diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 03252b0cd..3d94ca449 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets._GITHUB_TOKEN }} DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }} - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 if: always() with: name: d2chaos diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index 3883537f4..b2f85ba92 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -8,7 +8,41 @@ concurrency: cancel-in-progress: true jobs: + npm-nightly: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 # Needed for git history and version tags + + - name: Check for changes + id: check_changes + run: | + if [ $(git rev-list --count --since="24 hours ago" HEAD) -gt 0 ]; then + echo "has_changes=true" >> $GITHUB_OUTPUT + echo "Found changes in the last 24 hours, proceeding to publish d2js nightly" + else + echo "has_changes=false" >> $GITHUB_OUTPUT + echo "No changes in the last 24 hours, skipping d2js nightly publish" + fi + + - uses: actions/setup-go@v4 + if: steps.check_changes.outputs.has_changes == 'true' + with: + go-version-file: ./go.mod + cache: true + + - name: Publish nightly version to NPM + if: steps.check_changes.outputs.has_changes == 'true' + run: | + export NPM_VERSION=nightly + COLOR=1 ./make.sh js + env: + NPM_TOKEN: ${{ secrets.NPM_TOKEN }} + GITHUB_TOKEN: ${{ secrets._GITHUB_TOKEN }} + DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }} ci: + needs: [npm-nightly] runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -20,7 +54,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets._GITHUB_TOKEN }} DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }} - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 if: always() with: name: d2chaos diff --git a/.prettierignore b/.prettierignore index 6b44e5f0b..4cfcedd6e 100644 --- a/.prettierignore +++ b/.prettierignore @@ -5,3 +5,4 @@ d2renderers/d2latex/polyfills.js d2renderers/d2latex/setup.js d2renderers/d2sketch/rough.js lib/png/generate_png.js +d2js diff --git a/Makefile b/Makefile index dc2e39f23..346e9649a 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ .POSIX: .PHONY: all -all: fmt gen lint build test +all: fmt gen js lint build test .PHONY: fmt fmt: @@ -21,3 +21,6 @@ test: fmt .PHONY: race race: fmt prefix "$@" ./ci/test.sh --race ./... +.PHONY: js +js: gen + cd d2js/js && NPM_VERSION="${NPM_VERSION}" prefix "$@" ./make.sh all diff --git a/README.md b/README.md index 45d9b372c..7a9763a4d 100644 --- a/README.md +++ b/README.md @@ -4,11 +4,13 @@ A modern diagram scripting language that turns text to diagrams. -[Docs](https://d2lang.com) | [Cheat sheet](./docs/assets/cheat_sheet.pdf) | [Comparisons](https://text-to-diagram.com) | [Playground](https://play.d2lang.com) +[Docs](https://d2lang.com) | [Cheat sheet](./docs/assets/cheat_sheet.pdf) | [Comparisons](https://text-to-diagram.com) | [Playground](https://play.d2lang.com) | [IDE](https://app.terrastruct.com) [![ci](https://github.com/terrastruct/d2/actions/workflows/ci.yml/badge.svg)](https://github.com/terrastruct/d2/actions/workflows/ci.yml) [![daily](https://github.com/terrastruct/d2/actions/workflows/daily.yml/badge.svg)](https://github.com/terrastruct/d2/actions/workflows/daily.yml) [![release](https://img.shields.io/github/v/release/terrastruct/d2)](https://github.com/terrastruct/d2/releases) +[![changelog](https://img.shields.io/badge/changelog-read-blue)](./CHANGELOG.md) +[![npm version](https://img.shields.io/npm/v/@terrastruct/d2)](https://www.npmjs.com/package/@terrastruct/d2) [![discord](https://img.shields.io/discord/1039184639652265985?label=discord)](https://discord.gg/NF6X8K4eDq) [![twitter](https://img.shields.io/twitter/follow/terrastruct?style=social)](https://twitter.com/terrastruct) [![license](https://img.shields.io/github/license/terrastruct/d2?color=9cf)](./LICENSE.txt) @@ -16,6 +18,9 @@ D2 Playground button + +D2 Studio button + https://user-images.githubusercontent.com/3120367/206125010-bd1fea8e-248a-43e7-8f85-0bbfca0c6e2a.mp4 @@ -238,7 +243,7 @@ let us know and we'll be happy to include it here! ### Community plugins -- **Tree-sitter grammar**: [https://git.pleshevski.ru/pleshevskiy/tree-sitter-d2](https://git.pleshevski.ru/pleshevskiy/tree-sitter-d2) +- **Tree-sitter grammar**: [https://github.com/ravsii/tree-sitter-d2](https://github.com/ravsii/tree-sitter-d2) - **Emacs major mode**: [https://github.com/andorsk/d2-mode](https://github.com/andorsk/d2-mode) - **Goldmark extension**: [https://github.com/FurqanSoftware/goldmark-d2](https://github.com/FurqanSoftware/goldmark-d2) - **Telegram bot**: [https://github.com/meinside/telegram-d2-bot](https://github.com/meinside/telegram-d2-bot) @@ -261,12 +266,16 @@ let us know and we'll be happy to include it here! - **ent2d2**: [https://github.com/tmc/ent2d2](https://github.com/tmc/ent2d2) - **MkDocs Plugin**: [https://github.com/landmaj/mkdocs-d2-plugin](https://github.com/landmaj/mkdocs-d2-plugin) - **Remark Plugin**: [https://github.com/mech-a/remark-d2](https://github.com/mech-a/remark-d2) +- **VitePress Plugin**: [https://github.com/BadgerHobbs/vitepress-plugin-d2](https://github.com/BadgerHobbs/vitepress-plugin-d2) - **Zed extension**: [https://github.com/gabeidx/zed-d2](https://github.com/gabeidx/zed-d2) +- **Hexo blog extension**: [https://github.com/leverimmy/hexo-d2](https://github.com/leverimmy/hexo-d2) +- **Rehype Plugin**: [https://github.com/stereobooster/beoe/tree/main/packages/rehype-d2](https://github.com/stereobooster/beoe/tree/main/packages/rehype-d2) ### Misc - **Comparison site**: [https://github.com/terrastruct/text-to-diagram-site](https://github.com/terrastruct/text-to-diagram-site) - **Playground**: [https://github.com/terrastruct/d2-playground](https://github.com/terrastruct/d2-playground) +- **IDE (paid)**: [https://app.terrastruct.com](https://app.terrastruct.com) - **Language docs**: [https://github.com/terrastruct/d2-docs](https://github.com/terrastruct/d2-docs) - **Hosted icons**: [https://icons.terrastruct.com](https://icons.terrastruct.com) diff --git a/ci/peek-wasm-size.sh b/ci/peek-wasm-size.sh new file mode 100755 index 000000000..5c3f85896 --- /dev/null +++ b/ci/peek-wasm-size.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +OUTPUT_FILE="main.wasm" +SOURCE_PACKAGE="./d2js" + +echo "Building WASM file..." +GOOS=js GOARCH=wasm go build -ldflags='-s -w' -trimpath -o "$OUTPUT_FILE" "$SOURCE_PACKAGE" + +if [ $? -eq 0 ]; then + echo "Build successful." + + if [ -f "$OUTPUT_FILE" ]; then + FILE_SIZE_BYTES=$(stat -f%z "$OUTPUT_FILE") + FILE_SIZE_MB=$(echo "scale=2; $FILE_SIZE_BYTES / 1024 / 1024" | bc) + + echo "File size of $OUTPUT_FILE: $FILE_SIZE_MB MB" + else + echo "File $OUTPUT_FILE not found!" + exit 1 + fi + + echo "Deleting $OUTPUT_FILE..." + rm "$OUTPUT_FILE" + echo "File deleted." +else + echo "Build failed." + exit 1 +fi diff --git a/ci/release/build_in_docker.sh b/ci/release/build_in_docker.sh index cbfcbcdec..839449137 100755 --- a/ci/release/build_in_docker.sh +++ b/ci/release/build_in_docker.sh @@ -4,7 +4,7 @@ cd -- "$(dirname "$0")/../.." . ./ci/sub/lib.sh tag="$(sh_c docker build \ - --build-arg GOVERSION="1.22.2.linux-$ARCH" \ + --build-arg GOVERSION="1.23.6.linux-$ARCH" \ -qf ./ci/release/linux/Dockerfile ./ci/release/linux)" docker_run \ -e DRY_RUN \ diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index 41f1becc9..65780a72c 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -1,13 +1,9 @@ #### Features 🚀 -- Render: SVG files render in non-browser contexts (e.g. Inkscape, LaTeX) [#2147](https://github.com/terrastruct/d2/pull/2147) - #### Improvements 🧹 -- Lib: removes a dependency on external slog that was causing troubles with installation [#2137](https://github.com/terrastruct/d2/pull/2137) -- CLI: attempts writing to path atomically, falling back to non-atomic if failed [#2141](https://github.com/terrastruct/d2/pull/2141) -- Export: pptx has "created at" metadata removed, so successive runs yield the same result [#2169](https://github.com/terrastruct/d2/pull/2160) - #### Bugfixes ⛑️ -- Render: fixes edge case of a 3d shape with outside label being cut off [#2132](https://github.com/terrastruct/d2/pull/2132) +--- + +For the latest d2.js changes, see separate [changelog](https://github.com/terrastruct/d2/blob/master/d2js/js/CHANGELOG.md). diff --git a/ci/release/changelogs/template.md b/ci/release/changelogs/template.md index f3c0d2a77..65780a72c 100644 --- a/ci/release/changelogs/template.md +++ b/ci/release/changelogs/template.md @@ -3,3 +3,7 @@ #### Improvements 🧹 #### Bugfixes ⛑️ + +--- + +For the latest d2.js changes, see separate [changelog](https://github.com/terrastruct/d2/blob/master/d2js/js/CHANGELOG.md). diff --git a/ci/release/changelogs/v0.6.8.md b/ci/release/changelogs/v0.6.8.md new file mode 100644 index 000000000..74c24db4b --- /dev/null +++ b/ci/release/changelogs/v0.6.8.md @@ -0,0 +1,17 @@ +#### Features 🚀 + +- Render: SVG files render in non-browser contexts (e.g. Inkscape, LaTeX) [#2147](https://github.com/terrastruct/d2/pull/2147) + +#### Improvements 🧹 + +- Lib: removes a dependency on external slog that was causing troubles with installation [#2137](https://github.com/terrastruct/d2/pull/2137) +- CLI: attempts writing to path atomically, falling back to non-atomic if failed [#2141](https://github.com/terrastruct/d2/pull/2141) +- Export: pptx has "created at" metadata removed, so successive runs yield the same result [#2169](https://github.com/terrastruct/d2/pull/2160) +- Formatter: empty board keywords (e.g. `layers`) are removed [#2178](https://github.com/terrastruct/d2/pull/2178) +- Render: a tooltip or link by itself will not expand width of shape [#2183](https://github.com/terrastruct/d2/pull/2183) + +#### Bugfixes ⛑️ + +- Render: fixes edge case of a 3d shape with outside label being cut off [#2132](https://github.com/terrastruct/d2/pull/2132) +- Composition: labels for boards set with shorthand `x: y` was not applied [#2182](https://github.com/terrastruct/d2/pull/2182) +- Globs: double globs (`**`) were erroring when used with multiple scenario boards [#2195](https://github.com/terrastruct/d2/pull/2195) diff --git a/ci/release/changelogs/v0.6.9.md b/ci/release/changelogs/v0.6.9.md new file mode 100644 index 000000000..fb288461e --- /dev/null +++ b/ci/release/changelogs/v0.6.9.md @@ -0,0 +1,35 @@ +#### Features 🚀 + +- Animations: `style.animated: true` is supported on shapes [#2250](https://github.com/terrastruct/d2/pull/2250) +- Connections now support `link` [#1955](https://github.com/terrastruct/d2/pull/1955) +- Vars: vars in markdown blocks are substituted [#2218](https://github.com/terrastruct/d2/pull/2218) +- Markdown: Github-flavored tables work in `md` blocks [#2221](https://github.com/terrastruct/d2/pull/2221) +- Render: adds box arrowheads [#2227](https://github.com/terrastruct/d2/issues/2227) +- `d2 fmt` now supports a `--check` flag [#2253](https://github.com/terrastruct/d2/pull/2253) +- CLI: PNG output to stdout is supported using `--stdout-format png -` [#2291](https://github.com/terrastruct/d2/pull/2291) +- Globs: `&connected` and `&leaf` filters are implemented [#2299](https://github.com/terrastruct/d2/pull/2299) +- CLI: add --no-xml-tag for direct HTML embedding [#2302](https://github.com/terrastruct/d2/pull/2302) +- CLI: `play` cmd added for opening d2 input in online playground [#2242](https://github.com/terrastruct/d2/pull/2242) + +#### Improvements 🧹 + +- Composition: links pointing to own board are purged [#2203](https://github.com/terrastruct/d2/pull/2203) +- Syntax: reserved keywords must be unquoted [#2231](https://github.com/terrastruct/d2/pull/2231) +- Latex: Backslashes in Latex blocks do not escape [#2232](https://github.com/terrastruct/d2/pull/2232) + - This is a breaking change. Previously Latex blocks required escaping the backslash. So + for older D2 versions, you should remove the excess backslashes. +- Links: non-http url scheme links are supported (e.g. `x.link: vscode://file/`) [#2237](https://github.com/terrastruct/d2/issues/2237) +- Compiler: reserved keywords with missing values error instead of silently doing nothing [#2251](https://github.com/terrastruct/d2/pull/2251) +- Render: SVG outputs conform to stricter HTML standards, e.g. no duplicate ids [#2273](https://github.com/terrastruct/d2/issues/2273) +- Themes: theme names are consistently cased [#2322](https://github.com/terrastruct/d2/pull/2322) +- Nears: constant nears avoid collision with edge routes [#2327](https://github.com/terrastruct/d2/pull/2327) + +#### Bugfixes ⛑️ + +- Imports: fixes using substitutions in `icon` values [#2207](https://github.com/terrastruct/d2/pull/2207) +- Markdown: fixes ampersands in URLs in markdown [#2219](https://github.com/terrastruct/d2/pull/2219) +- Globs: fixes edge case where globs with imported boards would create empty boards [#2247](https://github.com/terrastruct/d2/pull/2247) +- Sequence diagrams: fixes alignment of notes when self messages are above it [#2264](https://github.com/terrastruct/d2/pull/2264) +- Null: fixes `null`ing a connection with absolute syntax [#2318](https://github.com/terrastruct/d2/issues/2318) +- Gradients: works with connection fills [#2326](https://github.com/terrastruct/d2/pull/2326) +- Latex: fixes backslashes doubling on successive parses [#2328](https://github.com/terrastruct/d2/pull/2328) diff --git a/ci/release/changelogs/v0.7.0.md b/ci/release/changelogs/v0.7.0.md new file mode 100644 index 000000000..b1828ca77 --- /dev/null +++ b/ci/release/changelogs/v0.7.0.md @@ -0,0 +1,59 @@ +#### Features 🚀 + +- Icons: + - connections can include icons [#12](https://github.com/terrastruct/d2/issues/12) +- Syntax: + - `suspend`/`unsuspend` to define models and instantiate them [#2394](https://github.com/terrastruct/d2/pull/2394) +- Globs: + - support for filtering edges based on properties of endpoint nodes (e.g., `&src.style.fill: blue`) [#2395](https://github.com/terrastruct/d2/pull/2395) + - `level` filter implemented [#2473](https://github.com/terrastruct/d2/pull/2473) +- Render: + - markdown, latex, and code can be used as object labels [#2204](https://github.com/terrastruct/d2/pull/2204) + - `shape: c4-person` to render a person shape like what the C4 model prescribes [#2397](https://github.com/terrastruct/d2/pull/2397) +- Icons: + - border-radius should work on icon [#2409](https://github.com/terrastruct/d2/issues/2409) +- Misc: + - Diagram legends are implemented [#2416](https://github.com/terrastruct/d2/pull/2416) + +#### Improvements 🧹 + +- CLI: + - Support `validate` command. [#2415](https://github.com/terrastruct/d2/pull/2415) + - Watch mode ignores backup files (e.g. files created by certain editors like Helix). [#2131](https://github.com/terrastruct/d2/issues/2131) + - Support for `--omit-version` flag. [#2377](https://github.com/terrastruct/d2/issues/2377) + - Casing is ignored for plugin names [#2486](https://github.com/terrastruct/d2/pull/2486) +- Compiler: + - `link`s can be set to root path, e.g. `/xyz`. [#2357](https://github.com/terrastruct/d2/issues/2357) + - When importing a file, attempt resolving substitutions at the imported file scope first [#2482](https://github.com/terrastruct/d2/pull/2482) + - validate gradient color stops. [#2492](https://github.com/terrastruct/d2/pull/2492) +- Parser: + - impose max key length. It's almost certainly a mistake if an ID gets too long, e.g. missing quotes [#2465](https://github.com/terrastruct/d2/pull/2465) +- Render: + - horizontal padding added for connection labels [#2461](https://github.com/terrastruct/d2/pull/2461) + +#### Bugfixes ⛑️ + +- Compiler: + - fixes panic when `sql_shape` shape value had mixed casing [#2349](https://github.com/terrastruct/d2/pull/2349) + - fixes panic when importing from a file with spread substitutions in `vars` [#2427](https://github.com/terrastruct/d2/pull/2427) + - fixes support for `center` in `d2-config` [#2360](https://github.com/terrastruct/d2/pull/2360) + - fixes panic when comment lines appear in arrays [#2378](https://github.com/terrastruct/d2/pull/2378) + - fixes inconsistencies when objects were double quoted [#2390](https://github.com/terrastruct/d2/pull/2390) + - fixes globs not applying to spread substitutions [#2426](https://github.com/terrastruct/d2/issues/2426) + - fixes panic when classes were mixed with layers incorrectly [#2448](https://github.com/terrastruct/d2/pull/2448) + - fixes panic when gradient colors are used in sketch mode [#2481](https://github.com/terrastruct/d2/pull/2487) + - fixes panic using glob ampersand filters with composite values [#2489](https://github.com/terrastruct/d2/pull/2489) + - fixes leaf ampersand filter when used with imports [#2494](https://github.com/terrastruct/d2/pull/2494) +- Formatter: + - fixes substitutions in quotes surrounded by text [#2462](https://github.com/terrastruct/d2/pull/2462) +- CLI: + - fetch and render remote images of mimetype octet-stream correctly [#2370](https://github.com/terrastruct/d2/pull/2370) +- Composition: + - spread importing scenarios/steps was not inheriting correctly [#2460](https://github.com/terrastruct/d2/pull/2460) + - imported fields were not merging with current fields/edges [#2464](https://github.com/terrastruct/d2/pull/2464) +- Markdown: + - fixes nested var substitutions not working [#2456](https://github.com/terrastruct/d2/pull/2456) + +--- + +For the latest d2.js changes, see separate [changelog](https://github.com/terrastruct/d2/blob/master/d2js/js/CHANGELOG.md). diff --git a/ci/release/release-js.sh b/ci/release/release-js.sh new file mode 100755 index 000000000..5cb5abea6 --- /dev/null +++ b/ci/release/release-js.sh @@ -0,0 +1,39 @@ +#!/bin/sh +set -eu +cd -- "$(dirname "$0")/../.." +. "./ci/sub/lib.sh" + +VERSION="" + +help() { + cat < + +Publishes the d2.js to NPM. + +Flags: + --version Version to publish (e.g., "0.1.2" or "nightly"). Note this is the js version, not related to the d2 version. A non-nightly version will publish to latest. +EOF +} + +for arg in "$@"; do + case "$arg" in + --help|-h) + help + exit 0 + ;; + --version=*) + VERSION="${arg#*=}" + ;; + esac +done + +if [ -z "$VERSION" ]; then + flag_errusage "--version is required" +fi + +FGCOLOR=6 header "Publishing JavaScript package to NPM (version: $VERSION)" + +sh_c "NPM_VERSION=$VERSION ./make.sh js" + +FGCOLOR=2 header 'NPM publish completed' diff --git a/ci/release/release.sh b/ci/release/release.sh index 517ae778d..f9bc7e5b6 100755 --- a/ci/release/release.sh +++ b/ci/release/release.sh @@ -1,5 +1,6 @@ #!/bin/sh set -eu cd -- "$(dirname "$0")/../.." +. "./ci/sub/lib.sh" ./ci/sub/release/release.sh "$@" diff --git a/ci/release/template/man/d2.1 b/ci/release/template/man/d2.1 index fa19626fa..b3132e15f 100644 --- a/ci/release/template/man/d2.1 +++ b/ci/release/template/man/d2.1 @@ -8,12 +8,17 @@ .Nm d2 .Op Fl -watch Ar false .Op Fl -theme Em 0 +.Op Fl -salt Ar string .Ar file.d2 .Op Ar file.svg | file.png .Nm d2 .Ar layout Op Ar name .Nm d2 .Ar fmt Ar file.d2 ... +.Nm d2 +.Ar play Ar file.d2 +.Nm d2 +.Ar validate Ar file.d2 .Sh DESCRIPTION .Nm compiles and renders @@ -125,12 +130,27 @@ In watch mode, images used in icons are cached for subsequent compilations. This .It Fl -timeout Ar 120 The maximum number of seconds that D2 runs for before timing out and exiting. When rendering a large diagram, it is recommended to increase this value .Ns . +.It Fl -check Ar false +Check that the specified files are formatted correctly +.Ns . +.It Fl -salt Ar string +Add a salt value to ensure the output uses unique IDs. This is useful when generating multiple identical diagrams to be included in the same HTML doc, so that duplicate id's do not cause invalid HTML. The salt value is a string that will be appended to IDs in the output. +.Ns . .It Fl h , -help Print usage information and exit .Ns . .It Fl v , -version Print version information and exit .Ns . +.It Fl -stdout-format Ar string +Set the output format when writing to stdout. Supported formats are: png, svg. Only used when output is set to stdout (-) +.Ns . +.It Fl -no-xml-tag Ar false +Omit XML tag () from output SVG files. Useful when generating SVGs for direct HTML embedding +.Ns . +.It Fl -omit-version Ar false +omit D2 version from generated image +.Ns . .El .Sh SUBCOMMANDS .Bl -tag -width Fl @@ -145,7 +165,64 @@ Lists available themes .Ns . .It Ar fmt Ar file.d2 ... Format all passed files -.Ns . +.It Ar play Ar file.d2 +Opens the file in playground, an online web viewer (https://play.d2lang.com) +.It Ar validate Ar file.d2 +Validates file.d2 +.El +.Sh ENVIRONMENT VARIABLES +Many flags can also be set with environment variables. +.Bl -tag -width Ds +.It Ev Sy D2_WATCH +See -w[atch] flag. +.It Ev Sy D2_LAYOUT +See -l[ayout] flag. +.It Ev Sy D2_THEME +See -t[heme] flag. +.It Ev Sy D2_DARK_THEME +See --dark-theme flag. +.It Ev Sy D2_PAD +See --pad flag. +.It Ev Sy D2_CENTER +See --center flag. +.It Ev Sy D2_SKETCH +See -s[ketch] flag. +.It Ev Sy D2_BUNDLE +See -b[undle] flag. +.It Ev Sy D2_FORCE_APPENDIX +See --force-appendix flag. +.It Ev Sy D2_FONT_REGULAR +See --font-regular flag. +.It Ev Sy D2_FONT_ITALIC +See --font-italic flag. +.It Ev Sy D2_FONT_BOLD +See --font-bold flag. +.It Ev Sy D2_FONT_SEMIBOLD +See --font-semibold flag. +.It Ev Sy D2_ANIMATE_INTERVAL +See --animate-interval flag. +.It Ev Sy D2_TIMEOUT +See --timeout flag. +.It Ev Sy D2_CHECK +See --check flag. +.El +.Bl -tag -width Ds +.It Ev Sy DEBUG +See -d[ebug] flag. +.It Ev Sy IMG_CACHE +See --img-cache flag. +.It Ev Sy HOST +See -h[ost] flag. +.It Ev Sy PORT +See -p[ort] flag. +.It Ev Sy BROWSER +See --browser flag. +.It Ev Sy D2_STDOUT_FORMAT +See --stdout-format flag. +.It Ev Sy D2_NO_XML_TAG +See --no-xml-tag flag. +.It Ev Sy OMIT_VERSION +See --omit-version .El .Sh SEE ALSO .Xr d2plugin-tala 1 diff --git a/d2ast/d2ast.go b/d2ast/d2ast.go index 711316b41..807b7c93c 100644 --- a/d2ast/d2ast.go +++ b/d2ast/d2ast.go @@ -56,6 +56,7 @@ var _ Node = &Comment{} var _ Node = &BlockComment{} var _ Node = &Null{} +var _ Node = &Suspension{} var _ Node = &Boolean{} var _ Node = &Number{} var _ Node = &UnquotedString{} @@ -166,7 +167,8 @@ func (r Range) Before(r2 Range) bool { type Position struct { Line int Column int - Byte int + // -1 is used as sentinel that a constructed position is missing byte offset (for LSP usage) + Byte int } var _ fmt.Stringer = Position{} @@ -276,7 +278,13 @@ func (p Position) SubtractString(s string, byUTF16 bool) Position { } func (p Position) Before(p2 Position) bool { - return p.Byte < p2.Byte + if p.Byte != p2.Byte && p.Byte != -1 && p2.Byte != -1 { + return p.Byte < p2.Byte + } + if p.Line != p2.Line { + return p.Line < p2.Line + } + return p.Column < p2.Column } // MapNode is implemented by nodes that may be children of Maps. @@ -322,6 +330,7 @@ type Scalar interface { // See String for rest. var _ Scalar = &Null{} +var _ Scalar = &Suspension{} var _ Scalar = &Boolean{} var _ Scalar = &Number{} @@ -331,6 +340,7 @@ type String interface { SetString(string) Copy() String _string() + IsUnquoted() bool } var _ String = &UnquotedString{} @@ -341,6 +351,7 @@ var _ String = &BlockString{} func (c *Comment) node() {} func (c *BlockComment) node() {} func (n *Null) node() {} +func (n *Suspension) node() {} func (b *Boolean) node() {} func (n *Number) node() {} func (s *UnquotedString) node() {} @@ -359,6 +370,7 @@ func (i *EdgeIndex) node() {} func (c *Comment) Type() string { return "comment" } func (c *BlockComment) Type() string { return "block comment" } func (n *Null) Type() string { return "null" } +func (n *Suspension) Type() string { return "suspension" } func (b *Boolean) Type() string { return "boolean" } func (n *Number) Type() string { return "number" } func (s *UnquotedString) Type() string { return "unquoted string" } @@ -377,6 +389,7 @@ func (i *EdgeIndex) Type() string { return "edge index" } func (c *Comment) GetRange() Range { return c.Range } func (c *BlockComment) GetRange() Range { return c.Range } func (n *Null) GetRange() Range { return n.Range } +func (n *Suspension) GetRange() Range { return n.Range } func (b *Boolean) GetRange() Range { return b.Range } func (n *Number) GetRange() Range { return n.Range } func (s *UnquotedString) GetRange() Range { return s.Range } @@ -401,6 +414,7 @@ func (i *Import) mapNode() {} func (c *Comment) arrayNode() {} func (c *BlockComment) arrayNode() {} func (n *Null) arrayNode() {} +func (n *Suspension) arrayNode() {} func (b *Boolean) arrayNode() {} func (n *Number) arrayNode() {} func (s *UnquotedString) arrayNode() {} @@ -413,6 +427,7 @@ func (a *Array) arrayNode() {} func (m *Map) arrayNode() {} func (n *Null) value() {} +func (n *Suspension) value() {} func (b *Boolean) value() {} func (n *Number) value() {} func (s *UnquotedString) value() {} @@ -424,6 +439,7 @@ func (m *Map) value() {} func (i *Import) value() {} func (n *Null) scalar() {} +func (n *Suspension) scalar() {} func (b *Boolean) scalar() {} func (n *Number) scalar() {} func (s *UnquotedString) scalar() {} @@ -434,6 +450,7 @@ func (s *BlockString) scalar() {} func (c *Comment) Children() []Node { return nil } func (c *BlockComment) Children() []Node { return nil } func (n *Null) Children() []Node { return nil } +func (n *Suspension) Children() []Node { return nil } func (b *Boolean) Children() []Node { return nil } func (n *Number) Children() []Node { return nil } func (s *SingleQuotedString) Children() []Node { return nil } @@ -565,9 +582,10 @@ func Walk(node Node, fn func(Node) bool) { } // TODO: mistake, move into parse.go -func (n *Null) ScalarString() string { return "" } -func (b *Boolean) ScalarString() string { return strconv.FormatBool(b.Value) } -func (n *Number) ScalarString() string { return n.Raw } +func (n *Null) ScalarString() string { return "" } +func (n *Suspension) ScalarString() string { return "" } +func (b *Boolean) ScalarString() string { return strconv.FormatBool(b.Value) } +func (n *Number) ScalarString() string { return n.Raw } func (s *UnquotedString) ScalarString() string { if len(s.Value) == 0 { return "" @@ -604,6 +622,11 @@ func (s *DoubleQuotedString) _string() {} func (s *SingleQuotedString) _string() {} func (s *BlockString) _string() {} +func (s *UnquotedString) IsUnquoted() bool { return true } +func (s *DoubleQuotedString) IsUnquoted() bool { return false } +func (s *SingleQuotedString) IsUnquoted() bool { return false } +func (s *BlockString) IsUnquoted() bool { return false } + type Comment struct { Range Range `json:"range"` Value string `json:"value"` @@ -618,6 +641,11 @@ type Null struct { Range Range `json:"range"` } +type Suspension struct { + Range Range `json:"range"` + Value bool `json:"value"` +} + type Boolean struct { Range Range `json:"range"` Value bool `json:"value"` @@ -1006,6 +1034,21 @@ func (mk *Key) HasTripleGlob() bool { return false } +func (mk *Key) HasMultiGlob() bool { + if mk.Key.HasMultiGlob() { + return true + } + for _, e := range mk.Edges { + if e.Src.HasMultiGlob() || e.Dst.HasMultiGlob() { + return true + } + } + if mk.EdgeKey.HasMultiGlob() { + return true + } + return false +} + func (mk *Key) SupportsGlobFilters() bool { if mk.Key.HasGlob() && len(mk.Edges) == 0 { return true @@ -1037,7 +1080,22 @@ func MakeKeyPath(a []string) *KeyPath { return kp } -func (kp *KeyPath) IDA() (ida []string) { +func MakeKeyPathString(a []String) *KeyPath { + kp := &KeyPath{} + for _, el := range a { + kp.Path = append(kp.Path, MakeValueBox(RawString(el.ScalarString(), true)).StringBox()) + } + return kp +} + +func (kp *KeyPath) IDA() (ida []String) { + for _, el := range kp.Path { + ida = append(ida, el.Unbox()) + } + return ida +} + +func (kp *KeyPath) StringIDA() (ida []string) { for _, el := range kp.Path { ida = append(ida, el.Unbox().ScalarString()) } @@ -1326,6 +1384,7 @@ func (ab ArrayNodeBox) Unbox() ArrayNode { // ValueBox is used to box Value for JSON persistence. type ValueBox struct { Null *Null `json:"null,omitempty"` + Suspension *Suspension `json:"suspension,omitempty"` Boolean *Boolean `json:"boolean,omitempty"` Number *Number `json:"number,omitempty"` UnquotedString *UnquotedString `json:"unquoted_string,omitempty"` @@ -1341,6 +1400,8 @@ func (vb ValueBox) Unbox() Value { switch { case vb.Null != nil: return vb.Null + case vb.Suspension != nil: + return vb.Suspension case vb.Boolean != nil: return vb.Boolean case vb.Number != nil: @@ -1369,6 +1430,8 @@ func MakeValueBox(v Value) ValueBox { switch v := v.(type) { case *Null: vb.Null = v + case *Suspension: + vb.Suspension = v case *Boolean: vb.Boolean = v case *Number: @@ -1394,6 +1457,7 @@ func MakeValueBox(v Value) ValueBox { func (vb ValueBox) ScalarBox() ScalarBox { var sb ScalarBox sb.Null = vb.Null + sb.Suspension = vb.Suspension sb.Boolean = vb.Boolean sb.Number = vb.Number sb.UnquotedString = vb.UnquotedString @@ -1416,6 +1480,7 @@ func (vb ValueBox) StringBox() *StringBox { // TODO: implement ScalarString() type ScalarBox struct { Null *Null `json:"null,omitempty"` + Suspension *Suspension `json:"suspension,omitempty"` Boolean *Boolean `json:"boolean,omitempty"` Number *Number `json:"number,omitempty"` UnquotedString *UnquotedString `json:"unquoted_string,omitempty"` @@ -1428,6 +1493,8 @@ func (sb ScalarBox) Unbox() Scalar { switch { case sb.Null != nil: return sb.Null + case sb.Suspension != nil: + return sb.Suspension case sb.Boolean != nil: return sb.Boolean case sb.Number != nil: @@ -1516,7 +1583,7 @@ func RawString(s string, inKey bool) String { return &SingleQuotedString{Value: s} } } - } else if s == "null" || strings.ContainsAny(s, UnquotedValueSpecials) { + } else if s == "null" || s == "suspend" || s == "unsuspend" || strings.ContainsAny(s, UnquotedValueSpecials) { if !strings.ContainsRune(s, '"') && !strings.ContainsRune(s, '$') { return FlatDoubleQuotedString(s) } @@ -1550,9 +1617,9 @@ func (s *Substitution) IDA() (ida []string) { return ida } -func (i *Import) IDA() (ida []string) { +func (i *Import) IDA() (ida []String) { for _, el := range i.Path[1:] { - ida = append(ida, el.Unbox().ScalarString()) + ida = append(ida, el.Unbox()) } return ida } diff --git a/d2ast/keywords.go b/d2ast/keywords.go index 7ad1fae65..65f67b775 100644 --- a/d2ast/keywords.go +++ b/d2ast/keywords.go @@ -8,7 +8,6 @@ var ReservedKeywords map[string]struct{} // Non Style/Holder keywords. var SimpleReservedKeywords = map[string]struct{}{ "label": {}, - "desc": {}, "shape": {}, "icon": {}, "constraint": {}, @@ -31,17 +30,17 @@ var SimpleReservedKeywords = map[string]struct{}{ // ReservedKeywordHolders are reserved keywords that are meaningless on its own and must hold composites var ReservedKeywordHolders = map[string]struct{}{ - "style": {}, - "source-arrowhead": {}, - "target-arrowhead": {}, + "style": {}, } // CompositeReservedKeywords are reserved keywords that can hold composites var CompositeReservedKeywords = map[string]struct{}{ - "classes": {}, - "constraint": {}, - "label": {}, - "icon": {}, + "source-arrowhead": {}, + "target-arrowhead": {}, + "classes": {}, + "constraint": {}, + "label": {}, + "icon": {}, } // StyleKeywords are reserved keywords which cannot exist outside of the "style" keyword diff --git a/d2chaos/d2chaos_test.go b/d2chaos/d2chaos_test.go index a6abfed52..83402181b 100644 --- a/d2chaos/d2chaos_test.go +++ b/d2chaos/d2chaos_test.go @@ -3,7 +3,6 @@ package d2chaos_test import ( "context" "fmt" - "io/ioutil" "os" "path/filepath" "runtime/debug" @@ -90,14 +89,14 @@ func TestD2Chaos(t *testing.T) { func test(t *testing.T, textPath, text string) { t.Logf("writing d2 to %v (%d bytes)", textPath, len(text)) - err := ioutil.WriteFile(textPath, []byte(text), 0644) + err := os.WriteFile(textPath, []byte(text), 0644) if err != nil { t.Fatal(err) } goencText := fmt.Sprintf("%#v", text) t.Logf("writing d2.goenc to %v (%d bytes)", textPath+".goenc", len(goencText)) - err = ioutil.WriteFile(textPath+".goenc", []byte(goencText), 0644) + err = os.WriteFile(textPath+".goenc", []byte(goencText), 0644) if err != nil { t.Fatal(err) } diff --git a/d2cli/export.go b/d2cli/export.go index 6da34bdb8..602cfd675 100644 --- a/d2cli/export.go +++ b/d2cli/export.go @@ -1,7 +1,9 @@ package d2cli import ( + "fmt" "path/filepath" + "strings" ) type exportExtension string @@ -14,6 +16,24 @@ const SVG exportExtension = ".svg" var SUPPORTED_EXTENSIONS = []exportExtension{SVG, PNG, PDF, PPTX, GIF} +var STDOUT_FORMAT_MAP = map[string]exportExtension{ + "png": PNG, + "svg": SVG, +} + +var SUPPORTED_STDOUT_FORMATS = []string{"png", "svg"} + +func getOutputFormat(stdoutFormatFlag *string, outputPath string) (exportExtension, error) { + if stdoutFormatFlag != nil && *stdoutFormatFlag != "" { + format := strings.ToLower(*stdoutFormatFlag) + if ext, ok := STDOUT_FORMAT_MAP[format]; ok { + return ext, nil + } + return "", fmt.Errorf("%s is not a supported format. Supported formats are: %s", *stdoutFormatFlag, SUPPORTED_STDOUT_FORMATS) + } + return getExportExtension(outputPath), nil +} + func getExportExtension(outputPath string) exportExtension { ext := filepath.Ext(outputPath) for _, kext := range SUPPORTED_EXTENSIONS { diff --git a/d2cli/export_test.go b/d2cli/export_test.go index eb7ac44ee..6022c65d0 100644 --- a/d2cli/export_test.go +++ b/d2cli/export_test.go @@ -8,6 +8,7 @@ import ( func TestOutputFormat(t *testing.T) { type testCase struct { + stdoutFormatFlag string outputPath string extension exportExtension supportsDarkTheme bool @@ -41,6 +42,15 @@ func TestOutputFormat(t *testing.T) { requiresAnimationInterval: false, requiresPngRender: false, }, + { + stdoutFormatFlag: "png", + outputPath: "-", + extension: PNG, + supportsDarkTheme: false, + supportsAnimation: false, + requiresAnimationInterval: false, + requiresPngRender: true, + }, { outputPath: "/out.png", extension: PNG, @@ -78,7 +88,8 @@ func TestOutputFormat(t *testing.T) { for _, tc := range testCases { tc := tc t.Run(tc.outputPath, func(t *testing.T) { - extension := getExportExtension(tc.outputPath) + extension, err := getOutputFormat(&tc.stdoutFormatFlag, tc.outputPath) + assert.NoError(t, err) assert.Equal(t, tc.extension, extension) assert.Equal(t, tc.supportsAnimation, extension.supportsAnimation()) assert.Equal(t, tc.supportsDarkTheme, extension.supportsDarkTheme()) diff --git a/d2cli/fmt.go b/d2cli/fmt.go index a2b837158..61daf15ea 100644 --- a/d2cli/fmt.go +++ b/d2cli/fmt.go @@ -12,9 +12,10 @@ import ( "oss.terrastruct.com/d2/d2format" "oss.terrastruct.com/d2/d2parser" + "oss.terrastruct.com/d2/lib/log" ) -func fmtCmd(ctx context.Context, ms *xmain.State) (err error) { +func fmtCmd(ctx context.Context, ms *xmain.State, check bool) (err error) { defer xdefer.Errorf(&err, "failed to fmt") ms.Opts = xmain.NewOpts(ms.Env, ms.Opts.Flags.Args()[1:]) @@ -22,6 +23,8 @@ func fmtCmd(ctx context.Context, ms *xmain.State) (err error) { return xmain.UsageErrorf("fmt must be passed at least one file to be formatted") } + unformattedCount := 0 + for _, inputPath := range ms.Opts.Args { if inputPath != "-" { inputPath = ms.AbsPath(inputPath) @@ -43,10 +46,25 @@ func fmtCmd(ctx context.Context, ms *xmain.State) (err error) { output := []byte(d2format.Format(m)) if !bytes.Equal(output, input) { - if err := ms.WritePath(inputPath, output); err != nil { - return err + if check { + unformattedCount += 1 + log.Warn(ctx, inputPath) + } else { + if err := ms.WritePath(inputPath, output); err != nil { + return err + } } } } + + if unformattedCount > 0 { + pluralFiles := "file" + if unformattedCount > 1 { + pluralFiles = "files" + } + + return xmain.ExitErrorf(1, "found %d unformatted %s. Run d2 fmt to fix.", unformattedCount, pluralFiles) + } + return nil } diff --git a/d2cli/help.go b/d2cli/help.go index a786cd7b4..5b025b6bb 100644 --- a/d2cli/help.go +++ b/d2cli/help.go @@ -22,6 +22,8 @@ Usage: %[1]s [--watch=false] [--theme=0] file.d2 [file.svg | file.png] %[1]s layout [name] %[1]s fmt file.d2 ... + %[1]s play [--theme=0] [--sketch] file.d2 + %[1]s validate file.d2 %[1]s compiles and renders file.d2 to file.svg | file.png It defaults to file.svg if an output path is not provided. @@ -38,6 +40,8 @@ Subcommands: %[1]s layout [name] - Display long help for a particular layout engine, including its configuration options %[1]s themes - Lists available themes %[1]s fmt file.d2 ... - Format passed files + %[1]s play file.d2 - Opens the file in playground, an online web viewer (https://play.d2lang.com) + %[1]s validate file.d2 - Validates file.d2 See more docs and the source code at https://oss.terrastruct.com/d2. Hosted icons at https://icons.terrastruct.com. @@ -55,7 +59,7 @@ func layoutCmd(ctx context.Context, ms *xmain.State, ps []d2plugin.Plugin) error } } -func themesCmd(ctx context.Context, ms *xmain.State) { +func themesCmd(_ context.Context, ms *xmain.State) { fmt.Fprintf(ms.Stdout, "Available themes:\n%s", d2themescatalog.CLIString()) } diff --git a/d2cli/main.go b/d2cli/main.go index df66926fa..5eb6e2b3e 100644 --- a/d2cli/main.go +++ b/d2cli/main.go @@ -50,7 +50,7 @@ import ( func Run(ctx context.Context, ms *xmain.State) (err error) { ctx = log.WithDefault(ctx) // These should be kept up-to-date with the d2 man page - watchFlag, err := ms.Opts.Bool("D2_WATCH", "watch", "w", false, "watch for changes to input and live reload. Use $HOST and $PORT to specify the listening address.\n(default localhost:0, which is will open on a randomly available local port).") + watchFlag, err := ms.Opts.Bool("D2_WATCH", "watch", "w", false, "watch for changes to input and live reload. Use $HOST and $PORT to specify the listening address.\n(default localhost:0, which will open on a randomly available local port).") if err != nil { return err } @@ -103,6 +103,11 @@ func Run(ctx context.Context, ms *xmain.State) (err error) { if err != nil { return err } + stdoutFormatFlag := ms.Opts.String("", "stdout-format", "", "", "output format when writing to stdout (svg, png). Usage: d2 input.d2 --stdout-format png - > output.png") + if err != nil { + return err + } + browserFlag := ms.Opts.String("BROWSER", "browser", "", "", "browser executable that watch opens. Setting to 0 opens no browser.") centerFlag, err := ms.Opts.Bool("D2_CENTER", "center", "c", false, "center the SVG in the containing viewbox, such as your browser screen") if err != nil { @@ -119,6 +124,23 @@ func Run(ctx context.Context, ms *xmain.State) (err error) { fontBoldFlag := ms.Opts.String("D2_FONT_BOLD", "font-bold", "", "", "path to .ttf file to use for the bold font. If none provided, Source Sans Pro Bold is used.") fontSemiboldFlag := ms.Opts.String("D2_FONT_SEMIBOLD", "font-semibold", "", "", "path to .ttf file to use for the semibold font. If none provided, Source Sans Pro Semibold is used.") + checkFlag, err := ms.Opts.Bool("D2_CHECK", "check", "", false, "check that the specified files are formatted correctly.") + if err != nil { + return err + } + + noXMLTagFlag, err := ms.Opts.Bool("D2_NO_XML_TAG", "no-xml-tag", "", false, "omit XML tag () from output SVG files. Useful when generating SVGs for direct HTML embedding") + if err != nil { + return err + } + + saltFlag := ms.Opts.String("", "salt", "", "", "Add a salt value to ensure the output uses unique IDs. This is useful when generating multiple identical diagrams to be included in the same HTML doc, so that duplicate IDs do not cause invalid HTML. The salt value is a string that will be appended to IDs in the output.") + + omitVersionFlag, err := ms.Opts.Bool("OMIT_VERSION", "omit-version", "", false, "omit D2 version from generated image") + if err != nil { + return err + } + plugins, err := d2plugin.ListPlugins(ctx) if err != nil { return err @@ -153,7 +175,11 @@ func Run(ctx context.Context, ms *xmain.State) (err error) { themesCmd(ctx, ms) return nil case "fmt": - return fmtCmd(ctx, ms) + return fmtCmd(ctx, ms, *checkFlag) + case "play": + return playCmd(ctx, ms) + case "validate": + return validateCmd(ctx, ms) case "version": if len(ms.Opts.Flags.Args()) > 1 { return xmain.UsageErrorf("version subcommand accepts no arguments") @@ -213,7 +239,12 @@ func Run(ctx context.Context, ms *xmain.State) (err error) { if filepath.Ext(outputPath) == ".ppt" { return xmain.UsageErrorf("D2 does not support ppt exports, did you mean \"pptx\"?") } - outputFormat := getExportExtension(outputPath) + + outputFormat, err := getOutputFormat(stdoutFormatFlag, outputPath) + if err != nil { + return xmain.UsageErrorf("%v", err) + } + if outputPath != "-" { outputPath = ms.AbsPath(outputPath) if *animateIntervalFlag > 0 && !outputFormat.supportsAnimation() { @@ -303,6 +334,9 @@ func Run(ctx context.Context, ms *xmain.State) (err error) { ThemeID: themeFlag, DarkThemeID: darkThemeFlag, Scale: scale, + NoXMLTag: noXMLTagFlag, + Salt: saltFlag, + OmitVersion: omitVersionFlag, } if *watchFlag { @@ -325,6 +359,7 @@ func Run(ctx context.Context, ms *xmain.State) (err error) { forceAppendix: *forceAppendixFlag, pw: pw, fontFamily: fontFamily, + outputFormat: outputFormat, }) if err != nil { return err @@ -349,13 +384,13 @@ func Run(ctx context.Context, ms *xmain.State) (err error) { if err != nil { return xmain.UsageErrorf("invalid target: %s", *targetFlag) } - boardPath = key.IDA() + boardPath = key.StringIDA() } ctx, cancel := timelib.WithTimeout(ctx, time.Minute*2) defer cancel() - _, written, err := compile(ctx, ms, plugins, nil, layoutFlag, renderOpts, fontFamily, *animateIntervalFlag, inputPath, outputPath, boardPath, noChildren, *bundleFlag, *forceAppendixFlag, pw.Page) + _, written, err := compile(ctx, ms, plugins, nil, layoutFlag, renderOpts, fontFamily, *animateIntervalFlag, inputPath, outputPath, boardPath, noChildren, *bundleFlag, *forceAppendixFlag, pw.Page, outputFormat) if err != nil { if written { return fmt.Errorf("failed to fully compile (partial render written) %s: %w", ms.HumanPath(inputPath), err) @@ -430,7 +465,7 @@ func RouterResolver(ctx context.Context, ms *xmain.State, plugins []d2plugin.Plu } } -func compile(ctx context.Context, ms *xmain.State, plugins []d2plugin.Plugin, fs fs.FS, layout *string, renderOpts d2svg.RenderOpts, fontFamily *d2fonts.FontFamily, animateInterval int64, inputPath, outputPath string, boardPath []string, noChildren, bundle, forceAppendix bool, page playwright.Page) (_ []byte, written bool, _ error) { +func compile(ctx context.Context, ms *xmain.State, plugins []d2plugin.Plugin, fs fs.FS, layout *string, renderOpts d2svg.RenderOpts, fontFamily *d2fonts.FontFamily, animateInterval int64, inputPath, outputPath string, boardPath []string, noChildren, bundle, forceAppendix bool, page playwright.Page, ext exportExtension) (_ []byte, written bool, _ error) { start := time.Now() input, err := ms.ReadPath(inputPath) if err != nil { @@ -495,7 +530,7 @@ func compile(ctx context.Context, ms *xmain.State, plugins []d2plugin.Plugin, fs plugin, _ := d2plugin.FindPlugin(ctx, plugins, *opts.Layout) if animateInterval > 0 { - masterID, err := diagram.HashID() + masterID, err := diagram.HashID(renderOpts.Salt) if err != nil { return nil, false, err } @@ -522,7 +557,6 @@ func compile(ctx context.Context, ms *xmain.State, plugins []d2plugin.Plugin, fs return nil, false, err } - ext := getExportExtension(outputPath) switch ext { case GIF: svg, pngs, err := renderPNGsForGIF(ctx, ms, plugin, renderOpts, ruler, page, inputPath, diagram) @@ -598,9 +632,9 @@ func compile(ctx context.Context, ms *xmain.State, plugins []d2plugin.Plugin, fs var boards [][]byte var err error if noChildren { - boards, err = renderSingle(ctx, ms, compileDur, plugin, renderOpts, inputPath, outputPath, bundle, forceAppendix, page, ruler, diagram) + boards, err = renderSingle(ctx, ms, compileDur, plugin, renderOpts, inputPath, outputPath, bundle, forceAppendix, page, ruler, diagram, ext) } else { - boards, err = render(ctx, ms, compileDur, plugin, renderOpts, inputPath, outputPath, bundle, forceAppendix, page, ruler, diagram) + boards, err = render(ctx, ms, compileDur, plugin, renderOpts, inputPath, outputPath, bundle, forceAppendix, page, ruler, diagram, ext) } if err != nil { return nil, false, err @@ -739,7 +773,7 @@ func relink(currDiagramPath string, d *d2target.Diagram, linkToOutput map[string return nil } -func render(ctx context.Context, ms *xmain.State, compileDur time.Duration, plugin d2plugin.Plugin, opts d2svg.RenderOpts, inputPath, outputPath string, bundle, forceAppendix bool, page playwright.Page, ruler *textmeasure.Ruler, diagram *d2target.Diagram) ([][]byte, error) { +func render(ctx context.Context, ms *xmain.State, compileDur time.Duration, plugin d2plugin.Plugin, opts d2svg.RenderOpts, inputPath, outputPath string, bundle, forceAppendix bool, page playwright.Page, ruler *textmeasure.Ruler, diagram *d2target.Diagram, ext exportExtension) ([][]byte, error) { if diagram.Name != "" { ext := filepath.Ext(outputPath) outputPath = strings.TrimSuffix(outputPath, ext) @@ -785,21 +819,21 @@ func render(ctx context.Context, ms *xmain.State, compileDur time.Duration, plug var boards [][]byte for _, dl := range diagram.Layers { - childrenBoards, err := render(ctx, ms, compileDur, plugin, opts, inputPath, layersOutputPath, bundle, forceAppendix, page, ruler, dl) + childrenBoards, err := render(ctx, ms, compileDur, plugin, opts, inputPath, layersOutputPath, bundle, forceAppendix, page, ruler, dl, ext) if err != nil { return nil, err } boards = append(boards, childrenBoards...) } for _, dl := range diagram.Scenarios { - childrenBoards, err := render(ctx, ms, compileDur, plugin, opts, inputPath, scenariosOutputPath, bundle, forceAppendix, page, ruler, dl) + childrenBoards, err := render(ctx, ms, compileDur, plugin, opts, inputPath, scenariosOutputPath, bundle, forceAppendix, page, ruler, dl, ext) if err != nil { return nil, err } boards = append(boards, childrenBoards...) } for _, dl := range diagram.Steps { - childrenBoards, err := render(ctx, ms, compileDur, plugin, opts, inputPath, stepsOutputPath, bundle, forceAppendix, page, ruler, dl) + childrenBoards, err := render(ctx, ms, compileDur, plugin, opts, inputPath, stepsOutputPath, bundle, forceAppendix, page, ruler, dl, ext) if err != nil { return nil, err } @@ -808,7 +842,7 @@ func render(ctx context.Context, ms *xmain.State, compileDur time.Duration, plug if !diagram.IsFolderOnly { start := time.Now() - out, err := _render(ctx, ms, plugin, opts, inputPath, boardOutputPath, bundle, forceAppendix, page, ruler, diagram) + out, err := _render(ctx, ms, plugin, opts, inputPath, boardOutputPath, bundle, forceAppendix, page, ruler, diagram, ext) if err != nil { return boards, err } @@ -822,9 +856,9 @@ func render(ctx context.Context, ms *xmain.State, compileDur time.Duration, plug return boards, nil } -func renderSingle(ctx context.Context, ms *xmain.State, compileDur time.Duration, plugin d2plugin.Plugin, opts d2svg.RenderOpts, inputPath, outputPath string, bundle, forceAppendix bool, page playwright.Page, ruler *textmeasure.Ruler, diagram *d2target.Diagram) ([][]byte, error) { +func renderSingle(ctx context.Context, ms *xmain.State, compileDur time.Duration, plugin d2plugin.Plugin, opts d2svg.RenderOpts, inputPath, outputPath string, bundle, forceAppendix bool, page playwright.Page, ruler *textmeasure.Ruler, diagram *d2target.Diagram, outputFormat exportExtension) ([][]byte, error) { start := time.Now() - out, err := _render(ctx, ms, plugin, opts, inputPath, outputPath, bundle, forceAppendix, page, ruler, diagram) + out, err := _render(ctx, ms, plugin, opts, inputPath, outputPath, bundle, forceAppendix, page, ruler, diagram, outputFormat) if err != nil { return [][]byte{}, err } @@ -835,15 +869,16 @@ func renderSingle(ctx context.Context, ms *xmain.State, compileDur time.Duration return [][]byte{out}, nil } -func _render(ctx context.Context, ms *xmain.State, plugin d2plugin.Plugin, opts d2svg.RenderOpts, inputPath, outputPath string, bundle, forceAppendix bool, page playwright.Page, ruler *textmeasure.Ruler, diagram *d2target.Diagram) ([]byte, error) { - toPNG := getExportExtension(outputPath) == PNG +func _render(ctx context.Context, ms *xmain.State, plugin d2plugin.Plugin, opts d2svg.RenderOpts, inputPath, outputPath string, bundle, forceAppendix bool, page playwright.Page, ruler *textmeasure.Ruler, diagram *d2target.Diagram, outputFormat exportExtension) ([]byte, error) { + toPNG := outputFormat == PNG + var scale *float64 if opts.Scale != nil { scale = opts.Scale } else if toPNG { scale = go2.Pointer(1.) } - svg, err := d2svg.Render(diagram, &d2svg.RenderOpts{ + renderOpts := &d2svg.RenderOpts{ Pad: opts.Pad, Sketch: opts.Sketch, Center: opts.Center, @@ -852,8 +887,12 @@ func _render(ctx context.Context, ms *xmain.State, plugin d2plugin.Plugin, opts DarkThemeID: opts.DarkThemeID, ThemeOverrides: opts.ThemeOverrides, DarkThemeOverrides: opts.DarkThemeOverrides, + NoXMLTag: opts.NoXMLTag, + Salt: opts.Salt, Scale: scale, - }) + OmitVersion: opts.OmitVersion, + } + svg, err := d2svg.Render(diagram, renderOpts) if err != nil { return nil, err } @@ -874,12 +913,12 @@ func _render(ctx context.Context, ms *xmain.State, plugin d2plugin.Plugin, opts bundleErr = multierr.Combine(bundleErr, bundleErr2) } if forceAppendix && !toPNG { - svg = appendix.Append(diagram, ruler, svg) + svg = appendix.Append(diagram, renderOpts, ruler, svg) } out := svg if toPNG { - svg := appendix.Append(diagram, ruler, svg) + svg := appendix.Append(diagram, renderOpts, ruler, svg) if !bundle { var bundleErr2 error @@ -937,7 +976,7 @@ func renderPDF(ctx context.Context, ms *xmain.State, plugin d2plugin.Plugin, opt scale = go2.Pointer(1.) } - svg, err = d2svg.Render(diagram, &d2svg.RenderOpts{ + renderOpts := &d2svg.RenderOpts{ Pad: opts.Pad, Sketch: opts.Sketch, Center: opts.Center, @@ -946,7 +985,9 @@ func renderPDF(ctx context.Context, ms *xmain.State, plugin d2plugin.Plugin, opt DarkThemeID: opts.DarkThemeID, ThemeOverrides: opts.ThemeOverrides, DarkThemeOverrides: opts.DarkThemeOverrides, - }) + OmitVersion: opts.OmitVersion, + } + svg, err = d2svg.Render(diagram, renderOpts) if err != nil { return nil, err } @@ -964,7 +1005,7 @@ func renderPDF(ctx context.Context, ms *xmain.State, plugin d2plugin.Plugin, opt if bundleErr != nil { return svg, bundleErr } - svg = appendix.Append(diagram, ruler, svg) + svg = appendix.Append(diagram, renderOpts, ruler, svg) pngImg, err := ConvertSVG(ms, page, svg) if err != nil { @@ -1043,7 +1084,7 @@ func renderPPTX(ctx context.Context, ms *xmain.State, presentation *pptx.Present var err error - svg, err = d2svg.Render(diagram, &d2svg.RenderOpts{ + renderOpts := &d2svg.RenderOpts{ Pad: opts.Pad, Sketch: opts.Sketch, Center: opts.Center, @@ -1052,7 +1093,9 @@ func renderPPTX(ctx context.Context, ms *xmain.State, presentation *pptx.Present DarkThemeID: opts.DarkThemeID, ThemeOverrides: opts.ThemeOverrides, DarkThemeOverrides: opts.DarkThemeOverrides, - }) + OmitVersion: opts.OmitVersion, + } + svg, err = d2svg.Render(diagram, renderOpts) if err != nil { return nil, err } @@ -1071,7 +1114,7 @@ func renderPPTX(ctx context.Context, ms *xmain.State, presentation *pptx.Present return nil, bundleErr } - svg = appendix.Append(diagram, ruler, svg) + svg = appendix.Append(diagram, renderOpts, ruler, svg) pngImg, err := ConvertSVG(ms, page, svg) if err != nil { @@ -1289,7 +1332,7 @@ func renderPNGsForGIF(ctx context.Context, ms *xmain.State, plugin d2plugin.Plug } else { scale = go2.Pointer(1.) } - svg, err = d2svg.Render(diagram, &d2svg.RenderOpts{ + renderOpts := &d2svg.RenderOpts{ Pad: opts.Pad, Sketch: opts.Sketch, Center: opts.Center, @@ -1298,7 +1341,9 @@ func renderPNGsForGIF(ctx context.Context, ms *xmain.State, plugin d2plugin.Plug DarkThemeID: opts.DarkThemeID, ThemeOverrides: opts.ThemeOverrides, DarkThemeOverrides: opts.DarkThemeOverrides, - }) + OmitVersion: opts.OmitVersion, + } + svg, err = d2svg.Render(diagram, renderOpts) if err != nil { return nil, nil, err } @@ -1317,7 +1362,7 @@ func renderPNGsForGIF(ctx context.Context, ms *xmain.State, plugin d2plugin.Plug return nil, nil, bundleErr } - svg = appendix.Append(diagram, ruler, svg) + svg = appendix.Append(diagram, renderOpts, ruler, svg) pngImg, err := ConvertSVG(ms, page, svg) if err != nil { diff --git a/d2cli/play.go b/d2cli/play.go new file mode 100644 index 000000000..f32590576 --- /dev/null +++ b/d2cli/play.go @@ -0,0 +1,75 @@ +package d2cli + +import ( + "context" + "fmt" + "io" + "os" + + "oss.terrastruct.com/d2/lib/urlenc" + "oss.terrastruct.com/util-go/xbrowser" + "oss.terrastruct.com/util-go/xmain" +) + +func playCmd(ctx context.Context, ms *xmain.State) error { + if len(ms.Opts.Flags.Args()) != 2 { + return xmain.UsageErrorf("play must be passed one argument: either a filepath or '-' for stdin") + } + filepath := ms.Opts.Flags.Args()[1] + + theme, err := ms.Opts.Flags.GetInt64("theme") + if err != nil { + return err + } + + sketch, err := ms.Opts.Flags.GetBool("sketch") + if err != nil { + return err + } + + var sketchNumber int + if sketch { + sketchNumber = 1 + } else { + sketchNumber = 0 + } + + fileRaw, err := readInput(filepath) + if err != nil { + return err + } + + encoded, err := urlenc.Encode(fileRaw) + if err != nil { + return err + } + + url := fmt.Sprintf("https://play.d2lang.com/?script=%s&sketch=%d&theme=%d&", encoded, sketchNumber, theme) + openBrowser(ctx, ms, url) + return nil +} + +func readInput(filepath string) (string, error) { + if filepath == "-" { + data, err := io.ReadAll(os.Stdin) + if err != nil { + return "", fmt.Errorf("error reading from stdin: %w", err) + } + return string(data), nil + } + + data, err := os.ReadFile(filepath) + if err != nil { + return "", xmain.UsageErrorf(err.Error()) + } + return string(data), nil +} + +func openBrowser(ctx context.Context, ms *xmain.State, url string) { + ms.Log.Info.Printf("opening playground: %s", url) + + err := xbrowser.Open(ctx, ms.Env, url) + if err != nil { + ms.Log.Warn.Printf("failed to open browser to %v: %v", url, err) + } +} diff --git a/d2cli/static/watch.js b/d2cli/static/watch.js index 4d91259eb..b3596eff2 100644 --- a/d2cli/static/watch.js +++ b/d2cli/static/watch.js @@ -27,7 +27,7 @@ function init(reconnectDelay) { const parsedXML = new DOMParser().parseFromString(msg.svg, "text/xml"); d2SVG.replaceChildren(parsedXML.documentElement); changeFavicon("/static/favicon.ico"); - const svgEl = d2SVG.querySelector("#d2-svg"); + const svgEl = d2SVG.querySelector(".d2-svg"); // just use inner SVG in watch mode svgEl.parentElement.replaceWith(svgEl); let width = parseInt(svgEl.getAttribute("width"), 10); diff --git a/d2cli/validate.go b/d2cli/validate.go new file mode 100644 index 000000000..69bd6028e --- /dev/null +++ b/d2cli/validate.go @@ -0,0 +1,41 @@ +package d2cli + +import ( + "context" + "fmt" + + "oss.terrastruct.com/d2/d2lib" + "oss.terrastruct.com/util-go/xdefer" + "oss.terrastruct.com/util-go/xmain" +) + +func validateCmd(ctx context.Context, ms *xmain.State) (err error) { + defer xdefer.Errorf(&err, "") + + ms.Opts = xmain.NewOpts(ms.Env, ms.Opts.Flags.Args()[1:]) + if len(ms.Opts.Args) == 0 { + return xmain.UsageErrorf("input argument required") + } + + inputPath := ms.Opts.Args[0] + if inputPath != "-" { + inputPath = ms.AbsPath(inputPath) + } + + input, err := ms.ReadPath(inputPath) + if err != nil { + return err + } + + _, err = d2lib.Parse(ctx, string(input), nil) + if err != nil { + return err + } + + if inputPath == "-" { + inputPath = "Input" + } + + fmt.Printf("Success! [%s] is valid D2.\n", inputPath) + return nil +} diff --git a/d2cli/watch.go b/d2cli/watch.go index 61b236348..f34dd0a1a 100644 --- a/d2cli/watch.go +++ b/d2cli/watch.go @@ -17,9 +17,9 @@ import ( "sync" "time" + "github.com/coder/websocket" + "github.com/coder/websocket/wsjson" "github.com/fsnotify/fsnotify" - "nhooyr.io/websocket" - "nhooyr.io/websocket/wsjson" "oss.terrastruct.com/util-go/xbrowser" @@ -57,6 +57,7 @@ type watcherOpts struct { forceAppendix bool pw png.Playwright fontFamily *d2fonts.FontFamily + outputFormat exportExtension } type watcher struct { @@ -263,6 +264,12 @@ func (w *watcher) watchLoop(ctx context.Context) error { return errors.New("fsnotify watcher closed") } w.ms.Log.Debug.Printf("received file system event %v", ev) + + if isTemp, reason := isBackupFile(ev.Name); isTemp { + w.ms.Log.Debug.Printf("skipping event for %q: detected as %s", w.ms.HumanPath(ev.Name), reason) + continue + } + mt, err := w.ensureAddWatch(ctx, ev.Name) if err != nil { return err @@ -348,6 +355,11 @@ func (w *watcher) ensureAddWatch(ctx context.Context, path string) (time.Time, e } func (w *watcher) addWatch(ctx context.Context, path string) (time.Time, error) { + if isTemp, reason := isBackupFile(path); isTemp { + w.ms.Log.Debug.Printf("skipping watch for %q: detected as %s", w.ms.HumanPath(path), reason) + return time.Time{}, nil + } + err := w.fw.Add(path) if err != nil { return time.Time{}, err @@ -430,7 +442,7 @@ func (w *watcher) compileLoop(ctx context.Context) error { if w.boardPath != "" { boardPath = strings.Split(w.boardPath, string(os.PathSeparator)) } - svg, _, err := compile(ctx, w.ms, w.plugins, &fs, w.layout, w.renderOpts, w.fontFamily, w.animateInterval, w.inputPath, w.outputPath, boardPath, false, w.bundle, w.forceAppendix, w.pw.Page) + svg, _, err := compile(ctx, w.ms, w.plugins, &fs, w.layout, w.renderOpts, w.fontFamily, w.animateInterval, w.inputPath, w.outputPath, boardPath, false, w.bundle, w.forceAppendix, w.pw.Page, w.outputFormat) w.boardpathMu.Unlock() errs := "" if err != nil { @@ -670,3 +682,41 @@ func (tfs *trackedFS) Open(name string) (fs.File, error) { } return f, err } + +func isBackupFile(path string) (bool, string) { + ext := filepath.Ext(path) + baseName := filepath.Base(path) + + // This list is based off of https://github.com/gohugoio/hugo/blob/master/commands/hugobuilder.go#L795 + switch { + case strings.HasSuffix(ext, "~"): + return true, "generic backup file (~)" + case ext == ".swp": + return true, "vim swap file" + case ext == ".swx": + return true, "vim swap file" + case ext == ".tmp": + return true, "generic temp file" + case ext == ".DS_Store": + return true, "OSX thumbnail" + case ext == ".bck": + return true, "Helix backup" + case baseName == "4913": + return true, "vim temp file" + case strings.HasPrefix(ext, ".goutputstream"): + return true, "GNOME temp file" + case strings.HasSuffix(ext, "jb_old___"): + return true, "IntelliJ old backup" + case strings.HasSuffix(ext, "jb_tmp___"): + return true, "IntelliJ temp file" + case strings.HasSuffix(ext, "jb_bak___"): + return true, "IntelliJ backup" + case strings.HasPrefix(ext, ".sb-"): + return true, "Byword temp file" + case strings.HasPrefix(baseName, ".#"): + return true, "Emacs lock file" + case strings.HasPrefix(baseName, "#"): + return true, "Emacs temp file" + } + return false, "" +} diff --git a/d2compiler/compile.go b/d2compiler/compile.go index 426427833..c7030146b 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -7,6 +7,7 @@ import ( "io" "io/fs" "net/url" + "slices" "strconv" "strings" @@ -19,6 +20,7 @@ import ( "oss.terrastruct.com/d2/d2parser" "oss.terrastruct.com/d2/d2target" "oss.terrastruct.com/d2/lib/color" + "oss.terrastruct.com/d2/lib/geo" "oss.terrastruct.com/d2/lib/textmeasure" ) @@ -86,6 +88,7 @@ func (c *compiler) compileBoard(g *d2graph.Graph, ir *d2ir.Map) *d2graph.Graph { ir = ir.Copy(nil).(*d2ir.Map) // c.preprocessSeqDiagrams(ir) c.compileMap(g.Root, ir) + c.setDefaultShapes(g) if len(c.err.Errors) == 0 { c.validateKeys(g.Root, ir) } @@ -94,6 +97,8 @@ func (c *compiler) compileBoard(g *d2graph.Graph, ir *d2ir.Map) *d2graph.Graph { c.validateEdges(g) c.validatePositionsCompatibility(g) + c.compileLegend(g, ir) + c.compileBoardsField(g, ir, "layers") c.compileBoardsField(g, ir, "scenarios") c.compileBoardsField(g, ir, "steps") @@ -108,8 +113,55 @@ func (c *compiler) compileBoard(g *d2graph.Graph, ir *d2ir.Map) *d2graph.Graph { return g } +func (c *compiler) compileLegend(g *d2graph.Graph, m *d2ir.Map) { + varsField := m.GetField(d2ast.FlatUnquotedString("vars")) + if varsField == nil || varsField.Map() == nil { + return + } + + legendField := varsField.Map().GetField(d2ast.FlatUnquotedString("d2-legend")) + if legendField == nil || legendField.Map() == nil { + return + } + + legendGraph := d2graph.NewGraph() + + c.compileMap(legendGraph.Root, legendField.Map()) + c.setDefaultShapes(legendGraph) + + objects := make([]*d2graph.Object, 0) + for _, obj := range legendGraph.Objects { + if obj.Style.Opacity != nil { + if opacity, err := strconv.ParseFloat(obj.Style.Opacity.Value, 64); err == nil && opacity == 0 { + continue + } + } + obj.Box = &geo.Box{} + obj.TopLeft = geo.NewPoint(10, 10) + obj.Width = 100 + obj.Height = 100 + objects = append(objects, obj) + } + + for _, edge := range legendGraph.Edges { + edge.Route = []*geo.Point{ + {X: 10, Y: 10}, + {X: 110, Y: 10}, + } + } + + legend := &d2graph.Legend{ + Objects: objects, + Edges: legendGraph.Edges, + } + + if len(legend.Objects) > 0 || len(legend.Edges) > 0 { + g.Legend = legend + } +} + func (c *compiler) compileBoardsField(g *d2graph.Graph, ir *d2ir.Map, fieldName string) { - boards := ir.GetField(fieldName) + boards := ir.GetField(d2ast.FlatUnquotedString(fieldName)) if boards.Map() == nil { return } @@ -118,8 +170,8 @@ func (c *compiler) compileBoardsField(g *d2graph.Graph, ir *d2ir.Map, fieldName if f.Map() == nil { m = &d2ir.Map{} } - if g.GetBoard(f.Name) != nil { - c.errorf(f.References[0].AST(), "board name %v already used by another board", f.Name) + if g.GetBoard(f.Name.ScalarString()) != nil { + c.errorf(f.References[0].AST(), "board name %v already used by another board", f.Name.ScalarString()) continue } g2 := d2graph.NewGraph() @@ -129,7 +181,10 @@ func (c *compiler) compileBoardsField(g *d2graph.Graph, ir *d2ir.Map, fieldName g2.BaseAST = findFieldAST(g.BaseAST, f) } c.compileBoard(g2, m) - g2.Name = f.Name + if f.Primary() != nil { + c.compileLabel(&g2.Root.Attributes, f) + } + g2.Name = f.Name.ScalarString() switch fieldName { case "layers": g.Layers = append(g.Layers, g2) @@ -145,7 +200,7 @@ func findFieldAST(ast *d2ast.Map, f *d2ir.Field) *d2ast.Map { path := []string{} curr := f for { - path = append([]string{curr.Name}, path...) + path = append([]string{curr.Name.ScalarString()}, path...) boardKind := d2ir.NodeBoardKind(curr) if boardKind == "" { break @@ -153,55 +208,48 @@ func findFieldAST(ast *d2ast.Map, f *d2ir.Field) *d2ast.Map { curr = d2ir.ParentField(curr) } - currAST := ast - for len(path) > 0 { - head := path[0] - found := false - for _, n := range currAST.Nodes { - if n.MapKey == nil { - continue - } - if n.MapKey.Key == nil { - continue - } - if len(n.MapKey.Key.Path) != 1 { - continue - } - head2 := n.MapKey.Key.Path[0].Unbox().ScalarString() - if head == head2 { - currAST = n.MapKey.Value.Map - // The BaseAST is only used for making edits to the AST (through d2oracle) - // If there's no Map for a given board, either it's an empty layer or set to an import - // Either way, in order to make edits, it needs to be expanded into a Map to add lines to - if currAST == nil { - n.MapKey.Value.Map = &d2ast.Map{ - Range: d2ast.MakeRange(",1:0:0-1:0:0"), - } - if n.MapKey.Value.Import != nil { - imp := &d2ast.Import{ - Range: d2ast.MakeRange(",1:0:0-1:0:0"), - Spread: true, - Pre: n.MapKey.Value.Import.Pre, - Path: n.MapKey.Value.Import.Path, - } - n.MapKey.Value.Map.Nodes = append(n.MapKey.Value.Map.Nodes, d2ast.MapNodeBox{ - Import: imp, - }) + return _findFieldAST(ast, path) +} - } - currAST = n.MapKey.Value.Map - } - found = true - break - } - } - if !found { - return nil - } - path = path[1:] +func _findFieldAST(ast *d2ast.Map, path []string) *d2ast.Map { + if len(path) == 0 { + return ast } - return currAST + head := path[0] + remainingPath := path[1:] + + for i := range ast.Nodes { + if ast.Nodes[i].MapKey == nil || ast.Nodes[i].MapKey.Key == nil || len(ast.Nodes[i].MapKey.Key.Path) != 1 { + continue + } + + head2 := ast.Nodes[i].MapKey.Key.Path[0].Unbox().ScalarString() + if head == head2 { + if ast.Nodes[i].MapKey.Value.Map == nil { + ast.Nodes[i].MapKey.Value.Map = &d2ast.Map{ + Range: d2ast.MakeRange(",1:0:0-1:0:0"), + } + if ast.Nodes[i].MapKey.Value.Import != nil { + imp := &d2ast.Import{ + Range: d2ast.MakeRange(",1:0:0-1:0:0"), + Spread: true, + Pre: ast.Nodes[i].MapKey.Value.Import.Pre, + Path: ast.Nodes[i].MapKey.Value.Import.Path, + } + ast.Nodes[i].MapKey.Value.Map.Nodes = append(ast.Nodes[i].MapKey.Value.Map.Nodes, d2ast.MapNodeBox{ + Import: imp, + }) + } + } + + if result := _findFieldAST(ast.Nodes[i].MapKey.Value.Map, remainingPath); result != nil { + return result + } + } + } + + return nil } type compiler struct { @@ -220,7 +268,7 @@ func (c *compiler) errorf(n d2ast.Node, f string, v ...interface{}) { } func (c *compiler) compileMap(obj *d2graph.Object, m *d2ir.Map) { - class := m.GetField("class") + class := m.GetField(d2ast.FlatUnquotedString("class")) if class != nil { var classNames []string if class.Primary() != nil { @@ -235,8 +283,6 @@ func (c *compiler) compileMap(obj *d2graph.Object, m *d2ir.Map) { } } } - } else { - c.errorf(class.LastRef().AST(), "class missing value") } for _, className := range classNames { @@ -261,7 +307,7 @@ func (c *compiler) compileMap(obj *d2graph.Object, m *d2ir.Map) { } } } - shape := m.GetField("shape") + shape := m.GetField(d2ast.FlatUnquotedString("shape")) if shape != nil { if shape.Composite != nil { c.errorf(shape.LastPrimaryKey(), "reserved field shape does not accept composite") @@ -270,10 +316,10 @@ func (c *compiler) compileMap(obj *d2graph.Object, m *d2ir.Map) { } } for _, f := range m.Fields { - if f.Name == "shape" { + if f.Name.ScalarString() == "shape" && f.Name.IsUnquoted() { continue } - if _, ok := d2ast.BoardKeywords[f.Name]; ok { + if _, ok := d2ast.BoardKeywords[f.Name.ScalarString()]; ok && f.Name.IsUnquoted() { continue } c.compileField(obj, f) @@ -294,14 +340,15 @@ func (c *compiler) compileMap(obj *d2graph.Object, m *d2ir.Map) { } func (c *compiler) compileField(obj *d2graph.Object, f *d2ir.Field) { - keyword := strings.ToLower(f.Name) + keyword := strings.ToLower(f.Name.ScalarString()) _, isStyleReserved := d2ast.StyleKeywords[keyword] - if isStyleReserved { - c.errorf(f.LastRef().AST(), "%v must be style.%v", f.Name, f.Name) + if isStyleReserved && f.Name.IsUnquoted() { + c.errorf(f.LastRef().AST(), "%v must be style.%v", f.Name.ScalarString(), f.Name.ScalarString()) return } _, isReserved := d2ast.SimpleReservedKeywords[keyword] - if f.Name == "classes" { + isReserved = isReserved && f.Name.IsUnquoted() + if f.Name.ScalarString() == "classes" && f.Name.IsUnquoted() { if f.Map() != nil { if len(f.Map().Edges) > 0 { c.errorf(f.Map().Edges[0].LastRef().AST(), "classes cannot contain an edge") @@ -311,34 +358,31 @@ func (c *compiler) compileField(obj *d2graph.Object, f *d2ir.Field) { continue } for _, cf := range classesField.Map().Fields { - if _, ok := d2ast.ReservedKeywords[cf.Name]; !ok { - c.errorf(cf.LastRef().AST(), "%s is an invalid class field, must be reserved keyword", cf.Name) + if _, ok := d2ast.ReservedKeywords[cf.Name.ScalarString()]; !(ok && f.Name.IsUnquoted()) { + c.errorf(cf.LastRef().AST(), "%s is an invalid class field, must be reserved keyword", cf.Name.ScalarString()) } - if cf.Name == "class" { + if cf.Name.ScalarString() == "class" && cf.Name.IsUnquoted() { c.errorf(cf.LastRef().AST(), `"class" cannot appear within "classes"`) } } } } return - } else if f.Name == "vars" { + } else if f.Name.ScalarString() == "vars" && f.Name.IsUnquoted() { return - } else if f.Name == "source-arrowhead" || f.Name == "target-arrowhead" { - c.errorf(f.LastRef().AST(), `%#v can only be used on connections`, f.Name) + } else if (f.Name.ScalarString() == "source-arrowhead" || f.Name.ScalarString() == "target-arrowhead") && f.Name.IsUnquoted() { + c.errorf(f.LastRef().AST(), `%#v can only be used on connections`, f.Name.ScalarString()) return } else if isReserved { c.compileReserved(&obj.Attributes, f) return - } else if f.Name == "style" { + } else if f.Name.ScalarString() == "style" && f.Name.IsUnquoted() { if f.Map() == nil || len(f.Map().Fields) == 0 { c.errorf(f.LastRef().AST(), `"style" expected to be set to a map of key-values, or contain an additional keyword like "style.opacity: 0.4"`) return } - c.compileStyle(&obj.Attributes, f.Map()) - if obj.Style.Animated != nil { - c.errorf(obj.Style.Animated.MapKey, `key "animated" can only be applied to edges`) - } + c.compileStyle(&obj.Attributes.Style, f.Map()) return } @@ -354,7 +398,7 @@ func (c *compiler) compileField(obj *d2graph.Object, f *d2ir.Field) { } parent := obj - obj = obj.EnsureChild(d2graphIDA([]string{f.Name})) + obj = obj.EnsureChild(([]d2ast.String{f.Name})) if f.Primary() != nil { c.compileLabel(&obj.Attributes, f) } @@ -383,7 +427,7 @@ func (c *compiler) compileField(obj *d2graph.Object, f *d2ir.Field) { IsVar: d2ir.IsVar(fr.Context_.ScopeMap), } if fr.Context_.ScopeMap != nil && !d2ir.IsVar(fr.Context_.ScopeMap) { - scopeObjIDA := d2graphIDA(d2ir.BoardIDA(fr.Context_.ScopeMap)) + scopeObjIDA := d2ir.BoardIDA(fr.Context_.ScopeMap) r.ScopeObj = obj.Graph.Root.EnsureChild(scopeObjIDA) } obj.References = append(obj.References, r) @@ -403,8 +447,6 @@ func (c *compiler) compileLabel(attrs *d2graph.Attributes, f d2ir.Node) { attrs.Language = fullTag } switch attrs.Language { - case "latex": - attrs.Shape.Value = d2target.ShapeText case "markdown": rendered, err := textmeasure.RenderMarkdown(scalar.ScalarString()) if err != nil { @@ -421,9 +463,6 @@ func (c *compiler) compileLabel(attrs *d2graph.Attributes, f d2ir.Node) { c.errorf(f.LastPrimaryKey(), "malformed Markdown: %s", err.Error()) } } - attrs.Shape.Value = d2target.ShapeText - default: - attrs.Shape.Value = d2target.ShapeCode } attrs.Label.Value = scalar.ScalarString() default: @@ -436,7 +475,7 @@ func (c *compiler) compilePosition(attrs *d2graph.Attributes, f *d2ir.Field) { name := f.Name if f.Map() != nil { for _, f := range f.Map().Fields { - if f.Name == "near" { + if f.Name.ScalarString() == "near" && f.Name.IsUnquoted() { if f.Primary() == nil { c.errorf(f.LastPrimaryKey(), `invalid "near" field`) } else { @@ -448,7 +487,7 @@ func (c *compiler) compilePosition(attrs *d2graph.Attributes, f *d2ir.Field) { if _, ok := d2ast.LabelPositions[scalar.ScalarString()]; !ok { c.errorf(f.LastPrimaryKey(), `invalid "near" field`) } else { - switch name { + switch name.ScalarString() { case "label": attrs.LabelPosition = &d2graph.Scalar{} attrs.LabelPosition.Value = scalar.ScalarString() @@ -463,7 +502,7 @@ func (c *compiler) compilePosition(attrs *d2graph.Attributes, f *d2ir.Field) { } } else { if f.LastPrimaryKey() != nil { - c.errorf(f.LastPrimaryKey(), `unexpected field %s`, f.Name) + c.errorf(f.LastPrimaryKey(), `unexpected field %s`, f.Name.ScalarString()) } } } @@ -476,7 +515,7 @@ func (c *compiler) compilePosition(attrs *d2graph.Attributes, f *d2ir.Field) { func (c *compiler) compileReserved(attrs *d2graph.Attributes, f *d2ir.Field) { if f.Primary() == nil { if f.Composite != nil { - switch f.Name { + switch f.Name.ScalarString() { case "class": if arr, ok := f.Composite.(*d2ir.Array); ok { for _, class := range arr.Values { @@ -501,24 +540,27 @@ func (c *compiler) compileReserved(attrs *d2graph.Attributes, f *d2ir.Field) { case "label", "icon": c.compilePosition(attrs, f) default: - c.errorf(f.LastPrimaryKey(), "reserved field %v does not accept composite", f.Name) + c.errorf(f.LastPrimaryKey(), "reserved field %v does not accept composite", f.Name.ScalarString()) } + } else { + c.errorf(f.LastRef().AST(), `reserved field "%v" must have a value`, f.Name.ScalarString()) } return } scalar := f.Primary().Value - switch f.Name { + switch f.Name.ScalarString() { case "label": c.compileLabel(attrs, f) c.compilePosition(attrs, f) case "shape": - in := d2target.IsShape(scalar.ScalarString()) - _, isArrowhead := d2target.Arrowheads[scalar.ScalarString()] + shapeVal := strings.ToLower(scalar.ScalarString()) + in := d2target.IsShape(shapeVal) + _, isArrowhead := d2target.Arrowheads[shapeVal] if !in && !isArrowhead { c.errorf(scalar, "unknown shape %q", scalar.ScalarString()) return } - attrs.Shape.Value = scalar.ScalarString() + attrs.Shape.Value = shapeVal if strings.EqualFold(attrs.Shape.Value, d2target.ShapeCode) { // Explicit code shape is plaintext. attrs.Language = d2target.ShapeText @@ -532,6 +574,17 @@ func (c *compiler) compileReserved(attrs *d2graph.Attributes, f *d2ir.Field) { } attrs.Icon = iconURL c.compilePosition(attrs, f) + if f.Map() != nil { + for _, ff := range f.Map().Fields { + if ff.Name.ScalarString() == "style" && ff.Name.IsUnquoted() { + if ff.Map() == nil || len(ff.Map().Fields) == 0 { + c.errorf(f.LastRef().AST(), `"style" expected to be set to a map of key-values, or contain an additional keyword like "style.opacity: 0.4"`) + return + } + c.compileStyle(&attrs.IconStyle, ff.Map()) + } + } + } case "near": nearKey, err := d2parser.ParseKey(scalar.ScalarString()) if err != nil { @@ -594,11 +647,12 @@ func (c *compiler) compileReserved(attrs *d2graph.Attributes, f *d2ir.Field) { attrs.Link.MapKey = f.LastPrimaryKey() case "direction": dirs := []string{"up", "down", "right", "left"} - if !go2.Contains(dirs, scalar.ScalarString()) { + val := strings.ToLower(scalar.ScalarString()) + if !go2.Contains(dirs, val) { c.errorf(scalar, `direction must be one of %v, got %q`, strings.Join(dirs, ", "), scalar.ScalarString()) return } - attrs.Direction.Value = scalar.ScalarString() + attrs.Direction.Value = val attrs.Direction.MapKey = f.LastPrimaryKey() case "constraint": if _, ok := scalar.(d2ast.String); !ok { @@ -676,6 +730,13 @@ func (c *compiler) compileReserved(attrs *d2graph.Attributes, f *d2ir.Field) { case "classes": } + if attrs.Link != nil && attrs.Label.Value != "" { + u, err := url.ParseRequestURI(attrs.Label.Value) + if err == nil && u.Host != "" { + c.errorf(scalar, "Label cannot be set to URL when link is also set (for security)") + } + } + if attrs.Link != nil && attrs.Tooltip != nil { u, err := url.ParseRequestURI(attrs.Tooltip.Value) if err == nil && u.Host != "" { @@ -684,84 +745,76 @@ func (c *compiler) compileReserved(attrs *d2graph.Attributes, f *d2ir.Field) { } } -func (c *compiler) compileStyle(attrs *d2graph.Attributes, m *d2ir.Map) { +func (c *compiler) compileStyle(styles *d2graph.Style, m *d2ir.Map) { for _, f := range m.Fields { - c.compileStyleField(attrs, f) + c.compileStyleField(styles, f) } } -func (c *compiler) compileStyleField(attrs *d2graph.Attributes, f *d2ir.Field) { - if _, ok := d2ast.StyleKeywords[strings.ToLower(f.Name)]; !ok { - c.errorf(f.LastRef().AST(), `invalid style keyword: "%s"`, f.Name) +func (c *compiler) compileStyleField(styles *d2graph.Style, f *d2ir.Field) { + if _, ok := d2ast.StyleKeywords[strings.ToLower(f.Name.ScalarString())]; !(ok && f.Name.IsUnquoted()) { + c.errorf(f.LastRef().AST(), `invalid style keyword: "%s"`, f.Name.ScalarString()) return } if f.Primary() == nil { return } - compileStyleFieldInit(attrs, f) + compileStyleFieldInit(styles, f) scalar := f.Primary().Value - err := attrs.Style.Apply(f.Name, scalar.ScalarString()) + err := styles.Apply(f.Name.ScalarString(), scalar.ScalarString()) if err != nil { c.errorf(scalar, err.Error()) return } } -func compileStyleFieldInit(attrs *d2graph.Attributes, f *d2ir.Field) { - switch f.Name { +func compileStyleFieldInit(styles *d2graph.Style, f *d2ir.Field) { + switch f.Name.ScalarString() { case "opacity": - attrs.Style.Opacity = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} + styles.Opacity = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} case "stroke": - attrs.Style.Stroke = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} + styles.Stroke = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} case "fill": - attrs.Style.Fill = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} + styles.Fill = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} case "fill-pattern": - attrs.Style.FillPattern = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} + styles.FillPattern = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} case "stroke-width": - attrs.Style.StrokeWidth = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} + styles.StrokeWidth = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} case "stroke-dash": - attrs.Style.StrokeDash = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} + styles.StrokeDash = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} case "border-radius": - attrs.Style.BorderRadius = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} + styles.BorderRadius = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} case "shadow": - attrs.Style.Shadow = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} + styles.Shadow = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} case "3d": - attrs.Style.ThreeDee = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} + styles.ThreeDee = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} case "multiple": - attrs.Style.Multiple = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} + styles.Multiple = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} case "font": - attrs.Style.Font = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} + styles.Font = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} case "font-size": - attrs.Style.FontSize = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} + styles.FontSize = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} case "font-color": - attrs.Style.FontColor = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} + styles.FontColor = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} case "animated": - attrs.Style.Animated = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} + styles.Animated = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} case "bold": - attrs.Style.Bold = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} + styles.Bold = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} case "italic": - attrs.Style.Italic = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} + styles.Italic = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} case "underline": - attrs.Style.Underline = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} + styles.Underline = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} case "filled": - attrs.Style.Filled = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} - case "width": - attrs.WidthAttr = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} - case "height": - attrs.HeightAttr = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} - case "top": - attrs.Top = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} - case "left": - attrs.Left = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} + styles.Filled = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} case "double-border": - attrs.Style.DoubleBorder = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} + styles.DoubleBorder = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} case "text-transform": - attrs.Style.TextTransform = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} + styles.TextTransform = &d2graph.Scalar{MapKey: f.LastPrimaryKey()} } } func (c *compiler) compileEdge(obj *d2graph.Object, e *d2ir.Edge) { - edge, err := obj.Connect(d2graphIDA(e.ID.SrcPath), d2graphIDA(e.ID.DstPath), e.ID.SrcArrow, e.ID.DstArrow, "") + edge, err := obj.Connect(e.ID.SrcPath, e.ID.DstPath, e.ID.SrcArrow, e.ID.DstArrow, "") if err != nil { c.errorf(e.References[0].AST(), err.Error()) return @@ -785,7 +838,7 @@ func (c *compiler) compileEdge(obj *d2graph.Object, e *d2ir.Edge) { ScopeObj: obj, } if er.Context_.ScopeMap != nil && !d2ir.IsVar(er.Context_.ScopeMap) { - scopeObjIDA := d2graphIDA(d2ir.BoardIDA(er.Context_.ScopeMap)) + scopeObjIDA := d2ir.BoardIDA(er.Context_.ScopeMap) r.ScopeObj = edge.Src.Graph.Root.EnsureChild(scopeObjIDA) } edge.References = append(edge.References, r) @@ -793,7 +846,7 @@ func (c *compiler) compileEdge(obj *d2graph.Object, e *d2ir.Edge) { } func (c *compiler) compileEdgeMap(edge *d2graph.Edge, m *d2ir.Map) { - class := m.GetField("class") + class := m.GetField(d2ast.FlatUnquotedString("class")) if class != nil { var classNames []string if class.Primary() != nil { @@ -808,8 +861,6 @@ func (c *compiler) compileEdgeMap(edge *d2graph.Edge, m *d2ir.Map) { } } } - } else { - c.errorf(class.LastRef().AST(), "class missing value") } for _, className := range classNames { @@ -820,8 +871,8 @@ func (c *compiler) compileEdgeMap(edge *d2graph.Edge, m *d2ir.Map) { } } for _, f := range m.Fields { - _, ok := d2ast.ReservedKeywords[f.Name] - if !ok { + _, ok := d2ast.ReservedKeywords[f.Name.ScalarString()] + if !(ok && f.Name.IsUnquoted()) { c.errorf(f.References[0].AST(), `edge map keys must be reserved keywords`) continue } @@ -830,32 +881,33 @@ func (c *compiler) compileEdgeMap(edge *d2graph.Edge, m *d2ir.Map) { } func (c *compiler) compileEdgeField(edge *d2graph.Edge, f *d2ir.Field) { - keyword := strings.ToLower(f.Name) + keyword := strings.ToLower(f.Name.ScalarString()) _, isStyleReserved := d2ast.StyleKeywords[keyword] + isStyleReserved = isStyleReserved && f.Name.IsUnquoted() if isStyleReserved { - c.errorf(f.LastRef().AST(), "%v must be style.%v", f.Name, f.Name) + c.errorf(f.LastRef().AST(), "%v must be style.%v", f.Name.ScalarString(), f.Name.ScalarString()) return } _, isReserved := d2ast.SimpleReservedKeywords[keyword] if isReserved { c.compileReserved(&edge.Attributes, f) return - } else if f.Name == "style" { + } else if f.Name.ScalarString() == "style" { if f.Map() == nil { return } - c.compileStyle(&edge.Attributes, f.Map()) + c.compileStyle(&edge.Attributes.Style, f.Map()) return } - if f.Name == "source-arrowhead" || f.Name == "target-arrowhead" { + if (f.Name.ScalarString() == "source-arrowhead" || f.Name.ScalarString() == "target-arrowhead") && f.Name.IsUnquoted() { c.compileArrowheads(edge, f) } } func (c *compiler) compileArrowheads(edge *d2graph.Edge, f *d2ir.Field) { var attrs *d2graph.Attributes - if f.Name == "source-arrowhead" { + if f.Name.ScalarString() == "source-arrowhead" { if edge.SrcArrowhead == nil { edge.SrcArrowhead = &d2graph.Attributes{} } @@ -873,16 +925,17 @@ func (c *compiler) compileArrowheads(edge *d2graph.Edge, f *d2ir.Field) { if f.Map() != nil { for _, f2 := range f.Map().Fields { - keyword := strings.ToLower(f2.Name) + keyword := strings.ToLower(f2.Name.ScalarString()) _, isReserved := d2ast.SimpleReservedKeywords[keyword] + isReserved = isReserved && f2.Name.IsUnquoted() if isReserved { c.compileReserved(attrs, f2) continue - } else if f2.Name == "style" { + } else if f2.Name.ScalarString() == "style" && f2.Name.IsUnquoted() { if f2.Map() == nil { continue } - c.compileStyle(attrs, f2.Map()) + c.compileStyle(&attrs.Style, f2.Map()) continue } else { c.errorf(f2.LastRef().AST(), `source-arrowhead/target-arrowhead map keys must be reserved keywords`) @@ -991,7 +1044,7 @@ func (c *compiler) compileSQLTable(obj *d2graph.Object) { func (c *compiler) validateKeys(obj *d2graph.Object, m *d2ir.Map) { for _, f := range m.Fields { - if _, ok := d2ast.BoardKeywords[f.Name]; ok { + if _, ok := d2ast.BoardKeywords[f.Name.ScalarString()]; ok && f.Name.IsUnquoted() { continue } c.validateKey(obj, f) @@ -999,8 +1052,9 @@ func (c *compiler) validateKeys(obj *d2graph.Object, m *d2ir.Map) { } func (c *compiler) validateKey(obj *d2graph.Object, f *d2ir.Field) { - keyword := strings.ToLower(f.Name) + keyword := strings.ToLower(f.Name.ScalarString()) _, isReserved := d2ast.ReservedKeywords[keyword] + isReserved = isReserved && f.Name.IsUnquoted() if isReserved { switch obj.Shape.Value { case d2target.ShapeCircle, d2target.ShapeSquare: @@ -1010,7 +1064,7 @@ func (c *compiler) validateKey(obj *d2graph.Object, f *d2ir.Field) { } } - switch f.Name { + switch f.Name.ScalarString() { case "style": if obj.Style.ThreeDee != nil { if !strings.EqualFold(obj.Shape.Value, d2target.ShapeSquare) && !strings.EqualFold(obj.Shape.Value, d2target.ShapeRectangle) && !strings.EqualFold(obj.Shape.Value, d2target.ShapeHexagon) { @@ -1045,7 +1099,7 @@ func (c *compiler) validateKey(obj *d2graph.Object, f *d2ir.Field) { return } - obj, ok := obj.HasChild([]string{f.Name}) + obj, ok := obj.HasChild([]string{f.Name.ScalarString()}) if ok && f.Map() != nil { c.validateKeys(obj, f.Map()) } @@ -1207,7 +1261,7 @@ func (c *compiler) validateBoardLinks(g *d2graph.Graph) { } u, err := url.Parse(html.UnescapeString(obj.Link.Value)) - isRemote := err == nil && strings.HasPrefix(u.Scheme, "http") + isRemote := err == nil && (u.Scheme != "" || strings.HasPrefix(u.Path, "/")) if isRemote { continue } @@ -1221,6 +1275,11 @@ func (c *compiler) validateBoardLinks(g *d2graph.Graph) { obj.Link = nil continue } + + if slices.Equal(linkKey.StringIDA(), obj.Graph.IDA()) { + obj.Link = nil + continue + } } for _, b := range g.Layers { c.validateBoardLinks(b) @@ -1233,34 +1292,34 @@ func (c *compiler) validateBoardLinks(g *d2graph.Graph) { } } -func hasBoard(root *d2graph.Graph, ida []string) bool { +func hasBoard(root *d2graph.Graph, ida []d2ast.String) bool { if len(ida) == 0 { return true } - if ida[0] == "root" { + if ida[0].ScalarString() == "root" && ida[0].IsUnquoted() { return hasBoard(root, ida[1:]) } id := ida[0] if len(ida) == 1 { - return root.Name == id + return root.Name == id.ScalarString() } nextID := ida[1] - switch id { + switch id.ScalarString() { case "layers": for _, b := range root.Layers { - if b.Name == nextID { + if b.Name == nextID.ScalarString() { return hasBoard(b, ida[2:]) } } case "scenarios": for _, b := range root.Scenarios { - if b.Name == nextID { + if b.Name == nextID.ScalarString() { return hasBoard(b, ida[2:]) } } case "steps": for _, b := range root.Steps { - if b.Name == nextID { + if b.Name == nextID.ScalarString() { return hasBoard(b, ida[2:]) } } @@ -1275,20 +1334,10 @@ func init() { } } -func d2graphIDA(irIDA []string) (ida []string) { - for _, el := range irIDA { - n := &d2ast.KeyPath{ - Path: []*d2ast.StringBox{d2ast.MakeValueBox(d2ast.RawString(el, true)).StringBox()}, - } - ida = append(ida, d2format.Format(n)) - } - return ida -} - // Unused for now until shape: edge_group func (c *compiler) preprocessSeqDiagrams(m *d2ir.Map) { for _, f := range m.Fields { - if f.Name == "shape" && f.Primary_.Value.ScalarString() == d2target.ShapeSequenceDiagram { + if f.Name.ScalarString() == "shape" && f.Name.IsUnquoted() && f.Primary_.Value.ScalarString() == d2target.ShapeSequenceDiagram { c.preprocessEdgeGroup(m, m) return } @@ -1340,8 +1389,8 @@ func (c *compiler) preprocessEdgeGroup(seqDiagram, m *d2ir.Map) { f := srcParent.GetField(el) if !isEdgeGroup(f) { for j := 0; j < i+1; j++ { - e.ID.SrcPath = append([]string{"_"}, e.ID.SrcPath...) - e.ID.DstPath = append([]string{"_"}, e.ID.DstPath...) + e.ID.SrcPath = append([]d2ast.String{d2ast.FlatUnquotedString("_")}, e.ID.SrcPath...) + e.ID.DstPath = append([]d2ast.String{d2ast.FlatUnquotedString("_")}, e.ID.DstPath...) } break } @@ -1356,7 +1405,7 @@ func hoistActor(seqDiagram *d2ir.Map, f *d2ir.Field) { seqDiagram.Fields = append(seqDiagram.Fields, f.Copy(seqDiagram).(*d2ir.Field)) } else { d2ir.OverlayField(f2, f) - d2ir.ParentMap(f).DeleteField(f.Name) + d2ir.ParentMap(f).DeleteField(f.Name.ScalarString()) } } @@ -1401,7 +1450,7 @@ func parentSeqDiagram(n d2ir.Node) *d2ir.Map { return nil } for _, f := range m.Fields { - if f.Name == "shape" && f.Primary_.Value.ScalarString() == d2target.ShapeSequenceDiagram { + if f.Name.ScalarString() == "shape" && f.Name.IsUnquoted() && f.Primary_.Value.ScalarString() == d2target.ShapeSequenceDiagram { return m } } @@ -1410,7 +1459,7 @@ func parentSeqDiagram(n d2ir.Node) *d2ir.Map { } func compileConfig(ir *d2ir.Map) (*d2target.Config, error) { - f := ir.GetField("vars", "d2-config") + f := ir.GetField(d2ast.FlatUnquotedString("vars"), d2ast.FlatUnquotedString("d2-config")) if f == nil || f.Map() == nil { return nil, nil } @@ -1419,36 +1468,42 @@ func compileConfig(ir *d2ir.Map) (*d2target.Config, error) { config := &d2target.Config{} - f = configMap.GetField("sketch") + f = configMap.GetField(d2ast.FlatUnquotedString("sketch")) if f != nil { val, _ := strconv.ParseBool(f.Primary().Value.ScalarString()) config.Sketch = &val } - f = configMap.GetField("theme-id") + f = configMap.GetField(d2ast.FlatUnquotedString("theme-id")) if f != nil { val, _ := strconv.Atoi(f.Primary().Value.ScalarString()) config.ThemeID = go2.Pointer(int64(val)) } - f = configMap.GetField("dark-theme-id") + f = configMap.GetField(d2ast.FlatUnquotedString("dark-theme-id")) if f != nil { val, _ := strconv.Atoi(f.Primary().Value.ScalarString()) config.DarkThemeID = go2.Pointer(int64(val)) } - f = configMap.GetField("pad") + f = configMap.GetField(d2ast.FlatUnquotedString("pad")) if f != nil { val, _ := strconv.Atoi(f.Primary().Value.ScalarString()) config.Pad = go2.Pointer(int64(val)) } - f = configMap.GetField("layout-engine") + f = configMap.GetField(d2ast.FlatUnquotedString("layout-engine")) if f != nil { config.LayoutEngine = go2.Pointer(f.Primary().Value.ScalarString()) } - f = configMap.GetField("theme-overrides") + f = configMap.GetField(d2ast.FlatUnquotedString("center")) + if f != nil { + val, _ := strconv.ParseBool(f.Primary().Value.ScalarString()) + config.Center = &val + } + + f = configMap.GetField(d2ast.FlatUnquotedString("theme-overrides")) if f != nil { overrides, err := compileThemeOverrides(f.Map()) if err != nil { @@ -1456,7 +1511,7 @@ func compileConfig(ir *d2ir.Map) (*d2target.Config, error) { } config.ThemeOverrides = overrides } - f = configMap.GetField("dark-theme-overrides") + f = configMap.GetField(d2ast.FlatUnquotedString("dark-theme-overrides")) if f != nil { overrides, err := compileThemeOverrides(f.Map()) if err != nil { @@ -1464,12 +1519,12 @@ func compileConfig(ir *d2ir.Map) (*d2target.Config, error) { } config.DarkThemeOverrides = overrides } - f = configMap.GetField("data") + f = configMap.GetField(d2ast.FlatUnquotedString("data")) if f != nil && f.Map() != nil { config.Data = make(map[string]interface{}) for _, f := range f.Map().Fields { if f.Primary() != nil { - config.Data[f.Name] = f.Primary().Value.ScalarString() + config.Data[f.Name.ScalarString()] = f.Primary().Value.ScalarString() } else if f.Composite != nil { var arr []interface{} switch c := f.Composite.(type) { @@ -1481,7 +1536,7 @@ func compileConfig(ir *d2ir.Map) (*d2target.Config, error) { } } } - config.Data[f.Name] = arr + config.Data[f.Name.ScalarString()] = arr } } } @@ -1498,7 +1553,7 @@ func compileThemeOverrides(m *d2ir.Map) (*d2target.ThemeOverrides, error) { err := &d2parser.ParseError{} FOR: for _, f := range m.Fields { - switch strings.ToUpper(f.Name) { + switch strings.ToUpper(f.Name.ScalarString()) { case "N1": themeOverrides.N1 = go2.Pointer(f.Primary().Value.ScalarString()) case "N2": @@ -1536,11 +1591,11 @@ FOR: case "AB5": themeOverrides.AB5 = go2.Pointer(f.Primary().Value.ScalarString()) default: - err.Errors = append(err.Errors, d2parser.Errorf(f.LastPrimaryKey(), fmt.Sprintf(`"%s" is not a valid theme code`, f.Name)).(d2ast.Error)) + err.Errors = append(err.Errors, d2parser.Errorf(f.LastPrimaryKey(), fmt.Sprintf(`"%s" is not a valid theme code`, f.Name.ScalarString())).(d2ast.Error)) continue FOR } if !go2.Contains(color.NamedColors, strings.ToLower(f.Primary().Value.ScalarString())) && !color.ColorHexRegex.MatchString(f.Primary().Value.ScalarString()) { - err.Errors = append(err.Errors, d2parser.Errorf(f.LastPrimaryKey(), fmt.Sprintf(`expected "%s" to be a valid named color ("orange") or a hex code ("#f0ff3a")`, f.Name)).(d2ast.Error)) + err.Errors = append(err.Errors, d2parser.Errorf(f.LastPrimaryKey(), fmt.Sprintf(`expected "%s" to be a valid named color ("orange") or a hex code ("#f0ff3a")`, f.Name.ScalarString())).(d2ast.Error)) } } @@ -1553,3 +1608,21 @@ FOR: } return nil, nil } + +func (c *compiler) setDefaultShapes(g *d2graph.Graph) { + for _, obj := range g.Objects { + if obj.Shape.Value == "" { + if obj.OuterSequenceDiagram() != nil { + obj.Shape.Value = d2target.ShapeRectangle + } else if obj.Language == "latex" { + obj.Shape.Value = d2target.ShapeText + } else if obj.Language == "markdown" { + obj.Shape.Value = d2target.ShapeText + } else if obj.Language != "" { + obj.Shape.Value = d2target.ShapeCode + } else { + obj.Shape.Value = d2target.ShapeRectangle + } + } + } +} diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index adf16c22c..8a3224aab 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -127,6 +127,18 @@ x: { tassert.Equal(t, "200", g.Objects[0].Top.Value) }, }, + { + name: "reserved_missing_values", + text: `foobar: { + width + bottom + left + right +} +`, + expErr: `d2/testdata/d2compiler/TestCompile/reserved_missing_values.d2:2:3: reserved field "width" must have a value +d2/testdata/d2compiler/TestCompile/reserved_missing_values.d2:4:3: reserved field "left" must have a value`, + }, { name: "positions_negative", text: `hey: { @@ -316,7 +328,7 @@ containers: { Steps } `, - expErr: `d2/testdata/d2compiler/TestCompile/image_children_Steps.d2:4:3: steps is only allowed at a board root`, + expErr: `d2/testdata/d2compiler/TestCompile/image_children_Steps.d2:4:3: steps must be declared at a board root scope`, }, { name: "name-with-dot-underscore", @@ -708,6 +720,142 @@ x: { } }, }, + { + name: "legend", + + text: ` + vars: { + d2-legend: { + User: "A person who interacts with the system" { + shape: person + style: { + fill: "#f5f5f5" + } + } + + Database: "Stores application data" { + shape: cylinder + style.fill: "#b5d3ff" + } + + HiddenShape: "This should not appear in the legend" { + style.opacity: 0 + } + + User -> Database: "Reads data" { + style.stroke: "blue" + } + + Database -> User: "Returns results" { + style.stroke-dash: 5 + } + } +} + +user: User +db: Database +user -> db: Uses +`, + assertions: func(t *testing.T, g *d2graph.Graph) { + if g.Legend == nil { + t.Fatal("Expected Legend to be non-nil") + return + } + + // 2. Verify the correct objects are in the legend + if len(g.Legend.Objects) != 2 { + t.Errorf("Expected 2 objects in legend, got %d", len(g.Legend.Objects)) + } + + // Check for User object + hasUser := false + hasDatabase := false + for _, obj := range g.Legend.Objects { + if obj.ID == "User" { + hasUser = true + if obj.Shape.Value != "person" { + t.Errorf("User shape incorrect, expected 'person', got: %s", obj.Shape.Value) + } + } else if obj.ID == "Database" { + hasDatabase = true + if obj.Shape.Value != "cylinder" { + t.Errorf("Database shape incorrect, expected 'cylinder', got: %s", obj.Shape.Value) + } + } else if obj.ID == "HiddenShape" { + t.Errorf("HiddenShape should not be in legend due to opacity: 0") + } + } + + if !hasUser { + t.Errorf("User object missing from legend") + } + if !hasDatabase { + t.Errorf("Database object missing from legend") + } + + // 3. Verify the correct edges are in the legend + if len(g.Legend.Edges) != 2 { + t.Errorf("Expected 2 edges in legend, got %d", len(g.Legend.Edges)) + } + + // Check for expected edges + hasReadsEdge := false + hasReturnsEdge := false + for _, edge := range g.Legend.Edges { + if edge.Label.Value == "Reads data" { + hasReadsEdge = true + // Check edge properties + if edge.Style.Stroke == nil { + t.Errorf("Reads edge stroke is nil") + } else if edge.Style.Stroke.Value != "blue" { + t.Errorf("Reads edge stroke incorrect, expected 'blue', got: %s", edge.Style.Stroke.Value) + } + } else if edge.Label.Value == "Returns results" { + hasReturnsEdge = true + // Check edge properties + if edge.Style.StrokeDash == nil { + t.Errorf("Returns edge stroke-dash is nil") + } else if edge.Style.StrokeDash.Value != "5" { + t.Errorf("Returns edge stroke-dash incorrect, expected '5', got: %s", edge.Style.StrokeDash.Value) + } + } else if edge.Label.Value == "Hidden connection" { + t.Errorf("Hidden connection should not be in legend due to opacity: 0") + } + } + + if !hasReadsEdge { + t.Errorf("'Reads data' edge missing from legend") + } + if !hasReturnsEdge { + t.Errorf("'Returns results' edge missing from legend") + } + + // 4. Verify the regular diagram content is still there + userObj, hasUserObj := g.Root.HasChild([]string{"user"}) + if !hasUserObj { + t.Errorf("Main diagram missing 'user' object") + } else if userObj.Label.Value != "User" { + t.Errorf("User label incorrect, expected 'User', got: %s", userObj.Label.Value) + } + + dbObj, hasDBObj := g.Root.HasChild([]string{"db"}) + if !hasDBObj { + t.Errorf("Main diagram missing 'db' object") + } else if dbObj.Label.Value != "Database" { + t.Errorf("DB label incorrect, expected 'Database', got: %s", dbObj.Label.Value) + } + + // Check the main edge + if len(g.Edges) == 0 { + t.Errorf("No edges found in main diagram") + } else { + mainEdge := g.Edges[0] + if mainEdge.Label.Value != "Uses" { + t.Errorf("Main edge label incorrect, expected 'Uses', got: %s", mainEdge.Label.Value) + } + } + }, + }, { name: "underscore_edge_nested", @@ -935,6 +1083,13 @@ b.(x -> y)[0]: two } }, }, + { + name: "markdown_ampersand", + text: `memo: |md + d2 +| +`, + }, { name: "unsemantic_markdown", @@ -1212,7 +1367,6 @@ x: { style.animated: true } `, - expErr: `d2/testdata/d2compiler/TestCompile/shape_edge_style.d2:3:2: key "animated" can only be applied to edges`, }, { name: "edge_invalid_style", @@ -1504,6 +1658,260 @@ x -> y: { } }, }, + { + name: "url_relative_link", + + text: `x: { + link: /google +} +`, + assertions: func(t *testing.T, g *d2graph.Graph) { + if len(g.Objects) != 1 { + t.Fatal(g.Objects) + } + if g.Objects[0].Link.Value != "/google" { + t.Fatal(g.Objects[0].Link.Value) + } + }, + }, + { + name: "non_url_link", + + text: `x: { + link: vscode://file//Users/pmoura/logtalk/examples/searching/hill_climbing1.lgt:35:0 +} +`, + assertions: func(t *testing.T, g *d2graph.Graph) { + if len(g.Objects) != 1 { + t.Fatal(g.Objects) + } + if g.Objects[0].Link.Value != "vscode://file//Users/pmoura/logtalk/examples/searching/hill_climbing1.lgt:35:0" { + t.Fatal(g.Objects[0].Link.Value) + } + }, + }, + { + name: "glob-connection-steps", + + text: `*.style.stroke: black + +layers: { + ok: @ok +} +`, + files: map[string]string{ + "ok.d2": ` +steps: { + 1: { + step1 + } +} +`, + }, + assertions: func(t *testing.T, g *d2graph.Graph) { + assert.Equal(t, 0, len(g.Steps)) + assert.Equal(t, 1, len(g.Layers)) + assert.Equal(t, 1, len(g.Layers[0].Steps)) + }, + }, + { + name: "composite-glob-filter", + + text: ` +*: { + &shape: [a; b] +} +k +`, + expErr: `d2/testdata/d2compiler/TestCompile/composite-glob-filter.d2:3:3: glob filters cannot be composites +d2/testdata/d2compiler/TestCompile/composite-glob-filter.d2:3:3: glob filters cannot be composites`, + }, + { + name: "imported-glob-leaf-filter", + + text: ` +***: { + &leaf: true + style: { + font-size: 30 + } +} +a: { + ...@x +} +`, + files: map[string]string{ + "x.d2": ` +b +`, + }, + assertions: func(t *testing.T, g *d2graph.Graph) { + assert.Equal(t, 2, len(g.Objects)) + assert.Equal(t, "b", g.Objects[0].Label.Value) + assert.Equal(t, "a", g.Objects[1].Label.Value) + assert.Equal(t, "30", g.Objects[0].Style.FontSize.Value) + assert.Equal(t, (*d2graph.Scalar)(nil), g.Objects[1].Style.FontSize) + }, + }, + { + name: "import-nested-var", + + text: `...@models.environment +`, + files: map[string]string{ + "models.d2": ` +vars: { + c: { + k + } +} + +environment: { + ...${c} +} +`, + }, + assertions: func(t *testing.T, g *d2graph.Graph) { + assert.Equal(t, 1, len(g.Objects)) + assert.Equal(t, "k", g.Objects[0].AbsID()) + }, + }, + { + name: "import-connections", + + text: `b.c -> b.d + +b: @imp +`, + files: map[string]string{ + "imp.d2": ` +c +d +d -> c +`, + }, + assertions: func(t *testing.T, g *d2graph.Graph) { + assert.Equal(t, 2, len(g.Edges)) + }, + }, + { + name: "import-style-1", + + text: `b.c.style.fill: red + +b: @imp +`, + files: map[string]string{ + "imp.d2": `c`, + }, + assertions: func(t *testing.T, g *d2graph.Graph) { + assert.Equal(t, 2, len(g.Objects)) + assert.Equal(t, "c", g.Objects[1].Label.Value) + assert.Equal(t, "red", g.Objects[1].Style.Fill.Value) + }, + }, + { + name: "import-style-2", + + text: `b.k.c.style.fill: red + +b: @imp +`, + files: map[string]string{ + "imp.d2": ` +k: { + c +} +`, + }, + assertions: func(t *testing.T, g *d2graph.Graph) { + assert.Equal(t, "c", g.Objects[2].Label.Value) + assert.Equal(t, "red", g.Objects[2].Style.Fill.Value) + }, + }, + { + name: "import-scenario", + + text: `a + +...@test +`, + files: map[string]string{ + "test.d2": ` +x + +scenarios: { + production: { + x.tooltip: foo + } +} + +`, + }, + assertions: func(t *testing.T, g *d2graph.Graph) { + assert.Equal(t, 2, len(g.Scenarios[0].Objects)) + }, + }, + { + name: "import-steps", + + text: `a + +...@test +`, + files: map[string]string{ + "test.d2": ` +x + +steps: { + 1: { + x.tooltip: foo + } + 2: { + x.tooltip: do + } +} +`, + }, + assertions: func(t *testing.T, g *d2graph.Graph) { + assert.Equal(t, 2, len(g.Steps[0].Objects)) + assert.Equal(t, 2, len(g.Steps[1].Objects)) + }, + }, + { + name: "import-classes-boards", + + text: `classes: { + a: { + label: hi + } +} + +layers: { + asdf: { + qwer: { + layers: { + ok: { + bok + } + } + } + } + wert: { + classes: @classes + } +} + +`, + files: map[string]string{ + "classes.d2": ` +c: { + label: bye +} +`, + }, + expErr: `d2/testdata/d2compiler/TestCompile/import-classes-boards.d2:10:7: layers must be declared at a board root scope`, + }, { name: "import_url_link", @@ -1592,6 +2000,27 @@ a.style.fill: null } }, }, + { + name: "no_url_link_and_path_url_label_concurrently", + text: `x -> y: https://google.com {link: https://not-google.com }`, + expErr: `d2/testdata/d2compiler/TestCompile/no_url_link_and_path_url_label_concurrently.d2:1:35: Label cannot be set to URL when link is also set (for security)`, + }, + { + name: "url_link_and_path_url_label_concurrently", + text: `x -> y: hello world {link: https://google.com}`, + assertions: func(t *testing.T, g *d2graph.Graph) { + if len(g.Edges) != 1 { + t.Fatal(len(g.Edges)) + } + if g.Edges[0].Link.Value != "https://google.com" { + t.Fatal(g.Edges[0].Link.Value) + } + + if g.Edges[0].Label.Value != "hello world" { + t.Fatal(g.Edges[0].Label.Value) + } + }, + }, { name: "nil_scope_obj_regression", @@ -1716,6 +2145,51 @@ y } }, }, + { + name: "reserved_quoted/1", + text: `x: { + "label": hello +} +`, + assertions: func(t *testing.T, g *d2graph.Graph) { + assert.Equal(t, 2, len(g.Objects)) + assert.Equal(t, "x", g.Objects[0].Label.Value) + }, + }, + { + name: "reserved_quoted/2", + text: `my_table: { + shape: sql_table + width: 200 + height: 200 + "shape": string + "icon": string + "width": int + "height": int +} + `, + assertions: func(t *testing.T, g *d2graph.Graph) { + assert.Equal(t, 4, len(g.Objects[0].SQLTable.Columns)) + assert.Equal(t, `shape`, g.Objects[0].SQLTable.Columns[0].Name.Label) + }, + }, + { + name: "reserved_quoted/3", + text: `*."shape" +x + `, + assertions: func(t *testing.T, g *d2graph.Graph) { + assert.Equal(t, 2, len(g.Objects)) + assert.Equal(t, `x.shape`, g.Objects[0].AbsID()) + }, + }, + { + name: "reserved_quoted/4", + text: `x."style"."fill"`, + assertions: func(t *testing.T, g *d2graph.Graph) { + assert.Equal(t, 3, len(g.Objects)) + }, + }, { name: "errors/reserved_icon_style", @@ -2317,6 +2791,27 @@ scenarios: { tassert.Equal(t, "root.layers.cat", g.Scenarios[0].Objects[0].Link.Value) }, }, + { + name: "no-self-link", + text: ` +x.link: scenarios.a + +layers: { + g: { + s.link: _.layers.g + } +} + +scenarios: { + a: { + b + } +}`, + assertions: func(t *testing.T, g *d2graph.Graph) { + tassert.Equal(t, (*d2graph.Scalar)(nil), g.Scenarios[0].Objects[0].Link) + tassert.Equal(t, (*d2graph.Scalar)(nil), g.Layers[0].Objects[0].Link) + }, + }, { name: "link-board-not-found-1", text: `x.link: layers.x @@ -2844,6 +3339,105 @@ x*: { tassert.Equal(t, "x2.ok", g.Objects[3].AbsID()) }, }, + { + name: "glob-spread-vars/1", + text: `vars: { + b: { + 1 + } +} + +a: { + ...${b} + *.style.fill: red +} +`, + assertions: func(t *testing.T, g *d2graph.Graph) { + assert.Equal(t, "1", g.Objects[1].Label.Value) + assert.Equal(t, "red", g.Objects[1].Style.Fill.Value) + }, + }, + { + name: "glob-spread-vars/2", + text: `vars: { + b: { + 1 + 2 + } +} + +a: { + ...${b} + ** -> _.ok +} + +ok +`, + assertions: func(t *testing.T, g *d2graph.Graph) { + assert.Equal(t, 2, len(g.Edges)) + }, + }, + { + name: "import-var-chain", + + text: `...@dev +`, + files: map[string]string{ + "dev.d2": ` +vars: { + a: { + b + } + c: { + ...${a} + } +} +`, + }, + }, + { + name: "var_in_markdown", + text: `vars: { + v: ok +} + +x: |md + m${v}y + + ` + "`hey ${v}`" + ` + + regular markdown + + ` + "```" + ` + bye ${v} + ` + "```" + ` +| +`, + assertions: func(t *testing.T, g *d2graph.Graph) { + tassert.True(t, strings.Contains(g.Objects[0].Attributes.Label.Value, "moky")) + tassert.False(t, strings.Contains(g.Objects[0].Attributes.Label.Value, "m${v}y")) + // Code spans untouched + tassert.True(t, strings.Contains(g.Objects[0].Attributes.Label.Value, "hey ${v}")) + // Code blocks untouched + tassert.True(t, strings.Contains(g.Objects[0].Attributes.Label.Value, "bye ${v}")) + }, + }, + { + name: "var_nested_in_markdown", + text: `vars: { + v: { + g: ok + } +} + +x: |md + m${v.g}y +| +`, + assertions: func(t *testing.T, g *d2graph.Graph) { + tassert.True(t, strings.Contains(g.Objects[0].Attributes.Label.Value, "moky")) + }, + }, { name: "var_in_vars", text: `vars: { @@ -2906,7 +3500,7 @@ object: { name: "no-class-primary", text: `x.class `, - expErr: `d2/testdata/d2compiler/TestCompile/no-class-primary.d2:1:3: class missing value`, + expErr: `d2/testdata/d2compiler/TestCompile/no-class-primary.d2:1:3: reserved field "class" must have a value`, }, { name: "no-class-inside-classes", @@ -3343,6 +3937,33 @@ svc_1."think about A" svc_1.t2 -> b: do with B `, }, + { + name: "layer-import-nested-layer", + text: `layers: { + ok: {...@meow} +} +`, + files: map[string]string{ + "meow.d2": `layers: { + 1: { + asdf + } +} +`, + }, + assertions: func(t *testing.T, g *d2graph.Graph) { + tassert.Equal(t, "d2/testdata/d2compiler/TestCompile/layer-import-nested-layer.d2", g.Layers[0].AST.Range.Path) + tassert.Equal(t, "d2/testdata/d2compiler/TestCompile/meow.d2", g.Layers[0].Layers[0].AST.Range.Path) + }, + }, + { + name: "invalid_gradient_color_stop", + text: ` + x + x.style.fill: "linear-gradient(#ggg, #000)" + `, + expErr: `d2/testdata/d2compiler/TestCompile/invalid_gradient_color_stop.d2:3:19: expected "fill" to be a valid named color ("orange"), a hex code ("#f0ff3a"), or a gradient ("linear-gradient(red, blue)")`, + }, } for _, tc := range testCases { @@ -3511,6 +4132,24 @@ steps: { assert.True(t, g.IsFolderOnly) }, }, + { + name: "board-label-primary", + run: func(t *testing.T) { + g, _ := assertCompile(t, `hi +layers: { + 1: one { + RJ + } + 2: { + label: two + RJ + } +} +`, "") + assert.Equal(t, "one", g.Layers[0].Root.Label.Value) + assert.Equal(t, "two", g.Layers[1].Root.Label.Value) + }, + }, { name: "no-inherit-label", run: func(t *testing.T) { @@ -3558,6 +4197,40 @@ steps: { `, `d2/testdata/d2compiler/TestCompile2/boards/errs/duplicate_board.d2:9:2: board name one already used by another board`) }, }, + { + name: "style-nested-boards", + run: func(t *testing.T) { + g, _ := assertCompile(t, `**.style.stroke: black + +scenarios: { + a: { + x + } + b: { + x + } +} +steps: { + c: { + x + } + d: { + x + } +} +layers: { + e: { + x + } +} +`, ``) + assert.Equal(t, "black", g.Scenarios[0].Objects[0].Style.Stroke.Value) + assert.Equal(t, "black", g.Scenarios[1].Objects[0].Style.Stroke.Value) + assert.Equal(t, "black", g.Steps[0].Objects[0].Style.Stroke.Value) + assert.Equal(t, "black", g.Steps[1].Objects[0].Style.Stroke.Value) + assert.Equal(t, (*d2graph.Scalar)(nil), g.Layers[0].Objects[0].Style.Stroke) + }, + }, } for _, tc := range tca { @@ -3642,7 +4315,7 @@ a: null }, }, { - name: "edge", + name: "basic-edge", run: func(t *testing.T) { g, _ := assertCompile(t, ` a -> b @@ -3652,6 +4325,20 @@ a -> b assert.Equal(t, 0, len(g.Edges)) }, }, + { + name: "nested-edge", + run: func(t *testing.T) { + g, _ := assertCompile(t, ` +a.b.c -> a.d.e +a.b.c -> a.d.e + +a.(b.c -> d.e)[0]: null +(a.b.c -> a.d.e)[1]: null +`, "") + assert.Equal(t, 5, len(g.Objects)) + assert.Equal(t, 0, len(g.Edges)) + }, + }, { name: "attribute", run: func(t *testing.T) { @@ -4152,6 +4839,24 @@ a: { assert.Equal(t, 2, len(g.Objects[0].SQLTable.Columns[0].Constraint)) }, }, + { + name: "comment-array", + run: func(t *testing.T) { + assertCompile(t, ` +vars: { + list: [ + "a"; + "b"; + "c"; + "d" + # e + ] +} + +a +`, "") + }, + }, { name: "spread-array", run: func(t *testing.T) { @@ -4954,6 +5659,155 @@ y.link: https://google.com assert.Equal(t, "true", g.Objects[1].Attributes.Style.Underline.Value) }, }, + { + name: "leaf-filter-1", + run: func(t *testing.T) { + g, _ := assertCompile(t, ` +**: { + &leaf: false + style.fill: red +} +**: { + &leaf: true + style.stroke: yellow +} +a.b.c +`, ``) + assert.Equal(t, "a", g.Objects[0].ID) + assert.Equal(t, "red", g.Objects[0].Attributes.Style.Fill.Value) + assert.Equal(t, (*d2graph.Scalar)(nil), g.Objects[0].Attributes.Style.Stroke) + assert.Equal(t, "b", g.Objects[1].ID) + assert.Equal(t, "red", g.Objects[1].Attributes.Style.Fill.Value) + assert.Equal(t, (*d2graph.Scalar)(nil), g.Objects[1].Attributes.Style.Stroke) + assert.Equal(t, "c", g.Objects[2].ID) + assert.Equal(t, (*d2graph.Scalar)(nil), g.Objects[2].Attributes.Style.Fill) + assert.Equal(t, "yellow", g.Objects[2].Attributes.Style.Stroke.Value) + }, + }, + { + name: "leaf-filter-2", + run: func(t *testing.T) { + g, _ := assertCompile(t, ` +**: { + &leaf: true + style.stroke: yellow +} +a: { + b -> c +} +d: { + e +} +`, ``) + assert.Equal(t, "a", g.Objects[0].ID) + assert.Equal(t, (*d2graph.Scalar)(nil), g.Objects[0].Attributes.Style.Stroke) + assert.Equal(t, "b", g.Objects[1].ID) + assert.Equal(t, "yellow", g.Objects[1].Attributes.Style.Stroke.Value) + assert.Equal(t, "c", g.Objects[2].ID) + assert.Equal(t, "yellow", g.Objects[2].Attributes.Style.Stroke.Value) + assert.Equal(t, "d", g.Objects[3].ID) + assert.Equal(t, (*d2graph.Scalar)(nil), g.Objects[3].Attributes.Style.Stroke) + assert.Equal(t, "e", g.Objects[4].ID) + assert.Equal(t, "yellow", g.Objects[4].Attributes.Style.Stroke.Value) + }, + }, + { + name: "level-filter", + run: func(t *testing.T) { + g, _ := assertCompile(t, ` +**: { + &level: 0 + style.fill: red +} +**: { + &level: 1 + style.stroke: yellow +} +(** -> **)[*]: { + &src.level: 0 + &dst.level: 0 + style.stroke: blue +} +a.b.c + +x -> y +a: { + 1 -> 2 +} +a.1 -> x +`, ``) + assert.Equal(t, "a", g.Objects[0].ID) + assert.Equal(t, "red", g.Objects[0].Attributes.Style.Fill.Value) + assert.Equal(t, (*d2graph.Scalar)(nil), g.Objects[0].Attributes.Style.Stroke) + + assert.Equal(t, "b", g.Objects[1].ID) + assert.Equal(t, "yellow", g.Objects[1].Attributes.Style.Stroke.Value) + assert.Equal(t, (*d2graph.Scalar)(nil), g.Objects[1].Attributes.Style.Fill) + + assert.Equal(t, "c", g.Objects[2].ID) + assert.Equal(t, (*d2graph.Scalar)(nil), g.Objects[2].Attributes.Style.Fill) + assert.Equal(t, (*d2graph.Scalar)(nil), g.Objects[2].Attributes.Style.Stroke) + + assert.Equal(t, "(x -> y)[0]", g.Edges[0].AbsID()) + assert.Equal(t, "blue", g.Edges[0].Attributes.Style.Stroke.Value) + + assert.Equal(t, "a.(1 -> 2)[0]", g.Edges[1].AbsID()) + assert.Equal(t, (*d2graph.Scalar)(nil), g.Edges[1].Attributes.Style.Stroke) + + assert.Equal(t, "(a.1 -> x)[0]", g.Edges[2].AbsID()) + assert.Equal(t, (*d2graph.Scalar)(nil), g.Edges[2].Attributes.Style.Stroke) + }, + }, + { + name: "connected-filter", + run: func(t *testing.T) { + g, _ := assertCompile(t, ` +*: { + &connected: true + style.fill: red +} +a -> b +c +`, ``) + assert.Equal(t, "a", g.Objects[0].ID) + assert.Equal(t, "red", g.Objects[0].Attributes.Style.Fill.Value) + assert.Equal(t, "b", g.Objects[1].ID) + assert.Equal(t, "red", g.Objects[1].Attributes.Style.Fill.Value) + assert.Equal(t, "c", g.Objects[2].ID) + assert.Equal(t, (*d2graph.Scalar)(nil), g.Objects[2].Attributes.Style.Fill) + }, + }, + { + name: "and-filter", + run: func(t *testing.T) { + g, _ := assertCompile(t, ` +*: { + &shape: person + &connected: true + style.fill: red +} +(** -> **)[*]: { + &src: a + &dst: c + style.stroke: yellow +} +a -> b +a.shape: person +a -> c +`, ``) + assert.Equal(t, "a", g.Objects[0].ID) + assert.Equal(t, "red", g.Objects[0].Attributes.Style.Fill.Value) + assert.Equal(t, "b", g.Objects[1].ID) + assert.Equal(t, (*d2graph.Scalar)(nil), g.Objects[1].Attributes.Style.Fill) + assert.Equal(t, "c", g.Objects[2].ID) + assert.Equal(t, (*d2graph.Scalar)(nil), g.Objects[2].Attributes.Style.Fill) + + assert.Equal(t, "(a -> b)[0]", g.Edges[0].AbsID()) + assert.Equal(t, (*d2graph.Scalar)(nil), g.Edges[0].Attributes.Style.Stroke) + assert.Equal(t, "(a -> c)[0]", g.Edges[1].AbsID()) + assert.Equal(t, "yellow", g.Edges[1].Attributes.Style.Stroke.Value) + }, + }, { name: "glob-filter", run: func(t *testing.T) { @@ -5087,6 +5941,280 @@ b -> c assert.Equal(t, "red", g.Edges[0].Style.Stroke.Value) }, }, + { + name: "merge-glob-values", + run: func(t *testing.T) { + assertCompile(t, ` +"a" +*.style.stroke-width: 2 +*.style.font-size: 14 +a.width: 339 +`, ``) + }, + }, + { + name: "mixed-edge-quoting", + run: func(t *testing.T) { + g, _ := assertCompile(t, ` +"a"."b"."c"."z1" -> "a"."b"."c"."z2" +`, ``) + assert.Equal(t, 5, len(g.Objects)) + }, + }, + { + name: "suspension-lazy", + run: func(t *testing.T) { + g, _ := assertCompile(t, ` +a -> b +c +**: suspend +(** -> **)[*]: suspend +d +`, ``) + assert.Equal(t, 1, len(g.Objects)) + }, + }, + { + name: "suspension-quotes", + run: func(t *testing.T) { + g, _ := assertCompile(t, ` +a -> b +c +**: suspend +(** -> **)[*]: suspend +d: "suspend" +d -> d: "suspend" +`, ``) + assert.Equal(t, 1, len(g.Objects)) + assert.Equal(t, 1, len(g.Edges)) + }, + }, + { + name: "unsuspend-edge-label", + run: func(t *testing.T) { + g, _ := assertCompile(t, ` +a -> b: hello +c +**: suspend +(** -> **)[*]: suspend + +(* -> *)[*]: unsuspend +`, ``) + assert.Equal(t, 2, len(g.Objects)) + assert.Equal(t, 1, len(g.Edges)) + assert.Equal(t, "hello", g.Edges[0].Label.Value) + }, + }, + { + name: "unsuspend-edge-filter", + run: func(t *testing.T) { + g, _ := assertCompile(t, ` +a -> b +**: suspend +(** -> **)[*]: suspend +(* -> *)[*]: unsuspend { + &dst: a +} +`, ``) + assert.Equal(t, 0, len(g.Objects)) + assert.Equal(t, 0, len(g.Edges)) + }, + }, + { + name: "unsuspend-edge-child", + run: func(t *testing.T) { + g, _ := assertCompile(t, ` +a: { + b -> c +} + +**: suspend +(** -> **)[*]: suspend +(** -> **)[*]: unsuspend { + &dst: a.c +} +`, ``) + assert.Equal(t, 3, len(g.Objects)) + assert.Equal(t, 1, len(g.Edges)) + }, + }, + { + name: "unsuspend-cross-container-edge-label", + run: func(t *testing.T) { + g, _ := assertCompile(t, ` +a: { + b +} +c: { + d +} +a.b -> c.d: likes +**: suspend +(** -> **)[*]: suspend +(** -> **)[*]: unsuspend { + &label: likes +} +`, ``) + assert.Equal(t, 4, len(g.Objects)) + assert.Equal(t, 1, len(g.Edges)) + }, + }, + { + name: "unsuspend-shape-label", + run: func(t *testing.T) { + g, _ := assertCompile(t, ` +a: hello +*: suspend +*: unsuspend +`, ``) + assert.Equal(t, 1, len(g.Objects)) + assert.Equal(t, "hello", g.Objects[0].Label.Value) + }, + }, + { + name: "suspend-shape", + run: func(t *testing.T) { + g, _ := assertCompile(t, ` +a: hello +*: suspend +`, ``) + assert.Equal(t, 0, len(g.Objects)) + }, + }, + { + name: "edge-glob-ampersand-filter/1", + run: func(t *testing.T) { + g, _ := assertCompile(t, ` + (* -> *)[*]: { + &src: a + style.stroke-dash: 3 + } + (* -> *)[*]: { + &dst: c + style.stroke: blue + } + (* -> *)[*]: { + &src: b + &dst: c + style.fill: red + } + a -> b + b -> c + a -> c + `, ``) + tassert.Equal(t, 3, len(g.Edges)) + + tassert.Equal(t, "a", g.Edges[0].Src.ID) + tassert.Equal(t, "b", g.Edges[0].Dst.ID) + tassert.Equal(t, "3", g.Edges[0].Style.StrokeDash.Value) + tassert.Equal(t, (*d2graph.Scalar)(nil), g.Edges[0].Style.Stroke) + tassert.Equal(t, (*d2graph.Scalar)(nil), g.Edges[0].Style.Fill) + + tassert.Equal(t, "b", g.Edges[1].Src.ID) + tassert.Equal(t, "c", g.Edges[1].Dst.ID) + tassert.Equal(t, "blue", g.Edges[1].Style.Stroke.Value) + tassert.Equal(t, (*d2graph.Scalar)(nil), g.Edges[1].Style.StrokeDash) + tassert.Equal(t, "red", g.Edges[1].Style.Fill.Value) + + tassert.Equal(t, "a", g.Edges[2].Src.ID) + tassert.Equal(t, "c", g.Edges[2].Dst.ID) + tassert.Equal(t, "3", g.Edges[2].Style.StrokeDash.Value) + tassert.Equal(t, "blue", g.Edges[2].Style.Stroke.Value) + tassert.Equal(t, (*d2graph.Scalar)(nil), g.Edges[2].Style.Fill) + }, + }, + { + name: "edge-glob-ampersand-filter/2", + run: func(t *testing.T) { + g, _ := assertCompile(t, ` +a: { + shape: circle + style: { + fill: blue + opacity: 0.8 + } +} +b: { + shape: rectangle + style: { + fill: red + opacity: 0.5 + } +} +c: { + shape: diamond + style.fill: green + style.opacity: 0.8 +} + +(* -> *)[*]: { + &src.style.fill: blue + style.stroke-dash: 3 +} +(* -> *)[*]: { + &dst.style.opacity: 0.8 + style.stroke: cyan +} +(* -> *)[*]: { + &src.shape: rectangle + &dst.style.fill: green + style.stroke-width: 5 +} + +a -> b +b -> c +a -> c + `, ``) + + tassert.Equal(t, 3, len(g.Edges)) + + tassert.Equal(t, "a", g.Edges[0].Src.ID) + tassert.Equal(t, "b", g.Edges[0].Dst.ID) + tassert.Equal(t, "3", g.Edges[0].Style.StrokeDash.Value) + tassert.Equal(t, (*d2graph.Scalar)(nil), g.Edges[0].Style.Stroke) + tassert.Equal(t, (*d2graph.Scalar)(nil), g.Edges[0].Style.StrokeWidth) + + tassert.Equal(t, "b", g.Edges[1].Src.ID) + tassert.Equal(t, "c", g.Edges[1].Dst.ID) + tassert.Equal(t, "cyan", g.Edges[1].Style.Stroke.Value) + tassert.Equal(t, (*d2graph.Scalar)(nil), g.Edges[1].Style.StrokeDash) + tassert.Equal(t, "5", g.Edges[1].Style.StrokeWidth.Value) + + tassert.Equal(t, "a", g.Edges[2].Src.ID) + tassert.Equal(t, "c", g.Edges[2].Dst.ID) + tassert.Equal(t, "3", g.Edges[2].Style.StrokeDash.Value) + tassert.Equal(t, "cyan", g.Edges[2].Style.Stroke.Value) + tassert.Equal(t, (*d2graph.Scalar)(nil), g.Edges[2].Style.StrokeWidth) + }, + }, + { + name: "md-shape", + run: func(t *testing.T) { + g, _ := assertCompile(t, ` +a.shape: circle +a: |md #hi | + +b.shape: circle +b.label: |md #hi | + +c: |md #hi | +c.shape: circle + +d.label: |md #hi | +d.shape: circle + +e: { + shape: circle + label: |md #hi | +} + `, ``) + tassert.Equal(t, 5, len(g.Objects)) + for _, obj := range g.Objects { + tassert.Equal(t, "circle", obj.Shape.Value, "Object "+obj.ID+" should have circle shape") + tassert.Equal(t, "markdown", obj.Language, "Object "+obj.ID+" should have md language") + } + }, + }, } for _, tc := range tca { diff --git a/d2exporter/export.go b/d2exporter/export.go index d01147af9..56f4b9146 100644 --- a/d2exporter/export.go +++ b/d2exporter/export.go @@ -8,6 +8,7 @@ import ( "oss.terrastruct.com/util-go/go2" + "oss.terrastruct.com/d2/d2ast" "oss.terrastruct.com/d2/d2graph" "oss.terrastruct.com/d2/d2parser" "oss.terrastruct.com/d2/d2renderers/d2fonts" @@ -15,6 +16,7 @@ import ( "oss.terrastruct.com/d2/d2themes" "oss.terrastruct.com/d2/lib/color" "oss.terrastruct.com/d2/lib/geo" + "oss.terrastruct.com/d2/lib/label" ) func Export(ctx context.Context, g *d2graph.Graph, fontFamily *d2fonts.FontFamily) (*d2target.Diagram, error) { @@ -45,6 +47,26 @@ func Export(ctx context.Context, g *d2graph.Graph, fontFamily *d2fonts.FontFamil diagram.Connections[i] = toConnection(g.Edges[i], g.Theme) } + if g.Legend != nil { + legend := &d2target.Legend{} + + if len(g.Legend.Objects) > 0 { + legend.Shapes = make([]d2target.Shape, len(g.Legend.Objects)) + for i, obj := range g.Legend.Objects { + legend.Shapes[i] = toShape(obj, g) + } + } + + if len(g.Legend.Edges) > 0 { + legend.Connections = make([]d2target.Connection, len(g.Legend.Edges)) + for i, edge := range g.Legend.Edges { + legend.Connections[i] = toConnection(edge, g.Theme) + } + } + + diagram.Legend = legend + } + return diagram, nil } @@ -77,6 +99,46 @@ func applyTheme(shape *d2target.Shape, obj *d2graph.Object, theme *d2themes.Them if theme.SpecialRules.Mono { shape.FontFamily = "mono" } + if theme.SpecialRules.C4 && len(obj.ChildrenArray) > 0 { + if obj.Style.Fill == nil { + shape.Fill = "transparent" + } + if obj.Style.Stroke == nil { + shape.Stroke = color.AA2 + } + if obj.Style.StrokeDash == nil { + shape.StrokeDash = 5 + } + if obj.Style.FontColor == nil { + shape.Color = color.N1 + } + } + if theme.SpecialRules.C4 && obj.Level() == 1 && len(obj.ChildrenArray) == 0 && + obj.Shape.Value != d2target.ShapePerson && obj.Shape.Value != d2target.ShapeC4Person { + if obj.Style.Fill == nil { + shape.Fill = color.B6 + } + if obj.Style.Stroke == nil { + shape.Stroke = color.B5 + } + } + if theme.SpecialRules.C4 && (obj.Shape.Value == d2target.ShapePerson || obj.Shape.Value == d2target.ShapeC4Person) { + if obj.Style.Fill == nil { + shape.Fill = color.B2 + } + if obj.Style.Stroke == nil { + shape.Stroke = color.B1 + } + } + if theme.SpecialRules.C4 && obj.Level() > 1 && len(obj.ChildrenArray) == 0 && + obj.Shape.Value != d2target.ShapePerson && obj.Shape.Value != d2target.ShapeC4Person { + if obj.Style.Fill == nil { + shape.Fill = color.B4 + } + if obj.Style.Stroke == nil { + shape.Stroke = color.B3 + } + } } } @@ -132,6 +194,9 @@ func applyStyles(shape *d2target.Shape, obj *d2graph.Object) { if obj.Style.DoubleBorder != nil { shape.DoubleBorder, _ = strconv.ParseBool(obj.Style.DoubleBorder.Value) } + if obj.IconStyle.BorderRadius != nil { + shape.IconBorderRadius, _ = strconv.Atoi(obj.IconStyle.BorderRadius.Value) + } } func toShape(obj *d2graph.Object, g *d2graph.Graph) d2target.Shape { @@ -144,6 +209,7 @@ func toShape(obj *d2graph.Object, g *d2graph.Graph) d2target.Shape { shape.Pos = d2target.NewPoint(int(obj.TopLeft.X), int(obj.TopLeft.Y)) shape.Width = int(obj.Width) shape.Height = int(obj.Height) + shape.Language = obj.Language text := obj.Text() shape.Bold = text.IsBold @@ -162,12 +228,18 @@ func toShape(obj *d2graph.Object, g *d2graph.Graph) d2target.Shape { applyStyles(shape, obj) applyTheme(shape, obj, g.Theme) shape.Color = text.GetColor(shape.Italic) + if g.Theme != nil && g.Theme.SpecialRules.C4 { + if obj.Style.FontColor == nil { + if len(obj.ChildrenArray) > 0 { + shape.Color = color.N1 + } else { + shape.Color = color.N7 + } + } + } applyStyles(shape, obj) - switch obj.Shape.Value { - case d2target.ShapeCode, d2target.ShapeText: - shape.Language = obj.Language - shape.Label = obj.Label.Value + switch strings.ToLower(obj.Shape.Value) { case d2target.ShapeClass: shape.Class = *obj.Class // The label is the header for classes and tables, which is set in client to be 4 px larger than the object's set font size @@ -194,6 +266,9 @@ func toShape(obj *d2graph.Object, g *d2graph.Graph) d2target.Shape { if obj.Tooltip != nil { shape.Tooltip = obj.Tooltip.Value } + if obj.Style.Animated != nil { + shape.Animated, _ = strconv.ParseBool(obj.Style.Animated.Value) + } if obj.Link != nil { shape.Link = obj.Link.Value shape.PrettyLink = toPrettyLink(g, obj.Link.Value) @@ -332,7 +407,18 @@ func toConnection(edge *d2graph.Edge, theme *d2themes.Theme) d2target.Connection if edge.Tooltip != nil { connection.Tooltip = edge.Tooltip.Value } - connection.Icon = edge.Icon + if edge.Icon != nil { + connection.Icon = edge.Icon + if edge.IconPosition != nil { + connection.IconPosition = (d2ast.LabelPositionsMapping[edge.IconPosition.Value]).String() + } else { + connection.IconPosition = label.InsideMiddleCenter.String() + } + } + + if edge.IconStyle.BorderRadius != nil { + connection.IconBorderRadius, _ = strconv.ParseFloat(edge.IconStyle.BorderRadius.Value, 64) + } if edge.Style.Italic != nil { connection.Italic, _ = strconv.ParseBool(edge.Style.Italic.Value) @@ -354,6 +440,9 @@ func toConnection(edge *d2graph.Edge, theme *d2themes.Theme) d2target.Connection if edge.Style.Font != nil { connection.FontFamily = edge.Style.Font.Value } + if edge.Link != nil { + connection.Link = edge.Link.Value + } connection.Label = text.Text connection.LabelWidth = text.Dimensions.Width connection.LabelHeight = text.Dimensions.Height @@ -377,5 +466,17 @@ func toConnection(edge *d2graph.Edge, theme *d2themes.Theme) d2target.Connection connection.Src = edge.Src.AbsID() connection.Dst = edge.Dst.AbsID() + if theme != nil && theme.SpecialRules.C4 { + if edge.Style.StrokeDash == nil { + connection.StrokeDash = 5 + } + if edge.Style.Stroke == nil { + connection.Stroke = color.AA4 + } + if edge.Style.FontColor == nil { + connection.Color = color.N2 + } + } + return *connection } diff --git a/d2exporter/export_test.go b/d2exporter/export_test.go index 1f1f1353a..94d3c8c4c 100644 --- a/d2exporter/export_test.go +++ b/d2exporter/export_test.go @@ -39,6 +39,7 @@ func TestExport(t *testing.T) { t.Run("connection", testConnection) t.Run("label", testLabel) t.Run("theme", testTheme) + t.Run("legend", testLegend) } func testShape(t *testing.T) { @@ -204,6 +205,30 @@ func testTheme(t *testing.T) { runa(t, tcs) } +func testLegend(t *testing.T) { + tcs := []testCase{ + { + name: "basic_legend", + dsl: `vars: { + d2-legend: { + legend: { + l1: Rectangles {shape: rectangle} + l2: Ovals {shape: oval} + l1 -> l2: Connection + } + } +} +x: {shape: rectangle} +y: {shape: oval} +x -> y: connects + +`, + }, + } + + runa(t, tcs) +} + func runa(t *testing.T, tcs []testCase) { for _, tc := range tcs { tc := tc @@ -303,10 +328,10 @@ a -> b db, err := compile(ctx, bString) assert.JSON(t, nil, err) - hashA, err := da.HashID() + hashA, err := da.HashID(nil) assert.JSON(t, nil, err) - hashB, err := db.HashID() + hashB, err := db.HashID(nil) assert.JSON(t, nil, err) assert.NotEqual(t, hashA, hashB) diff --git a/d2format/format.go b/d2format/format.go index e72800e68..63bebcadd 100644 --- a/d2format/format.go +++ b/d2format/format.go @@ -42,6 +42,12 @@ func (p *printer) node(n d2ast.Node) { p.blockComment(n) case *d2ast.Null: p.sb.WriteString("null") + case *d2ast.Suspension: + if n.Value { + p.sb.WriteString("suspend") + } else { + p.sb.WriteString("unsuspend") + } case *d2ast.Boolean: p.sb.WriteString(strconv.FormatBool(n.Value)) case *d2ast.Number: @@ -121,7 +127,7 @@ func (p *printer) blockComment(bc *d2ast.BlockComment) { } func (p *printer) interpolationBoxes(boxes []d2ast.InterpolationBox, isDoubleString bool) { - for _, b := range boxes { + for i, b := range boxes { if b.Substitution != nil { p.substitution(b.Substitution) continue @@ -134,6 +140,11 @@ func (p *printer) interpolationBoxes(boxes []d2ast.InterpolationBox, isDoubleStr s = escapeUnquotedValue(*b.String, p.inKey) } b.StringRaw = &s + } else if i > 0 && boxes[i-1].Substitution != nil { + // If this string follows a substitution, we need to make sure to use + // the actual string content, not the raw value which might be incorrect + s := *b.String + b.StringRaw = &s } if !isDoubleString { if _, ok := d2ast.ReservedKeywords[strings.ToLower(*b.StringRaw)]; ok { @@ -293,11 +304,18 @@ func (p *printer) _map(m *d2ast.Map) { if nb.IsBoardNode() { switch nb.MapKey.Key.Path[0].Unbox().ScalarString() { case "layers": - layerNodes = append(layerNodes, nb) + // remove useless + if nb.MapKey.Value.Map != nil && len(nb.MapKey.Value.Map.Nodes) > 0 { + layerNodes = append(layerNodes, nb) + } case "scenarios": - scenarioNodes = append(scenarioNodes, nb) + if nb.MapKey.Value.Map != nil && len(nb.MapKey.Value.Map.Nodes) > 0 { + scenarioNodes = append(scenarioNodes, nb) + } case "steps": - stepNodes = append(stepNodes, nb) + if nb.MapKey.Value.Map != nil && len(nb.MapKey.Value.Map.Nodes) > 0 { + stepNodes = append(stepNodes, nb) + } } prev = n continue diff --git a/d2format/format_test.go b/d2format/format_test.go index e70783311..ed7c9e97a 100644 --- a/d2format/format_test.go +++ b/d2format/format_test.go @@ -881,6 +881,30 @@ coop: { fill: blue } } +`, + }, + { + name: "remove-empty-boards", + in: `k + +layers +scenarios: {} +steps: asdf +`, + exp: `k +`, + }, + { + name: "vars", + in: `vars: { + a: "a" + b: "X${a})" +} +`, + exp: `vars: { + a: "a" + b: "X${a})" +} `, }, } diff --git a/d2graph/d2graph.go b/d2graph/d2graph.go index 674dc8e31..ba9a02657 100644 --- a/d2graph/d2graph.go +++ b/d2graph/d2graph.go @@ -49,6 +49,7 @@ type Graph struct { BaseAST *d2ast.Map `json:"-"` Root *Object `json:"root"` + Legend *Legend `json:"legend,omitempty"` Edges []*Edge `json:"edges"` Objects []*Object `json:"objects"` @@ -67,6 +68,11 @@ type Graph struct { Data map[string]interface{} `json:"data,omitempty"` } +type Legend struct { + Objects []*Object `json:"objects,omitempty"` + Edges []*Edge `json:"edges,omitempty"` +} + func NewGraph() *Graph { d := &Graph{} d.Root = &Object{ @@ -84,6 +90,66 @@ func (g *Graph) RootBoard() *Graph { return g } +func (g *Graph) IDA() []string { + if g == nil { + return nil + } + + var parts []string + + current := g + for current != nil { + if current.Name != "" { + parts = append(parts, current.Name) + } + current = current.Parent + } + + for i := 0; i < len(parts)/2; i++ { + j := len(parts) - 1 - i + parts[i], parts[j] = parts[j], parts[i] + } + + if len(parts) == 0 { + return []string{"root"} + } + + parts = append([]string{"root"}, parts...) + + if g.Parent != nil { + var containerName string + if len(g.Parent.Layers) > 0 { + for _, l := range g.Parent.Layers { + if l == g { + containerName = "layers" + break + } + } + } + if len(g.Parent.Scenarios) > 0 { + for _, s := range g.Parent.Scenarios { + if s == g { + containerName = "scenarios" + break + } + } + } + if len(g.Parent.Steps) > 0 { + for _, s := range g.Parent.Steps { + if s == g { + containerName = "steps" + break + } + } + } + if containerName != "" { + parts = append(parts[:1], append([]string{containerName}, parts[1:]...)...) + } + } + + return parts +} + type LayoutGraph func(context.Context, *Graph) error type RouteEdges func(context.Context, *Graph, []*Edge) error @@ -130,10 +196,11 @@ type Attributes struct { Label Scalar `json:"label"` LabelDimensions d2target.TextDimensions `json:"labelDimensions"` - Style Style `json:"style"` - Icon *url.URL `json:"icon,omitempty"` - Tooltip *Scalar `json:"tooltip,omitempty"` - Link *Scalar `json:"link,omitempty"` + Style Style `json:"style"` + Icon *url.URL `json:"icon,omitempty"` + IconStyle Style `json:"iconStyle"` + Tooltip *Scalar `json:"tooltip,omitempty"` + Link *Scalar `json:"link,omitempty"` WidthAttr *Scalar `json:"width,omitempty"` HeightAttr *Scalar `json:"height,omitempty"` @@ -504,7 +571,7 @@ func (obj *Object) GetFill() string { return color.AB5 } - if strings.EqualFold(shape, d2target.ShapePerson) { + if strings.EqualFold(shape, d2target.ShapePerson) || strings.EqualFold(shape, d2target.ShapeC4Person) { return color.B3 } if strings.EqualFold(shape, d2target.ShapeDiamond) { @@ -634,7 +701,10 @@ func (obj *Object) Text() *d2target.MText { } } -func (obj *Object) newObject(id string) *Object { +func (obj *Object) newObject(ids d2ast.String) *Object { + id := d2format.Format(&d2ast.KeyPath{ + Path: []*d2ast.StringBox{d2ast.MakeValueBox(d2ast.RawString(ids.ScalarString(), true)).StringBox()}, + }) idval := id k, _ := d2parser.ParseKey(id) if k != nil && len(k.Path) > 0 { @@ -647,9 +717,6 @@ func (obj *Object) newObject(id string) *Object { Label: Scalar{ Value: idval, }, - Shape: Scalar{ - Value: d2target.ShapeRectangle, - }, }, Graph: obj.Graph, @@ -787,7 +854,7 @@ func (obj *Object) FindEdges(mk *d2ast.Key) ([]*Edge, bool) { return ea, true } -func (obj *Object) ensureChildEdge(ida []string) *Object { +func (obj *Object) ensureChildEdge(ida []d2ast.String) *Object { for i := range ida { switch obj.Shape.Value { case d2target.ShapeClass, d2target.ShapeSQLTable: @@ -803,12 +870,12 @@ func (obj *Object) ensureChildEdge(ida []string) *Object { // EnsureChild grabs the child by ids or creates it if it does not exist including all // intermediate nodes. -func (obj *Object) EnsureChild(ida []string) *Object { +func (obj *Object) EnsureChild(ida []d2ast.String) *Object { seq := obj.OuterSequenceDiagram() if seq != nil { for _, c := range seq.ChildrenArray { - if c.ID == ida[0] { - if obj.ID == ida[0] { + if c.ID == ida[0].ScalarString() { + if obj.ID == ida[0].ScalarString() { // In cases of a.a where EnsureChild is called on the parent a, the second a should // be created as a child of a and not as a child of the diagram. This is super // unfortunate code but alas. @@ -824,9 +891,11 @@ func (obj *Object) EnsureChild(ida []string) *Object { return obj } - _, is := d2ast.ReservedKeywordHolders[ida[0]] + _, is := d2ast.ReservedKeywordHolders[ida[0].ScalarString()] + is = is && ida[0].IsUnquoted() if len(ida) == 1 && !is { - _, ok := d2ast.ReservedKeywords[ida[0]] + _, ok := d2ast.ReservedKeywords[ida[0].ScalarString()] + ok = ok && ida[0].IsUnquoted() if ok { return obj } @@ -835,11 +904,14 @@ func (obj *Object) EnsureChild(ida []string) *Object { id := ida[0] ida = ida[1:] - if id == "_" { + if id.ScalarString() == "_" && id.IsUnquoted() { return obj.Parent.EnsureChild(ida) } - child, ok := obj.Children[strings.ToLower(id)] + head := d2format.Format(&d2ast.KeyPath{ + Path: []*d2ast.StringBox{d2ast.MakeValueBox(d2ast.RawString(id.ScalarString(), true)).StringBox()}, + }) + child, ok := obj.Children[strings.ToLower(head)] if !ok { child = obj.newObject(id) } @@ -877,14 +949,16 @@ func (obj *Object) GetLabelSize(mtexts []*d2target.MText, ruler *textmeasure.Rul var dims *d2target.TextDimensions switch shapeType { - case d2target.ShapeText: + case d2target.ShapeClass: + dims = GetTextDimensions(mtexts, ruler, obj.Text(), go2.Pointer(d2fonts.SourceCodePro)) + default: if obj.Language == "latex" { width, height, err := d2latex.Measure(obj.Text().Text) if err != nil { return nil, err } dims = d2target.NewTextDimensions(width, height) - } else if obj.Language != "" { + } else if obj.Language != "" && shapeType != d2target.ShapeCode { var err error dims, err = getMarkdownDimensions(mtexts, ruler, obj.Text(), fontFamily) if err != nil { @@ -893,12 +967,6 @@ func (obj *Object) GetLabelSize(mtexts []*d2target.MText, ruler *textmeasure.Rul } else { dims = GetTextDimensions(mtexts, ruler, obj.Text(), fontFamily) } - - case d2target.ShapeClass: - dims = GetTextDimensions(mtexts, ruler, obj.Text(), go2.Pointer(d2fonts.SourceCodePro)) - - default: - dims = GetTextDimensions(mtexts, ruler, obj.Text(), fontFamily) } if shapeType == d2target.ShapeSQLTable && obj.Label.Value == "" { @@ -1238,10 +1306,10 @@ func (e *Edge) AbsID() string { return fmt.Sprintf("%s(%s %s %s)[%d]", commonKey, strings.Join(srcIDA, "."), e.ArrowString(), strings.Join(dstIDA, "."), e.Index) } -func (obj *Object) Connect(srcID, dstID []string, srcArrow, dstArrow bool, label string) (*Edge, error) { - for _, id := range [][]string{srcID, dstID} { +func (obj *Object) Connect(srcID, dstID []d2ast.String, srcArrow, dstArrow bool, label string) (*Edge, error) { + for _, id := range [][]d2ast.String{srcID, dstID} { for _, p := range id { - if _, ok := d2ast.ReservedKeywords[p]; ok { + if _, ok := d2ast.ReservedKeywords[p.ScalarString()]; ok && p.IsUnquoted() { return nil, errors.New("cannot connect to reserved keyword") } } @@ -1269,7 +1337,7 @@ func (obj *Object) Connect(srcID, dstID []string, srcArrow, dstArrow bool, label return e, nil } -func addSQLTableColumnIndices(e *Edge, srcID, dstID []string, obj, src, dst *Object) { +func addSQLTableColumnIndices(e *Edge, srcID, dstID []d2ast.String, obj, src, dst *Object) { if src.Shape.Value == d2target.ShapeSQLTable { if src == dst { // Ignore edge to column inside table. @@ -1279,7 +1347,7 @@ func addSQLTableColumnIndices(e *Edge, srcID, dstID []string, obj, src, dst *Obj srcAbsID := src.AbsIDArray() if len(objAbsID)+len(srcID) > len(srcAbsID) { for i, d2col := range src.SQLTable.Columns { - if d2col.Name.Label == srcID[len(srcID)-1] { + if d2col.Name.Label == srcID[len(srcID)-1].ScalarString() { d2col.Reference = dst.AbsID() e.SrcTableColumnIndex = new(int) *e.SrcTableColumnIndex = i @@ -1293,7 +1361,7 @@ func addSQLTableColumnIndices(e *Edge, srcID, dstID []string, obj, src, dst *Obj dstAbsID := dst.AbsIDArray() if len(objAbsID)+len(dstID) > len(dstAbsID) { for i, d2col := range dst.SQLTable.Columns { - if d2col.Name.Label == dstID[len(dstID)-1] { + if d2col.Name.Label == dstID[len(dstID)-1].ScalarString() { d2col.Reference = dst.AbsID() e.DstTableColumnIndex = new(int) *e.DstTableColumnIndex = i @@ -1544,11 +1612,8 @@ func (g *Graph) SetDimensions(mtexts []*d2target.MText, ruler *textmeasure.Ruler switch shapeType { case shape.TABLE_TYPE, shape.CLASS_TYPE, shape.CODE_TYPE: default: - if obj.Link != nil { - paddingX += 32 - } - if obj.Tooltip != nil { - paddingX += 32 + if obj.Link != nil && obj.Tooltip != nil { + paddingX += 64 } } } diff --git a/d2graph/serde.go b/d2graph/serde.go index 6b1006c31..e7c697251 100644 --- a/d2graph/serde.go +++ b/d2graph/serde.go @@ -10,10 +10,11 @@ import ( ) type SerializedGraph struct { - Root SerializedObject `json:"root"` - Edges []SerializedEdge `json:"edges"` - Objects []SerializedObject `json:"objects"` - RootLevel int `json:"rootLevel"` + Root SerializedObject `json:"root"` + Edges []SerializedEdge `json:"edges"` + Objects []SerializedObject `json:"objects"` + RootLevel int `json:"rootLevel"` + Data map[string]interface{} `json:"data,omitempty"` } type SerializedObject map[string]interface{} @@ -27,6 +28,7 @@ func DeserializeGraph(bytes []byte, g *Graph) error { return err } + g.Data = sg.Data var root Object Convert(sg.Root, &root) g.Root = &root @@ -95,6 +97,7 @@ func SerializeGraph(g *Graph) ([]byte, error) { } sg.Root = root sg.RootLevel = g.RootLevel + sg.Data = g.Data var sobjects []SerializedObject for _, o := range g.Objects { diff --git a/d2ir/compile.go b/d2ir/compile.go index a85f9ddb2..6467fef1a 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -15,6 +15,7 @@ import ( "oss.terrastruct.com/d2/d2parser" "oss.terrastruct.com/d2/d2themes" "oss.terrastruct.com/d2/d2themes/d2themescatalog" + "oss.terrastruct.com/d2/lib/textmeasure" ) type globContext struct { @@ -80,6 +81,7 @@ func Compile(ast *d2ast.Map, opts *CompileOptions) (*Map, []string, error) { c.compileMap(m, ast, ast) c.compileSubstitutions(m, nil) c.overlayClasses(m) + m.removeSuspendedFields() if !c.err.Empty() { return nil, nil, c.err } @@ -87,12 +89,12 @@ func Compile(ast *d2ast.Map, opts *CompileOptions) (*Map, []string, error) { } func (c *compiler) overlayClasses(m *Map) { - classes := m.GetField("classes") + classes := m.GetField(d2ast.FlatUnquotedString("classes")) if classes == nil || classes.Map() == nil { return } - layersField := m.GetField("layers") + layersField := m.GetField(d2ast.FlatUnquotedString("layers")) if layersField == nil { return } @@ -103,16 +105,15 @@ func (c *compiler) overlayClasses(m *Map) { for _, lf := range layers.Fields { if lf.Map() == nil || lf.Primary() != nil { - c.errorf(lf.References[0].Context_.Key, "invalid layer") continue } l := lf.Map() - lClasses := l.GetField("classes") + lClasses := l.GetField(d2ast.FlatUnquotedString("classes")) if lClasses == nil { lClasses = classes.Copy(l).(*Field) l.Fields = append(l.Fields, lClasses) - } else { + } else if lClasses.Map() != nil { base := classes.Copy(l).(*Field) OverlayMap(base.Map(), lClasses.Map()) l.DeleteField("classes") @@ -125,7 +126,10 @@ func (c *compiler) overlayClasses(m *Map) { func (c *compiler) compileSubstitutions(m *Map, varsStack []*Map) { for _, f := range m.Fields { - if f.Name == "vars" && f.Map() != nil { + if f.Name == nil { + continue + } + if f.Name.ScalarString() == "vars" && f.Name.IsUnquoted() && f.Map() != nil { varsStack = append([]*Map{f.Map()}, varsStack...) } } @@ -147,9 +151,9 @@ func (c *compiler) compileSubstitutions(m *Map, varsStack []*Map) { } } } else if f.Map() != nil { - if f.Name == "vars" { + if f.Name != nil && f.Name.ScalarString() == "vars" && f.Name.IsUnquoted() { c.compileSubstitutions(f.Map(), varsStack) - c.validateConfigs(f.Map().GetField("d2-config")) + c.validateConfigs(f.Map().GetField(d2ast.FlatUnquotedString("d2-config"))) } else { c.compileSubstitutions(f.Map(), varsStack) } @@ -171,37 +175,37 @@ func (c *compiler) validateConfigs(configs *Field) { } if NodeBoardKind(ParentMap(ParentMap(configs))) == "" { - c.errorf(configs.LastRef().AST(), `"%s" can only appear at root vars`, configs.Name) + c.errorf(configs.LastRef().AST(), `"%s" can only appear at root vars`, configs.Name.ScalarString()) return } for _, f := range configs.Map().Fields { var val string if f.Primary() == nil { - if f.Name != "theme-overrides" && f.Name != "dark-theme-overrides" && f.Name != "data" { - c.errorf(f.LastRef().AST(), `"%s" needs a value`, f.Name) + if f.Name.ScalarString() != "theme-overrides" && f.Name.ScalarString() != "dark-theme-overrides" && f.Name.ScalarString() != "data" { + c.errorf(f.LastRef().AST(), `"%s" needs a value`, f.Name.ScalarString()) continue } } else { val = f.Primary().Value.ScalarString() } - switch f.Name { + switch f.Name.ScalarString() { case "sketch", "center": _, err := strconv.ParseBool(val) if err != nil { - c.errorf(f.LastRef().AST(), `expected a boolean for "%s", got "%s"`, f.Name, val) + c.errorf(f.LastRef().AST(), `expected a boolean for "%s", got "%s"`, f.Name.ScalarString(), val) continue } case "theme-overrides", "dark-theme-overrides", "data": if f.Map() == nil { - c.errorf(f.LastRef().AST(), `"%s" needs a map`, f.Name) + c.errorf(f.LastRef().AST(), `"%s" needs a map`, f.Name.ScalarString()) continue } case "theme-id", "dark-theme-id": valInt, err := strconv.Atoi(val) if err != nil { - c.errorf(f.LastRef().AST(), `expected an integer for "%s", got "%s"`, f.Name, val) + c.errorf(f.LastRef().AST(), `expected an integer for "%s", got "%s"`, f.Name.ScalarString(), val) continue } if d2themescatalog.Find(int64(valInt)) == (d2themes.Theme{}) { @@ -211,12 +215,12 @@ func (c *compiler) validateConfigs(configs *Field) { case "pad": _, err := strconv.Atoi(val) if err != nil { - c.errorf(f.LastRef().AST(), `expected an integer for "%s", got "%s"`, f.Name, val) + c.errorf(f.LastRef().AST(), `expected an integer for "%s", got "%s"`, f.Name.ScalarString(), val) continue } case "layout-engine": default: - c.errorf(f.LastRef().AST(), `"%s" is not a valid config`, f.Name) + c.errorf(f.LastRef().AST(), `"%s" is not a valid config`, f.Name.ScalarString()) } } } @@ -276,6 +280,19 @@ func (c *compiler) resolveSubstitutions(varsStack []*Map, node Node) (removedFie break } } + + if removedField && len(m.globs) > 0 && !c.lazyGlobBeingApplied { + origGlobStack := c.globContextStack + c.globContextStack = append(c.globContextStack, m.globs) + for _, gctx := range m.globs { + old := c.lazyGlobBeingApplied + c.lazyGlobBeingApplied = true + c.compileKey(gctx.refctx) + c.lazyGlobBeingApplied = old + } + c.globContextStack = origGlobStack + } + } } if resolvedField.Primary() == nil { @@ -342,10 +359,37 @@ func (c *compiler) resolveSubstitutions(varsStack []*Map, node Node) (removedFie if subbed { s.Coalesce() } + case *d2ast.BlockString: + variables := make(map[string]string) + for _, vars := range varsStack { + c.collectVariables(vars, variables) + } + preprocessedValue := textmeasure.ReplaceSubstitutionsMarkdown(s.Value, variables) + + // Update the block string value + s.Value = preprocessedValue } return removedField } +func (c *compiler) collectVariables(vars *Map, variables map[string]string) { + if vars == nil { + return + } + for _, f := range vars.Fields { + if f.Primary() != nil { + variables[f.Name.ScalarString()] = f.Primary().Value.ScalarString() + } else if f.Map() != nil { + nestedVars := make(map[string]string) + c.collectVariables(f.Map(), nestedVars) + for k, v := range nestedVars { + variables[f.Name.ScalarString()+"."+k] = v + } + c.collectVariables(f.Map(), variables) + } + } +} + func (c *compiler) resolveSubstitution(vars *Map, node Node, substitution *d2ast.Substitution, isCurrentScopeVars bool) *Field { if vars == nil { return nil @@ -355,7 +399,7 @@ func (c *compiler) resolveSubstitution(vars *Map, node Node, substitution *d2ast parent := ParentField(node) for i, p := range substitution.Path { - f := vars.GetField(p.Unbox().ScalarString()) + f := vars.GetField(p.Unbox()) if f == nil { return nil } @@ -375,7 +419,7 @@ func (c *compiler) resolveSubstitution(vars *Map, node Node, substitution *d2ast // // When resolving hi.vars.x, the vars stack includes itself. // So this next if clause says, "ignore if we're using the current scope's vars to try to resolve a substitution that requires a var from further in the stack" - if fok && fieldNode.Name == p.Unbox().ScalarString() && isCurrentScopeVars && parent.Name == "vars" { + if fok && fieldNode.Name != nil && fieldNode.Name.ScalarString() == p.Unbox().ScalarString() && isCurrentScopeVars && parent.Name.ScalarString() == "vars" && parent.Name.IsUnquoted() { return nil } @@ -417,22 +461,6 @@ func (g *globContext) copyApplied(from *globContext) { } } -func (g *globContext) prefixed(dst *Map) *globContext { - g2 := g.copy() - prefix := d2ast.MakeKeyPath(RelIDA(g2.refctx.ScopeMap, dst)) - g2.refctx.Key = g2.refctx.Key.Copy() - if g2.refctx.Key.Key != nil { - prefix.Path = append(prefix.Path, g2.refctx.Key.Key.Path...) - } - if len(prefix.Path) > 0 { - g2.refctx.Key.Key = prefix - } - if !g2.refctx.Key.HasTripleGlob() && g2.refctx.Key.EdgeKey != nil { - prefix.Path = append(prefix.Path, g2.refctx.Key.EdgeKey.Path...) - } - return g2 -} - func (c *compiler) ampersandFilterMap(dst *Map, ast, scopeAST *d2ast.Map) bool { for _, n := range ast.Nodes { switch { @@ -456,10 +484,10 @@ func (c *compiler) ampersandFilterMap(dst *Map, ast, scopeAST *d2ast.Map) bool { return false } var ks string - if gctx.refctx.Key.HasTripleGlob() { - ks = d2format.Format(d2ast.MakeKeyPath(IDA(dst))) + if gctx.refctx.Key.HasMultiGlob() { + ks = d2format.Format(d2ast.MakeKeyPathString(IDA(dst))) } else { - ks = d2format.Format(d2ast.MakeKeyPath(BoardIDA(dst))) + ks = d2format.Format(d2ast.MakeKeyPathString(BoardIDA(dst))) } delete(gctx.appliedFields, ks) delete(gctx.appliedEdges, ks) @@ -479,16 +507,28 @@ func (c *compiler) compileMap(dst *Map, ast, scopeAST *d2ast.Map) { if NodeBoardKind(dst) == BoardLayer && !dst.Root() { for _, g := range previousGlobs { if g.refctx.Key.HasTripleGlob() { - globs = append(globs, g.prefixed(dst)) + gctx2 := g.copy() + gctx2.refctx.ScopeMap = dst + globs = append(globs, gctx2) } } } else if NodeBoardKind(dst) == BoardScenario { for _, g := range previousGlobs { - g2 := g.prefixed(dst) + gctx2 := g.copy() + gctx2.refctx.ScopeMap = dst + if !g.refctx.Key.HasMultiGlob() { + // Triple globs already apply independently to each board + gctx2.copyApplied(g) + } + globs = append(globs, gctx2) + } + for _, g := range previousGlobs { + g2 := g.copy() + g2.refctx.ScopeMap = dst // We don't want globs applied in a given scenario to affect future boards // Copying the applied fields and edges keeps the applications scoped to this board // Note that this is different from steps, where applications carry over - if !g.refctx.Key.HasTripleGlob() { + if !g.refctx.Key.HasMultiGlob() { // Triple globs already apply independently to each board g2.copyApplied(g) } @@ -496,7 +536,9 @@ func (c *compiler) compileMap(dst *Map, ast, scopeAST *d2ast.Map) { } } else if NodeBoardKind(dst) == BoardStep { for _, g := range previousGlobs { - globs = append(globs, g.prefixed(dst)) + gctx2 := g.copy() + gctx2.refctx.ScopeMap = dst + globs = append(globs, gctx2) } } else { globs = append(globs, previousGlobs...) @@ -562,6 +604,20 @@ func (c *compiler) compileMap(dst *Map, ast, scopeAST *d2ast.Map) { c.ensureGlobContext(gctx2.refctx) } + scenariosField := impn.Map().GetField(d2ast.FlatUnquotedString("scenarios")) + if scenariosField != nil && scenariosField.Map() != nil { + for _, sf := range scenariosField.Map().Fields { + c.overlay(dst, sf) + } + } + + stepsField := impn.Map().GetField(d2ast.FlatUnquotedString("steps")) + if stepsField != nil && stepsField.Map() != nil { + for _, sf := range stepsField.Map().Fields { + c.overlay(dst, sf) + } + } + OverlayMap(dst, impn.Map()) impDir := n.Import.Dir() c.extendLinks(dst, ParentField(dst), impDir) @@ -670,13 +726,77 @@ func (c *compiler) ampersandFilter(refctx *RefContext) bool { return true } + keyPath := refctx.Key.Key + if keyPath == nil || len(keyPath.Path) == 0 { + return false + } + + firstPart := keyPath.Path[0].Unbox().ScalarString() + if (firstPart == "src" || firstPart == "dst") && len(keyPath.Path) > 1 { + if len(c.mapRefContextStack) == 0 { + return false + } + + edge := ParentEdge(refctx.ScopeMap) + if edge == nil { + return false + } + + var nodePath []d2ast.String + if firstPart == "src" { + nodePath = edge.ID.SrcPath + } else { + nodePath = edge.ID.DstPath + } + + rootMap := RootMap(refctx.ScopeMap) + node := rootMap.GetField(nodePath...) + if node == nil || node.Map() == nil { + return false + } + + secondPart := keyPath.Path[1].Unbox().ScalarString() + value := refctx.Key.Value.ScalarBox().Unbox().ScalarString() + + if len(keyPath.Path) == 2 && c._ampersandPropertyFilter(secondPart, value, node, refctx.Key) { + return true + } + + propKeyPath := &d2ast.KeyPath{ + Path: keyPath.Path[1:], + } + + propKey := &d2ast.Key{ + Key: propKeyPath, + Value: refctx.Key.Value, + } + + propRefCtx := &RefContext{ + Key: propKey, + ScopeMap: node.Map(), + ScopeAST: refctx.ScopeAST, + } + + fa, err := node.Map().EnsureField(propKeyPath, propRefCtx, false, c) + if err != nil || len(fa) == 0 { + return false + } + + for _, f := range fa { + if c._ampersandFilter(f, propRefCtx) { + return true + } + } + return false + } + fa, err := refctx.ScopeMap.EnsureField(refctx.Key.Key, refctx, false, c) if err != nil { c.err.Errors = append(c.err.Errors, err.(d2ast.Error)) return false } if len(fa) == 0 { - if refctx.Key.Value.ScalarBox().Unbox().ScalarString() == "*" { + if refctx.Key.Value.ScalarBox().Unbox() != nil && refctx.Key.Value.ScalarBox().Unbox().ScalarString() == "*" { return false } // The field/edge has no value for this filter @@ -727,6 +847,7 @@ func (c *compiler) ampersandFilter(refctx *RefContext) bool { }, } return c._ampersandFilter(f, refctx) + case "label": f := &Field{} n := refctx.ScopeMap.Parent() @@ -735,7 +856,7 @@ func (c *compiler) ampersandFilter(refctx *RefContext) bool { case *Field: // The label value for fields is their key value f.Primary_ = &Scalar{ - Value: d2ast.FlatUnquotedString(n.Name), + Value: n.Name, } case *Edge: // But for edges, it's nothing @@ -745,8 +866,83 @@ func (c *compiler) ampersandFilter(refctx *RefContext) bool { f.Primary_ = n.Primary() } return c._ampersandFilter(f, refctx) + case "src": + if len(c.mapRefContextStack) == 0 { + return false + } + + edge := ParentEdge(refctx.ScopeMap) + if edge == nil { + return false + } + + filterValue := refctx.Key.Value.ScalarBox().Unbox().ScalarString() + + var srcParts []string + for _, part := range edge.ID.SrcPath { + srcParts = append(srcParts, part.ScalarString()) + } + + container := ParentField(edge) + if container != nil && container.Name.ScalarString() != "root" { + containerPath := []string{} + curr := container + for curr != nil && curr.Name.ScalarString() != "root" { + containerPath = append([]string{curr.Name.ScalarString()}, containerPath...) + curr = ParentField(curr) + } + + srcStart := srcParts[0] + if !strings.EqualFold(srcStart, containerPath[0]) { + srcParts = append(containerPath, srcParts...) + } + } + + srcPath := strings.Join(srcParts, ".") + + return srcPath == filterValue + + case "dst": + if len(c.mapRefContextStack) == 0 { + return false + } + + edge := ParentEdge(refctx.ScopeMap) + if edge == nil { + return false + } + + filterValue := refctx.Key.Value.ScalarBox().Unbox().ScalarString() + + var dstParts []string + for _, part := range edge.ID.DstPath { + dstParts = append(dstParts, part.ScalarString()) + } + + // Find the container that holds this edge + // Build the absolute path by prepending the container's path + container := ParentField(edge) + if container != nil && container.Name.ScalarString() != "root" { + containerPath := []string{} + curr := container + for curr != nil && curr.Name.ScalarString() != "root" { + containerPath = append([]string{curr.Name.ScalarString()}, containerPath...) + curr = ParentField(curr) + } + + dstStart := dstParts[0] + if !strings.EqualFold(dstStart, containerPath[0]) { + dstParts = append(containerPath, dstParts...) + } + } + dstPath := strings.Join(dstParts, ".") + + return dstPath == filterValue default: - return false + f := refctx.ScopeMap.Parent().(*Field) + propName := refctx.Key.Key.Last().ScalarString() + value := refctx.Key.Value.ScalarBox().Unbox().ScalarString() + return c._ampersandPropertyFilter(propName, value, f, refctx.Key) } } for _, f := range fa { @@ -758,6 +954,70 @@ func (c *compiler) ampersandFilter(refctx *RefContext) bool { return true } +// handles filters that are not based on fields +func (c *compiler) _ampersandPropertyFilter(propName string, value string, node *Field, key *d2ast.Key) bool { + switch propName { + case "level": + levelVal, err := strconv.Atoi(value) + if err != nil { + c.errorf(key, `&level must be a non-negative integer, got %q`, value) + return false + } + if levelVal < 0 { + c.errorf(key, `&level must be a non-negative integer, got %d`, levelVal) + return false + } + + level := 0 + parent := ParentField(node) + for parent != nil && parent.Name.ScalarString() != "root" && NodeBoardKind(parent) == "" { + level++ + parent = ParentField(parent) + } + return level == levelVal + case "leaf": + boolVal, err := strconv.ParseBool(value) + if err != nil { + c.errorf(key, `&leaf must be "true" or "false", got %q`, value) + return false + } + isLeaf := node.Map() == nil || !c.IsContainer(node.Map()) + return isLeaf == boolVal + case "connected": + boolVal, err := strconv.ParseBool(value) + if err != nil { + c.errorf(key, `&connected must be "true" or "false", got %q`, value) + return false + } + isConnected := false + for _, r := range node.References { + if r.InEdge() { + isConnected = true + break + } + } + return isConnected == boolVal + case "label": + f := &Field{} + if node.Primary() == nil { + f.Primary_ = &Scalar{ + Value: node.Name, + } + } else { + f.Primary_ = node.Primary() + } + propKey := &d2ast.Key{ + Key: key.Key, + Value: key.Value, + } + propRefCtx := &RefContext{ + Key: propKey, + } + return c._ampersandFilter(f, propRefCtx) + } + return false +} + func (c *compiler) _ampersandFilter(f *Field, refctx *RefContext) bool { if refctx.Key.Value.ScalarBox().Unbox() == nil { c.errorf(refctx.Key, "glob filters cannot be composites") @@ -811,11 +1071,22 @@ func (c *compiler) _compileField(f *Field, refctx *RefContext) { // For vars, if we delete the field, it may just resolve to an outer scope var of the same name // Instead we keep it around, so that resolveSubstitutions can find it if !IsVar(ParentMap(f)) { - ParentMap(f).DeleteField(f.Name) + ParentMap(f).DeleteField(f.Name.ScalarString()) return } } + if len(refctx.Key.Edges) == 0 && (refctx.Key.Primary.Suspension != nil || refctx.Key.Value.Suspension != nil) { + if !c.lazyGlobBeingApplied { + if refctx.Key.Primary.Suspension != nil { + f.suspended = refctx.Key.Primary.Suspension.Value + } else { + f.suspended = refctx.Key.Value.Suspension.Value + } + } + return + } + if refctx.Key.Primary.Unbox() != nil { if c.ignoreLazyGlob(f) { return @@ -875,6 +1146,11 @@ func (c *compiler) _compileField(f *Field, refctx *RefContext) { return } n.(Importable).SetImportAST(refctx.Key.Value.Import) + var existingEdges []*Edge + if f.Map() != nil { + existingEdges = f.Map().Edges + } + originalF := f.Copy(refctx.ScopeMap).(*Field) switch n := n.(type) { case *Field: if n.Primary_ != nil { @@ -911,6 +1187,22 @@ func (c *compiler) _compileField(f *Field, refctx *RefContext) { c.overlayClasses(f.Map()) } } + OverlayField(f, originalF) + if existingEdges != nil && f.Map() != nil { + for _, edge := range existingEdges { + exists := false + for _, currentEdge := range f.Map().Edges { + if currentEdge.ID.Match(edge.ID) { + exists = true + break + } + } + if !exists { + f.Map().Edges = append(f.Map().Edges, edge) + } + } + } + } else if refctx.Key.Value.ScalarBox().Unbox() != nil { if c.ignoreLazyGlob(f) { return @@ -920,7 +1212,7 @@ func (c *compiler) _compileField(f *Field, refctx *RefContext) { Value: refctx.Key.Value.ScalarBox().Unbox(), } // If the link is a board, we need to transform it into an absolute path. - if f.Name == "link" { + if f.Name.ScalarString() == "link" && f.Name.IsUnquoted() { c.compileLink(f, refctx) } } @@ -943,7 +1235,11 @@ func (c *compiler) extendLinks(m *Map, importF *Field, importDir string) { nodeBoardKind := NodeBoardKind(m) importIDA := IDA(importF) for _, f := range m.Fields { - if f.Name == "link" { + // A substitute or such + if f.Name == nil { + continue + } + if f.Name.ScalarString() == "link" && f.Name.IsUnquoted() { if nodeBoardKind != "" { c.errorf(f.LastRef().AST(), "a board itself cannot be linked; only objects within a board can be linked") continue @@ -951,7 +1247,7 @@ func (c *compiler) extendLinks(m *Map, importF *Field, importDir string) { val := f.Primary().Value.ScalarString() u, err := url.Parse(html.UnescapeString(val)) - isRemote := err == nil && strings.HasPrefix(u.Scheme, "http") + isRemote := err == nil && (u.Scheme != "" || strings.HasPrefix(u.Path, "/")) if isRemote { continue } @@ -966,11 +1262,11 @@ func (c *compiler) extendLinks(m *Map, importF *Field, importDir string) { } for _, id := range linkIDA[1:] { - if id == "_" { + if id.ScalarString() == "_" && id.IsUnquoted() { if len(linkIDA) < 2 || len(importIDA) < 2 { break } - linkIDA = append([]string{linkIDA[0]}, linkIDA[2:]...) + linkIDA = append([]d2ast.String{linkIDA[0]}, linkIDA[2:]...) importIDA = importIDA[:len(importIDA)-2] } else { break @@ -978,14 +1274,18 @@ func (c *compiler) extendLinks(m *Map, importF *Field, importDir string) { } extendedIDA := append(importIDA, linkIDA[1:]...) - kp := d2ast.MakeKeyPath(extendedIDA) + kp := d2ast.MakeKeyPathString(extendedIDA) s := d2format.Format(kp) f.Primary_.Value = d2ast.MakeValueBox(d2ast.FlatUnquotedString(s)).ScalarBox().Unbox() } - if f.Name == "icon" && f.Primary() != nil { + if f.Name.ScalarString() == "icon" && f.Name.IsUnquoted() && f.Primary() != nil { val := f.Primary().Value.ScalarString() + // It's likely a substitution + if val == "" { + continue + } u, err := url.Parse(html.UnescapeString(val)) - isRemoteImg := err == nil && strings.HasPrefix(u.Scheme, "http") + isRemoteImg := err == nil && (u.Scheme != "" || strings.HasPrefix(u.Path, "/")) if isRemoteImg { continue } @@ -1016,30 +1316,29 @@ func (c *compiler) compileLink(f *Field, refctx *RefContext) { return } - if linkIDA[0] == "root" { - c.errorf(refctx.Key.Key, "cannot refer to root in link") + if !linkIDA[0].IsUnquoted() { return } // If it doesn't start with one of these reserved words, the link is definitely not a board link. - if !strings.EqualFold(linkIDA[0], "layers") && !strings.EqualFold(linkIDA[0], "scenarios") && !strings.EqualFold(linkIDA[0], "steps") && linkIDA[0] != "_" { + if !strings.EqualFold(linkIDA[0].ScalarString(), "layers") && !strings.EqualFold(linkIDA[0].ScalarString(), "scenarios") && !strings.EqualFold(linkIDA[0].ScalarString(), "steps") && linkIDA[0].ScalarString() != "_" { return } // Chop off the non-board portion of the scope, like if this is being defined on a nested object (e.g. `x.y.z`) for i := len(scopeIDA) - 1; i > 0; i-- { - if strings.EqualFold(scopeIDA[i-1], "layers") || strings.EqualFold(scopeIDA[i-1], "scenarios") || strings.EqualFold(scopeIDA[i-1], "steps") { + if scopeIDA[i-1].IsUnquoted() && (strings.EqualFold(scopeIDA[i-1].ScalarString(), "layers") || strings.EqualFold(scopeIDA[i-1].ScalarString(), "scenarios") || strings.EqualFold(scopeIDA[i-1].ScalarString(), "steps")) { scopeIDA = scopeIDA[:i+1] break } - if scopeIDA[i-1] == "root" { + if scopeIDA[i-1].ScalarString() == "root" && scopeIDA[i-1].IsUnquoted() { scopeIDA = scopeIDA[:i] break } } // Resolve underscores - for len(linkIDA) > 0 && linkIDA[0] == "_" { + for len(linkIDA) > 0 && linkIDA[0].ScalarString() == "_" && linkIDA[0].IsUnquoted() { if len(scopeIDA) < 2 { // Leave the underscore. It will fail in compiler as a standalone board, // but if imported, will get further resolved in extendLinks @@ -1050,12 +1349,12 @@ func (c *compiler) compileLink(f *Field, refctx *RefContext) { linkIDA = linkIDA[1:] } if len(scopeIDA) == 0 { - scopeIDA = []string{"root"} + scopeIDA = []d2ast.String{d2ast.FlatUnquotedString("root")} } // Create the absolute path by appending scope path with value specified scopeIDA = append(scopeIDA, linkIDA...) - kp := d2ast.MakeKeyPath(scopeIDA) + kp := d2ast.MakeKeyPathString(scopeIDA) f.Primary_.Value = d2ast.FlatUnquotedString(d2format.Format(kp)) } @@ -1111,6 +1410,99 @@ func (c *compiler) _compileEdges(refctx *RefContext) { refctx.ScopeMap.DeleteEdge(e.ID) continue } + + if refctx.Key.Value.Map != nil && refctx.Key.Value.Map.HasFilter() { + if e.Map_ == nil { + e.Map_ = &Map{ + parent: e, + } + } + c.mapRefContextStack = append(c.mapRefContextStack, refctx) + ok := c.ampersandFilterMap(e.Map_, refctx.Key.Value.Map, refctx.ScopeAST) + c.mapRefContextStack = c.mapRefContextStack[:len(c.mapRefContextStack)-1] + if !ok { + continue + } + } + + if refctx.Key.Primary.Suspension != nil || refctx.Key.Value.Suspension != nil { + if !c.lazyGlobBeingApplied { + // Check if edge passes filter before applying suspension + if refctx.Key.Value.Map != nil && refctx.Key.Value.Map.HasFilter() { + if e.Map_ == nil { + e.Map_ = &Map{ + parent: e, + } + } + c.mapRefContextStack = append(c.mapRefContextStack, refctx) + ok := c.ampersandFilterMap(e.Map_, refctx.Key.Value.Map, refctx.ScopeAST) + c.mapRefContextStack = c.mapRefContextStack[:len(c.mapRefContextStack)-1] + if !ok { + continue + } + } + + var suspensionValue bool + if refctx.Key.Primary.Suspension != nil { + suspensionValue = refctx.Key.Primary.Suspension.Value + } else { + suspensionValue = refctx.Key.Value.Suspension.Value + } + e.suspended = suspensionValue + + // If we're unsuspending an edge, we should also unsuspend its src and dst objects + // And their ancestors + if !suspensionValue { + srcPath, dstPath := e.ID.SrcPath, e.ID.DstPath + + // Make paths absolute if they're relative + container := ParentField(e) + if container != nil && container.Name.ScalarString() != "root" { + containerPath := []d2ast.String{} + curr := container + for curr != nil && curr.Name.ScalarString() != "root" { + containerPath = append([]d2ast.String{curr.Name}, containerPath...) + curr = ParentField(curr) + } + + if len(srcPath) > 0 && !strings.EqualFold(srcPath[0].ScalarString(), containerPath[0].ScalarString()) { + absSrcPath := append([]d2ast.String{}, containerPath...) + srcPath = append(absSrcPath, srcPath...) + } + + if len(dstPath) > 0 && !strings.EqualFold(dstPath[0].ScalarString(), containerPath[0].ScalarString()) { + absDstPath := append([]d2ast.String{}, containerPath...) + dstPath = append(absDstPath, dstPath...) + } + } + + rootMap := RootMap(refctx.ScopeMap) + srcObj := rootMap.GetField(srcPath...) + dstObj := rootMap.GetField(dstPath...) + + // Unsuspend source node and all its ancestors + if srcObj != nil { + srcObj.suspended = false + parent := ParentField(srcObj) + for parent != nil && parent.Name.ScalarString() != "root" { + parent.suspended = false + parent = ParentField(parent) + } + } + + // Unsuspend destination node and all its ancestors + if dstObj != nil { + dstObj.suspended = false + parent := ParentField(dstObj) + for parent != nil && parent.Name.ScalarString() != "root" { + parent.suspended = false + parent = ParentField(parent) + } + } + } + } + } + e.References = append(e.References, &EdgeReference{ Context_: refctx, DueToGlob_: len(c.globRefContextStack) > 0, @@ -1137,7 +1529,7 @@ func (c *compiler) _compileEdges(refctx *RefContext) { } c.compileField(e.Map_, refctx.Key.EdgeKey, refctx) } else { - if refctx.Key.Primary.Unbox() != nil { + if refctx.Key.Primary.Unbox() != nil && refctx.Key.Primary.Suspension == nil { if c.ignoreLazyGlob(e) { return } @@ -1158,7 +1550,7 @@ func (c *compiler) _compileEdges(refctx *RefContext) { c.mapRefContextStack = append(c.mapRefContextStack, refctx) c.compileMap(e.Map_, refctx.Key.Value.Map, refctx.ScopeAST) c.mapRefContextStack = c.mapRefContextStack[:len(c.mapRefContextStack)-1] - } else if refctx.Key.Value.ScalarBox().Unbox() != nil { + } else if refctx.Key.Value.ScalarBox().Unbox() != nil && refctx.Key.Value.Suspension == nil { if c.ignoreLazyGlob(e) { return } @@ -1229,8 +1621,46 @@ func (c *compiler) compileArray(dst *Array, a *d2ast.Array, scopeAST *d2ast.Map) Value: []d2ast.InterpolationBox{{Substitution: an.Substitution}}, }, } + case *d2ast.Comment: + continue } dst.Values = append(dst.Values, irv) } } + +func (m *Map) removeSuspendedFields() { + if m == nil { + return + } + + for _, f := range m.Fields { + if f.Map() != nil { + f.Map().removeSuspendedFields() + } + } + + for i := len(m.Fields) - 1; i >= 0; i-- { + if m.Fields[i].Name == nil { + continue + } + _, isReserved := d2ast.ReservedKeywords[m.Fields[i].Name.ScalarString()] + if isReserved { + continue + } + if m.Fields[i].suspended { + m.DeleteField(m.Fields[i].Name.ScalarString()) + } + } + + for _, e := range m.Edges { + if e.Map() != nil { + e.Map().removeSuspendedFields() + } + } + for i := len(m.Edges) - 1; i >= 0; i-- { + if m.Edges[i].suspended { + m.DeleteEdge(m.Edges[i].ID) + } + } +} diff --git a/d2ir/compile_test.go b/d2ir/compile_test.go index e65a03ae2..da3a74aaa 100644 --- a/d2ir/compile_test.go +++ b/d2ir/compile_test.go @@ -195,6 +195,23 @@ func testCompileFields(t *testing.T) { assert.String(t, `[1; 2; 3; 4]`, f.Composite.String()) }, }, + { + name: "quoted", + run: func(t testing.TB) { + m, err := compile(t, `my_table: { + shape: sql_table + width: 200 + height: 200 + "shape": string + "icon": string + "width": int + "height": int +}`) + assert.Success(t, err) + assertQuery(t, m, 0, 0, "sql_table", "my_table.shape") + assertQuery(t, m, 0, 0, "string", `my_table."shape"`) + }, + }, { name: "null", run: func(t testing.TB) { @@ -576,7 +593,7 @@ classes: { } } `) - assert.ErrorString(t, err, `TestCompile/classes/nonroot.d2:2:3: classes is only allowed at a board root`) + assert.ErrorString(t, err, `TestCompile/classes/nonroot.d2:2:3: classes must be declared at a board root scope`) }, }, { @@ -722,7 +739,7 @@ dora: { } `) assert.Success(t, err) - assert.Equal(t, "grid-columns", m.Fields[1].Map().Fields[0].Name) + assert.Equal(t, "grid-columns", m.Fields[1].Map().Fields[0].Name.ScalarString()) }, }, } diff --git a/d2ir/d2ir.go b/d2ir/d2ir.go index 33dbda997..d336d7894 100644 --- a/d2ir/d2ir.go +++ b/d2ir/d2ir.go @@ -176,7 +176,7 @@ type Map struct { func (m *Map) initRoot() { m.parent = &Field{ - Name: "root", + Name: d2ast.FlatUnquotedString("root"), References: []*FieldReference{{ Context_: &RefContext{ ScopeMap: m, @@ -293,7 +293,7 @@ func NodeBoardKind(n Node) BoardKind { if f == nil { return "" } - switch f.Name { + switch f.Name.ScalarString() { case "layers": return BoardLayer case "scenarios": @@ -318,8 +318,9 @@ type Field struct { // *Map. parent Node importAST d2ast.Node + suspended bool - Name string `json:"name"` + Name d2ast.String `json:"name"` // Primary_ to avoid clashing with Primary(). We need to keep it exported for // encoding/json to marshal it so cannot prefix _ instead. @@ -377,11 +378,11 @@ func (f *Field) LastRef() Reference { } type EdgeID struct { - SrcPath []string `json:"src_path"` - SrcArrow bool `json:"src_arrow"` + SrcPath []d2ast.String `json:"src_path"` + SrcArrow bool `json:"src_arrow"` - DstPath []string `json:"dst_path"` - DstArrow bool `json:"dst_arrow"` + DstPath []d2ast.String `json:"dst_path"` + DstArrow bool `json:"dst_arrow"` // If nil, then any EdgeID with equal src/dst/arrows matches. Index *int `json:"index"` @@ -409,8 +410,8 @@ func (eid *EdgeID) Copy() *EdgeID { tmp := *eid eid = &tmp - eid.SrcPath = append([]string(nil), eid.SrcPath...) - eid.DstPath = append([]string(nil), eid.DstPath...) + eid.SrcPath = append([]d2ast.String(nil), eid.SrcPath...) + eid.DstPath = append([]d2ast.String(nil), eid.DstPath...) return eid } @@ -428,7 +429,7 @@ func (eid *EdgeID) Match(eid2 *EdgeID) bool { return false } for i, s := range eid.SrcPath { - if !strings.EqualFold(s, eid2.SrcPath[i]) { + if !strings.EqualFold(s.ScalarString(), eid2.SrcPath[i].ScalarString()) { return false } } @@ -440,7 +441,7 @@ func (eid *EdgeID) Match(eid2 *EdgeID) bool { return false } for i, s := range eid.DstPath { - if !strings.EqualFold(s, eid2.DstPath[i]) { + if !strings.EqualFold(s.ScalarString(), eid2.DstPath[i].ScalarString()) { return false } } @@ -450,21 +451,21 @@ func (eid *EdgeID) Match(eid2 *EdgeID) bool { // resolve resolves both underscores and commons in eid. // It returns the new eid, containing map adjusted for underscores and common ida. -func (eid *EdgeID) resolve(m *Map) (_ *EdgeID, _ *Map, common []string, _ error) { +func (eid *EdgeID) resolve(m *Map) (_ *EdgeID, _ *Map, common []d2ast.String, _ error) { eid = eid.Copy() maxUnderscores := go2.Max(countUnderscores(eid.SrcPath), countUnderscores(eid.DstPath)) for i := 0; i < maxUnderscores; i++ { - if eid.SrcPath[0] == "_" { + if eid.SrcPath[0].ScalarString() == "_" && eid.SrcPath[0].IsUnquoted() { eid.SrcPath = eid.SrcPath[1:] } else { mf := ParentField(m) - eid.SrcPath = append([]string{mf.Name}, eid.SrcPath...) + eid.SrcPath = append([]d2ast.String{mf.Name}, eid.SrcPath...) } - if eid.DstPath[0] == "_" { + if eid.DstPath[0].ScalarString() == "_" && eid.DstPath[0].IsUnquoted() { eid.DstPath = eid.DstPath[1:] } else { mf := ParentField(m) - eid.DstPath = append([]string{mf.Name}, eid.DstPath...) + eid.DstPath = append([]d2ast.String{mf.Name}, eid.DstPath...) } m = ParentMap(m) if m == nil { @@ -473,7 +474,7 @@ func (eid *EdgeID) resolve(m *Map) (_ *EdgeID, _ *Map, common []string, _ error) } for len(eid.SrcPath) > 1 && len(eid.DstPath) > 1 { - if !strings.EqualFold(eid.SrcPath[0], eid.DstPath[0]) || strings.Contains(eid.SrcPath[0], "*") { + if !strings.EqualFold(eid.SrcPath[0].ScalarString(), eid.DstPath[0].ScalarString()) || strings.Contains(eid.SrcPath[0].ScalarString(), "*") { return eid, m, common, nil } common = append(common, eid.SrcPath[0]) @@ -488,6 +489,7 @@ type Edge struct { // *Map parent Node importAST d2ast.Node + suspended bool ID *EdgeID `json:"edge_id"` @@ -648,7 +650,41 @@ func (rc *RefContext) EdgeIndex() int { func (rc *RefContext) Equal(rc2 *RefContext) bool { // We intentionally ignore edges here because the same glob can produce multiple RefContexts that should be treated the same with only the edge as the difference. // Same with ScopeMap. - return rc.Key.Equals(rc2.Key) && rc.Scope == rc2.Scope && rc.ScopeAST == rc2.ScopeAST + if !(rc.Key.Equals(rc2.Key) && rc.Scope == rc2.Scope && rc.ScopeAST == rc2.ScopeAST) { + return false + } + + // Check if suspension values match for suspension operations + // We don't want these two to equal + // 1. *: suspend + // 2. *: unsuspend + hasSuspension1 := (rc.Key.Primary.Suspension != nil || rc.Key.Value.Suspension != nil) + hasSuspension2 := (rc2.Key.Primary.Suspension != nil || rc2.Key.Value.Suspension != nil) + + if hasSuspension1 || hasSuspension2 { + var val1, val2 bool + if rc.Key.Primary.Suspension != nil { + val1 = rc.Key.Primary.Suspension.Value + } else if rc.Key.Value.Suspension != nil { + val1 = rc.Key.Value.Suspension.Value + } + + if rc2.Key.Primary.Suspension != nil { + val2 = rc2.Key.Primary.Suspension.Value + } else if rc2.Key.Value.Suspension != nil { + val2 = rc2.Key.Value.Suspension.Value + } + + if hasSuspension1 && hasSuspension2 && val1 != val2 { + return false + } + + if hasSuspension1 != hasSuspension2 { + return false + } + } + + return true } func (m *Map) FieldCountRecursive() int { @@ -669,13 +705,44 @@ func (m *Map) FieldCountRecursive() int { return acc } -func (m *Map) IsContainer() bool { +func (c *compiler) IsContainer(m *Map) bool { if m == nil { return false } + // Check references as the fields and edges may not be compiled yet + f := m.Parent().(*Field) + for _, ref := range f.References { + if ref.Primary() && ref.Context_.Key != nil && ref.Context_.Key.Value.Map != nil { + for _, n := range ref.Context_.Key.Value.Map.Nodes { + if n.MapKey == nil { + if n.Import != nil { + impn, ok := c.peekImport(n.Import) + if ok { + for _, f := range impn.Fields { + _, isReserved := d2ast.ReservedKeywords[f.Name.ScalarString()] + if !(isReserved && f.Name.IsUnquoted()) { + return true + } + } + } + } + continue + } + if len(n.MapKey.Edges) > 0 { + return true + } + if n.MapKey.Key != nil { + _, isReserved := d2ast.ReservedKeywords[n.MapKey.Key.Path[0].Unbox().ScalarString()] + if !(isReserved && f.Name.IsUnquoted()) { + return true + } + } + } + } + } for _, f := range m.Fields { - _, isReserved := d2ast.ReservedKeywords[f.Name] - if !isReserved { + _, isReserved := d2ast.ReservedKeywords[f.Name.ScalarString()] + if !(isReserved && f.Name.IsUnquoted()) { return true } } @@ -702,9 +769,9 @@ func (m *Map) EdgeCountRecursive() int { func (m *Map) GetClassMap(name string) *Map { root := RootMap(m) - classes := root.Map().GetField("classes") + classes := root.Map().GetField(d2ast.FlatUnquotedString("classes")) if classes != nil && classes.Map() != nil { - class := classes.Map().GetField(name) + class := classes.Map().GetField(d2ast.FlatUnquotedString(name)) if class != nil && class.Map() != nil { return class.Map() } @@ -712,8 +779,8 @@ func (m *Map) GetClassMap(name string) *Map { return nil } -func (m *Map) GetField(ida ...string) *Field { - for len(ida) > 0 && ida[0] == "_" { +func (m *Map) GetField(ida ...d2ast.String) *Field { + for len(ida) > 0 && ida[0].ScalarString() == "_" && ida[0].IsUnquoted() { m = ParentMap(m) if m == nil { return nil @@ -722,7 +789,7 @@ func (m *Map) GetField(ida ...string) *Field { return m.getField(ida) } -func (m *Map) getField(ida []string) *Field { +func (m *Map) getField(ida []d2ast.String) *Field { if len(ida) == 0 { return nil } @@ -730,14 +797,22 @@ func (m *Map) getField(ida []string) *Field { s := ida[0] rest := ida[1:] - if s == "_" { + if s.ScalarString() == "_" && s.IsUnquoted() { return nil } for _, f := range m.Fields { - if !strings.EqualFold(f.Name, s) { + if f.Name == nil { continue } + if !strings.EqualFold(f.Name.ScalarString(), s.ScalarString()) { + continue + } + if _, isReserved := d2ast.ReservedKeywords[strings.ToLower(s.ScalarString())]; isReserved { + if f.Name.IsUnquoted() != s.IsUnquoted() { + continue + } + } if len(rest) == 0 { return f } @@ -751,7 +826,7 @@ func (m *Map) getField(ida []string) *Field { // EnsureField is a bit of a misnomer. It's more of a Query/Ensure combination function at this point. func (m *Map) EnsureField(kp *d2ast.KeyPath, refctx *RefContext, create bool, c *compiler) ([]*Field, error) { i := 0 - for kp.Path[i].Unbox().ScalarString() == "_" { + for kp.Path[i].Unbox().ScalarString() == "_" && kp.Path[i].Unbox().IsUnquoted() { m = ParentMap(m) if m == nil { return nil, d2parser.Errorf(kp.Path[i].Unbox(), "invalid underscore: no parent") @@ -784,10 +859,10 @@ func (m *Map) ensureField(i int, kp *d2ast.KeyPath, refctx *RefContext, create b filter := func(f *Field, passthrough bool) bool { if gctx != nil { var ks string - if refctx.Key.HasTripleGlob() { - ks = d2format.Format(d2ast.MakeKeyPath(IDA(f))) + if refctx.Key.HasMultiGlob() { + ks = d2format.Format(d2ast.MakeKeyPathString(IDA(f))) } else { - ks = d2format.Format(d2ast.MakeKeyPath(BoardIDA(f))) + ks = d2format.Format(d2ast.MakeKeyPathString(BoardIDA(f))) } if !kp.HasGlob() { if !passthrough { @@ -841,7 +916,10 @@ func (m *Map) ensureField(i int, kp *d2ast.KeyPath, refctx *RefContext, create b return nil } for _, f := range m.Fields { - if matchPattern(f.Name, us.Pattern) { + if f.Name == nil { + continue + } + if matchPattern(f.Name.ScalarString(), us.Pattern) { if i == len(kp.Path)-1 { faAppend(f) } else { @@ -863,31 +941,37 @@ func (m *Map) ensureField(i int, kp *d2ast.KeyPath, refctx *RefContext, create b return nil } - head := kp.Path[i].Unbox().ScalarString() + head := kp.Path[i].Unbox() + headString := head.ScalarString() - if _, ok := d2ast.ReservedKeywords[strings.ToLower(head)]; ok { - head = strings.ToLower(head) - if _, ok := d2ast.CompositeReservedKeywords[head]; !ok && i < len(kp.Path)-1 { - return d2parser.Errorf(kp.Path[i].Unbox(), fmt.Sprintf(`"%s" must be the last part of the key`, head)) + if _, ok := d2ast.ReservedKeywords[strings.ToLower(head.ScalarString())]; ok && head.IsUnquoted() { + headString = strings.ToLower(head.ScalarString()) + if _, ok := d2ast.CompositeReservedKeywords[headString]; !ok && i < len(kp.Path)-1 { + return d2parser.Errorf(kp.Path[i].Unbox(), fmt.Sprintf(`"%s" must be the last part of the key`, headString)) } } - if head == "_" { + if headString == "_" && head.IsUnquoted() { return d2parser.Errorf(kp.Path[i].Unbox(), `parent "_" can only be used in the beginning of paths, e.g. "_.x"`) } - if head == "classes" && NodeBoardKind(m) == "" { - return d2parser.Errorf(kp.Path[i].Unbox(), "%s is only allowed at a board root", head) + if headString == "classes" && head.IsUnquoted() && NodeBoardKind(m) == "" { + return d2parser.Errorf(kp.Path[i].Unbox(), "%s must be declared at a board root scope", headString) } - if findBoardKeyword(head) != -1 && NodeBoardKind(m) == "" { - return d2parser.Errorf(kp.Path[i].Unbox(), "%s is only allowed at a board root", head) + if findBoardKeyword(head) != -1 && head.IsUnquoted() && NodeBoardKind(m) == "" { + return d2parser.Errorf(kp.Path[i].Unbox(), "%s must be declared at a board root scope", headString) } for _, f := range m.Fields { - if !strings.EqualFold(f.Name, head) { + if !(f.Name != nil && strings.EqualFold(f.Name.ScalarString(), head.ScalarString())) { continue } + if _, isReserved := d2ast.ReservedKeywords[strings.ToLower(f.Name.ScalarString())]; isReserved { + if f.Name.IsUnquoted() != head.IsUnquoted() { + continue + } + } // Don't add references for fake common KeyPath from trimCommon in CreateEdge. if refctx != nil { @@ -922,14 +1006,14 @@ func (m *Map) ensureField(i int, kp *d2ast.KeyPath, refctx *RefContext, create b return nil } shape := ParentShape(m) - if _, ok := d2ast.ReservedKeywords[strings.ToLower(head)]; !ok && len(c.globRefContextStack) > 0 { + if _, ok := d2ast.ReservedKeywords[strings.ToLower(head.ScalarString())]; !(ok && head.IsUnquoted()) && len(c.globRefContextStack) > 0 { if shape == d2target.ShapeClass || shape == d2target.ShapeSQLTable { return nil } } f := &Field{ parent: m, - Name: head, + Name: kp.Path[i].Unbox(), } defer func() { if i < kp.FirstGlob() { @@ -937,10 +1021,10 @@ func (m *Map) ensureField(i int, kp *d2ast.KeyPath, refctx *RefContext, create b } for _, grefctx := range c.globRefContextStack { var ks string - if grefctx.Key.HasTripleGlob() { - ks = d2format.Format(d2ast.MakeKeyPath(IDA(f))) + if grefctx.Key.HasMultiGlob() { + ks = d2format.Format(d2ast.MakeKeyPathString(IDA(f))) } else { - ks = d2format.Format(d2ast.MakeKeyPath(BoardIDA(f))) + ks = d2format.Format(d2ast.MakeKeyPathString(BoardIDA(f))) } gctx2 := c.getGlobContext(grefctx) gctx2.appliedFields[ks] = struct{}{} @@ -977,9 +1061,25 @@ func (m *Map) DeleteEdge(eid *EdgeID) *Edge { return nil } - for i, e := range m.Edges { - if e.ID.Match(eid) { - m.Edges = append(m.Edges[:i], m.Edges[i+1:]...) + resolvedEID, resolvedM, common, err := eid.resolve(m) + if err != nil { + return nil + } + + if len(common) > 0 { + f := resolvedM.GetField(common...) + if f == nil { + return nil + } + if f.Map() == nil { + return nil + } + return f.Map().DeleteEdge(resolvedEID) + } + + for i, e := range resolvedM.Edges { + if e.ID.Match(resolvedEID) { + resolvedM.Edges = append(resolvedM.Edges[:i], resolvedM.Edges[i+1:]...) return e } } @@ -995,7 +1095,7 @@ func (m *Map) DeleteField(ida ...string) *Field { rest := ida[1:] for i, f := range m.Fields { - if !strings.EqualFold(f.Name, s) { + if !strings.EqualFold(f.Name.ScalarString(), s) { continue } if len(rest) == 0 { @@ -1022,10 +1122,10 @@ func (m *Map) DeleteField(ida ...string) *Field { // then that holder becomes meaningless and should be deleted too parent := ParentField(f) for keywordHolder := range d2ast.ReservedKeywordHolders { - if parent != nil && parent.Name == keywordHolder && len(parent.Map().Fields) == 0 { + if parent != nil && parent.Name.ScalarString() == keywordHolder && parent.Name.IsUnquoted() && len(parent.Map().Fields) == 0 { keywordHolderParentMap := ParentMap(parent) for i, f := range keywordHolderParentMap.Fields { - if f.Name == keywordHolder { + if f.Name.ScalarString() == keywordHolder && f.Name.IsUnquoted() { keywordHolderParentMap.Fields = append(keywordHolderParentMap.Fields[:i], keywordHolderParentMap.Fields[i+1:]...) break } @@ -1083,7 +1183,7 @@ func (m *Map) getEdges(eid *EdgeID, refctx *RefContext, gctx *globContext, ea *[ } if len(common) > 0 { - commonKP := d2ast.MakeKeyPath(common) + commonKP := d2ast.MakeKeyPathString(common) lastMatch := 0 for i, el := range commonKP.Path { for j := lastMatch; j < len(refctx.Edge.Src.Path); j++ { @@ -1134,10 +1234,10 @@ func (m *Map) getEdges(eid *EdgeID, refctx *RefContext, gctx *globContext, ea *[ for _, e := range ea2 { if gctx != nil { var ks string - if refctx.Key.HasTripleGlob() { - ks = d2format.Format(d2ast.MakeKeyPath(IDA(e))) + if refctx.Key.HasMultiGlob() { + ks = d2format.Format(d2ast.MakeKeyPathString(IDA(e))) } else { - ks = d2format.Format(d2ast.MakeKeyPath(BoardIDA(e))) + ks = d2format.Format(d2ast.MakeKeyPathString(BoardIDA(e))) } if _, ok := gctx.appliedEdges[ks]; ok { continue @@ -1179,7 +1279,7 @@ func (m *Map) createEdge(eid *EdgeID, refctx *RefContext, gctx *globContext, c * return d2parser.Errorf(refctx.Edge, err.Error()) } if len(common) > 0 { - commonKP := d2ast.MakeKeyPath(common) + commonKP := d2ast.MakeKeyPathString(common) lastMatch := 0 for i, el := range commonKP.Path { for j := lastMatch; j < len(refctx.Edge.Src.Path); j++ { @@ -1247,7 +1347,7 @@ func (m *Map) createEdge(eid *EdgeID, refctx *RefContext, gctx *globContext, c * if refctx.Edge.Src.HasMultiGlob() { // If src has a double glob we only select leafs, those without children. - if src.Map().IsContainer() { + if c.IsContainer(src.Map()) { continue } if NodeBoardKind(src) != "" || ParentBoard(src) != ParentBoard(dst) { @@ -1256,7 +1356,7 @@ func (m *Map) createEdge(eid *EdgeID, refctx *RefContext, gctx *globContext, c * } if refctx.Edge.Dst.HasMultiGlob() { // If dst has a double glob we only select leafs, those without children. - if dst.Map().IsContainer() { + if c.IsContainer(dst.Map()) { continue } if NodeBoardKind(dst) != "" || ParentBoard(src) != ParentBoard(dst) { @@ -1296,7 +1396,7 @@ func (m *Map) createEdge2(eid *EdgeID, refctx *RefContext, gctx *globContext, c return nil, d2parser.Errorf(refctx.Edge, err.Error()) } if len(common) > 0 { - commonKP := d2ast.MakeKeyPath(common) + commonKP := d2ast.MakeKeyPathString(common) lastMatch := 0 for i, el := range commonKP.Path { for j := lastMatch; j < len(refctx.Edge.Src.Path); j++ { @@ -1352,10 +1452,10 @@ func (m *Map) createEdge2(eid *EdgeID, refctx *RefContext, gctx *globContext, c e2 := e.Copy(e.Parent()).(*Edge) e2.ID = e2.ID.Copy() e2.ID.Index = nil - if refctx.Key.HasTripleGlob() { - ks = d2format.Format(d2ast.MakeKeyPath(IDA(e2))) + if refctx.Key.HasMultiGlob() { + ks = d2format.Format(d2ast.MakeKeyPathString(IDA(e2))) } else { - ks = d2format.Format(d2ast.MakeKeyPath(BoardIDA(e2))) + ks = d2format.Format(d2ast.MakeKeyPathString(BoardIDA(e2))) } if _, ok := gctx.appliedEdges[ks]; ok { return nil, nil @@ -1376,7 +1476,7 @@ func (f *Field) AST() d2ast.Node { k := &d2ast.Key{ Key: &d2ast.KeyPath{ Path: []*d2ast.StringBox{ - d2ast.MakeValueBox(d2ast.RawString(f.Name, true)).StringBox(), + d2ast.MakeValueBox(f.Name).StringBox(), }, }, } @@ -1385,7 +1485,14 @@ func (f *Field) AST() d2ast.Node { k.Primary = d2ast.MakeValueBox(f.Primary_.AST().(d2ast.Value)).ScalarBox() } if f.Composite != nil { - k.Value = d2ast.MakeValueBox(f.Composite.AST().(d2ast.Value)) + value := f.Composite.AST().(d2ast.Value) + if m, ok := value.(*d2ast.Map); ok { + path := m.Range.Path + // Treat it as multi-line, but not file-map (line 0) + m.Range = d2ast.MakeRange(",1:0:0-2:0:0") + m.Range.Path = path + } + k.Value = d2ast.MakeValueBox(value) } return k @@ -1394,11 +1501,11 @@ func (f *Field) AST() d2ast.Node { func (e *Edge) AST() d2ast.Node { astEdge := &d2ast.Edge{} - astEdge.Src = d2ast.MakeKeyPath(e.ID.SrcPath) + astEdge.Src = d2ast.MakeKeyPathString(e.ID.SrcPath) if e.ID.SrcArrow { astEdge.SrcArrow = "<" } - astEdge.Dst = d2ast.MakeKeyPath(e.ID.DstPath) + astEdge.Dst = d2ast.MakeKeyPathString(e.ID.DstPath) if e.ID.DstArrow { astEdge.DstArrow = ">" } @@ -1417,7 +1524,7 @@ func (e *Edge) AST() d2ast.Node { return k } -func (e *Edge) IDString() string { +func (e *Edge) IDString() d2ast.String { ast := e.AST().(*d2ast.Key) if e.ID.Index != nil { ast.EdgeIndex = &d2ast.EdgeIndex{ @@ -1426,7 +1533,8 @@ func (e *Edge) IDString() string { } ast.Primary = d2ast.ScalarBox{} ast.Value = d2ast.ValueBox{} - return d2format.Format(ast) + formatted := d2format.Format(ast) + return d2ast.FlatUnquotedString(formatted) } func (a *Array) AST() d2ast.Node { @@ -1447,6 +1555,12 @@ func (m *Map) AST() d2ast.Node { astMap := &d2ast.Map{ Range: d2ast.MakeRange(",0:0:0-1:0:0"), } + if m.parent != nil && NodeBoardKind(m) != "" { + f, ok := m.parent.(*Field) + if ok { + astMap.Range.Path = f.Name.GetRange().Path + } + } for _, f := range m.Fields { astMap.Nodes = append(astMap.Nodes, d2ast.MakeMapNodeBox(f.AST().(d2ast.MapNode))) } @@ -1458,7 +1572,7 @@ func (m *Map) AST() d2ast.Node { func (m *Map) appendFieldReferences(i int, kp *d2ast.KeyPath, refctx *RefContext, c *compiler) { sb := kp.Path[i] - f := m.GetField(sb.Unbox().ScalarString()) + f := m.GetField(sb.Unbox()) if f == nil { return } @@ -1517,7 +1631,7 @@ func IsVar(n Node) bool { if NodeBoardKind(n) != "" { return false } - if f, ok := n.(*Field); ok && f.Name == "vars" { + if f, ok := n.(*Field); ok && f.Name.ScalarString() == "vars" && f.Name.IsUnquoted() { return true } if n == (*Map)(nil) { @@ -1556,7 +1670,7 @@ func ParentShape(n Node) string { f, ok := n.(*Field) if ok { if f.Map() != nil { - shapef := f.Map().GetField("shape") + shapef := f.Map().GetField(d2ast.FlatUnquotedString("shape")) if shapef != nil && shapef.Primary() != nil { return shapef.Primary().Value.ScalarString() } @@ -1569,30 +1683,30 @@ func ParentShape(n Node) string { } } -func countUnderscores(p []string) int { +func countUnderscores(p []d2ast.String) int { for i, el := range p { - if el != "_" { + if el.ScalarString() != "_" || !el.IsUnquoted() { return i } } return 0 } -func findBoardKeyword(ida ...string) int { +func findBoardKeyword(ida ...d2ast.String) int { for i := range ida { - if _, ok := d2ast.BoardKeywords[ida[i]]; ok { + if _, ok := d2ast.BoardKeywords[strings.ToLower(ida[i].ScalarString())]; ok && ida[i].IsUnquoted() { return i } } return -1 } -func findProhibitedEdgeKeyword(ida ...string) int { +func findProhibitedEdgeKeyword(ida ...d2ast.String) int { for i := range ida { - if _, ok := d2ast.SimpleReservedKeywords[ida[i]]; ok { + if _, ok := d2ast.SimpleReservedKeywords[ida[i].ScalarString()]; ok && ida[i].IsUnquoted() { return i } - if _, ok := d2ast.ReservedKeywordHolders[ida[i]]; ok { + if _, ok := d2ast.ReservedKeywordHolders[ida[i].ScalarString()]; ok && ida[i].IsUnquoted() { return i } } @@ -1636,7 +1750,7 @@ func parentPrimaryKey(n Node) *d2ast.Key { } // BoardIDA returns the absolute path to n from the nearest board root. -func BoardIDA(n Node) (ida []string) { +func BoardIDA(n Node) (ida []d2ast.String) { for { switch n := n.(type) { case *Field: @@ -1657,7 +1771,7 @@ func BoardIDA(n Node) (ida []string) { } // IDA returns the absolute path to n. -func IDA(n Node) (ida []string) { +func IDA(n Node) (ida []d2ast.String) { for { switch n := n.(type) { case *Field: @@ -1678,7 +1792,7 @@ func IDA(n Node) (ida []string) { } // RelIDA returns the path to n relative to p. -func RelIDA(p, n Node) (ida []string) { +func RelIDA(p, n Node) (ida []d2ast.String) { for { switch n := n.(type) { case *Field: @@ -1688,7 +1802,7 @@ func RelIDA(p, n Node) (ida []string) { return ida } case *Edge: - ida = append(ida, n.String()) + ida = append(ida, d2ast.FlatUnquotedString(n.String())) } n = n.Parent() f, fok := n.(*Field) @@ -1700,11 +1814,11 @@ func RelIDA(p, n Node) (ida []string) { } } -func reverseIDA(ida []string) { - for i := 0; i < len(ida)/2; i++ { - tmp := ida[i] - ida[i] = ida[len(ida)-i-1] - ida[len(ida)-i-1] = tmp +func reverseIDA[T any](slice []T) { + for i := 0; i < len(slice)/2; i++ { + tmp := slice[i] + slice[i] = slice[len(slice)-i-1] + slice[len(slice)-i-1] = tmp } } @@ -1779,7 +1893,7 @@ func (m *Map) Equal(n2 Node) bool { } func (m *Map) InClass(key *d2ast.Key) bool { - classes := m.Map().GetField("classes") + classes := m.Map().GetField(d2ast.FlatUnquotedString("classes")) if classes == nil || classes.Map() == nil { return false } @@ -1807,7 +1921,7 @@ func (m *Map) IsClass() bool { if parentBoard.Map() == nil { return false } - classes := parentBoard.Map().GetField("classes") + classes := parentBoard.Map().GetField(d2ast.FlatUnquotedString("classes")) if classes == nil || classes.Map() == nil { return false } @@ -1828,39 +1942,39 @@ func (m *Map) FindBoardRoot(path []string) *Map { return m } - layersf := m.GetField("layers") - scenariosf := m.GetField("scenarios") - stepsf := m.GetField("steps") + layersf := m.GetField(d2ast.FlatUnquotedString("layers")) + scenariosf := m.GetField(d2ast.FlatUnquotedString("scenarios")) + stepsf := m.GetField(d2ast.FlatUnquotedString("steps")) if layersf != nil && layersf.Map() != nil { for _, f := range layersf.Map().Fields { - if f.Name == path[0] { + if f.Name.ScalarString() == path[0] { if len(path) == 1 { return f.Map() } - return layersf.Map().FindBoardRoot(path[1:]) + return f.Map().FindBoardRoot(path[1:]) } } } if scenariosf != nil && scenariosf.Map() != nil { for _, f := range scenariosf.Map().Fields { - if f.Name == path[0] { + if f.Name.ScalarString() == path[0] { if len(path) == 1 { return f.Map() } - return scenariosf.Map().FindBoardRoot(path[1:]) + return f.Map().FindBoardRoot(path[1:]) } } } if stepsf != nil && stepsf.Map() != nil { for _, f := range stepsf.Map().Fields { - if f.Name == path[0] { + if f.Name.ScalarString() == path[0] { if len(path) == 1 { return f.Map() } - return stepsf.Map().FindBoardRoot(path[1:]) + return f.Map().FindBoardRoot(path[1:]) } } } diff --git a/d2ir/d2ir_test.go b/d2ir/d2ir_test.go index c8b34dbc0..cb1b2fc6e 100644 --- a/d2ir/d2ir_test.go +++ b/d2ir/d2ir_test.go @@ -33,7 +33,7 @@ func TestCopy(t *testing.T) { const keyStr = `Absence makes the heart grow frantic.` f := &d2ir.Field{ - Name: keyStr, + Name: d2ast.FlatUnquotedString(keyStr), Primary_: s, Composite: a, @@ -48,10 +48,10 @@ func TestCopy(t *testing.T) { } m = m.Copy(nil).(*d2ir.Map) - f.Name = `Many a wife thinks her husband is the world's greatest lover.` + f.Name = d2ast.FlatUnquotedString(`Many a wife thinks her husband is the world's greatest lover.`) assert.Equal(t, m, m.Fields[0].Parent()) - assert.Equal(t, keyStr, m.Fields[0].Name) + assert.Equal(t, keyStr, m.Fields[0].Name.ScalarString()) assert.Equal(t, m.Fields[0], m.Fields[0].Primary_.Parent()) assert.Equal(t, m.Fields[0], m.Fields[0].Composite.(*d2ir.Array).Parent()) diff --git a/d2ir/import.go b/d2ir/import.go index 6f593c5c7..dff3edbee 100644 --- a/d2ir/import.go +++ b/d2ir/import.go @@ -111,11 +111,66 @@ func (c *compiler) __import(imp *d2ast.Import) (*Map, bool) { c.compileMap(ir, ast, ast) + // We attempt to resolve variables in the imported file scope first + // But ignore errors, in case the variable is meant to be resolved at the + // importer + savedErrors := make([]d2ast.Error, len(c.err.Errors)) + copy(savedErrors, c.err.Errors) + c.compileSubstitutions(ir, nil) + c.err.Errors = savedErrors + c.seenImports[impPath] = struct{}{} return ir, true } +func (c *compiler) peekImport(imp *d2ast.Import) (*Map, bool) { + impPath := imp.PathWithPre() + if impPath == "" && imp.Range != (d2ast.Range{}) { + return nil, false + } + + if len(c.importStack) > 0 { + if path.Ext(impPath) != ".d2" { + impPath += ".d2" + } + + if !filepath.IsAbs(impPath) { + impPath = path.Join(path.Dir(c.importStack[len(c.importStack)-1]), impPath) + } + } + + var f fs.File + var err error + if c.fs == nil { + f, err = os.Open(impPath) + } else { + f, err = c.fs.Open(impPath) + } + if err != nil { + return nil, false + } + defer f.Close() + + // Use a separate parse error to avoid polluting the main one + localErr := &d2parser.ParseError{} + ast, err := d2parser.Parse(impPath, f, &d2parser.ParseOptions{ + UTF16Pos: c.utf16Pos, + ParseError: localErr, + }) + if err != nil { + return nil, false + } + + ir := &Map{} + ir.initRoot() + ir.parent.(*Field).References[0].Context_.Scope = ast + + c.compileMap(ir, ast, ast) + + return ir, true +} + func nilScopeMap(n Node) { switch n := n.(type) { case *Map: diff --git a/d2ir/pattern.go b/d2ir/pattern.go index 474c99d38..a62021342 100644 --- a/d2ir/pattern.go +++ b/d2ir/pattern.go @@ -21,11 +21,14 @@ func (m *Map) multiGlob(pattern []string) ([]*Field, bool) { func (m *Map) _doubleGlob(fa *[]*Field) { for _, f := range m.Fields { - if _, ok := d2ast.ReservedKeywords[f.Name]; ok { - if f.Name == "layers" { + if f.Name == nil { + continue + } + if _, ok := d2ast.ReservedKeywords[f.Name.ScalarString()]; ok && f.Name.IsUnquoted() { + if f.Name.ScalarString() == "layers" { continue } - if _, ok := d2ast.BoardKeywords[f.Name]; !ok { + if _, ok := d2ast.BoardKeywords[f.Name.ScalarString()]; !ok { continue } // We don't ever want to append layers, scenarios or steps directly. @@ -45,8 +48,8 @@ func (m *Map) _doubleGlob(fa *[]*Field) { func (m *Map) _tripleGlob(fa *[]*Field) { for _, f := range m.Fields { - if _, ok := d2ast.ReservedKeywords[f.Name]; ok { - if _, ok := d2ast.BoardKeywords[f.Name]; !ok { + if _, ok := d2ast.ReservedKeywords[f.Name.ScalarString()]; ok && f.Name.IsUnquoted() { + if _, ok := d2ast.BoardKeywords[f.Name.ScalarString()]; !ok { continue } // We don't ever want to append layers, scenarios or steps directly. diff --git a/d2js/d2wasm/api.go b/d2js/d2wasm/api.go new file mode 100644 index 000000000..e87386cd6 --- /dev/null +++ b/d2js/d2wasm/api.go @@ -0,0 +1,71 @@ +//go:build js && wasm + +package d2wasm + +import ( + "encoding/json" + "fmt" + "runtime/debug" + "syscall/js" +) + +type D2API struct { + exports map[string]js.Func +} + +func NewD2API() *D2API { + return &D2API{ + exports: make(map[string]js.Func), + } +} + +func (api *D2API) Register(name string, fn func(args []js.Value) (interface{}, error)) { + api.exports[name] = wrapWASMCall(fn) +} + +func (api *D2API) ExportTo(target js.Value) { + d2Namespace := make(map[string]interface{}) + for name, fn := range api.exports { + d2Namespace[name] = fn + } + target.Set("d2", js.ValueOf(d2Namespace)) +} + +func wrapWASMCall(fn func(args []js.Value) (interface{}, error)) js.Func { + return js.FuncOf(func(this js.Value, args []js.Value) (result any) { + defer func() { + if r := recover(); r != nil { + resp := WASMResponse{ + Error: &WASMError{ + Message: fmt.Sprintf("panic recovered: %v\n%s", r, debug.Stack()), + Code: 500, + }, + } + jsonResp, _ := json.Marshal(resp) + result = string(jsonResp) + } + }() + + data, err := fn(args) + if err != nil { + wasmErr, ok := err.(*WASMError) + if !ok { + wasmErr = &WASMError{ + Message: err.Error(), + Code: 500, + } + } + resp := WASMResponse{ + Error: wasmErr, + } + jsonResp, _ := json.Marshal(resp) + return string(jsonResp) + } + + resp := WASMResponse{ + Data: data, + } + jsonResp, _ := json.Marshal(resp) + return string(jsonResp) + }) +} diff --git a/d2js/d2wasm/functions.go b/d2js/d2wasm/functions.go new file mode 100644 index 000000000..ca36e08fa --- /dev/null +++ b/d2js/d2wasm/functions.go @@ -0,0 +1,544 @@ +//go:build js && wasm + +package d2wasm + +import ( + "context" + "encoding/json" + "fmt" + "strings" + "syscall/js" + + "oss.terrastruct.com/d2/d2ast" + "oss.terrastruct.com/d2/d2compiler" + "oss.terrastruct.com/d2/d2format" + "oss.terrastruct.com/d2/d2graph" + "oss.terrastruct.com/d2/d2layouts/d2dagrelayout" + "oss.terrastruct.com/d2/d2layouts/d2elklayout" + "oss.terrastruct.com/d2/d2lib" + "oss.terrastruct.com/d2/d2lsp" + "oss.terrastruct.com/d2/d2oracle" + "oss.terrastruct.com/d2/d2parser" + "oss.terrastruct.com/d2/d2renderers/d2animate" + "oss.terrastruct.com/d2/d2renderers/d2fonts" + "oss.terrastruct.com/d2/d2renderers/d2svg" + "oss.terrastruct.com/d2/d2renderers/d2svg/appendix" + "oss.terrastruct.com/d2/d2target" + "oss.terrastruct.com/d2/lib/log" + "oss.terrastruct.com/d2/lib/memfs" + "oss.terrastruct.com/d2/lib/textmeasure" + "oss.terrastruct.com/d2/lib/urlenc" + "oss.terrastruct.com/d2/lib/version" +) + +const DEFAULT_INPUT_PATH = "index" + +func GetParentID(args []js.Value) (interface{}, error) { + if len(args) < 1 { + return nil, &WASMError{Message: "missing id argument", Code: 400} + } + + id := args[0].String() + mk, err := d2parser.ParseMapKey(id) + if err != nil { + return nil, &WASMError{Message: err.Error(), Code: 400} + } + + if len(mk.Edges) > 0 { + return "", nil + } + + if mk.Key != nil { + if len(mk.Key.Path) == 1 { + return "root", nil + } + mk.Key.Path = mk.Key.Path[:len(mk.Key.Path)-1] + return strings.Join(mk.Key.StringIDA(), "."), nil + } + + return "", nil +} + +func GetObjOrder(args []js.Value) (interface{}, error) { + if len(args) < 1 { + return nil, &WASMError{Message: "missing dsl argument", Code: 400} + } + + dsl := args[0].String() + g, _, err := d2compiler.Compile("", strings.NewReader(dsl), &d2compiler.CompileOptions{ + UTF16Pos: true, + }) + if err != nil { + return nil, &WASMError{Message: err.Error(), Code: 400} + } + + objOrder, err := d2oracle.GetObjOrder(g, nil) + if err != nil { + return nil, &WASMError{Message: err.Error(), Code: 500} + } + + return map[string]interface{}{ + "order": objOrder, + }, nil +} + +func GetRefRanges(args []js.Value) (interface{}, error) { + if len(args) < 4 { + return nil, &WASMError{Message: "missing required arguments", Code: 400} + } + + var fs map[string]string + if err := json.Unmarshal([]byte(args[0].String()), &fs); err != nil { + return nil, &WASMError{Message: "invalid fs argument", Code: 400} + } + + file := args[1].String() + key := args[2].String() + + var boardPath []string + if err := json.Unmarshal([]byte(args[3].String()), &boardPath); err != nil { + return nil, &WASMError{Message: "invalid boardPath argument", Code: 400} + } + + ranges, importRanges, err := d2lsp.GetRefRanges(file, fs, boardPath, key) + if err != nil { + return nil, &WASMError{Message: err.Error(), Code: 500} + } + + return RefRangesResponse{ + Ranges: ranges, + ImportRanges: importRanges, + }, nil +} + +func GetELKGraph(args []js.Value) (interface{}, error) { + if len(args) < 1 { + return nil, &WASMError{Message: "missing JSON argument", Code: 400} + } + var input CompileRequest + if err := json.Unmarshal([]byte(args[0].String()), &input); err != nil { + return nil, &WASMError{Message: "invalid JSON input", Code: 400} + } + + if input.FS == nil { + return nil, &WASMError{Message: "missing 'fs' field in input JSON", Code: 400} + } + + inputPath := DEFAULT_INPUT_PATH + + if input.InputPath != nil { + inputPath = *input.InputPath + } + + if _, ok := input.FS[inputPath]; !ok { + return nil, &WASMError{Message: fmt.Sprintf("missing '%s' file in input fs", inputPath), Code: 400} + } + + fs, err := memfs.New(input.FS) + if err != nil { + return nil, &WASMError{Message: fmt.Sprintf("invalid fs input: %s", err.Error()), Code: 400} + } + + g, _, err := d2compiler.Compile(inputPath, strings.NewReader(input.FS[inputPath]), &d2compiler.CompileOptions{ + UTF16Pos: true, + FS: fs, + }) + if err != nil { + return nil, &WASMError{Message: err.Error(), Code: 400} + } + + ruler, err := textmeasure.NewRuler() + if err != nil { + return nil, &WASMError{Message: fmt.Sprintf("text ruler cannot be initialized: %s", err.Error()), Code: 500} + } + err = g.SetDimensions(nil, ruler, nil) + if err != nil { + return nil, err + } + + elk, err := d2elklayout.ConvertGraph(context.Background(), g, nil) + if err != nil { + return nil, &WASMError{Message: err.Error(), Code: 400} + } + return elk, nil +} + +func Compile(args []js.Value) (interface{}, error) { + if len(args) < 1 { + return nil, &WASMError{Message: "missing JSON argument", Code: 400} + } + var input CompileRequest + if err := json.Unmarshal([]byte(args[0].String()), &input); err != nil { + return nil, &WASMError{Message: "invalid JSON input", Code: 400} + } + + if input.FS == nil { + return nil, &WASMError{Message: "missing 'fs' field in input JSON", Code: 400} + } + + compileOpts := &d2lib.CompileOptions{ + UTF16Pos: true, + } + + inputPath := DEFAULT_INPUT_PATH + + if input.InputPath != nil { + inputPath = *input.InputPath + } + + if _, ok := input.FS[inputPath]; !ok { + return nil, &WASMError{Message: fmt.Sprintf("missing '%s' file in input fs", inputPath), Code: 400} + } + + compileOpts.InputPath = inputPath + + compileOpts.LayoutResolver = func(engine string) (d2graph.LayoutGraph, error) { + switch engine { + case "dagre": + return d2dagrelayout.DefaultLayout, nil + case "elk": + return d2elklayout.DefaultLayout, nil + default: + return nil, &WASMError{Message: fmt.Sprintf("layout option '%s' not recognized", engine), Code: 400} + } + } + + var err error + compileOpts.FS, err = memfs.New(input.FS) + if err != nil { + return nil, &WASMError{Message: fmt.Sprintf("invalid fs input: %s", err.Error()), Code: 400} + } + + var fontRegular []byte + var fontItalic []byte + var fontBold []byte + var fontSemibold []byte + if input.Opts != nil && (input.Opts.FontRegular != nil) { + fontRegular = *input.Opts.FontRegular + } + if input.Opts != nil && (input.Opts.FontItalic != nil) { + fontItalic = *input.Opts.FontItalic + } + if input.Opts != nil && (input.Opts.FontBold != nil) { + fontBold = *input.Opts.FontBold + } + if input.Opts != nil && (input.Opts.FontSemibold != nil) { + fontSemibold = *input.Opts.FontSemibold + } + if fontRegular != nil || fontItalic != nil || fontBold != nil || fontSemibold != nil { + fontFamily, err := d2fonts.AddFontFamily("custom", fontRegular, fontItalic, fontBold, fontSemibold) + if err != nil { + return nil, &WASMError{Message: fmt.Sprintf("custom fonts could not be initialized: %s", err.Error()), Code: 400} + } + compileOpts.FontFamily = fontFamily + } + + compileOpts.Ruler, err = textmeasure.NewRuler() + if err != nil { + return nil, &WASMError{Message: fmt.Sprintf("text ruler cannot be initialized: %s", err.Error()), Code: 500} + } + + if input.Opts != nil && input.Opts.Layout != nil { + compileOpts.Layout = input.Opts.Layout + } + + renderOpts := &d2svg.RenderOpts{} + if input.Opts != nil && input.Opts.Sketch != nil { + renderOpts.Sketch = input.Opts.Sketch + } + if input.Opts != nil && input.Opts.Pad != nil { + renderOpts.Pad = input.Opts.Pad + } + if input.Opts != nil && input.Opts.Center != nil { + renderOpts.Center = input.Opts.Center + } + if input.Opts != nil && input.Opts.ThemeID != nil { + renderOpts.ThemeID = input.Opts.ThemeID + } + if input.Opts != nil && input.Opts.DarkThemeID != nil { + renderOpts.DarkThemeID = input.Opts.DarkThemeID + } + if input.Opts != nil && input.Opts.Scale != nil { + renderOpts.Scale = input.Opts.Scale + } + + ctx := log.WithDefault(context.Background()) + diagram, g, err := d2lib.Compile(ctx, input.FS[inputPath], compileOpts, renderOpts) + if err != nil { + if pe, ok := err.(*d2parser.ParseError); ok { + errs, _ := json.Marshal(pe.Errors) + return nil, &WASMError{Message: string(errs), Code: 400} + } + return nil, &WASMError{Message: err.Error(), Code: 500} + } + + input.FS[inputPath] = d2format.Format(g.AST) + + return CompileResponse{ + FS: input.FS, + InputPath: inputPath, + Diagram: *diagram, + Graph: *g, + RenderOptions: RenderOptions{ + ThemeID: renderOpts.ThemeID, + DarkThemeID: renderOpts.DarkThemeID, + Sketch: renderOpts.Sketch, + Pad: renderOpts.Pad, + Center: renderOpts.Center, + Scale: renderOpts.Scale, + ForceAppendix: input.Opts.ForceAppendix, + Target: input.Opts.Target, + AnimateInterval: input.Opts.AnimateInterval, + Salt: input.Opts.Salt, + NoXMLTag: input.Opts.NoXMLTag, + }, + }, nil +} + +func Render(args []js.Value) (interface{}, error) { + if len(args) < 1 { + return nil, &WASMError{Message: "missing JSON argument", Code: 400} + } + var input RenderRequest + if err := json.Unmarshal([]byte(args[0].String()), &input); err != nil { + return nil, &WASMError{Message: "invalid JSON input", Code: 400} + } + + if input.Diagram == nil { + return nil, &WASMError{Message: "missing 'diagram' field in input JSON", Code: 400} + } + + animateInterval := 0 + if input.Opts != nil && input.Opts.AnimateInterval != nil && *input.Opts.AnimateInterval > 0 { + animateInterval = int(*input.Opts.AnimateInterval) + } + + var boardPath []string + noChildren := true + + if input.Opts.Target != nil { + switch *input.Opts.Target { + case "*": + noChildren = false + case "": + default: + target := *input.Opts.Target + if strings.HasSuffix(target, ".*") { + target = target[:len(target)-2] + noChildren = false + } + key, err := d2parser.ParseKey(target) + if err != nil { + return nil, &WASMError{Message: fmt.Sprintf("target '%s' not recognized", target), Code: 400} + } + boardPath = key.StringIDA() + } + if !noChildren && animateInterval <= 0 { + return nil, &WASMError{Message: fmt.Sprintf("target '%s' only supported for animated SVGs", *input.Opts.Target), Code: 500} + } + } + + diagram := input.Diagram.GetBoard(boardPath) + if diagram == nil { + return nil, &WASMError{Message: fmt.Sprintf("render target '%s' not found", strings.Join(boardPath, ".")), Code: 400} + } + if noChildren { + diagram.Layers = nil + diagram.Scenarios = nil + diagram.Steps = nil + } + + renderOpts := &d2svg.RenderOpts{} + + if input.Opts != nil && input.Opts.Salt != nil { + renderOpts.Salt = input.Opts.Salt + } + + if animateInterval > 0 { + masterID, err := diagram.HashID(renderOpts.Salt) + if err != nil { + return nil, &WASMError{Message: fmt.Sprintf("cannot process animate interval: %s", err.Error()), Code: 500} + } + renderOpts.MasterID = masterID + } + + ruler, err := textmeasure.NewRuler() + if err != nil { + return nil, &WASMError{Message: fmt.Sprintf("text ruler cannot be initialized: %s", err.Error()), Code: 500} + } + + if input.Opts != nil && input.Opts.Sketch != nil { + renderOpts.Sketch = input.Opts.Sketch + } + if input.Opts != nil && input.Opts.Pad != nil { + renderOpts.Pad = input.Opts.Pad + } + if input.Opts != nil && input.Opts.Center != nil { + renderOpts.Center = input.Opts.Center + } + if input.Opts != nil && input.Opts.ThemeID != nil { + renderOpts.ThemeID = input.Opts.ThemeID + } + if input.Opts != nil && input.Opts.DarkThemeID != nil { + renderOpts.DarkThemeID = input.Opts.DarkThemeID + } + if input.Opts != nil && input.Opts.Scale != nil { + renderOpts.Scale = input.Opts.Scale + } + if input.Opts != nil && input.Opts.NoXMLTag != nil { + renderOpts.NoXMLTag = input.Opts.NoXMLTag + } + + forceAppendix := input.Opts != nil && input.Opts.ForceAppendix != nil && *input.Opts.ForceAppendix + + var boards [][]byte + if noChildren { + var board []byte + board, err = renderSingleBoard(renderOpts, forceAppendix, ruler, diagram) + boards = [][]byte{board} + } else { + boards, err = renderBoards(renderOpts, forceAppendix, ruler, diagram) + } + if err != nil { + return nil, &WASMError{Message: fmt.Sprintf("render failed: %s", err.Error()), Code: 500} + } + + var out []byte + if len(boards) > 0 { + out = boards[0] + if animateInterval > 0 { + out, err = d2animate.Wrap(diagram, boards, *renderOpts, animateInterval) + if err != nil { + return nil, &WASMError{Message: fmt.Sprintf("animation failed: %s", err.Error()), Code: 500} + } + } + } + return out, nil +} + +func renderSingleBoard(opts *d2svg.RenderOpts, forceAppendix bool, ruler *textmeasure.Ruler, diagram *d2target.Diagram) ([]byte, error) { + out, err := d2svg.Render(diagram, opts) + if err != nil { + return nil, &WASMError{Message: fmt.Sprintf("render failed: %s", err.Error()), Code: 500} + } + if forceAppendix { + out = appendix.Append(diagram, opts, ruler, out) + } + return out, nil +} + +func renderBoards(opts *d2svg.RenderOpts, forceAppendix bool, ruler *textmeasure.Ruler, diagram *d2target.Diagram) ([][]byte, error) { + var boards [][]byte + for _, dl := range diagram.Layers { + childrenBoards, err := renderBoards(opts, forceAppendix, ruler, dl) + if err != nil { + return nil, err + } + boards = append(boards, childrenBoards...) + } + for _, dl := range diagram.Scenarios { + childrenBoards, err := renderBoards(opts, forceAppendix, ruler, dl) + if err != nil { + return nil, err + } + boards = append(boards, childrenBoards...) + } + for _, dl := range diagram.Steps { + childrenBoards, err := renderBoards(opts, forceAppendix, ruler, dl) + if err != nil { + return nil, err + } + boards = append(boards, childrenBoards...) + } + + if !diagram.IsFolderOnly { + out, err := renderSingleBoard(opts, forceAppendix, ruler, diagram) + if err != nil { + return boards, err + } + boards = append([][]byte{out}, boards...) + } + return boards, nil +} + +func GetBoardAtPosition(args []js.Value) (interface{}, error) { + if len(args) < 3 { + return nil, &WASMError{Message: "missing required arguments", Code: 400} + } + + dsl := args[0].String() + line := args[1].Int() + column := args[2].Int() + + boardPath, err := d2lsp.GetBoardAtPosition(dsl, d2ast.Position{ + Line: line, + Column: column, + }) + if err != nil { + return nil, &WASMError{Message: err.Error(), Code: 500} + } + + return BoardPositionResponse{BoardPath: boardPath}, nil +} + +func Encode(args []js.Value) (interface{}, error) { + if len(args) < 1 { + return nil, &WASMError{Message: "missing script argument", Code: 400} + } + + script := args[0].String() + encoded, err := urlenc.Encode(script) + // should never happen + if err != nil { + return nil, &WASMError{Message: err.Error(), Code: 500} + } + + return map[string]string{"result": encoded}, nil +} + +func Decode(args []js.Value) (interface{}, error) { + if len(args) < 1 { + return nil, &WASMError{Message: "missing script argument", Code: 400} + } + + script := args[0].String() + script, err := urlenc.Decode(script) + if err != nil { + return nil, &WASMError{Message: err.Error(), Code: 500} + } + return map[string]string{"result": script}, nil +} + +func GetVersion(args []js.Value) (interface{}, error) { + return version.Version, nil +} + +func GetCompletions(args []js.Value) (interface{}, error) { + if len(args) < 3 { + return nil, &WASMError{Message: "missing required arguments", Code: 400} + } + + text := args[0].String() + line := args[1].Int() + column := args[2].Int() + + completions, err := d2lsp.GetCompletionItems(text, line, column) + if err != nil { + return nil, &WASMError{Message: err.Error(), Code: 500} + } + + // Convert to map for JSON serialization + items := make([]map[string]interface{}, len(completions)) + for i, completion := range completions { + items[i] = map[string]interface{}{ + "label": completion.Label, + "kind": int(completion.Kind), + "detail": completion.Detail, + "insertText": completion.InsertText, + } + } + + return CompletionResponse{ + Items: items, + }, nil +} diff --git a/d2js/d2wasm/types.go b/d2js/d2wasm/types.go new file mode 100644 index 000000000..68550958c --- /dev/null +++ b/d2js/d2wasm/types.go @@ -0,0 +1,78 @@ +//go:build js && wasm + +package d2wasm + +import ( + "oss.terrastruct.com/d2/d2ast" + "oss.terrastruct.com/d2/d2graph" + "oss.terrastruct.com/d2/d2target" +) + +type WASMResponse struct { + Data interface{} `json:"data,omitempty"` + Error *WASMError `json:"error,omitempty"` +} + +type WASMError struct { + Message string `json:"message"` + Code int `json:"code"` +} + +func (e *WASMError) Error() string { + return e.Message +} + +type RefRangesResponse struct { + Ranges []d2ast.Range `json:"ranges"` + ImportRanges []d2ast.Range `json:"importRanges"` +} + +type BoardPositionResponse struct { + BoardPath []string `json:"boardPath"` +} + +type CompileRequest struct { + FS map[string]string `json:"fs"` + InputPath *string `json:"inputPath"` + Opts *CompileOptions `json:"options"` +} + +type RenderOptions struct { + Pad *int64 `json:"pad"` + Sketch *bool `json:"sketch"` + Center *bool `json:"center"` + ThemeID *int64 `json:"themeID"` + DarkThemeID *int64 `json:"darkThemeID"` + Scale *float64 `json:"scale"` + ForceAppendix *bool `json:"forceAppendix"` + Target *string `json:"target"` + AnimateInterval *int64 `json:"animateInterval"` + Salt *string `json:"salt"` + NoXMLTag *bool `json:"noXMLTag"` +} + +type CompileOptions struct { + RenderOptions + Layout *string `json:"layout"` + FontRegular *[]byte `json:"FontRegular"` + FontItalic *[]byte `json:"FontItalic"` + FontBold *[]byte `json:"FontBold"` + FontSemibold *[]byte `json:"FontSemibold"` +} + +type CompileResponse struct { + FS map[string]string `json:"fs"` + InputPath string `json:"inputPath"` + Diagram d2target.Diagram `json:"diagram"` + Graph d2graph.Graph `json:"graph"` + RenderOptions RenderOptions `json:"renderOptions"` +} + +type CompletionResponse struct { + Items []map[string]interface{} `json:"items"` +} + +type RenderRequest struct { + Diagram *d2target.Diagram `json:"diagram"` + Opts *RenderOptions `json:"options"` +} diff --git a/d2js/js.go b/d2js/js.go new file mode 100644 index 000000000..3d449ddfb --- /dev/null +++ b/d2js/js.go @@ -0,0 +1,32 @@ +//go:build js && wasm + +package main + +import ( + "syscall/js" + + "oss.terrastruct.com/d2/d2js/d2wasm" +) + +func main() { + api := d2wasm.NewD2API() + + api.Register("getCompletions", d2wasm.GetCompletions) + api.Register("getParentID", d2wasm.GetParentID) + api.Register("getObjOrder", d2wasm.GetObjOrder) + api.Register("getRefRanges", d2wasm.GetRefRanges) + api.Register("getELKGraph", d2wasm.GetELKGraph) + api.Register("compile", d2wasm.Compile) + api.Register("render", d2wasm.Render) + api.Register("getBoardAtPosition", d2wasm.GetBoardAtPosition) + api.Register("encode", d2wasm.Encode) + api.Register("decode", d2wasm.Decode) + api.Register("version", d2wasm.GetVersion) + + api.ExportTo(js.Global()) + + if cb := js.Global().Get("onWasmInitialized"); !cb.IsUndefined() { + cb.Invoke() + } + select {} +} diff --git a/d2js/js/.gitignore b/d2js/js/.gitignore new file mode 100644 index 000000000..3d458b49a --- /dev/null +++ b/d2js/js/.gitignore @@ -0,0 +1,28 @@ +node_modules +.npm +bun.lockb + +src/wasm-loader.browser.js +wasm/d2.wasm +dist/ + +.vscode/ +.idea/ +*.swp +*.swo +.DS_Store +Thumbs.db + +logs +*.log +npm-debug.log* + +coverage/ + +.env +.env.local +.env.*.local + +*.tmp +*.temp +.cache/ diff --git a/d2js/js/.prettierignore b/d2js/js/.prettierignore new file mode 100644 index 000000000..96bbfb74b --- /dev/null +++ b/d2js/js/.prettierignore @@ -0,0 +1 @@ +src/platform.browser.js diff --git a/d2js/js/CHANGELOG.md b/d2js/js/CHANGELOG.md new file mode 100644 index 000000000..18767b5cc --- /dev/null +++ b/d2js/js/CHANGELOG.md @@ -0,0 +1,31 @@ +# Changelog + +All notable changes to only the d2.js package will be documented in this file. **Does not +include changes to the main d2 project.** + +## Next + +- Fix TypeScript signatures + +## [0.1.22] +### March 20, 2025 + +- Support `d2-config`. Support additional options. [#2343](https://github.com/terrastruct/d2/pull/2343) + - `themeID` + - `darkThemeID` + - `center` + - `pad` + - `scale` + - `forceAppendix` + - `target` + - `animateInterval` + - `salt` + - `noXMLTag` +- Support relative imports. Improve elk error handling [#2382](https://github.com/terrastruct/d2/pull/2382) +- Support fonts (`fontRegular`, `fontItalic`, `fontBold`, `fontSemiBold`) [#2384](https://github.com/terrastruct/d2/pull/2384) +- Add TypeScript signatures + +## [0.1.21] +### January 12, 2025 + +First public release diff --git a/d2js/js/Makefile b/d2js/js/Makefile new file mode 100644 index 000000000..7ffc32798 --- /dev/null +++ b/d2js/js/Makefile @@ -0,0 +1,29 @@ +.POSIX: +.PHONY: all +all: fmt build test cleanup + +.PHONY: fmt +fmt: node_modules + prefix "$@" ../../ci/sub/bin/fmt.sh + prefix "$@" rm -f yarn.lock + +.PHONY: build +build: fmt + prefix "$@" ./ci/build.sh + +.PHONY: dev +dev: build + prefix "$@" git checkout -- src/platform.js src/worker.js + prefix "$@" bun run dev + +.PHONY: test +test: build + prefix "$@" bun test:all + +.PHONY: node_modules +node_modules: + prefix "$@" bun install $${CI:+--frozen-lockfile} + +.PHONY: cleanup +cleanup: test + prefix "$@" git checkout -- src/platform.js src/worker.js diff --git a/d2js/js/README.md b/d2js/js/README.md new file mode 100644 index 000000000..1b7298245 --- /dev/null +++ b/d2js/js/README.md @@ -0,0 +1,193 @@ +# D2.js + +[![npm version](https://badge.fury.io/js/%40terrastruct%2Fd2.svg)](https://www.npmjs.com/package/@terrastruct/d2) +[![License: MPL-2.0](https://img.shields.io/badge/License-MPL_2.0-brightgreen.svg)](https://mozilla.org/MPL/2.0/) + +D2.js is a JavaScript wrapper around D2, the modern diagram scripting language. It enables running D2 directly in browsers and Node environments through WebAssembly. + +## Features + +- 🌐 **Universal** - Works in both browser and Node environments +- 🚀 **Modern** - Built with ESM modules, with CJS fallback +- 🔄 **Isomorphic** - Same API everywhere +- ⚡ **Fast** - Powered by WebAssembly for near-native performance +- 📦 **Lightweight** - Minimal wrapper around the core D2 engine + +## Installation + +```bash +# npm +npm install @terrastruct/d2 + +# yarn +yarn add @terrastruct/d2 + +# pnpm +pnpm add @terrastruct/d2 + +# bun +bun add @terrastruct/d2 +``` + +### Nightly + +Use the `@nightly` tag to get the version that is built by daily CI on the master branch. + +For example, + +```bash +yarn add @terrastruct/d2@nightly +``` + +A demo using the nightly build is hosted [here](https://alixander-d2js.web.val.run/). + +## Usage + +D2.js uses webworkers to call a WASM file. + +### Basic Usage + +```javascript +// Same for Node or browser +import { D2 } from '@terrastruct/d2'; +// Or using a CDN +// import { D2 } from 'https://esm.sh/@terrastruct/d2'; + +const d2 = new D2(); + +const result = await d2.compile('x -> y'); +const svg = await d2.render(result.diagram, result.renderOptions); +``` + +Configuring render options (see [CompileOptions](#compileoptions) for all available options): + +```javascript +import { D2 } from '@terrastruct/d2'; + +const d2 = new D2(); + +const result = await d2.compile('x -> y', { + sketch: true, +}); +const svg = await d2.render(result.diagram, result.renderOptions); +``` + +### Imports + +In order to support [imports](https://d2lang.com/tour/imports), a mapping of D2 file paths to their content can be passed to the compiler. + +```javascript +import { D2 } from '@terrastruct/d2'; + +const d2 = new D2(); + +const fs = { + "project.d2": "a: @import", + "import.d2": "x: {shape: circle}", +} + +const result = await d2.compile({ + fs, + inputPath: "project.d2", + options: { + sketch: true + } +}); +const svg = await d2.render(result.diagram, result.renderOptions); +``` + +## API Reference + +### `new D2()` + +Creates a new D2 instance. + +### `compile(input: string | CompileRequest, options?: CompileOptions): Promise` + +Compiles D2 markup into an intermediate representation. It compile options are provided in both `input` and `options`, the latter will take precedence. + +### `render(diagram: Diagram, options?: RenderOptions): Promise` + +Renders a compiled diagram to SVG. + +### `CompileOptions` + +All [RenderOptions](#renderoptions) properties in addition to: + +- `layout`: Layout engine to use ('dagre' | 'elk') [default: 'dagre'] +- `fontRegular` A byte array containing .ttf file to use for the regular font. If none provided, Source Sans Pro Regular is used. +- `fontItalic` A byte array containing .ttf file to use for the italic font. If none provided, Source Sans Pro Italic is used. +- `fontBold` A byte array containing .ttf file to use for the bold font. If none provided, Source Sans Pro Bold is used. +- `fontSemibold` A byte array containing .ttf file to use for the semibold font. If none provided, Source Sans Pro Semibold is used. + +### `RenderOptions` + +- `sketch`: Enable sketch mode [default: false] +- `themeID`: Theme ID to use [default: 0] +- `darkThemeID`: Theme ID to use when client is in dark mode +- `center`: Center the SVG in the containing viewbox [default: false] +- `pad`: Pixels padded around the rendered diagram [default: 100] +- `scale`: Scale the output. E.g., 0.5 to halve the default size. The default will render SVG's that will fit to screen. Setting to 1 turns off SVG fitting to screen. +- `forceAppendix`: Adds an appendix for tooltips and links [default: false] +- `target`: Target board/s to render. If target ends with '*', it will be rendered with all of its scenarios, steps, and layers. Otherwise, only the target board will be rendered. E.g. `target: 'layers.x.*'` to render layer 'x' with all of its children. Pass '*' to render all scenarios, steps, and layers. By default, only the root board is rendered. Multi-board outputs are currently only supported for animated SVGs and so `animateInterval` must be set to a value greater than 0 when targeting multiple boards. +- `animateInterval`: If given, multiple boards are packaged as 1 SVG which transitions through each board at the interval (in milliseconds). +- `salt`: Add a salt value to ensure the output uses unique IDs. This is useful when generating multiple identical diagrams to be included in the same HTML doc, so that duplicate IDs do not cause invalid HTML. The salt value is a string that will be appended to IDs in the output. +- `noXMLTag`: Omit XML tag `()` from output SVG files. Useful when generating SVGs for direct HTML embedding. + +### `CompileRequest` + +- `fs`: A mapping of D2 file paths to their content +- `inputPath`: The path of the entry D2 file [default: index] +- `options`: The [CompileOptions](#compileoptions) to pass to the compiler + +### `CompileResult` + +- `diagram`: `Diagram`: Compiled D2 diagram +- `options`: `RenderOptions`: Render options merged with configuration set in diagram +- `fs` +- `graph` + +## Development + +D2.js uses Bun, so install this first. + +### Building from source + +```bash +git clone https://github.com/terrastruct/d2.git +cd d2/d2js/js +./make.sh all +``` + +If you change the main D2 source code, you should regenerate the WASM file: +```bash +./make.sh build +``` + +### Running the dev server + +You can browse the examples by running the dev server: + +```bash +./make.sh dev +``` + +Visit `http://localhost:3000` to see the example page. + +### Publishing + +TODO stable release publishing. + +Nightly builds are automated by CI by running: + +```bash +PUBLISH=1 ./make.sh build +``` + +## Contributing + +Contributions are welcome! + +## License + +This project is licensed under the Mozilla Public License Version 2.0. diff --git a/d2js/js/build.js b/d2js/js/build.js new file mode 100644 index 000000000..c445f49d4 --- /dev/null +++ b/d2js/js/build.js @@ -0,0 +1,107 @@ +import { build } from "bun"; +import { copyFile, mkdir, writeFile, readFile, rm } from "node:fs/promises"; +import { join, resolve } from "node:path"; + +const __dirname = new URL(".", import.meta.url).pathname; +const ROOT_DIR = resolve(__dirname); +const SRC_DIR = resolve(ROOT_DIR, "src"); + +await rm("./dist", { recursive: true, force: true }); +await mkdir("./dist/browser", { recursive: true }); +await mkdir("./dist/node-esm", { recursive: true }); +await mkdir("./dist/node-cjs", { recursive: true }); + +const wasmBinary = await readFile("./wasm/d2.wasm"); +const wasmExecJs = await readFile("./wasm/wasm_exec.js", "utf8"); + +await writeFile( + join(SRC_DIR, "wasm-loader.browser.js"), + `export const wasmBinary = Uint8Array.from(atob("${Buffer.from(wasmBinary).toString( + "base64" + )}"), c => c.charCodeAt(0)); + export const wasmExecJs = ${JSON.stringify(wasmExecJs)};` +); + +const commonConfig = { + minify: true, +}; + +async function buildDynamicFiles(platform) { + const platformContent = + platform === "node" + ? `export * from "./platform.node.js";` + : `export * from "./platform.browser.js";`; + + const platformPath = join(SRC_DIR, "platform.js"); + await writeFile(platformPath, platformContent); + + const workerSource = + platform === "node" + ? join(SRC_DIR, "worker.node.js") + : join(SRC_DIR, "worker.browser.js"); + + const workerTarget = join(SRC_DIR, "worker.js"); + const workerContent = await readFile(workerSource, "utf8"); + await writeFile(workerTarget, workerContent); +} + +async function buildAndCopy(buildType) { + const configs = { + browser: { + outdir: resolve(ROOT_DIR, "dist/browser"), + splitting: false, + format: "esm", + target: "browser", + platform: "browser", + entrypoints: [resolve(SRC_DIR, "index.js")], + }, + "node-esm": { + outdir: resolve(ROOT_DIR, "dist/node-esm"), + splitting: true, + format: "esm", + target: "node", + platform: "node", + entrypoints: [resolve(SRC_DIR, "index.js"), resolve(SRC_DIR, "worker.js")], + }, + "node-cjs": { + outdir: resolve(ROOT_DIR, "dist/node-cjs"), + splitting: false, + format: "cjs", + target: "node", + platform: "node", + entrypoints: [resolve(SRC_DIR, "index.js"), resolve(SRC_DIR, "worker.js")], + }, + }; + + const config = configs[buildType]; + await buildDynamicFiles(config.platform); + + const result = await build({ + ...commonConfig, + ...config, + }); + + if (!result.outputs || result.outputs.length === 0) { + throw new Error( + `No outputs generated for ${buildType} build. Result: ${JSON.stringify(result)}` + ); + } + + if (buildType !== "browser") { + await copyFile(resolve(ROOT_DIR, "wasm/d2.wasm"), join(config.outdir, "d2.wasm")); + await copyFile( + resolve(ROOT_DIR, "wasm/wasm_exec.js"), + join(config.outdir, "wasm_exec.js") + ); + await copyFile(resolve(ROOT_DIR, "src/elk.js"), join(config.outdir, "elk.js")); + } +} + +try { + await buildAndCopy("browser"); + await buildAndCopy("node-esm"); + await buildAndCopy("node-cjs"); +} catch (error) { + console.error("Build failed:", error); + process.exit(1); +} diff --git a/d2js/js/bun.lockb b/d2js/js/bun.lockb new file mode 100755 index 000000000..c2ef20a7e Binary files /dev/null and b/d2js/js/bun.lockb differ diff --git a/d2js/js/ci/build.sh b/d2js/js/ci/build.sh new file mode 100755 index 000000000..87a692196 --- /dev/null +++ b/d2js/js/ci/build.sh @@ -0,0 +1,75 @@ +#!/bin/sh +set -eu +. "$(dirname "$0")/../../../ci/sub/lib.sh" +cd -- "$(dirname "$0")/.." + +cd ../.. +sh_c "GOOS=js GOARCH=wasm go build -ldflags='-s -w' -trimpath -o main.wasm ./d2js" +sh_c "mv main.wasm ./d2js/js/wasm/d2.wasm" + +if [ ! -f ./d2js/js/wasm/d2.wasm ]; then + echoerr "Error: d2.wasm is missing" + exit 1 +else + echo "d2.wasm exists. Size:" + ls -lh ./d2js/js/wasm/d2.wasm | awk '{print $5}' +fi + +cd d2js/js +sh_c bun build.js + +if [ -n "${NPM_VERSION:-}" ]; then + cp package.json package.json.bak + trap 'rm -f .npmrc; mv package.json.bak package.json' EXIT + + if [ "$NPM_VERSION" = "nightly" ]; then + echo "Publishing nightly version to npm..." + + DATE_TAG=$(date +'%Y%m%d') + COMMIT_SHORT=$(git rev-parse --short HEAD) + CURRENT_VERSION=$(node -p "require('./package.json').version") + PUBLISH_VERSION="${CURRENT_VERSION}-nightly.${DATE_TAG}.${COMMIT_SHORT}" + NPM_TAG="nightly" + + echo "Updating package version to ${PUBLISH_VERSION}" + else + echo "Publishing official version ${NPM_VERSION} to npm..." + PUBLISH_VERSION="$NPM_VERSION" + NPM_TAG="latest" + + echo "Setting package version to ${PUBLISH_VERSION}" + fi + + # Update package.json with the new version + npm version "${PUBLISH_VERSION}" --no-git-tag-version + + echo "Publishing to npm with tag '${NPM_TAG}'..." + if [ -n "${NPM_TOKEN-}" ]; then + # Create .npmrc file with auth token + echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > .npmrc + + if npm publish --tag "$NPM_TAG"; then + echo "Successfully published @terrastruct/d2@${PUBLISH_VERSION} to npm with tag '${NPM_TAG}'" + + # For official releases, bump the patch version + if [ "$NPM_VERSION" != "nightly" ]; then + # Restore original package.json first + mv package.json.bak package.json + + echo "Bumping version to ${NPM_VERSION}" + npm version "${NPM_VERSION}" --no-git-tag-version + git add package.json + git commit -m "Bump version to ${NPM_VERSION} [skip ci]" + + # Cancel the trap since we manually restored and don't want it to execute on exit + trap - EXIT + fi + else + echoerr "Failed to publish package to npm" + exit 1 + fi + else + echoerr "NPM_TOKEN environment variable is required for publishing to npm" + exit 1 + fi +fi diff --git a/d2js/js/d2.wasm b/d2js/js/d2.wasm new file mode 100755 index 000000000..de7590740 Binary files /dev/null and b/d2js/js/d2.wasm differ diff --git a/d2js/js/dev-server.js b/d2js/js/dev-server.js new file mode 100644 index 000000000..cfc51f557 --- /dev/null +++ b/d2js/js/dev-server.js @@ -0,0 +1,72 @@ +const fs = require("fs/promises"); +const path = require("path"); + +const MIME_TYPES = { + ".html": "text/html", + ".js": "text/javascript", + ".mjs": "text/javascript", + ".css": "text/css", + ".wasm": "application/wasm", + ".svg": "image/svg+xml", +}; + +const server = Bun.serve({ + port: 3000, + async fetch(request) { + const url = new URL(request.url); + let filePath = url.pathname.slice(1); // Remove leading "/" + + if (filePath === "") { + filePath = "examples/"; + } + + try { + const fullPath = path.join(process.cwd(), filePath); + const stats = await fs.stat(fullPath); + + if (stats.isDirectory()) { + const entries = await fs.readdir(fullPath); + const links = await Promise.all( + entries.map(async (entry) => { + const entryPath = path.join(fullPath, entry); + const isDir = (await fs.stat(entryPath)).isDirectory(); + const slash = isDir ? "/" : ""; + return `
  • ${entry}${slash}
    • `; + }) + ); + + const html = ` + + +

    Examples

    +
      + ${links.join("")} +
    + + + `; + return new Response(html, { + headers: { "Content-Type": "text/html" }, + }); + } else { + const ext = path.extname(filePath); + const mimeType = MIME_TYPES[ext] || "application/octet-stream"; + + const file = Bun.file(filePath); + return new Response(file, { + headers: { + "Content-Type": mimeType, + "Access-Control-Allow-Origin": "*", + "Cross-Origin-Opener-Policy": "same-origin", + "Cross-Origin-Embedder-Policy": "require-corp", + }, + }); + } + } catch (err) { + console.error(`Error serving ${filePath}:`, err); + return new Response(`File not found: ${filePath}`, { status: 404 }); + } + }, +}); + +console.log(`Server running at http://localhost:3000`); diff --git a/d2js/js/examples/basic.html b/d2js/js/examples/basic.html new file mode 100644 index 000000000..2dbaee7fe --- /dev/null +++ b/d2js/js/examples/basic.html @@ -0,0 +1,49 @@ + + + + + + +
    + + +
    +
    + + + diff --git a/d2js/js/examples/customizable.html b/d2js/js/examples/customizable.html new file mode 100644 index 000000000..afa6e60a3 --- /dev/null +++ b/d2js/js/examples/customizable.html @@ -0,0 +1,459 @@ + + + + + + + +
    + +
    +
    +
    + +
    +
    +
    + + +
    +
    +
    +
    +
    + +
    +
    +
    + + +
    +
    +
    +
    +
    + +
    +
    +
    + + +
    +
    +
    +
    +
    + +
    +
    +
    + + +
    +
    +
    +
    +
    + +
    +
    + +
    +
    +
    +
    + +
    +
    + +
    +
    +
    +
    + +
    +
    + +
    +
    +
    +
    + +
    +
    + +
    +
    +
    +
    + +
    +
    + +
    +
    +
    +
    + +
    +
    + +
    +
    +
    +
    + +
    +
    +
    +
    + +
    +
    +
    +
    + +
    +
    +
    +
    + +
    +
    +
    +
    + +
    +
    +
    + +
    +
    + + + diff --git a/d2js/js/index.d.ts b/d2js/js/index.d.ts new file mode 100644 index 000000000..0b455af6e --- /dev/null +++ b/d2js/js/index.d.ts @@ -0,0 +1,343 @@ +export class D2 { + compile(input: string, options?: Omit): Promise; + compile(input: CompileRequest): Promise; + + render(diagram: Diagram, options?: RenderOptions): Promise; +} + +export interface RenderOptions { + /** Enable sketch mode [default: false] */ + sketch?: boolean; + /** Theme ID to use [default: 0] */ + themeID?: number; + /** Theme ID to use when client is in dark mode */ + darkThemeID?: number; + /** Center the SVG in the containing viewbox [default: false] */ + center?: boolean; + /** Pixels padded around the rendered diagram [default: 100] */ + pad?: number; + /** Scale the output. E.g., 0.5 to halve the default size. The default will render SVG's that will fit to screen. Setting to 1 turns off SVG fitting to screen. */ + scale?: number; + /** Adds an appendix for tooltips and links [default: false] */ + forceAppendix?: boolean; + /** Target board/s to render. If target ends with '', it will be rendered with all of its scenarios, steps, and layers. Otherwise, only the target board will be rendered. E.g. target: 'layers.x.*' to render layer 'x' with all of its children. Pass '' to render all scenarios, steps, and layers. By default, only the root board is rendered. Multi-board outputs are currently only supported for animated SVGs and so animateInterval must be set to a value greater than 0 when targeting multiple boards. */ + target?: string; + /** If given, multiple boards are packaged as 1 SVG which transitions through each board at the interval (in milliseconds). */ + animateInterval?: number; + /** Add a salt value to ensure the output uses unique IDs. This is useful when generating multiple identical diagrams to be included in the same HTML doc, so that duplicate IDs do not cause invalid HTML. The salt value is a string that will be appended to IDs in the output. */ + salt?: string; + /** Omit XML tag () from output SVG files. Useful when generating SVGs for direct HTML embedding. */ + noXMLTag?: boolean; +} + +export interface CompileOptions extends RenderOptions { + /** Layout engine to use [default: 'dagre'] */ + layout?: "dagre" | "elk"; + /** A byte array containing .ttf file to use for the regular font. If none provided, Source Sans Pro Regular is used. */ + fontRegular?: Uint8Array; + /** A byte array containing .ttf file to use for the italic font. If none provided, Source Sans Pro Italic is used. */ + fontItalic?: Uint8Array; + /** A byte array containing .ttf file to use for the bold font. If none provided, Source Sans Pro Bold is used. */ + fontBold?: Uint8Array; + /** A byte array containing .ttf file to use for the semibold font. If none provided, Source Sans Pro Semibold is used. */ + fontSemibold?: Uint8Array; +} + +export interface CompileRequest { + /** A mapping of D2 file paths to their content*/ + fs: Record; + /** The path of the entry D2 file [default: index]*/ + inputPath?: string; + /** The CompileOptions to pass to the compiler*/ + options: CompileOptions; +} + +export interface CompileResponse { + /** Compiled D2 diagram*/ + diagram: Diagram /* d2target.Diagram */; + /** RenderOptions: Render options merged with configuration set in diagram*/ + renderOptions: RenderOptions; + fs: Record; + graph: Graph; + inputPath: string; +} + +export interface Diagram { + config?: RenderOptions; + name: string; + /** + * See docs on the same field in d2graph to understand what it means. + */ + isFolderOnly: boolean; + description?: string; + fontFamily?: any /* d2fonts.FontFamily */; + shapes: Shape[]; + connections: Connection[]; + root: Shape; + legend?: Legend; + layers?: (Diagram | undefined)[]; + scenarios?: (Diagram | undefined)[]; + steps?: (Diagram | undefined)[]; +} + +export interface Legend { + shapes?: Shape[]; + connections?: Connection[]; +} + +export type Shape = (Class | SQLTable | Text) & ShapeBase; + +export interface ShapeBase { + id: string; + type: string; + classes?: string[]; + pos: Point; + width: number /* int */; + height: number /* int */; + opacity: number /* float64 */; + strokeDash: number /* float64 */; + strokeWidth: number /* int */; + borderRadius: number /* int */; + fill: string; + fillPattern?: string; + stroke: string; + animated: boolean; + shadow: boolean; + "3d": boolean; + multiple: boolean; + "double-border": boolean; + tooltip: string; + link: string; + prettyLink?: string; + icon?: string /* url.URL */; + iconPosition: string; + /** + * Whether the shape should allow shapes behind it to bleed through + * Currently just used for sequence diagram groups + */ + blend: boolean; + contentAspectRatio?: number /* float64 */; + labelPosition?: string; + zIndex: number /* int */; + level: number /* int */; + /** + * These are used for special shapes, sql_table and class + */ + primaryAccentColor?: string; + secondaryAccentColor?: string; + neutralAccentColor?: string; +} + +export interface Point { + x: number /* int */; + y: number /* int */; +} + +export interface Class { + fields: ClassField[]; + methods: ClassMethod[]; +} + +export interface ClassField { + name: string; + type: string; + visibility: string; +} + +export interface ClassMethod { + name: string; + return: string; + visibility: string; +} + +export interface SQLTable { + columns: SQLColumn[]; +} + +export interface SQLColumn { + name: Text; + type: Text; + constraint: string[]; + reference: string; +} + +export interface Text { + label: string; + fontSize: number /* int */; + fontFamily: string; + language: string; + color: string; + italic: boolean; + bold: boolean; + underline: boolean; + labelWidth: number /* int */; + labelHeight: number /* int */; + labelFill?: string; +} + +export interface Connection extends Text { + id: string; + classes?: string[]; + src: string; + srcArrow: Arrowhead; + srcLabel?: Text; + dst: string; + dstArrow: Arrowhead; + dstLabel?: Text; + opacity: number /* float64 */; + strokeDash: number /* float64 */; + strokeWidth: number /* int */; + stroke: string; + fill?: string; + borderRadius?: number /* float64 */; + labelPosition: string; + labelPercentage: number /* float64 */; + link: string; + prettyLink?: string; + route: (any /* geo.Point */ | undefined)[]; + isCurve?: boolean; + animated: boolean; + tooltip: string; + icon?: string /* url.URL */; + iconPosition?: string; + zIndex: number /* int */; +} + +export type Arrowhead = + | "none" + | "arrow" + | "unfilled-triangle" + | "triangle" + | "diamond" + | "filled-diamond" + | "circle" + | "filled-circle" + | "box" + | "filled-box" + | "line" + | "cf-one" + | "cf-many" + | "cf-one-required" + | "cf-many-required"; + +export interface Graph { + name: string; + /** + * IsFolderOnly indicates a board or scenario itself makes no modifications from its + * base. Folder only boards do not have a render and are used purely for organizing + * the board tree. + */ + isFolderOnly: boolean; + ast?: any /* d2ast.Map */; + root?: Object; + legend?: Legend; + edges: (Edge | undefined)[]; + objects: (Object | undefined)[]; + layers?: (Graph | undefined)[]; + scenarios?: (Graph | undefined)[]; + steps?: (Graph | undefined)[]; + theme?: any /* d2themes.Theme */; + /** + * Object.Level uses the location of a nested graph + */ + rootLevel?: number /* int */; + /** + * Currently this holds data embedded from source code configuration variables + * Plugins only have access to exported graph, so this data structure allows + * carrying arbitrary metadata that any plugin might handle + */ + data?: { [key: string]: any }; +} + +export interface Edge { + index: number /* int */; + srcTableColumnIndex?: number /* int */; + dstTableColumnIndex?: number /* int */; + labelPosition?: string; + labelPercentage?: number /* float64 */; + isCurve: boolean; + route?: (any /* geo.Point */ | undefined)[]; + src_arrow: boolean; + srcArrowhead?: Attributes; + /** + * TODO alixander (Mon Sep 12 2022): deprecate SrcArrow and DstArrow and just use SrcArrowhead and DstArrowhead + */ + dst_arrow: boolean; + dstArrowhead?: Attributes; + references?: EdgeReference[]; + attributes?: Attributes; + zIndex: number /* int */; +} + +export interface Attributes { + label: Scalar; + labelDimensions: TextDimensions; + style: Style; + icon?: string /* url.URL */; + tooltip?: Scalar; + link?: Scalar; + width?: Scalar; + height?: Scalar; + top?: Scalar; + left?: Scalar; + /** + * TODO consider separate Attributes struct for shape-specific and edge-specific + * Shapes only + */ + near_key?: any /* d2ast.KeyPath */; + language?: string; + /** + * TODO: default to ShapeRectangle instead of empty string + */ + shape: Scalar; + direction: Scalar; + constraint: string[]; + gridRows?: Scalar; + gridColumns?: Scalar; + gridGap?: Scalar; + verticalGap?: Scalar; + horizontalGap?: Scalar; + labelPosition?: Scalar; + iconPosition?: Scalar; + /** + * These names are attached to the rendered elements in SVG + * so that users can target them however they like outside of D2 + */ + classes?: string[]; +} + +export interface EdgeReference { + map_key_edge_index: number /* int */; +} + +export interface Scalar { + value: string; +} + +export interface Style { + opacity?: Scalar; + stroke?: Scalar; + fill?: Scalar; + fillPattern?: Scalar; + strokeWidth?: Scalar; + strokeDash?: Scalar; + borderRadius?: Scalar; + shadow?: Scalar; + "3d"?: Scalar; + multiple?: Scalar; + font?: Scalar; + fontSize?: Scalar; + fontColor?: Scalar; + animated?: Scalar; + bold?: Scalar; + italic?: Scalar; + underline?: Scalar; + filled?: Scalar; + doubleBorder?: Scalar; + textTransform?: Scalar; +} + +export interface TextDimensions { + width: number /* int */; + height: number /* int */; +} diff --git a/d2js/js/make.sh b/d2js/js/make.sh new file mode 100755 index 000000000..318dff2e0 --- /dev/null +++ b/d2js/js/make.sh @@ -0,0 +1,23 @@ +#!/bin/sh +set -eu +if [ ! -e "$(dirname "$0")/../../ci/sub/.git" ]; then + set -x + git submodule update --init + set +x +fi +. "$(dirname "$0")/../../ci/sub/lib.sh" +PATH="$(cd -- "$(dirname "$0")" && pwd)/../../ci/sub/bin:$PATH" +cd -- "$(dirname "$0")" + +if ! command -v bun >/dev/null 2>&1; then + if [ -n "${CI-}" ]; then + echo "Bun is not installed. Installing Bun..." + curl -fsSL https://bun.sh/install | bash + export PATH="$HOME/.bun/bin:$PATH" + else + echoerr "You need bun to build d2.js: curl -fsSL https://bun.sh/install | bash" + exit 1 + fi +fi + +_make "$@" diff --git a/d2js/js/package.json b/d2js/js/package.json new file mode 100644 index 000000000..039c79a7b --- /dev/null +++ b/d2js/js/package.json @@ -0,0 +1,61 @@ +{ + "name": "@terrastruct/d2", + "author": "Terrastruct, Inc.", + "description": "D2.js is a wrapper around the WASM build of D2, the modern text-to-diagram language.", + "version": "0.1.23", + "repository": { + "type": "git", + "url": "git+https://github.com/terrastruct/d2.git", + "directory": "d2js/js" + }, + "bugs": { + "url": "https://github.com/terrastruct/d2/issues" + }, + "homepage": "https://github.com/terrastruct/d2/tree/master/d2js/js#readme", + "publishConfig": { + "access": "public" + }, + "type": "module", + "main": "./dist/cjs/index.js", + "module": "./dist/esm/index.js", + "exports": { + ".": { + "browser": "./dist/browser/index.js", + "import": { + "browser": "./dist/browser/index.js", + "default": "./dist/node-esm/index.js", + "types": "./index.d.ts" + }, + "require": { + "default": "./dist/node-cjs/index.js", + "types": "./index.d.ts" + }, + "default": "./dist/node-esm/index.js" + }, + "./worker": "./dist/browser/worker.js" + }, + "files": [ + "dist", + "index.d.ts" + ], + "types": "./index.d.ts", + "scripts": { + "build": "./make.sh build", + "test": "bun test test/unit", + "test:integration": "bun test test/integration", + "test:all": "bun run test && bun run test:integration", + "dev": "bun --watch dev-server.js" + }, + "keywords": [ + "d2", + "d2lang", + "diagram", + "wasm", + "text-to-diagram", + "go" + ], + "license": "MPL-2.0", + "devDependencies": { + "bun": "latest" + } +} diff --git a/d2js/js/src/elk.js b/d2js/js/src/elk.js new file mode 100644 index 000000000..830eacc4c --- /dev/null +++ b/d2js/js/src/elk.js @@ -0,0 +1,105805 @@ +(function (f) { + var g; + g = globalThis; + g.ELK = f(); +})(function () { + var define, module, exports; + return (function () { + function r(e, n, t) { + function o(i, f) { + if (!n[i]) { + if (!e[i]) { + var c = "function" == typeof require && require; + if (!f && c) return c(i, !0); + if (u) return u(i, !0); + var a = new Error("Cannot find module '" + i + "'"); + throw ((a.code = "MODULE_NOT_FOUND"), a); + } + var p = (n[i] = { exports: {} }); + e[i][0].call( + p.exports, + function (r) { + var n = e[i][1][r]; + return o(n || r); + }, + p, + p.exports, + r, + e, + n, + t + ); + } + return n[i].exports; + } + for (var u = "function" == typeof require && require, i = 0; i < t.length; i++) + o(t[i]); + return o; + } + return r; + })()( + { + 1: [ + function (require, module, exports) { + "use strict"; + + Object.defineProperty(exports, "__esModule", { + value: true, + }); + + var _createClass = (function () { + function defineProperties(target, props) { + for (var i = 0; i < props.length; i++) { + var descriptor = props[i]; + descriptor.enumerable = descriptor.enumerable || false; + descriptor.configurable = true; + if ("value" in descriptor) descriptor.writable = true; + Object.defineProperty(target, descriptor.key, descriptor); + } + } + return function (Constructor, protoProps, staticProps) { + if (protoProps) defineProperties(Constructor.prototype, protoProps); + if (staticProps) defineProperties(Constructor, staticProps); + return Constructor; + }; + })(); + + function _classCallCheck(instance, Constructor) { + if (!(instance instanceof Constructor)) { + throw new TypeError("Cannot call a class as a function"); + } + } + + /******************************************************************************* + * Copyright (c) 2017 Kiel University and others. + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + *******************************************************************************/ + var ELK = (function () { + function ELK() { + var _this = this; + + var _ref = + arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {}, + _ref$defaultLayoutOpt = _ref.defaultLayoutOptions, + defaultLayoutOptions = + _ref$defaultLayoutOpt === undefined ? {} : _ref$defaultLayoutOpt, + _ref$algorithms = _ref.algorithms, + algorithms = + _ref$algorithms === undefined + ? [ + "layered", + "stress", + "mrtree", + "radial", + "force", + "disco", + "sporeOverlap", + "sporeCompaction", + "rectpacking", + ] + : _ref$algorithms, + workerFactory = _ref.workerFactory, + workerUrl = _ref.workerUrl; + + _classCallCheck(this, ELK); + + this.defaultLayoutOptions = defaultLayoutOptions; + this.initialized = false; + + // check valid worker construction possible + if ( + typeof workerUrl === "undefined" && + typeof workerFactory === "undefined" + ) { + throw new Error( + "Cannot construct an ELK without both 'workerUrl' and 'workerFactory'." + ); + } + var factory = workerFactory; + if ( + typeof workerUrl !== "undefined" && + typeof workerFactory === "undefined" + ) { + // use default Web Worker + factory = function factory(url) { + return new Worker(url); + }; + } + + // create the worker + var worker = factory(workerUrl); + if (typeof worker.postMessage !== "function") { + throw new TypeError( + "Created worker does not provide" + + " the required 'postMessage' function." + ); + } + + // wrap the worker to return promises + this.worker = new PromisedWorker(worker); + + // initially register algorithms + this.worker + .postMessage({ + cmd: "register", + algorithms: algorithms, + }) + .then(function (r) { + return (_this.initialized = true); + }) + .catch(console.err); + } + + _createClass(ELK, [ + { + key: "layout", + value: function layout(graph) { + var _ref2 = + arguments.length > 1 && arguments[1] !== undefined + ? arguments[1] + : {}, + _ref2$layoutOptions = _ref2.layoutOptions, + layoutOptions = + _ref2$layoutOptions === undefined + ? this.defaultLayoutOptions + : _ref2$layoutOptions, + _ref2$logging = _ref2.logging, + logging = _ref2$logging === undefined ? false : _ref2$logging, + _ref2$measureExecutio = _ref2.measureExecutionTime, + measureExecutionTime = + _ref2$measureExecutio === undefined ? false : _ref2$measureExecutio; + + if (!graph) { + return Promise.reject( + new Error("Missing mandatory parameter 'graph'.") + ); + } + return this.worker.postMessage({ + cmd: "layout", + graph: graph, + layoutOptions: layoutOptions, + options: { + logging: logging, + measureExecutionTime: measureExecutionTime, + }, + }); + }, + }, + { + key: "knownLayoutAlgorithms", + value: function knownLayoutAlgorithms() { + return this.worker.postMessage({ cmd: "algorithms" }); + }, + }, + { + key: "knownLayoutOptions", + value: function knownLayoutOptions() { + return this.worker.postMessage({ cmd: "options" }); + }, + }, + { + key: "knownLayoutCategories", + value: function knownLayoutCategories() { + return this.worker.postMessage({ cmd: "categories" }); + }, + }, + { + key: "terminateWorker", + value: function terminateWorker() { + this.worker.terminate(); + }, + }, + ]); + + return ELK; + })(); + + exports.default = ELK; + + var PromisedWorker = (function () { + function PromisedWorker(worker) { + var _this2 = this; + + _classCallCheck(this, PromisedWorker); + + if (worker === undefined) { + throw new Error("Missing mandatory parameter 'worker'."); + } + this.resolvers = {}; + this.worker = worker; + this.worker.onmessage = function (answer) { + // why is this necessary? + setTimeout(function () { + _this2.receive(_this2, answer); + }, 0); + }; + } + + _createClass(PromisedWorker, [ + { + key: "postMessage", + value: function postMessage(msg) { + var id = this.id || 0; + this.id = id + 1; + msg.id = id; + var self = this; + return new Promise(function (resolve, reject) { + // prepare the resolver + self.resolvers[id] = function (err, res) { + if (err) { + self.convertGwtStyleError(err); + reject(err); + } else { + resolve(res); + } + }; + // post the message + self.worker.postMessage(msg); + }); + }, + }, + { + key: "receive", + value: function receive(self, answer) { + var json = answer.data; + var resolver = self.resolvers[json.id]; + if (resolver) { + delete self.resolvers[json.id]; + if (json.error) { + resolver(json.error); + } else { + resolver(null, json.data); + } + } + }, + }, + { + key: "terminate", + value: function terminate() { + if (this.worker.terminate) { + this.worker.terminate(); + } + }, + }, + { + key: "convertGwtStyleError", + value: function convertGwtStyleError(err) { + if (!err) { + return; + } + // Somewhat flatten the way GWT stores nested exception(s) + var javaException = err["__java$exception"]; + if (javaException) { + // Note that the property name of the nested exception is different + // in the non-minified ('cause') and the minified (not deterministic) version. + // Hence, the version below only works for the non-minified version. + // However, as the minified stack trace is not of much use anyway, one + // should switch the used version for debugging in such a case. + if (javaException.cause && javaException.cause.backingJsObject) { + err.cause = javaException.cause.backingJsObject; + this.convertGwtStyleError(err.cause); + } + delete err["__java$exception"]; + } + }, + }, + ]); + + return PromisedWorker; + })(); + }, + {}, + ], + 2: [ + function (require, module, exports) { + (function (global) { + (function () { + "use strict"; + + // -------------- FAKE ELEMENTS GWT ASSUMES EXIST -------------- + var $wnd = { Error: {} }; + + var $moduleName, $moduleBase; + + // -------------- WORKAROUND STRICT MODE, SEE #127 -------------- + var g, i, o; + + // -------------- GENERATED CODE -------------- + function nb() {} + function xb() {} + function Fd() {} + function $g() {} + function _p() {} + function yq() {} + function Sq() {} + function Es() {} + function Jw() {} + function Vw() {} + function VA() {} + function dA() {} + function MA() {} + function PA() {} + function PB() {} + function bx() {} + function cx() {} + function vy() {} + function Nz() {} + function Yz() {} + function Ylb() {} + function Ymb() {} + function xmb() {} + function Fmb() {} + function Qmb() {} + function gcb() {} + function ccb() {} + function jcb() {} + function jtb() {} + function otb() {} + function qtb() {} + function _fb() {} + function bpb() {} + function kpb() {} + function ppb() {} + function Gpb() {} + function drb() {} + function dzb() {} + function fzb() {} + function fxb() {} + function Vxb() {} + function Ovb() {} + function byb() {} + function zyb() {} + function Zyb() {} + function _yb() {} + function hzb() {} + function jzb() {} + function lzb() {} + function nzb() {} + function rzb() {} + function zzb() {} + function Czb() {} + function Ezb() {} + function Gzb() {} + function Izb() {} + function Mzb() {} + function bBb() {} + function NBb() {} + function PBb() {} + function RBb() {} + function iCb() {} + function OCb() {} + function SCb() {} + function GDb() {} + function JDb() {} + function fEb() {} + function xEb() {} + function CEb() {} + function GEb() {} + function yFb() {} + function KGb() {} + function tIb() {} + function vIb() {} + function xIb() {} + function zIb() {} + function OIb() {} + function SIb() {} + function TJb() {} + function VJb() {} + function XJb() {} + function XKb() {} + function fKb() {} + function VKb() {} + function VLb() {} + function jLb() {} + function nLb() {} + function GLb() {} + function KLb() {} + function MLb() {} + function OLb() {} + function RLb() {} + function YLb() {} + function bMb() {} + function gMb() {} + function lMb() {} + function pMb() {} + function wMb() {} + function zMb() {} + function CMb() {} + function FMb() {} + function LMb() {} + function zNb() {} + function PNb() {} + function kOb() {} + function pOb() {} + function tOb() {} + function yOb() {} + function FOb() {} + function GPb() {} + function aQb() {} + function cQb() {} + function eQb() {} + function gQb() {} + function iQb() {} + function CQb() {} + function MQb() {} + function OQb() {} + function ASb() {} + function fTb() {} + function kTb() {} + function STb() {} + function fUb() {} + function DUb() {} + function VUb() {} + function YUb() {} + function _Ub() {} + function _Wb() {} + function QWb() {} + function XWb() {} + function jVb() {} + function DVb() {} + function VVb() {} + function $Vb() {} + function dXb() {} + function hXb() {} + function lXb() {} + function gYb() {} + function HYb() {} + function SYb() {} + function VYb() {} + function dZb() {} + function P$b() {} + function T$b() {} + function h1b() {} + function m1b() {} + function q1b() {} + function u1b() {} + function y1b() {} + function C1b() {} + function e2b() {} + function g2b() {} + function m2b() {} + function q2b() {} + function u2b() {} + function S2b() {} + function U2b() {} + function W2b() {} + function _2b() {} + function e3b() {} + function h3b() {} + function p3b() {} + function t3b() {} + function w3b() {} + function y3b() {} + function A3b() {} + function M3b() {} + function Q3b() {} + function U3b() {} + function Y3b() {} + function l4b() {} + function q4b() {} + function s4b() {} + function u4b() {} + function w4b() {} + function y4b() {} + function L4b() {} + function N4b() {} + function P4b() {} + function R4b() {} + function T4b() {} + function X4b() {} + function I5b() {} + function Q5b() {} + function T5b() {} + function Z5b() {} + function l6b() {} + function o6b() {} + function t6b() {} + function z6b() {} + function L6b() {} + function M6b() {} + function P6b() {} + function X6b() {} + function $6b() {} + function a7b() {} + function c7b() {} + function g7b() {} + function j7b() {} + function m7b() {} + function r7b() {} + function x7b() {} + function D7b() {} + function D9b() {} + function b9b() {} + function h9b() {} + function j9b() {} + function l9b() {} + function w9b() {} + function F9b() {} + function hac() {} + function jac() {} + function pac() {} + function uac() {} + function Iac() {} + function Kac() {} + function Sac() {} + function obc() {} + function rbc() {} + function vbc() {} + function Fbc() {} + function Jbc() {} + function Xbc() {} + function ccc() {} + function fcc() {} + function lcc() {} + function occ() {} + function tcc() {} + function ycc() {} + function Acc() {} + function Ccc() {} + function Ecc() {} + function Gcc() {} + function Zcc() {} + function _cc() {} + function bdc() {} + function fdc() {} + function jdc() {} + function pdc() {} + function sdc() {} + function ydc() {} + function Adc() {} + function Cdc() {} + function Edc() {} + function Idc() {} + function Ndc() {} + function Qdc() {} + function Sdc() {} + function Udc() {} + function Wdc() {} + function Ydc() {} + function aec() {} + function hec() {} + function jec() {} + function lec() {} + function nec() {} + function uec() {} + function wec() {} + function yec() {} + function Aec() {} + function Fec() {} + function Jec() {} + function Lec() {} + function Nec() {} + function Rec() {} + function Uec() {} + function Zec() {} + function Zfc() {} + function lfc() {} + function tfc() {} + function xfc() {} + function zfc() {} + function Ffc() {} + function Jfc() {} + function Nfc() {} + function Pfc() {} + function Vfc() {} + function _fc() {} + function fgc() {} + function jgc() {} + function lgc() {} + function Bgc() {} + function ehc() {} + function ghc() {} + function ihc() {} + function khc() {} + function mhc() {} + function ohc() {} + function qhc() {} + function yhc() {} + function Ahc() {} + function Ghc() {} + function Ihc() {} + function Khc() {} + function Mhc() {} + function Shc() {} + function Uhc() {} + function Whc() {} + function dic() {} + function dlc() {} + function blc() {} + function flc() {} + function hlc() {} + function jlc() {} + function Glc() {} + function Ilc() {} + function Klc() {} + function Mlc() {} + function Mjc() {} + function Qjc() {} + function Qlc() {} + function Ulc() {} + function Ylc() {} + function Lkc() {} + function Nkc() {} + function Pkc() {} + function Rkc() {} + function Xkc() {} + function _kc() {} + function gmc() {} + function kmc() {} + function zmc() {} + function Fmc() {} + function Wmc() {} + function $mc() {} + function anc() {} + function mnc() {} + function wnc() {} + function Hnc() {} + function Jnc() {} + function Lnc() {} + function Nnc() {} + function Pnc() {} + function Ync() {} + function eoc() {} + function Aoc() {} + function Coc() {} + function Eoc() {} + function Joc() {} + function Loc() {} + function Zoc() {} + function _oc() {} + function bpc() {} + function hpc() {} + function kpc() {} + function ppc() {} + function pFc() {} + function Ryc() {} + function QCc() {} + function PDc() {} + function xGc() {} + function HGc() {} + function JGc() {} + function NGc() {} + function GIc() {} + function iKc() {} + function mKc() {} + function wKc() {} + function yKc() {} + function AKc() {} + function EKc() {} + function KKc() {} + function OKc() {} + function QKc() {} + function SKc() {} + function UKc() {} + function YKc() {} + function aLc() {} + function fLc() {} + function hLc() {} + function nLc() {} + function pLc() {} + function tLc() {} + function vLc() {} + function zLc() {} + function BLc() {} + function DLc() {} + function FLc() {} + function sMc() {} + function JMc() {} + function hNc() {} + function RNc() {} + function ZNc() {} + function _Nc() {} + function bOc() {} + function dOc() {} + function fOc() {} + function hOc() {} + function hRc() {} + function jRc() {} + function KRc() {} + function NRc() {} + function NQc() {} + function LQc() {} + function _Qc() {} + function cPc() {} + function iPc() {} + function kPc() {} + function mPc() {} + function xPc() {} + function zPc() {} + function zSc() {} + function BSc() {} + function GSc() {} + function ISc() {} + function NSc() {} + function TSc() {} + function NTc() {} + function NVc() {} + function oVc() {} + function SVc() {} + function VVc() {} + function XVc() {} + function ZVc() {} + function bWc() {} + function bXc() {} + function CXc() {} + function FXc() {} + function IXc() {} + function MXc() {} + function UXc() {} + function bYc() {} + function fYc() {} + function oYc() {} + function qYc() {} + function uYc() {} + function pZc() {} + function G$c() {} + function h0c() {} + function N0c() {} + function k1c() {} + function I1c() {} + function Q1c() {} + function f2c() {} + function i2c() {} + function k2c() {} + function w2c() {} + function O2c() {} + function S2c() {} + function Z2c() {} + function v3c() {} + function x3c() {} + function R3c() {} + function U3c() {} + function e4c() {} + function w4c() {} + function x4c() {} + function z4c() {} + function B4c() {} + function D4c() {} + function F4c() {} + function H4c() {} + function J4c() {} + function L4c() {} + function N4c() {} + function P4c() {} + function R4c() {} + function T4c() {} + function V4c() {} + function X4c() {} + function Z4c() {} + function _4c() {} + function _7c() {} + function b5c() {} + function d5c() {} + function f5c() {} + function h5c() {} + function H5c() {} + function Hfd() {} + function Zfd() {} + function Zed() {} + function ged() {} + function Jed() {} + function Ned() {} + function Red() {} + function Ved() {} + function bbd() {} + function mdd() {} + function _fd() {} + function fgd() {} + function kgd() {} + function Mgd() {} + function Ahd() {} + function Ald() {} + function Tld() {} + function xkd() {} + function rmd() {} + function knd() {} + function Jod() {} + function JCd() {} + function Bpd() {} + function BFd() {} + function oFd() {} + function bqd() {} + function bvd() {} + function jvd() {} + function yud() {} + function Hxd() {} + function EBd() {} + function aDd() {} + function MGd() {} + function vHd() {} + function RHd() {} + function wNd() {} + function zNd() {} + function CNd() {} + function KNd() {} + function XNd() {} + function $Nd() {} + function HPd() {} + function lUd() {} + function XUd() {} + function DWd() {} + function GWd() {} + function JWd() {} + function MWd() {} + function PWd() {} + function SWd() {} + function VWd() {} + function YWd() {} + function _Wd() {} + function xYd() {} + function BYd() {} + function mZd() {} + function EZd() {} + function GZd() {} + function JZd() {} + function MZd() {} + function PZd() {} + function SZd() {} + function VZd() {} + function YZd() {} + function _Zd() {} + function c$d() {} + function f$d() {} + function i$d() {} + function l$d() {} + function o$d() {} + function r$d() {} + function u$d() {} + function x$d() {} + function A$d() {} + function D$d() {} + function G$d() {} + function J$d() {} + function M$d() {} + function P$d() {} + function S$d() {} + function V$d() {} + function Y$d() {} + function _$d() {} + function c_d() {} + function f_d() {} + function i_d() {} + function l_d() {} + function o_d() {} + function r_d() {} + function u_d() {} + function x_d() {} + function A_d() {} + function D_d() {} + function G_d() {} + function J_d() {} + function M_d() {} + function P_d() {} + function S_d() {} + function V_d() {} + function Y_d() {} + function h5d() {} + function U6d() {} + function U9d() {} + function _8d() {} + function fae() {} + function hae() {} + function kae() {} + function nae() {} + function qae() {} + function tae() {} + function wae() {} + function zae() {} + function Cae() {} + function Fae() {} + function Iae() {} + function Lae() {} + function Oae() {} + function Rae() {} + function Uae() {} + function Xae() {} + function $ae() {} + function bbe() {} + function ebe() {} + function hbe() {} + function kbe() {} + function nbe() {} + function qbe() {} + function tbe() {} + function wbe() {} + function zbe() {} + function Cbe() {} + function Fbe() {} + function Ibe() {} + function Lbe() {} + function Obe() {} + function Rbe() {} + function Ube() {} + function Xbe() {} + function $be() {} + function bce() {} + function ece() {} + function hce() {} + function kce() {} + function nce() {} + function qce() {} + function tce() {} + function wce() {} + function zce() {} + function Cce() {} + function Fce() {} + function Ice() {} + function Lce() {} + function Oce() {} + function Rce() {} + function Uce() {} + function Xce() {} + function ude() {} + function Vge() {} + function dhe() {} + function s_b(a) {} + function jSd(a) {} + function ol() { + wb(); + } + function oPb() { + nPb(); + } + function EPb() { + CPb(); + } + function gFb() { + fFb(); + } + function TRb() { + SRb(); + } + function ySb() { + wSb(); + } + function PSb() { + OSb(); + } + function dTb() { + bTb(); + } + function i4b() { + b4b(); + } + function D2b() { + x2b(); + } + function J6b() { + D6b(); + } + function u9b() { + q9b(); + } + function $9b() { + I9b(); + } + function Umc() { + Imc(); + } + function abc() { + Vac(); + } + function ZCc() { + VCc(); + } + function kCc() { + hCc(); + } + function rCc() { + oCc(); + } + function Tcc() { + Occ(); + } + function xkc() { + gkc(); + } + function xDc() { + rDc(); + } + function iDc() { + cDc(); + } + function kwc() { + jwc(); + } + function tJc() { + jJc(); + } + function dJc() { + aJc(); + } + function Pyc() { + Nyc(); + } + function VBc() { + SBc(); + } + function CFc() { + yFc(); + } + function CUc() { + wUc(); + } + function lUc() { + fUc(); + } + function sUc() { + pUc(); + } + function IUc() { + GUc(); + } + function IWc() { + HWc(); + } + function _Wc() { + ZWc(); + } + function fHc() { + dHc(); + } + function f0c() { + d0c(); + } + function B0c() { + A0c(); + } + function L0c() { + J0c(); + } + function LTc() { + JTc(); + } + function sTc() { + rTc(); + } + function KLc() { + ILc(); + } + function wNc() { + tNc(); + } + function PYc() { + OYc(); + } + function nZc() { + lZc(); + } + function q3c() { + p3c(); + } + function Z7c() { + X7c(); + } + function Z9c() { + Y9c(); + } + function _ad() { + Zad(); + } + function kdd() { + idd(); + } + function $md() { + Smd(); + } + function HGd() { + tGd(); + } + function hLd() { + NKd(); + } + function J6d() { + Uge(); + } + function Mvb(a) { + uCb(a); + } + function Yb(a) { + this.a = a; + } + function cc(a) { + this.a = a; + } + function cj(a) { + this.a = a; + } + function ij(a) { + this.a = a; + } + function Dj(a) { + this.a = a; + } + function df(a) { + this.a = a; + } + function kf(a) { + this.a = a; + } + function ah(a) { + this.a = a; + } + function lh(a) { + this.a = a; + } + function th(a) { + this.a = a; + } + function Ph(a) { + this.a = a; + } + function vi(a) { + this.a = a; + } + function Ci(a) { + this.a = a; + } + function Fk(a) { + this.a = a; + } + function Ln(a) { + this.a = a; + } + function ap(a) { + this.a = a; + } + function zp(a) { + this.a = a; + } + function Yp(a) { + this.a = a; + } + function qq(a) { + this.a = a; + } + function Dq(a) { + this.a = a; + } + function wr(a) { + this.a = a; + } + function Ir(a) { + this.b = a; + } + function sj(a) { + this.c = a; + } + function sw(a) { + this.a = a; + } + function fw(a) { + this.a = a; + } + function xw(a) { + this.a = a; + } + function Cw(a) { + this.a = a; + } + function Qw(a) { + this.a = a; + } + function Rw(a) { + this.a = a; + } + function Xw(a) { + this.a = a; + } + function Xv(a) { + this.a = a; + } + function Sv(a) { + this.a = a; + } + function eu(a) { + this.a = a; + } + function Zx(a) { + this.a = a; + } + function _x(a) { + this.a = a; + } + function xy(a) { + this.a = a; + } + function xB(a) { + this.a = a; + } + function HB(a) { + this.a = a; + } + function TB(a) { + this.a = a; + } + function fC(a) { + this.a = a; + } + function wB() { + this.a = []; + } + function MBb(a, b) { + a.a = b; + } + function w_b(a, b) { + a.a = b; + } + function x_b(a, b) { + a.b = b; + } + function YOb(a, b) { + a.b = b; + } + function $Ob(a, b) { + a.b = b; + } + function ZGb(a, b) { + a.j = b; + } + function qNb(a, b) { + a.g = b; + } + function rNb(a, b) { + a.i = b; + } + function dRb(a, b) { + a.c = b; + } + function eRb(a, b) { + a.d = b; + } + function z_b(a, b) { + a.d = b; + } + function y_b(a, b) { + a.c = b; + } + function __b(a, b) { + a.k = b; + } + function E0b(a, b) { + a.c = b; + } + function njc(a, b) { + a.c = b; + } + function mjc(a, b) { + a.a = b; + } + function dFc(a, b) { + a.a = b; + } + function eFc(a, b) { + a.f = b; + } + function nOc(a, b) { + a.a = b; + } + function oOc(a, b) { + a.b = b; + } + function pOc(a, b) { + a.d = b; + } + function qOc(a, b) { + a.i = b; + } + function rOc(a, b) { + a.o = b; + } + function sOc(a, b) { + a.r = b; + } + function $Pc(a, b) { + a.a = b; + } + function _Pc(a, b) { + a.b = b; + } + function DVc(a, b) { + a.e = b; + } + function EVc(a, b) { + a.f = b; + } + function FVc(a, b) { + a.g = b; + } + function SZc(a, b) { + a.e = b; + } + function TZc(a, b) { + a.f = b; + } + function c$c(a, b) { + a.f = b; + } + function bJd(a, b) { + a.n = b; + } + function A1d(a, b) { + a.a = b; + } + function J1d(a, b) { + a.a = b; + } + function B1d(a, b) { + a.c = b; + } + function K1d(a, b) { + a.c = b; + } + function L1d(a, b) { + a.d = b; + } + function M1d(a, b) { + a.e = b; + } + function N1d(a, b) { + a.g = b; + } + function d2d(a, b) { + a.a = b; + } + function e2d(a, b) { + a.c = b; + } + function f2d(a, b) { + a.d = b; + } + function g2d(a, b) { + a.e = b; + } + function h2d(a, b) { + a.f = b; + } + function i2d(a, b) { + a.j = b; + } + function Z8d(a, b) { + a.a = b; + } + function $8d(a, b) { + a.b = b; + } + function g9d(a, b) { + a.a = b; + } + function Cic(a) { + a.b = a.a; + } + function Dg(a) { + a.c = a.d.d; + } + function vib(a) { + this.d = a; + } + function eib(a) { + this.a = a; + } + function Pib(a) { + this.a = a; + } + function Vib(a) { + this.a = a; + } + function $ib(a) { + this.a = a; + } + function mcb(a) { + this.a = a; + } + function Mcb(a) { + this.a = a; + } + function Xcb(a) { + this.a = a; + } + function Ndb(a) { + this.a = a; + } + function _db(a) { + this.a = a; + } + function teb(a) { + this.a = a; + } + function Qeb(a) { + this.a = a; + } + function djb(a) { + this.a = a; + } + function Gjb(a) { + this.a = a; + } + function Njb(a) { + this.a = a; + } + function Bjb(a) { + this.b = a; + } + function lnb(a) { + this.b = a; + } + function Dnb(a) { + this.b = a; + } + function anb(a) { + this.a = a; + } + function Mob(a) { + this.a = a; + } + function Rob(a) { + this.a = a; + } + function iob(a) { + this.c = a; + } + function olb(a) { + this.c = a; + } + function qub(a) { + this.c = a; + } + function Tub(a) { + this.a = a; + } + function Vub(a) { + this.a = a; + } + function Xub(a) { + this.a = a; + } + function Zub(a) { + this.a = a; + } + function tpb(a) { + this.a = a; + } + function _pb(a) { + this.a = a; + } + function Wqb(a) { + this.a = a; + } + function nsb(a) { + this.a = a; + } + function Rxb(a) { + this.a = a; + } + function Txb(a) { + this.a = a; + } + function Xxb(a) { + this.a = a; + } + function bzb(a) { + this.a = a; + } + function tzb(a) { + this.a = a; + } + function vzb(a) { + this.a = a; + } + function xzb(a) { + this.a = a; + } + function Kzb(a) { + this.a = a; + } + function Ozb(a) { + this.a = a; + } + function iAb(a) { + this.a = a; + } + function kAb(a) { + this.a = a; + } + function mAb(a) { + this.a = a; + } + function BAb(a) { + this.a = a; + } + function hBb(a) { + this.a = a; + } + function jBb(a) { + this.a = a; + } + function nBb(a) { + this.a = a; + } + function TBb(a) { + this.a = a; + } + function XBb(a) { + this.a = a; + } + function QCb(a) { + this.a = a; + } + function WCb(a) { + this.a = a; + } + function _Cb(a) { + this.a = a; + } + function dEb(a) { + this.a = a; + } + function QGb(a) { + this.a = a; + } + function YGb(a) { + this.a = a; + } + function tKb(a) { + this.a = a; + } + function CLb(a) { + this.a = a; + } + function JMb(a) { + this.a = a; + } + function RNb(a) { + this.a = a; + } + function kQb(a) { + this.a = a; + } + function mQb(a) { + this.a = a; + } + function FQb(a) { + this.a = a; + } + function ETb(a) { + this.a = a; + } + function UTb(a) { + this.a = a; + } + function dUb(a) { + this.a = a; + } + function hUb(a) { + this.a = a; + } + function EZb(a) { + this.a = a; + } + function j$b(a) { + this.a = a; + } + function v$b(a) { + this.e = a; + } + function J0b(a) { + this.a = a; + } + function M0b(a) { + this.a = a; + } + function R0b(a) { + this.a = a; + } + function U0b(a) { + this.a = a; + } + function i2b(a) { + this.a = a; + } + function k2b(a) { + this.a = a; + } + function o2b(a) { + this.a = a; + } + function s2b(a) { + this.a = a; + } + function G2b(a) { + this.a = a; + } + function I2b(a) { + this.a = a; + } + function K2b(a) { + this.a = a; + } + function M2b(a) { + this.a = a; + } + function W3b(a) { + this.a = a; + } + function $3b(a) { + this.a = a; + } + function V4b(a) { + this.a = a; + } + function u5b(a) { + this.a = a; + } + function A7b(a) { + this.a = a; + } + function G7b(a) { + this.a = a; + } + function J7b(a) { + this.a = a; + } + function M7b(a) { + this.a = a; + } + function Mbc(a) { + this.a = a; + } + function Pbc(a) { + this.a = a; + } + function lac(a) { + this.a = a; + } + function nac(a) { + this.a = a; + } + function qcc(a) { + this.a = a; + } + function Gdc(a) { + this.a = a; + } + function $dc(a) { + this.a = a; + } + function cec(a) { + this.a = a; + } + function _ec(a) { + this.a = a; + } + function pfc(a) { + this.a = a; + } + function Bfc(a) { + this.a = a; + } + function Lfc(a) { + this.a = a; + } + function ygc(a) { + this.a = a; + } + function Dgc(a) { + this.a = a; + } + function shc(a) { + this.a = a; + } + function uhc(a) { + this.a = a; + } + function whc(a) { + this.a = a; + } + function Chc(a) { + this.a = a; + } + function Ehc(a) { + this.a = a; + } + function Ohc(a) { + this.a = a; + } + function Yhc(a) { + this.a = a; + } + function Tkc(a) { + this.a = a; + } + function Vkc(a) { + this.a = a; + } + function Olc(a) { + this.a = a; + } + function pnc(a) { + this.a = a; + } + function rnc(a) { + this.a = a; + } + function dpc(a) { + this.a = a; + } + function fpc(a) { + this.a = a; + } + function GCc(a) { + this.a = a; + } + function KCc(a) { + this.a = a; + } + function mDc(a) { + this.a = a; + } + function jEc(a) { + this.a = a; + } + function HEc(a) { + this.a = a; + } + function FEc(a) { + this.c = a; + } + function qoc(a) { + this.b = a; + } + function bFc(a) { + this.a = a; + } + function GFc(a) { + this.a = a; + } + function iGc(a) { + this.a = a; + } + function kGc(a) { + this.a = a; + } + function mGc(a) { + this.a = a; + } + function $Gc(a) { + this.a = a; + } + function hIc(a) { + this.a = a; + } + function lIc(a) { + this.a = a; + } + function pIc(a) { + this.a = a; + } + function tIc(a) { + this.a = a; + } + function xIc(a) { + this.a = a; + } + function zIc(a) { + this.a = a; + } + function CIc(a) { + this.a = a; + } + function LIc(a) { + this.a = a; + } + function CKc(a) { + this.a = a; + } + function IKc(a) { + this.a = a; + } + function MKc(a) { + this.a = a; + } + function $Kc(a) { + this.a = a; + } + function cLc(a) { + this.a = a; + } + function jLc(a) { + this.a = a; + } + function rLc(a) { + this.a = a; + } + function xLc(a) { + this.a = a; + } + function OMc(a) { + this.a = a; + } + function ZOc(a) { + this.a = a; + } + function ZRc(a) { + this.a = a; + } + function aSc(a) { + this.a = a; + } + function I$c(a) { + this.a = a; + } + function K$c(a) { + this.a = a; + } + function M$c(a) { + this.a = a; + } + function O$c(a) { + this.a = a; + } + function U$c(a) { + this.a = a; + } + function n1c(a) { + this.a = a; + } + function z1c(a) { + this.a = a; + } + function B1c(a) { + this.a = a; + } + function Q2c(a) { + this.a = a; + } + function U2c(a) { + this.a = a; + } + function z3c(a) { + this.a = a; + } + function med(a) { + this.a = a; + } + function Xed(a) { + this.a = a; + } + function _ed(a) { + this.a = a; + } + function Qfd(a) { + this.a = a; + } + function Bgd(a) { + this.a = a; + } + function $gd(a) { + this.a = a; + } + function lrd(a) { + this.a = a; + } + function urd(a) { + this.a = a; + } + function vrd(a) { + this.a = a; + } + function wrd(a) { + this.a = a; + } + function xrd(a) { + this.a = a; + } + function yrd(a) { + this.a = a; + } + function zrd(a) { + this.a = a; + } + function Ard(a) { + this.a = a; + } + function Brd(a) { + this.a = a; + } + function Crd(a) { + this.a = a; + } + function Ird(a) { + this.a = a; + } + function Krd(a) { + this.a = a; + } + function Lrd(a) { + this.a = a; + } + function Mrd(a) { + this.a = a; + } + function Nrd(a) { + this.a = a; + } + function Prd(a) { + this.a = a; + } + function Srd(a) { + this.a = a; + } + function Yrd(a) { + this.a = a; + } + function Zrd(a) { + this.a = a; + } + function _rd(a) { + this.a = a; + } + function asd(a) { + this.a = a; + } + function bsd(a) { + this.a = a; + } + function csd(a) { + this.a = a; + } + function dsd(a) { + this.a = a; + } + function msd(a) { + this.a = a; + } + function osd(a) { + this.a = a; + } + function qsd(a) { + this.a = a; + } + function ssd(a) { + this.a = a; + } + function Wsd(a) { + this.a = a; + } + function Lsd(a) { + this.b = a; + } + function thd(a) { + this.f = a; + } + function qtd(a) { + this.a = a; + } + function yBd(a) { + this.a = a; + } + function GBd(a) { + this.a = a; + } + function MBd(a) { + this.a = a; + } + function SBd(a) { + this.a = a; + } + function iCd(a) { + this.a = a; + } + function YMd(a) { + this.a = a; + } + function GNd(a) { + this.a = a; + } + function EPd(a) { + this.a = a; + } + function EQd(a) { + this.a = a; + } + function NTd(a) { + this.a = a; + } + function qOd(a) { + this.b = a; + } + function lVd(a) { + this.c = a; + } + function VVd(a) { + this.e = a; + } + function iYd(a) { + this.a = a; + } + function RYd(a) { + this.a = a; + } + function ZYd(a) { + this.a = a; + } + function z0d(a) { + this.a = a; + } + function O0d(a) { + this.a = a; + } + function s0d(a) { + this.d = a; + } + function W5d(a) { + this.a = a; + } + function cge(a) { + this.a = a; + } + function xfe(a) { + this.e = a; + } + function Tfd() { + this.a = 0; + } + function jkb() { + Vjb(this); + } + function Rkb() { + Ckb(this); + } + function Lqb() { + Uhb(this); + } + function lEb() { + kEb(this); + } + function A_b() { + s_b(this); + } + function UQd() { + this.c = FQd; + } + function v6d(a, b) { + b.Wb(a); + } + function moc(a, b) { + a.b += b; + } + function yXb(a) { + a.b = new Ji(); + } + function vbb(a) { + return a.e; + } + function DB(a) { + return a.a; + } + function LB(a) { + return a.a; + } + function ZB(a) { + return a.a; + } + function lC(a) { + return a.a; + } + function EC(a) { + return a.a; + } + function wC() { + return null; + } + function SB() { + return null; + } + function hcb() { + mvd(); + ovd(); + } + function zJb(a) { + a.b.tf(a.e); + } + function j5b(a, b) { + a.b = b - a.b; + } + function g5b(a, b) { + a.a = b - a.a; + } + function PXc(a, b) { + b.ad(a.a); + } + function plc(a, b) { + G0b(b, a); + } + function hp(a, b, c) { + a.Od(c, b); + } + function As(a, b) { + a.e = b; + b.b = a; + } + function Zl(a) { + Ql(); + this.a = a; + } + function jq(a) { + Ql(); + this.a = a; + } + function sq(a) { + Ql(); + this.a = a; + } + function Fq(a) { + im(); + this.a = a; + } + function Sz(a) { + Rz(); + Qz.be(a); + } + function gz() { + Xy.call(this); + } + function xcb() { + Xy.call(this); + } + function pcb() { + gz.call(this); + } + function tcb() { + gz.call(this); + } + function Bdb() { + gz.call(this); + } + function Vdb() { + gz.call(this); + } + function Ydb() { + gz.call(this); + } + function Geb() { + gz.call(this); + } + function bgb() { + gz.call(this); + } + function Apb() { + gz.call(this); + } + function Jpb() { + gz.call(this); + } + function utb() { + gz.call(this); + } + function x2c() { + gz.call(this); + } + function rQd() { + this.a = this; + } + function MPd() { + this.Bb |= 256; + } + function tTb() { + this.b = new mt(); + } + function fA() { + fA = ccb; + new Lqb(); + } + function rcb() { + pcb.call(this); + } + function dCb(a, b) { + a.length = b; + } + function Tvb(a, b) { + Ekb(a.a, b); + } + function sKb(a, b) { + UHb(a.c, b); + } + function SMc(a, b) { + Qqb(a.b, b); + } + function vBd(a, b) { + uAd(a.a, b); + } + function wBd(a, b) { + vAd(a.a, b); + } + function GLd(a, b) { + Uhd(a.e, b); + } + function d7d(a) { + D2d(a.c, a.b); + } + function mj(a, b) { + a.kc().Nb(b); + } + function Odb(a) { + this.a = Tdb(a); + } + function Tqb() { + this.a = new Lqb(); + } + function gyb() { + this.a = new Lqb(); + } + function Wvb() { + this.a = new Rkb(); + } + function KFb() { + this.a = new Rkb(); + } + function PFb() { + this.a = new Rkb(); + } + function FFb() { + this.a = new yFb(); + } + function pGb() { + this.a = new MFb(); + } + function ZQb() { + this.a = new MQb(); + } + function Gxb() { + this.a = new Pwb(); + } + function jUb() { + this.a = new PTb(); + } + function sDb() { + this.a = new oDb(); + } + function zDb() { + this.a = new tDb(); + } + function CWb() { + this.a = new Rkb(); + } + function HXb() { + this.a = new Rkb(); + } + function nYb() { + this.a = new Rkb(); + } + function BYb() { + this.a = new Rkb(); + } + function fLb() { + this.d = new Rkb(); + } + function vYb() { + this.a = new Tqb(); + } + function a2b() { + this.a = new Lqb(); + } + function wZb() { + this.b = new Lqb(); + } + function TCc() { + this.b = new Rkb(); + } + function zJc() { + this.e = new Rkb(); + } + function uMc() { + this.d = new Rkb(); + } + function wdc() { + this.a = new xkc(); + } + function vKc() { + Rkb.call(this); + } + function twb() { + Wvb.call(this); + } + function oHb() { + $Gb.call(this); + } + function LXb() { + HXb.call(this); + } + function L_b() { + H_b.call(this); + } + function H_b() { + A_b.call(this); + } + function p0b() { + A_b.call(this); + } + function s0b() { + p0b.call(this); + } + function WMc() { + VMc.call(this); + } + function bNc() { + VMc.call(this); + } + function EPc() { + CPc.call(this); + } + function JPc() { + CPc.call(this); + } + function OPc() { + CPc.call(this); + } + function w1c() { + s1c.call(this); + } + function s7c() { + Psb.call(this); + } + function apd() { + Ald.call(this); + } + function ppd() { + Ald.call(this); + } + function lDd() { + YCd.call(this); + } + function NDd() { + YCd.call(this); + } + function mFd() { + Lqb.call(this); + } + function vFd() { + Lqb.call(this); + } + function GFd() { + Lqb.call(this); + } + function KPd() { + Tqb.call(this); + } + function OJd() { + hJd.call(this); + } + function aQd() { + MPd.call(this); + } + function SSd() { + FId.call(this); + } + function rUd() { + FId.call(this); + } + function oUd() { + Lqb.call(this); + } + function NYd() { + Lqb.call(this); + } + function cZd() { + Lqb.call(this); + } + function R8d() { + MGd.call(this); + } + function o9d() { + MGd.call(this); + } + function i9d() { + R8d.call(this); + } + function hee() { + ude.call(this); + } + function Dd(a) { + yd.call(this, a); + } + function Hd(a) { + yd.call(this, a); + } + function ph(a) { + lh.call(this, a); + } + function Sh(a) { + Wc.call(this, a); + } + function oi(a) { + Sh.call(this, a); + } + function Ii(a) { + Wc.call(this, a); + } + function Zdd() { + this.a = new Psb(); + } + function CPc() { + this.a = new Tqb(); + } + function s1c() { + this.a = new Lqb(); + } + function QSc() { + this.a = new Rkb(); + } + function D2c() { + this.j = new Rkb(); + } + function QXc() { + this.a = new UXc(); + } + function e_c() { + this.a = new d_c(); + } + function YCd() { + this.a = new aDd(); + } + function _k() { + _k = ccb; + $k = new al(); + } + function Lk() { + Lk = ccb; + Kk = new Mk(); + } + function wb() { + wb = ccb; + vb = new xb(); + } + function hs() { + hs = ccb; + gs = new is(); + } + function rs(a) { + Sh.call(this, a); + } + function Gp(a) { + Sh.call(this, a); + } + function xp(a) { + Lo.call(this, a); + } + function Ep(a) { + Lo.call(this, a); + } + function Tp(a) { + Wn.call(this, a); + } + function wx(a) { + un.call(this, a); + } + function ov(a) { + dv.call(this, a); + } + function Mv(a) { + Br.call(this, a); + } + function Ov(a) { + Br.call(this, a); + } + function Lw(a) { + Br.call(this, a); + } + function hz(a) { + Yy.call(this, a); + } + function MB(a) { + hz.call(this, a); + } + function eC() { + fC.call(this, {}); + } + function Ftb(a) { + Atb(); + this.a = a; + } + function zwb(a) { + a.b = null; + a.c = 0; + } + function Vy(a, b) { + a.e = b; + Sy(a, b); + } + function LVb(a, b) { + a.a = b; + NVb(a); + } + function lIb(a, b, c) { + a.a[b.g] = c; + } + function vfd(a, b, c) { + Dfd(c, a, b); + } + function Odc(a, b) { + rjc(b.i, a.n); + } + function Wyc(a, b) { + Xyc(a).td(b); + } + function ERb(a, b) { + return (a * a) / b; + } + function Xr(a, b) { + return a.g - b.g; + } + function tC(a) { + return new TB(a); + } + function vC(a) { + return new yC(a); + } + function ocb(a) { + hz.call(this, a); + } + function qcb(a) { + hz.call(this, a); + } + function ucb(a) { + hz.call(this, a); + } + function vcb(a) { + Yy.call(this, a); + } + function fGc(a) { + LFc(); + this.a = a; + } + function c0d(a) { + kzd(); + this.a = a; + } + function bhd(a) { + Rgd(); + this.f = a; + } + function dhd(a) { + Rgd(); + this.f = a; + } + function Cdb(a) { + hz.call(this, a); + } + function Wdb(a) { + hz.call(this, a); + } + function Zdb(a) { + hz.call(this, a); + } + function Feb(a) { + hz.call(this, a); + } + function Heb(a) { + hz.call(this, a); + } + function Ccb(a) { + return uCb(a), a; + } + function Edb(a) { + return uCb(a), a; + } + function Gdb(a) { + return uCb(a), a; + } + function jfb(a) { + return uCb(a), a; + } + function tfb(a) { + return uCb(a), a; + } + function akb(a) { + return a.b == a.c; + } + function Hwb(a) { + return !!a && a.b; + } + function pIb(a) { + return !!a && a.k; + } + function qIb(a) { + return !!a && a.j; + } + function amb(a) { + uCb(a); + this.a = a; + } + function wVb(a) { + qVb(a); + return a; + } + function Blb(a) { + Glb(a, a.length); + } + function cgb(a) { + hz.call(this, a); + } + function cqd(a) { + hz.call(this, a); + } + function n8d(a) { + hz.call(this, a); + } + function y2c(a) { + hz.call(this, a); + } + function z2c(a) { + hz.call(this, a); + } + function mde(a) { + hz.call(this, a); + } + function pc(a) { + qc.call(this, a, 0); + } + function Ji() { + Ki.call(this, 12, 3); + } + function Kz() { + Kz = ccb; + Jz = new Nz(); + } + function jz() { + jz = ccb; + iz = new nb(); + } + function KA() { + KA = ccb; + JA = new MA(); + } + function OB() { + OB = ccb; + NB = new PB(); + } + function jc() { + throw vbb(new bgb()); + } + function zh() { + throw vbb(new bgb()); + } + function Pi() { + throw vbb(new bgb()); + } + function Pj() { + throw vbb(new bgb()); + } + function Qj() { + throw vbb(new bgb()); + } + function Ym() { + throw vbb(new bgb()); + } + function Gb() { + this.a = GD(Qb(She)); + } + function oy(a) { + Ql(); + this.a = Qb(a); + } + function Bs(a, b) { + a.Td(b); + b.Sd(a); + } + function iw(a, b) { + a.a.ec().Mc(b); + } + function CYb(a, b, c) { + a.c.lf(b, c); + } + function scb(a) { + qcb.call(this, a); + } + function Oeb(a) { + Wdb.call(this, a); + } + function Hfb() { + mcb.call(this, ""); + } + function Ifb() { + mcb.call(this, ""); + } + function Ufb() { + mcb.call(this, ""); + } + function Vfb() { + mcb.call(this, ""); + } + function Xfb(a) { + qcb.call(this, a); + } + function zob(a) { + lnb.call(this, a); + } + function Yob(a) { + Inb.call(this, a); + } + function Gob(a) { + zob.call(this, a); + } + function Mk() { + Fk.call(this, null); + } + function al() { + Fk.call(this, null); + } + function Az() { + Az = ccb; + !!(Rz(), Qz); + } + function wrb() { + wrb = ccb; + vrb = yrb(); + } + function Mtb(a) { + return a.a ? a.b : 0; + } + function Vtb(a) { + return a.a ? a.b : 0; + } + function Lcb(a, b) { + return a.a - b.a; + } + function Wcb(a, b) { + return a.a - b.a; + } + function Peb(a, b) { + return a.a - b.a; + } + function eCb(a, b) { + return PC(a, b); + } + function GC(a, b) { + return rdb(a, b); + } + function _B(b, a) { + return a in b.a; + } + function _Db(a, b) { + a.f = b; + return a; + } + function ZDb(a, b) { + a.b = b; + return a; + } + function $Db(a, b) { + a.c = b; + return a; + } + function aEb(a, b) { + a.g = b; + return a; + } + function HGb(a, b) { + a.a = b; + return a; + } + function IGb(a, b) { + a.f = b; + return a; + } + function JGb(a, b) { + a.k = b; + return a; + } + function dLb(a, b) { + a.a = b; + return a; + } + function eLb(a, b) { + a.e = b; + return a; + } + function zVb(a, b) { + a.e = b; + return a; + } + function AVb(a, b) { + a.f = b; + return a; + } + function KOb(a, b) { + a.b = true; + a.d = b; + } + function DHb(a, b) { + a.b = new g7c(b); + } + function uvb(a, b, c) { + b.td(a.a[c]); + } + function zvb(a, b, c) { + b.we(a.a[c]); + } + function wJc(a, b) { + return a.b - b.b; + } + function kOc(a, b) { + return a.g - b.g; + } + function WQc(a, b) { + return a.s - b.s; + } + function Lic(a, b) { + return a ? 0 : b - 1; + } + function SFc(a, b) { + return a ? 0 : b - 1; + } + function RFc(a, b) { + return a ? b - 1 : 0; + } + function M2c(a, b) { + return b.Yf(a); + } + function M3c(a, b) { + a.b = b; + return a; + } + function L3c(a, b) { + a.a = b; + return a; + } + function N3c(a, b) { + a.c = b; + return a; + } + function O3c(a, b) { + a.d = b; + return a; + } + function P3c(a, b) { + a.e = b; + return a; + } + function Q3c(a, b) { + a.f = b; + return a; + } + function b4c(a, b) { + a.a = b; + return a; + } + function c4c(a, b) { + a.b = b; + return a; + } + function d4c(a, b) { + a.c = b; + return a; + } + function z5c(a, b) { + a.c = b; + return a; + } + function y5c(a, b) { + a.b = b; + return a; + } + function A5c(a, b) { + a.d = b; + return a; + } + function B5c(a, b) { + a.e = b; + return a; + } + function C5c(a, b) { + a.f = b; + return a; + } + function D5c(a, b) { + a.g = b; + return a; + } + function E5c(a, b) { + a.a = b; + return a; + } + function F5c(a, b) { + a.i = b; + return a; + } + function G5c(a, b) { + a.j = b; + return a; + } + function Vdd(a, b) { + a.k = b; + return a; + } + function Wdd(a, b) { + a.j = b; + return a; + } + function ykc(a, b) { + gkc(); + F0b(b, a); + } + function T$c(a, b, c) { + R$c(a.a, b, c); + } + function RGc(a) { + cEc.call(this, a); + } + function iHc(a) { + cEc.call(this, a); + } + function t7c(a) { + Qsb.call(this, a); + } + function aPb(a) { + _Ob.call(this, a); + } + function Ixd(a) { + zud.call(this, a); + } + function dCd(a) { + ZBd.call(this, a); + } + function fCd(a) { + ZBd.call(this, a); + } + function p_b() { + q_b.call(this, ""); + } + function d7c() { + this.a = 0; + this.b = 0; + } + function aPc() { + this.b = 0; + this.a = 0; + } + function NJd(a, b) { + a.b = 0; + DId(a, b); + } + function X1d(a, b) { + a.c = b; + a.b = true; + } + function Oc(a, b) { + return a.c._b(b); + } + function gdb(a) { + return a.e && a.e(); + } + function Vd(a) { + return !a ? null : a.d; + } + function sn(a, b) { + return Gv(a.b, b); + } + function Fv(a) { + return !a ? null : a.g; + } + function Kv(a) { + return !a ? null : a.i; + } + function hdb(a) { + fdb(a); + return a.o; + } + function Fhd() { + Fhd = ccb; + Ehd = ond(); + } + function Hhd() { + Hhd = ccb; + Ghd = Cod(); + } + function LFd() { + LFd = ccb; + KFd = qZd(); + } + function p8d() { + p8d = ccb; + o8d = Y9d(); + } + function r8d() { + r8d = ccb; + q8d = dae(); + } + function mvd() { + mvd = ccb; + lvd = n4c(); + } + function Srb() { + throw vbb(new bgb()); + } + function enb() { + throw vbb(new bgb()); + } + function fnb() { + throw vbb(new bgb()); + } + function gnb() { + throw vbb(new bgb()); + } + function jnb() { + throw vbb(new bgb()); + } + function Cnb() { + throw vbb(new bgb()); + } + function Uqb(a) { + this.a = new Mqb(a); + } + function tgb(a) { + lgb(); + ngb(this, a); + } + function Hxb(a) { + this.a = new Qwb(a); + } + function _ub(a, b) { + while (a.ye(b)); + } + function Sub(a, b) { + while (a.sd(b)); + } + function Bfb(a, b) { + a.a += b; + return a; + } + function Cfb(a, b) { + a.a += b; + return a; + } + function Ffb(a, b) { + a.a += b; + return a; + } + function Lfb(a, b) { + a.a += b; + return a; + } + function WAb(a) { + Tzb(a); + return a.a; + } + function Wsb(a) { + return a.b != a.d.c; + } + function pD(a) { + return a.l | (a.m << 22); + } + function aIc(a, b) { + return a.d[b.p]; + } + function h2c(a, b) { + return c2c(a, b); + } + function cCb(a, b, c) { + a.splice(b, c); + } + function WHb(a) { + a.c ? VHb(a) : XHb(a); + } + function jVc(a) { + this.a = 0; + this.b = a; + } + function ZUc() { + this.a = new L2c(K$); + } + function tRc() { + this.b = new L2c(h$); + } + function Q$c() { + this.b = new L2c(J_); + } + function d_c() { + this.b = new L2c(J_); + } + function OCd() { + throw vbb(new bgb()); + } + function PCd() { + throw vbb(new bgb()); + } + function QCd() { + throw vbb(new bgb()); + } + function RCd() { + throw vbb(new bgb()); + } + function SCd() { + throw vbb(new bgb()); + } + function TCd() { + throw vbb(new bgb()); + } + function UCd() { + throw vbb(new bgb()); + } + function VCd() { + throw vbb(new bgb()); + } + function WCd() { + throw vbb(new bgb()); + } + function XCd() { + throw vbb(new bgb()); + } + function ahe() { + throw vbb(new utb()); + } + function bhe() { + throw vbb(new utb()); + } + function Rge(a) { + this.a = new ege(a); + } + function ege(a) { + dge(this, a, Vee()); + } + function Fhe(a) { + return !a || Ehe(a); + } + function dde(a) { + return $ce[a] != -1; + } + function Iz() { + xz != 0 && (xz = 0); + zz = -1; + } + function Ybb() { + Wbb == null && (Wbb = []); + } + function ONd(a, b) { + Rxd(ZKd(a.a), b); + } + function TNd(a, b) { + Rxd(ZKd(a.a), b); + } + function Yf(a, b) { + zf.call(this, a, b); + } + function $f(a, b) { + Yf.call(this, a, b); + } + function Hf(a, b) { + this.b = a; + this.c = b; + } + function rk(a, b) { + this.b = a; + this.a = b; + } + function ek(a, b) { + this.a = a; + this.b = b; + } + function gk(a, b) { + this.a = a; + this.b = b; + } + function pk(a, b) { + this.a = a; + this.b = b; + } + function yk(a, b) { + this.a = a; + this.b = b; + } + function Ak(a, b) { + this.a = a; + this.b = b; + } + function Fj(a, b) { + this.a = a; + this.b = b; + } + function _j(a, b) { + this.a = a; + this.b = b; + } + function dr(a, b) { + this.a = a; + this.b = b; + } + function zr(a, b) { + this.b = a; + this.a = b; + } + function So(a, b) { + this.b = a; + this.a = b; + } + function qp(a, b) { + this.b = a; + this.a = b; + } + function $q(a, b) { + this.b = a; + this.a = b; + } + function $r(a, b) { + this.f = a; + this.g = b; + } + function ne(a, b) { + this.e = a; + this.d = b; + } + function Wo(a, b) { + this.g = a; + this.i = b; + } + function bu(a, b) { + this.a = a; + this.b = b; + } + function qu(a, b) { + this.a = a; + this.f = b; + } + function qv(a, b) { + this.b = a; + this.c = b; + } + function ox(a, b) { + this.a = a; + this.b = b; + } + function Px(a, b) { + this.a = a; + this.b = b; + } + function mC(a, b) { + this.a = a; + this.b = b; + } + function Wc(a) { + Lb(a.dc()); + this.c = a; + } + function rf(a) { + this.b = BD(Qb(a), 83); + } + function Zv(a) { + this.a = BD(Qb(a), 83); + } + function dv(a) { + this.a = BD(Qb(a), 15); + } + function $u(a) { + this.a = BD(Qb(a), 15); + } + function Br(a) { + this.b = BD(Qb(a), 47); + } + function eB() { + this.q = new Date(); + } + function Zfb() { + Zfb = ccb; + Yfb = new jcb(); + } + function Emb() { + Emb = ccb; + Dmb = new Fmb(); + } + function Vhb(a) { + return a.f.c + a.g.c; + } + function hnb(a, b) { + return a.b.Hc(b); + } + function inb(a, b) { + return a.b.Ic(b); + } + function knb(a, b) { + return a.b.Qc(b); + } + function Dob(a, b) { + return a.b.Hc(b); + } + function dob(a, b) { + return a.c.uc(b); + } + function Rqb(a, b) { + return a.a._b(b); + } + function fob(a, b) { + return pb(a.c, b); + } + function jt(a, b) { + return Mhb(a.b, b); + } + function Lp(a, b) { + return a > b && b < Iie; + } + function Ryb(a, b) { + return a.Gc(b), a; + } + function Syb(a, b) { + return ye(a, b), a; + } + function sC(a) { + return GB(), a ? FB : EB; + } + function Mqb(a) { + Whb.call(this, a, 0); + } + function Pwb() { + Qwb.call(this, null); + } + function yAb() { + Vzb.call(this, null); + } + function Gqb(a) { + this.c = a; + Dqb(this); + } + function Psb() { + Csb(this); + Osb(this); + } + function MAb(a, b) { + Tzb(a); + a.a.Nb(b); + } + function Myb(a, b) { + a.Gc(b); + return a; + } + function qDb(a, b) { + a.a.f = b; + return a; + } + function wDb(a, b) { + a.a.d = b; + return a; + } + function xDb(a, b) { + a.a.g = b; + return a; + } + function yDb(a, b) { + a.a.j = b; + return a; + } + function BFb(a, b) { + a.a.a = b; + return a; + } + function CFb(a, b) { + a.a.d = b; + return a; + } + function DFb(a, b) { + a.a.e = b; + return a; + } + function EFb(a, b) { + a.a.g = b; + return a; + } + function oGb(a, b) { + a.a.f = b; + return a; + } + function TGb(a) { + a.b = false; + return a; + } + function Ltb() { + Ltb = ccb; + Ktb = new Otb(); + } + function Utb() { + Utb = ccb; + Ttb = new Wtb(); + } + function $xb() { + $xb = ccb; + Zxb = new byb(); + } + function $Yb() { + $Yb = ccb; + ZYb = new dZb(); + } + function cPb() { + cPb = ccb; + bPb = new dPb(); + } + function EAb() { + EAb = ccb; + DAb = new PBb(); + } + function a$b() { + a$b = ccb; + _Zb = new P$b(); + } + function FDb() { + FDb = ccb; + EDb = new GDb(); + } + function xUb() { + xUb = ccb; + wUb = new DUb(); + } + function x2b() { + x2b = ccb; + w2b = new d7c(); + } + function iVb() { + iVb = ccb; + hVb = new jVb(); + } + function nVb() { + nVb = ccb; + mVb = new OVb(); + } + function LWb() { + LWb = ccb; + KWb = new QWb(); + } + function b4b() { + b4b = ccb; + a4b = new l4b(); + } + function q9b() { + q9b = ccb; + p9b = new w9b(); + } + function qgc() { + qgc = ccb; + pgc = new dic(); + } + function Imc() { + Imc = ccb; + Hmc = new Wmc(); + } + function GUc() { + GUc = ccb; + FUc = new j3c(); + } + function i_c() { + i_c = ccb; + h_c = new k_c(); + } + function s_c() { + s_c = ccb; + r_c = new t_c(); + } + function R0c() { + R0c = ccb; + Q0c = new T0c(); + } + function Vyc() { + Vyc = ccb; + Uyc = new Ved(); + } + function DCc() { + vCc(); + this.c = new Ji(); + } + function k_c() { + $r.call(this, Une, 0); + } + function r4c(a, b) { + Xrb(a.c.b, b.c, b); + } + function s4c(a, b) { + Xrb(a.c.c, b.b, b); + } + function B3c(a, b, c) { + Shb(a.d, b.f, c); + } + function kKb(a, b, c, d) { + jKb(a, d, b, c); + } + function E3b(a, b, c, d) { + J3b(d, a, b, c); + } + function e9b(a, b, c, d) { + f9b(d, a, b, c); + } + function g3c(a, b) { + a.a = b.g; + return a; + } + function DQd(a, b) { + return qA(a.a, b); + } + function nQd(a) { + return a.b ? a.b : a.a; + } + function $Oc(a) { + return (a.c + a.a) / 2; + } + function Pgd() { + Pgd = ccb; + Ogd = new Ahd(); + } + function AFd() { + AFd = ccb; + zFd = new BFd(); + } + function tFd() { + tFd = ccb; + sFd = new vFd(); + } + function EFd() { + EFd = ccb; + DFd = new GFd(); + } + function yFd() { + yFd = ccb; + xFd = new oUd(); + } + function JFd() { + JFd = ccb; + IFd = new cZd(); + } + function nRd() { + nRd = ccb; + mRd = new u4d(); + } + function LRd() { + LRd = ccb; + KRd = new y4d(); + } + function g5d() { + g5d = ccb; + f5d = new h5d(); + } + function Q6d() { + Q6d = ccb; + P6d = new U6d(); + } + function pEd() { + pEd = ccb; + oEd = new Lqb(); + } + function tZd() { + tZd = ccb; + rZd = new Rkb(); + } + function Xge() { + Xge = ccb; + Wge = new dhe(); + } + function Hz(a) { + clearTimeout(a); + } + function jw(a) { + this.a = BD(Qb(a), 224); + } + function Lv(a) { + return BD(a, 42).cd(); + } + function sib(a) { + return a.b < a.d.gc(); + } + function Lpb(a, b) { + return tqb(a.a, b); + } + function Dbb(a, b) { + return ybb(a, b) > 0; + } + function Gbb(a, b) { + return ybb(a, b) < 0; + } + function Crb(a, b) { + return a.a.get(b); + } + function icb(b, a) { + return a.split(b); + } + function Vrb(a, b) { + return Mhb(a.e, b); + } + function Nvb(a) { + return uCb(a), false; + } + function Rub(a) { + Kub.call(this, a, 21); + } + function wcb(a, b) { + Zy.call(this, a, b); + } + function mxb(a, b) { + $r.call(this, a, b); + } + function Gyb(a, b) { + $r.call(this, a, b); + } + function zx(a) { + yx(); + Wn.call(this, a); + } + function zlb(a, b) { + Dlb(a, a.length, b); + } + function Alb(a, b) { + Flb(a, a.length, b); + } + function ABb(a, b, c) { + b.ud(a.a.Ge(c)); + } + function uBb(a, b, c) { + b.we(a.a.Fe(c)); + } + function GBb(a, b, c) { + b.td(a.a.Kb(c)); + } + function Zq(a, b, c) { + a.Mb(c) && b.td(c); + } + function aCb(a, b, c) { + a.splice(b, 0, c); + } + function lDb(a, b) { + return uqb(a.e, b); + } + function pjb(a, b) { + this.d = a; + this.e = b; + } + function kqb(a, b) { + this.b = a; + this.a = b; + } + function VBb(a, b) { + this.b = a; + this.a = b; + } + function BEb(a, b) { + this.b = a; + this.a = b; + } + function sBb(a, b) { + this.a = a; + this.b = b; + } + function yBb(a, b) { + this.a = a; + this.b = b; + } + function EBb(a, b) { + this.a = a; + this.b = b; + } + function KBb(a, b) { + this.a = a; + this.b = b; + } + function aDb(a, b) { + this.a = a; + this.b = b; + } + function tMb(a, b) { + this.b = a; + this.a = b; + } + function oOb(a, b) { + this.b = a; + this.a = b; + } + function SOb(a, b) { + $r.call(this, a, b); + } + function SMb(a, b) { + $r.call(this, a, b); + } + function NEb(a, b) { + $r.call(this, a, b); + } + function VEb(a, b) { + $r.call(this, a, b); + } + function sFb(a, b) { + $r.call(this, a, b); + } + function hHb(a, b) { + $r.call(this, a, b); + } + function OHb(a, b) { + $r.call(this, a, b); + } + function FIb(a, b) { + $r.call(this, a, b); + } + function wLb(a, b) { + $r.call(this, a, b); + } + function YRb(a, b) { + $r.call(this, a, b); + } + function zTb(a, b) { + $r.call(this, a, b); + } + function rUb(a, b) { + $r.call(this, a, b); + } + function oWb(a, b) { + $r.call(this, a, b); + } + function SXb(a, b) { + $r.call(this, a, b); + } + function k0b(a, b) { + $r.call(this, a, b); + } + function z5b(a, b) { + $r.call(this, a, b); + } + function T8b(a, b) { + $r.call(this, a, b); + } + function ibc(a, b) { + $r.call(this, a, b); + } + function Cec(a, b) { + this.a = a; + this.b = b; + } + function rfc(a, b) { + this.a = a; + this.b = b; + } + function Rfc(a, b) { + this.a = a; + this.b = b; + } + function Tfc(a, b) { + this.a = a; + this.b = b; + } + function bgc(a, b) { + this.a = a; + this.b = b; + } + function ngc(a, b) { + this.a = a; + this.b = b; + } + function Qhc(a, b) { + this.a = a; + this.b = b; + } + function $hc(a, b) { + this.a = a; + this.b = b; + } + function Z0b(a, b) { + this.a = a; + this.b = b; + } + function ZVb(a, b) { + this.b = a; + this.a = b; + } + function Dfc(a, b) { + this.b = a; + this.a = b; + } + function dgc(a, b) { + this.b = a; + this.a = b; + } + function Bmc(a, b) { + this.b = a; + this.a = b; + } + function cWb(a, b) { + this.c = a; + this.d = b; + } + function I$b(a, b) { + this.e = a; + this.d = b; + } + function Unc(a, b) { + this.a = a; + this.b = b; + } + function Oic(a, b) { + this.b = b; + this.c = a; + } + function Bjc(a, b) { + $r.call(this, a, b); + } + function Yjc(a, b) { + $r.call(this, a, b); + } + function Gkc(a, b) { + $r.call(this, a, b); + } + function Bpc(a, b) { + $r.call(this, a, b); + } + function Jpc(a, b) { + $r.call(this, a, b); + } + function Tpc(a, b) { + $r.call(this, a, b); + } + function cqc(a, b) { + $r.call(this, a, b); + } + function oqc(a, b) { + $r.call(this, a, b); + } + function yqc(a, b) { + $r.call(this, a, b); + } + function Hqc(a, b) { + $r.call(this, a, b); + } + function Uqc(a, b) { + $r.call(this, a, b); + } + function arc(a, b) { + $r.call(this, a, b); + } + function mrc(a, b) { + $r.call(this, a, b); + } + function zrc(a, b) { + $r.call(this, a, b); + } + function Prc(a, b) { + $r.call(this, a, b); + } + function Yrc(a, b) { + $r.call(this, a, b); + } + function fsc(a, b) { + $r.call(this, a, b); + } + function nsc(a, b) { + $r.call(this, a, b); + } + function nzc(a, b) { + $r.call(this, a, b); + } + function zzc(a, b) { + $r.call(this, a, b); + } + function Kzc(a, b) { + $r.call(this, a, b); + } + function Xzc(a, b) { + $r.call(this, a, b); + } + function Dtc(a, b) { + $r.call(this, a, b); + } + function lAc(a, b) { + $r.call(this, a, b); + } + function uAc(a, b) { + $r.call(this, a, b); + } + function CAc(a, b) { + $r.call(this, a, b); + } + function LAc(a, b) { + $r.call(this, a, b); + } + function UAc(a, b) { + $r.call(this, a, b); + } + function aBc(a, b) { + $r.call(this, a, b); + } + function uBc(a, b) { + $r.call(this, a, b); + } + function DBc(a, b) { + $r.call(this, a, b); + } + function MBc(a, b) { + $r.call(this, a, b); + } + function sGc(a, b) { + $r.call(this, a, b); + } + function VIc(a, b) { + $r.call(this, a, b); + } + function EIc(a, b) { + this.b = a; + this.a = b; + } + function qKc(a, b) { + this.a = a; + this.b = b; + } + function GKc(a, b) { + this.a = a; + this.b = b; + } + function lLc(a, b) { + this.a = a; + this.b = b; + } + function mMc(a, b) { + this.a = a; + this.b = b; + } + function fMc(a, b) { + $r.call(this, a, b); + } + function ZLc(a, b) { + $r.call(this, a, b); + } + function ZMc(a, b) { + this.b = a; + this.d = b; + } + function IOc(a, b) { + $r.call(this, a, b); + } + function GQc(a, b) { + $r.call(this, a, b); + } + function PQc(a, b) { + this.a = a; + this.b = b; + } + function RQc(a, b) { + this.a = a; + this.b = b; + } + function ARc(a, b) { + $r.call(this, a, b); + } + function rSc(a, b) { + $r.call(this, a, b); + } + function TTc(a, b) { + $r.call(this, a, b); + } + function _Tc(a, b) { + $r.call(this, a, b); + } + function RUc(a, b) { + $r.call(this, a, b); + } + function uVc(a, b) { + $r.call(this, a, b); + } + function hWc(a, b) { + $r.call(this, a, b); + } + function rWc(a, b) { + $r.call(this, a, b); + } + function kXc(a, b) { + $r.call(this, a, b); + } + function uXc(a, b) { + $r.call(this, a, b); + } + function AYc(a, b) { + $r.call(this, a, b); + } + function l$c(a, b) { + $r.call(this, a, b); + } + function Z$c(a, b) { + $r.call(this, a, b); + } + function D_c(a, b) { + $r.call(this, a, b); + } + function O_c(a, b) { + $r.call(this, a, b); + } + function c1c(a, b) { + $r.call(this, a, b); + } + function cVb(a, b) { + return uqb(a.c, b); + } + function nnc(a, b) { + return uqb(b.b, a); + } + function x1c(a, b) { + return -a.b.Je(b); + } + function D3c(a, b) { + return uqb(a.g, b); + } + function O5c(a, b) { + $r.call(this, a, b); + } + function a6c(a, b) { + $r.call(this, a, b); + } + function m2c(a, b) { + this.a = a; + this.b = b; + } + function W2c(a, b) { + this.a = a; + this.b = b; + } + function f7c(a, b) { + this.a = a; + this.b = b; + } + function G7c(a, b) { + $r.call(this, a, b); + } + function j8c(a, b) { + $r.call(this, a, b); + } + function iad(a, b) { + $r.call(this, a, b); + } + function rad(a, b) { + $r.call(this, a, b); + } + function Bad(a, b) { + $r.call(this, a, b); + } + function Nad(a, b) { + $r.call(this, a, b); + } + function ibd(a, b) { + $r.call(this, a, b); + } + function tbd(a, b) { + $r.call(this, a, b); + } + function Ibd(a, b) { + $r.call(this, a, b); + } + function Ubd(a, b) { + $r.call(this, a, b); + } + function gcd(a, b) { + $r.call(this, a, b); + } + function scd(a, b) { + $r.call(this, a, b); + } + function Ycd(a, b) { + $r.call(this, a, b); + } + function udd(a, b) { + $r.call(this, a, b); + } + function Jdd(a, b) { + $r.call(this, a, b); + } + function Eed(a, b) { + $r.call(this, a, b); + } + function bfd(a, b) { + this.a = a; + this.b = b; + } + function dfd(a, b) { + this.a = a; + this.b = b; + } + function ffd(a, b) { + this.a = a; + this.b = b; + } + function Kfd(a, b) { + this.a = a; + this.b = b; + } + function Mfd(a, b) { + this.a = a; + this.b = b; + } + function Ofd(a, b) { + this.a = a; + this.b = b; + } + function vgd(a, b) { + this.a = a; + this.b = b; + } + function qgd(a, b) { + $r.call(this, a, b); + } + function jrd(a, b) { + this.a = a; + this.b = b; + } + function krd(a, b) { + this.a = a; + this.b = b; + } + function mrd(a, b) { + this.a = a; + this.b = b; + } + function nrd(a, b) { + this.a = a; + this.b = b; + } + function qrd(a, b) { + this.a = a; + this.b = b; + } + function rrd(a, b) { + this.a = a; + this.b = b; + } + function srd(a, b) { + this.b = a; + this.a = b; + } + function trd(a, b) { + this.b = a; + this.a = b; + } + function Drd(a, b) { + this.b = a; + this.a = b; + } + function Frd(a, b) { + this.b = a; + this.a = b; + } + function Hrd(a, b) { + this.a = a; + this.b = b; + } + function Jrd(a, b) { + this.a = a; + this.b = b; + } + function Ord(a, b) { + Xqd(a.a, BD(b, 56)); + } + function BIc(a, b) { + gIc(a.a, BD(b, 11)); + } + function fIc(a, b) { + FHc(); + return b != a; + } + function Arb() { + wrb(); + return new vrb(); + } + function CMc() { + wMc(); + this.b = new Tqb(); + } + function NNc() { + FNc(); + this.a = new Tqb(); + } + function eCc() { + ZBc(); + aCc.call(this); + } + function Dsd(a, b) { + $r.call(this, a, b); + } + function Urd(a, b) { + this.a = a; + this.b = b; + } + function Wrd(a, b) { + this.a = a; + this.b = b; + } + function kGd(a, b) { + this.a = a; + this.b = b; + } + function nGd(a, b) { + this.a = a; + this.b = b; + } + function bUd(a, b) { + this.a = a; + this.b = b; + } + function zVd(a, b) { + this.a = a; + this.b = b; + } + function C1d(a, b) { + this.d = a; + this.b = b; + } + function MLd(a, b) { + this.d = a; + this.e = b; + } + function Wud(a, b) { + this.f = a; + this.c = b; + } + function f7d(a, b) { + this.b = a; + this.c = b; + } + function _zd(a, b) { + this.i = a; + this.g = b; + } + function Y1d(a, b) { + this.e = a; + this.a = b; + } + function c8d(a, b) { + this.a = a; + this.b = b; + } + function $Id(a, b) { + a.i = null; + _Id(a, b); + } + function ivd(a, b) { + !!a && Rhb(cvd, a, b); + } + function hCd(a, b) { + return qAd(a.a, b); + } + function e7d(a) { + return R2d(a.c, a.b); + } + function Wd(a) { + return !a ? null : a.dd(); + } + function PD(a) { + return a == null ? null : a; + } + function KD(a) { + return typeof a === Khe; + } + function LD(a) { + return typeof a === Lhe; + } + function ND(a) { + return typeof a === Mhe; + } + function Em(a, b) { + return a.Hd().Xb(b); + } + function Kq(a, b) { + return hr(a.Kc(), b); + } + function Bbb(a, b) { + return ybb(a, b) == 0; + } + function Ebb(a, b) { + return ybb(a, b) >= 0; + } + function Kbb(a, b) { + return ybb(a, b) != 0; + } + function Jdb(a) { + return "" + (uCb(a), a); + } + function pfb(a, b) { + return a.substr(b); + } + function cg(a) { + ag(a); + return a.d.gc(); + } + function oVb(a) { + pVb(a, a.c); + return a; + } + function RD(a) { + CCb(a == null); + return a; + } + function Dfb(a, b) { + a.a += "" + b; + return a; + } + function Efb(a, b) { + a.a += "" + b; + return a; + } + function Nfb(a, b) { + a.a += "" + b; + return a; + } + function Pfb(a, b) { + a.a += "" + b; + return a; + } + function Qfb(a, b) { + a.a += "" + b; + return a; + } + function Mfb(a, b) { + return (a.a += "" + b), a; + } + function Esb(a, b) { + Gsb(a, b, a.a, a.a.a); + } + function Fsb(a, b) { + Gsb(a, b, a.c.b, a.c); + } + function Mqd(a, b, c) { + Rpd(b, kqd(a, c)); + } + function Nqd(a, b, c) { + Rpd(b, kqd(a, c)); + } + function Dhe(a, b) { + Hhe(new Fyd(a), b); + } + function cB(a, b) { + a.q.setTime(Sbb(b)); + } + function fvb(a, b) { + bvb.call(this, a, b); + } + function jvb(a, b) { + bvb.call(this, a, b); + } + function nvb(a, b) { + bvb.call(this, a, b); + } + function Nqb(a) { + Uhb(this); + Ld(this, a); + } + function wmb(a) { + tCb(a, 0); + return null; + } + function X6c(a) { + a.a = 0; + a.b = 0; + return a; + } + function f3c(a, b) { + a.a = b.g + 1; + return a; + } + function PJc(a, b) { + return a.j[b.p] == 2; + } + function _Pb(a) { + return VPb(BD(a, 79)); + } + function yJb() { + yJb = ccb; + xJb = as(wJb()); + } + function Y8b() { + Y8b = ccb; + X8b = as(W8b()); + } + function mt() { + this.b = new Mqb(Cv(12)); + } + function Otb() { + this.b = 0; + this.a = false; + } + function Wtb() { + this.b = 0; + this.a = false; + } + function sl(a) { + this.a = a; + ol.call(this); + } + function vl(a) { + this.a = a; + ol.call(this); + } + function Nsd(a, b) { + Msd.call(this, a, b); + } + function $zd(a, b) { + Cyd.call(this, a, b); + } + function nNd(a, b) { + _zd.call(this, a, b); + } + function s4d(a, b) { + p4d.call(this, a, b); + } + function w4d(a, b) { + qRd.call(this, a, b); + } + function rEd(a, b) { + pEd(); + Rhb(oEd, a, b); + } + function lcb(a, b) { + return qfb(a.a, 0, b); + } + function ww(a, b) { + return a.a.a.a.cc(b); + } + function mb(a, b) { + return PD(a) === PD(b); + } + function Mdb(a, b) { + return Kdb(a.a, b.a); + } + function $db(a, b) { + return beb(a.a, b.a); + } + function seb(a, b) { + return ueb(a.a, b.a); + } + function hfb(a, b) { + return a.indexOf(b); + } + function Ny(a, b) { + return a == b ? 0 : a ? 1 : -1; + } + function kB(a) { + return a < 10 ? "0" + a : "" + a; + } + function Mq(a) { + return Qb(a), new sl(a); + } + function SC(a) { + return TC(a.l, a.m, a.h); + } + function Hdb(a) { + return QD((uCb(a), a)); + } + function Idb(a) { + return QD((uCb(a), a)); + } + function NIb(a, b) { + return beb(a.g, b.g); + } + function Fbb(a) { + return typeof a === Lhe; + } + function mWb(a) { + return a == hWb || a == kWb; + } + function nWb(a) { + return a == hWb || a == iWb; + } + function G1b(a) { + return Jkb(a.b.b, a, 0); + } + function lrb(a) { + this.a = Arb(); + this.b = a; + } + function Frb(a) { + this.a = Arb(); + this.b = a; + } + function swb(a, b) { + Ekb(a.a, b); + return b; + } + function Z1c(a, b) { + Ekb(a.c, b); + return a; + } + function E2c(a, b) { + d3c(a.a, b); + return a; + } + function _gc(a, b) { + Hgc(); + return (b.a += a); + } + function bhc(a, b) { + Hgc(); + return (b.a += a); + } + function ahc(a, b) { + Hgc(); + return (b.c += a); + } + function Nlb(a, b) { + Klb(a, 0, a.length, b); + } + function zsb() { + Wqb.call(this, new $rb()); + } + function I_b() { + B_b.call(this, 0, 0, 0, 0); + } + function I6c() { + J6c.call(this, 0, 0, 0, 0); + } + function g7c(a) { + this.a = a.a; + this.b = a.b; + } + function fad(a) { + return a == aad || a == bad; + } + function gad(a) { + return a == dad || a == _9c; + } + function Jzc(a) { + return a == Fzc || a == Ezc; + } + function fcd(a) { + return a != bcd && a != ccd; + } + function oid(a) { + return a.Lg() && a.Mg(); + } + function Gfd(a) { + return Kkd(BD(a, 118)); + } + function k3c(a) { + return d3c(new j3c(), a); + } + function y2d(a, b) { + return new p4d(b, a); + } + function z2d(a, b) { + return new p4d(b, a); + } + function ukd(a, b, c) { + vkd(a, b); + wkd(a, c); + } + function _kd(a, b, c) { + cld(a, b); + ald(a, c); + } + function bld(a, b, c) { + dld(a, b); + eld(a, c); + } + function gmd(a, b, c) { + hmd(a, b); + imd(a, c); + } + function nmd(a, b, c) { + omd(a, b); + pmd(a, c); + } + function iKd(a, b) { + $Jd(a, b); + _Jd(a, a.D); + } + function _ud(a) { + Wud.call(this, a, true); + } + function Xg(a, b, c) { + Vg.call(this, a, b, c); + } + function Ygb(a) { + Hgb(); + Zgb.call(this, a); + } + function rxb() { + mxb.call(this, "Head", 1); + } + function wxb() { + mxb.call(this, "Tail", 3); + } + function Ckb(a) { + a.c = KC(SI, Uhe, 1, 0, 5, 1); + } + function Vjb(a) { + a.a = KC(SI, Uhe, 1, 8, 5, 1); + } + function MGb(a) { + Hkb(a.xf(), new QGb(a)); + } + function xtb(a) { + return a != null ? tb(a) : 0; + } + function b2b(a, b) { + return ntd(b, mpd(a)); + } + function c2b(a, b) { + return ntd(b, mpd(a)); + } + function dAb(a, b) { + return (a[a.length] = b); + } + function gAb(a, b) { + return (a[a.length] = b); + } + function Vq(a) { + return lr(a.b.Kc(), a.a); + } + function dqd(a, b) { + return _o(qo(a.d), b); + } + function eqd(a, b) { + return _o(qo(a.g), b); + } + function fqd(a, b) { + return _o(qo(a.j), b); + } + function Osd(a, b) { + Msd.call(this, a.b, b); + } + function q0b(a) { + B_b.call(this, a, a, a, a); + } + function HOb(a) { + a.b && LOb(a); + return a.a; + } + function IOb(a) { + a.b && LOb(a); + return a.c; + } + function uyb(a, b) { + if (lyb) { + return; + } + a.b = b; + } + function lzd(a, b, c) { + NC(a, b, c); + return c; + } + function mBc(a, b, c) { + NC(a.c[b.g], b.g, c); + } + function _Hd(a, b, c) { + BD(a.c, 69).Xh(b, c); + } + function wfd(a, b, c) { + bld(c, c.i + a, c.j + b); + } + function UOd(a, b) { + wtd(VKd(a.a), XOd(b)); + } + function bTd(a, b) { + wtd(QSd(a.a), eTd(b)); + } + function Lge(a) { + wfe(); + xfe.call(this, a); + } + function CAd(a) { + return a == null ? 0 : tb(a); + } + function fNc() { + fNc = ccb; + eNc = new Rpb(v1); + } + function h0d() { + h0d = ccb; + new i0d(); + new Rkb(); + } + function i0d() { + new Lqb(); + new Lqb(); + new Lqb(); + } + function GA() { + GA = ccb; + fA(); + FA = new Lqb(); + } + function Iy() { + Iy = ccb; + Math.log(2); + } + function UVd() { + UVd = ccb; + TVd = (AFd(), zFd); + } + function _ge() { + throw vbb(new cgb(Cxe)); + } + function ohe() { + throw vbb(new cgb(Cxe)); + } + function che() { + throw vbb(new cgb(Dxe)); + } + function rhe() { + throw vbb(new cgb(Dxe)); + } + function Mg(a) { + this.a = a; + Gg.call(this, a); + } + function up(a) { + this.a = a; + rf.call(this, a); + } + function Bp(a) { + this.a = a; + rf.call(this, a); + } + function Okb(a, b) { + Mlb(a.c, a.c.length, b); + } + function llb(a) { + return a.a < a.c.c.length; + } + function Eqb(a) { + return a.a < a.c.a.length; + } + function Ntb(a, b) { + return a.a ? a.b : b.De(); + } + function beb(a, b) { + return a < b ? -1 : a > b ? 1 : 0; + } + function Deb(a, b) { + return ybb(a, b) > 0 ? a : b; + } + function TC(a, b, c) { + return { l: a, m: b, h: c }; + } + function Ctb(a, b) { + a.a != null && BIc(b, a.a); + } + function Csb(a) { + a.a = new jtb(); + a.c = new jtb(); + } + function hDb(a) { + this.b = a; + this.a = new Rkb(); + } + function dOb(a) { + this.b = new pOb(); + this.a = a; + } + function q_b(a) { + n_b.call(this); + this.a = a; + } + function txb() { + mxb.call(this, "Range", 2); + } + function bUb() { + ZTb(); + this.a = new L2c(zP); + } + function Bh(a, b) { + Qb(b); + Ah(a).Jc(new Vw()); + } + function fKc(a, b) { + FJc(); + return (b.n.b += a); + } + function Tgc(a, b, c) { + return Rhb(a.g, c, b); + } + function LJc(a, b, c) { + return Rhb(a.k, c, b); + } + function r1c(a, b) { + return Rhb(a.a, b.a, b); + } + function jBc(a, b, c) { + return hBc(b, c, a.c); + } + function E6c(a) { + return new f7c(a.c, a.d); + } + function F6c(a) { + return new f7c(a.c, a.d); + } + function R6c(a) { + return new f7c(a.a, a.b); + } + function CQd(a, b) { + return hA(a.a, b, null); + } + function fec(a) { + QZb(a, null); + RZb(a, null); + } + function AOc(a) { + BOc(a, null); + COc(a, null); + } + function u4d() { + qRd.call(this, null, null); + } + function y4d() { + RRd.call(this, null, null); + } + function a7d(a) { + this.a = a; + Lqb.call(this); + } + function Pp(a) { + this.b = (mmb(), new iob(a)); + } + function Py(a) { + a.j = KC(VI, nie, 310, 0, 0, 1); + } + function oAd(a, b, c) { + a.c.Vc(b, BD(c, 133)); + } + function GAd(a, b, c) { + a.c.ji(b, BD(c, 133)); + } + function JLd(a, b) { + Uxd(a); + a.Gc(BD(b, 15)); + } + function b7d(a, b) { + return t2d(a.c, a.b, b); + } + function Bv(a, b) { + return new Qv(a.Kc(), b); + } + function Lq(a, b) { + return rr(a.Kc(), b) != -1; + } + function Sqb(a, b) { + return a.a.Bc(b) != null; + } + function pr(a) { + return a.Ob() ? a.Pb() : null; + } + function yfb(a) { + return zfb(a, 0, a.length); + } + function JD(a, b) { + return a != null && AD(a, b); + } + function $A(a, b) { + a.q.setHours(b); + YA(a, b); + } + function Yrb(a, b) { + if (a.c) { + jsb(b); + isb(b); + } + } + function nk(a, b, c) { + BD(a.Kb(c), 164).Nb(b); + } + function RJc(a, b, c) { + SJc(a, b, c); + return c; + } + function Eub(a, b, c) { + a.a = b ^ 1502; + a.b = c ^ kke; + } + function xHb(a, b, c) { + return a.a[b.g][c.g]; + } + function REc(a, b) { + return a.a[b.c.p][b.p]; + } + function aEc(a, b) { + return a.e[b.c.p][b.p]; + } + function tEc(a, b) { + return a.c[b.c.p][b.p]; + } + function OJc(a, b) { + return (a.j[b.p] = aKc(b)); + } + function k5c(a, b) { + return cfb(a.f, b.tg()); + } + function Isd(a, b) { + return cfb(a.b, b.tg()); + } + function Sfd(a, b) { + return a.a < Kcb(b) ? -1 : 1; + } + function ZDc(a, b, c) { + return c ? b != 0 : b != a - 1; + } + function _6c(a, b, c) { + a.a = b; + a.b = c; + return a; + } + function Y6c(a, b) { + a.a *= b; + a.b *= b; + return a; + } + function mud(a, b, c) { + NC(a.g, b, c); + return c; + } + function CHb(a, b, c, d) { + NC(a.a[b.g], c.g, d); + } + function EQb(a, b) { + O6c(b, a.a.a.a, a.a.a.b); + } + function Ozd(a) { + a.a = BD(Ajd(a.b.a, 4), 126); + } + function Wzd(a) { + a.a = BD(Ajd(a.b.a, 4), 126); + } + function otd(a) { + ytb(a, hue); + Rld(a, gtd(a)); + } + function Atb() { + Atb = ccb; + ztb = new Ftb(null); + } + function Ivb() { + Ivb = ccb; + Ivb(); + Hvb = new Ovb(); + } + function FId() { + this.Bb |= 256; + this.Bb |= 512; + } + function Fyd(a) { + this.i = a; + this.f = this.i.j; + } + function xMd(a, b, c) { + pMd.call(this, a, b, c); + } + function BMd(a, b, c) { + xMd.call(this, a, b, c); + } + function K4d(a, b, c) { + xMd.call(this, a, b, c); + } + function N4d(a, b, c) { + BMd.call(this, a, b, c); + } + function X4d(a, b, c) { + pMd.call(this, a, b, c); + } + function _4d(a, b, c) { + pMd.call(this, a, b, c); + } + function C4d(a, b, c) { + k2d.call(this, a, b, c); + } + function G4d(a, b, c) { + k2d.call(this, a, b, c); + } + function I4d(a, b, c) { + C4d.call(this, a, b, c); + } + function c5d(a, b, c) { + X4d.call(this, a, b, c); + } + function zf(a, b) { + this.a = a; + rf.call(this, b); + } + function aj(a, b) { + this.a = a; + pc.call(this, b); + } + function kj(a, b) { + this.a = a; + pc.call(this, b); + } + function Jj(a, b) { + this.a = a; + pc.call(this, b); + } + function Rj(a) { + this.a = a; + sj.call(this, a.d); + } + function she(a) { + this.c = a; + this.a = this.c.a; + } + function xl(a, b) { + this.a = b; + pc.call(this, a); + } + function Qo(a, b) { + this.a = b; + Lo.call(this, a); + } + function op(a, b) { + this.a = a; + Lo.call(this, b); + } + function rj(a, b) { + return Rl(Xm(a.c)).Xb(b); + } + function Eb(a, b) { + return Db(a, new Ufb(), b).a; + } + function ur(a, b) { + Qb(b); + return new Gr(a, b); + } + function Gr(a, b) { + this.a = b; + Br.call(this, a); + } + function Hs(a) { + this.b = a; + this.a = this.b.a.e; + } + function Eg(a) { + a.b.Qb(); + --a.d.f.d; + bg(a.d); + } + function Uk(a) { + Fk.call(this, BD(Qb(a), 35)); + } + function il(a) { + Fk.call(this, BD(Qb(a), 35)); + } + function is() { + $r.call(this, "INSTANCE", 0); + } + function Lb(a) { + if (!a) { + throw vbb(new Vdb()); + } + } + function Ub(a) { + if (!a) { + throw vbb(new Ydb()); + } + } + function ot(a) { + if (!a) { + throw vbb(new utb()); + } + } + function I6d() { + I6d = ccb; + g5d(); + H6d = new J6d(); + } + function Bcb() { + Bcb = ccb; + zcb = false; + Acb = true; + } + function Jfb(a) { + mcb.call(this, (uCb(a), a)); + } + function Wfb(a) { + mcb.call(this, (uCb(a), a)); + } + function Inb(a) { + lnb.call(this, a); + this.a = a; + } + function Xnb(a) { + Dnb.call(this, a); + this.a = a; + } + function Zob(a) { + zob.call(this, a); + this.a = a; + } + function Xy() { + Py(this); + Ry(this); + this._d(); + } + function Qv(a, b) { + this.a = b; + Br.call(this, a); + } + function au(a, b) { + return new xu(a.a, a.b, b); + } + function kfb(a, b) { + return a.lastIndexOf(b); + } + function ifb(a, b, c) { + return a.indexOf(b, c); + } + function xfb(a) { + return a == null ? Xhe : fcb(a); + } + function nz(a) { + return a == null ? null : a.name; + } + function Etb(a) { + return a.a != null ? a.a : null; + } + function or(a) { + return Wsb(a.a) ? nr(a) : null; + } + function Fxb(a, b) { + return Jwb(a.a, b) != null; + } + function uqb(a, b) { + return !!b && a.b[b.g] == b; + } + function FCb(a) { + return a.$H || (a.$H = ++ECb); + } + function aD(a) { + return a.l + a.m * Hje + a.h * Ije; + } + function pDb(a, b) { + Ekb(b.a, a.a); + return a.a; + } + function vDb(a, b) { + Ekb(b.b, a.a); + return a.a; + } + function nGb(a, b) { + Ekb(b.a, a.a); + return a.a; + } + function Btb(a) { + sCb(a.a != null); + return a.a; + } + function Asb(a) { + Wqb.call(this, new _rb(a)); + } + function GUb(a, b) { + HUb.call(this, a, b, null); + } + function cxb(a) { + this.a = a; + Bjb.call(this, a); + } + function CKb() { + CKb = ccb; + BKb = new Msd(tle, 0); + } + function NFb(a, b) { + ++a.b; + return Ekb(a.a, b); + } + function OFb(a, b) { + ++a.b; + return Lkb(a.a, b); + } + function n6b(a, b) { + return Kdb(a.n.a, b.n.a); + } + function WKb(a, b) { + return Kdb(a.c.d, b.c.d); + } + function gLb(a, b) { + return Kdb(a.c.c, b.c.c); + } + function zXb(a, b) { + return BD(Qc(a.b, b), 15); + } + function s7b(a, b) { + return (a.n.b = (uCb(b), b)); + } + function t7b(a, b) { + return (a.n.b = (uCb(b), b)); + } + function a1b(a) { + return llb(a.a) || llb(a.b); + } + function fBc(a, b, c) { + return gBc(a, b, c, a.b); + } + function iBc(a, b, c) { + return gBc(a, b, c, a.c); + } + function i3c(a, b, c) { + BD(B2c(a, b), 21).Fc(c); + } + function xBd(a, b, c) { + vAd(a.a, c); + uAd(a.a, b); + } + function qRd(a, b) { + nRd(); + this.a = a; + this.b = b; + } + function RRd(a, b) { + LRd(); + this.b = a; + this.c = b; + } + function hhd(a, b) { + Rgd(); + this.f = b; + this.d = a; + } + function qc(a, b) { + Sb(b, a); + this.d = a; + this.c = b; + } + function n5b(a) { + var b; + b = a.a; + a.a = a.b; + a.b = b; + } + function chc(a) { + Hgc(); + return !!a && !a.dc(); + } + function Afe(a) { + ++vfe; + return new lge(3, a); + } + function jm(a, b) { + return new Vp(a, a.gc(), b); + } + function ns(a) { + hs(); + return es((qs(), ps), a); + } + function Oyd(a) { + this.d = a; + Fyd.call(this, a); + } + function $yd(a) { + this.c = a; + Fyd.call(this, a); + } + function bzd(a) { + this.c = a; + Oyd.call(this, a); + } + function sgc() { + qgc(); + this.b = new ygc(this); + } + function Pu(a) { + Xj(a, Jie); + return new Skb(a); + } + function Vz(a) { + Rz(); + return parseInt(a) || -1; + } + function qfb(a, b, c) { + return a.substr(b, c - b); + } + function gfb(a, b, c) { + return ifb(a, wfb(b), c); + } + function Pkb(a) { + return ZBb(a.c, a.c.length); + } + function Yr(a) { + return a.f != null ? a.f : "" + a.g; + } + function Zr(a) { + return a.f != null ? a.f : "" + a.g; + } + function Hsb(a) { + sCb(a.b != 0); + return a.a.a.c; + } + function Isb(a) { + sCb(a.b != 0); + return a.c.b.c; + } + function Cmd(a) { + JD(a, 150) && BD(a, 150).Gh(); + } + function Wwb(a) { + return (a.b = BD(tib(a.a), 42)); + } + function Ptb(a) { + Ltb(); + this.b = a; + this.a = true; + } + function Xtb(a) { + Utb(); + this.b = a; + this.a = true; + } + function Trb(a) { + a.d = new ksb(a); + a.e = new Lqb(); + } + function mkb(a) { + if (!a) { + throw vbb(new Apb()); + } + } + function lCb(a) { + if (!a) { + throw vbb(new Vdb()); + } + } + function yCb(a) { + if (!a) { + throw vbb(new Ydb()); + } + } + function qCb(a) { + if (!a) { + throw vbb(new tcb()); + } + } + function sCb(a) { + if (!a) { + throw vbb(new utb()); + } + } + function ksb(a) { + lsb.call(this, a, null, null); + } + function dPb() { + $r.call(this, "POLYOMINO", 0); + } + function Cg(a, b, c, d) { + qg.call(this, a, b, c, d); + } + function zkc(a, b) { + gkc(); + return Rc(a, b.e, b); + } + function azc(a, b, c) { + Vyc(); + return c.qg(a, b); + } + function wNb(a, b) { + return !!a.q && Mhb(a.q, b); + } + function JRb(a, b) { + return a > 0 ? (b * b) / a : b * b * 100; + } + function CRb(a, b) { + return a > 0 ? b / (a * a) : b * 100; + } + function G2c(a, b, c) { + return Ekb(b, I2c(a, c)); + } + function t3c(a, b, c) { + p3c(); + a.Xe(b) && c.td(a); + } + function St(a, b, c) { + var d; + d = a.Zc(b); + d.Rb(c); + } + function O6c(a, b, c) { + a.a += b; + a.b += c; + return a; + } + function Z6c(a, b, c) { + a.a *= b; + a.b *= c; + return a; + } + function b7c(a, b, c) { + a.a -= b; + a.b -= c; + return a; + } + function a7c(a, b) { + a.a = b.a; + a.b = b.b; + return a; + } + function V6c(a) { + a.a = -a.a; + a.b = -a.b; + return a; + } + function Dic(a) { + this.c = a; + this.a = 1; + this.b = 1; + } + function xed(a) { + this.c = a; + dld(a, 0); + eld(a, 0); + } + function u7c(a) { + Psb.call(this); + n7c(this, a); + } + function AXb(a) { + xXb(); + yXb(this); + this.mf(a); + } + function GRd(a, b) { + nRd(); + qRd.call(this, a, b); + } + function dSd(a, b) { + LRd(); + RRd.call(this, a, b); + } + function hSd(a, b) { + LRd(); + RRd.call(this, a, b); + } + function fSd(a, b) { + LRd(); + dSd.call(this, a, b); + } + function sId(a, b, c) { + dId.call(this, a, b, c, 2); + } + function zXd(a, b) { + UVd(); + nXd.call(this, a, b); + } + function BXd(a, b) { + UVd(); + zXd.call(this, a, b); + } + function DXd(a, b) { + UVd(); + zXd.call(this, a, b); + } + function FXd(a, b) { + UVd(); + DXd.call(this, a, b); + } + function PXd(a, b) { + UVd(); + nXd.call(this, a, b); + } + function RXd(a, b) { + UVd(); + PXd.call(this, a, b); + } + function XXd(a, b) { + UVd(); + nXd.call(this, a, b); + } + function pAd(a, b) { + return a.c.Fc(BD(b, 133)); + } + function w1d(a, b, c) { + return V1d(p1d(a, b), c); + } + function N2d(a, b, c) { + return b.Qk(a.e, a.c, c); + } + function P2d(a, b, c) { + return b.Rk(a.e, a.c, c); + } + function a3d(a, b) { + return xid(a.e, BD(b, 49)); + } + function aTd(a, b, c) { + vtd(QSd(a.a), b, eTd(c)); + } + function TOd(a, b, c) { + vtd(VKd(a.a), b, XOd(c)); + } + function ypb(a, b) { + b.$modCount = a.$modCount; + } + function MUc() { + MUc = ccb; + LUc = new Lsd("root"); + } + function LCd() { + LCd = ccb; + KCd = new lDd(); + new NDd(); + } + function KVc() { + this.a = new Hp(); + this.b = new Hp(); + } + function FUd() { + hJd.call(this); + this.Bb |= Tje; + } + function t_c() { + $r.call(this, "GROW_TREE", 0); + } + function C9d(a) { + return a == null ? null : cde(a); + } + function G9d(a) { + return a == null ? null : jde(a); + } + function J9d(a) { + return a == null ? null : fcb(a); + } + function K9d(a) { + return a == null ? null : fcb(a); + } + function fdb(a) { + if (a.o != null) { + return; + } + vdb(a); + } + function DD(a) { + CCb(a == null || KD(a)); + return a; + } + function ED(a) { + CCb(a == null || LD(a)); + return a; + } + function GD(a) { + CCb(a == null || ND(a)); + return a; + } + function gB(a) { + this.q = new Date(Sbb(a)); + } + function Mf(a, b) { + this.c = a; + ne.call(this, a, b); + } + function Sf(a, b) { + this.a = a; + Mf.call(this, a, b); + } + function Hg(a, b) { + this.d = a; + Dg(this); + this.b = b; + } + function bAb(a, b) { + Vzb.call(this, a); + this.a = b; + } + function vAb(a, b) { + Vzb.call(this, a); + this.a = b; + } + function sNb(a) { + pNb.call(this, 0, 0); + this.f = a; + } + function Vg(a, b, c) { + dg.call(this, a, b, c, null); + } + function Yg(a, b, c) { + dg.call(this, a, b, c, null); + } + function Pxb(a, b, c) { + return a.ue(b, c) <= 0 ? c : b; + } + function Qxb(a, b, c) { + return a.ue(b, c) <= 0 ? b : c; + } + function g4c(a, b) { + return BD(Wrb(a.b, b), 149); + } + function i4c(a, b) { + return BD(Wrb(a.c, b), 229); + } + function wic(a) { + return BD(Ikb(a.a, a.b), 287); + } + function B6c(a) { + return new f7c(a.c, a.d + a.a); + } + function eLc(a) { + return FJc(), Jzc(BD(a, 197)); + } + function $Jb() { + $Jb = ccb; + ZJb = pqb((tdd(), sdd)); + } + function fOb(a, b) { + b.a ? gOb(a, b) : Fxb(a.a, b.b); + } + function qyb(a, b) { + if (lyb) { + return; + } + Ekb(a.a, b); + } + function F2b(a, b) { + x2b(); + return f_b(b.d.i, a); + } + function _9b(a, b) { + I9b(); + return new gac(b, a); + } + function _Hb(a, b) { + ytb(b, lle); + a.f = b; + return a; + } + function Kld(a, b, c) { + c = _hd(a, b, 3, c); + return c; + } + function bmd(a, b, c) { + c = _hd(a, b, 6, c); + return c; + } + function kpd(a, b, c) { + c = _hd(a, b, 9, c); + return c; + } + function Cvd(a, b, c) { + ++a.j; + a.Ki(); + Atd(a, b, c); + } + function Avd(a, b, c) { + ++a.j; + a.Hi(b, a.oi(b, c)); + } + function bRd(a, b, c) { + var d; + d = a.Zc(b); + d.Rb(c); + } + function c7d(a, b, c) { + return C2d(a.c, a.b, b, c); + } + function DAd(a, b) { + return (b & Ohe) % a.d.length; + } + function Msd(a, b) { + Lsd.call(this, a); + this.a = b; + } + function uVd(a, b) { + lVd.call(this, a); + this.a = b; + } + function sYd(a, b) { + lVd.call(this, a); + this.a = b; + } + function zyd(a, b) { + this.c = a; + zud.call(this, b); + } + function YOd(a, b) { + this.a = a; + qOd.call(this, b); + } + function fTd(a, b) { + this.a = a; + qOd.call(this, b); + } + function Xp(a) { + this.a = (Xj(a, Jie), new Skb(a)); + } + function cq(a) { + this.a = (Xj(a, Jie), new Skb(a)); + } + function LA(a) { + !a.a && (a.a = new VA()); + return a.a; + } + function XMb(a) { + if (a > 8) { + return 0; + } + return a + 1; + } + function Ecb(a, b) { + Bcb(); + return a == b ? 0 : a ? 1 : -1; + } + function Opb(a, b, c) { + return Npb(a, BD(b, 22), c); + } + function Bz(a, b, c) { + return a.apply(b, c); + var d; + } + function Sfb(a, b, c) { + a.a += zfb(b, 0, c); + return a; + } + function ijb(a, b) { + var c; + c = a.e; + a.e = b; + return c; + } + function trb(a, b) { + var c; + c = a[hke]; + c.call(a, b); + } + function urb(a, b) { + var c; + c = a[hke]; + c.call(a, b); + } + function Aib(a, b) { + a.a.Vc(a.b, b); + ++a.b; + a.c = -1; + } + function Urb(a) { + Uhb(a.e); + a.d.b = a.d; + a.d.a = a.d; + } + function _f(a) { + a.b ? _f(a.b) : a.f.c.zc(a.e, a.d); + } + function _Ab(a, b, c) { + EAb(); + MBb(a, b.Ce(a.a, c)); + } + function Bxb(a, b) { + return Vd(Cwb(a.a, b, true)); + } + function Cxb(a, b) { + return Vd(Dwb(a.a, b, true)); + } + function _Bb(a, b) { + return eCb(new Array(b), a); + } + function HD(a) { + return String.fromCharCode(a); + } + function mz(a) { + return a == null ? null : a.message; + } + function gRb() { + this.a = new Rkb(); + this.b = new Rkb(); + } + function iTb() { + this.a = new MQb(); + this.b = new tTb(); + } + function tDb() { + this.b = new d7c(); + this.c = new Rkb(); + } + function _Qb() { + this.d = new d7c(); + this.e = new d7c(); + } + function n_b() { + this.n = new d7c(); + this.o = new d7c(); + } + function $Gb() { + this.n = new p0b(); + this.i = new I6c(); + } + function sec() { + this.a = new Umc(); + this.b = new mnc(); + } + function NIc() { + this.a = new Rkb(); + this.d = new Rkb(); + } + function LDc() { + this.b = new Tqb(); + this.a = new Tqb(); + } + function hSc() { + this.b = new Lqb(); + this.a = new Lqb(); + } + function HRc() { + this.b = new tRc(); + this.a = new hRc(); + } + function aHb() { + $Gb.call(this); + this.a = new d7c(); + } + function Ywb(a) { + Zwb.call(this, a, (lxb(), hxb)); + } + function J_b(a, b, c, d) { + B_b.call(this, a, b, c, d); + } + function sqd(a, b, c) { + c != null && kmd(b, Wqd(a, c)); + } + function tqd(a, b, c) { + c != null && lmd(b, Wqd(a, c)); + } + function Tod(a, b, c) { + c = _hd(a, b, 11, c); + return c; + } + function P6c(a, b) { + a.a += b.a; + a.b += b.b; + return a; + } + function c7c(a, b) { + a.a -= b.a; + a.b -= b.b; + return a; + } + function u7b(a, b) { + return (a.n.a = (uCb(b), b) + 10); + } + function v7b(a, b) { + return (a.n.a = (uCb(b), b) + 10); + } + function dLd(a, b) { + return b == a || pud(UKd(b), a); + } + function PYd(a, b) { + return Rhb(a.a, b, "") == null; + } + function E2b(a, b) { + x2b(); + return !f_b(b.d.i, a); + } + function rjc(a, b) { + fad(a.f) ? sjc(a, b) : tjc(a, b); + } + function h1d(a, b) { + var c; + c = b.Hh(a.a); + return c; + } + function Cyd(a, b) { + qcb.call(this, gve + a + mue + b); + } + function gUd(a, b, c, d) { + cUd.call(this, a, b, c, d); + } + function Q4d(a, b, c, d) { + cUd.call(this, a, b, c, d); + } + function U4d(a, b, c, d) { + Q4d.call(this, a, b, c, d); + } + function n5d(a, b, c, d) { + i5d.call(this, a, b, c, d); + } + function p5d(a, b, c, d) { + i5d.call(this, a, b, c, d); + } + function v5d(a, b, c, d) { + i5d.call(this, a, b, c, d); + } + function t5d(a, b, c, d) { + p5d.call(this, a, b, c, d); + } + function A5d(a, b, c, d) { + p5d.call(this, a, b, c, d); + } + function y5d(a, b, c, d) { + v5d.call(this, a, b, c, d); + } + function D5d(a, b, c, d) { + A5d.call(this, a, b, c, d); + } + function d6d(a, b, c, d) { + Y5d.call(this, a, b, c, d); + } + function Vp(a, b, c) { + this.a = a; + qc.call(this, b, c); + } + function tk(a, b, c) { + this.c = b; + this.b = c; + this.a = a; + } + function ik(a, b, c) { + return (a.d = BD(b.Kb(c), 164)); + } + function j6d(a, b) { + return a.Aj().Nh().Kh(a, b); + } + function h6d(a, b) { + return a.Aj().Nh().Ih(a, b); + } + function Fdb(a, b) { + return uCb(a), PD(a) === PD(b); + } + function dfb(a, b) { + return uCb(a), PD(a) === PD(b); + } + function Dxb(a, b) { + return Vd(Cwb(a.a, b, false)); + } + function Exb(a, b) { + return Vd(Dwb(a.a, b, false)); + } + function vBb(a, b) { + return a.b.sd(new yBb(a, b)); + } + function BBb(a, b) { + return a.b.sd(new EBb(a, b)); + } + function HBb(a, b) { + return a.b.sd(new KBb(a, b)); + } + function lfb(a, b, c) { + return a.lastIndexOf(b, c); + } + function uTb(a, b, c) { + return Kdb(a[b.b], a[c.b]); + } + function RTb(a, b) { + return yNb(b, (Nyc(), Cwc), a); + } + function fmc(a, b) { + return beb(b.a.d.p, a.a.d.p); + } + function emc(a, b) { + return beb(a.a.d.p, b.a.d.p); + } + function _Oc(a, b) { + return Kdb(a.c - a.s, b.c - b.s); + } + function S_b(a) { + return !a.c ? -1 : Jkb(a.c.a, a, 0); + } + function Vxd(a) { + return a < 100 ? null : new Ixd(a); + } + function ecd(a) { + return a == Zbd || a == _bd || a == $bd; + } + function zAd(a, b) { + return JD(b, 15) && Btd(a.c, b); + } + function vyb(a, b) { + if (lyb) { + return; + } + !!b && (a.d = b); + } + function ujb(a, b) { + var c; + c = b; + return !!Awb(a, c); + } + function czd(a, b) { + this.c = a; + Pyd.call(this, a, b); + } + function fBb(a) { + this.c = a; + nvb.call(this, rie, 0); + } + function Avb(a, b) { + Bvb.call(this, a, a.length, b); + } + function aId(a, b, c) { + return BD(a.c, 69).lk(b, c); + } + function bId(a, b, c) { + return BD(a.c, 69).mk(b, c); + } + function O2d(a, b, c) { + return N2d(a, BD(b, 332), c); + } + function Q2d(a, b, c) { + return P2d(a, BD(b, 332), c); + } + function i3d(a, b, c) { + return h3d(a, BD(b, 332), c); + } + function k3d(a, b, c) { + return j3d(a, BD(b, 332), c); + } + function tn(a, b) { + return b == null ? null : Hv(a.b, b); + } + function Kcb(a) { + return LD(a) ? (uCb(a), a) : a.ke(); + } + function Ldb(a) { + return !isNaN(a) && !isFinite(a); + } + function Wn(a) { + Ql(); + this.a = (mmb(), new zob(a)); + } + function dIc(a) { + FHc(); + this.d = a; + this.a = new jkb(); + } + function xqb(a, b, c) { + this.a = a; + this.b = b; + this.c = c; + } + function Nrb(a, b, c) { + this.a = a; + this.b = b; + this.c = c; + } + function $sb(a, b, c) { + this.d = a; + this.b = c; + this.a = b; + } + function Qsb(a) { + Csb(this); + Osb(this); + ye(this, a); + } + function Tkb(a) { + Ckb(this); + bCb(this.c, 0, a.Pc()); + } + function Xwb(a) { + uib(a.a); + Kwb(a.c, a.b); + a.b = null; + } + function iyb(a) { + this.a = a; + Zfb(); + Cbb(Date.now()); + } + function JCb() { + JCb = ccb; + GCb = new nb(); + ICb = new nb(); + } + function ntb() { + ntb = ccb; + ltb = new otb(); + mtb = new qtb(); + } + function kzd() { + kzd = ccb; + jzd = KC(SI, Uhe, 1, 0, 5, 1); + } + function tGd() { + tGd = ccb; + sGd = KC(SI, Uhe, 1, 0, 5, 1); + } + function $Gd() { + $Gd = ccb; + ZGd = KC(SI, Uhe, 1, 0, 5, 1); + } + function Ql() { + Ql = ccb; + new Zl((mmb(), mmb(), jmb)); + } + function pxb(a) { + lxb(); + return es((zxb(), yxb), a); + } + function Hyb(a) { + Fyb(); + return es((Kyb(), Jyb), a); + } + function OEb(a) { + MEb(); + return es((REb(), QEb), a); + } + function WEb(a) { + UEb(); + return es((ZEb(), YEb), a); + } + function tFb(a) { + rFb(); + return es((wFb(), vFb), a); + } + function iHb(a) { + gHb(); + return es((lHb(), kHb), a); + } + function PHb(a) { + NHb(); + return es((SHb(), RHb), a); + } + function GIb(a) { + EIb(); + return es((JIb(), IIb), a); + } + function vJb(a) { + qJb(); + return es((yJb(), xJb), a); + } + function xLb(a) { + vLb(); + return es((ALb(), zLb), a); + } + function TMb(a) { + RMb(); + return es((WMb(), VMb), a); + } + function TOb(a) { + ROb(); + return es((WOb(), VOb), a); + } + function ePb(a) { + cPb(); + return es((hPb(), gPb), a); + } + function ZRb(a) { + XRb(); + return es((aSb(), _Rb), a); + } + function ATb(a) { + yTb(); + return es((DTb(), CTb), a); + } + function sUb(a) { + qUb(); + return es((vUb(), uUb), a); + } + function rWb(a) { + lWb(); + return es((uWb(), tWb), a); + } + function TXb(a) { + RXb(); + return es((WXb(), VXb), a); + } + function Mb(a, b) { + if (!a) { + throw vbb(new Wdb(b)); + } + } + function l0b(a) { + j0b(); + return es((o0b(), n0b), a); + } + function r0b(a) { + B_b.call(this, a.d, a.c, a.a, a.b); + } + function K_b(a) { + B_b.call(this, a.d, a.c, a.a, a.b); + } + function mKb(a, b, c) { + this.b = a; + this.c = b; + this.a = c; + } + function BZb(a, b, c) { + this.b = a; + this.a = b; + this.c = c; + } + function TNb(a, b, c) { + this.a = a; + this.b = b; + this.c = c; + } + function uOb(a, b, c) { + this.a = a; + this.b = b; + this.c = c; + } + function S3b(a, b, c) { + this.a = a; + this.b = b; + this.c = c; + } + function Z6b(a, b, c) { + this.a = a; + this.b = b; + this.c = c; + } + function n9b(a, b, c) { + this.b = a; + this.a = b; + this.c = c; + } + function x$b(a, b, c) { + this.e = b; + this.b = a; + this.d = c; + } + function $Ab(a, b, c) { + EAb(); + a.a.Od(b, c); + return b; + } + function LGb(a) { + var b; + b = new KGb(); + b.e = a; + return b; + } + function iLb(a) { + var b; + b = new fLb(); + b.b = a; + return b; + } + function D6b() { + D6b = ccb; + B6b = new M6b(); + C6b = new P6b(); + } + function Hgc() { + Hgc = ccb; + Fgc = new ghc(); + Ggc = new ihc(); + } + function jbc(a) { + gbc(); + return es((mbc(), lbc), a); + } + function Cjc(a) { + Ajc(); + return es((Fjc(), Ejc), a); + } + function Clc(a) { + Alc(); + return es((Flc(), Elc), a); + } + function Cpc(a) { + Apc(); + return es((Fpc(), Epc), a); + } + function Kpc(a) { + Ipc(); + return es((Npc(), Mpc), a); + } + function Wpc(a) { + Rpc(); + return es((Zpc(), Ypc), a); + } + function $jc(a) { + Xjc(); + return es((bkc(), akc), a); + } + function Hkc(a) { + Fkc(); + return es((Kkc(), Jkc), a); + } + function dqc(a) { + bqc(); + return es((gqc(), fqc), a); + } + function rqc(a) { + mqc(); + return es((uqc(), tqc), a); + } + function zqc(a) { + xqc(); + return es((Cqc(), Bqc), a); + } + function Iqc(a) { + Gqc(); + return es((Lqc(), Kqc), a); + } + function Vqc(a) { + Sqc(); + return es((Yqc(), Xqc), a); + } + function brc(a) { + _qc(); + return es((erc(), drc), a); + } + function nrc(a) { + lrc(); + return es((qrc(), prc), a); + } + function Arc(a) { + yrc(); + return es((Drc(), Crc), a); + } + function Qrc(a) { + Orc(); + return es((Trc(), Src), a); + } + function Zrc(a) { + Xrc(); + return es((asc(), _rc), a); + } + function gsc(a) { + esc(); + return es((jsc(), isc), a); + } + function osc(a) { + msc(); + return es((rsc(), qsc), a); + } + function Etc(a) { + Ctc(); + return es((Htc(), Gtc), a); + } + function qzc(a) { + lzc(); + return es((tzc(), szc), a); + } + function Azc(a) { + xzc(); + return es((Dzc(), Czc), a); + } + function Mzc(a) { + Izc(); + return es((Pzc(), Ozc), a); + } + function MAc(a) { + KAc(); + return es((PAc(), OAc), a); + } + function mAc(a) { + kAc(); + return es((pAc(), oAc), a); + } + function vAc(a) { + tAc(); + return es((yAc(), xAc), a); + } + function DAc(a) { + BAc(); + return es((GAc(), FAc), a); + } + function VAc(a) { + TAc(); + return es((YAc(), XAc), a); + } + function $zc(a) { + Vzc(); + return es((bAc(), aAc), a); + } + function bBc(a) { + _Ac(); + return es((eBc(), dBc), a); + } + function vBc(a) { + tBc(); + return es((yBc(), xBc), a); + } + function EBc(a) { + CBc(); + return es((HBc(), GBc), a); + } + function NBc(a) { + LBc(); + return es((QBc(), PBc), a); + } + function tGc(a) { + rGc(); + return es((wGc(), vGc), a); + } + function WIc(a) { + UIc(); + return es((ZIc(), YIc), a); + } + function $Lc(a) { + YLc(); + return es((bMc(), aMc), a); + } + function gMc(a) { + eMc(); + return es((jMc(), iMc), a); + } + function JOc(a) { + HOc(); + return es((MOc(), LOc), a); + } + function HQc(a) { + FQc(); + return es((KQc(), JQc), a); + } + function DRc(a) { + yRc(); + return es((GRc(), FRc), a); + } + function tSc(a) { + qSc(); + return es((wSc(), vSc), a); + } + function UTc(a) { + STc(); + return es((XTc(), WTc), a); + } + function UUc(a) { + PUc(); + return es((XUc(), WUc), a); + } + function aUc(a) { + $Tc(); + return es((dUc(), cUc), a); + } + function wVc(a) { + tVc(); + return es((zVc(), yVc), a); + } + function iWc(a) { + fWc(); + return es((lWc(), kWc), a); + } + function sWc(a) { + pWc(); + return es((vWc(), uWc), a); + } + function lXc(a) { + iXc(); + return es((oXc(), nXc), a); + } + function vXc(a) { + sXc(); + return es((yXc(), xXc), a); + } + function BYc(a) { + zYc(); + return es((EYc(), DYc), a); + } + function m$c(a) { + k$c(); + return es((p$c(), o$c), a); + } + function $$c(a) { + Y$c(); + return es((b_c(), a_c), a); + } + function n_c(a) { + i_c(); + return es((q_c(), p_c), a); + } + function w_c(a) { + s_c(); + return es((z_c(), y_c), a); + } + function E_c(a) { + C_c(); + return es((H_c(), G_c), a); + } + function P_c(a) { + N_c(); + return es((S_c(), R_c), a); + } + function W0c(a) { + R0c(); + return es((Z0c(), Y0c), a); + } + function f1c(a) { + a1c(); + return es((i1c(), h1c), a); + } + function P5c(a) { + N5c(); + return es((S5c(), R5c), a); + } + function b6c(a) { + _5c(); + return es((e6c(), d6c), a); + } + function H7c(a) { + F7c(); + return es((K7c(), J7c), a); + } + function k8c(a) { + i8c(); + return es((n8c(), m8c), a); + } + function V8b(a) { + S8b(); + return es((Y8b(), X8b), a); + } + function A5b(a) { + y5b(); + return es((D5b(), C5b), a); + } + function jad(a) { + ead(); + return es((mad(), lad), a); + } + function sad(a) { + qad(); + return es((vad(), uad), a); + } + function Cad(a) { + Aad(); + return es((Fad(), Ead), a); + } + function Oad(a) { + Mad(); + return es((Rad(), Qad), a); + } + function jbd(a) { + hbd(); + return es((mbd(), lbd), a); + } + function ubd(a) { + rbd(); + return es((xbd(), wbd), a); + } + function Kbd(a) { + Hbd(); + return es((Nbd(), Mbd), a); + } + function Vbd(a) { + Tbd(); + return es((Ybd(), Xbd), a); + } + function hcd(a) { + dcd(); + return es((kcd(), jcd), a); + } + function vcd(a) { + rcd(); + return es((ycd(), xcd), a); + } + function vdd(a) { + tdd(); + return es((ydd(), xdd), a); + } + function Kdd(a) { + Idd(); + return es((Ndd(), Mdd), a); + } + function $cd(a) { + Ucd(); + return es((cdd(), bdd), a); + } + function Fed(a) { + Ded(); + return es((Ied(), Hed), a); + } + function rgd(a) { + pgd(); + return es((ugd(), tgd), a); + } + function Esd(a) { + Csd(); + return es((Hsd(), Gsd), a); + } + function Yoc(a, b) { + return (uCb(a), a) + (uCb(b), b); + } + function NNd(a, b) { + Zfb(); + return wtd(ZKd(a.a), b); + } + function SNd(a, b) { + Zfb(); + return wtd(ZKd(a.a), b); + } + function bPc(a, b) { + this.c = a; + this.a = b; + this.b = b - a; + } + function nYc(a, b, c) { + this.a = a; + this.b = b; + this.c = c; + } + function L1c(a, b, c) { + this.a = a; + this.b = b; + this.c = c; + } + function T1c(a, b, c) { + this.a = a; + this.b = b; + this.c = c; + } + function Rrd(a, b, c) { + this.a = a; + this.b = b; + this.c = c; + } + function zCd(a, b, c) { + this.a = a; + this.b = b; + this.c = c; + } + function IVd(a, b, c) { + this.e = a; + this.a = b; + this.c = c; + } + function kWd(a, b, c) { + UVd(); + cWd.call(this, a, b, c); + } + function HXd(a, b, c) { + UVd(); + oXd.call(this, a, b, c); + } + function TXd(a, b, c) { + UVd(); + oXd.call(this, a, b, c); + } + function ZXd(a, b, c) { + UVd(); + oXd.call(this, a, b, c); + } + function JXd(a, b, c) { + UVd(); + HXd.call(this, a, b, c); + } + function LXd(a, b, c) { + UVd(); + HXd.call(this, a, b, c); + } + function NXd(a, b, c) { + UVd(); + LXd.call(this, a, b, c); + } + function VXd(a, b, c) { + UVd(); + TXd.call(this, a, b, c); + } + function _Xd(a, b, c) { + UVd(); + ZXd.call(this, a, b, c); + } + function $j(a, b) { + Qb(a); + Qb(b); + return new _j(a, b); + } + function Nq(a, b) { + Qb(a); + Qb(b); + return new Wq(a, b); + } + function Rq(a, b) { + Qb(a); + Qb(b); + return new ar(a, b); + } + function lr(a, b) { + Qb(a); + Qb(b); + return new zr(a, b); + } + function BD(a, b) { + CCb(a == null || AD(a, b)); + return a; + } + function Nu(a) { + var b; + b = new Rkb(); + fr(b, a); + return b; + } + function Ex(a) { + var b; + b = new Tqb(); + fr(b, a); + return b; + } + function Hx(a) { + var b; + b = new Gxb(); + Jq(b, a); + return b; + } + function Ru(a) { + var b; + b = new Psb(); + Jq(b, a); + return b; + } + function YEc(a) { + !a.e && (a.e = new Rkb()); + return a.e; + } + function SMd(a) { + !a.c && (a.c = new xYd()); + return a.c; + } + function Ekb(a, b) { + a.c[a.c.length] = b; + return true; + } + function WA(a, b) { + this.c = a; + this.b = b; + this.a = false; + } + function Gg(a) { + this.d = a; + Dg(this); + this.b = ed(a.d); + } + function pzb() { + this.a = ";,;"; + this.b = ""; + this.c = ""; + } + function Bvb(a, b, c) { + qvb.call(this, b, c); + this.a = a; + } + function fAb(a, b, c) { + this.b = a; + fvb.call(this, b, c); + } + function lsb(a, b, c) { + this.c = a; + pjb.call(this, b, c); + } + function bCb(a, b, c) { + $Bb(c, 0, a, b, c.length, false); + } + function HVb(a, b, c, d, e) { + a.b = b; + a.c = c; + a.d = d; + a.a = e; + } + function eBb(a, b) { + if (b) { + a.b = b; + a.a = (Tzb(b), b.a); + } + } + function v_b(a, b, c, d, e) { + a.d = b; + a.c = c; + a.a = d; + a.b = e; + } + function h5b(a) { + var b, c; + b = a.b; + c = a.c; + a.b = c; + a.c = b; + } + function k5b(a) { + var b, c; + c = a.d; + b = a.a; + a.d = b; + a.a = c; + } + function Lbb(a) { + return zbb(iD(Fbb(a) ? Rbb(a) : a)); + } + function rlc(a, b) { + return beb(D0b(a.d), D0b(b.d)); + } + function uic(a, b) { + return b == (Ucd(), Tcd) ? a.c : a.d; + } + function FHc() { + FHc = ccb; + DHc = (Ucd(), Tcd); + EHc = zcd; + } + function DRb() { + this.b = Edb(ED(Ksd((wSb(), vSb)))); + } + function aBb(a) { + return EAb(), KC(SI, Uhe, 1, a, 5, 1); + } + function C6c(a) { + return new f7c(a.c + a.b, a.d + a.a); + } + function Vmc(a, b) { + Imc(); + return beb(a.d.p, b.d.p); + } + function Lsb(a) { + sCb(a.b != 0); + return Nsb(a, a.a.a); + } + function Msb(a) { + sCb(a.b != 0); + return Nsb(a, a.c.b); + } + function rCb(a, b) { + if (!a) { + throw vbb(new ucb(b)); + } + } + function mCb(a, b) { + if (!a) { + throw vbb(new Wdb(b)); + } + } + function dWb(a, b, c) { + cWb.call(this, a, b); + this.b = c; + } + function pMd(a, b, c) { + MLd.call(this, a, b); + this.c = c; + } + function Dnc(a, b, c) { + Cnc.call(this, b, c); + this.d = a; + } + function _Gd(a) { + $Gd(); + MGd.call(this); + this.th(a); + } + function PNd(a, b, c) { + this.a = a; + nNd.call(this, b, c); + } + function UNd(a, b, c) { + this.a = a; + nNd.call(this, b, c); + } + function k2d(a, b, c) { + MLd.call(this, a, b); + this.c = c; + } + function y1d() { + T0d(); + z1d.call(this, (yFd(), xFd)); + } + function gFd(a) { + return a != null && !OEd(a, CEd, DEd); + } + function dFd(a, b) { + return ((jFd(a) << 4) | jFd(b)) & aje; + } + function ln(a, b) { + return Vm(), Wj(a, b), new iy(a, b); + } + function Sdd(a, b) { + var c; + if (a.n) { + c = b; + Ekb(a.f, c); + } + } + function Upd(a, b, c) { + var d; + d = new yC(c); + cC(a, b, d); + } + function WUd(a, b) { + var c; + c = a.c; + VUd(a, b); + return c; + } + function Ydd(a, b) { + b < 0 ? (a.g = -1) : (a.g = b); + return a; + } + function $6c(a, b) { + W6c(a); + a.a *= b; + a.b *= b; + return a; + } + function G6c(a, b, c, d, e) { + a.c = b; + a.d = c; + a.b = d; + a.a = e; + } + function Dsb(a, b) { + Gsb(a, b, a.c.b, a.c); + return true; + } + function jsb(a) { + a.a.b = a.b; + a.b.a = a.a; + a.a = a.b = null; + } + function Aq(a) { + this.b = a; + this.a = Wm(this.b.a).Ed(); + } + function Wq(a, b) { + this.b = a; + this.a = b; + ol.call(this); + } + function ar(a, b) { + this.a = a; + this.b = b; + ol.call(this); + } + function vvb(a, b) { + qvb.call(this, b, 1040); + this.a = a; + } + function Eeb(a) { + return a == 0 || isNaN(a) ? a : a < 0 ? -1 : 1; + } + function WPb(a) { + QPb(); + return jtd(a) == Xod(ltd(a)); + } + function XPb(a) { + QPb(); + return ltd(a) == Xod(jtd(a)); + } + function iYb(a, b) { + return hYb(a, new cWb(b.a, b.b)); + } + function NZb(a) { + return !OZb(a) && a.c.i.c == a.d.i.c; + } + function _Gb(a) { + var b; + b = a.n; + return a.a.b + b.d + b.a; + } + function YHb(a) { + var b; + b = a.n; + return a.e.b + b.d + b.a; + } + function ZHb(a) { + var b; + b = a.n; + return a.e.a + b.b + b.c; + } + function zfe(a) { + wfe(); + ++vfe; + return new ige(0, a); + } + function o_b(a) { + if (a.a) { + return a.a; + } + return JZb(a); + } + function CCb(a) { + if (!a) { + throw vbb(new Cdb(null)); + } + } + function X6d() { + X6d = ccb; + W6d = (mmb(), new anb(Fwe)); + } + function ex() { + ex = ccb; + new gx((_k(), $k), (Lk(), Kk)); + } + function oeb() { + oeb = ccb; + neb = KC(JI, nie, 19, 256, 0, 1); + } + function d$c(a, b, c, d) { + e$c.call(this, a, b, c, d, 0, 0); + } + function sQc(a, b, c) { + return Rhb(a.b, BD(c.b, 17), b); + } + function tQc(a, b, c) { + return Rhb(a.b, BD(c.b, 17), b); + } + function xfd(a, b) { + return Ekb(a, new f7c(b.a, b.b)); + } + function Bic(a, b) { + return a.c < b.c ? -1 : a.c == b.c ? 0 : 1; + } + function B0b(a) { + return a.e.c.length + a.g.c.length; + } + function D0b(a) { + return a.e.c.length - a.g.c.length; + } + function Ojc(a) { + return a.b.c.length - a.e.c.length; + } + function dKc(a) { + FJc(); + return (Ucd(), Ecd).Hc(a.j); + } + function lHd(a) { + $Gd(); + _Gd.call(this, a); + this.a = -1; + } + function R7d(a, b) { + f7d.call(this, a, b); + this.a = this; + } + function odb(a, b) { + var c; + c = ldb(a, b); + c.i = 2; + return c; + } + function Evd(a, b) { + var c; + ++a.j; + c = a.Ti(b); + return c; + } + function e3c(a, b, c) { + a.a = -1; + i3c(a, b.g, c); + return a; + } + function Qrd(a, b, c) { + Kqd(a.a, a.b, a.c, BD(b, 202), c); + } + function OHd(a, b) { + PHd(a, b == null ? null : (uCb(b), b)); + } + function SUd(a, b) { + UUd(a, b == null ? null : (uCb(b), b)); + } + function TUd(a, b) { + UUd(a, b == null ? null : (uCb(b), b)); + } + function Zj(a, b, c) { + return new tk(oAb(a).Ie(), c, b); + } + function IC(a, b, c, d, e, f) { + return JC(a, b, c, d, e, 0, f); + } + function Ucb() { + Ucb = ccb; + Tcb = KC(xI, nie, 217, 256, 0, 1); + } + function Ceb() { + Ceb = ccb; + Beb = KC(MI, nie, 162, 256, 0, 1); + } + function Yeb() { + Yeb = ccb; + Xeb = KC(UI, nie, 184, 256, 0, 1); + } + function ddb() { + ddb = ccb; + cdb = KC(yI, nie, 172, 128, 0, 1); + } + function IVb() { + HVb(this, false, false, false, false); + } + function my(a) { + im(); + this.a = (mmb(), new anb(Qb(a))); + } + function ir(a) { + Qb(a); + while (a.Ob()) { + a.Pb(); + a.Qb(); + } + } + function Tw(a) { + a.a.cd(); + BD(a.a.dd(), 14).gc(); + zh(); + } + function mf(a) { + this.c = a; + this.b = this.c.d.vc().Kc(); + } + function fqb(a) { + this.c = a; + this.a = new Gqb(this.c.a); + } + function Vqb(a) { + this.a = new Mqb(a.gc()); + ye(this, a); + } + function Bsb(a) { + Wqb.call(this, new $rb()); + ye(this, a); + } + function Rfb(a, b) { + a.a += zfb(b, 0, b.length); + return a; + } + function Ikb(a, b) { + tCb(b, a.c.length); + return a.c[b]; + } + function $lb(a, b) { + tCb(b, a.a.length); + return a.a[b]; + } + function YAb(a, b) { + EAb(); + Vzb.call(this, a); + this.a = b; + } + function Qyb(a, b) { + return Aeb(wbb(Aeb(a.a).a, b.a)); + } + function jpb(a, b) { + return uCb(a), Fcb(a, (uCb(b), b)); + } + function opb(a, b) { + return uCb(b), Fcb(b, (uCb(a), a)); + } + function Oyb(a, b) { + return NC(b, 0, Bzb(b[0], Aeb(1))); + } + function Bzb(a, b) { + return Qyb(BD(a, 162), BD(b, 162)); + } + function vic(a) { + return a.c - BD(Ikb(a.a, a.b), 287).b; + } + function uNb(a) { + return !a.q ? (mmb(), mmb(), kmb) : a.q; + } + function Xi(a) { + return a.e.Hd().gc() * a.c.Hd().gc(); + } + function onc(a, b, c) { + return beb(b.d[a.g], c.d[a.g]); + } + function YHc(a, b, c) { + return beb(a.d[b.p], a.d[c.p]); + } + function ZHc(a, b, c) { + return beb(a.d[b.p], a.d[c.p]); + } + function $Hc(a, b, c) { + return beb(a.d[b.p], a.d[c.p]); + } + function _Hc(a, b, c) { + return beb(a.d[b.p], a.d[c.p]); + } + function q$c(a, b, c) { + return Math.min(c / a, 1 / b); + } + function sEc(a, b) { + return a ? 0 : Math.max(0, b - 1); + } + function Elb(a, b) { + var c; + for (c = 0; c < b; ++c) { + a[c] = -1; + } + } + function bVc(a) { + var b; + b = hVc(a); + return !b ? a : bVc(b); + } + function Voc(a, b) { + a.a == null && Toc(a); + return a.a[b]; + } + function qed(a) { + if (a.c) { + return a.c.f; + } + return a.e.b; + } + function red(a) { + if (a.c) { + return a.c.g; + } + return a.e.a; + } + function pFd(a) { + zud.call(this, a.gc()); + ytd(this, a); + } + function nXd(a, b) { + UVd(); + VVd.call(this, b); + this.a = a; + } + function KYd(a, b, c) { + this.a = a; + xMd.call(this, b, c, 2); + } + function B_b(a, b, c, d) { + s_b(this); + v_b(this, a, b, c, d); + } + function ige(a, b) { + wfe(); + xfe.call(this, a); + this.a = b; + } + function jgd(a) { + this.b = new Psb(); + this.a = a; + this.c = -1; + } + function MOb() { + this.d = new f7c(0, 0); + this.e = new Tqb(); + } + function Nr(a) { + qc.call(this, 0, 0); + this.a = a; + this.b = 0; + } + function ejc(a) { + this.a = a; + this.c = new Lqb(); + $ic(this); + } + function ju(a) { + if (a.e.c != a.b) { + throw vbb(new Apb()); + } + } + function bt(a) { + if (a.c.e != a.a) { + throw vbb(new Apb()); + } + } + function Tbb(a) { + if (Fbb(a)) { + return a | 0; + } + return pD(a); + } + function Bfe(a, b) { + wfe(); + ++vfe; + return new rge(a, b); + } + function SEd(a, b) { + return a == null ? b == null : dfb(a, b); + } + function TEd(a, b) { + return a == null ? b == null : efb(a, b); + } + function Npb(a, b, c) { + rqb(a.a, b); + return Qpb(a, b.g, c); + } + function Mlb(a, b, c) { + oCb(0, b, a.length); + Klb(a, 0, b, c); + } + function Dkb(a, b, c) { + wCb(b, a.c.length); + aCb(a.c, b, c); + } + function Dlb(a, b, c) { + var d; + for (d = 0; d < b; ++d) { + a[d] = c; + } + } + function qqb(a, b) { + var c; + c = pqb(a); + nmb(c, b); + return c; + } + function Oz(a, b) { + !a && (a = []); + a[a.length] = b; + return a; + } + function Brb(a, b) { + return !(a.a.get(b) === undefined); + } + function Wyb(a, b) { + return Nyb(new rzb(), new bzb(a), b); + } + function Itb(a) { + return a == null ? ztb : new Ftb(uCb(a)); + } + function tqb(a, b) { + return JD(b, 22) && uqb(a, BD(b, 22)); + } + function vqb(a, b) { + return JD(b, 22) && wqb(a, BD(b, 22)); + } + function Aub(a) { + return Cub(a, 26) * ike + Cub(a, 27) * jke; + } + function MC(a) { + return Array.isArray(a) && a.im === gcb; + } + function bg(a) { + a.b ? bg(a.b) : a.d.dc() && a.f.c.Bc(a.e); + } + function $Nb(a, b) { + P6c(a.c, b); + a.b.c += b.a; + a.b.d += b.b; + } + function ZNb(a, b) { + $Nb(a, c7c(new f7c(b.a, b.b), a.c)); + } + function BLb(a, b) { + this.b = new Psb(); + this.a = a; + this.c = b; + } + function OVb() { + this.b = new $Vb(); + this.c = new SVb(this); + } + function oEb() { + this.d = new CEb(); + this.e = new uEb(this); + } + function aCc() { + ZBc(); + this.f = new Psb(); + this.e = new Psb(); + } + function $Jc() { + FJc(); + this.k = new Lqb(); + this.d = new Tqb(); + } + function Rgd() { + Rgd = ccb; + Qgd = new Osd((Y9c(), s9c), 0); + } + function Mr() { + Mr = ccb; + Lr = new Nr(KC(SI, Uhe, 1, 0, 5, 1)); + } + function gfc(a, b, c) { + bfc(c, a, 1); + Ekb(b, new Tfc(c, a)); + } + function hfc(a, b, c) { + cfc(c, a, 1); + Ekb(b, new dgc(c, a)); + } + function R$c(a, b, c) { + return Qqb(a, new aDb(b.a, c.a)); + } + function ACc(a, b, c) { + return -beb(a.f[b.p], a.f[c.p]); + } + function mHb(a, b, c) { + var d; + if (a) { + d = a.i; + d.c = b; + d.b = c; + } + } + function nHb(a, b, c) { + var d; + if (a) { + d = a.i; + d.d = b; + d.a = c; + } + } + function c3c(a, b, c) { + a.a = -1; + i3c(a, b.g + 1, c); + return a; + } + function Dod(a, b, c) { + c = _hd(a, BD(b, 49), 7, c); + return c; + } + function JHd(a, b, c) { + c = _hd(a, BD(b, 49), 3, c); + return c; + } + function JMd(a, b, c) { + this.a = a; + BMd.call(this, b, c, 22); + } + function UTd(a, b, c) { + this.a = a; + BMd.call(this, b, c, 14); + } + function eXd(a, b, c, d) { + UVd(); + nWd.call(this, a, b, c, d); + } + function lXd(a, b, c, d) { + UVd(); + nWd.call(this, a, b, c, d); + } + function FNd(a, b) { + (b.Bb & ote) != 0 && !a.a.o && (a.a.o = b); + } + function MD(a) { + return a != null && OD(a) && !(a.im === gcb); + } + function ID(a) { + return !Array.isArray(a) && a.im === gcb; + } + function ed(a) { + return JD(a, 15) ? BD(a, 15).Yc() : a.Kc(); + } + function De(a) { + return a.Qc(KC(SI, Uhe, 1, a.gc(), 5, 1)); + } + function u1d(a, b) { + return W1d(p1d(a, b)) ? b.Qh() : null; + } + function uvd(a) { + a ? Ty(a, (Zfb(), Yfb), "") : (Zfb(), Yfb); + } + function Sr(a) { + this.a = (Mr(), Lr); + this.d = BD(Qb(a), 47); + } + function qg(a, b, c, d) { + this.a = a; + dg.call(this, a, b, c, d); + } + function Yge(a) { + Xge(); + this.a = 0; + this.b = a - 1; + this.c = 1; + } + function Yy(a) { + Py(this); + this.g = a; + Ry(this); + this._d(); + } + function Wm(a) { + if (a.c) { + return a.c; + } + return (a.c = a.Id()); + } + function Xm(a) { + if (a.d) { + return a.d; + } + return (a.d = a.Jd()); + } + function Rl(a) { + var b; + b = a.c; + return !b ? (a.c = a.Dd()) : b; + } + function fe(a) { + var b; + b = a.f; + return !b ? (a.f = a.Dc()) : b; + } + function Ec(a) { + var b; + b = a.i; + return !b ? (a.i = a.bc()) : b; + } + function Ffe(a) { + wfe(); + ++vfe; + return new Hge(10, a, 0); + } + function Ubb(a) { + if (Fbb(a)) { + return "" + a; + } + return qD(a); + } + function a4d(a) { + if (a.e.j != a.d) { + throw vbb(new Apb()); + } + } + function Nbb(a, b) { + return zbb(kD(Fbb(a) ? Rbb(a) : a, b)); + } + function Obb(a, b) { + return zbb(lD(Fbb(a) ? Rbb(a) : a, b)); + } + function Pbb(a, b) { + return zbb(mD(Fbb(a) ? Rbb(a) : a, b)); + } + function Dcb(a, b) { + return Ecb((uCb(a), a), (uCb(b), b)); + } + function Ddb(a, b) { + return Kdb((uCb(a), a), (uCb(b), b)); + } + function fx(a, b) { + return Qb(b), a.a.Ad(b) && !a.b.Ad(b); + } + function dD(a, b) { + return TC(a.l & b.l, a.m & b.m, a.h & b.h); + } + function jD(a, b) { + return TC(a.l | b.l, a.m | b.m, a.h | b.h); + } + function rD(a, b) { + return TC(a.l ^ b.l, a.m ^ b.m, a.h ^ b.h); + } + function QAb(a, b) { + return TAb(a, (uCb(b), new Rxb(b))); + } + function RAb(a, b) { + return TAb(a, (uCb(b), new Txb(b))); + } + function g1b(a) { + return z0b(), BD(a, 11).e.c.length != 0; + } + function l1b(a) { + return z0b(), BD(a, 11).g.c.length != 0; + } + function bac(a, b) { + I9b(); + return Kdb(b.a.o.a, a.a.o.a); + } + function Rnc(a, b, c) { + return Snc(a, BD(b, 11), BD(c, 11)); + } + function koc(a) { + if (a.e) { + return poc(a.e); + } + return null; + } + function Iub(a) { + if (!a.d) { + a.d = a.b.Kc(); + a.c = a.b.gc(); + } + } + function pBb(a, b, c) { + if (a.a.Mb(c)) { + a.b = true; + b.td(c); + } + } + function _vb(a, b) { + if (a < 0 || a >= b) { + throw vbb(new rcb()); + } + } + function Pyb(a, b, c) { + NC(b, 0, Bzb(b[0], c[0])); + return b; + } + function _yc(a, b, c) { + b.Ye(c, Edb(ED(Ohb(a.b, c))) * a.a); + } + function n6c(a, b, c) { + i6c(); + return m6c(a, b) && m6c(a, c); + } + function tcd(a) { + rcd(); + return !a.Hc(ncd) && !a.Hc(pcd); + } + function D6c(a) { + return new f7c(a.c + a.b / 2, a.d + a.a / 2); + } + function oOd(a, b) { + return b.kh() ? xid(a.b, BD(b, 49)) : b; + } + function bvb(a, b) { + this.e = a; + this.d = (b & 64) != 0 ? b | oie : b; + } + function qvb(a, b) { + this.c = 0; + this.d = a; + this.b = b | 64 | oie; + } + function gub(a) { + this.b = new Skb(11); + this.a = (ipb(), a); + } + function Qwb(a) { + this.b = null; + this.a = (ipb(), !a ? fpb : a); + } + function nHc(a) { + this.a = lHc(a.a); + this.b = new Tkb(a.b); + } + function Pzd(a) { + this.b = a; + Oyd.call(this, a); + Ozd(this); + } + function Xzd(a) { + this.b = a; + bzd.call(this, a); + Wzd(this); + } + function jUd(a, b, c) { + this.a = a; + gUd.call(this, b, c, 5, 6); + } + function Y5d(a, b, c, d) { + this.b = a; + xMd.call(this, b, c, d); + } + function nSd(a, b, c, d, e) { + oSd.call(this, a, b, c, d, e, -1); + } + function DSd(a, b, c, d, e) { + ESd.call(this, a, b, c, d, e, -1); + } + function cUd(a, b, c, d) { + xMd.call(this, a, b, c); + this.b = d; + } + function i5d(a, b, c, d) { + pMd.call(this, a, b, c); + this.b = d; + } + function x0d(a) { + Wud.call(this, a, false); + this.a = false; + } + function Lj(a, b) { + this.b = a; + sj.call(this, a.b); + this.a = b; + } + function px(a, b) { + im(); + ox.call(this, a, Dm(new amb(b))); + } + function Cfe(a, b) { + wfe(); + ++vfe; + return new Dge(a, b, 0); + } + function Efe(a, b) { + wfe(); + ++vfe; + return new Dge(6, a, b); + } + function nfb(a, b) { + return dfb(a.substr(0, b.length), b); + } + function Mhb(a, b) { + return ND(b) ? Qhb(a, b) : !!irb(a.f, b); + } + function Rrb(a, b) { + uCb(b); + while (a.Ob()) { + b.td(a.Pb()); + } + } + function Vgb(a, b, c) { + Hgb(); + this.e = a; + this.d = b; + this.a = c; + } + function amc(a, b, c, d) { + var e; + e = a.i; + e.i = b; + e.a = c; + e.b = d; + } + function xJc(a) { + var b; + b = a; + while (b.f) { + b = b.f; + } + return b; + } + function fkb(a) { + var b; + b = bkb(a); + sCb(b != null); + return b; + } + function gkb(a) { + var b; + b = ckb(a); + sCb(b != null); + return b; + } + function cv(a, b) { + var c; + c = a.a.gc(); + Sb(b, c); + return c - b; + } + function Glb(a, b) { + var c; + for (c = 0; c < b; ++c) { + a[c] = false; + } + } + function Clb(a, b, c, d) { + var e; + for (e = b; e < c; ++e) { + a[e] = d; + } + } + function ylb(a, b, c, d) { + oCb(b, c, a.length); + Clb(a, b, c, d); + } + function Vvb(a, b, c) { + _vb(c, a.a.c.length); + Nkb(a.a, c, b); + } + function Lyb(a, b, c) { + this.c = a; + this.a = b; + mmb(); + this.b = c; + } + function Qpb(a, b, c) { + var d; + d = a.b[b]; + a.b[b] = c; + return d; + } + function Qqb(a, b) { + var c; + c = a.a.zc(b, a); + return c == null; + } + function zjb(a) { + if (!a) { + throw vbb(new utb()); + } + return a.d; + } + function vCb(a, b) { + if (a == null) { + throw vbb(new Heb(b)); + } + } + function Goc(a, b) { + if (!b) { + return false; + } + return ye(a, b); + } + function K2c(a, b, c) { + C2c(a, b.g, c); + rqb(a.c, b); + return a; + } + function vVb(a) { + tVb(a, (ead(), aad)); + a.d = true; + return a; + } + function c2d(a) { + !a.j && i2d(a, d1d(a.g, a.b)); + return a.j; + } + function nlb(a) { + yCb(a.b != -1); + Kkb(a.c, (a.a = a.b)); + a.b = -1; + } + function Uhb(a) { + a.f = new lrb(a); + a.g = new Frb(a); + zpb(a); + } + function Plb(a) { + return new YAb(null, Olb(a, a.length)); + } + function ul(a) { + return new Sr(new xl(a.a.length, a.a)); + } + function iD(a) { + return TC(~a.l & Eje, ~a.m & Eje, ~a.h & Fje); + } + function OD(a) { + return typeof a === Jhe || typeof a === Nhe; + } + function D9d(a) { + return a == Pje ? Nwe : a == Qje ? "-INF" : "" + a; + } + function F9d(a) { + return a == Pje ? Nwe : a == Qje ? "-INF" : "" + a; + } + function yRb(a, b) { + return a > 0 ? Math.log(a / b) : -100; + } + function ueb(a, b) { + return ybb(a, b) < 0 ? -1 : ybb(a, b) > 0 ? 1 : 0; + } + function HMb(a, b, c) { + return IMb(a, BD(b, 46), BD(c, 167)); + } + function iq(a, b) { + return BD(Rl(Wm(a.a)).Xb(b), 42).cd(); + } + function Olb(a, b) { + return avb(b, a.length), new vvb(a, b); + } + function Pyd(a, b) { + this.d = a; + Fyd.call(this, a); + this.e = b; + } + function Lub(a) { + this.d = (uCb(a), a); + this.a = 0; + this.c = rie; + } + function rge(a, b) { + xfe.call(this, 1); + this.a = a; + this.b = b; + } + function Rzb(a, b) { + !a.c ? Ekb(a.b, b) : Rzb(a.c, b); + return a; + } + function uB(a, b, c) { + var d; + d = tB(a, b); + vB(a, b, c); + return d; + } + function ZBb(a, b) { + var c; + c = a.slice(0, b); + return PC(c, a); + } + function Flb(a, b, c) { + var d; + for (d = 0; d < b; ++d) { + NC(a, d, c); + } + } + function ffb(a, b, c, d, e) { + while (b < c) { + d[e++] = bfb(a, b++); + } + } + function hLb(a, b) { + return Kdb(a.c.c + a.c.b, b.c.c + b.c.b); + } + function Axb(a, b) { + return Iwb(a.a, b, (Bcb(), zcb)) == null; + } + function Vsb(a, b) { + Gsb(a.d, b, a.b.b, a.b); + ++a.a; + a.c = null; + } + function d3d(a, b) { + JLd(a, JD(b, 153) ? b : BD(b, 1937).gl()); + } + function hkc(a, b) { + MAb(NAb(a.Oc(), new Rkc()), new Tkc(b)); + } + function kkc(a, b, c, d, e) { + jkc(a, BD(Qc(b.k, c), 15), c, d, e); + } + function lOc(a) { + a.s = NaN; + a.c = NaN; + mOc(a, a.e); + mOc(a, a.j); + } + function it(a) { + a.a = null; + a.e = null; + Uhb(a.b); + a.d = 0; + ++a.c; + } + function gKc(a) { + return Math.abs(a.d.e - a.e.e) - a.a; + } + function MAd(a, b, c) { + return BD(a.c._c(b, BD(c, 133)), 42); + } + function os() { + hs(); + return OC(GC(yG, 1), Kie, 538, 0, [gs]); + } + function VPb(a) { + QPb(); + return Xod(jtd(a)) == Xod(ltd(a)); + } + function aRb(a) { + _Qb.call(this); + this.a = a; + Ekb(a.a, this); + } + function tPc(a, b) { + this.d = DPc(a); + this.c = b; + this.a = 0.5 * b; + } + function A6d() { + $rb.call(this); + this.a = true; + this.b = true; + } + function aLd(a) { + return (a.i == null && TKd(a), a.i).length; + } + function oRd(a) { + return JD(a, 99) && (BD(a, 18).Bb & ote) != 0; + } + function w2d(a, b) { + ++a.j; + t3d(a, a.i, b); + v2d(a, BD(b, 332)); + } + function vId(a, b) { + b = a.nk(null, b); + return uId(a, null, b); + } + function ytd(a, b) { + a.hi() && (b = Dtd(a, b)); + return a.Wh(b); + } + function mdb(a, b, c) { + var d; + d = ldb(a, b); + zdb(c, d); + return d; + } + function ldb(a, b) { + var c; + c = new jdb(); + c.j = a; + c.d = b; + return c; + } + function Qb(a) { + if (a == null) { + throw vbb(new Geb()); + } + return a; + } + function Fc(a) { + var b; + b = a.j; + return !b ? (a.j = new Cw(a)) : b; + } + function Vi(a) { + var b; + b = a.f; + return !b ? (a.f = new Rj(a)) : b; + } + function ci(a) { + var b; + return (b = a.k), !b ? (a.k = new th(a)) : b; + } + function Uc(a) { + var b; + return (b = a.k), !b ? (a.k = new th(a)) : b; + } + function Pc(a) { + var b; + return (b = a.g), !b ? (a.g = new lh(a)) : b; + } + function Yi(a) { + var b; + return (b = a.i), !b ? (a.i = new Ci(a)) : b; + } + function qo(a) { + var b; + b = a.d; + return !b ? (a.d = new ap(a)) : b; + } + function Fb(a) { + Qb(a); + return JD(a, 475) ? BD(a, 475) : fcb(a); + } + function Ix(a) { + if (JD(a, 607)) { + return a; + } + return new by(a); + } + function qj(a, b) { + Pb(b, a.c.b.c.gc()); + return new Fj(a, b); + } + function Dfe(a, b, c) { + wfe(); + ++vfe; + return new zge(a, b, c); + } + function NC(a, b, c) { + qCb(c == null || FC(a, c)); + return (a[b] = c); + } + function bv(a, b) { + var c; + c = a.a.gc(); + Pb(b, c); + return c - 1 - b; + } + function Afb(a, b) { + a.a += String.fromCharCode(b); + return a; + } + function Kfb(a, b) { + a.a += String.fromCharCode(b); + return a; + } + function ovb(a, b) { + uCb(b); + while (a.c < a.d) { + a.ze(b, a.c++); + } + } + function Ohb(a, b) { + return ND(b) ? Phb(a, b) : Wd(irb(a.f, b)); + } + function ZPb(a, b) { + QPb(); + return a == jtd(b) ? ltd(b) : jtd(b); + } + function isd(a, b) { + Qpd(a, new yC(b.f != null ? b.f : "" + b.g)); + } + function ksd(a, b) { + Qpd(a, new yC(b.f != null ? b.f : "" + b.g)); + } + function dVb(a) { + this.b = new Rkb(); + this.a = new Rkb(); + this.c = a; + } + function H1b(a) { + this.c = new d7c(); + this.a = new Rkb(); + this.b = a; + } + function pRb(a) { + _Qb.call(this); + this.a = new d7c(); + this.c = a; + } + function yC(a) { + if (a == null) { + throw vbb(new Geb()); + } + this.a = a; + } + function HA(a) { + fA(); + this.b = new Rkb(); + this.a = a; + sA(this, a); + } + function v4c(a) { + this.c = a; + this.a = new Psb(); + this.b = new Psb(); + } + function GB() { + GB = ccb; + EB = new HB(false); + FB = new HB(true); + } + function im() { + im = ccb; + Ql(); + hm = new ux((mmb(), mmb(), jmb)); + } + function yx() { + yx = ccb; + Ql(); + xx = new zx((mmb(), mmb(), lmb)); + } + function NFd() { + NFd = ccb; + MFd = BZd(); + !!(jGd(), PFd) && DZd(); + } + function aac(a, b) { + I9b(); + return BD(Mpb(a, b.d), 15).Fc(b); + } + function pTb(a, b, c, d) { + return c == 0 || (c - d) / c < a.e || b >= a.g; + } + function NHc(a, b, c) { + var d; + d = THc(a, b, c); + return MHc(a, d); + } + function Qpd(a, b) { + var c; + c = a.a.length; + tB(a, c); + vB(a, c, b); + } + function gCb(a, b) { + var c; + c = console[a]; + c.call(console, b); + } + function Bvd(a, b) { + var c; + ++a.j; + c = a.Vi(); + a.Ii(a.oi(c, b)); + } + function E1c(a, b, c) { + BD(b.b, 65); + Hkb(b.a, new L1c(a, c, b)); + } + function oXd(a, b, c) { + VVd.call(this, b); + this.a = a; + this.b = c; + } + function Dge(a, b, c) { + xfe.call(this, a); + this.a = b; + this.b = c; + } + function dYd(a, b, c) { + this.a = a; + lVd.call(this, b); + this.b = c; + } + function f0d(a, b, c) { + this.a = a; + mxd.call(this, 8, b, null, c); + } + function z1d(a) { + this.a = (uCb(Rve), Rve); + this.b = a; + new oUd(); + } + function ct(a) { + this.c = a; + this.b = this.c.a; + this.a = this.c.e; + } + function usb(a) { + this.c = a; + this.b = a.a.d.a; + ypb(a.a.e, this); + } + function uib(a) { + yCb(a.c != -1); + a.d.$c(a.c); + a.b = a.c; + a.c = -1; + } + function U6c(a) { + return Math.sqrt(a.a * a.a + a.b * a.b); + } + function Uvb(a, b) { + return _vb(b, a.a.c.length), Ikb(a.a, b); + } + function Hb(a, b) { + return PD(a) === PD(b) || (a != null && pb(a, b)); + } + function oAb(a) { + if (0 >= a) { + return new yAb(); + } + return pAb(a - 1); + } + function Nfe(a) { + if (!bfe) return false; + return Qhb(bfe, a); + } + function Ehe(a) { + if (a) return a.dc(); + return !a.Kc().Ob(); + } + function Q_b(a) { + if (!a.a && !!a.c) { + return a.c.b; + } + return a.a; + } + function LHd(a) { + !a.a && (a.a = new xMd(m5, a, 4)); + return a.a; + } + function LQd(a) { + !a.d && (a.d = new xMd(j5, a, 1)); + return a.d; + } + function uCb(a) { + if (a == null) { + throw vbb(new Geb()); + } + return a; + } + function Qzb(a) { + if (!a.c) { + a.d = true; + Szb(a); + } else { + a.c.He(); + } + } + function Tzb(a) { + if (!a.c) { + Uzb(a); + a.d = true; + } else { + Tzb(a.c); + } + } + function Kpb(a) { + Ae(a.a); + a.b = KC(SI, Uhe, 1, a.b.length, 5, 1); + } + function qlc(a, b) { + return beb(b.j.c.length, a.j.c.length); + } + function igd(a, b) { + a.c < 0 || a.b.b < a.c ? Fsb(a.b, b) : a.a._e(b); + } + function Did(a, b) { + var c; + c = a.Yg(b); + c >= 0 ? a.Bh(c) : vid(a, b); + } + function WHc(a) { + var b, c; + b = a.c.i.c; + c = a.d.i.c; + return b == c; + } + function Wwd(a) { + if (a.p != 4) throw vbb(new Ydb()); + return a.e; + } + function Vwd(a) { + if (a.p != 3) throw vbb(new Ydb()); + return a.e; + } + function Ywd(a) { + if (a.p != 6) throw vbb(new Ydb()); + return a.f; + } + function fxd(a) { + if (a.p != 6) throw vbb(new Ydb()); + return a.k; + } + function cxd(a) { + if (a.p != 3) throw vbb(new Ydb()); + return a.j; + } + function dxd(a) { + if (a.p != 4) throw vbb(new Ydb()); + return a.j; + } + function AYd(a) { + !a.b && (a.b = new RYd(new NYd())); + return a.b; + } + function $1d(a) { + a.c == -2 && e2d(a, X0d(a.g, a.b)); + return a.c; + } + function pdb(a, b) { + var c; + c = ldb("", a); + c.n = b; + c.i = 1; + return c; + } + function MNb(a, b) { + $Nb(BD(b.b, 65), a); + Hkb(b.a, new RNb(a)); + } + function Cnd(a, b) { + wtd((!a.a && (a.a = new fTd(a, a)), a.a), b); + } + function Qzd(a, b) { + this.b = a; + Pyd.call(this, a, b); + Ozd(this); + } + function Yzd(a, b) { + this.b = a; + czd.call(this, a, b); + Wzd(this); + } + function Ms(a, b, c, d) { + Wo.call(this, a, b); + this.d = c; + this.a = d; + } + function $o(a, b, c, d) { + Wo.call(this, a, c); + this.a = b; + this.f = d; + } + function iy(a, b) { + Pp.call(this, umb(Qb(a), Qb(b))); + this.a = b; + } + function cae() { + fod.call(this, Ewe, (p8d(), o8d)); + $9d(this); + } + function AZd() { + fod.call(this, _ve, (LFd(), KFd)); + uZd(this); + } + function T0c() { + $r.call(this, "DELAUNAY_TRIANGULATION", 0); + } + function vfb(a) { + return String.fromCharCode.apply(null, a); + } + function Rhb(a, b, c) { + return ND(b) ? Shb(a, b, c) : jrb(a.f, b, c); + } + function tmb(a) { + mmb(); + return !a ? (ipb(), ipb(), hpb) : a.ve(); + } + function d2c(a, b, c) { + Y1c(); + return c.pg(a, BD(b.cd(), 146)); + } + function ix(a, b) { + ex(); + return new gx(new il(a), new Uk(b)); + } + function Iu(a) { + Xj(a, Mie); + return Oy(wbb(wbb(5, a), (a / 10) | 0)); + } + function Vm() { + Vm = ccb; + Um = new wx(OC(GC(CK, 1), zie, 42, 0, [])); + } + function hob(a) { + !a.d && (a.d = new lnb(a.c.Cc())); + return a.d; + } + function eob(a) { + !a.a && (a.a = new Gob(a.c.vc())); + return a.a; + } + function gob(a) { + !a.b && (a.b = new zob(a.c.ec())); + return a.b; + } + function keb(a, b) { + while (b-- > 0) { + a = (a << 1) | (a < 0 ? 1 : 0); + } + return a; + } + function wtb(a, b) { + return PD(a) === PD(b) || (a != null && pb(a, b)); + } + function Gbc(a, b) { + return Bcb(), BD(b.b, 19).a < a ? true : false; + } + function Hbc(a, b) { + return Bcb(), BD(b.a, 19).a < a ? true : false; + } + function Mpb(a, b) { + return tqb(a.a, b) ? a.b[BD(b, 22).g] : null; + } + function kcb(a, b, c, d) { + a.a = qfb(a.a, 0, b) + ("" + d) + pfb(a.a, c); + } + function OJb(a, b) { + a.u.Hc((rcd(), ncd)) && MJb(a, b); + QJb(a, b); + } + function bfb(a, b) { + BCb(b, a.length); + return a.charCodeAt(b); + } + function vtb() { + hz.call(this, "There is no more element."); + } + function xkb(a) { + this.d = a; + this.a = this.d.b; + this.b = this.d.c; + } + function kEb(a) { + a.b = false; + a.c = false; + a.d = false; + a.a = false; + } + function Znd(a, b, c, d) { + Ynd(a, b, c, false); + LPd(a, d); + return a; + } + function h3c(a) { + a.j.c = KC(SI, Uhe, 1, 0, 5, 1); + a.a = -1; + return a; + } + function Old(a) { + !a.c && (a.c = new y5d(z2, a, 5, 8)); + return a.c; + } + function Nld(a) { + !a.b && (a.b = new y5d(z2, a, 4, 7)); + return a.b; + } + function Kkd(a) { + !a.n && (a.n = new cUd(D2, a, 1, 7)); + return a.n; + } + function Yod(a) { + !a.c && (a.c = new cUd(F2, a, 9, 9)); + return a.c; + } + function a2d(a) { + a.e == Gwe && g2d(a, a1d(a.g, a.b)); + return a.e; + } + function b2d(a) { + a.f == Gwe && h2d(a, b1d(a.g, a.b)); + return a.f; + } + function Ah(a) { + var b; + b = a.b; + !b && (a.b = b = new Ph(a)); + return b; + } + function Ae(a) { + var b; + for (b = a.Kc(); b.Ob(); ) { + b.Pb(); + b.Qb(); + } + } + function Fg(a) { + ag(a.d); + if (a.d.d != a.c) { + throw vbb(new Apb()); + } + } + function Xx(a, b) { + this.b = a; + this.c = b; + this.a = new Gqb(this.b); + } + function Zeb(a, b, c) { + this.a = Zie; + this.d = a; + this.b = b; + this.c = c; + } + function Mub(a, b) { + this.d = (uCb(a), a); + this.a = 16449; + this.c = b; + } + function nqd(a, b) { + ctd(a, Edb(Xpd(b, "x")), Edb(Xpd(b, "y"))); + } + function Aqd(a, b) { + ctd(a, Edb(Xpd(b, "x")), Edb(Xpd(b, "y"))); + } + function JAb(a, b) { + Uzb(a); + return new YAb(a, new qBb(b, a.a)); + } + function NAb(a, b) { + Uzb(a); + return new YAb(a, new IBb(b, a.a)); + } + function OAb(a, b) { + Uzb(a); + return new bAb(a, new wBb(b, a.a)); + } + function PAb(a, b) { + Uzb(a); + return new vAb(a, new CBb(b, a.a)); + } + function Cy(a, b) { + return new Ay(BD(Qb(a), 62), BD(Qb(b), 62)); + } + function PWb(a, b) { + LWb(); + return Kdb((uCb(a), a), (uCb(b), b)); + } + function fPb() { + cPb(); + return OC(GC(GO, 1), Kie, 481, 0, [bPb]); + } + function o_c() { + i_c(); + return OC(GC(N_, 1), Kie, 482, 0, [h_c]); + } + function x_c() { + s_c(); + return OC(GC(O_, 1), Kie, 551, 0, [r_c]); + } + function X0c() { + R0c(); + return OC(GC(W_, 1), Kie, 530, 0, [Q0c]); + } + function cEc(a) { + this.a = new Rkb(); + this.e = KC(WD, nie, 48, a, 0, 2); + } + function l$b(a, b, c, d) { + this.a = a; + this.e = b; + this.d = c; + this.c = d; + } + function QIc(a, b, c, d) { + this.a = a; + this.c = b; + this.b = c; + this.d = d; + } + function rKc(a, b, c, d) { + this.c = a; + this.b = b; + this.a = c; + this.d = d; + } + function WKc(a, b, c, d) { + this.c = a; + this.b = b; + this.d = c; + this.a = d; + } + function J6c(a, b, c, d) { + this.c = a; + this.d = b; + this.b = c; + this.a = d; + } + function gPc(a, b, c, d) { + this.a = a; + this.d = b; + this.c = c; + this.b = d; + } + function Blc(a, b, c, d) { + $r.call(this, a, b); + this.a = c; + this.b = d; + } + function Ggd(a, b, c, d) { + this.a = a; + this.c = b; + this.d = c; + this.b = d; + } + function pec(a, b, c) { + Pmc(a.a, c); + dmc(c); + enc(a.b, c); + xmc(b, c); + } + function Pid(a, b, c) { + var d, e; + d = QEd(a); + e = b.Kh(c, d); + return e; + } + function KPb(a, b) { + var c, d; + c = a / b; + d = QD(c); + c > d && ++d; + return d; + } + function Nnd(a) { + var b, c; + c = ((b = new UQd()), b); + NQd(c, a); + return c; + } + function Ond(a) { + var b, c; + c = ((b = new UQd()), b); + RQd(c, a); + return c; + } + function hqd(a, b) { + var c; + c = Ohb(a.f, b); + Yqd(b, c); + return null; + } + function JZb(a) { + var b; + b = P2b(a); + if (b) { + return b; + } + return null; + } + function Wod(a) { + !a.b && (a.b = new cUd(B2, a, 12, 3)); + return a.b; + } + function YEd(a) { + return a != null && hnb(GEd, a.toLowerCase()); + } + function ied(a, b) { + return Kdb(red(a) * qed(a), red(b) * qed(b)); + } + function jed(a, b) { + return Kdb(red(a) * qed(a), red(b) * qed(b)); + } + function wEb(a, b) { + return Kdb(a.d.c + a.d.b / 2, b.d.c + b.d.b / 2); + } + function UVb(a, b) { + return Kdb(a.g.c + a.g.b / 2, b.g.c + b.g.b / 2); + } + function pQb(a, b, c) { + c.a ? eld(a, b.b - a.f / 2) : dld(a, b.a - a.g / 2); + } + function prd(a, b, c, d) { + this.a = a; + this.b = b; + this.c = c; + this.d = d; + } + function ord(a, b, c, d) { + this.a = a; + this.b = b; + this.c = c; + this.d = d; + } + function JVd(a, b, c, d) { + this.e = a; + this.a = b; + this.c = c; + this.d = d; + } + function ZVd(a, b, c, d) { + this.a = a; + this.c = b; + this.d = c; + this.b = d; + } + function cXd(a, b, c, d) { + UVd(); + mWd.call(this, b, c, d); + this.a = a; + } + function jXd(a, b, c, d) { + UVd(); + mWd.call(this, b, c, d); + this.a = a; + } + function Ng(a, b) { + this.a = a; + Hg.call(this, a, BD(a.d, 15).Zc(b)); + } + function ZBd(a) { + this.f = a; + this.c = this.f.e; + a.f > 0 && YBd(this); + } + function lBb(a, b, c, d) { + this.b = a; + this.c = d; + nvb.call(this, b, c); + } + function tib(a) { + sCb(a.b < a.d.gc()); + return a.d.Xb((a.c = a.b++)); + } + function Osb(a) { + a.a.a = a.c; + a.c.b = a.a; + a.a.b = a.c.a = null; + a.b = 0; + } + function u_b(a, b) { + a.b = b.b; + a.c = b.c; + a.d = b.d; + a.a = b.a; + return a; + } + function Ry(a) { + if (a.n) { + a.e !== Sie && a._d(); + a.j = null; + } + return a; + } + function FD(a) { + CCb(a == null || (OD(a) && !(a.im === gcb))); + return a; + } + function p4b(a) { + this.b = new Rkb(); + Gkb(this.b, this.b); + this.a = a; + } + function QPb() { + QPb = ccb; + PPb = new Rkb(); + OPb = new Lqb(); + NPb = new Rkb(); + } + function mmb() { + mmb = ccb; + jmb = new xmb(); + kmb = new Qmb(); + lmb = new Ymb(); + } + function ipb() { + ipb = ccb; + fpb = new kpb(); + gpb = new kpb(); + hpb = new ppb(); + } + function ODb() { + ODb = ccb; + LDb = new JDb(); + NDb = new oEb(); + MDb = new fEb(); + } + function MCb() { + if (HCb == 256) { + GCb = ICb; + ICb = new nb(); + HCb = 0; + } + ++HCb; + } + function nd(a) { + var b; + return (b = a.f), !b ? (a.f = new ne(a, a.c)) : b; + } + function d2b(a) { + return Qld(a) && Ccb(DD(hkd(a, (Nyc(), gxc)))); + } + function mcc(a, b) { + return Rc(a, BD(vNb(b, (Nyc(), Nxc)), 19), b); + } + function POc(a, b) { + return vPc(a.j, b.s, b.c) + vPc(b.e, a.s, a.c); + } + function ooc(a, b) { + if (!!a.e && !a.e.a) { + moc(a.e, b); + ooc(a.e, b); + } + } + function noc(a, b) { + if (!!a.d && !a.d.a) { + moc(a.d, b); + noc(a.d, b); + } + } + function hed(a, b) { + return -Kdb(red(a) * qed(a), red(b) * qed(b)); + } + function cgd(a) { + return BD(a.cd(), 146).tg() + ":" + fcb(a.dd()); + } + function Zgc(a) { + Hgc(); + var b; + b = BD(a.g, 10); + b.n.a = a.d.c + b.d.b; + } + function wgc(a, b, c) { + qgc(); + return iEb(BD(Ohb(a.e, b), 522), c); + } + function Y2c(a, b) { + rb(a); + rb(b); + return Xr(BD(a, 22), BD(b, 22)); + } + function oic(a, b, c) { + a.i = 0; + a.e = 0; + if (b == c) { + return; + } + kic(a, b, c); + } + function pic(a, b, c) { + a.i = 0; + a.e = 0; + if (b == c) { + return; + } + lic(a, b, c); + } + function Spd(a, b, c) { + var d, e; + d = Kcb(c); + e = new TB(d); + cC(a, b, e); + } + function FSd(a, b, c, d, e, f) { + ESd.call(this, a, b, c, d, e, f ? -2 : -1); + } + function U5d(a, b, c, d) { + MLd.call(this, b, c); + this.b = a; + this.a = d; + } + function QRc(a, b) { + new Psb(); + this.a = new s7c(); + this.b = a; + this.c = b; + } + function Hec(a, b) { + BD(vNb(a, (wtc(), Qsc)), 15).Fc(b); + return b; + } + function Rb(a, b) { + if (a == null) { + throw vbb(new Heb(b)); + } + return a; + } + function WKd(a) { + !a.q && (a.q = new cUd(n5, a, 11, 10)); + return a.q; + } + function ZKd(a) { + !a.s && (a.s = new cUd(t5, a, 21, 17)); + return a.s; + } + function Vod(a) { + !a.a && (a.a = new cUd(E2, a, 10, 11)); + return a.a; + } + function Dx(a) { + return JD(a, 14) ? new Vqb(BD(a, 14)) : Ex(a.Kc()); + } + function Ni(a) { + return new aj(a, a.e.Hd().gc() * a.c.Hd().gc()); + } + function Zi(a) { + return new kj(a, a.e.Hd().gc() * a.c.Hd().gc()); + } + function rz(a) { + return !!a && !!a.hashCode ? a.hashCode() : FCb(a); + } + function Qhb(a, b) { + return b == null ? !!irb(a.f, null) : Brb(a.g, b); + } + function Oq(a) { + Qb(a); + return mr(new Sr(ur(a.a.Kc(), new Sq()))); + } + function vmb(a) { + mmb(); + return JD(a, 54) ? new Yob(a) : new Inb(a); + } + function VDb(a, b, c) { + if (a.f) { + return a.f.Ne(b, c); + } + return false; + } + function Gfb(a, b) { + a.a = qfb(a.a, 0, b) + "" + pfb(a.a, b + 1); + return a; + } + function fVb(a, b) { + var c; + c = Sqb(a.a, b); + c && (b.d = null); + return c; + } + function zpb(a) { + var b, c; + c = a; + b = c.$modCount | 0; + c.$modCount = b + 1; + } + function pu(a) { + this.b = a; + this.c = a; + a.e = null; + a.c = null; + this.a = 1; + } + function hOb(a) { + this.b = a; + this.a = new Hxb(BD(Qb(new kOb()), 62)); + } + function uEb(a) { + this.c = a; + this.b = new Hxb(BD(Qb(new xEb()), 62)); + } + function SVb(a) { + this.c = a; + this.b = new Hxb(BD(Qb(new VVb()), 62)); + } + function FYb() { + this.a = new HXb(); + this.b = new LXb(); + this.d = new SYb(); + } + function UZb() { + this.a = new s7c(); + this.b = (Xj(3, Jie), new Skb(3)); + } + function VMc() { + this.b = new Tqb(); + this.d = new Psb(); + this.e = new twb(); + } + function K6c(a) { + this.c = a.c; + this.d = a.d; + this.b = a.b; + this.a = a.a; + } + function Ay(a, b) { + oi.call(this, new Qwb(a)); + this.a = a; + this.b = b; + } + function eod() { + bod(this, new $md()); + this.wb = (NFd(), MFd); + LFd(); + } + function eHc(a) { + Odd(a, "No crossing minimization", 1); + Qdd(a); + } + function Gz(a) { + Az(); + setTimeout(function () { + throw a; + }, 0); + } + function _Kd(a) { + if (!a.u) { + $Kd(a); + a.u = new YOd(a, a); + } + return a.u; + } + function wjd(a) { + var b; + b = BD(Ajd(a, 16), 26); + return !b ? a.zh() : b; + } + function Jsd(a, b) { + return JD(b, 146) && dfb(a.b, BD(b, 146).tg()); + } + function t0d(a, b) { + return a.a ? b.Wg().Kc() : BD(b.Wg(), 69).Zh(); + } + function u3b(a) { + return a.k == (j0b(), h0b) && wNb(a, (wtc(), Csc)); + } + function ux(a) { + this.a = (mmb(), JD(a, 54) ? new Yob(a) : new Inb(a)); + } + function Rz() { + Rz = ccb; + var a, b; + b = !Xz(); + a = new dA(); + Qz = b ? new Yz() : a; + } + function Wy(a, b) { + var c; + c = hdb(a.gm); + return b == null ? c : c + ": " + b; + } + function Eob(a, b) { + var c; + c = a.b.Qc(b); + Fob(c, a.b.gc()); + return c; + } + function ytb(a, b) { + if (a == null) { + throw vbb(new Heb(b)); + } + return a; + } + function irb(a, b) { + return grb(a, b, hrb(a, b == null ? 0 : a.b.se(b))); + } + function ofb(a, b, c) { + return c >= 0 && dfb(a.substr(c, b.length), b); + } + function H2d(a, b, c, d, e, f, g) { + return new O7d(a.e, b, c, d, e, f, g); + } + function Cxd(a, b, c, d, e, f) { + this.a = a; + nxd.call(this, b, c, d, e, f); + } + function vyd(a, b, c, d, e, f) { + this.a = a; + nxd.call(this, b, c, d, e, f); + } + function $Ec(a, b) { + this.g = a; + this.d = OC(GC(OQ, 1), kne, 10, 0, [b]); + } + function KVd(a, b) { + this.e = a; + this.a = SI; + this.b = R5d(b); + this.c = b; + } + function cIb(a, b) { + $Gb.call(this); + THb(this); + this.a = a; + this.c = b; + } + function kBc(a, b, c, d) { + NC(a.c[b.g], c.g, d); + NC(a.c[c.g], b.g, d); + } + function nBc(a, b, c, d) { + NC(a.c[b.g], b.g, c); + NC(a.b[b.g], b.g, d); + } + function cBc() { + _Ac(); + return OC(GC(fX, 1), Kie, 376, 0, [$Ac, ZAc]); + } + function crc() { + _qc(); + return OC(GC(MW, 1), Kie, 479, 0, [$qc, Zqc]); + } + function Aqc() { + xqc(); + return OC(GC(JW, 1), Kie, 419, 0, [vqc, wqc]); + } + function Lpc() { + Ipc(); + return OC(GC(FW, 1), Kie, 422, 0, [Gpc, Hpc]); + } + function psc() { + msc(); + return OC(GC(SW, 1), Kie, 420, 0, [ksc, lsc]); + } + function EAc() { + BAc(); + return OC(GC(cX, 1), Kie, 421, 0, [zAc, AAc]); + } + function XIc() { + UIc(); + return OC(GC(mY, 1), Kie, 523, 0, [TIc, SIc]); + } + function KOc() { + HOc(); + return OC(GC(DZ, 1), Kie, 520, 0, [GOc, FOc]); + } + function _Lc() { + YLc(); + return OC(GC(fZ, 1), Kie, 516, 0, [XLc, WLc]); + } + function hMc() { + eMc(); + return OC(GC(gZ, 1), Kie, 515, 0, [cMc, dMc]); + } + function IQc() { + FQc(); + return OC(GC(YZ, 1), Kie, 455, 0, [DQc, EQc]); + } + function bUc() { + $Tc(); + return OC(GC(F$, 1), Kie, 425, 0, [ZTc, YTc]); + } + function VTc() { + STc(); + return OC(GC(E$, 1), Kie, 480, 0, [QTc, RTc]); + } + function VUc() { + PUc(); + return OC(GC(K$, 1), Kie, 495, 0, [NUc, OUc]); + } + function jWc() { + fWc(); + return OC(GC(X$, 1), Kie, 426, 0, [dWc, eWc]); + } + function g1c() { + a1c(); + return OC(GC(X_, 1), Kie, 429, 0, [_0c, $0c]); + } + function F_c() { + C_c(); + return OC(GC(P_, 1), Kie, 430, 0, [B_c, A_c]); + } + function PEb() { + MEb(); + return OC(GC(aN, 1), Kie, 428, 0, [LEb, KEb]); + } + function XEb() { + UEb(); + return OC(GC(bN, 1), Kie, 427, 0, [SEb, TEb]); + } + function $Rb() { + XRb(); + return OC(GC(gP, 1), Kie, 424, 0, [VRb, WRb]); + } + function B5b() { + y5b(); + return OC(GC(ZR, 1), Kie, 511, 0, [x5b, w5b]); + } + function lid(a, b, c, d) { + return c >= 0 ? a.jh(b, c, d) : a.Sg(null, c, d); + } + function hgd(a) { + if (a.b.b == 0) { + return a.a.$e(); + } + return Lsb(a.b); + } + function Xwd(a) { + if (a.p != 5) throw vbb(new Ydb()); + return Tbb(a.f); + } + function exd(a) { + if (a.p != 5) throw vbb(new Ydb()); + return Tbb(a.k); + } + function pNd(a) { + PD(a.a) === PD((NKd(), MKd)) && qNd(a); + return a.a; + } + function by(a) { + this.a = BD(Qb(a), 271); + this.b = (mmb(), new Zob(a)); + } + function bQc(a, b) { + $Pc(this, new f7c(a.a, a.b)); + _Pc(this, Ru(b)); + } + function FQc() { + FQc = ccb; + DQc = new GQc(jle, 0); + EQc = new GQc(kle, 1); + } + function YLc() { + YLc = ccb; + XLc = new ZLc(kle, 0); + WLc = new ZLc(jle, 1); + } + function Hp() { + Gp.call(this, new Mqb(Cv(12))); + Lb(true); + this.a = 2; + } + function Hge(a, b, c) { + wfe(); + xfe.call(this, a); + this.b = b; + this.a = c; + } + function cWd(a, b, c) { + UVd(); + VVd.call(this, b); + this.a = a; + this.b = c; + } + function aIb(a) { + $Gb.call(this); + THb(this); + this.a = a; + this.c = true; + } + function isb(a) { + var b; + b = a.c.d.b; + a.b = b; + a.a = a.c.d; + b.a = a.c.d.b = a; + } + function $Cb(a) { + var b; + NGb(a.a); + MGb(a.a); + b = new YGb(a.a); + UGb(b); + } + function iKb(a, b) { + hKb(a, true); + Hkb(a.e.wf(), new mKb(a, true, b)); + } + function tlb(a, b) { + pCb(b); + return vlb(a, KC(WD, oje, 25, b, 15, 1), b); + } + function YPb(a, b) { + QPb(); + return a == Xod(jtd(b)) || a == Xod(ltd(b)); + } + function Phb(a, b) { + return b == null ? Wd(irb(a.f, null)) : Crb(a.g, b); + } + function Ksb(a) { + return a.b == 0 ? null : (sCb(a.b != 0), Nsb(a, a.a.a)); + } + function QD(a) { + return Math.max(Math.min(a, Ohe), -2147483648) | 0; + } + function uz(a, b) { + var c = tz[a.charCodeAt(0)]; + return c == null ? a : c; + } + function Cx(a, b) { + Rb(a, "set1"); + Rb(b, "set2"); + return new Px(a, b); + } + function QUb(a, b) { + var c; + c = zUb(a.f, b); + return P6c(V6c(c), a.f.d); + } + function Jwb(a, b) { + var c, d; + c = b; + d = new fxb(); + Lwb(a, c, d); + return d.d; + } + function NJb(a, b, c, d) { + var e; + e = new aHb(); + b.a[c.g] = e; + Npb(a.b, d, e); + } + function zid(a, b, c) { + var d; + d = a.Yg(b); + d >= 0 ? a.sh(d, c) : uid(a, b, c); + } + function hvd(a, b, c) { + evd(); + !!a && Rhb(dvd, a, b); + !!a && Rhb(cvd, a, c); + } + function g_c(a, b, c) { + this.i = new Rkb(); + this.b = a; + this.g = b; + this.a = c; + } + function VZc(a, b, c) { + this.c = new Rkb(); + this.e = a; + this.f = b; + this.b = c; + } + function b$c(a, b, c) { + this.a = new Rkb(); + this.e = a; + this.f = b; + this.c = c; + } + function Zy(a, b) { + Py(this); + this.f = b; + this.g = a; + Ry(this); + this._d(); + } + function ZA(a, b) { + var c; + c = a.q.getHours(); + a.q.setDate(b); + YA(a, c); + } + function no(a, b) { + var c; + Qb(b); + for (c = a.a; c; c = c.c) { + b.Od(c.g, c.i); + } + } + function Fx(a) { + var b; + b = new Uqb(Cv(a.length)); + nmb(b, a); + return b; + } + function ecb(a) { + function b() {} + b.prototype = a || {}; + return new b(); + } + function dkb(a, b) { + if (Zjb(a, b)) { + wkb(a); + return true; + } + return false; + } + function aC(a, b) { + if (b == null) { + throw vbb(new Geb()); + } + return bC(a, b); + } + function tdb(a) { + if (a.qe()) { + return null; + } + var b = a.n; + return _bb[b]; + } + function Mld(a) { + if (a.Db >> 16 != 3) return null; + return BD(a.Cb, 33); + } + function mpd(a) { + if (a.Db >> 16 != 9) return null; + return BD(a.Cb, 33); + } + function fmd(a) { + if (a.Db >> 16 != 6) return null; + return BD(a.Cb, 79); + } + function Ind(a) { + if (a.Db >> 16 != 7) return null; + return BD(a.Cb, 235); + } + function Fod(a) { + if (a.Db >> 16 != 7) return null; + return BD(a.Cb, 160); + } + function Xod(a) { + if (a.Db >> 16 != 11) return null; + return BD(a.Cb, 33); + } + function nid(a, b) { + var c; + c = a.Yg(b); + return c >= 0 ? a.lh(c) : tid(a, b); + } + function Dtd(a, b) { + var c; + c = new Bsb(b); + Ve(c, a); + return new Tkb(c); + } + function Uud(a) { + var b; + b = a.d; + b = a.si(a.f); + wtd(a, b); + return b.Ob(); + } + function t_b(a, b) { + a.b += b.b; + a.c += b.c; + a.d += b.d; + a.a += b.a; + return a; + } + function A4b(a, b) { + return Math.abs(a) < Math.abs(b) ? a : b; + } + function Zod(a) { + return !a.a && (a.a = new cUd(E2, a, 10, 11)), a.a.i > 0; + } + function oDb() { + this.a = new zsb(); + this.e = new Tqb(); + this.g = 0; + this.i = 0; + } + function BGc(a) { + this.a = a; + this.b = KC(SX, nie, 1944, a.e.length, 0, 2); + } + function RHc(a, b, c) { + var d; + d = SHc(a, b, c); + a.b = new BHc(d.c.length); + } + function eMc() { + eMc = ccb; + cMc = new fMc(vle, 0); + dMc = new fMc("UP", 1); + } + function STc() { + STc = ccb; + QTc = new TTc(Yqe, 0); + RTc = new TTc("FAN", 1); + } + function evd() { + evd = ccb; + dvd = new Lqb(); + cvd = new Lqb(); + ivd(hK, new jvd()); + } + function Swd(a) { + if (a.p != 0) throw vbb(new Ydb()); + return Kbb(a.f, 0); + } + function _wd(a) { + if (a.p != 0) throw vbb(new Ydb()); + return Kbb(a.k, 0); + } + function MHd(a) { + if (a.Db >> 16 != 3) return null; + return BD(a.Cb, 147); + } + function ZJd(a) { + if (a.Db >> 16 != 6) return null; + return BD(a.Cb, 235); + } + function WId(a) { + if (a.Db >> 16 != 17) return null; + return BD(a.Cb, 26); + } + function rdb(a, b) { + var c = (a.a = a.a || []); + return c[b] || (c[b] = a.le(b)); + } + function hrb(a, b) { + var c; + c = a.a.get(b); + return c == null ? new Array() : c; + } + function aB(a, b) { + var c; + c = a.q.getHours(); + a.q.setMonth(b); + YA(a, c); + } + function Shb(a, b, c) { + return b == null ? jrb(a.f, null, c) : Drb(a.g, b, c); + } + function FLd(a, b, c, d, e, f) { + return new pSd(a.e, b, a.aj(), c, d, e, f); + } + function Tfb(a, b, c) { + a.a = qfb(a.a, 0, b) + ("" + c) + pfb(a.a, b); + return a; + } + function bq(a, b, c) { + Ekb(a.a, (Vm(), Wj(b, c), new Wo(b, c))); + return a; + } + function uu(a) { + ot(a.c); + a.e = a.a = a.c; + a.c = a.c.c; + ++a.d; + return a.a.f; + } + function vu(a) { + ot(a.e); + a.c = a.a = a.e; + a.e = a.e.e; + --a.d; + return a.a.f; + } + function RZb(a, b) { + !!a.d && Lkb(a.d.e, a); + a.d = b; + !!a.d && Ekb(a.d.e, a); + } + function QZb(a, b) { + !!a.c && Lkb(a.c.g, a); + a.c = b; + !!a.c && Ekb(a.c.g, a); + } + function $_b(a, b) { + !!a.c && Lkb(a.c.a, a); + a.c = b; + !!a.c && Ekb(a.c.a, a); + } + function F0b(a, b) { + !!a.i && Lkb(a.i.j, a); + a.i = b; + !!a.i && Ekb(a.i.j, a); + } + function jDb(a, b, c) { + this.a = b; + this.c = a; + this.b = (Qb(c), new Tkb(c)); + } + function qXb(a, b, c) { + this.a = b; + this.c = a; + this.b = (Qb(c), new Tkb(c)); + } + function aOb(a, b) { + this.a = a; + this.c = R6c(this.a); + this.b = new K6c(b); + } + function IAb(a) { + var b; + Uzb(a); + b = new Tqb(); + return JAb(a, new jBb(b)); + } + function wCb(a, b) { + if (a < 0 || a > b) { + throw vbb(new qcb(Ake + a + Bke + b)); + } + } + function Ppb(a, b) { + return vqb(a.a, b) ? Qpb(a, BD(b, 22).g, null) : null; + } + function WUb(a) { + LUb(); + return Bcb(), BD(a.a, 81).d.e != 0 ? true : false; + } + function qs() { + qs = ccb; + ps = as((hs(), OC(GC(yG, 1), Kie, 538, 0, [gs]))); + } + function SBc() { + SBc = ccb; + RBc = c3c(new j3c(), (qUb(), pUb), (S8b(), J8b)); + } + function ZBc() { + ZBc = ccb; + YBc = c3c(new j3c(), (qUb(), pUb), (S8b(), J8b)); + } + function oCc() { + oCc = ccb; + nCc = c3c(new j3c(), (qUb(), pUb), (S8b(), J8b)); + } + function aJc() { + aJc = ccb; + _Ic = e3c(new j3c(), (qUb(), pUb), (S8b(), h8b)); + } + function FJc() { + FJc = ccb; + EJc = e3c(new j3c(), (qUb(), pUb), (S8b(), h8b)); + } + function ILc() { + ILc = ccb; + HLc = e3c(new j3c(), (qUb(), pUb), (S8b(), h8b)); + } + function wMc() { + wMc = ccb; + vMc = e3c(new j3c(), (qUb(), pUb), (S8b(), h8b)); + } + function fUc() { + fUc = ccb; + eUc = c3c(new j3c(), (yRc(), xRc), (qSc(), kSc)); + } + function DOc(a, b, c, d) { + this.c = a; + this.d = d; + BOc(this, b); + COc(this, c); + } + function W3c(a) { + this.c = new Psb(); + this.b = a.b; + this.d = a.c; + this.a = a.a; + } + function e7c(a) { + this.a = Math.cos(a); + this.b = Math.sin(a); + } + function BOc(a, b) { + !!a.a && Lkb(a.a.k, a); + a.a = b; + !!a.a && Ekb(a.a.k, a); + } + function COc(a, b) { + !!a.b && Lkb(a.b.f, a); + a.b = b; + !!a.b && Ekb(a.b.f, a); + } + function D1c(a, b) { + E1c(a, a.b, a.c); + BD(a.b.b, 65); + !!b && BD(b.b, 65).b; + } + function BUd(a, b) { + CUd(a, b); + JD(a.Cb, 88) && XMd($Kd(BD(a.Cb, 88)), 2); + } + function cJd(a, b) { + JD(a.Cb, 88) && XMd($Kd(BD(a.Cb, 88)), 4); + pnd(a, b); + } + function lKd(a, b) { + JD(a.Cb, 179) && (BD(a.Cb, 179).tb = null); + pnd(a, b); + } + function T2d(a, b) { + return Q6d(), YId(b) ? new R7d(b, a) : new f7d(b, a); + } + function jsd(a, b) { + var c, d; + c = b.c; + d = c != null; + d && Qpd(a, new yC(b.c)); + } + function XOd(a) { + var b, c; + c = (LFd(), (b = new UQd()), b); + NQd(c, a); + return c; + } + function eTd(a) { + var b, c; + c = (LFd(), (b = new UQd()), b); + NQd(c, a); + return c; + } + function yCc(a, b) { + var c; + c = new H1b(a); + b.c[b.c.length] = c; + return c; + } + function Aw(a, b) { + var c; + c = BD(Hv(nd(a.a), b), 14); + return !c ? 0 : c.gc(); + } + function UAb(a) { + var b; + Uzb(a); + b = (ipb(), ipb(), gpb); + return VAb(a, b); + } + function nr(a) { + var b; + while (true) { + b = a.Pb(); + if (!a.Ob()) { + return b; + } + } + } + function Ki(a, b) { + Ii.call(this, new Mqb(Cv(a))); + Xj(b, mie); + this.a = b; + } + function Jib(a, b, c) { + xCb(b, c, a.gc()); + this.c = a; + this.a = b; + this.b = c - b; + } + function Mkb(a, b, c) { + var d; + xCb(b, c, a.c.length); + d = c - b; + cCb(a.c, b, d); + } + function Fub(a, b) { + Eub(a, Tbb(xbb(Obb(b, 24), nke)), Tbb(xbb(b, nke))); + } + function tCb(a, b) { + if (a < 0 || a >= b) { + throw vbb(new qcb(Ake + a + Bke + b)); + } + } + function BCb(a, b) { + if (a < 0 || a >= b) { + throw vbb(new Xfb(Ake + a + Bke + b)); + } + } + function Kub(a, b) { + this.b = (uCb(a), a); + this.a = (b & Rje) == 0 ? b | 64 | oie : b; + } + function kkb(a) { + Vjb(this); + dCb(this.a, geb(Math.max(8, a)) << 1); + } + function A0b(a) { + return l7c(OC(GC(m1, 1), nie, 8, 0, [a.i.n, a.n, a.a])); + } + function Iyb() { + Fyb(); + return OC(GC(xL, 1), Kie, 132, 0, [Cyb, Dyb, Eyb]); + } + function jHb() { + gHb(); + return OC(GC(pN, 1), Kie, 232, 0, [dHb, eHb, fHb]); + } + function QHb() { + NHb(); + return OC(GC(sN, 1), Kie, 461, 0, [LHb, KHb, MHb]); + } + function HIb() { + EIb(); + return OC(GC(zN, 1), Kie, 462, 0, [DIb, CIb, BIb]); + } + function UXb() { + RXb(); + return OC(GC(hQ, 1), Kie, 423, 0, [QXb, PXb, OXb]); + } + function BTb() { + yTb(); + return OC(GC(oP, 1), Kie, 379, 0, [wTb, vTb, xTb]); + } + function Bzc() { + xzc(); + return OC(GC(ZW, 1), Kie, 378, 0, [uzc, vzc, wzc]); + } + function Xpc() { + Rpc(); + return OC(GC(GW, 1), Kie, 314, 0, [Ppc, Opc, Qpc]); + } + function eqc() { + bqc(); + return OC(GC(HW, 1), Kie, 337, 0, [$pc, aqc, _pc]); + } + function Jqc() { + Gqc(); + return OC(GC(KW, 1), Kie, 450, 0, [Eqc, Dqc, Fqc]); + } + function Ikc() { + Fkc(); + return OC(GC(vV, 1), Kie, 361, 0, [Ekc, Dkc, Ckc]); + } + function hsc() { + esc(); + return OC(GC(RW, 1), Kie, 303, 0, [csc, dsc, bsc]); + } + function $rc() { + Xrc(); + return OC(GC(QW, 1), Kie, 292, 0, [Vrc, Wrc, Urc]); + } + function NAc() { + KAc(); + return OC(GC(dX, 1), Kie, 452, 0, [JAc, HAc, IAc]); + } + function wAc() { + tAc(); + return OC(GC(bX, 1), Kie, 339, 0, [rAc, qAc, sAc]); + } + function WAc() { + TAc(); + return OC(GC(eX, 1), Kie, 375, 0, [QAc, RAc, SAc]); + } + function OBc() { + LBc(); + return OC(GC(jX, 1), Kie, 377, 0, [JBc, KBc, IBc]); + } + function wBc() { + tBc(); + return OC(GC(hX, 1), Kie, 336, 0, [qBc, rBc, sBc]); + } + function FBc() { + CBc(); + return OC(GC(iX, 1), Kie, 338, 0, [BBc, zBc, ABc]); + } + function uGc() { + rGc(); + return OC(GC(PX, 1), Kie, 454, 0, [oGc, pGc, qGc]); + } + function xVc() { + tVc(); + return OC(GC(O$, 1), Kie, 442, 0, [sVc, qVc, rVc]); + } + function tWc() { + pWc(); + return OC(GC(Y$, 1), Kie, 380, 0, [mWc, nWc, oWc]); + } + function CYc() { + zYc(); + return OC(GC(q_, 1), Kie, 381, 0, [xYc, yYc, wYc]); + } + function wXc() { + sXc(); + return OC(GC(b_, 1), Kie, 293, 0, [qXc, rXc, pXc]); + } + function _$c() { + Y$c(); + return OC(GC(J_, 1), Kie, 437, 0, [V$c, W$c, X$c]); + } + function kbd() { + hbd(); + return OC(GC(z1, 1), Kie, 334, 0, [fbd, ebd, gbd]); + } + function tad() { + qad(); + return OC(GC(u1, 1), Kie, 272, 0, [nad, oad, pad]); + } + function o3d(a, b) { + return p3d(a, b, JD(b, 99) && (BD(b, 18).Bb & Tje) != 0); + } + function LZc(a, b, c) { + var d; + d = MZc(a, b, false); + return d.b <= b && d.a <= c; + } + function tMc(a, b, c) { + var d; + d = new sMc(); + d.b = b; + d.a = c; + ++b.b; + Ekb(a.d, d); + } + function fs(a, b) { + var c; + c = (uCb(a), a).g; + lCb(!!c); + uCb(b); + return c(b); + } + function av(a, b) { + var c, d; + d = cv(a, b); + c = a.a.Zc(d); + return new qv(a, c); + } + function cKd(a) { + if (a.Db >> 16 != 6) return null; + return BD(aid(a), 235); + } + function Uwd(a) { + if (a.p != 2) throw vbb(new Ydb()); + return Tbb(a.f) & aje; + } + function bxd(a) { + if (a.p != 2) throw vbb(new Ydb()); + return Tbb(a.k) & aje; + } + function Z1d(a) { + a.a == (T0d(), S0d) && d2d(a, U0d(a.g, a.b)); + return a.a; + } + function _1d(a) { + a.d == (T0d(), S0d) && f2d(a, Y0d(a.g, a.b)); + return a.d; + } + function mlb(a) { + sCb(a.a < a.c.c.length); + a.b = a.a++; + return a.c.c[a.b]; + } + function hEb(a, b) { + a.b = a.b | b.b; + a.c = a.c | b.c; + a.d = a.d | b.d; + a.a = a.a | b.a; + } + function xbb(a, b) { + return zbb(dD(Fbb(a) ? Rbb(a) : a, Fbb(b) ? Rbb(b) : b)); + } + function Mbb(a, b) { + return zbb(jD(Fbb(a) ? Rbb(a) : a, Fbb(b) ? Rbb(b) : b)); + } + function Vbb(a, b) { + return zbb(rD(Fbb(a) ? Rbb(a) : a, Fbb(b) ? Rbb(b) : b)); + } + function Dub(a) { + return wbb(Nbb(Cbb(Cub(a, 32)), 32), Cbb(Cub(a, 32))); + } + function Mu(a) { + Qb(a); + return JD(a, 14) ? new Tkb(BD(a, 14)) : Nu(a.Kc()); + } + function EWb(a, b) { + AWb(); + return a.c == b.c ? Kdb(b.d, a.d) : Kdb(a.c, b.c); + } + function FWb(a, b) { + AWb(); + return a.c == b.c ? Kdb(a.d, b.d) : Kdb(a.c, b.c); + } + function HWb(a, b) { + AWb(); + return a.c == b.c ? Kdb(a.d, b.d) : Kdb(b.c, a.c); + } + function GWb(a, b) { + AWb(); + return a.c == b.c ? Kdb(b.d, a.d) : Kdb(b.c, a.c); + } + function WGb(a, b) { + var c; + c = Edb(ED(a.a.We((Y9c(), Q9c)))); + XGb(a, b, c); + } + function Rgc(a, b) { + var c; + c = BD(Ohb(a.g, b), 57); + Hkb(b.d, new Qhc(a, c)); + } + function GYb(a, b) { + var c, d; + c = d_b(a); + d = d_b(b); + return c < d ? -1 : c > d ? 1 : 0; + } + function bjc(a, b) { + var c, d; + c = ajc(b); + d = c; + return BD(Ohb(a.c, d), 19).a; + } + function iSc(a, b) { + var c; + c = a + ""; + while (c.length < b) { + c = "0" + c; + } + return c; + } + function WRc(a) { + return a.c == null || a.c.length == 0 ? "n_" + a.g : "n_" + a.c; + } + function oRb(a) { + return a.c == null || a.c.length == 0 ? "n_" + a.b : "n_" + a.c; + } + function qz(a, b) { + return !!a && !!a.equals ? a.equals(b) : PD(a) === PD(b); + } + function dkd(a, b) { + if (b == 0) { + return !!a.o && a.o.f != 0; + } + return mid(a, b); + } + function Tdd(a, b, c) { + var d; + if (a.n && !!b && !!c) { + d = new kgd(); + Ekb(a.e, d); + } + } + function cIc(a, b, c) { + var d; + d = a.d[b.p]; + a.d[b.p] = a.d[c.p]; + a.d[c.p] = d; + } + function kxd(a, b, c) { + this.d = a; + this.j = b; + this.e = c; + this.o = -1; + this.p = 3; + } + function lxd(a, b, c) { + this.d = a; + this.k = b; + this.f = c; + this.o = -1; + this.p = 5; + } + function zge(a, b, c) { + xfe.call(this, 25); + this.b = a; + this.a = b; + this.c = c; + } + function $fe(a) { + wfe(); + xfe.call(this, a); + this.c = false; + this.a = false; + } + function sSd(a, b, c, d, e, f) { + rSd.call(this, a, b, c, d, e); + f && (this.o = -2); + } + function uSd(a, b, c, d, e, f) { + tSd.call(this, a, b, c, d, e); + f && (this.o = -2); + } + function wSd(a, b, c, d, e, f) { + vSd.call(this, a, b, c, d, e); + f && (this.o = -2); + } + function ySd(a, b, c, d, e, f) { + xSd.call(this, a, b, c, d, e); + f && (this.o = -2); + } + function ASd(a, b, c, d, e, f) { + zSd.call(this, a, b, c, d, e); + f && (this.o = -2); + } + function CSd(a, b, c, d, e, f) { + BSd.call(this, a, b, c, d, e); + f && (this.o = -2); + } + function HSd(a, b, c, d, e, f) { + GSd.call(this, a, b, c, d, e); + f && (this.o = -2); + } + function JSd(a, b, c, d, e, f) { + ISd.call(this, a, b, c, d, e); + f && (this.o = -2); + } + function nWd(a, b, c, d) { + VVd.call(this, c); + this.b = a; + this.c = b; + this.d = d; + } + function x$c(a, b) { + this.a = new Rkb(); + this.d = new Rkb(); + this.f = a; + this.c = b; + } + function PTb() { + this.c = new bUb(); + this.a = new FYb(); + this.b = new wZb(); + $Yb(); + } + function b2c() { + Y1c(); + this.b = new Lqb(); + this.a = new Lqb(); + this.c = new Rkb(); + } + function j2d(a, b) { + this.g = a; + this.d = (T0d(), S0d); + this.a = S0d; + this.b = b; + } + function O1d(a, b) { + this.f = a; + this.a = (T0d(), R0d); + this.c = R0d; + this.b = b; + } + function h9d(a, b) { + !a.c && (a.c = new u3d(a, 0)); + f3d(a.c, (Q8d(), I8d), b); + } + function $Tc() { + $Tc = ccb; + ZTc = new _Tc("DFS", 0); + YTc = new _Tc("BFS", 1); + } + function Cc(a, b, c) { + var d; + d = BD(a.Zb().xc(b), 14); + return !!d && d.Hc(c); + } + function Gc(a, b, c) { + var d; + d = BD(a.Zb().xc(b), 14); + return !!d && d.Mc(c); + } + function Ofb(a, b, c, d) { + a.a += "" + qfb(b == null ? Xhe : fcb(b), c, d); + return a; + } + function Xnd(a, b, c, d, e, f) { + Ynd(a, b, c, f); + eLd(a, d); + fLd(a, e); + return a; + } + function Ysb(a) { + sCb(a.b.b != a.d.a); + a.c = a.b = a.b.b; + --a.a; + return a.c.c; + } + function Jgb(a) { + while (a.d > 0 && a.a[--a.d] == 0); + a.a[a.d++] == 0 && (a.e = 0); + } + function wwb(a) { + return !a.a ? a.c : a.e.length == 0 ? a.a.a : a.a.a + ("" + a.e); + } + function RSd(a) { + return !!a.a && QSd(a.a.a).i != 0 && !(!!a.b && QTd(a.b)); + } + function cLd(a) { + return !!a.u && VKd(a.u.a).i != 0 && !(!!a.n && FMd(a.n)); + } + function $i(a) { + return Zj(a.e.Hd().gc() * a.c.Hd().gc(), 16, new ij(a)); + } + function XA(a, b) { + return ueb(Cbb(a.q.getTime()), Cbb(b.q.getTime())); + } + function k_b(a) { + return BD(Qkb(a, KC(AQ, jne, 17, a.c.length, 0, 1)), 474); + } + function l_b(a) { + return BD(Qkb(a, KC(OQ, kne, 10, a.c.length, 0, 1)), 193); + } + function cKc(a) { + FJc(); + return !OZb(a) && !(!OZb(a) && a.c.i.c == a.d.i.c); + } + function kDb(a, b, c) { + var d; + d = (Qb(a), new Tkb(a)); + iDb(new jDb(d, b, c)); + } + function rXb(a, b, c) { + var d; + d = (Qb(a), new Tkb(a)); + pXb(new qXb(d, b, c)); + } + function Nwb(a, b) { + var c; + c = 1 - b; + a.a[c] = Owb(a.a[c], c); + return Owb(a, b); + } + function YXc(a, b) { + var c; + a.e = new QXc(); + c = gVc(b); + Okb(c, a.c); + ZXc(a, c, 0); + } + function o4c(a, b, c, d) { + var e; + e = new w4c(); + e.a = b; + e.b = c; + e.c = d; + Dsb(a.a, e); + } + function p4c(a, b, c, d) { + var e; + e = new w4c(); + e.a = b; + e.b = c; + e.c = d; + Dsb(a.b, e); + } + function i6d(a) { + var b, c, d; + b = new A6d(); + c = s6d(b, a); + z6d(b); + d = c; + return d; + } + function vZd() { + var a, b, c; + b = ((c = ((a = new UQd()), a)), c); + Ekb(rZd, b); + return b; + } + function H2c(a) { + a.j.c = KC(SI, Uhe, 1, 0, 5, 1); + Ae(a.c); + h3c(a.a); + return a; + } + function tgc(a) { + qgc(); + if (JD(a.g, 10)) { + return BD(a.g, 10); + } + return null; + } + function Zw(a) { + if (Ah(a).dc()) { + return false; + } + Bh(a, new bx()); + return true; + } + function _y(b) { + if (!("stack" in b)) { + try { + throw b; + } catch (a) {} + } + return b; + } + function Pb(a, b) { + if (a < 0 || a >= b) { + throw vbb(new qcb(Ib(a, b))); + } + return a; + } + function Tb(a, b, c) { + if (a < 0 || b < a || b > c) { + throw vbb(new qcb(Kb(a, b, c))); + } + } + function eVb(a, b) { + Qqb(a.a, b); + if (b.d) { + throw vbb(new hz(Hke)); + } + b.d = a; + } + function xpb(a, b) { + if (b.$modCount != a.$modCount) { + throw vbb(new Apb()); + } + } + function $pb(a, b) { + if (JD(b, 42)) { + return Jd(a.a, BD(b, 42)); + } + return false; + } + function dib(a, b) { + if (JD(b, 42)) { + return Jd(a.a, BD(b, 42)); + } + return false; + } + function msb(a, b) { + if (JD(b, 42)) { + return Jd(a.a, BD(b, 42)); + } + return false; + } + function qAb(a, b) { + if (a.a <= a.b) { + b.ud(a.a++); + return true; + } + return false; + } + function Sbb(a) { + var b; + if (Fbb(a)) { + b = a; + return b == -0 ? 0 : b; + } + return oD(a); + } + function tAb(a) { + var b; + Tzb(a); + b = new drb(); + _ub(a.a, new BAb(b)); + return b; + } + function Yzb(a) { + var b; + Tzb(a); + b = new Gpb(); + _ub(a.a, new mAb(b)); + return b; + } + function Bib(a, b) { + this.a = a; + vib.call(this, a); + wCb(b, a.gc()); + this.b = b; + } + function orb(a) { + this.e = a; + this.b = this.e.a.entries(); + this.a = new Array(); + } + function Oi(a) { + return Zj(a.e.Hd().gc() * a.c.Hd().gc(), 273, new cj(a)); + } + function Qu(a) { + return new Skb((Xj(a, Mie), Oy(wbb(wbb(5, a), (a / 10) | 0)))); + } + function m_b(a) { + return BD(Qkb(a, KC(aR, lne, 11, a.c.length, 0, 1)), 1943); + } + function sMb(a, b, c) { + return c.f.c.length > 0 ? HMb(a.a, b, c) : HMb(a.b, b, c); + } + function SZb(a, b, c) { + !!a.d && Lkb(a.d.e, a); + a.d = b; + !!a.d && Dkb(a.d.e, c, a); + } + function a5b(a, b) { + i5b(b, a); + k5b(a.d); + k5b(BD(vNb(a, (Nyc(), wxc)), 207)); + } + function _4b(a, b) { + f5b(b, a); + h5b(a.d); + h5b(BD(vNb(a, (Nyc(), wxc)), 207)); + } + function Ypd(a, b) { + var c, d; + c = aC(a, b); + d = null; + !!c && (d = c.fe()); + return d; + } + function Zpd(a, b) { + var c, d; + c = tB(a, b); + d = null; + !!c && (d = c.ie()); + return d; + } + function $pd(a, b) { + var c, d; + c = aC(a, b); + d = null; + !!c && (d = c.ie()); + return d; + } + function _pd(a, b) { + var c, d; + c = aC(a, b); + d = null; + !!c && (d = aqd(c)); + return d; + } + function Tqd(a, b, c) { + var d; + d = Wpd(c); + ro(a.g, d, b); + ro(a.i, b, c); + return b; + } + function Ez(a, b, c) { + var d; + d = Cz(); + try { + return Bz(a, b, c); + } finally { + Fz(d); + } + } + function C6d(a) { + var b; + b = a.Wg(); + this.a = JD(b, 69) ? BD(b, 69).Zh() : b.Kc(); + } + function j3c() { + D2c.call(this); + this.j.c = KC(SI, Uhe, 1, 0, 5, 1); + this.a = -1; + } + function mxd(a, b, c, d) { + this.d = a; + this.n = b; + this.g = c; + this.o = d; + this.p = -1; + } + function jk(a, b, c, d) { + this.e = d; + this.d = null; + this.c = a; + this.a = b; + this.b = c; + } + function uEc(a, b, c) { + this.d = new HEc(this); + this.e = a; + this.i = b; + this.f = c; + } + function msc() { + msc = ccb; + ksc = new nsc(gle, 0); + lsc = new nsc("TOP_LEFT", 1); + } + function cDc() { + cDc = ccb; + bDc = ix(meb(1), meb(4)); + aDc = ix(meb(1), meb(2)); + } + function z_c() { + z_c = ccb; + y_c = as((s_c(), OC(GC(O_, 1), Kie, 551, 0, [r_c]))); + } + function q_c() { + q_c = ccb; + p_c = as((i_c(), OC(GC(N_, 1), Kie, 482, 0, [h_c]))); + } + function Z0c() { + Z0c = ccb; + Y0c = as((R0c(), OC(GC(W_, 1), Kie, 530, 0, [Q0c]))); + } + function hPb() { + hPb = ccb; + gPb = as((cPb(), OC(GC(GO, 1), Kie, 481, 0, [bPb]))); + } + function yLb() { + vLb(); + return OC(GC(PN, 1), Kie, 406, 0, [uLb, rLb, sLb, tLb]); + } + function qxb() { + lxb(); + return OC(GC(iL, 1), Kie, 297, 0, [hxb, ixb, jxb, kxb]); + } + function UOb() { + ROb(); + return OC(GC(CO, 1), Kie, 394, 0, [OOb, NOb, POb, QOb]); + } + function UMb() { + RMb(); + return OC(GC(jO, 1), Kie, 323, 0, [OMb, NMb, PMb, QMb]); + } + function sWb() { + lWb(); + return OC(GC(SP, 1), Kie, 405, 0, [hWb, kWb, iWb, jWb]); + } + function kbc() { + gbc(); + return OC(GC(VS, 1), Kie, 360, 0, [fbc, dbc, ebc, cbc]); + } + function Vc(a, b, c, d) { + return JD(c, 54) ? new Cg(a, b, c, d) : new qg(a, b, c, d); + } + function Djc() { + Ajc(); + return OC(GC(mV, 1), Kie, 411, 0, [wjc, xjc, yjc, zjc]); + } + function okc(a) { + var b; + return a.j == (Ucd(), Rcd) && ((b = pkc(a)), uqb(b, zcd)); + } + function Mdc(a, b) { + var c; + c = b.a; + QZb(c, b.c.d); + RZb(c, b.d.d); + q7c(c.a, a.n); + } + function Smc(a, b) { + return BD(Btb(QAb(BD(Qc(a.k, b), 15).Oc(), Hmc)), 113); + } + function Tmc(a, b) { + return BD(Btb(RAb(BD(Qc(a.k, b), 15).Oc(), Hmc)), 113); + } + function _w(a) { + return new Kub(rmb(BD(a.a.dd(), 14).gc(), a.a.cd()), 16); + } + function Qq(a) { + if (JD(a, 14)) { + return BD(a, 14).dc(); + } + return !a.Kc().Ob(); + } + function ugc(a) { + qgc(); + if (JD(a.g, 145)) { + return BD(a.g, 145); + } + return null; + } + function Ko(a) { + if (a.e.g != a.b) { + throw vbb(new Apb()); + } + return !!a.c && a.d > 0; + } + function Xsb(a) { + sCb(a.b != a.d.c); + a.c = a.b; + a.b = a.b.a; + ++a.a; + return a.c.c; + } + function Xjb(a, b) { + uCb(b); + NC(a.a, a.c, b); + a.c = (a.c + 1) & (a.a.length - 1); + _jb(a); + } + function Wjb(a, b) { + uCb(b); + a.b = (a.b - 1) & (a.a.length - 1); + NC(a.a, a.b, b); + _jb(a); + } + function A2c(a, b) { + var c; + for (c = a.j.c.length; c < b; c++) { + Ekb(a.j, a.rg()); + } + } + function gBc(a, b, c, d) { + var e; + e = d[b.g][c.g]; + return Edb(ED(vNb(a.a, e))); + } + function goc(a, b, c, d, e) { + this.i = a; + this.a = b; + this.e = c; + this.j = d; + this.f = e; + } + function DZc(a, b, c, d, e) { + this.a = a; + this.e = b; + this.f = c; + this.b = d; + this.g = e; + } + function Fz(a) { + a && Mz((Kz(), Jz)); + --xz; + if (a) { + if (zz != -1) { + Hz(zz); + zz = -1; + } + } + } + function Nzc() { + Izc(); + return OC(GC($W, 1), Kie, 197, 0, [Gzc, Hzc, Fzc, Ezc]); + } + function ERc() { + yRc(); + return OC(GC(h$, 1), Kie, 393, 0, [uRc, vRc, wRc, xRc]); + } + function mXc() { + iXc(); + return OC(GC(a_, 1), Kie, 340, 0, [hXc, fXc, gXc, eXc]); + } + function wdd() { + tdd(); + return OC(GC(I1, 1), Kie, 374, 0, [rdd, sdd, qdd, pdd]); + } + function vbd() { + rbd(); + return OC(GC(A1, 1), Kie, 285, 0, [qbd, nbd, obd, pbd]); + } + function Dad() { + Aad(); + return OC(GC(v1, 1), Kie, 218, 0, [zad, xad, wad, yad]); + } + function Ged() { + Ded(); + return OC(GC(O1, 1), Kie, 311, 0, [Ced, zed, Bed, Aed]); + } + function sgd() { + pgd(); + return OC(GC(k2, 1), Kie, 396, 0, [mgd, ngd, lgd, ogd]); + } + function gvd(a) { + evd(); + return Mhb(dvd, a) ? BD(Ohb(dvd, a), 331).ug() : null; + } + function cid(a, b, c) { + return b < 0 ? tid(a, c) : BD(c, 66).Nj().Sj(a, a.yh(), b); + } + function Sqd(a, b, c) { + var d; + d = Wpd(c); + ro(a.d, d, b); + Rhb(a.e, b, c); + return b; + } + function Uqd(a, b, c) { + var d; + d = Wpd(c); + ro(a.j, d, b); + Rhb(a.k, b, c); + return b; + } + function dtd(a) { + var b, c; + b = (Fhd(), (c = new Tld()), c); + !!a && Rld(b, a); + return b; + } + function wud(a) { + var b; + b = a.ri(a.i); + a.i > 0 && $fb(a.g, 0, b, 0, a.i); + return b; + } + function qEd(a, b) { + pEd(); + var c; + c = BD(Ohb(oEd, a), 55); + return !c || c.wj(b); + } + function Twd(a) { + if (a.p != 1) throw vbb(new Ydb()); + return (Tbb(a.f) << 24) >> 24; + } + function axd(a) { + if (a.p != 1) throw vbb(new Ydb()); + return (Tbb(a.k) << 24) >> 24; + } + function gxd(a) { + if (a.p != 7) throw vbb(new Ydb()); + return (Tbb(a.k) << 16) >> 16; + } + function Zwd(a) { + if (a.p != 7) throw vbb(new Ydb()); + return (Tbb(a.f) << 16) >> 16; + } + function sr(a) { + var b; + b = 0; + while (a.Ob()) { + a.Pb(); + b = wbb(b, 1); + } + return Oy(b); + } + function nx(a, b) { + var c; + c = new Vfb(); + a.xd(c); + c.a += ".."; + b.yd(c); + return c.a; + } + function Sgc(a, b, c) { + var d; + d = BD(Ohb(a.g, c), 57); + Ekb(a.a.c, new vgd(b, d)); + } + function VCb(a, b, c) { + return Ddb(ED(Wd(irb(a.f, b))), ED(Wd(irb(a.f, c)))); + } + function E2d(a, b, c) { + return F2d(a, b, c, JD(b, 99) && (BD(b, 18).Bb & Tje) != 0); + } + function L2d(a, b, c) { + return M2d(a, b, c, JD(b, 99) && (BD(b, 18).Bb & Tje) != 0); + } + function q3d(a, b, c) { + return r3d(a, b, c, JD(b, 99) && (BD(b, 18).Bb & Tje) != 0); + } + function JJc(a, b) { + return a == (j0b(), h0b) && b == h0b ? 4 : a == h0b || b == h0b ? 8 : 32; + } + function Nd(a, b) { + return PD(b) === PD(a) ? "(this Map)" : b == null ? Xhe : fcb(b); + } + function kFd(a, b) { + return BD(b == null ? Wd(irb(a.f, null)) : Crb(a.g, b), 281); + } + function Rqd(a, b, c) { + var d; + d = Wpd(c); + Rhb(a.b, d, b); + Rhb(a.c, b, c); + return b; + } + function Bfd(a, b) { + var c; + c = b; + while (c) { + O6c(a, c.i, c.j); + c = Xod(c); + } + return a; + } + function kt(a, b) { + var c; + c = vmb(Nu(new wu(a, b))); + ir(new wu(a, b)); + return c; + } + function R6d(a, b) { + Q6d(); + var c; + c = BD(a, 66).Mj(); + kVd(c, b); + return c.Ok(b); + } + function TOc(a, b, c, d, e) { + var f; + f = OOc(e, c, d); + Ekb(b, tOc(e, f)); + XOc(a, e, b); + } + function mic(a, b, c) { + a.i = 0; + a.e = 0; + if (b == c) { + return; + } + lic(a, b, c); + kic(a, b, c); + } + function dB(a, b) { + var c; + c = a.q.getHours(); + a.q.setFullYear(b + nje); + YA(a, c); + } + function dC(d, a, b) { + if (b) { + var c = b.ee(); + d.a[a] = c(b); + } else { + delete d.a[a]; + } + } + function vB(d, a, b) { + if (b) { + var c = b.ee(); + b = c(b); + } else { + b = undefined; + } + d.a[a] = b; + } + function pCb(a) { + if (a < 0) { + throw vbb(new Feb("Negative array size: " + a)); + } + } + function VKd(a) { + if (!a.n) { + $Kd(a); + a.n = new JMd(a, j5, a); + _Kd(a); + } + return a.n; + } + function Fqb(a) { + sCb(a.a < a.c.a.length); + a.b = a.a; + Dqb(a); + return a.c.b[a.b]; + } + function Yjb(a) { + if (a.b == a.c) { + return; + } + a.a = KC(SI, Uhe, 1, 8, 5, 1); + a.b = 0; + a.c = 0; + } + function AQb(a) { + this.b = new Lqb(); + this.c = new Lqb(); + this.d = new Lqb(); + this.a = a; + } + function lge(a, b) { + wfe(); + xfe.call(this, a); + this.a = b; + this.c = -1; + this.b = -1; + } + function lSd(a, b, c, d) { + kxd.call(this, 1, c, d); + jSd(this); + this.c = a; + this.b = b; + } + function mSd(a, b, c, d) { + lxd.call(this, 1, c, d); + jSd(this); + this.c = a; + this.b = b; + } + function O7d(a, b, c, d, e, f, g) { + nxd.call(this, b, d, e, f, g); + this.c = a; + this.a = c; + } + function LVd(a, b, c) { + this.e = a; + this.a = SI; + this.b = R5d(b); + this.c = b; + this.d = c; + } + function Lo(a) { + this.e = a; + this.c = this.e.a; + this.b = this.e.g; + this.d = this.e.i; + } + function nYd(a) { + this.c = a; + this.a = BD(wId(a), 148); + this.b = this.a.Aj().Nh(); + } + function Irb(a) { + this.d = a; + this.b = this.d.a.entries(); + this.a = this.b.next(); + } + function $rb() { + Lqb.call(this); + Trb(this); + this.d.b = this.d; + this.d.a = this.d; + } + function mRb(a, b) { + _Qb.call(this); + this.a = a; + this.b = b; + Ekb(this.a.b, this); + } + function uFd(a, b) { + var c; + return (c = b != null ? Phb(a, b) : Wd(irb(a.f, b))), RD(c); + } + function FFd(a, b) { + var c; + return (c = b != null ? Phb(a, b) : Wd(irb(a.f, b))), RD(c); + } + function Fob(a, b) { + var c; + for (c = 0; c < b; ++c) { + NC(a, c, new Rob(BD(a[c], 42))); + } + } + function Lgb(a, b) { + var c; + for (c = a.d - 1; c >= 0 && a.a[c] === b[c]; c--); + return c < 0; + } + function Ucc(a, b) { + Occ(); + var c; + c = a.j.g - b.j.g; + if (c != 0) { + return c; + } + return 0; + } + function Dtb(a, b) { + uCb(b); + if (a.a != null) { + return Itb(b.Kb(a.a)); + } + return ztb; + } + function Gx(a) { + var b; + if (a) { + return new Bsb(a); + } + b = new zsb(); + Jq(b, a); + return b; + } + function GAb(a, b) { + var c; + return b.b.Kb(SAb(a, b.c.Ee(), ((c = new TBb(b)), c))); + } + function Hub(a) { + zub(); + Eub(this, Tbb(xbb(Obb(a, 24), nke)), Tbb(xbb(a, nke))); + } + function REb() { + REb = ccb; + QEb = as((MEb(), OC(GC(aN, 1), Kie, 428, 0, [LEb, KEb]))); + } + function ZEb() { + ZEb = ccb; + YEb = as((UEb(), OC(GC(bN, 1), Kie, 427, 0, [SEb, TEb]))); + } + function aSb() { + aSb = ccb; + _Rb = as((XRb(), OC(GC(gP, 1), Kie, 424, 0, [VRb, WRb]))); + } + function D5b() { + D5b = ccb; + C5b = as((y5b(), OC(GC(ZR, 1), Kie, 511, 0, [x5b, w5b]))); + } + function Cqc() { + Cqc = ccb; + Bqc = as((xqc(), OC(GC(JW, 1), Kie, 419, 0, [vqc, wqc]))); + } + function erc() { + erc = ccb; + drc = as((_qc(), OC(GC(MW, 1), Kie, 479, 0, [$qc, Zqc]))); + } + function eBc() { + eBc = ccb; + dBc = as((_Ac(), OC(GC(fX, 1), Kie, 376, 0, [$Ac, ZAc]))); + } + function GAc() { + GAc = ccb; + FAc = as((BAc(), OC(GC(cX, 1), Kie, 421, 0, [zAc, AAc]))); + } + function Npc() { + Npc = ccb; + Mpc = as((Ipc(), OC(GC(FW, 1), Kie, 422, 0, [Gpc, Hpc]))); + } + function rsc() { + rsc = ccb; + qsc = as((msc(), OC(GC(SW, 1), Kie, 420, 0, [ksc, lsc]))); + } + function MOc() { + MOc = ccb; + LOc = as((HOc(), OC(GC(DZ, 1), Kie, 520, 0, [GOc, FOc]))); + } + function ZIc() { + ZIc = ccb; + YIc = as((UIc(), OC(GC(mY, 1), Kie, 523, 0, [TIc, SIc]))); + } + function bMc() { + bMc = ccb; + aMc = as((YLc(), OC(GC(fZ, 1), Kie, 516, 0, [XLc, WLc]))); + } + function jMc() { + jMc = ccb; + iMc = as((eMc(), OC(GC(gZ, 1), Kie, 515, 0, [cMc, dMc]))); + } + function KQc() { + KQc = ccb; + JQc = as((FQc(), OC(GC(YZ, 1), Kie, 455, 0, [DQc, EQc]))); + } + function dUc() { + dUc = ccb; + cUc = as(($Tc(), OC(GC(F$, 1), Kie, 425, 0, [ZTc, YTc]))); + } + function XUc() { + XUc = ccb; + WUc = as((PUc(), OC(GC(K$, 1), Kie, 495, 0, [NUc, OUc]))); + } + function XTc() { + XTc = ccb; + WTc = as((STc(), OC(GC(E$, 1), Kie, 480, 0, [QTc, RTc]))); + } + function lWc() { + lWc = ccb; + kWc = as((fWc(), OC(GC(X$, 1), Kie, 426, 0, [dWc, eWc]))); + } + function i1c() { + i1c = ccb; + h1c = as((a1c(), OC(GC(X_, 1), Kie, 429, 0, [_0c, $0c]))); + } + function H_c() { + H_c = ccb; + G_c = as((C_c(), OC(GC(P_, 1), Kie, 430, 0, [B_c, A_c]))); + } + function UIc() { + UIc = ccb; + TIc = new VIc("UPPER", 0); + SIc = new VIc("LOWER", 1); + } + function Lqd(a, b) { + var c; + c = new eC(); + Spd(c, "x", b.a); + Spd(c, "y", b.b); + Qpd(a, c); + } + function Oqd(a, b) { + var c; + c = new eC(); + Spd(c, "x", b.a); + Spd(c, "y", b.b); + Qpd(a, c); + } + function Jic(a, b) { + var c, d; + d = false; + do { + c = Mic(a, b); + d = d | c; + } while (c); + return d; + } + function zHc(a, b) { + var c, d; + c = b; + d = 0; + while (c > 0) { + d += a.a[c]; + c -= c & -c; + } + return d; + } + function Cfd(a, b) { + var c; + c = b; + while (c) { + O6c(a, -c.i, -c.j); + c = Xod(c); + } + return a; + } + function reb(a, b) { + var c, d; + uCb(b); + for (d = a.Kc(); d.Ob(); ) { + c = d.Pb(); + b.td(c); + } + } + function me(a, b) { + var c; + c = b.cd(); + return new Wo(c, a.e.pc(c, BD(b.dd(), 14))); + } + function Gsb(a, b, c, d) { + var e; + e = new jtb(); + e.c = b; + e.b = c; + e.a = d; + d.b = c.a = e; + ++a.b; + } + function Nkb(a, b, c) { + var d; + d = (tCb(b, a.c.length), a.c[b]); + a.c[b] = c; + return d; + } + function lFd(a, b, c) { + return BD(b == null ? jrb(a.f, null, c) : Drb(a.g, b, c), 281); + } + function fRb(a) { + return !!a.c && !!a.d ? oRb(a.c) + "->" + oRb(a.d) : "e_" + FCb(a); + } + function FAb(a, b) { + return (Uzb(a), WAb(new YAb(a, new qBb(b, a.a)))).sd(DAb); + } + function tUb() { + qUb(); + return OC(GC(zP, 1), Kie, 356, 0, [lUb, mUb, nUb, oUb, pUb]); + } + function _cd() { + Ucd(); + return OC(GC(F1, 1), bne, 61, 0, [Scd, Acd, zcd, Rcd, Tcd]); + } + function Dz(b) { + Az(); + return function () { + return Ez(b, this, arguments); + var a; + }; + } + function sz() { + if (Date.now) { + return Date.now(); + } + return new Date().getTime(); + } + function OZb(a) { + if (!a.c || !a.d) { + return false; + } + return !!a.c.i && a.c.i == a.d.i; + } + function pv(a) { + if (!a.c.Sb()) { + throw vbb(new utb()); + } + a.a = true; + return a.c.Ub(); + } + function ko(a) { + a.i = 0; + Alb(a.b, null); + Alb(a.c, null); + a.a = null; + a.e = null; + ++a.g; + } + function ycb(a) { + wcb.call(this, a == null ? Xhe : fcb(a), JD(a, 78) ? BD(a, 78) : null); + } + function PYb(a) { + MYb(); + yXb(this); + this.a = new Psb(); + NYb(this, a); + Dsb(this.a, a); + } + function jYb() { + Ckb(this); + this.b = new f7c(Pje, Pje); + this.a = new f7c(Qje, Qje); + } + function rAb(a, b) { + this.c = 0; + this.b = b; + jvb.call(this, a, 17493); + this.a = this.c; + } + function wyb(a) { + oyb(); + if (lyb) { + return; + } + this.c = a; + this.e = true; + this.a = new Rkb(); + } + function oyb() { + oyb = ccb; + lyb = true; + jyb = false; + kyb = false; + nyb = false; + myb = false; + } + function C3c(a, b) { + if (JD(b, 149)) { + return dfb(a.c, BD(b, 149).c); + } + return false; + } + function zUc(a, b) { + var c; + c = 0; + !!a && (c += a.f.a / 2); + !!b && (c += b.f.a / 2); + return c; + } + function j4c(a, b) { + var c; + c = BD(Wrb(a.d, b), 23); + return c ? c : BD(Wrb(a.e, b), 23); + } + function Lzd(a) { + this.b = a; + Fyd.call(this, a); + this.a = BD(Ajd(this.b.a, 4), 126); + } + function Uzd(a) { + this.b = a; + $yd.call(this, a); + this.a = BD(Ajd(this.b.a, 4), 126); + } + function $Kd(a) { + if (!a.t) { + a.t = new YMd(a); + vtd(new c0d(a), 0, a.t); + } + return a.t; + } + function kad() { + ead(); + return OC(GC(t1, 1), Kie, 103, 0, [cad, bad, aad, _9c, dad]); + } + function Wbd() { + Tbd(); + return OC(GC(C1, 1), Kie, 249, 0, [Qbd, Sbd, Obd, Pbd, Rbd]); + } + function Q5c() { + N5c(); + return OC(GC(e1, 1), Kie, 175, 0, [L5c, K5c, I5c, M5c, J5c]); + } + function Q_c() { + N_c(); + return OC(GC(Q_, 1), Kie, 316, 0, [I_c, J_c, M_c, K_c, L_c]); + } + function _zc() { + Vzc(); + return OC(GC(_W, 1), Kie, 315, 0, [Uzc, Rzc, Szc, Qzc, Tzc]); + } + function sqc() { + mqc(); + return OC(GC(IW, 1), Kie, 335, 0, [iqc, hqc, kqc, lqc, jqc]); + } + function n$c() { + k$c(); + return OC(GC(y_, 1), Kie, 355, 0, [g$c, f$c, i$c, h$c, j$c]); + } + function _jc() { + Xjc(); + return OC(GC(uV, 1), Kie, 363, 0, [Tjc, Vjc, Wjc, Ujc, Sjc]); + } + function Ftc() { + Ctc(); + return OC(GC(TW, 1), Kie, 163, 0, [Btc, xtc, ytc, ztc, Atc]); + } + function T0d() { + T0d = ccb; + var a, b; + R0d = (LFd(), (b = new MPd()), b); + S0d = ((a = new OJd()), a); + } + function yUd(a) { + var b; + if (!a.c) { + b = a.r; + JD(b, 88) && (a.c = BD(b, 26)); + } + return a.c; + } + function zc(a) { + a.e = 3; + a.d = a.Yb(); + if (a.e != 2) { + a.e = 0; + return true; + } + return false; + } + function RC(a) { + var b, c, d; + b = a & Eje; + c = (a >> 22) & Eje; + d = a < 0 ? Fje : 0; + return TC(b, c, d); + } + function uy(a) { + var b, c, d, e; + for (c = a, d = 0, e = c.length; d < e; ++d) { + b = c[d]; + Qzb(b); + } + } + function Tc(a, b) { + var c, d; + c = BD(Iv(a.c, b), 14); + if (c) { + d = c.gc(); + c.$b(); + a.d -= d; + } + } + function tjb(a, b) { + var c, d; + c = b.cd(); + d = Awb(a, c); + return !!d && wtb(d.e, b.dd()); + } + function Qgb(a, b) { + if (b == 0 || a.e == 0) { + return a; + } + return b > 0 ? ihb(a, b) : lhb(a, -b); + } + function Rgb(a, b) { + if (b == 0 || a.e == 0) { + return a; + } + return b > 0 ? lhb(a, b) : ihb(a, -b); + } + function Rr(a) { + if (Qr(a)) { + a.c = a.a; + return a.a.Pb(); + } else { + throw vbb(new utb()); + } + } + function Yac(a) { + var b, c; + b = a.c.i; + c = a.d.i; + return b.k == (j0b(), e0b) && c.k == e0b; + } + function kZb(a) { + var b; + b = new UZb(); + tNb(b, a); + yNb(b, (Nyc(), jxc), null); + return b; + } + function hid(a, b, c) { + var d; + return (d = a.Yg(b)), d >= 0 ? a._g(d, c, true) : sid(a, b, c); + } + function uHb(a, b, c, d) { + var e; + for (e = 0; e < rHb; e++) { + nHb(a.a[b.g][e], c, d[b.g]); + } + } + function vHb(a, b, c, d) { + var e; + for (e = 0; e < sHb; e++) { + mHb(a.a[e][b.g], c, d[b.g]); + } + } + function vSd(a, b, c, d, e) { + kxd.call(this, b, d, e); + jSd(this); + this.c = a; + this.a = c; + } + function zSd(a, b, c, d, e) { + lxd.call(this, b, d, e); + jSd(this); + this.c = a; + this.a = c; + } + function ISd(a, b, c, d, e) { + oxd.call(this, b, d, e); + jSd(this); + this.c = a; + this.a = c; + } + function qSd(a, b, c, d, e) { + oxd.call(this, b, d, e); + jSd(this); + this.c = a; + this.b = c; + } + function mWd(a, b, c) { + VVd.call(this, c); + this.b = a; + this.c = b; + this.d = (CWd(), AWd); + } + function oxd(a, b, c) { + this.d = a; + this.k = b ? 1 : 0; + this.f = c ? 1 : 0; + this.o = -1; + this.p = 0; + } + function _6d(a, b, c) { + var d; + d = new a7d(a.a); + Ld(d, a.a.a); + jrb(d.f, b, c); + a.a.a = d; + } + function lud(a, b) { + a.qi(a.i + 1); + mud(a, a.i, a.oi(a.i, b)); + a.bi(a.i++, b); + a.ci(); + } + function oud(a) { + var b, c; + ++a.j; + b = a.g; + c = a.i; + a.g = null; + a.i = 0; + a.di(c, b); + a.ci(); + } + function Ou(a) { + var b, c; + Qb(a); + b = Iu(a.length); + c = new Skb(b); + nmb(c, a); + return c; + } + function km(a) { + var b; + b = (Qb(a), a ? new Tkb(a) : Nu(a.Kc())); + smb(b); + return Dm(b); + } + function Kkb(a, b) { + var c; + c = (tCb(b, a.c.length), a.c[b]); + cCb(a.c, b, 1); + return c; + } + function Qc(a, b) { + var c; + c = BD(a.c.xc(b), 14); + !c && (c = a.ic(b)); + return a.pc(b, c); + } + function cfb(a, b) { + var c, d; + c = (uCb(a), a); + d = (uCb(b), b); + return c == d ? 0 : c < d ? -1 : 1; + } + function Fpb(a) { + var b; + b = a.e + a.f; + if (isNaN(b) && Ldb(a.d)) { + return a.d; + } + return b; + } + function uwb(a, b) { + !a.a ? (a.a = new Wfb(a.d)) : Qfb(a.a, a.b); + Nfb(a.a, b); + return a; + } + function Sb(a, b) { + if (a < 0 || a > b) { + throw vbb(new qcb(Jb(a, b, "index"))); + } + return a; + } + function zhb(a, b, c, d) { + var e; + e = KC(WD, oje, 25, b, 15, 1); + Ahb(e, a, b, c, d); + return e; + } + function _A(a, b) { + var c; + c = a.q.getHours() + ((b / 60) | 0); + a.q.setMinutes(b); + YA(a, c); + } + function A$c(a, b) { + return Math.min(S6c(b.a, a.d.d.c), S6c(b.b, a.d.d.c)); + } + function Thb(a, b) { + return ND(b) ? (b == null ? krb(a.f, null) : Erb(a.g, b)) : krb(a.f, b); + } + function b1b(a) { + this.c = a; + this.a = new olb(this.c.a); + this.b = new olb(this.c.b); + } + function kRb() { + this.e = new Rkb(); + this.c = new Rkb(); + this.d = new Rkb(); + this.b = new Rkb(); + } + function MFb() { + this.g = new PFb(); + this.b = new PFb(); + this.a = new Rkb(); + this.k = new Rkb(); + } + function Gjc(a, b, c) { + this.a = a; + this.c = b; + this.d = c; + Ekb(b.e, this); + Ekb(c.b, this); + } + function wBb(a, b) { + fvb.call(this, b.rd(), b.qd() & -6); + uCb(a); + this.a = a; + this.b = b; + } + function CBb(a, b) { + jvb.call(this, b.rd(), b.qd() & -6); + uCb(a); + this.a = a; + this.b = b; + } + function IBb(a, b) { + nvb.call(this, b.rd(), b.qd() & -6); + uCb(a); + this.a = a; + this.b = b; + } + function BQc(a, b, c) { + this.a = a; + this.b = b; + this.c = c; + Ekb(a.t, this); + Ekb(b.i, this); + } + function SRc() { + this.b = new Psb(); + this.a = new Psb(); + this.b = new Psb(); + this.a = new Psb(); + } + function g6c() { + g6c = ccb; + f6c = new Lsd("org.eclipse.elk.labels.labelManager"); + } + function Vac() { + Vac = ccb; + Uac = new Msd("separateLayerConnections", (gbc(), fbc)); + } + function HOc() { + HOc = ccb; + GOc = new IOc("REGULAR", 0); + FOc = new IOc("CRITICAL", 1); + } + function _Ac() { + _Ac = ccb; + $Ac = new aBc("STACKED", 0); + ZAc = new aBc("SEQUENCED", 1); + } + function C_c() { + C_c = ccb; + B_c = new D_c("FIXED", 0); + A_c = new D_c("CENTER_NODE", 1); + } + function PHc(a, b) { + var c; + c = VHc(a, b); + a.b = new BHc(c.c.length); + return OHc(a, c); + } + function KAd(a, b, c) { + var d; + ++a.e; + --a.f; + d = BD(a.d[b].$c(c), 133); + return d.dd(); + } + function JJd(a) { + var b; + if (!a.a) { + b = a.r; + JD(b, 148) && (a.a = BD(b, 148)); + } + return a.a; + } + function poc(a) { + if (a.a) { + if (a.e) { + return poc(a.e); + } + } else { + return a; + } + return null; + } + function ODc(a, b) { + if (a.p < b.p) { + return 1; + } else if (a.p > b.p) { + return -1; + } + return 0; + } + function pvb(a, b) { + uCb(b); + if (a.c < a.d) { + a.ze(b, a.c++); + return true; + } + return false; + } + function QYd(a, b) { + if (Mhb(a.a, b)) { + Thb(a.a, b); + return true; + } else { + return false; + } + } + function fd(a) { + var b, c; + b = a.cd(); + c = BD(a.dd(), 14); + return $j(c.Nc(), new ah(b)); + } + function sqb(a) { + var b; + b = BD(ZBb(a.b, a.b.length), 9); + return new xqb(a.a, b, a.c); + } + function _zb(a) { + var b; + Uzb(a); + b = new fAb(a, a.a.e, a.a.d | 4); + return new bAb(a, b); + } + function HAb(a) { + var b; + Tzb(a); + b = 0; + while (a.a.sd(new RBb())) { + b = wbb(b, 1); + } + return b; + } + function UDc(a, b, c) { + var d, e; + d = 0; + for (e = 0; e < b.length; e++) { + d += a.$f(b[e], d, c); + } + } + function QJb(a, b) { + var c; + if (a.C) { + c = BD(Mpb(a.b, b), 124).n; + c.d = a.C.d; + c.a = a.C.a; + } + } + function Mi(a, b, c) { + Pb(b, a.e.Hd().gc()); + Pb(c, a.c.Hd().gc()); + return a.a[b][c]; + } + function Ugb(a, b) { + Hgb(); + this.e = a; + this.d = 1; + this.a = OC(GC(WD, 1), oje, 25, 15, [b]); + } + function dg(a, b, c, d) { + this.f = a; + this.e = b; + this.d = c; + this.b = d; + this.c = !d ? null : d.d; + } + function o5b(a) { + var b, c, d, e; + e = a.d; + b = a.a; + c = a.b; + d = a.c; + a.d = c; + a.a = d; + a.b = e; + a.c = b; + } + function Y2d(a, b, c, d) { + X2d(a, b, c, M2d(a, b, d, JD(b, 99) && (BD(b, 18).Bb & Tje) != 0)); + } + function tac(a, b) { + Odd(b, "Label management", 1); + RD(vNb(a, (g6c(), f6c))); + Qdd(b); + } + function Skb(a) { + Ckb(this); + mCb(a >= 0, "Initial capacity must not be negative"); + } + function lHb() { + lHb = ccb; + kHb = as((gHb(), OC(GC(pN, 1), Kie, 232, 0, [dHb, eHb, fHb]))); + } + function SHb() { + SHb = ccb; + RHb = as((NHb(), OC(GC(sN, 1), Kie, 461, 0, [LHb, KHb, MHb]))); + } + function JIb() { + JIb = ccb; + IIb = as((EIb(), OC(GC(zN, 1), Kie, 462, 0, [DIb, CIb, BIb]))); + } + function Kyb() { + Kyb = ccb; + Jyb = as((Fyb(), OC(GC(xL, 1), Kie, 132, 0, [Cyb, Dyb, Eyb]))); + } + function DTb() { + DTb = ccb; + CTb = as((yTb(), OC(GC(oP, 1), Kie, 379, 0, [wTb, vTb, xTb]))); + } + function WXb() { + WXb = ccb; + VXb = as((RXb(), OC(GC(hQ, 1), Kie, 423, 0, [QXb, PXb, OXb]))); + } + function Zpc() { + Zpc = ccb; + Ypc = as((Rpc(), OC(GC(GW, 1), Kie, 314, 0, [Ppc, Opc, Qpc]))); + } + function gqc() { + gqc = ccb; + fqc = as((bqc(), OC(GC(HW, 1), Kie, 337, 0, [$pc, aqc, _pc]))); + } + function Lqc() { + Lqc = ccb; + Kqc = as((Gqc(), OC(GC(KW, 1), Kie, 450, 0, [Eqc, Dqc, Fqc]))); + } + function Kkc() { + Kkc = ccb; + Jkc = as((Fkc(), OC(GC(vV, 1), Kie, 361, 0, [Ekc, Dkc, Ckc]))); + } + function jsc() { + jsc = ccb; + isc = as((esc(), OC(GC(RW, 1), Kie, 303, 0, [csc, dsc, bsc]))); + } + function asc() { + asc = ccb; + _rc = as((Xrc(), OC(GC(QW, 1), Kie, 292, 0, [Vrc, Wrc, Urc]))); + } + function Dzc() { + Dzc = ccb; + Czc = as((xzc(), OC(GC(ZW, 1), Kie, 378, 0, [uzc, vzc, wzc]))); + } + function YAc() { + YAc = ccb; + XAc = as((TAc(), OC(GC(eX, 1), Kie, 375, 0, [QAc, RAc, SAc]))); + } + function yAc() { + yAc = ccb; + xAc = as((tAc(), OC(GC(bX, 1), Kie, 339, 0, [rAc, qAc, sAc]))); + } + function PAc() { + PAc = ccb; + OAc = as((KAc(), OC(GC(dX, 1), Kie, 452, 0, [JAc, HAc, IAc]))); + } + function QBc() { + QBc = ccb; + PBc = as((LBc(), OC(GC(jX, 1), Kie, 377, 0, [JBc, KBc, IBc]))); + } + function yBc() { + yBc = ccb; + xBc = as((tBc(), OC(GC(hX, 1), Kie, 336, 0, [qBc, rBc, sBc]))); + } + function HBc() { + HBc = ccb; + GBc = as((CBc(), OC(GC(iX, 1), Kie, 338, 0, [BBc, zBc, ABc]))); + } + function wGc() { + wGc = ccb; + vGc = as((rGc(), OC(GC(PX, 1), Kie, 454, 0, [oGc, pGc, qGc]))); + } + function zVc() { + zVc = ccb; + yVc = as((tVc(), OC(GC(O$, 1), Kie, 442, 0, [sVc, qVc, rVc]))); + } + function vWc() { + vWc = ccb; + uWc = as((pWc(), OC(GC(Y$, 1), Kie, 380, 0, [mWc, nWc, oWc]))); + } + function EYc() { + EYc = ccb; + DYc = as((zYc(), OC(GC(q_, 1), Kie, 381, 0, [xYc, yYc, wYc]))); + } + function yXc() { + yXc = ccb; + xXc = as((sXc(), OC(GC(b_, 1), Kie, 293, 0, [qXc, rXc, pXc]))); + } + function b_c() { + b_c = ccb; + a_c = as((Y$c(), OC(GC(J_, 1), Kie, 437, 0, [V$c, W$c, X$c]))); + } + function mbd() { + mbd = ccb; + lbd = as((hbd(), OC(GC(z1, 1), Kie, 334, 0, [fbd, ebd, gbd]))); + } + function vad() { + vad = ccb; + uad = as((qad(), OC(GC(u1, 1), Kie, 272, 0, [nad, oad, pad]))); + } + function icd() { + dcd(); + return OC(GC(D1, 1), Kie, 98, 0, [ccd, bcd, acd, Zbd, _bd, $bd]); + } + function ikd(a, b) { + return !a.o && (a.o = new dId((Thd(), Qhd), S2, a, 0)), qAd(a.o, b); + } + function NAd(a) { + !a.g && (a.g = new JCd()); + !a.g.d && (a.g.d = new MBd(a)); + return a.g.d; + } + function yAd(a) { + !a.g && (a.g = new JCd()); + !a.g.a && (a.g.a = new SBd(a)); + return a.g.a; + } + function EAd(a) { + !a.g && (a.g = new JCd()); + !a.g.b && (a.g.b = new GBd(a)); + return a.g.b; + } + function FAd(a) { + !a.g && (a.g = new JCd()); + !a.g.c && (a.g.c = new iCd(a)); + return a.g.c; + } + function A2d(a, b, c) { + var d, e; + e = new p4d(b, a); + for (d = 0; d < c; ++d) { + d4d(e); + } + return e; + } + function Atd(a, b, c) { + var d, e; + if (c != null) { + for (d = 0; d < b; ++d) { + e = c[d]; + a.fi(d, e); + } + } + } + function uhb(a, b, c, d) { + var e; + e = KC(WD, oje, 25, b + 1, 15, 1); + vhb(e, a, b, c, d); + return e; + } + function KC(a, b, c, d, e, f) { + var g; + g = LC(e, d); + e != 10 && OC(GC(a, f), b, c, e, g); + return g; + } + function bYd(a, b, c, d) { + !!c && (d = c.gh(b, bLd(c.Tg(), a.c.Lj()), null, d)); + return d; + } + function cYd(a, b, c, d) { + !!c && (d = c.ih(b, bLd(c.Tg(), a.c.Lj()), null, d)); + return d; + } + function KNb(a, b, c) { + BD(a.b, 65); + BD(a.b, 65); + BD(a.b, 65); + Hkb(a.a, new TNb(c, b, a)); + } + function ACb(a, b, c) { + if (a < 0 || b > c || b < a) { + throw vbb(new Xfb(xke + a + zke + b + oke + c)); + } + } + function zCb(a) { + if (!a) { + throw vbb(new Zdb("Unable to add element to queue")); + } + } + function Vzb(a) { + if (!a) { + this.c = null; + this.b = new Rkb(); + } else { + this.c = a; + this.b = null; + } + } + function exb(a, b) { + pjb.call(this, a, b); + this.a = KC(dL, zie, 436, 2, 0, 1); + this.b = true; + } + function _rb(a) { + Whb.call(this, a, 0); + Trb(this); + this.d.b = this.d; + this.d.a = this.d; + } + function VRc(a) { + var b; + b = a.b; + if (b.b == 0) { + return null; + } + return BD(Ut(b, 0), 188).b; + } + function Kwb(a, b) { + var c; + c = new fxb(); + c.c = true; + c.d = b.dd(); + return Lwb(a, b.cd(), c); + } + function bB(a, b) { + var c; + c = a.q.getHours() + ((b / 3600) | 0); + a.q.setSeconds(b); + YA(a, c); + } + function zGc(a, b, c) { + var d; + d = a.b[c.c.p][c.p]; + d.b += b.b; + d.c += b.c; + d.a += b.a; + ++d.a; + } + function S6c(a, b) { + var c, d; + c = a.a - b.a; + d = a.b - b.b; + return Math.sqrt(c * c + d * d); + } + function Ipc() { + Ipc = ccb; + Gpc = new Jpc("QUADRATIC", 0); + Hpc = new Jpc("SCANLINE", 1); + } + function hCc() { + hCc = ccb; + gCc = c3c(e3c(new j3c(), (qUb(), lUb), (S8b(), n8b)), pUb, J8b); + } + function l8c() { + i8c(); + return OC(GC(r1, 1), Kie, 291, 0, [h8c, g8c, f8c, d8c, c8c, e8c]); + } + function I7c() { + F7c(); + return OC(GC(o1, 1), Kie, 248, 0, [z7c, C7c, D7c, E7c, A7c, B7c]); + } + function Dpc() { + Apc(); + return OC(GC(EW, 1), Kie, 227, 0, [wpc, ypc, vpc, xpc, zpc, upc]); + } + function Brc() { + yrc(); + return OC(GC(OW, 1), Kie, 275, 0, [wrc, trc, xrc, vrc, urc, rrc]); + } + function orc() { + lrc(); + return OC(GC(NW, 1), Kie, 274, 0, [irc, hrc, krc, grc, jrc, frc]); + } + function rzc() { + lzc(); + return OC(GC(YW, 1), Kie, 313, 0, [jzc, hzc, fzc, gzc, kzc, izc]); + } + function Wqc() { + Sqc(); + return OC(GC(LW, 1), Kie, 276, 0, [Nqc, Mqc, Pqc, Oqc, Rqc, Qqc]); + } + function uSc() { + qSc(); + return OC(GC(t$, 1), Kie, 327, 0, [pSc, lSc, nSc, mSc, oSc, kSc]); + } + function wcd() { + rcd(); + return OC(GC(E1, 1), Kie, 273, 0, [pcd, ncd, ocd, mcd, lcd, qcd]); + } + function Pad() { + Mad(); + return OC(GC(w1, 1), Kie, 312, 0, [Kad, Iad, Lad, Gad, Jad, Had]); + } + function m0b() { + j0b(); + return OC(GC(NQ, 1), Kie, 267, 0, [h0b, g0b, e0b, i0b, f0b, d0b]); + } + function mib(a) { + yCb(!!a.c); + xpb(a.e, a); + a.c.Qb(); + a.c = null; + a.b = kib(a); + ypb(a.e, a); + } + function tsb(a) { + xpb(a.c.a.e, a); + sCb(a.b != a.c.a.d); + a.a = a.b; + a.b = a.b.a; + return a.a; + } + function kSd(a) { + var b; + if (!a.a && a.b != -1) { + b = a.c.Tg(); + a.a = XKd(b, a.b); + } + return a.a; + } + function wtd(a, b) { + if (a.hi() && a.Hc(b)) { + return false; + } else { + a.Yh(b); + return true; + } + } + function $Hb(a, b) { + ytb(b, "Horizontal alignment cannot be null"); + a.b = b; + return a; + } + function Lfe(a, b, c) { + wfe(); + var d; + d = Kfe(a, b); + c && !!d && Nfe(a) && (d = null); + return d; + } + function vXb(a, b, c) { + var d, e; + for (e = a.Kc(); e.Ob(); ) { + d = BD(e.Pb(), 37); + uXb(d, b, c); + } + } + function tXb(a, b) { + var c, d; + for (d = b.Kc(); d.Ob(); ) { + c = BD(d.Pb(), 37); + sXb(a, c, 0, 0); + } + } + function ojc(a, b, c) { + var d; + a.d[b.g] = c; + d = a.g.c; + d[b.g] = Math.max(d[b.g], c + 1); + } + function KZc(a, b) { + var c, d, e; + e = a.r; + d = a.d; + c = MZc(a, b, true); + return c.b != e || c.a != d; + } + function Jjc(a, b) { + Vrb(a.e, b) || Xrb(a.e, b, new Pjc(b)); + return BD(Wrb(a.e, b), 113); + } + function Byb(a, b, c, d) { + uCb(a); + uCb(b); + uCb(c); + uCb(d); + return new Lyb(a, b, new Vxb()); + } + function dId(a, b, c, d) { + this.rj(); + this.a = b; + this.b = a; + this.c = new Y5d(this, b, c, d); + } + function oSd(a, b, c, d, e, f) { + mxd.call(this, b, d, e, f); + jSd(this); + this.c = a; + this.b = c; + } + function ESd(a, b, c, d, e, f) { + mxd.call(this, b, d, e, f); + jSd(this); + this.c = a; + this.a = c; + } + function Bqd(a, b, c) { + var d, e, f; + d = aC(a, c); + e = null; + !!d && (e = aqd(d)); + f = e; + Vqd(b, c, f); + } + function Cqd(a, b, c) { + var d, e, f; + d = aC(a, c); + e = null; + !!d && (e = aqd(d)); + f = e; + Vqd(b, c, f); + } + function v1d(a, b, c) { + var d, e; + e = ((d = nUd(a.b, b)), d); + return !e ? null : V1d(p1d(a, e), c); + } + function gid(a, b) { + var c; + return (c = a.Yg(b)), c >= 0 ? a._g(c, true, true) : sid(a, b, true); + } + function s6b(a, b) { + return Kdb(Edb(ED(vNb(a, (wtc(), htc)))), Edb(ED(vNb(b, htc)))); + } + function pUc() { + pUc = ccb; + oUc = b3c(b3c(g3c(new j3c(), (yRc(), vRc)), (qSc(), pSc)), lSc); + } + function IHc(a, b, c) { + var d; + d = SHc(a, b, c); + a.b = new BHc(d.c.length); + return KHc(a, d); + } + function qhe(a) { + if (a.b <= 0) throw vbb(new utb()); + --a.b; + a.a -= a.c.c; + return meb(a.a); + } + function ptd(a) { + var b; + if (!a.a) { + throw vbb(new vtb()); + } + b = a.a; + a.a = Xod(a.a); + return b; + } + function dBb(a) { + while (!a.a) { + if (!HBb(a.c, new hBb(a))) { + return false; + } + } + return true; + } + function vr(a) { + var b; + Qb(a); + if (JD(a, 198)) { + b = BD(a, 198); + return b; + } + return new wr(a); + } + function r3c(a) { + p3c(); + BD(a.We((Y9c(), x9c)), 174).Fc((rcd(), ocd)); + a.Ye(w9c, null); + } + function p3c() { + p3c = ccb; + m3c = new v3c(); + o3c = new x3c(); + n3c = mn((Y9c(), w9c), m3c, b9c, o3c); + } + function fWc() { + fWc = ccb; + dWc = new hWc("LEAF_NUMBER", 0); + eWc = new hWc("NODE_SIZE", 1); + } + function UMc(a, b, c) { + a.a = b; + a.c = c; + a.b.a.$b(); + Osb(a.d); + a.e.a.c = KC(SI, Uhe, 1, 0, 5, 1); + } + function yHc(a) { + a.a = KC(WD, oje, 25, a.b + 1, 15, 1); + a.c = KC(WD, oje, 25, a.b, 15, 1); + a.d = 0; + } + function MWb(a, b) { + if (a.a.ue(b.d, a.b) > 0) { + Ekb(a.c, new dWb(b.c, b.d, a.d)); + a.b = b.d; + } + } + function nud(a, b) { + if (a.g == null || b >= a.i) throw vbb(new $zd(b, a.i)); + return a.g[b]; + } + function pOd(a, b, c) { + Itd(a, c); + if (c != null && !a.wj(c)) { + throw vbb(new tcb()); + } + return c; + } + function KLd(a) { + var b; + if (a.Ek()) { + for (b = a.i - 1; b >= 0; --b) { + qud(a, b); + } + } + return wud(a); + } + function Bwb(a) { + var b, c; + if (!a.b) { + return null; + } + c = a.b; + while ((b = c.a[0])) { + c = b; + } + return c; + } + function ulb(a, b) { + var c, d; + pCb(b); + return (c = ((d = a.slice(0, b)), PC(d, a))), (c.length = b), c; + } + function Klb(a, b, c, d) { + var e; + d = (ipb(), !d ? fpb : d); + e = a.slice(b, c); + Llb(e, a, b, c, -b, d); + } + function bid(a, b, c, d, e) { + return b < 0 ? sid(a, c, d) : BD(c, 66).Nj().Pj(a, a.yh(), b, d, e); + } + function hZd(a) { + if (JD(a, 172)) { + return "" + BD(a, 172).a; + } + return a == null ? null : fcb(a); + } + function iZd(a) { + if (JD(a, 172)) { + return "" + BD(a, 172).a; + } + return a == null ? null : fcb(a); + } + function nDb(a, b) { + if (b.a) { + throw vbb(new hz(Hke)); + } + Qqb(a.a, b); + b.a = a; + !a.j && (a.j = b); + } + function qBb(a, b) { + nvb.call(this, b.rd(), b.qd() & -16449); + uCb(a); + this.a = a; + this.c = b; + } + function Ti(a, b) { + var c, d; + d = (b / a.c.Hd().gc()) | 0; + c = b % a.c.Hd().gc(); + return Mi(a, d, c); + } + function NHb() { + NHb = ccb; + LHb = new OHb(jle, 0); + KHb = new OHb(gle, 1); + MHb = new OHb(kle, 2); + } + function lxb() { + lxb = ccb; + hxb = new mxb("All", 0); + ixb = new rxb(); + jxb = new txb(); + kxb = new wxb(); + } + function zxb() { + zxb = ccb; + yxb = as((lxb(), OC(GC(iL, 1), Kie, 297, 0, [hxb, ixb, jxb, kxb]))); + } + function uWb() { + uWb = ccb; + tWb = as((lWb(), OC(GC(SP, 1), Kie, 405, 0, [hWb, kWb, iWb, jWb]))); + } + function ALb() { + ALb = ccb; + zLb = as((vLb(), OC(GC(PN, 1), Kie, 406, 0, [uLb, rLb, sLb, tLb]))); + } + function WMb() { + WMb = ccb; + VMb = as((RMb(), OC(GC(jO, 1), Kie, 323, 0, [OMb, NMb, PMb, QMb]))); + } + function WOb() { + WOb = ccb; + VOb = as((ROb(), OC(GC(CO, 1), Kie, 394, 0, [OOb, NOb, POb, QOb]))); + } + function GRc() { + GRc = ccb; + FRc = as((yRc(), OC(GC(h$, 1), Kie, 393, 0, [uRc, vRc, wRc, xRc]))); + } + function mbc() { + mbc = ccb; + lbc = as((gbc(), OC(GC(VS, 1), Kie, 360, 0, [fbc, dbc, ebc, cbc]))); + } + function oXc() { + oXc = ccb; + nXc = as((iXc(), OC(GC(a_, 1), Kie, 340, 0, [hXc, fXc, gXc, eXc]))); + } + function Fjc() { + Fjc = ccb; + Ejc = as((Ajc(), OC(GC(mV, 1), Kie, 411, 0, [wjc, xjc, yjc, zjc]))); + } + function Pzc() { + Pzc = ccb; + Ozc = as((Izc(), OC(GC($W, 1), Kie, 197, 0, [Gzc, Hzc, Fzc, Ezc]))); + } + function ugd() { + ugd = ccb; + tgd = as((pgd(), OC(GC(k2, 1), Kie, 396, 0, [mgd, ngd, lgd, ogd]))); + } + function xbd() { + xbd = ccb; + wbd = as((rbd(), OC(GC(A1, 1), Kie, 285, 0, [qbd, nbd, obd, pbd]))); + } + function Fad() { + Fad = ccb; + Ead = as((Aad(), OC(GC(v1, 1), Kie, 218, 0, [zad, xad, wad, yad]))); + } + function Ied() { + Ied = ccb; + Hed = as((Ded(), OC(GC(O1, 1), Kie, 311, 0, [Ced, zed, Bed, Aed]))); + } + function ydd() { + ydd = ccb; + xdd = as((tdd(), OC(GC(I1, 1), Kie, 374, 0, [rdd, sdd, qdd, pdd]))); + } + function A9d() { + A9d = ccb; + Smd(); + x9d = Pje; + w9d = Qje; + z9d = new Ndb(Pje); + y9d = new Ndb(Qje); + } + function _qc() { + _qc = ccb; + $qc = new arc(ane, 0); + Zqc = new arc("IMPROVE_STRAIGHTNESS", 1); + } + function eIc(a, b) { + FHc(); + return Ekb(a, new vgd(b, meb(b.e.c.length + b.g.c.length))); + } + function gIc(a, b) { + FHc(); + return Ekb(a, new vgd(b, meb(b.e.c.length + b.g.c.length))); + } + function PC(a, b) { + HC(b) != 10 && OC(rb(b), b.hm, b.__elementTypeId$, HC(b), a); + return a; + } + function Lkb(a, b) { + var c; + c = Jkb(a, b, 0); + if (c == -1) { + return false; + } + Kkb(a, c); + return true; + } + function Zrb(a, b) { + var c; + c = BD(Thb(a.e, b), 387); + if (c) { + jsb(c); + return c.e; + } + return null; + } + function Jbb(a) { + var b; + if (Fbb(a)) { + b = 0 - a; + if (!isNaN(b)) { + return b; + } + } + return zbb(hD(a)); + } + function Jkb(a, b, c) { + for (; c < a.c.length; ++c) { + if (wtb(b, a.c[c])) { + return c; + } + } + return -1; + } + function SAb(a, b, c) { + var d; + Tzb(a); + d = new NBb(); + d.a = b; + a.a.Nb(new VBb(d, c)); + return d.a; + } + function aAb(a) { + var b; + Tzb(a); + b = KC(UD, Vje, 25, 0, 15, 1); + _ub(a.a, new kAb(b)); + return b; + } + function ajc(a) { + var b, c; + c = BD(Ikb(a.j, 0), 11); + b = BD(vNb(c, (wtc(), $sc)), 11); + return b; + } + function yc(a) { + var b; + if (!xc(a)) { + throw vbb(new utb()); + } + a.e = 1; + b = a.d; + a.d = null; + return b; + } + function wu(a, b) { + var c; + this.f = a; + this.b = b; + c = BD(Ohb(a.b, b), 283); + this.c = !c ? null : c.b; + } + function Ygc() { + Hgc(); + this.b = new Lqb(); + this.f = new Lqb(); + this.g = new Lqb(); + this.e = new Lqb(); + } + function Tnc(a, b) { + this.a = KC(OQ, kne, 10, a.a.c.length, 0, 1); + Qkb(a.a, this.a); + this.b = b; + } + function zoc(a) { + var b; + for (b = a.p + 1; b < a.c.a.c.length; ++b) { + --BD(Ikb(a.c.a, b), 10).p; + } + } + function Rwd(a) { + var b; + b = a.Ai(); + b != null && a.d != -1 && BD(b, 92).Ng(a); + !!a.i && a.i.Fi(); + } + function rFd(a) { + Py(this); + this.g = !a ? null : Wy(a, a.$d()); + this.f = a; + Ry(this); + this._d(); + } + function pSd(a, b, c, d, e, f, g) { + nxd.call(this, b, d, e, f, g); + jSd(this); + this.c = a; + this.b = c; + } + function Ayb(a, b, c, d, e) { + uCb(a); + uCb(b); + uCb(c); + uCb(d); + uCb(e); + return new Lyb(a, b, d); + } + function B2c(a, b) { + if (b < 0) { + throw vbb(new qcb(ese + b)); + } + A2c(a, b + 1); + return Ikb(a.j, b); + } + function Ob(a, b, c, d) { + if (!a) { + throw vbb(new Wdb(hc(b, OC(GC(SI, 1), Uhe, 1, 5, [c, d])))); + } + } + function dDb(a, b) { + return wtb(b, Ikb(a.f, 0)) || wtb(b, Ikb(a.f, 1)) || wtb(b, Ikb(a.f, 2)); + } + function ghd(a, b) { + ecd(BD(BD(a.f, 33).We((Y9c(), t9c)), 98)) && NCd(Yod(BD(a.f, 33)), b); + } + function p1d(a, b) { + var c, d; + c = BD(b, 675); + d = c.Oh(); + !d && c.Rh((d = new Y1d(a, b))); + return d; + } + function q1d(a, b) { + var c, d; + c = BD(b, 677); + d = c.pk(); + !d && c.tk((d = new j2d(a, b))); + return d; + } + function QSd(a) { + if (!a.b) { + a.b = new UTd(a, j5, a); + !a.a && (a.a = new fTd(a, a)); + } + return a.b; + } + function yTb() { + yTb = ccb; + wTb = new zTb("XY", 0); + vTb = new zTb("X", 1); + xTb = new zTb("Y", 2); + } + function EIb() { + EIb = ccb; + DIb = new FIb("TOP", 0); + CIb = new FIb(gle, 1); + BIb = new FIb(mle, 2); + } + function esc() { + esc = ccb; + csc = new fsc(ane, 0); + dsc = new fsc("TOP", 1); + bsc = new fsc(mle, 2); + } + function BAc() { + BAc = ccb; + zAc = new CAc("INPUT_ORDER", 0); + AAc = new CAc("PORT_DEGREE", 1); + } + function wD() { + wD = ccb; + sD = TC(Eje, Eje, 524287); + tD = TC(0, 0, Gje); + uD = RC(1); + RC(2); + vD = RC(0); + } + function WDc(a, b, c) { + a.a.c = KC(SI, Uhe, 1, 0, 5, 1); + $Dc(a, b, c); + a.a.c.length == 0 || TDc(a, b); + } + function rfb(a) { + var b, c; + c = a.length; + b = KC(TD, $ie, 25, c, 15, 1); + ffb(a, 0, c, b, 0); + return b; + } + function Aid(a) { + var b; + if (!a.dh()) { + b = aLd(a.Tg()) - a.Ah(); + a.ph().bk(b); + } + return a.Pg(); + } + function xjd(a) { + var b; + b = CD(Ajd(a, 32)); + if (b == null) { + yjd(a); + b = CD(Ajd(a, 32)); + } + return b; + } + function iid(a, b) { + var c; + c = bLd(a.d, b); + return c >= 0 ? fid(a, c, true, true) : sid(a, b, true); + } + function vgc(a, b) { + qgc(); + var c, d; + c = ugc(a); + d = ugc(b); + return !!c && !!d && !omb(c.k, d.k); + } + function Gqd(a, b) { + dld( + a, + b == null || Ldb((uCb(b), b)) || isNaN((uCb(b), b)) ? 0 : (uCb(b), b) + ); + } + function Hqd(a, b) { + eld( + a, + b == null || Ldb((uCb(b), b)) || isNaN((uCb(b), b)) ? 0 : (uCb(b), b) + ); + } + function Iqd(a, b) { + cld( + a, + b == null || Ldb((uCb(b), b)) || isNaN((uCb(b), b)) ? 0 : (uCb(b), b) + ); + } + function Jqd(a, b) { + ald( + a, + b == null || Ldb((uCb(b), b)) || isNaN((uCb(b), b)) ? 0 : (uCb(b), b) + ); + } + function agd(a) { + (!this.q ? (mmb(), mmb(), kmb) : this.q).Ac( + !a.q ? (mmb(), mmb(), kmb) : a.q + ); + } + function S2d(a, b) { + return JD(b, 99) && (BD(b, 18).Bb & Tje) != 0 + ? new s4d(b, a) + : new p4d(b, a); + } + function U2d(a, b) { + return JD(b, 99) && (BD(b, 18).Bb & Tje) != 0 + ? new s4d(b, a) + : new p4d(b, a); + } + function INb(a, b) { + HNb = new tOb(); + FNb = b; + GNb = a; + BD(GNb.b, 65); + KNb(GNb, HNb, null); + JNb(GNb); + } + function uud(a, b, c) { + var d; + d = a.g[b]; + mud(a, b, a.oi(b, c)); + a.gi(b, c, d); + a.ci(); + return d; + } + function Ftd(a, b) { + var c; + c = a.Xc(b); + if (c >= 0) { + a.$c(c); + return true; + } else { + return false; + } + } + function YId(a) { + var b; + if (a.d != a.r) { + b = wId(a); + a.e = !!b && b.Cj() == Bve; + a.d = b; + } + return a.e; + } + function fr(a, b) { + var c; + Qb(a); + Qb(b); + c = false; + while (b.Ob()) { + c = c | a.Fc(b.Pb()); + } + return c; + } + function Wrb(a, b) { + var c; + c = BD(Ohb(a.e, b), 387); + if (c) { + Yrb(a, c); + return c.e; + } + return null; + } + function UA(a) { + var b, c; + b = (a / 60) | 0; + c = a % 60; + if (c == 0) { + return "" + b; + } + return "" + b + ":" + ("" + c); + } + function LAb(a, b) { + var c, d; + Uzb(a); + d = new IBb(b, a.a); + c = new fBb(d); + return new YAb(a, c); + } + function tB(d, a) { + var b = d.a[a]; + var c = (rC(), qC)[typeof b]; + return c ? c(b) : xC(typeof b); + } + function yzc(a) { + switch (a.g) { + case 0: + return Ohe; + case 1: + return -1; + default: + return 0; + } + } + function oD(a) { + if (eD(a, (wD(), vD)) < 0) { + return -aD(hD(a)); + } + return a.l + a.m * Hje + a.h * Ije; + } + function HC(a) { + return a.__elementTypeCategory$ == null ? 10 : a.__elementTypeCategory$; + } + function dub(a) { + var b; + b = a.b.c.length == 0 ? null : Ikb(a.b, 0); + b != null && fub(a, 0); + return b; + } + function uA(a, b) { + while (b[0] < a.length && hfb(" \t\r\n", wfb(bfb(a, b[0]))) >= 0) { + ++b[0]; + } + } + function sgb(a, b) { + this.e = b; + this.a = vgb(a); + this.a < 54 ? (this.f = Sbb(a)) : (this.c = ghb(a)); + } + function vge(a, b, c, d) { + wfe(); + xfe.call(this, 26); + this.c = a; + this.a = b; + this.d = c; + this.b = d; + } + function EA(a, b, c) { + var d, e; + d = 10; + for (e = 0; e < c - 1; e++) { + b < d && ((a.a += "0"), a); + d *= 10; + } + a.a += b; + } + function Hhe(a, b) { + var c; + c = 0; + while (a.e != a.i.gc()) { + Qrd(b, Dyd(a), meb(c)); + c != Ohe && ++c; + } + } + function xHc(a, b) { + var c; + ++a.d; + ++a.c[b]; + c = b + 1; + while (c < a.a.length) { + ++a.a[c]; + c += c & -c; + } + } + function Qgc(a, b) { + var c, d, e; + e = b.c.i; + c = BD(Ohb(a.f, e), 57); + d = c.d.c - c.e.c; + p7c(b.a, d, 0); + } + function Scb(a) { + var b, c; + b = a + 128; + c = (Ucb(), Tcb)[b]; + !c && (c = Tcb[b] = new Mcb(a)); + return c; + } + function es(a, b) { + var c; + uCb(b); + c = a[":" + b]; + nCb(!!c, OC(GC(SI, 1), Uhe, 1, 5, [b])); + return c; + } + function Mz(a) { + var b, c; + if (a.b) { + c = null; + do { + b = a.b; + a.b = null; + c = Pz(b, c); + } while (a.b); + a.b = c; + } + } + function Lz(a) { + var b, c; + if (a.a) { + c = null; + do { + b = a.a; + a.a = null; + c = Pz(b, c); + } while (a.a); + a.a = c; + } + } + function Dqb(a) { + var b; + ++a.a; + for (b = a.c.a.length; a.a < b; ++a.a) { + if (a.c.b[a.a]) { + return; + } + } + } + function S9b(a, b) { + var c, d; + d = b.c; + for (c = d + 1; c <= b.f; c++) { + a.a[c] > a.a[d] && (d = c); + } + return d; + } + function fic(a, b) { + var c; + c = Jy(a.e.c, b.e.c); + if (c == 0) { + return Kdb(a.e.d, b.e.d); + } + return c; + } + function Ogb(a, b) { + if (b.e == 0) { + return Ggb; + } + if (a.e == 0) { + return Ggb; + } + return Dhb(), Ehb(a, b); + } + function nCb(a, b) { + if (!a) { + throw vbb(new Wdb(DCb("Enum constant undefined: %s", b))); + } + } + function AWb() { + AWb = ccb; + xWb = new XWb(); + yWb = new _Wb(); + vWb = new dXb(); + wWb = new hXb(); + zWb = new lXb(); + } + function UEb() { + UEb = ccb; + SEb = new VEb("BY_SIZE", 0); + TEb = new VEb("BY_SIZE_AND_SHAPE", 1); + } + function XRb() { + XRb = ccb; + VRb = new YRb("EADES", 0); + WRb = new YRb("FRUCHTERMAN_REINGOLD", 1); + } + function xqc() { + xqc = ccb; + vqc = new yqc("READING_DIRECTION", 0); + wqc = new yqc("ROTATION", 1); + } + function uqc() { + uqc = ccb; + tqc = as((mqc(), OC(GC(IW, 1), Kie, 335, 0, [iqc, hqc, kqc, lqc, jqc]))); + } + function bAc() { + bAc = ccb; + aAc = as((Vzc(), OC(GC(_W, 1), Kie, 315, 0, [Uzc, Rzc, Szc, Qzc, Tzc]))); + } + function bkc() { + bkc = ccb; + akc = as((Xjc(), OC(GC(uV, 1), Kie, 363, 0, [Tjc, Vjc, Wjc, Ujc, Sjc]))); + } + function Htc() { + Htc = ccb; + Gtc = as((Ctc(), OC(GC(TW, 1), Kie, 163, 0, [Btc, xtc, ytc, ztc, Atc]))); + } + function S_c() { + S_c = ccb; + R_c = as((N_c(), OC(GC(Q_, 1), Kie, 316, 0, [I_c, J_c, M_c, K_c, L_c]))); + } + function S5c() { + S5c = ccb; + R5c = as((N5c(), OC(GC(e1, 1), Kie, 175, 0, [L5c, K5c, I5c, M5c, J5c]))); + } + function p$c() { + p$c = ccb; + o$c = as((k$c(), OC(GC(y_, 1), Kie, 355, 0, [g$c, f$c, i$c, h$c, j$c]))); + } + function vUb() { + vUb = ccb; + uUb = as((qUb(), OC(GC(zP, 1), Kie, 356, 0, [lUb, mUb, nUb, oUb, pUb]))); + } + function mad() { + mad = ccb; + lad = as((ead(), OC(GC(t1, 1), Kie, 103, 0, [cad, bad, aad, _9c, dad]))); + } + function Ybd() { + Ybd = ccb; + Xbd = as((Tbd(), OC(GC(C1, 1), Kie, 249, 0, [Qbd, Sbd, Obd, Pbd, Rbd]))); + } + function cdd() { + cdd = ccb; + bdd = as((Ucd(), OC(GC(F1, 1), bne, 61, 0, [Scd, Acd, zcd, Rcd, Tcd]))); + } + function _1c(a, b) { + var c; + c = BD(Ohb(a.a, b), 134); + if (!c) { + c = new zNb(); + Rhb(a.a, b, c); + } + return c; + } + function hoc(a) { + var b; + b = BD(vNb(a, (wtc(), usc)), 305); + if (b) { + return b.a == a; + } + return false; + } + function ioc(a) { + var b; + b = BD(vNb(a, (wtc(), usc)), 305); + if (b) { + return b.i == a; + } + return false; + } + function Jub(a, b) { + uCb(b); + Iub(a); + if (a.d.Ob()) { + b.td(a.d.Pb()); + return true; + } + return false; + } + function Oy(a) { + if (ybb(a, Ohe) > 0) { + return Ohe; + } + if (ybb(a, Rie) < 0) { + return Rie; + } + return Tbb(a); + } + function Cv(a) { + if (a < 3) { + Xj(a, Hie); + return a + 1; + } + if (a < Iie) { + return QD(a / 0.75 + 1); + } + return Ohe; + } + function XKd(a, b) { + var c; + c = (a.i == null && TKd(a), a.i); + return b >= 0 && b < c.length ? c[b] : null; + } + function cC(a, b, c) { + var d; + if (b == null) { + throw vbb(new Geb()); + } + d = aC(a, b); + dC(a, b, c); + return d; + } + function Emc(a) { + a.a >= -0.01 && a.a <= ple && (a.a = 0); + a.b >= -0.01 && a.b <= ple && (a.b = 0); + return a; + } + function sfb(a, b) { + return b == (ntb(), ntb(), mtb) ? a.toLocaleLowerCase() : a.toLowerCase(); + } + function idb(a) { + return ( + ((a.i & 2) != 0 ? "interface " : (a.i & 1) != 0 ? "" : "class ") + + (fdb(a), a.o) + ); + } + function Pnd(a) { + var b, c; + c = ((b = new SSd()), b); + wtd((!a.q && (a.q = new cUd(n5, a, 11, 10)), a.q), c); + } + function Pdd(a, b) { + var c; + c = b > 0 ? b - 1 : b; + return Vdd(Wdd(Xdd(Ydd(new Zdd(), c), a.n), a.j), a.k); + } + function u2d(a, b, c, d) { + var e; + a.j = -1; + Qxd(a, I2d(a, b, c), (Q6d(), (e = BD(b, 66).Mj()), e.Ok(d))); + } + function VWb(a) { + this.g = a; + this.f = new Rkb(); + this.a = Math.min(this.g.c.c, this.g.d.c); + } + function mDb(a) { + this.b = new Rkb(); + this.a = new Rkb(); + this.c = new Rkb(); + this.d = new Rkb(); + this.e = a; + } + function Cnc(a, b) { + this.a = new Lqb(); + this.e = new Lqb(); + this.b = (xzc(), wzc); + this.c = a; + this.b = b; + } + function bIb(a, b, c) { + $Gb.call(this); + THb(this); + this.a = a; + this.c = c; + this.b = b.d; + this.f = b.e; + } + function yd(a) { + this.d = a; + this.c = a.c.vc().Kc(); + this.b = null; + this.a = null; + this.e = (hs(), gs); + } + function zud(a) { + if (a < 0) { + throw vbb(new Wdb("Illegal Capacity: " + a)); + } + this.g = this.ri(a); + } + function avb(a, b) { + if (0 > a || a > b) { + throw vbb(new scb("fromIndex: 0, toIndex: " + a + oke + b)); + } + } + function Gs(a) { + var b; + if (a.a == a.b.a) { + throw vbb(new utb()); + } + b = a.a; + a.c = b; + a.a = a.a.e; + return b; + } + function Zsb(a) { + var b; + yCb(!!a.c); + b = a.c.a; + Nsb(a.d, a.c); + a.b == a.c ? (a.b = b) : --a.a; + a.c = null; + } + function VAb(a, b) { + var c; + Uzb(a); + c = new lBb(a, a.a.rd(), a.a.qd() | 4, b); + return new YAb(a, c); + } + function ke(a, b) { + var c, d; + c = BD(Hv(a.d, b), 14); + if (!c) { + return null; + } + d = b; + return a.e.pc(d, c); + } + function xac(a, b) { + var c, d; + for (d = a.Kc(); d.Ob(); ) { + c = BD(d.Pb(), 70); + yNb(c, (wtc(), Ssc), b); + } + } + function t9b(a) { + var b; + b = Edb(ED(vNb(a, (Nyc(), Zwc)))); + if (b < 0) { + b = 0; + yNb(a, Zwc, b); + } + return b; + } + function ifc(a, b, c) { + var d; + d = Math.max(0, a.b / 2 - 0.5); + cfc(c, d, 1); + Ekb(b, new rfc(c, d)); + } + function NMc(a, b, c) { + var d; + d = a.a.e[BD(b.a, 10).p] - a.a.e[BD(c.a, 10).p]; + return QD(Eeb(d)); + } + function iZb(a, b, c, d, e, f) { + var g; + g = kZb(d); + QZb(g, e); + RZb(g, f); + Rc(a.a, d, new BZb(g, b, c.f)); + } + function Bid(a, b) { + var c; + c = YKd(a.Tg(), b); + if (!c) { + throw vbb(new Wdb(ite + b + lte)); + } + return c; + } + function ntd(a, b) { + var c; + c = a; + while (Xod(c)) { + c = Xod(c); + if (c == b) { + return true; + } + } + return false; + } + function Uw(a, b) { + var c, d, e; + d = b.a.cd(); + c = BD(b.a.dd(), 14).gc(); + for (e = 0; e < c; e++) { + a.td(d); + } + } + function Hkb(a, b) { + var c, d, e, f; + uCb(b); + for (d = a.c, e = 0, f = d.length; e < f; ++e) { + c = d[e]; + b.td(c); + } + } + function Nsb(a, b) { + var c; + c = b.c; + b.a.b = b.b; + b.b.a = b.a; + b.a = b.b = null; + b.c = null; + --a.b; + return c; + } + function wqb(a, b) { + if (!!b && a.b[b.g] == b) { + NC(a.b, b.g, null); + --a.c; + return true; + } + return false; + } + function lo(a, b) { + return !!vo( + a, + b, + Tbb(Ibb(Eie, keb(Tbb(Ibb(b == null ? 0 : tb(b), Fie)), 15))) + ); + } + function w$b(a, b) { + ecd(BD(vNb(BD(a.e, 10), (Nyc(), Vxc)), 98)) && + (mmb(), Okb(BD(a.e, 10).j, b)); + } + function THb(a) { + a.b = (NHb(), KHb); + a.f = (EIb(), CIb); + a.d = (Xj(2, Jie), new Skb(2)); + a.e = new d7c(); + } + function gHb() { + gHb = ccb; + dHb = new hHb("BEGIN", 0); + eHb = new hHb(gle, 1); + fHb = new hHb("END", 2); + } + function qad() { + qad = ccb; + nad = new rad(gle, 0); + oad = new rad("HEAD", 1); + pad = new rad("TAIL", 2); + } + function Fsd() { + Csd(); + return OC(GC(O3, 1), Kie, 237, 0, [ + Bsd, + ysd, + zsd, + xsd, + Asd, + vsd, + usd, + wsd, + ]); + } + function c6c() { + _5c(); + return OC(GC(f1, 1), Kie, 277, 0, [ + $5c, + T5c, + X5c, + Z5c, + U5c, + V5c, + W5c, + Y5c, + ]); + } + function Dlc() { + Alc(); + return OC(GC(KV, 1), Kie, 270, 0, [ + tlc, + wlc, + slc, + zlc, + vlc, + ulc, + ylc, + xlc, + ]); + } + function nAc() { + kAc(); + return OC(GC(aX, 1), Kie, 260, 0, [ + iAc, + dAc, + gAc, + eAc, + fAc, + cAc, + hAc, + jAc, + ]); + } + function kcd() { + kcd = ccb; + jcd = as( + (dcd(), OC(GC(D1, 1), Kie, 98, 0, [ccd, bcd, acd, Zbd, _bd, $bd])) + ); + } + function tHb() { + tHb = ccb; + sHb = (gHb(), OC(GC(pN, 1), Kie, 232, 0, [dHb, eHb, fHb])).length; + rHb = sHb; + } + function wed(a) { + this.b = (Qb(a), new Tkb(a)); + this.a = new Rkb(); + this.d = new Rkb(); + this.e = new d7c(); + } + function W6c(a) { + var b; + b = Math.sqrt(a.a * a.a + a.b * a.b); + if (b > 0) { + a.a /= b; + a.b /= b; + } + return a; + } + function bKd(a) { + var b; + if (a.w) { + return a.w; + } else { + b = cKd(a); + !!b && !b.kh() && (a.w = b); + return b; + } + } + function gZd(a) { + var b; + if (a == null) { + return null; + } else { + b = BD(a, 190); + return Umd(b, b.length); + } + } + function qud(a, b) { + if (a.g == null || b >= a.i) throw vbb(new $zd(b, a.i)); + return a.li(b, a.g[b]); + } + function Mmc(a) { + var b, c; + b = a.a.d.j; + c = a.c.d.j; + while (b != c) { + rqb(a.b, b); + b = Xcd(b); + } + rqb(a.b, b); + } + function Jmc(a) { + var b; + for (b = 0; b < a.c.length; b++) { + (tCb(b, a.c.length), BD(a.c[b], 11)).p = b; + } + } + function bEc(a, b, c) { + var d, e, f; + e = b[c]; + for (d = 0; d < e.length; d++) { + f = e[d]; + a.e[f.c.p][f.p] = d; + } + } + function ZEc(a, b) { + var c, d, e, f; + for (d = a.d, e = 0, f = d.length; e < f; ++e) { + c = d[e]; + REc(a.g, c).a = b; + } + } + function q7c(a, b) { + var c, d; + for (d = Jsb(a, 0); d.b != d.d.c; ) { + c = BD(Xsb(d), 8); + P6c(c, b); + } + return a; + } + function zUb(a, b) { + var c; + c = c7c(R6c(BD(Ohb(a.g, b), 8)), E6c(BD(Ohb(a.f, b), 460).b)); + return c; + } + function lib(a) { + var b; + xpb(a.e, a); + sCb(a.b); + a.c = a.a; + b = BD(a.a.Pb(), 42); + a.b = kib(a); + return b; + } + function CD(a) { + var b; + CCb( + a == null || (Array.isArray(a) && ((b = HC(a)), !(b >= 14 && b <= 16))) + ); + return a; + } + function dcb(a, b, c) { + var d = function () { + return a.apply(d, arguments); + }; + b.apply(d, c); + return d; + } + function TLc(a, b, c) { + var d, e; + d = b; + do { + e = Edb(a.p[d.p]) + c; + a.p[d.p] = e; + d = a.a[d.p]; + } while (d != b); + } + function NQd(a, b) { + var c, d; + d = a.a; + c = OQd(a, b, null); + d != b && !a.e && (c = QQd(a, b, c)); + !!c && c.Fi(); + } + function ADb(a, b) { + return ( + Iy(), + My(Qie), + Math.abs(a - b) <= Qie || a == b || (isNaN(a) && isNaN(b)) + ); + } + function Ky(a, b) { + Iy(); + My(Qie); + return Math.abs(a - b) <= Qie || a == b || (isNaN(a) && isNaN(b)); + } + function Akc(a, b) { + gkc(); + return beb(a.b.c.length - a.e.c.length, b.b.c.length - b.e.c.length); + } + function oo(a, b) { + return Kv( + uo(a, b, Tbb(Ibb(Eie, keb(Tbb(Ibb(b == null ? 0 : tb(b), Fie)), 15)))) + ); + } + function o0b() { + o0b = ccb; + n0b = as( + (j0b(), OC(GC(NQ, 1), Kie, 267, 0, [h0b, g0b, e0b, i0b, f0b, d0b])) + ); + } + function n8c() { + n8c = ccb; + m8c = as( + (i8c(), OC(GC(r1, 1), Kie, 291, 0, [h8c, g8c, f8c, d8c, c8c, e8c])) + ); + } + function K7c() { + K7c = ccb; + J7c = as( + (F7c(), OC(GC(o1, 1), Kie, 248, 0, [z7c, C7c, D7c, E7c, A7c, B7c])) + ); + } + function Fpc() { + Fpc = ccb; + Epc = as( + (Apc(), OC(GC(EW, 1), Kie, 227, 0, [wpc, ypc, vpc, xpc, zpc, upc])) + ); + } + function Drc() { + Drc = ccb; + Crc = as( + (yrc(), OC(GC(OW, 1), Kie, 275, 0, [wrc, trc, xrc, vrc, urc, rrc])) + ); + } + function qrc() { + qrc = ccb; + prc = as( + (lrc(), OC(GC(NW, 1), Kie, 274, 0, [irc, hrc, krc, grc, jrc, frc])) + ); + } + function tzc() { + tzc = ccb; + szc = as( + (lzc(), OC(GC(YW, 1), Kie, 313, 0, [jzc, hzc, fzc, gzc, kzc, izc])) + ); + } + function Yqc() { + Yqc = ccb; + Xqc = as( + (Sqc(), OC(GC(LW, 1), Kie, 276, 0, [Nqc, Mqc, Pqc, Oqc, Rqc, Qqc])) + ); + } + function wSc() { + wSc = ccb; + vSc = as( + (qSc(), OC(GC(t$, 1), Kie, 327, 0, [pSc, lSc, nSc, mSc, oSc, kSc])) + ); + } + function ycd() { + ycd = ccb; + xcd = as( + (rcd(), OC(GC(E1, 1), Kie, 273, 0, [pcd, ncd, ocd, mcd, lcd, qcd])) + ); + } + function Rad() { + Rad = ccb; + Qad = as( + (Mad(), OC(GC(w1, 1), Kie, 312, 0, [Kad, Iad, Lad, Gad, Jad, Had])) + ); + } + function Lbd() { + Hbd(); + return OC(GC(B1, 1), Kie, 93, 0, [ + zbd, + ybd, + Bbd, + Gbd, + Fbd, + Ebd, + Cbd, + Dbd, + Abd, + ]); + } + function vkd(a, b) { + var c; + c = a.a; + a.a = b; + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new lSd(a, 0, c, a.a)); + } + function wkd(a, b) { + var c; + c = a.b; + a.b = b; + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new lSd(a, 1, c, a.b)); + } + function hmd(a, b) { + var c; + c = a.b; + a.b = b; + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new lSd(a, 3, c, a.b)); + } + function ald(a, b) { + var c; + c = a.f; + a.f = b; + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new lSd(a, 3, c, a.f)); + } + function cld(a, b) { + var c; + c = a.g; + a.g = b; + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new lSd(a, 4, c, a.g)); + } + function dld(a, b) { + var c; + c = a.i; + a.i = b; + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new lSd(a, 5, c, a.i)); + } + function eld(a, b) { + var c; + c = a.j; + a.j = b; + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new lSd(a, 6, c, a.j)); + } + function omd(a, b) { + var c; + c = a.j; + a.j = b; + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new lSd(a, 1, c, a.j)); + } + function imd(a, b) { + var c; + c = a.c; + a.c = b; + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new lSd(a, 4, c, a.c)); + } + function pmd(a, b) { + var c; + c = a.k; + a.k = b; + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new lSd(a, 2, c, a.k)); + } + function qQd(a, b) { + var c; + c = a.d; + a.d = b; + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new mSd(a, 2, c, a.d)); + } + function AId(a, b) { + var c; + c = a.s; + a.s = b; + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new mSd(a, 4, c, a.s)); + } + function DId(a, b) { + var c; + c = a.t; + a.t = b; + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new mSd(a, 5, c, a.t)); + } + function _Jd(a, b) { + var c; + c = a.F; + a.F = b; + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new nSd(a, 1, 5, c, b)); + } + function izd(a, b) { + var c; + c = BD(Ohb((pEd(), oEd), a), 55); + return c ? c.xj(b) : KC(SI, Uhe, 1, b, 5, 1); + } + function Xpd(a, b) { + var c, d; + c = b in a.a; + if (c) { + d = aC(a, b).he(); + if (d) { + return d.a; + } + } + return null; + } + function ftd(a, b) { + var c, d, e; + c = ((d = (Fhd(), (e = new Jod()), e)), !!b && God(d, b), d); + Hod(c, a); + return c; + } + function LLd(a, b, c) { + Itd(a, c); + if (!a.Bk() && c != null && !a.wj(c)) { + throw vbb(new tcb()); + } + return c; + } + function Xdd(a, b) { + a.n = b; + if (a.n) { + a.f = new Rkb(); + a.e = new Rkb(); + } else { + a.f = null; + a.e = null; + } + return a; + } + function ndb(a, b, c, d, e, f) { + var g; + g = ldb(a, b); + zdb(c, g); + g.i = e ? 8 : 0; + g.f = d; + g.e = e; + g.g = f; + return g; + } + function rSd(a, b, c, d, e) { + this.d = b; + this.k = d; + this.f = e; + this.o = -1; + this.p = 1; + this.c = a; + this.a = c; + } + function tSd(a, b, c, d, e) { + this.d = b; + this.k = d; + this.f = e; + this.o = -1; + this.p = 2; + this.c = a; + this.a = c; + } + function BSd(a, b, c, d, e) { + this.d = b; + this.k = d; + this.f = e; + this.o = -1; + this.p = 6; + this.c = a; + this.a = c; + } + function GSd(a, b, c, d, e) { + this.d = b; + this.k = d; + this.f = e; + this.o = -1; + this.p = 7; + this.c = a; + this.a = c; + } + function xSd(a, b, c, d, e) { + this.d = b; + this.j = d; + this.e = e; + this.o = -1; + this.p = 4; + this.c = a; + this.a = c; + } + function rDb(a, b) { + var c, d, e, f; + for (d = b, e = 0, f = d.length; e < f; ++e) { + c = d[e]; + nDb(a.a, c); + } + return a; + } + function pl(a) { + var b, c, d, e; + for (c = a, d = 0, e = c.length; d < e; ++d) { + b = c[d]; + Qb(b); + } + return new vl(a); + } + function Uz(a) { + var b = /function(?:\s+([\w$]+))?\s*\(/; + var c = b.exec(a); + return (c && c[1]) || Xie; + } + function zdb(a, b) { + var c; + if (!a) { + return; + } + b.n = a; + var d = tdb(b); + if (!d) { + _bb[a] = [b]; + return; + } + d.gm = b; + } + function vlb(a, b, c) { + var d, e; + e = a.length; + d = Math.min(c, e); + $Bb(a, 0, b, 0, d, true); + return b; + } + function RPb(a, b, c) { + var d, e; + for (e = b.Kc(); e.Ob(); ) { + d = BD(e.Pb(), 79); + Qqb(a, BD(c.Kb(d), 33)); + } + } + function Xbb() { + Ybb(); + var a = Wbb; + for (var b = 0; b < arguments.length; b++) { + a.push(arguments[b]); + } + } + function n7c(a, b) { + var c, d, e, f; + for (d = b, e = 0, f = d.length; e < f; ++e) { + c = d[e]; + Gsb(a, c, a.c.b, a.c); + } + } + function s$c(a, b) { + a.b = Math.max(a.b, b.d); + a.e += b.r + (a.a.c.length == 0 ? 0 : a.c); + Ekb(a.a, b); + } + function wkb(a) { + yCb(a.c >= 0); + if (ekb(a.d, a.c) < 0) { + a.a = (a.a - 1) & (a.d.a.length - 1); + a.b = a.d.c; + } + a.c = -1; + } + function pgb(a) { + if (a.a < 54) { + return a.f < 0 ? -1 : a.f > 0 ? 1 : 0; + } + return (!a.c && (a.c = fhb(a.f)), a.c).e; + } + function My(a) { + if (!(a >= 0)) { + throw vbb(new Wdb("tolerance (" + a + ") must be >= 0")); + } + return a; + } + function n4c() { + if (!f4c) { + f4c = new m4c(); + l4c(f4c, OC(GC(C0, 1), Uhe, 130, 0, [new Z9c()])); + } + return f4c; + } + function KAc() { + KAc = ccb; + JAc = new LAc(ole, 0); + HAc = new LAc("INPUT", 1); + IAc = new LAc("OUTPUT", 2); + } + function bqc() { + bqc = ccb; + $pc = new cqc("ARD", 0); + aqc = new cqc("MSD", 1); + _pc = new cqc("MANUAL", 2); + } + function rGc() { + rGc = ccb; + oGc = new sGc("BARYCENTER", 0); + pGc = new sGc(Bne, 1); + qGc = new sGc(Cne, 2); + } + function ztd(a, b) { + var c; + c = a.gc(); + if (b < 0 || b > c) throw vbb(new Cyd(b, c)); + return new czd(a, b); + } + function JAd(a, b) { + var c; + if (JD(b, 42)) { + return a.c.Mc(b); + } else { + c = qAd(a, b); + LAd(a, b); + return c; + } + } + function $nd(a, b, c) { + yId(a, b); + pnd(a, c); + AId(a, 0); + DId(a, 1); + CId(a, true); + BId(a, true); + return a; + } + function Xj(a, b) { + if (a < 0) { + throw vbb(new Wdb(b + " cannot be negative but was: " + a)); + } + return a; + } + function Bt(a, b) { + var c, d; + for (c = 0, d = a.gc(); c < d; ++c) { + if (wtb(b, a.Xb(c))) { + return c; + } + } + return -1; + } + function Nc(a) { + var b, c; + for (c = a.c.Cc().Kc(); c.Ob(); ) { + b = BD(c.Pb(), 14); + b.$b(); + } + a.c.$b(); + a.d = 0; + } + function Ri(a) { + var b, c, d, e; + for (c = a.a, d = 0, e = c.length; d < e; ++d) { + b = c[d]; + Flb(b, b.length, null); + } + } + function ieb(a) { + var b, c; + if (a == 0) { + return 32; + } else { + c = 0; + for (b = 1; (b & a) == 0; b <<= 1) { + ++c; + } + return c; + } + } + function NGb(a) { + var b, c; + for (c = new olb(ahd(a)); c.a < c.c.c.length; ) { + b = BD(mlb(c), 680); + b.Gf(); + } + } + function CUb(a) { + xUb(); + this.g = new Lqb(); + this.f = new Lqb(); + this.b = new Lqb(); + this.c = new Hp(); + this.i = a; + } + function XZb() { + this.f = new d7c(); + this.d = new s0b(); + this.c = new d7c(); + this.a = new Rkb(); + this.b = new Rkb(); + } + function c6d(a, b, c, d) { + this.rj(); + this.a = b; + this.b = a; + this.c = null; + this.c = new d6d(this, b, c, d); + } + function nxd(a, b, c, d, e) { + this.d = a; + this.n = b; + this.g = c; + this.o = d; + this.p = -1; + e || (this.o = -2 - d - 1); + } + function hJd() { + FId.call(this); + this.n = -1; + this.g = null; + this.i = null; + this.j = null; + this.Bb |= zte; + } + function Ldd() { + Idd(); + return OC(GC(J1, 1), Kie, 259, 0, [ + Bdd, + Ddd, + Add, + Edd, + Fdd, + Hdd, + Gdd, + Cdd, + zdd, + ]); + } + function uFb() { + rFb(); + return OC(GC(dN, 1), Kie, 250, 0, [ + qFb, + lFb, + mFb, + kFb, + oFb, + pFb, + nFb, + jFb, + iFb, + ]); + } + function qeb() { + qeb = ccb; + peb = OC( + GC(WD, 1), + oje, + 25, + 15, + [0, 8, 4, 12, 2, 10, 6, 14, 1, 9, 5, 13, 3, 11, 7, 15] + ); + } + function vCc() { + vCc = ccb; + uCc = e3c( + e3c(e3c(new j3c(), (qUb(), lUb), (S8b(), Z7b)), mUb, w8b), + nUb, + v8b + ); + } + function VCc() { + VCc = ccb; + UCc = e3c( + e3c(e3c(new j3c(), (qUb(), lUb), (S8b(), Z7b)), mUb, w8b), + nUb, + v8b + ); + } + function rDc() { + rDc = ccb; + qDc = e3c( + e3c(e3c(new j3c(), (qUb(), lUb), (S8b(), Z7b)), mUb, w8b), + nUb, + v8b + ); + } + function yFc() { + yFc = ccb; + xFc = c3c( + e3c(e3c(new j3c(), (qUb(), nUb), (S8b(), z8b)), oUb, p8b), + pUb, + y8b + ); + } + function Rpc() { + Rpc = ccb; + Ppc = new Tpc("LAYER_SWEEP", 0); + Opc = new Tpc(Tne, 1); + Qpc = new Tpc(ane, 2); + } + function RLc(a, b) { + var c, d; + c = a.c; + d = b.e[a.p]; + if (d > 0) { + return BD(Ikb(c.a, d - 1), 10); + } + return null; + } + function Lkd(a, b) { + var c; + c = a.k; + a.k = b; + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new nSd(a, 1, 2, c, a.k)); + } + function kmd(a, b) { + var c; + c = a.f; + a.f = b; + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new nSd(a, 1, 8, c, a.f)); + } + function lmd(a, b) { + var c; + c = a.i; + a.i = b; + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new nSd(a, 1, 7, c, a.i)); + } + function Hod(a, b) { + var c; + c = a.a; + a.a = b; + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new nSd(a, 1, 8, c, a.a)); + } + function zpd(a, b) { + var c; + c = a.b; + a.b = b; + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new nSd(a, 1, 0, c, a.b)); + } + function UUd(a, b) { + var c; + c = a.b; + a.b = b; + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new nSd(a, 1, 0, c, a.b)); + } + function VUd(a, b) { + var c; + c = a.c; + a.c = b; + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new nSd(a, 1, 1, c, a.c)); + } + function Apd(a, b) { + var c; + c = a.c; + a.c = b; + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new nSd(a, 1, 1, c, a.c)); + } + function pQd(a, b) { + var c; + c = a.c; + a.c = b; + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new nSd(a, 1, 4, c, a.c)); + } + function PHd(a, b) { + var c; + c = a.d; + a.d = b; + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new nSd(a, 1, 1, c, a.d)); + } + function jKd(a, b) { + var c; + c = a.D; + a.D = b; + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new nSd(a, 1, 2, c, a.D)); + } + function Rdd(a, b) { + if (a.r > 0 && a.c < a.r) { + a.c += b; + !!a.i && a.i.d > 0 && a.g != 0 && Rdd(a.i, (b / a.r) * a.i.d); + } + } + function dge(a, b, c) { + var d; + a.b = b; + a.a = c; + d = (a.a & 512) == 512 ? new hee() : new ude(); + a.c = ode(d, a.b, a.a); + } + function g3d(a, b) { + return T6d(a.e, b) + ? (Q6d(), YId(b) ? new R7d(b, a) : new f7d(b, a)) + : new c8d(b, a); + } + function _o(a, b) { + return Fv( + vo(a.a, b, Tbb(Ibb(Eie, keb(Tbb(Ibb(b == null ? 0 : tb(b), Fie)), 15)))) + ); + } + function Nyb(a, b, c) { + return Ayb( + a, + new Kzb(b), + new Mzb(), + new Ozb(c), + OC(GC(xL, 1), Kie, 132, 0, []) + ); + } + function pAb(a) { + var b, c; + if (0 > a) { + return new yAb(); + } + b = a + 1; + c = new rAb(b, a); + return new vAb(null, c); + } + function umb(a, b) { + mmb(); + var c; + c = new Mqb(1); + ND(a) ? Shb(c, a, b) : jrb(c.f, a, b); + return new iob(c); + } + function aMb(a, b) { + var c, d; + c = a.o + a.p; + d = b.o + b.p; + if (c < d) { + return -1; + } + if (c == d) { + return 0; + } + return 1; + } + function P2b(a) { + var b; + b = vNb(a, (wtc(), $sc)); + if (JD(b, 160)) { + return O2b(BD(b, 160)); + } + return null; + } + function Kp(a) { + var b; + a = Math.max(a, 2); + b = geb(a); + if (a > b) { + b <<= 1; + return b > 0 ? b : Iie; + } + return b; + } + function xc(a) { + Ub(a.e != 3); + switch (a.e) { + case 2: + return false; + case 0: + return true; + } + return zc(a); + } + function T6c(a, b) { + var c; + if (JD(b, 8)) { + c = BD(b, 8); + return a.a == c.a && a.b == c.b; + } else { + return false; + } + } + function _Mb(a, b, c) { + var d, e, f; + f = b >> 5; + e = b & 31; + d = xbb(Pbb(a.n[c][f], Tbb(Nbb(e, 1))), 3); + return d; + } + function IAd(a, b) { + var c, d; + for (d = b.vc().Kc(); d.Ob(); ) { + c = BD(d.Pb(), 42); + HAd(a, c.cd(), c.dd()); + } + } + function N1c(a, b) { + var c; + c = new tOb(); + BD(b.b, 65); + BD(b.b, 65); + BD(b.b, 65); + Hkb(b.a, new T1c(a, c, b)); + } + function DUd(a, b) { + var c; + c = a.b; + a.b = b; + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new nSd(a, 1, 21, c, a.b)); + } + function jmd(a, b) { + var c; + c = a.d; + a.d = b; + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new nSd(a, 1, 11, c, a.d)); + } + function _Id(a, b) { + var c; + c = a.j; + a.j = b; + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new nSd(a, 1, 13, c, a.j)); + } + function $jb(a, b, c) { + var d, e, f; + f = a.a.length - 1; + for (e = a.b, d = 0; d < c; e = (e + 1) & f, ++d) { + NC(b, d, a.a[e]); + } + } + function rqb(a, b) { + var c; + uCb(b); + c = b.g; + if (!a.b[c]) { + NC(a.b, c, b); + ++a.c; + return true; + } + return false; + } + function eub(a, b) { + var c; + c = b == null ? -1 : Jkb(a.b, b, 0); + if (c < 0) { + return false; + } + fub(a, c); + return true; + } + function fub(a, b) { + var c; + c = Kkb(a.b, a.b.c.length - 1); + if (b < a.b.c.length) { + Nkb(a.b, b, c); + bub(a, b); + } + } + function eyb(a, b) { + ((oyb(), lyb) ? null : b.c).length == 0 && qyb(b, new zyb()); + Shb(a.a, lyb ? null : b.c, b); + } + function M5b(a, b) { + Odd(b, "Hierarchical port constraint processing", 1); + N5b(a); + P5b(a); + Qdd(b); + } + function GOb(a, b) { + var c, d; + for (d = b.Kc(); d.Ob(); ) { + c = BD(d.Pb(), 266); + a.b = true; + Qqb(a.e, c); + c.b = a; + } + } + function Owb(a, b) { + var c, d; + c = 1 - b; + d = a.a[c]; + a.a[c] = d.a[b]; + d.a[b] = a; + a.b = true; + d.b = false; + return d; + } + function Gec(a, b) { + var c, d; + c = BD(vNb(a, (Nyc(), ayc)), 8); + d = BD(vNb(b, ayc), 8); + return Kdb(c.b, d.b); + } + function jfc(a) { + oEb.call(this); + this.b = Edb(ED(vNb(a, (Nyc(), lyc)))); + this.a = BD(vNb(a, Swc), 218); + } + function XGc(a, b, c) { + uEc.call(this, a, b, c); + this.a = new Lqb(); + this.b = new Lqb(); + this.d = new $Gc(this); + } + function ku(a) { + this.e = a; + this.d = new Uqb(Cv(Ec(this.e).gc())); + this.c = this.e.a; + this.b = this.e.c; + } + function BHc(a) { + this.b = a; + this.a = KC(WD, oje, 25, a + 1, 15, 1); + this.c = KC(WD, oje, 25, a, 15, 1); + this.d = 0; + } + function THc(a, b, c) { + var d; + d = new Rkb(); + UHc(a, b, d, c, true, true); + a.b = new BHc(d.c.length); + return d; + } + function nMc(a, b) { + var c; + c = BD(Ohb(a.c, b), 458); + if (!c) { + c = new uMc(); + c.c = b; + Rhb(a.c, c.c, c); + } + return c; + } + function $B(e, a) { + var b = e.a; + var c = 0; + for (var d in b) { + b.hasOwnProperty(d) && (a[c++] = d); + } + return a; + } + function pRd(a) { + var b; + if (a.b == null) { + return LRd(), LRd(), KRd; + } + b = a.Lk() ? a.Kk() : a.Jk(); + return b; + } + function r$c(a) { + var b, c; + for (c = new Fyd(a); c.e != c.i.gc(); ) { + b = BD(Dyd(c), 33); + dld(b, 0); + eld(b, 0); + } + } + function HSb() { + HSb = ccb; + FSb = new Lsd(Ime); + GSb = new Lsd(Jme); + ESb = new Lsd(Kme); + DSb = new Lsd(Lme); + } + function y5b() { + y5b = ccb; + x5b = new z5b("TO_INTERNAL_LTR", 0); + w5b = new z5b("TO_INPUT_DIRECTION", 1); + } + function PUc() { + PUc = ccb; + NUc = new RUc("P1_NODE_PLACEMENT", 0); + OUc = new RUc("P2_EDGE_ROUTING", 1); + } + function Fkc() { + Fkc = ccb; + Ekc = new Gkc("START", 0); + Dkc = new Gkc("MIDDLE", 1); + Ckc = new Gkc("END", 2); + } + function I9b() { + I9b = ccb; + H9b = new Msd("edgelabelcenterednessanalysis.includelabel", (Bcb(), zcb)); + } + function Zyc(a, b) { + MAb( + JAb(new YAb(null, new Kub(new Pib(a.b), 1)), new bfd(a, b)), + new ffd(a, b) + ); + } + function $Xc() { + this.c = new jVc(0); + this.b = new jVc(Tqe); + this.d = new jVc(Sqe); + this.a = new jVc(cme); + } + function $Fc(a) { + var b, c; + for (c = a.c.a.ec().Kc(); c.Ob(); ) { + b = BD(c.Pb(), 214); + eFc(b, new oHc(b.e)); + } + } + function ZFc(a) { + var b, c; + for (c = a.c.a.ec().Kc(); c.Ob(); ) { + b = BD(c.Pb(), 214); + dFc(b, new nHc(b.f)); + } + } + function pnd(a, b) { + var c; + c = a.zb; + a.zb = b; + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new nSd(a, 1, 1, c, a.zb)); + } + function cod(a, b) { + var c; + c = a.xb; + a.xb = b; + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new nSd(a, 1, 3, c, a.xb)); + } + function dod(a, b) { + var c; + c = a.yb; + a.yb = b; + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new nSd(a, 1, 2, c, a.yb)); + } + function Knd(a, b) { + var c, d; + c = ((d = new OJd()), d); + c.n = b; + wtd((!a.s && (a.s = new cUd(t5, a, 21, 17)), a.s), c); + } + function Qnd(a, b) { + var c, d; + d = ((c = new FUd()), c); + d.n = b; + wtd((!a.s && (a.s = new cUd(t5, a, 21, 17)), a.s), d); + } + function ktb(a, b) { + var c, d; + c = a.Pc(); + Klb(c, 0, c.length, b); + for (d = 0; d < c.length; d++) { + a._c(d, c[d]); + } + } + function ye(a, b) { + var c, d, e; + uCb(b); + c = false; + for (e = b.Kc(); e.Ob(); ) { + d = e.Pb(); + c = c | a.Fc(d); + } + return c; + } + function Bx(a) { + var b, c, d; + b = 0; + for (d = a.Kc(); d.Ob(); ) { + c = d.Pb(); + b += c != null ? tb(c) : 0; + b = ~~b; + } + return b; + } + function SA(a) { + var b; + if (a == 0) { + return "UTC"; + } + if (a < 0) { + a = -a; + b = "UTC+"; + } else { + b = "UTC-"; + } + return b + UA(a); + } + function Jq(a, b) { + var c; + if (JD(b, 14)) { + c = BD(b, 14); + return a.Gc(c); + } + return fr(a, BD(Qb(b), 20).Kc()); + } + function Bnc(a, b, c) { + Cnc.call(this, b, c); + this.d = KC(OQ, kne, 10, a.a.c.length, 0, 1); + Qkb(a.a, this.d); + } + function IMc(a) { + a.a = null; + a.e = null; + a.b.c = KC(SI, Uhe, 1, 0, 5, 1); + a.f.c = KC(SI, Uhe, 1, 0, 5, 1); + a.c = null; + } + function gKd(a, b) { + if (b) { + if (a.B == null) { + a.B = a.D; + a.D = null; + } + } else if (a.B != null) { + a.D = a.B; + a.B = null; + } + } + function Poc(a, b) { + return Edb( + ED(Btb(TAb(NAb(new YAb(null, new Kub(a.c.b, 16)), new fpc(a)), b))) + ); + } + function Soc(a, b) { + return Edb( + ED(Btb(TAb(NAb(new YAb(null, new Kub(a.c.b, 16)), new dpc(a)), b))) + ); + } + function Q2b(a, b) { + Odd(b, zne, 1); + MAb(LAb(new YAb(null, new Kub(a.b, 16)), new U2b()), new W2b()); + Qdd(b); + } + function SXc(a, b) { + var c, d; + c = BD(hkd(a, (ZWc(), SWc)), 19); + d = BD(hkd(b, SWc), 19); + return beb(c.a, d.a); + } + function p7c(a, b, c) { + var d, e; + for (e = Jsb(a, 0); e.b != e.d.c; ) { + d = BD(Xsb(e), 8); + d.a += b; + d.b += c; + } + return a; + } + function uo(a, b, c) { + var d; + for (d = a.b[c & a.f]; d; d = d.b) { + if (c == d.a && Hb(b, d.g)) { + return d; + } + } + return null; + } + function vo(a, b, c) { + var d; + for (d = a.c[c & a.f]; d; d = d.d) { + if (c == d.f && Hb(b, d.i)) { + return d; + } + } + return null; + } + function khb(a, b, c) { + var d, e, f; + d = 0; + for (e = 0; e < c; e++) { + f = b[e]; + a[e] = (f << 1) | d; + d = f >>> 31; + } + d != 0 && (a[c] = d); + } + function rmb(a, b) { + mmb(); + var c, d; + d = new Rkb(); + for (c = 0; c < a; ++c) { + d.c[d.c.length] = b; + } + return new Yob(d); + } + function Zzb(a) { + var b; + b = Yzb(a); + if (Bbb(b.a, 0)) { + return Ltb(), Ltb(), Ktb; + } + return Ltb(), new Ptb(b.b); + } + function $zb(a) { + var b; + b = Yzb(a); + if (Bbb(b.a, 0)) { + return Ltb(), Ltb(), Ktb; + } + return Ltb(), new Ptb(b.c); + } + function uAb(a) { + var b; + b = tAb(a); + if (Bbb(b.a, 0)) { + return Utb(), Utb(), Ttb; + } + return Utb(), new Xtb(b.b); + } + function zZb(a) { + if (a.b.c.i.k == (j0b(), e0b)) { + return BD(vNb(a.b.c.i, (wtc(), $sc)), 11); + } + return a.b.c; + } + function AZb(a) { + if (a.b.d.i.k == (j0b(), e0b)) { + return BD(vNb(a.b.d.i, (wtc(), $sc)), 11); + } + return a.b.d; + } + function Vnd(a, b, c, d, e, f, g, h, i, j, k, l, m) { + aod(a, b, c, d, e, f, g, h, i, j, k, l, m); + MJd(a, false); + return a; + } + function tJb(a, b, c, d, e, f, g) { + $r.call(this, a, b); + this.d = c; + this.e = d; + this.c = e; + this.b = f; + this.a = Ou(g); + } + function $bb(a, b) { + typeof window === Jhe && + typeof window["$gwt"] === Jhe && + (window["$gwt"][a] = b); + } + function pWb(a, b) { + lWb(); + return ( + (a == hWb && b == kWb) || + (a == kWb && b == hWb) || + (a == jWb && b == iWb) || + (a == iWb && b == jWb) + ); + } + function qWb(a, b) { + lWb(); + return ( + (a == hWb && b == iWb) || + (a == hWb && b == jWb) || + (a == kWb && b == jWb) || + (a == kWb && b == iWb) + ); + } + function IJb(a, b) { + return ( + Iy(), + My(ple), + Math.abs(0 - b) <= ple || 0 == b || (isNaN(0) && isNaN(b)) ? 0 : a / b + ); + } + function Rrc() { + Orc(); + return OC(GC(PW, 1), Kie, 256, 0, [ + Frc, + Hrc, + Irc, + Jrc, + Krc, + Lrc, + Nrc, + Erc, + Grc, + Mrc, + ]); + } + function NKd() { + NKd = ccb; + KKd = new KPd(); + MKd = OC(GC(t5, 1), Mve, 170, 0, []); + LKd = OC(GC(n5, 1), Nve, 59, 0, []); + } + function CBc() { + CBc = ccb; + BBc = new DBc("NO", 0); + zBc = new DBc("GREEDY", 1); + ABc = new DBc("LOOK_BACK", 2); + } + function z0b() { + z0b = ccb; + w0b = new m1b(); + u0b = new h1b(); + v0b = new q1b(); + t0b = new u1b(); + x0b = new y1b(); + y0b = new C1b(); + } + function J9b(a) { + var b, c, d; + d = 0; + for (c = new olb(a.b); c.a < c.c.c.length; ) { + b = BD(mlb(c), 29); + b.p = d; + ++d; + } + } + function nfd(a, b) { + var c; + c = sfd(a); + return mfd(new f7c(c.c, c.d), new f7c(c.b, c.a), a.rf(), b, a.Hf()); + } + function Udd(a, b) { + var c; + if (a.b) { + return null; + } else { + c = Pdd(a, a.g); + Dsb(a.a, c); + c.i = a; + a.d = b; + return c; + } + } + function kUc(a, b, c) { + Odd(c, "DFS Treeifying phase", 1); + jUc(a, b); + hUc(a, b); + a.a = null; + a.b = null; + Qdd(c); + } + function zic(a, b, c) { + this.g = a; + this.d = b; + this.e = c; + this.a = new Rkb(); + xic(this); + mmb(); + Okb(this.a, null); + } + function Aud(a) { + this.i = a.gc(); + if (this.i > 0) { + this.g = this.ri(this.i + ((this.i / 8) | 0) + 1); + a.Qc(this.g); + } + } + function u3d(a, b) { + k2d.call(this, D9, a, b); + this.b = this; + this.a = S6d(a.Tg(), XKd(this.e.Tg(), this.c)); + } + function Ld(a, b) { + var c, d; + uCb(b); + for (d = b.vc().Kc(); d.Ob(); ) { + c = BD(d.Pb(), 42); + a.zc(c.cd(), c.dd()); + } + } + function G2d(a, b, c) { + var d; + for (d = c.Kc(); d.Ob(); ) { + if (!E2d(a, b, d.Pb())) { + return false; + } + } + return true; + } + function sVd(a, b, c, d, e) { + var f; + if (c) { + f = bLd(b.Tg(), a.c); + e = c.gh(b, -1 - (f == -1 ? d : f), null, e); + } + return e; + } + function tVd(a, b, c, d, e) { + var f; + if (c) { + f = bLd(b.Tg(), a.c); + e = c.ih(b, -1 - (f == -1 ? d : f), null, e); + } + return e; + } + function Mgb(a) { + var b; + if (a.b == -2) { + if (a.e == 0) { + b = -1; + } else { + for (b = 0; a.a[b] == 0; b++); + } + a.b = b; + } + return a.b; + } + function Z4b(a) { + switch (a.g) { + case 2: + return Ucd(), Tcd; + case 4: + return Ucd(), zcd; + default: + return a; + } + } + function $4b(a) { + switch (a.g) { + case 1: + return Ucd(), Rcd; + case 3: + return Ucd(), Acd; + default: + return a; + } + } + function nkc(a) { + var b, c, d; + return ( + a.j == (Ucd(), Acd) && + ((b = pkc(a)), (c = uqb(b, zcd)), (d = uqb(b, Tcd)), d || (d && c)) + ); + } + function oqb(a) { + var b, c; + b = BD(a.e && a.e(), 9); + c = BD(ZBb(b, b.length), 9); + return new xqb(b, c, b.length); + } + function l7b(a, b) { + Odd(b, zne, 1); + UGb(TGb(new YGb((a$b(), new l$b(a, false, false, new T$b()))))); + Qdd(b); + } + function Fcb(a, b) { + Bcb(); + return ND(a) + ? cfb(a, GD(b)) + : LD(a) + ? Ddb(a, ED(b)) + : KD(a) + ? Dcb(a, DD(b)) + : a.wd(b); + } + function WZc(a, b) { + b.q = a; + a.d = Math.max(a.d, b.r); + a.b += b.d + (a.a.c.length == 0 ? 0 : a.c); + Ekb(a.a, b); + } + function m6c(a, b) { + var c, d, e, f; + e = a.c; + c = a.c + a.b; + f = a.d; + d = a.d + a.a; + return b.a > e && b.a < c && b.b > f && b.b < d; + } + function Ynd(a, b, c, d) { + JD(a.Cb, 179) && (BD(a.Cb, 179).tb = null); + pnd(a, c); + !!b && hKd(a, b); + d && a.xk(true); + } + function Yqd(a, b) { + var c; + c = BD(b, 183); + Spd(c, "x", a.i); + Spd(c, "y", a.j); + Spd(c, Gte, a.g); + Spd(c, Fte, a.f); + } + function LFc() { + LFc = ccb; + KFc = b3c( + f3c(e3c(e3c(new j3c(), (qUb(), nUb), (S8b(), z8b)), oUb, p8b), pUb), + y8b + ); + } + function dHc() { + dHc = ccb; + cHc = b3c( + f3c(e3c(e3c(new j3c(), (qUb(), nUb), (S8b(), z8b)), oUb, p8b), pUb), + y8b + ); + } + function sXc() { + sXc = ccb; + qXc = new uXc(ane, 0); + rXc = new uXc("POLAR_COORDINATE", 1); + pXc = new uXc("ID", 2); + } + function TAc() { + TAc = ccb; + QAc = new UAc("EQUALLY", 0); + RAc = new UAc(xle, 1); + SAc = new UAc("NORTH_SOUTH", 2); + } + function pAc() { + pAc = ccb; + oAc = as( + (kAc(), + OC(GC(aX, 1), Kie, 260, 0, [iAc, dAc, gAc, eAc, fAc, cAc, hAc, jAc])) + ); + } + function Flc() { + Flc = ccb; + Elc = as( + (Alc(), + OC(GC(KV, 1), Kie, 270, 0, [tlc, wlc, slc, zlc, vlc, ulc, ylc, xlc])) + ); + } + function e6c() { + e6c = ccb; + d6c = as( + (_5c(), + OC(GC(f1, 1), Kie, 277, 0, [$5c, T5c, X5c, Z5c, U5c, V5c, W5c, Y5c])) + ); + } + function Hsd() { + Hsd = ccb; + Gsd = as( + (Csd(), + OC(GC(O3, 1), Kie, 237, 0, [Bsd, ysd, zsd, xsd, Asd, vsd, usd, wsd])) + ); + } + function XNb() { + XNb = ccb; + VNb = new Msd("debugSVG", (Bcb(), false)); + WNb = new Msd("overlapsExisted", true); + } + function Xyb(a, b) { + return Ayb( + new tzb(a), + new vzb(b), + new xzb(b), + new zzb(), + OC(GC(xL, 1), Kie, 132, 0, []) + ); + } + function hyb() { + var a; + if (!dyb) { + dyb = new gyb(); + a = new wyb(""); + uyb(a, ($xb(), Zxb)); + eyb(dyb, a); + } + return dyb; + } + function hr(a, b) { + var c; + Qb(b); + while (a.Ob()) { + c = a.Pb(); + if (!QNc(BD(c, 10))) { + return false; + } + } + return true; + } + function T3c(a, b) { + var c; + c = h4c(n4c(), a); + if (c) { + jkd(b, (Y9c(), F9c), c); + return true; + } else { + return false; + } + } + function d3c(a, b) { + var c; + for (c = 0; c < b.j.c.length; c++) { + BD(B2c(a, c), 21).Gc(BD(B2c(b, c), 14)); + } + return a; + } + function M9b(a, b) { + var c, d; + for (d = new olb(b.b); d.a < d.c.c.length; ) { + c = BD(mlb(d), 29); + a.a[c.p] = _$b(c); + } + } + function stb(a, b) { + var c, d; + uCb(b); + for (d = a.vc().Kc(); d.Ob(); ) { + c = BD(d.Pb(), 42); + b.Od(c.cd(), c.dd()); + } + } + function cId(a, b) { + var c; + if (JD(b, 83)) { + BD(a.c, 76).Xj(); + c = BD(b, 83); + IAd(a, c); + } else { + BD(a.c, 76).Wb(b); + } + } + function Su(a) { + return JD(a, 152) + ? km(BD(a, 152)) + : JD(a, 131) + ? BD(a, 131).a + : JD(a, 54) + ? new ov(a) + : new dv(a); + } + function fac(a, b) { + return b < a.b.gc() + ? BD(a.b.Xb(b), 10) + : b == a.b.gc() + ? a.a + : BD(Ikb(a.e, b - a.b.gc() - 1), 10); + } + function crb(a, b) { + a.a = wbb(a.a, 1); + a.c = Math.min(a.c, b); + a.b = Math.max(a.b, b); + a.d = wbb(a.d, b); + } + function n3b(a, b) { + var c; + Odd(b, "Edge and layer constraint edge reversal", 1); + c = m3b(a); + l3b(c); + Qdd(b); + } + function tAd(a) { + var b; + if (a.d == null) { + ++a.e; + a.f = 0; + sAd(null); + } else { + ++a.e; + b = a.d; + a.d = null; + a.f = 0; + sAd(b); + } + } + function zbb(a) { + var b; + b = a.h; + if (b == 0) { + return a.l + a.m * Hje; + } + if (b == Fje) { + return a.l + a.m * Hje - Ije; + } + return a; + } + function aKb(a) { + $Jb(); + if (a.A.Hc((tdd(), pdd))) { + if (!a.B.Hc((Idd(), Ddd))) { + return _Jb(a); + } + } + return null; + } + function Zgb(a) { + uCb(a); + if (a.length == 0) { + throw vbb(new Oeb("Zero length BigInteger")); + } + dhb(this, a); + } + function Vb(a) { + if (!a) { + throw vbb( + new Zdb("no calls to next() since the last call to remove()") + ); + } + } + function Cbb(a) { + if (Kje < a && a < Ije) { + return a < 0 ? Math.ceil(a) : Math.floor(a); + } + return zbb(fD(a)); + } + function Yyb(a, b) { + var c, d, e; + c = a.c.Ee(); + for (e = b.Kc(); e.Ob(); ) { + d = e.Pb(); + a.a.Od(c, d); + } + return a.b.Kb(c); + } + function Uhd(a, b) { + var c, d, e; + c = a.Jg(); + if (c != null && a.Mg()) { + for (d = 0, e = c.length; d < e; ++d) { + c[d].ui(b); + } + } + } + function f_b(a, b) { + var c, d; + c = a; + d = Q_b(c).e; + while (d) { + c = d; + if (c == b) { + return true; + } + d = Q_b(c).e; + } + return false; + } + function lDc(a, b, c) { + var d, e; + d = a.a.f[b.p]; + e = a.a.f[c.p]; + if (d < e) { + return -1; + } + if (d == e) { + return 0; + } + return 1; + } + function Si(a, b, c) { + var d, e; + e = BD(tn(a.d, b), 19); + d = BD(tn(a.b, c), 19); + return !e || !d ? null : Mi(a, e.a, d.a); + } + function cYc(a, b) { + var c, d; + for (d = new Fyd(a); d.e != d.i.gc(); ) { + c = BD(Dyd(d), 33); + bld(c, c.i + b.b, c.j + b.d); + } + } + function qjc(a, b) { + var c, d; + for (d = new olb(b); d.a < d.c.c.length; ) { + c = BD(mlb(d), 70); + Ekb(a.d, c); + ujc(a, c); + } + } + function pQc(a, b) { + var c, d; + d = new Rkb(); + c = b; + do { + d.c[d.c.length] = c; + c = BD(Ohb(a.k, c), 17); + } while (c); + return d; + } + function Ajd(a, b) { + var c; + if ((a.Db & b) != 0) { + c = zjd(a, b); + return c == -1 ? a.Eb : CD(a.Eb)[c]; + } else { + return null; + } + } + function Lnd(a, b) { + var c, d; + c = ((d = new hLd()), d); + c.G = b; + !a.rb && (a.rb = new jUd(a, d5, a)); + wtd(a.rb, c); + return c; + } + function Mnd(a, b) { + var c, d; + c = ((d = new MPd()), d); + c.G = b; + !a.rb && (a.rb = new jUd(a, d5, a)); + wtd(a.rb, c); + return c; + } + function Hkd(a, b) { + switch (b) { + case 1: + return !!a.n && a.n.i != 0; + case 2: + return a.k != null; + } + return dkd(a, b); + } + function gNc(a) { + switch (a.a.g) { + case 1: + return new NNc(); + case 3: + return new vQc(); + default: + return new wNc(); + } + } + function MRd(a) { + var b; + if (a.g > 1 || a.Ob()) { + ++a.a; + a.g = 0; + b = a.i; + a.Ob(); + return b; + } else { + throw vbb(new utb()); + } + } + function kNc(a) { + fNc(); + var b; + if (!Lpb(eNc, a)) { + b = new hNc(); + b.a = a; + Opb(eNc, a, b); + } + return BD(Mpb(eNc, a), 635); + } + function Rbb(a) { + var b, c, d, e; + e = a; + d = 0; + if (e < 0) { + e += Ije; + d = Fje; + } + c = QD(e / Hje); + b = QD(e - c * Hje); + return TC(b, c, d); + } + function Ox(a) { + var b, c, d; + d = 0; + for (c = new Gqb(a.a); c.a < c.c.a.length; ) { + b = Fqb(c); + a.b.Hc(b) && ++d; + } + return d; + } + function Ku(a) { + var b, c, d; + b = 1; + for (d = a.Kc(); d.Ob(); ) { + c = d.Pb(); + b = 31 * b + (c == null ? 0 : tb(c)); + b = ~~b; + } + return b; + } + function Zwb(a, b) { + var c; + this.c = a; + c = new Rkb(); + Ewb(a, c, b, a.b, null, false, null, false); + this.a = new Bib(c, 0); + } + function p4d(a, b) { + this.b = a; + this.e = b; + this.d = b.j; + this.f = (Q6d(), BD(a, 66).Oj()); + this.k = S6d(b.e.Tg(), a); + } + function xwb(a, b, c) { + this.b = (uCb(a), a); + this.d = (uCb(b), b); + this.e = (uCb(c), c); + this.c = this.d + ("" + this.e); + } + function xRb() { + this.a = BD(Ksd((wSb(), eSb)), 19).a; + this.c = Edb(ED(Ksd(uSb))); + this.b = Edb(ED(Ksd(qSb))); + } + function Nbd() { + Nbd = ccb; + Mbd = as( + (Hbd(), + OC(GC(B1, 1), Kie, 93, 0, [ + zbd, + ybd, + Bbd, + Gbd, + Fbd, + Ebd, + Cbd, + Dbd, + Abd, + ])) + ); + } + function wFb() { + wFb = ccb; + vFb = as( + (rFb(), + OC(GC(dN, 1), Kie, 250, 0, [ + qFb, + lFb, + mFb, + kFb, + oFb, + pFb, + nFb, + jFb, + iFb, + ])) + ); + } + function vLb() { + vLb = ccb; + uLb = new wLb("UP", 0); + rLb = new wLb(vle, 1); + sLb = new wLb(jle, 2); + tLb = new wLb(kle, 3); + } + function rTc() { + rTc = ccb; + qTc = (STc(), QTc); + pTc = new Nsd(Zqe, qTc); + oTc = ($Tc(), ZTc); + nTc = new Nsd($qe, oTc); + } + function Xrc() { + Xrc = ccb; + Vrc = new Yrc("ONE_SIDED", 0); + Wrc = new Yrc("TWO_SIDED", 1); + Urc = new Yrc("OFF", 2); + } + function TQc(a) { + a.r = new Tqb(); + a.w = new Tqb(); + a.t = new Rkb(); + a.i = new Rkb(); + a.d = new Tqb(); + a.a = new I6c(); + a.c = new Lqb(); + } + function uOc(a) { + this.n = new Rkb(); + this.e = new Psb(); + this.j = new Psb(); + this.k = new Rkb(); + this.f = new Rkb(); + this.p = a; + } + function PEc(a, b) { + if (a.c) { + QEc(a, b, true); + MAb(new YAb(null, new Kub(b, 16)), new bFc(a)); + } + QEc(a, b, false); + } + function wFc(a, b, c) { + return a == (rGc(), qGc) + ? new pFc() + : Cub(b, 1) != 0 + ? new iHc(c.length) + : new RGc(c.length); + } + function tNb(a, b) { + var c; + if (!b) { + return a; + } + c = b.Ve(); + c.dc() || (!a.q ? (a.q = new Nqb(c)) : Ld(a.q, c)); + return a; + } + function Erb(a, b) { + var c; + c = a.a.get(b); + if (c === undefined) { + ++a.d; + } else { + urb(a.a, b); + --a.c; + zpb(a.b); + } + return c; + } + function UYb(a, b) { + var c, d, e; + c = b.p - a.p; + if (c == 0) { + d = a.f.a * a.f.b; + e = b.f.a * b.f.b; + return Kdb(d, e); + } + return c; + } + function XLb(a, b) { + var c, d; + c = a.f.c.length; + d = b.f.c.length; + if (c < d) { + return -1; + } + if (c == d) { + return 0; + } + return 1; + } + function KZb(a) { + if (a.b.c.length != 0 && !!BD(Ikb(a.b, 0), 70).a) { + return BD(Ikb(a.b, 0), 70).a; + } + return JZb(a); + } + function Pq(a) { + var b; + if (a) { + b = a; + if (b.dc()) { + throw vbb(new utb()); + } + return b.Xb(b.gc() - 1); + } + return nr(a.Kc()); + } + function vgb(a) { + var b; + ybb(a, 0) < 0 && (a = Lbb(a)); + return (b = Tbb(Obb(a, 32))), 64 - (b != 0 ? heb(b) : heb(Tbb(a)) + 32); + } + function QNc(a) { + var b; + b = BD(vNb(a, (wtc(), Hsc)), 61); + return a.k == (j0b(), e0b) && (b == (Ucd(), Tcd) || b == zcd); + } + function bZb(a, b, c) { + var d, e; + e = BD(vNb(a, (Nyc(), jxc)), 74); + if (e) { + d = new s7c(); + o7c(d, 0, e); + q7c(d, c); + ye(b, d); + } + } + function M_b(a, b, c) { + var d, e, f, g; + g = Q_b(a); + d = g.d; + e = g.c; + f = a.n; + b && (f.a = f.a - d.b - e.a); + c && (f.b = f.b - d.d - e.b); + } + function dcc(a, b) { + var c, d; + c = a.j; + d = b.j; + return c != d + ? c.g - d.g + : a.p == b.p + ? 0 + : c == (Ucd(), Acd) + ? a.p - b.p + : b.p - a.p; + } + function dmc(a) { + var b, c; + bmc(a); + for (c = new olb(a.d); c.a < c.c.c.length; ) { + b = BD(mlb(c), 101); + !!b.i && cmc(b); + } + } + function lBc(a, b, c, d, e) { + NC(a.c[b.g], c.g, d); + NC(a.c[c.g], b.g, d); + NC(a.b[b.g], c.g, e); + NC(a.b[c.g], b.g, e); + } + function G1c(a, b, c, d) { + BD(c.b, 65); + BD(c.b, 65); + BD(d.b, 65); + BD(d.b, 65); + BD(d.b, 65); + Hkb(d.a, new L1c(a, b, d)); + } + function WDb(a, b) { + a.d == (ead(), aad) || a.d == dad + ? BD(b.a, 57).c.Fc(BD(b.b, 57)) + : BD(b.b, 57).c.Fc(BD(b.a, 57)); + } + function Gkd(a, b, c, d) { + if (c == 1) { + return !a.n && (a.n = new cUd(D2, a, 1, 7)), Txd(a.n, b, d); + } + return ckd(a, b, c, d); + } + function Gnd(a, b) { + var c, d; + d = ((c = new BYd()), c); + pnd(d, b); + wtd((!a.A && (a.A = new K4d(u5, a, 7)), a.A), d); + return d; + } + function Zqd(a, b, c) { + var d, e, f, g; + f = null; + g = b; + e = Ypd(g, Jte); + d = new jrd(a, c); + f = (lqd(d.a, d.b, e), e); + return f; + } + function KJd(a) { + var b; + if (!a.a || ((a.Bb & 1) == 0 && a.a.kh())) { + b = wId(a); + JD(b, 148) && (a.a = BD(b, 148)); + } + return a.a; + } + function Be(a, b) { + var c, d; + uCb(b); + for (d = b.Kc(); d.Ob(); ) { + c = d.Pb(); + if (!a.Hc(c)) { + return false; + } + } + return true; + } + function cD(a, b) { + var c, d, e; + c = a.l + b.l; + d = a.m + b.m + (c >> 22); + e = a.h + b.h + (d >> 22); + return TC(c & Eje, d & Eje, e & Fje); + } + function nD(a, b) { + var c, d, e; + c = a.l - b.l; + d = a.m - b.m + (c >> 22); + e = a.h - b.h + (d >> 22); + return TC(c & Eje, d & Eje, e & Fje); + } + function bdb(a) { + var b; + if (a < 128) { + b = (ddb(), cdb)[a]; + !b && (b = cdb[a] = new Xcb(a)); + return b; + } + return new Xcb(a); + } + function ubb(a) { + var b; + if (JD(a, 78)) { + return a; + } + b = a && a.__java$exception; + if (!b) { + b = new lz(a); + Sz(b); + } + return b; + } + function btd(a) { + if (JD(a, 186)) { + return BD(a, 118); + } else if (!a) { + throw vbb(new Heb(gue)); + } else { + return null; + } + } + function Zjb(a, b) { + if (b == null) { + return false; + } + while (a.a != a.b) { + if (pb(b, vkb(a))) { + return true; + } + } + return false; + } + function kib(a) { + if (a.a.Ob()) { + return true; + } + if (a.a != a.d) { + return false; + } + a.a = new orb(a.e.f); + return a.a.Ob(); + } + function Gkb(a, b) { + var c, d; + c = b.Pc(); + d = c.length; + if (d == 0) { + return false; + } + bCb(a.c, a.c.length, c); + return true; + } + function Vyb(a, b, c) { + var d, e; + for (e = b.vc().Kc(); e.Ob(); ) { + d = BD(e.Pb(), 42); + a.yc(d.cd(), d.dd(), c); + } + return a; + } + function yac(a, b) { + var c, d; + for (d = new olb(a.b); d.a < d.c.c.length; ) { + c = BD(mlb(d), 70); + yNb(c, (wtc(), Ssc), b); + } + } + function FZc(a, b, c) { + var d, e; + for (e = new olb(a.b); e.a < e.c.c.length; ) { + d = BD(mlb(e), 33); + bld(d, d.i + b, d.j + c); + } + } + function Nb(a, b) { + if (!a) { + throw vbb( + new Wdb( + hc("value already present: %s", OC(GC(SI, 1), Uhe, 1, 5, [b])) + ) + ); + } + } + function mEb(a, b) { + if (!a || !b || a == b) { + return false; + } + return CDb(a.d.c, b.d.c + b.d.b) && CDb(b.d.c, a.d.c + a.d.b); + } + function xyb() { + oyb(); + if (lyb) { + return new wyb(null); + } + return fyb(hyb(), "com.google.common.base.Strings"); + } + function J2c(a, b) { + var c; + c = Pu(b.a.gc()); + MAb(VAb(new YAb(null, new Kub(b, 1)), a.i), new W2c(a, c)); + return c; + } + function Hnd(a) { + var b, c; + c = ((b = new BYd()), b); + pnd(c, "T"); + wtd((!a.d && (a.d = new K4d(u5, a, 11)), a.d), c); + return c; + } + function Etd(a) { + var b, c, d, e; + b = 1; + for (c = 0, e = a.gc(); c < e; ++c) { + d = a.ki(c); + b = 31 * b + (d == null ? 0 : tb(d)); + } + return b; + } + function Wi(a, b, c, d) { + var e; + Pb(b, a.e.Hd().gc()); + Pb(c, a.c.Hd().gc()); + e = a.a[b][c]; + NC(a.a[b], c, d); + return e; + } + function OC(a, b, c, d, e) { + e.gm = a; + e.hm = b; + e.im = gcb; + e.__elementTypeId$ = c; + e.__elementTypeCategory$ = d; + return e; + } + function p6c(a, b, c, d, e) { + i6c(); + return Math.min( + A6c(a, b, c, d, e), + A6c(c, d, a, b, V6c(new f7c(e.a, e.b))) + ); + } + function gbc() { + gbc = ccb; + fbc = new ibc(ane, 0); + dbc = new ibc(Gne, 1); + ebc = new ibc(Hne, 2); + cbc = new ibc("BOTH", 3); + } + function Ajc() { + Ajc = ccb; + wjc = new Bjc(gle, 0); + xjc = new Bjc(jle, 1); + yjc = new Bjc(kle, 2); + zjc = new Bjc("TOP", 3); + } + function lWb() { + lWb = ccb; + hWb = new oWb("Q1", 0); + kWb = new oWb("Q4", 1); + iWb = new oWb("Q2", 2); + jWb = new oWb("Q3", 3); + } + function LBc() { + LBc = ccb; + JBc = new MBc("OFF", 0); + KBc = new MBc("SINGLE_EDGE", 1); + IBc = new MBc("MULTI_EDGE", 2); + } + function a1c() { + a1c = ccb; + _0c = new c1c("MINIMUM_SPANNING_TREE", 0); + $0c = new c1c("MAXIMUM_SPANNING_TREE", 1); + } + function Y1c() { + Y1c = ccb; + new Lsd("org.eclipse.elk.addLayoutConfig"); + W1c = new k2c(); + V1c = new f2c(); + X1c = new i2c(); + } + function URc(a) { + var b, c, d; + b = new Psb(); + for (d = Jsb(a.d, 0); d.b != d.d.c; ) { + c = BD(Xsb(d), 188); + Dsb(b, c.c); + } + return b; + } + function dVc(a) { + var b, c, d, e; + e = new Rkb(); + for (d = a.Kc(); d.Ob(); ) { + c = BD(d.Pb(), 33); + b = gVc(c); + Gkb(e, b); + } + return e; + } + function xcc(a) { + var b; + PZb(a, true); + b = _ie; + wNb(a, (Nyc(), cyc)) && (b += BD(vNb(a, cyc), 19).a); + yNb(a, cyc, meb(b)); + } + function q1c(a, b, c) { + var d; + Uhb(a.a); + Hkb(c.i, new B1c(a)); + d = new hDb(BD(Ohb(a.a, b.b), 65)); + p1c(a, d, b); + c.f = d; + } + function QLc(a, b) { + var c, d; + c = a.c; + d = b.e[a.p]; + if (d < c.a.c.length - 1) { + return BD(Ikb(c.a, d + 1), 10); + } + return null; + } + function rr(a, b) { + var c, d; + Rb(b, "predicate"); + for (d = 0; a.Ob(); d++) { + c = a.Pb(); + if (b.Lb(c)) { + return d; + } + } + return -1; + } + function ZEd(a, b) { + var c, d; + d = 0; + if (a < 64 && a <= b) { + b = b < 64 ? b : 63; + for (c = a; c <= b; c++) { + d = Mbb(d, Nbb(1, c)); + } + } + return d; + } + function pmb(a) { + mmb(); + var b, c, d; + d = 0; + for (c = a.Kc(); c.Ob(); ) { + b = c.Pb(); + d = d + (b != null ? tb(b) : 0); + d = d | 0; + } + return d; + } + function etd(a) { + var b, c; + c = (Fhd(), (b = new rmd()), b); + !!a && wtd((!a.a && (a.a = new cUd(A2, a, 6, 6)), a.a), c); + return c; + } + function TA(a) { + var b; + b = new PA(); + b.a = a; + b.b = RA(a); + b.c = KC(ZI, nie, 2, 2, 6, 1); + b.c[0] = SA(a); + b.c[1] = SA(a); + return b; + } + function fkd(a, b) { + switch (b) { + case 0: + !a.o && (a.o = new dId((Thd(), Qhd), S2, a, 0)); + a.o.c.$b(); + return; + } + Cid(a, b); + } + function jEb(a, b, c) { + switch (c.g) { + case 2: + a.b = b; + break; + case 1: + a.c = b; + break; + case 4: + a.d = b; + break; + case 3: + a.a = b; + } + } + function sbd(a) { + switch (a.g) { + case 1: + return obd; + case 2: + return nbd; + case 3: + return pbd; + default: + return qbd; + } + } + function Zac(a) { + switch (BD(vNb(a, (Nyc(), mxc)), 163).g) { + case 2: + case 4: + return true; + default: + return false; + } + } + function Trc() { + Trc = ccb; + Src = as( + (Orc(), + OC(GC(PW, 1), Kie, 256, 0, [ + Frc, + Hrc, + Irc, + Jrc, + Krc, + Lrc, + Nrc, + Erc, + Grc, + Mrc, + ])) + ); + } + function Ndd() { + Ndd = ccb; + Mdd = as( + (Idd(), + OC(GC(J1, 1), Kie, 259, 0, [ + Bdd, + Ddd, + Add, + Edd, + Fdd, + Hdd, + Gdd, + Cdd, + zdd, + ])) + ); + } + function wUc() { + wUc = ccb; + vUc = e3c( + b3c( + b3c(g3c(e3c(new j3c(), (yRc(), vRc), (qSc(), pSc)), wRc), mSc), + nSc + ), + xRc, + oSc + ); + } + function Gqc() { + Gqc = ccb; + Eqc = new Hqc(ane, 0); + Dqc = new Hqc("INCOMING_ONLY", 1); + Fqc = new Hqc("OUTGOING_ONLY", 2); + } + function rC() { + rC = ccb; + qC = { + boolean: sC, + number: tC, + string: vC, + object: uC, + function: uC, + undefined: wC, + }; + } + function Whb(a, b) { + mCb(a >= 0, "Negative initial capacity"); + mCb(b >= 0, "Non-positive load factor"); + Uhb(this); + } + function _Ed(a, b, c) { + if (a >= 128) return false; + return a < 64 + ? Kbb(xbb(Nbb(1, a), c), 0) + : Kbb(xbb(Nbb(1, a - 64), b), 0); + } + function bOb(a, b) { + if (!a || !b || a == b) { + return false; + } + return Jy(a.b.c, b.b.c + b.b.b) < 0 && Jy(b.b.c, a.b.c + a.b.b) < 0; + } + function I4b(a) { + var b, c, d; + c = a.n; + d = a.o; + b = a.d; + return new J6c( + c.a - b.b, + c.b - b.d, + d.a + (b.b + b.c), + d.b + (b.d + b.a) + ); + } + function $ic(a) { + var b, c, d, e; + for (c = a.a, d = 0, e = c.length; d < e; ++d) { + b = c[d]; + djc(a, b, (Ucd(), Rcd)); + djc(a, b, Acd); + } + } + function Uy(a) { + var b, c, d, e; + for ( + b = (a.j == null && (a.j = (Rz(), (e = Qz.ce(a)), Tz(e))), a.j), + c = 0, + d = b.length; + c < d; + ++c + ); + } + function hD(a) { + var b, c, d; + b = (~a.l + 1) & Eje; + c = (~a.m + (b == 0 ? 1 : 0)) & Eje; + d = (~a.h + (b == 0 && c == 0 ? 1 : 0)) & Fje; + return TC(b, c, d); + } + function C$c(a, b) { + var c, d; + c = BD(BD(Ohb(a.g, b.a), 46).a, 65); + d = BD(BD(Ohb(a.g, b.b), 46).a, 65); + return _Nb(c, d); + } + function xtd(a, b, c) { + var d; + d = a.gc(); + if (b > d) throw vbb(new Cyd(b, d)); + a.hi() && (c = Dtd(a, c)); + return a.Vh(b, c); + } + function xNb(a, b, c) { + return ( + c == null + ? (!a.q && (a.q = new Lqb()), Thb(a.q, b)) + : (!a.q && (a.q = new Lqb()), Rhb(a.q, b, c)), + a + ); + } + function yNb(a, b, c) { + c == null + ? (!a.q && (a.q = new Lqb()), Thb(a.q, b)) + : (!a.q && (a.q = new Lqb()), Rhb(a.q, b, c)); + return a; + } + function TQb(a) { + var b, c; + c = new kRb(); + tNb(c, a); + yNb(c, (HSb(), FSb), a); + b = new Lqb(); + VQb(a, c, b); + UQb(a, c, b); + return c; + } + function j6c(a) { + i6c(); + var b, c, d; + c = KC(m1, nie, 8, 2, 0, 1); + d = 0; + for (b = 0; b < 2; b++) { + d += 0.5; + c[b] = r6c(d, a); + } + return c; + } + function Mic(a, b) { + var c, d, e, f; + c = false; + d = a.a[b].length; + for (f = 0; f < d - 1; f++) { + e = f + 1; + c = c | Nic(a, b, f, e); + } + return c; + } + function nNb(a, b, c, d, e) { + var f, g; + for (g = c; g <= e; g++) { + for (f = b; f <= d; f++) { + YMb(a, f, g) || aNb(a, f, g, true, false); + } + } + } + function rNd(a, b) { + this.b = a; + nNd.call(this, (BD(qud(ZKd((NFd(), MFd).o), 10), 18), b.i), b.g); + this.a = (NKd(), MKd); + } + function hj(a, b) { + this.c = a; + this.d = b; + this.b = (this.d / this.c.c.Hd().gc()) | 0; + this.a = this.d % this.c.c.Hd().gc(); + } + function jdb() { + ++edb; + this.o = null; + this.k = null; + this.j = null; + this.d = null; + this.b = null; + this.n = null; + this.a = null; + } + function fB(a, b, c) { + this.q = new Date(); + this.q.setFullYear(a + nje, b, c); + this.q.setHours(0, 0, 0, 0); + YA(this, 0); + } + function tAc() { + tAc = ccb; + rAc = new uAc(ane, 0); + qAc = new uAc("NODES_AND_EDGES", 1); + sAc = new uAc("PREFER_EDGES", 2); + } + function RA(a) { + var b; + if (a == 0) { + return "Etc/GMT"; + } + if (a < 0) { + a = -a; + b = "Etc/GMT-"; + } else { + b = "Etc/GMT+"; + } + return b + UA(a); + } + function geb(a) { + var b; + if (a < 0) { + return Rie; + } else if (a == 0) { + return 0; + } else { + for (b = Iie; (b & a) == 0; b >>= 1); + return b; + } + } + function $C(a) { + var b, c; + c = heb(a.h); + if (c == 32) { + b = heb(a.m); + return b == 32 ? heb(a.l) + 32 : b + 20 - 10; + } else { + return c - 12; + } + } + function bkb(a) { + var b; + b = a.a[a.b]; + if (b == null) { + return null; + } + NC(a.a, a.b, null); + a.b = (a.b + 1) & (a.a.length - 1); + return b; + } + function EDc(a) { + var b, c; + b = a.t - a.k[a.o.p] * a.d + a.j[a.o.p] > a.f; + c = a.u + a.e[a.o.p] * a.d > a.f * a.s * a.d; + return b || c; + } + function Iwb(a, b, c) { + var d, e; + d = new exb(b, c); + e = new fxb(); + a.b = Gwb(a, a.b, d, e); + e.b || ++a.c; + a.b.b = false; + return e.d; + } + function djc(a, b, c) { + var d, e, f, g; + g = CHc(b, c); + f = 0; + for (e = g.Kc(); e.Ob(); ) { + d = BD(e.Pb(), 11); + Rhb(a.c, d, meb(f++)); + } + } + function xVb(a) { + var b, c; + for (c = new olb(a.a.b); c.a < c.c.c.length; ) { + b = BD(mlb(c), 81); + b.g.c = -b.g.c - b.g.b; + } + sVb(a); + } + function XDb(a) { + var b, c; + for (c = new olb(a.a.b); c.a < c.c.c.length; ) { + b = BD(mlb(c), 57); + b.d.c = -b.d.c - b.d.b; + } + RDb(a); + } + function AUd(a) { + var b; + if (!a.c || ((a.Bb & 1) == 0 && (a.c.Db & 64) != 0)) { + b = wId(a); + JD(b, 88) && (a.c = BD(b, 26)); + } + return a.c; + } + function ZC(a) { + var b, c, d; + b = (~a.l + 1) & Eje; + c = (~a.m + (b == 0 ? 1 : 0)) & Eje; + d = (~a.h + (b == 0 && c == 0 ? 1 : 0)) & Fje; + a.l = b; + a.m = c; + a.h = d; + } + function l7c(a) { + var b, c, d, e, f; + b = new d7c(); + for (d = a, e = 0, f = d.length; e < f; ++e) { + c = d[e]; + b.a += c.a; + b.b += c.b; + } + return b; + } + function nmb(a, b) { + mmb(); + var c, d, e, f, g; + g = false; + for (d = b, e = 0, f = d.length; e < f; ++e) { + c = d[e]; + g = g | a.Fc(c); + } + return g; + } + function w6c(a) { + i6c(); + var b, c; + c = -1.7976931348623157e308; + for (b = 0; b < a.length; b++) { + a[b] > c && (c = a[b]); + } + return c; + } + function SHc(a, b, c) { + var d; + d = new Rkb(); + UHc(a, b, d, (Ucd(), zcd), true, false); + UHc(a, c, d, Tcd, false, false); + return d; + } + function crd(a, b, c) { + var d, e, f, g; + f = null; + g = b; + e = Ypd(g, "labels"); + d = new Hrd(a, c); + f = (Dqd(d.a, d.b, e), e); + return f; + } + function j1d(a, b, c, d) { + var e; + e = r1d(a, b, c, d); + if (!e) { + e = i1d(a, c, d); + if (!!e && !e1d(a, b, e)) { + return null; + } + } + return e; + } + function m1d(a, b, c, d) { + var e; + e = s1d(a, b, c, d); + if (!e) { + e = l1d(a, c, d); + if (!!e && !e1d(a, b, e)) { + return null; + } + } + return e; + } + function Xb(a, b) { + var c; + for (c = 0; c < a.a.a.length; c++) { + if (!BD($lb(a.a, c), 169).Lb(b)) { + return false; + } + } + return true; + } + function Cb(a, b, c) { + Qb(b); + if (c.Ob()) { + Mfb(b, Fb(c.Pb())); + while (c.Ob()) { + Mfb(b, a.a); + Mfb(b, Fb(c.Pb())); + } + } + return b; + } + function qmb(a) { + mmb(); + var b, c, d; + d = 1; + for (c = a.Kc(); c.Ob(); ) { + b = c.Pb(); + d = 31 * d + (b != null ? tb(b) : 0); + d = d | 0; + } + return d; + } + function WC(a, b, c, d, e) { + var f; + f = lD(a, b); + c && ZC(f); + if (e) { + a = YC(a, b); + d ? (QC = hD(a)) : (QC = TC(a.l, a.m, a.h)); + } + return f; + } + function Xzb(b, c) { + var d; + try { + c.Vd(); + } catch (a) { + a = ubb(a); + if (JD(a, 78)) { + d = a; + b.c[b.c.length] = d; + } else throw vbb(a); + } + } + function jRb(a, b, c) { + var d, e; + if (JD(b, 144) && !!c) { + d = BD(b, 144); + e = c; + return a.a[d.b][e.b] + a.a[e.b][d.b]; + } + return 0; + } + function xld(a, b) { + switch (b) { + case 7: + return !!a.e && a.e.i != 0; + case 8: + return !!a.d && a.d.i != 0; + } + return Ykd(a, b); + } + function YQb(a, b) { + switch (b.g) { + case 0: + JD(a.b, 631) || (a.b = new xRb()); + break; + case 1: + JD(a.b, 632) || (a.b = new DRb()); + } + } + function Ghe(a, b) { + while ( + a.g == null && !a.c + ? Uud(a) + : a.g == null || (a.i != 0 && BD(a.g[a.i - 1], 47).Ob()) + ) { + Ord(b, Vud(a)); + } + } + function kic(a, b, c) { + a.g = qic(a, b, (Ucd(), zcd), a.b); + a.d = qic(a, c, zcd, a.b); + if (a.g.c == 0 || a.d.c == 0) { + return; + } + nic(a); + } + function lic(a, b, c) { + a.g = qic(a, b, (Ucd(), Tcd), a.j); + a.d = qic(a, c, Tcd, a.j); + if (a.g.c == 0 || a.d.c == 0) { + return; + } + nic(a); + } + function $yc(a, b, c) { + return !WAb( + JAb(new YAb(null, new Kub(a.c, 16)), new Xxb(new dfd(b, c))) + ).sd((EAb(), DAb)); + } + function KAb(a) { + var b; + Tzb(a); + b = new NBb(); + if (a.a.sd(b)) { + return Atb(), new Ftb(uCb(b.a)); + } + return Atb(), Atb(), ztb; + } + function nA(a) { + var b; + if (a.b <= 0) { + return false; + } + b = hfb("MLydhHmsSDkK", wfb(bfb(a.c, 0))); + return b > 1 || (b >= 0 && a.b < 3); + } + function w7c(a) { + var b, c, d; + b = new s7c(); + for (d = Jsb(a, 0); d.b != d.d.c; ) { + c = BD(Xsb(d), 8); + St(b, 0, new g7c(c)); + } + return b; + } + function qVb(a) { + var b, c; + for (c = new olb(a.a.b); c.a < c.c.c.length; ) { + b = BD(mlb(c), 81); + b.f.$b(); + } + LVb(a.b, a); + rVb(a); + } + function tb(a) { + return ND(a) + ? LCb(a) + : LD(a) + ? Hdb(a) + : KD(a) + ? (uCb(a), a) + ? 1231 + : 1237 + : ID(a) + ? a.Hb() + : MC(a) + ? FCb(a) + : rz(a); + } + function rb(a) { + return ND(a) + ? ZI + : LD(a) + ? BI + : KD(a) + ? wI + : ID(a) + ? a.gm + : MC(a) + ? a.gm + : a.gm || (Array.isArray(a) && GC(PH, 1)) || PH; + } + function j_c(a) { + switch (a.g) { + case 0: + return new Q1c(); + default: + throw vbb(new Wdb(Mre + (a.f != null ? a.f : "" + a.g))); + } + } + function S0c(a) { + switch (a.g) { + case 0: + return new k1c(); + default: + throw vbb(new Wdb(Mre + (a.f != null ? a.f : "" + a.g))); + } + } + function ekd(a, b, c) { + switch (b) { + case 0: + !a.o && (a.o = new dId((Thd(), Qhd), S2, a, 0)); + cId(a.o, c); + return; + } + yid(a, b, c); + } + function XRc(a, b, c) { + this.g = a; + this.e = new d7c(); + this.f = new d7c(); + this.d = new Psb(); + this.b = new Psb(); + this.a = b; + this.c = c; + } + function PZc(a, b, c, d) { + this.b = new Rkb(); + this.n = new Rkb(); + this.i = d; + this.j = c; + this.s = a; + this.t = b; + this.r = 0; + this.d = 0; + } + function nib(a) { + this.e = a; + this.d = new Irb(this.e.g); + this.a = this.d; + this.b = kib(this); + this.$modCount = a.$modCount; + } + function Pr(a) { + while (!a.d || !a.d.Ob()) { + if (!!a.b && !akb(a.b)) { + a.d = BD(fkb(a.b), 47); + } else { + return null; + } + } + return a.d; + } + function Xyc(a) { + Ekb(a.c, (Y1c(), W1c)); + if (Ky(a.a, Edb(ED(Ksd((dzc(), bzc)))))) { + return new Zed(); + } + return new _ed(a); + } + function bRc(a) { + switch (a.g) { + case 1: + return Sqe; + default: + case 2: + return 0; + case 3: + return cme; + case 4: + return Tqe; + } + } + function Ife() { + wfe(); + var a; + if (dfe) return dfe; + a = Afe(Kfe("M", true)); + a = Bfe(Kfe("M", false), a); + dfe = a; + return dfe; + } + function Awb(a, b) { + var c, d, e; + e = a.b; + while (e) { + c = a.a.ue(b, e.d); + if (c == 0) { + return e; + } + d = c < 0 ? 0 : 1; + e = e.a[d]; + } + return null; + } + function Tyb(a, b, c) { + var d, e; + d = (Bcb(), _Pb(c) ? true : false); + e = BD(b.xc(d), 15); + if (!e) { + e = new Rkb(); + b.zc(d, e); + } + e.Fc(c); + } + function dYc(a, b) { + var c, d; + c = BD(hkd(a, (lZc(), UYc)), 19).a; + d = BD(hkd(b, UYc), 19).a; + return c == d ? -1 : c < d ? -1 : c > d ? 1 : 0; + } + function NYb(a, b) { + if (OYb(a, b)) { + Rc(a.b, BD(vNb(b, (wtc(), Esc)), 21), b); + Dsb(a.a, b); + return true; + } else { + return false; + } + } + function d3b(a) { + var b, c; + b = BD(vNb(a, (wtc(), gtc)), 10); + if (b) { + c = b.c; + Lkb(c.a, b); + c.a.c.length == 0 && Lkb(Q_b(b).b, c); + } + } + function syb(a) { + if (lyb) { + return KC(qL, tke, 572, 0, 0, 1); + } + return BD(Qkb(a.a, KC(qL, tke, 572, a.a.c.length, 0, 1)), 842); + } + function mn(a, b, c, d) { + Vm(); + return new wx( + OC(GC(CK, 1), zie, 42, 0, [ + (Wj(a, b), new Wo(a, b)), + (Wj(c, d), new Wo(c, d)), + ]) + ); + } + function Dnd(a, b, c) { + var d, e; + e = ((d = new SSd()), d); + $nd(e, b, c); + wtd((!a.q && (a.q = new cUd(n5, a, 11, 10)), a.q), e); + return e; + } + function Zmd(a) { + var b, c, d, e; + e = icb(Rmd, a); + c = e.length; + d = KC(ZI, nie, 2, c, 6, 1); + for (b = 0; b < c; ++b) { + d[b] = e[b]; + } + return d; + } + function l4c(a, b) { + var c, d, e, f, g; + for (d = b, e = 0, f = d.length; e < f; ++e) { + c = d[e]; + g = new v4c(a); + c.Qe(g); + q4c(g); + } + Uhb(a.f); + } + function hw(a, b) { + var c; + if (b === a) { + return true; + } + if (JD(b, 224)) { + c = BD(b, 224); + return pb(a.Zb(), c.Zb()); + } + return false; + } + function aub(a, b) { + var c; + if (b * 2 + 1 >= a.b.c.length) { + return; + } + aub(a, 2 * b + 1); + c = 2 * b + 2; + c < a.b.c.length && aub(a, c); + bub(a, b); + } + function Ss(a, b, c) { + var d, e; + this.g = a; + this.c = b; + this.a = this; + this.d = this; + e = Kp(c); + d = KC(BG, Gie, 330, e, 0, 1); + this.b = d; + } + function whb(a, b, c) { + var d; + for (d = c - 1; d >= 0 && a[d] === b[d]; d--); + return d < 0 ? 0 : Gbb(xbb(a[d], Yje), xbb(b[d], Yje)) ? -1 : 1; + } + function UFc(a, b) { + var c, d; + for (d = Jsb(a, 0); d.b != d.d.c; ) { + c = BD(Xsb(d), 214); + if (c.e.length > 0) { + b.td(c); + c.i && _Fc(c); + } + } + } + function nzd(a, b) { + var c, d; + d = BD(Ajd(a.a, 4), 126); + c = KC($3, hve, 415, b, 0, 1); + d != null && $fb(d, 0, c, 0, d.length); + return c; + } + function JEd(a, b) { + var c; + c = new NEd( + (a.f & 256) != 0, + a.i, + a.a, + a.d, + (a.f & 16) != 0, + a.j, + a.g, + b + ); + a.e != null || (c.c = a); + return c; + } + function Dc(a, b) { + var c, d; + for (d = a.Zb().Cc().Kc(); d.Ob(); ) { + c = BD(d.Pb(), 14); + if (c.Hc(b)) { + return true; + } + } + return false; + } + function oNb(a, b, c, d, e) { + var f, g; + for (g = c; g <= e; g++) { + for (f = b; f <= d; f++) { + if (YMb(a, f, g)) { + return true; + } + } + } + return false; + } + function Tt(a, b, c) { + var d, e, f, g; + uCb(c); + g = false; + f = a.Zc(b); + for (e = c.Kc(); e.Ob(); ) { + d = e.Pb(); + f.Rb(d); + g = true; + } + return g; + } + function Dv(a, b) { + var c; + if (a === b) { + return true; + } else if (JD(b, 83)) { + c = BD(b, 83); + return Ax(Wm(a), c.vc()); + } + return false; + } + function Nhb(a, b, c) { + var d, e; + for (e = c.Kc(); e.Ob(); ) { + d = BD(e.Pb(), 42); + if (a.re(b, d.dd())) { + return true; + } + } + return false; + } + function Hic(a, b, c) { + if (!a.d[b.p][c.p]) { + Gic(a, b, c); + a.d[b.p][c.p] = true; + a.d[c.p][b.p] = true; + } + return a.a[b.p][c.p]; + } + function Itd(a, b) { + if (!a.ai() && b == null) { + throw vbb(new Wdb("The 'no null' constraint is violated")); + } + return b; + } + function $Jd(a, b) { + if (a.D == null && a.B != null) { + a.D = a.B; + a.B = null; + } + jKd(a, b == null ? null : (uCb(b), b)); + !!a.C && a.yk(null); + } + function XHc(a, b) { + var c; + if (!a || a == b || !wNb(b, (wtc(), Psc))) { + return false; + } + c = BD(vNb(b, (wtc(), Psc)), 10); + return c != a; + } + function b4d(a) { + switch (a.i) { + case 2: { + return true; + } + case 1: { + return false; + } + case -1: { + ++a.c; + } + default: { + return a.pl(); + } + } + } + function c4d(a) { + switch (a.i) { + case -2: { + return true; + } + case -1: { + return false; + } + case 1: { + --a.c; + } + default: { + return a.ql(); + } + } + } + function Xdb(a) { + Zy.call( + this, + "The given string does not match the expected format for individual spacings.", + a + ); + } + function pgd() { + pgd = ccb; + mgd = new qgd("ELK", 0); + ngd = new qgd("JSON", 1); + lgd = new qgd("DOT", 2); + ogd = new qgd("SVG", 3); + } + function pWc() { + pWc = ccb; + mWc = new rWc(ane, 0); + nWc = new rWc("RADIAL_COMPACTION", 1); + oWc = new rWc("WEDGE_COMPACTION", 2); + } + function Fyb() { + Fyb = ccb; + Cyb = new Gyb("CONCURRENT", 0); + Dyb = new Gyb("IDENTITY_FINISH", 1); + Eyb = new Gyb("UNORDERED", 2); + } + function nPb() { + nPb = ccb; + kPb = (cPb(), bPb); + jPb = new Nsd(Tle, kPb); + iPb = new Lsd(Ule); + lPb = new Lsd(Vle); + mPb = new Lsd(Wle); + } + function Occ() { + Occ = ccb; + Mcc = new Zcc(); + Ncc = new _cc(); + Lcc = new bdc(); + Kcc = new fdc(); + Jcc = new jdc(); + Icc = (uCb(Jcc), new bpb()); + } + function tBc() { + tBc = ccb; + qBc = new uBc("CONSERVATIVE", 0); + rBc = new uBc("CONSERVATIVE_SOFT", 1); + sBc = new uBc("SLOPPY", 2); + } + function Zad() { + Zad = ccb; + Xad = new q0b(15); + Wad = new Osd((Y9c(), f9c), Xad); + Yad = C9c; + Sad = s8c; + Tad = Y8c; + Vad = _8c; + Uad = $8c; + } + function o7c(a, b, c) { + var d, e, f; + d = new Psb(); + for (f = Jsb(c, 0); f.b != f.d.c; ) { + e = BD(Xsb(f), 8); + Dsb(d, new g7c(e)); + } + Tt(a, b, d); + } + function r7c(a) { + var b, c, d; + b = 0; + d = KC(m1, nie, 8, a.b, 0, 1); + c = Jsb(a, 0); + while (c.b != c.d.c) { + d[b++] = BD(Xsb(c), 8); + } + return d; + } + function $Pd(a) { + var b; + b = (!a.a && (a.a = new cUd(g5, a, 9, 5)), a.a); + if (b.i != 0) { + return nQd(BD(qud(b, 0), 678)); + } + return null; + } + function Ly(a, b) { + var c; + c = wbb(a, b); + if (Gbb(Vbb(a, b), 0) | Ebb(Vbb(a, c), 0)) { + return c; + } + return wbb(rie, Vbb(Pbb(c, 63), 1)); + } + function Yyc(a, b) { + var c; + c = + Ksd((dzc(), bzc)) != null && b.wg() != null + ? Edb(ED(b.wg())) / Edb(ED(Ksd(bzc))) + : 1; + Rhb(a.b, b, c); + } + function le(a, b) { + var c, d; + c = BD(a.d.Bc(b), 14); + if (!c) { + return null; + } + d = a.e.hc(); + d.Gc(c); + a.e.d -= c.gc(); + c.$b(); + return d; + } + function AHc(a, b) { + var c, d; + d = a.c[b]; + if (d == 0) { + return; + } + a.c[b] = 0; + a.d -= d; + c = b + 1; + while (c < a.a.length) { + a.a[c] -= d; + c += c & -c; + } + } + function rwb(a) { + var b; + b = a.a.c.length; + if (b > 0) { + return _vb(b - 1, a.a.c.length), Kkb(a.a, b - 1); + } else { + throw vbb(new Jpb()); + } + } + function C2c(a, b, c) { + if (b < 0) { + throw vbb(new qcb(ese + b)); + } + if (b < a.j.c.length) { + Nkb(a.j, b, c); + } else { + A2c(a, b); + Ekb(a.j, c); + } + } + function oCb(a, b, c) { + if (a > b) { + throw vbb(new Wdb(xke + a + yke + b)); + } + if (a < 0 || b > c) { + throw vbb(new scb(xke + a + zke + b + oke + c)); + } + } + function j5c(a) { + if (!a.a || (a.a.i & 8) == 0) { + throw vbb( + new Zdb("Enumeration class expected for layout option " + a.f) + ); + } + } + function vud(a) { + var b; + ++a.j; + if (a.i == 0) { + a.g = null; + } else if (a.i < a.g.length) { + b = a.g; + a.g = a.ri(a.i); + $fb(b, 0, a.g, 0, a.i); + } + } + function hkb(a, b) { + var c, d; + c = a.a.length - 1; + a.c = (a.c - 1) & c; + while (b != a.c) { + d = (b + 1) & c; + NC(a.a, b, a.a[d]); + b = d; + } + NC(a.a, a.c, null); + } + function ikb(a, b) { + var c, d; + c = a.a.length - 1; + while (b != a.b) { + d = (b - 1) & c; + NC(a.a, b, a.a[d]); + b = d; + } + NC(a.a, a.b, null); + a.b = (a.b + 1) & c; + } + function Fkb(a, b, c) { + var d, e; + wCb(b, a.c.length); + d = c.Pc(); + e = d.length; + if (e == 0) { + return false; + } + bCb(a.c, b, d); + return true; + } + function VEd(a) { + var b, c; + if (a == null) return null; + for (b = 0, c = a.length; b < c; b++) { + if (!gFd(a[b])) return a[b]; + } + return null; + } + function grb(a, b, c) { + var d, e, f, g; + for (e = c, f = 0, g = e.length; f < g; ++f) { + d = e[f]; + if (a.b.re(b, d.cd())) { + return d; + } + } + return null; + } + function Hlb(a) { + var b, c, d, e, f; + f = 1; + for (c = a, d = 0, e = c.length; d < e; ++d) { + b = c[d]; + f = 31 * f + (b != null ? tb(b) : 0); + f = f | 0; + } + return f; + } + function as(a) { + var b, c, d, e, f; + b = {}; + for (d = a, e = 0, f = d.length; e < f; ++e) { + c = d[e]; + b[":" + (c.f != null ? c.f : "" + c.g)] = c; + } + return b; + } + function gr(a) { + var b; + Qb(a); + Mb(true, "numberToAdvance must be nonnegative"); + for (b = 0; b < 0 && Qr(a); b++) { + Rr(a); + } + return b; + } + function eDc(a) { + var b, c, d; + d = 0; + for (c = new Sr(ur(a.a.Kc(), new Sq())); Qr(c); ) { + b = BD(Rr(c), 17); + b.c.i == b.d.i || ++d; + } + return d; + } + function HZb(a, b) { + var c, d, e; + c = a; + e = 0; + do { + if (c == b) { + return e; + } + d = c.e; + if (!d) { + throw vbb(new Vdb()); + } + c = Q_b(d); + ++e; + } while (true); + } + function w$c(a, b) { + var c, d, e; + e = b - a.f; + for (d = new olb(a.d); d.a < d.c.c.length; ) { + c = BD(mlb(d), 443); + _Zc(c, c.e, c.f + e); + } + a.f = b; + } + function aRc(a, b, c) { + if (Math.abs(b - a) < Rqe || Math.abs(c - a) < Rqe) { + return true; + } + return b - a > Rqe ? a - c > Rqe : c - a > Rqe; + } + function pHb(a, b) { + if (!a) { + return 0; + } + if (b && !a.j) { + return 0; + } + if (JD(a, 124)) { + if (BD(a, 124).a.b == 0) { + return 0; + } + } + return a.Re(); + } + function qHb(a, b) { + if (!a) { + return 0; + } + if (b && !a.k) { + return 0; + } + if (JD(a, 124)) { + if (BD(a, 124).a.a == 0) { + return 0; + } + } + return a.Se(); + } + function fhb(a) { + Hgb(); + if (a < 0) { + if (a != -1) { + return new Tgb(-1, -a); + } + return Bgb; + } else return a <= 10 ? Dgb[QD(a)] : new Tgb(1, a); + } + function xC(a) { + rC(); + throw vbb( + new MB( + "Unexpected typeof result '" + + a + + "'; please report this bug to the GWT team" + ) + ); + } + function lz(a) { + jz(); + Py(this); + Ry(this); + this.e = a; + Sy(this, a); + this.g = a == null ? Xhe : fcb(a); + this.a = ""; + this.b = a; + this.a = ""; + } + function F$c() { + this.a = new G$c(); + this.f = new I$c(this); + this.b = new K$c(this); + this.i = new M$c(this); + this.e = new O$c(this); + } + function ss() { + rs.call(this, new _rb(Cv(16))); + Xj(2, mie); + this.b = 2; + this.a = new Ms(null, null, 0, null); + As(this.a, this.a); + } + function xzc() { + xzc = ccb; + uzc = new zzc("DUMMY_NODE_OVER", 0); + vzc = new zzc("DUMMY_NODE_UNDER", 1); + wzc = new zzc("EQUAL", 2); + } + function LUb() { + LUb = ccb; + JUb = Fx(OC(GC(t1, 1), Kie, 103, 0, [(ead(), aad), bad])); + KUb = Fx(OC(GC(t1, 1), Kie, 103, 0, [dad, _9c])); + } + function VQc(a) { + return (Ucd(), Lcd).Hc(a.j) + ? Edb(ED(vNb(a, (wtc(), qtc)))) + : l7c(OC(GC(m1, 1), nie, 8, 0, [a.i.n, a.n, a.a])).b; + } + function DOb(a) { + var b, c, d, e; + d = a.b.a; + for (c = d.a.ec().Kc(); c.Ob(); ) { + b = BD(c.Pb(), 561); + e = new MPb(b, a.e, a.f); + Ekb(a.g, e); + } + } + function yId(a, b) { + var c, d, e; + d = a.nk(b, null); + e = null; + if (b) { + e = (LFd(), (c = new UQd()), c); + NQd(e, a.r); + } + d = xId(a, e, d); + !!d && d.Fi(); + } + function VFc(a, b) { + var c, d; + d = Cub(a.d, 1) != 0; + c = true; + while (c) { + c = false; + c = b.c.Tf(b.e, d); + c = c | dGc(a, b, d, false); + d = !d; + } + $Fc(a); + } + function wZc(a, b) { + var c, d, e; + d = false; + c = b.q.d; + if (b.d < a.b) { + e = ZZc(b.q, a.b); + if (b.q.d > e) { + $Zc(b.q, e); + d = c != b.q.d; + } + } + return d; + } + function PVc(a, b) { + var c, d, e, f, g, h, i, j; + i = b.i; + j = b.j; + d = a.f; + e = d.i; + f = d.j; + g = i - e; + h = j - f; + c = Math.sqrt(g * g + h * h); + return c; + } + function Rnd(a, b) { + var c, d; + d = jid(a); + if (!d) { + !And && (And = new lUd()); + c = (IEd(), PEd(b)); + d = new s0d(c); + wtd(d.Vk(), a); + } + return d; + } + function Sc(a, b) { + var c, d; + c = BD(a.c.Bc(b), 14); + if (!c) { + return a.jc(); + } + d = a.hc(); + d.Gc(c); + a.d -= c.gc(); + c.$b(); + return a.mc(d); + } + function j7c(a, b) { + var c; + for (c = 0; c < b.length; c++) { + if (a == (BCb(c, b.length), b.charCodeAt(c))) { + return true; + } + } + return false; + } + function E_b(a, b) { + var c; + for (c = 0; c < b.length; c++) { + if (a == (BCb(c, b.length), b.charCodeAt(c))) { + return true; + } + } + return false; + } + function hFd(a) { + var b, c; + if (a == null) return false; + for (b = 0, c = a.length; b < c; b++) { + if (!gFd(a[b])) return false; + } + return true; + } + function Ngb(a) { + var b; + if (a.c != 0) { + return a.c; + } + for (b = 0; b < a.a.length; b++) { + a.c = a.c * 33 + (a.a[b] & -1); + } + a.c = a.c * a.e; + return a.c; + } + function vkb(a) { + var b; + sCb(a.a != a.b); + b = a.d.a[a.a]; + mkb(a.b == a.d.c && b != null); + a.c = a.a; + a.a = (a.a + 1) & (a.d.a.length - 1); + return b; + } + function phe(a) { + var b; + if (!(a.c.c < 0 ? a.a >= a.c.b : a.a <= a.c.b)) { + throw vbb(new utb()); + } + b = a.a; + a.a += a.c.c; + ++a.b; + return meb(b); + } + function BWb(a) { + var b; + b = new VWb(a); + rXb(a.a, zWb, new amb(OC(GC(bQ, 1), Uhe, 369, 0, [b]))); + !!b.d && Ekb(b.f, b.d); + return b.f; + } + function Z1b(a) { + var b; + b = new q_b(a.a); + tNb(b, a); + yNb(b, (wtc(), $sc), a); + b.o.a = a.g; + b.o.b = a.f; + b.n.a = a.i; + b.n.b = a.j; + return b; + } + function A9b(a, b, c, d) { + var e, f; + for (f = a.Kc(); f.Ob(); ) { + e = BD(f.Pb(), 70); + e.n.a = b.a + (d.a - e.o.a) / 2; + e.n.b = b.b; + b.b += e.o.b + c; + } + } + function UDb(a, b, c) { + var d, e; + for (e = b.a.a.ec().Kc(); e.Ob(); ) { + d = BD(e.Pb(), 57); + if (VDb(a, d, c)) { + return true; + } + } + return false; + } + function JDc(a) { + var b, c; + for (c = new olb(a.r); c.a < c.c.c.length; ) { + b = BD(mlb(c), 10); + if (a.n[b.p] <= 0) { + return b; + } + } + return null; + } + function cVc(a) { + var b, c, d, e; + e = new Tqb(); + for (d = new olb(a); d.a < d.c.c.length; ) { + c = BD(mlb(d), 33); + b = fVc(c); + ye(e, b); + } + return e; + } + function zFc(a) { + var b; + b = k3c(xFc); + BD(vNb(a, (wtc(), Ksc)), 21).Hc((Orc(), Krc)) && + e3c(b, (qUb(), nUb), (S8b(), H8b)); + return b; + } + function qKb(a, b, c) { + var d; + d = new AJb(a, b); + Rc(a.r, b.Hf(), d); + if (c && !tcd(a.u)) { + d.c = new aIb(a.d); + Hkb(b.wf(), new tKb(d)); + } + } + function ybb(a, b) { + var c; + if (Fbb(a) && Fbb(b)) { + c = a - b; + if (!isNaN(c)) { + return c; + } + } + return eD(Fbb(a) ? Rbb(a) : a, Fbb(b) ? Rbb(b) : b); + } + function bFd(a, b) { + return ( + b < a.length && + (BCb(b, a.length), a.charCodeAt(b) != 63) && + (BCb(b, a.length), a.charCodeAt(b) != 35) + ); + } + function Kic(a, b, c, d) { + var e, f; + a.a = b; + f = d ? 0 : 1; + a.f = + ((e = new Iic(a.c, a.a, c, f)), + new jjc(c, a.a, e, a.e, a.b, a.c == (rGc(), pGc))); + } + function Tmd(a, b, c) { + var d, e; + e = a.a; + a.a = b; + if ((a.Db & 4) != 0 && (a.Db & 1) == 0) { + d = new nSd(a, 1, 1, e, b); + !c ? (c = d) : c.Ei(d); + } + return c; + } + function GQd(a, b, c) { + var d, e; + e = a.b; + a.b = b; + if ((a.Db & 4) != 0 && (a.Db & 1) == 0) { + d = new nSd(a, 1, 3, e, b); + !c ? (c = d) : c.Ei(d); + } + return c; + } + function IQd(a, b, c) { + var d, e; + e = a.f; + a.f = b; + if ((a.Db & 4) != 0 && (a.Db & 1) == 0) { + d = new nSd(a, 1, 0, e, b); + !c ? (c = d) : c.Ei(d); + } + return c; + } + function xid(a, b) { + var c, d, e, f; + f = ((e = a ? jid(a) : null), q6d(((d = b), e ? e.Xk() : null, d))); + if (f == b) { + c = jid(a); + !!c && c.Xk(); + } + return f; + } + function x6c(a, b) { + var c, d, e; + e = 1; + c = a; + d = b >= 0 ? b : -b; + while (d > 0) { + if (d % 2 == 0) { + c *= c; + d = (d / 2) | 0; + } else { + e *= c; + d -= 1; + } + } + return b < 0 ? 1 / e : e; + } + function y6c(a, b) { + var c, d, e; + e = 1; + c = a; + d = b >= 0 ? b : -b; + while (d > 0) { + if (d % 2 == 0) { + c *= c; + d = (d / 2) | 0; + } else { + e *= c; + d -= 1; + } + } + return b < 0 ? 1 / e : e; + } + function sAd(a) { + var b, c, d, e; + if (a != null) { + for (c = 0; c < a.length; ++c) { + b = a[c]; + if (b) { + BD(b.g, 367); + e = b.i; + for (d = 0; d < e; ++d); + } + } + } + } + function YZc(a) { + var b, c, d; + d = 0; + for (c = new olb(a.a); c.a < c.c.c.length; ) { + b = BD(mlb(c), 187); + d = Math.max(d, b.g); + } + return d; + } + function eGc(a) { + var b, c, d; + for (d = new olb(a.b); d.a < d.c.c.length; ) { + c = BD(mlb(d), 214); + b = c.c.Rf() ? c.f : c.a; + !!b && mHc(b, c.j); + } + } + function hbd() { + hbd = ccb; + fbd = new ibd("INHERIT", 0); + ebd = new ibd("INCLUDE_CHILDREN", 1); + gbd = new ibd("SEPARATE_CHILDREN", 2); + } + function Jkd(a, b) { + switch (b) { + case 1: + !a.n && (a.n = new cUd(D2, a, 1, 7)); + Uxd(a.n); + return; + case 2: + Lkd(a, null); + return; + } + fkd(a, b); + } + function Dm(a) { + var b; + switch (a.gc()) { + case 0: + return hm; + case 1: + return new my(Qb(a.Xb(0))); + default: + b = a; + return new ux(b); + } + } + function Vn(a) { + Ql(); + switch (a.gc()) { + case 0: + return yx(), xx; + case 1: + return new oy(a.Kc().Pb()); + default: + return new zx(a); + } + } + function Up(a) { + Ql(); + switch (a.c) { + case 0: + return yx(), xx; + case 1: + return new oy(qr(new Gqb(a))); + default: + return new Tp(a); + } + } + function Hv(b, c) { + Qb(b); + try { + return b.xc(c); + } catch (a) { + a = ubb(a); + if (JD(a, 205) || JD(a, 173)) { + return null; + } else throw vbb(a); + } + } + function Iv(b, c) { + Qb(b); + try { + return b.Bc(c); + } catch (a) { + a = ubb(a); + if (JD(a, 205) || JD(a, 173)) { + return null; + } else throw vbb(a); + } + } + function Ck(b, c) { + Qb(b); + try { + return b.Hc(c); + } catch (a) { + a = ubb(a); + if (JD(a, 205) || JD(a, 173)) { + return false; + } else throw vbb(a); + } + } + function Dk(b, c) { + Qb(b); + try { + return b.Mc(c); + } catch (a) { + a = ubb(a); + if (JD(a, 205) || JD(a, 173)) { + return false; + } else throw vbb(a); + } + } + function Gv(b, c) { + Qb(b); + try { + return b._b(c); + } catch (a) { + a = ubb(a); + if (JD(a, 205) || JD(a, 173)) { + return false; + } else throw vbb(a); + } + } + function KXb(a, b) { + var c; + if (a.a.c.length > 0) { + c = BD(Ikb(a.a, a.a.c.length - 1), 570); + if (NYb(c, b)) { + return; + } + } + Ekb(a.a, new PYb(b)); + } + function $gc(a) { + Hgc(); + var b, c; + b = a.d.c - a.e.c; + c = BD(a.g, 145); + Hkb(c.b, new shc(b)); + Hkb(c.c, new uhc(b)); + reb(c.i, new whc(b)); + } + function gic(a) { + var b; + b = new Ufb(); + b.a += "VerticalSegment "; + Pfb(b, a.e); + b.a += " "; + Qfb(b, Eb(new Gb(), new olb(a.k))); + return b.a; + } + function u4c(a) { + var b; + b = BD(Wrb(a.c.c, ""), 229); + if (!b) { + b = new W3c(d4c(c4c(new e4c(), ""), "Other")); + Xrb(a.c.c, "", b); + } + return b; + } + function qnd(a) { + var b; + if ((a.Db & 64) != 0) return Eid(a); + b = new Jfb(Eid(a)); + b.a += " (name: "; + Efb(b, a.zb); + b.a += ")"; + return b.a; + } + function Jnd(a, b, c) { + var d, e; + e = a.sb; + a.sb = b; + if ((a.Db & 4) != 0 && (a.Db & 1) == 0) { + d = new nSd(a, 1, 4, e, b); + !c ? (c = d) : c.Ei(d); + } + return c; + } + function _ic(a, b) { + var c, d, e; + c = 0; + for (e = V_b(a, b).Kc(); e.Ob(); ) { + d = BD(e.Pb(), 11); + c += vNb(d, (wtc(), gtc)) != null ? 1 : 0; + } + return c; + } + function vPc(a, b, c) { + var d, e, f; + d = 0; + for (f = Jsb(a, 0); f.b != f.d.c; ) { + e = Edb(ED(Xsb(f))); + if (e > c) { + break; + } else e >= b && ++d; + } + return d; + } + function RTd(a, b, c) { + var d, e; + d = new pSd( + a.e, + 3, + 13, + null, + ((e = b.c), e ? e : (jGd(), YFd)), + HLd(a, b), + false + ); + !c ? (c = d) : c.Ei(d); + return c; + } + function STd(a, b, c) { + var d, e; + d = new pSd( + a.e, + 4, + 13, + ((e = b.c), e ? e : (jGd(), YFd)), + null, + HLd(a, b), + false + ); + !c ? (c = d) : c.Ei(d); + return c; + } + function zId(a, b, c) { + var d, e; + e = a.r; + a.r = b; + if ((a.Db & 4) != 0 && (a.Db & 1) == 0) { + d = new nSd(a, 1, 8, e, a.r); + !c ? (c = d) : c.Ei(d); + } + return c; + } + function o1d(a, b) { + var c, d; + c = BD(b, 676); + d = c.vk(); + !d && + c.wk((d = JD(b, 88) ? new C1d(a, BD(b, 26)) : new O1d(a, BD(b, 148)))); + return d; + } + function kud(a, b, c) { + var d; + a.qi(a.i + 1); + d = a.oi(b, c); + b != a.i && $fb(a.g, b, a.g, b + 1, a.i - b); + NC(a.g, b, d); + ++a.i; + a.bi(b, c); + a.ci(); + } + function vwb(a, b) { + var c; + if (b.a) { + c = b.a.a.length; + !a.a ? (a.a = new Wfb(a.d)) : Qfb(a.a, a.b); + Ofb(a.a, b.a, b.d.length, c); + } + return a; + } + function __d(a, b) { + var c, d, e, f; + b.vi(a.a); + f = BD(Ajd(a.a, 8), 1936); + if (f != null) { + for (c = f, d = 0, e = c.length; d < e; ++d) { + null.jm(); + } + } + } + function TAb(a, b) { + var c; + c = new NBb(); + if (!a.a.sd(c)) { + Tzb(a); + return Atb(), Atb(), ztb; + } + return Atb(), new Ftb(uCb(SAb(a, c.a, b))); + } + function CHc(a, b) { + switch (b.g) { + case 2: + case 1: + return V_b(a, b); + case 3: + case 4: + return Su(V_b(a, b)); + } + return mmb(), mmb(), jmb; + } + function pb(a, b) { + return ND(a) + ? dfb(a, b) + : LD(a) + ? Fdb(a, b) + : KD(a) + ? (uCb(a), PD(a) === PD(b)) + : ID(a) + ? a.Fb(b) + : MC(a) + ? mb(a, b) + : qz(a, b); + } + function r6d(a) { + return !a + ? null + : (a.i & 1) != 0 + ? a == sbb + ? wI + : a == WD + ? JI + : a == VD + ? FI + : a == UD + ? BI + : a == XD + ? MI + : a == rbb + ? UI + : a == SD + ? xI + : yI + : a; + } + function Fhb(a, b, c, d, e) { + if (b == 0 || d == 0) { + return; + } + b == 1 + ? (e[d] = Hhb(e, c, d, a[0])) + : d == 1 + ? (e[b] = Hhb(e, a, b, c[0])) + : Ghb(a, c, e, b, d); + } + function c6b(a, b) { + var c; + if (a.c.length == 0) { + return; + } + c = BD(Qkb(a, KC(OQ, kne, 10, a.c.length, 0, 1)), 193); + Nlb(c, new o6b()); + _5b(c, b); + } + function i6b(a, b) { + var c; + if (a.c.length == 0) { + return; + } + c = BD(Qkb(a, KC(OQ, kne, 10, a.c.length, 0, 1)), 193); + Nlb(c, new t6b()); + _5b(c, b); + } + function Ekd(a, b, c, d) { + switch (b) { + case 1: + return !a.n && (a.n = new cUd(D2, a, 1, 7)), a.n; + case 2: + return a.k; + } + return bkd(a, b, c, d); + } + function ead() { + ead = ccb; + cad = new iad(ole, 0); + bad = new iad(kle, 1); + aad = new iad(jle, 2); + _9c = new iad(vle, 3); + dad = new iad("UP", 4); + } + function RXb() { + RXb = ccb; + QXb = new SXb(ane, 0); + PXb = new SXb("INSIDE_PORT_SIDE_GROUPS", 1); + OXb = new SXb("FORCE_MODEL_ORDER", 2); + } + function xCb(a, b, c) { + if (a < 0 || b > c) { + throw vbb(new qcb(xke + a + zke + b + ", size: " + c)); + } + if (a > b) { + throw vbb(new Wdb(xke + a + yke + b)); + } + } + function eid(a, b, c) { + if (b < 0) { + vid(a, c); + } else { + if (!c.Ij()) { + throw vbb(new Wdb(ite + c.ne() + jte)); + } + BD(c, 66).Nj().Vj(a, a.yh(), b); + } + } + function Jlb(a, b, c, d, e, f, g, h) { + var i; + i = c; + while (f < g) { + i >= d || (b < c && h.ue(a[b], a[i]) <= 0) + ? NC(e, f++, a[b++]) + : NC(e, f++, a[i++]); + } + } + function yZb(a, b, c, d, e, f) { + this.e = new Rkb(); + this.f = (KAc(), JAc); + Ekb(this.e, a); + this.d = b; + this.a = c; + this.b = d; + this.f = e; + this.c = f; + } + function VOd(a, b) { + var c, d; + for (d = new Fyd(a); d.e != d.i.gc(); ) { + c = BD(Dyd(d), 26); + if (PD(b) === PD(c)) { + return true; + } + } + return false; + } + function uJb(a) { + qJb(); + var b, c, d, e; + for (c = wJb(), d = 0, e = c.length; d < e; ++d) { + b = c[d]; + if (Jkb(b.a, a, 0) != -1) { + return b; + } + } + return pJb; + } + function jFd(a) { + if (a >= 65 && a <= 70) { + return a - 65 + 10; + } + if (a >= 97 && a <= 102) { + return a - 97 + 10; + } + if (a >= 48 && a <= 57) { + return a - 48; + } + return 0; + } + function QHd(a) { + var b; + if ((a.Db & 64) != 0) return Eid(a); + b = new Jfb(Eid(a)); + b.a += " (source: "; + Efb(b, a.d); + b.a += ")"; + return b.a; + } + function OQd(a, b, c) { + var d, e; + e = a.a; + a.a = b; + if ((a.Db & 4) != 0 && (a.Db & 1) == 0) { + d = new nSd(a, 1, 5, e, a.a); + !c ? (c = d) : Qwd(c, d); + } + return c; + } + function BId(a, b) { + var c; + c = (a.Bb & 256) != 0; + b ? (a.Bb |= 256) : (a.Bb &= -257); + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new qSd(a, 1, 2, c, b)); + } + function eLd(a, b) { + var c; + c = (a.Bb & 256) != 0; + b ? (a.Bb |= 256) : (a.Bb &= -257); + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new qSd(a, 1, 8, c, b)); + } + function LPd(a, b) { + var c; + c = (a.Bb & 256) != 0; + b ? (a.Bb |= 256) : (a.Bb &= -257); + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new qSd(a, 1, 8, c, b)); + } + function CId(a, b) { + var c; + c = (a.Bb & 512) != 0; + b ? (a.Bb |= 512) : (a.Bb &= -513); + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new qSd(a, 1, 3, c, b)); + } + function fLd(a, b) { + var c; + c = (a.Bb & 512) != 0; + b ? (a.Bb |= 512) : (a.Bb &= -513); + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new qSd(a, 1, 9, c, b)); + } + function N7d(a, b) { + var c; + if (a.b == -1 && !!a.a) { + c = a.a.Gj(); + a.b = !c ? bLd(a.c.Tg(), a.a) : a.c.Xg(a.a.aj(), c); + } + return a.c.Og(a.b, b); + } + function meb(a) { + var b, c; + if (a > -129 && a < 128) { + b = a + 128; + c = (oeb(), neb)[b]; + !c && (c = neb[b] = new _db(a)); + return c; + } + return new _db(a); + } + function Web(a) { + var b, c; + if (a > -129 && a < 128) { + b = a + 128; + c = (Yeb(), Xeb)[b]; + !c && (c = Xeb[b] = new Qeb(a)); + return c; + } + return new Qeb(a); + } + function L5b(a) { + var b, c; + b = a.k; + if (b == (j0b(), e0b)) { + c = BD(vNb(a, (wtc(), Hsc)), 61); + return c == (Ucd(), Acd) || c == Rcd; + } + return false; + } + function i1d(a, b, c) { + var d, e, f; + f = ((e = nUd(a.b, b)), e); + if (f) { + d = BD(V1d(p1d(a, f), ""), 26); + if (d) { + return r1d(a, d, b, c); + } + } + return null; + } + function l1d(a, b, c) { + var d, e, f; + f = ((e = nUd(a.b, b)), e); + if (f) { + d = BD(V1d(p1d(a, f), ""), 26); + if (d) { + return s1d(a, d, b, c); + } + } + return null; + } + function cTd(a, b) { + var c, d; + for (d = new Fyd(a); d.e != d.i.gc(); ) { + c = BD(Dyd(d), 138); + if (PD(b) === PD(c)) { + return true; + } + } + return false; + } + function vtd(a, b, c) { + var d; + d = a.gc(); + if (b > d) throw vbb(new Cyd(b, d)); + if (a.hi() && a.Hc(c)) { + throw vbb(new Wdb(kue)); + } + a.Xh(b, c); + } + function iqd(a, b) { + var c; + c = oo(a.i, b); + if (c == null) { + throw vbb(new cqd("Node did not exist in input.")); + } + Yqd(b, c); + return null; + } + function $hd(a, b) { + var c; + c = YKd(a, b); + if (JD(c, 322)) { + return BD(c, 34); + } + throw vbb(new Wdb(ite + b + "' is not a valid attribute")); + } + function V2d(a, b, c) { + var d, e; + e = + JD(b, 99) && (BD(b, 18).Bb & Tje) != 0 ? new s4d(b, a) : new p4d(b, a); + for (d = 0; d < c; ++d) { + d4d(e); + } + return e; + } + function ede(a) { + var b, c, d; + d = 0; + c = a.length; + for (b = 0; b < c; b++) { + a[b] == 32 || a[b] == 13 || a[b] == 10 || a[b] == 9 || (a[d++] = a[b]); + } + return d; + } + function lYb(a) { + var b, c, d; + b = new Rkb(); + for (d = new olb(a.b); d.a < d.c.c.length; ) { + c = BD(mlb(d), 594); + Gkb(b, BD(c.jf(), 14)); + } + return b; + } + function SSc(a) { + var b, c, d; + b = BD(vNb(a, (mTc(), gTc)), 15); + for (d = b.Kc(); d.Ob(); ) { + c = BD(d.Pb(), 188); + Dsb(c.b.d, c); + Dsb(c.c.b, c); + } + } + function b5b(a) { + switch (BD(vNb(a, (wtc(), Osc)), 303).g) { + case 1: + yNb(a, Osc, (esc(), bsc)); + break; + case 2: + yNb(a, Osc, (esc(), dsc)); + } + } + function _Fc(a) { + var b; + if (a.g) { + b = a.c.Rf() ? a.f : a.a; + bGc(b.a, a.o, true); + bGc(b.a, a.o, false); + yNb(a.o, (Nyc(), Vxc), (dcd(), Zbd)); + } + } + function loc(a) { + var b; + if (!a.a) { + throw vbb(new Zdb("Cannot offset an unassigned cut.")); + } + b = a.c - a.b; + a.b += b; + noc(a, b); + ooc(a, b); + } + function ckb(a) { + var b; + b = a.a[(a.c - 1) & (a.a.length - 1)]; + if (b == null) { + return null; + } + a.c = (a.c - 1) & (a.a.length - 1); + NC(a.a, a.c, null); + return b; + } + function zGb(a) { + var b, c; + for (c = a.p.a.ec().Kc(); c.Ob(); ) { + b = BD(c.Pb(), 213); + if (b.f && a.b[b.c] < -1.0e-10) { + return b; + } + } + return null; + } + function bLb(a, b) { + switch (a.b.g) { + case 0: + case 1: + return b; + case 2: + case 3: + return new J6c(b.d, 0, b.a, b.b); + default: + return null; + } + } + function had(a) { + switch (a.g) { + case 2: + return bad; + case 1: + return aad; + case 4: + return _9c; + case 3: + return dad; + default: + return cad; + } + } + function Vcd(a) { + switch (a.g) { + case 1: + return Tcd; + case 2: + return Acd; + case 3: + return zcd; + case 4: + return Rcd; + default: + return Scd; + } + } + function Wcd(a) { + switch (a.g) { + case 1: + return Rcd; + case 2: + return Tcd; + case 3: + return Acd; + case 4: + return zcd; + default: + return Scd; + } + } + function Xcd(a) { + switch (a.g) { + case 1: + return zcd; + case 2: + return Rcd; + case 3: + return Tcd; + case 4: + return Acd; + default: + return Scd; + } + } + function DPc(a) { + switch (a) { + case 0: + return new OPc(); + case 1: + return new EPc(); + case 2: + return new JPc(); + default: + throw vbb(new Vdb()); + } + } + function Kdb(a, b) { + if (a < b) { + return -1; + } + if (a > b) { + return 1; + } + if (a == b) { + return a == 0 ? Kdb(1 / a, 1 / b) : 0; + } + return isNaN(a) ? (isNaN(b) ? 0 : 1) : -1; + } + function f4b(a, b) { + Odd(b, "Sort end labels", 1); + MAb( + JAb(LAb(new YAb(null, new Kub(a.b, 16)), new q4b()), new s4b()), + new u4b() + ); + Qdd(b); + } + function Wxd(a, b, c) { + var d, e; + if (a.ej()) { + e = a.fj(); + d = sud(a, b, c); + a.$i(a.Zi(7, meb(c), d, b, e)); + return d; + } else { + return sud(a, b, c); + } + } + function vAd(a, b) { + var c, d, e; + if (a.d == null) { + ++a.e; + --a.f; + } else { + e = b.cd(); + c = b.Sh(); + d = (c & Ohe) % a.d.length; + KAd(a, d, xAd(a, d, c, e)); + } + } + function ZId(a, b) { + var c; + c = (a.Bb & zte) != 0; + b ? (a.Bb |= zte) : (a.Bb &= -1025); + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new qSd(a, 1, 10, c, b)); + } + function dJd(a, b) { + var c; + c = (a.Bb & Rje) != 0; + b ? (a.Bb |= Rje) : (a.Bb &= -4097); + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new qSd(a, 1, 12, c, b)); + } + function eJd(a, b) { + var c; + c = (a.Bb & Cve) != 0; + b ? (a.Bb |= Cve) : (a.Bb &= -8193); + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new qSd(a, 1, 15, c, b)); + } + function fJd(a, b) { + var c; + c = (a.Bb & Dve) != 0; + b ? (a.Bb |= Dve) : (a.Bb &= -2049); + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new qSd(a, 1, 11, c, b)); + } + function jOb(a, b) { + var c; + c = Kdb(a.b.c, b.b.c); + if (c != 0) { + return c; + } + c = Kdb(a.a.a, b.a.a); + if (c != 0) { + return c; + } + return Kdb(a.a.b, b.a.b); + } + function jqd(a, b) { + var c; + c = Ohb(a.k, b); + if (c == null) { + throw vbb(new cqd("Port did not exist in input.")); + } + Yqd(b, c); + return null; + } + function k6d(a) { + var b, c; + for (c = l6d(bKd(a)).Kc(); c.Ob(); ) { + b = GD(c.Pb()); + if (Dmd(a, b)) { + return uFd((tFd(), sFd), b); + } + } + return null; + } + function n3d(a, b) { + var c, d, e, f, g; + g = S6d(a.e.Tg(), b); + f = 0; + c = BD(a.g, 119); + for (e = 0; e < a.i; ++e) { + d = c[e]; + g.rl(d.ak()) && ++f; + } + return f; + } + function Vsd(a, b, c) { + var d, e; + d = BD(b.We(a.a), 35); + e = BD(c.We(a.a), 35); + return d != null && e != null + ? Fcb(d, e) + : d != null + ? -1 + : e != null + ? 1 + : 0; + } + function ved(a, b, c) { + var d, e; + if (a.c) { + Efd(a.c, b, c); + } else { + for (e = new olb(a.b); e.a < e.c.c.length; ) { + d = BD(mlb(e), 157); + ved(d, b, c); + } + } + } + function RUb(a, b) { + var c, d; + for (d = new olb(b); d.a < d.c.c.length; ) { + c = BD(mlb(d), 46); + Lkb(a.b.b, c.b); + fVb(BD(c.a, 189), BD(c.b, 81)); + } + } + function tr(a) { + var b, c; + c = Kfb(new Ufb(), 91); + b = true; + while (a.Ob()) { + b || ((c.a += She), c); + b = false; + Pfb(c, a.Pb()); + } + return ((c.a += "]"), c).a; + } + function aJd(a, b) { + var c; + c = (a.Bb & oie) != 0; + b ? (a.Bb |= oie) : (a.Bb &= -16385); + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new qSd(a, 1, 16, c, b)); + } + function MJd(a, b) { + var c; + c = (a.Bb & ote) != 0; + b ? (a.Bb |= ote) : (a.Bb &= -32769); + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new qSd(a, 1, 18, c, b)); + } + function CUd(a, b) { + var c; + c = (a.Bb & ote) != 0; + b ? (a.Bb |= ote) : (a.Bb &= -32769); + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new qSd(a, 1, 18, c, b)); + } + function EUd(a, b) { + var c; + c = (a.Bb & Tje) != 0; + b ? (a.Bb |= Tje) : (a.Bb &= -65537); + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new qSd(a, 1, 20, c, b)); + } + function Tee(a) { + var b; + b = KC(TD, $ie, 25, 2, 15, 1); + a -= Tje; + b[0] = ((a >> 10) + Uje) & aje; + b[1] = ((a & 1023) + 56320) & aje; + return zfb(b, 0, b.length); + } + function a_b(a) { + var b, c; + c = BD(vNb(a, (Nyc(), Lwc)), 103); + if (c == (ead(), cad)) { + b = Edb(ED(vNb(a, owc))); + return b >= 1 ? bad : _9c; + } + return c; + } + function rec(a) { + switch (BD(vNb(a, (Nyc(), Swc)), 218).g) { + case 1: + return new Fmc(); + case 3: + return new wnc(); + default: + return new zmc(); + } + } + function Uzb(a) { + if (a.c) { + Uzb(a.c); + } else if (a.d) { + throw vbb( + new Zdb("Stream already terminated, can't be modified or used") + ); + } + } + function Mkd(a) { + var b; + if ((a.Db & 64) != 0) return Eid(a); + b = new Jfb(Eid(a)); + b.a += " (identifier: "; + Efb(b, a.k); + b.a += ")"; + return b.a; + } + function ctd(a, b, c) { + var d, e; + d = (Fhd(), (e = new xkd()), e); + vkd(d, b); + wkd(d, c); + !!a && wtd((!a.a && (a.a = new xMd(y2, a, 5)), a.a), d); + return d; + } + function ttb(a, b, c, d) { + var e, f; + uCb(d); + uCb(c); + e = a.xc(b); + f = e == null ? c : Myb(BD(e, 15), BD(c, 14)); + f == null ? a.Bc(b) : a.zc(b, f); + return f; + } + function pqb(a) { + var b, c, d, e; + c = + ((b = BD(gdb(((d = a.gm), (e = d.f), e == CI ? d : e)), 9)), + new xqb(b, BD(_Bb(b, b.length), 9), 0)); + rqb(c, a); + return c; + } + function hDc(a, b, c) { + var d, e; + for (e = a.a.ec().Kc(); e.Ob(); ) { + d = BD(e.Pb(), 10); + if (Be(c, BD(Ikb(b, d.p), 14))) { + return d; + } + } + return null; + } + function Db(b, c, d) { + var e; + try { + Cb(b, c, d); + } catch (a) { + a = ubb(a); + if (JD(a, 597)) { + e = a; + throw vbb(new ycb(e)); + } else throw vbb(a); + } + return c; + } + function Qbb(a, b) { + var c; + if (Fbb(a) && Fbb(b)) { + c = a - b; + if (Kje < c && c < Ije) { + return c; + } + } + return zbb(nD(Fbb(a) ? Rbb(a) : a, Fbb(b) ? Rbb(b) : b)); + } + function wbb(a, b) { + var c; + if (Fbb(a) && Fbb(b)) { + c = a + b; + if (Kje < c && c < Ije) { + return c; + } + } + return zbb(cD(Fbb(a) ? Rbb(a) : a, Fbb(b) ? Rbb(b) : b)); + } + function Ibb(a, b) { + var c; + if (Fbb(a) && Fbb(b)) { + c = a * b; + if (Kje < c && c < Ije) { + return c; + } + } + return zbb(gD(Fbb(a) ? Rbb(a) : a, Fbb(b) ? Rbb(b) : b)); + } + function V_b(a, b) { + var c; + a.i || N_b(a); + c = BD(Mpb(a.g, b), 46); + return !c + ? (mmb(), mmb(), jmb) + : new Jib(a.j, BD(c.a, 19).a, BD(c.b, 19).a); + } + function Drb(a, b, c) { + var d; + d = a.a.get(b); + a.a.set(b, c === undefined ? null : c); + if (d === undefined) { + ++a.c; + zpb(a.b); + } else { + ++a.d; + } + return d; + } + function kNb(a, b, c) { + a.n = IC(XD, [nie, Sje], [364, 25], 14, [c, QD(Math.ceil(b / 32))], 2); + a.o = b; + a.p = c; + a.j = (b - 1) >> 1; + a.k = (c - 1) >> 1; + } + function Gub() { + zub(); + var a, b, c; + c = yub++ + Date.now(); + a = QD(Math.floor(c * lke)) & nke; + b = QD(c - a * mke); + this.a = a ^ 1502; + this.b = b ^ kke; + } + function O_b(a) { + var b, c, d; + b = new Rkb(); + for (d = new olb(a.j); d.a < d.c.c.length; ) { + c = BD(mlb(d), 11); + Ekb(b, c.b); + } + return Qb(b), new sl(b); + } + function R_b(a) { + var b, c, d; + b = new Rkb(); + for (d = new olb(a.j); d.a < d.c.c.length; ) { + c = BD(mlb(d), 11); + Ekb(b, c.e); + } + return Qb(b), new sl(b); + } + function U_b(a) { + var b, c, d; + b = new Rkb(); + for (d = new olb(a.j); d.a < d.c.c.length; ) { + c = BD(mlb(d), 11); + Ekb(b, c.g); + } + return Qb(b), new sl(b); + } + function n6d(a) { + var b, c; + for (c = o6d(bKd(WId(a))).Kc(); c.Ob(); ) { + b = GD(c.Pb()); + if (Dmd(a, b)) return FFd((EFd(), DFd), b); + } + return null; + } + function wm(a) { + var b, c, d; + for (c = 0, d = a.length; c < d; c++) { + if (a[c] == null) { + throw vbb(new Heb("at index " + c)); + } + } + b = a; + return new amb(b); + } + function wid(a, b) { + var c; + c = YKd(a.Tg(), b); + if (JD(c, 99)) { + return BD(c, 18); + } + throw vbb(new Wdb(ite + b + "' is not a valid reference")); + } + function Tdb(a) { + var b; + b = Hcb(a); + if (b > 3.4028234663852886e38) { + return Pje; + } else if (b < -3.4028234663852886e38) { + return Qje; + } + return b; + } + function aeb(a) { + a -= (a >> 1) & 1431655765; + a = ((a >> 2) & 858993459) + (a & 858993459); + a = ((a >> 4) + a) & 252645135; + a += a >> 8; + a += a >> 16; + return a & 63; + } + function Ev(a) { + var b, c, d, e; + b = new cq(a.Hd().gc()); + e = 0; + for (d = vr(a.Hd().Kc()); d.Ob(); ) { + c = d.Pb(); + bq(b, c, meb(e++)); + } + return fn(b.a); + } + function Uyb(a, b) { + var c, d, e; + e = new Lqb(); + for (d = b.vc().Kc(); d.Ob(); ) { + c = BD(d.Pb(), 42); + Rhb(e, c.cd(), Yyb(a, BD(c.dd(), 15))); + } + return e; + } + function EZc(a, b) { + a.n.c.length == 0 && Ekb(a.n, new VZc(a.s, a.t, a.i)); + Ekb(a.b, b); + QZc(BD(Ikb(a.n, a.n.c.length - 1), 211), b); + GZc(a, b); + } + function LFb(a) { + if (a.c != a.b.b || a.i != a.g.b) { + a.a.c = KC(SI, Uhe, 1, 0, 5, 1); + Gkb(a.a, a.b); + Gkb(a.a, a.g); + a.c = a.b.b; + a.i = a.g.b; + } + return a.a; + } + function Ycc(a, b) { + var c, d, e; + e = 0; + for (d = BD(b.Kb(a), 20).Kc(); d.Ob(); ) { + c = BD(d.Pb(), 17); + Ccb(DD(vNb(c, (wtc(), ltc)))) || ++e; + } + return e; + } + function efc(a, b) { + var c, d, e; + d = tgc(b); + e = Edb(ED(pBc(d, (Nyc(), lyc)))); + c = Math.max(0, e / 2 - 0.5); + cfc(b, c, 1); + Ekb(a, new Dfc(b, c)); + } + function Ctc() { + Ctc = ccb; + Btc = new Dtc(ane, 0); + xtc = new Dtc("FIRST", 1); + ytc = new Dtc(Gne, 2); + ztc = new Dtc("LAST", 3); + Atc = new Dtc(Hne, 4); + } + function Aad() { + Aad = ccb; + zad = new Bad(ole, 0); + xad = new Bad("POLYLINE", 1); + wad = new Bad("ORTHOGONAL", 2); + yad = new Bad("SPLINES", 3); + } + function zYc() { + zYc = ccb; + xYc = new AYc("ASPECT_RATIO_DRIVEN", 0); + yYc = new AYc("MAX_SCALE_DRIVEN", 1); + wYc = new AYc("AREA_DRIVEN", 2); + } + function Y$c() { + Y$c = ccb; + V$c = new Z$c("P1_STRUCTURE", 0); + W$c = new Z$c("P2_PROCESSING_ORDER", 1); + X$c = new Z$c("P3_EXECUTION", 2); + } + function tVc() { + tVc = ccb; + sVc = new uVc("OVERLAP_REMOVAL", 0); + qVc = new uVc("COMPACTION", 1); + rVc = new uVc("GRAPH_SIZE_CALCULATION", 2); + } + function Jy(a, b) { + Iy(); + return ( + My(Qie), + Math.abs(a - b) <= Qie || a == b || (isNaN(a) && isNaN(b)) + ? 0 + : a < b + ? -1 + : a > b + ? 1 + : Ny(isNaN(a), isNaN(b)) + ); + } + function yOc(a, b) { + var c, d; + c = Jsb(a, 0); + while (c.b != c.d.c) { + d = Gdb(ED(Xsb(c))); + if (d == b) { + return; + } else if (d > b) { + Ysb(c); + break; + } + } + Vsb(c, b); + } + function t4c(a, b) { + var c, d, e, f, g; + c = b.f; + Xrb(a.c.d, c, b); + if (b.g != null) { + for (e = b.g, f = 0, g = e.length; f < g; ++f) { + d = e[f]; + Xrb(a.c.e, d, b); + } + } + } + function Ilb(a, b, c, d) { + var e, f, g; + for (e = b + 1; e < c; ++e) { + for (f = e; f > b && d.ue(a[f - 1], a[f]) > 0; --f) { + g = a[f]; + NC(a, f, a[f - 1]); + NC(a, f - 1, g); + } + } + } + function did(a, b, c, d) { + if (b < 0) { + uid(a, c, d); + } else { + if (!c.Ij()) { + throw vbb(new Wdb(ite + c.ne() + jte)); + } + BD(c, 66).Nj().Tj(a, a.yh(), b, d); + } + } + function xFb(a, b) { + if (b == a.d) { + return a.e; + } else if (b == a.e) { + return a.d; + } else { + throw vbb(new Wdb("Node " + b + " not part of edge " + a)); + } + } + function iEb(a, b) { + switch (b.g) { + case 2: + return a.b; + case 1: + return a.c; + case 4: + return a.d; + case 3: + return a.a; + default: + return false; + } + } + function GVb(a, b) { + switch (b.g) { + case 2: + return a.b; + case 1: + return a.c; + case 4: + return a.d; + case 3: + return a.a; + default: + return false; + } + } + function Xkd(a, b, c, d) { + switch (b) { + case 3: + return a.f; + case 4: + return a.g; + case 5: + return a.i; + case 6: + return a.j; + } + return Ekd(a, b, c, d); + } + function Ljc(a) { + if (a.k != (j0b(), h0b)) { + return false; + } + return FAb( + new YAb(null, new Lub(new Sr(ur(U_b(a).a.Kc(), new Sq())))), + new Mjc() + ); + } + function MEd(a) { + if (a.e == null) { + return a; + } else + !a.c && + (a.c = new NEd( + (a.f & 256) != 0, + a.i, + a.a, + a.d, + (a.f & 16) != 0, + a.j, + a.g, + null + )); + return a.c; + } + function VC(a, b) { + if (a.h == Gje && a.m == 0 && a.l == 0) { + b && (QC = TC(0, 0, 0)); + return SC((wD(), uD)); + } + b && (QC = TC(a.l, a.m, a.h)); + return TC(0, 0, 0); + } + function fcb(a) { + var b; + if (Array.isArray(a) && a.im === gcb) { + return hdb(rb(a)) + "@" + ((b = tb(a) >>> 0), b.toString(16)); + } + return a.toString(); + } + function Rpb(a) { + var b; + this.a = + ((b = BD(a.e && a.e(), 9)), new xqb(b, BD(_Bb(b, b.length), 9), 0)); + this.b = KC(SI, Uhe, 1, this.a.a.length, 5, 1); + } + function _Ob(a) { + var b, c, d; + this.a = new zsb(); + for (d = new olb(a); d.a < d.c.c.length; ) { + c = BD(mlb(d), 14); + b = new MOb(); + GOb(b, c); + Qqb(this.a, b); + } + } + function cKb(a) { + $Jb(); + var b, c, d, e; + b = a.o.b; + for (d = BD(BD(Qc(a.r, (Ucd(), Rcd)), 21), 84).Kc(); d.Ob(); ) { + c = BD(d.Pb(), 111); + e = c.e; + e.b += b; + } + } + function ag(a) { + var b; + if (a.b) { + ag(a.b); + if (a.b.d != a.c) { + throw vbb(new Apb()); + } + } else if (a.d.dc()) { + b = BD(a.f.c.xc(a.e), 14); + !!b && (a.d = b); + } + } + function fFd(a) { + var b; + if (a == null) return true; + b = a.length; + return ( + b > 0 && + (BCb(b - 1, a.length), a.charCodeAt(b - 1) == 58) && + !OEd(a, CEd, DEd) + ); + } + function OEd(a, b, c) { + var d, e; + for (d = 0, e = a.length; d < e; d++) { + if (_Ed((BCb(d, a.length), a.charCodeAt(d)), b, c)) return true; + } + return false; + } + function JOb(a, b) { + var c, d; + for (d = a.e.a.ec().Kc(); d.Ob(); ) { + c = BD(d.Pb(), 266); + if (t6c(b, c.d) || o6c(b, c.d)) { + return true; + } + } + return false; + } + function Q9b(a, b) { + var c, d, e; + d = N9b(a, b); + e = d[d.length - 1] / 2; + for (c = 0; c < d.length; c++) { + if (d[c] >= e) { + return b.c + c; + } + } + return b.c + b.b.gc(); + } + function NCd(a, b) { + LCd(); + var c, d, e, f; + d = KLd(a); + e = b; + Klb(d, 0, d.length, e); + for (c = 0; c < d.length; c++) { + f = MCd(a, d[c], c); + c != f && Wxd(a, c, f); + } + } + function EHb(a, b) { + var c, d, e, f, g, h; + d = 0; + c = 0; + for (f = b, g = 0, h = f.length; g < h; ++g) { + e = f[g]; + if (e > 0) { + d += e; + ++c; + } + } + c > 1 && (d += a.d * (c - 1)); + return d; + } + function Htd(a) { + var b, c, d; + d = new Hfb(); + d.a += "["; + for (b = 0, c = a.gc(); b < c; ) { + Efb(d, xfb(a.ki(b))); + ++b < c && ((d.a += She), d); + } + d.a += "]"; + return d.a; + } + function fsd(a) { + var b, c, d, e, f; + f = hsd(a); + c = Fhe(a.c); + d = !c; + if (d) { + e = new wB(); + cC(f, "knownLayouters", e); + b = new qsd(e); + reb(a.c, b); + } + return f; + } + function Ce(a, b) { + var c, d, e; + uCb(b); + c = false; + for (d = new olb(a); d.a < d.c.c.length; ) { + e = mlb(d); + if (ze(b, e, false)) { + nlb(d); + c = true; + } + } + return c; + } + function UGb(a) { + var b, c, d; + d = Edb(ED(a.a.We((Y9c(), Q9c)))); + for (c = new olb(a.a.xf()); c.a < c.c.c.length; ) { + b = BD(mlb(c), 680); + XGb(a, b, d); + } + } + function MUb(a, b) { + var c, d; + for (d = new olb(b); d.a < d.c.c.length; ) { + c = BD(mlb(d), 46); + Ekb(a.b.b, BD(c.b, 81)); + eVb(BD(c.a, 189), BD(c.b, 81)); + } + } + function XCc(a, b, c) { + var d, e; + e = a.a.b; + for (d = e.c.length; d < c; d++) { + Dkb(e, 0, new H1b(a.a)); + } + $_b(b, BD(Ikb(e, e.c.length - c), 29)); + a.b[b.p] = c; + } + function JTb(a, b, c) { + var d; + d = c; + !d && (d = Ydd(new Zdd(), 0)); + Odd(d, Vme, 2); + qZb(a.b, b, Udd(d, 1)); + LTb(a, b, Udd(d, 1)); + _Yb(b, Udd(d, 1)); + Qdd(d); + } + function eKc(a, b, c, d, e) { + FJc(); + AFb(DFb(CFb(BFb(EFb(new FFb(), 0), e.d.e - a), b), e.d)); + AFb(DFb(CFb(BFb(EFb(new FFb(), 0), c - e.a.e), e.a), d)); + } + function e$c(a, b, c, d, e, f) { + this.a = a; + this.c = b; + this.b = c; + this.f = d; + this.d = e; + this.e = f; + this.c > 0 && this.b > 0 && q$c(this.c, this.b, this.a); + } + function ezc(a) { + dzc(); + this.c = Ou(OC(GC(h0, 1), Uhe, 831, 0, [Uyc])); + this.b = new Lqb(); + this.a = a; + Rhb(this.b, bzc, 1); + Hkb(czc, new Xed(this)); + } + function I2c(a, b) { + var c; + if (a.d) { + if (Mhb(a.b, b)) { + return BD(Ohb(a.b, b), 51); + } else { + c = b.Kf(); + Rhb(a.b, b, c); + return c; + } + } else { + return b.Kf(); + } + } + function Kgb(a, b) { + var c; + if (PD(a) === PD(b)) { + return true; + } + if (JD(b, 91)) { + c = BD(b, 91); + return a.e == c.e && a.d == c.d && Lgb(a, c.a); + } + return false; + } + function Zcd(a) { + Ucd(); + switch (a.g) { + case 4: + return Acd; + case 1: + return zcd; + case 3: + return Rcd; + case 2: + return Tcd; + default: + return Scd; + } + } + function Ykd(a, b) { + switch (b) { + case 3: + return a.f != 0; + case 4: + return a.g != 0; + case 5: + return a.i != 0; + case 6: + return a.j != 0; + } + return Hkd(a, b); + } + function gWc(a) { + switch (a.g) { + case 0: + return new FXc(); + case 1: + return new IXc(); + default: + throw vbb(new Wdb(jre + (a.f != null ? a.f : "" + a.g))); + } + } + function QUc(a) { + switch (a.g) { + case 0: + return new CXc(); + case 1: + return new MXc(); + default: + throw vbb(new Wdb(Dne + (a.f != null ? a.f : "" + a.g))); + } + } + function b1c(a) { + switch (a.g) { + case 0: + return new s1c(); + case 1: + return new w1c(); + default: + throw vbb(new Wdb(Mre + (a.f != null ? a.f : "" + a.g))); + } + } + function qWc(a) { + switch (a.g) { + case 1: + return new SVc(); + case 2: + return new KVc(); + default: + throw vbb(new Wdb(jre + (a.f != null ? a.f : "" + a.g))); + } + } + function ryb(a) { + var b, c; + if (a.b) { + return a.b; + } + c = lyb ? null : a.d; + while (c) { + b = lyb ? null : c.b; + if (b) { + return b; + } + c = lyb ? null : c.d; + } + return $xb(), Zxb; + } + function hhb(a) { + var b, c, d; + if (a.e == 0) { + return 0; + } + b = a.d << 5; + c = a.a[a.d - 1]; + if (a.e < 0) { + d = Mgb(a); + if (d == a.d - 1) { + --c; + c = c | 0; + } + } + b -= heb(c); + return b; + } + function bhb(a) { + var b, c, d; + if (a < Fgb.length) { + return Fgb[a]; + } + c = a >> 5; + b = a & 31; + d = KC(WD, oje, 25, c + 1, 15, 1); + d[c] = 1 << b; + return new Vgb(1, c + 1, d); + } + function O2b(a) { + var b, c, d; + c = a.zg(); + if (c) { + b = a.Ug(); + if (JD(b, 160)) { + d = O2b(BD(b, 160)); + if (d != null) { + return d + "." + c; + } + } + return c; + } + return null; + } + function ze(a, b, c) { + var d, e; + for (e = a.Kc(); e.Ob(); ) { + d = e.Pb(); + if (PD(b) === PD(d) || (b != null && pb(b, d))) { + c && e.Qb(); + return true; + } + } + return false; + } + function zvd(a, b, c) { + var d, e; + ++a.j; + if (c.dc()) { + return false; + } else { + for (e = c.Kc(); e.Ob(); ) { + d = e.Pb(); + a.Hi(b, a.oi(b, d)); + ++b; + } + return true; + } + } + function yA(a, b, c, d) { + var e, f; + f = c - b; + if (f < 3) { + while (f < 3) { + a *= 10; + ++f; + } + } else { + e = 1; + while (f > 3) { + e *= 10; + --f; + } + a = ((a + (e >> 1)) / e) | 0; + } + d.i = a; + return true; + } + function XUb(a) { + LUb(); + return ( + Bcb(), + GVb(BD(a.a, 81).j, BD(a.b, 103)) || + (BD(a.a, 81).d.e != 0 && GVb(BD(a.a, 81).j, BD(a.b, 103))) + ? true + : false + ); + } + function s3c(a) { + p3c(); + if (BD(a.We((Y9c(), b9c)), 174).Hc((Idd(), Gdd))) { + BD(a.We(x9c), 174).Fc((rcd(), qcd)); + BD(a.We(b9c), 174).Mc(Gdd); + } + } + function Gxd(a, b) { + var c, d; + if (!b) { + return false; + } else { + for (c = 0; c < a.i; ++c) { + d = BD(a.g[c], 366); + if (d.Di(b)) { + return false; + } + } + return wtd(a, b); + } + } + function pvd(a) { + var b, c, d, e; + b = new wB(); + for (e = new Dnb(a.b.Kc()); e.b.Ob(); ) { + d = BD(e.b.Pb(), 686); + c = lsd(d); + uB(b, b.a.length, c); + } + return b.a; + } + function cLb(a) { + var b; + !a.c && (a.c = new VKb()); + Okb(a.d, new jLb()); + _Kb(a); + b = UKb(a); + MAb(new YAb(null, new Kub(a.d, 16)), new CLb(a)); + return b; + } + function mKd(a) { + var b; + if ((a.Db & 64) != 0) return qnd(a); + b = new Jfb(qnd(a)); + b.a += " (instanceClassName: "; + Efb(b, a.D); + b.a += ")"; + return b.a; + } + function Pqd(a, b) { + var c, d, e, f; + if (b) { + e = Xpd(b, "x"); + c = new bsd(a); + hmd(c.a, (uCb(e), e)); + f = Xpd(b, "y"); + d = new csd(a); + imd(d.a, (uCb(f), f)); + } + } + function Eqd(a, b) { + var c, d, e, f; + if (b) { + e = Xpd(b, "x"); + c = new Yrd(a); + omd(c.a, (uCb(e), e)); + f = Xpd(b, "y"); + d = new _rd(a); + pmd(d.a, (uCb(f), f)); + } + } + function bLd(a, b) { + var c, d, e; + c = (a.i == null && TKd(a), a.i); + d = b.aj(); + if (d != -1) { + for (e = c.length; d < e; ++d) { + if (c[d] == b) { + return d; + } + } + } + return -1; + } + function tNd(a) { + var b, c, d, e, f; + c = BD(a.g, 674); + for (d = a.i - 1; d >= 0; --d) { + b = c[d]; + for (e = 0; e < d; ++e) { + f = c[e]; + if (uNd(a, b, f)) { + tud(a, d); + break; + } + } + } + } + function jCb(b) { + var c = b.e; + function d(a) { + if (!a || a.length == 0) { + return ""; + } + return "\t" + a.join("\n\t"); + } + return c && (c.stack || d(b[Yie])); + } + function nm(a) { + im(); + var b; + b = a.Pc(); + switch (b.length) { + case 0: + return hm; + case 1: + return new my(Qb(b[0])); + default: + return new ux(wm(b)); + } + } + function W_b(a, b) { + switch (b.g) { + case 1: + return Nq(a.j, (z0b(), u0b)); + case 2: + return Nq(a.j, (z0b(), w0b)); + default: + return mmb(), mmb(), jmb; + } + } + function $kd(a, b) { + switch (b) { + case 3: + ald(a, 0); + return; + case 4: + cld(a, 0); + return; + case 5: + dld(a, 0); + return; + case 6: + eld(a, 0); + return; + } + Jkd(a, b); + } + function dzc() { + dzc = ccb; + Vyc(); + bzc = (Nyc(), vyc); + czc = Ou( + OC(GC(Q3, 1), zqe, 146, 0, [ + kyc, + lyc, + nyc, + oyc, + ryc, + syc, + tyc, + uyc, + xyc, + zyc, + myc, + pyc, + wyc, + ]) + ); + } + function Y9b(a) { + var b, c; + b = a.d == (Apc(), vpc); + c = U9b(a); + (b && !c) || (!b && c) + ? yNb(a.a, (Nyc(), mwc), (F7c(), D7c)) + : yNb(a.a, (Nyc(), mwc), (F7c(), C7c)); + } + function XAb(a, b) { + var c; + c = BD( + GAb( + a, + Byb( + new fzb(), + new dzb(), + new Ezb(), + OC(GC(xL, 1), Kie, 132, 0, [(Fyb(), Dyb)]) + ) + ), + 15 + ); + return c.Qc(aBb(c.gc())); + } + function Ded() { + Ded = ccb; + Ced = new Eed("SIMPLE", 0); + zed = new Eed("GROUP_DEC", 1); + Bed = new Eed("GROUP_MIXED", 2); + Aed = new Eed("GROUP_INC", 3); + } + function CWd() { + CWd = ccb; + AWd = new DWd(); + tWd = new GWd(); + uWd = new JWd(); + vWd = new MWd(); + wWd = new PWd(); + xWd = new SWd(); + yWd = new VWd(); + zWd = new YWd(); + BWd = new _Wd(); + } + function FHb(a, b, c) { + tHb(); + oHb.call(this); + this.a = IC(oN, [nie, ile], [595, 212], 0, [sHb, rHb], 2); + this.c = new I6c(); + this.g = a; + this.f = b; + this.d = c; + } + function pNb(a, b) { + this.n = IC(XD, [nie, Sje], [364, 25], 14, [b, QD(Math.ceil(a / 32))], 2); + this.o = a; + this.p = b; + this.j = (a - 1) >> 1; + this.k = (b - 1) >> 1; + } + function r3b(a, b) { + Odd(b, "End label post-processing", 1); + MAb( + JAb(LAb(new YAb(null, new Kub(a.b, 16)), new w3b()), new y3b()), + new A3b() + ); + Qdd(b); + } + function NLc(a, b, c) { + var d, e; + d = Edb(a.p[b.i.p]) + Edb(a.d[b.i.p]) + b.n.b + b.a.b; + e = Edb(a.p[c.i.p]) + Edb(a.d[c.i.p]) + c.n.b + c.a.b; + return e - d; + } + function xhb(a, b, c) { + var d, e; + d = xbb(c, Yje); + for (e = 0; ybb(d, 0) != 0 && e < b; e++) { + d = wbb(d, xbb(a[e], Yje)); + a[e] = Tbb(d); + d = Obb(d, 32); + } + return Tbb(d); + } + function $Ed(a) { + var b, c, d, e; + e = 0; + for (c = 0, d = a.length; c < d; c++) { + b = (BCb(c, a.length), a.charCodeAt(c)); + b < 64 && (e = Mbb(e, Nbb(1, b))); + } + return e; + } + function S9d(a) { + var b; + return a == null + ? null + : new Ygb( + ((b = Qge(a, true)), + b.length > 0 && (BCb(0, b.length), b.charCodeAt(0) == 43) + ? b.substr(1) + : b) + ); + } + function T9d(a) { + var b; + return a == null + ? null + : new Ygb( + ((b = Qge(a, true)), + b.length > 0 && (BCb(0, b.length), b.charCodeAt(0) == 43) + ? b.substr(1) + : b) + ); + } + function xud(a, b) { + var c; + if (a.i > 0) { + if (b.length < a.i) { + c = izd(rb(b).c, a.i); + b = c; + } + $fb(a.g, 0, b, 0, a.i); + } + b.length > a.i && NC(b, a.i, null); + return b; + } + function Sxd(a, b, c) { + var d, e, f; + if (a.ej()) { + d = a.i; + f = a.fj(); + kud(a, d, b); + e = a.Zi(3, null, b, d, f); + !c ? (c = e) : c.Ei(e); + } else { + kud(a, a.i, b); + } + return c; + } + function HMd(a, b, c) { + var d, e; + d = new pSd( + a.e, + 4, + 10, + ((e = b.c), JD(e, 88) ? BD(e, 26) : (jGd(), _Fd)), + null, + HLd(a, b), + false + ); + !c ? (c = d) : c.Ei(d); + return c; + } + function GMd(a, b, c) { + var d, e; + d = new pSd( + a.e, + 3, + 10, + null, + ((e = b.c), JD(e, 88) ? BD(e, 26) : (jGd(), _Fd)), + HLd(a, b), + false + ); + !c ? (c = d) : c.Ei(d); + return c; + } + function _Jb(a) { + $Jb(); + var b; + b = new g7c(BD(a.e.We((Y9c(), _8c)), 8)); + if (a.B.Hc((Idd(), Bdd))) { + b.a <= 0 && (b.a = 20); + b.b <= 0 && (b.b = 20); + } + return b; + } + function Lzc(a) { + Izc(); + var b; + (!a.q ? (mmb(), mmb(), kmb) : a.q)._b((Nyc(), Cxc)) + ? (b = BD(vNb(a, Cxc), 197)) + : (b = BD(vNb(Q_b(a), Dxc), 197)); + return b; + } + function pBc(a, b) { + var c, d; + d = null; + if (wNb(a, (Nyc(), qyc))) { + c = BD(vNb(a, qyc), 94); + c.Xe(b) && (d = c.We(b)); + } + d == null && (d = vNb(Q_b(a), b)); + return d; + } + function Ze(a, b) { + var c, d, e; + if (JD(b, 42)) { + c = BD(b, 42); + d = c.cd(); + e = Hv(a.Rc(), d); + return Hb(e, c.dd()) && (e != null || a.Rc()._b(d)); + } + return false; + } + function qAd(a, b) { + var c, d, e; + if (a.f > 0) { + a.qj(); + d = b == null ? 0 : tb(b); + e = (d & Ohe) % a.d.length; + c = xAd(a, e, d, b); + return c != -1; + } else { + return false; + } + } + function AAd(a, b) { + var c, d, e; + if (a.f > 0) { + a.qj(); + d = b == null ? 0 : tb(b); + e = (d & Ohe) % a.d.length; + c = wAd(a, e, d, b); + if (c) { + return c.dd(); + } + } + return null; + } + function R2d(a, b) { + var c, d, e, f; + f = S6d(a.e.Tg(), b); + c = BD(a.g, 119); + for (e = 0; e < a.i; ++e) { + d = c[e]; + if (f.rl(d.ak())) { + return false; + } + } + return true; + } + function B6d(a) { + if (a.b == null) { + while (a.a.Ob()) { + a.b = a.a.Pb(); + if (!BD(a.b, 49).Zg()) { + return true; + } + } + a.b = null; + return false; + } else { + return true; + } + } + function Myd(b, c) { + b.mj(); + try { + b.d.Vc(b.e++, c); + b.f = b.d.j; + b.g = -1; + } catch (a) { + a = ubb(a); + if (JD(a, 73)) { + throw vbb(new Apb()); + } else throw vbb(a); + } + } + function IA(a, b) { + GA(); + var c, d; + c = LA((KA(), KA(), JA)); + d = null; + b == c && (d = BD(Phb(FA, a), 615)); + if (!d) { + d = new HA(a); + b == c && Shb(FA, a, d); + } + return d; + } + function Epb(a, b) { + var c, d; + a.a = wbb(a.a, 1); + a.c = Math.min(a.c, b); + a.b = Math.max(a.b, b); + a.d += b; + c = b - a.f; + d = a.e + c; + a.f = d - a.e - c; + a.e = d; + } + function ogb(a, b) { + var c; + a.c = b; + a.a = hhb(b); + a.a < 54 && + (a.f = + ((c = + b.d > 1 + ? Mbb(Nbb(b.a[1], 32), xbb(b.a[0], Yje)) + : xbb(b.a[0], Yje)), + Sbb(Ibb(b.e, c)))); + } + function Hbb(a, b) { + var c; + if (Fbb(a) && Fbb(b)) { + c = a % b; + if (Kje < c && c < Ije) { + return c; + } + } + return zbb((UC(Fbb(a) ? Rbb(a) : a, Fbb(b) ? Rbb(b) : b, true), QC)); + } + function p5b(a, b) { + var c; + m5b(b); + c = BD(vNb(a, (Nyc(), Rwc)), 276); + !!c && yNb(a, Rwc, Tqc(c)); + n5b(a.c); + n5b(a.f); + o5b(a.d); + o5b(BD(vNb(a, wxc), 207)); + } + function rHc(a) { + this.e = KC(WD, oje, 25, a.length, 15, 1); + this.c = KC(sbb, dle, 25, a.length, 16, 1); + this.b = KC(sbb, dle, 25, a.length, 16, 1); + this.f = 0; + } + function BDc(a) { + var b, c; + a.j = KC(UD, Vje, 25, a.p.c.length, 15, 1); + for (c = new olb(a.p); c.a < c.c.c.length; ) { + b = BD(mlb(c), 10); + a.j[b.p] = b.o.b / a.i; + } + } + function yic(a) { + var b; + if (a.c == 0) { + return; + } + b = BD(Ikb(a.a, a.b), 287); + b.b == 1 + ? (++a.b, a.b < a.a.c.length && Cic(BD(Ikb(a.a, a.b), 287))) + : --b.b; + --a.c; + } + function eac(a) { + var b; + b = a.a; + do { + b = BD(Rr(new Sr(ur(U_b(b).a.Kc(), new Sq()))), 17).d.i; + b.k == (j0b(), g0b) && Ekb(a.e, b); + } while (b.k == (j0b(), g0b)); + } + function idd() { + idd = ccb; + fdd = new q0b(15); + edd = new Osd((Y9c(), f9c), fdd); + hdd = new Osd(T9c, 15); + gdd = new Osd(E9c, meb(0)); + ddd = new Osd(r8c, tme); + } + function tdd() { + tdd = ccb; + rdd = new udd("PORTS", 0); + sdd = new udd("PORT_LABELS", 1); + qdd = new udd("NODE_LABELS", 2); + pdd = new udd("MINIMUM_SIZE", 3); + } + function Ree(a, b) { + var c, d; + d = b.length; + for (c = 0; c < d; c += 2) + Ufe( + a, + (BCb(c, b.length), b.charCodeAt(c)), + (BCb(c + 1, b.length), b.charCodeAt(c + 1)) + ); + } + function _Zc(a, b, c) { + var d, e, f, g; + f = b - a.e; + g = c - a.f; + for (e = new olb(a.a); e.a < e.c.c.length; ) { + d = BD(mlb(e), 187); + OZc(d, d.s + f, d.t + g); + } + a.e = b; + a.f = c; + } + function jUc(a, b) { + var c, d, e, f; + f = b.b.b; + a.a = new Psb(); + a.b = KC(WD, oje, 25, f, 15, 1); + c = 0; + for (e = Jsb(b.b, 0); e.b != e.d.c; ) { + d = BD(Xsb(e), 86); + d.g = c++; + } + } + function ihb(a, b) { + var c, d, e, f; + c = b >> 5; + b &= 31; + e = a.d + c + (b == 0 ? 0 : 1); + d = KC(WD, oje, 25, e, 15, 1); + jhb(d, a.a, c, b); + f = new Vgb(a.e, e, d); + Jgb(f); + return f; + } + function Ofe(a, b, c) { + var d, e; + d = BD(Phb(Zee, b), 117); + e = BD(Phb($ee, b), 117); + if (c) { + Shb(Zee, a, d); + Shb($ee, a, e); + } else { + Shb($ee, a, d); + Shb(Zee, a, e); + } + } + function Cwb(a, b, c) { + var d, e, f; + e = null; + f = a.b; + while (f) { + d = a.a.ue(b, f.d); + if (c && d == 0) { + return f; + } + if (d >= 0) { + f = f.a[1]; + } else { + e = f; + f = f.a[0]; + } + } + return e; + } + function Dwb(a, b, c) { + var d, e, f; + e = null; + f = a.b; + while (f) { + d = a.a.ue(b, f.d); + if (c && d == 0) { + return f; + } + if (d <= 0) { + f = f.a[0]; + } else { + e = f; + f = f.a[1]; + } + } + return e; + } + function Nic(a, b, c, d) { + var e, f, g; + e = false; + if (fjc(a.f, c, d)) { + ijc(a.f, a.a[b][c], a.a[b][d]); + f = a.a[b]; + g = f[d]; + f[d] = f[c]; + f[c] = g; + e = true; + } + return e; + } + function QHc(a, b, c, d, e) { + var f, g, h; + g = e; + while (b.b != b.c) { + f = BD(fkb(b), 10); + h = BD(V_b(f, d).Xb(0), 11); + a.d[h.p] = g++; + c.c[c.c.length] = h; + } + return g; + } + function hBc(a, b, c) { + var d, e, f, g, h; + g = a.k; + h = b.k; + d = c[g.g][h.g]; + e = ED(pBc(a, d)); + f = ED(pBc(b, d)); + return Math.max((uCb(e), e), (uCb(f), f)); + } + function zZc(a, b, c) { + var d, e, f, g; + d = c / a.c.length; + e = 0; + for (g = new olb(a); g.a < g.c.c.length; ) { + f = BD(mlb(g), 200); + w$c(f, f.f + d * e); + t$c(f, b, d); + ++e; + } + } + function hnc(a, b, c) { + var d, e, f, g; + e = BD(Ohb(a.b, c), 177); + d = 0; + for (g = new olb(b.j); g.a < g.c.c.length; ) { + f = BD(mlb(g), 113); + e[f.d.p] && ++d; + } + return d; + } + function mzd(a) { + var b, c; + b = BD(Ajd(a.a, 4), 126); + if (b != null) { + c = KC($3, hve, 415, b.length, 0, 1); + $fb(b, 0, c, 0, b.length); + return c; + } else { + return jzd; + } + } + function Cz() { + var a; + if (xz != 0) { + a = sz(); + if (a - yz > 2000) { + yz = a; + zz = setTimeout(Iz, 10); + } + } + if (xz++ == 0) { + Lz((Kz(), Jz)); + return true; + } + return false; + } + function wCc(a, b) { + var c, d, e; + for (d = new Sr(ur(U_b(a).a.Kc(), new Sq())); Qr(d); ) { + c = BD(Rr(d), 17); + e = c.d.i; + if (e.c == b) { + return false; + } + } + return true; + } + function Ek(b, c) { + var d, e; + if (JD(c, 245)) { + e = BD(c, 245); + try { + d = b.vd(e); + return d == 0; + } catch (a) { + a = ubb(a); + if (!JD(a, 205)) throw vbb(a); + } + } + return false; + } + function Xz() { + if (Error.stackTraceLimit > 0) { + return true; + } + return "stack" in new Error(); + } + function BDb(a, b) { + return ( + Iy(), + Iy(), + My(Qie), + (Math.abs(a - b) <= Qie || a == b || (isNaN(a) && isNaN(b)) + ? 0 + : a < b + ? -1 + : a > b + ? 1 + : Ny(isNaN(a), isNaN(b))) > 0 + ); + } + function DDb(a, b) { + return ( + Iy(), + Iy(), + My(Qie), + (Math.abs(a - b) <= Qie || a == b || (isNaN(a) && isNaN(b)) + ? 0 + : a < b + ? -1 + : a > b + ? 1 + : Ny(isNaN(a), isNaN(b))) < 0 + ); + } + function CDb(a, b) { + return ( + Iy(), + Iy(), + My(Qie), + (Math.abs(a - b) <= Qie || a == b || (isNaN(a) && isNaN(b)) + ? 0 + : a < b + ? -1 + : a > b + ? 1 + : Ny(isNaN(a), isNaN(b))) <= 0 + ); + } + function ydb(a, b) { + var c = 0; + while (!b[c] || b[c] == "") { + c++; + } + var d = b[c++]; + for (; c < b.length; c++) { + if (!b[c] || b[c] == "") { + continue; + } + d += a + b[c]; + } + return d; + } + function zfb(a, b, c) { + var d, e, f, g; + f = b + c; + ACb(b, f, a.length); + g = ""; + for (e = b; e < f; ) { + d = Math.min(e + 10000, f); + g += vfb(a.slice(e, d)); + e = d; + } + return g; + } + function N9d(a) { + var b, c, d, e, f; + if (a == null) return null; + f = new Rkb(); + for (c = Zmd(a), d = 0, e = c.length; d < e; ++d) { + b = c[d]; + Ekb(f, Qge(b, true)); + } + return f; + } + function Q9d(a) { + var b, c, d, e, f; + if (a == null) return null; + f = new Rkb(); + for (c = Zmd(a), d = 0, e = c.length; d < e; ++d) { + b = c[d]; + Ekb(f, Qge(b, true)); + } + return f; + } + function R9d(a) { + var b, c, d, e, f; + if (a == null) return null; + f = new Rkb(); + for (c = Zmd(a), d = 0, e = c.length; d < e; ++d) { + b = c[d]; + Ekb(f, Qge(b, true)); + } + return f; + } + function ted(a, b) { + var c, d, e; + if (a.c) { + cld(a.c, b); + } else { + c = b - red(a); + for (e = new olb(a.d); e.a < e.c.c.length; ) { + d = BD(mlb(e), 157); + ted(d, red(d) + c); + } + } + } + function sed(a, b) { + var c, d, e; + if (a.c) { + ald(a.c, b); + } else { + c = b - qed(a); + for (e = new olb(a.a); e.a < e.c.c.length; ) { + d = BD(mlb(e), 157); + sed(d, qed(d) + c); + } + } + } + function t6d(a, b) { + var c, d, e, f; + e = new Skb(b.gc()); + for (d = b.Kc(); d.Ob(); ) { + c = d.Pb(); + f = s6d(a, BD(c, 56)); + !!f && ((e.c[e.c.length] = f), true); + } + return e; + } + function LAd(a, b) { + var c, d, e; + a.qj(); + d = b == null ? 0 : tb(b); + e = (d & Ohe) % a.d.length; + c = wAd(a, e, d, b); + if (c) { + JAd(a, c); + return c.dd(); + } else { + return null; + } + } + function rde(a) { + var b, c; + c = sde(a); + b = null; + while (a.c == 2) { + nde(a); + if (!b) { + b = (wfe(), wfe(), ++vfe, new Lge(2)); + Kge(b, c); + c = b; + } + c.$l(sde(a)); + } + return c; + } + function Wpd(a) { + var b, c, d; + d = null; + b = Vte in a.a; + c = !b; + if (c) { + throw vbb(new cqd("Every element must have an id.")); + } + d = Vpd(aC(a, Vte)); + return d; + } + function jid(a) { + var b, c, d; + d = a.Zg(); + if (!d) { + b = 0; + for (c = a.eh(); c; c = c.eh()) { + if (++b > Wje) { + return c.fh(); + } + d = c.Zg(); + if (!!d || c == a) { + break; + } + } + } + return d; + } + function fvd(a) { + evd(); + if (JD(a, 156)) { + return BD(Ohb(cvd, hK), 288).vg(a); + } + if (Mhb(cvd, rb(a))) { + return BD(Ohb(cvd, rb(a)), 288).vg(a); + } + return null; + } + function fZd(a) { + if (efb(kse, a)) { + return Bcb(), Acb; + } else if (efb(lse, a)) { + return Bcb(), zcb; + } else { + throw vbb(new Wdb("Expecting true or false")); + } + } + function uDc(a, b) { + if (b.c == a) { + return b.d; + } else if (b.d == a) { + return b.c; + } + throw vbb(new Wdb("Input edge is not connected to the input port.")); + } + function Igb(a, b) { + if (a.e > b.e) { + return 1; + } + if (a.e < b.e) { + return -1; + } + if (a.d > b.d) { + return a.e; + } + if (a.d < b.d) { + return -b.e; + } + return a.e * whb(a.a, b.a, a.d); + } + function Zcb(a) { + if (a >= 48 && a < 48 + Math.min(10, 10)) { + return a - 48; + } + if (a >= 97 && a < 97) { + return a - 97 + 10; + } + if (a >= 65 && a < 65) { + return a - 65 + 10; + } + return -1; + } + function Ue(a, b) { + var c; + if (PD(b) === PD(a)) { + return true; + } + if (!JD(b, 21)) { + return false; + } + c = BD(b, 21); + if (c.gc() != a.gc()) { + return false; + } + return a.Ic(c); + } + function ekb(a, b) { + var c, d, e, f; + d = a.a.length - 1; + c = (b - a.b) & d; + f = (a.c - b) & d; + e = (a.c - a.b) & d; + mkb(c < e); + if (c >= f) { + hkb(a, b); + return -1; + } else { + ikb(a, b); + return 1; + } + } + function lA(a, b) { + var c, d; + c = (BCb(b, a.length), a.charCodeAt(b)); + d = b + 1; + while (d < a.length && (BCb(d, a.length), a.charCodeAt(d) == c)) { + ++d; + } + return d - b; + } + function sJb(a) { + switch (a.g) { + case 12: + case 13: + case 14: + case 15: + case 16: + case 17: + case 18: + case 19: + case 20: + return true; + default: + return false; + } + } + function bC(f, a) { + var b = f.a; + var c; + a = String(a); + b.hasOwnProperty(a) && (c = b[a]); + var d = (rC(), qC)[typeof c]; + var e = d ? d(c) : xC(typeof c); + return e; + } + function b3c(a, b) { + if (a.a < 0) { + throw vbb( + new Zdb( + "Did not call before(...) or after(...) before calling add(...)." + ) + ); + } + i3c(a, a.a, b); + return a; + } + function VOc(a, b, c, d) { + var e, f; + if (b.c.length == 0) { + return; + } + e = ROc(c, d); + f = QOc(b); + MAb(VAb(new YAb(null, new Kub(f, 1)), new cPc()), new gPc(a, c, e, d)); + } + function Cjd(a, b, c) { + var d; + if ((a.Db & b) != 0) { + if (c == null) { + Bjd(a, b); + } else { + d = zjd(a, b); + d == -1 ? (a.Eb = c) : NC(CD(a.Eb), d, c); + } + } else c != null && vjd(a, b, c); + } + function yjd(a) { + var b, c; + if ((a.Db & 32) == 0) { + c = ((b = BD(Ajd(a, 16), 26)), aLd(!b ? a.zh() : b) - aLd(a.zh())); + c != 0 && Cjd(a, 32, KC(SI, Uhe, 1, c, 5, 1)); + } + return a; + } + function W1d(a) { + var b; + a.b || + X1d( + a, + ((b = h1d(a.e, a.a)), + !b || + !dfb( + lse, + AAd( + (!b.b && (b.b = new sId((jGd(), fGd), x6, b)), b.b), + "qualified" + ) + )) + ); + return a.c; + } + function dTd(a, b, c) { + var d, e, f; + d = BD(qud(QSd(a.a), b), 87); + f = ((e = d.c), e ? e : (jGd(), YFd)); + (f.kh() ? xid(a.b, BD(f, 49)) : f) == c ? KQd(d) : NQd(d, c); + return f; + } + function fCb(a, b) { + (!b && console.groupCollapsed != null + ? console.groupCollapsed + : console.group != null + ? console.group + : console.log + ).call(console, a); + } + function NNb(a, b, c, d) { + d == a + ? (BD(c.b, 65), BD(c.b, 65), BD(d.b, 65), BD(d.b, 65).c.b) + : (BD(c.b, 65), BD(c.b, 65), BD(d.b, 65), BD(d.b, 65).c.b); + KNb(d, b, a); + } + function EOb(a) { + var b, c, d; + b = 0; + for (c = new olb(a.g); c.a < c.c.c.length; ) { + BD(mlb(c), 562); + ++b; + } + d = new ENb(a.g, Edb(a.a), a.c); + ELb(d); + a.g = d.b; + a.d = d.a; + } + function ymc(a, b, c) { + b.b = Math.max(b.b, -c.a); + b.c = Math.max(b.c, c.a - a.a); + b.d = Math.max(b.d, -c.b); + b.a = Math.max(b.a, c.b - a.b); + } + function MIc(a, b) { + if (a.e < b.e) { + return -1; + } else if (a.e > b.e) { + return 1; + } else if (a.f < b.f) { + return -1; + } else if (a.f > b.f) { + return 1; + } + return tb(a) - tb(b); + } + function efb(a, b) { + uCb(a); + if (b == null) { + return false; + } + if (dfb(a, b)) { + return true; + } + return a.length == b.length && dfb(a.toLowerCase(), b.toLowerCase()); + } + function x6d(a, b) { + var c, d, e, f; + for (d = 0, e = b.gc(); d < e; ++d) { + c = b.il(d); + if (JD(c, 99) && (BD(c, 18).Bb & ote) != 0) { + f = b.jl(d); + f != null && s6d(a, BD(f, 56)); + } + } + } + function p1c(a, b, c) { + var d, e, f; + for (f = new olb(c.a); f.a < f.c.c.length; ) { + e = BD(mlb(f), 221); + d = new hDb(BD(Ohb(a.a, e.b), 65)); + Ekb(b.a, d); + p1c(a, d, e); + } + } + function Aeb(a) { + var b, c; + if (ybb(a, -129) > 0 && ybb(a, 128) < 0) { + b = Tbb(a) + 128; + c = (Ceb(), Beb)[b]; + !c && (c = Beb[b] = new teb(a)); + return c; + } + return new teb(a); + } + function _0d(a, b) { + var c, d; + c = b.Hh(a.a); + if (c) { + d = GD(AAd((!c.b && (c.b = new sId((jGd(), fGd), x6, c)), c.b), fue)); + if (d != null) { + return d; + } + } + return b.ne(); + } + function a1d(a, b) { + var c, d; + c = b.Hh(a.a); + if (c) { + d = GD(AAd((!c.b && (c.b = new sId((jGd(), fGd), x6, c)), c.b), fue)); + if (d != null) { + return d; + } + } + return b.ne(); + } + function FMc(a, b) { + wMc(); + var c, d; + for (d = new Sr(ur(O_b(a).a.Kc(), new Sq())); Qr(d); ) { + c = BD(Rr(d), 17); + if (c.d.i == b || c.c.i == b) { + return c; + } + } + return null; + } + function HUb(a, b, c) { + this.c = a; + this.f = new Rkb(); + this.e = new d7c(); + this.j = new IVb(); + this.n = new IVb(); + this.b = b; + this.g = new J6c(b.c, b.d, b.b, b.a); + this.a = c; + } + function gVb(a) { + var b, c, d, e; + this.a = new zsb(); + this.d = new Tqb(); + this.e = 0; + for (c = a, d = 0, e = c.length; d < e; ++d) { + b = c[d]; + !this.f && (this.f = b); + eVb(this, b); + } + } + function Xgb(a) { + Hgb(); + if (a.length == 0) { + this.e = 0; + this.d = 1; + this.a = OC(GC(WD, 1), oje, 25, 15, [0]); + } else { + this.e = 1; + this.d = a.length; + this.a = a; + Jgb(this); + } + } + function mIb(a, b, c) { + oHb.call(this); + this.a = KC( + oN, + ile, + 212, + (gHb(), OC(GC(pN, 1), Kie, 232, 0, [dHb, eHb, fHb])).length, + 0, + 1 + ); + this.b = a; + this.d = b; + this.c = c; + } + function Kjc(a) { + this.d = new Rkb(); + this.e = new $rb(); + this.c = KC( + WD, + oje, + 25, + (Ucd(), OC(GC(F1, 1), bne, 61, 0, [Scd, Acd, zcd, Rcd, Tcd])).length, + 15, + 1 + ); + this.b = a; + } + function Vbc(a) { + var b, c, d, e, f, g; + g = BD(vNb(a, (wtc(), $sc)), 11); + yNb(g, qtc, a.i.n.b); + b = k_b(a.e); + for (d = b, e = 0, f = d.length; e < f; ++e) { + c = d[e]; + RZb(c, g); + } + } + function Wbc(a) { + var b, c, d, e, f, g; + c = BD(vNb(a, (wtc(), $sc)), 11); + yNb(c, qtc, a.i.n.b); + b = k_b(a.g); + for (e = b, f = 0, g = e.length; f < g; ++f) { + d = e[f]; + QZb(d, c); + } + } + function vcc(a) { + var b, c; + if (wNb(a.d.i, (Nyc(), Nxc))) { + b = BD(vNb(a.c.i, Nxc), 19); + c = BD(vNb(a.d.i, Nxc), 19); + return beb(b.a, c.a) > 0; + } else { + return false; + } + } + function q2c(a) { + var b; + if (PD(hkd(a, (Y9c(), J8c))) === PD((hbd(), fbd))) { + if (!Xod(a)) { + jkd(a, J8c, gbd); + } else { + b = BD(hkd(Xod(a), J8c), 334); + jkd(a, J8c, b); + } + } + } + function ijc(a, b, c) { + var d, e; + bIc(a.e, b, c, (Ucd(), Tcd)); + bIc(a.i, b, c, zcd); + if (a.a) { + e = BD(vNb(b, (wtc(), $sc)), 11); + d = BD(vNb(c, $sc), 11); + cIc(a.g, e, d); + } + } + function OEc(a, b, c) { + var d, e, f; + d = b.c.p; + f = b.p; + a.b[d][f] = new $Ec(a, b); + if (c) { + a.a[d][f] = new FEc(b); + e = BD(vNb(b, (wtc(), Psc)), 10); + !!e && Rc(a.d, e, b); + } + } + function TPb(a, b) { + var c, d, e; + Ekb(PPb, a); + b.Fc(a); + c = BD(Ohb(OPb, a), 21); + if (c) { + for (e = c.Kc(); e.Ob(); ) { + d = BD(e.Pb(), 33); + Jkb(PPb, d, 0) != -1 || TPb(d, b); + } + } + } + function tyb(a, b, c) { + var d; + (jyb + ? (ryb(a), true) + : kyb + ? ($xb(), true) + : nyb + ? ($xb(), true) + : myb && ($xb(), false)) && + ((d = new iyb(b)), (d.b = c), pyb(a, d), undefined); + } + function xKb(a, b) { + var c; + c = !a.A.Hc((tdd(), sdd)) || a.q == (dcd(), $bd); + a.u.Hc((rcd(), ncd)) + ? c + ? vKb(a, b) + : zKb(a, b) + : a.u.Hc(pcd) && (c ? wKb(a, b) : AKb(a, b)); + } + function b0d(a, b) { + var c, d; + ++a.j; + if (b != null) { + c = ((d = a.a.Cb), JD(d, 97) ? BD(d, 97).Jg() : null); + if (xlb(b, c)) { + Cjd(a.a, 4, c); + return; + } + } + Cjd(a.a, 4, BD(b, 126)); + } + function dYb(a, b, c) { + return new J6c( + Math.min(a.a, b.a) - c / 2, + Math.min(a.b, b.b) - c / 2, + Math.abs(a.a - b.a) + c, + Math.abs(a.b - b.b) + c + ); + } + function k4b(a, b) { + var c, d; + c = beb(a.a.c.p, b.a.c.p); + if (c != 0) { + return c; + } + d = beb(a.a.d.i.p, b.a.d.i.p); + if (d != 0) { + return d; + } + return beb(b.a.d.p, a.a.d.p); + } + function _Dc(a, b, c) { + var d, e, f, g; + f = b.j; + g = c.j; + if (f != g) { + return f.g - g.g; + } else { + d = a.f[b.p]; + e = a.f[c.p]; + return d == 0 && e == 0 ? 0 : d == 0 ? -1 : e == 0 ? 1 : Kdb(d, e); + } + } + function HFb(a, b, c) { + var d, e, f; + if (c[b.d]) { + return; + } + c[b.d] = true; + for (e = new olb(LFb(b)); e.a < e.c.c.length; ) { + d = BD(mlb(e), 213); + f = xFb(d, b); + HFb(a, f, c); + } + } + function umc(a, b, c) { + var d; + d = c[a.g][b]; + switch (a.g) { + case 1: + case 3: + return new f7c(0, d); + case 2: + case 4: + return new f7c(d, 0); + default: + return null; + } + } + function r2c(b, c, d) { + var e, f; + f = BD(hgd(c.f), 209); + try { + f.Ze(b, d); + igd(c.f, f); + } catch (a) { + a = ubb(a); + if (JD(a, 102)) { + e = a; + throw vbb(e); + } else throw vbb(a); + } + } + function Vqd(a, b, c) { + var d, e, f, g, h, i; + d = null; + h = k4c(n4c(), b); + f = null; + if (h) { + e = null; + i = o5c(h, c); + g = null; + i != null && (g = a.Ye(h, i)); + e = g; + f = e; + } + d = f; + return d; + } + function TTd(a, b, c, d) { + var e, f, g; + e = new pSd( + a.e, + 1, + 13, + ((g = b.c), g ? g : (jGd(), YFd)), + ((f = c.c), f ? f : (jGd(), YFd)), + HLd(a, b), + false + ); + !d ? (d = e) : d.Ei(e); + return d; + } + function UEd(a, b, c, d) { + var e; + e = a.length; + if (b >= e) return e; + for (b = b > 0 ? b : 0; b < e; b++) { + if (_Ed((BCb(b, a.length), a.charCodeAt(b)), c, d)) break; + } + return b; + } + function Qkb(a, b) { + var c, d; + d = a.c.length; + b.length < d && (b = eCb(new Array(d), b)); + for (c = 0; c < d; ++c) { + NC(b, c, a.c[c]); + } + b.length > d && NC(b, d, null); + return b; + } + function _lb(a, b) { + var c, d; + d = a.a.length; + b.length < d && (b = eCb(new Array(d), b)); + for (c = 0; c < d; ++c) { + NC(b, c, a.a[c]); + } + b.length > d && NC(b, d, null); + return b; + } + function Xrb(a, b, c) { + var d, e, f; + e = BD(Ohb(a.e, b), 387); + if (!e) { + d = new lsb(a, b, c); + Rhb(a.e, b, d); + isb(d); + return null; + } else { + f = ijb(e, c); + Yrb(a, e); + return f; + } + } + function P9d(a) { + var b; + if (a == null) return null; + b = ide(Qge(a, true)); + if (b == null) { + throw vbb(new n8d("Invalid hexBinary value: '" + a + "'")); + } + return b; + } + function ghb(a) { + Hgb(); + if (ybb(a, 0) < 0) { + if (ybb(a, -1) != 0) { + return new Wgb(-1, Jbb(a)); + } + return Bgb; + } else return ybb(a, 10) <= 0 ? Dgb[Tbb(a)] : new Wgb(1, a); + } + function wJb() { + qJb(); + return OC(GC(DN, 1), Kie, 159, 0, [ + nJb, + mJb, + oJb, + eJb, + dJb, + fJb, + iJb, + hJb, + gJb, + lJb, + kJb, + jJb, + bJb, + aJb, + cJb, + $Ib, + ZIb, + _Ib, + XIb, + WIb, + YIb, + pJb, + ]); + } + function vjc(a) { + var b; + this.d = new Rkb(); + this.j = new d7c(); + this.g = new d7c(); + b = a.g.b; + this.f = BD(vNb(Q_b(b), (Nyc(), Lwc)), 103); + this.e = Edb(ED(c_b(b, ryc))); + } + function Pjc(a) { + this.b = new Rkb(); + this.e = new Rkb(); + this.d = a; + this.a = !WAb( + JAb(new YAb(null, new Lub(new b1b(a.b))), new Xxb(new Qjc())) + ).sd((EAb(), DAb)); + } + function N5c() { + N5c = ccb; + L5c = new O5c("PARENTS", 0); + K5c = new O5c("NODES", 1); + I5c = new O5c("EDGES", 2); + M5c = new O5c("PORTS", 3); + J5c = new O5c("LABELS", 4); + } + function Tbd() { + Tbd = ccb; + Qbd = new Ubd("DISTRIBUTED", 0); + Sbd = new Ubd("JUSTIFIED", 1); + Obd = new Ubd("BEGIN", 2); + Pbd = new Ubd(gle, 3); + Rbd = new Ubd("END", 4); + } + function UMd(a) { + var b; + b = a.yi(null); + switch (b) { + case 10: + return 0; + case 15: + return 1; + case 14: + return 2; + case 11: + return 3; + case 21: + return 4; + } + return -1; + } + function cYb(a) { + switch (a.g) { + case 1: + return ead(), dad; + case 4: + return ead(), aad; + case 2: + return ead(), bad; + case 3: + return ead(), _9c; + } + return ead(), cad; + } + function kA(a, b, c) { + var d; + d = c.q.getFullYear() - nje + nje; + d < 0 && (d = -d); + switch (b) { + case 1: + a.a += d; + break; + case 2: + EA(a, d % 100, 2); + break; + default: + EA(a, d, b); + } + } + function Jsb(a, b) { + var c, d; + wCb(b, a.b); + if (b >= a.b >> 1) { + d = a.c; + for (c = a.b; c > b; --c) { + d = d.b; + } + } else { + d = a.a.a; + for (c = 0; c < b; ++c) { + d = d.a; + } + } + return new $sb(a, b, d); + } + function MEb() { + MEb = ccb; + LEb = new NEb("NUM_OF_EXTERNAL_SIDES_THAN_NUM_OF_EXTENSIONS_LAST", 0); + KEb = new NEb("CORNER_CASES_THAN_SINGLE_SIDE_LAST", 1); + } + function h4b(a) { + var b, c, d, e; + d = c4b(a); + Okb(d, a4b); + e = a.d; + e.c = KC(SI, Uhe, 1, 0, 5, 1); + for (c = new olb(d); c.a < c.c.c.length; ) { + b = BD(mlb(c), 456); + Gkb(e, b.b); + } + } + function gkd(a) { + var b, c, d; + d = (!a.o && (a.o = new dId((Thd(), Qhd), S2, a, 0)), a.o); + for (c = d.c.Kc(); c.e != c.i.gc(); ) { + b = BD(c.nj(), 42); + b.dd(); + } + return FAd(d); + } + function N5b(a) { + var b; + if (!ecd(BD(vNb(a, (Nyc(), Vxc)), 98))) { + return; + } + b = a.b; + O5b((tCb(0, b.c.length), BD(b.c[0], 29))); + O5b(BD(Ikb(b, b.c.length - 1), 29)); + } + function Roc(a, b) { + var c, d, e, f; + c = 0; + for (e = new olb(b.a); e.a < e.c.c.length; ) { + d = BD(mlb(e), 10); + f = d.o.a + d.d.c + d.d.b + a.j; + c = Math.max(c, f); + } + return c; + } + function XEd(a) { + var b, c, d, e; + e = 0; + for (c = 0, d = a.length; c < d; c++) { + b = (BCb(c, a.length), a.charCodeAt(c)); + b >= 64 && b < 128 && (e = Mbb(e, Nbb(1, b - 64))); + } + return e; + } + function c_b(a, b) { + var c, d; + d = null; + if (wNb(a, (Y9c(), O9c))) { + c = BD(vNb(a, O9c), 94); + c.Xe(b) && (d = c.We(b)); + } + d == null && !!Q_b(a) && (d = vNb(Q_b(a), b)); + return d; + } + function oQc(a, b) { + var c, d, e; + e = b.d.i; + d = e.k; + if (d == (j0b(), h0b) || d == d0b) { + return; + } + c = new Sr(ur(U_b(e).a.Kc(), new Sq())); + Qr(c) && Rhb(a.k, b, BD(Rr(c), 17)); + } + function mid(a, b) { + var c, d, e; + d = XKd(a.Tg(), b); + c = b - a.Ah(); + return c < 0 + ? ((e = a.Yg(d)), e >= 0 ? a.lh(e) : tid(a, d)) + : c < 0 + ? tid(a, d) + : BD(d, 66).Nj().Sj(a, a.yh(), c); + } + function Ksd(a) { + var b; + if (JD(a.a, 4)) { + b = fvd(a.a); + if (b == null) { + throw vbb(new Zdb(mse + a.b + "'. " + ise + (fdb(Y3), Y3.k) + jse)); + } + return b; + } else { + return a.a; + } + } + function L9d(a) { + var b; + if (a == null) return null; + b = bde(Qge(a, true)); + if (b == null) { + throw vbb(new n8d("Invalid base64Binary value: '" + a + "'")); + } + return b; + } + function Dyd(b) { + var c; + try { + c = b.i.Xb(b.e); + b.mj(); + b.g = b.e++; + return c; + } catch (a) { + a = ubb(a); + if (JD(a, 73)) { + b.mj(); + throw vbb(new utb()); + } else throw vbb(a); + } + } + function Zyd(b) { + var c; + try { + c = b.c.ki(b.e); + b.mj(); + b.g = b.e++; + return c; + } catch (a) { + a = ubb(a); + if (JD(a, 73)) { + b.mj(); + throw vbb(new utb()); + } else throw vbb(a); + } + } + function CPb() { + CPb = ccb; + BPb = (Y9c(), K9c); + vPb = G8c; + qPb = r8c; + wPb = f9c; + zPb = (fFb(), bFb); + yPb = _Eb; + APb = dFb; + xPb = $Eb; + sPb = (nPb(), jPb); + rPb = iPb; + tPb = lPb; + uPb = mPb; + } + function NWb(a) { + LWb(); + this.c = new Rkb(); + this.d = a; + switch (a.g) { + case 0: + case 2: + this.a = tmb(KWb); + this.b = Pje; + break; + case 3: + case 1: + this.a = KWb; + this.b = Qje; + } + } + function ued(a, b, c) { + var d, e; + if (a.c) { + dld(a.c, a.c.i + b); + eld(a.c, a.c.j + c); + } else { + for (e = new olb(a.b); e.a < e.c.c.length; ) { + d = BD(mlb(e), 157); + ued(d, b, c); + } + } + } + function KEd(a, b) { + var c, d; + if (a.j.length != b.j.length) return false; + for (c = 0, d = a.j.length; c < d; c++) { + if (!dfb(a.j[c], b.j[c])) return false; + } + return true; + } + function gA(a, b, c) { + var d; + if (b.a.length > 0) { + Ekb(a.b, new WA(b.a, c)); + d = b.a.length; + 0 < d + ? (b.a = b.a.substr(0, 0)) + : 0 > d && (b.a += yfb(KC(TD, $ie, 25, -d, 15, 1))); + } + } + function JKb(a, b) { + var c, d, e; + c = a.o; + for (e = BD(BD(Qc(a.r, b), 21), 84).Kc(); e.Ob(); ) { + d = BD(e.Pb(), 111); + d.e.a = DKb(d, c.a); + d.e.b = c.b * Edb(ED(d.b.We(BKb))); + } + } + function S5b(a, b) { + var c, d, e, f; + e = a.k; + c = Edb(ED(vNb(a, (wtc(), htc)))); + f = b.k; + d = Edb(ED(vNb(b, htc))); + return f != (j0b(), e0b) + ? -1 + : e != e0b + ? 1 + : c == d + ? 0 + : c < d + ? -1 + : 1; + } + function B$c(a, b) { + var c, d; + c = BD(BD(Ohb(a.g, b.a), 46).a, 65); + d = BD(BD(Ohb(a.g, b.b), 46).a, 65); + return S6c(b.a, b.b) - S6c(b.a, E6c(c.b)) - S6c(b.b, E6c(d.b)); + } + function aZb(a, b) { + var c; + c = BD(vNb(a, (Nyc(), jxc)), 74); + if (Lq(b, ZYb)) { + if (!c) { + c = new s7c(); + yNb(a, jxc, c); + } else { + Osb(c); + } + } else !!c && yNb(a, jxc, null); + return c; + } + function a0b(a) { + var b; + b = new Ufb(); + b.a += "n"; + a.k != (j0b(), h0b) && + Qfb(Qfb(((b.a += "("), b), Zr(a.k).toLowerCase()), ")"); + Qfb(((b.a += "_"), b), P_b(a)); + return b.a; + } + function Kdc(a, b) { + Odd(b, "Self-Loop post-processing", 1); + MAb( + JAb( + JAb(LAb(new YAb(null, new Kub(a.b, 16)), new Qdc()), new Sdc()), + new Udc() + ), + new Wdc() + ); + Qdd(b); + } + function kid(a, b, c, d) { + var e; + if (c >= 0) { + return a.hh(b, c, d); + } else { + !!a.eh() && + (d = + ((e = a.Vg()), e >= 0 ? a.Qg(d) : a.eh().ih(a, -1 - e, null, d))); + return a.Sg(b, c, d); + } + } + function zld(a, b) { + switch (b) { + case 7: + !a.e && (a.e = new y5d(B2, a, 7, 4)); + Uxd(a.e); + return; + case 8: + !a.d && (a.d = new y5d(B2, a, 8, 5)); + Uxd(a.d); + return; + } + $kd(a, b); + } + function Ut(b, c) { + var d; + d = b.Zc(c); + try { + return d.Pb(); + } catch (a) { + a = ubb(a); + if (JD(a, 109)) { + throw vbb(new qcb("Can't get element " + c)); + } else throw vbb(a); + } + } + function Tgb(a, b) { + this.e = a; + if (b < Zje) { + this.d = 1; + this.a = OC(GC(WD, 1), oje, 25, 15, [b | 0]); + } else { + this.d = 2; + this.a = OC(GC(WD, 1), oje, 25, 15, [b % Zje | 0, (b / Zje) | 0]); + } + } + function omb(a, b) { + mmb(); + var c, d, e, f; + c = a; + f = b; + if (JD(a, 21) && !JD(b, 21)) { + c = b; + f = a; + } + for (e = c.Kc(); e.Ob(); ) { + d = e.Pb(); + if (f.Hc(d)) { + return false; + } + } + return true; + } + function Txd(a, b, c) { + var d, e, f, g; + d = a.Xc(b); + if (d != -1) { + if (a.ej()) { + f = a.fj(); + g = tud(a, d); + e = a.Zi(4, g, null, d, f); + !c ? (c = e) : c.Ei(e); + } else { + tud(a, d); + } + } + return c; + } + function uwd(a, b, c) { + var d, e, f, g; + d = a.Xc(b); + if (d != -1) { + if (a.ej()) { + f = a.fj(); + g = Evd(a, d); + e = a.Zi(4, g, null, d, f); + !c ? (c = e) : c.Ei(e); + } else { + Evd(a, d); + } + } + return c; + } + function PJb(a, b) { + var c; + c = BD(Mpb(a.b, b), 124).n; + switch (b.g) { + case 1: + a.t >= 0 && (c.d = a.t); + break; + case 3: + a.t >= 0 && (c.a = a.t); + } + if (a.C) { + c.b = a.C.b; + c.c = a.C.c; + } + } + function RMb() { + RMb = ccb; + OMb = new SMb(xle, 0); + NMb = new SMb(yle, 1); + PMb = new SMb(zle, 2); + QMb = new SMb(Ale, 3); + OMb.a = false; + NMb.a = true; + PMb.a = false; + QMb.a = true; + } + function ROb() { + ROb = ccb; + OOb = new SOb(xle, 0); + NOb = new SOb(yle, 1); + POb = new SOb(zle, 2); + QOb = new SOb(Ale, 3); + OOb.a = false; + NOb.a = true; + POb.a = false; + QOb.a = true; + } + function dac(a) { + var b; + b = a.a; + do { + b = BD(Rr(new Sr(ur(R_b(b).a.Kc(), new Sq()))), 17).c.i; + b.k == (j0b(), g0b) && a.b.Fc(b); + } while (b.k == (j0b(), g0b)); + a.b = Su(a.b); + } + function CDc(a) { + var b, c, d; + d = a.c.a; + a.p = (Qb(d), new Tkb(d)); + for (c = new olb(d); c.a < c.c.c.length; ) { + b = BD(mlb(c), 10); + b.p = GDc(b).a; + } + mmb(); + Okb(a.p, new PDc()); + } + function eVc(a) { + var b, c, d, e; + d = 0; + e = gVc(a); + if (e.c.length == 0) { + return 1; + } else { + for (c = new olb(e); c.a < c.c.c.length; ) { + b = BD(mlb(c), 33); + d += eVc(b); + } + } + return d; + } + function JJb(a, b) { + var c, d, e; + e = 0; + d = BD(BD(Qc(a.r, b), 21), 84).Kc(); + while (d.Ob()) { + c = BD(d.Pb(), 111); + e += c.d.b + c.b.rf().a + c.d.c; + d.Ob() && (e += a.w); + } + return e; + } + function RKb(a, b) { + var c, d, e; + e = 0; + d = BD(BD(Qc(a.r, b), 21), 84).Kc(); + while (d.Ob()) { + c = BD(d.Pb(), 111); + e += c.d.d + c.b.rf().b + c.d.a; + d.Ob() && (e += a.w); + } + return e; + } + function SOc(a, b, c, d) { + if (b.a < d.a) { + return true; + } else if (b.a == d.a) { + if (b.b < d.b) { + return true; + } else if (b.b == d.b) { + if (a.b > c.b) { + return true; + } + } + } + return false; + } + function AD(a, b) { + if (ND(a)) { + return !!zD[b]; + } else if (a.hm) { + return !!a.hm[b]; + } else if (LD(a)) { + return !!yD[b]; + } else if (KD(a)) { + return !!xD[b]; + } + return false; + } + function jkd(a, b, c) { + c == null + ? (!a.o && (a.o = new dId((Thd(), Qhd), S2, a, 0)), LAd(a.o, b)) + : (!a.o && (a.o = new dId((Thd(), Qhd), S2, a, 0)), HAd(a.o, b, c)); + return a; + } + function jKb(a, b, c, d) { + var e, f; + f = b.Xe((Y9c(), W8c)) ? BD(b.We(W8c), 21) : a.j; + e = uJb(f); + if (e == (qJb(), pJb)) { + return; + } + if (c && !sJb(e)) { + return; + } + UHb(lKb(a, e, d), b); + } + function fid(a, b, c, d) { + var e, f, g; + f = XKd(a.Tg(), b); + e = b - a.Ah(); + return e < 0 + ? ((g = a.Yg(f)), g >= 0 ? a._g(g, c, true) : sid(a, f, c)) + : BD(f, 66).Nj().Pj(a, a.yh(), e, c, d); + } + function u6d(a, b, c, d) { + var e, f, g; + if (c.mh(b)) { + Q6d(); + if (YId(b)) { + e = BD(c.ah(b), 153); + x6d(a, e); + } else { + f = ((g = b), !g ? null : BD(d, 49).xh(g)); + !!f && v6d(c.ah(b), f); + } + } + } + function H3b(a) { + switch (a.g) { + case 1: + return vLb(), uLb; + case 3: + return vLb(), rLb; + case 2: + return vLb(), tLb; + case 4: + return vLb(), sLb; + default: + return null; + } + } + function kCb(a) { + switch (typeof a) { + case Mhe: + return LCb(a); + case Lhe: + return QD(a); + case Khe: + return Bcb(), a ? 1231 : 1237; + default: + return a == null ? 0 : FCb(a); + } + } + function Gic(a, b, c) { + if (a.e) { + switch (a.b) { + case 1: + oic(a.c, b, c); + break; + case 0: + pic(a.c, b, c); + } + } else { + mic(a.c, b, c); + } + a.a[b.p][c.p] = a.c.i; + a.a[c.p][b.p] = a.c.e; + } + function lHc(a) { + var b, c; + if (a == null) { + return null; + } + c = KC(OQ, nie, 193, a.length, 0, 2); + for (b = 0; b < c.length; b++) { + c[b] = BD(ulb(a[b], a[b].length), 193); + } + return c; + } + function d4d(a) { + var b; + if (b4d(a)) { + a4d(a); + if (a.Lk()) { + b = b3d(a.e, a.b, a.c, a.a, a.j); + a.j = b; + } + a.g = a.a; + ++a.a; + ++a.c; + a.i = 0; + return a.j; + } else { + throw vbb(new utb()); + } + } + function fMb(a, b) { + var c, d, e, f; + f = a.o; + c = a.p; + f < c ? (f *= f) : (c *= c); + d = f + c; + f = b.o; + c = b.p; + f < c ? (f *= f) : (c *= c); + e = f + c; + if (d < e) { + return -1; + } + if (d == e) { + return 0; + } + return 1; + } + function HLd(a, b) { + var c, d, e; + e = rud(a, b); + if (e >= 0) return e; + if (a.Fk()) { + for (d = 0; d < a.i; ++d) { + c = a.Gk(BD(a.g[d], 56)); + if (PD(c) === PD(b)) { + return d; + } + } + } + return -1; + } + function Gtd(a, b, c) { + var d, e; + e = a.gc(); + if (b >= e) throw vbb(new Cyd(b, e)); + if (a.hi()) { + d = a.Xc(c); + if (d >= 0 && d != b) { + throw vbb(new Wdb(kue)); + } + } + return a.mi(b, c); + } + function gx(a, b) { + this.a = BD(Qb(a), 245); + this.b = BD(Qb(b), 245); + if (a.vd(b) > 0 || a == (Lk(), Kk) || b == (_k(), $k)) { + throw vbb(new Wdb("Invalid range: " + nx(a, b))); + } + } + function mYb(a) { + var b, c; + this.b = new Rkb(); + this.c = a; + this.a = false; + for (c = new olb(a.a); c.a < c.c.c.length; ) { + b = BD(mlb(c), 10); + this.a = this.a | (b.k == (j0b(), h0b)); + } + } + function GFb(a, b) { + var c, d, e; + c = nGb(new pGb(), a); + for (e = new olb(b); e.a < e.c.c.length; ) { + d = BD(mlb(e), 121); + AFb(DFb(CFb(EFb(BFb(new FFb(), 0), 0), c), d)); + } + return c; + } + function Nac(a, b, c) { + var d, e, f; + for (e = new Sr(ur((b ? R_b(a) : U_b(a)).a.Kc(), new Sq())); Qr(e); ) { + d = BD(Rr(e), 17); + f = b ? d.c.i : d.d.i; + f.k == (j0b(), f0b) && $_b(f, c); + } + } + function Izc() { + Izc = ccb; + Gzc = new Kzc(ane, 0); + Hzc = new Kzc("PORT_POSITION", 1); + Fzc = new Kzc("NODE_SIZE_WHERE_SPACE_PERMITS", 2); + Ezc = new Kzc("NODE_SIZE", 3); + } + function F7c() { + F7c = ccb; + z7c = new G7c("AUTOMATIC", 0); + C7c = new G7c(jle, 1); + D7c = new G7c(kle, 2); + E7c = new G7c("TOP", 3); + A7c = new G7c(mle, 4); + B7c = new G7c(gle, 5); + } + function Hhb(a, b, c, d) { + Dhb(); + var e, f; + e = 0; + for (f = 0; f < c; f++) { + e = wbb(Ibb(xbb(b[f], Yje), xbb(d, Yje)), xbb(Tbb(e), Yje)); + a[f] = Tbb(e); + e = Pbb(e, 32); + } + return Tbb(e); + } + function zHb(a, b, c) { + var d, e; + e = 0; + for (d = 0; d < rHb; d++) { + e = Math.max(e, pHb(a.a[b.g][d], c)); + } + b == (gHb(), eHb) && !!a.b && (e = Math.max(e, a.b.b)); + return e; + } + function Bub(a, b) { + var c, d; + lCb(b > 0); + if ((b & -b) == b) { + return QD(b * Cub(a, 31) * 4.6566128730773926e-10); + } + do { + c = Cub(a, 31); + d = c % b; + } while (c - d + (b - 1) < 0); + return QD(d); + } + function LCb(a) { + JCb(); + var b, c, d; + c = ":" + a; + d = ICb[c]; + if (d != null) { + return QD((uCb(d), d)); + } + d = GCb[c]; + b = d == null ? KCb(a) : QD((uCb(d), d)); + MCb(); + ICb[c] = b; + return b; + } + function qZb(a, b, c) { + Odd(c, "Compound graph preprocessor", 1); + a.a = new Hp(); + vZb(a, b, null); + pZb(a, b); + uZb(a); + yNb(b, (wtc(), zsc), a.a); + a.a = null; + Uhb(a.b); + Qdd(c); + } + function X$b(a, b, c) { + switch (c.g) { + case 1: + a.a = b.a / 2; + a.b = 0; + break; + case 2: + a.a = b.a; + a.b = b.b / 2; + break; + case 3: + a.a = b.a / 2; + a.b = b.b; + break; + case 4: + a.a = 0; + a.b = b.b / 2; + } + } + function tkc(a) { + var b, c, d; + for (d = BD(Qc(a.a, (Xjc(), Vjc)), 15).Kc(); d.Ob(); ) { + c = BD(d.Pb(), 101); + b = Bkc(c); + kkc(a, c, b[0], (Fkc(), Ckc), 0); + kkc(a, c, b[1], Ekc, 1); + } + } + function ukc(a) { + var b, c, d; + for (d = BD(Qc(a.a, (Xjc(), Wjc)), 15).Kc(); d.Ob(); ) { + c = BD(d.Pb(), 101); + b = Bkc(c); + kkc(a, c, b[0], (Fkc(), Ckc), 0); + kkc(a, c, b[1], Ekc, 1); + } + } + function tXc(a) { + switch (a.g) { + case 0: + return null; + case 1: + return new $Xc(); + case 2: + return new QXc(); + default: + throw vbb(new Wdb(jre + (a.f != null ? a.f : "" + a.g))); + } + } + function OZc(a, b, c) { + var d, e; + FZc(a, b - a.s, c - a.t); + for (e = new olb(a.n); e.a < e.c.c.length; ) { + d = BD(mlb(e), 211); + SZc(d, d.e + b - a.s); + TZc(d, d.f + c - a.t); + } + a.s = b; + a.t = c; + } + function JFb(a) { + var b, c, d, e, f; + c = 0; + for (e = new olb(a.a); e.a < e.c.c.length; ) { + d = BD(mlb(e), 121); + d.d = c++; + } + b = IFb(a); + f = null; + b.c.length > 1 && (f = GFb(a, b)); + return f; + } + function dmd(a) { + var b; + if (!!a.f && a.f.kh()) { + b = BD(a.f, 49); + a.f = BD(xid(a, b), 82); + a.f != b && + (a.Db & 4) != 0 && + (a.Db & 1) == 0 && + Uhd(a, new nSd(a, 9, 8, b, a.f)); + } + return a.f; + } + function emd(a) { + var b; + if (!!a.i && a.i.kh()) { + b = BD(a.i, 49); + a.i = BD(xid(a, b), 82); + a.i != b && + (a.Db & 4) != 0 && + (a.Db & 1) == 0 && + Uhd(a, new nSd(a, 9, 7, b, a.i)); + } + return a.i; + } + function zUd(a) { + var b; + if (!!a.b && (a.b.Db & 64) != 0) { + b = a.b; + a.b = BD(xid(a, b), 18); + a.b != b && + (a.Db & 4) != 0 && + (a.Db & 1) == 0 && + Uhd(a, new nSd(a, 9, 21, b, a.b)); + } + return a.b; + } + function uAd(a, b) { + var c, d, e; + if (a.d == null) { + ++a.e; + ++a.f; + } else { + d = b.Sh(); + BAd(a, a.f + 1); + e = (d & Ohe) % a.d.length; + c = a.d[e]; + !c && (c = a.d[e] = a.uj()); + c.Fc(b); + ++a.f; + } + } + function m3d(a, b, c) { + var d; + if (b.Kj()) { + return false; + } else if (b.Zj() != -2) { + d = b.zj(); + return d == null ? c == null : pb(d, c); + } else return b.Hj() == a.e.Tg() && c == null; + } + function wo() { + var a; + Xj(16, Hie); + a = Kp(16); + this.b = KC(GF, Gie, 317, a, 0, 1); + this.c = KC(GF, Gie, 317, a, 0, 1); + this.a = null; + this.e = null; + this.i = 0; + this.f = a - 1; + this.g = 0; + } + function b0b(a) { + n_b.call(this); + this.k = (j0b(), h0b); + this.j = (Xj(6, Jie), new Skb(6)); + this.b = (Xj(2, Jie), new Skb(2)); + this.d = new L_b(); + this.f = new s0b(); + this.a = a; + } + function Scc(a) { + var b, c; + if (a.c.length <= 1) { + return; + } + b = Pcc(a, (Ucd(), Rcd)); + Rcc(a, BD(b.a, 19).a, BD(b.b, 19).a); + c = Pcc(a, Tcd); + Rcc(a, BD(c.a, 19).a, BD(c.b, 19).a); + } + function Vzc() { + Vzc = ccb; + Uzc = new Xzc("SIMPLE", 0); + Rzc = new Xzc(Tne, 1); + Szc = new Xzc("LINEAR_SEGMENTS", 2); + Qzc = new Xzc("BRANDES_KOEPF", 3); + Tzc = new Xzc(Aqe, 4); + } + function XDc(a, b, c) { + if (!ecd(BD(vNb(b, (Nyc(), Vxc)), 98))) { + WDc(a, b, Y_b(b, c)); + WDc(a, b, Y_b(b, (Ucd(), Rcd))); + WDc(a, b, Y_b(b, Acd)); + mmb(); + Okb(b.j, new jEc(a)); + } + } + function HVc(a, b, c, d) { + var e, f, g; + e = d ? BD(Qc(a.a, b), 21) : BD(Qc(a.b, b), 21); + for (g = e.Kc(); g.Ob(); ) { + f = BD(g.Pb(), 33); + if (BVc(a, c, f)) { + return true; + } + } + return false; + } + function FMd(a) { + var b, c; + for (c = new Fyd(a); c.e != c.i.gc(); ) { + b = BD(Dyd(c), 87); + if (!!b.e || (!b.d && (b.d = new xMd(j5, b, 1)), b.d).i != 0) { + return true; + } + } + return false; + } + function QTd(a) { + var b, c; + for (c = new Fyd(a); c.e != c.i.gc(); ) { + b = BD(Dyd(c), 87); + if (!!b.e || (!b.d && (b.d = new xMd(j5, b, 1)), b.d).i != 0) { + return true; + } + } + return false; + } + function FDc(a) { + var b, c, d; + b = 0; + for (d = new olb(a.c.a); d.a < d.c.c.length; ) { + c = BD(mlb(d), 10); + b += sr(new Sr(ur(U_b(c).a.Kc(), new Sq()))); + } + return b / a.c.a.c.length; + } + function UPc(a) { + var b, c; + a.c || XPc(a); + c = new s7c(); + b = new olb(a.a); + mlb(b); + while (b.a < b.c.c.length) { + Dsb(c, BD(mlb(b), 407).a); + } + sCb(c.b != 0); + Nsb(c, c.c.b); + return c; + } + function J0c() { + J0c = ccb; + I0c = (A0c(), z0c); + G0c = new q0b(8); + new Osd((Y9c(), f9c), G0c); + new Osd(T9c, 8); + H0c = x0c; + E0c = n0c; + F0c = o0c; + D0c = new Osd(y8c, (Bcb(), false)); + } + function uld(a, b, c, d) { + switch (b) { + case 7: + return !a.e && (a.e = new y5d(B2, a, 7, 4)), a.e; + case 8: + return !a.d && (a.d = new y5d(B2, a, 8, 5)), a.d; + } + return Xkd(a, b, c, d); + } + function JQd(a) { + var b; + if (!!a.a && a.a.kh()) { + b = BD(a.a, 49); + a.a = BD(xid(a, b), 138); + a.a != b && + (a.Db & 4) != 0 && + (a.Db & 1) == 0 && + Uhd(a, new nSd(a, 9, 5, b, a.a)); + } + return a.a; + } + function yde(a) { + if (a < 48) return -1; + if (a > 102) return -1; + if (a <= 57) return a - 48; + if (a < 65) return -1; + if (a <= 70) return a - 65 + 10; + if (a < 97) return -1; + return a - 97 + 10; + } + function Wj(a, b) { + if (a == null) { + throw vbb(new Heb("null key in entry: null=" + b)); + } else if (b == null) { + throw vbb(new Heb("null value in entry: " + a + "=null")); + } + } + function kr(a, b) { + var c, d; + while (a.Ob()) { + if (!b.Ob()) { + return false; + } + c = a.Pb(); + d = b.Pb(); + if (!(PD(c) === PD(d) || (c != null && pb(c, d)))) { + return false; + } + } + return !b.Ob(); + } + function jIb(a, b) { + var c; + c = OC(GC(UD, 1), Vje, 25, 15, [ + pHb(a.a[0], b), + pHb(a.a[1], b), + pHb(a.a[2], b), + ]); + if (a.d) { + c[0] = Math.max(c[0], c[2]); + c[2] = c[0]; + } + return c; + } + function kIb(a, b) { + var c; + c = OC(GC(UD, 1), Vje, 25, 15, [ + qHb(a.a[0], b), + qHb(a.a[1], b), + qHb(a.a[2], b), + ]); + if (a.d) { + c[0] = Math.max(c[0], c[2]); + c[2] = c[0]; + } + return c; + } + function mqc() { + mqc = ccb; + iqc = new oqc("GREEDY", 0); + hqc = new oqc(Une, 1); + kqc = new oqc(Tne, 2); + lqc = new oqc("MODEL_ORDER", 3); + jqc = new oqc("GREEDY_MODEL_ORDER", 4); + } + function iUc(a, b) { + var c, d, e; + a.b[b.g] = 1; + for (d = Jsb(b.d, 0); d.b != d.d.c; ) { + c = BD(Xsb(d), 188); + e = c.c; + a.b[e.g] == 1 + ? Dsb(a.a, c) + : a.b[e.g] == 2 + ? (a.b[e.g] = 1) + : iUc(a, e); + } + } + function V9b(a, b) { + var c, d, e; + e = new Skb(b.gc()); + for (d = b.Kc(); d.Ob(); ) { + c = BD(d.Pb(), 286); + c.c == c.f + ? K9b(a, c, c.c) + : L9b(a, c) || ((e.c[e.c.length] = c), true); + } + return e; + } + function IZc(a, b, c) { + var d, e, f, g, h; + h = a.r + b; + a.r += b; + a.d += c; + d = c / a.n.c.length; + e = 0; + for (g = new olb(a.n); g.a < g.c.c.length; ) { + f = BD(mlb(g), 211); + RZc(f, h, d, e); + ++e; + } + } + function tEb(a) { + var b, c, d; + zwb(a.b.a); + a.a = KC(PM, Uhe, 57, a.c.c.a.b.c.length, 0, 1); + b = 0; + for (d = new olb(a.c.c.a.b); d.a < d.c.c.length; ) { + c = BD(mlb(d), 57); + c.f = b++; + } + } + function RVb(a) { + var b, c, d; + zwb(a.b.a); + a.a = KC(IP, Uhe, 81, a.c.a.a.b.c.length, 0, 1); + b = 0; + for (d = new olb(a.c.a.a.b); d.a < d.c.c.length; ) { + c = BD(mlb(d), 81); + c.i = b++; + } + } + function P1c(a, b, c) { + var d; + Odd(c, "Shrinking tree compaction", 1); + if (Ccb(DD(vNb(b, (XNb(), VNb))))) { + N1c(a, b.f); + INb(b.f, ((d = b.c), d)); + } else { + INb(b.f, b.c); + } + Qdd(c); + } + function mr(a) { + var b; + b = gr(a); + if (!Qr(a)) { + throw vbb( + new qcb( + "position (0) must be less than the number of elements that remained (" + + b + + ")" + ) + ); + } + return Rr(a); + } + function hNb(b, c, d) { + var e; + try { + return YMb(b, c + b.j, d + b.k); + } catch (a) { + a = ubb(a); + if (JD(a, 73)) { + e = a; + throw vbb(new qcb(e.g + Gle + c + She + d + ").")); + } else throw vbb(a); + } + } + function iNb(b, c, d) { + var e; + try { + return ZMb(b, c + b.j, d + b.k); + } catch (a) { + a = ubb(a); + if (JD(a, 73)) { + e = a; + throw vbb(new qcb(e.g + Gle + c + She + d + ").")); + } else throw vbb(a); + } + } + function jNb(b, c, d) { + var e; + try { + return $Mb(b, c + b.j, d + b.k); + } catch (a) { + a = ubb(a); + if (JD(a, 73)) { + e = a; + throw vbb(new qcb(e.g + Gle + c + She + d + ").")); + } else throw vbb(a); + } + } + function s5b(a) { + switch (a.g) { + case 1: + return Ucd(), Tcd; + case 4: + return Ucd(), Acd; + case 3: + return Ucd(), zcd; + case 2: + return Ucd(), Rcd; + default: + return Ucd(), Scd; + } + } + function cjc(a, b, c) { + if (b.k == (j0b(), h0b) && c.k == g0b) { + a.d = _ic(b, (Ucd(), Rcd)); + a.b = _ic(b, Acd); + } + if (c.k == h0b && b.k == g0b) { + a.d = _ic(c, (Ucd(), Acd)); + a.b = _ic(c, Rcd); + } + } + function gjc(a, b) { + var c, d, e; + e = V_b(a, b); + for (d = e.Kc(); d.Ob(); ) { + c = BD(d.Pb(), 11); + if (vNb(c, (wtc(), gtc)) != null || a1b(new b1b(c.b))) { + return true; + } + } + return false; + } + function QZc(a, b) { + dld(b, a.e + a.d + (a.c.c.length == 0 ? 0 : a.b)); + eld(b, a.f); + a.a = Math.max(a.a, b.f); + a.d += b.g + (a.c.c.length == 0 ? 0 : a.b); + Ekb(a.c, b); + return true; + } + function XZc(a, b, c) { + var d, e, f, g; + g = 0; + d = c / a.a.c.length; + for (f = new olb(a.a); f.a < f.c.c.length; ) { + e = BD(mlb(f), 187); + OZc(e, e.s, e.t + g * d); + IZc(e, a.d - e.r + b, d); + ++g; + } + } + function H4b(a) { + var b, c, d, e, f; + for (d = new olb(a.b); d.a < d.c.c.length; ) { + c = BD(mlb(d), 29); + b = 0; + for (f = new olb(c.a); f.a < f.c.c.length; ) { + e = BD(mlb(f), 10); + e.p = b++; + } + } + } + function r6c(a, b) { + var c, d, e, f, g, h; + e = b.length - 1; + g = 0; + h = 0; + for (d = 0; d <= e; d++) { + f = b[d]; + c = k6c(e, d) * x6c(1 - a, e - d) * x6c(a, d); + g += f.a * c; + h += f.b * c; + } + return new f7c(g, h); + } + function jud(a, b) { + var c, d, e, f, g; + c = b.gc(); + a.qi(a.i + c); + f = b.Kc(); + g = a.i; + a.i += c; + for (d = g; d < a.i; ++d) { + e = f.Pb(); + mud(a, d, a.oi(d, e)); + a.bi(d, e); + a.ci(); + } + return c != 0; + } + function twd(a, b, c) { + var d, e, f; + if (a.ej()) { + d = a.Vi(); + f = a.fj(); + ++a.j; + a.Hi(d, a.oi(d, b)); + e = a.Zi(3, null, b, d, f); + !c ? (c = e) : c.Ei(e); + } else { + Avd(a, a.Vi(), b); + } + return c; + } + function WOd(a, b, c) { + var d, e, f; + d = BD(qud(VKd(a.a), b), 87); + f = ((e = d.c), JD(e, 88) ? BD(e, 26) : (jGd(), _Fd)); + ((f.Db & 64) != 0 ? xid(a.b, f) : f) == c ? KQd(d) : NQd(d, c); + return f; + } + function Ewb(a, b, c, d, e, f, g, h) { + var i, j; + if (!d) { + return; + } + i = d.a[0]; + !!i && Ewb(a, b, c, i, e, f, g, h); + Fwb(a, c, d.d, e, f, g, h) && b.Fc(d); + j = d.a[1]; + !!j && Ewb(a, b, c, j, e, f, g, h); + } + function eAb(a, b) { + var c; + if (!a.a) { + c = KC(UD, Vje, 25, 0, 15, 1); + _ub(a.b.a, new iAb(c)); + c.sort(dcb(Ylb.prototype.te, Ylb, [])); + a.a = new Avb(c, a.d); + } + return pvb(a.a, b); + } + function YMb(b, c, d) { + try { + return Bbb(_Mb(b, c, d), 1); + } catch (a) { + a = ubb(a); + if (JD(a, 320)) { + throw vbb(new qcb(Dle + b.o + "*" + b.p + Ele + c + She + d + Fle)); + } else throw vbb(a); + } + } + function ZMb(b, c, d) { + try { + return Bbb(_Mb(b, c, d), 0); + } catch (a) { + a = ubb(a); + if (JD(a, 320)) { + throw vbb(new qcb(Dle + b.o + "*" + b.p + Ele + c + She + d + Fle)); + } else throw vbb(a); + } + } + function $Mb(b, c, d) { + try { + return Bbb(_Mb(b, c, d), 2); + } catch (a) { + a = ubb(a); + if (JD(a, 320)) { + throw vbb(new qcb(Dle + b.o + "*" + b.p + Ele + c + She + d + Fle)); + } else throw vbb(a); + } + } + function Nyd(b, c) { + if (b.g == -1) { + throw vbb(new Ydb()); + } + b.mj(); + try { + b.d._c(b.g, c); + b.f = b.d.j; + } catch (a) { + a = ubb(a); + if (JD(a, 73)) { + throw vbb(new Apb()); + } else throw vbb(a); + } + } + function rJc(a, b, c) { + Odd(c, "Linear segments node placement", 1); + a.b = BD(vNb(b, (wtc(), otc)), 304); + sJc(a, b); + nJc(a, b); + kJc(a, b); + qJc(a); + a.a = null; + a.b = null; + Qdd(c); + } + function Ee(a, b) { + var c, d, e, f; + f = a.gc(); + b.length < f && (b = eCb(new Array(f), b)); + e = b; + d = a.Kc(); + for (c = 0; c < f; ++c) { + NC(e, c, d.Pb()); + } + b.length > f && NC(b, f, null); + return b; + } + function Lu(a, b) { + var c, d; + d = a.gc(); + if (b == null) { + for (c = 0; c < d; c++) { + if (a.Xb(c) == null) { + return c; + } + } + } else { + for (c = 0; c < d; c++) { + if (pb(b, a.Xb(c))) { + return c; + } + } + } + return -1; + } + function Jd(a, b) { + var c, d, e; + c = b.cd(); + e = b.dd(); + d = a.xc(c); + if (!(PD(e) === PD(d) || (e != null && pb(e, d)))) { + return false; + } + if (d == null && !a._b(c)) { + return false; + } + return true; + } + function YC(a, b) { + var c, d, e; + if (b <= 22) { + c = a.l & ((1 << b) - 1); + d = e = 0; + } else if (b <= 44) { + c = a.l; + d = a.m & ((1 << (b - 22)) - 1); + e = 0; + } else { + c = a.l; + d = a.m; + e = a.h & ((1 << (b - 44)) - 1); + } + return TC(c, d, e); + } + function yKb(a, b) { + switch (b.g) { + case 1: + return a.f.n.d + a.t; + case 3: + return a.f.n.a + a.t; + case 2: + return a.f.n.c + a.s; + case 4: + return a.f.n.b + a.s; + default: + return 0; + } + } + function aLb(a, b) { + var c, d; + d = b.c; + c = b.a; + switch (a.b.g) { + case 0: + c.d = a.e - d.a - d.d; + break; + case 1: + c.d += a.e; + break; + case 2: + c.c = a.e - d.a - d.d; + break; + case 3: + c.c = a.e + d.d; + } + } + function ZOb(a, b, c, d) { + var e, f; + this.a = b; + this.c = d; + e = a.a; + YOb(this, new f7c(-e.c, -e.d)); + P6c(this.b, c); + f = d / 2; + b.a ? b7c(this.b, 0, f) : b7c(this.b, f, 0); + Ekb(a.c, this); + } + function iXc() { + iXc = ccb; + hXc = new kXc(ane, 0); + fXc = new kXc(Vne, 1); + gXc = new kXc("EDGE_LENGTH_BY_POSITION", 2); + eXc = new kXc("CROSSING_MINIMIZATION_BY_POSITION", 3); + } + function Wqd(a, b) { + var c, d; + c = BD(oo(a.g, b), 33); + if (c) { + return c; + } + d = BD(oo(a.j, b), 118); + if (d) { + return d; + } + throw vbb(new cqd("Referenced shape does not exist: " + b)); + } + function rTb(a, b) { + if (a.c == b) { + return a.d; + } else if (a.d == b) { + return a.c; + } else { + throw vbb( + new Wdb("Node 'one' must be either source or target of edge 'edge'.") + ); + } + } + function TMc(a, b) { + if (a.c.i == b) { + return a.d.i; + } else if (a.d.i == b) { + return a.c.i; + } else { + throw vbb( + new Wdb("Node " + b + " is neither source nor target of edge " + a) + ); + } + } + function _lc(a, b) { + var c; + switch (b.g) { + case 2: + case 4: + c = a.a; + a.c.d.n.b < c.d.n.b && (c = a.c); + amc(a, b, (Ajc(), zjc), c); + break; + case 1: + case 3: + amc(a, b, (Ajc(), wjc), null); + } + } + function smc(a, b, c, d, e, f) { + var g, h, i, j, k; + g = qmc(b, c, f); + h = c == (Ucd(), Acd) || c == Tcd ? -1 : 1; + j = a[c.g]; + for (k = 0; k < j.length; k++) { + i = j[k]; + i > 0 && (i += e); + j[k] = g; + g += h * (i + d); + } + } + function Uoc(a) { + var b, c, d; + d = a.f; + a.n = KC(UD, Vje, 25, d, 15, 1); + a.d = KC(UD, Vje, 25, d, 15, 1); + for (b = 0; b < d; b++) { + c = BD(Ikb(a.c.b, b), 29); + a.n[b] = Roc(a, c); + a.d[b] = Qoc(a, c); + } + } + function zjd(a, b) { + var c, d, e; + e = 0; + for (d = 2; d < b; d <<= 1) { + (a.Db & d) != 0 && ++e; + } + if (e == 0) { + for (c = b <<= 1; c <= 128; c <<= 1) { + if ((a.Db & c) != 0) { + return 0; + } + } + return -1; + } else { + return e; + } + } + function s3d(a, b) { + var c, d, e, f, g; + g = S6d(a.e.Tg(), b); + f = null; + c = BD(a.g, 119); + for (e = 0; e < a.i; ++e) { + d = c[e]; + if (g.rl(d.ak())) { + !f && (f = new yud()); + wtd(f, d); + } + } + !!f && Yxd(a, f); + } + function H9d(a) { + var b, c, d; + if (!a) return null; + if (a.dc()) return ""; + d = new Hfb(); + for (c = a.Kc(); c.Ob(); ) { + b = c.Pb(); + Efb(d, GD(b)); + d.a += " "; + } + return lcb(d, d.a.length - 1); + } + function Ty(a, b, c) { + var d, e, f, g, h; + Uy(a); + for ( + e = (a.k == null && (a.k = KC(_I, nie, 78, 0, 0, 1)), a.k), + f = 0, + g = e.length; + f < g; + ++f + ) { + d = e[f]; + Ty(d, b, "\t" + c); + } + h = a.f; + !!h && Ty(h, b, c); + } + function LC(a, b) { + var c = new Array(b); + var d; + switch (a) { + case 14: + case 15: + d = 0; + break; + case 16: + d = false; + break; + default: + return c; + } + for (var e = 0; e < b; ++e) { + c[e] = d; + } + return c; + } + function PDb(a) { + var b, c, d; + for (c = new olb(a.a.b); c.a < c.c.c.length; ) { + b = BD(mlb(c), 57); + b.c.$b(); + } + fad(a.d) ? (d = a.a.c) : (d = a.a.d); + Hkb(d, new dEb(a)); + a.c.Me(a); + QDb(a); + } + function sRb(a) { + var b, c, d, e; + for (c = new olb(a.e.c); c.a < c.c.c.length; ) { + b = BD(mlb(c), 282); + for (e = new olb(b.b); e.a < e.c.c.length; ) { + d = BD(mlb(e), 447); + lRb(d); + } + cRb(b); + } + } + function a$c(a) { + var b, c, d, e, f; + d = 0; + f = 0; + e = 0; + for (c = new olb(a.a); c.a < c.c.c.length; ) { + b = BD(mlb(c), 187); + f = Math.max(f, b.r); + d += b.d + (e > 0 ? a.c : 0); + ++e; + } + a.b = d; + a.d = f; + } + function BZc(a, b) { + var c, d, e, f, g; + d = 0; + e = 0; + c = 0; + for (g = new olb(b); g.a < g.c.c.length; ) { + f = BD(mlb(g), 200); + d = Math.max(d, f.e); + e += f.b + (c > 0 ? a.g : 0); + ++c; + } + a.c = e; + a.d = d; + } + function AHb(a, b) { + var c; + c = OC(GC(UD, 1), Vje, 25, 15, [ + zHb(a, (gHb(), dHb), b), + zHb(a, eHb, b), + zHb(a, fHb, b), + ]); + if (a.f) { + c[0] = Math.max(c[0], c[2]); + c[2] = c[0]; + } + return c; + } + function lNb(b, c, d) { + var e; + try { + aNb(b, c + b.j, d + b.k, false, true); + } catch (a) { + a = ubb(a); + if (JD(a, 73)) { + e = a; + throw vbb(new qcb(e.g + Gle + c + She + d + ").")); + } else throw vbb(a); + } + } + function mNb(b, c, d) { + var e; + try { + aNb(b, c + b.j, d + b.k, true, false); + } catch (a) { + a = ubb(a); + if (JD(a, 73)) { + e = a; + throw vbb(new qcb(e.g + Gle + c + She + d + ").")); + } else throw vbb(a); + } + } + function d5b(a) { + var b; + if (!wNb(a, (Nyc(), xxc))) { + return; + } + b = BD(vNb(a, xxc), 21); + if (b.Hc((Hbd(), zbd))) { + b.Mc(zbd); + b.Fc(Bbd); + } else if (b.Hc(Bbd)) { + b.Mc(Bbd); + b.Fc(zbd); + } + } + function e5b(a) { + var b; + if (!wNb(a, (Nyc(), xxc))) { + return; + } + b = BD(vNb(a, xxc), 21); + if (b.Hc((Hbd(), Gbd))) { + b.Mc(Gbd); + b.Fc(Ebd); + } else if (b.Hc(Ebd)) { + b.Mc(Ebd); + b.Fc(Gbd); + } + } + function udc(a, b, c) { + Odd(c, "Self-Loop ordering", 1); + MAb( + NAb( + JAb( + JAb(LAb(new YAb(null, new Kub(b.b, 16)), new ydc()), new Adc()), + new Cdc() + ), + new Edc() + ), + new Gdc(a) + ); + Qdd(c); + } + function ikc(a, b, c, d) { + var e, f; + for (e = b; e < a.c.length; e++) { + f = (tCb(e, a.c.length), BD(a.c[e], 11)); + if (c.Mb(f)) { + d.c[d.c.length] = f; + } else { + return e; + } + } + return a.c.length; + } + function Kmc(a, b, c, d) { + var e, f, g, h; + a.a == null && Nmc(a, b); + g = b.b.j.c.length; + f = c.d.p; + h = d.d.p; + e = h - 1; + e < 0 && (e = g - 1); + return f <= e ? a.a[e] - a.a[f] : a.a[g - 1] - a.a[f] + a.a[e]; + } + function ehd(a) { + var b, c; + if (!a.b) { + a.b = Qu(BD(a.f, 33).Ag().i); + for (c = new Fyd(BD(a.f, 33).Ag()); c.e != c.i.gc(); ) { + b = BD(Dyd(c), 137); + Ekb(a.b, new dhd(b)); + } + } + return a.b; + } + function fhd(a) { + var b, c; + if (!a.e) { + a.e = Qu(Yod(BD(a.f, 33)).i); + for (c = new Fyd(Yod(BD(a.f, 33))); c.e != c.i.gc(); ) { + b = BD(Dyd(c), 118); + Ekb(a.e, new thd(b)); + } + } + return a.e; + } + function ahd(a) { + var b, c; + if (!a.a) { + a.a = Qu(Vod(BD(a.f, 33)).i); + for (c = new Fyd(Vod(BD(a.f, 33))); c.e != c.i.gc(); ) { + b = BD(Dyd(c), 33); + Ekb(a.a, new hhd(a, b)); + } + } + return a.a; + } + function dKd(b) { + var c; + if (!b.C && (b.D != null || b.B != null)) { + c = eKd(b); + if (c) { + b.yk(c); + } else { + try { + b.yk(null); + } catch (a) { + a = ubb(a); + if (!JD(a, 60)) throw vbb(a); + } + } + } + return b.C; + } + function GJb(a) { + switch (a.q.g) { + case 5: + DJb(a, (Ucd(), Acd)); + DJb(a, Rcd); + break; + case 4: + EJb(a, (Ucd(), Acd)); + EJb(a, Rcd); + break; + default: + FJb(a, (Ucd(), Acd)); + FJb(a, Rcd); + } + } + function PKb(a) { + switch (a.q.g) { + case 5: + MKb(a, (Ucd(), zcd)); + MKb(a, Tcd); + break; + case 4: + NKb(a, (Ucd(), zcd)); + NKb(a, Tcd); + break; + default: + OKb(a, (Ucd(), zcd)); + OKb(a, Tcd); + } + } + function EXb(a, b) { + var c, d, e; + e = new d7c(); + for (d = a.Kc(); d.Ob(); ) { + c = BD(d.Pb(), 37); + uXb(c, e.a, 0); + e.a += c.f.a + b; + e.b = Math.max(e.b, c.f.b); + } + e.b > 0 && (e.b += b); + return e; + } + function GXb(a, b) { + var c, d, e; + e = new d7c(); + for (d = a.Kc(); d.Ob(); ) { + c = BD(d.Pb(), 37); + uXb(c, 0, e.b); + e.b += c.f.b + b; + e.a = Math.max(e.a, c.f.a); + } + e.a > 0 && (e.a += b); + return e; + } + function d_b(a) { + var b, c, d; + d = Ohe; + for (c = new olb(a.a); c.a < c.c.c.length; ) { + b = BD(mlb(c), 10); + wNb(b, (wtc(), Zsc)) && (d = Math.min(d, BD(vNb(b, Zsc), 19).a)); + } + return d; + } + function pHc(a, b) { + var c, d; + if (b.length == 0) { + return 0; + } + c = NHc(a.a, b[0], (Ucd(), Tcd)); + c += NHc(a.a, b[b.length - 1], zcd); + for (d = 0; d < b.length; d++) { + c += qHc(a, d, b); + } + return c; + } + function vQc() { + hQc(); + this.c = new Rkb(); + this.i = new Rkb(); + this.e = new zsb(); + this.f = new zsb(); + this.g = new zsb(); + this.j = new Rkb(); + this.a = new Rkb(); + this.b = new Lqb(); + this.k = new Lqb(); + } + function aKd(a, b) { + var c, d; + if (a.Db >> 16 == 6) { + return a.Cb.ih(a, 5, o5, b); + } + return ( + (d = zUd( + BD(XKd(((c = BD(Ajd(a, 16), 26)), !c ? a.zh() : c), a.Db >> 16), 18) + )), + a.Cb.ih(a, d.n, d.f, b) + ); + } + function Wz(a) { + Rz(); + var b = a.e; + if (b && b.stack) { + var c = b.stack; + var d = b + "\n"; + c.substring(0, d.length) == d && (c = c.substring(d.length)); + return c.split("\n"); + } + return []; + } + function jeb(a) { + var b; + b = (qeb(), peb); + return ( + b[a >>> 28] | + (b[(a >> 24) & 15] << 4) | + (b[(a >> 20) & 15] << 8) | + (b[(a >> 16) & 15] << 12) | + (b[(a >> 12) & 15] << 16) | + (b[(a >> 8) & 15] << 20) | + (b[(a >> 4) & 15] << 24) | + (b[a & 15] << 28) + ); + } + function _jb(a) { + var b, c, d; + if (a.b != a.c) { + return; + } + d = a.a.length; + c = geb(Math.max(8, d)) << 1; + if (a.b != 0) { + b = _Bb(a.a, c); + $jb(a, b, d); + a.a = b; + a.b = 0; + } else { + dCb(a.a, c); + } + a.c = d; + } + function DKb(a, b) { + var c; + c = a.b; + return c.Xe((Y9c(), s9c)) + ? c.Hf() == (Ucd(), Tcd) + ? -c.rf().a - Edb(ED(c.We(s9c))) + : b + Edb(ED(c.We(s9c))) + : c.Hf() == (Ucd(), Tcd) + ? -c.rf().a + : b; + } + function P_b(a) { + var b; + if (a.b.c.length != 0 && !!BD(Ikb(a.b, 0), 70).a) { + return BD(Ikb(a.b, 0), 70).a; + } + b = JZb(a); + if (b != null) { + return b; + } + return "" + (!a.c ? -1 : Jkb(a.c.a, a, 0)); + } + function C0b(a) { + var b; + if (a.f.c.length != 0 && !!BD(Ikb(a.f, 0), 70).a) { + return BD(Ikb(a.f, 0), 70).a; + } + b = JZb(a); + if (b != null) { + return b; + } + return "" + (!a.i ? -1 : Jkb(a.i.j, a, 0)); + } + function Ogc(a, b) { + var c, d; + if (b < 0 || b >= a.gc()) { + return null; + } + for (c = b; c < a.gc(); ++c) { + d = BD(a.Xb(c), 128); + if (c == a.gc() - 1 || !d.o) { + return new vgd(meb(c), d); + } + } + return null; + } + function uoc(a, b, c) { + var d, e, f, g, h; + f = a.c; + h = c ? b : a; + d = c ? a : b; + for (e = h.p + 1; e < d.p; ++e) { + g = BD(Ikb(f.a, e), 10); + if (!(g.k == (j0b(), d0b) || voc(g))) { + return false; + } + } + return true; + } + function u$c(a) { + var b, c, d, e, f; + f = 0; + e = Qje; + d = 0; + for (c = new olb(a.a); c.a < c.c.c.length; ) { + b = BD(mlb(c), 187); + f += b.r + (d > 0 ? a.c : 0); + e = Math.max(e, b.d); + ++d; + } + a.e = f; + a.b = e; + } + function shd(a) { + var b, c; + if (!a.b) { + a.b = Qu(BD(a.f, 118).Ag().i); + for (c = new Fyd(BD(a.f, 118).Ag()); c.e != c.i.gc(); ) { + b = BD(Dyd(c), 137); + Ekb(a.b, new dhd(b)); + } + } + return a.b; + } + function Ctd(a, b) { + var c, d, e; + if (b.dc()) { + return LCd(), LCd(), KCd; + } else { + c = new zyd(a, b.gc()); + for (e = new Fyd(a); e.e != e.i.gc(); ) { + d = Dyd(e); + b.Hc(d) && wtd(c, d); + } + return c; + } + } + function bkd(a, b, c, d) { + if (b == 0) { + return d + ? (!a.o && (a.o = new dId((Thd(), Qhd), S2, a, 0)), a.o) + : (!a.o && (a.o = new dId((Thd(), Qhd), S2, a, 0)), FAd(a.o)); + } + return fid(a, b, c, d); + } + function Tnd(a) { + var b, c; + if (a.rb) { + for (b = 0, c = a.rb.i; b < c; ++b) { + Cmd(qud(a.rb, b)); + } + } + if (a.vb) { + for (b = 0, c = a.vb.i; b < c; ++b) { + Cmd(qud(a.vb, b)); + } + } + u1d((O6d(), M6d), a); + a.Bb |= 1; + } + function _nd(a, b, c, d, e, f, g, h, i, j, k, l, m, n) { + aod(a, b, d, null, e, f, g, h, i, j, m, true, n); + CUd(a, k); + JD(a.Cb, 88) && XMd($Kd(BD(a.Cb, 88)), 2); + !!c && DUd(a, c); + EUd(a, l); + return a; + } + function jZd(b) { + var c, d; + if (b == null) { + return null; + } + d = 0; + try { + d = Icb(b, Rie, Ohe) & aje; + } catch (a) { + a = ubb(a); + if (JD(a, 127)) { + c = rfb(b); + d = c[0]; + } else throw vbb(a); + } + return bdb(d); + } + function kZd(b) { + var c, d; + if (b == null) { + return null; + } + d = 0; + try { + d = Icb(b, Rie, Ohe) & aje; + } catch (a) { + a = ubb(a); + if (JD(a, 127)) { + c = rfb(b); + d = c[0]; + } else throw vbb(a); + } + return bdb(d); + } + function bD(a, b) { + var c, d, e; + e = a.h - b.h; + if (e < 0) { + return false; + } + c = a.l - b.l; + d = a.m - b.m + (c >> 22); + e += d >> 22; + if (e < 0) { + return false; + } + a.l = c & Eje; + a.m = d & Eje; + a.h = e & Fje; + return true; + } + function Fwb(a, b, c, d, e, f, g) { + var h, i; + if (b.Ae() && ((i = a.a.ue(c, d)), i < 0 || (!e && i == 0))) { + return false; + } + if (b.Be() && ((h = a.a.ue(c, f)), h > 0 || (!g && h == 0))) { + return false; + } + return true; + } + function Vcc(a, b) { + Occ(); + var c; + c = a.j.g - b.j.g; + if (c != 0) { + return 0; + } + switch (a.j.g) { + case 2: + return Ycc(b, Ncc) - Ycc(a, Ncc); + case 4: + return Ycc(a, Mcc) - Ycc(b, Mcc); + } + return 0; + } + function Tqc(a) { + switch (a.g) { + case 0: + return Mqc; + case 1: + return Nqc; + case 2: + return Oqc; + case 3: + return Pqc; + case 4: + return Qqc; + case 5: + return Rqc; + default: + return null; + } + } + function End(a, b, c) { + var d, e; + d = + ((e = new rUd()), + yId(e, b), + pnd(e, c), + wtd((!a.c && (a.c = new cUd(p5, a, 12, 10)), a.c), e), + e); + AId(d, 0); + DId(d, 1); + CId(d, true); + BId(d, true); + return d; + } + function tud(a, b) { + var c, d; + if (b >= a.i) throw vbb(new $zd(b, a.i)); + ++a.j; + c = a.g[b]; + d = a.i - b - 1; + d > 0 && $fb(a.g, b + 1, a.g, b, d); + NC(a.g, --a.i, null); + a.fi(b, c); + a.ci(); + return c; + } + function UId(a, b) { + var c, d; + if (a.Db >> 16 == 17) { + return a.Cb.ih(a, 21, c5, b); + } + return ( + (d = zUd( + BD(XKd(((c = BD(Ajd(a, 16), 26)), !c ? a.zh() : c), a.Db >> 16), 18) + )), + a.Cb.ih(a, d.n, d.f, b) + ); + } + function iDb(a) { + var b, c, d, e; + mmb(); + Okb(a.c, a.a); + for (e = new olb(a.c); e.a < e.c.c.length; ) { + d = mlb(e); + for (c = new olb(a.b); c.a < c.c.c.length; ) { + b = BD(mlb(c), 679); + b.Ke(d); + } + } + } + function pXb(a) { + var b, c, d, e; + mmb(); + Okb(a.c, a.a); + for (e = new olb(a.c); e.a < e.c.c.length; ) { + d = mlb(e); + for (c = new olb(a.b); c.a < c.c.c.length; ) { + b = BD(mlb(c), 369); + b.Ke(d); + } + } + } + function AGb(a) { + var b, c, d, e, f; + e = Ohe; + f = null; + for (d = new olb(a.d); d.a < d.c.c.length; ) { + c = BD(mlb(d), 213); + if (c.d.j ^ c.e.j) { + b = c.e.e - c.d.e - c.a; + if (b < e) { + e = b; + f = c; + } + } + } + return f; + } + function OSb() { + OSb = ccb; + MSb = new Nsd(Mme, (Bcb(), false)); + ISb = new Nsd(Nme, 100); + KSb = (yTb(), wTb); + JSb = new Nsd(Ome, KSb); + LSb = new Nsd(Pme, qme); + NSb = new Nsd(Qme, meb(Ohe)); + } + function ric(a, b, c) { + var d, e, f, g, h, i, j, k; + j = 0; + for (e = a.a[b], f = 0, g = e.length; f < g; ++f) { + d = e[f]; + k = CHc(d, c); + for (i = k.Kc(); i.Ob(); ) { + h = BD(i.Pb(), 11); + Rhb(a.f, h, meb(j++)); + } + } + } + function uqd(a, b, c) { + var d, e, f, g; + if (c) { + e = c.a.length; + d = new Yge(e); + for (g = (d.b - d.a) * d.c < 0 ? (Xge(), Wge) : new she(d); g.Ob(); ) { + f = BD(g.Pb(), 19); + Rc(a, b, Vpd(tB(c, f.a))); + } + } + } + function vqd(a, b, c) { + var d, e, f, g; + if (c) { + e = c.a.length; + d = new Yge(e); + for (g = (d.b - d.a) * d.c < 0 ? (Xge(), Wge) : new she(d); g.Ob(); ) { + f = BD(g.Pb(), 19); + Rc(a, b, Vpd(tB(c, f.a))); + } + } + } + function Bkc(a) { + gkc(); + var b; + b = BD(Ee(Ec(a.k), KC(F1, bne, 61, 2, 0, 1)), 122); + Klb(b, 0, b.length, null); + if (b[0] == (Ucd(), Acd) && b[1] == Tcd) { + NC(b, 0, Tcd); + NC(b, 1, Acd); + } + return b; + } + function JHc(a, b, c) { + var d, e, f; + e = HHc(a, b, c); + f = KHc(a, e); + yHc(a.b); + cIc(a, b, c); + mmb(); + Okb(e, new hIc(a)); + d = KHc(a, e); + yHc(a.b); + cIc(a, c, b); + return new vgd(meb(f), meb(d)); + } + function jJc() { + jJc = ccb; + gJc = e3c(new j3c(), (qUb(), pUb), (S8b(), h8b)); + hJc = new Msd("linearSegments.inputPrio", meb(0)); + iJc = new Msd("linearSegments.outputPrio", meb(0)); + } + function yRc() { + yRc = ccb; + uRc = new ARc("P1_TREEIFICATION", 0); + vRc = new ARc("P2_NODE_ORDERING", 1); + wRc = new ARc("P3_NODE_PLACEMENT", 2); + xRc = new ARc("P4_EDGE_ROUTING", 3); + } + function ZWc() { + ZWc = ccb; + UWc = (Y9c(), C9c); + XWc = T9c; + NWc = Y8c; + OWc = _8c; + PWc = b9c; + MWc = W8c; + QWc = e9c; + TWc = x9c; + KWc = (HWc(), wWc); + LWc = xWc; + RWc = zWc; + SWc = BWc; + VWc = CWc; + WWc = DWc; + YWc = FWc; + } + function rbd() { + rbd = ccb; + qbd = new tbd("UNKNOWN", 0); + nbd = new tbd("ABOVE", 1); + obd = new tbd("BELOW", 2); + pbd = new tbd("INLINE", 3); + new Msd("org.eclipse.elk.labelSide", qbd); + } + function rud(a, b) { + var c; + if (a.ni() && b != null) { + for (c = 0; c < a.i; ++c) { + if (pb(b, a.g[c])) { + return c; + } + } + } else { + for (c = 0; c < a.i; ++c) { + if (PD(a.g[c]) === PD(b)) { + return c; + } + } + } + return -1; + } + function DZb(a, b, c) { + var d, e; + if (b.c == (KAc(), IAc) && c.c == HAc) { + return -1; + } else if (b.c == HAc && c.c == IAc) { + return 1; + } + d = HZb(b.a, a.a); + e = HZb(c.a, a.a); + return b.c == IAc ? e - d : d - e; + } + function Z_b(a, b, c) { + if (!!c && (b < 0 || b > c.a.c.length)) { + throw vbb(new Wdb("index must be >= 0 and <= layer node count")); + } + !!a.c && Lkb(a.c.a, a); + a.c = c; + !!c && Dkb(c.a, b, a); + } + function p7b(a, b) { + var c, d, e; + for (d = new Sr(ur(O_b(a).a.Kc(), new Sq())); Qr(d); ) { + c = BD(Rr(d), 17); + e = BD(b.Kb(c), 10); + return new cc(Qb(e.n.b + e.o.b / 2)); + } + return wb(), wb(), vb; + } + function rMc(a, b) { + this.c = new Lqb(); + this.a = a; + this.b = b; + this.d = BD(vNb(a, (wtc(), otc)), 304); + PD(vNb(a, (Nyc(), yxc))) === PD((_qc(), Zqc)) + ? (this.e = new bNc()) + : (this.e = new WMc()); + } + function $dd(a, b) { + var c, d, e, f; + f = 0; + for (d = new olb(a); d.a < d.c.c.length; ) { + c = BD(mlb(d), 33); + f += Math.pow(c.g * c.f - b, 2); + } + e = Math.sqrt(f / (a.c.length - 1)); + return e; + } + function bgd(a, b) { + var c, d; + d = null; + if (a.Xe((Y9c(), O9c))) { + c = BD(a.We(O9c), 94); + c.Xe(b) && (d = c.We(b)); + } + d == null && !!a.yf() && (d = a.yf().We(b)); + d == null && (d = Ksd(b)); + return d; + } + function Vt(b, c) { + var d, e; + d = b.Zc(c); + try { + e = d.Pb(); + d.Qb(); + return e; + } catch (a) { + a = ubb(a); + if (JD(a, 109)) { + throw vbb(new qcb("Can't remove element " + c)); + } else throw vbb(a); + } + } + function qA(a, b) { + var c, d, e; + d = new eB(); + e = new fB(d.q.getFullYear() - nje, d.q.getMonth(), d.q.getDate()); + c = pA(a, b, e); + if (c == 0 || c < b.length) { + throw vbb(new Wdb(b)); + } + return e; + } + function _tb(a, b) { + var c, d, e; + uCb(b); + lCb(b != a); + e = a.b.c.length; + for (d = b.Kc(); d.Ob(); ) { + c = d.Pb(); + Ekb(a.b, uCb(c)); + } + if (e != a.b.c.length) { + aub(a, 0); + return true; + } + return false; + } + function bTb() { + bTb = ccb; + VSb = (Y9c(), O8c); + new Osd(B8c, (Bcb(), true)); + YSb = Y8c; + ZSb = _8c; + $Sb = b9c; + XSb = W8c; + _Sb = e9c; + aTb = x9c; + USb = (OSb(), MSb); + SSb = JSb; + TSb = LSb; + WSb = NSb; + RSb = ISb; + } + function MZb(a, b) { + if (b == a.c) { + return a.d; + } else if (b == a.d) { + return a.c; + } else { + throw vbb( + new Wdb( + "'port' must be either the source port or target port of the edge." + ) + ); + } + } + function C3b(a, b, c) { + var d, e; + e = a.o; + d = a.d; + switch (b.g) { + case 1: + return -d.d - c; + case 3: + return e.b + d.a + c; + case 2: + return e.a + d.c + c; + case 4: + return -d.b - c; + default: + return 0; + } + } + function H6b(a, b, c, d) { + var e, f, g, h; + $_b(b, BD(d.Xb(0), 29)); + h = d.bd(1, d.gc()); + for (f = BD(c.Kb(b), 20).Kc(); f.Ob(); ) { + e = BD(f.Pb(), 17); + g = e.c.i == b ? e.d.i : e.c.i; + H6b(a, g, c, h); + } + } + function Xec(a) { + var b; + b = new Lqb(); + if (wNb(a, (wtc(), ttc))) { + return BD(vNb(a, ttc), 83); + } + MAb(JAb(new YAb(null, new Kub(a.j, 16)), new Zec()), new _ec(b)); + yNb(a, ttc, b); + return b; + } + function cmd(a, b) { + var c, d; + if (a.Db >> 16 == 6) { + return a.Cb.ih(a, 6, B2, b); + } + return ( + (d = zUd( + BD( + XKd(((c = BD(Ajd(a, 16), 26)), !c ? (Thd(), Lhd) : c), a.Db >> 16), + 18 + ) + )), + a.Cb.ih(a, d.n, d.f, b) + ); + } + function Eod(a, b) { + var c, d; + if (a.Db >> 16 == 7) { + return a.Cb.ih(a, 1, C2, b); + } + return ( + (d = zUd( + BD( + XKd(((c = BD(Ajd(a, 16), 26)), !c ? (Thd(), Nhd) : c), a.Db >> 16), + 18 + ) + )), + a.Cb.ih(a, d.n, d.f, b) + ); + } + function lpd(a, b) { + var c, d; + if (a.Db >> 16 == 9) { + return a.Cb.ih(a, 9, E2, b); + } + return ( + (d = zUd( + BD( + XKd(((c = BD(Ajd(a, 16), 26)), !c ? (Thd(), Phd) : c), a.Db >> 16), + 18 + ) + )), + a.Cb.ih(a, d.n, d.f, b) + ); + } + function mQd(a, b) { + var c, d; + if (a.Db >> 16 == 5) { + return a.Cb.ih(a, 9, h5, b); + } + return ( + (d = zUd( + BD( + XKd(((c = BD(Ajd(a, 16), 26)), !c ? (jGd(), VFd) : c), a.Db >> 16), + 18 + ) + )), + a.Cb.ih(a, d.n, d.f, b) + ); + } + function KHd(a, b) { + var c, d; + if (a.Db >> 16 == 3) { + return a.Cb.ih(a, 0, k5, b); + } + return ( + (d = zUd( + BD( + XKd(((c = BD(Ajd(a, 16), 26)), !c ? (jGd(), OFd) : c), a.Db >> 16), + 18 + ) + )), + a.Cb.ih(a, d.n, d.f, b) + ); + } + function Snd(a, b) { + var c, d; + if (a.Db >> 16 == 7) { + return a.Cb.ih(a, 6, o5, b); + } + return ( + (d = zUd( + BD( + XKd(((c = BD(Ajd(a, 16), 26)), !c ? (jGd(), cGd) : c), a.Db >> 16), + 18 + ) + )), + a.Cb.ih(a, d.n, d.f, b) + ); + } + function ird() { + this.a = new bqd(); + this.g = new wo(); + this.j = new wo(); + this.b = new Lqb(); + this.d = new wo(); + this.i = new wo(); + this.k = new Lqb(); + this.c = new Lqb(); + this.e = new Lqb(); + this.f = new Lqb(); + } + function MCd(a, b, c) { + var d, e, f; + c < 0 && (c = 0); + f = a.i; + for (e = c; e < f; e++) { + d = qud(a, e); + if (b == null) { + if (d == null) { + return e; + } + } else if (PD(b) === PD(d) || pb(b, d)) { + return e; + } + } + return -1; + } + function b1d(a, b) { + var c, d; + c = b.Hh(a.a); + if (!c) { + return null; + } else { + d = GD(AAd((!c.b && (c.b = new sId((jGd(), fGd), x6, c)), c.b), Awe)); + return dfb(Bwe, d) ? u1d(a, bKd(b.Hj())) : d; + } + } + function p6d(a, b) { + var c, d; + if (b) { + if (b == a) { + return true; + } + c = 0; + for (d = BD(b, 49).eh(); !!d && d != b; d = d.eh()) { + if (++c > Wje) { + return p6d(a, d); + } + if (d == a) { + return true; + } + } + } + return false; + } + function HKb(a) { + CKb(); + switch (a.q.g) { + case 5: + EKb(a, (Ucd(), Acd)); + EKb(a, Rcd); + break; + case 4: + FKb(a, (Ucd(), Acd)); + FKb(a, Rcd); + break; + default: + GKb(a, (Ucd(), Acd)); + GKb(a, Rcd); + } + } + function LKb(a) { + CKb(); + switch (a.q.g) { + case 5: + IKb(a, (Ucd(), zcd)); + IKb(a, Tcd); + break; + case 4: + JKb(a, (Ucd(), zcd)); + JKb(a, Tcd); + break; + default: + KKb(a, (Ucd(), zcd)); + KKb(a, Tcd); + } + } + function XQb(a) { + var b, c; + b = BD(vNb(a, (wSb(), pSb)), 19); + if (b) { + c = b.a; + c == 0 + ? yNb(a, (HSb(), GSb), new Gub()) + : yNb(a, (HSb(), GSb), new Hub(c)); + } else { + yNb(a, (HSb(), GSb), new Hub(1)); + } + } + function V$b(a, b) { + var c; + c = a.i; + switch (b.g) { + case 1: + return -(a.n.b + a.o.b); + case 2: + return a.n.a - c.o.a; + case 3: + return a.n.b - c.o.b; + case 4: + return -(a.n.a + a.o.a); + } + return 0; + } + function hbc(a, b) { + switch (a.g) { + case 0: + return b == (Ctc(), ytc) ? dbc : ebc; + case 1: + return b == (Ctc(), ytc) ? dbc : cbc; + case 2: + return b == (Ctc(), ytc) ? cbc : ebc; + default: + return cbc; + } + } + function v$c(a, b) { + var c, d, e; + Lkb(a.a, b); + a.e -= b.r + (a.a.c.length == 0 ? 0 : a.c); + e = ere; + for (d = new olb(a.a); d.a < d.c.c.length; ) { + c = BD(mlb(d), 187); + e = Math.max(e, c.d); + } + a.b = e; + } + function Lld(a, b) { + var c, d; + if (a.Db >> 16 == 3) { + return a.Cb.ih(a, 12, E2, b); + } + return ( + (d = zUd( + BD( + XKd(((c = BD(Ajd(a, 16), 26)), !c ? (Thd(), Khd) : c), a.Db >> 16), + 18 + ) + )), + a.Cb.ih(a, d.n, d.f, b) + ); + } + function Uod(a, b) { + var c, d; + if (a.Db >> 16 == 11) { + return a.Cb.ih(a, 10, E2, b); + } + return ( + (d = zUd( + BD( + XKd(((c = BD(Ajd(a, 16), 26)), !c ? (Thd(), Ohd) : c), a.Db >> 16), + 18 + ) + )), + a.Cb.ih(a, d.n, d.f, b) + ); + } + function PSd(a, b) { + var c, d; + if (a.Db >> 16 == 10) { + return a.Cb.ih(a, 11, c5, b); + } + return ( + (d = zUd( + BD( + XKd(((c = BD(Ajd(a, 16), 26)), !c ? (jGd(), aGd) : c), a.Db >> 16), + 18 + ) + )), + a.Cb.ih(a, d.n, d.f, b) + ); + } + function qUd(a, b) { + var c, d; + if (a.Db >> 16 == 10) { + return a.Cb.ih(a, 12, n5, b); + } + return ( + (d = zUd( + BD( + XKd(((c = BD(Ajd(a, 16), 26)), !c ? (jGd(), dGd) : c), a.Db >> 16), + 18 + ) + )), + a.Cb.ih(a, d.n, d.f, b) + ); + } + function wId(a) { + var b; + if ((a.Bb & 1) == 0 && !!a.r && a.r.kh()) { + b = BD(a.r, 49); + a.r = BD(xid(a, b), 138); + a.r != b && + (a.Db & 4) != 0 && + (a.Db & 1) == 0 && + Uhd(a, new nSd(a, 9, 8, b, a.r)); + } + return a.r; + } + function yHb(a, b, c) { + var d; + d = OC(GC(UD, 1), Vje, 25, 15, [ + BHb(a, (gHb(), dHb), b, c), + BHb(a, eHb, b, c), + BHb(a, fHb, b, c), + ]); + if (a.f) { + d[0] = Math.max(d[0], d[2]); + d[2] = d[0]; + } + return d; + } + function O9b(a, b) { + var c, d, e; + e = V9b(a, b); + if (e.c.length == 0) { + return; + } + Okb(e, new pac()); + c = e.c.length; + for (d = 0; d < c; d++) { + K9b(a, (tCb(d, e.c.length), BD(e.c[d], 286)), R9b(a, e, d)); + } + } + function qkc(a) { + var b, c, d, e; + for (e = BD(Qc(a.a, (Xjc(), Sjc)), 15).Kc(); e.Ob(); ) { + d = BD(e.Pb(), 101); + for (c = Ec(d.k).Kc(); c.Ob(); ) { + b = BD(c.Pb(), 61); + kkc(a, d, b, (Fkc(), Dkc), 1); + } + } + } + function voc(a) { + var b, c; + if (a.k == (j0b(), g0b)) { + for (c = new Sr(ur(O_b(a).a.Kc(), new Sq())); Qr(c); ) { + b = BD(Rr(c), 17); + if (!OZb(b) && a.c == LZb(b, a).c) { + return true; + } + } + } + return false; + } + function JNc(a) { + var b, c; + if (a.k == (j0b(), g0b)) { + for (c = new Sr(ur(O_b(a).a.Kc(), new Sq())); Qr(c); ) { + b = BD(Rr(c), 17); + if (!OZb(b) && b.c.i.c == b.d.i.c) { + return true; + } + } + } + return false; + } + function HUc(a, b) { + var c, d, e, f; + Odd(b, "Dull edge routing", 1); + for (f = Jsb(a.b, 0); f.b != f.d.c; ) { + e = BD(Xsb(f), 86); + for (d = Jsb(e.d, 0); d.b != d.d.c; ) { + c = BD(Xsb(d), 188); + Osb(c.a); + } + } + } + function xqd(a, b) { + var c, d, e, f, g; + if (b) { + e = b.a.length; + c = new Yge(e); + for (g = (c.b - c.a) * c.c < 0 ? (Xge(), Wge) : new she(c); g.Ob(); ) { + f = BD(g.Pb(), 19); + d = Zpd(b, f.a); + !!d && ard(a, d); + } + } + } + function DZd() { + tZd(); + var a, b; + xZd((NFd(), MFd)); + wZd(MFd); + Tnd(MFd); + FQd = (jGd(), YFd); + for (b = new olb(rZd); b.a < b.c.c.length; ) { + a = BD(mlb(b), 241); + QQd(a, YFd, null); + } + return true; + } + function eD(a, b) { + var c, d, e, f, g, h, i, j; + i = a.h >> 19; + j = b.h >> 19; + if (i != j) { + return j - i; + } + e = a.h; + h = b.h; + if (e != h) { + return e - h; + } + d = a.m; + g = b.m; + if (d != g) { + return d - g; + } + c = a.l; + f = b.l; + return c - f; + } + function fFb() { + fFb = ccb; + eFb = (rFb(), oFb); + dFb = new Nsd(Yke, eFb); + cFb = (UEb(), TEb); + bFb = new Nsd(Zke, cFb); + aFb = (MEb(), LEb); + _Eb = new Nsd($ke, aFb); + $Eb = new Nsd(_ke, (Bcb(), true)); + } + function cfc(a, b, c) { + var d, e; + d = b * c; + if (JD(a.g, 145)) { + e = ugc(a); + if (e.f.d) { + e.f.a || (a.d.a += d + ple); + } else { + a.d.d -= d + ple; + a.d.a += d + ple; + } + } else if (JD(a.g, 10)) { + a.d.d -= d; + a.d.a += 2 * d; + } + } + function vmc(a, b, c) { + var d, e, f, g, h; + e = a[c.g]; + for (h = new olb(b.d); h.a < h.c.c.length; ) { + g = BD(mlb(h), 101); + f = g.i; + if (!!f && f.i == c) { + d = g.d[c.g]; + e[d] = Math.max(e[d], f.j.b); + } + } + } + function AZc(a, b) { + var c, d, e, f, g; + d = 0; + e = 0; + c = 0; + for (g = new olb(b.d); g.a < g.c.c.length; ) { + f = BD(mlb(g), 443); + a$c(f); + d = Math.max(d, f.b); + e += f.d + (c > 0 ? a.g : 0); + ++c; + } + b.b = d; + b.e = e; + } + function to(a) { + var b, c, d; + d = a.b; + if (Lp(a.i, d.length)) { + c = d.length * 2; + a.b = KC(GF, Gie, 317, c, 0, 1); + a.c = KC(GF, Gie, 317, c, 0, 1); + a.f = c - 1; + a.i = 0; + for (b = a.a; b; b = b.c) { + po(a, b, b); + } + ++a.g; + } + } + function cNb(a, b, c, d) { + var e, f, g, h; + for (e = 0; e < b.o; e++) { + f = e - b.j + c; + for (g = 0; g < b.p; g++) { + h = g - b.k + d; + YMb(b, e, g) + ? jNb(a, f, h) || lNb(a, f, h) + : $Mb(b, e, g) && (hNb(a, f, h) || mNb(a, f, h)); + } + } + } + function Ooc(a, b, c) { + var d; + d = b.c.i; + if (d.k == (j0b(), g0b)) { + yNb(a, (wtc(), Vsc), BD(vNb(d, Vsc), 11)); + yNb(a, Wsc, BD(vNb(d, Wsc), 11)); + } else { + yNb(a, (wtc(), Vsc), b.c); + yNb(a, Wsc, c.d); + } + } + function l6c(a, b, c) { + i6c(); + var d, e, f, g, h, i; + g = b / 2; + f = c / 2; + d = Math.abs(a.a); + e = Math.abs(a.b); + h = 1; + i = 1; + d > g && (h = g / d); + e > f && (i = f / e); + Y6c(a, Math.min(h, i)); + return a; + } + function ond() { + Smd(); + var b, c; + try { + c = BD(mUd((yFd(), xFd), yte), 2014); + if (c) { + return c; + } + } catch (a) { + a = ubb(a); + if (JD(a, 102)) { + b = a; + uvd((h0d(), b)); + } else throw vbb(a); + } + return new knd(); + } + function Y9d() { + A9d(); + var b, c; + try { + c = BD(mUd((yFd(), xFd), Ewe), 2024); + if (c) { + return c; + } + } catch (a) { + a = ubb(a); + if (JD(a, 102)) { + b = a; + uvd((h0d(), b)); + } else throw vbb(a); + } + return new U9d(); + } + function qZd() { + Smd(); + var b, c; + try { + c = BD(mUd((yFd(), xFd), _ve), 1941); + if (c) { + return c; + } + } catch (a) { + a = ubb(a); + if (JD(a, 102)) { + b = a; + uvd((h0d(), b)); + } else throw vbb(a); + } + return new mZd(); + } + function HQd(a, b, c) { + var d, e; + e = a.e; + a.e = b; + if ((a.Db & 4) != 0 && (a.Db & 1) == 0) { + d = new nSd(a, 1, 4, e, b); + !c ? (c = d) : c.Ei(d); + } + e != b && (b ? (c = QQd(a, MQd(a, b), c)) : (c = QQd(a, a.a, c))); + return c; + } + function nB() { + eB.call(this); + this.e = -1; + this.a = false; + this.p = Rie; + this.k = -1; + this.c = -1; + this.b = -1; + this.g = false; + this.f = -1; + this.j = -1; + this.n = -1; + this.i = -1; + this.d = -1; + this.o = Rie; + } + function qEb(a, b) { + var c, d, e; + d = a.b.d.d; + a.a || (d += a.b.d.a); + e = b.b.d.d; + b.a || (e += b.b.d.a); + c = Kdb(d, e); + if (c == 0) { + if (!a.a && b.a) { + return -1; + } else if (!b.a && a.a) { + return 1; + } + } + return c; + } + function eOb(a, b) { + var c, d, e; + d = a.b.b.d; + a.a || (d += a.b.b.a); + e = b.b.b.d; + b.a || (e += b.b.b.a); + c = Kdb(d, e); + if (c == 0) { + if (!a.a && b.a) { + return -1; + } else if (!b.a && a.a) { + return 1; + } + } + return c; + } + function PVb(a, b) { + var c, d, e; + d = a.b.g.d; + a.a || (d += a.b.g.a); + e = b.b.g.d; + b.a || (e += b.b.g.a); + c = Kdb(d, e); + if (c == 0) { + if (!a.a && b.a) { + return -1; + } else if (!b.a && a.a) { + return 1; + } + } + return c; + } + function ZTb() { + ZTb = ccb; + WTb = c3c( + e3c( + e3c(e3c(new j3c(), (qUb(), oUb), (S8b(), m8b)), oUb, q8b), + pUb, + x8b + ), + pUb, + a8b + ); + YTb = e3c(e3c(new j3c(), oUb, S7b), oUb, b8b); + XTb = c3c(new j3c(), pUb, d8b); + } + function s3b(a) { + var b, c, d, e, f; + b = BD(vNb(a, (wtc(), Csc)), 83); + f = a.n; + for (d = b.Cc().Kc(); d.Ob(); ) { + c = BD(d.Pb(), 306); + e = c.i; + e.c += f.a; + e.d += f.b; + c.c ? VHb(c) : XHb(c); + } + yNb(a, Csc, null); + } + function qmc(a, b, c) { + var d, e; + e = a.b; + d = e.d; + switch (b.g) { + case 1: + return -d.d - c; + case 2: + return e.o.a + d.c + c; + case 3: + return e.o.b + d.a + c; + case 4: + return -d.b - c; + default: + return -1; + } + } + function BXc(a) { + var b, c, d, e, f; + d = 0; + e = dme; + if (a.b) { + for (b = 0; b < 360; b++) { + c = b * 0.017453292519943295; + zXc(a, a.d, 0, 0, dre, c); + f = a.b.ig(a.d); + if (f < e) { + d = c; + e = f; + } + } + } + zXc(a, a.d, 0, 0, dre, d); + } + function E$c(a, b) { + var c, d, e, f; + f = new Lqb(); + b.e = null; + b.f = null; + for (d = new olb(b.i); d.a < d.c.c.length; ) { + c = BD(mlb(d), 65); + e = BD(Ohb(a.g, c.a), 46); + c.a = D6c(c.b); + Rhb(f, c.a, e); + } + a.g = f; + } + function t$c(a, b, c) { + var d, e, f, g, h, i; + e = b - a.e; + f = e / a.d.c.length; + g = 0; + for (i = new olb(a.d); i.a < i.c.c.length; ) { + h = BD(mlb(i), 443); + d = a.b - h.b + c; + _Zc(h, h.e + g * f, h.f); + XZc(h, f, d); + ++g; + } + } + function YBd(a) { + var b; + a.f.qj(); + if (a.b != -1) { + ++a.b; + b = a.f.d[a.a]; + if (a.b < b.i) { + return; + } + ++a.a; + } + for (; a.a < a.f.d.length; ++a.a) { + b = a.f.d[a.a]; + if (!!b && b.i != 0) { + a.b = 0; + return; + } + } + a.b = -1; + } + function j0d(a, b) { + var c, d, e; + e = b.c.length; + c = l0d(a, e == 0 ? "" : (tCb(0, b.c.length), GD(b.c[0]))); + for (d = 1; d < e && !!c; ++d) { + c = BD(c, 49).oh((tCb(d, b.c.length), GD(b.c[d]))); + } + return c; + } + function rEc(a, b) { + var c, d; + for (d = new olb(b); d.a < d.c.c.length; ) { + c = BD(mlb(d), 10); + a.c[c.c.p][c.p].a = Aub(a.i); + a.c[c.c.p][c.p].d = Edb(a.c[c.c.p][c.p].a); + a.c[c.c.p][c.p].b = 1; + } + } + function _dd(a, b) { + var c, d, e, f; + f = 0; + for (d = new olb(a); d.a < d.c.c.length; ) { + c = BD(mlb(d), 157); + f += Math.pow(red(c) * qed(c) - b, 2); + } + e = Math.sqrt(f / (a.c.length - 1)); + return e; + } + function LHc(a, b, c, d) { + var e, f, g; + f = GHc(a, b, c, d); + g = MHc(a, f); + bIc(a, b, c, d); + yHc(a.b); + mmb(); + Okb(f, new lIc(a)); + e = MHc(a, f); + bIc(a, c, b, d); + yHc(a.b); + return new vgd(meb(g), meb(e)); + } + function cJc(a, b, c) { + var d, e; + Odd(c, "Interactive node placement", 1); + a.a = BD(vNb(b, (wtc(), otc)), 304); + for (e = new olb(b.b); e.a < e.c.c.length; ) { + d = BD(mlb(e), 29); + bJc(a, d); + } + Qdd(c); + } + function MVc(a, b) { + var c; + Odd(b, "General Compactor", 1); + b.n && !!a && Tdd(b, i6d(a), (pgd(), mgd)); + c = qWc(BD(hkd(a, (ZWc(), LWc)), 380)); + c.hg(a); + b.n && !!a && Tdd(b, i6d(a), (pgd(), mgd)); + } + function Dfd(a, b, c) { + var d, e; + nmd(a, a.j + b, a.k + c); + for ( + e = new Fyd((!a.a && (a.a = new xMd(y2, a, 5)), a.a)); + e.e != e.i.gc(); + + ) { + d = BD(Dyd(e), 469); + ukd(d, d.a + b, d.b + c); + } + gmd(a, a.b + b, a.c + c); + } + function vld(a, b, c, d) { + switch (c) { + case 7: + return !a.e && (a.e = new y5d(B2, a, 7, 4)), Sxd(a.e, b, d); + case 8: + return !a.d && (a.d = new y5d(B2, a, 8, 5)), Sxd(a.d, b, d); + } + return Fkd(a, b, c, d); + } + function wld(a, b, c, d) { + switch (c) { + case 7: + return !a.e && (a.e = new y5d(B2, a, 7, 4)), Txd(a.e, b, d); + case 8: + return !a.d && (a.d = new y5d(B2, a, 8, 5)), Txd(a.d, b, d); + } + return Gkd(a, b, c, d); + } + function lqd(a, b, c) { + var d, e, f, g, h; + if (c) { + f = c.a.length; + d = new Yge(f); + for (h = (d.b - d.a) * d.c < 0 ? (Xge(), Wge) : new she(d); h.Ob(); ) { + g = BD(h.Pb(), 19); + e = Zpd(c, g.a); + !!e && drd(a, e, b); + } + } + } + function HAd(a, b, c) { + var d, e, f, g, h; + a.qj(); + f = b == null ? 0 : tb(b); + if (a.f > 0) { + g = (f & Ohe) % a.d.length; + e = wAd(a, g, f, b); + if (e) { + h = e.ed(c); + return h; + } + } + d = a.tj(f, b, c); + a.c.Fc(d); + return null; + } + function t1d(a, b) { + var c, d, e, f; + switch (o1d(a, b)._k()) { + case 3: + case 2: { + c = OKd(b); + for (e = 0, f = c.i; e < f; ++e) { + d = BD(qud(c, e), 34); + if ($1d(q1d(a, d)) == 5) { + return d; + } + } + break; + } + } + return null; + } + function Qs(a) { + var b, c, d, e, f; + if (Lp(a.f, a.b.length)) { + d = KC(BG, Gie, 330, a.b.length * 2, 0, 1); + a.b = d; + e = d.length - 1; + for (c = a.a; c != a; c = c.Rd()) { + f = BD(c, 330); + b = f.d & e; + f.a = d[b]; + d[b] = f; + } + } + } + function DJb(a, b) { + var c, d, e, f; + f = 0; + for (e = BD(BD(Qc(a.r, b), 21), 84).Kc(); e.Ob(); ) { + d = BD(e.Pb(), 111); + f = Math.max(f, d.e.a + d.b.rf().a); + } + c = BD(Mpb(a.b, b), 124); + c.n.b = 0; + c.a.a = f; + } + function MKb(a, b) { + var c, d, e, f; + c = 0; + for (f = BD(BD(Qc(a.r, b), 21), 84).Kc(); f.Ob(); ) { + e = BD(f.Pb(), 111); + c = Math.max(c, e.e.b + e.b.rf().b); + } + d = BD(Mpb(a.b, b), 124); + d.n.d = 0; + d.a.b = c; + } + function INc(a) { + var b, c; + c = BD(vNb(a, (wtc(), Ksc)), 21); + b = k3c(zNc); + c.Hc((Orc(), Lrc)) && d3c(b, CNc); + c.Hc(Nrc) && d3c(b, ENc); + c.Hc(Erc) && d3c(b, ANc); + c.Hc(Grc) && d3c(b, BNc); + return b; + } + function j1c(a, b) { + var c; + Odd(b, "Delaunay triangulation", 1); + c = new Rkb(); + Hkb(a.i, new n1c(c)); + Ccb(DD(vNb(a, (XNb(), VNb)))) && "null10bw"; + !a.e ? (a.e = NCb(c)) : ye(a.e, NCb(c)); + Qdd(b); + } + function q6c(a) { + if (a < 0) { + throw vbb(new Wdb("The input must be positive")); + } else + return a < h6c.length + ? Sbb(h6c[a]) + : Math.sqrt(dre * a) * (y6c(a, a) / x6c(2.718281828459045, a)); + } + function pud(a, b) { + var c; + if (a.ni() && b != null) { + for (c = 0; c < a.i; ++c) { + if (pb(b, a.g[c])) { + return true; + } + } + } else { + for (c = 0; c < a.i; ++c) { + if (PD(a.g[c]) === PD(b)) { + return true; + } + } + } + return false; + } + function jr(a, b) { + if (b == null) { + while (a.a.Ob()) { + if (BD(a.a.Pb(), 42).dd() == null) { + return true; + } + } + } else { + while (a.a.Ob()) { + if (pb(b, BD(a.a.Pb(), 42).dd())) { + return true; + } + } + } + return false; + } + function zy(a, b) { + var c, d, e; + if (b === a) { + return true; + } else if (JD(b, 664)) { + e = BD(b, 1947); + return Ue( + ((d = a.g), !d ? (a.g = new vi(a)) : d), + ((c = e.g), !c ? (e.g = new vi(e)) : c) + ); + } else { + return false; + } + } + function Tz(a) { + var b, c, d, e; + b = "Sz"; + c = "ez"; + e = Math.min(a.length, 5); + for (d = e - 1; d >= 0; d--) { + if (dfb(a[d].d, b) || dfb(a[d].d, c)) { + a.length >= d + 1 && a.splice(0, d + 1); + break; + } + } + return a; + } + function Abb(a, b) { + var c; + if (Fbb(a) && Fbb(b)) { + c = a / b; + if (Kje < c && c < Ije) { + return c < 0 ? Math.ceil(c) : Math.floor(c); + } + } + return zbb(UC(Fbb(a) ? Rbb(a) : a, Fbb(b) ? Rbb(b) : b, false)); + } + function LZb(a, b) { + if (b == a.c.i) { + return a.d.i; + } else if (b == a.d.i) { + return a.c.i; + } else { + throw vbb( + new Wdb( + "'node' must either be the source node or target node of the edge." + ) + ); + } + } + function C2b(a) { + var b, c, d, e; + e = BD(vNb(a, (wtc(), xsc)), 37); + if (e) { + d = new d7c(); + b = Q_b(a.c.i); + while (b != e) { + c = b.e; + b = Q_b(c); + O6c(P6c(P6c(d, c.n), b.c), b.d.b, b.d.d); + } + return d; + } + return w2b; + } + function Ldc(a) { + var b; + b = BD(vNb(a, (wtc(), ntc)), 403); + MAb(LAb(new YAb(null, new Kub(b.d, 16)), new Ydc()), new $dc(a)); + MAb(JAb(new YAb(null, new Kub(b.d, 16)), new aec()), new cec(a)); + } + function woc(a, b) { + var c, d, e, f; + e = b ? U_b(a) : R_b(a); + for (d = new Sr(ur(e.a.Kc(), new Sq())); Qr(d); ) { + c = BD(Rr(d), 17); + f = LZb(c, a); + if (f.k == (j0b(), g0b) && f.c != a.c) { + return f; + } + } + return null; + } + function HDc(a) { + var b, c, d; + for (c = new olb(a.p); c.a < c.c.c.length; ) { + b = BD(mlb(c), 10); + if (b.k != (j0b(), h0b)) { + continue; + } + d = b.o.b; + a.i = Math.min(a.i, d); + a.g = Math.max(a.g, d); + } + } + function oEc(a, b, c) { + var d, e, f; + for (f = new olb(b); f.a < f.c.c.length; ) { + d = BD(mlb(f), 10); + a.c[d.c.p][d.p].e = false; + } + for (e = new olb(b); e.a < e.c.c.length; ) { + d = BD(mlb(e), 10); + nEc(a, d, c); + } + } + function WOc(a, b, c) { + var d, e; + d = vPc(b.j, c.s, c.c) + vPc(c.e, b.s, b.c); + e = vPc(c.j, b.s, b.c) + vPc(b.e, c.s, c.c); + if (d == e) { + if (d > 0) { + a.b += 2; + a.a += d; + } + } else { + a.b += 1; + a.a += Math.min(d, e); + } + } + function Rpd(a, b) { + var c, d; + d = false; + if (ND(b)) { + d = true; + Qpd(a, new yC(GD(b))); + } + if (!d) { + if (JD(b, 236)) { + d = true; + Qpd(a, ((c = Kcb(BD(b, 236))), new TB(c))); + } + } + if (!d) { + throw vbb(new vcb(Ute)); + } + } + function IMd(a, b, c, d) { + var e, f, g; + e = new pSd( + a.e, + 1, + 10, + ((g = b.c), JD(g, 88) ? BD(g, 26) : (jGd(), _Fd)), + ((f = c.c), JD(f, 88) ? BD(f, 26) : (jGd(), _Fd)), + HLd(a, b), + false + ); + !d ? (d = e) : d.Ei(e); + return d; + } + function T_b(a) { + var b, c; + switch (BD(vNb(Q_b(a), (Nyc(), ixc)), 420).g) { + case 0: + b = a.n; + c = a.o; + return new f7c(b.a + c.a / 2, b.b + c.b / 2); + case 1: + return new g7c(a.n); + default: + return null; + } + } + function lrc() { + lrc = ccb; + irc = new mrc(ane, 0); + hrc = new mrc("LEFTUP", 1); + krc = new mrc("RIGHTUP", 2); + grc = new mrc("LEFTDOWN", 3); + jrc = new mrc("RIGHTDOWN", 4); + frc = new mrc("BALANCED", 5); + } + function FFc(a, b, c) { + var d, e, f; + d = Kdb(a.a[b.p], a.a[c.p]); + if (d == 0) { + e = BD(vNb(b, (wtc(), Qsc)), 15); + f = BD(vNb(c, Qsc), 15); + if (e.Hc(c)) { + return -1; + } else if (f.Hc(b)) { + return 1; + } + } + return d; + } + function jXc(a) { + switch (a.g) { + case 1: + return new XVc(); + case 2: + return new ZVc(); + case 3: + return new VVc(); + case 0: + return null; + default: + throw vbb(new Wdb(jre + (a.f != null ? a.f : "" + a.g))); + } + } + function Ikd(a, b, c) { + switch (b) { + case 1: + !a.n && (a.n = new cUd(D2, a, 1, 7)); + Uxd(a.n); + !a.n && (a.n = new cUd(D2, a, 1, 7)); + ytd(a.n, BD(c, 14)); + return; + case 2: + Lkd(a, GD(c)); + return; + } + ekd(a, b, c); + } + function Zkd(a, b, c) { + switch (b) { + case 3: + ald(a, Edb(ED(c))); + return; + case 4: + cld(a, Edb(ED(c))); + return; + case 5: + dld(a, Edb(ED(c))); + return; + case 6: + eld(a, Edb(ED(c))); + return; + } + Ikd(a, b, c); + } + function Fnd(a, b, c) { + var d, e, f; + f = ((d = new rUd()), d); + e = xId(f, b, null); + !!e && e.Fi(); + pnd(f, c); + wtd((!a.c && (a.c = new cUd(p5, a, 12, 10)), a.c), f); + AId(f, 0); + DId(f, 1); + CId(f, true); + BId(f, true); + } + function mUd(a, b) { + var c, d, e; + c = Crb(a.g, b); + if (JD(c, 235)) { + e = BD(c, 235); + e.Qh() == null && undefined; + return e.Nh(); + } else if (JD(c, 498)) { + d = BD(c, 1938); + e = d.b; + return e; + } else { + return null; + } + } + function Ui(a, b, c, d) { + var e, f; + Qb(b); + Qb(c); + f = BD(tn(a.d, b), 19); + Ob(!!f, "Row %s not in %s", b, a.e); + e = BD(tn(a.b, c), 19); + Ob(!!e, "Column %s not in %s", c, a.c); + return Wi(a, f.a, e.a, d); + } + function JC(a, b, c, d, e, f, g) { + var h, i, j, k, l; + k = e[f]; + j = f == g - 1; + h = j ? d : 0; + l = LC(h, k); + d != 10 && OC(GC(a, g - f), b[f], c[f], h, l); + if (!j) { + ++f; + for (i = 0; i < k; ++i) { + l[i] = JC(a, b, c, d, e, f, g); + } + } + return l; + } + function Eyd(b) { + if (b.g == -1) { + throw vbb(new Ydb()); + } + b.mj(); + try { + b.i.$c(b.g); + b.f = b.i.j; + b.g < b.e && --b.e; + b.g = -1; + } catch (a) { + a = ubb(a); + if (JD(a, 73)) { + throw vbb(new Apb()); + } else throw vbb(a); + } + } + function hYb(a, b) { + a.b.a = Math.min(a.b.a, b.c); + a.b.b = Math.min(a.b.b, b.d); + a.a.a = Math.max(a.a.a, b.c); + a.a.b = Math.max(a.a.b, b.d); + return (a.c[a.c.length] = b), true; + } + function nZb(a) { + var b, c, d, e; + e = -1; + d = 0; + for (c = new olb(a); c.a < c.c.c.length; ) { + b = BD(mlb(c), 243); + if (b.c == (KAc(), HAc)) { + e = d == 0 ? 0 : d - 1; + break; + } else d == a.c.length - 1 && (e = d); + d += 1; + } + return e; + } + function UZc(a) { + var b, c, d, e; + e = 0; + b = 0; + for (d = new olb(a.c); d.a < d.c.c.length; ) { + c = BD(mlb(d), 33); + dld(c, a.e + e); + eld(c, a.f); + e += c.g + a.b; + b = Math.max(b, c.f + a.b); + } + a.d = e - a.b; + a.a = b - a.b; + } + function bEb(a) { + var b, c, d; + for (c = new olb(a.a.b); c.a < c.c.c.length; ) { + b = BD(mlb(c), 57); + d = b.d.c; + b.d.c = b.d.d; + b.d.d = d; + d = b.d.b; + b.d.b = b.d.a; + b.d.a = d; + d = b.b.a; + b.b.a = b.b.b; + b.b.b = d; + } + RDb(a); + } + function BVb(a) { + var b, c, d; + for (c = new olb(a.a.b); c.a < c.c.c.length; ) { + b = BD(mlb(c), 81); + d = b.g.c; + b.g.c = b.g.d; + b.g.d = d; + d = b.g.b; + b.g.b = b.g.a; + b.g.a = d; + d = b.e.a; + b.e.a = b.e.b; + b.e.b = d; + } + sVb(a); + } + function Lmc(a) { + var b, c, d, e, f; + f = Ec(a.k); + for ( + c = (Ucd(), OC(GC(F1, 1), bne, 61, 0, [Scd, Acd, zcd, Rcd, Tcd])), + d = 0, + e = c.length; + d < e; + ++d + ) { + b = c[d]; + if (b != Scd && !f.Hc(b)) { + return b; + } + } + return null; + } + function znc(a, b) { + var c, d; + d = BD(Etb(KAb(JAb(new YAb(null, new Kub(b.j, 16)), new Pnc()))), 11); + if (d) { + c = BD(Ikb(d.e, 0), 17); + if (c) { + return BD(vNb(c, (wtc(), Zsc)), 19).a; + } + } + return yzc(a.b); + } + function CCc(a, b) { + var c, d, e, f; + for (f = new olb(b.a); f.a < f.c.c.length; ) { + e = BD(mlb(f), 10); + Blb(a.d); + for (d = new Sr(ur(U_b(e).a.Kc(), new Sq())); Qr(d); ) { + c = BD(Rr(d), 17); + zCc(a, e, c.d.i); + } + } + } + function NZc(a, b) { + var c, d; + Lkb(a.b, b); + for (d = new olb(a.n); d.a < d.c.c.length; ) { + c = BD(mlb(d), 211); + if (Jkb(c.c, b, 0) != -1) { + Lkb(c.c, b); + UZc(c); + c.c.c.length == 0 && Lkb(a.n, c); + break; + } + } + HZc(a); + } + function $Zc(a, b) { + var c, d, e, f, g; + g = a.f; + e = 0; + f = 0; + for (d = new olb(a.a); d.a < d.c.c.length; ) { + c = BD(mlb(d), 187); + OZc(c, a.e, g); + KZc(c, b); + f = Math.max(f, c.r); + g += c.d + a.c; + e = g; + } + a.d = f; + a.b = e; + } + function hVc(a) { + var b, c; + c = $sd(a); + if (Qq(c)) { + return null; + } else { + b = (Qb(c), BD(mr(new Sr(ur(c.a.Kc(), new Sq()))), 79)); + return atd(BD(qud((!b.b && (b.b = new y5d(z2, b, 4, 7)), b.b), 0), 82)); + } + } + function XId(a) { + var b; + if (!a.o) { + b = a.Lj(); + b + ? (a.o = new dYd(a, a, null)) + : a.rk() + ? (a.o = new uVd(a, null)) + : $1d(q1d((O6d(), M6d), a)) == 1 + ? (a.o = new nYd(a)) + : (a.o = new sYd(a, null)); + } + return a.o; + } + function w6d(a, b, c, d) { + var e, f, g, h, i; + if (c.mh(b)) { + e = ((g = b), !g ? null : BD(d, 49).xh(g)); + if (e) { + i = c.ah(b); + h = b.t; + if (h > 1 || h == -1) { + f = BD(i, 15); + e.Wb(t6d(a, f)); + } else { + e.Wb(s6d(a, BD(i, 56))); + } + } + } + } + function Zbb(b, c, d, e) { + Ybb(); + var f = Wbb; + $moduleName = c; + $moduleBase = d; + tbb = e; + function g() { + for (var a = 0; a < f.length; a++) { + f[a](); + } + } + if (b) { + try { + Ihe(g)(); + } catch (a) { + b(c, a); + } + } else { + Ihe(g)(); + } + } + function Kgc(a) { + var b, c, d, e, f; + for (d = new nib(new eib(a.b).a); d.b; ) { + c = lib(d); + b = BD(c.cd(), 10); + f = BD(BD(c.dd(), 46).a, 10); + e = BD(BD(c.dd(), 46).b, 8); + P6c(X6c(b.n), P6c(R6c(f.n), e)); + } + } + function llc(a) { + switch (BD(vNb(a.b, (Nyc(), Vwc)), 375).g) { + case 1: + MAb( + NAb(LAb(new YAb(null, new Kub(a.d, 16)), new Glc()), new Ilc()), + new Klc() + ); + break; + case 2: + nlc(a); + break; + case 0: + mlc(a); + } + } + function KXc(a, b, c) { + var d; + Odd(c, "Straight Line Edge Routing", 1); + c.n && !!b && Tdd(c, i6d(b), (pgd(), mgd)); + d = BD(hkd(b, (MUc(), LUc)), 33); + LXc(a, d); + c.n && !!b && Tdd(c, i6d(b), (pgd(), mgd)); + } + function i8c() { + i8c = ccb; + h8c = new j8c("V_TOP", 0); + g8c = new j8c("V_CENTER", 1); + f8c = new j8c("V_BOTTOM", 2); + d8c = new j8c("H_LEFT", 3); + c8c = new j8c("H_CENTER", 4); + e8c = new j8c("H_RIGHT", 5); + } + function gLd(a) { + var b; + if ((a.Db & 64) != 0) return mKd(a); + b = new Jfb(mKd(a)); + b.a += " (abstract: "; + Ffb(b, (a.Bb & 256) != 0); + b.a += ", interface: "; + Ffb(b, (a.Bb & 512) != 0); + b.a += ")"; + return b.a; + } + function l3d(a, b, c, d) { + var e, f, g, h; + if (oid(a.e)) { + e = b.ak(); + h = b.dd(); + f = c.dd(); + g = H2d( + a, + 1, + e, + h, + f, + e.$j() ? M2d(a, e, f, JD(e, 99) && (BD(e, 18).Bb & Tje) != 0) : -1, + true + ); + d ? d.Ei(g) : (d = g); + } + return d; + } + function kz(a) { + var b; + if (a.c == null) { + b = PD(a.b) === PD(iz) ? null : a.b; + a.d = b == null ? Xhe : MD(b) ? nz(FD(b)) : ND(b) ? Vie : hdb(rb(b)); + a.a = a.a + ": " + (MD(b) ? mz(FD(b)) : b + ""); + a.c = "(" + a.d + ") " + a.a; + } + } + function Wgb(a, b) { + this.e = a; + if (Bbb(xbb(b, -4294967296), 0)) { + this.d = 1; + this.a = OC(GC(WD, 1), oje, 25, 15, [Tbb(b)]); + } else { + this.d = 2; + this.a = OC(GC(WD, 1), oje, 25, 15, [Tbb(b), Tbb(Obb(b, 32))]); + } + } + function yrb() { + function b() { + try { + return new Map().entries().next().done; + } catch (a) { + return false; + } + } + if (typeof Map === Nhe && Map.prototype.entries && b()) { + return Map; + } else { + return zrb(); + } + } + function VPc(a, b) { + var c, d, e, f; + f = new Bib(a.e, 0); + c = 0; + while (f.b < f.d.gc()) { + d = Edb((sCb(f.b < f.d.gc()), ED(f.d.Xb((f.c = f.b++))))); + e = d - b; + if (e > Oqe) { + return c; + } else e > -1.0e-6 && ++c; + } + return c; + } + function PQd(a, b) { + var c; + if (b != a.b) { + c = null; + !!a.b && (c = lid(a.b, a, -4, c)); + !!b && (c = kid(b, a, -4, c)); + c = GQd(a, b, c); + !!c && c.Fi(); + } else + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new nSd(a, 1, 3, b, b)); + } + function SQd(a, b) { + var c; + if (b != a.f) { + c = null; + !!a.f && (c = lid(a.f, a, -1, c)); + !!b && (c = kid(b, a, -1, c)); + c = IQd(a, b, c); + !!c && c.Fi(); + } else + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new nSd(a, 1, 0, b, b)); + } + function E9d(a) { + var b, c, d; + if (a == null) return null; + c = BD(a, 15); + if (c.dc()) return ""; + d = new Hfb(); + for (b = c.Kc(); b.Ob(); ) { + Efb(d, (Q8d(), GD(b.Pb()))); + d.a += " "; + } + return lcb(d, d.a.length - 1); + } + function I9d(a) { + var b, c, d; + if (a == null) return null; + c = BD(a, 15); + if (c.dc()) return ""; + d = new Hfb(); + for (b = c.Kc(); b.Ob(); ) { + Efb(d, (Q8d(), GD(b.Pb()))); + d.a += " "; + } + return lcb(d, d.a.length - 1); + } + function qEc(a, b, c) { + var d, e; + d = a.c[b.c.p][b.p]; + e = a.c[c.c.p][c.p]; + if (d.a != null && e.a != null) { + return Ddb(d.a, e.a); + } else if (d.a != null) { + return -1; + } else if (e.a != null) { + return 1; + } + return 0; + } + function zqd(a, b) { + var c, d, e, f, g, h; + if (b) { + f = b.a.length; + c = new Yge(f); + for (h = (c.b - c.a) * c.c < 0 ? (Xge(), Wge) : new she(c); h.Ob(); ) { + g = BD(h.Pb(), 19); + e = Zpd(b, g.a); + d = new Crd(a); + Aqd(d.a, e); + } + } + } + function Qqd(a, b) { + var c, d, e, f, g, h; + if (b) { + f = b.a.length; + c = new Yge(f); + for (h = (c.b - c.a) * c.c < 0 ? (Xge(), Wge) : new she(c); h.Ob(); ) { + g = BD(h.Pb(), 19); + e = Zpd(b, g.a); + d = new lrd(a); + nqd(d.a, e); + } + } + } + function eFd(b) { + var c; + if (b != null && b.length > 0 && bfb(b, b.length - 1) == 33) { + try { + c = PEd(qfb(b, 0, b.length - 1)); + return c.e == null; + } catch (a) { + a = ubb(a); + if (!JD(a, 32)) throw vbb(a); + } + } + return false; + } + function h3d(a, b, c) { + var d, e, f; + d = b.ak(); + f = b.dd(); + e = d.$j() + ? H2d( + a, + 3, + d, + null, + f, + M2d(a, d, f, JD(d, 99) && (BD(d, 18).Bb & Tje) != 0), + true + ) + : H2d(a, 1, d, d.zj(), f, -1, true); + c ? c.Ei(e) : (c = e); + return c; + } + function Vee() { + var a, b, c; + b = 0; + for (a = 0; a < "X".length; a++) { + c = Uee((BCb(a, "X".length), "X".charCodeAt(a))); + if (c == 0) throw vbb(new mde("Unknown Option: " + "X".substr(a))); + b |= c; + } + return b; + } + function mZb(a, b, c) { + var d, e, f; + d = Q_b(b); + e = a_b(d); + f = new H0b(); + F0b(f, b); + switch (c.g) { + case 1: + G0b(f, Wcd(Zcd(e))); + break; + case 2: + G0b(f, Zcd(e)); + } + yNb(f, (Nyc(), Uxc), ED(vNb(a, Uxc))); + return f; + } + function U9b(a) { + var b, c; + b = BD(Rr(new Sr(ur(R_b(a.a).a.Kc(), new Sq()))), 17); + c = BD(Rr(new Sr(ur(U_b(a.a).a.Kc(), new Sq()))), 17); + return Ccb(DD(vNb(b, (wtc(), ltc)))) || Ccb(DD(vNb(c, ltc))); + } + function Xjc() { + Xjc = ccb; + Tjc = new Yjc("ONE_SIDE", 0); + Vjc = new Yjc("TWO_SIDES_CORNER", 1); + Wjc = new Yjc("TWO_SIDES_OPPOSING", 2); + Ujc = new Yjc("THREE_SIDES", 3); + Sjc = new Yjc("FOUR_SIDES", 4); + } + function jkc(a, b, c, d, e) { + var f, g; + f = BD( + GAb( + JAb(b.Oc(), new _kc()), + Byb( + new fzb(), + new dzb(), + new Ezb(), + OC(GC(xL, 1), Kie, 132, 0, [(Fyb(), Dyb)]) + ) + ), + 15 + ); + g = BD(Si(a.b, c, d), 15); + e == 0 ? g.Wc(0, f) : g.Gc(f); + } + function KDc(a, b) { + var c, d, e, f, g; + for (f = new olb(b.a); f.a < f.c.c.length; ) { + e = BD(mlb(f), 10); + for (d = new Sr(ur(R_b(e).a.Kc(), new Sq())); Qr(d); ) { + c = BD(Rr(d), 17); + g = c.c.i.p; + a.n[g] = a.n[g] - 1; + } + } + } + function cnc(a, b) { + var c, d, e, f, g; + for (f = new olb(b.d); f.a < f.c.c.length; ) { + e = BD(mlb(f), 101); + g = BD(Ohb(a.c, e), 112).o; + for (d = new Gqb(e.b); d.a < d.c.a.length; ) { + c = BD(Fqb(d), 61); + ojc(e, c, g); + } + } + } + function HJc(a) { + var b, c; + for (c = new olb(a.e.b); c.a < c.c.c.length; ) { + b = BD(mlb(c), 29); + YJc(a, b); + } + MAb( + JAb( + LAb(LAb(new YAb(null, new Kub(a.e.b, 16)), new YKc()), new tLc()), + new vLc() + ), + new xLc(a) + ); + } + function Qwd(a, b) { + if (!b) { + return false; + } else { + if (a.Di(b)) { + return false; + } + if (!a.i) { + if (JD(b, 143)) { + a.i = BD(b, 143); + return true; + } else { + a.i = new Hxd(); + return a.i.Ei(b); + } + } else { + return a.i.Ei(b); + } + } + } + function B9d(a) { + a = Qge(a, true); + if (dfb(kse, a) || dfb("1", a)) { + return Bcb(), Acb; + } else if (dfb(lse, a) || dfb("0", a)) { + return Bcb(), zcb; + } + throw vbb(new n8d("Invalid boolean value: '" + a + "'")); + } + function Kd(a, b, c) { + var d, e, f; + for (e = a.vc().Kc(); e.Ob(); ) { + d = BD(e.Pb(), 42); + f = d.cd(); + if (PD(b) === PD(f) || (b != null && pb(b, f))) { + if (c) { + d = new pjb(d.cd(), d.dd()); + e.Qb(); + } + return d; + } + } + return null; + } + function dKb(a) { + $Jb(); + var b, c, d; + if (!a.B.Hc((Idd(), Add))) { + return; + } + d = a.f.i; + b = new K6c(a.a.c); + c = new p0b(); + c.b = b.c - d.c; + c.d = b.d - d.d; + c.c = d.c + d.b - (b.c + b.b); + c.a = d.d + d.a - (b.d + b.a); + a.e.Ff(c); + } + function LNb(a, b, c, d) { + var e, f, g; + g = Math.min(c, ONb(BD(a.b, 65), b, c, d)); + for (f = new olb(a.a); f.a < f.c.c.length; ) { + e = BD(mlb(f), 221); + e != b && (g = Math.min(g, LNb(e, b, g, d))); + } + return g; + } + function WZb(a) { + var b, c, d, e; + e = KC(OQ, nie, 193, a.b.c.length, 0, 2); + d = new Bib(a.b, 0); + while (d.b < d.d.gc()) { + b = (sCb(d.b < d.d.gc()), BD(d.d.Xb((d.c = d.b++)), 29)); + c = d.b - 1; + e[c] = l_b(b.a); + } + return e; + } + function K3b(a, b, c, d, e) { + var f, g, h, i; + g = eLb(dLb(iLb(H3b(c)), d), C3b(a, c, e)); + for (i = Y_b(a, c).Kc(); i.Ob(); ) { + h = BD(i.Pb(), 11); + if (b[h.p]) { + f = b[h.p].i; + Ekb(g.d, new BLb(f, bLb(g, f))); + } + } + cLb(g); + } + function sic(a, b) { + this.f = new Lqb(); + this.b = new Lqb(); + this.j = new Lqb(); + this.a = a; + this.c = b; + this.c > 0 && ric(this, this.c - 1, (Ucd(), zcd)); + this.c < this.a.length - 1 && ric(this, this.c + 1, (Ucd(), Tcd)); + } + function SEc(a) { + a.length > 0 && + a[0].length > 0 && + (this.c = Ccb(DD(vNb(Q_b(a[0][0]), (wtc(), Rsc))))); + this.a = KC(CX, nie, 2018, a.length, 0, 2); + this.b = KC(FX, nie, 2019, a.length, 0, 2); + this.d = new ss(); + } + function tKc(a) { + if (a.c.length == 0) { + return false; + } + if ((tCb(0, a.c.length), BD(a.c[0], 17)).c.i.k == (j0b(), g0b)) { + return true; + } + return FAb(NAb(new YAb(null, new Kub(a, 16)), new wKc()), new yKc()); + } + function rRc(a, b, c) { + Odd(c, "Tree layout", 1); + H2c(a.b); + K2c(a.b, (yRc(), uRc), uRc); + K2c(a.b, vRc, vRc); + K2c(a.b, wRc, wRc); + K2c(a.b, xRc, xRc); + a.a = F2c(a.b, b); + sRc(a, b, Udd(c, 1)); + Qdd(c); + return b; + } + function HXc(a, b) { + var c, d, e, f, g, h, i; + h = gVc(b); + f = b.f; + i = b.g; + g = Math.sqrt(f * f + i * i); + e = 0; + for (d = new olb(h); d.a < d.c.c.length; ) { + c = BD(mlb(d), 33); + e += HXc(a, c); + } + return Math.max(e, g); + } + function dcd() { + dcd = ccb; + ccd = new gcd(ole, 0); + bcd = new gcd("FREE", 1); + acd = new gcd("FIXED_SIDE", 2); + Zbd = new gcd("FIXED_ORDER", 3); + _bd = new gcd("FIXED_RATIO", 4); + $bd = new gcd("FIXED_POS", 5); + } + function c1d(a, b) { + var c, d, e; + c = b.Hh(a.a); + if (c) { + e = GD(AAd((!c.b && (c.b = new sId((jGd(), fGd), x6, c)), c.b), Cwe)); + for (d = 1; d < (O6d(), N6d).length; ++d) { + if (dfb(N6d[d], e)) { + return d; + } + } + } + return 0; + } + function Qlb(a) { + var b, c, d, e, f; + if (a == null) { + return Xhe; + } + f = new xwb(She, "[", "]"); + for (c = a, d = 0, e = c.length; d < e; ++d) { + b = c[d]; + uwb(f, "" + b); + } + return !f.a ? f.c : f.e.length == 0 ? f.a.a : f.a.a + ("" + f.e); + } + function Wlb(a) { + var b, c, d, e, f; + if (a == null) { + return Xhe; + } + f = new xwb(She, "[", "]"); + for (c = a, d = 0, e = c.length; d < e; ++d) { + b = c[d]; + uwb(f, "" + b); + } + return !f.a ? f.c : f.e.length == 0 ? f.a.a : f.a.a + ("" + f.e); + } + function Md(a) { + var b, c, d; + d = new xwb(She, "{", "}"); + for (c = a.vc().Kc(); c.Ob(); ) { + b = BD(c.Pb(), 42); + uwb(d, Nd(a, b.cd()) + "=" + Nd(a, b.dd())); + } + return !d.a ? d.c : d.e.length == 0 ? d.a.a : d.a.a + ("" + d.e); + } + function EGb(a) { + var b, c, d, e; + while (!akb(a.o)) { + c = BD(fkb(a.o), 46); + d = BD(c.a, 121); + b = BD(c.b, 213); + e = xFb(b, d); + if (b.e == d) { + NFb(e.g, b); + d.e = e.e + b.a; + } else { + NFb(e.b, b); + d.e = e.e - b.a; + } + Ekb(a.e.a, d); + } + } + function F6b(a, b) { + var c, d, e; + c = null; + for (e = BD(b.Kb(a), 20).Kc(); e.Ob(); ) { + d = BD(e.Pb(), 17); + if (!c) { + c = d.c.i == a ? d.d.i : d.c.i; + } else { + if ((d.c.i == a ? d.d.i : d.c.i) != c) { + return false; + } + } + } + return true; + } + function uPc(a, b) { + var c, d, e, f, g; + c = WNc(a, false, b); + for (e = new olb(c); e.a < e.c.c.length; ) { + d = BD(mlb(e), 129); + d.d == 0 + ? (BOc(d, null), COc(d, null)) + : ((f = d.a), (g = d.b), BOc(d, g), COc(d, f), undefined); + } + } + function qQc(a) { + var b, c; + b = new j3c(); + d3c(b, cQc); + c = BD(vNb(a, (wtc(), Ksc)), 21); + c.Hc((Orc(), Nrc)) && d3c(b, gQc); + c.Hc(Erc) && d3c(b, dQc); + c.Hc(Lrc) && d3c(b, fQc); + c.Hc(Grc) && d3c(b, eQc); + return b; + } + function Xac(a) { + var b, c, d, e; + Wac(a); + for (c = new Sr(ur(O_b(a).a.Kc(), new Sq())); Qr(c); ) { + b = BD(Rr(c), 17); + d = b.c.i == a; + e = d ? b.d : b.c; + d ? RZb(b, null) : QZb(b, null); + yNb(b, (wtc(), ctc), e); + _ac(a, e.i); + } + } + function wmc(a, b, c, d) { + var e, f; + f = b.i; + e = c[f.g][a.d[f.g]]; + switch (f.g) { + case 1: + e -= d + b.j.b; + b.g.b = e; + break; + case 3: + e += d; + b.g.b = e; + break; + case 4: + e -= d + b.j.a; + b.g.a = e; + break; + case 2: + e += d; + b.g.a = e; + } + } + function aVc(a) { + var b, c, d; + for ( + c = new Fyd((!a.a && (a.a = new cUd(E2, a, 10, 11)), a.a)); + c.e != c.i.gc(); + + ) { + b = BD(Dyd(c), 33); + d = $sd(b); + if (!Qr(new Sr(ur(d.a.Kc(), new Sq())))) { + return b; + } + } + return null; + } + function Cod() { + var a; + if (yod) return BD(nUd((yFd(), xFd), yte), 2016); + a = BD(JD(Phb((yFd(), xFd), yte), 555) ? Phb(xFd, yte) : new Bod(), 555); + yod = true; + zod(a); + Aod(a); + Tnd(a); + Shb(xFd, yte, a); + return a; + } + function t3d(a, b, c) { + var d, e; + if (a.j == 0) return c; + e = BD(LLd(a, b, c), 72); + d = c.ak(); + if (!d.Ij() || !a.a.rl(d)) { + throw vbb( + new hz("Invalid entry feature '" + d.Hj().zb + "." + d.ne() + "'") + ); + } + return e; + } + function Qi(a, b) { + var c, d, e, f, g, h, i, j; + for (h = a.a, i = 0, j = h.length; i < j; ++i) { + g = h[i]; + for (d = g, e = 0, f = d.length; e < f; ++e) { + c = d[e]; + if (PD(b) === PD(c) || (b != null && pb(b, c))) { + return true; + } + } + } + return false; + } + function qhb(a) { + var b, c, d; + if (ybb(a, 0) >= 0) { + c = Abb(a, Jje); + d = Hbb(a, Jje); + } else { + b = Pbb(a, 1); + c = Abb(b, 500000000); + d = Hbb(b, 500000000); + d = wbb(Nbb(d, 1), xbb(a, 1)); + } + return Mbb(Nbb(d, 32), xbb(c, Yje)); + } + function oQb(a, b, c) { + var d, e; + d = (sCb(b.b != 0), BD(Nsb(b, b.a.a), 8)); + switch (c.g) { + case 0: + d.b = 0; + break; + case 2: + d.b = a.f; + break; + case 3: + d.a = 0; + break; + default: + d.a = a.g; + } + e = Jsb(b, 0); + Vsb(e, d); + return b; + } + function pmc(a, b, c, d) { + var e, f, g, h, i; + i = a.b; + f = b.d; + g = f.j; + h = umc(g, i.d[g.g], c); + e = P6c(R6c(f.n), f.a); + switch (f.j.g) { + case 1: + case 3: + h.a += e.a; + break; + case 2: + case 4: + h.b += e.b; + } + Gsb(d, h, d.c.b, d.c); + } + function yJc(a, b, c) { + var d, e, f, g; + g = Jkb(a.e, b, 0); + f = new zJc(); + f.b = c; + d = new Bib(a.e, g); + while (d.b < d.d.gc()) { + e = (sCb(d.b < d.d.gc()), BD(d.d.Xb((d.c = d.b++)), 10)); + e.p = c; + Ekb(f.e, e); + uib(d); + } + return f; + } + function sYc(a, b, c, d) { + var e, f, g, h, i; + e = null; + f = 0; + for (h = new olb(b); h.a < h.c.c.length; ) { + g = BD(mlb(h), 33); + i = g.i + g.g; + if (a < g.j + g.f + d) { + !e ? (e = g) : c.i - i < c.i - f && (e = g); + f = e.i + e.g; + } + } + return !e ? 0 : f + d; + } + function tYc(a, b, c, d) { + var e, f, g, h, i; + f = null; + e = 0; + for (h = new olb(b); h.a < h.c.c.length; ) { + g = BD(mlb(h), 33); + i = g.j + g.f; + if (a < g.i + g.g + d) { + !f ? (f = g) : c.j - i < c.j - e && (f = g); + e = f.j + f.f; + } + } + return !f ? 0 : e + d; + } + function mA(a) { + var b, c, d; + b = false; + d = a.b.c.length; + for (c = 0; c < d; c++) { + if (nA(BD(Ikb(a.b, c), 434))) { + if (!b && c + 1 < d && nA(BD(Ikb(a.b, c + 1), 434))) { + b = true; + BD(Ikb(a.b, c), 434).a = true; + } + } else { + b = false; + } + } + } + function Ahb(a, b, c, d, e) { + var f, g; + f = 0; + for (g = 0; g < e; g++) { + f = wbb(f, Qbb(xbb(b[g], Yje), xbb(d[g], Yje))); + a[g] = Tbb(f); + f = Obb(f, 32); + } + for (; g < c; g++) { + f = wbb(f, xbb(b[g], Yje)); + a[g] = Tbb(f); + f = Obb(f, 32); + } + } + function Jhb(a, b) { + Dhb(); + var c, d; + d = (Hgb(), Cgb); + c = a; + for (; b > 1; b >>= 1) { + (b & 1) != 0 && (d = Ogb(d, c)); + c.d == 1 + ? (c = Ogb(c, c)) + : (c = new Xgb(Lhb(c.a, c.d, KC(WD, oje, 25, c.d << 1, 15, 1)))); + } + d = Ogb(d, c); + return d; + } + function zub() { + zub = ccb; + var a, b, c, d; + wub = KC(UD, Vje, 25, 25, 15, 1); + xub = KC(UD, Vje, 25, 33, 15, 1); + d = 1.52587890625e-5; + for (b = 32; b >= 0; b--) { + xub[b] = d; + d *= 0.5; + } + c = 1; + for (a = 24; a >= 0; a--) { + wub[a] = c; + c *= 0.5; + } + } + function S1b(a) { + var b, c; + if (Ccb(DD(hkd(a, (Nyc(), fxc))))) { + for (c = new Sr(ur(_sd(a).a.Kc(), new Sq())); Qr(c); ) { + b = BD(Rr(c), 79); + if (Qld(b)) { + if (Ccb(DD(hkd(b, gxc)))) { + return true; + } + } + } + } + return false; + } + function kjc(a, b) { + var c, d, e; + if (Qqb(a.f, b)) { + b.b = a; + d = b.c; + Jkb(a.j, d, 0) != -1 || Ekb(a.j, d); + e = b.d; + Jkb(a.j, e, 0) != -1 || Ekb(a.j, e); + c = b.a.b; + if (c.c.length != 0) { + !a.i && (a.i = new vjc(a)); + qjc(a.i, c); + } + } + } + function rmc(a) { + var b, c, d, e, f; + c = a.c.d; + d = c.j; + e = a.d.d; + f = e.j; + if (d == f) { + return c.p < e.p ? 0 : 1; + } else if (Xcd(d) == f) { + return 0; + } else if (Vcd(d) == f) { + return 1; + } else { + b = a.b; + return uqb(b.b, Xcd(d)) ? 0 : 1; + } + } + function lzc() { + lzc = ccb; + jzc = new nzc(Aqe, 0); + hzc = new nzc("LONGEST_PATH", 1); + fzc = new nzc("COFFMAN_GRAHAM", 2); + gzc = new nzc(Tne, 3); + kzc = new nzc("STRETCH_WIDTH", 4); + izc = new nzc("MIN_WIDTH", 5); + } + function E3c(a) { + var b; + this.d = new Lqb(); + this.c = a.c; + this.e = a.d; + this.b = a.b; + this.f = new jgd(a.e); + this.a = a.a; + !a.f + ? (this.g = + ((b = BD(gdb(O3), 9)), new xqb(b, BD(_Bb(b, b.length), 9), 0))) + : (this.g = a.f); + } + function grd(a, b) { + var c, d, e, f, g, h; + e = a; + g = $pd(e, "layoutOptions"); + !g && (g = $pd(e, Dte)); + if (g) { + h = g; + d = null; + !!h && (d = ((f = $B(h, KC(ZI, nie, 2, 0, 6, 1))), new mC(h, f))); + if (d) { + c = new Drd(h, b); + reb(d, c); + } + } + } + function atd(a) { + if (JD(a, 239)) { + return BD(a, 33); + } else if (JD(a, 186)) { + return mpd(BD(a, 118)); + } else if (!a) { + throw vbb(new Heb(gue)); + } else { + throw vbb(new cgb("Only support nodes and ports.")); + } + } + function CA(a, b, c, d) { + if (b >= 0 && dfb(a.substr(b, "GMT".length), "GMT")) { + c[0] = b + 3; + return tA(a, c, d); + } + if (b >= 0 && dfb(a.substr(b, "UTC".length), "UTC")) { + c[0] = b + 3; + return tA(a, c, d); + } + return tA(a, c, d); + } + function tjc(a, b) { + var c, d, e, f, g; + f = a.g.a; + g = a.g.b; + for (d = new olb(a.d); d.a < d.c.c.length; ) { + c = BD(mlb(d), 70); + e = c.n; + e.a = f; + a.i == (Ucd(), Acd) ? (e.b = g + a.j.b - c.o.b) : (e.b = g); + P6c(e, b); + f += c.o.a + a.e; + } + } + function Odd(a, b, c) { + if (a.b) { + throw vbb(new Zdb("The task is already done.")); + } else if (a.p != null) { + return false; + } else { + a.p = b; + a.r = c; + a.k && (a.o = (Zfb(), Ibb(Cbb(Date.now()), _ie))); + return true; + } + } + function hsd(a) { + var b, c, d, e, f, g, h; + h = new eC(); + c = a.tg(); + e = c != null; + e && Upd(h, Vte, a.tg()); + d = a.ne(); + f = d != null; + f && Upd(h, fue, a.ne()); + b = a.sg(); + g = b != null; + g && Upd(h, "description", a.sg()); + return h; + } + function uId(a, b, c) { + var d, e, f; + f = a.q; + a.q = b; + if ((a.Db & 4) != 0 && (a.Db & 1) == 0) { + e = new nSd(a, 1, 9, f, b); + !c ? (c = e) : c.Ei(e); + } + if (!b) { + !!a.r && (c = a.nk(null, c)); + } else { + d = b.c; + d != a.r && (c = a.nk(d, c)); + } + return c; + } + function IYd(a, b, c) { + var d, e, f, g, h; + c = ((h = b), kid(h, a.e, -1 - a.c, c)); + g = AYd(a.a); + for (f = ((d = new nib(new eib(g.a).a)), new ZYd(d)); f.a.b; ) { + e = BD(lib(f.a).cd(), 87); + c = QQd(e, MQd(e, a.a), c); + } + return c; + } + function JYd(a, b, c) { + var d, e, f, g, h; + c = ((h = b), lid(h, a.e, -1 - a.c, c)); + g = AYd(a.a); + for (f = ((d = new nib(new eib(g.a).a)), new ZYd(d)); f.a.b; ) { + e = BD(lib(f.a).cd(), 87); + c = QQd(e, MQd(e, a.a), c); + } + return c; + } + function jhb(a, b, c, d) { + var e, f, g; + if (d == 0) { + $fb(b, 0, a, c, a.length - c); + } else { + g = 32 - d; + a[a.length - 1] = 0; + for (f = a.length - 1; f > c; f--) { + a[f] |= b[f - c - 1] >>> g; + a[f - 1] = b[f - c - 1] << d; + } + } + for (e = 0; e < c; e++) { + a[e] = 0; + } + } + function LJb(a) { + var b, c, d, e, f; + b = 0; + c = 0; + for (f = a.Kc(); f.Ob(); ) { + d = BD(f.Pb(), 111); + b = Math.max(b, d.d.b); + c = Math.max(c, d.d.c); + } + for (e = a.Kc(); e.Ob(); ) { + d = BD(e.Pb(), 111); + d.d.b = b; + d.d.c = c; + } + } + function TKb(a) { + var b, c, d, e, f; + c = 0; + b = 0; + for (f = a.Kc(); f.Ob(); ) { + d = BD(f.Pb(), 111); + c = Math.max(c, d.d.d); + b = Math.max(b, d.d.a); + } + for (e = a.Kc(); e.Ob(); ) { + d = BD(e.Pb(), 111); + d.d.d = c; + d.d.a = b; + } + } + function rpc(a, b) { + var c, d, e, f; + f = new Rkb(); + e = 0; + d = b.Kc(); + while (d.Ob()) { + c = meb(BD(d.Pb(), 19).a + e); + while (c.a < a.f && !Voc(a, c.a)) { + c = meb(c.a + 1); + ++e; + } + if (c.a >= a.f) { + break; + } + f.c[f.c.length] = c; + } + return f; + } + function sfd(a) { + var b, c, d, e; + b = null; + for (e = new olb(a.wf()); e.a < e.c.c.length; ) { + d = BD(mlb(e), 181); + c = new J6c(d.qf().a, d.qf().b, d.rf().a, d.rf().b); + !b ? (b = c) : H6c(b, c); + } + !b && (b = new I6c()); + return b; + } + function Fkd(a, b, c, d) { + var e, f; + if (c == 1) { + return !a.n && (a.n = new cUd(D2, a, 1, 7)), Sxd(a.n, b, d); + } + return ( + (f = BD(XKd(((e = BD(Ajd(a, 16), 26)), !e ? a.zh() : e), c), 66)), + f.Nj().Qj(a, yjd(a), c - aLd(a.zh()), b, d) + ); + } + function iud(a, b, c) { + var d, e, f, g, h; + d = c.gc(); + a.qi(a.i + d); + h = a.i - b; + h > 0 && $fb(a.g, b, a.g, b + d, h); + g = c.Kc(); + a.i += d; + for (e = 0; e < d; ++e) { + f = g.Pb(); + mud(a, b, a.oi(b, f)); + a.bi(b, f); + a.ci(); + ++b; + } + return d != 0; + } + function xId(a, b, c) { + var d; + if (b != a.q) { + !!a.q && (c = lid(a.q, a, -10, c)); + !!b && (c = kid(b, a, -10, c)); + c = uId(a, b, c); + } else if ((a.Db & 4) != 0 && (a.Db & 1) == 0) { + d = new nSd(a, 1, 9, b, b); + !c ? (c = d) : c.Ei(d); + } + return c; + } + function Yj(a, b, c, d) { + Mb((c & oie) == 0, "flatMap does not support SUBSIZED characteristic"); + Mb((c & 4) == 0, "flatMap does not support SORTED characteristic"); + Qb(a); + Qb(b); + return new jk(a, c, d, b); + } + function Qy(a, b) { + vCb(b, "Cannot suppress a null exception."); + mCb(b != a, "Exception can not suppress itself."); + if (a.i) { + return; + } + a.k == null + ? (a.k = OC(GC(_I, 1), nie, 78, 0, [b])) + : (a.k[a.k.length] = b); + } + function oA(a, b, c, d) { + var e, f, g, h, i, j; + g = c.length; + f = 0; + e = -1; + j = sfb(a.substr(b), (ntb(), ltb)); + for (h = 0; h < g; ++h) { + i = c[h].length; + if (i > f && nfb(j, sfb(c[h], ltb))) { + e = h; + f = i; + } + } + e >= 0 && (d[0] = b + f); + return e; + } + function MIb(a, b) { + var c; + c = NIb(a.b.Hf(), b.b.Hf()); + if (c != 0) { + return c; + } + switch (a.b.Hf().g) { + case 1: + case 2: + return beb(a.b.sf(), b.b.sf()); + case 3: + case 4: + return beb(b.b.sf(), a.b.sf()); + } + return 0; + } + function iRb(a) { + var b, c, d; + d = a.e.c.length; + a.a = IC(WD, [nie, oje], [48, 25], 15, [d, d], 2); + for (c = new olb(a.c); c.a < c.c.c.length; ) { + b = BD(mlb(c), 282); + a.a[b.c.b][b.d.b] += BD(vNb(b, (wSb(), oSb)), 19).a; + } + } + function H1c(a, b, c) { + Odd(c, "Grow Tree", 1); + a.b = b.f; + if (Ccb(DD(vNb(b, (XNb(), VNb))))) { + a.c = new tOb(); + D1c(a, null); + } else { + a.c = new tOb(); + } + a.a = false; + F1c(a, b.f); + yNb(b, WNb, (Bcb(), a.a ? true : false)); + Qdd(c); + } + function Umd(a, b) { + var c, d, e, f, g; + if (a == null) { + return null; + } else { + g = KC(TD, $ie, 25, 2 * b, 15, 1); + for (d = 0, e = 0; d < b; ++d) { + c = (a[d] >> 4) & 15; + f = a[d] & 15; + g[e++] = Qmd[c]; + g[e++] = Qmd[f]; + } + return zfb(g, 0, g.length); + } + } + function j3d(a, b, c) { + var d, e, f; + d = b.ak(); + f = b.dd(); + e = d.$j() + ? H2d( + a, + 4, + d, + f, + null, + M2d(a, d, f, JD(d, 99) && (BD(d, 18).Bb & Tje) != 0), + true + ) + : H2d(a, d.Kj() ? 2 : 1, d, f, d.zj(), -1, true); + c ? c.Ei(e) : (c = e); + return c; + } + function wfb(a) { + var b, c; + if (a >= Tje) { + b = (Uje + (((a - Tje) >> 10) & 1023)) & aje; + c = (56320 + ((a - Tje) & 1023)) & aje; + return String.fromCharCode(b) + ("" + String.fromCharCode(c)); + } else { + return String.fromCharCode(a & aje); + } + } + function bKb(a, b) { + $Jb(); + var c, d, e, f; + e = BD(BD(Qc(a.r, b), 21), 84); + if (e.gc() >= 2) { + d = BD(e.Kc().Pb(), 111); + c = a.u.Hc((rcd(), mcd)); + f = a.u.Hc(qcd); + return !d.a && !c && (e.gc() == 2 || f); + } else { + return false; + } + } + function IVc(a, b, c, d, e) { + var f, g, h; + f = JVc(a, b, c, d, e); + h = false; + while (!f) { + AVc(a, e, true); + h = true; + f = JVc(a, b, c, d, e); + } + h && AVc(a, e, false); + g = dVc(e); + if (g.c.length != 0) { + !!a.d && a.d.lg(g); + IVc(a, e, c, d, g); + } + } + function Mad() { + Mad = ccb; + Kad = new Nad(ane, 0); + Iad = new Nad("DIRECTED", 1); + Lad = new Nad("UNDIRECTED", 2); + Gad = new Nad("ASSOCIATION", 3); + Jad = new Nad("GENERALIZATION", 4); + Had = new Nad("DEPENDENCY", 5); + } + function kfd(a, b) { + var c; + if (!mpd(a)) { + throw vbb(new Zdb(Sse)); + } + c = mpd(a); + switch (b.g) { + case 1: + return -(a.j + a.f); + case 2: + return a.i - c.g; + case 3: + return a.j - c.f; + case 4: + return -(a.i + a.g); + } + return 0; + } + function cub(a, b) { + var c, d; + uCb(b); + d = a.b.c.length; + Ekb(a.b, b); + while (d > 0) { + c = d; + d = ((d - 1) / 2) | 0; + if (a.a.ue(Ikb(a.b, d), b) <= 0) { + Nkb(a.b, c, b); + return true; + } + Nkb(a.b, c, Ikb(a.b, d)); + } + Nkb(a.b, d, b); + return true; + } + function BHb(a, b, c, d) { + var e, f; + e = 0; + if (!c) { + for (f = 0; f < sHb; f++) { + e = Math.max(e, qHb(a.a[f][b.g], d)); + } + } else { + e = qHb(a.a[c.g][b.g], d); + } + b == (gHb(), eHb) && !!a.b && (e = Math.max(e, a.b.a)); + return e; + } + function knc(a, b) { + var c, d, e, f, g, h; + e = a.i; + f = b.i; + if (!e || !f) { + return false; + } + if (e.i != f.i || e.i == (Ucd(), zcd) || e.i == (Ucd(), Tcd)) { + return false; + } + g = e.g.a; + c = g + e.j.a; + h = f.g.a; + d = h + f.j.a; + return g <= d && c >= h; + } + function Tpd(a, b, c, d) { + var e; + e = false; + if (ND(d)) { + e = true; + Upd(b, c, GD(d)); + } + if (!e) { + if (KD(d)) { + e = true; + Tpd(a, b, c, d); + } + } + if (!e) { + if (JD(d, 236)) { + e = true; + Spd(b, c, BD(d, 236)); + } + } + if (!e) { + throw vbb(new vcb(Ute)); + } + } + function W0d(a, b) { + var c, d, e; + c = b.Hh(a.a); + if (c) { + e = AAd((!c.b && (c.b = new sId((jGd(), fGd), x6, c)), c.b), Sve); + if (e != null) { + for (d = 1; d < (O6d(), K6d).length; ++d) { + if (dfb(K6d[d], e)) { + return d; + } + } + } + } + return 0; + } + function X0d(a, b) { + var c, d, e; + c = b.Hh(a.a); + if (c) { + e = AAd((!c.b && (c.b = new sId((jGd(), fGd), x6, c)), c.b), Sve); + if (e != null) { + for (d = 1; d < (O6d(), L6d).length; ++d) { + if (dfb(L6d[d], e)) { + return d; + } + } + } + } + return 0; + } + function Ve(a, b) { + var c, d, e, f; + uCb(b); + f = a.a.gc(); + if (f < b.gc()) { + for (c = a.a.ec().Kc(); c.Ob(); ) { + d = c.Pb(); + b.Hc(d) && c.Qb(); + } + } else { + for (e = b.Kc(); e.Ob(); ) { + d = e.Pb(); + a.a.Bc(d) != null; + } + } + return f != a.a.gc(); + } + function bYb(a) { + var b, c; + c = R6c(l7c(OC(GC(m1, 1), nie, 8, 0, [a.i.n, a.n, a.a]))); + b = a.i.d; + switch (a.j.g) { + case 1: + c.b -= b.d; + break; + case 2: + c.a += b.c; + break; + case 3: + c.b += b.a; + break; + case 4: + c.a -= b.b; + } + return c; + } + function P9b(a) { + var b; + b = (I9b(), BD(Rr(new Sr(ur(R_b(a).a.Kc(), new Sq()))), 17).c.i); + while (b.k == (j0b(), g0b)) { + yNb(b, (wtc(), Tsc), (Bcb(), true)); + b = BD(Rr(new Sr(ur(R_b(b).a.Kc(), new Sq()))), 17).c.i; + } + } + function bIc(a, b, c, d) { + var e, f, g, h; + h = CHc(b, d); + for (g = h.Kc(); g.Ob(); ) { + e = BD(g.Pb(), 11); + a.d[e.p] = a.d[e.p] + a.c[c.p]; + } + h = CHc(c, d); + for (f = h.Kc(); f.Ob(); ) { + e = BD(f.Pb(), 11); + a.d[e.p] = a.d[e.p] - a.c[b.p]; + } + } + function Efd(a, b, c) { + var d, e; + for ( + e = new Fyd((!a.a && (a.a = new cUd(E2, a, 10, 11)), a.a)); + e.e != e.i.gc(); + + ) { + d = BD(Dyd(e), 33); + bld(d, d.i + b, d.j + c); + } + reb((!a.b && (a.b = new cUd(B2, a, 12, 3)), a.b), new Kfd(b, c)); + } + function Mwb(a, b, c, d) { + var e, f; + f = b; + e = f.d == null || a.a.ue(c.d, f.d) > 0 ? 1 : 0; + while (f.a[e] != c) { + f = f.a[e]; + e = a.a.ue(c.d, f.d) > 0 ? 1 : 0; + } + f.a[e] = d; + d.b = c.b; + d.a[0] = c.a[0]; + d.a[1] = c.a[1]; + c.a[0] = null; + c.a[1] = null; + } + function ucd(a) { + rcd(); + var b, c; + b = qqb(ncd, OC(GC(E1, 1), Kie, 273, 0, [pcd])); + if (Ox(Cx(b, a)) > 1) { + return false; + } + c = qqb(mcd, OC(GC(E1, 1), Kie, 273, 0, [lcd, qcd])); + if (Ox(Cx(c, a)) > 1) { + return false; + } + return true; + } + function fod(a, b) { + var c; + c = Phb((yFd(), xFd), a); + JD(c, 498) ? Shb(xFd, a, new bUd(this, b)) : Shb(xFd, a, this); + bod(this, b); + if (b == (LFd(), KFd)) { + this.wb = BD(this, 1939); + BD(b, 1941); + } else { + this.wb = (NFd(), MFd); + } + } + function lZd(b) { + var c, d, e; + if (b == null) { + return null; + } + c = null; + for (d = 0; d < Pmd.length; ++d) { + try { + return DQd(Pmd[d], b); + } catch (a) { + a = ubb(a); + if (JD(a, 32)) { + e = a; + c = e; + } else throw vbb(a); + } + } + throw vbb(new rFd(c)); + } + function Dpb() { + Dpb = ccb; + Bpb = OC(GC(ZI, 1), nie, 2, 6, [ + "Sun", + "Mon", + "Tue", + "Wed", + "Thu", + "Fri", + "Sat", + ]); + Cpb = OC(GC(ZI, 1), nie, 2, 6, [ + "Jan", + "Feb", + "Mar", + "Apr", + fje, + "Jun", + "Jul", + "Aug", + "Sep", + "Oct", + "Nov", + "Dec", + ]); + } + function yyb(a) { + var b, c, d; + b = dfb(typeof b, uke) ? null : new iCb(); + if (!b) { + return; + } + $xb(); + c = + ((d = 900), + d >= _ie ? "error" : d >= 900 ? "warn" : d >= 800 ? "info" : "log"); + gCb(c, a.a); + !!a.b && hCb(b, c, a.b, "Exception: ", true); + } + function vNb(a, b) { + var c, d; + d = (!a.q && (a.q = new Lqb()), Ohb(a.q, b)); + if (d != null) { + return d; + } + c = b.wg(); + JD(c, 4) && + (c == null + ? (!a.q && (a.q = new Lqb()), Thb(a.q, b)) + : (!a.q && (a.q = new Lqb()), Rhb(a.q, b, c)), + a); + return c; + } + function qUb() { + qUb = ccb; + lUb = new rUb("P1_CYCLE_BREAKING", 0); + mUb = new rUb("P2_LAYERING", 1); + nUb = new rUb("P3_NODE_ORDERING", 2); + oUb = new rUb("P4_NODE_PLACEMENT", 3); + pUb = new rUb("P5_EDGE_ROUTING", 4); + } + function SUb(a, b) { + var c, d, e, f, g; + e = b == 1 ? KUb : JUb; + for (d = e.a.ec().Kc(); d.Ob(); ) { + c = BD(d.Pb(), 103); + for (g = BD(Qc(a.f.c, c), 21).Kc(); g.Ob(); ) { + f = BD(g.Pb(), 46); + Lkb(a.b.b, f.b); + Lkb(a.b.a, BD(f.b, 81).d); + } + } + } + function IWb(a, b) { + AWb(); + var c; + if (a.c == b.c) { + if (a.b == b.b || pWb(a.b, b.b)) { + c = mWb(a.b) ? 1 : -1; + if (a.a && !b.a) { + return c; + } else if (!a.a && b.a) { + return -c; + } + } + return beb(a.b.g, b.b.g); + } else { + return Kdb(a.c, b.c); + } + } + function y6b(a, b) { + var c; + Odd(b, "Hierarchical port position processing", 1); + c = a.b; + c.c.length > 0 && x6b((tCb(0, c.c.length), BD(c.c[0], 29)), a); + c.c.length > 1 && x6b(BD(Ikb(c, c.c.length - 1), 29), a); + Qdd(b); + } + function RVc(a, b) { + var c, d, e; + if (CVc(a, b)) { + return true; + } + for (d = new olb(b); d.a < d.c.c.length; ) { + c = BD(mlb(d), 33); + e = hVc(c); + if (BVc(a, c, e)) { + return true; + } + if (PVc(a, c) - a.g <= a.a) { + return true; + } + } + return false; + } + function d0c() { + d0c = ccb; + c0c = (A0c(), z0c); + __c = v0c; + $_c = t0c; + Y_c = p0c; + Z_c = r0c; + X_c = new q0b(8); + W_c = new Osd((Y9c(), f9c), X_c); + a0c = new Osd(T9c, 8); + b0c = x0c; + T_c = k0c; + U_c = m0c; + V_c = new Osd(y8c, (Bcb(), false)); + } + function X7c() { + X7c = ccb; + U7c = new q0b(15); + T7c = new Osd((Y9c(), f9c), U7c); + W7c = new Osd(T9c, 15); + V7c = new Osd(D9c, meb(0)); + O7c = I8c; + Q7c = Y8c; + S7c = b9c; + L7c = new Osd(r8c, pse); + P7c = O8c; + R7c = _8c; + M7c = t8c; + N7c = w8c; + } + function jtd(a) { + if ( + (!a.b && (a.b = new y5d(z2, a, 4, 7)), a.b).i != 1 || + (!a.c && (a.c = new y5d(z2, a, 5, 8)), a.c).i != 1 + ) { + throw vbb(new Wdb(iue)); + } + return atd(BD(qud((!a.b && (a.b = new y5d(z2, a, 4, 7)), a.b), 0), 82)); + } + function ktd(a) { + if ( + (!a.b && (a.b = new y5d(z2, a, 4, 7)), a.b).i != 1 || + (!a.c && (a.c = new y5d(z2, a, 5, 8)), a.c).i != 1 + ) { + throw vbb(new Wdb(iue)); + } + return btd(BD(qud((!a.b && (a.b = new y5d(z2, a, 4, 7)), a.b), 0), 82)); + } + function mtd(a) { + if ( + (!a.b && (a.b = new y5d(z2, a, 4, 7)), a.b).i != 1 || + (!a.c && (a.c = new y5d(z2, a, 5, 8)), a.c).i != 1 + ) { + throw vbb(new Wdb(iue)); + } + return btd(BD(qud((!a.c && (a.c = new y5d(z2, a, 5, 8)), a.c), 0), 82)); + } + function ltd(a) { + if ( + (!a.b && (a.b = new y5d(z2, a, 4, 7)), a.b).i != 1 || + (!a.c && (a.c = new y5d(z2, a, 5, 8)), a.c).i != 1 + ) { + throw vbb(new Wdb(iue)); + } + return atd(BD(qud((!a.c && (a.c = new y5d(z2, a, 5, 8)), a.c), 0), 82)); + } + function Dvd(a, b, c) { + var d, e, f; + ++a.j; + e = a.Vi(); + if (b >= e || b < 0) throw vbb(new qcb(lue + b + mue + e)); + if (c >= e || c < 0) throw vbb(new qcb(nue + c + mue + e)); + b != c ? (d = ((f = a.Ti(c)), a.Hi(b, f), f)) : (d = a.Oi(c)); + return d; + } + function m6d(a) { + var b, c, d; + d = a; + if (a) { + b = 0; + for (c = a.Ug(); c; c = c.Ug()) { + if (++b > Wje) { + return m6d(c); + } + d = c; + if (c == a) { + throw vbb( + new Zdb("There is a cycle in the containment hierarchy of " + a) + ); + } + } + } + return d; + } + function Fe(a) { + var b, c, d; + d = new xwb(She, "[", "]"); + for (c = a.Kc(); c.Ob(); ) { + b = c.Pb(); + uwb( + d, + PD(b) === PD(a) ? "(this Collection)" : b == null ? Xhe : fcb(b) + ); + } + return !d.a ? d.c : d.e.length == 0 ? d.a.a : d.a.a + ("" + d.e); + } + function CVc(a, b) { + var c, d; + d = false; + if (b.gc() < 2) { + return false; + } + for (c = 0; c < b.gc(); c++) { + c < b.gc() - 1 + ? (d = d | BVc(a, BD(b.Xb(c), 33), BD(b.Xb(c + 1), 33))) + : (d = d | BVc(a, BD(b.Xb(c), 33), BD(b.Xb(0), 33))); + } + return d; + } + function Ymd(a, b) { + var c; + if (b != a.a) { + c = null; + !!a.a && (c = BD(a.a, 49).ih(a, 4, o5, c)); + !!b && (c = BD(b, 49).gh(a, 4, o5, c)); + c = Tmd(a, b, c); + !!c && c.Fi(); + } else + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new nSd(a, 1, 1, b, b)); + } + function RQd(a, b) { + var c; + if (b != a.e) { + !!a.e && QYd(AYd(a.e), a); + !!b && (!b.b && (b.b = new RYd(new NYd())), PYd(b.b, a)); + c = HQd(a, b, null); + !!c && c.Fi(); + } else + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new nSd(a, 1, 4, b, b)); + } + function ufb(a) { + var b, c, d; + c = a.length; + d = 0; + while (d < c && (BCb(d, a.length), a.charCodeAt(d) <= 32)) { + ++d; + } + b = c; + while (b > d && (BCb(b - 1, a.length), a.charCodeAt(b - 1) <= 32)) { + --b; + } + return d > 0 || b < c ? a.substr(d, b - d) : a; + } + function ujc(a, b) { + var c; + c = b.o; + if (fad(a.f)) { + a.j.a = Math.max(a.j.a, c.a); + a.j.b += c.b; + a.d.c.length > 1 && (a.j.b += a.e); + } else { + a.j.a += c.a; + a.j.b = Math.max(a.j.b, c.b); + a.d.c.length > 1 && (a.j.a += a.e); + } + } + function gkc() { + gkc = ccb; + dkc = OC(GC(F1, 1), bne, 61, 0, [(Ucd(), Acd), zcd, Rcd]); + ckc = OC(GC(F1, 1), bne, 61, 0, [zcd, Rcd, Tcd]); + ekc = OC(GC(F1, 1), bne, 61, 0, [Rcd, Tcd, Acd]); + fkc = OC(GC(F1, 1), bne, 61, 0, [Tcd, Acd, zcd]); + } + function omc(a, b, c, d) { + var e, f, g, h, i, j, k; + g = a.c.d; + h = a.d.d; + if (g.j == h.j) { + return; + } + k = a.b; + e = g.j; + i = null; + while (e != h.j) { + i = b == 0 ? Xcd(e) : Vcd(e); + f = umc(e, k.d[e.g], c); + j = umc(i, k.d[i.g], c); + Dsb(d, P6c(f, j)); + e = i; + } + } + function oFc(a, b, c, d) { + var e, f, g, h, i; + g = JHc(a.a, b, c); + h = BD(g.a, 19).a; + f = BD(g.b, 19).a; + if (d) { + i = BD(vNb(b, (wtc(), gtc)), 10); + e = BD(vNb(c, gtc), 10); + if (!!i && !!e) { + mic(a.b, i, e); + h += a.b.i; + f += a.b.e; + } + } + return h > f; + } + function oHc(a) { + var b, c, d, e, f, g, h, i, j; + this.a = lHc(a); + this.b = new Rkb(); + for (c = a, d = 0, e = c.length; d < e; ++d) { + b = c[d]; + f = new Rkb(); + Ekb(this.b, f); + for (h = b, i = 0, j = h.length; i < j; ++i) { + g = h[i]; + Ekb(f, new Tkb(g.j)); + } + } + } + function qHc(a, b, c) { + var d, e, f; + f = 0; + d = c[b]; + if (b < c.length - 1) { + e = c[b + 1]; + if (a.b[b]) { + f = KIc(a.d, d, e); + f += NHc(a.a, d, (Ucd(), zcd)); + f += NHc(a.a, e, Tcd); + } else { + f = IHc(a.a, d, e); + } + } + a.c[b] && (f += PHc(a.a, d)); + return f; + } + function jZb(a, b, c, d, e) { + var f, g, h, i; + i = null; + for (h = new olb(d); h.a < h.c.c.length; ) { + g = BD(mlb(h), 441); + if (g != c && Jkb(g.e, e, 0) != -1) { + i = g; + break; + } + } + f = kZb(e); + QZb(f, c.b); + RZb(f, i.b); + Rc(a.a, e, new BZb(f, b, c.f)); + } + function nic(a) { + while (a.g.c != 0 && a.d.c != 0) { + if (wic(a.g).c > wic(a.d).c) { + a.i += a.g.c; + yic(a.d); + } else if (wic(a.d).c > wic(a.g).c) { + a.e += a.d.c; + yic(a.g); + } else { + a.i += vic(a.g); + a.e += vic(a.d); + yic(a.g); + yic(a.d); + } + } + } + function XOc(a, b, c) { + var d, e, f, g; + f = b.q; + g = b.r; + new DOc((HOc(), FOc), b, f, 1); + new DOc(FOc, f, g, 1); + for (e = new olb(c); e.a < e.c.c.length; ) { + d = BD(mlb(e), 112); + if (d != f && d != b && d != g) { + pPc(a.a, d, b); + pPc(a.a, d, g); + } + } + } + function XQc(a, b, c, d) { + a.a.d = Math.min(b, c); + a.a.a = Math.max(b, d) - a.a.d; + if (b < c) { + a.b = 0.5 * (b + c); + a.g = Qqe * a.b + 0.9 * b; + a.f = Qqe * a.b + 0.9 * c; + } else { + a.b = 0.5 * (b + d); + a.g = Qqe * a.b + 0.9 * d; + a.f = Qqe * a.b + 0.9 * b; + } + } + function acb() { + _bb = {}; + !Array.isArray && + (Array.isArray = function (a) { + return Object.prototype.toString.call(a) === "[object Array]"; + }); + function b() { + return new Date().getTime(); + } + !Date.now && (Date.now = b); + } + function $Tb(a, b) { + var c, d; + d = BD(vNb(b, (Nyc(), Vxc)), 98); + yNb(b, (wtc(), dtc), d); + c = b.e; + !!c && + (MAb(new YAb(null, new Kub(c.a, 16)), new dUb(a)), + MAb(LAb(new YAb(null, new Kub(c.b, 16)), new fUb()), new hUb(a))); + } + function _$b(a) { + var b, c, d, e; + if (gad(BD(vNb(a.b, (Nyc(), Lwc)), 103))) { + return 0; + } + b = 0; + for (d = new olb(a.a); d.a < d.c.c.length; ) { + c = BD(mlb(d), 10); + if (c.k == (j0b(), h0b)) { + e = c.o.a; + b = Math.max(b, e); + } + } + return b; + } + function c5b(a) { + switch (BD(vNb(a, (Nyc(), mxc)), 163).g) { + case 1: + yNb(a, mxc, (Ctc(), ztc)); + break; + case 2: + yNb(a, mxc, (Ctc(), Atc)); + break; + case 3: + yNb(a, mxc, (Ctc(), xtc)); + break; + case 4: + yNb(a, mxc, (Ctc(), ytc)); + } + } + function yrc() { + yrc = ccb; + wrc = new zrc(ane, 0); + trc = new zrc(jle, 1); + xrc = new zrc(kle, 2); + vrc = new zrc("LEFT_RIGHT_CONSTRAINT_LOCKING", 3); + urc = new zrc("LEFT_RIGHT_CONNECTION_LOCKING", 4); + rrc = new zrc(Vne, 5); + } + function qRc(a, b, c) { + var d, e, f, g, h, i, j; + h = c.a / 2; + f = c.b / 2; + d = Math.abs(b.a - a.a); + e = Math.abs(b.b - a.b); + i = 1; + j = 1; + d > h && (i = h / d); + e > f && (j = f / e); + g = Math.min(i, j); + a.a += g * (b.a - a.a); + a.b += g * (b.b - a.b); + } + function sZc(a, b, c, d, e) { + var f, g; + g = false; + f = BD(Ikb(c.b, 0), 33); + while (yZc(a, b, f, d, e)) { + g = true; + NZc(c, f); + if (c.b.c.length == 0) { + break; + } + f = BD(Ikb(c.b, 0), 33); + } + c.b.c.length == 0 && v$c(c.j, c); + g && a$c(b.q); + return g; + } + function t6c(a, b) { + i6c(); + var c, d, e, f; + if (b.b < 2) { + return false; + } + f = Jsb(b, 0); + c = BD(Xsb(f), 8); + d = c; + while (f.b != f.d.c) { + e = BD(Xsb(f), 8); + if (s6c(a, d, e)) { + return true; + } + d = e; + } + if (s6c(a, d, c)) { + return true; + } + return false; + } + function ckd(a, b, c, d) { + var e, f; + if (c == 0) { + return !a.o && (a.o = new dId((Thd(), Qhd), S2, a, 0)), bId(a.o, b, d); + } + return ( + (f = BD(XKd(((e = BD(Ajd(a, 16), 26)), !e ? a.zh() : e), c), 66)), + f.Nj().Rj(a, yjd(a), c - aLd(a.zh()), b, d) + ); + } + function bod(a, b) { + var c; + if (b != a.sb) { + c = null; + !!a.sb && (c = BD(a.sb, 49).ih(a, 1, i5, c)); + !!b && (c = BD(b, 49).gh(a, 1, i5, c)); + c = Jnd(a, b, c); + !!c && c.Fi(); + } else + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new nSd(a, 1, 4, b, b)); + } + function yqd(a, b) { + var c, d, e, f; + if (b) { + e = Xpd(b, "x"); + c = new zrd(a); + hmd(c.a, (uCb(e), e)); + f = Xpd(b, "y"); + d = new Ard(a); + imd(d.a, (uCb(f), f)); + } else { + throw vbb(new cqd("All edge sections need an end point.")); + } + } + function wqd(a, b) { + var c, d, e, f; + if (b) { + e = Xpd(b, "x"); + c = new wrd(a); + omd(c.a, (uCb(e), e)); + f = Xpd(b, "y"); + d = new xrd(a); + pmd(d.a, (uCb(f), f)); + } else { + throw vbb(new cqd("All edge sections need a start point.")); + } + } + function pyb(a, b) { + var c, d, e, f, g, h, i; + for (d = syb(a), f = 0, h = d.length; f < h; ++f) { + yyb(b); + } + i = !lyb && a.e ? (lyb ? null : a.d) : null; + while (i) { + for (c = syb(i), e = 0, g = c.length; e < g; ++e) { + yyb(b); + } + i = !lyb && i.e ? (lyb ? null : i.d) : null; + } + } + function j0b() { + j0b = ccb; + h0b = new k0b("NORMAL", 0); + g0b = new k0b("LONG_EDGE", 1); + e0b = new k0b("EXTERNAL_PORT", 2); + i0b = new k0b("NORTH_SOUTH_PORT", 3); + f0b = new k0b("LABEL", 4); + d0b = new k0b("BREAKING_POINT", 5); + } + function g4b(a) { + var b, c, d, e; + b = false; + if (wNb(a, (wtc(), Csc))) { + c = BD(vNb(a, Csc), 83); + for (e = new olb(a.j); e.a < e.c.c.length; ) { + d = BD(mlb(e), 11); + if (e4b(d)) { + if (!b) { + d4b(Q_b(a)); + b = true; + } + h4b(BD(c.xc(d), 306)); + } + } + } + } + function qec(a, b, c) { + var d; + Odd(c, "Self-Loop routing", 1); + d = rec(b); + RD(vNb(b, (g6c(), f6c))); + MAb( + NAb( + JAb( + JAb(LAb(new YAb(null, new Kub(b.b, 16)), new uec()), new wec()), + new yec() + ), + new Aec() + ), + new Cec(a, d) + ); + Qdd(c); + } + function gsd(a) { + var b, c, d, e, f, g, h, i, j; + j = hsd(a); + c = a.e; + f = c != null; + f && Upd(j, eue, a.e); + h = a.k; + g = !!h; + g && Upd(j, "type", Zr(a.k)); + d = Fhe(a.j); + e = !d; + if (e) { + i = new wB(); + cC(j, Mte, i); + b = new ssd(i); + reb(a.j, b); + } + return j; + } + function Jv(a) { + var b, c, d, e; + e = Kfb((Xj(a.gc(), "size"), new Vfb()), 123); + d = true; + for (c = Wm(a).Kc(); c.Ob(); ) { + b = BD(c.Pb(), 42); + d || ((e.a += She), e); + d = false; + Pfb(Kfb(Pfb(e, b.cd()), 61), b.dd()); + } + return ((e.a += "}"), e).a; + } + function kD(a, b) { + var c, d, e; + b &= 63; + if (b < 22) { + c = a.l << b; + d = (a.m << b) | (a.l >> (22 - b)); + e = (a.h << b) | (a.m >> (22 - b)); + } else if (b < 44) { + c = 0; + d = a.l << (b - 22); + e = (a.m << (b - 22)) | (a.l >> (44 - b)); + } else { + c = 0; + d = 0; + e = a.l << (b - 44); + } + return TC(c & Eje, d & Eje, e & Fje); + } + function Hcb(a) { + Gcb == null && + (Gcb = new RegExp( + "^\\s*[+-]?(NaN|Infinity|((\\d+\\.?\\d*)|(\\.\\d+))([eE][+-]?\\d+)?[dDfF]?)\\s*$" + )); + if (!Gcb.test(a)) { + throw vbb(new Oeb(Oje + a + '"')); + } + return parseFloat(a); + } + function IFb(a) { + var b, c, d, e; + b = new Rkb(); + c = KC(sbb, dle, 25, a.a.c.length, 16, 1); + Glb(c, c.length); + for (e = new olb(a.a); e.a < e.c.c.length; ) { + d = BD(mlb(e), 121); + if (!c[d.d]) { + b.c[b.c.length] = d; + HFb(a, d, c); + } + } + return b; + } + function Nmc(a, b) { + var c, d, e, f; + f = b.b.j; + a.a = KC(WD, oje, 25, f.c.length, 15, 1); + e = 0; + for (d = 0; d < f.c.length; d++) { + c = (tCb(d, f.c.length), BD(f.c[d], 11)); + c.e.c.length == 0 && c.g.c.length == 0 ? (e += 1) : (e += 3); + a.a[d] = e; + } + } + function Sqc() { + Sqc = ccb; + Nqc = new Uqc("ALWAYS_UP", 0); + Mqc = new Uqc("ALWAYS_DOWN", 1); + Pqc = new Uqc("DIRECTION_UP", 2); + Oqc = new Uqc("DIRECTION_DOWN", 3); + Rqc = new Uqc("SMART_UP", 4); + Qqc = new Uqc("SMART_DOWN", 5); + } + function k6c(a, b) { + if (a < 0 || b < 0) { + throw vbb(new Wdb("k and n must be positive")); + } else if (b > a) { + throw vbb(new Wdb("k must be smaller than n")); + } else + return b == 0 || b == a + ? 1 + : a == 0 + ? 0 + : q6c(a) / (q6c(b) * q6c(a - b)); + } + function jfd(a, b) { + var c, d, e, f; + c = new _ud(a); + while ( + c.g == null && !c.c + ? Uud(c) + : c.g == null || (c.i != 0 && BD(c.g[c.i - 1], 47).Ob()) + ) { + f = BD(Vud(c), 56); + if (JD(f, 160)) { + d = BD(f, 160); + for (e = 0; e < b.length; e++) { + b[e].og(d); + } + } + } + } + function fld(a) { + var b; + if ((a.Db & 64) != 0) return Mkd(a); + b = new Jfb(Mkd(a)); + b.a += " (height: "; + Bfb(b, a.f); + b.a += ", width: "; + Bfb(b, a.g); + b.a += ", x: "; + Bfb(b, a.i); + b.a += ", y: "; + Bfb(b, a.j); + b.a += ")"; + return b.a; + } + function un(a) { + var b, c, d, e, f, g, h; + b = new $rb(); + for (d = a, e = 0, f = d.length; e < f; ++e) { + c = d[e]; + g = Qb(c.cd()); + h = Xrb(b, g, Qb(c.dd())); + if (h != null) { + throw vbb(new Wdb("duplicate key: " + g)); + } + } + this.b = (mmb(), new iob(b)); + } + function Rlb(a) { + var b, c, d, e, f; + if (a == null) { + return Xhe; + } + f = new xwb(She, "[", "]"); + for (c = a, d = 0, e = c.length; d < e; ++d) { + b = c[d]; + uwb(f, String.fromCharCode(b)); + } + return !f.a ? f.c : f.e.length == 0 ? f.a.a : f.a.a + ("" + f.e); + } + function SRb() { + SRb = ccb; + MRb = (XRb(), WRb); + LRb = new Nsd(mme, MRb); + meb(1); + KRb = new Nsd(nme, meb(300)); + meb(0); + PRb = new Nsd(ome, meb(0)); + new Tfd(); + QRb = new Nsd(pme, qme); + new Tfd(); + NRb = new Nsd(rme, 5); + RRb = WRb; + ORb = VRb; + } + function NUb(a, b) { + var c, d, e, f, g; + e = b == 1 ? KUb : JUb; + for (d = e.a.ec().Kc(); d.Ob(); ) { + c = BD(d.Pb(), 103); + for (g = BD(Qc(a.f.c, c), 21).Kc(); g.Ob(); ) { + f = BD(g.Pb(), 46); + Ekb(a.b.b, BD(f.b, 81)); + Ekb(a.b.a, BD(f.b, 81).d); + } + } + } + function kVd(a, b) { + var c; + if (b != null && !a.c.Yj().wj(b)) { + c = JD(b, 56) ? BD(b, 56).Tg().zb : hdb(rb(b)); + throw vbb( + new Cdb( + ite + + a.c.ne() + + "'s type '" + + a.c.Yj().ne() + + "' does not permit a value of type '" + + c + + "'" + ) + ); + } + } + function cZb(a, b, c) { + var d, e; + e = new Bib(a.b, 0); + while (e.b < e.d.gc()) { + d = (sCb(e.b < e.d.gc()), BD(e.d.Xb((e.c = e.b++)), 70)); + if (PD(vNb(d, (wtc(), btc))) !== PD(b)) { + continue; + } + Y$b(d.n, Q_b(a.c.i), c); + uib(e); + Ekb(b.b, d); + } + } + function vdc(a, b) { + if (b.a) { + switch (BD(vNb(b.b, (wtc(), dtc)), 98).g) { + case 0: + case 1: + llc(b); + case 2: + MAb(new YAb(null, new Kub(b.d, 16)), new Idc()); + wkc(a.a, b); + } + } else { + MAb(new YAb(null, new Kub(b.d, 16)), new Idc()); + } + } + function Znc(a) { + var b, c; + c = Math.sqrt( + (a.k == null && (a.k = Soc(a, new bpc())), + Edb(a.k) / (a.b * (a.g == null && (a.g = Poc(a, new _oc())), Edb(a.g)))) + ); + b = Tbb(Cbb(Math.round(c))); + b = Math.min(b, a.f); + return b; + } + function H0b() { + z0b(); + n_b.call(this); + this.j = (Ucd(), Scd); + this.a = new d7c(); + new L_b(); + this.f = (Xj(2, Jie), new Skb(2)); + this.e = (Xj(4, Jie), new Skb(4)); + this.g = (Xj(4, Jie), new Skb(4)); + this.b = new Z0b(this.e, this.g); + } + function j3b(a, b) { + var c, d; + if (Ccb(DD(vNb(b, (wtc(), ltc))))) { + return false; + } + d = b.c.i; + if (a == (Ctc(), xtc)) { + if (d.k == (j0b(), f0b)) { + return false; + } + } + c = BD(vNb(d, (Nyc(), mxc)), 163); + if (c == ytc) { + return false; + } + return true; + } + function k3b(a, b) { + var c, d; + if (Ccb(DD(vNb(b, (wtc(), ltc))))) { + return false; + } + d = b.d.i; + if (a == (Ctc(), ztc)) { + if (d.k == (j0b(), f0b)) { + return false; + } + } + c = BD(vNb(d, (Nyc(), mxc)), 163); + if (c == Atc) { + return false; + } + return true; + } + function L3b(a, b) { + var c, d, e, f, g, h, i; + g = a.d; + i = a.o; + h = new J6c(-g.b, -g.d, g.b + i.a + g.c, g.d + i.b + g.a); + for (d = b, e = 0, f = d.length; e < f; ++e) { + c = d[e]; + !!c && H6c(h, c.i); + } + g.b = -h.c; + g.d = -h.d; + g.c = h.b - g.b - i.a; + g.a = h.a - g.d - i.b; + } + function N_c() { + N_c = ccb; + I_c = new O_c("CENTER_DISTANCE", 0); + J_c = new O_c("CIRCLE_UNDERLAP", 1); + M_c = new O_c("RECTANGLE_UNDERLAP", 2); + K_c = new O_c("INVERTED_OVERLAP", 3); + L_c = new O_c("MINIMUM_ROOT_DISTANCE", 4); + } + function jde(a) { + hde(); + var b, c, d, e, f; + if (a == null) return null; + d = a.length; + e = d * 2; + b = KC(TD, $ie, 25, e, 15, 1); + for (c = 0; c < d; c++) { + f = a[c]; + f < 0 && (f += 256); + b[c * 2] = gde[f >> 4]; + b[c * 2 + 1] = gde[f & 15]; + } + return zfb(b, 0, b.length); + } + function fn(a) { + Vm(); + var b, c, d; + d = a.c.length; + switch (d) { + case 0: + return Um; + case 1: + b = BD(qr(new olb(a)), 42); + return ln(b.cd(), b.dd()); + default: + c = BD(Qkb(a, KC(CK, zie, 42, a.c.length, 0, 1)), 165); + return new wx(c); + } + } + function ITb(a) { + var b, c, d, e, f, g; + b = new jkb(); + c = new jkb(); + Wjb(b, a); + Wjb(c, a); + while (c.b != c.c) { + e = BD(fkb(c), 37); + for (g = new olb(e.a); g.a < g.c.c.length; ) { + f = BD(mlb(g), 10); + if (f.e) { + d = f.e; + Wjb(b, d); + Wjb(c, d); + } + } + } + return b; + } + function Y_b(a, b) { + switch (b.g) { + case 1: + return Nq(a.j, (z0b(), v0b)); + case 2: + return Nq(a.j, (z0b(), t0b)); + case 3: + return Nq(a.j, (z0b(), x0b)); + case 4: + return Nq(a.j, (z0b(), y0b)); + default: + return mmb(), mmb(), jmb; + } + } + function tic(a, b) { + var c, d, e; + c = uic(b, a.e); + d = BD(Ohb(a.g.f, c), 19).a; + e = a.a.c.length - 1; + if (a.a.c.length != 0 && BD(Ikb(a.a, e), 287).c == d) { + ++BD(Ikb(a.a, e), 287).a; + ++BD(Ikb(a.a, e), 287).b; + } else { + Ekb(a.a, new Dic(d)); + } + } + function VGc(a, b, c) { + var d, e; + d = UGc(a, b, c); + if (d != 0) { + return d; + } + if (wNb(b, (wtc(), Zsc)) && wNb(c, Zsc)) { + e = beb(BD(vNb(b, Zsc), 19).a, BD(vNb(c, Zsc), 19).a); + e < 0 ? WGc(a, b, c) : e > 0 && WGc(a, c, b); + return e; + } + return TGc(a, b, c); + } + function MSc(a, b, c) { + var d, e, f, g; + if (b.b != 0) { + d = new Psb(); + for (g = Jsb(b, 0); g.b != g.d.c; ) { + f = BD(Xsb(g), 86); + ye(d, URc(f)); + e = f.e; + e.a = BD(vNb(f, (mTc(), kTc)), 19).a; + e.b = BD(vNb(f, lTc), 19).a; + } + MSc(a, d, Udd(c, (d.b / a.a) | 0)); + } + } + function JZc(a, b) { + var c, d, e, f, g; + if (a.e <= b) { + return a.g; + } + if (LZc(a, a.g, b)) { + return a.g; + } + f = a.r; + d = a.g; + g = a.r; + e = (f - d) / 2 + d; + while (d + 1 < f) { + c = MZc(a, e, false); + if (c.b <= e && c.a <= b) { + g = e; + f = e; + } else { + d = e; + } + e = (f - d) / 2 + d; + } + return g; + } + function t2c(a, b, c) { + var d; + d = o2c(a, b, true); + Odd(c, "Recursive Graph Layout", d); + jfd(b, OC(GC(g2, 1), Uhe, 527, 0, [new q3c()])); + ikd(b, (Y9c(), F9c)) || jfd(b, OC(GC(g2, 1), Uhe, 527, 0, [new U3c()])); + u2c(a, b, null, c); + Qdd(c); + } + function Qdd(a) { + var b; + if (a.p == null) { + throw vbb(new Zdb("The task has not begun yet.")); + } + if (!a.b) { + if (a.k) { + b = (Zfb(), Ibb(Cbb(Date.now()), _ie)); + a.q = Sbb(Qbb(b, a.o)) * 1.0e-9; + } + a.c < a.r && Rdd(a, a.r - a.c); + a.b = true; + } + } + function ofd(a) { + var b, c, d; + d = new s7c(); + Dsb(d, new f7c(a.j, a.k)); + for ( + c = new Fyd((!a.a && (a.a = new xMd(y2, a, 5)), a.a)); + c.e != c.i.gc(); + + ) { + b = BD(Dyd(c), 469); + Dsb(d, new f7c(b.a, b.b)); + } + Dsb(d, new f7c(a.b, a.c)); + return d; + } + function qqd(a, b, c, d, e) { + var f, g, h, i, j, k; + if (e) { + i = e.a.length; + f = new Yge(i); + for (k = (f.b - f.a) * f.c < 0 ? (Xge(), Wge) : new she(f); k.Ob(); ) { + j = BD(k.Pb(), 19); + h = Zpd(e, j.a); + g = new prd(a, b, c, d); + rqd(g.a, g.b, g.c, g.d, h); + } + } + } + function Ax(b, c) { + var d; + if (PD(b) === PD(c)) { + return true; + } + if (JD(c, 21)) { + d = BD(c, 21); + try { + return b.gc() == d.gc() && b.Ic(d); + } catch (a) { + a = ubb(a); + if (JD(a, 173) || JD(a, 205)) { + return false; + } else throw vbb(a); + } + } + return false; + } + function UHb(a, b) { + var c; + Ekb(a.d, b); + c = b.rf(); + if (a.c) { + a.e.a = Math.max(a.e.a, c.a); + a.e.b += c.b; + a.d.c.length > 1 && (a.e.b += a.a); + } else { + a.e.a += c.a; + a.e.b = Math.max(a.e.b, c.b); + a.d.c.length > 1 && (a.e.a += a.a); + } + } + function cmc(a) { + var b, c, d, e; + e = a.i; + b = e.b; + d = e.j; + c = e.g; + switch (e.a.g) { + case 0: + c.a = (a.g.b.o.a - d.a) / 2; + break; + case 1: + c.a = b.d.n.a + b.d.a.a; + break; + case 2: + c.a = b.d.n.a + b.d.a.a - d.a; + break; + case 3: + c.b = b.d.n.b + b.d.a.b; + } + } + function Q6c(a, b, c, d, e) { + if (d < b || e < c) { + throw vbb( + new Wdb( + "The highx must be bigger then lowx and the highy must be bigger then lowy" + ) + ); + } + a.a < b ? (a.a = b) : a.a > d && (a.a = d); + a.b < c ? (a.b = c) : a.b > e && (a.b = e); + return a; + } + function lsd(a) { + if (JD(a, 149)) { + return esd(BD(a, 149)); + } else if (JD(a, 229)) { + return fsd(BD(a, 229)); + } else if (JD(a, 23)) { + return gsd(BD(a, 23)); + } else { + throw vbb(new Wdb(Xte + Fe(new amb(OC(GC(SI, 1), Uhe, 1, 5, [a]))))); + } + } + function mhb(a, b, c, d, e) { + var f, g, h; + f = true; + for (g = 0; g < d; g++) { + f = f & (c[g] == 0); + } + if (e == 0) { + $fb(c, d, a, 0, b); + g = b; + } else { + h = 32 - e; + f = f & (c[g] << h == 0); + for (g = 0; g < b - 1; g++) { + a[g] = (c[g + d] >>> e) | (c[g + d + 1] << h); + } + a[g] = c[g + d] >>> e; + ++g; + } + return f; + } + function zMc(a, b, c, d) { + var e, f, g; + if (b.k == (j0b(), g0b)) { + for (f = new Sr(ur(R_b(b).a.Kc(), new Sq())); Qr(f); ) { + e = BD(Rr(f), 17); + g = e.c.i.k; + if (g == g0b && a.c.a[e.c.i.c.p] == d && a.c.a[b.c.p] == c) { + return true; + } + } + } + return false; + } + function mD(a, b) { + var c, d, e, f; + b &= 63; + c = a.h & Fje; + if (b < 22) { + f = c >>> b; + e = (a.m >> b) | (c << (22 - b)); + d = (a.l >> b) | (a.m << (22 - b)); + } else if (b < 44) { + f = 0; + e = c >>> (b - 22); + d = (a.m >> (b - 22)) | (a.h << (44 - b)); + } else { + f = 0; + e = 0; + d = c >>> (b - 44); + } + return TC(d & Eje, e & Eje, f & Fje); + } + function Iic(a, b, c, d) { + var e; + this.b = d; + this.e = a == (rGc(), pGc); + e = b[c]; + this.d = IC(sbb, [nie, dle], [177, 25], 16, [e.length, e.length], 2); + this.a = IC(WD, [nie, oje], [48, 25], 15, [e.length, e.length], 2); + this.c = new sic(b, c); + } + function ljc(a) { + var b, c, d; + a.k = new Ki( + (Ucd(), OC(GC(F1, 1), bne, 61, 0, [Scd, Acd, zcd, Rcd, Tcd])).length, + a.j.c.length + ); + for (d = new olb(a.j); d.a < d.c.c.length; ) { + c = BD(mlb(d), 113); + b = c.d.j; + Rc(a.k, b, c); + } + a.e = Zjc(Ec(a.k)); + } + function UQc(a, b) { + var c, d, e; + Qqb(a.d, b); + c = new _Qc(); + Rhb(a.c, b, c); + c.f = VQc(b.c); + c.a = VQc(b.d); + c.d = (hQc(), (e = b.c.i.k), e == (j0b(), h0b) || e == d0b); + c.e = ((d = b.d.i.k), d == h0b || d == d0b); + c.b = b.c.j == (Ucd(), Tcd); + c.c = b.d.j == zcd; + } + function BGb(a) { + var b, c, d, e, f; + f = Ohe; + e = Ohe; + for (d = new olb(LFb(a)); d.a < d.c.c.length; ) { + c = BD(mlb(d), 213); + b = c.e.e - c.d.e; + c.e == a && b < e ? (e = b) : b < f && (f = b); + } + e == Ohe && (e = -1); + f == Ohe && (f = -1); + return new vgd(meb(e), meb(f)); + } + function zQb(a, b) { + var c, d, e; + e = dme; + d = (ROb(), OOb); + e = Math.abs(a.b); + c = Math.abs(b.f - a.b); + if (c < e) { + e = c; + d = POb; + } + c = Math.abs(a.a); + if (c < e) { + e = c; + d = QOb; + } + c = Math.abs(b.g - a.a); + if (c < e) { + e = c; + d = NOb; + } + return d; + } + function L9b(a, b) { + var c, d, e, f; + c = b.a.o.a; + f = new Jib(Q_b(b.a).b, b.c, b.f + 1); + for (e = new vib(f); e.b < e.d.gc(); ) { + d = (sCb(e.b < e.d.gc()), BD(e.d.Xb((e.c = e.b++)), 29)); + if (d.c.a >= c) { + K9b(a, b, d.p); + return true; + } + } + return false; + } + function Iod(a) { + var b; + if ((a.Db & 64) != 0) return fld(a); + b = new Wfb(dte); + !a.a || Qfb(Qfb(((b.a += ' "'), b), a.a), '"'); + Qfb( + Lfb( + Qfb( + Lfb( + Qfb(Lfb(Qfb(Lfb(((b.a += " ("), b), a.i), ","), a.j), " | "), + a.g + ), + "," + ), + a.f + ), + ")" + ); + return b.a; + } + function Z2d(a, b, c) { + var d, e, f, g, h; + h = S6d(a.e.Tg(), b); + e = BD(a.g, 119); + d = 0; + for (g = 0; g < a.i; ++g) { + f = e[g]; + if (h.rl(f.ak())) { + if (d == c) { + Xxd(a, g); + return Q6d(), BD(b, 66).Oj() ? f : f.dd(); + } + ++d; + } + } + throw vbb(new qcb(gve + c + mue + d)); + } + function sde(a) { + var b, c, d; + b = a.c; + if (b == 2 || b == 7 || b == 1) { + return wfe(), wfe(), ffe; + } else { + d = qde(a); + c = null; + while ((b = a.c) != 2 && b != 7 && b != 1) { + if (!c) { + c = (wfe(), wfe(), ++vfe, new Lge(1)); + Kge(c, d); + d = c; + } + Kge(c, qde(a)); + } + return d; + } + } + function Kb(a, b, c) { + if (a < 0 || a > c) { + return Jb(a, c, "start index"); + } + if (b < 0 || b > c) { + return Jb(b, c, "end index"); + } + return hc( + "end index (%s) must not be less than start index (%s)", + OC(GC(SI, 1), Uhe, 1, 5, [meb(b), meb(a)]) + ); + } + function Pz(b, c) { + var d, e, f, g; + for (e = 0, f = b.length; e < f; e++) { + g = b[e]; + try { + g[1] ? g[0].jm() && (c = Oz(c, g)) : g[0].jm(); + } catch (a) { + a = ubb(a); + if (JD(a, 78)) { + d = a; + Az(); + Gz(JD(d, 477) ? BD(d, 477).ae() : d); + } else throw vbb(a); + } + } + return c; + } + function K9b(a, b, c) { + var d, e, f; + c != b.c + b.b.gc() && Z9b(b.a, fac(b, c - b.c)); + f = b.a.c.p; + a.a[f] = Math.max(a.a[f], b.a.o.a); + for (e = BD(vNb(b.a, (wtc(), ktc)), 15).Kc(); e.Ob(); ) { + d = BD(e.Pb(), 70); + yNb(d, H9b, (Bcb(), true)); + } + } + function Wec(a, b) { + var c, d, e; + e = Vec(b); + yNb(b, (wtc(), Xsc), e); + if (e) { + d = Ohe; + !!irb(a.f, e) && (d = BD(Wd(irb(a.f, e)), 19).a); + c = BD(Ikb(b.g, 0), 17); + Ccb(DD(vNb(c, ltc))) || + Rhb(a, e, meb(Math.min(BD(vNb(c, Zsc), 19).a, d))); + } + } + function iCc(a, b, c) { + var d, e, f, g, h; + b.p = -1; + for (h = W_b(b, (KAc(), IAc)).Kc(); h.Ob(); ) { + g = BD(h.Pb(), 11); + for (e = new olb(g.g); e.a < e.c.c.length; ) { + d = BD(mlb(e), 17); + f = d.d.i; + b != f && (f.p < 0 ? c.Fc(d) : f.p > 0 && iCc(a, f, c)); + } + } + b.p = 0; + } + function p5c(a) { + var b; + this.c = new Psb(); + this.f = a.e; + this.e = a.d; + this.i = a.g; + this.d = a.c; + this.b = a.b; + this.k = a.j; + this.a = a.a; + !a.i + ? (this.j = + ((b = BD(gdb(e1), 9)), new xqb(b, BD(_Bb(b, b.length), 9), 0))) + : (this.j = a.i); + this.g = a.f; + } + function Wb(a) { + var b, c, d, e; + b = Kfb(Qfb(new Wfb("Predicates."), "and"), 40); + c = true; + for (e = new vib(a); e.b < e.d.gc(); ) { + d = (sCb(e.b < e.d.gc()), e.d.Xb((e.c = e.b++))); + c || ((b.a += ","), b); + b.a += "" + d; + c = false; + } + return ((b.a += ")"), b).a; + } + function Rcc(a, b, c) { + var d, e, f; + if (c <= b + 2) { + return; + } + e = ((c - b) / 2) | 0; + for (d = 0; d < e; ++d) { + f = (tCb(b + d, a.c.length), BD(a.c[b + d], 11)); + Nkb(a, b + d, (tCb(c - d - 1, a.c.length), BD(a.c[c - d - 1], 11))); + tCb(c - d - 1, a.c.length); + a.c[c - d - 1] = f; + } + } + function hjc(a, b, c) { + var d, e, f, g, h, i, j, k; + f = a.d.p; + h = f.e; + i = f.r; + a.g = new dIc(i); + g = a.d.o.c.p; + d = g > 0 ? h[g - 1] : KC(OQ, kne, 10, 0, 0, 1); + e = h[g]; + j = g < h.length - 1 ? h[g + 1] : KC(OQ, kne, 10, 0, 0, 1); + k = b == c - 1; + k ? RHc(a.g, e, j) : RHc(a.g, d, e); + } + function pjc(a) { + var b; + this.j = new Rkb(); + this.f = new Tqb(); + this.b = ((b = BD(gdb(F1), 9)), new xqb(b, BD(_Bb(b, b.length), 9), 0)); + this.d = KC( + WD, + oje, + 25, + (Ucd(), OC(GC(F1, 1), bne, 61, 0, [Scd, Acd, zcd, Rcd, Tcd])).length, + 15, + 1 + ); + this.g = a; + } + function QVc(a, b) { + var c, d, e; + if (b.c.length != 0) { + c = RVc(a, b); + e = false; + while (!c) { + AVc(a, b, true); + e = true; + c = RVc(a, b); + } + e && AVc(a, b, false); + d = dVc(b); + !!a.b && a.b.lg(d); + a.a = PVc(a, (tCb(0, b.c.length), BD(b.c[0], 33))); + QVc(a, d); + } + } + function Cid(a, b) { + var c, d, e; + d = XKd(a.Tg(), b); + c = b - a.Ah(); + if (c < 0) { + if (!d) { + throw vbb(new Wdb(mte + b + nte)); + } else if (d.Ij()) { + e = a.Yg(d); + e >= 0 ? a.Bh(e) : vid(a, d); + } else { + throw vbb(new Wdb(ite + d.ne() + jte)); + } + } else { + eid(a, c, d); + } + } + function aqd(a) { + var b, c; + c = null; + b = false; + if (JD(a, 204)) { + b = true; + c = BD(a, 204).a; + } + if (!b) { + if (JD(a, 258)) { + b = true; + c = "" + BD(a, 258).a; + } + } + if (!b) { + if (JD(a, 483)) { + b = true; + c = "" + BD(a, 483).a; + } + } + if (!b) { + throw vbb(new vcb(Ute)); + } + return c; + } + function ORd(a, b) { + var c, d; + if (a.f) { + while (b.Ob()) { + c = BD(b.Pb(), 72); + d = c.ak(); + if ( + JD(d, 99) && + (BD(d, 18).Bb & ote) != 0 && + (!a.e || d.Gj() != x2 || d.aj() != 0) && + c.dd() != null + ) { + b.Ub(); + return true; + } + } + return false; + } else { + return b.Ob(); + } + } + function QRd(a, b) { + var c, d; + if (a.f) { + while (b.Sb()) { + c = BD(b.Ub(), 72); + d = c.ak(); + if ( + JD(d, 99) && + (BD(d, 18).Bb & ote) != 0 && + (!a.e || d.Gj() != x2 || d.aj() != 0) && + c.dd() != null + ) { + b.Pb(); + return true; + } + } + return false; + } else { + return b.Sb(); + } + } + function I2d(a, b, c) { + var d, e, f, g, h, i; + i = S6d(a.e.Tg(), b); + d = 0; + h = a.i; + e = BD(a.g, 119); + for (g = 0; g < a.i; ++g) { + f = e[g]; + if (i.rl(f.ak())) { + if (c == d) { + return g; + } + ++d; + h = g + 1; + } + } + if (c == d) { + return h; + } else { + throw vbb(new qcb(gve + c + mue + d)); + } + } + function d9b(a, b) { + var c, d, e, f; + if (a.f.c.length == 0) { + return null; + } else { + f = new I6c(); + for (d = new olb(a.f); d.a < d.c.c.length; ) { + c = BD(mlb(d), 70); + e = c.o; + f.b = Math.max(f.b, e.a); + f.a += e.b; + } + f.a += (a.f.c.length - 1) * b; + return f; + } + } + function QJc(a, b, c) { + var d, e, f; + for (e = new Sr(ur(O_b(c).a.Kc(), new Sq())); Qr(e); ) { + d = BD(Rr(e), 17); + if (!(!OZb(d) && !(!OZb(d) && d.c.i.c == d.d.i.c))) { + continue; + } + f = IJc(a, d, c, new vKc()); + f.c.length > 1 && ((b.c[b.c.length] = f), true); + } + } + function TJc(a) { + var b, c, d, e; + c = new Psb(); + ye(c, a.o); + d = new twb(); + while (c.b != 0) { + b = BD(c.b == 0 ? null : (sCb(c.b != 0), Nsb(c, c.a.a)), 508); + e = KJc(a, b, true); + e && Ekb(d.a, b); + } + while (d.a.c.length != 0) { + b = BD(rwb(d), 508); + KJc(a, b, false); + } + } + function _5c() { + _5c = ccb; + $5c = new a6c(ole, 0); + T5c = new a6c("BOOLEAN", 1); + X5c = new a6c("INT", 2); + Z5c = new a6c("STRING", 3); + U5c = new a6c("DOUBLE", 4); + V5c = new a6c("ENUM", 5); + W5c = new a6c("ENUMSET", 6); + Y5c = new a6c("OBJECT", 7); + } + function H6c(a, b) { + var c, d, e, f, g; + d = Math.min(a.c, b.c); + f = Math.min(a.d, b.d); + e = Math.max(a.c + a.b, b.c + b.b); + g = Math.max(a.d + a.a, b.d + b.a); + if (e < d) { + c = d; + d = e; + e = c; + } + if (g < f) { + c = f; + f = g; + g = c; + } + G6c(a, d, f, e - d, g - f); + } + function O6d() { + O6d = ccb; + L6d = OC(GC(ZI, 1), nie, 2, 6, [swe, twe, uwe, vwe, wwe, xwe, eue]); + K6d = OC(GC(ZI, 1), nie, 2, 6, [swe, "empty", twe, Qve, "elementOnly"]); + N6d = OC(GC(ZI, 1), nie, 2, 6, [swe, "preserve", "replace", ywe]); + M6d = new y1d(); + } + function Y$b(a, b, c) { + var d, e, f; + if (b == c) { + return; + } + d = b; + do { + P6c(a, d.c); + e = d.e; + if (e) { + f = d.d; + O6c(a, f.b, f.d); + P6c(a, e.n); + d = Q_b(e); + } + } while (e); + d = c; + do { + c7c(a, d.c); + e = d.e; + if (e) { + f = d.d; + b7c(a, f.b, f.d); + c7c(a, e.n); + d = Q_b(e); + } + } while (e); + } + function qic(a, b, c, d) { + var e, f, g, h, i; + if (d.f.c + d.g.c == 0) { + for (g = a.a[a.c], h = 0, i = g.length; h < i; ++h) { + f = g[h]; + Rhb(d, f, new zic(a, f, c)); + } + } + e = BD(Wd(irb(d.f, b)), 663); + e.b = 0; + e.c = e.f; + e.c == 0 || Cic(BD(Ikb(e.a, e.b), 287)); + return e; + } + function Apc() { + Apc = ccb; + wpc = new Bpc("MEDIAN_LAYER", 0); + ypc = new Bpc("TAIL_LAYER", 1); + vpc = new Bpc("HEAD_LAYER", 2); + xpc = new Bpc("SPACE_EFFICIENT_LAYER", 3); + zpc = new Bpc("WIDEST_LAYER", 4); + upc = new Bpc("CENTER_LAYER", 5); + } + function rJb(a) { + switch (a.g) { + case 0: + case 1: + case 2: + return Ucd(), Acd; + case 3: + case 4: + case 5: + return Ucd(), Rcd; + case 6: + case 7: + case 8: + return Ucd(), Tcd; + case 9: + case 10: + case 11: + return Ucd(), zcd; + default: + return Ucd(), Scd; + } + } + function sKc(a, b) { + var c; + if (a.c.length == 0) { + return false; + } + c = Lzc((tCb(0, a.c.length), BD(a.c[0], 17)).c.i); + FJc(); + if (c == (Izc(), Fzc) || c == Ezc) { + return true; + } + return FAb(NAb(new YAb(null, new Kub(a, 16)), new AKc()), new CKc(b)); + } + function cRc(a, b, c) { + var d, e, f; + if (!a.b[b.g]) { + a.b[b.g] = true; + d = c; + !d && (d = new SRc()); + Dsb(d.b, b); + for (f = a.a[b.g].Kc(); f.Ob(); ) { + e = BD(f.Pb(), 188); + e.b != b && cRc(a, e.b, d); + e.c != b && cRc(a, e.c, d); + Dsb(d.a, e); + } + return d; + } + return null; + } + function qSc() { + qSc = ccb; + pSc = new rSc("ROOT_PROC", 0); + lSc = new rSc("FAN_PROC", 1); + nSc = new rSc("NEIGHBORS_PROC", 2); + mSc = new rSc("LEVEL_HEIGHT", 3); + oSc = new rSc("NODE_POSITION_PROC", 4); + kSc = new rSc("DETREEIFYING_PROC", 5); + } + function kqd(a, b) { + if (JD(b, 239)) { + return eqd(a, BD(b, 33)); + } else if (JD(b, 186)) { + return fqd(a, BD(b, 118)); + } else if (JD(b, 439)) { + return dqd(a, BD(b, 202)); + } else { + throw vbb(new Wdb(Xte + Fe(new amb(OC(GC(SI, 1), Uhe, 1, 5, [b]))))); + } + } + function xu(a, b, c) { + var d, e; + this.f = a; + d = BD(Ohb(a.b, b), 283); + e = !d ? 0 : d.a; + Sb(c, e); + if (c >= ((e / 2) | 0)) { + this.e = !d ? null : d.c; + this.d = e; + while (c++ < e) { + vu(this); + } + } else { + this.c = !d ? null : d.b; + while (c-- > 0) { + uu(this); + } + } + this.b = b; + this.a = null; + } + function rEb(a, b) { + var c, d; + b.a + ? sEb(a, b) + : ((c = BD(Exb(a.b, b.b), 57)), + !!c && c == a.a[b.b.f] && !!c.a && c.a != b.b.a && c.c.Fc(b.b), + (d = BD(Dxb(a.b, b.b), 57)), + !!d && a.a[d.f] == b.b && !!d.a && d.a != b.b.a && b.b.c.Fc(d), + Fxb(a.b, b.b), + undefined); + } + function FJb(a, b) { + var c, d; + c = BD(Mpb(a.b, b), 124); + if (BD(BD(Qc(a.r, b), 21), 84).dc()) { + c.n.b = 0; + c.n.c = 0; + return; + } + c.n.b = a.C.b; + c.n.c = a.C.c; + a.A.Hc((tdd(), sdd)) && KJb(a, b); + d = JJb(a, b); + KIb(a, b) == (Tbd(), Qbd) && (d += 2 * a.w); + c.a.a = d; + } + function OKb(a, b) { + var c, d; + c = BD(Mpb(a.b, b), 124); + if (BD(BD(Qc(a.r, b), 21), 84).dc()) { + c.n.d = 0; + c.n.a = 0; + return; + } + c.n.d = a.C.d; + c.n.a = a.C.a; + a.A.Hc((tdd(), sdd)) && SKb(a, b); + d = RKb(a, b); + KIb(a, b) == (Tbd(), Qbd) && (d += 2 * a.w); + c.a.b = d; + } + function cOb(a, b) { + var c, d, e, f; + f = new Rkb(); + for (d = new olb(b); d.a < d.c.c.length; ) { + c = BD(mlb(d), 65); + Ekb(f, new oOb(c, true)); + Ekb(f, new oOb(c, false)); + } + e = new hOb(a); + zwb(e.a.a); + kDb(f, a.b, new amb(OC(GC(JM, 1), Uhe, 679, 0, [e]))); + } + function rQb(a, b, c, d) { + var e, f, g, h, i, j, k, l, m, n, o, p, q; + i = a.a; + n = a.b; + j = b.a; + o = b.b; + k = c.a; + p = c.b; + l = d.a; + q = d.b; + f = i * o - n * j; + g = k * q - p * l; + e = (i - j) * (p - q) - (n - o) * (k - l); + h = (f * (k - l) - g * (i - j)) / e; + m = (f * (p - q) - g * (n - o)) / e; + return new f7c(h, m); + } + function TBc(a, b) { + var c, d, e; + if (a.d[b.p]) { + return; + } + a.d[b.p] = true; + a.a[b.p] = true; + for (d = new Sr(ur(U_b(b).a.Kc(), new Sq())); Qr(d); ) { + c = BD(Rr(d), 17); + if (OZb(c)) { + continue; + } + e = c.d.i; + a.a[e.p] ? Ekb(a.b, c) : TBc(a, e); + } + a.a[b.p] = false; + } + function pCc(a, b, c) { + var d; + d = 0; + switch (BD(vNb(b, (Nyc(), mxc)), 163).g) { + case 2: + d = 2 * -c + a.a; + ++a.a; + break; + case 1: + d = -c; + break; + case 3: + d = c; + break; + case 4: + d = 2 * c + a.b; + ++a.b; + } + wNb(b, (wtc(), Zsc)) && (d += BD(vNb(b, Zsc), 19).a); + return d; + } + function jOc(a, b, c) { + var d, e, f; + c.zc(b, a); + Ekb(a.n, b); + f = a.p.eg(b); + b.j == a.p.fg() ? yOc(a.e, f) : yOc(a.j, f); + lOc(a); + for ( + e = ul(pl(OC(GC(KI, 1), Uhe, 20, 0, [new J0b(b), new R0b(b)]))); + Qr(e); + + ) { + d = BD(Rr(e), 11); + c._b(d) || jOc(a, d, c); + } + } + function rfd(a) { + var b, c, d; + c = BD(hkd(a, (Y9c(), Y8c)), 21); + if (c.Hc((tdd(), pdd))) { + d = BD(hkd(a, b9c), 21); + b = new g7c(BD(hkd(a, _8c), 8)); + if (d.Hc((Idd(), Bdd))) { + b.a <= 0 && (b.a = 20); + b.b <= 0 && (b.b = 20); + } + return b; + } else { + return new d7c(); + } + } + function PKd(a) { + var b, c, d; + if (!a.b) { + d = new $Nd(); + for (c = new $yd(SKd(a)); c.e != c.i.gc(); ) { + b = BD(Zyd(c), 18); + (b.Bb & ote) != 0 && wtd(d, b); + } + vud(d); + a.b = new nNd((BD(qud(ZKd((NFd(), MFd).o), 8), 18), d.i), d.g); + $Kd(a).b &= -9; + } + return a.b; + } + function Rmc(a, b) { + var c, d, e, f, g, h, i, j; + i = BD(Ee(Ec(b.k), KC(F1, bne, 61, 2, 0, 1)), 122); + j = b.g; + c = Tmc(b, i[0]); + e = Smc(b, i[1]); + d = Kmc(a, j, c, e); + f = Tmc(b, i[1]); + h = Smc(b, i[0]); + g = Kmc(a, j, f, h); + if (d <= g) { + b.a = c; + b.c = e; + } else { + b.a = f; + b.c = h; + } + } + function ESc(a, b, c) { + var d, e, f; + Odd(c, "Processor set neighbors", 1); + a.a = b.b.b == 0 ? 1 : b.b.b; + e = null; + d = Jsb(b.b, 0); + while (!e && d.b != d.d.c) { + f = BD(Xsb(d), 86); + Ccb(DD(vNb(f, (mTc(), jTc)))) && (e = f); + } + !!e && FSc(a, new ZRc(e), c); + Qdd(c); + } + function PEd(a) { + IEd(); + var b, c, d, e; + d = hfb(a, wfb(35)); + b = d == -1 ? a : a.substr(0, d); + c = d == -1 ? null : a.substr(d + 1); + e = kFd(HEd, b); + if (!e) { + e = aFd(b); + lFd(HEd, b, e); + c != null && (e = JEd(e, c)); + } else c != null && (e = JEd(e, (uCb(c), c))); + return e; + } + function smb(a) { + var h; + mmb(); + var b, c, d, e, f, g; + if (JD(a, 54)) { + for (e = 0, d = a.gc() - 1; e < d; ++e, --d) { + h = a.Xb(e); + a._c(e, a.Xb(d)); + a._c(d, h); + } + } else { + b = a.Yc(); + f = a.Zc(a.gc()); + while (b.Tb() < f.Vb()) { + c = b.Pb(); + g = f.Ub(); + b.Wb(g); + f.Wb(c); + } + } + } + function I3b(a, b) { + var c, d, e; + Odd(b, "End label pre-processing", 1); + c = Edb(ED(vNb(a, (Nyc(), nyc)))); + d = Edb(ED(vNb(a, ryc))); + e = gad(BD(vNb(a, Lwc), 103)); + MAb(LAb(new YAb(null, new Kub(a.b, 16)), new Q3b()), new S3b(c, d, e)); + Qdd(b); + } + function NFc(a, b) { + var c, d, e, f, g, h; + h = 0; + f = new jkb(); + Wjb(f, b); + while (f.b != f.c) { + g = BD(fkb(f), 214); + h += pHc(g.d, g.e); + for (e = new olb(g.b); e.a < e.c.c.length; ) { + d = BD(mlb(e), 37); + c = BD(Ikb(a.b, d.p), 214); + c.s || (h += NFc(a, c)); + } + } + return h; + } + function YQc(a, b, c) { + var d, e; + TQc(this); + b == (FQc(), DQc) ? Qqb(this.r, a.c) : Qqb(this.w, a.c); + c == DQc ? Qqb(this.r, a.d) : Qqb(this.w, a.d); + UQc(this, a); + d = VQc(a.c); + e = VQc(a.d); + XQc(this, d, e, e); + this.o = (hQc(), Math.abs(d - e) < 0.2); + } + function a0d(a, b, c) { + var d, e, f, g, h, i; + h = BD(Ajd(a.a, 8), 1936); + if (h != null) { + for (e = h, f = 0, g = e.length; f < g; ++f) { + null.jm(); + } + } + d = c; + if ((a.a.Db & 1) == 0) { + i = new f0d(a, c, b); + d.ui(i); + } + JD(d, 672) ? BD(d, 672).wi(a.a) : d.ti() == a.a && d.vi(null); + } + function dae() { + var a; + if (Z9d) return BD(nUd((yFd(), xFd), Ewe), 1945); + eae(); + a = BD(JD(Phb((yFd(), xFd), Ewe), 586) ? Phb(xFd, Ewe) : new cae(), 586); + Z9d = true; + aae(a); + bae(a); + Rhb((JFd(), IFd), a, new fae()); + Tnd(a); + Shb(xFd, Ewe, a); + return a; + } + function xA(a, b, c, d) { + var e; + e = oA( + a, + c, + OC(GC(ZI, 1), nie, 2, 6, [rje, sje, tje, uje, vje, wje, xje]), + b + ); + e < 0 && + (e = oA( + a, + c, + OC(GC(ZI, 1), nie, 2, 6, [ + "Sun", + "Mon", + "Tue", + "Wed", + "Thu", + "Fri", + "Sat", + ]), + b + )); + if (e < 0) { + return false; + } + d.d = e; + return true; + } + function AA(a, b, c, d) { + var e; + e = oA( + a, + c, + OC(GC(ZI, 1), nie, 2, 6, [rje, sje, tje, uje, vje, wje, xje]), + b + ); + e < 0 && + (e = oA( + a, + c, + OC(GC(ZI, 1), nie, 2, 6, [ + "Sun", + "Mon", + "Tue", + "Wed", + "Thu", + "Fri", + "Sat", + ]), + b + )); + if (e < 0) { + return false; + } + d.d = e; + return true; + } + function NVb(a) { + var b, c, d; + KVb(a); + d = new Rkb(); + for (c = new olb(a.a.a.b); c.a < c.c.c.length; ) { + b = BD(mlb(c), 81); + Ekb(d, new ZVb(b, true)); + Ekb(d, new ZVb(b, false)); + } + RVb(a.c); + rXb(d, a.b, new amb(OC(GC(bQ, 1), Uhe, 369, 0, [a.c]))); + MVb(a); + } + function c4b(a) { + var b, c, d, e; + c = new Lqb(); + for (e = new olb(a.d); e.a < e.c.c.length; ) { + d = BD(mlb(e), 181); + b = BD(d.We((wtc(), Dsc)), 17); + !!irb(c.f, b) || Rhb(c, b, new p4b(b)); + Ekb(BD(Wd(irb(c.f, b)), 456).b, d); + } + return new Tkb(new $ib(c)); + } + function Gac(a, b) { + var c, d, e, f, g; + d = new kkb(a.j.c.length); + c = null; + for (f = new olb(a.j); f.a < f.c.c.length; ) { + e = BD(mlb(f), 11); + if (e.j != c) { + d.b == d.c || Hac(d, c, b); + Yjb(d); + c = e.j; + } + g = N3b(e); + !!g && (Xjb(d, g), true); + } + d.b == d.c || Hac(d, c, b); + } + function wbc(a, b) { + var c, d, e; + d = new Bib(a.b, 0); + while (d.b < d.d.gc()) { + c = (sCb(d.b < d.d.gc()), BD(d.d.Xb((d.c = d.b++)), 70)); + e = BD(vNb(c, (Nyc(), Qwc)), 272); + if (e == (qad(), oad)) { + uib(d); + Ekb(b.b, c); + wNb(c, (wtc(), Dsc)) || yNb(c, Dsc, a); + } + } + } + function GDc(a) { + var b, c, d, e, f; + b = sr(new Sr(ur(U_b(a).a.Kc(), new Sq()))); + for (e = new Sr(ur(R_b(a).a.Kc(), new Sq())); Qr(e); ) { + d = BD(Rr(e), 17); + c = d.c.i; + f = sr(new Sr(ur(U_b(c).a.Kc(), new Sq()))); + b = Math.max(b, f); + } + return meb(b); + } + function rUc(a, b, c) { + var d, e, f, g; + Odd(c, "Processor arrange node", 1); + e = null; + f = new Psb(); + d = Jsb(b.b, 0); + while (!e && d.b != d.d.c) { + g = BD(Xsb(d), 86); + Ccb(DD(vNb(g, (mTc(), jTc)))) && (e = g); + } + Gsb(f, e, f.c.b, f.c); + qUc(a, f, Udd(c, 1)); + Qdd(c); + } + function Ffd(a, b, c) { + var d, e, f; + d = BD(hkd(a, (Y9c(), w8c)), 21); + e = 0; + f = 0; + b.a > c.a && + (d.Hc((i8c(), c8c)) + ? (e = (b.a - c.a) / 2) + : d.Hc(e8c) && (e = b.a - c.a)); + b.b > c.b && + (d.Hc((i8c(), g8c)) + ? (f = (b.b - c.b) / 2) + : d.Hc(f8c) && (f = b.b - c.b)); + Efd(a, e, f); + } + function aod(a, b, c, d, e, f, g, h, i, j, k, l, m) { + JD(a.Cb, 88) && XMd($Kd(BD(a.Cb, 88)), 4); + pnd(a, c); + a.f = g; + dJd(a, h); + fJd(a, i); + ZId(a, j); + eJd(a, k); + CId(a, l); + aJd(a, m); + BId(a, true); + AId(a, e); + a.ok(f); + yId(a, b); + d != null && ((a.i = null), _Id(a, d)); + } + function PRd(a) { + var b, c; + if (a.f) { + while (a.n > 0) { + b = BD(a.k.Xb(a.n - 1), 72); + c = b.ak(); + if ( + JD(c, 99) && + (BD(c, 18).Bb & ote) != 0 && + (!a.e || c.Gj() != x2 || c.aj() != 0) && + b.dd() != null + ) { + return true; + } else { + --a.n; + } + } + return false; + } else { + return a.n > 0; + } + } + function Jb(a, b, c) { + if (a < 0) { + return hc(The, OC(GC(SI, 1), Uhe, 1, 5, [c, meb(a)])); + } else if (b < 0) { + throw vbb(new Wdb(Vhe + b)); + } else { + return hc( + "%s (%s) must not be greater than size (%s)", + OC(GC(SI, 1), Uhe, 1, 5, [c, meb(a), meb(b)]) + ); + } + } + function Llb(a, b, c, d, e, f) { + var g, h, i, j; + g = d - c; + if (g < 7) { + Ilb(b, c, d, f); + return; + } + i = c + e; + h = d + e; + j = i + ((h - i) >> 1); + Llb(b, a, i, j, -e, f); + Llb(b, a, j, h, -e, f); + if (f.ue(a[j - 1], a[j]) <= 0) { + while (c < d) { + NC(b, c++, a[i++]); + } + return; + } + Jlb(a, i, j, h, b, c, d, f); + } + function nEb(a, b) { + var c, d, e; + e = new Rkb(); + for (d = new olb(a.c.a.b); d.a < d.c.c.length; ) { + c = BD(mlb(d), 57); + if (b.Lb(c)) { + Ekb(e, new BEb(c, true)); + Ekb(e, new BEb(c, false)); + } + } + tEb(a.e); + kDb(e, a.d, new amb(OC(GC(JM, 1), Uhe, 679, 0, [a.e]))); + } + function gnc(a, b) { + var c, d, e, f, g, h, i; + i = b.d; + e = b.b.j; + for (h = new olb(i); h.a < h.c.c.length; ) { + g = BD(mlb(h), 101); + f = KC(sbb, dle, 25, e.c.length, 16, 1); + Rhb(a.b, g, f); + c = g.a.d.p - 1; + d = g.c.d.p; + while (c != d) { + c = (c + 1) % e.c.length; + f[c] = true; + } + } + } + function tOc(a, b) { + a.r = new uOc(a.p); + sOc(a.r, a); + ye(a.r.j, a.j); + Osb(a.j); + Dsb(a.j, b); + Dsb(a.r.e, b); + lOc(a); + lOc(a.r); + while (a.f.c.length != 0) { + AOc(BD(Ikb(a.f, 0), 129)); + } + while (a.k.c.length != 0) { + AOc(BD(Ikb(a.k, 0), 129)); + } + return a.r; + } + function yid(a, b, c) { + var d, e, f; + e = XKd(a.Tg(), b); + d = b - a.Ah(); + if (d < 0) { + if (!e) { + throw vbb(new Wdb(mte + b + nte)); + } else if (e.Ij()) { + f = a.Yg(e); + f >= 0 ? a.sh(f, c) : uid(a, e, c); + } else { + throw vbb(new Wdb(ite + e.ne() + jte)); + } + } else { + did(a, d, e, c); + } + } + function q6d(b) { + var c, d, e, f; + d = BD(b, 49).qh(); + if (d) { + try { + e = null; + c = nUd((yFd(), xFd), LEd(MEd(d))); + if (c) { + f = c.rh(); + !!f && (e = f.Wk(tfb(d.e))); + } + if (!!e && e != b) { + return q6d(e); + } + } catch (a) { + a = ubb(a); + if (!JD(a, 60)) throw vbb(a); + } + } + return b; + } + function jrb(a, b, c) { + var d, e, f, g; + g = b == null ? 0 : a.b.se(b); + e = ((d = a.a.get(g)), d == null ? new Array() : d); + if (e.length == 0) { + a.a.set(g, e); + } else { + f = grb(a, b, e); + if (f) { + return f.ed(c); + } + } + NC(e, e.length, new pjb(b, c)); + ++a.c; + zpb(a.b); + return null; + } + function YUc(a, b) { + var c, d; + H2c(a.a); + K2c(a.a, (PUc(), NUc), NUc); + K2c(a.a, OUc, OUc); + d = new j3c(); + e3c(d, OUc, (tVc(), sVc)); + PD(hkd(b, (ZWc(), LWc))) !== PD((pWc(), mWc)) && e3c(d, OUc, qVc); + e3c(d, OUc, rVc); + E2c(a.a, d); + c = F2c(a.a, b); + return c; + } + function uC(a) { + if (!a) { + return OB(), NB; + } + var b = a.valueOf ? a.valueOf() : a; + if (b !== a) { + var c = qC[typeof b]; + return c ? c(b) : xC(typeof b); + } else if (a instanceof Array || a instanceof Array) { + return new xB(a); + } else { + return new fC(a); + } + } + function RJb(a, b, c) { + var d, e, f; + f = a.o; + d = BD(Mpb(a.p, c), 244); + e = d.i; + e.b = gIb(d); + e.a = fIb(d); + e.b = Math.max(e.b, f.a); + e.b > f.a && !b && (e.b = f.a); + e.c = -(e.b - f.a) / 2; + switch (c.g) { + case 1: + e.d = -e.a; + break; + case 3: + e.d = f.b; + } + hIb(d); + iIb(d); + } + function SJb(a, b, c) { + var d, e, f; + f = a.o; + d = BD(Mpb(a.p, c), 244); + e = d.i; + e.b = gIb(d); + e.a = fIb(d); + e.a = Math.max(e.a, f.b); + e.a > f.b && !b && (e.a = f.b); + e.d = -(e.a - f.b) / 2; + switch (c.g) { + case 4: + e.c = -e.b; + break; + case 2: + e.c = f.a; + } + hIb(d); + iIb(d); + } + function Jgc(a, b) { + var c, d, e, f, g; + if (b.dc()) { + return; + } + e = BD(b.Xb(0), 128); + if (b.gc() == 1) { + Igc(a, e, e, 1, 0, b); + return; + } + c = 1; + while (c < b.gc()) { + if (e.j || !e.o) { + f = Ogc(b, c); + if (f) { + d = BD(f.a, 19).a; + g = BD(f.b, 128); + Igc(a, e, g, c, d, b); + c = d + 1; + e = g; + } + } + } + } + function mlc(a) { + var b, c, d, e, f, g; + g = new Tkb(a.d); + Okb(g, new Qlc()); + b = + (Alc(), + OC(GC(KV, 1), Kie, 270, 0, [tlc, wlc, slc, zlc, vlc, ulc, ylc, xlc])); + c = 0; + for (f = new olb(g); f.a < f.c.c.length; ) { + e = BD(mlb(f), 101); + d = b[c % b.length]; + olc(e, d); + ++c; + } + } + function o6c(a, b) { + i6c(); + var c, d, e, f; + if (b.b < 2) { + return false; + } + f = Jsb(b, 0); + c = BD(Xsb(f), 8); + d = c; + while (f.b != f.d.c) { + e = BD(Xsb(f), 8); + if (!(m6c(a, d) && m6c(a, e))) { + return false; + } + d = e; + } + if (!(m6c(a, d) && m6c(a, c))) { + return false; + } + return true; + } + function hrd(a, b) { + var c, d, e, f, g, h, i, j, k, l; + k = null; + l = a; + g = Xpd(l, "x"); + c = new Krd(b); + Gqd(c.a, g); + h = Xpd(l, "y"); + d = new Lrd(b); + Hqd(d.a, h); + i = Xpd(l, Gte); + e = new Mrd(b); + Iqd(e.a, i); + j = Xpd(l, Fte); + f = new Nrd(b); + k = (Jqd(f.a, j), j); + return k; + } + function XMd(a, b) { + TMd(a, b); + (a.b & 1) != 0 && (a.a.a = null); + (a.b & 2) != 0 && (a.a.f = null); + if ((a.b & 4) != 0) { + a.a.g = null; + a.a.i = null; + } + if ((a.b & 16) != 0) { + a.a.d = null; + a.a.e = null; + } + (a.b & 8) != 0 && (a.a.b = null); + if ((a.b & 32) != 0) { + a.a.j = null; + a.a.c = null; + } + } + function l0d(b, c) { + var d, e, f; + f = 0; + if (c.length > 0) { + try { + f = Icb(c, Rie, Ohe); + } catch (a) { + a = ubb(a); + if (JD(a, 127)) { + e = a; + throw vbb(new rFd(e)); + } else throw vbb(a); + } + } + d = (!b.a && (b.a = new z0d(b)), b.a); + return f < d.i && f >= 0 ? BD(qud(d, f), 56) : null; + } + function Ib(a, b) { + if (a < 0) { + return hc(The, OC(GC(SI, 1), Uhe, 1, 5, ["index", meb(a)])); + } else if (b < 0) { + throw vbb(new Wdb(Vhe + b)); + } else { + return hc( + "%s (%s) must be less than size (%s)", + OC(GC(SI, 1), Uhe, 1, 5, ["index", meb(a), meb(b)]) + ); + } + } + function Slb(a) { + var b, c, d, e, f; + if (a == null) { + return Xhe; + } + f = new xwb(She, "[", "]"); + for (c = a, d = 0, e = c.length; d < e; ++d) { + b = c[d]; + !f.a ? (f.a = new Wfb(f.d)) : Qfb(f.a, f.b); + Nfb(f.a, "" + b); + } + return !f.a ? f.c : f.e.length == 0 ? f.a.a : f.a.a + ("" + f.e); + } + function Tlb(a) { + var b, c, d, e, f; + if (a == null) { + return Xhe; + } + f = new xwb(She, "[", "]"); + for (c = a, d = 0, e = c.length; d < e; ++d) { + b = c[d]; + !f.a ? (f.a = new Wfb(f.d)) : Qfb(f.a, f.b); + Nfb(f.a, "" + b); + } + return !f.a ? f.c : f.e.length == 0 ? f.a.a : f.a.a + ("" + f.e); + } + function Ulb(a) { + var b, c, d, e, f; + if (a == null) { + return Xhe; + } + f = new xwb(She, "[", "]"); + for (c = a, d = 0, e = c.length; d < e; ++d) { + b = c[d]; + !f.a ? (f.a = new Wfb(f.d)) : Qfb(f.a, f.b); + Nfb(f.a, "" + b); + } + return !f.a ? f.c : f.e.length == 0 ? f.a.a : f.a.a + ("" + f.e); + } + function Xlb(a) { + var b, c, d, e, f; + if (a == null) { + return Xhe; + } + f = new xwb(She, "[", "]"); + for (c = a, d = 0, e = c.length; d < e; ++d) { + b = c[d]; + !f.a ? (f.a = new Wfb(f.d)) : Qfb(f.a, f.b); + Nfb(f.a, "" + b); + } + return !f.a ? f.c : f.e.length == 0 ? f.a.a : f.a.a + ("" + f.e); + } + function bub(a, b) { + var c, d, e, f, g, h; + c = a.b.c.length; + e = Ikb(a.b, b); + while (b * 2 + 1 < c) { + d = + ((f = 2 * b + 1), + (g = f + 1), + (h = f), + g < c && a.a.ue(Ikb(a.b, g), Ikb(a.b, f)) < 0 && (h = g), + h); + if (a.a.ue(e, Ikb(a.b, d)) < 0) { + break; + } + Nkb(a.b, b, Ikb(a.b, d)); + b = d; + } + Nkb(a.b, b, e); + } + function $Bb(a, b, c, d, e, f) { + var g, h, i, j, k; + if (PD(a) === PD(c)) { + a = a.slice(b, b + e); + b = 0; + } + i = c; + for (h = b, j = b + e; h < j; ) { + g = Math.min(h + 10000, j); + e = g - h; + k = a.slice(h, g); + k.splice(0, 0, d, f ? e : 0); + Array.prototype.splice.apply(i, k); + h = g; + d += e; + } + } + function xGb(a, b, c) { + var d, e; + d = c.d; + e = c.e; + if ( + a.g[d.d] <= a.i[b.d] && + a.i[b.d] <= a.i[d.d] && + a.g[e.d] <= a.i[b.d] && + a.i[b.d] <= a.i[e.d] + ) { + if (a.i[d.d] < a.i[e.d]) { + return false; + } + return true; + } + if (a.i[d.d] < a.i[e.d]) { + return true; + } + return false; + } + function cRb(a) { + var b, c, d, e, f, g, h; + d = a.a.c.length; + if (d > 0) { + g = a.c.d; + h = a.d.d; + e = Y6c(c7c(new f7c(h.a, h.b), g), 1 / (d + 1)); + f = new f7c(g.a, g.b); + for (c = new olb(a.a); c.a < c.c.c.length; ) { + b = BD(mlb(c), 559); + b.d.a = f.a; + b.d.b = f.b; + P6c(f, e); + } + } + } + function YNb(a, b, c) { + var d, e, f, g, h, i; + i = Pje; + for (f = new olb(wOb(a.b)); f.a < f.c.c.length; ) { + e = BD(mlb(f), 168); + for (h = new olb(wOb(b.b)); h.a < h.c.c.length; ) { + g = BD(mlb(h), 168); + d = p6c(e.a, e.b, g.a, g.b, c); + i = Math.min(i, d); + } + } + return i; + } + function G0b(a, b) { + if (!b) { + throw vbb(new Geb()); + } + a.j = b; + if (!a.d) { + switch (a.j.g) { + case 1: + a.a.a = a.o.a / 2; + a.a.b = 0; + break; + case 2: + a.a.a = a.o.a; + a.a.b = a.o.b / 2; + break; + case 3: + a.a.a = a.o.a / 2; + a.a.b = a.o.b; + break; + case 4: + a.a.a = 0; + a.a.b = a.o.b / 2; + } + } + } + function dfc(a, b) { + var c, d, e; + if (JD(b.g, 10) && BD(b.g, 10).k == (j0b(), e0b)) { + return Pje; + } + e = ugc(b); + if (e) { + return Math.max(0, a.b / 2 - 0.5); + } + c = tgc(b); + if (c) { + d = Edb(ED(pBc(c, (Nyc(), vyc)))); + return Math.max(0, d / 2 - 0.5); + } + return Pje; + } + function ffc(a, b) { + var c, d, e; + if (JD(b.g, 10) && BD(b.g, 10).k == (j0b(), e0b)) { + return Pje; + } + e = ugc(b); + if (e) { + return Math.max(0, a.b / 2 - 0.5); + } + c = tgc(b); + if (c) { + d = Edb(ED(pBc(c, (Nyc(), vyc)))); + return Math.max(0, d / 2 - 0.5); + } + return Pje; + } + function xic(a) { + var b, c, d, e, f, g; + g = CHc(a.d, a.e); + for (f = g.Kc(); f.Ob(); ) { + e = BD(f.Pb(), 11); + d = a.e == (Ucd(), Tcd) ? e.e : e.g; + for (c = new olb(d); c.a < c.c.c.length; ) { + b = BD(mlb(c), 17); + if (!OZb(b) && b.c.i.c != b.d.i.c) { + tic(a, b); + ++a.f; + ++a.c; + } + } + } + } + function tpc(a, b) { + var c, d; + if (b.dc()) { + return mmb(), mmb(), jmb; + } + d = new Rkb(); + Ekb(d, meb(Rie)); + for (c = 1; c < a.f; ++c) { + a.a == null && Toc(a); + a.a[c] && Ekb(d, meb(c)); + } + if (d.c.length == 1) { + return mmb(), mmb(), jmb; + } + Ekb(d, meb(Ohe)); + return spc(b, d); + } + function MJc(a, b) { + var c, d, e, f, g, h, i; + g = b.c.i.k != (j0b(), h0b); + i = g ? b.d : b.c; + c = MZb(b, i).i; + e = BD(Ohb(a.k, i), 121); + d = a.i[c.p].a; + if (S_b(i.i) < (!c.c ? -1 : Jkb(c.c.a, c, 0))) { + f = e; + h = d; + } else { + f = d; + h = e; + } + AFb(DFb(CFb(EFb(BFb(new FFb(), 0), 4), f), h)); + } + function oqd(a, b, c) { + var d, e, f, g, h, i; + if (c) { + e = c.a.length; + d = new Yge(e); + for (h = (d.b - d.a) * d.c < 0 ? (Xge(), Wge) : new she(d); h.Ob(); ) { + g = BD(h.Pb(), 19); + i = Wqd(a, Vpd(tB(c, g.a))); + if (i) { + f = (!b.b && (b.b = new y5d(z2, b, 4, 7)), b.b); + wtd(f, i); + } + } + } + } + function pqd(a, b, c) { + var d, e, f, g, h, i; + if (c) { + e = c.a.length; + d = new Yge(e); + for (h = (d.b - d.a) * d.c < 0 ? (Xge(), Wge) : new she(d); h.Ob(); ) { + g = BD(h.Pb(), 19); + i = Wqd(a, Vpd(tB(c, g.a))); + if (i) { + f = (!b.c && (b.c = new y5d(z2, b, 5, 8)), b.c); + wtd(f, i); + } + } + } + } + function po(a, b, c) { + var d, e; + d = b.a & a.f; + b.b = a.b[d]; + a.b[d] = b; + e = b.f & a.f; + b.d = a.c[e]; + a.c[e] = b; + if (!c) { + b.e = a.e; + b.c = null; + !a.e ? (a.a = b) : (a.e.c = b); + a.e = b; + } else { + b.e = c.e; + !b.e ? (a.a = b) : (b.e.c = b); + b.c = c.c; + !b.c ? (a.e = b) : (b.c.e = b); + } + ++a.i; + ++a.g; + } + function qr(a) { + var b, c, d; + b = a.Pb(); + if (!a.Ob()) { + return b; + } + d = Pfb(Qfb(new Ufb(), "expected one element but was: <"), b); + for (c = 0; c < 4 && a.Ob(); c++) { + Pfb(((d.a += She), d), a.Pb()); + } + a.Ob() && ((d.a += ", ..."), d); + d.a += ">"; + throw vbb(new Wdb(d.a)); + } + function lt(a, b) { + var c; + b.d ? (b.d.b = b.b) : (a.a = b.b); + b.b ? (b.b.d = b.d) : (a.e = b.d); + if (!b.e && !b.c) { + c = BD(Thb(a.b, b.a), 283); + c.a = 0; + ++a.c; + } else { + c = BD(Ohb(a.b, b.a), 283); + --c.a; + !b.e ? (c.b = b.c) : (b.e.c = b.c); + !b.c ? (c.c = b.e) : (b.c.e = b.e); + } + --a.d; + } + function OA(a) { + var b, c; + c = -a.a; + b = OC(GC(TD, 1), $ie, 25, 15, [43, 48, 48, 48, 48]); + if (c < 0) { + b[0] = 45; + c = -c; + } + b[1] = (b[1] + ((((c / 60) | 0) / 10) | 0)) & aje; + b[2] = (b[2] + (((c / 60) | 0) % 10)) & aje; + b[3] = (b[3] + (((c % 60) / 10) | 0)) & aje; + b[4] = (b[4] + (c % 10)) & aje; + return zfb(b, 0, b.length); + } + function uRb(a, b, c) { + var d, e; + d = b.d; + e = c.d; + while (d.a - e.a == 0 && d.b - e.b == 0) { + d.a += Cub(a, 26) * ike + Cub(a, 27) * jke - 0.5; + d.b += Cub(a, 26) * ike + Cub(a, 27) * jke - 0.5; + e.a += Cub(a, 26) * ike + Cub(a, 27) * jke - 0.5; + e.b += Cub(a, 26) * ike + Cub(a, 27) * jke - 0.5; + } + } + function N_b(a) { + var b, c, d, e; + a.g = new Rpb(BD(Qb(F1), 290)); + d = 0; + c = (Ucd(), Acd); + b = 0; + for (; b < a.j.c.length; b++) { + e = BD(Ikb(a.j, b), 11); + if (e.j != c) { + d != b && Npb(a.g, c, new vgd(meb(d), meb(b))); + c = e.j; + d = b; + } + } + Npb(a.g, c, new vgd(meb(d), meb(b))); + } + function d4b(a) { + var b, c, d, e, f, g, h; + d = 0; + for (c = new olb(a.b); c.a < c.c.c.length; ) { + b = BD(mlb(c), 29); + for (f = new olb(b.a); f.a < f.c.c.length; ) { + e = BD(mlb(f), 10); + e.p = d++; + for (h = new olb(e.j); h.a < h.c.c.length; ) { + g = BD(mlb(h), 11); + g.p = d++; + } + } + } + } + function qPc(a, b, c, d, e) { + var f, g, h, i, j; + if (b) { + for (h = b.Kc(); h.Ob(); ) { + g = BD(h.Pb(), 10); + for (j = X_b(g, (KAc(), IAc), c).Kc(); j.Ob(); ) { + i = BD(j.Pb(), 11); + f = BD(Wd(irb(e.f, i)), 112); + if (!f) { + f = new uOc(a.d); + d.c[d.c.length] = f; + jOc(f, i, e); + } + } + } + } + } + function vid(a, b) { + var c, d, e; + e = e1d((O6d(), M6d), a.Tg(), b); + if (e) { + Q6d(); + BD(e, 66).Oj() || (e = _1d(q1d(M6d, e))); + d = + ((c = a.Yg(e)), + BD(c >= 0 ? a._g(c, true, true) : sid(a, e, true), 153)); + BD(d, 215).ol(b); + } else { + throw vbb(new Wdb(ite + b.ne() + jte)); + } + } + function ugb(a) { + var b, c; + if (a > -140737488355328 && a < 140737488355328) { + if (a == 0) { + return 0; + } + b = a < 0; + b && (a = -a); + c = QD(Math.floor(Math.log(a) / 0.6931471805599453)); + (!b || a != Math.pow(2, c)) && ++c; + return c; + } + return vgb(Cbb(a)); + } + function QOc(a) { + var b, c, d, e, f, g, h; + f = new zsb(); + for (c = new olb(a); c.a < c.c.c.length; ) { + b = BD(mlb(c), 129); + g = b.a; + h = b.b; + if (f.a._b(g) || f.a._b(h)) { + continue; + } + e = g; + d = h; + if (g.e.b + g.j.b > 2 && h.e.b + h.j.b <= 2) { + e = h; + d = g; + } + f.a.zc(e, f); + e.q = d; + } + return f; + } + function K5b(a, b) { + var c, d, e; + d = new b0b(a); + tNb(d, b); + yNb(d, (wtc(), Gsc), b); + yNb(d, (Nyc(), Vxc), (dcd(), $bd)); + yNb(d, mwc, (F7c(), B7c)); + __b(d, (j0b(), e0b)); + c = new H0b(); + F0b(c, d); + G0b(c, (Ucd(), Tcd)); + e = new H0b(); + F0b(e, d); + G0b(e, zcd); + return d; + } + function Spc(a) { + switch (a.g) { + case 0: + return new fGc((rGc(), oGc)); + case 1: + return new CFc(); + case 2: + return new fHc(); + default: + throw vbb( + new Wdb( + "No implementation is available for the crossing minimizer " + + (a.f != null ? a.f : "" + a.g) + ) + ); + } + } + function tDc(a, b) { + var c, d, e, f, g; + a.c[b.p] = true; + Ekb(a.a, b); + for (g = new olb(b.j); g.a < g.c.c.length; ) { + f = BD(mlb(g), 11); + for (d = new b1b(f.b); llb(d.a) || llb(d.b); ) { + c = BD(llb(d.a) ? mlb(d.a) : mlb(d.b), 17); + e = uDc(f, c).i; + a.c[e.p] || tDc(a, e); + } + } + } + function _Uc(a) { + var b, c, d, e, f, g, h; + g = 0; + for ( + c = new Fyd((!a.a && (a.a = new cUd(E2, a, 10, 11)), a.a)); + c.e != c.i.gc(); + + ) { + b = BD(Dyd(c), 33); + h = b.g; + e = b.f; + d = Math.sqrt(h * h + e * e); + g = Math.max(d, g); + f = _Uc(b); + g = Math.max(f, g); + } + return g; + } + function rcd() { + rcd = ccb; + pcd = new scd("OUTSIDE", 0); + ncd = new scd("INSIDE", 1); + ocd = new scd("NEXT_TO_PORT_IF_POSSIBLE", 2); + mcd = new scd("ALWAYS_SAME_SIDE", 3); + lcd = new scd("ALWAYS_OTHER_SAME_SIDE", 4); + qcd = new scd("SPACE_EFFICIENT", 5); + } + function drd(a, b, c) { + var d, e, f, h, i, j; + d = Tqd(a, ((e = (Fhd(), (f = new apd()), f)), !!c && $od(e, c), e), b); + Lkd(d, _pd(b, Vte)); + grd(b, d); + brd(b, d); + hrd(b, d); + g = null; + h = b; + i = Ypd(h, "ports"); + j = new Jrd(a, d); + Fqd(j.a, j.b, i); + crd(a, b, d); + Zqd(a, b, d); + return d; + } + function NA(a) { + var b, c; + c = -a.a; + b = OC(GC(TD, 1), $ie, 25, 15, [43, 48, 48, 58, 48, 48]); + if (c < 0) { + b[0] = 45; + c = -c; + } + b[1] = (b[1] + ((((c / 60) | 0) / 10) | 0)) & aje; + b[2] = (b[2] + (((c / 60) | 0) % 10)) & aje; + b[4] = (b[4] + (((c % 60) / 10) | 0)) & aje; + b[5] = (b[5] + (c % 10)) & aje; + return zfb(b, 0, b.length); + } + function QA(a) { + var b; + b = OC(GC(TD, 1), $ie, 25, 15, [71, 77, 84, 45, 48, 48, 58, 48, 48]); + if (a <= 0) { + b[3] = 43; + a = -a; + } + b[4] = (b[4] + ((((a / 60) | 0) / 10) | 0)) & aje; + b[5] = (b[5] + (((a / 60) | 0) % 10)) & aje; + b[7] = (b[7] + (((a % 60) / 10) | 0)) & aje; + b[8] = (b[8] + (a % 10)) & aje; + return zfb(b, 0, b.length); + } + function Vlb(a) { + var b, c, d, e, f; + if (a == null) { + return Xhe; + } + f = new xwb(She, "[", "]"); + for (c = a, d = 0, e = c.length; d < e; ++d) { + b = c[d]; + !f.a ? (f.a = new Wfb(f.d)) : Qfb(f.a, f.b); + Nfb(f.a, "" + Ubb(b)); + } + return !f.a ? f.c : f.e.length == 0 ? f.a.a : f.a.a + ("" + f.e); + } + function DGb(a, b) { + var c, d, e; + e = Ohe; + for (d = new olb(LFb(b)); d.a < d.c.c.length; ) { + c = BD(mlb(d), 213); + if (c.f && !a.c[c.c]) { + a.c[c.c] = true; + e = Math.min(e, DGb(a, xFb(c, b))); + } + } + a.i[b.d] = a.j; + a.g[b.d] = Math.min(e, a.j++); + return a.g[b.d]; + } + function EKb(a, b) { + var c, d, e; + for (e = BD(BD(Qc(a.r, b), 21), 84).Kc(); e.Ob(); ) { + d = BD(e.Pb(), 111); + d.e.b = + ((c = d.b), + c.Xe((Y9c(), s9c)) + ? c.Hf() == (Ucd(), Acd) + ? -c.rf().b - Edb(ED(c.We(s9c))) + : Edb(ED(c.We(s9c))) + : c.Hf() == (Ucd(), Acd) + ? -c.rf().b + : 0); + } + } + function LPb(a) { + var b, c, d, e, f, g, h; + c = IOb(a.e); + f = Y6c(b7c(R6c(HOb(a.e)), a.d * a.a, a.c * a.b), -0.5); + b = c.a - f.a; + e = c.b - f.b; + for (h = 0; h < a.c; h++) { + d = b; + for (g = 0; g < a.d; g++) { + JOb(a.e, new J6c(d, e, a.a, a.b)) && aNb(a, g, h, false, true); + d += a.a; + } + e += a.b; + } + } + function s2c(a) { + var b, c, d; + if (Ccb(DD(hkd(a, (Y9c(), M8c))))) { + d = new Rkb(); + for (c = new Sr(ur(_sd(a).a.Kc(), new Sq())); Qr(c); ) { + b = BD(Rr(c), 79); + Qld(b) && Ccb(DD(hkd(b, N8c))) && ((d.c[d.c.length] = b), true); + } + return d; + } else { + return mmb(), mmb(), jmb; + } + } + function Vpd(a) { + var b, c; + c = false; + if (JD(a, 204)) { + c = true; + return BD(a, 204).a; + } + if (!c) { + if (JD(a, 258)) { + b = BD(a, 258).a % 1 == 0; + if (b) { + c = true; + return meb(Idb(BD(a, 258).a)); + } + } + } + throw vbb(new cqd("Id must be a string or an integer: '" + a + "'.")); + } + function k0d(a, b) { + var c, d, e, f, g, h; + f = null; + for (e = new x0d((!a.a && (a.a = new z0d(a)), a.a)); u0d(e); ) { + c = BD(Vud(e), 56); + d = + ((g = c.Tg()), + (h = (OKd(g), g.o)), + !h || !c.mh(h) ? null : h6d(KJd(h), c.ah(h))); + if (d != null) { + if (dfb(d, b)) { + f = c; + break; + } + } + } + return f; + } + function Bw(a, b, c) { + var d, e, f, g, h; + Xj(c, "occurrences"); + if (c == 0) { + return (h = BD(Hv(nd(a.a), b), 14)), !h ? 0 : h.gc(); + } + g = BD(Hv(nd(a.a), b), 14); + if (!g) { + return 0; + } + f = g.gc(); + if (c >= f) { + g.$b(); + } else { + e = g.Kc(); + for (d = 0; d < c; d++) { + e.Pb(); + e.Qb(); + } + } + return f; + } + function ax(a, b, c) { + var d, e, f, g; + Xj(c, "oldCount"); + Xj(0, "newCount"); + d = BD(Hv(nd(a.a), b), 14); + if ((!d ? 0 : d.gc()) == c) { + Xj(0, "count"); + e = ((f = BD(Hv(nd(a.a), b), 14)), !f ? 0 : f.gc()); + g = -e; + g > 0 ? zh() : g < 0 && Bw(a, b, -g); + return true; + } else { + return false; + } + } + function fIb(a) { + var b, c, d, e, f, g, h; + h = 0; + if (a.b == 0) { + g = jIb(a, true); + b = 0; + for (d = g, e = 0, f = d.length; e < f; ++e) { + c = d[e]; + if (c > 0) { + h += c; + ++b; + } + } + b > 1 && (h += a.c * (b - 1)); + } else { + h = Mtb(Zzb(OAb(JAb(Plb(a.a), new xIb()), new zIb()))); + } + return h > 0 ? h + a.n.d + a.n.a : 0; + } + function gIb(a) { + var b, c, d, e, f, g, h; + h = 0; + if (a.b == 0) { + h = Mtb(Zzb(OAb(JAb(Plb(a.a), new tIb()), new vIb()))); + } else { + g = kIb(a, true); + b = 0; + for (d = g, e = 0, f = d.length; e < f; ++e) { + c = d[e]; + if (c > 0) { + h += c; + ++b; + } + } + b > 1 && (h += a.c * (b - 1)); + } + return h > 0 ? h + a.n.b + a.n.c : 0; + } + function MJb(a, b) { + var c, d, e, f; + f = BD(Mpb(a.b, b), 124); + c = f.a; + for (e = BD(BD(Qc(a.r, b), 21), 84).Kc(); e.Ob(); ) { + d = BD(e.Pb(), 111); + !!d.c && (c.a = Math.max(c.a, ZHb(d.c))); + } + if (c.a > 0) { + switch (b.g) { + case 2: + f.n.c = a.s; + break; + case 4: + f.n.b = a.s; + } + } + } + function NQb(a, b) { + var c, d, e; + c = BD(vNb(b, (wSb(), oSb)), 19).a - BD(vNb(a, oSb), 19).a; + if (c == 0) { + d = c7c(R6c(BD(vNb(a, (HSb(), DSb)), 8)), BD(vNb(a, ESb), 8)); + e = c7c(R6c(BD(vNb(b, DSb), 8)), BD(vNb(b, ESb), 8)); + return Kdb(d.a * d.b, e.a * e.b); + } + return c; + } + function iRc(a, b) { + var c, d, e; + c = BD(vNb(b, (JTc(), ETc)), 19).a - BD(vNb(a, ETc), 19).a; + if (c == 0) { + d = c7c(R6c(BD(vNb(a, (mTc(), VSc)), 8)), BD(vNb(a, WSc), 8)); + e = c7c(R6c(BD(vNb(b, VSc), 8)), BD(vNb(b, WSc), 8)); + return Kdb(d.a * d.b, e.a * e.b); + } + return c; + } + function TZb(a) { + var b, c; + c = new Ufb(); + c.a += "e_"; + b = KZb(a); + b != null && ((c.a += "" + b), c); + if (!!a.c && !!a.d) { + Qfb(((c.a += " "), c), C0b(a.c)); + Qfb(Pfb(((c.a += "["), c), a.c.i), "]"); + Qfb(((c.a += gne), c), C0b(a.d)); + Qfb(Pfb(((c.a += "["), c), a.d.i), "]"); + } + return c.a; + } + function zRc(a) { + switch (a.g) { + case 0: + return new lUc(); + case 1: + return new sUc(); + case 2: + return new CUc(); + case 3: + return new IUc(); + default: + throw vbb( + new Wdb( + "No implementation is available for the layout phase " + + (a.f != null ? a.f : "" + a.g) + ) + ); + } + } + function mfd(a, b, c, d, e) { + var f; + f = 0; + switch (e.g) { + case 1: + f = Math.max(0, b.b + a.b - (c.b + d)); + break; + case 3: + f = Math.max(0, -a.b - d); + break; + case 2: + f = Math.max(0, -a.a - d); + break; + case 4: + f = Math.max(0, b.a + a.a - (c.a + d)); + } + return f; + } + function mqd(a, b, c) { + var d, e, f, g, h; + if (c) { + e = c.a.length; + d = new Yge(e); + for (h = (d.b - d.a) * d.c < 0 ? (Xge(), Wge) : new she(d); h.Ob(); ) { + g = BD(h.Pb(), 19); + f = Zpd(c, g.a); + Lte in f.a || Mte in f.a ? $qd(a, f, b) : erd(a, f, b); + otd(BD(Ohb(a.b, Wpd(f)), 79)); + } + } + } + function LJd(a) { + var b, c; + switch (a.b) { + case -1: { + return true; + } + case 0: { + c = a.t; + if (c > 1 || c == -1) { + a.b = -1; + return true; + } else { + b = wId(a); + if (!!b && (Q6d(), b.Cj() == Bve)) { + a.b = -1; + return true; + } else { + a.b = 1; + return false; + } + } + } + default: + case 1: { + return false; + } + } + } + function k1d(a, b) { + var c, d, e, f, g; + d = (!b.s && (b.s = new cUd(t5, b, 21, 17)), b.s); + f = null; + for (e = 0, g = d.i; e < g; ++e) { + c = BD(qud(d, e), 170); + switch ($1d(q1d(a, c))) { + case 2: + case 3: { + !f && (f = new Rkb()); + f.c[f.c.length] = c; + } + } + } + return !f ? (mmb(), mmb(), jmb) : f; + } + function tde(a, b) { + var c, d, e, f; + nde(a); + if (a.c != 0 || a.a != 123) throw vbb(new mde(tvd((h0d(), Fue)))); + f = b == 112; + d = a.d; + c = gfb(a.i, 125, d); + if (c < 0) throw vbb(new mde(tvd((h0d(), Gue)))); + e = qfb(a.i, d, c); + a.d = c + 1; + return Lfe(e, f, (a.e & 512) == 512); + } + function QTb(a) { + var b; + b = BD(vNb(a, (Nyc(), Iwc)), 314); + if (b == (Rpc(), Ppc)) { + throw vbb( + new z2c( + "The hierarchy aware processor " + + b + + " in child node " + + a + + " is only allowed if the root node specifies the same hierarchical processor." + ) + ); + } + } + function dhc(a, b) { + Hgc(); + var c, d, e, f, g, h; + c = null; + for (g = b.Kc(); g.Ob(); ) { + f = BD(g.Pb(), 128); + if (f.o) { + continue; + } + d = F6c(f.a); + e = C6c(f.a); + h = new hic(d, e, null, BD(f.d.a.ec().Kc().Pb(), 17)); + Ekb(h.c, f.a); + a.c[a.c.length] = h; + !!c && Ekb(c.d, h); + c = h; + } + } + function hKd(a, b) { + var c, d, e; + if (!b) { + jKd(a, null); + _Jd(a, null); + } else if ((b.i & 4) != 0) { + d = "[]"; + for (c = b.c; ; c = c.c) { + if ((c.i & 4) == 0) { + e = jfb((fdb(c), c.o + d)); + jKd(a, e); + _Jd(a, e); + break; + } + d += "[]"; + } + } else { + e = jfb((fdb(b), b.o)); + jKd(a, e); + _Jd(a, e); + } + a.yk(b); + } + function b3d(a, b, c, d, e) { + var f, g, h, i; + i = a3d(a, BD(e, 56)); + if (PD(i) !== PD(e)) { + h = BD(a.g[c], 72); + f = R6d(b, i); + mud(a, c, t3d(a, c, f)); + if (oid(a.e)) { + g = H2d(a, 9, f.ak(), e, i, d, false); + Qwd(g, new pSd(a.e, 9, a.c, h, f, d, false)); + Rwd(g); + } + return i; + } + return e; + } + function xCc(a, b, c) { + var d, e, f, g, h, i; + d = BD(Qc(a.c, b), 15); + e = BD(Qc(a.c, c), 15); + f = d.Zc(d.gc()); + g = e.Zc(e.gc()); + while (f.Sb() && g.Sb()) { + h = BD(f.Ub(), 19); + i = BD(g.Ub(), 19); + if (h != i) { + return beb(h.a, i.a); + } + } + return !f.Ob() && !g.Ob() ? 0 : f.Ob() ? 1 : -1; + } + function m5c(c, d) { + var e, f, g; + try { + g = fs(c.a, d); + return g; + } catch (b) { + b = ubb(b); + if (JD(b, 32)) { + try { + f = Icb(d, Rie, Ohe); + e = gdb(c.a); + if (f >= 0 && f < e.length) { + return e[f]; + } + } catch (a) { + a = ubb(a); + if (!JD(a, 127)) throw vbb(a); + } + return null; + } else throw vbb(b); + } + } + function tid(a, b) { + var c, d, e; + e = e1d((O6d(), M6d), a.Tg(), b); + if (e) { + Q6d(); + BD(e, 66).Oj() || (e = _1d(q1d(M6d, e))); + d = + ((c = a.Yg(e)), + BD(c >= 0 ? a._g(c, true, true) : sid(a, e, true), 153)); + return BD(d, 215).ll(b); + } else { + throw vbb(new Wdb(ite + b.ne() + lte)); + } + } + function BZd() { + tZd(); + var a; + if (sZd) return BD(nUd((yFd(), xFd), _ve), 1939); + rEd(CK, new J_d()); + CZd(); + a = BD(JD(Phb((yFd(), xFd), _ve), 547) ? Phb(xFd, _ve) : new AZd(), 547); + sZd = true; + yZd(a); + zZd(a); + Rhb((JFd(), IFd), a, new EZd()); + Shb(xFd, _ve, a); + return a; + } + function v2d(a, b) { + var c, d, e, f; + a.j = -1; + if (oid(a.e)) { + c = a.i; + f = a.i != 0; + lud(a, b); + d = new pSd(a.e, 3, a.c, null, b, c, f); + e = b.Qk(a.e, a.c, null); + e = h3d(a, b, e); + if (!e) { + Uhd(a.e, d); + } else { + e.Ei(d); + e.Fi(); + } + } else { + lud(a, b); + e = b.Qk(a.e, a.c, null); + !!e && e.Fi(); + } + } + function rA(a, b) { + var c, d, e; + e = 0; + d = b[0]; + if (d >= a.length) { + return -1; + } + c = (BCb(d, a.length), a.charCodeAt(d)); + while (c >= 48 && c <= 57) { + e = e * 10 + (c - 48); + ++d; + if (d >= a.length) { + break; + } + c = (BCb(d, a.length), a.charCodeAt(d)); + } + d > b[0] ? (b[0] = d) : (e = -1); + return e; + } + function vMb(a) { + var b, c, d, e, f; + e = BD(a.a, 19).a; + f = BD(a.b, 19).a; + c = e; + d = f; + b = Math.max(Math.abs(e), Math.abs(f)); + if (e <= 0 && e == f) { + c = 0; + d = f - 1; + } else { + if (e == -b && f != b) { + c = f; + d = e; + f >= 0 && ++c; + } else { + c = -f; + d = e; + } + } + return new vgd(meb(c), meb(d)); + } + function fNb(a, b, c, d) { + var e, f, g, h, i, j; + for (e = 0; e < b.o; e++) { + f = e - b.j + c; + for (g = 0; g < b.p; g++) { + h = g - b.k + d; + if ( + ((i = f), + (j = h), + (i += a.j), + (j += a.k), + i >= 0 && j >= 0 && i < a.o && j < a.p) && + ((!ZMb(b, e, g) && hNb(a, f, h)) || (YMb(b, e, g) && !iNb(a, f, h))) + ) { + return true; + } + } + } + return false; + } + function LNc(a, b, c) { + var d, e, f, g, h; + g = a.c; + h = a.d; + f = l7c(OC(GC(m1, 1), nie, 8, 0, [g.i.n, g.n, g.a])).b; + e = (f + l7c(OC(GC(m1, 1), nie, 8, 0, [h.i.n, h.n, h.a])).b) / 2; + d = null; + g.j == (Ucd(), zcd) + ? (d = new f7c(b + g.i.c.c.a + c, e)) + : (d = new f7c(b - c, e)); + St(a.a, 0, d); + } + function Qld(a) { + var b, c, d, e; + b = null; + for ( + d = ul( + pl( + OC(GC(KI, 1), Uhe, 20, 0, [ + (!a.b && (a.b = new y5d(z2, a, 4, 7)), a.b), + (!a.c && (a.c = new y5d(z2, a, 5, 8)), a.c), + ]) + ) + ); + Qr(d); + + ) { + c = BD(Rr(d), 82); + e = atd(c); + if (!b) { + b = e; + } else if (b != e) { + return false; + } + } + return true; + } + function sud(a, b, c) { + var d; + ++a.j; + if (b >= a.i) throw vbb(new qcb(lue + b + mue + a.i)); + if (c >= a.i) throw vbb(new qcb(nue + c + mue + a.i)); + d = a.g[c]; + if (b != c) { + b < c ? $fb(a.g, b, a.g, b + 1, c - b) : $fb(a.g, c + 1, a.g, c, b - c); + NC(a.g, b, d); + a.ei(b, d, c); + a.ci(); + } + return d; + } + function Rc(a, b, c) { + var d; + d = BD(a.c.xc(b), 14); + if (!d) { + d = a.ic(b); + if (d.Fc(c)) { + ++a.d; + a.c.zc(b, d); + return true; + } else { + throw vbb(new ycb("New Collection violated the Collection spec")); + } + } else if (d.Fc(c)) { + ++a.d; + return true; + } else { + return false; + } + } + function heb(a) { + var b, c, d; + if (a < 0) { + return 0; + } else if (a == 0) { + return 32; + } else { + d = -(a >> 16); + b = (d >> 16) & 16; + c = 16 - b; + a = a >> b; + d = a - 256; + b = (d >> 16) & 8; + c += b; + a <<= b; + d = a - Rje; + b = (d >> 16) & 4; + c += b; + a <<= b; + d = a - oie; + b = (d >> 16) & 2; + c += b; + a <<= b; + d = a >> 14; + b = d & ~(d >> 1); + return c + 2 - b; + } + } + function $Pb(a) { + QPb(); + var b, c, d, e; + PPb = new Rkb(); + OPb = new Lqb(); + NPb = new Rkb(); + b = (!a.a && (a.a = new cUd(E2, a, 10, 11)), a.a); + SPb(b); + for (e = new Fyd(b); e.e != e.i.gc(); ) { + d = BD(Dyd(e), 33); + if (Jkb(PPb, d, 0) == -1) { + c = new Rkb(); + Ekb(NPb, c); + TPb(d, c); + } + } + return NPb; + } + function BQb(a, b, c) { + var d, e, f, g; + a.a = c.b.d; + if (JD(b, 352)) { + e = itd(BD(b, 79), false, false); + f = ofd(e); + d = new FQb(a); + reb(f, d); + ifd(f, e); + b.We((Y9c(), Q8c)) != null && reb(BD(b.We(Q8c), 74), d); + } else { + g = BD(b, 470); + g.Hg(g.Dg() + a.a.a); + g.Ig(g.Eg() + a.a.b); + } + } + function _5b(a, b) { + var c, d, e, f, g, h, i, j; + j = Edb(ED(vNb(b, (Nyc(), zyc)))); + i = a[0].n.a + a[0].o.a + a[0].d.c + j; + for (h = 1; h < a.length; h++) { + d = a[h].n; + e = a[h].o; + c = a[h].d; + f = d.a - c.b - i; + f < 0 && (d.a -= f); + g = b.f; + g.a = Math.max(g.a, d.a + e.a); + i = d.a + e.a + c.c + j; + } + } + function D$c(a, b) { + var c, d, e, f, g, h; + d = BD(BD(Ohb(a.g, b.a), 46).a, 65); + e = BD(BD(Ohb(a.g, b.b), 46).a, 65); + f = d.b; + g = e.b; + c = z6c(f, g); + if (c >= 0) { + return c; + } + h = U6c( + c7c( + new f7c(g.c + g.b / 2, g.d + g.a / 2), + new f7c(f.c + f.b / 2, f.d + f.a / 2) + ) + ); + return -(xOb(f, g) - 1) * h; + } + function ufd(a, b, c) { + var d; + MAb( + new YAb(null, (!c.a && (c.a = new cUd(A2, c, 6, 6)), new Kub(c.a, 16))), + new Mfd(a, b) + ); + MAb( + new YAb(null, (!c.n && (c.n = new cUd(D2, c, 1, 7)), new Kub(c.n, 16))), + new Ofd(a, b) + ); + d = BD(hkd(c, (Y9c(), Q8c)), 74); + !!d && p7c(d, a, b); + } + function sid(a, b, c) { + var d, e, f; + f = e1d((O6d(), M6d), a.Tg(), b); + if (f) { + Q6d(); + BD(f, 66).Oj() || (f = _1d(q1d(M6d, f))); + e = + ((d = a.Yg(f)), + BD(d >= 0 ? a._g(d, true, true) : sid(a, f, true), 153)); + return BD(e, 215).hl(b, c); + } else { + throw vbb(new Wdb(ite + b.ne() + lte)); + } + } + function wAd(a, b, c, d) { + var e, f, g, h, i; + e = a.d[b]; + if (e) { + f = e.g; + i = e.i; + if (d != null) { + for (h = 0; h < i; ++h) { + g = BD(f[h], 133); + if (g.Sh() == c && pb(d, g.cd())) { + return g; + } + } + } else { + for (h = 0; h < i; ++h) { + g = BD(f[h], 133); + if (PD(g.cd()) === PD(d)) { + return g; + } + } + } + } + return null; + } + function Pgb(a, b) { + var c; + if (b < 0) { + throw vbb(new ocb("Negative exponent")); + } + if (b == 0) { + return Cgb; + } else if (b == 1 || Kgb(a, Cgb) || Kgb(a, Ggb)) { + return a; + } + if (!Sgb(a, 0)) { + c = 1; + while (!Sgb(a, c)) { + ++c; + } + return Ogb(bhb(c * b), Pgb(Rgb(a, c), b)); + } + return Jhb(a, b); + } + function xlb(a, b) { + var c, d, e; + if (PD(a) === PD(b)) { + return true; + } + if (a == null || b == null) { + return false; + } + if (a.length != b.length) { + return false; + } + for (c = 0; c < a.length; ++c) { + d = a[c]; + e = b[c]; + if (!(PD(d) === PD(e) || (d != null && pb(d, e)))) { + return false; + } + } + return true; + } + function CVb(a) { + nVb(); + var b, c, d; + this.b = mVb; + this.c = (ead(), cad); + this.f = (iVb(), hVb); + this.a = a; + zVb(this, new DVb()); + sVb(this); + for (d = new olb(a.b); d.a < d.c.c.length; ) { + c = BD(mlb(d), 81); + if (!c.d) { + b = new gVb(OC(GC(IP, 1), Uhe, 81, 0, [c])); + Ekb(a.a, b); + } + } + } + function D3b(a, b, c) { + var d, e, f, g, h, i; + if (!a || a.c.length == 0) { + return null; + } + f = new cIb(b, !c); + for (e = new olb(a); e.a < e.c.c.length; ) { + d = BD(mlb(e), 70); + UHb(f, (a$b(), new v$b(d))); + } + g = f.i; + g.a = ((i = f.n), f.e.b + i.d + i.a); + g.b = ((h = f.n), f.e.a + h.b + h.c); + return f; + } + function O5b(a) { + var b, c, d, e, f, g, h; + h = l_b(a.a); + Nlb(h, new T5b()); + c = null; + for (e = h, f = 0, g = e.length; f < g; ++f) { + d = e[f]; + if (d.k != (j0b(), e0b)) { + break; + } + b = BD(vNb(d, (wtc(), Hsc)), 61); + if (b != (Ucd(), Tcd) && b != zcd) { + continue; + } + !!c && BD(vNb(c, Qsc), 15).Fc(d); + c = d; + } + } + function YOc(a, b, c) { + var d, e, f, g, h, i, j; + i = (tCb(b, a.c.length), BD(a.c[b], 329)); + Kkb(a, b); + if (i.b / 2 >= c) { + d = b; + j = (i.c + i.a) / 2; + g = j - c; + if (i.c <= j - c) { + e = new bPc(i.c, g); + Dkb(a, d++, e); + } + h = j + c; + if (h <= i.a) { + f = new bPc(h, i.a); + wCb(d, a.c.length); + aCb(a.c, d, f); + } + } + } + function u0d(a) { + var b; + if (!a.c && a.g == null) { + a.d = a.si(a.f); + wtd(a, a.d); + b = a.d; + } else { + if (a.g == null) { + return true; + } else if (a.i == 0) { + return false; + } else { + b = BD(a.g[a.i - 1], 47); + } + } + if (b == a.b && null.km >= null.jm()) { + Vud(a); + return u0d(a); + } else { + return b.Ob(); + } + } + function KTb(a, b, c) { + var d, e, f, g, h; + h = c; + !h && (h = Ydd(new Zdd(), 0)); + Odd(h, Vme, 1); + aUb(a.c, b); + g = EYb(a.a, b); + if (g.gc() == 1) { + MTb(BD(g.Xb(0), 37), h); + } else { + f = 1 / g.gc(); + for (e = g.Kc(); e.Ob(); ) { + d = BD(e.Pb(), 37); + MTb(d, Udd(h, f)); + } + } + CYb(a.a, g, b); + NTb(b); + Qdd(h); + } + function qYb(a) { + this.a = a; + if (a.c.i.k == (j0b(), e0b)) { + this.c = a.c; + this.d = BD(vNb(a.c.i, (wtc(), Hsc)), 61); + } else if (a.d.i.k == e0b) { + this.c = a.d; + this.d = BD(vNb(a.d.i, (wtc(), Hsc)), 61); + } else { + throw vbb(new Wdb("Edge " + a + " is not an external edge.")); + } + } + function oQd(a, b) { + var c, d, e; + e = a.b; + a.b = b; + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new nSd(a, 1, 3, e, a.b)); + if (!b) { + pnd(a, null); + qQd(a, 0); + pQd(a, null); + } else if (b != a) { + pnd(a, b.zb); + qQd(a, b.d); + c = ((d = b.c), d == null ? b.zb : d); + pQd(a, c == null || dfb(c, b.zb) ? null : c); + } + } + function NRd(a) { + var b, c; + if (a.f) { + while (a.n < a.o) { + b = BD(!a.j ? a.k.Xb(a.n) : a.j.pi(a.n), 72); + c = b.ak(); + if ( + JD(c, 99) && + (BD(c, 18).Bb & ote) != 0 && + (!a.e || c.Gj() != x2 || c.aj() != 0) && + b.dd() != null + ) { + return true; + } else { + ++a.n; + } + } + return false; + } else { + return a.n < a.o; + } + } + function _i(a, b) { + var c; + this.e = (im(), Qb(a), im(), nm(a)); + this.c = (Qb(b), nm(b)); + Lb(this.e.Hd().dc() == this.c.Hd().dc()); + this.d = Ev(this.e); + this.b = Ev(this.c); + c = IC( + SI, + [nie, Uhe], + [5, 1], + 5, + [this.e.Hd().gc(), this.c.Hd().gc()], + 2 + ); + this.a = c; + Ri(this); + } + function vz(b) { + var c = (!tz && (tz = wz()), tz); + var d = b.replace( + /[\x00-\x1f\xad\u0600-\u0603\u06dd\u070f\u17b4\u17b5\u200b-\u200f\u2028-\u202e\u2060-\u2064\u206a-\u206f\ufeff\ufff9-\ufffb"\\]/g, + function (a) { + return uz(a, c); + } + ); + return '"' + d + '"'; + } + function cEb(a) { + ODb(); + var b, c; + this.b = LDb; + this.c = NDb; + this.g = (FDb(), EDb); + this.d = (ead(), cad); + this.a = a; + RDb(this); + for (c = new olb(a.b); c.a < c.c.c.length; ) { + b = BD(mlb(c), 57); + !b.a && pDb(rDb(new sDb(), OC(GC(PM, 1), Uhe, 57, 0, [b])), a); + b.e = new K6c(b.d); + } + } + function HQb(a) { + var b, c, d, e, f, g; + e = a.e.c.length; + d = KC(yK, eme, 15, e, 0, 1); + for (g = new olb(a.e); g.a < g.c.c.length; ) { + f = BD(mlb(g), 144); + d[f.b] = new Psb(); + } + for (c = new olb(a.c); c.a < c.c.c.length; ) { + b = BD(mlb(c), 282); + d[b.c.b].Fc(b); + d[b.d.b].Fc(b); + } + return d; + } + function fDc(a) { + var b, c, d, e, f, g, h; + h = Pu(a.c.length); + for (e = new olb(a); e.a < e.c.c.length; ) { + d = BD(mlb(e), 10); + g = new Tqb(); + f = U_b(d); + for (c = new Sr(ur(f.a.Kc(), new Sq())); Qr(c); ) { + b = BD(Rr(c), 17); + b.c.i == b.d.i || Qqb(g, b.d.i); + } + h.c[h.c.length] = g; + } + return h; + } + function ozd(a, b) { + var c, d, e, f, g; + c = BD(Ajd(a.a, 4), 126); + g = c == null ? 0 : c.length; + if (b >= g) throw vbb(new Cyd(b, g)); + e = c[b]; + if (g == 1) { + d = null; + } else { + d = KC($3, hve, 415, g - 1, 0, 1); + $fb(c, 0, d, 0, b); + f = g - b - 1; + f > 0 && $fb(c, b + 1, d, b, f); + } + b0d(a, d); + a0d(a, b, e); + return e; + } + function m8d() { + m8d = ccb; + k8d = BD(qud(ZKd((r8d(), q8d).qb), 6), 34); + h8d = BD(qud(ZKd(q8d.qb), 3), 34); + i8d = BD(qud(ZKd(q8d.qb), 4), 34); + j8d = BD(qud(ZKd(q8d.qb), 5), 18); + XId(k8d); + XId(h8d); + XId(i8d); + XId(j8d); + l8d = new amb(OC(GC(t5, 1), Mve, 170, 0, [k8d, h8d])); + } + function AJb(a, b) { + var c; + this.d = new H_b(); + this.b = b; + this.e = new g7c(b.qf()); + c = a.u.Hc((rcd(), ocd)); + a.u.Hc(ncd) + ? a.D + ? (this.a = c && !b.If()) + : (this.a = true) + : a.u.Hc(pcd) + ? c + ? (this.a = !(b.zf().Kc().Ob() || b.Bf().Kc().Ob())) + : (this.a = false) + : (this.a = false); + } + function IKb(a, b) { + var c, d, e, f; + c = a.o.a; + for (f = BD(BD(Qc(a.r, b), 21), 84).Kc(); f.Ob(); ) { + e = BD(f.Pb(), 111); + e.e.a = + ((d = e.b), + d.Xe((Y9c(), s9c)) + ? d.Hf() == (Ucd(), Tcd) + ? -d.rf().a - Edb(ED(d.We(s9c))) + : c + Edb(ED(d.We(s9c))) + : d.Hf() == (Ucd(), Tcd) + ? -d.rf().a + : c); + } + } + function Q1b(a, b) { + var c, d, e, f; + c = BD(vNb(a, (Nyc(), Lwc)), 103); + f = BD(hkd(b, $xc), 61); + e = BD(vNb(a, Vxc), 98); + if (e != (dcd(), bcd) && e != ccd) { + if (f == (Ucd(), Scd)) { + f = lfd(b, c); + f == Scd && (f = Zcd(c)); + } + } else { + d = M1b(b); + d > 0 ? (f = Zcd(c)) : (f = Wcd(Zcd(c))); + } + jkd(b, $xc, f); + } + function olc(a, b) { + var c, d, e, f, g; + g = a.j; + b.a != b.b && Okb(g, new Ulc()); + e = (g.c.length / 2) | 0; + for (d = 0; d < e; d++) { + f = (tCb(d, g.c.length), BD(g.c[d], 113)); + f.c && G0b(f.d, b.a); + } + for (c = e; c < g.c.length; c++) { + f = (tCb(c, g.c.length), BD(g.c[c], 113)); + f.c && G0b(f.d, b.b); + } + } + function TGc(a, b, c) { + var d, e, f; + d = a.c[b.c.p][b.p]; + e = a.c[c.c.p][c.p]; + if (d.a != null && e.a != null) { + f = Ddb(d.a, e.a); + f < 0 ? WGc(a, b, c) : f > 0 && WGc(a, c, b); + return f; + } else if (d.a != null) { + WGc(a, b, c); + return -1; + } else if (e.a != null) { + WGc(a, c, b); + return 1; + } + return 0; + } + function swd(a, b) { + var c, d, e, f; + if (a.ej()) { + c = a.Vi(); + f = a.fj(); + ++a.j; + a.Hi(c, a.oi(c, b)); + d = a.Zi(3, null, b, c, f); + if (a.bj()) { + e = a.cj(b, null); + if (!e) { + a.$i(d); + } else { + e.Ei(d); + e.Fi(); + } + } else { + a.$i(d); + } + } else { + Bvd(a, b); + if (a.bj()) { + e = a.cj(b, null); + !!e && e.Fi(); + } + } + } + function D2d(a, b) { + var c, d, e, f, g; + g = S6d(a.e.Tg(), b); + e = new yud(); + c = BD(a.g, 119); + for (f = a.i; --f >= 0; ) { + d = c[f]; + g.rl(d.ak()) && wtd(e, d); + } + !Yxd(a, e) && + oid(a.e) && + GLd( + a, + b.$j() + ? H2d(a, 6, b, (mmb(), jmb), null, -1, false) + : H2d(a, b.Kj() ? 2 : 1, b, null, null, -1, false) + ); + } + function Dhb() { + Dhb = ccb; + var a, b; + Bhb = KC(cJ, nie, 91, 32, 0, 1); + Chb = KC(cJ, nie, 91, 32, 0, 1); + a = 1; + for (b = 0; b <= 18; b++) { + Bhb[b] = ghb(a); + Chb[b] = ghb(Nbb(a, b)); + a = Ibb(a, 5); + } + for (; b < Chb.length; b++) { + Bhb[b] = Ogb(Bhb[b - 1], Bhb[1]); + Chb[b] = Ogb(Chb[b - 1], (Hgb(), Egb)); + } + } + function K4b(a, b) { + var c, d, e, f, g; + if (a.a == (yrc(), wrc)) { + return true; + } + f = b.a.c; + c = b.a.c + b.a.b; + if (b.j) { + d = b.A; + g = d.c.c.a - d.o.a / 2; + e = f - (d.n.a + d.o.a); + if (e > g) { + return false; + } + } + if (b.q) { + d = b.C; + g = d.c.c.a - d.o.a / 2; + e = d.n.a - c; + if (e > g) { + return false; + } + } + return true; + } + function wcc(a, b) { + var c; + Odd(b, "Partition preprocessing", 1); + c = BD( + GAb( + JAb( + LAb(JAb(new YAb(null, new Kub(a.a, 16)), new Acc()), new Ccc()), + new Ecc() + ), + Byb( + new fzb(), + new dzb(), + new Ezb(), + OC(GC(xL, 1), Kie, 132, 0, [(Fyb(), Dyb)]) + ) + ), + 15 + ); + MAb(c.Oc(), new Gcc()); + Qdd(b); + } + function DMc(a) { + wMc(); + var b, c, d, e, f, g, h; + c = new $rb(); + for (e = new olb(a.e.b); e.a < e.c.c.length; ) { + d = BD(mlb(e), 29); + for (g = new olb(d.a); g.a < g.c.c.length; ) { + f = BD(mlb(g), 10); + h = a.g[f.p]; + b = BD(Wrb(c, h), 15); + if (!b) { + b = new Rkb(); + Xrb(c, h, b); + } + b.Fc(f); + } + } + return c; + } + function dRc(a, b) { + var c, d, e, f, g; + e = b.b.b; + a.a = KC(yK, eme, 15, e, 0, 1); + a.b = KC(sbb, dle, 25, e, 16, 1); + for (g = Jsb(b.b, 0); g.b != g.d.c; ) { + f = BD(Xsb(g), 86); + a.a[f.g] = new Psb(); + } + for (d = Jsb(b.a, 0); d.b != d.d.c; ) { + c = BD(Xsb(d), 188); + a.a[c.b.g].Fc(c); + a.a[c.c.g].Fc(c); + } + } + function qmd(a) { + var b; + if ((a.Db & 64) != 0) return Eid(a); + b = new Jfb(Eid(a)); + b.a += " (startX: "; + Bfb(b, a.j); + b.a += ", startY: "; + Bfb(b, a.k); + b.a += ", endX: "; + Bfb(b, a.b); + b.a += ", endY: "; + Bfb(b, a.c); + b.a += ", identifier: "; + Efb(b, a.d); + b.a += ")"; + return b.a; + } + function EId(a) { + var b; + if ((a.Db & 64) != 0) return qnd(a); + b = new Jfb(qnd(a)); + b.a += " (ordered: "; + Ffb(b, (a.Bb & 256) != 0); + b.a += ", unique: "; + Ffb(b, (a.Bb & 512) != 0); + b.a += ", lowerBound: "; + Cfb(b, a.s); + b.a += ", upperBound: "; + Cfb(b, a.t); + b.a += ")"; + return b.a; + } + function Wnd(a, b, c, d, e, f, g, h) { + var i; + JD(a.Cb, 88) && XMd($Kd(BD(a.Cb, 88)), 4); + pnd(a, c); + a.f = d; + dJd(a, e); + fJd(a, f); + ZId(a, g); + eJd(a, false); + CId(a, true); + aJd(a, h); + BId(a, true); + AId(a, 0); + a.b = 0; + DId(a, 1); + i = xId(a, b, null); + !!i && i.Fi(); + MJd(a, false); + return a; + } + function fyb(a, b) { + var c, d, e, f; + c = BD(Phb(a.a, b), 512); + if (!c) { + d = new wyb(b); + e = (oyb(), lyb) ? null : d.c; + f = qfb(e, 0, Math.max(0, kfb(e, wfb(46)))); + vyb(d, fyb(a, f)); + (lyb ? null : d.c).length == 0 && qyb(d, new zyb()); + Shb(a.a, lyb ? null : d.c, d); + return d; + } + return c; + } + function BOb(a, b) { + var c; + a.b = b; + a.g = new Rkb(); + c = COb(a.b); + a.e = c; + a.f = c; + a.c = Ccb(DD(vNb(a.b, (fFb(), $Eb)))); + a.a = ED(vNb(a.b, (Y9c(), r8c))); + a.a == null && (a.a = 1); + Edb(a.a) > 1 ? (a.e *= Edb(a.a)) : (a.f /= Edb(a.a)); + DOb(a); + EOb(a); + AOb(a); + yNb(a.b, (CPb(), uPb), a.g); + } + function Y5b(a, b, c) { + var d, e, f, g, h, i; + d = 0; + i = c; + if (!b) { + d = c * (a.c.length - 1); + i *= -1; + } + for (f = new olb(a); f.a < f.c.c.length; ) { + e = BD(mlb(f), 10); + yNb(e, (Nyc(), mwc), (F7c(), B7c)); + e.o.a = d; + for (h = Y_b(e, (Ucd(), zcd)).Kc(); h.Ob(); ) { + g = BD(h.Pb(), 11); + g.n.a = d; + } + d += i; + } + } + function Qxd(a, b, c) { + var d, e, f; + if (a.ej()) { + f = a.fj(); + kud(a, b, c); + d = a.Zi(3, null, c, b, f); + if (a.bj()) { + e = a.cj(c, null); + a.ij() && (e = a.jj(c, e)); + if (!e) { + a.$i(d); + } else { + e.Ei(d); + e.Fi(); + } + } else { + a.$i(d); + } + } else { + kud(a, b, c); + if (a.bj()) { + e = a.cj(c, null); + !!e && e.Fi(); + } + } + } + function ILd(a, b, c) { + var d, e, f, g, h, i; + h = a.Gk(c); + if (h != c) { + g = a.g[b]; + i = h; + mud(a, b, a.oi(b, i)); + f = g; + a.gi(b, i, f); + if (a.rk()) { + d = c; + e = a.dj(d, null); + !BD(h, 49).eh() && (e = a.cj(i, e)); + !!e && e.Fi(); + } + oid(a.e) && GLd(a, a.Zi(9, c, h, b, false)); + return h; + } else { + return c; + } + } + function pVb(a, b) { + var c, d, e, f; + for (d = new olb(a.a.a); d.a < d.c.c.length; ) { + c = BD(mlb(d), 189); + c.g = true; + } + for (f = new olb(a.a.b); f.a < f.c.c.length; ) { + e = BD(mlb(f), 81); + e.k = Ccb(DD(a.e.Kb(new vgd(e, b)))); + e.d.g = e.d.g & Ccb(DD(a.e.Kb(new vgd(e, b)))); + } + return a; + } + function pkc(a) { + var b, c, d, e, f; + c = ((b = BD(gdb(F1), 9)), new xqb(b, BD(_Bb(b, b.length), 9), 0)); + f = BD(vNb(a, (wtc(), gtc)), 10); + if (f) { + for (e = new olb(f.j); e.a < e.c.c.length; ) { + d = BD(mlb(e), 11); + PD(vNb(d, $sc)) === PD(a) && a1b(new b1b(d.b)) && rqb(c, d.j); + } + } + return c; + } + function zCc(a, b, c) { + var d, e, f, g, h; + if (a.d[c.p]) { + return; + } + for (e = new Sr(ur(U_b(c).a.Kc(), new Sq())); Qr(e); ) { + d = BD(Rr(e), 17); + h = d.d.i; + for (g = new Sr(ur(R_b(h).a.Kc(), new Sq())); Qr(g); ) { + f = BD(Rr(g), 17); + f.c.i == b && (a.a[f.p] = true); + } + zCc(a, b, h); + } + a.d[c.p] = true; + } + function Bjd(a, b) { + var c, d, e, f, g, h, i; + d = aeb(a.Db & 254); + if (d == 1) { + a.Eb = null; + } else { + f = CD(a.Eb); + if (d == 2) { + e = zjd(a, b); + a.Eb = f[e == 0 ? 1 : 0]; + } else { + g = KC(SI, Uhe, 1, d - 1, 5, 1); + for (c = 2, h = 0, i = 0; c <= 128; c <<= 1) { + c == b ? ++h : (a.Db & c) != 0 && (g[i++] = f[h++]); + } + a.Eb = g; + } + } + a.Db &= ~b; + } + function n1d(a, b) { + var c, d, e, f, g; + d = (!b.s && (b.s = new cUd(t5, b, 21, 17)), b.s); + f = null; + for (e = 0, g = d.i; e < g; ++e) { + c = BD(qud(d, e), 170); + switch ($1d(q1d(a, c))) { + case 4: + case 5: + case 6: { + !f && (f = new Rkb()); + f.c[f.c.length] = c; + break; + } + } + } + return !f ? (mmb(), mmb(), jmb) : f; + } + function Uee(a) { + var b; + b = 0; + switch (a) { + case 105: + b = 2; + break; + case 109: + b = 8; + break; + case 115: + b = 4; + break; + case 120: + b = 16; + break; + case 117: + b = 32; + break; + case 119: + b = 64; + break; + case 70: + b = 256; + break; + case 72: + b = 128; + break; + case 88: + b = 512; + break; + case 44: + b = zte; + } + return b; + } + function Ghb(a, b, c, d, e) { + var f, g, h, i; + if (PD(a) === PD(b) && d == e) { + Lhb(a, d, c); + return; + } + for (h = 0; h < d; h++) { + g = 0; + f = a[h]; + for (i = 0; i < e; i++) { + g = wbb( + wbb(Ibb(xbb(f, Yje), xbb(b[i], Yje)), xbb(c[h + i], Yje)), + xbb(Tbb(g), Yje) + ); + c[h + i] = Tbb(g); + g = Pbb(g, 32); + } + c[h + e] = Tbb(g); + } + } + function COb(a) { + var b, c, d, e, f, g, h, i, j, k, l; + k = 0; + j = 0; + e = a.a; + h = e.a.gc(); + for (d = e.a.ec().Kc(); d.Ob(); ) { + c = BD(d.Pb(), 561); + b = (c.b && LOb(c), c.a); + l = b.a; + g = b.b; + k += l + g; + j += l * g; + } + i = Math.sqrt(400 * h * j - 4 * j + k * k) + k; + f = 2 * (100 * h - 1); + if (f == 0) { + return i; + } + return i / f; + } + function mOc(a, b) { + if (b.b != 0) { + isNaN(a.s) + ? (a.s = Edb((sCb(b.b != 0), ED(b.a.a.c)))) + : (a.s = Math.min(a.s, Edb((sCb(b.b != 0), ED(b.a.a.c))))); + isNaN(a.c) + ? (a.c = Edb((sCb(b.b != 0), ED(b.c.b.c)))) + : (a.c = Math.max(a.c, Edb((sCb(b.b != 0), ED(b.c.b.c))))); + } + } + function Pld(a) { + var b, c, d, e; + b = null; + for ( + d = ul( + pl( + OC(GC(KI, 1), Uhe, 20, 0, [ + (!a.b && (a.b = new y5d(z2, a, 4, 7)), a.b), + (!a.c && (a.c = new y5d(z2, a, 5, 8)), a.c), + ]) + ) + ); + Qr(d); + + ) { + c = BD(Rr(d), 82); + e = atd(c); + if (!b) { + b = Xod(e); + } else if (b != Xod(e)) { + return true; + } + } + return false; + } + function Rxd(a, b) { + var c, d, e, f; + if (a.ej()) { + c = a.i; + f = a.fj(); + lud(a, b); + d = a.Zi(3, null, b, c, f); + if (a.bj()) { + e = a.cj(b, null); + a.ij() && (e = a.jj(b, e)); + if (!e) { + a.$i(d); + } else { + e.Ei(d); + e.Fi(); + } + } else { + a.$i(d); + } + } else { + lud(a, b); + if (a.bj()) { + e = a.cj(b, null); + !!e && e.Fi(); + } + } + } + function rwd(a, b, c) { + var d, e, f; + if (a.ej()) { + f = a.fj(); + ++a.j; + a.Hi(b, a.oi(b, c)); + d = a.Zi(3, null, c, b, f); + if (a.bj()) { + e = a.cj(c, null); + if (!e) { + a.$i(d); + } else { + e.Ei(d); + e.Fi(); + } + } else { + a.$i(d); + } + } else { + ++a.j; + a.Hi(b, a.oi(b, c)); + if (a.bj()) { + e = a.cj(c, null); + !!e && e.Fi(); + } + } + } + function Wee(a) { + var b, c, d, e; + e = a.length; + b = null; + for (d = 0; d < e; d++) { + c = (BCb(d, a.length), a.charCodeAt(d)); + if (hfb(".*+?{[()|\\^$", wfb(c)) >= 0) { + if (!b) { + b = new Ifb(); + d > 0 && Efb(b, a.substr(0, d)); + } + b.a += "\\"; + Afb(b, c & aje); + } else !!b && Afb(b, c & aje); + } + return b ? b.a : a; + } + function l5c(a) { + var b; + if (!a.a) { + throw vbb(new Zdb("IDataType class expected for layout option " + a.f)); + } + b = gvd(a.a); + if (b == null) { + throw vbb( + new Zdb( + "Couldn't create new instance of property '" + + a.f + + "'. " + + ise + + (fdb(Y3), Y3.k) + + jse + ) + ); + } + return BD(b, 414); + } + function aid(a) { + var b, c, d, e, f; + f = a.eh(); + if (f) { + if (f.kh()) { + e = xid(a, f); + if (e != f) { + c = a.Vg(); + d = + ((b = a.Vg()), + b >= 0 ? a.Qg(null) : a.eh().ih(a, -1 - b, null, null)); + a.Rg(BD(e, 49), c); + !!d && d.Fi(); + a.Lg() && a.Mg() && c > -1 && Uhd(a, new nSd(a, 9, c, f, e)); + return e; + } + } + } + return f; + } + function nTb(a) { + var b, c, d, e, f, g, h, i; + g = 0; + f = a.f.e; + for (d = 0; d < f.c.length; ++d) { + h = (tCb(d, f.c.length), BD(f.c[d], 144)); + for (e = d + 1; e < f.c.length; ++e) { + i = (tCb(e, f.c.length), BD(f.c[e], 144)); + c = S6c(h.d, i.d); + b = c - a.a[h.b][i.b]; + g += a.i[h.b][i.b] * b * b; + } + } + return g; + } + function _ac(a, b) { + var c; + if (wNb(b, (Nyc(), mxc))) { + return; + } + c = hbc(BD(vNb(b, Uac), 360), BD(vNb(a, mxc), 163)); + yNb(b, Uac, c); + if (Qr(new Sr(ur(O_b(b).a.Kc(), new Sq())))) { + return; + } + switch (c.g) { + case 1: + yNb(b, mxc, (Ctc(), xtc)); + break; + case 2: + yNb(b, mxc, (Ctc(), ztc)); + } + } + function wkc(a, b) { + var c; + mkc(a); + a.a = + ((c = new Ji()), MAb(new YAb(null, new Kub(b.d, 16)), new Vkc(c)), c); + rkc(a, BD(vNb(b.b, (Nyc(), Wwc)), 376)); + tkc(a); + skc(a); + qkc(a); + ukc(a); + vkc(a, b); + MAb(LAb(new YAb(null, $i(Yi(a.b).a)), new Lkc()), new Nkc()); + b.a = false; + a.a = null; + } + function Bod() { + fod.call(this, yte, (Fhd(), Ehd)); + this.p = null; + this.a = null; + this.f = null; + this.n = null; + this.g = null; + this.c = null; + this.i = null; + this.j = null; + this.d = null; + this.b = null; + this.e = null; + this.k = null; + this.o = null; + this.s = null; + this.q = false; + this.r = false; + } + function Csd() { + Csd = ccb; + Bsd = new Dsd(Wne, 0); + ysd = new Dsd("INSIDE_SELF_LOOPS", 1); + zsd = new Dsd("MULTI_EDGES", 2); + xsd = new Dsd("EDGE_LABELS", 3); + Asd = new Dsd("PORTS", 4); + vsd = new Dsd("COMPOUND", 5); + usd = new Dsd("CLUSTERS", 6); + wsd = new Dsd("DISCONNECTED", 7); + } + function Sgb(a, b) { + var c, d, e; + if (b == 0) { + return (a.a[0] & 1) != 0; + } + if (b < 0) { + throw vbb(new ocb("Negative bit address")); + } + e = b >> 5; + if (e >= a.d) { + return a.e < 0; + } + c = a.a[e]; + b = 1 << (b & 31); + if (a.e < 0) { + d = Mgb(a); + if (e < d) { + return false; + } else d == e ? (c = -c) : (c = ~c); + } + return (c & b) != 0; + } + function O1c(a, b, c, d) { + var e; + BD(c.b, 65); + BD(c.b, 65); + BD(d.b, 65); + BD(d.b, 65); + e = c7c(R6c(BD(c.b, 65).c), BD(d.b, 65).c); + $6c(e, YNb(BD(c.b, 65), BD(d.b, 65), e)); + BD(d.b, 65); + BD(d.b, 65); + BD(d.b, 65).c.a + e.a; + BD(d.b, 65).c.b + e.b; + BD(d.b, 65); + Hkb(d.a, new T1c(a, b, d)); + } + function vNd(a, b) { + var c, d, e, f, g, h, i; + f = b.e; + if (f) { + c = aid(f); + d = BD(a.g, 674); + for (g = 0; g < a.i; ++g) { + i = d[g]; + if (JQd(i) == c) { + e = (!i.d && (i.d = new xMd(j5, i, 1)), i.d); + h = BD(c.ah(Nid(f, f.Cb, f.Db >> 16)), 15).Xc(f); + if (h < e.i) { + return vNd(a, BD(qud(e, h), 87)); + } + } + } + } + return b; + } + function bcb(a, b, c) { + var d = _bb, + h; + var e = d[a]; + var f = e instanceof Array ? e[0] : null; + if (e && !f) { + _ = e; + } else { + _ = ((h = b && b.prototype), !h && (h = _bb[b]), ecb(h)); + _.hm = c; + !b && (_.im = gcb); + d[a] = _; + } + for (var g = 3; g < arguments.length; ++g) { + arguments[g].prototype = _; + } + f && (_.gm = f); + } + function Qr(a) { + var b; + while (!BD(Qb(a.a), 47).Ob()) { + a.d = Pr(a); + if (!a.d) { + return false; + } + a.a = BD(a.d.Pb(), 47); + if (JD(a.a, 39)) { + b = BD(a.a, 39); + a.a = b.a; + !a.b && (a.b = new jkb()); + Wjb(a.b, a.d); + if (b.b) { + while (!akb(b.b)) { + Wjb(a.b, BD(gkb(b.b), 47)); + } + } + a.d = b.d; + } + } + return true; + } + function krb(a, b) { + var c, d, e, f, g; + f = b == null ? 0 : a.b.se(b); + d = ((c = a.a.get(f)), c == null ? new Array() : c); + for (g = 0; g < d.length; g++) { + e = d[g]; + if (a.b.re(b, e.cd())) { + if (d.length == 1) { + d.length = 0; + trb(a.a, f); + } else { + d.splice(g, 1); + } + --a.c; + zpb(a.b); + return e.dd(); + } + } + return null; + } + function GGb(a, b) { + var c, d, e, f; + e = 1; + b.j = true; + f = null; + for (d = new olb(LFb(b)); d.a < d.c.c.length; ) { + c = BD(mlb(d), 213); + if (!a.c[c.c]) { + a.c[c.c] = true; + f = xFb(c, b); + if (c.f) { + e += GGb(a, f); + } else if (!f.j && c.a == c.e.e - c.d.e) { + c.f = true; + Qqb(a.p, c); + e += GGb(a, f); + } + } + } + return e; + } + function MVb(a) { + var b, c, d; + for (c = new olb(a.a.a.b); c.a < c.c.c.length; ) { + b = BD(mlb(c), 81); + d = (uCb(0), 0); + if (d > 0) { + !(fad(a.a.c) && b.n.d) && + !(gad(a.a.c) && b.n.b) && + (b.g.d += Math.max(0, d / 2 - 0.5)); + !(fad(a.a.c) && b.n.a) && !(gad(a.a.c) && b.n.c) && (b.g.a -= d - 1); + } + } + } + function N3b(a) { + var b, c, d, e, f; + e = new Rkb(); + f = O3b(a, e); + b = BD(vNb(a, (wtc(), gtc)), 10); + if (b) { + for (d = new olb(b.j); d.a < d.c.c.length; ) { + c = BD(mlb(d), 11); + PD(vNb(c, $sc)) === PD(a) && (f = Math.max(f, O3b(c, e))); + } + } + e.c.length == 0 || yNb(a, Ysc, f); + return f != -1 ? e : null; + } + function a9b(a, b, c) { + var d, e, f, g, h, i; + f = BD(Ikb(b.e, 0), 17).c; + d = f.i; + e = d.k; + i = BD(Ikb(c.g, 0), 17).d; + g = i.i; + h = g.k; + e == (j0b(), g0b) + ? yNb(a, (wtc(), Vsc), BD(vNb(d, Vsc), 11)) + : yNb(a, (wtc(), Vsc), f); + h == g0b + ? yNb(a, (wtc(), Wsc), BD(vNb(g, Wsc), 11)) + : yNb(a, (wtc(), Wsc), i); + } + function Rs(a, b) { + var c, d, e, f; + f = Tbb(Ibb(Eie, keb(Tbb(Ibb(b == null ? 0 : tb(b), Fie)), 15))); + c = f & (a.b.length - 1); + e = null; + for (d = a.b[c]; d; e = d, d = d.a) { + if (d.d == f && Hb(d.i, b)) { + !e ? (a.b[c] = d.a) : (e.a = d.a); + Bs(d.c, d.f); + As(d.b, d.e); + --a.f; + ++a.e; + return true; + } + } + return false; + } + function lD(a, b) { + var c, d, e, f, g; + b &= 63; + c = a.h; + d = (c & Gje) != 0; + d && (c |= -1048576); + if (b < 22) { + g = c >> b; + f = (a.m >> b) | (c << (22 - b)); + e = (a.l >> b) | (a.m << (22 - b)); + } else if (b < 44) { + g = d ? Fje : 0; + f = c >> (b - 22); + e = (a.m >> (b - 22)) | (c << (44 - b)); + } else { + g = d ? Fje : 0; + f = d ? Eje : 0; + e = c >> (b - 44); + } + return TC(e & Eje, f & Eje, g & Fje); + } + function XOb(a) { + var b, c, d, e, f, g; + this.c = new Rkb(); + this.d = a; + d = Pje; + e = Pje; + b = Qje; + c = Qje; + for (g = Jsb(a, 0); g.b != g.d.c; ) { + f = BD(Xsb(g), 8); + d = Math.min(d, f.a); + e = Math.min(e, f.b); + b = Math.max(b, f.a); + c = Math.max(c, f.b); + } + this.a = new J6c(d, e, b - d, c - e); + } + function Dac(a, b) { + var c, d, e, f, g, h; + for (f = new olb(a.b); f.a < f.c.c.length; ) { + e = BD(mlb(f), 29); + for (h = new olb(e.a); h.a < h.c.c.length; ) { + g = BD(mlb(h), 10); + g.k == (j0b(), f0b) && zac(g, b); + for (d = new Sr(ur(U_b(g).a.Kc(), new Sq())); Qr(d); ) { + c = BD(Rr(d), 17); + yac(c, b); + } + } + } + } + function Xoc(a) { + var b, c, d; + this.c = a; + d = BD(vNb(a, (Nyc(), Lwc)), 103); + b = Edb(ED(vNb(a, owc))); + c = Edb(ED(vNb(a, Dyc))); + d == (ead(), aad) || d == bad || d == cad + ? (this.b = b * c) + : (this.b = 1 / (b * c)); + this.j = Edb(ED(vNb(a, wyc))); + this.e = Edb(ED(vNb(a, vyc))); + this.f = a.b.c.length; + } + function ADc(a) { + var b, c; + a.e = KC(WD, oje, 25, a.p.c.length, 15, 1); + a.k = KC(WD, oje, 25, a.p.c.length, 15, 1); + for (c = new olb(a.p); c.a < c.c.c.length; ) { + b = BD(mlb(c), 10); + a.e[b.p] = sr(new Sr(ur(R_b(b).a.Kc(), new Sq()))); + a.k[b.p] = sr(new Sr(ur(U_b(b).a.Kc(), new Sq()))); + } + } + function DDc(a) { + var b, c, d, e, f, g; + e = 0; + a.q = new Rkb(); + b = new Tqb(); + for (g = new olb(a.p); g.a < g.c.c.length; ) { + f = BD(mlb(g), 10); + f.p = e; + for (d = new Sr(ur(U_b(f).a.Kc(), new Sq())); Qr(d); ) { + c = BD(Rr(d), 17); + Qqb(b, c.d.i); + } + b.a.Bc(f) != null; + Ekb(a.q, new Vqb(b)); + b.a.$b(); + ++e; + } + } + function JTc() { + JTc = ccb; + CTc = new q0b(20); + BTc = new Osd((Y9c(), f9c), CTc); + HTc = new Osd(T9c, 20); + uTc = new Osd(r8c, tme); + ETc = new Osd(D9c, meb(1)); + GTc = new Osd(H9c, (Bcb(), true)); + vTc = y8c; + xTc = Y8c; + yTc = _8c; + zTc = b9c; + wTc = W8c; + ATc = e9c; + DTc = x9c; + ITc = (rTc(), pTc); + FTc = nTc; + } + function RBd(a, b) { + var c, d, e, f, g, h, i, j, k; + if (a.a.f > 0 && JD(b, 42)) { + a.a.qj(); + j = BD(b, 42); + i = j.cd(); + f = i == null ? 0 : tb(i); + g = DAd(a.a, f); + c = a.a.d[g]; + if (c) { + d = BD(c.g, 367); + k = c.i; + for (h = 0; h < k; ++h) { + e = d[h]; + if (e.Sh() == f && e.Fb(j)) { + RBd(a, j); + return true; + } + } + } + } + return false; + } + function skc(a) { + var b, c, d, e; + for (e = BD(Qc(a.a, (Xjc(), Ujc)), 15).Kc(); e.Ob(); ) { + d = BD(e.Pb(), 101); + c = + ((b = Ec(d.k)), + b.Hc((Ucd(), Acd)) + ? b.Hc(zcd) + ? b.Hc(Rcd) + ? b.Hc(Tcd) + ? null + : dkc + : fkc + : ekc + : ckc); + kkc(a, d, c[0], (Fkc(), Ckc), 0); + kkc(a, d, c[1], Dkc, 1); + kkc(a, d, c[2], Ekc, 1); + } + } + function enc(a, b) { + var c, d; + c = fnc(b); + inc(a, b, c); + uPc(a.a, BD(vNb(Q_b(b.b), (wtc(), jtc)), 230)); + dnc(a); + cnc(a, b); + d = KC(WD, oje, 25, b.b.j.c.length, 15, 1); + lnc(a, b, (Ucd(), Acd), d, c); + lnc(a, b, zcd, d, c); + lnc(a, b, Rcd, d, c); + lnc(a, b, Tcd, d, c); + a.a = null; + a.c = null; + a.b = null; + } + function OYc() { + OYc = ccb; + LYc = (zYc(), yYc); + KYc = new Nsd(Bre, LYc); + IYc = new Nsd(Cre, (Bcb(), true)); + meb(-1); + FYc = new Nsd(Dre, meb(-1)); + meb(-1); + GYc = new Nsd(Ere, meb(-1)); + JYc = new Nsd(Fre, false); + MYc = new Nsd(Gre, true); + HYc = new Nsd(Hre, false); + NYc = new Nsd(Ire, -1); + } + function yld(a, b, c) { + switch (b) { + case 7: + !a.e && (a.e = new y5d(B2, a, 7, 4)); + Uxd(a.e); + !a.e && (a.e = new y5d(B2, a, 7, 4)); + ytd(a.e, BD(c, 14)); + return; + case 8: + !a.d && (a.d = new y5d(B2, a, 8, 5)); + Uxd(a.d); + !a.d && (a.d = new y5d(B2, a, 8, 5)); + ytd(a.d, BD(c, 14)); + return; + } + Zkd(a, b, c); + } + function At(a, b) { + var c, d, e, f, g; + if (PD(b) === PD(a)) { + return true; + } + if (!JD(b, 15)) { + return false; + } + g = BD(b, 15); + if (a.gc() != g.gc()) { + return false; + } + f = g.Kc(); + for (d = a.Kc(); d.Ob(); ) { + c = d.Pb(); + e = f.Pb(); + if (!(PD(c) === PD(e) || (c != null && pb(c, e)))) { + return false; + } + } + return true; + } + function U6b(a, b) { + var c, d, e, f; + f = BD( + GAb( + LAb(LAb(new YAb(null, new Kub(b.b, 16)), new $6b()), new a7b()), + Byb( + new fzb(), + new dzb(), + new Ezb(), + OC(GC(xL, 1), Kie, 132, 0, [(Fyb(), Dyb)]) + ) + ), + 15 + ); + f.Jc(new c7b()); + c = 0; + for (e = f.Kc(); e.Ob(); ) { + d = BD(e.Pb(), 11); + d.p == -1 && T6b(a, d, c++); + } + } + function Wzc(a) { + switch (a.g) { + case 0: + return new KLc(); + case 1: + return new dJc(); + case 2: + return new tJc(); + case 3: + return new CMc(); + case 4: + return new $Jc(); + default: + throw vbb( + new Wdb( + "No implementation is available for the node placer " + + (a.f != null ? a.f : "" + a.g) + ) + ); + } + } + function nqc(a) { + switch (a.g) { + case 0: + return new aCc(); + case 1: + return new VBc(); + case 2: + return new kCc(); + case 3: + return new rCc(); + case 4: + return new eCc(); + default: + throw vbb( + new Wdb( + "No implementation is available for the cycle breaker " + + (a.f != null ? a.f : "" + a.g) + ) + ); + } + } + function HWc() { + HWc = ccb; + BWc = new Nsd(lre, meb(0)); + CWc = new Nsd(mre, 0); + yWc = (pWc(), mWc); + xWc = new Nsd(nre, yWc); + meb(0); + wWc = new Nsd(ore, meb(1)); + EWc = (sXc(), qXc); + DWc = new Nsd(pre, EWc); + GWc = (fWc(), eWc); + FWc = new Nsd(qre, GWc); + AWc = (iXc(), hXc); + zWc = new Nsd(rre, AWc); + } + function XXb(a, b, c) { + var d; + d = null; + !!b && (d = b.d); + hYb(a, new cWb(b.n.a - d.b + c.a, b.n.b - d.d + c.b)); + hYb(a, new cWb(b.n.a - d.b + c.a, b.n.b + b.o.b + d.a + c.b)); + hYb(a, new cWb(b.n.a + b.o.a + d.c + c.a, b.n.b - d.d + c.b)); + hYb(a, new cWb(b.n.a + b.o.a + d.c + c.a, b.n.b + b.o.b + d.a + c.b)); + } + function T6b(a, b, c) { + var d, e, f; + b.p = c; + for ( + f = ul(pl(OC(GC(KI, 1), Uhe, 20, 0, [new J0b(b), new R0b(b)]))); + Qr(f); + + ) { + d = BD(Rr(f), 11); + d.p == -1 && T6b(a, d, c); + } + if (b.i.k == (j0b(), g0b)) { + for (e = new olb(b.i.j); e.a < e.c.c.length; ) { + d = BD(mlb(e), 11); + d != b && d.p == -1 && T6b(a, d, c); + } + } + } + function rPc(a) { + var b, c, d, e, f; + e = BD( + GAb( + IAb(UAb(a)), + Byb( + new fzb(), + new dzb(), + new Ezb(), + OC(GC(xL, 1), Kie, 132, 0, [(Fyb(), Dyb)]) + ) + ), + 15 + ); + d = dme; + if (e.gc() >= 2) { + c = e.Kc(); + b = ED(c.Pb()); + while (c.Ob()) { + f = b; + b = ED(c.Pb()); + d = Math.min(d, (uCb(b), b) - (uCb(f), f)); + } + } + return d; + } + function gUc(a, b) { + var c, d, e, f, g; + d = new Psb(); + Gsb(d, b, d.c.b, d.c); + do { + c = (sCb(d.b != 0), BD(Nsb(d, d.a.a), 86)); + a.b[c.g] = 1; + for (f = Jsb(c.d, 0); f.b != f.d.c; ) { + e = BD(Xsb(f), 188); + g = e.c; + a.b[g.g] == 1 + ? Dsb(a.a, e) + : a.b[g.g] == 2 + ? (a.b[g.g] = 1) + : Gsb(d, g, d.c.b, d.c); + } + } while (d.b != 0); + } + function Ju(a, b) { + var c, d, e; + if (PD(b) === PD(Qb(a))) { + return true; + } + if (!JD(b, 15)) { + return false; + } + d = BD(b, 15); + e = a.gc(); + if (e != d.gc()) { + return false; + } + if (JD(d, 54)) { + for (c = 0; c < e; c++) { + if (!Hb(a.Xb(c), d.Xb(c))) { + return false; + } + } + return true; + } else { + return kr(a.Kc(), d.Kc()); + } + } + function Aac(a, b) { + var c, d; + if (a.c.length != 0) { + if (a.c.length == 2) { + zac((tCb(0, a.c.length), BD(a.c[0], 10)), (rbd(), nbd)); + zac((tCb(1, a.c.length), BD(a.c[1], 10)), obd); + } else { + for (d = new olb(a); d.a < d.c.c.length; ) { + c = BD(mlb(d), 10); + zac(c, b); + } + } + a.c = KC(SI, Uhe, 1, 0, 5, 1); + } + } + function uKc(a) { + var b, c; + if (a.c.length != 2) { + throw vbb(new Zdb("Order only allowed for two paths.")); + } + b = (tCb(0, a.c.length), BD(a.c[0], 17)); + c = (tCb(1, a.c.length), BD(a.c[1], 17)); + if (b.d.i != c.c.i) { + a.c = KC(SI, Uhe, 1, 0, 5, 1); + a.c[a.c.length] = c; + a.c[a.c.length] = b; + } + } + function EMc(a, b) { + var c, d, e, f, g, h; + d = new $rb(); + g = Gx(new amb(a.g)); + for (f = g.a.ec().Kc(); f.Ob(); ) { + e = BD(f.Pb(), 10); + if (!e) { + Sdd(b, "There are no classes in a balanced layout."); + break; + } + h = a.j[e.p]; + c = BD(Wrb(d, h), 15); + if (!c) { + c = new Rkb(); + Xrb(d, h, c); + } + c.Fc(e); + } + return d; + } + function Dqd(a, b, c) { + var d, e, f, g, h, i, j; + if (c) { + f = c.a.length; + d = new Yge(f); + for (h = (d.b - d.a) * d.c < 0 ? (Xge(), Wge) : new she(d); h.Ob(); ) { + g = BD(h.Pb(), 19); + i = Zpd(c, g.a); + if (i) { + j = ftd(_pd(i, Ite), b); + Rhb(a.f, j, i); + e = Vte in i.a; + e && Lkd(j, _pd(i, Vte)); + grd(i, j); + hrd(i, j); + } + } + } + } + function ndc(a, b) { + var c, d, e, f, g; + Odd(b, "Port side processing", 1); + for (g = new olb(a.a); g.a < g.c.c.length; ) { + e = BD(mlb(g), 10); + odc(e); + } + for (d = new olb(a.b); d.a < d.c.c.length; ) { + c = BD(mlb(d), 29); + for (f = new olb(c.a); f.a < f.c.c.length; ) { + e = BD(mlb(f), 10); + odc(e); + } + } + Qdd(b); + } + function bfc(a, b, c) { + var d, e, f, g, h; + e = a.f; + !e && (e = BD(a.a.a.ec().Kc().Pb(), 57)); + cfc(e, b, c); + if (a.a.a.gc() == 1) { + return; + } + d = b * c; + for (g = a.a.a.ec().Kc(); g.Ob(); ) { + f = BD(g.Pb(), 57); + if (f != e) { + h = ugc(f); + if (h.f.d) { + f.d.d += d + ple; + f.d.a -= d + ple; + } else h.f.a && (f.d.a -= d + ple); + } + } + } + function tQb(a, b, c, d, e) { + var f, g, h, i, j, k, l, m, n; + g = c - a; + h = d - b; + f = Math.atan2(g, h); + i = f + cme; + j = f - cme; + k = e * Math.sin(i) + a; + m = e * Math.cos(i) + b; + l = e * Math.sin(j) + a; + n = e * Math.cos(j) + b; + return Ou(OC(GC(m1, 1), nie, 8, 0, [new f7c(k, m), new f7c(l, n)])); + } + function OLc(a, b, c, d) { + var e, f, g, h, i, j, k, l; + e = c; + k = b; + f = k; + do { + f = a.a[f.p]; + h = ((l = a.g[f.p]), Edb(a.p[l.p]) + Edb(a.d[f.p]) - f.d.d); + i = RLc(f, d); + if (i) { + g = ((j = a.g[i.p]), Edb(a.p[j.p]) + Edb(a.d[i.p]) + i.o.b + i.d.a); + e = Math.min(e, h - (g + jBc(a.k, f, i))); + } + } while (k != f); + return e; + } + function PLc(a, b, c, d) { + var e, f, g, h, i, j, k, l; + e = c; + k = b; + f = k; + do { + f = a.a[f.p]; + g = ((l = a.g[f.p]), Edb(a.p[l.p]) + Edb(a.d[f.p]) + f.o.b + f.d.a); + i = QLc(f, d); + if (i) { + h = ((j = a.g[i.p]), Edb(a.p[j.p]) + Edb(a.d[i.p]) - i.d.d); + e = Math.min(e, h - (g + jBc(a.k, f, i))); + } + } while (k != f); + return e; + } + function hkd(a, b) { + var c, d; + d = (!a.o && (a.o = new dId((Thd(), Qhd), S2, a, 0)), AAd(a.o, b)); + if (d != null) { + return d; + } + c = b.wg(); + JD(c, 4) && + (c == null + ? (!a.o && (a.o = new dId((Thd(), Qhd), S2, a, 0)), LAd(a.o, b)) + : (!a.o && (a.o = new dId((Thd(), Qhd), S2, a, 0)), HAd(a.o, b, c)), + a); + return c; + } + function Hbd() { + Hbd = ccb; + zbd = new Ibd("H_LEFT", 0); + ybd = new Ibd("H_CENTER", 1); + Bbd = new Ibd("H_RIGHT", 2); + Gbd = new Ibd("V_TOP", 3); + Fbd = new Ibd("V_CENTER", 4); + Ebd = new Ibd("V_BOTTOM", 5); + Cbd = new Ibd("INSIDE", 6); + Dbd = new Ibd("OUTSIDE", 7); + Abd = new Ibd("H_PRIORITY", 8); + } + function o6d(a) { + var b, c, d, e, f, g, h; + b = a.Hh(_ve); + if (b) { + h = GD( + AAd( + (!b.b && (b.b = new sId((jGd(), fGd), x6, b)), b.b), + "settingDelegates" + ) + ); + if (h != null) { + c = new Rkb(); + for (e = mfb(h, "\\w+"), f = 0, g = e.length; f < g; ++f) { + d = e[f]; + c.c[c.c.length] = d; + } + return c; + } + } + return mmb(), mmb(), jmb; + } + function sGb(a, b) { + var c, d, e, f, g, h, i; + if (!b.f) { + throw vbb(new Wdb("The input edge is not a tree edge.")); + } + f = null; + e = Ohe; + for (d = new olb(a.d); d.a < d.c.c.length; ) { + c = BD(mlb(d), 213); + h = c.d; + i = c.e; + if (xGb(a, h, b) && !xGb(a, i, b)) { + g = i.e - h.e - c.a; + if (g < e) { + e = g; + f = c; + } + } + } + return f; + } + function qTb(a) { + var b, c, d, e, f, g; + if (a.f.e.c.length <= 1) { + return; + } + b = 0; + e = nTb(a); + c = Pje; + do { + b > 0 && (e = c); + for (g = new olb(a.f.e); g.a < g.c.c.length; ) { + f = BD(mlb(g), 144); + if (Ccb(DD(vNb(f, (bTb(), USb))))) { + continue; + } + d = mTb(a, f); + P6c(X6c(f.d), d); + } + c = nTb(a); + } while (!pTb(a, b++, e, c)); + } + function $ac(a, b) { + var c, d, e; + Odd(b, "Layer constraint preprocessing", 1); + c = new Rkb(); + e = new Bib(a.a, 0); + while (e.b < e.d.gc()) { + d = (sCb(e.b < e.d.gc()), BD(e.d.Xb((e.c = e.b++)), 10)); + if (Zac(d)) { + Xac(d); + c.c[c.c.length] = d; + uib(e); + } + } + c.c.length == 0 || yNb(a, (wtc(), Lsc), c); + Qdd(b); + } + function sjc(a, b) { + var c, d, e, f, g; + f = a.g.a; + g = a.g.b; + for (d = new olb(a.d); d.a < d.c.c.length; ) { + c = BD(mlb(d), 70); + e = c.n; + a.a == (Ajc(), xjc) || a.i == (Ucd(), zcd) + ? (e.a = f) + : a.a == yjc || a.i == (Ucd(), Tcd) + ? (e.a = f + a.j.a - c.o.a) + : (e.a = f + (a.j.a - c.o.a) / 2); + e.b = g; + P6c(e, b); + g += c.o.b + a.e; + } + } + function LSc(a, b, c) { + var d, e, f, g; + Odd(c, "Processor set coordinates", 1); + a.a = b.b.b == 0 ? 1 : b.b.b; + f = null; + d = Jsb(b.b, 0); + while (!f && d.b != d.d.c) { + g = BD(Xsb(d), 86); + if (Ccb(DD(vNb(g, (mTc(), jTc))))) { + f = g; + e = g.e; + e.a = BD(vNb(g, kTc), 19).a; + e.b = 0; + } + } + MSc(a, URc(f), Udd(c, 1)); + Qdd(c); + } + function xSc(a, b, c) { + var d, e, f; + Odd(c, "Processor determine the height for each level", 1); + a.a = b.b.b == 0 ? 1 : b.b.b; + e = null; + d = Jsb(b.b, 0); + while (!e && d.b != d.d.c) { + f = BD(Xsb(d), 86); + Ccb(DD(vNb(f, (mTc(), jTc)))) && (e = f); + } + !!e && ySc(a, Ou(OC(GC(q$, 1), fme, 86, 0, [e])), c); + Qdd(c); + } + function brd(a, b) { + var c, d, e, f, g, h, i, j, k, l; + j = a; + i = $pd(j, "individualSpacings"); + if (i) { + d = ikd(b, (Y9c(), O9c)); + g = !d; + if (g) { + e = new _fd(); + jkd(b, O9c, e); + } + h = BD(hkd(b, O9c), 373); + l = i; + f = null; + !!l && (f = ((k = $B(l, KC(ZI, nie, 2, 0, 6, 1))), new mC(l, k))); + if (f) { + c = new Frd(l, h); + reb(f, c); + } + } + } + function frd(a, b) { + var c, d, e, f, g, h, i, j, k, l, m; + i = null; + l = a; + k = null; + if (cue in l.a || due in l.a || Ote in l.a) { + j = null; + m = etd(b); + g = $pd(l, cue); + c = new Ird(m); + Eqd(c.a, g); + h = $pd(l, due); + d = new asd(m); + Pqd(d.a, h); + f = Ypd(l, Ote); + e = new dsd(m); + j = (Qqd(e.a, f), f); + k = j; + } + i = k; + return i; + } + function $w(a, b) { + var c, d, e; + if (b === a) { + return true; + } + if (JD(b, 543)) { + e = BD(b, 835); + if (a.a.d != e.a.d || Ah(a).gc() != Ah(e).gc()) { + return false; + } + for (d = Ah(e).Kc(); d.Ob(); ) { + c = BD(d.Pb(), 416); + if (Aw(a, c.a.cd()) != BD(c.a.dd(), 14).gc()) { + return false; + } + } + return true; + } + return false; + } + function BMb(a) { + var b, c, d, e; + d = BD(a.a, 19).a; + e = BD(a.b, 19).a; + b = d; + c = e; + if (d == 0 && e == 0) { + c -= 1; + } else { + if (d == -1 && e <= 0) { + b = 0; + c -= 2; + } else { + if (d <= 0 && e > 0) { + b -= 1; + c -= 1; + } else { + if (d >= 0 && e < 0) { + b += 1; + c += 1; + } else { + if (d > 0 && e >= 0) { + b -= 1; + c += 1; + } else { + b += 1; + c -= 1; + } + } + } + } + } + return new vgd(meb(b), meb(c)); + } + function PIc(a, b) { + if (a.c < b.c) { + return -1; + } else if (a.c > b.c) { + return 1; + } else if (a.b < b.b) { + return -1; + } else if (a.b > b.b) { + return 1; + } else if (a.a != b.a) { + return tb(a.a) - tb(b.a); + } else if (a.d == (UIc(), TIc) && b.d == SIc) { + return -1; + } else if (a.d == SIc && b.d == TIc) { + return 1; + } + return 0; + } + function aNc(a, b) { + var c, d, e, f, g; + f = b.a; + f.c.i == b.b ? (g = f.d) : (g = f.c); + f.c.i == b.b ? (d = f.c) : (d = f.d); + e = NLc(a.a, g, d); + if (e > 0 && e < dme) { + c = OLc(a.a, d.i, e, a.c); + TLc(a.a, d.i, -c); + return c > 0; + } else if (e < 0 && -e < dme) { + c = PLc(a.a, d.i, -e, a.c); + TLc(a.a, d.i, c); + return c > 0; + } + return false; + } + function RZc(a, b, c, d) { + var e, f, g, h, i, j, k, l; + e = (b - a.d) / a.c.c.length; + f = 0; + a.a += c; + a.d = b; + for (l = new olb(a.c); l.a < l.c.c.length; ) { + k = BD(mlb(l), 33); + j = k.g; + i = k.f; + dld(k, k.i + f * e); + eld(k, k.j + d * c); + cld(k, k.g + e); + ald(k, a.a); + ++f; + h = k.g; + g = k.f; + Ffd(k, new f7c(h, g), new f7c(j, i)); + } + } + function Xmd(a) { + var b, c, d, e, f, g, h; + if (a == null) { + return null; + } + h = a.length; + e = ((h + 1) / 2) | 0; + g = KC(SD, wte, 25, e, 15, 1); + h % 2 != 0 && (g[--e] = jnd((BCb(h - 1, a.length), a.charCodeAt(h - 1)))); + for (c = 0, d = 0; c < e; ++c) { + b = jnd(bfb(a, d++)); + f = jnd(bfb(a, d++)); + g[c] = (((b << 4) | f) << 24) >> 24; + } + return g; + } + function vdb(a) { + if (a.pe()) { + var b = a.c; + b.qe() + ? (a.o = "[" + b.n) + : !b.pe() + ? (a.o = "[L" + b.ne() + ";") + : (a.o = "[" + b.ne()); + a.b = b.me() + "[]"; + a.k = b.oe() + "[]"; + return; + } + var c = a.j; + var d = a.d; + d = d.split("/"); + a.o = ydb(".", [c, ydb("$", d)]); + a.b = ydb(".", [c, ydb(".", d)]); + a.k = d[d.length - 1]; + } + function qGb(a, b) { + var c, d, e, f, g; + g = null; + for (f = new olb(a.e.a); f.a < f.c.c.length; ) { + e = BD(mlb(f), 121); + if (e.b.a.c.length == e.g.a.c.length) { + d = e.e; + g = BGb(e); + for (c = e.e - BD(g.a, 19).a + 1; c < e.e + BD(g.b, 19).a; c++) { + b[c] < b[d] && (d = c); + } + if (b[d] < b[e.e]) { + --b[e.e]; + ++b[d]; + e.e = d; + } + } + } + } + function SLc(a) { + var b, c, d, e, f, g, h, i; + e = Pje; + d = Qje; + for (c = new olb(a.e.b); c.a < c.c.c.length; ) { + b = BD(mlb(c), 29); + for (g = new olb(b.a); g.a < g.c.c.length; ) { + f = BD(mlb(g), 10); + i = Edb(a.p[f.p]); + h = i + Edb(a.b[a.g[f.p].p]); + e = Math.min(e, i); + d = Math.max(d, h); + } + } + return d - e; + } + function r1d(a, b, c, d) { + var e, f, g, h, i, j; + i = null; + e = f1d(a, b); + for (h = 0, j = e.gc(); h < j; ++h) { + f = BD(e.Xb(h), 170); + if (dfb(d, a2d(q1d(a, f)))) { + g = b2d(q1d(a, f)); + if (c == null) { + if (g == null) { + return f; + } else !i && (i = f); + } else if (dfb(c, g)) { + return f; + } else g == null && !i && (i = f); + } + } + return null; + } + function s1d(a, b, c, d) { + var e, f, g, h, i, j; + i = null; + e = g1d(a, b); + for (h = 0, j = e.gc(); h < j; ++h) { + f = BD(e.Xb(h), 170); + if (dfb(d, a2d(q1d(a, f)))) { + g = b2d(q1d(a, f)); + if (c == null) { + if (g == null) { + return f; + } else !i && (i = f); + } else if (dfb(c, g)) { + return f; + } else g == null && !i && (i = f); + } + } + return null; + } + function p3d(a, b, c) { + var d, e, f, g, h, i; + g = new yud(); + h = S6d(a.e.Tg(), b); + d = BD(a.g, 119); + Q6d(); + if (BD(b, 66).Oj()) { + for (f = 0; f < a.i; ++f) { + e = d[f]; + h.rl(e.ak()) && wtd(g, e); + } + } else { + for (f = 0; f < a.i; ++f) { + e = d[f]; + if (h.rl(e.ak())) { + i = e.dd(); + wtd(g, c ? b3d(a, b, f, g.i, i) : i); + } + } + } + return wud(g); + } + function T9b(a, b) { + var c, d, e, f, g; + c = new Rpb(EW); + for ( + e = (Apc(), OC(GC(EW, 1), Kie, 227, 0, [wpc, ypc, vpc, xpc, zpc, upc])), + f = 0, + g = e.length; + f < g; + ++f + ) { + d = e[f]; + Opb(c, d, new Rkb()); + } + MAb( + NAb( + JAb(LAb(new YAb(null, new Kub(a.b, 16)), new hac()), new jac()), + new lac(b) + ), + new nac(c) + ); + return c; + } + function AVc(a, b, c) { + var d, e, f, g, h, i, j, k, l, m; + for (f = b.Kc(); f.Ob(); ) { + e = BD(f.Pb(), 33); + k = e.i + e.g / 2; + m = e.j + e.f / 2; + i = a.f; + g = i.i + i.g / 2; + h = i.j + i.f / 2; + j = k - g; + l = m - h; + d = Math.sqrt(j * j + l * l); + j *= a.e / d; + l *= a.e / d; + if (c) { + k -= j; + m -= l; + } else { + k += j; + m += l; + } + dld(e, k - e.g / 2); + eld(e, m - e.f / 2); + } + } + function Yfe(a) { + var b, c, d; + if (a.c) return; + if (a.b == null) return; + for (b = a.b.length - 4; b >= 0; b -= 2) { + for (c = 0; c <= b; c += 2) { + if ( + a.b[c] > a.b[c + 2] || + (a.b[c] === a.b[c + 2] && a.b[c + 1] > a.b[c + 3]) + ) { + d = a.b[c + 2]; + a.b[c + 2] = a.b[c]; + a.b[c] = d; + d = a.b[c + 3]; + a.b[c + 3] = a.b[c + 1]; + a.b[c + 1] = d; + } + } + } + a.c = true; + } + function UUb(a, b) { + var c, d, e, f, g, h, i, j; + g = b == 1 ? KUb : JUb; + for (f = g.a.ec().Kc(); f.Ob(); ) { + e = BD(f.Pb(), 103); + for (i = BD(Qc(a.f.c, e), 21).Kc(); i.Ob(); ) { + h = BD(i.Pb(), 46); + d = BD(h.b, 81); + j = BD(h.a, 189); + c = j.c; + switch (e.g) { + case 2: + case 1: + d.g.d += c; + break; + case 4: + case 3: + d.g.c += c; + } + } + } + } + function PFc(a, b) { + var c, d, e, f, g, h, i, j, k; + j = -1; + k = 0; + for (g = a, h = 0, i = g.length; h < i; ++h) { + f = g[h]; + c = new Dnc(j == -1 ? a[0] : a[j], b, (xzc(), wzc)); + for (d = 0; d < f.length; d++) { + for (e = d + 1; e < f.length; e++) { + wNb(f[d], (wtc(), Zsc)) && + wNb(f[e], Zsc) && + ync(c, f[d], f[e]) > 0 && + ++k; + } + } + ++j; + } + return k; + } + function Eid(a) { + var b, c; + c = new Wfb(hdb(a.gm)); + c.a += "@"; + Qfb(c, ((b = tb(a) >>> 0), b.toString(16))); + if (a.kh()) { + c.a += " (eProxyURI: "; + Pfb(c, a.qh()); + if (a.$g()) { + c.a += " eClass: "; + Pfb(c, a.$g()); + } + c.a += ")"; + } else if (a.$g()) { + c.a += " (eClass: "; + Pfb(c, a.$g()); + c.a += ")"; + } + return c.a; + } + function TDb(a) { + var b, c, d, e; + if (a.e) { + throw vbb(new Zdb((fdb(TM), Jke + TM.k + Kke))); + } + a.d == (ead(), cad) && SDb(a, aad); + for (c = new olb(a.a.a); c.a < c.c.c.length; ) { + b = BD(mlb(c), 307); + b.g = b.i; + } + for (e = new olb(a.a.b); e.a < e.c.c.length; ) { + d = BD(mlb(e), 57); + d.i = Qje; + } + a.b.Le(a); + return a; + } + function TPc(a, b) { + var c, d, e, f, g; + if (b < 2 * a.b) { + throw vbb( + new Wdb( + "The knot vector must have at least two time the dimension elements." + ) + ); + } + a.f = 1; + for (e = 0; e < a.b; e++) { + Ekb(a.e, 0); + } + g = b + 1 - 2 * a.b; + c = g; + for (f = 1; f < g; f++) { + Ekb(a.e, f / c); + } + if (a.d) { + for (d = 0; d < a.b; d++) { + Ekb(a.e, 1); + } + } + } + function ard(a, b) { + var c, d, e, f, g, h, i, j, k; + j = b; + k = BD(_o(qo(a.i), j), 33); + if (!k) { + e = _pd(j, Vte); + h = "Unable to find elk node for json object '" + e; + i = h + "' Panic!"; + throw vbb(new cqd(i)); + } + f = Ypd(j, "edges"); + c = new krd(a, k); + mqd(c.a, c.b, f); + g = Ypd(j, Jte); + d = new vrd(a); + xqd(d.a, g); + } + function xAd(a, b, c, d) { + var e, f, g, h, i; + if (d != null) { + e = a.d[b]; + if (e) { + f = e.g; + i = e.i; + for (h = 0; h < i; ++h) { + g = BD(f[h], 133); + if (g.Sh() == c && pb(d, g.cd())) { + return h; + } + } + } + } else { + e = a.d[b]; + if (e) { + f = e.g; + i = e.i; + for (h = 0; h < i; ++h) { + g = BD(f[h], 133); + if (PD(g.cd()) === PD(d)) { + return h; + } + } + } + } + return -1; + } + function nUd(a, b) { + var c, d, e; + c = b == null ? Wd(irb(a.f, null)) : Crb(a.g, b); + if (JD(c, 235)) { + e = BD(c, 235); + e.Qh() == null && undefined; + return e; + } else if (JD(c, 498)) { + d = BD(c, 1938); + e = d.a; + !!e && + (e.yb == null + ? undefined + : b == null + ? jrb(a.f, null, e) + : Drb(a.g, b, e)); + return e; + } else { + return null; + } + } + function ide(a) { + hde(); + var b, c, d, e, f, g, h; + if (a == null) return null; + e = a.length; + if (e % 2 != 0) return null; + b = rfb(a); + f = (e / 2) | 0; + c = KC(SD, wte, 25, f, 15, 1); + for (d = 0; d < f; d++) { + g = fde[b[d * 2]]; + if (g == -1) return null; + h = fde[b[d * 2 + 1]]; + if (h == -1) return null; + c[d] = (((g << 4) | h) << 24) >> 24; + } + return c; + } + function lKb(a, b, c) { + var d, e, f; + e = BD(Mpb(a.i, b), 306); + if (!e) { + e = new bIb(a.d, b, c); + Npb(a.i, b, e); + if (sJb(b)) { + CHb(a.a, b.c, b.b, e); + } else { + f = rJb(b); + d = BD(Mpb(a.p, f), 244); + switch (f.g) { + case 1: + case 3: + e.j = true; + lIb(d, b.b, e); + break; + case 4: + case 2: + e.k = true; + lIb(d, b.c, e); + } + } + } + return e; + } + function r3d(a, b, c, d) { + var e, f, g, h, i, j; + h = new yud(); + i = S6d(a.e.Tg(), b); + e = BD(a.g, 119); + Q6d(); + if (BD(b, 66).Oj()) { + for (g = 0; g < a.i; ++g) { + f = e[g]; + i.rl(f.ak()) && wtd(h, f); + } + } else { + for (g = 0; g < a.i; ++g) { + f = e[g]; + if (i.rl(f.ak())) { + j = f.dd(); + wtd(h, d ? b3d(a, b, g, h.i, j) : j); + } + } + } + return xud(h, c); + } + function YCc(a, b) { + var c, d, e, f, g, h, i, j; + e = a.b[b.p]; + if (e >= 0) { + return e; + } else { + f = 1; + for (h = new olb(b.j); h.a < h.c.c.length; ) { + g = BD(mlb(h), 11); + for (d = new olb(g.g); d.a < d.c.c.length; ) { + c = BD(mlb(d), 17); + j = c.d.i; + if (b != j) { + i = YCc(a, j); + f = Math.max(f, i + 1); + } + } + } + XCc(a, b, f); + return f; + } + } + function YGc(a, b, c) { + var d, e, f; + for (d = 1; d < a.c.length; d++) { + f = (tCb(d, a.c.length), BD(a.c[d], 10)); + e = d; + while ( + e > 0 && + b.ue((tCb(e - 1, a.c.length), BD(a.c[e - 1], 10)), f) > 0 + ) { + Nkb(a, e, (tCb(e - 1, a.c.length), BD(a.c[e - 1], 10))); + --e; + } + tCb(e, a.c.length); + a.c[e] = f; + } + c.a = new Lqb(); + c.b = new Lqb(); + } + function n5c(a, b, c) { + var d, e, f, g, h, i, j, k; + k = ((d = BD(b.e && b.e(), 9)), new xqb(d, BD(_Bb(d, d.length), 9), 0)); + i = mfb(c, "[\\[\\]\\s,]+"); + for (f = i, g = 0, h = f.length; g < h; ++g) { + e = f[g]; + if (ufb(e).length == 0) { + continue; + } + j = m5c(a, e); + if (j == null) { + return null; + } else { + rqb(k, BD(j, 22)); + } + } + return k; + } + function KVb(a) { + var b, c, d; + for (c = new olb(a.a.a.b); c.a < c.c.c.length; ) { + b = BD(mlb(c), 81); + d = (uCb(0), 0); + if (d > 0) { + !(fad(a.a.c) && b.n.d) && + !(gad(a.a.c) && b.n.b) && + (b.g.d -= Math.max(0, d / 2 - 0.5)); + !(fad(a.a.c) && b.n.a) && + !(gad(a.a.c) && b.n.c) && + (b.g.a += Math.max(0, d - 1)); + } + } + } + function Hac(a, b, c) { + var d, e; + if (((a.c - a.b) & (a.a.length - 1)) == 2) { + if (b == (Ucd(), Acd) || b == zcd) { + xac(BD(bkb(a), 15), (rbd(), nbd)); + xac(BD(bkb(a), 15), obd); + } else { + xac(BD(bkb(a), 15), (rbd(), obd)); + xac(BD(bkb(a), 15), nbd); + } + } else { + for (e = new xkb(a); e.a != e.b; ) { + d = BD(vkb(e), 15); + xac(d, c); + } + } + } + function htd(a, b) { + var c, d, e, f, g, h, i; + e = Nu(new qtd(a)); + h = new Bib(e, e.c.length); + f = Nu(new qtd(b)); + i = new Bib(f, f.c.length); + g = null; + while (h.b > 0 && i.b > 0) { + c = (sCb(h.b > 0), BD(h.a.Xb((h.c = --h.b)), 33)); + d = (sCb(i.b > 0), BD(i.a.Xb((i.c = --i.b)), 33)); + if (c == d) { + g = c; + } else { + break; + } + } + return g; + } + function Cub(a, b) { + var c, d, e, f, g, h; + f = a.a * kke + a.b * 1502; + h = a.b * kke + 11; + c = Math.floor(h * lke); + f += c; + h -= c * mke; + f %= mke; + a.a = f; + a.b = h; + if (b <= 24) { + return Math.floor(a.a * wub[b]); + } else { + e = a.a * (1 << (b - 24)); + g = Math.floor(a.b * xub[b]); + d = e + g; + d >= 2147483648 && (d -= Zje); + return d; + } + } + function Zic(a, b, c) { + var d, e, f, g; + if (bjc(a, b) > bjc(a, c)) { + d = V_b(c, (Ucd(), zcd)); + a.d = d.dc() ? 0 : B0b(BD(d.Xb(0), 11)); + g = V_b(b, Tcd); + a.b = g.dc() ? 0 : B0b(BD(g.Xb(0), 11)); + } else { + e = V_b(c, (Ucd(), Tcd)); + a.d = e.dc() ? 0 : B0b(BD(e.Xb(0), 11)); + f = V_b(b, zcd); + a.b = f.dc() ? 0 : B0b(BD(f.Xb(0), 11)); + } + } + function l6d(a) { + var b, c, d, e, f, g, h; + if (a) { + b = a.Hh(_ve); + if (b) { + g = GD( + AAd( + (!b.b && (b.b = new sId((jGd(), fGd), x6, b)), b.b), + "conversionDelegates" + ) + ); + if (g != null) { + h = new Rkb(); + for (d = mfb(g, "\\w+"), e = 0, f = d.length; e < f; ++e) { + c = d[e]; + h.c[h.c.length] = c; + } + return h; + } + } + } + return mmb(), mmb(), jmb; + } + function FKb(a, b) { + var c, d, e, f; + c = a.o.a; + for (f = BD(BD(Qc(a.r, b), 21), 84).Kc(); f.Ob(); ) { + e = BD(f.Pb(), 111); + e.e.a = c * Edb(ED(e.b.We(BKb))); + e.e.b = + ((d = e.b), + d.Xe((Y9c(), s9c)) + ? d.Hf() == (Ucd(), Acd) + ? -d.rf().b - Edb(ED(d.We(s9c))) + : Edb(ED(d.We(s9c))) + : d.Hf() == (Ucd(), Acd) + ? -d.rf().b + : 0); + } + } + function Woc(a) { + var b, c, d, e, f, g, h, i; + b = true; + e = null; + f = null; + j: for (i = new olb(a.a); i.a < i.c.c.length; ) { + h = BD(mlb(i), 10); + for (d = new Sr(ur(R_b(h).a.Kc(), new Sq())); Qr(d); ) { + c = BD(Rr(d), 17); + if (!!e && e != h) { + b = false; + break j; + } + e = h; + g = c.c.i; + if (!!f && f != g) { + b = false; + break j; + } + f = g; + } + } + return b; + } + function OOc(a, b, c) { + var d, e, f, g, h, i; + f = -1; + h = -1; + for (g = 0; g < b.c.length; g++) { + e = (tCb(g, b.c.length), BD(b.c[g], 329)); + if (e.c > a.c) { + break; + } else if (e.a >= a.s) { + f < 0 && (f = g); + h = g; + } + } + i = (a.s + a.c) / 2; + if (f >= 0) { + d = NOc(a, b, f, h); + i = $Oc((tCb(d, b.c.length), BD(b.c[d], 329))); + YOc(b, d, c); + } + return i; + } + function lZc() { + lZc = ccb; + RYc = new Osd((Y9c(), r8c), 1.3); + VYc = I8c; + gZc = new q0b(15); + fZc = new Osd(f9c, gZc); + jZc = new Osd(T9c, 15); + SYc = w8c; + _Yc = Y8c; + aZc = _8c; + bZc = b9c; + $Yc = W8c; + cZc = e9c; + hZc = x9c; + eZc = (OYc(), KYc); + ZYc = IYc; + dZc = JYc; + iZc = MYc; + WYc = HYc; + XYc = O8c; + YYc = P8c; + UYc = GYc; + TYc = FYc; + kZc = NYc; + } + function Bnd(a, b, c) { + var d, e, f, g, h, i, j; + g = ((f = new RHd()), f); + PHd(g, (uCb(b), b)); + j = (!g.b && (g.b = new sId((jGd(), fGd), x6, g)), g.b); + for (i = 1; i < c.length; i += 2) { + HAd(j, c[i - 1], c[i]); + } + d = (!a.Ab && (a.Ab = new cUd(a5, a, 0, 3)), a.Ab); + for (h = 0; h < 0; ++h) { + e = LHd(BD(qud(d, d.i - 1), 590)); + d = e; + } + wtd(d, g); + } + function MPb(a, b, c) { + var d, e, f; + sNb.call(this, new Rkb()); + this.a = b; + this.b = c; + this.e = a; + d = (a.b && LOb(a), a.a); + this.d = KPb(d.a, this.a); + this.c = KPb(d.b, this.b); + kNb(this, this.d, this.c); + LPb(this); + for (f = this.e.e.a.ec().Kc(); f.Ob(); ) { + e = BD(f.Pb(), 266); + e.c.c.length > 0 && JPb(this, e); + } + } + function IQb(a, b, c, d, e, f) { + var g, h, i; + if (!e[b.b]) { + e[b.b] = true; + g = d; + !g && (g = new kRb()); + Ekb(g.e, b); + for (i = f[b.b].Kc(); i.Ob(); ) { + h = BD(i.Pb(), 282); + if (h.d == c || h.c == c) { + continue; + } + h.c != b && IQb(a, h.c, b, g, e, f); + h.d != b && IQb(a, h.d, b, g, e, f); + Ekb(g.c, h); + Gkb(g.d, h.b); + } + return g; + } + return null; + } + function e4b(a) { + var b, c, d, e, f, g, h; + b = 0; + for (e = new olb(a.e); e.a < e.c.c.length; ) { + d = BD(mlb(e), 17); + c = FAb(new YAb(null, new Kub(d.b, 16)), new w4b()); + c && ++b; + } + for (g = new olb(a.g); g.a < g.c.c.length; ) { + f = BD(mlb(g), 17); + h = FAb(new YAb(null, new Kub(f.b, 16)), new y4b()); + h && ++b; + } + return b >= 2; + } + function gec(a, b) { + var c, d, e, f; + Odd(b, "Self-Loop pre-processing", 1); + for (d = new olb(a.a); d.a < d.c.c.length; ) { + c = BD(mlb(d), 10); + if (Ljc(c)) { + e = ((f = new Kjc(c)), yNb(c, (wtc(), ntc), f), Hjc(f), f); + MAb( + NAb(LAb(new YAb(null, new Kub(e.d, 16)), new jec()), new lec()), + new nec() + ); + eec(e); + } + } + Qdd(b); + } + function vnc(a, b, c, d, e) { + var f, g, h, i, j, k; + f = a.c.d.j; + g = BD(Ut(c, 0), 8); + for (k = 1; k < c.b; k++) { + j = BD(Ut(c, k), 8); + Gsb(d, g, d.c.b, d.c); + h = Y6c(P6c(new g7c(g), j), 0.5); + i = Y6c(new e7c(bRc(f)), e); + P6c(h, i); + Gsb(d, h, d.c.b, d.c); + g = j; + f = b == 0 ? Xcd(f) : Vcd(f); + } + Dsb(d, (sCb(c.b != 0), BD(c.c.b.c, 8))); + } + function Jbd(a) { + Hbd(); + var b, c, d; + c = qqb(Cbd, OC(GC(B1, 1), Kie, 93, 0, [Dbd])); + if (Ox(Cx(c, a)) > 1) { + return false; + } + b = qqb(zbd, OC(GC(B1, 1), Kie, 93, 0, [ybd, Bbd])); + if (Ox(Cx(b, a)) > 1) { + return false; + } + d = qqb(Gbd, OC(GC(B1, 1), Kie, 93, 0, [Fbd, Ebd])); + if (Ox(Cx(d, a)) > 1) { + return false; + } + return true; + } + function U0d(a, b) { + var c, d, e; + c = b.Hh(a.a); + if (c) { + e = GD( + AAd( + (!c.b && (c.b = new sId((jGd(), fGd), x6, c)), c.b), + "affiliation" + ) + ); + if (e != null) { + d = kfb(e, wfb(35)); + return d == -1 + ? l1d(a, u1d(a, bKd(b.Hj())), e) + : d == 0 + ? l1d(a, null, e.substr(1)) + : l1d(a, e.substr(0, d), e.substr(d + 1)); + } + } + return null; + } + function ic(b) { + var c, d, e; + try { + return b == null ? Xhe : fcb(b); + } catch (a) { + a = ubb(a); + if (JD(a, 102)) { + c = a; + e = hdb(rb(b)) + "@" + ((d = (Zfb(), kCb(b)) >>> 0), d.toString(16)); + tyb(xyb(), ($xb(), "Exception during lenientFormat for " + e), c); + return "<" + e + " threw " + hdb(c.gm) + ">"; + } else throw vbb(a); + } + } + function mzc(a) { + switch (a.g) { + case 0: + return new xDc(); + case 1: + return new ZCc(); + case 2: + return new DCc(); + case 3: + return new QCc(); + case 4: + return new LDc(); + case 5: + return new iDc(); + default: + throw vbb( + new Wdb( + "No implementation is available for the layerer " + + (a.f != null ? a.f : "" + a.g) + ) + ); + } + } + function AQc(a, b, c) { + var d, e, f; + for (f = new olb(a.t); f.a < f.c.c.length; ) { + d = BD(mlb(f), 268); + if (d.b.s < 0 && d.c > 0) { + d.b.n -= d.c; + d.b.n <= 0 && d.b.u > 0 && Dsb(b, d.b); + } + } + for (e = new olb(a.i); e.a < e.c.c.length; ) { + d = BD(mlb(e), 268); + if (d.a.s < 0 && d.c > 0) { + d.a.u -= d.c; + d.a.u <= 0 && d.a.n > 0 && Dsb(c, d.a); + } + } + } + function Vud(a) { + var b, c, d, e, f; + if (a.g == null) { + a.d = a.si(a.f); + wtd(a, a.d); + if (a.c) { + f = a.f; + return f; + } + } + b = BD(a.g[a.i - 1], 47); + e = b.Pb(); + a.e = b; + c = a.si(e); + if (c.Ob()) { + a.d = c; + wtd(a, c); + } else { + a.d = null; + while (!b.Ob()) { + NC(a.g, --a.i, null); + if (a.i == 0) { + break; + } + d = BD(a.g[a.i - 1], 47); + b = d; + } + } + return e; + } + function r2d(a, b) { + var c, d, e, f, g, h; + d = b; + e = d.ak(); + if (T6d(a.e, e)) { + if (e.hi() && E2d(a, e, d.dd())) { + return false; + } + } else { + h = S6d(a.e.Tg(), e); + c = BD(a.g, 119); + for (f = 0; f < a.i; ++f) { + g = c[f]; + if (h.rl(g.ak())) { + if (pb(g, d)) { + return false; + } else { + BD(Gtd(a, f, b), 72); + return true; + } + } + } + } + return wtd(a, b); + } + function r9b(a, b, c, d) { + var e, f, g, h; + e = new b0b(a); + __b(e, (j0b(), f0b)); + yNb(e, (wtc(), $sc), b); + yNb(e, ktc, d); + yNb(e, (Nyc(), Vxc), (dcd(), $bd)); + yNb(e, Vsc, b.c); + yNb(e, Wsc, b.d); + zbc(b, e); + h = Math.floor(c / 2); + for (g = new olb(e.j); g.a < g.c.c.length; ) { + f = BD(mlb(g), 11); + f.n.b = h; + } + return e; + } + function wac(a, b) { + var c, d, e, f, g, h, i, j, k; + i = Pu((a.c - a.b) & (a.a.length - 1)); + j = null; + k = null; + for (f = new xkb(a); f.a != f.b; ) { + e = BD(vkb(f), 10); + c = ((h = BD(vNb(e, (wtc(), Vsc)), 11)), !h ? null : h.i); + d = ((g = BD(vNb(e, Wsc), 11)), !g ? null : g.i); + if (j != c || k != d) { + Aac(i, b); + j = c; + k = d; + } + i.c[i.c.length] = e; + } + Aac(i, b); + } + function HNc(a) { + var b, c, d, e, f, g, h; + b = 0; + for (d = new olb(a.a); d.a < d.c.c.length; ) { + c = BD(mlb(d), 10); + for (f = new Sr(ur(U_b(c).a.Kc(), new Sq())); Qr(f); ) { + e = BD(Rr(f), 17); + if (a == e.d.i.c && e.c.j == (Ucd(), Tcd)) { + g = A0b(e.c).b; + h = A0b(e.d).b; + b = Math.max(b, Math.abs(h - g)); + } + } + } + return b; + } + function aWc(a, b, c) { + var d, e, f; + Odd(c, "Remove overlaps", 1); + c.n && !!b && Tdd(c, i6d(b), (pgd(), mgd)); + d = BD(hkd(b, (MUc(), LUc)), 33); + a.f = d; + a.a = tXc(BD(hkd(b, (ZWc(), WWc)), 293)); + e = ED(hkd(b, (Y9c(), T9c))); + FVc(a, (uCb(e), e)); + f = gVc(d); + _Vc(a, b, f, c); + c.n && !!b && Tdd(c, i6d(b), (pgd(), mgd)); + } + function aYb(a, b, c) { + switch (c.g) { + case 1: + return new f7c(b.a, Math.min(a.d.b, b.b)); + case 2: + return new f7c(Math.max(a.c.a, b.a), b.b); + case 3: + return new f7c(b.a, Math.max(a.c.b, b.b)); + case 4: + return new f7c(Math.min(b.a, a.d.a), b.b); + } + return new f7c(b.a, b.b); + } + function mFc(a, b, c, d) { + var e, f, g, h, i, j, k, l, m; + l = d ? (Ucd(), Tcd) : (Ucd(), zcd); + e = false; + for (i = b[c], j = 0, k = i.length; j < k; ++j) { + h = i[j]; + if (ecd(BD(vNb(h, (Nyc(), Vxc)), 98))) { + continue; + } + g = h.e; + m = !V_b(h, l).dc() && !!g; + if (m) { + f = WZb(g); + a.b = new sic(f, d ? 0 : f.length - 1); + } + e = e | nFc(a, h, l, m); + } + return e; + } + function $sd(a) { + var b, c, d; + b = Pu(1 + (!a.c && (a.c = new cUd(F2, a, 9, 9)), a.c).i); + Ekb(b, (!a.d && (a.d = new y5d(B2, a, 8, 5)), a.d)); + for ( + d = new Fyd((!a.c && (a.c = new cUd(F2, a, 9, 9)), a.c)); + d.e != d.i.gc(); + + ) { + c = BD(Dyd(d), 118); + Ekb(b, (!c.d && (c.d = new y5d(B2, c, 8, 5)), c.d)); + } + return Qb(b), new sl(b); + } + function _sd(a) { + var b, c, d; + b = Pu(1 + (!a.c && (a.c = new cUd(F2, a, 9, 9)), a.c).i); + Ekb(b, (!a.e && (a.e = new y5d(B2, a, 7, 4)), a.e)); + for ( + d = new Fyd((!a.c && (a.c = new cUd(F2, a, 9, 9)), a.c)); + d.e != d.i.gc(); + + ) { + c = BD(Dyd(d), 118); + Ekb(b, (!c.e && (c.e = new y5d(B2, c, 7, 4)), c.e)); + } + return Qb(b), new sl(b); + } + function M9d(a) { + var b, c, d, e; + if (a == null) { + return null; + } else { + d = Qge(a, true); + e = Nwe.length; + if (dfb(d.substr(d.length - e, e), Nwe)) { + c = d.length; + if (c == 4) { + b = (BCb(0, d.length), d.charCodeAt(0)); + if (b == 43) { + return x9d; + } else if (b == 45) { + return w9d; + } + } else if (c == 3) { + return x9d; + } + } + return Hcb(d); + } + } + function aKc(a) { + var b, c, d, e; + b = 0; + c = 0; + for (e = new olb(a.j); e.a < e.c.c.length; ) { + d = BD(mlb(e), 11); + b = Tbb(wbb(b, HAb(JAb(new YAb(null, new Kub(d.e, 16)), new nLc())))); + c = Tbb(wbb(c, HAb(JAb(new YAb(null, new Kub(d.g, 16)), new pLc())))); + if (b > 1 || c > 1) { + return 2; + } + } + if (b + c == 1) { + return 2; + } + return 0; + } + function WQb(a, b, c) { + var d, e, f, g, h; + Odd(c, "ELK Force", 1); + Ccb(DD(hkd(b, (wSb(), jSb)))) || + $Cb(((d = new _Cb((Pgd(), new bhd(b)))), d)); + h = TQb(b); + XQb(h); + YQb(a, BD(vNb(h, fSb), 424)); + g = LQb(a.a, h); + for (f = g.Kc(); f.Ob(); ) { + e = BD(f.Pb(), 231); + tRb(a.b, e, Udd(c, 1 / g.gc())); + } + h = KQb(g); + SQb(h); + Qdd(c); + } + function yoc(a, b) { + var c, d, e, f, g; + Odd(b, "Breaking Point Processor", 1); + xoc(a); + if (Ccb(DD(vNb(a, (Nyc(), Jyc))))) { + for (e = new olb(a.b); e.a < e.c.c.length; ) { + d = BD(mlb(e), 29); + c = 0; + for (g = new olb(d.a); g.a < g.c.c.length; ) { + f = BD(mlb(g), 10); + f.p = c++; + } + } + soc(a); + toc(a, true); + toc(a, false); + } + Qdd(b); + } + function $1c(a, b, c) { + var d, e, f, g, h, i; + h = a.c; + for (g = (!c.q ? (mmb(), mmb(), kmb) : c.q).vc().Kc(); g.Ob(); ) { + f = BD(g.Pb(), 42); + d = !WAb(JAb(new YAb(null, new Kub(h, 16)), new Xxb(new m2c(b, f)))).sd( + (EAb(), DAb) + ); + if (d) { + i = f.dd(); + if (JD(i, 4)) { + e = fvd(i); + e != null && (i = e); + } + b.Ye(BD(f.cd(), 146), i); + } + } + } + function MQd(a, b) { + var c, d, e, f, g; + if (!b) { + return null; + } else { + f = JD(a.Cb, 88) || JD(a.Cb, 99); + g = !f && JD(a.Cb, 322); + for ( + d = new Fyd((!b.a && (b.a = new KYd(b, j5, b)), b.a)); + d.e != d.i.gc(); + + ) { + c = BD(Dyd(d), 87); + e = KQd(c); + if (f ? JD(e, 88) : g ? JD(e, 148) : !!e) { + return e; + } + } + return f ? (jGd(), _Fd) : (jGd(), YFd); + } + } + function g3b(a, b) { + var c, d, e, f, g, h; + Odd(b, "Constraints Postprocessor", 1); + g = 0; + for (f = new olb(a.b); f.a < f.c.c.length; ) { + e = BD(mlb(f), 29); + h = 0; + for (d = new olb(e.a); d.a < d.c.c.length; ) { + c = BD(mlb(d), 10); + if (c.k == (j0b(), h0b)) { + yNb(c, (Nyc(), nxc), meb(g)); + yNb(c, Gwc, meb(h)); + ++h; + } + } + ++g; + } + Qdd(b); + } + function eRc(a, b, c, d) { + var e, f, g, h, i, j, k; + i = new f7c(c, d); + c7c(i, BD(vNb(b, (mTc(), WSc)), 8)); + for (k = Jsb(b.b, 0); k.b != k.d.c; ) { + j = BD(Xsb(k), 86); + P6c(j.e, i); + Dsb(a.b, j); + } + for (h = Jsb(b.a, 0); h.b != h.d.c; ) { + g = BD(Xsb(h), 188); + for (f = Jsb(g.a, 0); f.b != f.d.c; ) { + e = BD(Xsb(f), 8); + P6c(e, i); + } + Dsb(a.a, g); + } + } + function uid(a, b, c) { + var d, e, f; + f = e1d((O6d(), M6d), a.Tg(), b); + if (f) { + Q6d(); + if (!BD(f, 66).Oj()) { + f = _1d(q1d(M6d, f)); + if (!f) { + throw vbb(new Wdb(ite + b.ne() + jte)); + } + } + e = + ((d = a.Yg(f)), + BD(d >= 0 ? a._g(d, true, true) : sid(a, f, true), 153)); + BD(e, 215).ml(b, c); + } else { + throw vbb(new Wdb(ite + b.ne() + jte)); + } + } + function ROc(a, b) { + var c, d, e, f, g; + c = new Rkb(); + e = LAb(new YAb(null, new Kub(a, 16)), new iPc()); + f = LAb(new YAb(null, new Kub(a, 16)), new kPc()); + g = aAb(_zb(OAb(ty(OC(GC(xM, 1), Uhe, 833, 0, [e, f])), new mPc()))); + for (d = 1; d < g.length; d++) { + g[d] - g[d - 1] >= 2 * b && Ekb(c, new bPc(g[d - 1] + b, g[d] - b)); + } + return c; + } + function AXc(a, b, c) { + Odd(c, "Eades radial", 1); + c.n && !!b && Tdd(c, i6d(b), (pgd(), mgd)); + a.d = BD(hkd(b, (MUc(), LUc)), 33); + a.c = Edb(ED(hkd(b, (ZWc(), VWc)))); + a.e = tXc(BD(hkd(b, WWc), 293)); + a.a = gWc(BD(hkd(b, YWc), 426)); + a.b = jXc(BD(hkd(b, RWc), 340)); + BXc(a); + c.n && !!b && Tdd(c, i6d(b), (pgd(), mgd)); + } + function Fqd(a, b, c) { + var d, e, f, g, h, j, k, l; + if (c) { + f = c.a.length; + d = new Yge(f); + for (h = (d.b - d.a) * d.c < 0 ? (Xge(), Wge) : new she(d); h.Ob(); ) { + g = BD(h.Pb(), 19); + e = Zpd(c, g.a); + !!e && + ((i = null), + (j = Uqd( + a, + ((k = (Fhd(), (l = new ppd()), l)), !!b && npd(k, b), k), + e + )), + Lkd(j, _pd(e, Vte)), + grd(e, j), + hrd(e, j), + crd(a, e, j)); + } + } + } + function UKd(a) { + var b, c, d, e, f, g; + if (!a.j) { + g = new HPd(); + b = KKd; + f = b.a.zc(a, b); + if (f == null) { + for (d = new Fyd(_Kd(a)); d.e != d.i.gc(); ) { + c = BD(Dyd(d), 26); + e = UKd(c); + ytd(g, e); + wtd(g, c); + } + b.a.Bc(a) != null; + } + vud(g); + a.j = new nNd((BD(qud(ZKd((NFd(), MFd).o), 11), 18), g.i), g.g); + $Kd(a).b &= -33; + } + return a.j; + } + function O9d(a) { + var b, c, d, e; + if (a == null) { + return null; + } else { + d = Qge(a, true); + e = Nwe.length; + if (dfb(d.substr(d.length - e, e), Nwe)) { + c = d.length; + if (c == 4) { + b = (BCb(0, d.length), d.charCodeAt(0)); + if (b == 43) { + return z9d; + } else if (b == 45) { + return y9d; + } + } else if (c == 3) { + return z9d; + } + } + return new Odb(d); + } + } + function _C(a) { + var b, c, d; + c = a.l; + if ((c & (c - 1)) != 0) { + return -1; + } + d = a.m; + if ((d & (d - 1)) != 0) { + return -1; + } + b = a.h; + if ((b & (b - 1)) != 0) { + return -1; + } + if (b == 0 && d == 0 && c == 0) { + return -1; + } + if (b == 0 && d == 0 && c != 0) { + return ieb(c); + } + if (b == 0 && d != 0 && c == 0) { + return ieb(d) + 22; + } + if (b != 0 && d == 0 && c == 0) { + return ieb(b) + 44; + } + return -1; + } + function qbc(a, b) { + var c, d, e, f, g; + Odd(b, "Edge joining", 1); + c = Ccb(DD(vNb(a, (Nyc(), Byc)))); + for (e = new olb(a.b); e.a < e.c.c.length; ) { + d = BD(mlb(e), 29); + g = new Bib(d.a, 0); + while (g.b < g.d.gc()) { + f = (sCb(g.b < g.d.gc()), BD(g.d.Xb((g.c = g.b++)), 10)); + if (f.k == (j0b(), g0b)) { + sbc(f, c); + uib(g); + } + } + } + Qdd(b); + } + function c_c(a, b, c) { + var d, e; + H2c(a.b); + K2c(a.b, (Y$c(), V$c), (R0c(), Q0c)); + K2c(a.b, W$c, b.g); + K2c(a.b, X$c, b.a); + a.a = F2c(a.b, b); + Odd(c, "Compaction by shrinking a tree", a.a.c.length); + if (b.i.c.length > 1) { + for (e = new olb(a.a); e.a < e.c.c.length; ) { + d = BD(mlb(e), 51); + d.pf(b, Udd(c, 1)); + } + } + Qdd(c); + } + function mo(a, b) { + var c, d, e, f, g; + e = b.a & a.f; + f = null; + for (d = a.b[e]; true; d = d.b) { + if (d == b) { + !f ? (a.b[e] = b.b) : (f.b = b.b); + break; + } + f = d; + } + g = b.f & a.f; + f = null; + for (c = a.c[g]; true; c = c.d) { + if (c == b) { + !f ? (a.c[g] = b.d) : (f.d = b.d); + break; + } + f = c; + } + !b.e ? (a.a = b.c) : (b.e.c = b.c); + !b.c ? (a.e = b.e) : (b.c.e = b.e); + --a.i; + ++a.g; + } + function eNb(a) { + var b, c, d, e, f, g, h, i, j, k; + c = a.o; + b = a.p; + g = Ohe; + e = Rie; + h = Ohe; + f = Rie; + for (j = 0; j < c; ++j) { + for (k = 0; k < b; ++k) { + if (YMb(a, j, k)) { + g = Math.min(g, j); + e = Math.max(e, j); + h = Math.min(h, k); + f = Math.max(f, k); + } + } + } + i = e - g + 1; + d = f - h + 1; + return new Ggd(meb(g), meb(h), meb(i), meb(d)); + } + function DWb(a, b) { + var c, d, e, f; + f = new Bib(a, 0); + c = (sCb(f.b < f.d.gc()), BD(f.d.Xb((f.c = f.b++)), 140)); + while (f.b < f.d.gc()) { + d = (sCb(f.b < f.d.gc()), BD(f.d.Xb((f.c = f.b++)), 140)); + e = new dWb(d.c, c.d, b); + sCb(f.b > 0); + f.a.Xb((f.c = --f.b)); + Aib(f, e); + sCb(f.b < f.d.gc()); + f.d.Xb((f.c = f.b++)); + e.a = false; + c = d; + } + } + function Y2b(a) { + var b, c, d, e, f, g; + e = BD(vNb(a, (wtc(), vsc)), 11); + for (g = new olb(a.j); g.a < g.c.c.length; ) { + f = BD(mlb(g), 11); + for (d = new olb(f.g); d.a < d.c.c.length; ) { + b = BD(mlb(d), 17); + RZb(b, e); + return f; + } + for (c = new olb(f.e); c.a < c.c.c.length; ) { + b = BD(mlb(c), 17); + QZb(b, e); + return f; + } + } + return null; + } + function iA(a, b, c) { + var d, e; + d = Cbb(c.q.getTime()); + if (ybb(d, 0) < 0) { + e = _ie - Tbb(Hbb(Jbb(d), _ie)); + e == _ie && (e = 0); + } else { + e = Tbb(Hbb(d, _ie)); + } + if (b == 1) { + e = Math.min(((e + 50) / 100) | 0, 9); + Kfb(a, (48 + e) & aje); + } else if (b == 2) { + e = Math.min(((e + 5) / 10) | 0, 99); + EA(a, e, 2); + } else { + EA(a, e, 3); + b > 3 && EA(a, 0, b - 3); + } + } + function cUb(a) { + var b, c, d, e; + if (PD(vNb(a, (Nyc(), axc))) === PD((hbd(), ebd))) { + return !a.e && PD(vNb(a, Cwc)) !== PD((Xrc(), Urc)); + } + d = BD(vNb(a, Dwc), 292); + e = Ccb(DD(vNb(a, Hwc))) || PD(vNb(a, Iwc)) === PD((Rpc(), Opc)); + b = BD(vNb(a, Bwc), 19).a; + c = a.a.c.length; + return !e && d != (Xrc(), Urc) && (b == 0 || b > c); + } + function lkc(a) { + var b, c; + c = 0; + for (; c < a.c.length; c++) { + if (Ojc((tCb(c, a.c.length), BD(a.c[c], 113))) > 0) { + break; + } + } + if (c > 0 && c < a.c.length - 1) { + return c; + } + b = 0; + for (; b < a.c.length; b++) { + if (Ojc((tCb(b, a.c.length), BD(a.c[b], 113))) > 0) { + break; + } + } + if (b > 0 && c < a.c.length - 1) { + return b; + } + return (a.c.length / 2) | 0; + } + function mmd(a, b) { + var c, d; + if (b != a.Cb || (a.Db >> 16 != 6 && !!b)) { + if (p6d(a, b)) throw vbb(new Wdb(ste + qmd(a))); + d = null; + !!a.Cb && + (d = + ((c = a.Db >> 16), + c >= 0 ? cmd(a, d) : a.Cb.ih(a, -1 - c, null, d))); + !!b && (d = kid(b, a, 6, d)); + d = bmd(a, b, d); + !!d && d.Fi(); + } else + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new nSd(a, 1, 6, b, b)); + } + function npd(a, b) { + var c, d; + if (b != a.Cb || (a.Db >> 16 != 9 && !!b)) { + if (p6d(a, b)) throw vbb(new Wdb(ste + opd(a))); + d = null; + !!a.Cb && + (d = + ((c = a.Db >> 16), + c >= 0 ? lpd(a, d) : a.Cb.ih(a, -1 - c, null, d))); + !!b && (d = kid(b, a, 9, d)); + d = kpd(a, b, d); + !!d && d.Fi(); + } else + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new nSd(a, 1, 9, b, b)); + } + function Rld(a, b) { + var c, d; + if (b != a.Cb || (a.Db >> 16 != 3 && !!b)) { + if (p6d(a, b)) throw vbb(new Wdb(ste + Sld(a))); + d = null; + !!a.Cb && + (d = + ((c = a.Db >> 16), + c >= 0 ? Lld(a, d) : a.Cb.ih(a, -1 - c, null, d))); + !!b && (d = kid(b, a, 12, d)); + d = Kld(a, b, d); + !!d && d.Fi(); + } else + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new nSd(a, 1, 3, b, b)); + } + function VId(b) { + var c, d, e, f, g; + e = wId(b); + g = b.j; + if (g == null && !!e) { + return b.$j() ? null : e.zj(); + } else if (JD(e, 148)) { + d = e.Aj(); + if (d) { + f = d.Nh(); + if (f != b.i) { + c = BD(e, 148); + if (c.Ej()) { + try { + b.g = f.Kh(c, g); + } catch (a) { + a = ubb(a); + if (JD(a, 78)) { + b.g = null; + } else throw vbb(a); + } + } + b.i = f; + } + } + return b.g; + } + return null; + } + function wOb(a) { + var b; + b = new Rkb(); + Ekb(b, new aDb(new f7c(a.c, a.d), new f7c(a.c + a.b, a.d))); + Ekb(b, new aDb(new f7c(a.c, a.d), new f7c(a.c, a.d + a.a))); + Ekb(b, new aDb(new f7c(a.c + a.b, a.d + a.a), new f7c(a.c + a.b, a.d))); + Ekb(b, new aDb(new f7c(a.c + a.b, a.d + a.a), new f7c(a.c, a.d + a.a))); + return b; + } + function IJc(a, b, c, d) { + var e, f, g; + g = LZb(b, c); + d.c[d.c.length] = b; + if (a.j[g.p] == -1 || a.j[g.p] == 2 || a.a[b.p]) { + return d; + } + a.j[g.p] = -1; + for (f = new Sr(ur(O_b(g).a.Kc(), new Sq())); Qr(f); ) { + e = BD(Rr(f), 17); + if (!(!OZb(e) && !(!OZb(e) && e.c.i.c == e.d.i.c)) || e == b) { + continue; + } + return IJc(a, e, g, d); + } + return d; + } + function vQb(a, b, c) { + var d, e, f; + for (f = b.a.ec().Kc(); f.Ob(); ) { + e = BD(f.Pb(), 79); + d = BD(Ohb(a.b, e), 266); + !d && + (Xod(jtd(e)) == Xod(ltd(e)) + ? uQb(a, e, c) + : jtd(e) == Xod(ltd(e)) + ? Ohb(a.c, e) == null && + Ohb(a.b, ltd(e)) != null && + xQb(a, e, c, false) + : Ohb(a.d, e) == null && + Ohb(a.b, jtd(e)) != null && + xQb(a, e, c, true)); + } + } + function jcc(a, b) { + var c, d, e, f, g, h, i; + for (e = a.Kc(); e.Ob(); ) { + d = BD(e.Pb(), 10); + h = new H0b(); + F0b(h, d); + G0b(h, (Ucd(), zcd)); + yNb(h, (wtc(), ftc), (Bcb(), true)); + for (g = b.Kc(); g.Ob(); ) { + f = BD(g.Pb(), 10); + i = new H0b(); + F0b(i, f); + G0b(i, Tcd); + yNb(i, ftc, true); + c = new UZb(); + yNb(c, ftc, true); + QZb(c, h); + RZb(c, i); + } + } + } + function jnc(a, b, c, d) { + var e, f, g, h; + e = hnc(a, b, c); + f = hnc(a, c, b); + g = BD(Ohb(a.c, b), 112); + h = BD(Ohb(a.c, c), 112); + if (e < f) { + new DOc((HOc(), GOc), g, h, f - e); + } else if (f < e) { + new DOc((HOc(), GOc), h, g, e - f); + } else if (e != 0 || (!(!b.i || !c.i) && d[b.i.c][c.i.c])) { + new DOc((HOc(), GOc), g, h, 0); + new DOc(GOc, h, g, 0); + } + } + function Qoc(a, b) { + var c, d, e, f, g, h, i; + e = 0; + for (g = new olb(b.a); g.a < g.c.c.length; ) { + f = BD(mlb(g), 10); + e += f.o.b + f.d.a + f.d.d + a.e; + for (d = new Sr(ur(R_b(f).a.Kc(), new Sq())); Qr(d); ) { + c = BD(Rr(d), 17); + if (c.c.i.k == (j0b(), i0b)) { + i = c.c.i; + h = BD(vNb(i, (wtc(), $sc)), 10); + e += h.o.b + h.d.a + h.d.d; + } + } + } + return e; + } + function WNc(a, b, c) { + var d, e, f, g, h, i, j; + f = new Rkb(); + j = new Psb(); + g = new Psb(); + XNc(a, j, g, b); + VNc(a, j, g, b, c); + for (i = new olb(a); i.a < i.c.c.length; ) { + h = BD(mlb(i), 112); + for (e = new olb(h.k); e.a < e.c.c.length; ) { + d = BD(mlb(e), 129); + (!b || d.c == (HOc(), FOc)) && + h.g > d.b.g && + ((f.c[f.c.length] = d), true); + } + } + return f; + } + function k$c() { + k$c = ccb; + g$c = new l$c("CANDIDATE_POSITION_LAST_PLACED_RIGHT", 0); + f$c = new l$c("CANDIDATE_POSITION_LAST_PLACED_BELOW", 1); + i$c = new l$c("CANDIDATE_POSITION_WHOLE_DRAWING_RIGHT", 2); + h$c = new l$c("CANDIDATE_POSITION_WHOLE_DRAWING_BELOW", 3); + j$c = new l$c("WHOLE_DRAWING", 4); + } + function Xqd(a, b) { + if (JD(b, 239)) { + return iqd(a, BD(b, 33)); + } else if (JD(b, 186)) { + return jqd(a, BD(b, 118)); + } else if (JD(b, 354)) { + return hqd(a, BD(b, 137)); + } else if (JD(b, 352)) { + return gqd(a, BD(b, 79)); + } else if (b) { + return null; + } else { + throw vbb(new Wdb(Xte + Fe(new amb(OC(GC(SI, 1), Uhe, 1, 5, [b]))))); + } + } + function aic(a) { + var b, c, d, e, f, g, h; + f = new Psb(); + for (e = new olb(a.d.a); e.a < e.c.c.length; ) { + d = BD(mlb(e), 121); + d.b.a.c.length == 0 && (Gsb(f, d, f.c.b, f.c), true); + } + if (f.b > 1) { + b = nGb(((c = new pGb()), ++a.b, c), a.d); + for (h = Jsb(f, 0); h.b != h.d.c; ) { + g = BD(Xsb(h), 121); + AFb(DFb(CFb(EFb(BFb(new FFb(), 1), 0), b), g)); + } + } + } + function $od(a, b) { + var c, d; + if (b != a.Cb || (a.Db >> 16 != 11 && !!b)) { + if (p6d(a, b)) throw vbb(new Wdb(ste + _od(a))); + d = null; + !!a.Cb && + (d = + ((c = a.Db >> 16), + c >= 0 ? Uod(a, d) : a.Cb.ih(a, -1 - c, null, d))); + !!b && (d = kid(b, a, 10, d)); + d = Tod(a, b, d); + !!d && d.Fi(); + } else + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new nSd(a, 1, 11, b, b)); + } + function uZb(a) { + var b, c, d, e; + for (d = new nib(new eib(a.b).a); d.b; ) { + c = lib(d); + e = BD(c.cd(), 11); + b = BD(c.dd(), 10); + yNb(b, (wtc(), $sc), e); + yNb(e, gtc, b); + yNb(e, Nsc, (Bcb(), true)); + G0b(e, BD(vNb(b, Hsc), 61)); + vNb(b, Hsc); + yNb(e.i, (Nyc(), Vxc), (dcd(), acd)); + BD(vNb(Q_b(e.i), Ksc), 21).Fc((Orc(), Krc)); + } + } + function G4b(a, b, c) { + var d, e, f, g, h, i; + f = 0; + g = 0; + if (a.c) { + for (i = new olb(a.d.i.j); i.a < i.c.c.length; ) { + h = BD(mlb(i), 11); + f += h.e.c.length; + } + } else { + f = 1; + } + if (a.d) { + for (i = new olb(a.c.i.j); i.a < i.c.c.length; ) { + h = BD(mlb(i), 11); + g += h.g.c.length; + } + } else { + g = 1; + } + e = QD(Eeb(g - f)); + d = (c + b) / 2 + (c - b) * (0.4 * e); + return d; + } + function Zjc(a) { + Xjc(); + var b, c; + if (a.Hc((Ucd(), Scd))) { + throw vbb(new Wdb("Port sides must not contain UNDEFINED")); + } + switch (a.gc()) { + case 1: + return Tjc; + case 2: + b = a.Hc(zcd) && a.Hc(Tcd); + c = a.Hc(Acd) && a.Hc(Rcd); + return b || c ? Wjc : Vjc; + case 3: + return Ujc; + case 4: + return Sjc; + default: + return null; + } + } + function Hoc(a, b, c) { + var d, e, f, g, h; + Odd(c, "Breaking Point Removing", 1); + a.a = BD(vNb(b, (Nyc(), Swc)), 218); + for (f = new olb(b.b); f.a < f.c.c.length; ) { + e = BD(mlb(f), 29); + for (h = new olb(Mu(e.a)); h.a < h.c.c.length; ) { + g = BD(mlb(h), 10); + if (hoc(g)) { + d = BD(vNb(g, (wtc(), usc)), 305); + !d.d && Ioc(a, d); + } + } + } + Qdd(c); + } + function s6c(a, b, c) { + i6c(); + if (m6c(a, b) && m6c(a, c)) { + return false; + } + return ( + u6c(new f7c(a.c, a.d), new f7c(a.c + a.b, a.d), b, c) || + u6c(new f7c(a.c + a.b, a.d), new f7c(a.c + a.b, a.d + a.a), b, c) || + u6c(new f7c(a.c + a.b, a.d + a.a), new f7c(a.c, a.d + a.a), b, c) || + u6c(new f7c(a.c, a.d + a.a), new f7c(a.c, a.d), b, c) + ); + } + function x1d(a, b) { + var c, d, e, f; + if (!a.dc()) { + for (c = 0, d = a.gc(); c < d; ++c) { + f = GD(a.Xb(c)); + if ( + f == null + ? b == null + : dfb(f.substr(0, 3), "!##") + ? b != null && + ((e = b.length), + !dfb(f.substr(f.length - e, e), b) || + f.length != b.length + 3) && + !dfb(Ewe, b) + : (dfb(f, Fwe) && !dfb(Ewe, b)) || dfb(f, b) + ) { + return true; + } + } + } + return false; + } + function J3b(a, b, c, d) { + var e, f, g, h, i, j; + g = a.j.c.length; + i = KC(tN, ile, 306, g, 0, 1); + for (h = 0; h < g; h++) { + f = BD(Ikb(a.j, h), 11); + f.p = h; + i[h] = D3b(N3b(f), c, d); + } + F3b(a, i, c, b, d); + j = new Lqb(); + for (e = 0; e < i.length; e++) { + !!i[e] && Rhb(j, BD(Ikb(a.j, e), 11), i[e]); + } + if (j.f.c + j.g.c != 0) { + yNb(a, (wtc(), Csc), j); + L3b(a, i); + } + } + function Lgc(a, b, c) { + var d, e, f; + for (e = new olb(a.a.b); e.a < e.c.c.length; ) { + d = BD(mlb(e), 57); + f = tgc(d); + if (f) { + if (f.k == (j0b(), e0b)) { + switch (BD(vNb(f, (wtc(), Hsc)), 61).g) { + case 4: + f.n.a = b.a; + break; + case 2: + f.n.a = c.a - (f.o.a + f.d.c); + break; + case 1: + f.n.b = b.b; + break; + case 3: + f.n.b = c.b - (f.o.b + f.d.a); + } + } + } + } + } + function kAc() { + kAc = ccb; + iAc = new lAc(ane, 0); + dAc = new lAc("NIKOLOV", 1); + gAc = new lAc("NIKOLOV_PIXEL", 2); + eAc = new lAc("NIKOLOV_IMPROVED", 3); + fAc = new lAc("NIKOLOV_IMPROVED_PIXEL", 4); + cAc = new lAc("DUMMYNODE_PERCENTAGE", 5); + hAc = new lAc("NODECOUNT_PERCENTAGE", 6); + jAc = new lAc("NO_BOUNDARY", 7); + } + function led(a, b, c) { + var d, e, f, g, h; + e = BD(hkd(b, (X7c(), V7c)), 19); + !e && (e = meb(0)); + f = BD(hkd(c, V7c), 19); + !f && (f = meb(0)); + if (e.a > f.a) { + return -1; + } else if (e.a < f.a) { + return 1; + } else { + if (a.a) { + d = Kdb(b.j, c.j); + if (d != 0) { + return d; + } + d = Kdb(b.i, c.i); + if (d != 0) { + return d; + } + } + g = b.g * b.f; + h = c.g * c.f; + return Kdb(g, h); + } + } + function BAd(a, b) { + var c, d, e, f, g, h, i, j, k, l; + ++a.e; + i = a.d == null ? 0 : a.d.length; + if (b > i) { + k = a.d; + a.d = KC(y4, jve, 63, 2 * i + 4, 0, 1); + for (f = 0; f < i; ++f) { + j = k[f]; + if (j) { + d = j.g; + l = j.i; + for (h = 0; h < l; ++h) { + e = BD(d[h], 133); + g = DAd(a, e.Sh()); + c = a.d[g]; + !c && (c = a.d[g] = a.uj()); + c.Fc(e); + } + } + } + return true; + } else { + return false; + } + } + function o2d(a, b, c) { + var d, e, f, g, h, i; + e = c; + f = e.ak(); + if (T6d(a.e, f)) { + if (f.hi()) { + d = BD(a.g, 119); + for (g = 0; g < a.i; ++g) { + h = d[g]; + if (pb(h, e) && g != b) { + throw vbb(new Wdb(kue)); + } + } + } + } else { + i = S6d(a.e.Tg(), f); + d = BD(a.g, 119); + for (g = 0; g < a.i; ++g) { + h = d[g]; + if (i.rl(h.ak())) { + throw vbb(new Wdb(Hwe)); + } + } + } + vtd(a, b, c); + } + function OYb(a, b) { + var c, d, e, f, g, h; + c = BD(vNb(b, (wtc(), Esc)), 21); + g = BD(Qc((xXb(), wXb), c), 21); + h = BD(Qc(LYb, c), 21); + for (f = g.Kc(); f.Ob(); ) { + d = BD(f.Pb(), 21); + if (!BD(Qc(a.b, d), 15).dc()) { + return false; + } + } + for (e = h.Kc(); e.Ob(); ) { + d = BD(e.Pb(), 21); + if (!BD(Qc(a.b, d), 15).dc()) { + return false; + } + } + return true; + } + function scc(a, b) { + var c, d, e, f, g, h; + Odd(b, "Partition postprocessing", 1); + for (d = new olb(a.b); d.a < d.c.c.length; ) { + c = BD(mlb(d), 29); + for (f = new olb(c.a); f.a < f.c.c.length; ) { + e = BD(mlb(f), 10); + h = new olb(e.j); + while (h.a < h.c.c.length) { + g = BD(mlb(h), 11); + Ccb(DD(vNb(g, (wtc(), ftc)))) && nlb(h); + } + } + } + Qdd(b); + } + function ZZc(a, b) { + var c, d, e, f, g, h, i, j, k; + if (a.a.c.length == 1) { + return JZc(BD(Ikb(a.a, 0), 187), b); + } + g = YZc(a); + i = 0; + j = a.d; + f = g; + k = a.d; + h = (j - f) / 2 + f; + while (f + 1 < j) { + i = 0; + for (d = new olb(a.a); d.a < d.c.c.length; ) { + c = BD(mlb(d), 187); + i += ((e = MZc(c, h, false)), e.a); + } + if (i < b) { + k = h; + j = h; + } else { + f = h; + } + h = (j - f) / 2 + f; + } + return k; + } + function fD(a) { + var b, c, d, e, f; + if (isNaN(a)) { + return wD(), vD; + } + if (a < -9223372036854775808) { + return wD(), tD; + } + if (a >= 9223372036854775807) { + return wD(), sD; + } + e = false; + if (a < 0) { + e = true; + a = -a; + } + d = 0; + if (a >= Ije) { + d = QD(a / Ije); + a -= d * Ije; + } + c = 0; + if (a >= Hje) { + c = QD(a / Hje); + a -= c * Hje; + } + b = QD(a); + f = TC(b, c, d); + e && ZC(f); + return f; + } + function rKb(a, b) { + var c, d, e, f; + c = !b || !a.u.Hc((rcd(), ncd)); + f = 0; + for (e = new olb(a.e.Cf()); e.a < e.c.c.length; ) { + d = BD(mlb(e), 838); + if (d.Hf() == (Ucd(), Scd)) { + throw vbb( + new Wdb( + "Label and node size calculator can only be used with ports that have port sides assigned." + ) + ); + } + d.vf(f++); + qKb(a, d, c); + } + } + function V0d(a, b) { + var c, d, e, f, g; + e = b.Hh(a.a); + if (e) { + d = (!e.b && (e.b = new sId((jGd(), fGd), x6, e)), e.b); + c = GD(AAd(d, cwe)); + if (c != null) { + f = c.lastIndexOf("#"); + g = + f == -1 + ? w1d(a, b.Aj(), c) + : f == 0 + ? v1d(a, null, c.substr(1)) + : v1d(a, c.substr(0, f), c.substr(f + 1)); + if (JD(g, 148)) { + return BD(g, 148); + } + } + } + return null; + } + function Z0d(a, b) { + var c, d, e, f, g; + d = b.Hh(a.a); + if (d) { + c = (!d.b && (d.b = new sId((jGd(), fGd), x6, d)), d.b); + f = GD(AAd(c, zwe)); + if (f != null) { + e = f.lastIndexOf("#"); + g = + e == -1 + ? w1d(a, b.Aj(), f) + : e == 0 + ? v1d(a, null, f.substr(1)) + : v1d(a, f.substr(0, e), f.substr(e + 1)); + if (JD(g, 148)) { + return BD(g, 148); + } + } + } + return null; + } + function RDb(a) { + var b, c, d, e, f; + for (c = new olb(a.a.a); c.a < c.c.c.length; ) { + b = BD(mlb(c), 307); + b.j = null; + for (f = b.a.a.ec().Kc(); f.Ob(); ) { + d = BD(f.Pb(), 57); + X6c(d.b); + (!b.j || d.d.c < b.j.d.c) && (b.j = d); + } + for (e = b.a.a.ec().Kc(); e.Ob(); ) { + d = BD(e.Pb(), 57); + d.b.a = d.d.c - b.j.d.c; + d.b.b = d.d.d - b.j.d.d; + } + } + return a; + } + function sVb(a) { + var b, c, d, e, f; + for (c = new olb(a.a.a); c.a < c.c.c.length; ) { + b = BD(mlb(c), 189); + b.f = null; + for (f = b.a.a.ec().Kc(); f.Ob(); ) { + d = BD(f.Pb(), 81); + X6c(d.e); + (!b.f || d.g.c < b.f.g.c) && (b.f = d); + } + for (e = b.a.a.ec().Kc(); e.Ob(); ) { + d = BD(e.Pb(), 81); + d.e.a = d.g.c - b.f.g.c; + d.e.b = d.g.d - b.f.g.d; + } + } + return a; + } + function EMb(a) { + var b, c, d; + c = BD(a.a, 19).a; + d = BD(a.b, 19).a; + b = Math.max(Math.abs(c), Math.abs(d)); + if (c < b && d == -b) { + return new vgd(meb(c + 1), meb(d)); + } + if (c == b && d < b) { + return new vgd(meb(c), meb(d + 1)); + } + if (c >= -b && d == b) { + return new vgd(meb(c - 1), meb(d)); + } + return new vgd(meb(c), meb(d - 1)); + } + function W8b() { + S8b(); + return OC(GC(AS, 1), Kie, 77, 0, [ + Y7b, + V7b, + Z7b, + n8b, + G8b, + r8b, + M8b, + w8b, + E8b, + i8b, + A8b, + v8b, + F8b, + e8b, + O8b, + P7b, + z8b, + I8b, + o8b, + H8b, + Q8b, + C8b, + Q7b, + D8b, + R8b, + K8b, + P8b, + p8b, + b8b, + q8b, + m8b, + N8b, + T7b, + _7b, + t8b, + S7b, + u8b, + k8b, + f8b, + x8b, + h8b, + W7b, + U7b, + l8b, + g8b, + y8b, + L8b, + R7b, + B8b, + j8b, + s8b, + c8b, + a8b, + J8b, + $7b, + d8b, + X7b, + ]); + } + function Yic(a, b, c) { + a.d = 0; + a.b = 0; + b.k == (j0b(), i0b) && + c.k == i0b && + BD(vNb(b, (wtc(), $sc)), 10) == BD(vNb(c, $sc), 10) && + (ajc(b).j == (Ucd(), Acd) ? Zic(a, b, c) : Zic(a, c, b)); + b.k == i0b && c.k == g0b + ? ajc(b).j == (Ucd(), Acd) + ? (a.d = 1) + : (a.b = 1) + : c.k == i0b && + b.k == g0b && + (ajc(c).j == (Ucd(), Acd) ? (a.b = 1) : (a.d = 1)); + cjc(a, b, c); + } + function esd(a) { + var b, c, d, e, f, g, h, i, j, k, l; + l = hsd(a); + b = a.a; + i = b != null; + i && Upd(l, "category", a.a); + e = Fhe(new Pib(a.d)); + g = !e; + if (g) { + j = new wB(); + cC(l, "knownOptions", j); + c = new msd(j); + reb(new Pib(a.d), c); + } + f = Fhe(a.g); + h = !f; + if (h) { + k = new wB(); + cC(l, "supportedFeatures", k); + d = new osd(k); + reb(a.g, d); + } + return l; + } + function ty(a) { + var b, c, d, e, f, g, h, i, j; + d = false; + b = 336; + c = 0; + f = new Xp(a.length); + for (h = a, i = 0, j = h.length; i < j; ++i) { + g = h[i]; + d = d | (Uzb(g), false); + e = (Tzb(g), g.a); + Ekb(f.a, Qb(e)); + b &= e.qd(); + c = Ly(c, e.rd()); + } + return BD( + BD( + Rzb( + new YAb(null, Yj(new Kub((im(), nm(f.a)), 16), new vy(), b, c)), + new xy(a) + ), + 670 + ), + 833 + ); + } + function UWb(a, b) { + var c; + if (!!a.d && (b.c != a.e.c || qWb(a.e.b, b.b))) { + Ekb(a.f, a.d); + a.a = a.d.c + a.d.b; + a.d = null; + a.e = null; + } + nWb(b.b) ? (a.c = b) : (a.b = b); + if ( + (b.b == (lWb(), hWb) && !b.a) || + (b.b == iWb && b.a) || + (b.b == jWb && b.a) || + (b.b == kWb && !b.a) + ) { + if (!!a.c && !!a.b) { + c = new J6c(a.a, a.c.d, b.c - a.a, a.b.d - a.c.d); + a.d = c; + a.e = b; + } + } + } + function L2c(a) { + var b; + D2c.call(this); + this.i = new Z2c(); + this.g = a; + this.f = BD(a.e && a.e(), 9).length; + if (this.f == 0) { + throw vbb( + new Wdb("There must be at least one phase in the phase enumeration.") + ); + } + this.c = + ((b = BD(gdb(this.g), 9)), new xqb(b, BD(_Bb(b, b.length), 9), 0)); + this.a = new j3c(); + this.b = new Lqb(); + } + function God(a, b) { + var c, d; + if (b != a.Cb || (a.Db >> 16 != 7 && !!b)) { + if (p6d(a, b)) throw vbb(new Wdb(ste + Iod(a))); + d = null; + !!a.Cb && + (d = + ((c = a.Db >> 16), + c >= 0 ? Eod(a, d) : a.Cb.ih(a, -1 - c, null, d))); + !!b && (d = BD(b, 49).gh(a, 1, C2, d)); + d = Dod(a, b, d); + !!d && d.Fi(); + } else + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new nSd(a, 1, 7, b, b)); + } + function NHd(a, b) { + var c, d; + if (b != a.Cb || (a.Db >> 16 != 3 && !!b)) { + if (p6d(a, b)) throw vbb(new Wdb(ste + QHd(a))); + d = null; + !!a.Cb && + (d = + ((c = a.Db >> 16), + c >= 0 ? KHd(a, d) : a.Cb.ih(a, -1 - c, null, d))); + !!b && (d = BD(b, 49).gh(a, 0, k5, d)); + d = JHd(a, b, d); + !!d && d.Fi(); + } else + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new nSd(a, 1, 3, b, b)); + } + function Ehb(a, b) { + Dhb(); + var c, d, e, f, g, h, i, j, k; + if (b.d > a.d) { + h = a; + a = b; + b = h; + } + if (b.d < 63) { + return Ihb(a, b); + } + g = (a.d & -2) << 4; + j = Rgb(a, g); + k = Rgb(b, g); + d = yhb(a, Qgb(j, g)); + e = yhb(b, Qgb(k, g)); + i = Ehb(j, k); + c = Ehb(d, e); + f = Ehb(yhb(j, d), yhb(e, k)); + f = thb(thb(f, i), c); + f = Qgb(f, g); + i = Qgb(i, g << 1); + return thb(thb(i, f), c); + } + function aGc(a, b, c) { + var d, e, f, g, h; + g = CHc(a, c); + h = KC(OQ, kne, 10, b.length, 0, 1); + d = 0; + for (f = g.Kc(); f.Ob(); ) { + e = BD(f.Pb(), 11); + Ccb(DD(vNb(e, (wtc(), Nsc)))) && (h[d++] = BD(vNb(e, gtc), 10)); + } + if (d < b.length) { + throw vbb( + new Zdb( + "Expected " + + b.length + + " hierarchical ports, but found only " + + d + + "." + ) + ); + } + return h; + } + function Und(a, b) { + var c, d, e, f, g, h; + if (!a.tb) { + f = (!a.rb && (a.rb = new jUd(a, d5, a)), a.rb); + h = new Mqb(f.i); + for (e = new Fyd(f); e.e != e.i.gc(); ) { + d = BD(Dyd(e), 138); + g = d.ne(); + c = BD(g == null ? jrb(h.f, null, d) : Drb(h.g, g, d), 138); + !!c && (g == null ? jrb(h.f, null, c) : Drb(h.g, g, c)); + } + a.tb = h; + } + return BD(Phb(a.tb, b), 138); + } + function YKd(a, b) { + var c, d, e, f, g; + (a.i == null && TKd(a), a.i).length; + if (!a.p) { + g = new Mqb((((3 * a.g.i) / 2) | 0) + 1); + for (e = new $yd(a.g); e.e != e.i.gc(); ) { + d = BD(Zyd(e), 170); + f = d.ne(); + c = BD(f == null ? jrb(g.f, null, d) : Drb(g.g, f, d), 170); + !!c && (f == null ? jrb(g.f, null, c) : Drb(g.g, f, c)); + } + a.p = g; + } + return BD(Phb(a.p, b), 170); + } + function hCb(a, b, c, d, e) { + var f, g, h, i, j; + fCb(d + Wy(c, c.$d()), e); + gCb(b, jCb(c)); + f = c.f; + !!f && hCb(a, b, f, "Caused by: ", false); + for ( + h = (c.k == null && (c.k = KC(_I, nie, 78, 0, 0, 1)), c.k), + i = 0, + j = h.length; + i < j; + ++i + ) { + g = h[i]; + hCb(a, b, g, "Suppressed: ", false); + } + console.groupEnd != null && console.groupEnd.call(console); + } + function dGc(a, b, c, d) { + var e, f, g, h, i; + i = b.e; + h = i.length; + g = b.q._f(i, c ? 0 : h - 1, c); + e = i[c ? 0 : h - 1]; + g = g | cGc(a, e, c, d); + for (f = c ? 1 : h - 2; c ? f < h : f >= 0; f += c ? 1 : -1) { + g = + g | + b.c.Sf( + i, + f, + c, + d && + !Ccb(DD(vNb(b.j, (wtc(), Jsc)))) && + !Ccb(DD(vNb(b.j, (wtc(), mtc)))) + ); + g = g | b.q._f(i, f, c); + g = g | cGc(a, i[f], c, d); + } + Qqb(a.c, b); + return g; + } + function o3b(a, b, c) { + var d, e, f, g, h, i, j, k, l, m; + for (k = m_b(a.j), l = 0, m = k.length; l < m; ++l) { + j = k[l]; + if (c == (KAc(), HAc) || c == JAc) { + i = k_b(j.g); + for (e = i, f = 0, g = e.length; f < g; ++f) { + d = e[f]; + k3b(b, d) && PZb(d, true); + } + } + if (c == IAc || c == JAc) { + h = k_b(j.e); + for (e = h, f = 0, g = e.length; f < g; ++f) { + d = e[f]; + j3b(b, d) && PZb(d, true); + } + } + } + } + function Qmc(a) { + var b, c; + b = null; + c = null; + switch (Lmc(a).g) { + case 1: + b = (Ucd(), zcd); + c = Tcd; + break; + case 2: + b = (Ucd(), Rcd); + c = Acd; + break; + case 3: + b = (Ucd(), Tcd); + c = zcd; + break; + case 4: + b = (Ucd(), Acd); + c = Rcd; + } + mjc(a, BD(Btb(RAb(BD(Qc(a.k, b), 15).Oc(), Hmc)), 113)); + njc(a, BD(Btb(QAb(BD(Qc(a.k, c), 15).Oc(), Hmc)), 113)); + } + function a6b(a) { + var b, c, d, e, f, g; + e = BD(Ikb(a.j, 0), 11); + if (e.e.c.length + e.g.c.length == 0) { + a.n.a = 0; + } else { + g = 0; + for ( + d = ul(pl(OC(GC(KI, 1), Uhe, 20, 0, [new J0b(e), new R0b(e)]))); + Qr(d); + + ) { + c = BD(Rr(d), 11); + g += c.i.n.a + c.n.a + c.a.a; + } + b = BD(vNb(a, (Nyc(), Txc)), 8); + f = !b ? 0 : b.a; + a.n.a = g / (e.e.c.length + e.g.c.length) - f; + } + } + function F1c(a, b) { + var c, d, e; + for (d = new olb(b.a); d.a < d.c.c.length; ) { + c = BD(mlb(d), 221); + $Nb(BD(c.b, 65), c7c(R6c(BD(b.b, 65).c), BD(b.b, 65).a)); + e = xOb(BD(b.b, 65).b, BD(c.b, 65).b); + e > 1 && (a.a = true); + ZNb( + BD(c.b, 65), + P6c( + R6c(BD(b.b, 65).c), + Y6c(c7c(R6c(BD(c.b, 65).a), BD(b.b, 65).a), e) + ) + ); + D1c(a, b); + F1c(a, c); + } + } + function rVb(a) { + var b, c, d, e, f, g, h; + for (f = new olb(a.a.a); f.a < f.c.c.length; ) { + d = BD(mlb(f), 189); + d.e = 0; + d.d.a.$b(); + } + for (e = new olb(a.a.a); e.a < e.c.c.length; ) { + d = BD(mlb(e), 189); + for (c = d.a.a.ec().Kc(); c.Ob(); ) { + b = BD(c.Pb(), 81); + for (h = b.f.Kc(); h.Ob(); ) { + g = BD(h.Pb(), 81); + if (g.d != d) { + Qqb(d.d, g); + ++g.d.e; + } + } + } + } + } + function bcc(a) { + var b, c, d, e, f, g, h, i; + i = a.j.c.length; + c = 0; + b = i; + e = 2 * i; + for (h = new olb(a.j); h.a < h.c.c.length; ) { + g = BD(mlb(h), 11); + switch (g.j.g) { + case 2: + case 4: + g.p = -1; + break; + case 1: + case 3: + d = g.e.c.length; + f = g.g.c.length; + d > 0 && f > 0 + ? (g.p = b++) + : d > 0 + ? (g.p = c++) + : f > 0 + ? (g.p = e++) + : (g.p = c++); + } + } + mmb(); + Okb(a.j, new fcc()); + } + function Vec(a) { + var b, c; + c = null; + b = BD(Ikb(a.g, 0), 17); + do { + c = b.d.i; + if (wNb(c, (wtc(), Wsc))) { + return BD(vNb(c, Wsc), 11).i; + } + if (c.k != (j0b(), h0b) && Qr(new Sr(ur(U_b(c).a.Kc(), new Sq())))) { + b = BD(Rr(new Sr(ur(U_b(c).a.Kc(), new Sq()))), 17); + } else if (c.k != h0b) { + return null; + } + } while (!!c && c.k != (j0b(), h0b)); + return c; + } + function Omc(a, b) { + var c, d, e, f, g, h, i, j, k; + h = b.j; + g = b.g; + i = BD(Ikb(h, h.c.length - 1), 113); + k = (tCb(0, h.c.length), BD(h.c[0], 113)); + j = Kmc(a, g, i, k); + for (f = 1; f < h.c.length; f++) { + c = (tCb(f - 1, h.c.length), BD(h.c[f - 1], 113)); + e = (tCb(f, h.c.length), BD(h.c[f], 113)); + d = Kmc(a, g, c, e); + if (d > j) { + i = c; + k = e; + j = d; + } + } + b.a = k; + b.c = i; + } + function sEb(a, b) { + var c, d; + d = Axb(a.b, b.b); + if (!d) { + throw vbb( + new Zdb("Invalid hitboxes for scanline constraint calculation.") + ); + } + (mEb(b.b, BD(Cxb(a.b, b.b), 57)) || mEb(b.b, BD(Bxb(a.b, b.b), 57))) && + (Zfb(), b.b + " has overlap."); + a.a[b.b.f] = BD(Exb(a.b, b.b), 57); + c = BD(Dxb(a.b, b.b), 57); + !!c && (a.a[c.f] = b.b); + } + function AFb(a) { + if (!a.a.d || !a.a.e) { + throw vbb( + new Zdb( + (fdb(fN), + fN.k + + " must have a source and target " + + (fdb(jN), jN.k) + + " specified.") + ) + ); + } + if (a.a.d == a.a.e) { + throw vbb( + new Zdb( + "Network simplex does not support self-loops: " + + a.a + + " " + + a.a.d + + " " + + a.a.e + ) + ); + } + NFb(a.a.d.g, a.a); + NFb(a.a.e.b, a.a); + return a.a; + } + function HHc(a, b, c) { + var d, e, f, g, h, i, j; + j = new Hxb(new tIc(a)); + for ( + g = OC(GC(aR, 1), lne, 11, 0, [b, c]), h = 0, i = g.length; + h < i; + ++h + ) { + f = g[h]; + Iwb(j.a, f, (Bcb(), zcb)) == null; + for (e = new b1b(f.b); llb(e.a) || llb(e.b); ) { + d = BD(llb(e.a) ? mlb(e.a) : mlb(e.b), 17); + d.c == d.d || Axb(j, f == d.c ? d.d : d.c); + } + } + return Qb(j), new Tkb(j); + } + function oPc(a, b, c) { + var d, e, f, g, h, i; + d = 0; + if (b.b != 0 && c.b != 0) { + f = Jsb(b, 0); + g = Jsb(c, 0); + h = Edb(ED(Xsb(f))); + i = Edb(ED(Xsb(g))); + e = true; + do { + if (h > i - a.b && h < i + a.b) { + return -1; + } else h > i - a.a && h < i + a.a && ++d; + h <= i && f.b != f.d.c + ? (h = Edb(ED(Xsb(f)))) + : i <= h && g.b != g.d.c + ? (i = Edb(ED(Xsb(g)))) + : (e = false); + } while (e); + } + return d; + } + function F3b(a, b, c, d, e) { + var f, g, h, i; + i = ((f = BD(gdb(F1), 9)), new xqb(f, BD(_Bb(f, f.length), 9), 0)); + for (h = new olb(a.j); h.a < h.c.c.length; ) { + g = BD(mlb(h), 11); + if (b[g.p]) { + G3b(g, b[g.p], d); + rqb(i, g.j); + } + } + if (e) { + K3b(a, b, (Ucd(), zcd), 2 * c, d); + K3b(a, b, Tcd, 2 * c, d); + } else { + K3b(a, b, (Ucd(), Acd), 2 * c, d); + K3b(a, b, Rcd, 2 * c, d); + } + } + function Szb(a) { + var b, c, d, e, f; + f = new Rkb(); + Hkb(a.b, new XBb(f)); + a.b.c = KC(SI, Uhe, 1, 0, 5, 1); + if (f.c.length != 0) { + b = (tCb(0, f.c.length), BD(f.c[0], 78)); + for (c = 1, d = f.c.length; c < d; ++c) { + e = (tCb(c, f.c.length), BD(f.c[c], 78)); + e != b && Qy(b, e); + } + if (JD(b, 60)) { + throw vbb(BD(b, 60)); + } + if (JD(b, 289)) { + throw vbb(BD(b, 289)); + } + } + } + function DCb(a, b) { + var c, d, e, f; + a = a == null ? Xhe : (uCb(a), a); + c = new Vfb(); + f = 0; + d = 0; + while (d < b.length) { + e = a.indexOf("%s", f); + if (e == -1) { + break; + } + Qfb(c, a.substr(f, e - f)); + Pfb(c, b[d++]); + f = e + 2; + } + Qfb(c, a.substr(f)); + if (d < b.length) { + c.a += " ["; + Pfb(c, b[d++]); + while (d < b.length) { + c.a += She; + Pfb(c, b[d++]); + } + c.a += "]"; + } + return c.a; + } + function KCb(a) { + var b, c, d, e; + b = 0; + d = a.length; + e = d - 4; + c = 0; + while (c < e) { + b = + (BCb(c + 3, a.length), + a.charCodeAt(c + 3) + + (BCb(c + 2, a.length), + 31 * + (a.charCodeAt(c + 2) + + (BCb(c + 1, a.length), + 31 * + (a.charCodeAt(c + 1) + + (BCb(c, a.length), 31 * (a.charCodeAt(c) + 31 * b))))))); + b = b | 0; + c += 4; + } + while (c < d) { + b = b * 31 + bfb(a, c++); + } + b = b | 0; + return b; + } + function Rac(a) { + var b, c; + for (c = new Sr(ur(U_b(a).a.Kc(), new Sq())); Qr(c); ) { + b = BD(Rr(c), 17); + if (b.d.i.k != (j0b(), f0b)) { + throw vbb( + new y2c( + Fne + + P_b(a) + + "' has its layer constraint set to LAST, but has at least one outgoing edge that " + + " does not go to a LAST_SEPARATE node. That must not happen." + ) + ); + } + } + } + function jQc(a, b, c, d) { + var e, f, g, h, i, j, k, l, m; + i = 0; + for (k = new olb(a.a); k.a < k.c.c.length; ) { + j = BD(mlb(k), 10); + h = 0; + for (f = new Sr(ur(R_b(j).a.Kc(), new Sq())); Qr(f); ) { + e = BD(Rr(f), 17); + l = A0b(e.c).b; + m = A0b(e.d).b; + h = Math.max(h, Math.abs(m - l)); + } + i = Math.max(i, h); + } + g = d * Math.min(1, b / c) * i; + return g; + } + function See(a) { + var b; + b = new Ifb(); + (a & 256) != 0 && ((b.a += "F"), b); + (a & 128) != 0 && ((b.a += "H"), b); + (a & 512) != 0 && ((b.a += "X"), b); + (a & 2) != 0 && ((b.a += "i"), b); + (a & 8) != 0 && ((b.a += "m"), b); + (a & 4) != 0 && ((b.a += "s"), b); + (a & 32) != 0 && ((b.a += "u"), b); + (a & 64) != 0 && ((b.a += "w"), b); + (a & 16) != 0 && ((b.a += "x"), b); + (a & zte) != 0 && ((b.a += ","), b); + return jfb(b.a); + } + function F5b(a, b) { + var c, d, e, f; + Odd(b, "Resize child graph to fit parent.", 1); + for (d = new olb(a.b); d.a < d.c.c.length; ) { + c = BD(mlb(d), 29); + Gkb(a.a, c.a); + c.a.c = KC(SI, Uhe, 1, 0, 5, 1); + } + for (f = new olb(a.a); f.a < f.c.c.length; ) { + e = BD(mlb(f), 10); + $_b(e, null); + } + a.b.c = KC(SI, Uhe, 1, 0, 5, 1); + G5b(a); + !!a.e && E5b(a.e, a); + Qdd(b); + } + function eec(a) { + var b, c, d, e, f, g, h, i, j; + d = a.b; + f = d.e; + g = ecd(BD(vNb(d, (Nyc(), Vxc)), 98)); + c = !!f && BD(vNb(f, (wtc(), Ksc)), 21).Hc((Orc(), Hrc)); + if (g || c) { + return; + } + for (j = ((h = new $ib(a.e).a.vc().Kc()), new djb(h)); j.a.Ob(); ) { + i = ((b = BD(j.a.Pb(), 42)), BD(b.dd(), 113)); + if (i.a) { + e = i.d; + F0b(e, null); + i.c = true; + a.a = true; + } + } + } + function QFc(a) { + var b, c, d, e, f, g, h, i, j, k, l, m, n; + m = -1; + n = 0; + for (j = a, k = 0, l = j.length; k < l; ++k) { + i = j[k]; + for (f = i, g = 0, h = f.length; g < h; ++g) { + e = f[g]; + b = new Unc(m == -1 ? a[0] : a[m], Xec(e)); + for (c = 0; c < e.j.c.length; c++) { + for (d = c + 1; d < e.j.c.length; d++) { + Rnc(b, BD(Ikb(e.j, c), 11), BD(Ikb(e.j, d), 11)) > 0 && ++n; + } + } + } + ++m; + } + return n; + } + function hUc(a, b) { + var c, d, e, f, g; + g = BD(vNb(b, (JTc(), FTc)), 425); + for (f = Jsb(b.b, 0); f.b != f.d.c; ) { + e = BD(Xsb(f), 86); + if (a.b[e.g] == 0) { + switch (g.g) { + case 0: + iUc(a, e); + break; + case 1: + gUc(a, e); + } + a.b[e.g] = 2; + } + } + for (d = Jsb(a.a, 0); d.b != d.d.c; ) { + c = BD(Xsb(d), 188); + ze(c.b.d, c, true); + ze(c.c.b, c, true); + } + yNb(b, (mTc(), gTc), a.a); + } + function S6d(a, b) { + Q6d(); + var c, d, e, f; + if (!b) { + return P6d; + } else if ( + b == (Q8d(), N8d) || + ((b == v8d || b == t8d || b == u8d) && a != s8d) + ) { + return new Z6d(a, b); + } else { + d = BD(b, 677); + c = d.pk(); + if (!c) { + a2d(q1d((O6d(), M6d), b)); + c = d.pk(); + } + f = (!c.i && (c.i = new Lqb()), c.i); + e = BD(Wd(irb(f.f, a)), 1942); + !e && Rhb(f, a, (e = new Z6d(a, b))); + return e; + } + } + function Tbc(a, b) { + var c, d, e, f, g, h, i, j, k; + i = BD(vNb(a, (wtc(), $sc)), 11); + j = l7c(OC(GC(m1, 1), nie, 8, 0, [i.i.n, i.n, i.a])).a; + k = a.i.n.b; + c = k_b(a.e); + for (e = c, f = 0, g = e.length; f < g; ++f) { + d = e[f]; + RZb(d, i); + Fsb(d.a, new f7c(j, k)); + if (b) { + h = BD(vNb(d, (Nyc(), jxc)), 74); + if (!h) { + h = new s7c(); + yNb(d, jxc, h); + } + Dsb(h, new f7c(j, k)); + } + } + } + function Ubc(a, b) { + var c, d, e, f, g, h, i, j, k; + e = BD(vNb(a, (wtc(), $sc)), 11); + j = l7c(OC(GC(m1, 1), nie, 8, 0, [e.i.n, e.n, e.a])).a; + k = a.i.n.b; + c = k_b(a.g); + for (g = c, h = 0, i = g.length; h < i; ++h) { + f = g[h]; + QZb(f, e); + Esb(f.a, new f7c(j, k)); + if (b) { + d = BD(vNb(f, (Nyc(), jxc)), 74); + if (!d) { + d = new s7c(); + yNb(f, jxc, d); + } + Dsb(d, new f7c(j, k)); + } + } + } + function TFc(a, b) { + var c, d, e, f, g, h; + a.b = new Rkb(); + a.d = BD(vNb(b, (wtc(), jtc)), 230); + a.e = Dub(a.d); + f = new Psb(); + e = Ou(OC(GC(KQ, 1), cne, 37, 0, [b])); + g = 0; + while (g < e.c.length) { + d = (tCb(g, e.c.length), BD(e.c[g], 37)); + d.p = g++; + c = new fFc(d, a.a, a.b); + Gkb(e, c.b); + Ekb(a.b, c); + c.s && ((h = Jsb(f, 0)), Vsb(h, c)); + } + a.c = new Tqb(); + return f; + } + function HJb(a, b) { + var c, d, e, f, g, h; + for (g = BD(BD(Qc(a.r, b), 21), 84).Kc(); g.Ob(); ) { + f = BD(g.Pb(), 111); + c = f.c ? ZHb(f.c) : 0; + if (c > 0) { + if (f.a) { + h = f.b.rf().a; + if (c > h) { + e = (c - h) / 2; + f.d.b = e; + f.d.c = e; + } + } else { + f.d.c = a.s + c; + } + } else if (tcd(a.u)) { + d = sfd(f.b); + d.c < 0 && (f.d.b = -d.c); + d.c + d.b > f.b.rf().a && (f.d.c = d.c + d.b - f.b.rf().a); + } + } + } + function Eec(a, b) { + var c, d, e, f; + Odd(b, "Semi-Interactive Crossing Minimization Processor", 1); + c = false; + for (e = new olb(a.b); e.a < e.c.c.length; ) { + d = BD(mlb(e), 29); + f = TAb( + VAb( + JAb(JAb(new YAb(null, new Kub(d.a, 16)), new Jec()), new Lec()), + new Nec() + ), + new Rec() + ); + c = c | (f.a != null); + } + c && yNb(a, (wtc(), Rsc), (Bcb(), true)); + Qdd(b); + } + function sRc(a, b, c) { + var d, e, f, g, h; + e = c; + !e && (e = new Zdd()); + Odd(e, "Layout", a.a.c.length); + if (Ccb(DD(vNb(b, (JTc(), vTc))))) { + Zfb(); + for (d = 0; d < a.a.c.length; d++) { + h = (d < 10 ? "0" : "") + d++; + " Slot " + h + ": " + hdb(rb(BD(Ikb(a.a, d), 51))); + } + } + for (g = new olb(a.a); g.a < g.c.c.length; ) { + f = BD(mlb(g), 51); + f.pf(b, Udd(e, 1)); + } + Qdd(e); + } + function yMb(a) { + var b, c; + b = BD(a.a, 19).a; + c = BD(a.b, 19).a; + if (b >= 0) { + if (b == c) { + return new vgd(meb(-b - 1), meb(-b - 1)); + } + if (b == -c) { + return new vgd(meb(-b), meb(c + 1)); + } + } + if (Math.abs(b) > Math.abs(c)) { + if (b < 0) { + return new vgd(meb(-b), meb(c)); + } + return new vgd(meb(-b), meb(c + 1)); + } + return new vgd(meb(b + 1), meb(c)); + } + function q5b(a) { + var b, c; + c = BD(vNb(a, (Nyc(), mxc)), 163); + b = BD(vNb(a, (wtc(), Osc)), 303); + if (c == (Ctc(), ytc)) { + yNb(a, mxc, Btc); + yNb(a, Osc, (esc(), dsc)); + } else if (c == Atc) { + yNb(a, mxc, Btc); + yNb(a, Osc, (esc(), bsc)); + } else if (b == (esc(), dsc)) { + yNb(a, mxc, ytc); + yNb(a, Osc, csc); + } else if (b == bsc) { + yNb(a, mxc, Atc); + yNb(a, Osc, csc); + } + } + function FNc() { + FNc = ccb; + DNc = new RNc(); + zNc = e3c(new j3c(), (qUb(), nUb), (S8b(), o8b)); + CNc = c3c(e3c(new j3c(), nUb, C8b), pUb, B8b); + ENc = b3c( + b3c(g3c(c3c(e3c(new j3c(), lUb, M8b), pUb, L8b), oUb), K8b), + N8b + ); + ANc = c3c( + e3c(e3c(e3c(new j3c(), mUb, r8b), oUb, t8b), oUb, u8b), + pUb, + s8b + ); + BNc = c3c(e3c(e3c(new j3c(), oUb, u8b), oUb, _7b), pUb, $7b); + } + function hQc() { + hQc = ccb; + cQc = e3c(c3c(new j3c(), (qUb(), pUb), (S8b(), c8b)), nUb, o8b); + gQc = b3c( + b3c(g3c(c3c(e3c(new j3c(), lUb, M8b), pUb, L8b), oUb), K8b), + N8b + ); + dQc = c3c( + e3c(e3c(e3c(new j3c(), mUb, r8b), oUb, t8b), oUb, u8b), + pUb, + s8b + ); + fQc = e3c(e3c(new j3c(), nUb, C8b), pUb, B8b); + eQc = c3c(e3c(e3c(new j3c(), oUb, u8b), oUb, _7b), pUb, $7b); + } + function GNc(a, b, c, d, e) { + var f, g; + if ( + ((!OZb(b) && b.c.i.c == b.d.i.c) || + !T6c(l7c(OC(GC(m1, 1), nie, 8, 0, [e.i.n, e.n, e.a])), c)) && + !OZb(b) + ) { + b.c == e ? St(b.a, 0, new g7c(c)) : Dsb(b.a, new g7c(c)); + if (d && !Rqb(a.a, c)) { + g = BD(vNb(b, (Nyc(), jxc)), 74); + if (!g) { + g = new s7c(); + yNb(b, jxc, g); + } + f = new g7c(c); + Gsb(g, f, g.c.b, g.c); + Qqb(a.a, f); + } + } + } + function Qac(a) { + var b, c; + for (c = new Sr(ur(R_b(a).a.Kc(), new Sq())); Qr(c); ) { + b = BD(Rr(c), 17); + if (b.c.i.k != (j0b(), f0b)) { + throw vbb( + new y2c( + Fne + + P_b(a) + + "' has its layer constraint set to FIRST, but has at least one incoming edge that " + + " does not come from a FIRST_SEPARATE node. That must not happen." + ) + ); + } + } + } + function vjd(a, b, c) { + var d, e, f, g, h, i, j; + e = aeb(a.Db & 254); + if (e == 0) { + a.Eb = c; + } else { + if (e == 1) { + h = KC(SI, Uhe, 1, 2, 5, 1); + f = zjd(a, b); + if (f == 0) { + h[0] = c; + h[1] = a.Eb; + } else { + h[0] = a.Eb; + h[1] = c; + } + } else { + h = KC(SI, Uhe, 1, e + 1, 5, 1); + g = CD(a.Eb); + for (d = 2, i = 0, j = 0; d <= 128; d <<= 1) { + d == b ? (h[j++] = c) : (a.Db & d) != 0 && (h[j++] = g[i++]); + } + } + a.Eb = h; + } + a.Db |= b; + } + function ENb(a, b, c) { + var d, e, f, g; + this.b = new Rkb(); + e = 0; + d = 0; + for (g = new olb(a); g.a < g.c.c.length; ) { + f = BD(mlb(g), 167); + c && rMb(f); + Ekb(this.b, f); + e += f.o; + d += f.p; + } + if (this.b.c.length > 0) { + f = BD(Ikb(this.b, 0), 167); + e += f.o; + d += f.p; + } + e *= 2; + d *= 2; + b > 1 ? (e = QD(Math.ceil(e * b))) : (d = QD(Math.ceil(d / b))); + this.a = new pNb(e, d); + } + function Igc(a, b, c, d, e, f) { + var g, h, i, j, k, l, m, n, o, p, q, r; + k = d; + if (b.j && b.o) { + n = BD(Ohb(a.f, b.A), 57); + p = n.d.c + n.d.b; + --k; + } else { + p = b.a.c + b.a.b; + } + l = e; + if (c.q && c.o) { + n = BD(Ohb(a.f, c.C), 57); + j = n.d.c; + ++l; + } else { + j = c.a.c; + } + q = j - p; + i = Math.max(2, l - k); + h = q / i; + o = p + h; + for (m = k; m < l; ++m) { + g = BD(f.Xb(m), 128); + r = g.a.b; + g.a.c = o - r / 2; + o += h; + } + } + function UHc(a, b, c, d, e, f) { + var g, h, i, j, k, l; + j = c.c.length; + f && (a.c = KC(WD, oje, 25, b.length, 15, 1)); + for ( + g = e ? 0 : b.length - 1; + e ? g < b.length : g >= 0; + g += e ? 1 : -1 + ) { + h = b[g]; + i = + d == (Ucd(), zcd) + ? e + ? V_b(h, d) + : Su(V_b(h, d)) + : e + ? Su(V_b(h, d)) + : V_b(h, d); + f && (a.c[h.p] = i.gc()); + for (l = i.Kc(); l.Ob(); ) { + k = BD(l.Pb(), 11); + a.d[k.p] = j++; + } + Gkb(c, i); + } + } + function aQc(a, b, c) { + var d, e, f, g, h, i, j, k; + f = Edb(ED(a.b.Kc().Pb())); + j = Edb(ED(Pq(b.b))); + d = Y6c(R6c(a.a), j - c); + e = Y6c(R6c(b.a), c - f); + k = P6c(d, e); + Y6c(k, 1 / (j - f)); + this.a = k; + this.b = new Rkb(); + h = true; + g = a.b.Kc(); + g.Pb(); + while (g.Ob()) { + i = Edb(ED(g.Pb())); + if (h && i - c > Oqe) { + this.b.Fc(c); + h = false; + } + this.b.Fc(i); + } + h && this.b.Fc(c); + } + function vGb(a) { + var b, c, d, e; + yGb(a, a.n); + if (a.d.c.length > 0) { + Blb(a.c); + while (GGb(a, BD(mlb(new olb(a.e.a)), 121)) < a.e.a.c.length) { + b = AGb(a); + e = b.e.e - b.d.e - b.a; + b.e.j && (e = -e); + for (d = new olb(a.e.a); d.a < d.c.c.length; ) { + c = BD(mlb(d), 121); + c.j && (c.e += e); + } + Blb(a.c); + } + Blb(a.c); + DGb(a, BD(mlb(new olb(a.e.a)), 121)); + rGb(a); + } + } + function rkc(a, b) { + var c, d, e, f, g; + for (e = BD(Qc(a.a, (Xjc(), Tjc)), 15).Kc(); e.Ob(); ) { + d = BD(e.Pb(), 101); + c = BD(Ikb(d.j, 0), 113).d.j; + f = new Tkb(d.j); + Okb(f, new Xkc()); + switch (b.g) { + case 1: + jkc(a, f, c, (Fkc(), Dkc), 1); + break; + case 0: + g = lkc(f); + jkc(a, new Jib(f, 0, g), c, (Fkc(), Dkc), 0); + jkc(a, new Jib(f, g, f.c.length), c, Dkc, 1); + } + } + } + function c2c(a, b) { + Y1c(); + var c, d; + c = j4c(n4c(), b.tg()); + if (c) { + d = c.j; + if (JD(a, 239)) { + return Zod(BD(a, 33)) + ? uqb(d, (N5c(), K5c)) || uqb(d, L5c) + : uqb(d, (N5c(), K5c)); + } else if (JD(a, 352)) { + return uqb(d, (N5c(), I5c)); + } else if (JD(a, 186)) { + return uqb(d, (N5c(), M5c)); + } else if (JD(a, 354)) { + return uqb(d, (N5c(), J5c)); + } + } + return true; + } + function c3d(a, b, c) { + var d, e, f, g, h, i; + e = c; + f = e.ak(); + if (T6d(a.e, f)) { + if (f.hi()) { + d = BD(a.g, 119); + for (g = 0; g < a.i; ++g) { + h = d[g]; + if (pb(h, e) && g != b) { + throw vbb(new Wdb(kue)); + } + } + } + } else { + i = S6d(a.e.Tg(), f); + d = BD(a.g, 119); + for (g = 0; g < a.i; ++g) { + h = d[g]; + if (i.rl(h.ak()) && g != b) { + throw vbb(new Wdb(Hwe)); + } + } + } + return BD(Gtd(a, b, c), 72); + } + function Sy(d, b) { + if (b instanceof Object) { + try { + b.__java$exception = d; + if ( + navigator.userAgent.toLowerCase().indexOf("msie") != -1 && + $doc.documentMode < 9 + ) { + return; + } + var c = d; + Object.defineProperties(b, { + cause: { + get: function () { + var a = c.Zd(); + return a && a.Xd(); + }, + }, + suppressed: { + get: function () { + return c.Yd(); + }, + }, + }); + } catch (a) {} + } + } + function lhb(a, b) { + var c, d, e, f, g; + d = b >> 5; + b &= 31; + if (d >= a.d) { + return a.e < 0 ? (Hgb(), Bgb) : (Hgb(), Ggb); + } + f = a.d - d; + e = KC(WD, oje, 25, f + 1, 15, 1); + mhb(e, f, a.a, d, b); + if (a.e < 0) { + for (c = 0; c < d && a.a[c] == 0; c++); + if (c < d || (b > 0 && a.a[c] << (32 - b) != 0)) { + for (c = 0; c < f && e[c] == -1; c++) { + e[c] = 0; + } + c == f && ++f; + ++e[c]; + } + } + g = new Vgb(a.e, f, e); + Jgb(g); + return g; + } + function UPb(a) { + var b, c, d, e; + e = mpd(a); + c = new kQb(e); + d = new mQb(e); + b = new Rkb(); + Gkb(b, (!a.d && (a.d = new y5d(B2, a, 8, 5)), a.d)); + Gkb(b, (!a.e && (a.e = new y5d(B2, a, 7, 4)), a.e)); + return BD( + GAb( + NAb(JAb(new YAb(null, new Kub(b, 16)), c), d), + Ayb( + new hzb(), + new jzb(), + new Gzb(), + new Izb(), + OC(GC(xL, 1), Kie, 132, 0, [(Fyb(), Eyb), Dyb]) + ) + ), + 21 + ); + } + function p2d(a, b, c, d) { + var e, f, g, h, i; + h = (Q6d(), BD(b, 66).Oj()); + if (T6d(a.e, b)) { + if (b.hi() && F2d(a, b, d, JD(b, 99) && (BD(b, 18).Bb & Tje) != 0)) { + throw vbb(new Wdb(kue)); + } + } else { + i = S6d(a.e.Tg(), b); + e = BD(a.g, 119); + for (g = 0; g < a.i; ++g) { + f = e[g]; + if (i.rl(f.ak())) { + throw vbb(new Wdb(Hwe)); + } + } + } + vtd(a, I2d(a, b, c), h ? BD(d, 72) : R6d(b, d)); + } + function T6d(a, b) { + Q6d(); + var c, d, e; + if (b.$j()) { + return true; + } else if (b.Zj() == -2) { + if (b == (m8d(), k8d) || b == h8d || b == i8d || b == j8d) { + return true; + } else { + e = a.Tg(); + if (bLd(e, b) >= 0) { + return false; + } else { + c = e1d((O6d(), M6d), e, b); + if (!c) { + return true; + } else { + d = c.Zj(); + return (d > 1 || d == -1) && $1d(q1d(M6d, c)) != 3; + } + } + } + } else { + return false; + } + } + function R1b(a, b, c, d) { + var e, f, g, h, i; + h = atd(BD(qud((!b.b && (b.b = new y5d(z2, b, 4, 7)), b.b), 0), 82)); + i = atd(BD(qud((!b.c && (b.c = new y5d(z2, b, 5, 8)), b.c), 0), 82)); + if (Xod(h) == Xod(i)) { + return null; + } + if (ntd(i, h)) { + return null; + } + g = Mld(b); + if (g == c) { + return d; + } else { + f = BD(Ohb(a.a, g), 10); + if (f) { + e = f.e; + if (e) { + return e; + } + } + } + return null; + } + function Cac(a, b) { + var c; + c = BD(vNb(a, (Nyc(), Rwc)), 276); + Odd(b, "Label side selection (" + c + ")", 1); + switch (c.g) { + case 0: + Dac(a, (rbd(), nbd)); + break; + case 1: + Dac(a, (rbd(), obd)); + break; + case 2: + Bac(a, (rbd(), nbd)); + break; + case 3: + Bac(a, (rbd(), obd)); + break; + case 4: + Eac(a, (rbd(), nbd)); + break; + case 5: + Eac(a, (rbd(), obd)); + } + Qdd(b); + } + function bGc(a, b, c) { + var d, e, f, g, h, i; + d = RFc(c, a.length); + g = a[d]; + if (g[0].k != (j0b(), e0b)) { + return; + } + f = SFc(c, g.length); + i = b.j; + for (e = 0; e < i.c.length; e++) { + h = (tCb(e, i.c.length), BD(i.c[e], 11)); + if ( + (c ? h.j == (Ucd(), zcd) : h.j == (Ucd(), Tcd)) && + Ccb(DD(vNb(h, (wtc(), Nsc)))) + ) { + Nkb(i, e, BD(vNb(g[f], (wtc(), $sc)), 11)); + f += c ? 1 : -1; + } + } + } + function rQc(a, b) { + var c, d, e, f, g; + g = new Rkb(); + c = b; + do { + f = BD(Ohb(a.b, c), 128); + f.B = c.c; + f.D = c.d; + g.c[g.c.length] = f; + c = BD(Ohb(a.k, c), 17); + } while (c); + d = (tCb(0, g.c.length), BD(g.c[0], 128)); + d.j = true; + d.A = BD(d.d.a.ec().Kc().Pb(), 17).c.i; + e = BD(Ikb(g, g.c.length - 1), 128); + e.q = true; + e.C = BD(e.d.a.ec().Kc().Pb(), 17).d.i; + return g; + } + function $wd(a) { + if (a.g == null) { + switch (a.p) { + case 0: + a.g = Swd(a) ? (Bcb(), Acb) : (Bcb(), zcb); + break; + case 1: + a.g = Scb(Twd(a)); + break; + case 2: + a.g = bdb(Uwd(a)); + break; + case 3: + a.g = Vwd(a); + break; + case 4: + a.g = new Ndb(Wwd(a)); + break; + case 6: + a.g = Aeb(Ywd(a)); + break; + case 5: + a.g = meb(Xwd(a)); + break; + case 7: + a.g = Web(Zwd(a)); + } + } + return a.g; + } + function hxd(a) { + if (a.n == null) { + switch (a.p) { + case 0: + a.n = _wd(a) ? (Bcb(), Acb) : (Bcb(), zcb); + break; + case 1: + a.n = Scb(axd(a)); + break; + case 2: + a.n = bdb(bxd(a)); + break; + case 3: + a.n = cxd(a); + break; + case 4: + a.n = new Ndb(dxd(a)); + break; + case 6: + a.n = Aeb(fxd(a)); + break; + case 5: + a.n = meb(exd(a)); + break; + case 7: + a.n = Web(gxd(a)); + } + } + return a.n; + } + function QDb(a) { + var b, c, d, e, f, g, h; + for (f = new olb(a.a.a); f.a < f.c.c.length; ) { + d = BD(mlb(f), 307); + d.g = 0; + d.i = 0; + d.e.a.$b(); + } + for (e = new olb(a.a.a); e.a < e.c.c.length; ) { + d = BD(mlb(e), 307); + for (c = d.a.a.ec().Kc(); c.Ob(); ) { + b = BD(c.Pb(), 57); + for (h = b.c.Kc(); h.Ob(); ) { + g = BD(h.Pb(), 57); + if (g.a != d) { + Qqb(d.e, g); + ++g.a.g; + ++g.a.i; + } + } + } + } + } + function gOb(a, b) { + var c, d, e, f, g, h; + h = Axb(a.a, b.b); + if (!h) { + throw vbb( + new Zdb("Invalid hitboxes for scanline overlap calculation.") + ); + } + g = false; + for ( + f = ((d = new Ywb(new cxb(new Gjb(a.a.a).a).b)), new Njb(d)); + sib(f.a.a); + + ) { + e = ((c = Wwb(f.a)), BD(c.cd(), 65)); + if (bOb(b.b, e)) { + T$c(a.b.a, b.b, e); + g = true; + } else { + if (g) { + break; + } + } + } + } + function G5b(a) { + var b, c, d, e, f; + e = BD(vNb(a, (Nyc(), Fxc)), 21); + f = BD(vNb(a, Ixc), 21); + c = new f7c(a.f.a + a.d.b + a.d.c, a.f.b + a.d.d + a.d.a); + b = new g7c(c); + if (e.Hc((tdd(), pdd))) { + d = BD(vNb(a, Hxc), 8); + if (f.Hc((Idd(), Bdd))) { + d.a <= 0 && (d.a = 20); + d.b <= 0 && (d.b = 20); + } + b.a = Math.max(c.a, d.a); + b.b = Math.max(c.b, d.b); + } + H5b(a, c, b); + } + function toc(a, b) { + var c, d, e, f, g, h, i, j, k, l, m; + e = b ? new Coc() : new Eoc(); + f = false; + do { + f = false; + j = b ? Su(a.b) : a.b; + for (i = j.Kc(); i.Ob(); ) { + h = BD(i.Pb(), 29); + m = Mu(h.a); + b || new ov(m); + for (l = new olb(m); l.a < l.c.c.length; ) { + k = BD(mlb(l), 10); + if (e.Mb(k)) { + d = k; + c = BD(vNb(k, (wtc(), usc)), 305); + g = b ? c.b : c.k; + f = roc(d, g, b, false); + } + } + } + } while (f); + } + function WCc(a, b, c) { + var d, e, f, g, h; + Odd(c, "Longest path layering", 1); + a.a = b; + h = a.a.a; + a.b = KC(WD, oje, 25, h.c.length, 15, 1); + d = 0; + for (g = new olb(h); g.a < g.c.c.length; ) { + e = BD(mlb(g), 10); + e.p = d; + a.b[d] = -1; + ++d; + } + for (f = new olb(h); f.a < f.c.c.length; ) { + e = BD(mlb(f), 10); + YCc(a, e); + } + h.c = KC(SI, Uhe, 1, 0, 5, 1); + a.a = null; + a.b = null; + Qdd(c); + } + function QVb(a, b) { + var c, d, e; + b.a + ? (Axb(a.b, b.b), + (a.a[b.b.i] = BD(Exb(a.b, b.b), 81)), + (c = BD(Dxb(a.b, b.b), 81)), + !!c && (a.a[c.i] = b.b), + undefined) + : ((d = BD(Exb(a.b, b.b), 81)), + !!d && d == a.a[b.b.i] && !!d.d && d.d != b.b.d && d.f.Fc(b.b), + (e = BD(Dxb(a.b, b.b), 81)), + !!e && a.a[e.i] == b.b && !!e.d && e.d != b.b.d && b.b.f.Fc(e), + Fxb(a.b, b.b), + undefined); + } + function zbc(a, b) { + var c, d, e, f, g, h; + f = a.d; + h = Edb(ED(vNb(a, (Nyc(), Zwc)))); + if (h < 0) { + h = 0; + yNb(a, Zwc, h); + } + b.o.b = h; + g = Math.floor(h / 2); + d = new H0b(); + G0b(d, (Ucd(), Tcd)); + F0b(d, b); + d.n.b = g; + e = new H0b(); + G0b(e, zcd); + F0b(e, b); + e.n.b = g; + RZb(a, d); + c = new UZb(); + tNb(c, a); + yNb(c, jxc, null); + QZb(c, e); + RZb(c, f); + ybc(b, a, c); + wbc(a, c); + return c; + } + function uNc(a) { + var b, c; + c = BD(vNb(a, (wtc(), Ksc)), 21); + b = new j3c(); + if (c.Hc((Orc(), Irc))) { + d3c(b, oNc); + d3c(b, qNc); + } + if (c.Hc(Krc) || Ccb(DD(vNb(a, (Nyc(), $wc))))) { + d3c(b, qNc); + c.Hc(Lrc) && d3c(b, rNc); + } + c.Hc(Hrc) && d3c(b, nNc); + c.Hc(Nrc) && d3c(b, sNc); + c.Hc(Jrc) && d3c(b, pNc); + c.Hc(Erc) && d3c(b, lNc); + c.Hc(Grc) && d3c(b, mNc); + return b; + } + function Ihb(a, b) { + var c, d, e, f, g, h, i, j, k, l, m; + d = a.d; + f = b.d; + h = d + f; + i = a.e != b.e ? -1 : 1; + if (h == 2) { + k = Ibb(xbb(a.a[0], Yje), xbb(b.a[0], Yje)); + m = Tbb(k); + l = Tbb(Pbb(k, 32)); + return l == 0 + ? new Ugb(i, m) + : new Vgb(i, 2, OC(GC(WD, 1), oje, 25, 15, [m, l])); + } + c = a.a; + e = b.a; + g = KC(WD, oje, 25, h, 15, 1); + Fhb(c, d, e, f, g); + j = new Vgb(i, h, g); + Jgb(j); + return j; + } + function Gwb(a, b, c, d) { + var e, f; + if (!b) { + return c; + } else { + e = a.a.ue(c.d, b.d); + if (e == 0) { + d.d = ijb(b, c.e); + d.b = true; + return b; + } + f = e < 0 ? 0 : 1; + b.a[f] = Gwb(a, b.a[f], c, d); + if (Hwb(b.a[f])) { + if (Hwb(b.a[1 - f])) { + b.b = true; + b.a[0].b = false; + b.a[1].b = false; + } else { + Hwb(b.a[f].a[f]) + ? (b = Owb(b, 1 - f)) + : Hwb(b.a[f].a[1 - f]) && (b = Nwb(b, 1 - f)); + } + } + } + return b; + } + function wHb(a, b, c) { + var d, e, f, g; + e = a.i; + d = a.n; + vHb(a, (gHb(), dHb), e.c + d.b, c); + vHb(a, fHb, e.c + e.b - d.c - c[2], c); + g = e.b - d.b - d.c; + if (c[0] > 0) { + c[0] += a.d; + g -= c[0]; + } + if (c[2] > 0) { + c[2] += a.d; + g -= c[2]; + } + f = Math.max(0, g); + c[1] = Math.max(c[1], g); + vHb(a, eHb, e.c + d.b + c[0] - (c[1] - g) / 2, c); + if (b == eHb) { + a.c.b = f; + a.c.c = e.c + d.b + (f - g) / 2; + } + } + function AYb() { + this.c = KC( + UD, + Vje, + 25, + (Ucd(), OC(GC(F1, 1), bne, 61, 0, [Scd, Acd, zcd, Rcd, Tcd])).length, + 15, + 1 + ); + this.b = KC( + UD, + Vje, + 25, + OC(GC(F1, 1), bne, 61, 0, [Scd, Acd, zcd, Rcd, Tcd]).length, + 15, + 1 + ); + this.a = KC( + UD, + Vje, + 25, + OC(GC(F1, 1), bne, 61, 0, [Scd, Acd, zcd, Rcd, Tcd]).length, + 15, + 1 + ); + zlb(this.c, Pje); + zlb(this.b, Qje); + zlb(this.a, Qje); + } + function Ufe(a, b, c) { + var d, e, f, g; + if (b <= c) { + e = b; + f = c; + } else { + e = c; + f = b; + } + d = 0; + if (a.b == null) { + a.b = KC(WD, oje, 25, 2, 15, 1); + a.b[0] = e; + a.b[1] = f; + a.c = true; + } else { + d = a.b.length; + if (a.b[d - 1] + 1 == e) { + a.b[d - 1] = f; + return; + } + g = KC(WD, oje, 25, d + 2, 15, 1); + $fb(a.b, 0, g, 0, d); + a.b = g; + a.b[d - 1] >= e && ((a.c = false), (a.a = false)); + a.b[d++] = e; + a.b[d] = f; + a.c || Yfe(a); + } + } + function inc(a, b, c) { + var d, e, f, g, h, i, j; + j = b.d; + a.a = new Skb(j.c.length); + a.c = new Lqb(); + for (h = new olb(j); h.a < h.c.c.length; ) { + g = BD(mlb(h), 101); + f = new uOc(null); + Ekb(a.a, f); + Rhb(a.c, g, f); + } + a.b = new Lqb(); + gnc(a, b); + for (d = 0; d < j.c.length - 1; d++) { + i = BD(Ikb(b.d, d), 101); + for (e = d + 1; e < j.c.length; e++) { + jnc(a, i, BD(Ikb(b.d, e), 101), c); + } + } + } + function ySc(a, b, c) { + var d, e, f, g, h, i; + if (!Qq(b)) { + i = Udd(c, ((JD(b, 14) ? BD(b, 14).gc() : sr(b.Kc())) / a.a) | 0); + Odd(i, Xqe, 1); + h = new BSc(); + g = 0; + for (f = b.Kc(); f.Ob(); ) { + d = BD(f.Pb(), 86); + h = pl(OC(GC(KI, 1), Uhe, 20, 0, [h, new ZRc(d)])); + g < d.f.b && (g = d.f.b); + } + for (e = b.Kc(); e.Ob(); ) { + d = BD(e.Pb(), 86); + yNb(d, (mTc(), bTc), g); + } + Qdd(i); + ySc(a, h, c); + } + } + function bJc(a, b) { + var c, d, e, f, g, h, i; + c = Qje; + h = (j0b(), h0b); + for (e = new olb(b.a); e.a < e.c.c.length; ) { + d = BD(mlb(e), 10); + f = d.k; + if (f != h0b) { + g = ED(vNb(d, (wtc(), atc))); + if (g == null) { + c = Math.max(c, 0); + d.n.b = c + iBc(a.a, f, h); + } else { + d.n.b = (uCb(g), g); + } + } + i = iBc(a.a, f, h); + d.n.b < c + i + d.d.d && (d.n.b = c + i + d.d.d); + c = d.n.b + d.o.b + d.d.a; + h = f; + } + } + function uQb(a, b, c) { + var d, e, f, g, h, i, j, k, l; + f = itd(b, false, false); + j = ofd(f); + l = Edb(ED(hkd(b, (CPb(), vPb)))); + e = sQb(j, l + a.a); + k = new XOb(e); + tNb(k, b); + Rhb(a.b, b, k); + c.c[c.c.length] = k; + i = (!b.n && (b.n = new cUd(D2, b, 1, 7)), b.n); + for (h = new Fyd(i); h.e != h.i.gc(); ) { + g = BD(Dyd(h), 137); + d = wQb(a, g, true, 0, 0); + c.c[c.c.length] = d; + } + return k; + } + function JVc(a, b, c, d, e) { + var f, g, h, i, j, k; + !!a.d && a.d.lg(e); + f = BD(e.Xb(0), 33); + if (HVc(a, c, f, false)) { + return true; + } + g = BD(e.Xb(e.gc() - 1), 33); + if (HVc(a, d, g, true)) { + return true; + } + if (CVc(a, e)) { + return true; + } + for (k = e.Kc(); k.Ob(); ) { + j = BD(k.Pb(), 33); + for (i = b.Kc(); i.Ob(); ) { + h = BD(i.Pb(), 33); + if (BVc(a, j, h)) { + return true; + } + } + } + return false; + } + function qid(a, b, c) { + var d, e, f, g, h, i, j, k, l, m; + m = b.c.length; + l = + ((j = a.Yg(c)), + BD(j >= 0 ? a._g(j, false, true) : sid(a, c, false), 58)); + n: for (f = l.Kc(); f.Ob(); ) { + e = BD(f.Pb(), 56); + for (k = 0; k < m; ++k) { + g = (tCb(k, b.c.length), BD(b.c[k], 72)); + i = g.dd(); + h = g.ak(); + d = e.bh(h, false); + if (i == null ? d != null : !pb(i, d)) { + continue n; + } + } + return e; + } + return null; + } + function V6b(a, b, c, d) { + var e, f, g, h; + e = BD( + Y_b(b, (Ucd(), Tcd)) + .Kc() + .Pb(), + 11 + ); + f = BD(Y_b(b, zcd).Kc().Pb(), 11); + for (h = new olb(a.j); h.a < h.c.c.length; ) { + g = BD(mlb(h), 11); + while (g.e.c.length != 0) { + RZb(BD(Ikb(g.e, 0), 17), e); + } + while (g.g.c.length != 0) { + QZb(BD(Ikb(g.g, 0), 17), f); + } + } + c || yNb(b, (wtc(), Vsc), null); + d || yNb(b, (wtc(), Wsc), null); + } + function itd(a, b, c) { + var d, e; + if ((!a.a && (a.a = new cUd(A2, a, 6, 6)), a.a).i == 0) { + return etd(a); + } else { + d = BD(qud((!a.a && (a.a = new cUd(A2, a, 6, 6)), a.a), 0), 202); + if (b) { + Uxd((!d.a && (d.a = new xMd(y2, d, 5)), d.a)); + omd(d, 0); + pmd(d, 0); + hmd(d, 0); + imd(d, 0); + } + if (c) { + e = (!a.a && (a.a = new cUd(A2, a, 6, 6)), a.a); + while (e.i > 1) { + Xxd(e, e.i - 1); + } + } + return d; + } + } + function Z2b(a, b) { + var c, d, e, f, g, h, i; + Odd(b, "Comment post-processing", 1); + for (f = new olb(a.b); f.a < f.c.c.length; ) { + e = BD(mlb(f), 29); + d = new Rkb(); + for (h = new olb(e.a); h.a < h.c.c.length; ) { + g = BD(mlb(h), 10); + i = BD(vNb(g, (wtc(), vtc)), 15); + c = BD(vNb(g, tsc), 15); + if (!!i || !!c) { + $2b(g, i, c); + !!i && Gkb(d, i); + !!c && Gkb(d, c); + } + } + Gkb(e.a, d); + } + Qdd(b); + } + function Eac(a, b) { + var c, d, e, f, g, h, i; + c = new jkb(); + for (f = new olb(a.b); f.a < f.c.c.length; ) { + e = BD(mlb(f), 29); + i = true; + d = 0; + for (h = new olb(e.a); h.a < h.c.c.length; ) { + g = BD(mlb(h), 10); + switch (g.k.g) { + case 4: + ++d; + case 1: + Xjb(c, g); + break; + case 0: + Gac(g, b); + default: + c.b == c.c || Fac(c, d, i, false, b); + i = false; + d = 0; + } + } + c.b == c.c || Fac(c, d, i, true, b); + } + } + function Ebc(a, b) { + var c, d, e, f, g, h, i; + e = new Rkb(); + for (c = 0; c <= a.i; c++) { + d = new H1b(b); + d.p = a.i - c; + e.c[e.c.length] = d; + } + for (h = new olb(a.o); h.a < h.c.c.length; ) { + g = BD(mlb(h), 10); + $_b(g, BD(Ikb(e, a.i - a.f[g.p]), 29)); + } + f = new olb(e); + while (f.a < f.c.c.length) { + i = BD(mlb(f), 29); + i.a.c.length == 0 && nlb(f); + } + b.b.c = KC(SI, Uhe, 1, 0, 5, 1); + Gkb(b.b, e); + } + function KHc(a, b) { + var c, d, e, f, g, h; + c = 0; + for (h = new olb(b); h.a < h.c.c.length; ) { + g = BD(mlb(h), 11); + AHc(a.b, a.d[g.p]); + for (e = new b1b(g.b); llb(e.a) || llb(e.b); ) { + d = BD(llb(e.a) ? mlb(e.a) : mlb(e.b), 17); + f = aIc(a, g == d.c ? d.d : d.c); + if (f > a.d[g.p]) { + c += zHc(a.b, f); + Wjb(a.a, meb(f)); + } + } + while (!akb(a.a)) { + xHc(a.b, BD(fkb(a.a), 19).a); + } + } + return c; + } + function o2c(a, b, c) { + var d, e, f, g; + f = (!b.a && (b.a = new cUd(E2, b, 10, 11)), b.a).i; + for ( + e = new Fyd((!b.a && (b.a = new cUd(E2, b, 10, 11)), b.a)); + e.e != e.i.gc(); + + ) { + d = BD(Dyd(e), 33); + (!d.a && (d.a = new cUd(E2, d, 10, 11)), d.a).i == 0 || + (f += o2c(a, d, false)); + } + if (c) { + g = Xod(b); + while (g) { + f += (!g.a && (g.a = new cUd(E2, g, 10, 11)), g.a).i; + g = Xod(g); + } + } + return f; + } + function Xxd(a, b) { + var c, d, e, f; + if (a.ej()) { + d = null; + e = a.fj(); + a.ij() && (d = a.kj(a.pi(b), null)); + c = a.Zi(4, (f = tud(a, b)), null, b, e); + if (a.bj() && f != null) { + d = a.dj(f, d); + if (!d) { + a.$i(c); + } else { + d.Ei(c); + d.Fi(); + } + } else { + if (!d) { + a.$i(c); + } else { + d.Ei(c); + d.Fi(); + } + } + return f; + } else { + f = tud(a, b); + if (a.bj() && f != null) { + d = a.dj(f, null); + !!d && d.Fi(); + } + return f; + } + } + function UKb(a) { + var b, c, d, e, f, g, h, i, j, k; + j = a.a; + b = new Tqb(); + i = 0; + for (d = new olb(a.d); d.a < d.c.c.length; ) { + c = BD(mlb(d), 222); + k = 0; + ktb(c.b, new XKb()); + for (g = Jsb(c.b, 0); g.b != g.d.c; ) { + f = BD(Xsb(g), 222); + if (b.a._b(f)) { + e = c.c; + h = f.c; + k < h.d + h.a + j && k + e.a + j > h.d && (k = h.d + h.a + j); + } + } + c.c.d = k; + b.a.zc(c, b); + i = Math.max(i, c.c.d + c.c.a); + } + return i; + } + function Orc() { + Orc = ccb; + Frc = new Prc("COMMENTS", 0); + Hrc = new Prc("EXTERNAL_PORTS", 1); + Irc = new Prc("HYPEREDGES", 2); + Jrc = new Prc("HYPERNODES", 3); + Krc = new Prc("NON_FREE_PORTS", 4); + Lrc = new Prc("NORTH_SOUTH_PORTS", 5); + Nrc = new Prc(Wne, 6); + Erc = new Prc("CENTER_LABELS", 7); + Grc = new Prc("END_LABELS", 8); + Mrc = new Prc("PARTITIONS", 9); + } + function gVc(a) { + var b, c, d, e, f; + e = new Rkb(); + b = new Vqb((!a.a && (a.a = new cUd(E2, a, 10, 11)), a.a)); + for (d = new Sr(ur(_sd(a).a.Kc(), new Sq())); Qr(d); ) { + c = BD(Rr(d), 79); + if (!JD(qud((!c.b && (c.b = new y5d(z2, c, 4, 7)), c.b), 0), 186)) { + f = atd(BD(qud((!c.c && (c.c = new y5d(z2, c, 5, 8)), c.c), 0), 82)); + b.a._b(f) || ((e.c[e.c.length] = f), true); + } + } + return e; + } + function fVc(a) { + var b, c, d, e, f, g; + f = new Tqb(); + b = new Vqb((!a.a && (a.a = new cUd(E2, a, 10, 11)), a.a)); + for (e = new Sr(ur(_sd(a).a.Kc(), new Sq())); Qr(e); ) { + d = BD(Rr(e), 79); + if (!JD(qud((!d.b && (d.b = new y5d(z2, d, 4, 7)), d.b), 0), 186)) { + g = atd(BD(qud((!d.c && (d.c = new y5d(z2, d, 5, 8)), d.c), 0), 82)); + b.a._b(g) || ((c = f.a.zc(g, f)), c == null); + } + } + return f; + } + function zA(a, b, c, d, e) { + if (d < 0) { + d = oA( + a, + e, + OC(GC(ZI, 1), nie, 2, 6, [ + bje, + cje, + dje, + eje, + fje, + gje, + hje, + ije, + jje, + kje, + lje, + mje, + ]), + b + ); + d < 0 && + (d = oA( + a, + e, + OC(GC(ZI, 1), nie, 2, 6, [ + "Jan", + "Feb", + "Mar", + "Apr", + fje, + "Jun", + "Jul", + "Aug", + "Sep", + "Oct", + "Nov", + "Dec", + ]), + b + )); + if (d < 0) { + return false; + } + c.k = d; + return true; + } else if (d > 0) { + c.k = d - 1; + return true; + } + return false; + } + function BA(a, b, c, d, e) { + if (d < 0) { + d = oA( + a, + e, + OC(GC(ZI, 1), nie, 2, 6, [ + bje, + cje, + dje, + eje, + fje, + gje, + hje, + ije, + jje, + kje, + lje, + mje, + ]), + b + ); + d < 0 && + (d = oA( + a, + e, + OC(GC(ZI, 1), nie, 2, 6, [ + "Jan", + "Feb", + "Mar", + "Apr", + fje, + "Jun", + "Jul", + "Aug", + "Sep", + "Oct", + "Nov", + "Dec", + ]), + b + )); + if (d < 0) { + return false; + } + c.k = d; + return true; + } else if (d > 0) { + c.k = d - 1; + return true; + } + return false; + } + function DA(a, b, c, d, e, f) { + var g, h, i, j; + h = 32; + if (d < 0) { + if (b[0] >= a.length) { + return false; + } + h = bfb(a, b[0]); + if (h != 43 && h != 45) { + return false; + } + ++b[0]; + d = rA(a, b); + if (d < 0) { + return false; + } + h == 45 && (d = -d); + } + if (h == 32 && b[0] - c == 2 && e.b == 2) { + i = new eB(); + j = i.q.getFullYear() - nje + nje - 80; + g = j % 100; + f.a = d == g; + d += ((j / 100) | 0) * 100 + (d < g ? 100 : 0); + } + f.p = d; + return true; + } + function L1b(a, b) { + var c, d, e, f, g; + if (!Xod(a)) { + return; + } + g = BD(vNb(b, (Nyc(), Fxc)), 174); + PD(hkd(a, Vxc)) === PD((dcd(), ccd)) && jkd(a, Vxc, bcd); + d = (Pgd(), new bhd(Xod(a))); + f = new hhd(!Xod(a) ? null : new bhd(Xod(a)), a); + e = PGb(d, f, false, true); + rqb(g, (tdd(), pdd)); + c = BD(vNb(b, Hxc), 8); + c.a = Math.max(e.a, c.a); + c.b = Math.max(e.b, c.b); + } + function Pac(a, b, c) { + var d, e, f, g, h, i; + for (g = BD(vNb(a, (wtc(), Lsc)), 15).Kc(); g.Ob(); ) { + f = BD(g.Pb(), 10); + switch (BD(vNb(f, (Nyc(), mxc)), 163).g) { + case 2: + $_b(f, b); + break; + case 4: + $_b(f, c); + } + for (e = new Sr(ur(O_b(f).a.Kc(), new Sq())); Qr(e); ) { + d = BD(Rr(e), 17); + if (!!d.c && !!d.d) { + continue; + } + h = !d.d; + i = BD(vNb(d, ctc), 11); + h ? RZb(d, i) : QZb(d, i); + } + } + } + function Alc() { + Alc = ccb; + tlc = new Blc(xle, 0, (Ucd(), Acd), Acd); + wlc = new Blc(zle, 1, Rcd, Rcd); + slc = new Blc(yle, 2, zcd, zcd); + zlc = new Blc(Ale, 3, Tcd, Tcd); + vlc = new Blc("NORTH_WEST_CORNER", 4, Tcd, Acd); + ulc = new Blc("NORTH_EAST_CORNER", 5, Acd, zcd); + ylc = new Blc("SOUTH_WEST_CORNER", 6, Rcd, Tcd); + xlc = new Blc("SOUTH_EAST_CORNER", 7, zcd, Rcd); + } + function i6c() { + i6c = ccb; + h6c = OC(GC(XD, 1), Sje, 25, 14, [ + 1, + 1, + 2, + 6, + 24, + 120, + 720, + 5040, + 40320, + 362880, + 3628800, + 39916800, + 479001600, + 6227020800, + 87178291200, + 1307674368000, + { l: 3506176, m: 794077, h: 1 }, + { l: 884736, m: 916411, h: 20 }, + { l: 3342336, m: 3912489, h: 363 }, + { l: 589824, m: 3034138, h: 6914 }, + { l: 3407872, m: 1962506, h: 138294 }, + ]); + Math.pow(2, -65); + } + function Pcc(a, b) { + var c, d, e, f, g; + if (a.c.length == 0) { + return new vgd(meb(0), meb(0)); + } + c = (tCb(0, a.c.length), BD(a.c[0], 11)).j; + g = 0; + f = b.g; + d = b.g + 1; + while (g < a.c.length - 1 && c.g < f) { + ++g; + c = (tCb(g, a.c.length), BD(a.c[g], 11)).j; + } + e = g; + while (e < a.c.length - 1 && c.g < d) { + ++e; + c = (tCb(g, a.c.length), BD(a.c[g], 11)).j; + } + return new vgd(meb(g), meb(e)); + } + function R9b(a, b, c) { + var d, e, f, g, h, i, j, k, l, m; + f = b.c.length; + g = (tCb(c, b.c.length), BD(b.c[c], 286)); + h = g.a.o.a; + l = g.c; + m = 0; + for (j = g.c; j <= g.f; j++) { + if (h <= a.a[j]) { + return j; + } + k = a.a[j]; + i = null; + for (e = c + 1; e < f; e++) { + d = (tCb(e, b.c.length), BD(b.c[e], 286)); + d.c <= j && d.f >= j && (i = d); + } + !!i && (k = Math.max(k, i.a.o.a)); + if (k > m) { + l = j; + m = k; + } + } + return l; + } + function ode(a, b, c) { + var d, e, f; + a.e = c; + a.d = 0; + a.b = 0; + a.f = 1; + a.i = b; + (a.e & 16) == 16 && (a.i = Xee(a.i)); + a.j = a.i.length; + nde(a); + f = rde(a); + if (a.d != a.j) throw vbb(new mde(tvd((h0d(), sue)))); + if (a.g) { + for (d = 0; d < a.g.a.c.length; d++) { + e = BD(Uvb(a.g, d), 584); + if (a.f <= e.a) throw vbb(new mde(tvd((h0d(), tue)))); + } + a.g.a.c = KC(SI, Uhe, 1, 0, 5, 1); + } + return f; + } + function _Pd(a, b) { + var c, d, e; + if (b == null) { + for ( + d = (!a.a && (a.a = new cUd(g5, a, 9, 5)), new Fyd(a.a)); + d.e != d.i.gc(); + + ) { + c = BD(Dyd(d), 678); + e = c.c; + if ((e == null ? c.zb : e) == null) { + return c; + } + } + } else { + for ( + d = (!a.a && (a.a = new cUd(g5, a, 9, 5)), new Fyd(a.a)); + d.e != d.i.gc(); + + ) { + c = BD(Dyd(d), 678); + if (dfb(b, ((e = c.c), e == null ? c.zb : e))) { + return c; + } + } + } + return null; + } + function KIb(a, b) { + var c; + c = null; + switch (b.g) { + case 1: + a.e.Xe((Y9c(), o9c)) && (c = BD(a.e.We(o9c), 249)); + break; + case 3: + a.e.Xe((Y9c(), p9c)) && (c = BD(a.e.We(p9c), 249)); + break; + case 2: + a.e.Xe((Y9c(), n9c)) && (c = BD(a.e.We(n9c), 249)); + break; + case 4: + a.e.Xe((Y9c(), q9c)) && (c = BD(a.e.We(q9c), 249)); + } + !c && (c = BD(a.e.We((Y9c(), l9c)), 249)); + return c; + } + function OCc(a, b, c) { + var d, e, f, g, h, i, j, k, l; + b.p = 1; + f = b.c; + for (l = W_b(b, (KAc(), IAc)).Kc(); l.Ob(); ) { + k = BD(l.Pb(), 11); + for (e = new olb(k.g); e.a < e.c.c.length; ) { + d = BD(mlb(e), 17); + j = d.d.i; + if (b != j) { + g = j.c; + if (g.p <= f.p) { + h = f.p + 1; + if (h == c.b.c.length) { + i = new H1b(c); + i.p = h; + Ekb(c.b, i); + $_b(j, i); + } else { + i = BD(Ikb(c.b, h), 29); + $_b(j, i); + } + OCc(a, j, c); + } + } + } + } + } + function ZXc(a, b, c) { + var d, e, f, g, h, i; + e = c; + f = 0; + for (h = new olb(b); h.a < h.c.c.length; ) { + g = BD(mlb(h), 33); + jkd(g, (ZWc(), SWc), meb(e++)); + i = gVc(g); + d = Math.atan2(g.j + g.f / 2, g.i + g.g / 2); + d += d < 0 ? dre : 0; + d < 0.7853981633974483 || d > vre + ? Okb(i, a.b) + : d <= vre && d > wre + ? Okb(i, a.d) + : d <= wre && d > xre + ? Okb(i, a.c) + : d <= xre && Okb(i, a.a); + f = ZXc(a, i, f); + } + return e; + } + function Hgb() { + Hgb = ccb; + var a; + Cgb = new Ugb(1, 1); + Egb = new Ugb(1, 10); + Ggb = new Ugb(0, 0); + Bgb = new Ugb(-1, 1); + Dgb = OC(GC(cJ, 1), nie, 91, 0, [ + Ggb, + Cgb, + new Ugb(1, 2), + new Ugb(1, 3), + new Ugb(1, 4), + new Ugb(1, 5), + new Ugb(1, 6), + new Ugb(1, 7), + new Ugb(1, 8), + new Ugb(1, 9), + Egb, + ]); + Fgb = KC(cJ, nie, 91, 32, 0, 1); + for (a = 0; a < Fgb.length; a++) { + Fgb[a] = ghb(Nbb(1, a)); + } + } + function B9b(a, b, c, d, e, f) { + var g, h, i, j; + h = !WAb(JAb(a.Oc(), new Xxb(new F9b()))).sd((EAb(), DAb)); + g = a; + f == (ead(), dad) && + (g = JD(g, 152) + ? km(BD(g, 152)) + : JD(g, 131) + ? BD(g, 131).a + : JD(g, 54) + ? new ov(g) + : new dv(g)); + for (j = g.Kc(); j.Ob(); ) { + i = BD(j.Pb(), 70); + i.n.a = b.a; + h + ? (i.n.b = b.b + (d.b - i.o.b) / 2) + : e + ? (i.n.b = b.b) + : (i.n.b = b.b + d.b - i.o.b); + b.a += i.o.a + c; + } + } + function UOc(a, b, c, d) { + var e, f, g, h, i, j; + e = (d.c + d.a) / 2; + Osb(b.j); + Dsb(b.j, e); + Osb(c.e); + Dsb(c.e, e); + j = new aPc(); + for (h = new olb(a.f); h.a < h.c.c.length; ) { + f = BD(mlb(h), 129); + i = f.a; + WOc(j, b, i); + WOc(j, c, i); + } + for (g = new olb(a.k); g.a < g.c.c.length; ) { + f = BD(mlb(g), 129); + i = f.b; + WOc(j, b, i); + WOc(j, c, i); + } + j.b += 2; + j.a += POc(b, a.q); + j.a += POc(a.q, c); + return j; + } + function FSc(a, b, c) { + var d, e, f, g, h; + if (!Qq(b)) { + h = Udd(c, ((JD(b, 14) ? BD(b, 14).gc() : sr(b.Kc())) / a.a) | 0); + Odd(h, Xqe, 1); + g = new ISc(); + f = null; + for (e = b.Kc(); e.Ob(); ) { + d = BD(e.Pb(), 86); + g = pl(OC(GC(KI, 1), Uhe, 20, 0, [g, new ZRc(d)])); + if (f) { + yNb(f, (mTc(), hTc), d); + yNb(d, _Sc, f); + if (VRc(d) == VRc(f)) { + yNb(f, iTc, d); + yNb(d, aTc, f); + } + } + f = d; + } + Qdd(h); + FSc(a, g, c); + } + } + function VHb(a) { + var b, c, d, e, f, g, h; + c = a.i; + b = a.n; + h = c.d; + a.f == (EIb(), CIb) + ? (h += (c.a - a.e.b) / 2) + : a.f == BIb && (h += c.a - a.e.b); + for (e = new olb(a.d); e.a < e.c.c.length; ) { + d = BD(mlb(e), 181); + g = d.rf(); + f = new d7c(); + f.b = h; + h += g.b + a.a; + switch (a.b.g) { + case 0: + f.a = c.c + b.b; + break; + case 1: + f.a = c.c + b.b + (c.b - g.a) / 2; + break; + case 2: + f.a = c.c + c.b - b.c - g.a; + } + d.tf(f); + } + } + function XHb(a) { + var b, c, d, e, f, g, h; + c = a.i; + b = a.n; + h = c.c; + a.b == (NHb(), KHb) + ? (h += (c.b - a.e.a) / 2) + : a.b == MHb && (h += c.b - a.e.a); + for (e = new olb(a.d); e.a < e.c.c.length; ) { + d = BD(mlb(e), 181); + g = d.rf(); + f = new d7c(); + f.a = h; + h += g.a + a.a; + switch (a.f.g) { + case 0: + f.b = c.d + b.d; + break; + case 1: + f.b = c.d + b.d + (c.a - g.b) / 2; + break; + case 2: + f.b = c.d + c.a - b.a - g.b; + } + d.tf(f); + } + } + function D4b(a, b, c) { + var d, e, f, g, h, i, j, k, l, m, n, o; + k = c.a.c; + g = c.a.c + c.a.b; + f = BD(Ohb(c.c, b), 459); + n = f.f; + o = f.a; + i = new f7c(k, n); + l = new f7c(g, o); + e = k; + c.p || (e += a.c); + e += c.F + c.v * a.b; + j = new f7c(e, n); + m = new f7c(e, o); + n7c(b.a, OC(GC(m1, 1), nie, 8, 0, [i, j])); + h = c.d.a.gc() > 1; + if (h) { + d = new f7c(e, c.b); + Dsb(b.a, d); + } + n7c(b.a, OC(GC(m1, 1), nie, 8, 0, [m, l])); + } + function jdd(a) { + r4c( + a, + new E3c( + P3c( + M3c( + O3c(N3c(new R3c(), Rse), "ELK Randomizer"), + 'Distributes the nodes randomly on the plane, leading to very obfuscating layouts. Can be useful to demonstrate the power of "real" layout algorithms.' + ), + new mdd() + ) + ) + ); + p4c(a, Rse, ame, fdd); + p4c(a, Rse, wme, 15); + p4c(a, Rse, yme, meb(0)); + p4c(a, Rse, _le, tme); + } + function hde() { + hde = ccb; + var a, b, c, d, e, f; + fde = KC(SD, wte, 25, 255, 15, 1); + gde = KC(TD, $ie, 25, 16, 15, 1); + for (b = 0; b < 255; b++) { + fde[b] = -1; + } + for (c = 57; c >= 48; c--) { + fde[c] = ((c - 48) << 24) >> 24; + } + for (d = 70; d >= 65; d--) { + fde[d] = ((d - 65 + 10) << 24) >> 24; + } + for (e = 102; e >= 97; e--) { + fde[e] = ((e - 97 + 10) << 24) >> 24; + } + for (f = 0; f < 10; f++) gde[f] = (48 + f) & aje; + for (a = 10; a <= 15; a++) gde[a] = (65 + a - 10) & aje; + } + function BVc(a, b, c) { + var d, e, f, g, h, i, j, k; + h = b.i - a.g / 2; + i = c.i - a.g / 2; + j = b.j - a.g / 2; + k = c.j - a.g / 2; + f = b.g + a.g / 2; + g = c.g + a.g / 2; + d = b.f + a.g / 2; + e = c.f + a.g / 2; + if (h < i + g && i < h && j < k + e && k < j) { + return true; + } else if (i < h + f && h < i && k < j + d && j < k) { + return true; + } else if (h < i + g && i < h && j < k && k < j + d) { + return true; + } else if (i < h + f && h < i && j < k + e && k < j) { + return true; + } + return false; + } + function NTb(a) { + var b, c, d, e, f; + e = BD(vNb(a, (Nyc(), Fxc)), 21); + f = BD(vNb(a, Ixc), 21); + c = new f7c(a.f.a + a.d.b + a.d.c, a.f.b + a.d.d + a.d.a); + b = new g7c(c); + if (e.Hc((tdd(), pdd))) { + d = BD(vNb(a, Hxc), 8); + if (f.Hc((Idd(), Bdd))) { + d.a <= 0 && (d.a = 20); + d.b <= 0 && (d.b = 20); + } + b.a = Math.max(c.a, d.a); + b.b = Math.max(c.b, d.b); + } + Ccb(DD(vNb(a, Gxc))) || OTb(a, c, b); + } + function NJc(a, b) { + var c, d, e, f; + for (f = V_b(b, (Ucd(), Rcd)).Kc(); f.Ob(); ) { + d = BD(f.Pb(), 11); + c = BD(vNb(d, (wtc(), gtc)), 10); + !!c && + AFb(DFb(CFb(EFb(BFb(new FFb(), 0), 0.1), a.i[b.p].d), a.i[c.p].a)); + } + for (e = V_b(b, Acd).Kc(); e.Ob(); ) { + d = BD(e.Pb(), 11); + c = BD(vNb(d, (wtc(), gtc)), 10); + !!c && + AFb(DFb(CFb(EFb(BFb(new FFb(), 0), 0.1), a.i[c.p].d), a.i[b.p].a)); + } + } + function QKd(a) { + var b, c, d, e, f, g; + if (!a.c) { + g = new wNd(); + b = KKd; + f = b.a.zc(a, b); + if (f == null) { + for (d = new Fyd(VKd(a)); d.e != d.i.gc(); ) { + c = BD(Dyd(d), 87); + e = KQd(c); + JD(e, 88) && ytd(g, QKd(BD(e, 26))); + wtd(g, c); + } + b.a.Bc(a) != null; + b.a.gc() == 0 && undefined; + } + tNd(g); + vud(g); + a.c = new nNd((BD(qud(ZKd((NFd(), MFd).o), 15), 18), g.i), g.g); + $Kd(a).b &= -33; + } + return a.c; + } + function eee(a) { + var b; + if (a.c != 10) throw vbb(new mde(tvd((h0d(), uue)))); + b = a.a; + switch (b) { + case 110: + b = 10; + break; + case 114: + b = 13; + break; + case 116: + b = 9; + break; + case 92: + case 124: + case 46: + case 94: + case 45: + case 63: + case 42: + case 43: + case 123: + case 125: + case 40: + case 41: + case 91: + case 93: + break; + default: + throw vbb(new mde(tvd((h0d(), Yue)))); + } + return b; + } + function qD(a) { + var b, c, d, e, f; + if (a.l == 0 && a.m == 0 && a.h == 0) { + return "0"; + } + if (a.h == Gje && a.m == 0 && a.l == 0) { + return "-9223372036854775808"; + } + if (a.h >> 19 != 0) { + return "-" + qD(hD(a)); + } + c = a; + d = ""; + while (!(c.l == 0 && c.m == 0 && c.h == 0)) { + e = RC(Jje); + c = UC(c, e, true); + b = "" + pD(QC); + if (!(c.l == 0 && c.m == 0 && c.h == 0)) { + f = 9 - b.length; + for (; f > 0; f--) { + b = "0" + b; + } + } + d = b + d; + } + return d; + } + function xrb() { + if (!Object.create || !Object.getOwnPropertyNames) { + return false; + } + var a = "__proto__"; + var b = Object.create(null); + if (b[a] !== undefined) { + return false; + } + var c = Object.getOwnPropertyNames(b); + if (c.length != 0) { + return false; + } + b[a] = 42; + if (b[a] !== 42) { + return false; + } + if (Object.getOwnPropertyNames(b).length == 0) { + return false; + } + return true; + } + function Pgc(a) { + var b, c, d, e, f, g, h; + b = false; + c = 0; + for (e = new olb(a.d.b); e.a < e.c.c.length; ) { + d = BD(mlb(e), 29); + d.p = c++; + for (g = new olb(d.a); g.a < g.c.c.length; ) { + f = BD(mlb(g), 10); + !b && !Qq(O_b(f)) && (b = true); + } + } + h = qqb((ead(), cad), OC(GC(t1, 1), Kie, 103, 0, [aad, bad])); + if (!b) { + rqb(h, dad); + rqb(h, _9c); + } + a.a = new mDb(h); + Uhb(a.f); + Uhb(a.b); + Uhb(a.e); + Uhb(a.g); + } + function _Xb(a, b, c) { + var d, e, f, g, h, i, j, k, l; + d = c.c; + e = c.d; + h = A0b(b.c); + i = A0b(b.d); + if (d == b.c) { + h = aYb(a, h, e); + i = bYb(b.d); + } else { + h = bYb(b.c); + i = aYb(a, i, e); + } + j = new t7c(b.a); + Gsb(j, h, j.a, j.a.a); + Gsb(j, i, j.c.b, j.c); + g = b.c == d; + l = new BYb(); + for (f = 0; f < j.b - 1; ++f) { + k = new vgd(BD(Ut(j, f), 8), BD(Ut(j, f + 1), 8)); + (g && f == 0) || (!g && f == j.b - 2) ? (l.b = k) : Ekb(l.a, k); + } + return l; + } + function O$b(a, b) { + var c, d, e, f; + f = a.j.g - b.j.g; + if (f != 0) { + return f; + } + c = BD(vNb(a, (Nyc(), Wxc)), 19); + d = BD(vNb(b, Wxc), 19); + if (!!c && !!d) { + e = c.a - d.a; + if (e != 0) { + return e; + } + } + switch (a.j.g) { + case 1: + return Kdb(a.n.a, b.n.a); + case 2: + return Kdb(a.n.b, b.n.b); + case 3: + return Kdb(b.n.a, a.n.a); + case 4: + return Kdb(b.n.b, a.n.b); + default: + throw vbb(new Zdb(ine)); + } + } + function G6b(a, b, c, d) { + var e, f, g, h, i; + if (sr((D6b(), new Sr(ur(O_b(b).a.Kc(), new Sq())))) >= a.a) { + return -1; + } + if (!F6b(b, c)) { + return -1; + } + if (Qq(BD(d.Kb(b), 20))) { + return 1; + } + e = 0; + for (g = BD(d.Kb(b), 20).Kc(); g.Ob(); ) { + f = BD(g.Pb(), 17); + i = f.c.i == b ? f.d.i : f.c.i; + h = G6b(a, i, c, d); + if (h == -1) { + return -1; + } + e = Math.max(e, h); + if (e > a.c - 1) { + return -1; + } + } + return e + 1; + } + function Btd(a, b) { + var c, d, e, f, g, h; + if (PD(b) === PD(a)) { + return true; + } + if (!JD(b, 15)) { + return false; + } + d = BD(b, 15); + h = a.gc(); + if (d.gc() != h) { + return false; + } + g = d.Kc(); + if (a.ni()) { + for (c = 0; c < h; ++c) { + e = a.ki(c); + f = g.Pb(); + if (e == null ? f != null : !pb(e, f)) { + return false; + } + } + } else { + for (c = 0; c < h; ++c) { + e = a.ki(c); + f = g.Pb(); + if (PD(e) !== PD(f)) { + return false; + } + } + } + return true; + } + function rAd(a, b) { + var c, d, e, f, g, h; + if (a.f > 0) { + a.qj(); + if (b != null) { + for (f = 0; f < a.d.length; ++f) { + c = a.d[f]; + if (c) { + d = BD(c.g, 367); + h = c.i; + for (g = 0; g < h; ++g) { + e = d[g]; + if (pb(b, e.dd())) { + return true; + } + } + } + } + } else { + for (f = 0; f < a.d.length; ++f) { + c = a.d[f]; + if (c) { + d = BD(c.g, 367); + h = c.i; + for (g = 0; g < h; ++g) { + e = d[g]; + if (PD(b) === PD(e.dd())) { + return true; + } + } + } + } + } + } + return false; + } + function e6b(a, b, c) { + var d, e, f, g; + Odd(c, "Orthogonally routing hierarchical port edges", 1); + a.a = 0; + d = h6b(b); + k6b(b, d); + j6b(a, b, d); + f6b(b); + e = BD(vNb(b, (Nyc(), Vxc)), 98); + f = b.b; + d6b((tCb(0, f.c.length), BD(f.c[0], 29)), e, b); + d6b(BD(Ikb(f, f.c.length - 1), 29), e, b); + g = b.b; + b6b((tCb(0, g.c.length), BD(g.c[0], 29))); + b6b(BD(Ikb(g, g.c.length - 1), 29)); + Qdd(c); + } + function jnd(a) { + switch (a) { + case 48: + case 49: + case 50: + case 51: + case 52: + case 53: + case 54: + case 55: + case 56: + case 57: { + return ((a - 48) << 24) >> 24; + } + case 97: + case 98: + case 99: + case 100: + case 101: + case 102: { + return ((a - 97 + 10) << 24) >> 24; + } + case 65: + case 66: + case 67: + case 68: + case 69: + case 70: { + return ((a - 65 + 10) << 24) >> 24; + } + default: { + throw vbb(new Oeb("Invalid hexadecimal")); + } + } + } + function AUc(a, b, c) { + var d, e, f, g; + Odd(c, "Processor order nodes", 2); + a.a = Edb(ED(vNb(b, (JTc(), HTc)))); + e = new Psb(); + for (g = Jsb(b.b, 0); g.b != g.d.c; ) { + f = BD(Xsb(g), 86); + Ccb(DD(vNb(f, (mTc(), jTc)))) && (Gsb(e, f, e.c.b, e.c), true); + } + d = (sCb(e.b != 0), BD(e.a.a.c, 86)); + yUc(a, d); + !c.b && Rdd(c, 1); + BUc(a, d, 0 - Edb(ED(vNb(d, (mTc(), bTc)))) / 2, 0); + !c.b && Rdd(c, 1); + Qdd(c); + } + function rFb() { + rFb = ccb; + qFb = new sFb("SPIRAL", 0); + lFb = new sFb("LINE_BY_LINE", 1); + mFb = new sFb("MANHATTAN", 2); + kFb = new sFb("JITTER", 3); + oFb = new sFb("QUADRANTS_LINE_BY_LINE", 4); + pFb = new sFb("QUADRANTS_MANHATTAN", 5); + nFb = new sFb("QUADRANTS_JITTER", 6); + jFb = new sFb("COMBINE_LINE_BY_LINE_MANHATTAN", 7); + iFb = new sFb("COMBINE_JITTER_MANHATTAN", 8); + } + function roc(a, b, c, d) { + var e, f, g, h, i, j; + i = woc(a, c); + j = woc(b, c); + e = false; + while (!!i && !!j) { + if (d || uoc(i, j, c)) { + g = woc(i, c); + h = woc(j, c); + zoc(b); + zoc(a); + f = i.c; + sbc(i, false); + sbc(j, false); + if (c) { + Z_b(b, j.p, f); + b.p = j.p; + Z_b(a, i.p + 1, f); + a.p = i.p; + } else { + Z_b(a, i.p, f); + a.p = i.p; + Z_b(b, j.p + 1, f); + b.p = j.p; + } + $_b(i, null); + $_b(j, null); + i = g; + j = h; + e = true; + } else { + break; + } + } + return e; + } + function VDc(a, b, c, d) { + var e, f, g, h, i; + e = false; + f = false; + for (h = new olb(d.j); h.a < h.c.c.length; ) { + g = BD(mlb(h), 11); + PD(vNb(g, (wtc(), $sc))) === PD(c) && + (g.g.c.length == 0 ? g.e.c.length == 0 || (e = true) : (f = true)); + } + i = 0; + e && e ^ f + ? (i = c.j == (Ucd(), Acd) ? -a.e[d.c.p][d.p] : b - a.e[d.c.p][d.p]) + : f && e ^ f + ? (i = a.e[d.c.p][d.p] + 1) + : e && f && (i = c.j == (Ucd(), Acd) ? 0 : b / 2); + return i; + } + function NEd(a, b, c, d, e, f, g, h) { + var i, j, k; + i = 0; + b != null && (i ^= LCb(b.toLowerCase())); + c != null && (i ^= LCb(c)); + d != null && (i ^= LCb(d)); + g != null && (i ^= LCb(g)); + h != null && (i ^= LCb(h)); + for (j = 0, k = f.length; j < k; j++) { + i ^= LCb(f[j]); + } + a ? (i |= 256) : (i &= -257); + e ? (i |= 16) : (i &= -17); + this.f = i; + this.i = b == null ? null : (uCb(b), b); + this.a = c; + this.d = d; + this.j = f; + this.g = g; + this.e = h; + } + function X_b(a, b, c) { + var d, e; + e = null; + switch (b.g) { + case 1: + e = (z0b(), u0b); + break; + case 2: + e = (z0b(), w0b); + } + d = null; + switch (c.g) { + case 1: + d = (z0b(), v0b); + break; + case 2: + d = (z0b(), t0b); + break; + case 3: + d = (z0b(), x0b); + break; + case 4: + d = (z0b(), y0b); + } + return !!e && !!d + ? Nq( + a.j, + new Yb( + new amb( + OC(GC(_D, 1), Uhe, 169, 0, [BD(Qb(e), 169), BD(Qb(d), 169)]) + ) + ) + ) + : (mmb(), mmb(), jmb); + } + function t5b(a) { + var b, c, d; + b = BD(vNb(a, (Nyc(), Hxc)), 8); + yNb(a, Hxc, new f7c(b.b, b.a)); + switch (BD(vNb(a, mwc), 248).g) { + case 1: + yNb(a, mwc, (F7c(), E7c)); + break; + case 2: + yNb(a, mwc, (F7c(), A7c)); + break; + case 3: + yNb(a, mwc, (F7c(), C7c)); + break; + case 4: + yNb(a, mwc, (F7c(), D7c)); + } + if ((!a.q ? (mmb(), mmb(), kmb) : a.q)._b(ayc)) { + c = BD(vNb(a, ayc), 8); + d = c.a; + c.a = c.b; + c.b = d; + } + } + function jjc(a, b, c, d, e, f) { + this.b = c; + this.d = e; + if (a >= b.length) { + throw vbb(new qcb("Greedy SwitchDecider: Free layer not in graph.")); + } + this.c = b[a]; + this.e = new dIc(d); + THc(this.e, this.c, (Ucd(), Tcd)); + this.i = new dIc(d); + THc(this.i, this.c, zcd); + this.f = new ejc(this.c); + this.a = !f && e.i && !e.s && this.c[0].k == (j0b(), e0b); + this.a && hjc(this, a, b.length); + } + function hKb(a, b) { + var c, d, e, f, g, h; + f = !a.B.Hc((Idd(), zdd)); + g = a.B.Hc(Cdd); + a.a = new FHb(g, f, a.c); + !!a.n && u_b(a.a.n, a.n); + lIb(a.g, (gHb(), eHb), a.a); + if (!b) { + d = new mIb(1, f, a.c); + d.n.a = a.k; + Npb(a.p, (Ucd(), Acd), d); + e = new mIb(1, f, a.c); + e.n.d = a.k; + Npb(a.p, Rcd, e); + h = new mIb(0, f, a.c); + h.n.c = a.k; + Npb(a.p, Tcd, h); + c = new mIb(0, f, a.c); + c.n.b = a.k; + Npb(a.p, zcd, c); + } + } + function Vgc(a) { + var b, c, d; + b = BD(vNb(a.d, (Nyc(), Swc)), 218); + switch (b.g) { + case 2: + c = Ngc(a); + break; + case 3: + c = + ((d = new Rkb()), + MAb( + JAb( + NAb( + LAb( + LAb(new YAb(null, new Kub(a.d.b, 16)), new Shc()), + new Uhc() + ), + new Whc() + ), + new ehc() + ), + new Yhc(d) + ), + d); + break; + default: + throw vbb(new Zdb("Compaction not supported for " + b + " edges.")); + } + Ugc(a, c); + reb(new Pib(a.g), new Ehc(a)); + } + function a2c(a, b) { + var c; + c = new zNb(); + !!b && tNb(c, BD(Ohb(a.a, C2), 94)); + JD(b, 470) && tNb(c, BD(Ohb(a.a, G2), 94)); + if (JD(b, 354)) { + tNb(c, BD(Ohb(a.a, D2), 94)); + return c; + } + JD(b, 82) && tNb(c, BD(Ohb(a.a, z2), 94)); + if (JD(b, 239)) { + tNb(c, BD(Ohb(a.a, E2), 94)); + return c; + } + if (JD(b, 186)) { + tNb(c, BD(Ohb(a.a, F2), 94)); + return c; + } + JD(b, 352) && tNb(c, BD(Ohb(a.a, B2), 94)); + return c; + } + function wSb() { + wSb = ccb; + oSb = new Osd((Y9c(), D9c), meb(1)); + uSb = new Osd(T9c, 80); + tSb = new Osd(M9c, 5); + bSb = new Osd(r8c, tme); + pSb = new Osd(E9c, meb(1)); + sSb = new Osd(H9c, (Bcb(), true)); + lSb = new q0b(50); + kSb = new Osd(f9c, lSb); + dSb = O8c; + mSb = t9c; + cSb = new Osd(B8c, false); + jSb = e9c; + iSb = b9c; + hSb = Y8c; + gSb = W8c; + nSb = x9c; + fSb = (SRb(), LRb); + vSb = QRb; + eSb = KRb; + qSb = NRb; + rSb = PRb; + } + function ZXb(a) { + var b, c, d, e, f, g, h, i; + i = new jYb(); + for (h = new olb(a.a); h.a < h.c.c.length; ) { + g = BD(mlb(h), 10); + if (g.k == (j0b(), e0b)) { + continue; + } + XXb(i, g, new d7c()); + for (f = new Sr(ur(U_b(g).a.Kc(), new Sq())); Qr(f); ) { + e = BD(Rr(f), 17); + if (e.c.i.k == e0b || e.d.i.k == e0b) { + continue; + } + for (d = Jsb(e.a, 0); d.b != d.d.c; ) { + c = BD(Xsb(d), 8); + b = c; + hYb(i, new cWb(b.a, b.b)); + } + } + } + return i; + } + function A0c() { + A0c = ccb; + z0c = new Lsd(Qre); + y0c = (R0c(), Q0c); + x0c = new Nsd(Vre, y0c); + w0c = (a1c(), _0c); + v0c = new Nsd(Rre, w0c); + u0c = (N_c(), J_c); + t0c = new Nsd(Sre, u0c); + p0c = new Nsd(Tre, null); + s0c = (C_c(), A_c); + r0c = new Nsd(Ure, s0c); + l0c = (i_c(), h_c); + k0c = new Nsd(Wre, l0c); + m0c = new Nsd(Xre, (Bcb(), false)); + n0c = new Nsd(Yre, meb(64)); + o0c = new Nsd(Zre, true); + q0c = B_c; + } + function Toc(a) { + var b, c, d, e, f, g; + if (a.a != null) { + return; + } + a.a = KC(sbb, dle, 25, a.c.b.c.length, 16, 1); + a.a[0] = false; + if (wNb(a.c, (Nyc(), Lyc))) { + d = BD(vNb(a.c, Lyc), 15); + for (c = d.Kc(); c.Ob(); ) { + b = BD(c.Pb(), 19).a; + b > 0 && b < a.a.length && (a.a[b] = false); + } + } else { + g = new olb(a.c.b); + g.a < g.c.c.length && mlb(g); + e = 1; + while (g.a < g.c.c.length) { + f = BD(mlb(g), 29); + a.a[e++] = Woc(f); + } + } + } + function TMd(a, b) { + var c, d, e, f; + e = a.b; + switch (b) { + case 1: { + a.b |= 1; + a.b |= 4; + a.b |= 8; + break; + } + case 2: { + a.b |= 2; + a.b |= 4; + a.b |= 8; + break; + } + case 4: { + a.b |= 1; + a.b |= 2; + a.b |= 4; + a.b |= 8; + break; + } + case 3: { + a.b |= 16; + a.b |= 8; + break; + } + case 0: { + a.b |= 32; + a.b |= 16; + a.b |= 8; + a.b |= 1; + a.b |= 2; + a.b |= 4; + break; + } + } + if (a.b != e && !!a.c) { + for (d = new Fyd(a.c); d.e != d.i.gc(); ) { + f = BD(Dyd(d), 473); + c = $Kd(f); + XMd(c, b); + } + } + } + function cGc(a, b, c, d) { + var e, f, g, h, i, j, k, l, m, n, o; + e = false; + for (g = b, h = 0, i = g.length; h < i; ++h) { + f = g[h]; + Ccb((Bcb(), f.e ? true : false)) && + !BD(Ikb(a.b, f.e.p), 214).s && + (e = + e | + ((j = f.e), + (k = BD(Ikb(a.b, j.p), 214)), + (l = k.e), + (m = SFc(c, l.length)), + (n = l[m][0]), + n.k == (j0b(), e0b) + ? (l[m] = aGc(f, l[m], c ? (Ucd(), Tcd) : (Ucd(), zcd))) + : k.c.Tf(l, c), + (o = dGc(a, k, c, d)), + bGc(k.e, k.o, c), + o)); + } + return e; + } + function p2c(a, b) { + var c, d, e, f, g; + f = (!b.a && (b.a = new cUd(E2, b, 10, 11)), b.a).i; + for ( + e = new Fyd((!b.a && (b.a = new cUd(E2, b, 10, 11)), b.a)); + e.e != e.i.gc(); + + ) { + d = BD(Dyd(e), 33); + if (PD(hkd(d, (Y9c(), J8c))) !== PD((hbd(), gbd))) { + g = BD(hkd(b, F9c), 149); + c = BD(hkd(d, F9c), 149); + (g == c || (!!g && C3c(g, c))) && + (!d.a && (d.a = new cUd(E2, d, 10, 11)), d.a).i != 0 && + (f += p2c(a, d)); + } + } + return f; + } + function nlc(a) { + var b, c, d, e, f, g, h; + d = 0; + h = 0; + for (g = new olb(a.d); g.a < g.c.c.length; ) { + f = BD(mlb(g), 101); + e = BD( + GAb( + JAb(new YAb(null, new Kub(f.j, 16)), new Ylc()), + Byb( + new fzb(), + new dzb(), + new Ezb(), + OC(GC(xL, 1), Kie, 132, 0, [(Fyb(), Dyb)]) + ) + ), + 15 + ); + c = null; + if (d <= h) { + c = (Ucd(), Acd); + d += e.gc(); + } else if (h < d) { + c = (Ucd(), Rcd); + h += e.gc(); + } + b = c; + MAb(NAb(e.Oc(), new Mlc()), new Olc(b)); + } + } + function mkc(a) { + var b, c, d, e, f, g, h, i; + a.b = new _i( + new amb((Ucd(), OC(GC(F1, 1), bne, 61, 0, [Scd, Acd, zcd, Rcd, Tcd]))), + new amb((Fkc(), OC(GC(vV, 1), Kie, 361, 0, [Ekc, Dkc, Ckc]))) + ); + for ( + g = OC(GC(F1, 1), bne, 61, 0, [Scd, Acd, zcd, Rcd, Tcd]), + h = 0, + i = g.length; + h < i; + ++h + ) { + f = g[h]; + for ( + c = OC(GC(vV, 1), Kie, 361, 0, [Ekc, Dkc, Ckc]), d = 0, e = c.length; + d < e; + ++d + ) { + b = c[d]; + Ui(a.b, f, b, new Rkb()); + } + } + } + function KJb(a, b) { + var c, d, e, f, g, h, i, j, k, l; + g = BD(BD(Qc(a.r, b), 21), 84); + h = a.u.Hc((rcd(), pcd)); + c = a.u.Hc(mcd); + d = a.u.Hc(lcd); + j = a.u.Hc(qcd); + l = a.B.Hc((Idd(), Hdd)); + k = !c && !d && (j || g.gc() == 2); + HJb(a, b); + e = null; + i = null; + if (h) { + f = g.Kc(); + e = BD(f.Pb(), 111); + i = e; + while (f.Ob()) { + i = BD(f.Pb(), 111); + } + e.d.b = 0; + i.d.c = 0; + k && !e.a && (e.d.c = 0); + } + if (l) { + LJb(g); + if (h) { + e.d.b = 0; + i.d.c = 0; + } + } + } + function SKb(a, b) { + var c, d, e, f, g, h, i, j, k, l; + g = BD(BD(Qc(a.r, b), 21), 84); + h = a.u.Hc((rcd(), pcd)); + c = a.u.Hc(mcd); + d = a.u.Hc(lcd); + i = a.u.Hc(qcd); + l = a.B.Hc((Idd(), Hdd)); + j = !c && !d && (i || g.gc() == 2); + QKb(a, b); + k = null; + e = null; + if (h) { + f = g.Kc(); + k = BD(f.Pb(), 111); + e = k; + while (f.Ob()) { + e = BD(f.Pb(), 111); + } + k.d.d = 0; + e.d.a = 0; + j && !k.a && (k.d.a = 0); + } + if (l) { + TKb(g); + if (h) { + k.d.d = 0; + e.d.a = 0; + } + } + } + function oJc(a, b, c) { + var d, e, f, g, h, i, j, k; + e = b.k; + if (b.p >= 0) { + return false; + } else { + b.p = c.b; + Ekb(c.e, b); + } + if (e == (j0b(), g0b) || e == i0b) { + for (g = new olb(b.j); g.a < g.c.c.length; ) { + f = BD(mlb(g), 11); + for (k = ((d = new olb(new R0b(f).a.g)), new U0b(d)); llb(k.a); ) { + j = BD(mlb(k.a), 17).d; + h = j.i; + i = h.k; + if (b.c != h.c) { + if (i == g0b || i == i0b) { + if (oJc(a, h, c)) { + return true; + } + } + } + } + } + } + return true; + } + function gJd(a) { + var b; + if ((a.Db & 64) != 0) return EId(a); + b = new Jfb(EId(a)); + b.a += " (changeable: "; + Ffb(b, (a.Bb & zte) != 0); + b.a += ", volatile: "; + Ffb(b, (a.Bb & Dve) != 0); + b.a += ", transient: "; + Ffb(b, (a.Bb & Rje) != 0); + b.a += ", defaultValueLiteral: "; + Efb(b, a.j); + b.a += ", unsettable: "; + Ffb(b, (a.Bb & Cve) != 0); + b.a += ", derived: "; + Ffb(b, (a.Bb & oie) != 0); + b.a += ")"; + return b.a; + } + function AOb(a) { + var b, c, d, e, f, g, h, i, j, k, l, m; + e = eNb(a.d); + g = BD(vNb(a.b, (CPb(), wPb)), 116); + h = g.b + g.c; + i = g.d + g.a; + k = e.d.a * a.e + h; + j = e.b.a * a.f + i; + $Ob(a.b, new f7c(k, j)); + for (m = new olb(a.g); m.a < m.c.c.length; ) { + l = BD(mlb(m), 562); + b = l.g - e.a.a; + c = l.i - e.c.a; + d = P6c( + Z6c(new f7c(b, c), l.a, l.b), + Y6c(b7c(R6c(HOb(l.e)), l.d * l.a, l.c * l.b), -0.5) + ); + f = IOb(l.e); + KOb(l.e, c7c(d, f)); + } + } + function tmc(a, b, c, d) { + var e, f, g, h, i; + i = KC( + UD, + nie, + 104, + (Ucd(), OC(GC(F1, 1), bne, 61, 0, [Scd, Acd, zcd, Rcd, Tcd])).length, + 0, + 2 + ); + for ( + f = OC(GC(F1, 1), bne, 61, 0, [Scd, Acd, zcd, Rcd, Tcd]), + g = 0, + h = f.length; + g < h; + ++g + ) { + e = f[g]; + i[e.g] = KC(UD, Vje, 25, a.c[e.g], 15, 1); + } + vmc(i, a, Acd); + vmc(i, a, Rcd); + smc(i, a, Acd, b, c, d); + smc(i, a, zcd, b, c, d); + smc(i, a, Rcd, b, c, d); + smc(i, a, Tcd, b, c, d); + return i; + } + function UGc(a, b, c) { + if (Mhb(a.a, b)) { + if (Rqb(BD(Ohb(a.a, b), 53), c)) { + return 1; + } + } else { + Rhb(a.a, b, new Tqb()); + } + if (Mhb(a.a, c)) { + if (Rqb(BD(Ohb(a.a, c), 53), b)) { + return -1; + } + } else { + Rhb(a.a, c, new Tqb()); + } + if (Mhb(a.b, b)) { + if (Rqb(BD(Ohb(a.b, b), 53), c)) { + return -1; + } + } else { + Rhb(a.b, b, new Tqb()); + } + if (Mhb(a.b, c)) { + if (Rqb(BD(Ohb(a.b, c), 53), b)) { + return 1; + } + } else { + Rhb(a.b, c, new Tqb()); + } + return 0; + } + function x2d(a, b, c, d) { + var e, f, g, h, i, j; + if (c == null) { + e = BD(a.g, 119); + for (h = 0; h < a.i; ++h) { + g = e[h]; + if (g.ak() == b) { + return Txd(a, g, d); + } + } + } + f = (Q6d(), BD(b, 66).Oj() ? BD(c, 72) : R6d(b, c)); + if (oid(a.e)) { + j = !R2d(a, b); + d = Sxd(a, f, d); + i = b.$j() + ? H2d( + a, + 3, + b, + null, + c, + M2d(a, b, c, JD(b, 99) && (BD(b, 18).Bb & Tje) != 0), + j + ) + : H2d(a, 1, b, b.zj(), c, -1, j); + d ? d.Ei(i) : (d = i); + } else { + d = Sxd(a, f, d); + } + return d; + } + function CJb(a) { + var b, c, d, e, f, g; + if (a.q == (dcd(), _bd) || a.q == $bd) { + return; + } + e = a.f.n.d + _Gb(BD(Mpb(a.b, (Ucd(), Acd)), 124)) + a.c; + b = a.f.n.a + _Gb(BD(Mpb(a.b, Rcd), 124)) + a.c; + d = BD(Mpb(a.b, zcd), 124); + g = BD(Mpb(a.b, Tcd), 124); + f = Math.max(0, d.n.d - e); + f = Math.max(f, g.n.d - e); + c = Math.max(0, d.n.a - b); + c = Math.max(c, g.n.a - b); + d.n.d = f; + g.n.d = f; + d.n.a = c; + g.n.a = c; + } + function rdc(a, b) { + var c, d, e, f, g, h, i, j, k, l, m; + Odd(b, "Restoring reversed edges", 1); + for (i = new olb(a.b); i.a < i.c.c.length; ) { + h = BD(mlb(i), 29); + for (k = new olb(h.a); k.a < k.c.c.length; ) { + j = BD(mlb(k), 10); + for (m = new olb(j.j); m.a < m.c.c.length; ) { + l = BD(mlb(m), 11); + g = k_b(l.g); + for (d = g, e = 0, f = d.length; e < f; ++e) { + c = d[e]; + Ccb(DD(vNb(c, (wtc(), ltc)))) && PZb(c, false); + } + } + } + } + Qdd(b); + } + function m4c() { + this.b = new $rb(); + this.d = new $rb(); + this.e = new $rb(); + this.c = new $rb(); + this.a = new Lqb(); + this.f = new Lqb(); + hvd(m1, new x4c(), new z4c()); + hvd(l1, new V4c(), new X4c()); + hvd(i1, new Z4c(), new _4c()); + hvd(j1, new b5c(), new d5c()); + hvd(i2, new f5c(), new h5c()); + hvd(DJ, new B4c(), new D4c()); + hvd(xK, new F4c(), new H4c()); + hvd(jK, new J4c(), new L4c()); + hvd(uK, new N4c(), new P4c()); + hvd(kL, new R4c(), new T4c()); + } + function R5d(a) { + var b, c, d, e, f, g; + f = 0; + b = wId(a); + !!b.Bj() && (f |= 4); + (a.Bb & Cve) != 0 && (f |= 2); + if (JD(a, 99)) { + c = BD(a, 18); + e = zUd(c); + (c.Bb & ote) != 0 && (f |= 32); + if (e) { + aLd(WId(e)); + f |= 8; + g = e.t; + (g > 1 || g == -1) && (f |= 16); + (e.Bb & ote) != 0 && (f |= 64); + } + (c.Bb & Tje) != 0 && (f |= Dve); + f |= zte; + } else { + if (JD(b, 457)) { + f |= 512; + } else { + d = b.Bj(); + !!d && (d.i & 1) != 0 && (f |= 256); + } + } + (a.Bb & 512) != 0 && (f |= 128); + return f; + } + function hc(a, b) { + var c, d, e, f, g; + a = a == null ? Xhe : (uCb(a), a); + for (e = 0; e < b.length; e++) { + b[e] = ic(b[e]); + } + c = new Vfb(); + g = 0; + d = 0; + while (d < b.length) { + f = a.indexOf("%s", g); + if (f == -1) { + break; + } + c.a += "" + qfb(a == null ? Xhe : (uCb(a), a), g, f); + Pfb(c, b[d++]); + g = f + 2; + } + Ofb(c, a, g, a.length); + if (d < b.length) { + c.a += " ["; + Pfb(c, b[d++]); + while (d < b.length) { + c.a += She; + Pfb(c, b[d++]); + } + c.a += "]"; + } + return c.a; + } + function m3b(a) { + var b, c, d, e, f; + f = new Skb(a.a.c.length); + for (e = new olb(a.a); e.a < e.c.c.length; ) { + d = BD(mlb(e), 10); + c = BD(vNb(d, (Nyc(), mxc)), 163); + b = null; + switch (c.g) { + case 1: + case 2: + b = (Gqc(), Fqc); + break; + case 3: + case 4: + b = (Gqc(), Dqc); + } + if (b) { + yNb(d, (wtc(), Bsc), (Gqc(), Fqc)); + b == Dqc + ? o3b(d, c, (KAc(), HAc)) + : b == Fqc && o3b(d, c, (KAc(), IAc)); + } else { + f.c[f.c.length] = d; + } + } + return f; + } + function MHc(a, b) { + var c, d, e, f, g, h, i; + c = 0; + for (i = new olb(b); i.a < i.c.c.length; ) { + h = BD(mlb(i), 11); + AHc(a.b, a.d[h.p]); + g = 0; + for (e = new b1b(h.b); llb(e.a) || llb(e.b); ) { + d = BD(llb(e.a) ? mlb(e.a) : mlb(e.b), 17); + if (WHc(d)) { + f = aIc(a, h == d.c ? d.d : d.c); + if (f > a.d[h.p]) { + c += zHc(a.b, f); + Wjb(a.a, meb(f)); + } + } else { + ++g; + } + } + c += a.b.d * g; + while (!akb(a.a)) { + xHc(a.b, BD(fkb(a.a), 19).a); + } + } + return c; + } + function Y6d(a, b) { + var c; + if (a.f == W6d) { + c = $1d(q1d((O6d(), M6d), b)); + return a.e + ? c == 4 && + b != (m8d(), k8d) && + b != (m8d(), h8d) && + b != (m8d(), i8d) && + b != (m8d(), j8d) + : c == 2; + } + if ( + !!a.d && + (a.d.Hc(b) || + a.d.Hc(_1d(q1d((O6d(), M6d), b))) || + a.d.Hc(e1d((O6d(), M6d), a.b, b))) + ) { + return true; + } + if (a.f) { + if (x1d((O6d(), a.f), b2d(q1d(M6d, b)))) { + c = $1d(q1d(M6d, b)); + return a.e ? c == 4 : c == 2; + } + } + return false; + } + function iVc(a, b, c, d) { + var e, f, g, h, i, j, k, l; + g = BD(hkd(c, (Y9c(), C9c)), 8); + i = g.a; + k = g.b + a; + e = Math.atan2(k, i); + e < 0 && (e += dre); + e += b; + e > dre && (e -= dre); + h = BD(hkd(d, C9c), 8); + j = h.a; + l = h.b + a; + f = Math.atan2(l, j); + f < 0 && (f += dre); + f += b; + f > dre && (f -= dre); + return ( + Iy(), + My(1.0e-10), + Math.abs(e - f) <= 1.0e-10 || e == f || (isNaN(e) && isNaN(f)) + ? 0 + : e < f + ? -1 + : e > f + ? 1 + : Ny(isNaN(e), isNaN(f)) + ); + } + function YDb(a) { + var b, c, d, e, f, g, h; + h = new Lqb(); + for (d = new olb(a.a.b); d.a < d.c.c.length; ) { + b = BD(mlb(d), 57); + Rhb(h, b, new Rkb()); + } + for (e = new olb(a.a.b); e.a < e.c.c.length; ) { + b = BD(mlb(e), 57); + b.i = Qje; + for (g = b.c.Kc(); g.Ob(); ) { + f = BD(g.Pb(), 57); + BD(Wd(irb(h.f, f)), 15).Fc(b); + } + } + for (c = new olb(a.a.b); c.a < c.c.c.length; ) { + b = BD(mlb(c), 57); + b.c.$b(); + b.c = BD(Wd(irb(h.f, b)), 15); + } + QDb(a); + } + function yVb(a) { + var b, c, d, e, f, g, h; + h = new Lqb(); + for (d = new olb(a.a.b); d.a < d.c.c.length; ) { + b = BD(mlb(d), 81); + Rhb(h, b, new Rkb()); + } + for (e = new olb(a.a.b); e.a < e.c.c.length; ) { + b = BD(mlb(e), 81); + b.o = Qje; + for (g = b.f.Kc(); g.Ob(); ) { + f = BD(g.Pb(), 81); + BD(Wd(irb(h.f, f)), 15).Fc(b); + } + } + for (c = new olb(a.a.b); c.a < c.c.c.length; ) { + b = BD(mlb(c), 81); + b.f.$b(); + b.f = BD(Wd(irb(h.f, b)), 15); + } + rVb(a); + } + function dNb(a, b, c, d) { + var e, f; + cNb(a, b, c, d); + qNb(b, a.j - b.j + c); + rNb(b, a.k - b.k + d); + for (f = new olb(b.f); f.a < f.c.c.length; ) { + e = BD(mlb(f), 324); + switch (e.a.g) { + case 0: + nNb(a, b.g + e.b.a, 0, b.g + e.c.a, b.i - 1); + break; + case 1: + nNb(a, b.g + b.o, b.i + e.b.a, a.o - 1, b.i + e.c.a); + break; + case 2: + nNb(a, b.g + e.b.a, b.i + b.p, b.g + e.c.a, a.p - 1); + break; + default: + nNb(a, 0, b.i + e.b.a, b.g - 1, b.i + e.c.a); + } + } + } + function aNb(b, c, d, e, f) { + var g, h, i; + try { + if (c >= b.o) { + throw vbb(new rcb()); + } + i = c >> 5; + h = c & 31; + g = Nbb(1, Tbb(Nbb(h, 1))); + f + ? (b.n[d][i] = Mbb(b.n[d][i], g)) + : (b.n[d][i] = xbb(b.n[d][i], Lbb(g))); + g = Nbb(g, 1); + e + ? (b.n[d][i] = Mbb(b.n[d][i], g)) + : (b.n[d][i] = xbb(b.n[d][i], Lbb(g))); + } catch (a) { + a = ubb(a); + if (JD(a, 320)) { + throw vbb(new qcb(Dle + b.o + "*" + b.p + Ele + c + She + d + Fle)); + } else throw vbb(a); + } + } + function BUc(a, b, c, d) { + var e, f, g; + if (b) { + f = Edb(ED(vNb(b, (mTc(), fTc)))) + d; + g = c + Edb(ED(vNb(b, bTc))) / 2; + yNb(b, kTc, meb(Tbb(Cbb(Math.round(f))))); + yNb(b, lTc, meb(Tbb(Cbb(Math.round(g))))); + b.d.b == 0 || + BUc( + a, + BD(pr(((e = Jsb(new ZRc(b).a.d, 0)), new aSc(e))), 86), + c + Edb(ED(vNb(b, bTc))) + a.a, + d + Edb(ED(vNb(b, cTc))) + ); + vNb(b, iTc) != null && BUc(a, BD(vNb(b, iTc), 86), c, d); + } + } + function N9b(a, b) { + var c, d, e, f, g, h, i, j, k, l, m; + i = Q_b(b.a); + e = Edb(ED(vNb(i, (Nyc(), pyc)))) * 2; + k = Edb(ED(vNb(i, wyc))); + j = Math.max(e, k); + f = KC(UD, Vje, 25, b.f - b.c + 1, 15, 1); + d = -j; + c = 0; + for (h = b.b.Kc(); h.Ob(); ) { + g = BD(h.Pb(), 10); + d += a.a[g.c.p] + j; + f[c++] = d; + } + d += a.a[b.a.c.p] + j; + f[c++] = d; + for (m = new olb(b.e); m.a < m.c.c.length; ) { + l = BD(mlb(m), 10); + d += a.a[l.c.p] + j; + f[c++] = d; + } + return f; + } + function GHc(a, b, c, d) { + var e, f, g, h, i, j, k, l, m; + m = new Hxb(new pIc(a)); + for ( + h = OC(GC(OQ, 1), kne, 10, 0, [b, c]), i = 0, j = h.length; + i < j; + ++i + ) { + g = h[i]; + for (l = CHc(g, d).Kc(); l.Ob(); ) { + k = BD(l.Pb(), 11); + for (f = new b1b(k.b); llb(f.a) || llb(f.b); ) { + e = BD(llb(f.a) ? mlb(f.a) : mlb(f.b), 17); + if (!OZb(e)) { + Iwb(m.a, k, (Bcb(), zcb)) == null; + WHc(e) && Axb(m, k == e.c ? e.d : e.c); + } + } + } + } + return Qb(m), new Tkb(m); + } + function zhd(a, b) { + var c, d, e, f; + f = BD(hkd(a, (Y9c(), A9c)), 61).g - BD(hkd(b, A9c), 61).g; + if (f != 0) { + return f; + } + c = BD(hkd(a, v9c), 19); + d = BD(hkd(b, v9c), 19); + if (!!c && !!d) { + e = c.a - d.a; + if (e != 0) { + return e; + } + } + switch (BD(hkd(a, A9c), 61).g) { + case 1: + return Kdb(a.i, b.i); + case 2: + return Kdb(a.j, b.j); + case 3: + return Kdb(b.i, a.i); + case 4: + return Kdb(b.j, a.j); + default: + throw vbb(new Zdb(ine)); + } + } + function _od(a) { + var b, c, d; + if ((a.Db & 64) != 0) return fld(a); + b = new Wfb(ete); + c = a.k; + if (!c) { + !a.n && (a.n = new cUd(D2, a, 1, 7)); + if (a.n.i > 0) { + d = (!a.n && (a.n = new cUd(D2, a, 1, 7)), BD(qud(a.n, 0), 137)).a; + !d || Qfb(Qfb(((b.a += ' "'), b), d), '"'); + } + } else { + Qfb(Qfb(((b.a += ' "'), b), c), '"'); + } + Qfb( + Lfb( + Qfb( + Lfb( + Qfb(Lfb(Qfb(Lfb(((b.a += " ("), b), a.i), ","), a.j), " | "), + a.g + ), + "," + ), + a.f + ), + ")" + ); + return b.a; + } + function opd(a) { + var b, c, d; + if ((a.Db & 64) != 0) return fld(a); + b = new Wfb(fte); + c = a.k; + if (!c) { + !a.n && (a.n = new cUd(D2, a, 1, 7)); + if (a.n.i > 0) { + d = (!a.n && (a.n = new cUd(D2, a, 1, 7)), BD(qud(a.n, 0), 137)).a; + !d || Qfb(Qfb(((b.a += ' "'), b), d), '"'); + } + } else { + Qfb(Qfb(((b.a += ' "'), b), c), '"'); + } + Qfb( + Lfb( + Qfb( + Lfb( + Qfb(Lfb(Qfb(Lfb(((b.a += " ("), b), a.i), ","), a.j), " | "), + a.g + ), + "," + ), + a.f + ), + ")" + ); + return b.a; + } + function h4c(a, b) { + var c, d, e, f, g, h, i; + if (b == null || b.length == 0) { + return null; + } + e = BD(Phb(a.a, b), 149); + if (!e) { + for (d = ((h = new $ib(a.b).a.vc().Kc()), new djb(h)); d.a.Ob(); ) { + c = ((f = BD(d.a.Pb(), 42)), BD(f.dd(), 149)); + g = c.c; + i = b.length; + if ( + dfb(g.substr(g.length - i, i), b) && + (b.length == g.length || bfb(g, g.length - b.length - 1) == 46) + ) { + if (e) { + return null; + } + e = c; + } + } + !!e && Shb(a.a, b, e); + } + return e; + } + function QLb(a, b) { + var c, d, e, f; + c = new VLb(); + d = BD( + GAb( + NAb(new YAb(null, new Kub(a.f, 16)), c), + Ayb( + new hzb(), + new jzb(), + new Gzb(), + new Izb(), + OC(GC(xL, 1), Kie, 132, 0, [(Fyb(), Eyb), Dyb]) + ) + ), + 21 + ); + e = d.gc(); + d = BD( + GAb( + NAb(new YAb(null, new Kub(b.f, 16)), c), + Ayb( + new hzb(), + new jzb(), + new Gzb(), + new Izb(), + OC(GC(xL, 1), Kie, 132, 0, [Eyb, Dyb]) + ) + ), + 21 + ); + f = d.gc(); + if (e < f) { + return -1; + } + if (e == f) { + return 0; + } + return 1; + } + function r5b(a) { + var b, c, d; + if (!wNb(a, (Nyc(), xxc))) { + return; + } + d = BD(vNb(a, xxc), 21); + if (d.dc()) { + return; + } + c = ((b = BD(gdb(B1), 9)), new xqb(b, BD(_Bb(b, b.length), 9), 0)); + d.Hc((Hbd(), Cbd)) ? rqb(c, Cbd) : rqb(c, Dbd); + d.Hc(Abd) || rqb(c, Abd); + d.Hc(zbd) + ? rqb(c, Gbd) + : d.Hc(ybd) + ? rqb(c, Fbd) + : d.Hc(Bbd) && rqb(c, Ebd); + d.Hc(Gbd) + ? rqb(c, zbd) + : d.Hc(Fbd) + ? rqb(c, ybd) + : d.Hc(Ebd) && rqb(c, Bbd); + yNb(a, xxc, c); + } + function kHc(a) { + var b, c, d, e, f, g, h; + e = BD(vNb(a, (wtc(), Psc)), 10); + d = a.j; + c = (tCb(0, d.c.length), BD(d.c[0], 11)); + for (g = new olb(e.j); g.a < g.c.c.length; ) { + f = BD(mlb(g), 11); + if (PD(f) === PD(vNb(c, $sc))) { + if (f.j == (Ucd(), Acd) && a.p > e.p) { + G0b(f, Rcd); + if (f.d) { + h = f.o.b; + b = f.a.b; + f.a.b = h - b; + } + } else if (f.j == Rcd && e.p > a.p) { + G0b(f, Acd); + if (f.d) { + h = f.o.b; + b = f.a.b; + f.a.b = -(h - b); + } + } + break; + } + } + return e; + } + function NOc(a, b, c, d) { + var e, f, g, h, i, j, k, l, m, n, o; + f = c; + if (c < d) { + m = + ((n = new uOc(a.p)), + (o = new uOc(a.p)), + ye(n.e, a.e), + (n.q = a.q), + (n.r = o), + lOc(n), + ye(o.j, a.j), + (o.r = n), + lOc(o), + new vgd(n, o)); + l = BD(m.a, 112); + k = BD(m.b, 112); + e = (tCb(f, b.c.length), BD(b.c[f], 329)); + g = UOc(a, l, k, e); + for (j = c + 1; j <= d; j++) { + h = (tCb(j, b.c.length), BD(b.c[j], 329)); + i = UOc(a, l, k, h); + if (SOc(h, i, e, g)) { + e = h; + g = i; + } + } + } + return f; + } + function wQb(a, b, c, d, e) { + var f, g, h, i, j, k, l; + if (!(JD(b, 239) || JD(b, 354) || JD(b, 186))) { + throw vbb( + new Wdb( + "Method only works for ElkNode-, ElkLabel and ElkPort-objects." + ) + ); + } + g = a.a / 2; + i = b.i + d - g; + k = b.j + e - g; + j = i + b.g + a.a; + l = k + b.f + a.a; + f = new s7c(); + Dsb(f, new f7c(i, k)); + Dsb(f, new f7c(i, l)); + Dsb(f, new f7c(j, l)); + Dsb(f, new f7c(j, k)); + h = new XOb(f); + tNb(h, b); + c && Rhb(a.b, b, h); + return h; + } + function uXb(a, b, c) { + var d, e, f, g, h, i, j, k, l, m; + f = new f7c(b, c); + for (k = new olb(a.a); k.a < k.c.c.length; ) { + j = BD(mlb(k), 10); + P6c(j.n, f); + for (m = new olb(j.j); m.a < m.c.c.length; ) { + l = BD(mlb(m), 11); + for (e = new olb(l.g); e.a < e.c.c.length; ) { + d = BD(mlb(e), 17); + q7c(d.a, f); + g = BD(vNb(d, (Nyc(), jxc)), 74); + !!g && q7c(g, f); + for (i = new olb(d.b); i.a < i.c.c.length; ) { + h = BD(mlb(i), 70); + P6c(h.n, f); + } + } + } + } + } + function g_b(a, b, c) { + var d, e, f, g, h, i, j, k, l, m; + f = new f7c(b, c); + for (k = new olb(a.a); k.a < k.c.c.length; ) { + j = BD(mlb(k), 10); + P6c(j.n, f); + for (m = new olb(j.j); m.a < m.c.c.length; ) { + l = BD(mlb(m), 11); + for (e = new olb(l.g); e.a < e.c.c.length; ) { + d = BD(mlb(e), 17); + q7c(d.a, f); + g = BD(vNb(d, (Nyc(), jxc)), 74); + !!g && q7c(g, f); + for (i = new olb(d.b); i.a < i.c.c.length; ) { + h = BD(mlb(i), 70); + P6c(h.n, f); + } + } + } + } + } + function N1b(a) { + if ((!a.b && (a.b = new y5d(z2, a, 4, 7)), a.b).i == 0) { + throw vbb(new z2c("Edges must have a source.")); + } else if ((!a.c && (a.c = new y5d(z2, a, 5, 8)), a.c).i == 0) { + throw vbb(new z2c("Edges must have a target.")); + } else { + !a.b && (a.b = new y5d(z2, a, 4, 7)); + if ( + !(a.b.i <= 1 && (!a.c && (a.c = new y5d(z2, a, 5, 8)), a.c.i <= 1)) + ) { + throw vbb(new z2c("Hyperedges are not supported.")); + } + } + } + function OFc(a, b) { + var c, d, e, f, g, h, i, j, k, l; + l = 0; + f = new jkb(); + Wjb(f, b); + while (f.b != f.c) { + i = BD(fkb(f), 214); + j = 0; + k = BD(vNb(b.j, (Nyc(), ywc)), 339); + g = Edb(ED(vNb(b.j, uwc))); + h = Edb(ED(vNb(b.j, vwc))); + if (k != (tAc(), rAc)) { + j += g * PFc(i.e, k); + j += h * QFc(i.e); + } + l += pHc(i.d, i.e) + j; + for (e = new olb(i.b); e.a < e.c.c.length; ) { + d = BD(mlb(e), 37); + c = BD(Ikb(a.b, d.p), 214); + c.s || (l += NFc(a, c)); + } + } + return l; + } + function dhb(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o, p, q; + n = b.length; + i = n; + BCb(0, b.length); + if (b.charCodeAt(0) == 45) { + l = -1; + m = 1; + --n; + } else { + l = 1; + m = 0; + } + f = (phb(), ohb)[10]; + e = (n / f) | 0; + q = n % f; + q != 0 && ++e; + h = KC(WD, oje, 25, e, 15, 1); + c = nhb[8]; + g = 0; + o = m + (q == 0 ? f : q); + for (p = m; p < i; p = o, o = p + f) { + d = Icb(b.substr(p, o - p), Rie, Ohe); + j = (Dhb(), Hhb(h, h, g, c)); + j += xhb(h, g, d); + h[g++] = j; + } + k = g; + a.e = l; + a.d = k; + a.a = h; + Jgb(a); + } + function SGb(a, b, c, d, e, f, g) { + a.c = d.qf().a; + a.d = d.qf().b; + if (e) { + a.c += e.qf().a; + a.d += e.qf().b; + } + a.b = b.rf().a; + a.a = b.rf().b; + if (!e) { + c ? (a.c -= g + b.rf().a) : (a.c += d.rf().a + g); + } else { + switch (e.Hf().g) { + case 0: + case 2: + a.c += e.rf().a + g + f.a + g; + break; + case 4: + a.c -= g + f.a + g + b.rf().a; + break; + case 1: + a.c += e.rf().a + g; + a.d -= g + f.b + g + b.rf().b; + break; + case 3: + a.c += e.rf().a + g; + a.d += e.rf().b + g + f.b + g; + } + } + } + function gac(a, b) { + var c, d; + this.b = new Rkb(); + this.e = new Rkb(); + this.a = a; + this.d = b; + dac(this); + eac(this); + this.b.dc() ? (this.c = a.c.p) : (this.c = BD(this.b.Xb(0), 10).c.p); + this.e.c.length == 0 + ? (this.f = a.c.p) + : (this.f = BD(Ikb(this.e, this.e.c.length - 1), 10).c.p); + for (d = BD(vNb(a, (wtc(), ktc)), 15).Kc(); d.Ob(); ) { + c = BD(d.Pb(), 70); + if (wNb(c, (Nyc(), Owc))) { + this.d = BD(vNb(c, Owc), 227); + break; + } + } + } + function Anc(a, b, c) { + var d, e, f, g, h, i, j, k; + d = BD(Ohb(a.a, b), 53); + f = BD(Ohb(a.a, c), 53); + e = BD(Ohb(a.e, b), 53); + g = BD(Ohb(a.e, c), 53); + d.a.zc(c, d); + g.a.zc(b, g); + for (k = f.a.ec().Kc(); k.Ob(); ) { + j = BD(k.Pb(), 10); + d.a.zc(j, d); + Qqb(BD(Ohb(a.e, j), 53), b); + ye(BD(Ohb(a.e, j), 53), e); + } + for (i = e.a.ec().Kc(); i.Ob(); ) { + h = BD(i.Pb(), 10); + g.a.zc(h, g); + Qqb(BD(Ohb(a.a, h), 53), c); + ye(BD(Ohb(a.a, h), 53), f); + } + } + function WGc(a, b, c) { + var d, e, f, g, h, i, j, k; + d = BD(Ohb(a.a, b), 53); + f = BD(Ohb(a.a, c), 53); + e = BD(Ohb(a.b, b), 53); + g = BD(Ohb(a.b, c), 53); + d.a.zc(c, d); + g.a.zc(b, g); + for (k = f.a.ec().Kc(); k.Ob(); ) { + j = BD(k.Pb(), 10); + d.a.zc(j, d); + Qqb(BD(Ohb(a.b, j), 53), b); + ye(BD(Ohb(a.b, j), 53), e); + } + for (i = e.a.ec().Kc(); i.Ob(); ) { + h = BD(i.Pb(), 10); + g.a.zc(h, g); + Qqb(BD(Ohb(a.a, h), 53), c); + ye(BD(Ohb(a.a, h), 53), f); + } + } + function doc(a, b) { + var c, d, e; + Odd(b, "Breaking Point Insertion", 1); + d = new Xoc(a); + switch (BD(vNb(a, (Nyc(), Gyc)), 337).g) { + case 2: + e = new hpc(); + case 0: + e = new Ync(); + break; + default: + e = new kpc(); + } + c = e.Vf(a, d); + Ccb(DD(vNb(a, Iyc))) && (c = coc(a, c)); + if (!e.Wf() && wNb(a, Myc)) { + switch (BD(vNb(a, Myc), 338).g) { + case 2: + c = tpc(d, c); + break; + case 1: + c = rpc(d, c); + } + } + if (c.dc()) { + Qdd(b); + return; + } + aoc(a, c); + Qdd(b); + } + function $qd(a, b, c) { + var d, e, f, g, h, i, j, k, l, m; + k = null; + m = b; + l = Rqd(a, dtd(c), m); + Lkd(l, _pd(m, Vte)); + g = Ypd(m, Lte); + d = new mrd(a, l); + oqd(d.a, d.b, g); + h = Ypd(m, Mte); + e = new nrd(a, l); + pqd(e.a, e.b, h); + if ( + (!l.b && (l.b = new y5d(z2, l, 4, 7)), l.b).i == 0 || + (!l.c && (l.c = new y5d(z2, l, 5, 8)), l.c).i == 0 + ) { + f = _pd(m, Vte); + i = Zte + f; + j = i + $te; + throw vbb(new cqd(j)); + } + grd(m, l); + _qd(a, m, l); + k = crd(a, m, l); + return k; + } + function yGb(a, b) { + var c, d, e, f, g, h, i; + e = KC(WD, oje, 25, a.e.a.c.length, 15, 1); + for (g = new olb(a.e.a); g.a < g.c.c.length; ) { + f = BD(mlb(g), 121); + e[f.d] += f.b.a.c.length; + } + h = Ru(b); + while (h.b != 0) { + f = BD(h.b == 0 ? null : (sCb(h.b != 0), Nsb(h, h.a.a)), 121); + for (d = vr(new olb(f.g.a)); d.Ob(); ) { + c = BD(d.Pb(), 213); + i = c.e; + i.e = Math.max(i.e, f.e + c.a); + --e[i.d]; + e[i.d] == 0 && (Gsb(h, i, h.c.b, h.c), true); + } + } + } + function CGb(a) { + var b, c, d, e, f, g, h, i, j, k, l; + c = Rie; + e = Ohe; + for (h = new olb(a.e.a); h.a < h.c.c.length; ) { + f = BD(mlb(h), 121); + e = Math.min(e, f.e); + c = Math.max(c, f.e); + } + b = KC(WD, oje, 25, c - e + 1, 15, 1); + for (g = new olb(a.e.a); g.a < g.c.c.length; ) { + f = BD(mlb(g), 121); + f.e -= e; + ++b[f.e]; + } + d = 0; + if (a.k != null) { + for (j = a.k, k = 0, l = j.length; k < l; ++k) { + i = j[k]; + b[d++] += i; + if (b.length == d) { + break; + } + } + } + return b; + } + function ixd(a) { + switch (a.d) { + case 9: + case 8: { + return true; + } + case 3: + case 5: + case 4: + case 6: { + return false; + } + case 7: { + return BD(hxd(a), 19).a == a.o; + } + case 1: + case 2: { + if (a.o == -2) { + return false; + } else { + switch (a.p) { + case 0: + case 1: + case 2: + case 6: + case 5: + case 7: { + return Bbb(a.k, a.f); + } + case 3: + case 4: { + return a.j == a.e; + } + default: { + return a.n == null ? a.g == null : pb(a.n, a.g); + } + } + } + } + default: { + return false; + } + } + } + function $ad(a) { + r4c( + a, + new E3c( + P3c( + M3c( + O3c(N3c(new R3c(), Qse), "ELK Fixed"), + "Keeps the current layout as it is, without any automatic modification. Optional coordinates can be given for nodes and edge bend points." + ), + new bbd() + ) + ) + ); + p4c(a, Qse, ame, Xad); + p4c(a, Qse, uqe, Ksd(Yad)); + p4c(a, Qse, use, Ksd(Sad)); + p4c(a, Qse, Fme, Ksd(Tad)); + p4c(a, Qse, Tme, Ksd(Vad)); + p4c(a, Qse, bqe, Ksd(Uad)); + } + function ro(a, b, c) { + var d, e, f, g, h; + d = Tbb(Ibb(Eie, keb(Tbb(Ibb(b == null ? 0 : tb(b), Fie)), 15))); + h = Tbb(Ibb(Eie, keb(Tbb(Ibb(c == null ? 0 : tb(c), Fie)), 15))); + f = uo(a, b, d); + if (!!f && h == f.f && Hb(c, f.i)) { + return c; + } + g = vo(a, c, h); + if (g) { + throw vbb(new Wdb("value already present: " + c)); + } + e = new $o(b, d, c, h); + if (f) { + mo(a, f); + po(a, e, f); + f.e = null; + f.c = null; + return f.i; + } else { + po(a, e, null); + to(a); + return null; + } + } + function E4b(a, b, c) { + var d, e, f, g, h, i, j, k, l, m, n, o; + k = c.a.c; + g = c.a.c + c.a.b; + f = BD(Ohb(c.c, b), 459); + n = f.f; + o = f.a; + f.b ? (i = new f7c(g, n)) : (i = new f7c(k, n)); + f.c ? (l = new f7c(k, o)) : (l = new f7c(g, o)); + e = k; + c.p || (e += a.c); + e += c.F + c.v * a.b; + j = new f7c(e, n); + m = new f7c(e, o); + n7c(b.a, OC(GC(m1, 1), nie, 8, 0, [i, j])); + h = c.d.a.gc() > 1; + if (h) { + d = new f7c(e, c.b); + Dsb(b.a, d); + } + n7c(b.a, OC(GC(m1, 1), nie, 8, 0, [m, l])); + } + function Nid(a, b, c) { + var d, e, f, g, h, i; + if (!b) { + return null; + } else { + if (c <= -1) { + d = XKd(b.Tg(), -1 - c); + if (JD(d, 99)) { + return BD(d, 18); + } else { + g = BD(b.ah(d), 153); + for (h = 0, i = g.gc(); h < i; ++h) { + if (PD(g.jl(h)) === PD(a)) { + e = g.il(h); + if (JD(e, 99)) { + f = BD(e, 18); + if ((f.Bb & ote) != 0) { + return f; + } + } + } + } + throw vbb(new Zdb("The containment feature could not be located")); + } + } else { + return zUd(BD(XKd(a.Tg(), c), 18)); + } + } + } + function Xee(a) { + var b, c, d, e, f; + d = a.length; + b = new Ifb(); + f = 0; + while (f < d) { + c = bfb(a, f++); + if (c == 9 || c == 10 || c == 12 || c == 13 || c == 32) continue; + if (c == 35) { + while (f < d) { + c = bfb(a, f++); + if (c == 13 || c == 10) break; + } + continue; + } + if (c == 92 && f < d) { + if ( + (e = (BCb(f, a.length), a.charCodeAt(f))) == 35 || + e == 9 || + e == 10 || + e == 12 || + e == 13 || + e == 32 + ) { + Afb(b, e & aje); + ++f; + } else { + b.a += "\\"; + Afb(b, e & aje); + ++f; + } + } else Afb(b, c & aje); + } + return b.a; + } + function GVc(a, b) { + var c, d, e; + for (d = new olb(b); d.a < d.c.c.length; ) { + c = BD(mlb(d), 33); + Rc(a.a, c, c); + Rc(a.b, c, c); + e = gVc(c); + if (e.c.length != 0) { + !!a.d && a.d.lg(e); + Rc(a.a, c, (tCb(0, e.c.length), BD(e.c[0], 33))); + Rc(a.b, c, BD(Ikb(e, e.c.length - 1), 33)); + while (dVc(e).c.length != 0) { + e = dVc(e); + !!a.d && a.d.lg(e); + Rc(a.a, c, (tCb(0, e.c.length), BD(e.c[0], 33))); + Rc(a.b, c, BD(Ikb(e, e.c.length - 1), 33)); + } + } + } + } + function fnc(a) { + var b, c, d, e, f, g, h, i, j, k; + c = 0; + for (h = new olb(a.d); h.a < h.c.c.length; ) { + g = BD(mlb(h), 101); + !!g.i && (g.i.c = c++); + } + b = IC(sbb, [nie, dle], [177, 25], 16, [c, c], 2); + k = a.d; + for (e = 0; e < k.c.length; e++) { + i = (tCb(e, k.c.length), BD(k.c[e], 101)); + if (i.i) { + for (f = e + 1; f < k.c.length; f++) { + j = (tCb(f, k.c.length), BD(k.c[f], 101)); + if (j.i) { + d = knc(i, j); + b[i.i.c][j.i.c] = d; + b[j.i.c][i.i.c] = d; + } + } + } + } + return b; + } + function ht(a, b, c, d) { + var e, f, g; + g = new qu(b, c); + if (!a.a) { + a.a = a.e = g; + Rhb(a.b, b, new pu(g)); + ++a.c; + } else if (!d) { + a.e.b = g; + g.d = a.e; + a.e = g; + e = BD(Ohb(a.b, b), 283); + if (!e) { + Rhb(a.b, b, (e = new pu(g))); + ++a.c; + } else { + ++e.a; + f = e.c; + f.c = g; + g.e = f; + e.c = g; + } + } else { + e = BD(Ohb(a.b, b), 283); + ++e.a; + g.d = d.d; + g.e = d.e; + g.b = d; + g.c = d; + !d.e ? (BD(Ohb(a.b, b), 283).b = g) : (d.e.c = g); + !d.d ? (a.a = g) : (d.d.b = g); + d.d = g; + d.e = g; + } + ++a.d; + return g; + } + function mfb(a, b) { + var c, d, e, f, g, h, i, j; + c = new RegExp(b, "g"); + i = KC(ZI, nie, 2, 0, 6, 1); + d = 0; + j = a; + f = null; + while (true) { + h = c.exec(j); + if (h == null || j == "") { + i[d] = j; + break; + } else { + g = h.index; + i[d] = j.substr(0, g); + j = qfb(j, g + h[0].length, j.length); + c.lastIndex = 0; + if (f == j) { + i[d] = j.substr(0, 1); + j = j.substr(1); + } + f = j; + ++d; + } + } + if (a.length > 0) { + e = i.length; + while (e > 0 && i[e - 1] == "") { + --e; + } + e < i.length && (i.length = e); + } + return i; + } + function f1d(a, b) { + var c, d, e, f, g, h, i, j, k, l; + l = _Kd(b); + j = null; + e = false; + for (h = 0, k = VKd(l.a).i; h < k; ++h) { + g = BD( + nOd( + l, + h, + ((f = BD(qud(VKd(l.a), h), 87)), + (i = f.c), + JD(i, 88) ? BD(i, 26) : (jGd(), _Fd)) + ), + 26 + ); + c = f1d(a, g); + if (!c.dc()) { + if (!j) { + j = c; + } else { + if (!e) { + e = true; + j = new pFd(j); + } + j.Gc(c); + } + } + } + d = k1d(a, b); + if (d.dc()) { + return !j ? (mmb(), mmb(), jmb) : j; + } else { + if (!j) { + return d; + } else { + e || (j = new pFd(j)); + j.Gc(d); + return j; + } + } + } + function g1d(a, b) { + var c, d, e, f, g, h, i, j, k, l; + l = _Kd(b); + j = null; + d = false; + for (h = 0, k = VKd(l.a).i; h < k; ++h) { + f = BD( + nOd( + l, + h, + ((e = BD(qud(VKd(l.a), h), 87)), + (i = e.c), + JD(i, 88) ? BD(i, 26) : (jGd(), _Fd)) + ), + 26 + ); + c = g1d(a, f); + if (!c.dc()) { + if (!j) { + j = c; + } else { + if (!d) { + d = true; + j = new pFd(j); + } + j.Gc(c); + } + } + } + g = n1d(a, b); + if (g.dc()) { + return !j ? (mmb(), mmb(), jmb) : j; + } else { + if (!j) { + return g; + } else { + d || (j = new pFd(j)); + j.Gc(g); + return j; + } + } + } + function B2d(a, b, c) { + var d, e, f, g, h, i; + if (JD(b, 72)) { + return Txd(a, b, c); + } else { + h = null; + f = null; + d = BD(a.g, 119); + for (g = 0; g < a.i; ++g) { + e = d[g]; + if (pb(b, e.dd())) { + f = e.ak(); + if (JD(f, 99) && (BD(f, 18).Bb & ote) != 0) { + h = e; + break; + } + } + } + if (h) { + if (oid(a.e)) { + i = f.$j() + ? H2d( + a, + 4, + f, + b, + null, + M2d(a, f, b, JD(f, 99) && (BD(f, 18).Bb & Tje) != 0), + true + ) + : H2d(a, f.Kj() ? 2 : 1, f, b, f.zj(), -1, true); + c ? c.Ei(i) : (c = i); + } + c = B2d(a, h, c); + } + return c; + } + } + function pKb(a) { + var b, c, d, e; + d = a.o; + $Jb(); + if (a.A.dc() || pb(a.A, ZJb)) { + e = d.a; + } else { + e = gIb(a.f); + if (a.A.Hc((tdd(), qdd)) && !a.B.Hc((Idd(), Edd))) { + e = Math.max(e, gIb(BD(Mpb(a.p, (Ucd(), Acd)), 244))); + e = Math.max(e, gIb(BD(Mpb(a.p, Rcd), 244))); + } + b = aKb(a); + !!b && (e = Math.max(e, b.a)); + } + Ccb(DD(a.e.yf().We((Y9c(), $8c)))) ? (d.a = Math.max(d.a, e)) : (d.a = e); + c = a.f.i; + c.c = 0; + c.b = e; + hIb(a.f); + } + function $0d(a, b) { + var c, d, e, f, g, h, i, j, k; + c = b.Hh(a.a); + if (c) { + i = GD( + AAd( + (!c.b && (c.b = new sId((jGd(), fGd), x6, c)), c.b), + "memberTypes" + ) + ); + if (i != null) { + j = new Rkb(); + for (f = mfb(i, "\\w"), g = 0, h = f.length; g < h; ++g) { + e = f[g]; + d = e.lastIndexOf("#"); + k = + d == -1 + ? w1d(a, b.Aj(), e) + : d == 0 + ? v1d(a, null, e.substr(1)) + : v1d(a, e.substr(0, d), e.substr(d + 1)); + JD(k, 148) && Ekb(j, BD(k, 148)); + } + return j; + } + } + return mmb(), mmb(), jmb; + } + function tRb(a, b, c) { + var d, e, f, g, h, i, j, k; + Odd(c, kme, 1); + a.bf(b); + f = 0; + while (a.df(f)) { + for (k = new olb(b.e); k.a < k.c.c.length; ) { + i = BD(mlb(k), 144); + for ( + h = ul(pl(OC(GC(KI, 1), Uhe, 20, 0, [b.e, b.d, b.b]))); + Qr(h); + + ) { + g = BD(Rr(h), 357); + if (g != i) { + e = a.af(g, i); + !!e && P6c(i.a, e); + } + } + } + for (j = new olb(b.e); j.a < j.c.c.length; ) { + i = BD(mlb(j), 144); + d = i.a; + Q6c(d, -a.d, -a.d, a.d, a.d); + P6c(i.d, d); + X6c(d); + } + a.cf(); + ++f; + } + Qdd(c); + } + function $2d(a, b, c) { + var d, e, f, g; + g = S6d(a.e.Tg(), b); + d = BD(a.g, 119); + Q6d(); + if (BD(b, 66).Oj()) { + for (f = 0; f < a.i; ++f) { + e = d[f]; + if (g.rl(e.ak())) { + if (pb(e, c)) { + Xxd(a, f); + return true; + } + } + } + } else if (c != null) { + for (f = 0; f < a.i; ++f) { + e = d[f]; + if (g.rl(e.ak())) { + if (pb(c, e.dd())) { + Xxd(a, f); + return true; + } + } + } + } else { + for (f = 0; f < a.i; ++f) { + e = d[f]; + if (g.rl(e.ak())) { + if (e.dd() == null) { + Xxd(a, f); + return true; + } + } + } + } + return false; + } + function sDc(a, b) { + var c, d, e, f, g; + a.c == null || a.c.length < b.c.length + ? (a.c = KC(sbb, dle, 25, b.c.length, 16, 1)) + : Blb(a.c); + a.a = new Rkb(); + d = 0; + for (g = new olb(b); g.a < g.c.c.length; ) { + e = BD(mlb(g), 10); + e.p = d++; + } + c = new Psb(); + for (f = new olb(b); f.a < f.c.c.length; ) { + e = BD(mlb(f), 10); + if (!a.c[e.p]) { + tDc(a, e); + c.b == 0 || (sCb(c.b != 0), BD(c.a.a.c, 15)).gc() < a.a.c.length + ? Esb(c, a.a) + : Fsb(c, a.a); + a.a = new Rkb(); + } + } + return c; + } + function jYc(a, b, c, d) { + var e, f, g, h, i, j, k, l, m, n, o; + g = BD(qud(b, 0), 33); + dld(g, 0); + eld(g, 0); + m = new Rkb(); + m.c[m.c.length] = g; + h = g; + f = new d$c(a.a, g.g, g.f, (k$c(), j$c)); + for (n = 1; n < b.i; n++) { + o = BD(qud(b, n), 33); + i = kYc(a, g$c, o, h, f, m, c); + j = kYc(a, f$c, o, h, f, m, c); + k = kYc(a, i$c, o, h, f, m, c); + l = kYc(a, h$c, o, h, f, m, c); + e = mYc(a, i, j, k, l, o, h, d); + dld(o, e.d); + eld(o, e.e); + c$c(e, j$c); + f = e; + h = o; + m.c[m.c.length] = o; + } + return f; + } + function K0c(a) { + r4c( + a, + new E3c( + P3c( + M3c( + O3c(N3c(new R3c(), ase), "ELK SPOrE Overlap Removal"), + 'A node overlap removal algorithm proposed by Nachmanson et al. in "Node overlap removal by growing a tree".' + ), + new N0c() + ) + ) + ); + p4c(a, ase, Qre, Ksd(I0c)); + p4c(a, ase, ame, G0c); + p4c(a, ase, wme, 8); + p4c(a, ase, Vre, Ksd(H0c)); + p4c(a, ase, Yre, Ksd(E0c)); + p4c(a, ase, Zre, Ksd(F0c)); + p4c(a, ase, Zpe, (Bcb(), false)); + } + function sXb(a, b, c, d) { + var e, f, g, h, i, j, k, l, m, n; + g = O6c(b.c, c, d); + for (l = new olb(b.a); l.a < l.c.c.length; ) { + k = BD(mlb(l), 10); + P6c(k.n, g); + for (n = new olb(k.j); n.a < n.c.c.length; ) { + m = BD(mlb(n), 11); + for (f = new olb(m.g); f.a < f.c.c.length; ) { + e = BD(mlb(f), 17); + q7c(e.a, g); + h = BD(vNb(e, (Nyc(), jxc)), 74); + !!h && q7c(h, g); + for (j = new olb(e.b); j.a < j.c.c.length; ) { + i = BD(mlb(j), 70); + P6c(i.n, g); + } + } + } + Ekb(a.a, k); + k.a = a; + } + } + function g9b(a, b) { + var c, d, e, f, g; + Odd(b, "Node and Port Label Placement and Node Sizing", 1); + MGb((a$b(), new l$b(a, true, true, new j9b()))); + if (BD(vNb(a, (wtc(), Ksc)), 21).Hc((Orc(), Hrc))) { + f = BD(vNb(a, (Nyc(), Yxc)), 21); + e = f.Hc((rcd(), ocd)); + g = Ccb(DD(vNb(a, Zxc))); + for (d = new olb(a.b); d.a < d.c.c.length; ) { + c = BD(mlb(d), 29); + MAb( + JAb(new YAb(null, new Kub(c.a, 16)), new l9b()), + new n9b(f, e, g) + ); + } + } + Qdd(b); + } + function Y0d(a, b) { + var c, d, e, f, g, h; + c = b.Hh(a.a); + if (c) { + h = GD(AAd((!c.b && (c.b = new sId((jGd(), fGd), x6, c)), c.b), eue)); + if (h != null) { + e = kfb(h, wfb(35)); + d = b.Hj(); + if (e == -1) { + g = u1d(a, bKd(d)); + f = h; + } else if (e == 0) { + g = null; + f = h.substr(1); + } else { + g = h.substr(0, e); + f = h.substr(e + 1); + } + switch ($1d(q1d(a, b))) { + case 2: + case 3: { + return j1d(a, d, g, f); + } + case 0: + case 4: + case 5: + case 6: { + return m1d(a, d, g, f); + } + } + } + } + return null; + } + function q2d(a, b, c) { + var d, e, f, g, h; + g = (Q6d(), BD(b, 66).Oj()); + if (T6d(a.e, b)) { + if (b.hi() && F2d(a, b, c, JD(b, 99) && (BD(b, 18).Bb & Tje) != 0)) { + return false; + } + } else { + h = S6d(a.e.Tg(), b); + d = BD(a.g, 119); + for (f = 0; f < a.i; ++f) { + e = d[f]; + if (h.rl(e.ak())) { + if (g ? pb(e, c) : c == null ? e.dd() == null : pb(c, e.dd())) { + return false; + } else { + BD(Gtd(a, f, g ? BD(c, 72) : R6d(b, c)), 72); + return true; + } + } + } + } + return wtd(a, g ? BD(c, 72) : R6d(b, c)); + } + function uVb(a) { + var b, c, d, e, f, g, h, i; + if (a.d) { + throw vbb(new Zdb((fdb(LP), Jke + LP.k + Kke))); + } + a.c == (ead(), cad) && tVb(a, aad); + for (c = new olb(a.a.a); c.a < c.c.c.length; ) { + b = BD(mlb(c), 189); + b.e = 0; + } + for (g = new olb(a.a.b); g.a < g.c.c.length; ) { + f = BD(mlb(g), 81); + f.o = Qje; + for (e = f.f.Kc(); e.Ob(); ) { + d = BD(e.Pb(), 81); + ++d.d.e; + } + } + JVb(a); + for (i = new olb(a.a.b); i.a < i.c.c.length; ) { + h = BD(mlb(i), 81); + h.k = true; + } + return a; + } + function Ijc(a, b) { + var c, d, e, f, g, h, i, j; + h = new pjc(a); + c = new Psb(); + Gsb(c, b, c.c.b, c.c); + while (c.b != 0) { + d = BD(c.b == 0 ? null : (sCb(c.b != 0), Nsb(c, c.a.a)), 113); + d.d.p = 1; + for (g = new olb(d.e); g.a < g.c.c.length; ) { + e = BD(mlb(g), 409); + kjc(h, e); + j = e.d; + j.d.p == 0 && (Gsb(c, j, c.c.b, c.c), true); + } + for (f = new olb(d.b); f.a < f.c.c.length; ) { + e = BD(mlb(f), 409); + kjc(h, e); + i = e.c; + i.d.p == 0 && (Gsb(c, i, c.c.b, c.c), true); + } + } + return h; + } + function hfd(a) { + var b, c, d, e, f; + d = Edb(ED(hkd(a, (Y9c(), G9c)))); + if (d == 1) { + return; + } + _kd(a, d * a.g, d * a.f); + c = Mq(Rq((!a.c && (a.c = new cUd(F2, a, 9, 9)), a.c), new Hfd())); + for ( + f = ul( + pl( + OC(GC(KI, 1), Uhe, 20, 0, [ + (!a.n && (a.n = new cUd(D2, a, 1, 7)), a.n), + (!a.c && (a.c = new cUd(F2, a, 9, 9)), a.c), + c, + ]) + ) + ); + Qr(f); + + ) { + e = BD(Rr(f), 470); + e.Gg(d * e.Dg(), d * e.Eg()); + e.Fg(d * e.Cg(), d * e.Bg()); + b = BD(e.We(r9c), 8); + if (b) { + b.a *= d; + b.b *= d; + } + } + } + function Mac(a, b, c, d, e) { + var f, g, h, i, j, k, l, m; + for (g = new olb(a.b); g.a < g.c.c.length; ) { + f = BD(mlb(g), 29); + m = l_b(f.a); + for (j = m, k = 0, l = j.length; k < l; ++k) { + i = j[k]; + switch (BD(vNb(i, (Nyc(), mxc)), 163).g) { + case 1: + Qac(i); + $_b(i, b); + Nac(i, true, d); + break; + case 3: + Rac(i); + $_b(i, c); + Nac(i, false, e); + } + } + } + h = new Bib(a.b, 0); + while (h.b < h.d.gc()) { + (sCb(h.b < h.d.gc()), BD(h.d.Xb((h.c = h.b++)), 29)).a.c.length == 0 && + uib(h); + } + } + function d1d(a, b) { + var c, d, e, f, g, h, i; + c = b.Hh(a.a); + if (c) { + i = GD(AAd((!c.b && (c.b = new sId((jGd(), fGd), x6, c)), c.b), Dwe)); + if (i != null) { + d = new Rkb(); + for (f = mfb(i, "\\w"), g = 0, h = f.length; g < h; ++g) { + e = f[g]; + dfb(e, "##other") + ? Ekb(d, "!##" + u1d(a, bKd(b.Hj()))) + : dfb(e, "##local") + ? ((d.c[d.c.length] = null), true) + : dfb(e, Bwe) + ? Ekb(d, u1d(a, bKd(b.Hj()))) + : ((d.c[d.c.length] = e), true); + } + return d; + } + } + return mmb(), mmb(), jmb; + } + function kMb(a, b) { + var c, d, e, f; + c = new pMb(); + d = BD( + GAb( + NAb(new YAb(null, new Kub(a.f, 16)), c), + Ayb( + new hzb(), + new jzb(), + new Gzb(), + new Izb(), + OC(GC(xL, 1), Kie, 132, 0, [(Fyb(), Eyb), Dyb]) + ) + ), + 21 + ); + e = d.gc(); + d = BD( + GAb( + NAb(new YAb(null, new Kub(b.f, 16)), c), + Ayb( + new hzb(), + new jzb(), + new Gzb(), + new Izb(), + OC(GC(xL, 1), Kie, 132, 0, [Eyb, Dyb]) + ) + ), + 21 + ); + f = d.gc(); + e = e == 1 ? 1 : 0; + f = f == 1 ? 1 : 0; + if (e < f) { + return -1; + } + if (e == f) { + return 0; + } + return 1; + } + function hZb(a) { + var b, c, d, e, f, g, h, i, j, k, l, m; + h = a.i; + e = Ccb(DD(vNb(h, (Nyc(), fxc)))); + k = 0; + d = 0; + for (j = new olb(a.g); j.a < j.c.c.length; ) { + i = BD(mlb(j), 17); + g = OZb(i); + f = g && e && Ccb(DD(vNb(i, gxc))); + m = i.d.i; + g && f ? ++d : g && !f ? ++k : Q_b(m).e == h ? ++d : ++k; + } + for (c = new olb(a.e); c.a < c.c.c.length; ) { + b = BD(mlb(c), 17); + g = OZb(b); + f = g && e && Ccb(DD(vNb(b, gxc))); + l = b.c.i; + g && f ? ++k : g && !f ? ++d : Q_b(l).e == h ? ++k : ++d; + } + return k - d; + } + function ULc(a, b, c, d) { + this.e = a; + this.k = BD(vNb(a, (wtc(), otc)), 304); + this.g = KC(OQ, kne, 10, b, 0, 1); + this.b = KC(BI, nie, 333, b, 7, 1); + this.a = KC(OQ, kne, 10, b, 0, 1); + this.d = KC(BI, nie, 333, b, 7, 1); + this.j = KC(OQ, kne, 10, b, 0, 1); + this.i = KC(BI, nie, 333, b, 7, 1); + this.p = KC(BI, nie, 333, b, 7, 1); + this.n = KC(wI, nie, 476, b, 8, 1); + Alb(this.n, (Bcb(), false)); + this.f = KC(wI, nie, 476, b, 8, 1); + Alb(this.f, true); + this.o = c; + this.c = d; + } + function X9b(a, b) { + var c, d, e, f, g, h; + if (b.dc()) { + return; + } + if (BD(b.Xb(0), 286).d == (Apc(), xpc)) { + O9b(a, b); + } else { + for (d = b.Kc(); d.Ob(); ) { + c = BD(d.Pb(), 286); + switch (c.d.g) { + case 5: + K9b(a, c, Q9b(a, c)); + break; + case 0: + K9b( + a, + c, + ((g = c.f - c.c + 1), (h = ((g - 1) / 2) | 0), c.c + h) + ); + break; + case 4: + K9b(a, c, S9b(a, c)); + break; + case 2: + Y9b(c); + K9b(a, c, ((f = U9b(c)), f ? c.c : c.f)); + break; + case 1: + Y9b(c); + K9b(a, c, ((e = U9b(c)), e ? c.f : c.c)); + } + P9b(c.a); + } + } + } + function C4b(a, b) { + var c, d, e, f, g, h, i; + if (b.e) { + return; + } + b.e = true; + for (d = b.d.a.ec().Kc(); d.Ob(); ) { + c = BD(d.Pb(), 17); + if (b.o && b.d.a.gc() <= 1) { + g = b.a.c; + h = b.a.c + b.a.b; + i = new f7c(g + (h - g) / 2, b.b); + Dsb(BD(b.d.a.ec().Kc().Pb(), 17).a, i); + continue; + } + e = BD(Ohb(b.c, c), 459); + if (e.b || e.c) { + E4b(a, c, b); + continue; + } + f = a.d == (tBc(), sBc) && (e.d || e.e) && K4b(a, b) && b.d.a.gc() <= 1; + f ? F4b(c, b) : D4b(a, c, b); + } + b.k && reb(b.d, new X4b()); + } + function zXc(a, b, c, d, e, f) { + var g, h, i, j, k, l, m, n, o, p, q, r, s, t; + m = f; + h = (d + e) / 2 + m; + q = c * Math.cos(h); + r = c * Math.sin(h); + s = q - b.g / 2; + t = r - b.f / 2; + dld(b, s); + eld(b, t); + l = a.a.jg(b); + p = 2 * Math.acos(c / c + a.c); + if (p < e - d) { + n = p / l; + g = (d + e - p) / 2; + } else { + n = (e - d) / l; + g = d; + } + o = gVc(b); + if (a.e) { + a.e.kg(a.d); + a.e.lg(o); + } + for (j = new olb(o); j.a < j.c.c.length; ) { + i = BD(mlb(j), 33); + k = a.a.jg(i); + zXc(a, i, c + a.c, g, g + n * k, f); + g += n * k; + } + } + function jA(a, b, c) { + var d; + d = c.q.getMonth(); + switch (b) { + case 5: + Qfb( + a, + OC(GC(ZI, 1), nie, 2, 6, [ + "J", + "F", + "M", + "A", + "M", + "J", + "J", + "A", + "S", + "O", + "N", + "D", + ])[d] + ); + break; + case 4: + Qfb( + a, + OC(GC(ZI, 1), nie, 2, 6, [ + bje, + cje, + dje, + eje, + fje, + gje, + hje, + ije, + jje, + kje, + lje, + mje, + ])[d] + ); + break; + case 3: + Qfb( + a, + OC(GC(ZI, 1), nie, 2, 6, [ + "Jan", + "Feb", + "Mar", + "Apr", + fje, + "Jun", + "Jul", + "Aug", + "Sep", + "Oct", + "Nov", + "Dec", + ])[d] + ); + break; + default: + EA(a, d + 1, b); + } + } + function uGb(a, b) { + var c, d, e, f, g; + Odd(b, "Network simplex", 1); + if (a.e.a.c.length < 1) { + Qdd(b); + return; + } + for (f = new olb(a.e.a); f.a < f.c.c.length; ) { + e = BD(mlb(f), 121); + e.e = 0; + } + g = a.e.a.c.length >= 40; + g && FGb(a); + wGb(a); + vGb(a); + c = zGb(a); + d = 0; + while (!!c && d < a.f) { + tGb(a, c, sGb(a, c)); + c = zGb(a); + ++d; + } + g && EGb(a); + a.a ? qGb(a, CGb(a)) : CGb(a); + a.b = null; + a.d = null; + a.p = null; + a.c = null; + a.g = null; + a.i = null; + a.n = null; + a.o = null; + Qdd(b); + } + function JQb(a, b, c, d) { + var e, f, g, h, i, j, k, l, m; + i = new f7c(c, d); + c7c(i, BD(vNb(b, (HSb(), ESb)), 8)); + for (m = new olb(b.e); m.a < m.c.c.length; ) { + l = BD(mlb(m), 144); + P6c(l.d, i); + Ekb(a.e, l); + } + for (h = new olb(b.c); h.a < h.c.c.length; ) { + g = BD(mlb(h), 282); + for (f = new olb(g.a); f.a < f.c.c.length; ) { + e = BD(mlb(f), 559); + P6c(e.d, i); + } + Ekb(a.c, g); + } + for (k = new olb(b.d); k.a < k.c.c.length; ) { + j = BD(mlb(k), 447); + P6c(j.d, i); + Ekb(a.d, j); + } + } + function _Bc(a, b) { + var c, d, e, f, g, h, i, j; + for (i = new olb(b.j); i.a < i.c.c.length; ) { + h = BD(mlb(i), 11); + for (e = new b1b(h.b); llb(e.a) || llb(e.b); ) { + d = BD(llb(e.a) ? mlb(e.a) : mlb(e.b), 17); + c = d.c == h ? d.d : d.c; + f = c.i; + if (b == f) { + continue; + } + j = BD(vNb(d, (Nyc(), cyc)), 19).a; + j < 0 && (j = 0); + g = f.p; + if (a.b[g] == 0) { + if (d.d == c) { + a.a[g] -= j + 1; + a.a[g] <= 0 && a.c[g] > 0 && Dsb(a.f, f); + } else { + a.c[g] -= j + 1; + a.c[g] <= 0 && a.a[g] > 0 && Dsb(a.e, f); + } + } + } + } + } + function _Kb(a) { + var b, c, d, e, f, g, h, i, j; + h = new Hxb(BD(Qb(new nLb()), 62)); + j = Qje; + for (c = new olb(a.d); c.a < c.c.c.length; ) { + b = BD(mlb(c), 222); + j = b.c.c; + while (h.a.c != 0) { + i = BD(zjb(Bwb(h.a)), 222); + if (i.c.c + i.c.b < j) { + Jwb(h.a, i) != null; + } else { + break; + } + } + for ( + g = ((e = new Ywb(new cxb(new Gjb(h.a).a).b)), new Njb(e)); + sib(g.a.a); + + ) { + f = ((d = Wwb(g.a)), BD(d.cd(), 222)); + Dsb(f.b, b); + Dsb(b.b, f); + } + Iwb(h.a, b, (Bcb(), zcb)) == null; + } + } + function QEc(a, b, c) { + var d, e, f, g, h, i, j, k, l; + f = new Skb(b.c.length); + for (j = new olb(b); j.a < j.c.c.length; ) { + g = BD(mlb(j), 10); + Ekb(f, a.b[g.c.p][g.p]); + } + LEc(a, f, c); + l = null; + while ((l = MEc(f))) { + NEc(a, BD(l.a, 233), BD(l.b, 233), f); + } + b.c = KC(SI, Uhe, 1, 0, 5, 1); + for (e = new olb(f); e.a < e.c.c.length; ) { + d = BD(mlb(e), 233); + for (h = d.d, i = 0, k = h.length; i < k; ++i) { + g = h[i]; + b.c[b.c.length] = g; + a.a[g.c.p][g.p].a = REc(d.g, d.d[0]).a; + } + } + } + function JRc(a, b) { + var c, d, e, f; + if (0 < (JD(a, 14) ? BD(a, 14).gc() : sr(a.Kc()))) { + e = b; + if (1 < e) { + --e; + f = new KRc(); + for (d = a.Kc(); d.Ob(); ) { + c = BD(d.Pb(), 86); + f = pl(OC(GC(KI, 1), Uhe, 20, 0, [f, new ZRc(c)])); + } + return JRc(f, e); + } + if (e < 0) { + f = new NRc(); + for (d = a.Kc(); d.Ob(); ) { + c = BD(d.Pb(), 86); + f = pl(OC(GC(KI, 1), Uhe, 20, 0, [f, new ZRc(c)])); + } + if (0 < (JD(f, 14) ? BD(f, 14).gc() : sr(f.Kc()))) { + return JRc(f, e); + } + } + } + return BD(pr(a.Kc()), 86); + } + function Idd() { + Idd = ccb; + Bdd = new Jdd("DEFAULT_MINIMUM_SIZE", 0); + Ddd = new Jdd("MINIMUM_SIZE_ACCOUNTS_FOR_PADDING", 1); + Add = new Jdd("COMPUTE_PADDING", 2); + Edd = new Jdd("OUTSIDE_NODE_LABELS_OVERHANG", 3); + Fdd = new Jdd("PORTS_OVERHANG", 4); + Hdd = new Jdd("UNIFORM_PORT_SPACING", 5); + Gdd = new Jdd("SPACE_EFFICIENT_PORT_LABELS", 6); + Cdd = new Jdd("FORCE_TABULAR_NODE_LABELS", 7); + zdd = new Jdd("ASYMMETRICAL", 8); + } + function s6d(a, b) { + var c, d, e, f, g, h, i, j; + if (!b) { + return null; + } else { + c = ((f = b.Tg()), !f ? null : bKd(f).Nh().Jh(f)); + if (c) { + Xrb(a, b, c); + e = b.Tg(); + for (i = 0, j = (e.i == null && TKd(e), e.i).length; i < j; ++i) { + h = + ((d = (e.i == null && TKd(e), e.i)), + i >= 0 && i < d.length ? d[i] : null); + if (h.Ij() && !h.Jj()) { + if (JD(h, 322)) { + u6d(a, BD(h, 34), b, c); + } else { + g = BD(h, 18); + (g.Bb & ote) != 0 && w6d(a, g, b, c); + } + } + } + b.kh() && BD(c, 49).vh(BD(b, 49).qh()); + } + return c; + } + } + function tGb(a, b, c) { + var d, e, f; + if (!b.f) { + throw vbb(new Wdb("Given leave edge is no tree edge.")); + } + if (c.f) { + throw vbb(new Wdb("Given enter edge is a tree edge already.")); + } + b.f = false; + Sqb(a.p, b); + c.f = true; + Qqb(a.p, c); + d = c.e.e - c.d.e - c.a; + xGb(a, c.e, b) || (d = -d); + for (f = new olb(a.e.a); f.a < f.c.c.length; ) { + e = BD(mlb(f), 121); + xGb(a, e, b) || (e.e += d); + } + a.j = 1; + Blb(a.c); + DGb(a, BD(mlb(new olb(a.e.a)), 121)); + rGb(a); + } + function x6b(a, b) { + var c, d, e, f, g, h; + h = BD(vNb(b, (Nyc(), Vxc)), 98); + if (!(h == (dcd(), _bd) || h == $bd)) { + return; + } + e = new f7c(b.f.a + b.d.b + b.d.c, b.f.b + b.d.d + b.d.a).b; + for (g = new olb(a.a); g.a < g.c.c.length; ) { + f = BD(mlb(g), 10); + if (f.k != (j0b(), e0b)) { + continue; + } + c = BD(vNb(f, (wtc(), Hsc)), 61); + if (c != (Ucd(), zcd) && c != Tcd) { + continue; + } + d = Edb(ED(vNb(f, htc))); + h == _bd && (d *= e); + f.n.b = d - BD(vNb(f, Txc), 8).b; + M_b(f, false, true); + } + } + function YDc(a, b, c, d) { + var e, f, g, h, i, j, k, l, m, n; + bEc(a, b, c); + f = b[c]; + n = d ? (Ucd(), Tcd) : (Ucd(), zcd); + if (ZDc(b.length, c, d)) { + e = b[d ? c - 1 : c + 1]; + UDc(a, e, d ? (KAc(), IAc) : (KAc(), HAc)); + for (i = f, k = 0, m = i.length; k < m; ++k) { + g = i[k]; + XDc(a, g, n); + } + UDc(a, f, d ? (KAc(), HAc) : (KAc(), IAc)); + for (h = e, j = 0, l = h.length; j < l; ++j) { + g = h[j]; + !!g.e || XDc(a, g, Wcd(n)); + } + } else { + for (h = f, j = 0, l = h.length; j < l; ++j) { + g = h[j]; + XDc(a, g, n); + } + } + return false; + } + function nFc(a, b, c, d) { + var e, f, g, h, i, j, k; + i = V_b(b, c); + (c == (Ucd(), Rcd) || c == Tcd) && + (i = JD(i, 152) + ? km(BD(i, 152)) + : JD(i, 131) + ? BD(i, 131).a + : JD(i, 54) + ? new ov(i) + : new dv(i)); + g = false; + do { + e = false; + for (f = 0; f < i.gc() - 1; f++) { + j = BD(i.Xb(f), 11); + h = BD(i.Xb(f + 1), 11); + if (oFc(a, j, h, d)) { + g = true; + cIc(a.a, BD(i.Xb(f), 11), BD(i.Xb(f + 1), 11)); + k = BD(i.Xb(f + 1), 11); + i._c(f + 1, BD(i.Xb(f), 11)); + i._c(f, k); + e = true; + } + } + } while (e); + return g; + } + function W2d(a, b, c) { + var d, e, f, g, h, i, j, k, l, m, n, o; + if (oid(a.e)) { + if (b != c) { + e = BD(a.g, 119); + n = e[c]; + g = n.ak(); + if (T6d(a.e, g)) { + o = S6d(a.e.Tg(), g); + i = -1; + h = -1; + d = 0; + for (j = 0, l = b > c ? b : c; j <= l; ++j) { + if (j == c) { + h = d++; + } else { + f = e[j]; + k = o.rl(f.ak()); + j == b && (i = j == l && !k ? d - 1 : d); + k && ++d; + } + } + m = BD(Wxd(a, b, c), 72); + h != i && GLd(a, new ESd(a.e, 7, g, meb(h), n.dd(), i)); + return m; + } + } + } else { + return BD(sud(a, b, c), 72); + } + return BD(Wxd(a, b, c), 72); + } + function Qcc(a, b) { + var c, d, e, f, g, h, i; + Odd(b, "Port order processing", 1); + i = BD(vNb(a, (Nyc(), _xc)), 421); + for (d = new olb(a.b); d.a < d.c.c.length; ) { + c = BD(mlb(d), 29); + for (f = new olb(c.a); f.a < f.c.c.length; ) { + e = BD(mlb(f), 10); + g = BD(vNb(e, Vxc), 98); + h = e.j; + if (g == (dcd(), Zbd) || g == _bd || g == $bd) { + mmb(); + Okb(h, Icc); + } else if (g != bcd && g != ccd) { + mmb(); + Okb(h, Lcc); + Scc(h); + i == (BAc(), AAc) && Okb(h, Kcc); + } + e.i = true; + N_b(e); + } + } + Qdd(b); + } + function vDc(a) { + var b, c, d, e, f, g, h, i; + i = new Lqb(); + b = new KFb(); + for (g = a.Kc(); g.Ob(); ) { + e = BD(g.Pb(), 10); + h = nGb(oGb(new pGb(), e), b); + jrb(i.f, e, h); + } + for (f = a.Kc(); f.Ob(); ) { + e = BD(f.Pb(), 10); + for (d = new Sr(ur(U_b(e).a.Kc(), new Sq())); Qr(d); ) { + c = BD(Rr(d), 17); + if (OZb(c)) { + continue; + } + AFb( + DFb( + CFb( + BFb( + EFb(new FFb(), Math.max(1, BD(vNb(c, (Nyc(), dyc)), 19).a)), + 1 + ), + BD(Ohb(i, c.c.i), 121) + ), + BD(Ohb(i, c.d.i), 121) + ) + ); + } + } + return b; + } + function tNc() { + tNc = ccb; + oNc = e3c(new j3c(), (qUb(), oUb), (S8b(), k8b)); + qNc = e3c(new j3c(), nUb, o8b); + rNc = c3c(e3c(new j3c(), nUb, C8b), pUb, B8b); + nNc = c3c(e3c(e3c(new j3c(), nUb, e8b), oUb, f8b), pUb, g8b); + sNc = b3c( + b3c(g3c(c3c(e3c(new j3c(), lUb, M8b), pUb, L8b), oUb), K8b), + N8b + ); + pNc = c3c(new j3c(), pUb, l8b); + lNc = c3c( + e3c(e3c(e3c(new j3c(), mUb, r8b), oUb, t8b), oUb, u8b), + pUb, + s8b + ); + mNc = c3c(e3c(e3c(new j3c(), oUb, u8b), oUb, _7b), pUb, $7b); + } + function XC(a, b, c, d, e, f) { + var g, h, i, j, k, l, m; + j = $C(b) - $C(a); + g = kD(b, j); + i = TC(0, 0, 0); + while (j >= 0) { + h = bD(a, g); + if (h) { + j < 22 + ? ((i.l |= 1 << j), undefined) + : j < 44 + ? ((i.m |= 1 << (j - 22)), undefined) + : ((i.h |= 1 << (j - 44)), undefined); + if (a.l == 0 && a.m == 0 && a.h == 0) { + break; + } + } + k = g.m; + l = g.h; + m = g.l; + g.h = l >>> 1; + g.m = (k >>> 1) | ((l & 1) << 21); + g.l = (m >>> 1) | ((k & 1) << 21); + --j; + } + c && ZC(i); + if (f) { + if (d) { + QC = hD(a); + e && (QC = nD(QC, (wD(), uD))); + } else { + QC = TC(a.l, a.m, a.h); + } + } + return i; + } + function TDc(a, b) { + var c, d, e, f, g, h, i, j, k, l; + j = a.e[b.c.p][b.p] + 1; + i = b.c.a.c.length + 1; + for (h = new olb(a.a); h.a < h.c.c.length; ) { + g = BD(mlb(h), 11); + l = 0; + f = 0; + for ( + e = ul(pl(OC(GC(KI, 1), Uhe, 20, 0, [new J0b(g), new R0b(g)]))); + Qr(e); + + ) { + d = BD(Rr(e), 11); + if (d.i.c == b.c) { + l += aEc(a, d.i) + 1; + ++f; + } + } + c = l / f; + k = g.j; + k == (Ucd(), zcd) + ? c < j + ? (a.f[g.p] = a.c - c) + : (a.f[g.p] = a.b + (i - c)) + : k == Tcd && + (c < j ? (a.f[g.p] = a.b + c) : (a.f[g.p] = a.c - (i - c))); + } + } + function Icb(a, b, c) { + var d, e, f, g, h; + if (a == null) { + throw vbb(new Oeb(Xhe)); + } + f = a.length; + g = + f > 0 && + (BCb(0, a.length), + a.charCodeAt(0) == 45 || (BCb(0, a.length), a.charCodeAt(0) == 43)) + ? 1 + : 0; + for (d = g; d < f; d++) { + if (Zcb((BCb(d, a.length), a.charCodeAt(d))) == -1) { + throw vbb(new Oeb(Oje + a + '"')); + } + } + h = parseInt(a, 10); + e = h < b; + if (isNaN(h)) { + throw vbb(new Oeb(Oje + a + '"')); + } else if (e || h > c) { + throw vbb(new Oeb(Oje + a + '"')); + } + return h; + } + function dnc(a) { + var b, c, d, e, f, g, h; + g = new Psb(); + for (f = new olb(a.a); f.a < f.c.c.length; ) { + e = BD(mlb(f), 112); + pOc(e, e.f.c.length); + qOc(e, e.k.c.length); + if (e.i == 0) { + e.o = 0; + Gsb(g, e, g.c.b, g.c); + } + } + while (g.b != 0) { + e = BD(g.b == 0 ? null : (sCb(g.b != 0), Nsb(g, g.a.a)), 112); + d = e.o + 1; + for (c = new olb(e.f); c.a < c.c.c.length; ) { + b = BD(mlb(c), 129); + h = b.a; + rOc(h, Math.max(h.o, d)); + qOc(h, h.i - 1); + h.i == 0 && (Gsb(g, h, g.c.b, g.c), true); + } + } + } + function v2c(a) { + var b, c, d, e, f, g, h, i; + for (g = new olb(a); g.a < g.c.c.length; ) { + f = BD(mlb(g), 79); + d = atd(BD(qud((!f.b && (f.b = new y5d(z2, f, 4, 7)), f.b), 0), 82)); + h = d.i; + i = d.j; + e = BD(qud((!f.a && (f.a = new cUd(A2, f, 6, 6)), f.a), 0), 202); + nmd(e, e.j + h, e.k + i); + gmd(e, e.b + h, e.c + i); + for ( + c = new Fyd((!e.a && (e.a = new xMd(y2, e, 5)), e.a)); + c.e != c.i.gc(); + + ) { + b = BD(Dyd(c), 469); + ukd(b, b.a + h, b.b + i); + } + p7c(BD(hkd(f, (Y9c(), Q8c)), 74), h, i); + } + } + function fee(a) { + var b; + switch (a) { + case 100: + return kee(nxe, true); + case 68: + return kee(nxe, false); + case 119: + return kee(oxe, true); + case 87: + return kee(oxe, false); + case 115: + return kee(pxe, true); + case 83: + return kee(pxe, false); + case 99: + return kee(qxe, true); + case 67: + return kee(qxe, false); + case 105: + return kee(rxe, true); + case 73: + return kee(rxe, false); + default: + throw vbb(new hz(((b = a), mxe + b.toString(16)))); + } + } + function $Xb(a) { + var b, c, d, e, f; + e = BD(Ikb(a.a, 0), 10); + b = new b0b(a); + Ekb(a.a, b); + b.o.a = Math.max(1, e.o.a); + b.o.b = Math.max(1, e.o.b); + b.n.a = e.n.a; + b.n.b = e.n.b; + switch (BD(vNb(e, (wtc(), Hsc)), 61).g) { + case 4: + b.n.a += 2; + break; + case 1: + b.n.b += 2; + break; + case 2: + b.n.a -= 2; + break; + case 3: + b.n.b -= 2; + } + d = new H0b(); + F0b(d, b); + c = new UZb(); + f = BD(Ikb(e.j, 0), 11); + QZb(c, f); + RZb(c, d); + P6c(X6c(d.n), f.n); + P6c(X6c(d.a), f.a); + return b; + } + function Fac(a, b, c, d, e) { + if ( + c && + (!d || ((a.c - a.b) & (a.a.length - 1)) > 1) && + b == 1 && + BD(a.a[a.b], 10).k == (j0b(), f0b) + ) { + zac(BD(a.a[a.b], 10), (rbd(), nbd)); + } else if ( + d && + (!c || ((a.c - a.b) & (a.a.length - 1)) > 1) && + b == 1 && + BD(a.a[(a.c - 1) & (a.a.length - 1)], 10).k == (j0b(), f0b) + ) { + zac(BD(a.a[(a.c - 1) & (a.a.length - 1)], 10), (rbd(), obd)); + } else if (((a.c - a.b) & (a.a.length - 1)) == 2) { + zac(BD(bkb(a), 10), (rbd(), nbd)); + zac(BD(bkb(a), 10), obd); + } else { + wac(a, e); + } + Yjb(a); + } + function pRc(a, b, c) { + var d, e, f, g, h; + f = 0; + for ( + e = new Fyd((!a.a && (a.a = new cUd(E2, a, 10, 11)), a.a)); + e.e != e.i.gc(); + + ) { + d = BD(Dyd(e), 33); + g = ""; + (!d.n && (d.n = new cUd(D2, d, 1, 7)), d.n).i == 0 || + (g = BD(qud((!d.n && (d.n = new cUd(D2, d, 1, 7)), d.n), 0), 137).a); + h = new XRc(f++, b, g); + tNb(h, d); + yNb(h, (mTc(), dTc), d); + h.e.b = d.j + d.f / 2; + h.f.a = Math.max(d.g, 1); + h.e.a = d.i + d.g / 2; + h.f.b = Math.max(d.f, 1); + Dsb(b.b, h); + jrb(c.f, d, h); + } + } + function B2b(a) { + var b, c, d, e, f; + d = BD(vNb(a, (wtc(), $sc)), 33); + f = BD(hkd(d, (Nyc(), Fxc)), 174).Hc((tdd(), sdd)); + if (!a.e) { + e = BD(vNb(a, Ksc), 21); + b = new f7c(a.f.a + a.d.b + a.d.c, a.f.b + a.d.d + a.d.a); + if (e.Hc((Orc(), Hrc))) { + jkd(d, Vxc, (dcd(), $bd)); + Afd(d, b.a, b.b, false, true); + } else { + Ccb(DD(hkd(d, Gxc))) || Afd(d, b.a, b.b, true, true); + } + } + f + ? jkd(d, Fxc, pqb(sdd)) + : jkd( + d, + Fxc, + ((c = BD(gdb(I1), 9)), new xqb(c, BD(_Bb(c, c.length), 9), 0)) + ); + } + function tA(a, b, c) { + var d, e, f, g; + if (b[0] >= a.length) { + c.o = 0; + return true; + } + switch (bfb(a, b[0])) { + case 43: + e = 1; + break; + case 45: + e = -1; + break; + default: + c.o = 0; + return true; + } + ++b[0]; + f = b[0]; + g = rA(a, b); + if (g == 0 && b[0] == f) { + return false; + } + if (b[0] < a.length && bfb(a, b[0]) == 58) { + d = g * 60; + ++b[0]; + f = b[0]; + g = rA(a, b); + if (g == 0 && b[0] == f) { + return false; + } + d += g; + } else { + d = g; + d < 24 && b[0] - f <= 2 + ? (d *= 60) + : (d = (d % 100) + ((d / 100) | 0) * 60); + } + d *= e; + c.o = -d; + return true; + } + function Hjc(a) { + var b, c, d, e, f, g, h, i, j; + g = new Rkb(); + for (d = new Sr(ur(U_b(a.b).a.Kc(), new Sq())); Qr(d); ) { + c = BD(Rr(d), 17); + OZb(c) && Ekb(g, new Gjc(c, Jjc(a, c.c), Jjc(a, c.d))); + } + for (j = ((f = new $ib(a.e).a.vc().Kc()), new djb(f)); j.a.Ob(); ) { + h = ((b = BD(j.a.Pb(), 42)), BD(b.dd(), 113)); + h.d.p = 0; + } + for (i = ((e = new $ib(a.e).a.vc().Kc()), new djb(e)); i.a.Ob(); ) { + h = ((b = BD(i.a.Pb(), 42)), BD(b.dd(), 113)); + h.d.p == 0 && Ekb(a.d, Ijc(a, h)); + } + } + function W1b(a) { + var b, c, d, e, f, g, h; + f = mpd(a); + for ( + e = new Fyd((!a.e && (a.e = new y5d(B2, a, 7, 4)), a.e)); + e.e != e.i.gc(); + + ) { + d = BD(Dyd(e), 79); + h = atd(BD(qud((!d.c && (d.c = new y5d(z2, d, 5, 8)), d.c), 0), 82)); + if (!ntd(h, f)) { + return true; + } + } + for ( + c = new Fyd((!a.d && (a.d = new y5d(B2, a, 8, 5)), a.d)); + c.e != c.i.gc(); + + ) { + b = BD(Dyd(c), 79); + g = atd(BD(qud((!b.b && (b.b = new y5d(z2, b, 4, 7)), b.b), 0), 82)); + if (!ntd(g, f)) { + return true; + } + } + return false; + } + function Dmc(a) { + var b, c, d, e, f, g, h, i; + i = new s7c(); + b = Jsb(a, 0); + h = null; + c = BD(Xsb(b), 8); + e = BD(Xsb(b), 8); + while (b.b != b.d.c) { + h = c; + c = e; + e = BD(Xsb(b), 8); + f = Emc(c7c(new f7c(h.a, h.b), c)); + g = Emc(c7c(new f7c(e.a, e.b), c)); + d = 10; + d = Math.min(d, Math.abs(f.a + f.b) / 2); + d = Math.min(d, Math.abs(g.a + g.b) / 2); + f.a = Eeb(f.a) * d; + f.b = Eeb(f.b) * d; + g.a = Eeb(g.a) * d; + g.b = Eeb(g.b) * d; + Dsb(i, P6c(f, c)); + Dsb(i, P6c(g, c)); + } + return i; + } + function _hd(a, b, c, d) { + var e, f, g, h, i; + g = a.eh(); + i = a.Zg(); + e = null; + if (i) { + if (!!b && (Nid(a, b, c).Bb & Tje) == 0) { + d = Txd(i.Vk(), a, d); + a.uh(null); + e = b.fh(); + } else { + i = null; + } + } else { + !!g && (i = g.fh()); + !!b && (e = b.fh()); + } + i != e && !!i && i.Zk(a); + h = a.Vg(); + a.Rg(b, c); + i != e && !!e && e.Yk(a); + if (a.Lg() && a.Mg()) { + if (!!g && h >= 0 && h != c) { + f = new nSd(a, 1, h, g, null); + !d ? (d = f) : d.Ei(f); + } + if (c >= 0) { + f = new nSd(a, 1, c, h == c ? g : null, b); + !d ? (d = f) : d.Ei(f); + } + } + return d; + } + function LEd(a) { + var b, c, d; + if (a.b == null) { + d = new Hfb(); + if (a.i != null) { + Efb(d, a.i); + d.a += ":"; + } + if ((a.f & 256) != 0) { + if ((a.f & 256) != 0 && a.a != null) { + YEd(a.i) || ((d.a += "//"), d); + Efb(d, a.a); + } + if (a.d != null) { + d.a += "/"; + Efb(d, a.d); + } + (a.f & 16) != 0 && ((d.a += "/"), d); + for (b = 0, c = a.j.length; b < c; b++) { + b != 0 && ((d.a += "/"), d); + Efb(d, a.j[b]); + } + if (a.g != null) { + d.a += "?"; + Efb(d, a.g); + } + } else { + Efb(d, a.a); + } + if (a.e != null) { + d.a += "#"; + Efb(d, a.e); + } + a.b = d.a; + } + return a.b; + } + function E5b(a, b) { + var c, d, e, f, g, h; + for (e = new olb(b.a); e.a < e.c.c.length; ) { + d = BD(mlb(e), 10); + f = vNb(d, (wtc(), $sc)); + if (JD(f, 11)) { + g = BD(f, 11); + h = b_b(b, d, g.o.a, g.o.b); + g.n.a = h.a; + g.n.b = h.b; + G0b(g, BD(vNb(d, Hsc), 61)); + } + } + c = new f7c(b.f.a + b.d.b + b.d.c, b.f.b + b.d.d + b.d.a); + if (BD(vNb(b, (wtc(), Ksc)), 21).Hc((Orc(), Hrc))) { + yNb(a, (Nyc(), Vxc), (dcd(), $bd)); + BD(vNb(Q_b(a), Ksc), 21).Fc(Krc); + j_b(a, c, false); + } else { + j_b(a, c, true); + } + } + function YFc(a, b, c) { + var d, e, f, g, h, i; + Odd(c, "Minimize Crossings " + a.a, 1); + d = + b.b.c.length == 0 || + !WAb(JAb(new YAb(null, new Kub(b.b, 16)), new Xxb(new xGc()))).sd( + (EAb(), DAb) + ); + i = b.b.c.length == 1 && BD(Ikb(b.b, 0), 29).a.c.length == 1; + f = PD(vNb(b, (Nyc(), axc))) === PD((hbd(), ebd)); + if (d || (i && !f)) { + Qdd(c); + return; + } + e = TFc(a, b); + g = + ((h = BD(Ut(e, 0), 214)), + h.c.Rf() ? (h.c.Lf() ? new kGc(a) : new mGc(a)) : new iGc(a)); + UFc(e, g); + eGc(a); + Qdd(c); + } + function so(a, b, c, d) { + var e, f, g, h, i; + i = Tbb(Ibb(Eie, keb(Tbb(Ibb(b == null ? 0 : tb(b), Fie)), 15))); + e = Tbb(Ibb(Eie, keb(Tbb(Ibb(c == null ? 0 : tb(c), Fie)), 15))); + h = vo(a, b, i); + g = uo(a, c, e); + if (!!h && e == h.a && Hb(c, h.g)) { + return c; + } else if (!!g && !d) { + throw vbb(new Wdb("key already present: " + c)); + } + !!h && mo(a, h); + !!g && mo(a, g); + f = new $o(c, e, b, i); + po(a, f, g); + if (g) { + g.e = null; + g.c = null; + } + if (h) { + h.e = null; + h.c = null; + } + to(a); + return !h ? null : h.g; + } + function Lhb(a, b, c) { + var d, e, f, g, h; + for (f = 0; f < b; f++) { + d = 0; + for (h = f + 1; h < b; h++) { + d = wbb( + wbb(Ibb(xbb(a[f], Yje), xbb(a[h], Yje)), xbb(c[f + h], Yje)), + xbb(Tbb(d), Yje) + ); + c[f + h] = Tbb(d); + d = Pbb(d, 32); + } + c[f + b] = Tbb(d); + } + khb(c, c, b << 1); + d = 0; + for (e = 0, g = 0; e < b; ++e, g++) { + d = wbb( + wbb(Ibb(xbb(a[e], Yje), xbb(a[e], Yje)), xbb(c[g], Yje)), + xbb(Tbb(d), Yje) + ); + c[g] = Tbb(d); + d = Pbb(d, 32); + ++g; + d = wbb(d, xbb(c[g], Yje)); + c[g] = Tbb(d); + d = Pbb(d, 32); + } + return c; + } + function ZJc(a, b, c) { + var d, e, f, g, h, i, j, k; + if (Qq(b)) { + return; + } + i = Edb(ED(pBc(c.c, (Nyc(), zyc)))); + j = BD(pBc(c.c, yyc), 142); + !j && (j = new H_b()); + d = c.a; + e = null; + for (h = b.Kc(); h.Ob(); ) { + g = BD(h.Pb(), 11); + k = 0; + if (!e) { + k = j.d; + } else { + k = i; + k += e.o.b; + } + f = nGb(oGb(new pGb(), g), a.f); + Rhb(a.k, g, f); + AFb(DFb(CFb(BFb(EFb(new FFb(), 0), QD(Math.ceil(k))), d), f)); + e = g; + d = f; + } + AFb(DFb(CFb(BFb(EFb(new FFb(), 0), QD(Math.ceil(j.a + e.o.b))), d), c.d)); + } + function uZc(a, b, c, d, e, f, g, h) { + var i, j, k, l, m, n; + n = false; + m = f - c.s; + k = c.t - b.f + ((j = MZc(c, m, false)), j.a); + if (d.g + h > m) { + return false; + } + l = ((i = MZc(d, m, false)), i.a); + if (k + h + l <= b.b) { + KZc(c, f - c.s); + c.c = true; + KZc(d, f - c.s); + OZc(d, c.s, c.t + c.d + h); + d.k = true; + WZc(c.q, d); + n = true; + if (e) { + s$c(b, d); + d.j = b; + if (a.c.length > g) { + v$c((tCb(g, a.c.length), BD(a.c[g], 200)), d); + (tCb(g, a.c.length), BD(a.c[g], 200)).a.c.length == 0 && Kkb(a, g); + } + } + } + return n; + } + function kcc(a, b) { + var c, d, e, f, g, h; + Odd(b, "Partition midprocessing", 1); + e = new Hp(); + MAb(JAb(new YAb(null, new Kub(a.a, 16)), new occ()), new qcc(e)); + if (e.d == 0) { + return; + } + h = BD( + GAb( + UAb( + ((f = e.i), new YAb(null, (!f ? (e.i = new zf(e, e.c)) : f).Nc())) + ), + Byb( + new fzb(), + new dzb(), + new Ezb(), + OC(GC(xL, 1), Kie, 132, 0, [(Fyb(), Dyb)]) + ) + ), + 15 + ); + d = h.Kc(); + c = BD(d.Pb(), 19); + while (d.Ob()) { + g = BD(d.Pb(), 19); + jcc(BD(Qc(e, c), 21), BD(Qc(e, g), 21)); + c = g; + } + Qdd(b); + } + function DYb(a, b, c) { + var d, e, f, g, h, i, j, k; + if (b.p == 0) { + b.p = 1; + g = c; + if (!g) { + e = new Rkb(); + f = ((d = BD(gdb(F1), 9)), new xqb(d, BD(_Bb(d, d.length), 9), 0)); + g = new vgd(e, f); + } + BD(g.a, 15).Fc(b); + b.k == (j0b(), e0b) && BD(g.b, 21).Fc(BD(vNb(b, (wtc(), Hsc)), 61)); + for (i = new olb(b.j); i.a < i.c.c.length; ) { + h = BD(mlb(i), 11); + for ( + k = ul(pl(OC(GC(KI, 1), Uhe, 20, 0, [new J0b(h), new R0b(h)]))); + Qr(k); + + ) { + j = BD(Rr(k), 11); + DYb(a, j.i, g); + } + } + return g; + } + return null; + } + function Dmd(a, b) { + var c, d, e, f, g; + if (a.Ab) { + if (a.Ab) { + g = a.Ab.i; + if (g > 0) { + e = BD(a.Ab.g, 1934); + if (b == null) { + for (f = 0; f < g; ++f) { + c = e[f]; + if (c.d == null) { + return c; + } + } + } else { + for (f = 0; f < g; ++f) { + c = e[f]; + if (dfb(b, c.d)) { + return c; + } + } + } + } + } else { + if (b == null) { + for (d = new Fyd(a.Ab); d.e != d.i.gc(); ) { + c = BD(Dyd(d), 590); + if (c.d == null) { + return c; + } + } + } else { + for (d = new Fyd(a.Ab); d.e != d.i.gc(); ) { + c = BD(Dyd(d), 590); + if (dfb(b, c.d)) { + return c; + } + } + } + } + } + return null; + } + function gRc(a, b) { + var c, d, e, f, g, h, i, j; + j = DD(vNb(b, (JTc(), GTc))); + if (j == null || (uCb(j), j)) { + dRc(a, b); + e = new Rkb(); + for (i = Jsb(b.b, 0); i.b != i.d.c; ) { + g = BD(Xsb(i), 86); + c = cRc(a, g, null); + if (c) { + tNb(c, b); + e.c[e.c.length] = c; + } + } + a.a = null; + a.b = null; + if (e.c.length > 1) { + for (d = new olb(e); d.a < d.c.c.length; ) { + c = BD(mlb(d), 135); + f = 0; + for (h = Jsb(c.b, 0); h.b != h.d.c; ) { + g = BD(Xsb(h), 86); + g.g = f++; + } + } + } + return e; + } + return Ou(OC(GC(n$, 1), fme, 135, 0, [b])); + } + function rqd(a, b, c, d, e) { + var f, g, h, i, j, k, l, m, n, p, q, r, s, t, u, v; + n = Sqd(a, etd(b), e); + jmd(n, _pd(e, Vte)); + o = null; + p = e; + q = $pd(p, Yte); + r = new urd(n); + wqd(r.a, q); + s = $pd(p, "endPoint"); + t = new yrd(n); + yqd(t.a, s); + u = Ypd(p, Ote); + v = new Brd(n); + zqd(v.a, u); + l = _pd(e, Qte); + f = new qrd(a, n); + sqd(f.a, f.b, l); + m = _pd(e, Pte); + g = new rrd(a, n); + tqd(g.a, g.b, m); + j = Ypd(e, Ste); + h = new srd(c, n); + uqd(h.b, h.a, j); + k = Ypd(e, Rte); + i = new trd(d, n); + vqd(i.b, i.a, k); + } + function i_b(a, b, c) { + var d, e, f, g, h; + h = null; + switch (b.g) { + case 1: + for (e = new olb(a.j); e.a < e.c.c.length; ) { + d = BD(mlb(e), 11); + if (Ccb(DD(vNb(d, (wtc(), Msc))))) { + return d; + } + } + h = new H0b(); + yNb(h, (wtc(), Msc), (Bcb(), true)); + break; + case 2: + for (g = new olb(a.j); g.a < g.c.c.length; ) { + f = BD(mlb(g), 11); + if (Ccb(DD(vNb(f, (wtc(), etc))))) { + return f; + } + } + h = new H0b(); + yNb(h, (wtc(), etc), (Bcb(), true)); + } + if (h) { + F0b(h, a); + G0b(h, c); + X$b(h.n, a.o, c); + } + return h; + } + function O3b(a, b) { + var c, d, e, f, g, h; + h = -1; + g = new Psb(); + for (d = new b1b(a.b); llb(d.a) || llb(d.b); ) { + c = BD(llb(d.a) ? mlb(d.a) : mlb(d.b), 17); + h = Math.max(h, Edb(ED(vNb(c, (Nyc(), Zwc))))); + c.c == a + ? MAb(JAb(new YAb(null, new Kub(c.b, 16)), new U3b()), new W3b(g)) + : MAb(JAb(new YAb(null, new Kub(c.b, 16)), new Y3b()), new $3b(g)); + for (f = Jsb(g, 0); f.b != f.d.c; ) { + e = BD(Xsb(f), 70); + wNb(e, (wtc(), Dsc)) || yNb(e, Dsc, c); + } + Gkb(b, g); + Osb(g); + } + return h; + } + function _bc(a, b, c, d, e) { + var f, g, h, i; + f = new b0b(a); + __b(f, (j0b(), i0b)); + yNb(f, (Nyc(), Vxc), (dcd(), $bd)); + yNb(f, (wtc(), $sc), b.c.i); + g = new H0b(); + yNb(g, $sc, b.c); + G0b(g, e); + F0b(g, f); + yNb(b.c, gtc, f); + h = new b0b(a); + __b(h, i0b); + yNb(h, Vxc, $bd); + yNb(h, $sc, b.d.i); + i = new H0b(); + yNb(i, $sc, b.d); + G0b(i, e); + F0b(i, h); + yNb(b.d, gtc, h); + QZb(b, g); + RZb(b, i); + wCb(0, c.c.length); + aCb(c.c, 0, f); + d.c[d.c.length] = h; + yNb(f, ysc, meb(1)); + yNb(h, ysc, meb(1)); + } + function BPc(a, b, c, d, e) { + var f, g, h, i, j; + h = e ? d.b : d.a; + if (Rqb(a.a, d)) { + return; + } + j = h > c.s && h < c.c; + i = false; + if (c.e.b != 0 && c.j.b != 0) { + i = + i | + (Math.abs(h - Edb(ED(Hsb(c.e)))) < qme && + Math.abs(h - Edb(ED(Hsb(c.j)))) < qme); + i = + i | + (Math.abs(h - Edb(ED(Isb(c.e)))) < qme && + Math.abs(h - Edb(ED(Isb(c.j)))) < qme); + } + if (j || i) { + g = BD(vNb(b, (Nyc(), jxc)), 74); + if (!g) { + g = new s7c(); + yNb(b, jxc, g); + } + f = new g7c(d); + Gsb(g, f, g.c.b, g.c); + Qqb(a.a, f); + } + } + function gNb(a, b, c, d) { + var e, f, g, h, i, j, k; + if (fNb(a, b, c, d)) { + return true; + } else { + for (g = new olb(b.f); g.a < g.c.c.length; ) { + f = BD(mlb(g), 324); + h = false; + i = a.j - b.j + c; + j = i + b.o; + k = a.k - b.k + d; + e = k + b.p; + switch (f.a.g) { + case 0: + h = oNb(a, i + f.b.a, 0, i + f.c.a, k - 1); + break; + case 1: + h = oNb(a, j, k + f.b.a, a.o - 1, k + f.c.a); + break; + case 2: + h = oNb(a, i + f.b.a, e, i + f.c.a, a.p - 1); + break; + default: + h = oNb(a, 0, k + f.b.a, i - 1, k + f.c.a); + } + if (h) { + return true; + } + } + } + return false; + } + function LMc(a, b) { + var c, d, e, f, g, h, i, j, k; + for (g = new olb(b.b); g.a < g.c.c.length; ) { + f = BD(mlb(g), 29); + for (j = new olb(f.a); j.a < j.c.c.length; ) { + i = BD(mlb(j), 10); + k = new Rkb(); + h = 0; + for (d = new Sr(ur(R_b(i).a.Kc(), new Sq())); Qr(d); ) { + c = BD(Rr(d), 17); + if (OZb(c) || (!OZb(c) && c.c.i.c == c.d.i.c)) { + continue; + } + e = BD(vNb(c, (Nyc(), eyc)), 19).a; + if (e > h) { + h = e; + k.c = KC(SI, Uhe, 1, 0, 5, 1); + } + e == h && Ekb(k, new vgd(c.c.i, c)); + } + mmb(); + Okb(k, a.c); + Dkb(a.b, i.p, k); + } + } + } + function MMc(a, b) { + var c, d, e, f, g, h, i, j, k; + for (g = new olb(b.b); g.a < g.c.c.length; ) { + f = BD(mlb(g), 29); + for (j = new olb(f.a); j.a < j.c.c.length; ) { + i = BD(mlb(j), 10); + k = new Rkb(); + h = 0; + for (d = new Sr(ur(U_b(i).a.Kc(), new Sq())); Qr(d); ) { + c = BD(Rr(d), 17); + if (OZb(c) || (!OZb(c) && c.c.i.c == c.d.i.c)) { + continue; + } + e = BD(vNb(c, (Nyc(), eyc)), 19).a; + if (e > h) { + h = e; + k.c = KC(SI, Uhe, 1, 0, 5, 1); + } + e == h && Ekb(k, new vgd(c.d.i, c)); + } + mmb(); + Okb(k, a.c); + Dkb(a.f, i.p, k); + } + } + } + function Y7c(a) { + r4c( + a, + new E3c( + P3c( + M3c( + O3c(N3c(new R3c(), qse), "ELK Box"), + "Algorithm for packing of unconnected boxes, i.e. graphs without edges." + ), + new _7c() + ) + ) + ); + p4c(a, qse, ame, U7c); + p4c(a, qse, wme, 15); + p4c(a, qse, vme, meb(0)); + p4c(a, qse, Jre, Ksd(O7c)); + p4c(a, qse, Fme, Ksd(Q7c)); + p4c(a, qse, Eme, Ksd(S7c)); + p4c(a, qse, _le, pse); + p4c(a, qse, Ame, Ksd(P7c)); + p4c(a, qse, Tme, Ksd(R7c)); + p4c(a, qse, rse, Ksd(M7c)); + p4c(a, qse, lqe, Ksd(N7c)); + } + function W$b(a, b) { + var c, d, e, f, g, h, i, j, k; + e = a.i; + g = e.o.a; + f = e.o.b; + if (g <= 0 && f <= 0) { + return Ucd(), Scd; + } + j = a.n.a; + k = a.n.b; + h = a.o.a; + c = a.o.b; + switch (b.g) { + case 2: + case 1: + if (j < 0) { + return Ucd(), Tcd; + } else if (j + h > g) { + return Ucd(), zcd; + } + break; + case 4: + case 3: + if (k < 0) { + return Ucd(), Acd; + } else if (k + c > f) { + return Ucd(), Rcd; + } + } + i = (j + h / 2) / g; + d = (k + c / 2) / f; + return i + d <= 1 && i - d <= 0 + ? (Ucd(), Tcd) + : i + d >= 1 && i - d >= 0 + ? (Ucd(), zcd) + : d < 0.5 + ? (Ucd(), Acd) + : (Ucd(), Rcd); + } + function pJc(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o, p; + c = false; + k = Edb(ED(vNb(b, (Nyc(), vyc)))); + o = Qie * k; + for (e = new olb(b.b); e.a < e.c.c.length; ) { + d = BD(mlb(e), 29); + j = new olb(d.a); + f = BD(mlb(j), 10); + l = xJc(a.a[f.p]); + while (j.a < j.c.c.length) { + h = BD(mlb(j), 10); + m = xJc(a.a[h.p]); + if (l != m) { + n = jBc(a.b, f, h); + g = f.n.b + f.o.b + f.d.a + l.a + n; + i = h.n.b - h.d.d + m.a; + if (g > i + o) { + p = l.g + m.g; + m.a = (m.g * m.a + l.g * l.a) / p; + m.g = p; + l.f = m; + c = true; + } + } + f = h; + l = m; + } + } + return c; + } + function VGb(a, b, c, d, e, f, g) { + var h, i, j, k, l, m; + m = new I6c(); + for (j = b.Kc(); j.Ob(); ) { + h = BD(j.Pb(), 839); + for (l = new olb(h.wf()); l.a < l.c.c.length; ) { + k = BD(mlb(l), 181); + if (PD(k.We((Y9c(), C8c))) === PD((qad(), pad))) { + SGb(m, k, false, d, e, f, g); + H6c(a, m); + } + } + } + for (i = c.Kc(); i.Ob(); ) { + h = BD(i.Pb(), 839); + for (l = new olb(h.wf()); l.a < l.c.c.length; ) { + k = BD(mlb(l), 181); + if (PD(k.We((Y9c(), C8c))) === PD((qad(), oad))) { + SGb(m, k, true, d, e, f, g); + H6c(a, m); + } + } + } + } + function oRc(a, b, c) { + var d, e, f, g, h, i, j; + for ( + g = new Fyd((!a.a && (a.a = new cUd(E2, a, 10, 11)), a.a)); + g.e != g.i.gc(); + + ) { + f = BD(Dyd(g), 33); + for (e = new Sr(ur(_sd(f).a.Kc(), new Sq())); Qr(e); ) { + d = BD(Rr(e), 79); + if (!Pld(d) && !Pld(d) && !Qld(d)) { + i = BD(Wd(irb(c.f, f)), 86); + j = BD( + Ohb( + c, + atd(BD(qud((!d.c && (d.c = new y5d(z2, d, 5, 8)), d.c), 0), 82)) + ), + 86 + ); + if (!!i && !!j) { + h = new QRc(i, j); + yNb(h, (mTc(), dTc), d); + tNb(h, d); + Dsb(i.d, h); + Dsb(j.b, h); + Dsb(b.a, h); + } + } + } + } + } + function QKb(a, b) { + var c, d, e, f, g, h, i, j; + for (i = BD(BD(Qc(a.r, b), 21), 84).Kc(); i.Ob(); ) { + h = BD(i.Pb(), 111); + e = h.c ? YHb(h.c) : 0; + if (e > 0) { + if (h.a) { + j = h.b.rf().b; + if (e > j) { + if (a.v || h.c.d.c.length == 1) { + g = (e - j) / 2; + h.d.d = g; + h.d.a = g; + } else { + c = BD(Ikb(h.c.d, 0), 181).rf().b; + d = (c - j) / 2; + h.d.d = Math.max(0, d); + h.d.a = e - d - j; + } + } + } else { + h.d.a = a.t + e; + } + } else if (tcd(a.u)) { + f = sfd(h.b); + f.d < 0 && (h.d.d = -f.d); + f.d + f.a > h.b.rf().b && (h.d.a = f.d + f.a - h.b.rf().b); + } + } + } + function FC(a, b) { + var c; + switch (HC(a)) { + case 6: + return ND(b); + case 7: + return LD(b); + case 8: + return KD(b); + case 3: + return Array.isArray(b) && ((c = HC(b)), !(c >= 14 && c <= 16)); + case 11: + return b != null && typeof b === Nhe; + case 12: + return b != null && (typeof b === Jhe || typeof b == Nhe); + case 0: + return AD(b, a.__elementTypeId$); + case 2: + return OD(b) && !(b.im === gcb); + case 1: + return (OD(b) && !(b.im === gcb)) || AD(b, a.__elementTypeId$); + default: + return true; + } + } + function xOb(a, b) { + var c, d, e, f; + d = Math.min(Math.abs(a.c - (b.c + b.b)), Math.abs(a.c + a.b - b.c)); + f = Math.min(Math.abs(a.d - (b.d + b.a)), Math.abs(a.d + a.a - b.d)); + c = Math.abs(a.c + a.b / 2 - (b.c + b.b / 2)); + if (c > a.b / 2 + b.b / 2) { + return 1; + } + e = Math.abs(a.d + a.a / 2 - (b.d + b.a / 2)); + if (e > a.a / 2 + b.a / 2) { + return 1; + } + if (c == 0 && e == 0) { + return 0; + } + if (c == 0) { + return f / e + 1; + } + if (e == 0) { + return d / c + 1; + } + return Math.min(d / c, f / e) + 1; + } + function mgb(a, b) { + var c, d, e, f, g, h; + e = pgb(a); + h = pgb(b); + if (e == h) { + if (a.e == b.e && a.a < 54 && b.a < 54) { + return a.f < b.f ? -1 : a.f > b.f ? 1 : 0; + } + d = a.e - b.e; + c = + (a.d > 0 ? a.d : Math.floor((a.a - 1) * Xje) + 1) - + (b.d > 0 ? b.d : Math.floor((b.a - 1) * Xje) + 1); + if (c > d + 1) { + return e; + } else if (c < d - 1) { + return -e; + } else { + f = (!a.c && (a.c = fhb(a.f)), a.c); + g = (!b.c && (b.c = fhb(b.f)), b.c); + d < 0 ? (f = Ogb(f, Khb(-d))) : d > 0 && (g = Ogb(g, Khb(d))); + return Igb(f, g); + } + } else return e < h ? -1 : 1; + } + function mTb(a, b) { + var c, d, e, f, g, h, i; + f = 0; + h = 0; + i = 0; + for (e = new olb(a.f.e); e.a < e.c.c.length; ) { + d = BD(mlb(e), 144); + if (b == d) { + continue; + } + g = a.i[b.b][d.b]; + f += g; + c = S6c(b.d, d.d); + c > 0 && + a.d != (yTb(), xTb) && + (h += g * (d.d.a + (a.a[b.b][d.b] * (b.d.a - d.d.a)) / c)); + c > 0 && + a.d != (yTb(), vTb) && + (i += g * (d.d.b + (a.a[b.b][d.b] * (b.d.b - d.d.b)) / c)); + } + switch (a.d.g) { + case 1: + return new f7c(h / f, b.d.b); + case 2: + return new f7c(b.d.a, i / f); + default: + return new f7c(h / f, i / f); + } + } + function Wcc(a, b) { + Occ(); + var c, d, e, f, g; + g = BD(vNb(a.i, (Nyc(), Vxc)), 98); + f = a.j.g - b.j.g; + if (f != 0 || !(g == (dcd(), Zbd) || g == _bd || g == $bd)) { + return 0; + } + if (g == (dcd(), Zbd)) { + c = BD(vNb(a, Wxc), 19); + d = BD(vNb(b, Wxc), 19); + if (!!c && !!d) { + e = c.a - d.a; + if (e != 0) { + return e; + } + } + } + switch (a.j.g) { + case 1: + return Kdb(a.n.a, b.n.a); + case 2: + return Kdb(a.n.b, b.n.b); + case 3: + return Kdb(b.n.a, a.n.a); + case 4: + return Kdb(b.n.b, a.n.b); + default: + throw vbb(new Zdb(ine)); + } + } + function tfd(a) { + var b, c, d, e, f, g; + c = (!a.a && (a.a = new xMd(y2, a, 5)), a.a).i + 2; + g = new Skb(c); + Ekb(g, new f7c(a.j, a.k)); + MAb( + new YAb(null, (!a.a && (a.a = new xMd(y2, a, 5)), new Kub(a.a, 16))), + new Qfd(g) + ); + Ekb(g, new f7c(a.b, a.c)); + b = 1; + while (b < g.c.length - 1) { + d = (tCb(b - 1, g.c.length), BD(g.c[b - 1], 8)); + e = (tCb(b, g.c.length), BD(g.c[b], 8)); + f = (tCb(b + 1, g.c.length), BD(g.c[b + 1], 8)); + (d.a == e.a && e.a == f.a) || (d.b == e.b && e.b == f.b) + ? Kkb(g, b) + : ++b; + } + return g; + } + function Xgc(a, b) { + var c, d, e, f, g, h, i; + c = vDb(yDb(wDb(xDb(new zDb(), b), new K6c(b.e)), Ggc), a.a); + b.j.c.length == 0 || nDb(BD(Ikb(b.j, 0), 57).a, c); + i = new lEb(); + Rhb(a.e, c, i); + g = new Tqb(); + h = new Tqb(); + for (f = new olb(b.k); f.a < f.c.c.length; ) { + e = BD(mlb(f), 17); + Qqb(g, e.c); + Qqb(h, e.d); + } + d = g.a.gc() - h.a.gc(); + if (d < 0) { + jEb(i, true, (ead(), aad)); + jEb(i, false, bad); + } else if (d > 0) { + jEb(i, false, (ead(), aad)); + jEb(i, true, bad); + } + Hkb(b.g, new $hc(a, c)); + Rhb(a.g, b, c); + } + function Neb() { + Neb = ccb; + var a; + Jeb = OC( + GC(WD, 1), + oje, + 25, + 15, + [ + -1, -1, 30, 19, 15, 13, 11, 11, 10, 9, 9, 8, 8, 8, 8, 7, 7, 7, 7, 7, + 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 5, + ] + ); + Keb = KC(WD, oje, 25, 37, 15, 1); + Leb = OC( + GC(WD, 1), + oje, + 25, + 15, + [ + -1, -1, 63, 40, 32, 28, 25, 23, 21, 20, 19, 19, 18, 18, 17, 17, 16, + 16, 16, 15, 15, 15, 15, 14, 14, 14, 14, 14, 14, 13, 13, 13, 13, 13, + 13, 13, 13, + ] + ); + Meb = KC(XD, Sje, 25, 37, 14, 1); + for (a = 2; a <= 36; a++) { + Keb[a] = QD(Math.pow(a, Jeb[a])); + Meb[a] = Abb(rie, Keb[a]); + } + } + function pfd(a) { + var b; + if ((!a.a && (a.a = new cUd(A2, a, 6, 6)), a.a).i != 1) { + throw vbb(new Wdb(Tse + (!a.a && (a.a = new cUd(A2, a, 6, 6)), a.a).i)); + } + b = new s7c(); + !!btd(BD(qud((!a.b && (a.b = new y5d(z2, a, 4, 7)), a.b), 0), 82)) && + ye( + b, + qfd( + a, + btd(BD(qud((!a.b && (a.b = new y5d(z2, a, 4, 7)), a.b), 0), 82)), + false + ) + ); + !!btd(BD(qud((!a.c && (a.c = new y5d(z2, a, 5, 8)), a.c), 0), 82)) && + ye( + b, + qfd( + a, + btd(BD(qud((!a.c && (a.c = new y5d(z2, a, 5, 8)), a.c), 0), 82)), + true + ) + ); + return b; + } + function _Mc(a, b) { + var c, d, e, f, g; + b.d + ? (e = a.a.c == (YLc(), XLc) ? R_b(b.b) : U_b(b.b)) + : (e = a.a.c == (YLc(), WLc) ? R_b(b.b) : U_b(b.b)); + f = false; + for (d = new Sr(ur(e.a.Kc(), new Sq())); Qr(d); ) { + c = BD(Rr(d), 17); + g = Ccb(a.a.f[a.a.g[b.b.p].p]); + if (!g && !OZb(c) && c.c.i.c == c.d.i.c) { + continue; + } + if (Ccb(a.a.n[a.a.g[b.b.p].p]) || Ccb(a.a.n[a.a.g[b.b.p].p])) { + continue; + } + f = true; + if (Rqb(a.b, a.a.g[TMc(c, b.b).p])) { + b.c = true; + b.a = c; + return b; + } + } + b.c = f; + b.a = null; + return b; + } + function bed(a, b, c, d, e) { + var f, g, h, i, j, k, l; + mmb(); + Okb(a, new Red()); + h = new Bib(a, 0); + l = new Rkb(); + f = 0; + while (h.b < h.d.gc()) { + g = (sCb(h.b < h.d.gc()), BD(h.d.Xb((h.c = h.b++)), 157)); + if (l.c.length != 0 && red(g) * qed(g) > f * 2) { + k = new wed(l); + j = red(g) / qed(g); + i = fed(k, b, new p0b(), c, d, e, j); + P6c(X6c(k.e), i); + l.c = KC(SI, Uhe, 1, 0, 5, 1); + f = 0; + l.c[l.c.length] = k; + l.c[l.c.length] = g; + f = red(k) * qed(k) + red(g) * qed(g); + } else { + l.c[l.c.length] = g; + f += red(g) * qed(g); + } + } + return l; + } + function qwd(a, b, c) { + var d, e, f, g, h, i, j; + d = c.gc(); + if (d == 0) { + return false; + } else { + if (a.ej()) { + i = a.fj(); + zvd(a, b, c); + g = + d == 1 ? a.Zi(3, null, c.Kc().Pb(), b, i) : a.Zi(5, null, c, b, i); + if (a.bj()) { + h = d < 100 ? null : new Ixd(d); + f = b + d; + for (e = b; e < f; ++e) { + j = a.Oi(e); + h = a.cj(j, h); + h = h; + } + if (!h) { + a.$i(g); + } else { + h.Ei(g); + h.Fi(); + } + } else { + a.$i(g); + } + } else { + zvd(a, b, c); + if (a.bj()) { + h = d < 100 ? null : new Ixd(d); + f = b + d; + for (e = b; e < f; ++e) { + h = a.cj(a.Oi(e), h); + } + !!h && h.Fi(); + } + } + return true; + } + } + function wwd(a, b, c) { + var d, e, f, g, h; + if (a.ej()) { + e = null; + f = a.fj(); + d = a.Zi(1, (h = ((g = a.Ui(b, a.oi(b, c))), g)), c, b, f); + if (a.bj() && !(a.ni() && !!h ? pb(h, c) : PD(h) === PD(c))) { + !!h && (e = a.dj(h, e)); + e = a.cj(c, e); + if (!e) { + a.$i(d); + } else { + e.Ei(d); + e.Fi(); + } + } else { + if (!e) { + a.$i(d); + } else { + e.Ei(d); + e.Fi(); + } + } + return h; + } else { + h = ((g = a.Ui(b, a.oi(b, c))), g); + if (a.bj() && !(a.ni() && !!h ? pb(h, c) : PD(h) === PD(c))) { + e = null; + !!h && (e = a.dj(h, null)); + e = a.cj(c, e); + !!e && e.Fi(); + } + return h; + } + } + function rRb(a, b) { + var c, d, e, f, g, h, i, j, k; + a.e = b; + a.f = BD(vNb(b, (HSb(), GSb)), 230); + iRb(b); + a.d = Math.max(b.e.c.length * 16 + b.c.c.length, 256); + if (!Ccb(DD(vNb(b, (wSb(), dSb))))) { + k = a.e.e.c.length; + for (i = new olb(b.e); i.a < i.c.c.length; ) { + h = BD(mlb(i), 144); + j = h.d; + j.a = Aub(a.f) * k; + j.b = Aub(a.f) * k; + } + } + c = b.b; + for (f = new olb(b.c); f.a < f.c.c.length; ) { + e = BD(mlb(f), 282); + d = BD(vNb(e, rSb), 19).a; + if (d > 0) { + for (g = 0; g < d; g++) { + Ekb(c, new aRb(e)); + } + cRb(e); + } + } + } + function zac(a, b) { + var c, d, e, f, g, h; + if (a.k == (j0b(), f0b)) { + c = WAb(JAb(BD(vNb(a, (wtc(), ktc)), 15).Oc(), new Xxb(new Kac()))).sd( + (EAb(), DAb) + ) + ? b + : (rbd(), pbd); + yNb(a, Ssc, c); + if (c != (rbd(), obd)) { + d = BD(vNb(a, $sc), 17); + h = Edb(ED(vNb(d, (Nyc(), Zwc)))); + g = 0; + if (c == nbd) { + g = a.o.b - Math.ceil(h / 2); + } else if (c == pbd) { + a.o.b -= Edb(ED(vNb(Q_b(a), nyc))); + g = (a.o.b - Math.ceil(h)) / 2; + } + for (f = new olb(a.j); f.a < f.c.c.length; ) { + e = BD(mlb(f), 11); + e.n.b = g; + } + } + } + } + function Uge() { + Uge = ccb; + g5d(); + Tge = new Vge(); + OC(GC(w5, 2), nie, 368, 0, [OC(GC(w5, 1), Axe, 592, 0, [new Rge(Xwe)])]); + OC(GC(w5, 2), nie, 368, 0, [OC(GC(w5, 1), Axe, 592, 0, [new Rge(Ywe)])]); + OC(GC(w5, 2), nie, 368, 0, [ + OC(GC(w5, 1), Axe, 592, 0, [new Rge(Zwe)]), + OC(GC(w5, 1), Axe, 592, 0, [new Rge(Ywe)]), + ]); + new Ygb("-1"); + OC(GC(w5, 2), nie, 368, 0, [ + OC(GC(w5, 1), Axe, 592, 0, [new Rge("\\c+")]), + ]); + new Ygb("0"); + new Ygb("0"); + new Ygb("1"); + new Ygb("0"); + new Ygb(hxe); + } + function KQd(a) { + var b, c; + if (!!a.c && a.c.kh()) { + c = BD(a.c, 49); + a.c = BD(xid(a, c), 138); + if (a.c != c) { + (a.Db & 4) != 0 && + (a.Db & 1) == 0 && + Uhd(a, new nSd(a, 9, 2, c, a.c)); + if (JD(a.Cb, 399)) { + a.Db >> 16 == -15 && + a.Cb.nh() && + Rwd(new oSd(a.Cb, 9, 13, c, a.c, HLd(QSd(BD(a.Cb, 59)), a))); + } else if (JD(a.Cb, 88)) { + if (a.Db >> 16 == -23 && a.Cb.nh()) { + b = a.c; + JD(b, 88) || (b = (jGd(), _Fd)); + JD(c, 88) || (c = (jGd(), _Fd)); + Rwd(new oSd(a.Cb, 9, 10, c, b, HLd(VKd(BD(a.Cb, 26)), a))); + } + } + } + } + return a.c; + } + function f7b(a, b) { + var c, d, e, f, g, h, i, j, k, l; + Odd(b, "Hypernodes processing", 1); + for (e = new olb(a.b); e.a < e.c.c.length; ) { + d = BD(mlb(e), 29); + for (h = new olb(d.a); h.a < h.c.c.length; ) { + g = BD(mlb(h), 10); + if (Ccb(DD(vNb(g, (Nyc(), exc)))) && g.j.c.length <= 2) { + l = 0; + k = 0; + c = 0; + f = 0; + for (j = new olb(g.j); j.a < j.c.c.length; ) { + i = BD(mlb(j), 11); + switch (i.j.g) { + case 1: + ++l; + break; + case 2: + ++k; + break; + case 3: + ++c; + break; + case 4: + ++f; + } + } + l == 0 && c == 0 && e7b(a, g, f <= k); + } + } + } + Qdd(b); + } + function i7b(a, b) { + var c, d, e, f, g, h, i, j, k; + Odd(b, "Layer constraint edge reversal", 1); + for (g = new olb(a.b); g.a < g.c.c.length; ) { + f = BD(mlb(g), 29); + k = -1; + c = new Rkb(); + j = l_b(f.a); + for (e = 0; e < j.length; e++) { + d = BD(vNb(j[e], (wtc(), Osc)), 303); + if (k == -1) { + d != (esc(), dsc) && (k = e); + } else { + if (d == (esc(), dsc)) { + $_b(j[e], null); + Z_b(j[e], k++, f); + } + } + d == (esc(), bsc) && Ekb(c, j[e]); + } + for (i = new olb(c); i.a < i.c.c.length; ) { + h = BD(mlb(i), 10); + $_b(h, null); + $_b(h, f); + } + } + Qdd(b); + } + function W6b(a, b, c) { + var d, e, f, g, h, i, j, k, l; + Odd(c, "Hyperedge merging", 1); + U6b(a, b); + i = new Bib(b.b, 0); + while (i.b < i.d.gc()) { + h = (sCb(i.b < i.d.gc()), BD(i.d.Xb((i.c = i.b++)), 29)); + k = h.a; + if (k.c.length == 0) { + continue; + } + d = null; + e = null; + f = null; + g = null; + for (j = 0; j < k.c.length; j++) { + d = (tCb(j, k.c.length), BD(k.c[j], 10)); + e = d.k; + if (e == (j0b(), g0b) && g == g0b) { + l = S6b(d, f); + if (l.a) { + V6b(d, f, l.b, l.c); + tCb(j, k.c.length); + cCb(k.c, j, 1); + --j; + d = f; + e = g; + } + } + f = d; + g = e; + } + } + Qdd(c); + } + function WFc(a, b) { + var c, d, e; + d = Cub(a.d, 1) != 0; + (!Ccb(DD(vNb(b.j, (wtc(), Jsc)))) && !Ccb(DD(vNb(b.j, mtc)))) || + PD(vNb(b.j, (Nyc(), ywc))) === PD((tAc(), rAc)) + ? b.c.Tf(b.e, d) + : (d = Ccb(DD(vNb(b.j, Jsc)))); + dGc(a, b, d, true); + Ccb(DD(vNb(b.j, mtc))) && yNb(b.j, mtc, (Bcb(), false)); + if (Ccb(DD(vNb(b.j, Jsc)))) { + yNb(b.j, Jsc, (Bcb(), false)); + yNb(b.j, mtc, true); + } + c = OFc(a, b); + do { + $Fc(a); + if (c == 0) { + return 0; + } + d = !d; + e = c; + dGc(a, b, d, false); + c = OFc(a, b); + } while (e > c); + return e; + } + function XFc(a, b) { + var c, d, e; + d = Cub(a.d, 1) != 0; + (!Ccb(DD(vNb(b.j, (wtc(), Jsc)))) && !Ccb(DD(vNb(b.j, mtc)))) || + PD(vNb(b.j, (Nyc(), ywc))) === PD((tAc(), rAc)) + ? b.c.Tf(b.e, d) + : (d = Ccb(DD(vNb(b.j, Jsc)))); + dGc(a, b, d, true); + Ccb(DD(vNb(b.j, mtc))) && yNb(b.j, mtc, (Bcb(), false)); + if (Ccb(DD(vNb(b.j, Jsc)))) { + yNb(b.j, Jsc, (Bcb(), false)); + yNb(b.j, mtc, true); + } + c = NFc(a, b); + do { + $Fc(a); + if (c == 0) { + return 0; + } + d = !d; + e = c; + dGc(a, b, d, false); + c = NFc(a, b); + } while (e > c); + return e; + } + function uNd(a, b, c) { + var d, e, f, g, h, i, j, k, l, m, n, o; + if (b == c) { + return true; + } else { + b = vNd(a, b); + c = vNd(a, c); + d = JQd(b); + if (d) { + k = JQd(c); + if (k != d) { + if (!k) { + return false; + } else { + i = d.Dj(); + o = k.Dj(); + return i == o && i != null; + } + } else { + g = (!b.d && (b.d = new xMd(j5, b, 1)), b.d); + f = g.i; + m = (!c.d && (c.d = new xMd(j5, c, 1)), c.d); + if (f == m.i) { + for (j = 0; j < f; ++j) { + e = BD(qud(g, j), 87); + l = BD(qud(m, j), 87); + if (!uNd(a, e, l)) { + return false; + } + } + } + return true; + } + } else { + h = b.e; + n = c.e; + return h == n; + } + } + } + function X2d(a, b, c, d) { + var e, f, g, h, i, j, k, l; + if (T6d(a.e, b)) { + l = S6d(a.e.Tg(), b); + f = BD(a.g, 119); + k = null; + i = -1; + h = -1; + e = 0; + for (j = 0; j < a.i; ++j) { + g = f[j]; + if (l.rl(g.ak())) { + e == c && (i = j); + if (e == d) { + h = j; + k = g.dd(); + } + ++e; + } + } + if (i == -1) { + throw vbb(new qcb(lue + c + mue + e)); + } + if (h == -1) { + throw vbb(new qcb(nue + d + mue + e)); + } + Wxd(a, i, h); + oid(a.e) && GLd(a, H2d(a, 7, b, meb(d), k, c, true)); + return k; + } else { + throw vbb(new Wdb("The feature must be many-valued to support move")); + } + } + function b_b(a, b, c, d) { + var e, f, g, h, i; + i = new g7c(b.n); + i.a += b.o.a / 2; + i.b += b.o.b / 2; + h = Edb(ED(vNb(b, (Nyc(), Uxc)))); + f = a.f; + g = a.d; + e = a.c; + switch (BD(vNb(b, (wtc(), Hsc)), 61).g) { + case 1: + i.a += g.b + e.a - c / 2; + i.b = -d - h; + b.n.b = -(g.d + h + e.b); + break; + case 2: + i.a = f.a + g.b + g.c + h; + i.b += g.d + e.b - d / 2; + b.n.a = f.a + g.c + h - e.a; + break; + case 3: + i.a += g.b + e.a - c / 2; + i.b = f.b + g.d + g.a + h; + b.n.b = f.b + g.a + h - e.b; + break; + case 4: + i.a = -c - h; + i.b += g.d + e.b - d / 2; + b.n.a = -(g.b + h + e.a); + } + return i; + } + function P1b(a) { + var b, c, d, e, f, g; + d = new XZb(); + tNb(d, a); + PD(vNb(d, (Nyc(), Lwc))) === PD((ead(), cad)) && yNb(d, Lwc, a_b(d)); + if (vNb(d, (g6c(), f6c)) == null) { + g = BD(m6d(a), 160); + yNb(d, f6c, RD(g.We(f6c))); + } + yNb(d, (wtc(), $sc), a); + yNb( + d, + Ksc, + ((b = BD(gdb(PW), 9)), new xqb(b, BD(_Bb(b, b.length), 9), 0)) + ); + e = OGb( + (!Xod(a) ? null : (Pgd(), new bhd(Xod(a))), + Pgd(), + new hhd(!Xod(a) ? null : new bhd(Xod(a)), a)), + bad + ); + f = BD(vNb(d, Kxc), 116); + c = d.d; + t_b(c, f); + t_b(c, e); + return d; + } + function ybc(a, b, c) { + var d, e; + d = b.c.i; + e = c.d.i; + if (d.k == (j0b(), g0b)) { + yNb(a, (wtc(), Vsc), BD(vNb(d, Vsc), 11)); + yNb(a, Wsc, BD(vNb(d, Wsc), 11)); + yNb(a, Usc, DD(vNb(d, Usc))); + } else if (d.k == f0b) { + yNb(a, (wtc(), Vsc), BD(vNb(d, Vsc), 11)); + yNb(a, Wsc, BD(vNb(d, Wsc), 11)); + yNb(a, Usc, (Bcb(), true)); + } else if (e.k == f0b) { + yNb(a, (wtc(), Vsc), BD(vNb(e, Vsc), 11)); + yNb(a, Wsc, BD(vNb(e, Wsc), 11)); + yNb(a, Usc, (Bcb(), true)); + } else { + yNb(a, (wtc(), Vsc), b.c); + yNb(a, Wsc, c.d); + } + } + function FGb(a) { + var b, c, d, e, f, g, h; + a.o = new jkb(); + d = new Psb(); + for (g = new olb(a.e.a); g.a < g.c.c.length; ) { + f = BD(mlb(g), 121); + LFb(f).c.length == 1 && (Gsb(d, f, d.c.b, d.c), true); + } + while (d.b != 0) { + f = BD(d.b == 0 ? null : (sCb(d.b != 0), Nsb(d, d.a.a)), 121); + if (LFb(f).c.length == 0) { + continue; + } + b = BD(Ikb(LFb(f), 0), 213); + c = f.g.a.c.length > 0; + h = xFb(b, f); + c ? OFb(h.b, b) : OFb(h.g, b); + LFb(h).c.length == 1 && (Gsb(d, h, d.c.b, d.c), true); + e = new vgd(f, b); + Wjb(a.o, e); + Lkb(a.e.a, f); + } + } + function _Nb(a, b) { + var c, d, e, f, g, h, i; + d = Math.abs(D6c(a.b).a - D6c(b.b).a); + h = Math.abs(D6c(a.b).b - D6c(b.b).b); + e = 0; + i = 0; + c = 1; + g = 1; + if (d > a.b.b / 2 + b.b.b / 2) { + e = Math.min( + Math.abs(a.b.c - (b.b.c + b.b.b)), + Math.abs(a.b.c + a.b.b - b.b.c) + ); + c = 1 - e / d; + } + if (h > a.b.a / 2 + b.b.a / 2) { + i = Math.min( + Math.abs(a.b.d - (b.b.d + b.b.a)), + Math.abs(a.b.d + a.b.a - b.b.d) + ); + g = 1 - i / h; + } + f = Math.min(c, g); + return (1 - f) * Math.sqrt(d * d + h * h); + } + function lQc(a) { + var b, c, d, e; + nQc(a, a.e, a.f, (FQc(), DQc), true, a.c, a.i); + nQc(a, a.e, a.f, DQc, false, a.c, a.i); + nQc(a, a.e, a.f, EQc, true, a.c, a.i); + nQc(a, a.e, a.f, EQc, false, a.c, a.i); + mQc(a, a.c, a.e, a.f, a.i); + d = new Bib(a.i, 0); + while (d.b < d.d.gc()) { + b = (sCb(d.b < d.d.gc()), BD(d.d.Xb((d.c = d.b++)), 128)); + e = new Bib(a.i, d.b); + while (e.b < e.d.gc()) { + c = (sCb(e.b < e.d.gc()), BD(e.d.Xb((e.c = e.b++)), 128)); + kQc(b, c); + } + } + wQc(a.i, BD(vNb(a.d, (wtc(), jtc)), 230)); + zQc(a.i); + } + function fKd(a, b) { + var c, d; + if (b != null) { + d = dKd(a); + if (d) { + if ((d.i & 1) != 0) { + if (d == sbb) { + return KD(b); + } else if (d == WD) { + return JD(b, 19); + } else if (d == VD) { + return JD(b, 155); + } else if (d == SD) { + return JD(b, 217); + } else if (d == TD) { + return JD(b, 172); + } else if (d == UD) { + return LD(b); + } else if (d == rbb) { + return JD(b, 184); + } else if (d == XD) { + return JD(b, 162); + } + } else { + return pEd(), (c = BD(Ohb(oEd, d), 55)), !c || c.wj(b); + } + } else if (JD(b, 56)) { + return a.uk(BD(b, 56)); + } + } + return false; + } + function ade() { + ade = ccb; + var a, b, c, d, e, f, g, h, i; + $ce = KC(SD, wte, 25, 255, 15, 1); + _ce = KC(TD, $ie, 25, 64, 15, 1); + for (b = 0; b < 255; b++) { + $ce[b] = -1; + } + for (c = 90; c >= 65; c--) { + $ce[c] = ((c - 65) << 24) >> 24; + } + for (d = 122; d >= 97; d--) { + $ce[d] = ((d - 97 + 26) << 24) >> 24; + } + for (e = 57; e >= 48; e--) { + $ce[e] = ((e - 48 + 52) << 24) >> 24; + } + $ce[43] = 62; + $ce[47] = 63; + for (f = 0; f <= 25; f++) _ce[f] = (65 + f) & aje; + for (g = 26, i = 0; g <= 51; ++g, i++) _ce[g] = (97 + i) & aje; + for (a = 52, h = 0; a <= 61; ++a, h++) _ce[a] = (48 + h) & aje; + _ce[62] = 43; + _ce[63] = 47; + } + function FXb(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n; + if (a.dc()) { + return new d7c(); + } + j = 0; + l = 0; + for (e = a.Kc(); e.Ob(); ) { + d = BD(e.Pb(), 37); + f = d.f; + j = Math.max(j, f.a); + l += f.a * f.b; + } + j = Math.max( + j, + Math.sqrt(l) * Edb(ED(vNb(BD(a.Kc().Pb(), 37), (Nyc(), owc)))) + ); + m = 0; + n = 0; + i = 0; + c = b; + for (h = a.Kc(); h.Ob(); ) { + g = BD(h.Pb(), 37); + k = g.f; + if (m + k.a > j) { + m = 0; + n += i + b; + i = 0; + } + uXb(g, m, n); + c = Math.max(c, m + k.a); + i = Math.max(i, k.b); + m += k.a + b; + } + return new f7c(c + b, n + i + b); + } + function mQc(a, b, c, d, e) { + var f, g, h, i, j, k, l; + for (g = new olb(b); g.a < g.c.c.length; ) { + f = BD(mlb(g), 17); + i = f.c; + if (c.a._b(i)) { + j = (FQc(), DQc); + } else if (d.a._b(i)) { + j = (FQc(), EQc); + } else { + throw vbb(new Wdb("Source port must be in one of the port sets.")); + } + k = f.d; + if (c.a._b(k)) { + l = (FQc(), DQc); + } else if (d.a._b(k)) { + l = (FQc(), EQc); + } else { + throw vbb(new Wdb("Target port must be in one of the port sets.")); + } + h = new YQc(f, j, l); + Rhb(a.b, f, h); + e.c[e.c.length] = h; + } + } + function lfd(a, b) { + var c, d, e, f, g, h, i; + if (!mpd(a)) { + throw vbb(new Zdb(Sse)); + } + d = mpd(a); + f = d.g; + e = d.f; + if (f <= 0 && e <= 0) { + return Ucd(), Scd; + } + h = a.i; + i = a.j; + switch (b.g) { + case 2: + case 1: + if (h < 0) { + return Ucd(), Tcd; + } else if (h + a.g > f) { + return Ucd(), zcd; + } + break; + case 4: + case 3: + if (i < 0) { + return Ucd(), Acd; + } else if (i + a.f > e) { + return Ucd(), Rcd; + } + } + g = (h + a.g / 2) / f; + c = (i + a.f / 2) / e; + return g + c <= 1 && g - c <= 0 + ? (Ucd(), Tcd) + : g + c >= 1 && g - c >= 0 + ? (Ucd(), zcd) + : c < 0.5 + ? (Ucd(), Acd) + : (Ucd(), Rcd); + } + function vhb(a, b, c, d, e) { + var f, g; + f = wbb(xbb(b[0], Yje), xbb(d[0], Yje)); + a[0] = Tbb(f); + f = Obb(f, 32); + if (c >= e) { + for (g = 1; g < e; g++) { + f = wbb(f, wbb(xbb(b[g], Yje), xbb(d[g], Yje))); + a[g] = Tbb(f); + f = Obb(f, 32); + } + for (; g < c; g++) { + f = wbb(f, xbb(b[g], Yje)); + a[g] = Tbb(f); + f = Obb(f, 32); + } + } else { + for (g = 1; g < c; g++) { + f = wbb(f, wbb(xbb(b[g], Yje), xbb(d[g], Yje))); + a[g] = Tbb(f); + f = Obb(f, 32); + } + for (; g < e; g++) { + f = wbb(f, xbb(d[g], Yje)); + a[g] = Tbb(f); + f = Obb(f, 32); + } + } + ybb(f, 0) != 0 && (a[g] = Tbb(f)); + } + function _fe(a) { + wfe(); + var b, c, d, e, f, g; + if (a.e != 4 && a.e != 5) + throw vbb(new Wdb("Token#complementRanges(): must be RANGE: " + a.e)); + f = a; + Yfe(f); + Vfe(f); + d = f.b.length + 2; + f.b[0] == 0 && (d -= 2); + c = f.b[f.b.length - 1]; + c == lxe && (d -= 2); + e = (++vfe, new $fe(4)); + e.b = KC(WD, oje, 25, d, 15, 1); + g = 0; + if (f.b[0] > 0) { + e.b[g++] = 0; + e.b[g++] = f.b[0] - 1; + } + for (b = 1; b < f.b.length - 2; b += 2) { + e.b[g++] = f.b[b] + 1; + e.b[g++] = f.b[b + 1] - 1; + } + if (c != lxe) { + e.b[g++] = c + 1; + e.b[g] = lxe; + } + e.a = true; + return e; + } + function Pxd(a, b, c) { + var d, e, f, g, h, i, j, k; + d = c.gc(); + if (d == 0) { + return false; + } else { + if (a.ej()) { + j = a.fj(); + iud(a, b, c); + g = + d == 1 ? a.Zi(3, null, c.Kc().Pb(), b, j) : a.Zi(5, null, c, b, j); + if (a.bj()) { + h = d < 100 ? null : new Ixd(d); + f = b + d; + for (e = b; e < f; ++e) { + k = a.g[e]; + h = a.cj(k, h); + h = a.jj(k, h); + } + if (!h) { + a.$i(g); + } else { + h.Ei(g); + h.Fi(); + } + } else { + a.$i(g); + } + } else { + iud(a, b, c); + if (a.bj()) { + h = d < 100 ? null : new Ixd(d); + f = b + d; + for (e = b; e < f; ++e) { + i = a.g[e]; + h = a.cj(i, h); + } + !!h && h.Fi(); + } + } + return true; + } + } + function YNc(a, b, c, d) { + var e, f, g, h, i; + for (g = new olb(a.k); g.a < g.c.c.length; ) { + e = BD(mlb(g), 129); + if (!d || e.c == (HOc(), FOc)) { + i = e.b; + if (i.g < 0 && e.d > 0) { + pOc(i, i.d - e.d); + e.c == (HOc(), FOc) && nOc(i, i.a - e.d); + i.d <= 0 && i.i > 0 && (Gsb(b, i, b.c.b, b.c), true); + } + } + } + for (f = new olb(a.f); f.a < f.c.c.length; ) { + e = BD(mlb(f), 129); + if (!d || e.c == (HOc(), FOc)) { + h = e.a; + if (h.g < 0 && e.d > 0) { + qOc(h, h.i - e.d); + e.c == (HOc(), FOc) && oOc(h, h.b - e.d); + h.i <= 0 && h.d > 0 && (Gsb(c, h, c.c.b, c.c), true); + } + } + } + } + function gSc(a, b, c) { + var d, e, f, g, h, i, j, k; + Odd(c, "Processor compute fanout", 1); + Uhb(a.b); + Uhb(a.a); + h = null; + f = Jsb(b.b, 0); + while (!h && f.b != f.d.c) { + j = BD(Xsb(f), 86); + Ccb(DD(vNb(j, (mTc(), jTc)))) && (h = j); + } + i = new Psb(); + Gsb(i, h, i.c.b, i.c); + fSc(a, i); + for (k = Jsb(b.b, 0); k.b != k.d.c; ) { + j = BD(Xsb(k), 86); + g = GD(vNb(j, (mTc(), $Sc))); + e = Phb(a.b, g) != null ? BD(Phb(a.b, g), 19).a : 0; + yNb(j, ZSc, meb(e)); + d = 1 + (Phb(a.a, g) != null ? BD(Phb(a.a, g), 19).a : 0); + yNb(j, XSc, meb(d)); + } + Qdd(c); + } + function WPc(a, b, c, d, e) { + var f, g, h, i, j, k, l, m, n, o; + m = VPc(a, c); + for (i = 0; i < b; i++) { + Aib(e, c); + n = new Rkb(); + o = (sCb(d.b < d.d.gc()), BD(d.d.Xb((d.c = d.b++)), 407)); + for (k = m + i; k < a.b; k++) { + h = o; + o = (sCb(d.b < d.d.gc()), BD(d.d.Xb((d.c = d.b++)), 407)); + Ekb(n, new aQc(h, o, c)); + } + for (l = m + i; l < a.b; l++) { + sCb(d.b > 0); + d.a.Xb((d.c = --d.b)); + l > m + i && uib(d); + } + for (g = new olb(n); g.a < g.c.c.length; ) { + f = BD(mlb(g), 407); + Aib(d, f); + } + if (i < b - 1) { + for (j = m + i; j < a.b; j++) { + sCb(d.b > 0); + d.a.Xb((d.c = --d.b)); + } + } + } + } + function Jfe() { + wfe(); + var a, b, c, d, e, f; + if (gfe) return gfe; + a = (++vfe, new $fe(4)); + Xfe(a, Kfe(vxe, true)); + Zfe(a, Kfe("M", true)); + Zfe(a, Kfe("C", true)); + f = (++vfe, new $fe(4)); + for (d = 0; d < 11; d++) { + Ufe(f, d, d); + } + b = (++vfe, new $fe(4)); + Xfe(b, Kfe("M", true)); + Ufe(b, 4448, 4607); + Ufe(b, 65438, 65439); + e = (++vfe, new Lge(2)); + Kge(e, a); + Kge(e, ffe); + c = (++vfe, new Lge(2)); + c.$l(Bfe(f, Kfe("L", true))); + c.$l(b); + c = (++vfe, new lge(3, c)); + c = (++vfe, new rge(e, c)); + gfe = c; + return gfe; + } + function S3c(a) { + var b, c; + b = GD(hkd(a, (Y9c(), o8c))); + if (T3c(b, a)) { + return; + } + if ( + !ikd(a, F9c) && + ((!a.a && (a.a = new cUd(E2, a, 10, 11)), a.a).i != 0 || + Ccb(DD(hkd(a, M8c)))) + ) { + if (b == null || ufb(b).length == 0) { + if (!T3c(sne, a)) { + c = Qfb( + Qfb(new Wfb("Unable to load default layout algorithm "), sne), + " for unconfigured node " + ); + yfd(a, c); + throw vbb(new y2c(c.a)); + } + } else { + c = Qfb(Qfb(new Wfb("Layout algorithm '"), b), "' not found for "); + yfd(a, c); + throw vbb(new y2c(c.a)); + } + } + } + function hIb(a) { + var b, c, d, e, f, g, h, i, j, k, l, m, n; + c = a.i; + b = a.n; + if (a.b == 0) { + n = c.c + b.b; + m = c.b - b.b - b.c; + for (g = a.a, i = 0, k = g.length; i < k; ++i) { + e = g[i]; + mHb(e, n, m); + } + } else { + d = kIb(a, false); + mHb(a.a[0], c.c + b.b, d[0]); + mHb(a.a[2], c.c + c.b - b.c - d[2], d[2]); + l = c.b - b.b - b.c; + if (d[0] > 0) { + l -= d[0] + a.c; + d[0] += a.c; + } + d[2] > 0 && (l -= d[2] + a.c); + d[1] = Math.max(d[1], l); + mHb(a.a[1], c.c + b.b + d[0] - (d[1] - l) / 2, d[1]); + } + for (f = a.a, h = 0, j = f.length; h < j; ++h) { + e = f[h]; + JD(e, 326) && BD(e, 326).Te(); + } + } + function KMc(a) { + var b, c, d, e, f, g, h, i, j, k, l; + l = new JMc(); + l.d = 0; + for (g = new olb(a.b); g.a < g.c.c.length; ) { + f = BD(mlb(g), 29); + l.d += f.a.c.length; + } + d = 0; + e = 0; + l.a = KC(WD, oje, 25, a.b.c.length, 15, 1); + j = 0; + k = 0; + l.e = KC(WD, oje, 25, l.d, 15, 1); + for (c = new olb(a.b); c.a < c.c.c.length; ) { + b = BD(mlb(c), 29); + b.p = d++; + l.a[b.p] = e++; + k = 0; + for (i = new olb(b.a); i.a < i.c.c.length; ) { + h = BD(mlb(i), 10); + h.p = j++; + l.e[h.p] = k++; + } + } + l.c = new OMc(l); + l.b = Pu(l.d); + LMc(l, a); + l.f = Pu(l.d); + MMc(l, a); + return l; + } + function GZc(a, b) { + var c, d, e, f; + f = BD(Ikb(a.n, a.n.c.length - 1), 211).d; + a.p = Math.min(a.p, b.g); + a.r = Math.max(a.r, f); + a.g = Math.max(a.g, b.g + (a.b.c.length == 1 ? 0 : a.i)); + a.o = Math.min(a.o, b.f); + a.e += b.f + (a.b.c.length == 1 ? 0 : a.i); + a.f = Math.max(a.f, b.f); + e = a.n.c.length > 0 ? (a.n.c.length - 1) * a.i : 0; + for (d = new olb(a.n); d.a < d.c.c.length; ) { + c = BD(mlb(d), 211); + e += c.a; + } + a.d = e; + a.a = a.e / a.b.c.length - a.i * ((a.b.c.length - 1) / a.b.c.length); + u$c(a.j); + } + function LQb(a, b) { + var c, d, e, f, g, h, i, j, k, l; + k = DD(vNb(b, (wSb(), sSb))); + if (k == null || (uCb(k), k)) { + l = KC(sbb, dle, 25, b.e.c.length, 16, 1); + g = HQb(b); + e = new Psb(); + for (j = new olb(b.e); j.a < j.c.c.length; ) { + h = BD(mlb(j), 144); + c = IQb(a, h, null, null, l, g); + if (c) { + tNb(c, b); + Gsb(e, c, e.c.b, e.c); + } + } + if (e.b > 1) { + for (d = Jsb(e, 0); d.b != d.d.c; ) { + c = BD(Xsb(d), 231); + f = 0; + for (i = new olb(c.e); i.a < i.c.c.length; ) { + h = BD(mlb(i), 144); + h.b = f++; + } + } + } + return e; + } + return Ou(OC(GC($O, 1), fme, 231, 0, [b])); + } + function TKd(a) { + var b, c, d, e, f, g, h; + if (!a.g) { + h = new zNd(); + b = KKd; + g = b.a.zc(a, b); + if (g == null) { + for (d = new Fyd(_Kd(a)); d.e != d.i.gc(); ) { + c = BD(Dyd(d), 26); + ytd(h, TKd(c)); + } + b.a.Bc(a) != null; + b.a.gc() == 0 && undefined; + } + e = h.i; + for ( + f = (!a.s && (a.s = new cUd(t5, a, 21, 17)), new Fyd(a.s)); + f.e != f.i.gc(); + ++e + ) { + bJd(BD(Dyd(f), 449), e); + } + ytd(h, (!a.s && (a.s = new cUd(t5, a, 21, 17)), a.s)); + vud(h); + a.g = new rNd(a, h); + a.i = BD(h.g, 247); + a.i == null && (a.i = MKd); + a.p = null; + $Kd(a).b &= -5; + } + return a.g; + } + function iIb(a) { + var b, c, d, e, f, g, h, i, j, k, l, m, n, o; + d = a.i; + c = a.n; + if (a.b == 0) { + b = jIb(a, false); + nHb(a.a[0], d.d + c.d, b[0]); + nHb(a.a[2], d.d + d.a - c.a - b[2], b[2]); + m = d.a - c.d - c.a; + l = m; + if (b[0] > 0) { + b[0] += a.c; + l -= b[0]; + } + b[2] > 0 && (l -= b[2] + a.c); + b[1] = Math.max(b[1], l); + nHb(a.a[1], d.d + c.d + b[0] - (b[1] - l) / 2, b[1]); + } else { + o = d.d + c.d; + n = d.a - c.d - c.a; + for (g = a.a, i = 0, k = g.length; i < k; ++i) { + e = g[i]; + nHb(e, o, n); + } + } + for (f = a.a, h = 0, j = f.length; h < j; ++h) { + e = f[h]; + JD(e, 326) && BD(e, 326).Ue(); + } + } + function boc(a) { + var b, c, d, e, f, g, h, i, j, k; + k = KC(WD, oje, 25, a.b.c.length + 1, 15, 1); + j = new Tqb(); + d = 0; + for (f = new olb(a.b); f.a < f.c.c.length; ) { + e = BD(mlb(f), 29); + k[d++] = j.a.gc(); + for (i = new olb(e.a); i.a < i.c.c.length; ) { + g = BD(mlb(i), 10); + for (c = new Sr(ur(U_b(g).a.Kc(), new Sq())); Qr(c); ) { + b = BD(Rr(c), 17); + j.a.zc(b, j); + } + } + for (h = new olb(e.a); h.a < h.c.c.length; ) { + g = BD(mlb(h), 10); + for (c = new Sr(ur(R_b(g).a.Kc(), new Sq())); Qr(c); ) { + b = BD(Rr(c), 17); + j.a.Bc(b) != null; + } + } + } + return k; + } + function F2d(a, b, c, d) { + var e, f, g, h, i; + i = S6d(a.e.Tg(), b); + e = BD(a.g, 119); + Q6d(); + if (BD(b, 66).Oj()) { + for (g = 0; g < a.i; ++g) { + f = e[g]; + if (i.rl(f.ak()) && pb(f, c)) { + return true; + } + } + } else if (c != null) { + for (h = 0; h < a.i; ++h) { + f = e[h]; + if (i.rl(f.ak()) && pb(c, f.dd())) { + return true; + } + } + if (d) { + for (g = 0; g < a.i; ++g) { + f = e[g]; + if (i.rl(f.ak()) && PD(c) === PD(a3d(a, BD(f.dd(), 56)))) { + return true; + } + } + } + } else { + for (g = 0; g < a.i; ++g) { + f = e[g]; + if (i.rl(f.ak()) && f.dd() == null) { + return false; + } + } + } + return false; + } + function e3d(a, b, c, d) { + var e, f, g, h, i, j; + j = S6d(a.e.Tg(), b); + g = BD(a.g, 119); + if (T6d(a.e, b)) { + if (b.hi()) { + f = M2d(a, b, d, JD(b, 99) && (BD(b, 18).Bb & Tje) != 0); + if (f >= 0 && f != c) { + throw vbb(new Wdb(kue)); + } + } + e = 0; + for (i = 0; i < a.i; ++i) { + h = g[i]; + if (j.rl(h.ak())) { + if (e == c) { + return BD( + Gtd(a, i, (Q6d(), BD(b, 66).Oj() ? BD(d, 72) : R6d(b, d))), + 72 + ); + } + ++e; + } + } + throw vbb(new qcb(gve + c + mue + e)); + } else { + for (i = 0; i < a.i; ++i) { + h = g[i]; + if (j.rl(h.ak())) { + return Q6d(), BD(b, 66).Oj() ? h : h.dd(); + } + } + return null; + } + } + function ONb(a, b, c, d) { + var e, f, g, h; + h = c; + for (g = new olb(b.a); g.a < g.c.c.length; ) { + f = BD(mlb(g), 221); + e = BD(f.b, 65); + if ( + Jy(a.b.c, e.b.c + e.b.b) <= 0 && + Jy(e.b.c, a.b.c + a.b.b) <= 0 && + Jy(a.b.d, e.b.d + e.b.a) <= 0 && + Jy(e.b.d, a.b.d + a.b.a) <= 0 + ) { + if ( + (Jy(e.b.c, a.b.c + a.b.b) == 0 && d.a < 0) || + (Jy(e.b.c + e.b.b, a.b.c) == 0 && d.a > 0) || + (Jy(e.b.d, a.b.d + a.b.a) == 0 && d.b < 0) || + (Jy(e.b.d + e.b.a, a.b.d) == 0 && d.b > 0) + ) { + h = 0; + break; + } + } else { + h = Math.min(h, YNb(a, e, d)); + } + h = Math.min(h, ONb(a, f, h, d)); + } + return h; + } + function ifd(a, b) { + var c, d, e, f, g, h, i; + if (a.b < 2) { + throw vbb( + new Wdb( + "The vector chain must contain at least a source and a target point." + ) + ); + } + e = (sCb(a.b != 0), BD(a.a.a.c, 8)); + nmd(b, e.a, e.b); + i = new Oyd((!b.a && (b.a = new xMd(y2, b, 5)), b.a)); + g = Jsb(a, 1); + while (g.a < a.b - 1) { + h = BD(Xsb(g), 8); + if (i.e != i.i.gc()) { + c = BD(Dyd(i), 469); + } else { + c = (Fhd(), (d = new xkd()), d); + Myd(i, c); + } + ukd(c, h.a, h.b); + } + while (i.e != i.i.gc()) { + Dyd(i); + Eyd(i); + } + f = (sCb(a.b != 0), BD(a.c.b.c, 8)); + gmd(b, f.a, f.b); + } + function $lc(a, b) { + var c, d, e, f, g, h, i, j, k; + c = 0; + for ( + e = new olb((tCb(0, a.c.length), BD(a.c[0], 101)).g.b.j); + e.a < e.c.c.length; + + ) { + d = BD(mlb(e), 11); + d.p = c++; + } + b == (Ucd(), Acd) ? Okb(a, new gmc()) : Okb(a, new kmc()); + h = 0; + k = a.c.length - 1; + while (h < k) { + g = (tCb(h, a.c.length), BD(a.c[h], 101)); + j = (tCb(k, a.c.length), BD(a.c[k], 101)); + f = b == Acd ? g.c : g.a; + i = b == Acd ? j.a : j.c; + amc(g, b, (Ajc(), yjc), f); + amc(j, b, xjc, i); + ++h; + --k; + } + h == k && + amc((tCb(h, a.c.length), BD(a.c[h], 101)), b, (Ajc(), wjc), null); + } + function UVc(a, b, c) { + var d, e, f, g, h, i, j, k, l, m, n, o, p, q, r; + l = a.a.i + a.a.g / 2; + m = a.a.i + a.a.g / 2; + o = b.i + b.g / 2; + q = b.j + b.f / 2; + h = new f7c(o, q); + j = BD(hkd(b, (Y9c(), C9c)), 8); + j.a = j.a + l; + j.b = j.b + m; + f = (h.b - j.b) / (h.a - j.a); + d = h.b - f * h.a; + p = c.i + c.g / 2; + r = c.j + c.f / 2; + i = new f7c(p, r); + k = BD(hkd(c, C9c), 8); + k.a = k.a + l; + k.b = k.b + m; + g = (i.b - k.b) / (i.a - k.a); + e = i.b - g * i.a; + n = (d - e) / (g - f); + if ((j.a < n && h.a < n) || (n < j.a && n < h.a)) { + return false; + } else if ((k.a < n && i.a < n) || (n < k.a && n < i.a)) { + return false; + } + return true; + } + function gqd(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n; + m = BD(Ohb(a.c, b), 183); + if (!m) { + throw vbb(new cqd("Edge did not exist in input.")); + } + j = Wpd(m); + f = Fhe((!b.a && (b.a = new cUd(A2, b, 6, 6)), b.a)); + h = !f; + if (h) { + n = new wB(); + c = new Rrd(a, j, n); + Dhe((!b.a && (b.a = new cUd(A2, b, 6, 6)), b.a), c); + cC(m, Nte, n); + } + e = ikd(b, (Y9c(), Q8c)); + if (e) { + k = BD(hkd(b, Q8c), 74); + g = !k || Ehe(k); + i = !g; + if (i) { + l = new wB(); + d = new Zrd(l); + reb(k, d); + cC(m, "junctionPoints", l); + } + } + Upd(m, "container", Mld(b).k); + return null; + } + function eDb(a, b, c) { + var d, e, f, g, h, i, j, k; + this.a = a; + this.b = b; + this.c = c; + this.e = Ou( + OC(GC(GM, 1), Uhe, 168, 0, [ + new aDb(a, b), + new aDb(b, c), + new aDb(c, a), + ]) + ); + this.f = Ou(OC(GC(m1, 1), nie, 8, 0, [a, b, c])); + this.d = + ((d = c7c(R6c(this.b), this.a)), + (e = c7c(R6c(this.c), this.a)), + (f = c7c(R6c(this.c), this.b)), + (g = d.a * (this.a.a + this.b.a) + d.b * (this.a.b + this.b.b)), + (h = e.a * (this.a.a + this.c.a) + e.b * (this.a.b + this.c.b)), + (i = 2 * (d.a * f.b - d.b * f.a)), + (j = (e.b * g - d.b * h) / i), + (k = (d.a * h - e.a * g) / i), + new f7c(j, k)); + } + function nvd(a, b, c, d) { + var e, f, g, h, i, j, k, l, m, n, o; + m = new yC(a.p); + cC(b, fue, m); + if (c && !(!a.f ? null : vmb(a.f)).a.dc()) { + k = new wB(); + cC(b, "logs", k); + h = 0; + for (o = new Dnb((!a.f ? null : vmb(a.f)).b.Kc()); o.b.Ob(); ) { + n = GD(o.b.Pb()); + l = new yC(n); + tB(k, h); + vB(k, h, l); + ++h; + } + } + if (d) { + j = new TB(a.q); + cC(b, "executionTime", j); + } + if (!vmb(a.a).a.dc()) { + g = new wB(); + cC(b, Jte, g); + h = 0; + for (f = new Dnb(vmb(a.a).b.Kc()); f.b.Ob(); ) { + e = BD(f.b.Pb(), 1949); + i = new eC(); + tB(g, h); + vB(g, h, i); + nvd(e, i, c, d); + ++h; + } + } + } + function PZb(a, b) { + var c, d, e, f, g, h; + f = a.c; + g = a.d; + QZb(a, null); + RZb(a, null); + b && Ccb(DD(vNb(g, (wtc(), Msc)))) + ? QZb(a, i_b(g.i, (KAc(), IAc), (Ucd(), zcd))) + : QZb(a, g); + b && Ccb(DD(vNb(f, (wtc(), etc)))) + ? RZb(a, i_b(f.i, (KAc(), HAc), (Ucd(), Tcd))) + : RZb(a, f); + for (d = new olb(a.b); d.a < d.c.c.length; ) { + c = BD(mlb(d), 70); + e = BD(vNb(c, (Nyc(), Qwc)), 272); + e == (qad(), pad) ? yNb(c, Qwc, oad) : e == oad && yNb(c, Qwc, pad); + } + h = Ccb(DD(vNb(a, (wtc(), ltc)))); + yNb(a, ltc, (Bcb(), h ? false : true)); + a.a = w7c(a.a); + } + function VQb(a, b, c) { + var d, e, f, g, h, i; + d = 0; + for ( + f = new Fyd((!a.a && (a.a = new cUd(E2, a, 10, 11)), a.a)); + f.e != f.i.gc(); + + ) { + e = BD(Dyd(f), 33); + g = ""; + (!e.n && (e.n = new cUd(D2, e, 1, 7)), e.n).i == 0 || + (g = BD(qud((!e.n && (e.n = new cUd(D2, e, 1, 7)), e.n), 0), 137).a); + h = new pRb(g); + tNb(h, e); + yNb(h, (HSb(), FSb), e); + h.b = d++; + h.d.a = e.i + e.g / 2; + h.d.b = e.j + e.f / 2; + h.e.a = Math.max(e.g, 1); + h.e.b = Math.max(e.f, 1); + Ekb(b.e, h); + jrb(c.f, e, h); + i = BD(hkd(e, (wSb(), mSb)), 98); + i == (dcd(), ccd) && (i = bcd); + } + } + function XJc(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o, p, q; + c = nGb(new pGb(), a.f); + j = a.i[b.c.i.p]; + n = a.i[b.d.i.p]; + i = b.c; + m = b.d; + h = i.a.b; + l = m.a.b; + j.b || (h += i.n.b); + n.b || (l += m.n.b); + k = QD(Math.max(0, h - l)); + g = QD(Math.max(0, l - h)); + o = + ((p = Math.max(1, BD(vNb(b, (Nyc(), eyc)), 19).a)), + (q = JJc(b.c.i.k, b.d.i.k)), + p * q); + e = AFb(DFb(CFb(BFb(EFb(new FFb(), o), g), c), BD(Ohb(a.k, b.c), 121))); + f = AFb(DFb(CFb(BFb(EFb(new FFb(), o), k), c), BD(Ohb(a.k, b.d), 121))); + d = new qKc(e, f); + a.c[b.p] = d; + } + function NEc(a, b, c, d) { + var e, f, g, h, i, j; + g = new _Ec(a, b, c); + i = new Bib(d, 0); + e = false; + while (i.b < i.d.gc()) { + h = (sCb(i.b < i.d.gc()), BD(i.d.Xb((i.c = i.b++)), 233)); + if (h == b || h == c) { + uib(i); + } else if (!e && Edb(REc(h.g, h.d[0]).a) > Edb(REc(g.g, g.d[0]).a)) { + sCb(i.b > 0); + i.a.Xb((i.c = --i.b)); + Aib(i, g); + e = true; + } else if (!!h.e && h.e.gc() > 0) { + f = (!h.e && (h.e = new Rkb()), h.e).Mc(b); + j = (!h.e && (h.e = new Rkb()), h.e).Mc(c); + if (f || j) { + (!h.e && (h.e = new Rkb()), h.e).Fc(g); + ++g.c; + } + } + } + e || ((d.c[d.c.length] = g), true); + } + function odc(a) { + var b, c, d; + if (fcd(BD(vNb(a, (Nyc(), Vxc)), 98))) { + for (c = new olb(a.j); c.a < c.c.c.length; ) { + b = BD(mlb(c), 11); + b.j == (Ucd(), Scd) && + ((d = BD(vNb(b, (wtc(), gtc)), 10)), + d + ? G0b(b, BD(vNb(d, Hsc), 61)) + : b.e.c.length - b.g.c.length < 0 + ? G0b(b, zcd) + : G0b(b, Tcd)); + } + } else { + for (c = new olb(a.j); c.a < c.c.c.length; ) { + b = BD(mlb(c), 11); + d = BD(vNb(b, (wtc(), gtc)), 10); + d + ? G0b(b, BD(vNb(d, Hsc), 61)) + : b.e.c.length - b.g.c.length < 0 + ? G0b(b, (Ucd(), zcd)) + : G0b(b, (Ucd(), Tcd)); + } + yNb(a, Vxc, (dcd(), acd)); + } + } + function age(a) { + var b, c, d; + switch (a) { + case 91: + case 93: + case 45: + case 94: + case 44: + case 92: + d = "\\" + String.fromCharCode(a & aje); + break; + case 12: + d = "\\f"; + break; + case 10: + d = "\\n"; + break; + case 13: + d = "\\r"; + break; + case 9: + d = "\\t"; + break; + case 27: + d = "\\e"; + break; + default: + if (a < 32) { + c = ((b = a >>> 0), "0" + b.toString(16)); + d = "\\x" + qfb(c, c.length - 2, c.length); + } else if (a >= Tje) { + c = ((b = a >>> 0), "0" + b.toString(16)); + d = "\\v" + qfb(c, c.length - 6, c.length); + } else d = "" + String.fromCharCode(a & aje); + } + return d; + } + function yhb(a, b) { + var c, d, e, f, g, h, i, j, k, l; + g = a.e; + i = b.e; + if (i == 0) { + return a; + } + if (g == 0) { + return b.e == 0 ? b : new Vgb(-b.e, b.d, b.a); + } + f = a.d; + h = b.d; + if (f + h == 2) { + c = xbb(a.a[0], Yje); + d = xbb(b.a[0], Yje); + g < 0 && (c = Jbb(c)); + i < 0 && (d = Jbb(d)); + return ghb(Qbb(c, d)); + } + e = f != h ? (f > h ? 1 : -1) : whb(a.a, b.a, f); + if (e == -1) { + l = -i; + k = g == i ? zhb(b.a, h, a.a, f) : uhb(b.a, h, a.a, f); + } else { + l = g; + if (g == i) { + if (e == 0) { + return Hgb(), Ggb; + } + k = zhb(a.a, f, b.a, h); + } else { + k = uhb(a.a, f, b.a, h); + } + } + j = new Vgb(l, k.length, k); + Jgb(j); + return j; + } + function YPc(a) { + var b, c, d, e, f, g; + this.e = new Rkb(); + this.a = new Rkb(); + for (c = a.b - 1; c < 3; c++) { + St(a, 0, BD(Ut(a, 0), 8)); + } + if (a.b < 4) { + throw vbb( + new Wdb("At (least dimension + 1) control points are necessary!") + ); + } else { + this.b = 3; + this.d = true; + this.c = false; + TPc(this, a.b + this.b - 1); + g = new Rkb(); + f = new olb(this.e); + for (b = 0; b < this.b - 1; b++) { + Ekb(g, ED(mlb(f))); + } + for (e = Jsb(a, 0); e.b != e.d.c; ) { + d = BD(Xsb(e), 8); + Ekb(g, ED(mlb(f))); + Ekb(this.a, new bQc(d, g)); + tCb(0, g.c.length); + g.c.splice(0, 1); + } + } + } + function Bac(a, b) { + var c, d, e, f, g, h, i, j, k; + for (f = new olb(a.b); f.a < f.c.c.length; ) { + e = BD(mlb(f), 29); + for (h = new olb(e.a); h.a < h.c.c.length; ) { + g = BD(mlb(h), 10); + if (g.k == (j0b(), f0b)) { + i = ((j = BD(Rr(new Sr(ur(R_b(g).a.Kc(), new Sq()))), 17)), + (k = BD(Rr(new Sr(ur(U_b(g).a.Kc(), new Sq()))), 17)), + !Ccb(DD(vNb(j, (wtc(), ltc)))) || !Ccb(DD(vNb(k, ltc)))) + ? b + : sbd(b); + zac(g, i); + } + for (d = new Sr(ur(U_b(g).a.Kc(), new Sq())); Qr(d); ) { + c = BD(Rr(d), 17); + i = Ccb(DD(vNb(c, (wtc(), ltc)))) ? sbd(b) : b; + yac(c, i); + } + } + } + } + function yZc(a, b, c, d, e) { + var f, g, h; + if ( + (c.f >= b.o && c.f <= b.f) || + (b.a * 0.5 <= c.f && b.a * 1.5 >= c.f) + ) { + g = BD(Ikb(b.n, b.n.c.length - 1), 211); + if ( + g.e + g.d + c.g + e <= d && + ((f = BD(Ikb(b.n, b.n.c.length - 1), 211)), + f.f - a.f + c.f <= a.b || a.a.c.length == 1) + ) { + EZc(b, c); + return true; + } else if ( + b.s + c.g <= d && + (b.t + b.d + c.f + e <= a.b || a.a.c.length == 1) + ) { + Ekb(b.b, c); + h = BD(Ikb(b.n, b.n.c.length - 1), 211); + Ekb(b.n, new VZc(b.s, h.f + h.a + b.i, b.i)); + QZc(BD(Ikb(b.n, b.n.c.length - 1), 211), c); + GZc(b, c); + return true; + } + } + return false; + } + function Zxd(a, b, c) { + var d, e, f, g; + if (a.ej()) { + e = null; + f = a.fj(); + d = a.Zi(1, (g = uud(a, b, c)), c, b, f); + if (a.bj() && !(a.ni() && g != null ? pb(g, c) : PD(g) === PD(c))) { + g != null && (e = a.dj(g, e)); + e = a.cj(c, e); + a.ij() && (e = a.lj(g, c, e)); + if (!e) { + a.$i(d); + } else { + e.Ei(d); + e.Fi(); + } + } else { + a.ij() && (e = a.lj(g, c, e)); + if (!e) { + a.$i(d); + } else { + e.Ei(d); + e.Fi(); + } + } + return g; + } else { + g = uud(a, b, c); + if (a.bj() && !(a.ni() && g != null ? pb(g, c) : PD(g) === PD(c))) { + e = null; + g != null && (e = a.dj(g, null)); + e = a.cj(c, e); + !!e && e.Fi(); + } + return g; + } + } + function YA(a, b) { + var c, d, e, f, g, h, i, j; + b %= 24; + if (a.q.getHours() != b) { + d = new Date(a.q.getTime()); + d.setDate(d.getDate() + 1); + h = a.q.getTimezoneOffset() - d.getTimezoneOffset(); + if (h > 0) { + i = (h / 60) | 0; + j = h % 60; + e = a.q.getDate(); + c = a.q.getHours(); + c + i >= 24 && ++e; + f = new Date( + a.q.getFullYear(), + a.q.getMonth(), + e, + b + i, + a.q.getMinutes() + j, + a.q.getSeconds(), + a.q.getMilliseconds() + ); + a.q.setTime(f.getTime()); + } + } + g = a.q.getTime(); + a.q.setTime(g + 3600000); + a.q.getHours() != b && a.q.setTime(g); + } + function opc(a, b) { + var c, d, e, f, g; + Odd(b, "Path-Like Graph Wrapping", 1); + if (a.b.c.length == 0) { + Qdd(b); + return; + } + e = new Xoc(a); + g = (e.i == null && (e.i = Soc(e, new Zoc())), Edb(e.i) * e.f); + c = g / (e.i == null && (e.i = Soc(e, new Zoc())), Edb(e.i)); + if (e.b > c) { + Qdd(b); + return; + } + switch (BD(vNb(a, (Nyc(), Gyc)), 337).g) { + case 2: + f = new hpc(); + break; + case 0: + f = new Ync(); + break; + default: + f = new kpc(); + } + d = f.Vf(a, e); + if (!f.Wf()) { + switch (BD(vNb(a, Myc), 338).g) { + case 2: + d = tpc(e, d); + break; + case 1: + d = rpc(e, d); + } + } + npc(a, e, d); + Qdd(b); + } + function MFc(a, b) { + var c, d, e, f; + Fub(a.d, a.e); + a.c.a.$b(); + if (Edb(ED(vNb(b.j, (Nyc(), uwc)))) != 0 || Edb(ED(vNb(b.j, uwc))) != 0) { + c = dme; + PD(vNb(b.j, ywc)) !== PD((tAc(), rAc)) && + yNb(b.j, (wtc(), Jsc), (Bcb(), true)); + f = BD(vNb(b.j, Ayc), 19).a; + for (e = 0; e < f; e++) { + d = WFc(a, b); + if (d < c) { + c = d; + ZFc(a); + if (c == 0) { + break; + } + } + } + } else { + c = Ohe; + PD(vNb(b.j, ywc)) !== PD((tAc(), rAc)) && + yNb(b.j, (wtc(), Jsc), (Bcb(), true)); + f = BD(vNb(b.j, Ayc), 19).a; + for (e = 0; e < f; e++) { + d = XFc(a, b); + if (d < c) { + c = d; + ZFc(a); + if (c == 0) { + break; + } + } + } + } + } + function spc(a, b) { + var c, d, e, f, g, h, i, j; + g = new Rkb(); + h = 0; + c = 0; + i = 0; + while (h < b.c.length - 1 && c < a.gc()) { + d = BD(a.Xb(c), 19).a + i; + while ((tCb(h + 1, b.c.length), BD(b.c[h + 1], 19)).a < d) { + ++h; + } + j = 0; + f = d - (tCb(h, b.c.length), BD(b.c[h], 19)).a; + e = (tCb(h + 1, b.c.length), BD(b.c[h + 1], 19)).a - d; + f > e && ++j; + Ekb(g, (tCb(h + j, b.c.length), BD(b.c[h + j], 19))); + i += (tCb(h + j, b.c.length), BD(b.c[h + j], 19)).a - d; + ++c; + while ( + c < a.gc() && + BD(a.Xb(c), 19).a + i <= + (tCb(h + j, b.c.length), BD(b.c[h + j], 19)).a + ) { + ++c; + } + h += 1 + j; + } + return g; + } + function RKd(a) { + var b, c, d, e, f, g, h; + if (!a.d) { + h = new XNd(); + b = KKd; + f = b.a.zc(a, b); + if (f == null) { + for (d = new Fyd(_Kd(a)); d.e != d.i.gc(); ) { + c = BD(Dyd(d), 26); + ytd(h, RKd(c)); + } + b.a.Bc(a) != null; + b.a.gc() == 0 && undefined; + } + g = h.i; + for ( + e = (!a.q && (a.q = new cUd(n5, a, 11, 10)), new Fyd(a.q)); + e.e != e.i.gc(); + ++g + ) { + BD(Dyd(e), 399); + } + ytd(h, (!a.q && (a.q = new cUd(n5, a, 11, 10)), a.q)); + vud(h); + a.d = new nNd((BD(qud(ZKd((NFd(), MFd).o), 9), 18), h.i), h.g); + a.e = BD(h.g, 673); + a.e == null && (a.e = LKd); + $Kd(a).b &= -17; + } + return a.d; + } + function M2d(a, b, c, d) { + var e, f, g, h, i, j; + j = S6d(a.e.Tg(), b); + i = 0; + e = BD(a.g, 119); + Q6d(); + if (BD(b, 66).Oj()) { + for (g = 0; g < a.i; ++g) { + f = e[g]; + if (j.rl(f.ak())) { + if (pb(f, c)) { + return i; + } + ++i; + } + } + } else if (c != null) { + for (h = 0; h < a.i; ++h) { + f = e[h]; + if (j.rl(f.ak())) { + if (pb(c, f.dd())) { + return i; + } + ++i; + } + } + if (d) { + i = 0; + for (g = 0; g < a.i; ++g) { + f = e[g]; + if (j.rl(f.ak())) { + if (PD(c) === PD(a3d(a, BD(f.dd(), 56)))) { + return i; + } + ++i; + } + } + } + } else { + for (g = 0; g < a.i; ++g) { + f = e[g]; + if (j.rl(f.ak())) { + if (f.dd() == null) { + return i; + } + ++i; + } + } + } + return -1; + } + function aed(a, b, c, d, e) { + var f, g, h, i, j, k, l, m, n; + mmb(); + Okb(a, new Jed()); + g = Ru(a); + n = new Rkb(); + m = new Rkb(); + h = null; + i = 0; + while (g.b != 0) { + f = BD(g.b == 0 ? null : (sCb(g.b != 0), Nsb(g, g.a.a)), 157); + if (!h || (red(h) * qed(h)) / 2 < red(f) * qed(f)) { + h = f; + n.c[n.c.length] = f; + } else { + i += red(f) * qed(f); + m.c[m.c.length] = f; + if (m.c.length > 1 && (i > (red(h) * qed(h)) / 2 || g.b == 0)) { + l = new wed(m); + k = red(h) / qed(h); + j = fed(l, b, new p0b(), c, d, e, k); + P6c(X6c(l.e), j); + h = l; + n.c[n.c.length] = l; + i = 0; + m.c = KC(SI, Uhe, 1, 0, 5, 1); + } + } + } + Gkb(n, m); + return n; + } + function y6d(a, b, c, d) { + var e, f, g, h, i, j, k, l, m, n, o, p; + if (c.mh(b)) { + k = ((n = b), !n ? null : BD(d, 49).xh(n)); + if (k) { + p = c.bh(b, a.a); + o = b.t; + if (o > 1 || o == -1) { + l = BD(p, 69); + m = BD(k, 69); + if (l.dc()) { + m.$b(); + } else { + g = !!zUd(b); + f = 0; + for (h = a.a ? l.Kc() : l.Zh(); h.Ob(); ) { + j = BD(h.Pb(), 56); + e = BD(Wrb(a, j), 56); + if (!e) { + if (a.b && !g) { + m.Xh(f, j); + ++f; + } + } else { + if (g) { + i = m.Xc(e); + i == -1 ? m.Xh(f, e) : f != i && m.ji(f, e); + } else { + m.Xh(f, e); + } + ++f; + } + } + } + } else { + if (p == null) { + k.Wb(null); + } else { + e = Wrb(a, p); + e == null ? a.b && !zUd(b) && k.Wb(p) : k.Wb(e); + } + } + } + } + } + function E6b(a, b) { + var c, d, e, f, g, h, i, j; + c = new L6b(); + for (e = new Sr(ur(R_b(b).a.Kc(), new Sq())); Qr(e); ) { + d = BD(Rr(e), 17); + if (OZb(d)) { + continue; + } + h = d.c.i; + if (F6b(h, C6b)) { + j = G6b(a, h, C6b, B6b); + if (j == -1) { + continue; + } + c.b = Math.max(c.b, j); + !c.a && (c.a = new Rkb()); + Ekb(c.a, h); + } + } + for (g = new Sr(ur(U_b(b).a.Kc(), new Sq())); Qr(g); ) { + f = BD(Rr(g), 17); + if (OZb(f)) { + continue; + } + i = f.d.i; + if (F6b(i, B6b)) { + j = G6b(a, i, B6b, C6b); + if (j == -1) { + continue; + } + c.d = Math.max(c.d, j); + !c.c && (c.c = new Rkb()); + Ekb(c.c, i); + } + } + return c; + } + function Khb(a) { + Dhb(); + var b, c, d, e; + b = QD(a); + if (a < Chb.length) { + return Chb[b]; + } else if (a <= 50) { + return Pgb((Hgb(), Egb), b); + } else if (a <= _ie) { + return Qgb(Pgb(Bhb[1], b), b); + } + if (a > 1000000) { + throw vbb(new ocb("power of ten too big")); + } + if (a <= Ohe) { + return Qgb(Pgb(Bhb[1], b), b); + } + d = Pgb(Bhb[1], Ohe); + e = d; + c = Cbb(a - Ohe); + b = QD(a % Ohe); + while (ybb(c, Ohe) > 0) { + e = Ogb(e, d); + c = Qbb(c, Ohe); + } + e = Ogb(e, Pgb(Bhb[1], b)); + e = Qgb(e, Ohe); + c = Cbb(a - Ohe); + while (ybb(c, Ohe) > 0) { + e = Qgb(e, Ohe); + c = Qbb(c, Ohe); + } + e = Qgb(e, b); + return e; + } + function X5b(a, b) { + var c, d, e, f, g, h, i, j, k; + Odd(b, "Hierarchical port dummy size processing", 1); + i = new Rkb(); + k = new Rkb(); + d = Edb(ED(vNb(a, (Nyc(), myc)))); + c = d * 2; + for (f = new olb(a.b); f.a < f.c.c.length; ) { + e = BD(mlb(f), 29); + i.c = KC(SI, Uhe, 1, 0, 5, 1); + k.c = KC(SI, Uhe, 1, 0, 5, 1); + for (h = new olb(e.a); h.a < h.c.c.length; ) { + g = BD(mlb(h), 10); + if (g.k == (j0b(), e0b)) { + j = BD(vNb(g, (wtc(), Hsc)), 61); + j == (Ucd(), Acd) + ? ((i.c[i.c.length] = g), true) + : j == Rcd && ((k.c[k.c.length] = g), true); + } + } + Y5b(i, true, c); + Y5b(k, false, c); + } + Qdd(b); + } + function Oac(a, b) { + var c, d, e, f, g, h, i; + Odd(b, "Layer constraint postprocessing", 1); + i = a.b; + if (i.c.length != 0) { + d = (tCb(0, i.c.length), BD(i.c[0], 29)); + g = BD(Ikb(i, i.c.length - 1), 29); + c = new H1b(a); + f = new H1b(a); + Mac(a, d, g, c, f); + c.a.c.length == 0 || (wCb(0, i.c.length), aCb(i.c, 0, c)); + f.a.c.length == 0 || ((i.c[i.c.length] = f), true); + } + if (wNb(a, (wtc(), Lsc))) { + e = new H1b(a); + h = new H1b(a); + Pac(a, e, h); + e.a.c.length == 0 || (wCb(0, i.c.length), aCb(i.c, 0, e)); + h.a.c.length == 0 || ((i.c[i.c.length] = h), true); + } + Qdd(b); + } + function b6b(a) { + var b, c, d, e, f, g, h, i, j, k; + for (i = new olb(a.a); i.a < i.c.c.length; ) { + h = BD(mlb(i), 10); + if (h.k != (j0b(), e0b)) { + continue; + } + e = BD(vNb(h, (wtc(), Hsc)), 61); + if (e == (Ucd(), zcd) || e == Tcd) { + for (d = new Sr(ur(O_b(h).a.Kc(), new Sq())); Qr(d); ) { + c = BD(Rr(d), 17); + b = c.a; + if (b.b == 0) { + continue; + } + j = c.c; + if (j.i == h) { + f = (sCb(b.b != 0), BD(b.a.a.c, 8)); + f.b = l7c(OC(GC(m1, 1), nie, 8, 0, [j.i.n, j.n, j.a])).b; + } + k = c.d; + if (k.i == h) { + g = (sCb(b.b != 0), BD(b.c.b.c, 8)); + g.b = l7c(OC(GC(m1, 1), nie, 8, 0, [k.i.n, k.n, k.a])).b; + } + } + } + } + } + function Tec(a, b) { + var c, d, e, f, g, h, i; + Odd(b, "Sort By Input Model " + vNb(a, (Nyc(), ywc)), 1); + e = 0; + for (d = new olb(a.b); d.a < d.c.c.length; ) { + c = BD(mlb(d), 29); + i = e == 0 ? 0 : e - 1; + h = BD(Ikb(a.b, i), 29); + for (g = new olb(c.a); g.a < g.c.c.length; ) { + f = BD(mlb(g), 10); + if ( + PD(vNb(f, Vxc)) !== PD((dcd(), Zbd)) && + PD(vNb(f, Vxc)) !== PD($bd) + ) { + mmb(); + Okb(f.j, new Tnc(h, Xec(f))); + Sdd(b, "Node " + f + " ports: " + f.j); + } + } + mmb(); + Okb(c.a, new Bnc(h, BD(vNb(a, ywc), 339), BD(vNb(a, wwc), 378))); + Sdd(b, "Layer " + e + ": " + c); + ++e; + } + Qdd(b); + } + function U1b(a, b) { + var c, d, e, f; + f = P1b(b); + MAb( + new YAb(null, (!b.c && (b.c = new cUd(F2, b, 9, 9)), new Kub(b.c, 16))), + new i2b(f) + ); + e = BD(vNb(f, (wtc(), Ksc)), 21); + O1b(b, e); + if (e.Hc((Orc(), Hrc))) { + for ( + d = new Fyd((!b.c && (b.c = new cUd(F2, b, 9, 9)), b.c)); + d.e != d.i.gc(); + + ) { + c = BD(Dyd(d), 118); + Y1b(a, b, f, c); + } + } + BD(hkd(b, (Nyc(), Fxc)), 174).gc() != 0 && L1b(b, f); + Ccb(DD(vNb(f, Mxc))) && e.Fc(Mrc); + wNb(f, hyc) && Wyc(new ezc(Edb(ED(vNb(f, hyc)))), f); + PD(hkd(b, axc)) === PD((hbd(), ebd)) ? V1b(a, b, f) : T1b(a, b, f); + return f; + } + function hic(a, b, c, d) { + var e, f, g; + this.j = new Rkb(); + this.k = new Rkb(); + this.b = new Rkb(); + this.c = new Rkb(); + this.e = new I6c(); + this.i = new s7c(); + this.f = new lEb(); + this.d = new Rkb(); + this.g = new Rkb(); + Ekb(this.b, a); + Ekb(this.b, b); + this.e.c = Math.min(a.a, b.a); + this.e.d = Math.min(a.b, b.b); + this.e.b = Math.abs(a.a - b.a); + this.e.a = Math.abs(a.b - b.b); + e = BD(vNb(d, (Nyc(), jxc)), 74); + if (e) { + for (g = Jsb(e, 0); g.b != g.d.c; ) { + f = BD(Xsb(g), 8); + ADb(f.a, a.a) && Dsb(this.i, f); + } + } + !!c && Ekb(this.j, c); + Ekb(this.k, d); + } + function oTb(a, b, c) { + var d, e, f, g, h, i, j, k, l, m; + k = new gub(new ETb(c)); + h = KC(sbb, dle, 25, a.f.e.c.length, 16, 1); + Glb(h, h.length); + c[b.b] = 0; + for (j = new olb(a.f.e); j.a < j.c.c.length; ) { + i = BD(mlb(j), 144); + i.b != b.b && (c[i.b] = Ohe); + zCb(cub(k, i)); + } + while (k.b.c.length != 0) { + l = BD(dub(k), 144); + h[l.b] = true; + for (f = au(new bu(a.b, l), 0); f.c; ) { + e = BD(uu(f), 282); + m = rTb(e, l); + if (h[m.b]) { + continue; + } + wNb(e, (bTb(), RSb)) ? (g = Edb(ED(vNb(e, RSb)))) : (g = a.c); + d = c[l.b] + g; + if (d < c[m.b]) { + c[m.b] = d; + eub(k, m); + zCb(cub(k, m)); + } + } + } + } + function xMc(a, b, c) { + var d, e, f, g, h, i, j, k, l; + e = true; + for (g = new olb(a.b); g.a < g.c.c.length; ) { + f = BD(mlb(g), 29); + j = Qje; + k = null; + for (i = new olb(f.a); i.a < i.c.c.length; ) { + h = BD(mlb(i), 10); + l = Edb(b.p[h.p]) + Edb(b.d[h.p]) - h.d.d; + d = Edb(b.p[h.p]) + Edb(b.d[h.p]) + h.o.b + h.d.a; + if (l > j && d > j) { + k = h; + j = Edb(b.p[h.p]) + Edb(b.d[h.p]) + h.o.b + h.d.a; + } else { + e = false; + c.n && + Sdd( + c, + "bk node placement breaks on " + + h + + " which should have been after " + + k + ); + break; + } + } + if (!e) { + break; + } + } + c.n && Sdd(c, b + " is feasible: " + e); + return e; + } + function XNc(a, b, c, d) { + var e, f, g, h, i, j, k; + h = -1; + for (k = new olb(a); k.a < k.c.c.length; ) { + j = BD(mlb(k), 112); + j.g = h--; + e = Tbb( + tAb(PAb(JAb(new YAb(null, new Kub(j.f, 16)), new ZNc()), new _Nc())).d + ); + f = Tbb( + tAb(PAb(JAb(new YAb(null, new Kub(j.k, 16)), new bOc()), new dOc())).d + ); + g = e; + i = f; + if (!d) { + g = Tbb(tAb(PAb(new YAb(null, new Kub(j.f, 16)), new fOc())).d); + i = Tbb(tAb(PAb(new YAb(null, new Kub(j.k, 16)), new hOc())).d); + } + j.d = g; + j.a = e; + j.i = i; + j.b = f; + i == 0 + ? (Gsb(c, j, c.c.b, c.c), true) + : g == 0 && (Gsb(b, j, b.c.b, b.c), true); + } + } + function $8b(a, b, c, d) { + var e, f, g, h, i, j, k; + if (c.d.i == b.i) { + return; + } + e = new b0b(a); + __b(e, (j0b(), g0b)); + yNb(e, (wtc(), $sc), c); + yNb(e, (Nyc(), Vxc), (dcd(), $bd)); + d.c[d.c.length] = e; + g = new H0b(); + F0b(g, e); + G0b(g, (Ucd(), Tcd)); + h = new H0b(); + F0b(h, e); + G0b(h, zcd); + k = c.d; + RZb(c, g); + f = new UZb(); + tNb(f, c); + yNb(f, jxc, null); + QZb(f, h); + RZb(f, k); + j = new Bib(c.b, 0); + while (j.b < j.d.gc()) { + i = (sCb(j.b < j.d.gc()), BD(j.d.Xb((j.c = j.b++)), 70)); + if (PD(vNb(i, Qwc)) === PD((qad(), oad))) { + yNb(i, Dsc, c); + uib(j); + Ekb(f.b, i); + } + } + a9b(e, g, h); + } + function Z8b(a, b, c, d) { + var e, f, g, h, i, j, k; + if (c.c.i == b.i) { + return; + } + e = new b0b(a); + __b(e, (j0b(), g0b)); + yNb(e, (wtc(), $sc), c); + yNb(e, (Nyc(), Vxc), (dcd(), $bd)); + d.c[d.c.length] = e; + g = new H0b(); + F0b(g, e); + G0b(g, (Ucd(), Tcd)); + h = new H0b(); + F0b(h, e); + G0b(h, zcd); + RZb(c, g); + f = new UZb(); + tNb(f, c); + yNb(f, jxc, null); + QZb(f, h); + RZb(f, b); + a9b(e, g, h); + j = new Bib(c.b, 0); + while (j.b < j.d.gc()) { + i = (sCb(j.b < j.d.gc()), BD(j.d.Xb((j.c = j.b++)), 70)); + k = BD(vNb(i, Qwc), 272); + if (k == (qad(), oad)) { + wNb(i, Dsc) || yNb(i, Dsc, c); + uib(j); + Ekb(f.b, i); + } + } + } + function dDc(a, b, c, d, e) { + var f, g, h, i, j, k, l, m, n, o, p, q, r, s, t; + m = new Rkb(); + r = Gx(d); + q = b * a.a; + l = 0; + o = 0; + f = new Tqb(); + g = new Tqb(); + h = new Rkb(); + s = 0; + t = 0; + n = 0; + p = 0; + j = 0; + k = 0; + while (r.a.gc() != 0) { + i = hDc(r, e, g); + if (i) { + r.a.Bc(i) != null; + h.c[h.c.length] = i; + f.a.zc(i, f); + o = a.f[i.p]; + s += a.e[i.p] - o * a.b; + l = a.c[i.p]; + t += l * a.b; + k += o * a.b; + p += a.e[i.p]; + } + if ( + !i || + r.a.gc() == 0 || + (s >= q && a.e[i.p] > o * a.b) || + t >= c * q + ) { + m.c[m.c.length] = h; + h = new Rkb(); + ye(g, f); + f.a.$b(); + j -= k; + n = Math.max(n, j * a.b + p); + j += t; + s = t; + t = 0; + k = 0; + p = 0; + } + } + return new vgd(n, m); + } + function q4c(a) { + var b, c, d, e, f, g, h, i, j, k, l, m, n; + for (c = ((j = new $ib(a.c.b).a.vc().Kc()), new djb(j)); c.a.Ob(); ) { + b = ((h = BD(c.a.Pb(), 42)), BD(h.dd(), 149)); + e = b.a; + e == null && (e = ""); + d = i4c(a.c, e); + !d && e.length == 0 && (d = u4c(a)); + !!d && !ze(d.c, b, false) && Dsb(d.c, b); + } + for (g = Jsb(a.a, 0); g.b != g.d.c; ) { + f = BD(Xsb(g), 478); + k = j4c(a.c, f.a); + n = j4c(a.c, f.b); + !!k && !!n && Dsb(k.c, new vgd(n, f.c)); + } + Osb(a.a); + for (m = Jsb(a.b, 0); m.b != m.d.c; ) { + l = BD(Xsb(m), 478); + b = g4c(a.c, l.a); + i = j4c(a.c, l.b); + !!b && !!i && B3c(b, i, l.c); + } + Osb(a.b); + } + function qvd(a, b, c) { + var d, e, f, g, h, i, j, k, l, m, n; + f = new fC(a); + g = new ird(); + e = + (ko(g.g), + ko(g.j), + Uhb(g.b), + ko(g.d), + ko(g.i), + Uhb(g.k), + Uhb(g.c), + Uhb(g.e), + (n = drd(g, f, null)), + ard(g, f), + n); + if (b) { + j = new fC(b); + h = rvd(j); + jfd(e, OC(GC(g2, 1), Uhe, 527, 0, [h])); + } + m = false; + l = false; + if (c) { + j = new fC(c); + que in j.a && (m = aC(j, que).ge().a); + rue in j.a && (l = aC(j, rue).ge().a); + } + k = Vdd(Xdd(new Zdd(), m), l); + t2c(new w2c(), e, k); + que in f.a && cC(f, que, null); + if (m || l) { + i = new eC(); + nvd(k, i, m, l); + cC(f, que, i); + } + d = new Prd(g); + Ghe(new _ud(e), d); + } + function pA(a, b, c) { + var d, e, f, g, h, i, j, k, l; + g = new nB(); + j = OC(GC(WD, 1), oje, 25, 15, [0]); + e = -1; + f = 0; + d = 0; + for (i = 0; i < a.b.c.length; ++i) { + k = BD(Ikb(a.b, i), 434); + if (k.b > 0) { + if (e < 0 && k.a) { + e = i; + f = j[0]; + d = 0; + } + if (e >= 0) { + h = k.b; + if (i == e) { + h -= d++; + if (h == 0) { + return 0; + } + } + if (!wA(b, j, k, h, g)) { + i = e - 1; + j[0] = f; + continue; + } + } else { + e = -1; + if (!wA(b, j, k, 0, g)) { + return 0; + } + } + } else { + e = -1; + if (bfb(k.c, 0) == 32) { + l = j[0]; + uA(b, j); + if (j[0] > l) { + continue; + } + } else if (ofb(b, k.c, j[0])) { + j[0] += k.c.length; + continue; + } + return 0; + } + } + if (!mB(g, c)) { + return 0; + } + return j[0]; + } + function SKd(a) { + var b, c, d, e, f, g, h, i; + if (!a.f) { + i = new CNd(); + h = new CNd(); + b = KKd; + g = b.a.zc(a, b); + if (g == null) { + for (f = new Fyd(_Kd(a)); f.e != f.i.gc(); ) { + e = BD(Dyd(f), 26); + ytd(i, SKd(e)); + } + b.a.Bc(a) != null; + b.a.gc() == 0 && undefined; + } + for ( + d = (!a.s && (a.s = new cUd(t5, a, 21, 17)), new Fyd(a.s)); + d.e != d.i.gc(); + + ) { + c = BD(Dyd(d), 170); + JD(c, 99) && wtd(h, BD(c, 18)); + } + vud(h); + a.r = new UNd(a, (BD(qud(ZKd((NFd(), MFd).o), 6), 18), h.i), h.g); + ytd(i, a.r); + vud(i); + a.f = new nNd((BD(qud(ZKd(MFd.o), 5), 18), i.i), i.g); + $Kd(a).b &= -3; + } + return a.f; + } + function rMb(a) { + var b, c, d, e, f, g, h, i, j, k, l, m, n, o; + g = a.o; + d = KC(WD, oje, 25, g, 15, 1); + e = KC(WD, oje, 25, g, 15, 1); + c = a.p; + b = KC(WD, oje, 25, c, 15, 1); + f = KC(WD, oje, 25, c, 15, 1); + for (j = 0; j < g; j++) { + l = 0; + while (l < c && !YMb(a, j, l)) { + ++l; + } + d[j] = l; + } + for (k = 0; k < g; k++) { + l = c - 1; + while (l >= 0 && !YMb(a, k, l)) { + --l; + } + e[k] = l; + } + for (n = 0; n < c; n++) { + h = 0; + while (h < g && !YMb(a, h, n)) { + ++h; + } + b[n] = h; + } + for (o = 0; o < c; o++) { + h = g - 1; + while (h >= 0 && !YMb(a, h, o)) { + --h; + } + f[o] = h; + } + for (i = 0; i < g; i++) { + for (m = 0; m < c; m++) { + i < f[m] && + i > b[m] && + m < e[i] && + m > d[i] && + aNb(a, i, m, false, true); + } + } + } + function lRb(a) { + var b, c, d, e, f, g, h, i; + c = Ccb(DD(vNb(a, (wSb(), cSb)))); + f = a.a.c.d; + h = a.a.d.d; + if (c) { + g = Y6c(c7c(new f7c(h.a, h.b), f), 0.5); + i = Y6c(R6c(a.e), 0.5); + b = c7c(P6c(new f7c(f.a, f.b), g), i); + a7c(a.d, b); + } else { + e = Edb(ED(vNb(a.a, tSb))); + d = a.d; + if (f.a >= h.a) { + if (f.b >= h.b) { + d.a = h.a + (f.a - h.a) / 2 + e; + d.b = h.b + (f.b - h.b) / 2 - e - a.e.b; + } else { + d.a = h.a + (f.a - h.a) / 2 + e; + d.b = f.b + (h.b - f.b) / 2 + e; + } + } else { + if (f.b >= h.b) { + d.a = f.a + (h.a - f.a) / 2 + e; + d.b = h.b + (f.b - h.b) / 2 + e; + } else { + d.a = f.a + (h.a - f.a) / 2 + e; + d.b = f.b + (h.b - f.b) / 2 - e - a.e.b; + } + } + } + } + function Qge(a, b) { + var c, d, e, f, g, h, i; + if (a == null) { + return null; + } + f = a.length; + if (f == 0) { + return ""; + } + i = KC(TD, $ie, 25, f, 15, 1); + ACb(0, f, a.length); + ACb(0, f, i.length); + ffb(a, 0, f, i, 0); + c = null; + h = b; + for (e = 0, g = 0; e < f; e++) { + d = i[e]; + lde(); + if (d <= 32 && (kde[d] & 2) != 0) { + if (h) { + !c && (c = new Jfb(a)); + Gfb(c, e - g++); + } else { + h = b; + if (d != 32) { + !c && (c = new Jfb(a)); + kcb(c, e - g, e - g + 1, String.fromCharCode(32)); + } + } + } else { + h = false; + } + } + if (h) { + if (!c) { + return a.substr(0, f - 1); + } else { + f = c.a.length; + return f > 0 ? qfb(c.a, 0, f - 1) : ""; + } + } else { + return !c ? a : c.a; + } + } + function DPb(a) { + r4c( + a, + new E3c( + P3c( + M3c( + O3c(N3c(new R3c(), Yle), "ELK DisCo"), + "Layouter for arranging unconnected subgraphs. The subgraphs themselves are, by default, not laid out." + ), + new GPb() + ) + ) + ); + p4c(a, Yle, Zle, Ksd(BPb)); + p4c(a, Yle, $le, Ksd(vPb)); + p4c(a, Yle, _le, Ksd(qPb)); + p4c(a, Yle, ame, Ksd(wPb)); + p4c(a, Yle, Zke, Ksd(zPb)); + p4c(a, Yle, $ke, Ksd(yPb)); + p4c(a, Yle, Yke, Ksd(APb)); + p4c(a, Yle, _ke, Ksd(xPb)); + p4c(a, Yle, Tle, Ksd(sPb)); + p4c(a, Yle, Ule, Ksd(rPb)); + p4c(a, Yle, Vle, Ksd(tPb)); + p4c(a, Yle, Wle, Ksd(uPb)); + } + function Zbc(a, b, c, d) { + var e, f, g, h, i, j, k, l, m; + f = new b0b(a); + __b(f, (j0b(), i0b)); + yNb(f, (Nyc(), Vxc), (dcd(), $bd)); + e = 0; + if (b) { + g = new H0b(); + yNb(g, (wtc(), $sc), b); + yNb(f, $sc, b.i); + G0b(g, (Ucd(), Tcd)); + F0b(g, f); + m = k_b(b.e); + for (j = m, k = 0, l = j.length; k < l; ++k) { + i = j[k]; + RZb(i, g); + } + yNb(b, gtc, f); + ++e; + } + if (c) { + h = new H0b(); + yNb(f, (wtc(), $sc), c.i); + yNb(h, $sc, c); + G0b(h, (Ucd(), zcd)); + F0b(h, f); + m = k_b(c.g); + for (j = m, k = 0, l = j.length; k < l; ++k) { + i = j[k]; + QZb(i, h); + } + yNb(c, gtc, f); + ++e; + } + yNb(f, (wtc(), ysc), meb(e)); + d.c[d.c.length] = f; + return f; + } + function Smd() { + Smd = ccb; + Qmd = OC( + GC(TD, 1), + $ie, + 25, + 15, + [48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 65, 66, 67, 68, 69, 70] + ); + Rmd = new RegExp("[ \t\n\r\f]+"); + try { + Pmd = OC(GC(c6, 1), Uhe, 2015, 0, [ + new EQd( + (GA(), IA("yyyy-MM-dd'T'HH:mm:ss'.'SSSZ", LA((KA(), KA(), JA)))) + ), + new EQd(IA("yyyy-MM-dd'T'HH:mm:ss'.'SSS", LA((null, JA)))), + new EQd(IA("yyyy-MM-dd'T'HH:mm:ss", LA((null, JA)))), + new EQd(IA("yyyy-MM-dd'T'HH:mm", LA((null, JA)))), + new EQd(IA("yyyy-MM-dd", LA((null, JA)))), + ]); + } catch (a) { + a = ubb(a); + if (!JD(a, 78)) throw vbb(a); + } + } + function qgb(a) { + var b, c, d, e; + d = shb((!a.c && (a.c = fhb(a.f)), a.c), 0); + if (a.e == 0 || (a.a == 0 && a.f != -1 && a.e < 0)) { + return d; + } + b = pgb(a) < 0 ? 1 : 0; + c = a.e; + e = (d.length + 1 + Math.abs(QD(a.e)), new Vfb()); + b == 1 && ((e.a += "-"), e); + if (a.e > 0) { + c -= d.length - b; + if (c >= 0) { + e.a += "0."; + for (; c > egb.length; c -= egb.length) { + Rfb(e, egb); + } + Sfb(e, egb, QD(c)); + Qfb(e, d.substr(b)); + } else { + c = b - c; + Qfb(e, qfb(d, b, QD(c))); + e.a += "."; + Qfb(e, pfb(d, QD(c))); + } + } else { + Qfb(e, d.substr(b)); + for (; c < -egb.length; c += egb.length) { + Rfb(e, egb); + } + Sfb(e, egb, QD(-c)); + } + return e.a; + } + function v6c(a, b, c, d) { + var e, f, g, h, i, j, k, l, m; + i = c7c(new f7c(c.a, c.b), a); + j = i.a * b.b - i.b * b.a; + k = b.a * d.b - b.b * d.a; + l = (i.a * d.b - i.b * d.a) / k; + m = j / k; + if (k == 0) { + if (j == 0) { + e = P6c(new f7c(c.a, c.b), Y6c(new f7c(d.a, d.b), 0.5)); + f = S6c(a, e); + g = S6c(P6c(new f7c(a.a, a.b), b), e); + h = Math.sqrt(d.a * d.a + d.b * d.b) * 0.5; + if (f < g && f <= h) { + return new f7c(a.a, a.b); + } + if (g <= h) { + return P6c(new f7c(a.a, a.b), b); + } + return null; + } else { + return null; + } + } else { + return l >= 0 && l <= 1 && m >= 0 && m <= 1 + ? P6c(new f7c(a.a, a.b), Y6c(new f7c(b.a, b.b), l)) + : null; + } + } + function OTb(a, b, c) { + var d, e, f, g, h; + d = BD(vNb(a, (Nyc(), zwc)), 21); + c.a > b.a && + (d.Hc((i8c(), c8c)) + ? (a.c.a += (c.a - b.a) / 2) + : d.Hc(e8c) && (a.c.a += c.a - b.a)); + c.b > b.b && + (d.Hc((i8c(), g8c)) + ? (a.c.b += (c.b - b.b) / 2) + : d.Hc(f8c) && (a.c.b += c.b - b.b)); + if ( + BD(vNb(a, (wtc(), Ksc)), 21).Hc((Orc(), Hrc)) && + (c.a > b.a || c.b > b.b) + ) { + for (h = new olb(a.a); h.a < h.c.c.length; ) { + g = BD(mlb(h), 10); + if (g.k == (j0b(), e0b)) { + e = BD(vNb(g, Hsc), 61); + e == (Ucd(), zcd) + ? (g.n.a += c.a - b.a) + : e == Rcd && (g.n.b += c.b - b.b); + } + } + } + f = a.d; + a.f.a = c.a - f.b - f.c; + a.f.b = c.b - f.d - f.a; + } + function H5b(a, b, c) { + var d, e, f, g, h; + d = BD(vNb(a, (Nyc(), zwc)), 21); + c.a > b.a && + (d.Hc((i8c(), c8c)) + ? (a.c.a += (c.a - b.a) / 2) + : d.Hc(e8c) && (a.c.a += c.a - b.a)); + c.b > b.b && + (d.Hc((i8c(), g8c)) + ? (a.c.b += (c.b - b.b) / 2) + : d.Hc(f8c) && (a.c.b += c.b - b.b)); + if ( + BD(vNb(a, (wtc(), Ksc)), 21).Hc((Orc(), Hrc)) && + (c.a > b.a || c.b > b.b) + ) { + for (g = new olb(a.a); g.a < g.c.c.length; ) { + f = BD(mlb(g), 10); + if (f.k == (j0b(), e0b)) { + e = BD(vNb(f, Hsc), 61); + e == (Ucd(), zcd) + ? (f.n.a += c.a - b.a) + : e == Rcd && (f.n.b += c.b - b.b); + } + } + } + h = a.d; + a.f.a = c.a - h.b - h.c; + a.f.b = c.b - h.d - h.a; + } + function kMc(a) { + var b, c, d, e, f, g, h, i, j, k, l, m; + b = DMc(a); + for (k = ((h = new Pib(b).a.vc().Kc()), new Vib(h)); k.a.Ob(); ) { + j = ((e = BD(k.a.Pb(), 42)), BD(e.cd(), 10)); + l = 0; + m = 0; + l = j.d.d; + m = j.o.b + j.d.a; + a.d[j.p] = 0; + c = j; + while ((f = a.a[c.p]) != j) { + d = FMc(c, f); + i = 0; + a.c == (YLc(), WLc) + ? (i = d.d.n.b + d.d.a.b - d.c.n.b - d.c.a.b) + : (i = d.c.n.b + d.c.a.b - d.d.n.b - d.d.a.b); + g = Edb(a.d[c.p]) + i; + a.d[f.p] = g; + l = Math.max(l, f.d.d - g); + m = Math.max(m, g + f.o.b + f.d.a); + c = f; + } + c = j; + do { + a.d[c.p] = Edb(a.d[c.p]) + l; + c = a.a[c.p]; + } while (c != j); + a.b[j.p] = l + m; + } + } + function LOb(a) { + var b, c, d, e, f, g, h, i, j, k, l, m; + a.b = false; + l = Pje; + i = Qje; + m = Pje; + j = Qje; + for (d = a.e.a.ec().Kc(); d.Ob(); ) { + c = BD(d.Pb(), 266); + e = c.a; + l = Math.min(l, e.c); + i = Math.max(i, e.c + e.b); + m = Math.min(m, e.d); + j = Math.max(j, e.d + e.a); + for (g = new olb(c.c); g.a < g.c.c.length; ) { + f = BD(mlb(g), 395); + b = f.a; + if (b.a) { + k = e.d + f.b.b; + h = k + f.c; + m = Math.min(m, k); + j = Math.max(j, h); + } else { + k = e.c + f.b.a; + h = k + f.c; + l = Math.min(l, k); + i = Math.max(i, h); + } + } + } + a.a = new f7c(i - l, j - m); + a.c = new f7c(l + a.d.a, m + a.d.b); + } + function xZc(a, b, c) { + var d, e, f, g, h, i, j, k, l; + l = new Rkb(); + k = new x$c(0, c); + f = 0; + s$c(k, new PZc(0, 0, k, c)); + e = 0; + for (j = new Fyd(a); j.e != j.i.gc(); ) { + i = BD(Dyd(j), 33); + d = BD(Ikb(k.a, k.a.c.length - 1), 187); + h = e + i.g + (BD(Ikb(k.a, 0), 187).b.c.length == 0 ? 0 : c); + if (h > b) { + e = 0; + f += k.b + c; + l.c[l.c.length] = k; + k = new x$c(f, c); + d = new PZc(0, k.f, k, c); + s$c(k, d); + e = 0; + } + if ( + d.b.c.length == 0 || + (i.f >= d.o && i.f <= d.f) || + (d.a * 0.5 <= i.f && d.a * 1.5 >= i.f) + ) { + EZc(d, i); + } else { + g = new PZc(d.s + d.r + c, k.f, k, c); + s$c(k, g); + EZc(g, i); + } + e = i.i + i.g; + } + l.c[l.c.length] = k; + return l; + } + function OKd(a) { + var b, c, d, e, f, g, h, i; + if (!a.a) { + a.o = null; + i = new GNd(a); + b = new KNd(); + c = KKd; + h = c.a.zc(a, c); + if (h == null) { + for (g = new Fyd(_Kd(a)); g.e != g.i.gc(); ) { + f = BD(Dyd(g), 26); + ytd(i, OKd(f)); + } + c.a.Bc(a) != null; + c.a.gc() == 0 && undefined; + } + for ( + e = (!a.s && (a.s = new cUd(t5, a, 21, 17)), new Fyd(a.s)); + e.e != e.i.gc(); + + ) { + d = BD(Dyd(e), 170); + JD(d, 322) && wtd(b, BD(d, 34)); + } + vud(b); + a.k = new PNd(a, (BD(qud(ZKd((NFd(), MFd).o), 7), 18), b.i), b.g); + ytd(i, a.k); + vud(i); + a.a = new nNd((BD(qud(ZKd(MFd.o), 4), 18), i.i), i.g); + $Kd(a).b &= -2; + } + return a.a; + } + function vZc(a, b, c, d, e, f, g) { + var h, i, j, k, l, m; + l = false; + i = ZZc(c.q, b.f + b.b - c.q.f); + m = e - (c.q.e + i - g); + if (m < d.g) { + return false; + } + j = f == a.c.length - 1 && m >= (tCb(f, a.c.length), BD(a.c[f], 200)).e; + k = ((h = MZc(d, m, false)), h.a); + if (k > b.b && !j) { + return false; + } + if (j || k <= b.b) { + if (j && k > b.b) { + c.d = k; + KZc(c, JZc(c, k)); + } else { + $Zc(c.q, i); + c.c = true; + } + KZc(d, e - (c.s + c.r)); + OZc(d, c.q.e + c.q.d, b.f); + s$c(b, d); + if (a.c.length > f) { + v$c((tCb(f, a.c.length), BD(a.c[f], 200)), d); + (tCb(f, a.c.length), BD(a.c[f], 200)).a.c.length == 0 && Kkb(a, f); + } + l = true; + } + return l; + } + function C2d(a, b, c, d) { + var e, f, g, h, i, j, k; + k = S6d(a.e.Tg(), b); + e = 0; + f = BD(a.g, 119); + i = null; + Q6d(); + if (BD(b, 66).Oj()) { + for (h = 0; h < a.i; ++h) { + g = f[h]; + if (k.rl(g.ak())) { + if (pb(g, c)) { + i = g; + break; + } + ++e; + } + } + } else if (c != null) { + for (h = 0; h < a.i; ++h) { + g = f[h]; + if (k.rl(g.ak())) { + if (pb(c, g.dd())) { + i = g; + break; + } + ++e; + } + } + } else { + for (h = 0; h < a.i; ++h) { + g = f[h]; + if (k.rl(g.ak())) { + if (g.dd() == null) { + i = g; + break; + } + ++e; + } + } + } + if (i) { + if (oid(a.e)) { + j = b.$j() + ? new O7d(a.e, 4, b, c, null, e, true) + : H2d(a, b.Kj() ? 2 : 1, b, c, b.zj(), -1, true); + d ? d.Ei(j) : (d = j); + } + d = B2d(a, i, d); + } + return d; + } + function kYc(a, b, c, d, e, f, g) { + var h, i, j, k, l, m, n, o, p; + o = 0; + p = 0; + i = e.c; + h = e.b; + k = c.f; + n = c.g; + switch (b.g) { + case 0: + o = d.i + d.g + g; + a.c ? (p = tYc(o, f, d, g)) : (p = d.j); + m = Math.max(i, o + n); + j = Math.max(h, p + k); + break; + case 1: + p = d.j + d.f + g; + a.c ? (o = sYc(p, f, d, g)) : (o = d.i); + m = Math.max(i, o + n); + j = Math.max(h, p + k); + break; + case 2: + o = i + g; + p = 0; + m = i + g + n; + j = Math.max(h, k); + break; + case 3: + o = 0; + p = h + g; + m = Math.max(i, n); + j = h + g + k; + break; + default: + throw vbb(new Wdb("IllegalPlacementOption.")); + } + l = new e$c(a.a, m, j, b, o, p); + return l; + } + function R2b(a) { + var b, c, d, e, f, g, h, i, j, k, l, m; + h = a.d; + l = BD(vNb(a, (wtc(), vtc)), 15); + b = BD(vNb(a, tsc), 15); + if (!l && !b) { + return; + } + f = Edb(ED(pBc(a, (Nyc(), iyc)))); + g = Edb(ED(pBc(a, jyc))); + m = 0; + if (l) { + j = 0; + for (e = l.Kc(); e.Ob(); ) { + d = BD(e.Pb(), 10); + j = Math.max(j, d.o.b); + m += d.o.a; + } + m += f * (l.gc() - 1); + h.d += j + g; + } + c = 0; + if (b) { + j = 0; + for (e = b.Kc(); e.Ob(); ) { + d = BD(e.Pb(), 10); + j = Math.max(j, d.o.b); + c += d.o.a; + } + c += f * (b.gc() - 1); + h.a += j + g; + } + i = Math.max(m, c); + if (i > a.o.a) { + k = (i - a.o.a) / 2; + h.b = Math.max(h.b, k); + h.c = Math.max(h.c, k); + } + } + function rvd(a) { + var b, c, d, e, f, g, h, i; + f = new b2c(); + Z1c(f, (Y1c(), V1c)); + for ( + d = + ((e = $B(a, KC(ZI, nie, 2, 0, 6, 1))), + new vib(new amb(new mC(a, e).b))); + d.b < d.d.gc(); + + ) { + c = (sCb(d.b < d.d.gc()), GD(d.d.Xb((d.c = d.b++)))); + g = k4c(lvd, c); + if (g) { + b = aC(a, c); + b.je() + ? (h = b.je().a) + : b.ge() + ? (h = "" + b.ge().a) + : b.he() + ? (h = "" + b.he().a) + : (h = b.Ib()); + i = o5c(g, h); + if (i != null) { + (uqb(g.j, (N5c(), K5c)) || uqb(g.j, L5c)) && xNb(_1c(f, E2), g, i); + uqb(g.j, I5c) && xNb(_1c(f, B2), g, i); + uqb(g.j, M5c) && xNb(_1c(f, F2), g, i); + uqb(g.j, J5c) && xNb(_1c(f, D2), g, i); + } + } + } + return f; + } + function J2d(a, b, c, d) { + var e, f, g, h, i, j; + i = S6d(a.e.Tg(), b); + f = BD(a.g, 119); + if (T6d(a.e, b)) { + e = 0; + for (h = 0; h < a.i; ++h) { + g = f[h]; + if (i.rl(g.ak())) { + if (e == c) { + Q6d(); + if (BD(b, 66).Oj()) { + return g; + } else { + j = g.dd(); + j != null && + d && + JD(b, 99) && + (BD(b, 18).Bb & Tje) != 0 && + (j = b3d(a, b, h, e, j)); + return j; + } + } + ++e; + } + } + throw vbb(new qcb(gve + c + mue + e)); + } else { + e = 0; + for (h = 0; h < a.i; ++h) { + g = f[h]; + if (i.rl(g.ak())) { + Q6d(); + if (BD(b, 66).Oj()) { + return g; + } else { + j = g.dd(); + j != null && + d && + JD(b, 99) && + (BD(b, 18).Bb & Tje) != 0 && + (j = b3d(a, b, h, e, j)); + return j; + } + } + ++e; + } + return b.zj(); + } + } + function K2d(a, b, c) { + var d, e, f, g, h, i, j, k; + e = BD(a.g, 119); + if (T6d(a.e, b)) { + return Q6d(), BD(b, 66).Oj() ? new R7d(b, a) : new f7d(b, a); + } else { + j = S6d(a.e.Tg(), b); + d = 0; + for (h = 0; h < a.i; ++h) { + f = e[h]; + g = f.ak(); + if (j.rl(g)) { + Q6d(); + if (BD(b, 66).Oj()) { + return f; + } else if (g == (m8d(), k8d) || g == h8d) { + i = new Wfb(fcb(f.dd())); + while (++h < a.i) { + f = e[h]; + g = f.ak(); + (g == k8d || g == h8d) && Qfb(i, fcb(f.dd())); + } + return j6d(BD(b.Yj(), 148), i.a); + } else { + k = f.dd(); + k != null && + c && + JD(b, 99) && + (BD(b, 18).Bb & Tje) != 0 && + (k = b3d(a, b, h, d, k)); + return k; + } + } + ++d; + } + return b.zj(); + } + } + function MZc(a, b, c) { + var d, e, f, g, h, i, j, k, l, m; + f = 0; + g = a.t; + e = 0; + d = 0; + i = 0; + m = 0; + l = 0; + if (c) { + a.n.c = KC(SI, Uhe, 1, 0, 5, 1); + Ekb(a.n, new VZc(a.s, a.t, a.i)); + } + h = 0; + for (k = new olb(a.b); k.a < k.c.c.length; ) { + j = BD(mlb(k), 33); + if (f + j.g + (h > 0 ? a.i : 0) > b && i > 0) { + f = 0; + g += i + a.i; + e = Math.max(e, m); + d += i + a.i; + i = 0; + m = 0; + if (c) { + ++l; + Ekb(a.n, new VZc(a.s, g, a.i)); + } + h = 0; + } + m += j.g + (h > 0 ? a.i : 0); + i = Math.max(i, j.f); + c && QZc(BD(Ikb(a.n, l), 211), j); + f += j.g + (h > 0 ? a.i : 0); + ++h; + } + e = Math.max(e, m); + d += i; + if (c) { + a.r = e; + a.d = d; + u$c(a.j); + } + return new J6c(a.s, a.t, e, d); + } + function $fb(a, b, c, d, e) { + Zfb(); + var f, g, h, i, j, k, l, m, n; + vCb(a, "src"); + vCb(c, "dest"); + m = rb(a); + i = rb(c); + rCb((m.i & 4) != 0, "srcType is not an array"); + rCb((i.i & 4) != 0, "destType is not an array"); + l = m.c; + g = i.c; + rCb((l.i & 1) != 0 ? l == g : (g.i & 1) == 0, "Array types don't match"); + n = a.length; + j = c.length; + if (b < 0 || d < 0 || e < 0 || b + e > n || d + e > j) { + throw vbb(new pcb()); + } + if ((l.i & 1) == 0 && m != i) { + k = CD(a); + f = CD(c); + if (PD(a) === PD(c) && b < d) { + b += e; + for (h = d + e; h-- > d; ) { + NC(f, h, k[--b]); + } + } else { + for (h = d + e; d < h; ) { + NC(f, d++, k[b++]); + } + } + } else e > 0 && $Bb(a, b, c, d, e, true); + } + function phb() { + phb = ccb; + nhb = OC(GC(WD, 1), oje, 25, 15, [ + Rie, + 1162261467, + Iie, + 1220703125, + 362797056, + 1977326743, + Iie, + 387420489, + Jje, + 214358881, + 429981696, + 815730721, + 1475789056, + 170859375, + 268435456, + 410338673, + 612220032, + 893871739, + 1280000000, + 1801088541, + 113379904, + 148035889, + 191102976, + 244140625, + 308915776, + 387420489, + 481890304, + 594823321, + 729000000, + 887503681, + Iie, + 1291467969, + 1544804416, + 1838265625, + 60466176, + ]); + ohb = OC( + GC(WD, 1), + oje, + 25, + 15, + [ + -1, -1, 31, 19, 15, 13, 11, 11, 10, 9, 9, 8, 8, 8, 8, 7, 7, 7, 7, 7, + 7, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 5, + ] + ); + } + function soc(a) { + var b, c, d, e, f, g, h, i; + for (e = new olb(a.b); e.a < e.c.c.length; ) { + d = BD(mlb(e), 29); + for (g = new olb(Mu(d.a)); g.a < g.c.c.length; ) { + f = BD(mlb(g), 10); + if (ioc(f)) { + c = BD(vNb(f, (wtc(), usc)), 305); + if (!c.g && !!c.d) { + b = c; + i = c.d; + while (i) { + roc(i.i, i.k, false, true); + zoc(b.a); + zoc(i.i); + zoc(i.k); + zoc(i.b); + RZb(i.c, b.c.d); + RZb(b.c, null); + $_b(b.a, null); + $_b(i.i, null); + $_b(i.k, null); + $_b(i.b, null); + h = new goc(b.i, i.a, b.e, i.j, i.f); + h.k = b.k; + h.n = b.n; + h.b = b.b; + h.c = i.c; + h.g = b.g; + h.d = i.d; + yNb(b.i, usc, h); + yNb(i.a, usc, h); + i = i.d; + b = h; + } + } + } + } + } + } + function Xfe(a, b) { + var c, d, e, f, g; + g = BD(b, 136); + Yfe(a); + Yfe(g); + if (g.b == null) return; + a.c = true; + if (a.b == null) { + a.b = KC(WD, oje, 25, g.b.length, 15, 1); + $fb(g.b, 0, a.b, 0, g.b.length); + return; + } + f = KC(WD, oje, 25, a.b.length + g.b.length, 15, 1); + for (c = 0, d = 0, e = 0; c < a.b.length || d < g.b.length; ) { + if (c >= a.b.length) { + f[e++] = g.b[d++]; + f[e++] = g.b[d++]; + } else if (d >= g.b.length) { + f[e++] = a.b[c++]; + f[e++] = a.b[c++]; + } else if ( + g.b[d] < a.b[c] || + (g.b[d] === a.b[c] && g.b[d + 1] < a.b[c + 1]) + ) { + f[e++] = g.b[d++]; + f[e++] = g.b[d++]; + } else { + f[e++] = a.b[c++]; + f[e++] = a.b[c++]; + } + } + a.b = f; + } + function S6b(a, b) { + var c, d, e, f, g, h, i, j, k, l; + c = Ccb(DD(vNb(a, (wtc(), Usc)))); + h = Ccb(DD(vNb(b, Usc))); + d = BD(vNb(a, Vsc), 11); + i = BD(vNb(b, Vsc), 11); + e = BD(vNb(a, Wsc), 11); + j = BD(vNb(b, Wsc), 11); + k = !!d && d == i; + l = !!e && e == j; + if (!c && !h) { + return new Z6b( + BD(mlb(new olb(a.j)), 11).p == BD(mlb(new olb(b.j)), 11).p, + k, + l + ); + } + f = + (!Ccb(DD(vNb(a, Usc))) || Ccb(DD(vNb(a, Tsc)))) && + (!Ccb(DD(vNb(b, Usc))) || Ccb(DD(vNb(b, Tsc)))); + g = + (!Ccb(DD(vNb(a, Usc))) || !Ccb(DD(vNb(a, Tsc)))) && + (!Ccb(DD(vNb(b, Usc))) || !Ccb(DD(vNb(b, Tsc)))); + return new Z6b((k && f) || (l && g), k, l); + } + function HZc(a) { + var b, c, d, e, f, g, h, i; + d = 0; + c = 0; + i = new Psb(); + b = 0; + for (h = new olb(a.n); h.a < h.c.c.length; ) { + g = BD(mlb(h), 211); + if (g.c.c.length == 0) { + Gsb(i, g, i.c.b, i.c); + } else { + d = Math.max(d, g.d); + c += g.a + (b > 0 ? a.i : 0); + } + ++b; + } + Ce(a.n, i); + a.d = c; + a.r = d; + a.g = 0; + a.f = 0; + a.e = 0; + a.o = Pje; + a.p = Pje; + for (f = new olb(a.b); f.a < f.c.c.length; ) { + e = BD(mlb(f), 33); + a.p = Math.min(a.p, e.g); + a.g = Math.max(a.g, e.g); + a.f = Math.max(a.f, e.f); + a.o = Math.min(a.o, e.f); + a.e += e.f + a.i; + } + a.a = a.e / a.b.c.length - a.i * ((a.b.c.length - 1) / a.b.c.length); + u$c(a.j); + } + function Sld(a) { + var b, c, d, e; + if ((a.Db & 64) != 0) return Mkd(a); + b = new Wfb(_se); + d = a.k; + if (!d) { + !a.n && (a.n = new cUd(D2, a, 1, 7)); + if (a.n.i > 0) { + e = (!a.n && (a.n = new cUd(D2, a, 1, 7)), BD(qud(a.n, 0), 137)).a; + !e || Qfb(Qfb(((b.a += ' "'), b), e), '"'); + } + } else { + Qfb(Qfb(((b.a += ' "'), b), d), '"'); + } + c = + (!a.b && (a.b = new y5d(z2, a, 4, 7)), + !(a.b.i <= 1 && (!a.c && (a.c = new y5d(z2, a, 5, 8)), a.c.i <= 1))); + c ? ((b.a += " ["), b) : ((b.a += " "), b); + Qfb(b, Eb(new Gb(), new Fyd(a.b))); + c && ((b.a += "]"), b); + b.a += gne; + c && ((b.a += "["), b); + Qfb(b, Eb(new Gb(), new Fyd(a.c))); + c && ((b.a += "]"), b); + return b.a; + } + function TQd(a, b) { + var c, d, e, f, g, h, i; + if (a.a) { + h = a.a.ne(); + i = null; + if (h != null) { + b.a += "" + h; + } else { + g = a.a.Dj(); + if (g != null) { + f = hfb(g, wfb(91)); + if (f != -1) { + i = g.substr(f); + b.a += "" + qfb(g == null ? Xhe : (uCb(g), g), 0, f); + } else { + b.a += "" + g; + } + } + } + if (!!a.d && a.d.i != 0) { + e = true; + b.a += "<"; + for (d = new Fyd(a.d); d.e != d.i.gc(); ) { + c = BD(Dyd(d), 87); + e ? (e = false) : ((b.a += She), b); + TQd(c, b); + } + b.a += ">"; + } + i != null && ((b.a += "" + i), b); + } else if (a.e) { + h = a.e.zb; + h != null && ((b.a += "" + h), b); + } else { + b.a += "?"; + if (a.b) { + b.a += " super "; + TQd(a.b, b); + } else { + if (a.f) { + b.a += " extends "; + TQd(a.f, b); + } + } + } + } + function Z9b(a, b) { + var c, + d, + e, + f, + g, + h, + i, + j, + k, + l, + m, + n, + o, + p, + q, + r, + s, + t, + u, + v, + w, + A, + B, + C, + D; + v = a.c; + w = b.c; + c = Jkb(v.a, a, 0); + d = Jkb(w.a, b, 0); + t = BD( + W_b(a, (KAc(), HAc)) + .Kc() + .Pb(), + 11 + ); + C = BD(W_b(a, IAc).Kc().Pb(), 11); + u = BD(W_b(b, HAc).Kc().Pb(), 11); + D = BD(W_b(b, IAc).Kc().Pb(), 11); + r = k_b(t.e); + A = k_b(C.g); + s = k_b(u.e); + B = k_b(D.g); + Z_b(a, d, w); + for (g = s, k = 0, o = g.length; k < o; ++k) { + e = g[k]; + RZb(e, t); + } + for (h = B, l = 0, p = h.length; l < p; ++l) { + e = h[l]; + QZb(e, C); + } + Z_b(b, c, v); + for (i = r, m = 0, q = i.length; m < q; ++m) { + e = i[m]; + RZb(e, u); + } + for (f = A, j = 0, n = f.length; j < n; ++j) { + e = f[j]; + QZb(e, D); + } + } + function $$b(a, b, c, d) { + var e, f, g, h, i, j, k; + f = a_b(d); + h = Ccb(DD(vNb(d, (Nyc(), uxc)))); + if ((h || Ccb(DD(vNb(a, exc)))) && !fcd(BD(vNb(a, Vxc), 98))) { + e = Zcd(f); + i = i_b(a, c, c == (KAc(), IAc) ? e : Wcd(e)); + } else { + i = new H0b(); + F0b(i, a); + if (b) { + k = i.n; + k.a = b.a - a.n.a; + k.b = b.b - a.n.b; + Q6c(k, 0, 0, a.o.a, a.o.b); + G0b(i, W$b(i, f)); + } else { + e = Zcd(f); + G0b(i, c == (KAc(), IAc) ? e : Wcd(e)); + } + g = BD(vNb(d, (wtc(), Ksc)), 21); + j = i.j; + switch (f.g) { + case 2: + case 1: + (j == (Ucd(), Acd) || j == Rcd) && g.Fc((Orc(), Lrc)); + break; + case 4: + case 3: + (j == (Ucd(), zcd) || j == Tcd) && g.Fc((Orc(), Lrc)); + } + } + return i; + } + function pPc(a, b, c) { + var d, e, f, g, h, i, j, k; + if (Math.abs(b.s - b.c) < qme || Math.abs(c.s - c.c) < qme) { + return 0; + } + d = oPc(a, b.j, c.e); + e = oPc(a, c.j, b.e); + f = d == -1 || e == -1; + g = 0; + if (f) { + if (d == -1) { + new DOc((HOc(), FOc), c, b, 1); + ++g; + } + if (e == -1) { + new DOc((HOc(), FOc), b, c, 1); + ++g; + } + } else { + h = vPc(b.j, c.s, c.c); + h += vPc(c.e, b.s, b.c); + i = vPc(c.j, b.s, b.c); + i += vPc(b.e, c.s, c.c); + j = d + 16 * h; + k = e + 16 * i; + if (j < k) { + new DOc((HOc(), GOc), b, c, k - j); + } else if (j > k) { + new DOc((HOc(), GOc), c, b, j - k); + } else if (j > 0 && k > 0) { + new DOc((HOc(), GOc), b, c, 0); + new DOc(GOc, c, b, 0); + } + } + return g; + } + function TUb(a, b) { + var c, d, e, f, g, h; + for (g = new nib(new eib(a.f.b).a); g.b; ) { + f = lib(g); + e = BD(f.cd(), 594); + if (b == 1) { + if (e.gf() != (ead(), dad) && e.gf() != _9c) { + continue; + } + } else { + if (e.gf() != (ead(), aad) && e.gf() != bad) { + continue; + } + } + d = BD(BD(f.dd(), 46).b, 81); + h = BD(BD(f.dd(), 46).a, 189); + c = h.c; + switch (e.gf().g) { + case 2: + d.g.c = a.e.a; + d.g.b = Math.max(1, d.g.b + c); + break; + case 1: + d.g.c = d.g.c + c; + d.g.b = Math.max(1, d.g.b - c); + break; + case 4: + d.g.d = a.e.b; + d.g.a = Math.max(1, d.g.a + c); + break; + case 3: + d.g.d = d.g.d + c; + d.g.a = Math.max(1, d.g.a - c); + } + } + } + function nJc(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o, p; + h = KC(WD, oje, 25, b.b.c.length, 15, 1); + j = KC(NQ, Kie, 267, b.b.c.length, 0, 1); + i = KC(OQ, kne, 10, b.b.c.length, 0, 1); + for (l = a.a, m = 0, n = l.length; m < n; ++m) { + k = l[m]; + p = 0; + for (g = new olb(k.e); g.a < g.c.c.length; ) { + e = BD(mlb(g), 10); + d = G1b(e.c); + ++h[d]; + o = Edb(ED(vNb(b, (Nyc(), lyc)))); + h[d] > 0 && !!i[d] && (o = jBc(a.b, i[d], e)); + p = Math.max(p, e.c.c.b + o); + } + for (f = new olb(k.e); f.a < f.c.c.length; ) { + e = BD(mlb(f), 10); + e.n.b = p + e.d.d; + c = e.c; + c.c.b = p + e.d.d + e.o.b + e.d.a; + j[Jkb(c.b.b, c, 0)] = e.k; + i[Jkb(c.b.b, c, 0)] = e; + } + } + } + function LXc(a, b) { + var c, d, e, f, g, h, i, j, k, l, m; + for (d = new Sr(ur(_sd(b).a.Kc(), new Sq())); Qr(d); ) { + c = BD(Rr(d), 79); + if (!JD(qud((!c.b && (c.b = new y5d(z2, c, 4, 7)), c.b), 0), 186)) { + i = atd(BD(qud((!c.c && (c.c = new y5d(z2, c, 5, 8)), c.c), 0), 82)); + if (!Pld(c)) { + g = b.i + b.g / 2; + h = b.j + b.f / 2; + k = i.i + i.g / 2; + l = i.j + i.f / 2; + m = new d7c(); + m.a = k - g; + m.b = l - h; + f = new f7c(m.a, m.b); + l6c(f, b.g, b.f); + m.a -= f.a; + m.b -= f.b; + g = k - m.a; + h = l - m.b; + j = new f7c(m.a, m.b); + l6c(j, i.g, i.f); + m.a -= j.a; + m.b -= j.b; + k = g + m.a; + l = h + m.b; + e = itd(c, true, true); + omd(e, g); + pmd(e, h); + hmd(e, k); + imd(e, l); + LXc(a, i); + } + } + } + } + function e0c(a) { + r4c( + a, + new E3c( + P3c( + M3c( + O3c(N3c(new R3c(), Pre), "ELK SPOrE Compaction"), + "ShrinkTree is a compaction algorithm that maintains the topology of a layout. The relocation of diagram elements is based on contracting a spanning tree." + ), + new h0c() + ) + ) + ); + p4c(a, Pre, Qre, Ksd(c0c)); + p4c(a, Pre, Rre, Ksd(__c)); + p4c(a, Pre, Sre, Ksd($_c)); + p4c(a, Pre, Tre, Ksd(Y_c)); + p4c(a, Pre, Ure, Ksd(Z_c)); + p4c(a, Pre, ame, X_c); + p4c(a, Pre, wme, 8); + p4c(a, Pre, Vre, Ksd(b0c)); + p4c(a, Pre, Wre, Ksd(T_c)); + p4c(a, Pre, Xre, Ksd(U_c)); + p4c(a, Pre, Zpe, (Bcb(), false)); + } + function JLc(a, b) { + var c, d, e, f, g, h, i, j, k, l; + Odd(b, "Simple node placement", 1); + l = BD(vNb(a, (wtc(), otc)), 304); + h = 0; + for (f = new olb(a.b); f.a < f.c.c.length; ) { + d = BD(mlb(f), 29); + g = d.c; + g.b = 0; + c = null; + for (j = new olb(d.a); j.a < j.c.c.length; ) { + i = BD(mlb(j), 10); + !!c && (g.b += hBc(i, c, l.c)); + g.b += i.d.d + i.o.b + i.d.a; + c = i; + } + h = Math.max(h, g.b); + } + for (e = new olb(a.b); e.a < e.c.c.length; ) { + d = BD(mlb(e), 29); + g = d.c; + k = (h - g.b) / 2; + c = null; + for (j = new olb(d.a); j.a < j.c.c.length; ) { + i = BD(mlb(j), 10); + !!c && (k += hBc(i, c, l.c)); + k += i.d.d; + i.n.b = k; + k += i.o.b + i.d.a; + c = i; + } + } + Qdd(b); + } + function s2d(a, b, c, d) { + var e, f, g, h, i, j, k, l; + if (d.gc() == 0) { + return false; + } + i = (Q6d(), BD(b, 66).Oj()); + g = i ? d : new zud(d.gc()); + if (T6d(a.e, b)) { + if (b.hi()) { + for (k = d.Kc(); k.Ob(); ) { + j = k.Pb(); + if (!F2d(a, b, j, JD(b, 99) && (BD(b, 18).Bb & Tje) != 0)) { + f = R6d(b, j); + g.Fc(f); + } + } + } else if (!i) { + for (k = d.Kc(); k.Ob(); ) { + j = k.Pb(); + f = R6d(b, j); + g.Fc(f); + } + } + } else { + l = S6d(a.e.Tg(), b); + e = BD(a.g, 119); + for (h = 0; h < a.i; ++h) { + f = e[h]; + if (l.rl(f.ak())) { + throw vbb(new Wdb(Hwe)); + } + } + if (d.gc() > 1) { + throw vbb(new Wdb(Hwe)); + } + if (!i) { + f = R6d(b, d.Kc().Pb()); + g.Fc(f); + } + } + return xtd(a, I2d(a, b, c), g); + } + function Pmc(a, b) { + var c, d, e, f; + Jmc(b.b.j); + MAb(NAb(new YAb(null, new Kub(b.d, 16)), new $mc()), new anc()); + for (f = new olb(b.d); f.a < f.c.c.length; ) { + e = BD(mlb(f), 101); + switch (e.e.g) { + case 0: + c = BD(Ikb(e.j, 0), 113).d.j; + mjc(e, BD(Btb(RAb(BD(Qc(e.k, c), 15).Oc(), Hmc)), 113)); + njc(e, BD(Btb(QAb(BD(Qc(e.k, c), 15).Oc(), Hmc)), 113)); + break; + case 1: + d = Bkc(e); + mjc(e, BD(Btb(RAb(BD(Qc(e.k, d[0]), 15).Oc(), Hmc)), 113)); + njc(e, BD(Btb(QAb(BD(Qc(e.k, d[1]), 15).Oc(), Hmc)), 113)); + break; + case 2: + Rmc(a, e); + break; + case 3: + Qmc(e); + break; + case 4: + Omc(a, e); + } + Mmc(e); + } + a.a = null; + } + function $Mc(a, b, c) { + var d, e, f, g, h, i, j, k; + d = a.a.o == (eMc(), dMc) ? Pje : Qje; + h = _Mc(a, new ZMc(b, c)); + if (!h.a && h.c) { + Dsb(a.d, h); + return d; + } else if (h.a) { + e = h.a.c; + i = h.a.d; + if (c) { + j = a.a.c == (YLc(), XLc) ? i : e; + f = a.a.c == XLc ? e : i; + g = a.a.g[f.i.p]; + k = + Edb(a.a.p[g.p]) + + Edb(a.a.d[f.i.p]) + + f.n.b + + f.a.b - + Edb(a.a.d[j.i.p]) - + j.n.b - + j.a.b; + } else { + j = a.a.c == (YLc(), WLc) ? i : e; + f = a.a.c == WLc ? e : i; + k = + Edb(a.a.p[a.a.g[f.i.p].p]) + + Edb(a.a.d[f.i.p]) + + f.n.b + + f.a.b - + Edb(a.a.d[j.i.p]) - + j.n.b - + j.a.b; + } + a.a.n[a.a.g[e.i.p].p] = (Bcb(), true); + a.a.n[a.a.g[i.i.p].p] = true; + return k; + } + return d; + } + function f3d(a, b, c) { + var d, e, f, g, h, i, j, k; + if (T6d(a.e, b)) { + i = (Q6d(), BD(b, 66).Oj() ? new R7d(b, a) : new f7d(b, a)); + D2d(i.c, i.b); + b7d(i, BD(c, 14)); + } else { + k = S6d(a.e.Tg(), b); + d = BD(a.g, 119); + for (g = 0; g < a.i; ++g) { + e = d[g]; + f = e.ak(); + if (k.rl(f)) { + if (f == (m8d(), k8d) || f == h8d) { + j = m3d(a, b, c); + h = g; + j ? Xxd(a, g) : ++g; + while (g < a.i) { + e = d[g]; + f = e.ak(); + f == k8d || f == h8d ? Xxd(a, g) : ++g; + } + j || BD(Gtd(a, h, R6d(b, c)), 72); + } else + m3d(a, b, c) + ? Xxd(a, g) + : BD( + Gtd(a, g, (Q6d(), BD(b, 66).Oj() ? BD(c, 72) : R6d(b, c))), + 72 + ); + return; + } + } + m3d(a, b, c) || wtd(a, (Q6d(), BD(b, 66).Oj() ? BD(c, 72) : R6d(b, c))); + } + } + function IMb(a, b, c) { + var d, e, f, g, h, i, j, k; + if (!pb(c, a.b)) { + a.b = c; + f = new LMb(); + g = BD( + GAb( + NAb(new YAb(null, new Kub(c.f, 16)), f), + Ayb( + new hzb(), + new jzb(), + new Gzb(), + new Izb(), + OC(GC(xL, 1), Kie, 132, 0, [(Fyb(), Eyb), Dyb]) + ) + ), + 21 + ); + a.e = true; + a.f = true; + a.c = true; + a.d = true; + e = g.Hc((RMb(), OMb)); + d = g.Hc(PMb); + e && !d && (a.f = false); + !e && d && (a.d = false); + e = g.Hc(NMb); + d = g.Hc(QMb); + e && !d && (a.c = false); + !e && d && (a.e = false); + } + k = BD(a.a.Ce(b, c), 46); + i = BD(k.a, 19).a; + j = BD(k.b, 19).a; + h = false; + i < 0 ? a.c || (h = true) : a.e || (h = true); + j < 0 ? a.d || (h = true) : a.f || (h = true); + return h ? IMb(a, k, c) : k; + } + function oKb(a) { + var b, c, d, e; + e = a.o; + $Jb(); + if (a.A.dc() || pb(a.A, ZJb)) { + b = e.b; + } else { + b = fIb(a.f); + if (a.A.Hc((tdd(), qdd)) && !a.B.Hc((Idd(), Edd))) { + b = Math.max(b, fIb(BD(Mpb(a.p, (Ucd(), zcd)), 244))); + b = Math.max(b, fIb(BD(Mpb(a.p, Tcd), 244))); + } + c = aKb(a); + !!c && (b = Math.max(b, c.b)); + if (a.A.Hc(rdd)) { + if (a.q == (dcd(), _bd) || a.q == $bd) { + b = Math.max(b, _Gb(BD(Mpb(a.b, (Ucd(), zcd)), 124))); + b = Math.max(b, _Gb(BD(Mpb(a.b, Tcd), 124))); + } + } + } + Ccb(DD(a.e.yf().We((Y9c(), $8c)))) ? (e.b = Math.max(e.b, b)) : (e.b = b); + d = a.f.i; + d.d = 0; + d.a = b; + iIb(a.f); + } + function $Ic(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o, p; + for (l = 0; l < b.length; l++) { + for (h = a.Kc(); h.Ob(); ) { + f = BD(h.Pb(), 225); + f.Of(l, b); + } + for (m = 0; m < b[l].length; m++) { + for (i = a.Kc(); i.Ob(); ) { + f = BD(i.Pb(), 225); + f.Pf(l, m, b); + } + p = b[l][m].j; + for (n = 0; n < p.c.length; n++) { + for (j = a.Kc(); j.Ob(); ) { + f = BD(j.Pb(), 225); + f.Qf(l, m, n, b); + } + o = (tCb(n, p.c.length), BD(p.c[n], 11)); + c = 0; + for (e = new b1b(o.b); llb(e.a) || llb(e.b); ) { + d = BD(llb(e.a) ? mlb(e.a) : mlb(e.b), 17); + for (k = a.Kc(); k.Ob(); ) { + f = BD(k.Pb(), 225); + f.Nf(l, m, n, c++, d, b); + } + } + } + } + } + for (g = a.Kc(); g.Ob(); ) { + f = BD(g.Pb(), 225); + f.Mf(); + } + } + function J4b(a, b) { + var c, d, e, f, g, h, i; + a.b = Edb(ED(vNb(b, (Nyc(), myc)))); + a.c = Edb(ED(vNb(b, pyc))); + a.d = BD(vNb(b, Xwc), 336); + a.a = BD(vNb(b, swc), 275); + H4b(b); + h = BD( + GAb( + JAb( + JAb( + LAb(LAb(new YAb(null, new Kub(b.b, 16)), new N4b()), new P4b()), + new R4b() + ), + new T4b() + ), + Byb( + new fzb(), + new dzb(), + new Ezb(), + OC(GC(xL, 1), Kie, 132, 0, [(Fyb(), Dyb)]) + ) + ), + 15 + ); + for (e = h.Kc(); e.Ob(); ) { + c = BD(e.Pb(), 17); + g = BD(vNb(c, (wtc(), rtc)), 15); + g.Jc(new V4b(a)); + yNb(c, rtc, null); + } + for (d = h.Kc(); d.Ob(); ) { + c = BD(d.Pb(), 17); + i = BD(vNb(c, (wtc(), stc)), 17); + f = BD(vNb(c, ptc), 15); + B4b(a, f, i); + yNb(c, ptc, null); + } + } + function uZd(a) { + a.b = null; + a.a = null; + a.o = null; + a.q = null; + a.v = null; + a.w = null; + a.B = null; + a.p = null; + a.Q = null; + a.R = null; + a.S = null; + a.T = null; + a.U = null; + a.V = null; + a.W = null; + a.bb = null; + a.eb = null; + a.ab = null; + a.H = null; + a.db = null; + a.c = null; + a.d = null; + a.f = null; + a.n = null; + a.r = null; + a.s = null; + a.u = null; + a.G = null; + a.J = null; + a.e = null; + a.j = null; + a.i = null; + a.g = null; + a.k = null; + a.t = null; + a.F = null; + a.I = null; + a.L = null; + a.M = null; + a.O = null; + a.P = null; + a.$ = null; + a.N = null; + a.Z = null; + a.cb = null; + a.K = null; + a.D = null; + a.A = null; + a.C = null; + a._ = null; + a.fb = null; + a.X = null; + a.Y = null; + a.gb = false; + a.hb = false; + } + function bKc(a) { + var b, c, d, e, f, g, h, i, j; + if (a.k != (j0b(), h0b)) { + return false; + } + if (a.j.c.length <= 1) { + return false; + } + f = BD(vNb(a, (Nyc(), Vxc)), 98); + if (f == (dcd(), $bd)) { + return false; + } + e = + (Izc(), + (!a.q ? (mmb(), mmb(), kmb) : a.q)._b(Cxc) + ? (d = BD(vNb(a, Cxc), 197)) + : (d = BD(vNb(Q_b(a), Dxc), 197)), + d); + if (e == Gzc) { + return false; + } + if (!(e == Fzc || e == Ezc)) { + g = Edb(ED(pBc(a, zyc))); + b = BD(vNb(a, yyc), 142); + !b && (b = new J_b(g, g, g, g)); + j = V_b(a, (Ucd(), Tcd)); + i = b.d + b.a + (j.gc() - 1) * g; + if (i > a.o.b) { + return false; + } + c = V_b(a, zcd); + h = b.d + b.a + (c.gc() - 1) * g; + if (h > a.o.b) { + return false; + } + } + return true; + } + function thb(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o; + g = a.e; + i = b.e; + if (g == 0) { + return b; + } + if (i == 0) { + return a; + } + f = a.d; + h = b.d; + if (f + h == 2) { + c = xbb(a.a[0], Yje); + d = xbb(b.a[0], Yje); + if (g == i) { + k = wbb(c, d); + o = Tbb(k); + n = Tbb(Pbb(k, 32)); + return n == 0 + ? new Ugb(g, o) + : new Vgb(g, 2, OC(GC(WD, 1), oje, 25, 15, [o, n])); + } + return ghb(g < 0 ? Qbb(d, c) : Qbb(c, d)); + } else if (g == i) { + m = g; + l = f >= h ? uhb(a.a, f, b.a, h) : uhb(b.a, h, a.a, f); + } else { + e = f != h ? (f > h ? 1 : -1) : whb(a.a, b.a, f); + if (e == 0) { + return Hgb(), Ggb; + } + if (e == 1) { + m = g; + l = zhb(a.a, f, b.a, h); + } else { + m = i; + l = zhb(b.a, h, a.a, f); + } + } + j = new Vgb(m, l.length, l); + Jgb(j); + return j; + } + function oZb(a, b, c, d, e, f, g) { + var h, i, j, k, l, m, n; + l = Ccb(DD(vNb(b, (Nyc(), vxc)))); + m = null; + f == (KAc(), HAc) && d.c.i == c + ? (m = d.c) + : f == IAc && d.d.i == c && (m = d.d); + j = g; + if (!j || !l || !!m) { + k = (Ucd(), Scd); + m ? (k = m.j) : fcd(BD(vNb(c, Vxc), 98)) && (k = f == HAc ? Tcd : zcd); + i = lZb(a, b, c, f, k, d); + h = kZb((Q_b(c), d)); + if (f == HAc) { + QZb(h, BD(Ikb(i.j, 0), 11)); + RZb(h, e); + } else { + QZb(h, e); + RZb(h, BD(Ikb(i.j, 0), 11)); + } + j = new yZb(d, h, i, BD(vNb(i, (wtc(), $sc)), 11), f, !m); + } else { + Ekb(j.e, d); + n = Math.max(Edb(ED(vNb(j.d, Zwc))), Edb(ED(vNb(d, Zwc)))); + yNb(j.d, Zwc, n); + } + Rc(a.a, d, new BZb(j.d, b, f)); + return j; + } + function V1d(a, b) { + var c, d, e, f, g, h, i, j, k, l; + k = null; + !!a.d && (k = BD(Phb(a.d, b), 138)); + if (!k) { + f = a.a.Mh(); + l = f.i; + if (!a.d || Vhb(a.d) != l) { + i = new Lqb(); + !!a.d && Ld(i, a.d); + j = i.f.c + i.g.c; + for (h = j; h < l; ++h) { + d = BD(qud(f, h), 138); + e = o1d(a.e, d).ne(); + c = BD(e == null ? jrb(i.f, null, d) : Drb(i.g, e, d), 138); + !!c && c != d && (e == null ? jrb(i.f, null, c) : Drb(i.g, e, c)); + } + if (i.f.c + i.g.c != l) { + for (g = 0; g < j; ++g) { + d = BD(qud(f, g), 138); + e = o1d(a.e, d).ne(); + c = BD(e == null ? jrb(i.f, null, d) : Drb(i.g, e, d), 138); + !!c && c != d && (e == null ? jrb(i.f, null, c) : Drb(i.g, e, c)); + } + } + a.d = i; + } + k = BD(Phb(a.d, b), 138); + } + return k; + } + function lZb(a, b, c, d, e, f) { + var g, h, i, j, k, l; + g = null; + j = d == (KAc(), HAc) ? f.c : f.d; + i = a_b(b); + if (j.i == c) { + g = BD(Ohb(a.b, j), 10); + if (!g) { + g = Z$b( + j, + BD(vNb(c, (Nyc(), Vxc)), 98), + e, + hZb(j), + null, + j.n, + j.o, + i, + b + ); + yNb(g, (wtc(), $sc), j); + Rhb(a.b, j, g); + } + } else { + g = Z$b( + ((k = new zNb()), + (l = Edb(ED(vNb(b, (Nyc(), lyc)))) / 2), + xNb(k, Uxc, l), + k), + BD(vNb(c, Vxc), 98), + e, + d == HAc ? -1 : 1, + null, + new d7c(), + new f7c(0, 0), + i, + b + ); + h = mZb(g, c, d); + yNb(g, (wtc(), $sc), h); + Rhb(a.b, h, g); + } + BD(vNb(b, (wtc(), Ksc)), 21).Fc((Orc(), Hrc)); + fcd(BD(vNb(b, (Nyc(), Vxc)), 98)) + ? yNb(b, Vxc, (dcd(), acd)) + : yNb(b, Vxc, (dcd(), bcd)); + return g; + } + function vNc(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o, p, q; + Odd(b, "Orthogonal edge routing", 1); + j = Edb(ED(vNb(a, (Nyc(), wyc)))); + c = Edb(ED(vNb(a, myc))); + d = Edb(ED(vNb(a, pyc))); + m = new tPc(0, c); + q = 0; + g = new Bib(a.b, 0); + h = null; + k = null; + i = null; + l = null; + do { + k = + g.b < g.d.gc() + ? (sCb(g.b < g.d.gc()), BD(g.d.Xb((g.c = g.b++)), 29)) + : null; + l = !k ? null : k.a; + if (h) { + h_b(h, q); + q += h.c.a; + } + p = !h ? q : q + d; + o = sPc(m, a, i, l, p); + e = !h || Kq(i, (FNc(), DNc)); + f = !k || Kq(l, (FNc(), DNc)); + if (o > 0) { + n = (o - 1) * c; + !!h && (n += d); + !!k && (n += d); + n < j && !e && !f && (n = j); + q += n; + } else !e && !f && (q += j); + h = k; + i = l; + } while (k); + a.f.a = q; + Qdd(b); + } + function IEd() { + IEd = ccb; + var a; + HEd = new mFd(); + BEd = KC(ZI, nie, 2, 0, 6, 1); + uEd = Mbb(ZEd(33, 58), ZEd(1, 26)); + vEd = Mbb(ZEd(97, 122), ZEd(65, 90)); + wEd = ZEd(48, 57); + sEd = Mbb(uEd, 0); + tEd = Mbb(vEd, wEd); + xEd = Mbb(Mbb(0, ZEd(1, 6)), ZEd(33, 38)); + yEd = Mbb(Mbb(wEd, ZEd(65, 70)), ZEd(97, 102)); + EEd = Mbb(sEd, XEd("-_.!~*'()")); + FEd = Mbb(tEd, $Ed("-_.!~*'()")); + XEd(lve); + $Ed(lve); + Mbb(EEd, XEd(";:@&=+$,")); + Mbb(FEd, $Ed(";:@&=+$,")); + zEd = XEd(":/?#"); + AEd = $Ed(":/?#"); + CEd = XEd("/?#"); + DEd = $Ed("/?#"); + a = new Tqb(); + a.a.zc("jar", a); + a.a.zc("zip", a); + a.a.zc("archive", a); + GEd = (mmb(), new zob(a)); + } + function yUc(a, b) { + var c, d, e, f, g, h, i, j, k, l; + yNb(b, (mTc(), cTc), 0); + i = BD(vNb(b, aTc), 86); + if (b.d.b == 0) { + if (i) { + k = Edb(ED(vNb(i, fTc))) + a.a + zUc(i, b); + yNb(b, fTc, k); + } else { + yNb(b, fTc, 0); + } + } else { + for (d = ((f = Jsb(new ZRc(b).a.d, 0)), new aSc(f)); Wsb(d.a); ) { + c = BD(Xsb(d.a), 188).c; + yUc(a, c); + } + h = BD(pr(((g = Jsb(new ZRc(b).a.d, 0)), new aSc(g))), 86); + l = BD(or(((e = Jsb(new ZRc(b).a.d, 0)), new aSc(e))), 86); + j = (Edb(ED(vNb(l, fTc))) + Edb(ED(vNb(h, fTc)))) / 2; + if (i) { + k = Edb(ED(vNb(i, fTc))) + a.a + zUc(i, b); + yNb(b, fTc, k); + yNb(b, cTc, Edb(ED(vNb(b, fTc))) - j); + xUc(a, b); + } else { + yNb(b, fTc, j); + } + } + } + function Dbc(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o; + h = 0; + o = 0; + i = tlb(a.f, a.f.length); + f = a.d; + g = a.i; + d = a.a; + e = a.b; + do { + n = 0; + for (k = new olb(a.p); k.a < k.c.c.length; ) { + j = BD(mlb(k), 10); + m = Cbc(a, j); + c = true; + (a.q == (kAc(), dAc) || a.q == gAc) && (c = Ccb(DD(m.b))); + if (BD(m.a, 19).a < 0 && c) { + ++n; + i = tlb(a.f, a.f.length); + a.d = a.d + BD(m.a, 19).a; + o += f - a.d; + f = a.d + BD(m.a, 19).a; + g = a.i; + d = Mu(a.a); + e = Mu(a.b); + } else { + a.f = tlb(i, i.length); + a.d = f; + a.a = (Qb(d), d ? new Tkb(d) : Nu(new olb(d))); + a.b = (Qb(e), e ? new Tkb(e) : Nu(new olb(e))); + a.i = g; + } + } + ++h; + l = n != 0 && Ccb(DD(b.Kb(new vgd(meb(o), meb(h))))); + } while (l); + } + function lYc(a, b, c, d) { + var e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, A, B, C; + g = a.f; + m = b.f; + h = g == (k$c(), f$c) || g == h$c; + n = m == f$c || m == h$c; + i = g == g$c || g == i$c; + o = m == g$c || m == i$c; + j = g == g$c || g == f$c; + p = m == g$c || m == f$c; + if (h && n) { + return a.f == h$c ? a : b; + } else if (i && o) { + return a.f == i$c ? a : b; + } else if (j && p) { + if (g == g$c) { + l = a; + k = b; + } else { + l = b; + k = a; + } + f = + ((q = c.j + c.f), + (r = l.e + d.f), + (s = Math.max(q, r)), + (t = s - Math.min(c.j, l.e)), + (u = l.d + d.g - c.i), + u * t); + e = + ((v = c.i + c.g), + (w = k.d + d.g), + (A = Math.max(v, w)), + (B = A - Math.min(c.i, k.d)), + (C = k.e + d.f - c.j), + B * C); + return f <= e ? (a.f == g$c ? a : b) : a.f == f$c ? a : b; + } + return a; + } + function wGb(a) { + var b, c, d, e, f, g, h, i, j, k, l; + k = a.e.a.c.length; + for (g = new olb(a.e.a); g.a < g.c.c.length; ) { + f = BD(mlb(g), 121); + f.j = false; + } + a.i = KC(WD, oje, 25, k, 15, 1); + a.g = KC(WD, oje, 25, k, 15, 1); + a.n = new Rkb(); + e = 0; + l = new Rkb(); + for (i = new olb(a.e.a); i.a < i.c.c.length; ) { + h = BD(mlb(i), 121); + h.d = e++; + h.b.a.c.length == 0 && Ekb(a.n, h); + Gkb(l, h.g); + } + b = 0; + for (d = new olb(l); d.a < d.c.c.length; ) { + c = BD(mlb(d), 213); + c.c = b++; + c.f = false; + } + j = l.c.length; + if (a.b == null || a.b.length < j) { + a.b = KC(UD, Vje, 25, j, 15, 1); + a.c = KC(sbb, dle, 25, j, 16, 1); + } else { + Blb(a.c); + } + a.d = l; + a.p = new Asb(Cv(a.d.c.length)); + a.j = 1; + } + function sTb(a, b) { + var c, d, e, f, g, h, i, j, k; + if (b.e.c.length <= 1) { + return; + } + a.f = b; + a.d = BD(vNb(a.f, (bTb(), SSb)), 379); + a.g = BD(vNb(a.f, WSb), 19).a; + a.e = Edb(ED(vNb(a.f, TSb))); + a.c = Edb(ED(vNb(a.f, RSb))); + it(a.b); + for (e = new olb(a.f.c); e.a < e.c.c.length; ) { + d = BD(mlb(e), 282); + ht(a.b, d.c, d, null); + ht(a.b, d.d, d, null); + } + h = a.f.e.c.length; + a.a = IC(UD, [nie, Vje], [104, 25], 15, [h, h], 2); + for (j = new olb(a.f.e); j.a < j.c.c.length; ) { + i = BD(mlb(j), 144); + oTb(a, i, a.a[i.b]); + } + a.i = IC(UD, [nie, Vje], [104, 25], 15, [h, h], 2); + for (f = 0; f < h; ++f) { + for (g = 0; g < h; ++g) { + c = a.a[f][g]; + k = 1 / (c * c); + a.i[f][g] = k; + } + } + } + function Vfe(a) { + var b, c, d, e; + if (a.b == null || a.b.length <= 2) return; + if (a.a) return; + b = 0; + e = 0; + while (e < a.b.length) { + if (b != e) { + a.b[b] = a.b[e++]; + a.b[b + 1] = a.b[e++]; + } else e += 2; + c = a.b[b + 1]; + while (e < a.b.length) { + if (c + 1 < a.b[e]) break; + if (c + 1 == a.b[e]) { + a.b[b + 1] = a.b[e + 1]; + c = a.b[b + 1]; + e += 2; + } else if (c >= a.b[e + 1]) { + e += 2; + } else if (c < a.b[e + 1]) { + a.b[b + 1] = a.b[e + 1]; + c = a.b[b + 1]; + e += 2; + } else { + throw vbb( + new hz( + "Token#compactRanges(): Internel Error: [" + + a.b[b] + + "," + + a.b[b + 1] + + "] [" + + a.b[e] + + "," + + a.b[e + 1] + + "]" + ) + ); + } + } + b += 2; + } + if (b != a.b.length) { + d = KC(WD, oje, 25, b, 15, 1); + $fb(a.b, 0, d, 0, b); + a.b = d; + } + a.a = true; + } + function pZb(a, b) { + var c, d, e, f, g, h, i; + for (g = Ec(a.a).Kc(); g.Ob(); ) { + f = BD(g.Pb(), 17); + if (f.b.c.length > 0) { + d = new Tkb(BD(Qc(a.a, f), 21)); + mmb(); + Okb(d, new EZb(b)); + e = new Bib(f.b, 0); + while (e.b < e.d.gc()) { + c = (sCb(e.b < e.d.gc()), BD(e.d.Xb((e.c = e.b++)), 70)); + h = -1; + switch (BD(vNb(c, (Nyc(), Qwc)), 272).g) { + case 1: + h = d.c.length - 1; + break; + case 0: + h = nZb(d); + break; + case 2: + h = 0; + } + if (h != -1) { + i = (tCb(h, d.c.length), BD(d.c[h], 243)); + Ekb(i.b.b, c); + BD(vNb(Q_b(i.b.c.i), (wtc(), Ksc)), 21).Fc((Orc(), Grc)); + BD(vNb(Q_b(i.b.c.i), Ksc), 21).Fc(Erc); + uib(e); + yNb(c, btc, f); + } + } + } + QZb(f, null); + RZb(f, null); + } + } + function FLb(a, b) { + var c, d, e, f; + c = new KLb(); + d = BD( + GAb( + NAb(new YAb(null, new Kub(a.f, 16)), c), + Ayb( + new hzb(), + new jzb(), + new Gzb(), + new Izb(), + OC(GC(xL, 1), Kie, 132, 0, [(Fyb(), Eyb), Dyb]) + ) + ), + 21 + ); + e = d.gc(); + e = e == 2 ? 1 : 0; + e == 1 && + Bbb( + Hbb( + BD(GAb(JAb(d.Lc(), new MLb()), Xyb(Aeb(0), new Czb())), 162).a, + 2 + ), + 0 + ) && + (e = 0); + d = BD( + GAb( + NAb(new YAb(null, new Kub(b.f, 16)), c), + Ayb( + new hzb(), + new jzb(), + new Gzb(), + new Izb(), + OC(GC(xL, 1), Kie, 132, 0, [Eyb, Dyb]) + ) + ), + 21 + ); + f = d.gc(); + f = f == 2 ? 1 : 0; + f == 1 && + Bbb( + Hbb( + BD(GAb(JAb(d.Lc(), new OLb()), Xyb(Aeb(0), new Czb())), 162).a, + 2 + ), + 0 + ) && + (f = 0); + if (e < f) { + return -1; + } + if (e == f) { + return 0; + } + return 1; + } + function h6b(a) { + var b, c, d, e, f, g, h, i, j, k, l, m, n; + j = new Rkb(); + if (!wNb(a, (wtc(), Fsc))) { + return j; + } + for (d = BD(vNb(a, Fsc), 15).Kc(); d.Ob(); ) { + b = BD(d.Pb(), 10); + g6b(b, a); + j.c[j.c.length] = b; + } + for (f = new olb(a.b); f.a < f.c.c.length; ) { + e = BD(mlb(f), 29); + for (h = new olb(e.a); h.a < h.c.c.length; ) { + g = BD(mlb(h), 10); + if (g.k != (j0b(), e0b)) { + continue; + } + i = BD(vNb(g, Gsc), 10); + !!i && + ((k = new H0b()), + F0b(k, g), + (l = BD(vNb(g, Hsc), 61)), + G0b(k, l), + (m = BD(Ikb(i.j, 0), 11)), + (n = new UZb()), + QZb(n, k), + RZb(n, m), + undefined); + } + } + for (c = new olb(j); c.a < c.c.c.length; ) { + b = BD(mlb(c), 10); + $_b(b, BD(Ikb(a.b, a.b.c.length - 1), 29)); + } + return j; + } + function M1b(a) { + var b, c, d, e, f, g, h, i, j, k, l, m; + b = mpd(a); + f = Ccb(DD(hkd(b, (Nyc(), fxc)))); + k = 0; + e = 0; + for ( + j = new Fyd((!a.e && (a.e = new y5d(B2, a, 7, 4)), a.e)); + j.e != j.i.gc(); + + ) { + i = BD(Dyd(j), 79); + h = Qld(i); + g = h && f && Ccb(DD(hkd(i, gxc))); + m = atd(BD(qud((!i.c && (i.c = new y5d(z2, i, 5, 8)), i.c), 0), 82)); + h && g ? ++e : h && !g ? ++k : Xod(m) == b || m == b ? ++e : ++k; + } + for ( + d = new Fyd((!a.d && (a.d = new y5d(B2, a, 8, 5)), a.d)); + d.e != d.i.gc(); + + ) { + c = BD(Dyd(d), 79); + h = Qld(c); + g = h && f && Ccb(DD(hkd(c, gxc))); + l = atd(BD(qud((!c.b && (c.b = new y5d(z2, c, 4, 7)), c.b), 0), 82)); + h && g ? ++k : h && !g ? ++e : Xod(l) == b || l == b ? ++k : ++e; + } + return k - e; + } + function ubc(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n; + Odd(b, "Edge splitting", 1); + if (a.b.c.length <= 2) { + Qdd(b); + return; + } + f = new Bib(a.b, 0); + g = (sCb(f.b < f.d.gc()), BD(f.d.Xb((f.c = f.b++)), 29)); + while (f.b < f.d.gc()) { + e = g; + g = (sCb(f.b < f.d.gc()), BD(f.d.Xb((f.c = f.b++)), 29)); + for (i = new olb(e.a); i.a < i.c.c.length; ) { + h = BD(mlb(i), 10); + for (k = new olb(h.j); k.a < k.c.c.length; ) { + j = BD(mlb(k), 11); + for (d = new olb(j.g); d.a < d.c.c.length; ) { + c = BD(mlb(d), 17); + m = c.d; + l = m.i.c; + l != e && + l != g && + zbc( + c, + ((n = new b0b(a)), + __b(n, (j0b(), g0b)), + yNb(n, (wtc(), $sc), c), + yNb(n, (Nyc(), Vxc), (dcd(), $bd)), + $_b(n, g), + n) + ); + } + } + } + } + Qdd(b); + } + function MTb(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o; + h = b.p != null && !b.b; + h || Odd(b, kme, 1); + c = BD(vNb(a, (wtc(), itc)), 15); + g = 1 / c.gc(); + if (b.n) { + Sdd(b, "ELK Layered uses the following " + c.gc() + " modules:"); + n = 0; + for (m = c.Kc(); m.Ob(); ) { + k = BD(m.Pb(), 51); + d = (n < 10 ? "0" : "") + n++; + Sdd(b, " Slot " + d + ": " + hdb(rb(k))); + } + } + o = 0; + for (l = c.Kc(); l.Ob(); ) { + k = BD(l.Pb(), 51); + k.pf(a, Udd(b, g)); + ++o; + } + for (f = new olb(a.b); f.a < f.c.c.length; ) { + e = BD(mlb(f), 29); + Gkb(a.a, e.a); + e.a.c = KC(SI, Uhe, 1, 0, 5, 1); + } + for (j = new olb(a.a); j.a < j.c.c.length; ) { + i = BD(mlb(j), 10); + $_b(i, null); + } + a.b.c = KC(SI, Uhe, 1, 0, 5, 1); + h || Qdd(b); + } + function kJc(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, A; + d = Edb(ED(vNb(b, (Nyc(), Bxc)))); + v = BD(vNb(b, Ayc), 19).a; + m = 4; + e = 3; + w = 20 / v; + n = false; + i = 0; + g = Ohe; + do { + f = i != 1; + l = i != 0; + A = 0; + for (q = a.a, s = 0, u = q.length; s < u; ++s) { + o = q[s]; + o.f = null; + lJc(a, o, f, l, d); + A += Math.abs(o.a); + } + do { + h = pJc(a, b); + } while (h); + for (p = a.a, r = 0, t = p.length; r < t; ++r) { + o = p[r]; + c = xJc(o).a; + if (c != 0) { + for (k = new olb(o.e); k.a < k.c.c.length; ) { + j = BD(mlb(k), 10); + j.n.b += c; + } + } + } + if (i == 0 || i == 1) { + --m; + if (m <= 0 && (A < g || -m > v)) { + i = 2; + g = Ohe; + } else if (i == 0) { + i = 1; + g = A; + } else { + i = 0; + g = A; + } + } else { + n = A >= g || g - A < w; + g = A; + n && --e; + } + } while (!(n && e <= 0)); + } + function UCb(a, b, c) { + var d, e, f, g, h, i, j, k, l, m, n, o; + o = new Lqb(); + for (f = a.a.ec().Kc(); f.Ob(); ) { + d = BD(f.Pb(), 168); + Rhb(o, d, c.Je(d)); + } + g = (Qb(a), a ? new Tkb(a) : Nu(a.a.ec().Kc())); + Okb(g, new WCb(o)); + h = Gx(g); + i = new hDb(b); + n = new Lqb(); + jrb(n.f, b, i); + while (h.a.gc() != 0) { + j = null; + k = null; + l = null; + for (e = h.a.ec().Kc(); e.Ob(); ) { + d = BD(e.Pb(), 168); + if (Edb(ED(Wd(irb(o.f, d)))) <= Pje) { + if (Mhb(n, d.a) && !Mhb(n, d.b)) { + k = d.b; + l = d.a; + j = d; + break; + } + if (Mhb(n, d.b)) { + if (!Mhb(n, d.a)) { + k = d.a; + l = d.b; + j = d; + break; + } + } + } + } + if (!j) { + break; + } + m = new hDb(k); + Ekb(BD(Wd(irb(n.f, l)), 221).a, m); + jrb(n.f, k, m); + h.a.Bc(j) != null; + } + return i; + } + function UBc(a, b, c) { + var d, e, f, g, h, i, j, k, l, m, n; + Odd(c, "Depth-first cycle removal", 1); + l = b.a; + k = l.c.length; + a.c = new Rkb(); + a.d = KC(sbb, dle, 25, k, 16, 1); + a.a = KC(sbb, dle, 25, k, 16, 1); + a.b = new Rkb(); + g = 0; + for (j = new olb(l); j.a < j.c.c.length; ) { + i = BD(mlb(j), 10); + i.p = g; + Qq(R_b(i)) && Ekb(a.c, i); + ++g; + } + for (n = new olb(a.c); n.a < n.c.c.length; ) { + m = BD(mlb(n), 10); + TBc(a, m); + } + for (f = 0; f < k; f++) { + if (!a.d[f]) { + h = (tCb(f, l.c.length), BD(l.c[f], 10)); + TBc(a, h); + } + } + for (e = new olb(a.b); e.a < e.c.c.length; ) { + d = BD(mlb(e), 17); + PZb(d, true); + yNb(b, (wtc(), Asc), (Bcb(), true)); + } + a.c = null; + a.d = null; + a.a = null; + a.b = null; + Qdd(c); + } + function PSc(a, b) { + var c, d, e, f, g, h, i; + a.a.c = KC(SI, Uhe, 1, 0, 5, 1); + for (d = Jsb(b.b, 0); d.b != d.d.c; ) { + c = BD(Xsb(d), 86); + if (c.b.b == 0) { + yNb(c, (mTc(), jTc), (Bcb(), true)); + Ekb(a.a, c); + } + } + switch (a.a.c.length) { + case 0: + e = new XRc(0, b, "DUMMY_ROOT"); + yNb(e, (mTc(), jTc), (Bcb(), true)); + yNb(e, YSc, true); + Dsb(b.b, e); + break; + case 1: + break; + default: + f = new XRc(0, b, "SUPER_ROOT"); + for (h = new olb(a.a); h.a < h.c.c.length; ) { + g = BD(mlb(h), 86); + i = new QRc(f, g); + yNb(i, (mTc(), YSc), (Bcb(), true)); + Dsb(f.a.a, i); + Dsb(f.d, i); + Dsb(g.b, i); + yNb(g, jTc, false); + } + yNb(f, (mTc(), jTc), (Bcb(), true)); + yNb(f, YSc, true); + Dsb(b.b, f); + } + } + function z6c(a, b) { + i6c(); + var c, d, e, f, g, h; + f = b.c - (a.c + a.b); + e = a.c - (b.c + b.b); + g = a.d - (b.d + b.a); + c = b.d - (a.d + a.a); + d = Math.max(e, f); + h = Math.max(g, c); + Iy(); + My(Jqe); + if ( + ((Math.abs(d) <= Jqe || d == 0 || (isNaN(d) && isNaN(0)) + ? 0 + : d < 0 + ? -1 + : d > 0 + ? 1 + : Ny(isNaN(d), isNaN(0))) >= + 0) ^ + (null, + My(Jqe), + (Math.abs(h) <= Jqe || h == 0 || (isNaN(h) && isNaN(0)) + ? 0 + : h < 0 + ? -1 + : h > 0 + ? 1 + : Ny(isNaN(h), isNaN(0))) >= 0) + ) { + return Math.max(h, d); + } + My(Jqe); + if ( + (Math.abs(d) <= Jqe || d == 0 || (isNaN(d) && isNaN(0)) + ? 0 + : d < 0 + ? -1 + : d > 0 + ? 1 + : Ny(isNaN(d), isNaN(0))) > 0 + ) { + return Math.sqrt(h * h + d * d); + } + return -Math.sqrt(h * h + d * d); + } + function Kge(a, b) { + var c, d, e, f, g, h; + if (!b) return; + !a.a && (a.a = new Wvb()); + if (a.e == 2) { + Tvb(a.a, b); + return; + } + if (b.e == 1) { + for (e = 0; e < b.em(); e++) Kge(a, b.am(e)); + return; + } + h = a.a.a.c.length; + if (h == 0) { + Tvb(a.a, b); + return; + } + g = BD(Uvb(a.a, h - 1), 117); + if (!((g.e == 0 || g.e == 10) && (b.e == 0 || b.e == 10))) { + Tvb(a.a, b); + return; + } + f = b.e == 0 ? 2 : b.bm().length; + if (g.e == 0) { + c = new Ifb(); + d = g._l(); + d >= Tje ? Efb(c, Tee(d)) : Afb(c, d & aje); + g = (++vfe, new Hge(10, null, 0)); + Vvb(a.a, g, h - 1); + } else { + c = (g.bm().length + f, new Ifb()); + Efb(c, g.bm()); + } + if (b.e == 0) { + d = b._l(); + d >= Tje ? Efb(c, Tee(d)) : Afb(c, d & aje); + } else { + Efb(c, b.bm()); + } + BD(g, 521).b = c.a; + } + function rgb(a) { + var b, c, d, e, f; + if (a.g != null) { + return a.g; + } + if (a.a < 32) { + a.g = rhb(Cbb(a.f), QD(a.e)); + return a.g; + } + e = shb((!a.c && (a.c = fhb(a.f)), a.c), 0); + if (a.e == 0) { + return e; + } + b = (!a.c && (a.c = fhb(a.f)), a.c).e < 0 ? 2 : 1; + c = e.length; + d = -a.e + c - b; + f = new Ufb(); + f.a += "" + e; + if (a.e > 0 && d >= -6) { + if (d >= 0) { + Tfb(f, c - QD(a.e), String.fromCharCode(46)); + } else { + f.a = qfb(f.a, 0, b - 1) + "0." + pfb(f.a, b - 1); + Tfb(f, b + 1, zfb(egb, 0, -QD(d) - 1)); + } + } else { + if (c - b >= 1) { + Tfb(f, b, String.fromCharCode(46)); + ++c; + } + Tfb(f, c, String.fromCharCode(69)); + d > 0 && Tfb(f, ++c, String.fromCharCode(43)); + Tfb(f, ++c, "" + Ubb(Cbb(d))); + } + a.g = f.a; + return a.g; + } + function npc(a, b, c) { + var d, e, f, g, h, i, j, k, l, m, n, o, p, q; + if (c.dc()) { + return; + } + h = 0; + m = 0; + d = c.Kc(); + o = BD(d.Pb(), 19).a; + while (h < b.f) { + if (h == o) { + m = 0; + d.Ob() ? (o = BD(d.Pb(), 19).a) : (o = b.f + 1); + } + if (h != m) { + q = BD(Ikb(a.b, h), 29); + n = BD(Ikb(a.b, m), 29); + p = Mu(q.a); + for (l = new olb(p); l.a < l.c.c.length; ) { + k = BD(mlb(l), 10); + Z_b(k, n.a.c.length, n); + if (m == 0) { + g = Mu(R_b(k)); + for (f = new olb(g); f.a < f.c.c.length; ) { + e = BD(mlb(f), 17); + PZb(e, true); + yNb(a, (wtc(), Asc), (Bcb(), true)); + Noc(a, e, 1); + } + } + } + } + ++m; + ++h; + } + i = new Bib(a.b, 0); + while (i.b < i.d.gc()) { + j = (sCb(i.b < i.d.gc()), BD(i.d.Xb((i.c = i.b++)), 29)); + j.a.c.length == 0 && uib(i); + } + } + function xmc(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t; + g = b.b; + k = g.o; + i = g.d; + d = Edb(ED(c_b(g, (Nyc(), lyc)))); + e = Edb(ED(c_b(g, nyc))); + j = Edb(ED(c_b(g, xyc))); + h = new L_b(); + v_b(h, i.d, i.c, i.a, i.b); + m = tmc(b, d, e, j); + for (r = new olb(b.d); r.a < r.c.c.length; ) { + q = BD(mlb(r), 101); + for (o = q.f.a.ec().Kc(); o.Ob(); ) { + n = BD(o.Pb(), 409); + f = n.a; + l = rmc(n); + c = + ((s = new s7c()), + pmc(n, n.c, m, s), + omc(n, l, m, s), + pmc(n, n.d, m, s), + s); + c = a.Uf(n, l, c); + Osb(f.a); + ye(f.a, c); + MAb(new YAb(null, new Kub(c, 16)), new Bmc(k, h)); + } + p = q.i; + if (p) { + wmc(q, p, m, e); + t = new g7c(p.g); + ymc(k, h, t); + P6c(t, p.j); + ymc(k, h, t); + } + } + v_b(i, h.d, h.c, h.a, h.b); + } + function rgc(a, b, c) { + var d, e, f; + e = BD(vNb(b, (Nyc(), swc)), 275); + if (e == (yrc(), wrc)) { + return; + } + Odd(c, "Horizontal Compaction", 1); + a.a = b; + f = new Ygc(); + d = new cEb( + ((f.d = b), (f.c = BD(vNb(f.d, Swc), 218)), Pgc(f), Wgc(f), Vgc(f), f.a) + ); + aEb(d, a.b); + switch (BD(vNb(b, rwc), 422).g) { + case 1: + $Db(d, new jfc(a.a)); + break; + default: + $Db(d, (ODb(), MDb)); + } + switch (e.g) { + case 1: + TDb(d); + break; + case 2: + TDb(SDb(d, (ead(), bad))); + break; + case 3: + TDb(_Db(SDb(TDb(d), (ead(), bad)), new Bgc())); + break; + case 4: + TDb(_Db(SDb(TDb(d), (ead(), bad)), new Dgc(f))); + break; + case 5: + TDb(ZDb(d, pgc)); + } + SDb(d, (ead(), aad)); + d.e = true; + Mgc(f); + Qdd(c); + } + function mYc(a, b, c, d, e, f, g, h) { + var i, j, k, l; + i = Ou(OC(GC(z_, 1), Uhe, 220, 0, [b, c, d, e])); + l = null; + switch (a.b.g) { + case 1: + l = Ou(OC(GC(o_, 1), Uhe, 526, 0, [new uYc(), new oYc(), new qYc()])); + break; + case 0: + l = Ou(OC(GC(o_, 1), Uhe, 526, 0, [new qYc(), new oYc(), new uYc()])); + break; + case 2: + l = Ou(OC(GC(o_, 1), Uhe, 526, 0, [new oYc(), new uYc(), new qYc()])); + } + for (k = new olb(l); k.a < k.c.c.length; ) { + j = BD(mlb(k), 526); + i.c.length > 1 && (i = j.mg(i, a.a, h)); + } + if (i.c.length == 1) { + return BD(Ikb(i, i.c.length - 1), 220); + } + if (i.c.length == 2) { + return lYc( + (tCb(0, i.c.length), BD(i.c[0], 220)), + (tCb(1, i.c.length), BD(i.c[1], 220)), + g, + f + ); + } + return null; + } + function JNb(a) { + var b, c, d, e, f, g; + Hkb(a.a, new PNb()); + for (c = new olb(a.a); c.a < c.c.c.length; ) { + b = BD(mlb(c), 221); + d = c7c(R6c(BD(a.b, 65).c), BD(b.b, 65).c); + if (FNb) { + g = BD(a.b, 65).b; + f = BD(b.b, 65).b; + if (Math.abs(d.a) >= Math.abs(d.b)) { + d.b = 0; + f.d + f.a > g.d && + f.d < g.d + g.a && + $6c(d, Math.max(g.c - (f.c + f.b), f.c - (g.c + g.b))); + } else { + d.a = 0; + f.c + f.b > g.c && + f.c < g.c + g.b && + $6c(d, Math.max(g.d - (f.d + f.a), f.d - (g.d + g.a))); + } + } else { + $6c(d, _Nb(BD(a.b, 65), BD(b.b, 65))); + } + e = Math.sqrt(d.a * d.a + d.b * d.b); + e = LNb(GNb, b, e, d); + $6c(d, e); + $Nb(BD(b.b, 65), d); + Hkb(b.a, new RNb(d)); + BD(GNb.b, 65); + KNb(GNb, HNb, b); + } + } + function VJc(a) { + var b, c, d, e, f, g, h, i, j, k, l, m, n, o; + a.f = new KFb(); + j = 0; + e = 0; + for (g = new olb(a.e.b); g.a < g.c.c.length; ) { + f = BD(mlb(g), 29); + for (i = new olb(f.a); i.a < i.c.c.length; ) { + h = BD(mlb(i), 10); + h.p = j++; + for (d = new Sr(ur(U_b(h).a.Kc(), new Sq())); Qr(d); ) { + c = BD(Rr(d), 17); + c.p = e++; + } + b = bKc(h); + for (m = new olb(h.j); m.a < m.c.c.length; ) { + l = BD(mlb(m), 11); + if (b) { + o = l.a.b; + if (o != Math.floor(o)) { + k = o - Sbb(Cbb(Math.round(o))); + l.a.b -= k; + } + } + n = l.n.b + l.a.b; + if (n != Math.floor(n)) { + k = n - Sbb(Cbb(Math.round(n))); + l.n.b -= k; + } + } + } + } + a.g = j; + a.b = e; + a.i = KC(xY, Uhe, 401, j, 0, 1); + a.c = KC(wY, Uhe, 649, e, 0, 1); + a.d.a.$b(); + } + function Uxd(a) { + var b, c, d, e, f, g, h, i, j; + if (a.ej()) { + i = a.fj(); + if (a.i > 0) { + b = new _zd(a.i, a.g); + c = a.i; + f = c < 100 ? null : new Ixd(c); + if (a.ij()) { + for (d = 0; d < a.i; ++d) { + g = a.g[d]; + f = a.kj(g, f); + } + } + oud(a); + e = c == 1 ? a.Zi(4, qud(b, 0), null, 0, i) : a.Zi(6, b, null, -1, i); + if (a.bj()) { + for (d = new $yd(b); d.e != d.i.gc(); ) { + f = a.dj(Zyd(d), f); + } + if (!f) { + a.$i(e); + } else { + f.Ei(e); + f.Fi(); + } + } else { + if (!f) { + a.$i(e); + } else { + f.Ei(e); + f.Fi(); + } + } + } else { + oud(a); + a.$i(a.Zi(6, (mmb(), jmb), null, -1, i)); + } + } else if (a.bj()) { + if (a.i > 0) { + h = a.g; + j = a.i; + oud(a); + f = j < 100 ? null : new Ixd(j); + for (d = 0; d < j; ++d) { + g = h[d]; + f = a.dj(g, f); + } + !!f && f.Fi(); + } else { + oud(a); + } + } else { + oud(a); + } + } + function ZQc(a, b, c) { + var d, e, f, g, h, i, j, k, l, m; + TQc(this); + c == (FQc(), DQc) ? Qqb(this.r, a) : Qqb(this.w, a); + k = Pje; + j = Qje; + for (g = b.a.ec().Kc(); g.Ob(); ) { + e = BD(g.Pb(), 46); + h = BD(e.a, 455); + d = BD(e.b, 17); + i = d.c; + i == a && (i = d.d); + h == DQc ? Qqb(this.r, i) : Qqb(this.w, i); + m = (Ucd(), Lcd).Hc(i.j) + ? Edb(ED(vNb(i, (wtc(), qtc)))) + : l7c(OC(GC(m1, 1), nie, 8, 0, [i.i.n, i.n, i.a])).b; + k = Math.min(k, m); + j = Math.max(j, m); + } + l = (Ucd(), Lcd).Hc(a.j) + ? Edb(ED(vNb(a, (wtc(), qtc)))) + : l7c(OC(GC(m1, 1), nie, 8, 0, [a.i.n, a.n, a.a])).b; + XQc(this, l, k, j); + for (f = b.a.ec().Kc(); f.Ob(); ) { + e = BD(f.Pb(), 46); + UQc(this, BD(e.b, 17)); + } + this.o = false; + } + function gD(a, b) { + var c, + d, + e, + f, + g, + h, + i, + j, + k, + l, + m, + n, + o, + p, + q, + r, + s, + t, + u, + v, + w, + A, + B, + C, + D, + F, + G; + c = a.l & 8191; + d = (a.l >> 13) | ((a.m & 15) << 9); + e = (a.m >> 4) & 8191; + f = (a.m >> 17) | ((a.h & 255) << 5); + g = (a.h & 1048320) >> 8; + h = b.l & 8191; + i = (b.l >> 13) | ((b.m & 15) << 9); + j = (b.m >> 4) & 8191; + k = (b.m >> 17) | ((b.h & 255) << 5); + l = (b.h & 1048320) >> 8; + B = c * h; + C = d * h; + D = e * h; + F = f * h; + G = g * h; + if (i != 0) { + C += c * i; + D += d * i; + F += e * i; + G += f * i; + } + if (j != 0) { + D += c * j; + F += d * j; + G += e * j; + } + if (k != 0) { + F += c * k; + G += d * k; + } + l != 0 && (G += c * l); + n = B & Eje; + o = (C & 511) << 13; + m = n + o; + q = B >> 22; + r = C >> 9; + s = (D & 262143) << 4; + t = (F & 31) << 17; + p = q + r + s + t; + v = D >> 18; + w = F >> 5; + A = (G & 4095) << 8; + u = v + w + A; + p += m >> 22; + m &= Eje; + u += p >> 22; + p &= Eje; + u &= Fje; + return TC(m, p, u); + } + function o7b(a) { + var b, c, d, e, f, g, h; + h = BD(Ikb(a.j, 0), 11); + if (h.g.c.length != 0 && h.e.c.length != 0) { + throw vbb( + new Zdb( + "Interactive layout does not support NORTH/SOUTH ports with incoming _and_ outgoing edges." + ) + ); + } + if (h.g.c.length != 0) { + f = Pje; + for (c = new olb(h.g); c.a < c.c.c.length; ) { + b = BD(mlb(c), 17); + g = b.d.i; + d = BD(vNb(g, (Nyc(), txc)), 142); + f = Math.min(f, g.n.a - d.b); + } + return new cc(Qb(f)); + } + if (h.e.c.length != 0) { + e = Qje; + for (c = new olb(h.e); c.a < c.c.c.length; ) { + b = BD(mlb(c), 17); + g = b.c.i; + d = BD(vNb(g, (Nyc(), txc)), 142); + e = Math.max(e, g.n.a + g.o.a + d.c); + } + return new cc(Qb(e)); + } + return wb(), wb(), vb; + } + function ELd(a, b) { + var c, d, e, f, g, h, i; + if (a.Fk()) { + if (a.i > 4) { + if (a.wj(b)) { + if (a.rk()) { + e = BD(b, 49); + d = e.Ug(); + i = + d == a.e && + (a.Dk() + ? e.Og(e.Vg(), a.zk()) == a.Ak() + : -1 - e.Vg() == a.aj()); + if (a.Ek() && !i && !d && !!e.Zg()) { + for (f = 0; f < a.i; ++f) { + c = a.Gk(BD(a.g[f], 56)); + if (PD(c) === PD(b)) { + return true; + } + } + } + return i; + } else if (a.Dk() && !a.Ck()) { + g = BD(b, 56).ah(zUd(BD(a.ak(), 18))); + if (PD(g) === PD(a.e)) { + return true; + } else if (g == null || !BD(g, 56).kh()) { + return false; + } + } + } else { + return false; + } + } + h = pud(a, b); + if (a.Ek() && !h) { + for (f = 0; f < a.i; ++f) { + e = a.Gk(BD(a.g[f], 56)); + if (PD(e) === PD(b)) { + return true; + } + } + } + return h; + } else { + return pud(a, b); + } + } + function mHc(a, b) { + var c, d, e, f, g, h, i, j, k, l, m; + k = new Rkb(); + m = new Tqb(); + g = b.b; + for (e = 0; e < g.c.length; e++) { + j = (tCb(e, g.c.length), BD(g.c[e], 29)).a; + k.c = KC(SI, Uhe, 1, 0, 5, 1); + for (f = 0; f < j.c.length; f++) { + h = a.a[e][f]; + h.p = f; + h.k == (j0b(), i0b) && ((k.c[k.c.length] = h), true); + Nkb(BD(Ikb(b.b, e), 29).a, f, h); + h.j.c = KC(SI, Uhe, 1, 0, 5, 1); + Gkb(h.j, BD(BD(Ikb(a.b, e), 15).Xb(f), 14)); + ecd(BD(vNb(h, (Nyc(), Vxc)), 98)) || yNb(h, Vxc, (dcd(), Zbd)); + } + for (d = new olb(k); d.a < d.c.c.length; ) { + c = BD(mlb(d), 10); + l = kHc(c); + m.a.zc(l, m); + m.a.zc(c, m); + } + } + for (i = m.a.ec().Kc(); i.Ob(); ) { + h = BD(i.Pb(), 10); + mmb(); + Okb(h.j, (Occ(), Icc)); + h.i = true; + N_b(h); + } + } + function g6b(a, b) { + var c, d, e, f, g, h, i, j, k, l; + k = BD(vNb(a, (wtc(), Hsc)), 61); + d = BD(Ikb(a.j, 0), 11); + k == (Ucd(), Acd) ? G0b(d, Rcd) : k == Rcd && G0b(d, Acd); + if (BD(vNb(b, (Nyc(), Fxc)), 174).Hc((tdd(), sdd))) { + i = Edb(ED(vNb(a, tyc))); + j = Edb(ED(vNb(a, uyc))); + g = Edb(ED(vNb(a, ryc))); + h = BD(vNb(b, Yxc), 21); + if (h.Hc((rcd(), ncd))) { + c = j; + l = a.o.a / 2 - d.n.a; + for (f = new olb(d.f); f.a < f.c.c.length; ) { + e = BD(mlb(f), 70); + e.n.b = c; + e.n.a = l - e.o.a / 2; + c += e.o.b + g; + } + } else if (h.Hc(pcd)) { + for (f = new olb(d.f); f.a < f.c.c.length; ) { + e = BD(mlb(f), 70); + e.n.a = i + a.o.a - d.n.a; + } + } + WGb( + new YGb((a$b(), new l$b(b, false, false, new T$b()))), + new x$b(null, a, false) + ); + } + } + function Ugc(a, b) { + var c, d, e, f, g, h, i, j, k; + if (b.c.length == 0) { + return; + } + mmb(); + Mlb(b.c, b.c.length, null); + e = new olb(b); + d = BD(mlb(e), 145); + while (e.a < e.c.c.length) { + c = BD(mlb(e), 145); + if ( + ADb(d.e.c, c.e.c) && + !(DDb(B6c(d.e).b, c.e.d) || DDb(B6c(c.e).b, d.e.d)) + ) { + d = + (Gkb(d.k, c.k), + Gkb(d.b, c.b), + Gkb(d.c, c.c), + ye(d.i, c.i), + Gkb(d.d, c.d), + Gkb(d.j, c.j), + (f = Math.min(d.e.c, c.e.c)), + (g = Math.min(d.e.d, c.e.d)), + (h = Math.max(d.e.c + d.e.b, c.e.c + c.e.b)), + (i = h - f), + (j = Math.max(d.e.d + d.e.a, c.e.d + c.e.a)), + (k = j - g), + G6c(d.e, f, g, i, k), + hEb(d.f, c.f), + !d.a && (d.a = c.a), + Gkb(d.g, c.g), + Ekb(d.g, c), + d); + } else { + Xgc(a, d); + d = c; + } + } + Xgc(a, d); + } + function e_b(a, b, c, d) { + var e, f, g, h, i, j; + h = a.j; + if (h == (Ucd(), Scd) && b != (dcd(), bcd) && b != (dcd(), ccd)) { + h = W$b(a, c); + G0b(a, h); + !(!a.q ? (mmb(), mmb(), kmb) : a.q)._b((Nyc(), Uxc)) && + h != Scd && + (a.n.a != 0 || a.n.b != 0) && + yNb(a, Uxc, V$b(a, h)); + } + if (b == (dcd(), _bd)) { + j = 0; + switch (h.g) { + case 1: + case 3: + f = a.i.o.a; + f > 0 && (j = a.n.a / f); + break; + case 2: + case 4: + e = a.i.o.b; + e > 0 && (j = a.n.b / e); + } + yNb(a, (wtc(), htc), j); + } + i = a.o; + g = a.a; + if (d) { + g.a = d.a; + g.b = d.b; + a.d = true; + } else if (b != bcd && b != ccd && h != Scd) { + switch (h.g) { + case 1: + g.a = i.a / 2; + break; + case 2: + g.a = i.a; + g.b = i.b / 2; + break; + case 3: + g.a = i.a / 2; + g.b = i.b; + break; + case 4: + g.b = i.b / 2; + } + } else { + g.a = i.a / 2; + g.b = i.b / 2; + } + } + function vwd(a) { + var b, c, d, e, f, g, h, i, j, k; + if (a.ej()) { + k = a.Vi(); + i = a.fj(); + if (k > 0) { + b = new Aud(a.Gi()); + c = k; + f = c < 100 ? null : new Ixd(c); + Cvd(a, c, b.g); + e = c == 1 ? a.Zi(4, qud(b, 0), null, 0, i) : a.Zi(6, b, null, -1, i); + if (a.bj()) { + for (d = new Fyd(b); d.e != d.i.gc(); ) { + f = a.dj(Dyd(d), f); + } + if (!f) { + a.$i(e); + } else { + f.Ei(e); + f.Fi(); + } + } else { + if (!f) { + a.$i(e); + } else { + f.Ei(e); + f.Fi(); + } + } + } else { + Cvd(a, a.Vi(), a.Wi()); + a.$i(a.Zi(6, (mmb(), jmb), null, -1, i)); + } + } else if (a.bj()) { + k = a.Vi(); + if (k > 0) { + h = a.Wi(); + j = k; + Cvd(a, k, h); + f = j < 100 ? null : new Ixd(j); + for (d = 0; d < j; ++d) { + g = h[d]; + f = a.dj(g, f); + } + !!f && f.Fi(); + } else { + Cvd(a, a.Vi(), a.Wi()); + } + } else { + Cvd(a, a.Vi(), a.Wi()); + } + } + function LEc(a, b, c) { + var d, e, f, g, h, i, j, k, l, m, n; + for (h = new olb(b); h.a < h.c.c.length; ) { + f = BD(mlb(h), 233); + f.e = null; + f.c = 0; + } + i = null; + for (g = new olb(b); g.a < g.c.c.length; ) { + f = BD(mlb(g), 233); + l = f.d[0]; + if (c && l.k != (j0b(), h0b)) { + continue; + } + for (n = BD(vNb(l, (wtc(), Qsc)), 15).Kc(); n.Ob(); ) { + m = BD(n.Pb(), 10); + if (!c || m.k == (j0b(), h0b)) { + (!f.e && (f.e = new Rkb()), f.e).Fc(a.b[m.c.p][m.p]); + ++a.b[m.c.p][m.p].c; + } + } + if (!c && l.k == (j0b(), h0b)) { + if (i) { + for (k = BD(Qc(a.d, i), 21).Kc(); k.Ob(); ) { + j = BD(k.Pb(), 10); + for (e = BD(Qc(a.d, l), 21).Kc(); e.Ob(); ) { + d = BD(e.Pb(), 10); + YEc(a.b[j.c.p][j.p]).Fc(a.b[d.c.p][d.p]); + ++a.b[d.c.p][d.p].c; + } + } + } + i = l; + } + } + } + function OHc(a, b) { + var c, d, e, f, g, h, i, j, k; + c = 0; + k = new Rkb(); + for (h = new olb(b); h.a < h.c.c.length; ) { + g = BD(mlb(h), 11); + AHc(a.b, a.d[g.p]); + k.c = KC(SI, Uhe, 1, 0, 5, 1); + switch (g.i.k.g) { + case 0: + d = BD(vNb(g, (wtc(), gtc)), 10); + Hkb(d.j, new xIc(k)); + break; + case 1: + Ctb( + KAb(JAb(new YAb(null, new Kub(g.i.j, 16)), new zIc(g))), + new CIc(k) + ); + break; + case 3: + e = BD(vNb(g, (wtc(), $sc)), 11); + Ekb(k, new vgd(e, meb(g.e.c.length + g.g.c.length))); + } + for (j = new olb(k); j.a < j.c.c.length; ) { + i = BD(mlb(j), 46); + f = aIc(a, BD(i.a, 11)); + if (f > a.d[g.p]) { + c += zHc(a.b, f) * BD(i.b, 19).a; + Wjb(a.a, meb(f)); + } + } + while (!akb(a.a)) { + xHc(a.b, BD(fkb(a.a), 19).a); + } + } + return c; + } + function eed(a, b, c, d) { + var e, f, g, h, i, j, k, l, m, n, o, p, q; + l = new g7c(BD(hkd(a, (X7c(), R7c)), 8)); + l.a = Math.max(l.a - c.b - c.c, 0); + l.b = Math.max(l.b - c.d - c.a, 0); + e = ED(hkd(a, L7c)); + (e == null || (uCb(e), e) <= 0) && (e = 1.3); + h = new Rkb(); + for ( + o = new Fyd((!a.a && (a.a = new cUd(E2, a, 10, 11)), a.a)); + o.e != o.i.gc(); + + ) { + n = BD(Dyd(o), 33); + g = new xed(n); + h.c[h.c.length] = g; + } + m = BD(hkd(a, M7c), 311); + switch (m.g) { + case 3: + q = bed(h, b, l.a, l.b, ((j = d), uCb(e), e, j)); + break; + case 1: + q = aed(h, b, l.a, l.b, ((k = d), uCb(e), e, k)); + break; + default: + q = ced(h, b, l.a, l.b, ((i = d), uCb(e), e, i)); + } + f = new wed(q); + p = fed(f, b, c, l.a, l.b, d, (uCb(e), e)); + Afd(a, p.a, p.b, false, true); + } + function vkc(a, b) { + var c, d, e, f; + c = b.b; + f = new Tkb(c.j); + e = 0; + d = c.j; + d.c = KC(SI, Uhe, 1, 0, 5, 1); + hkc(BD(Si(a.b, (Ucd(), Acd), (Fkc(), Ekc)), 15), c); + e = ikc(f, e, new blc(), d); + hkc(BD(Si(a.b, Acd, Dkc), 15), c); + e = ikc(f, e, new dlc(), d); + hkc(BD(Si(a.b, Acd, Ckc), 15), c); + hkc(BD(Si(a.b, zcd, Ekc), 15), c); + hkc(BD(Si(a.b, zcd, Dkc), 15), c); + e = ikc(f, e, new flc(), d); + hkc(BD(Si(a.b, zcd, Ckc), 15), c); + hkc(BD(Si(a.b, Rcd, Ekc), 15), c); + e = ikc(f, e, new hlc(), d); + hkc(BD(Si(a.b, Rcd, Dkc), 15), c); + e = ikc(f, e, new jlc(), d); + hkc(BD(Si(a.b, Rcd, Ckc), 15), c); + hkc(BD(Si(a.b, Tcd, Ekc), 15), c); + e = ikc(f, e, new Pkc(), d); + hkc(BD(Si(a.b, Tcd, Dkc), 15), c); + hkc(BD(Si(a.b, Tcd, Ckc), 15), c); + } + function nbc(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o, p; + Odd(b, "Layer size calculation", 1); + k = Pje; + j = Qje; + e = false; + for (h = new olb(a.b); h.a < h.c.c.length; ) { + g = BD(mlb(h), 29); + i = g.c; + i.a = 0; + i.b = 0; + if (g.a.c.length == 0) { + continue; + } + e = true; + for (m = new olb(g.a); m.a < m.c.c.length; ) { + l = BD(mlb(m), 10); + o = l.o; + n = l.d; + i.a = Math.max(i.a, o.a + n.b + n.c); + } + d = BD(Ikb(g.a, 0), 10); + p = d.n.b - d.d.d; + d.k == (j0b(), e0b) && (p -= BD(vNb(a, (Nyc(), yyc)), 142).d); + f = BD(Ikb(g.a, g.a.c.length - 1), 10); + c = f.n.b + f.o.b + f.d.a; + f.k == e0b && (c += BD(vNb(a, (Nyc(), yyc)), 142).a); + i.b = c - p; + k = Math.min(k, p); + j = Math.max(j, c); + } + if (!e) { + k = 0; + j = 0; + } + a.f.b = j - k; + a.c.b -= k; + Qdd(b); + } + function h_b(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r; + f = 0; + g = 0; + for (j = new olb(a.a); j.a < j.c.c.length; ) { + h = BD(mlb(j), 10); + f = Math.max(f, h.d.b); + g = Math.max(g, h.d.c); + } + for (i = new olb(a.a); i.a < i.c.c.length; ) { + h = BD(mlb(i), 10); + c = BD(vNb(h, (Nyc(), mwc)), 248); + switch (c.g) { + case 1: + o = 0; + break; + case 2: + o = 1; + break; + case 5: + o = 0.5; + break; + default: + d = 0; + l = 0; + for (n = new olb(h.j); n.a < n.c.c.length; ) { + m = BD(mlb(n), 11); + m.e.c.length == 0 || ++d; + m.g.c.length == 0 || ++l; + } + d + l == 0 ? (o = 0.5) : (o = l / (d + l)); + } + q = a.c; + k = h.o.a; + r = (q.a - k) * o; + o > 0.5 + ? (r -= g * 2 * (o - 0.5)) + : o < 0.5 && (r += f * 2 * (0.5 - o)); + e = h.d.b; + r < e && (r = e); + p = h.d.c; + r > q.a - p - k && (r = q.a - p - k); + h.n.a = b + r; + } + } + function ced(a, b, c, d, e) { + var f, g, h, i, j, k, l, m, n, o, p, q; + h = KC(UD, Vje, 25, a.c.length, 15, 1); + m = new gub(new Ned()); + _tb(m, a); + j = 0; + p = new Rkb(); + while (m.b.c.length != 0) { + g = BD(m.b.c.length == 0 ? null : Ikb(m.b, 0), 157); + if (j > 1 && (red(g) * qed(g)) / 2 > h[0]) { + f = 0; + while (f < p.c.length - 1 && (red(g) * qed(g)) / 2 > h[f]) { + ++f; + } + o = new Jib(p, 0, f + 1); + l = new wed(o); + k = red(g) / qed(g); + i = fed(l, b, new p0b(), c, d, e, k); + P6c(X6c(l.e), i); + zCb(cub(m, l)); + n = new Jib(p, f + 1, p.c.length); + _tb(m, n); + p.c = KC(SI, Uhe, 1, 0, 5, 1); + j = 0; + Dlb(h, h.length, 0); + } else { + q = m.b.c.length == 0 ? null : Ikb(m.b, 0); + q != null && fub(m, 0); + j > 0 && (h[j] = h[j - 1]); + h[j] += red(g) * qed(g); + ++j; + p.c[p.c.length] = g; + } + } + return p; + } + function Wac(a) { + var b, c, d, e, f; + d = BD(vNb(a, (Nyc(), mxc)), 163); + if (d == (Ctc(), ytc)) { + for (c = new Sr(ur(R_b(a).a.Kc(), new Sq())); Qr(c); ) { + b = BD(Rr(c), 17); + if (!Yac(b)) { + throw vbb( + new y2c( + Fne + + P_b(a) + + "' has its layer constraint set to FIRST_SEPARATE, but has at least one incoming edge. " + + "FIRST_SEPARATE nodes must not have incoming edges." + ) + ); + } + } + } else if (d == Atc) { + for (f = new Sr(ur(U_b(a).a.Kc(), new Sq())); Qr(f); ) { + e = BD(Rr(f), 17); + if (!Yac(e)) { + throw vbb( + new y2c( + Fne + + P_b(a) + + "' has its layer constraint set to LAST_SEPARATE, but has at least one outgoing edge. " + + "LAST_SEPARATE nodes must not have outgoing edges." + ) + ); + } + } + } + } + function C9b(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o; + Odd(b, "Label dummy removal", 1); + d = Edb(ED(vNb(a, (Nyc(), nyc)))); + e = Edb(ED(vNb(a, ryc))); + j = BD(vNb(a, Lwc), 103); + for (i = new olb(a.b); i.a < i.c.c.length; ) { + h = BD(mlb(i), 29); + l = new Bib(h.a, 0); + while (l.b < l.d.gc()) { + k = (sCb(l.b < l.d.gc()), BD(l.d.Xb((l.c = l.b++)), 10)); + if (k.k == (j0b(), f0b)) { + m = BD(vNb(k, (wtc(), $sc)), 17); + o = Edb(ED(vNb(m, Zwc))); + g = PD(vNb(k, Ssc)) === PD((rbd(), obd)); + c = new g7c(k.n); + g && (c.b += o + d); + f = new f7c(k.o.a, k.o.b - o - d); + n = BD(vNb(k, ktc), 15); + j == (ead(), dad) || j == _9c + ? B9b(n, c, e, f, g, j) + : A9b(n, c, e, f); + Gkb(m.b, n); + sbc(k, PD(vNb(a, Swc)) === PD((Aad(), xad))); + uib(l); + } + } + } + Qdd(b); + } + function tZb(a, b, c, d) { + var e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v; + i = new Rkb(); + for (f = new olb(b.a); f.a < f.c.c.length; ) { + e = BD(mlb(f), 10); + for (h = new olb(e.j); h.a < h.c.c.length; ) { + g = BD(mlb(h), 11); + k = null; + for (t = k_b(g.g), u = 0, v = t.length; u < v; ++u) { + s = t[u]; + if (!f_b(s.d.i, c)) { + r = oZb(a, b, c, s, s.c, (KAc(), IAc), k); + r != k && ((i.c[i.c.length] = r), true); + r.c && (k = r); + } + } + j = null; + for (o = k_b(g.e), p = 0, q = o.length; p < q; ++p) { + n = o[p]; + if (!f_b(n.c.i, c)) { + r = oZb(a, b, c, n, n.d, (KAc(), HAc), j); + r != j && ((i.c[i.c.length] = r), true); + r.c && (j = r); + } + } + } + } + for (m = new olb(i); m.a < m.c.c.length; ) { + l = BD(mlb(m), 441); + Jkb(b.a, l.a, 0) != -1 || Ekb(b.a, l.a); + l.c && ((d.c[d.c.length] = l), true); + } + } + function jCc(a, b, c) { + var d, e, f, g, h, i, j, k, l, m, n, o, p, q; + Odd(c, "Interactive cycle breaking", 1); + l = new Rkb(); + for (n = new olb(b.a); n.a < n.c.c.length; ) { + m = BD(mlb(n), 10); + m.p = 1; + o = T_b(m).a; + for (k = W_b(m, (KAc(), IAc)).Kc(); k.Ob(); ) { + j = BD(k.Pb(), 11); + for (f = new olb(j.g); f.a < f.c.c.length; ) { + d = BD(mlb(f), 17); + p = d.d.i; + if (p != m) { + q = T_b(p).a; + q < o && ((l.c[l.c.length] = d), true); + } + } + } + } + for (g = new olb(l); g.a < g.c.c.length; ) { + d = BD(mlb(g), 17); + PZb(d, true); + } + l.c = KC(SI, Uhe, 1, 0, 5, 1); + for (i = new olb(b.a); i.a < i.c.c.length; ) { + h = BD(mlb(i), 10); + h.p > 0 && iCc(a, h, l); + } + for (e = new olb(l); e.a < e.c.c.length; ) { + d = BD(mlb(e), 17); + PZb(d, true); + } + l.c = KC(SI, Uhe, 1, 0, 5, 1); + Qdd(c); + } + function _z(a, b) { + var c, d, e, f, g, h, i, j, k; + j = ""; + if (b.length == 0) { + return a.de(Zie, Xie, -1, -1); + } + k = ufb(b); + dfb(k.substr(0, 3), "at ") && (k = k.substr(3)); + k = k.replace(/\[.*?\]/g, ""); + g = k.indexOf("("); + if (g == -1) { + g = k.indexOf("@"); + if (g == -1) { + j = k; + k = ""; + } else { + j = ufb(k.substr(g + 1)); + k = ufb(k.substr(0, g)); + } + } else { + c = k.indexOf(")", g); + j = k.substr(g + 1, c - (g + 1)); + k = ufb(k.substr(0, g)); + } + g = hfb(k, wfb(46)); + g != -1 && (k = k.substr(g + 1)); + (k.length == 0 || dfb(k, "Anonymous function")) && (k = Xie); + h = kfb(j, wfb(58)); + e = lfb(j, wfb(58), h - 1); + i = -1; + d = -1; + f = Zie; + if (h != -1 && e != -1) { + f = j.substr(0, e); + i = Vz(j.substr(e + 1, h - (e + 1))); + d = Vz(j.substr(h + 1)); + } + return a.de(f, k, i, d); + } + function UC(a, b, c) { + var d, e, f, g, h, i; + if (b.l == 0 && b.m == 0 && b.h == 0) { + throw vbb(new ocb("divide by zero")); + } + if (a.l == 0 && a.m == 0 && a.h == 0) { + c && (QC = TC(0, 0, 0)); + return TC(0, 0, 0); + } + if (b.h == Gje && b.m == 0 && b.l == 0) { + return VC(a, c); + } + i = false; + if (b.h >> 19 != 0) { + b = hD(b); + i = !i; + } + g = _C(b); + f = false; + e = false; + d = false; + if (a.h == Gje && a.m == 0 && a.l == 0) { + e = true; + f = true; + if (g == -1) { + a = SC((wD(), sD)); + d = true; + i = !i; + } else { + h = lD(a, g); + i && ZC(h); + c && (QC = TC(0, 0, 0)); + return h; + } + } else if (a.h >> 19 != 0) { + f = true; + a = hD(a); + d = true; + i = !i; + } + if (g != -1) { + return WC(a, g, i, f, c); + } + if (eD(a, b) < 0) { + c && (f ? (QC = hD(a)) : (QC = TC(a.l, a.m, a.h))); + return TC(0, 0, 0); + } + return XC(d ? a : TC(a.l, a.m, a.h), b, i, f, e, c); + } + function F2c(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o; + if (a.e && a.c.c < a.f) { + throw vbb( + new Zdb( + "Expected " + + a.f + + " phases to be configured; " + + "only found " + + a.c.c + ) + ); + } + k = BD(gdb(a.g), 9); + n = Pu(a.f); + for (f = k, h = 0, j = f.length; h < j; ++h) { + d = f[h]; + l = BD(B2c(a, d.g), 246); + l ? Ekb(n, BD(I2c(a, l), 123)) : ((n.c[n.c.length] = null), true); + } + o = new j3c(); + MAb( + JAb( + NAb(JAb(new YAb(null, new Kub(n, 16)), new O2c()), new Q2c(b)), + new S2c() + ), + new U2c(o) + ); + d3c(o, a.a); + c = new Rkb(); + for (e = k, g = 0, i = e.length; g < i; ++g) { + d = e[g]; + Gkb(c, J2c(a, Dx(BD(B2c(o, d.g), 20)))); + m = BD(Ikb(n, d.g), 123); + !!m && ((c.c[c.c.length] = m), true); + } + Gkb(c, J2c(a, Dx(BD(B2c(o, k[k.length - 1].g + 1), 20)))); + return c; + } + function qCc(a, b, c) { + var d, e, f, g, h, i, j, k, l, m, n, o, p, q; + Odd(c, "Model order cycle breaking", 1); + a.a = 0; + a.b = 0; + n = new Rkb(); + k = b.a.c.length; + for (j = new olb(b.a); j.a < j.c.c.length; ) { + i = BD(mlb(j), 10); + wNb(i, (wtc(), Zsc)) && (k = Math.max(k, BD(vNb(i, Zsc), 19).a + 1)); + } + for (p = new olb(b.a); p.a < p.c.c.length; ) { + o = BD(mlb(p), 10); + g = pCc(a, o, k); + for (m = W_b(o, (KAc(), IAc)).Kc(); m.Ob(); ) { + l = BD(m.Pb(), 11); + for (f = new olb(l.g); f.a < f.c.c.length; ) { + d = BD(mlb(f), 17); + q = d.d.i; + h = pCc(a, q, k); + h < g && ((n.c[n.c.length] = d), true); + } + } + } + for (e = new olb(n); e.a < e.c.c.length; ) { + d = BD(mlb(e), 17); + PZb(d, true); + yNb(b, (wtc(), Asc), (Bcb(), true)); + } + n.c = KC(SI, Uhe, 1, 0, 5, 1); + Qdd(c); + } + function kQc(a, b) { + var c, d, e, f, g, h, i; + if (a.g > b.f || b.g > a.f) { + return; + } + c = 0; + d = 0; + for (g = a.w.a.ec().Kc(); g.Ob(); ) { + e = BD(g.Pb(), 11); + aRc(l7c(OC(GC(m1, 1), nie, 8, 0, [e.i.n, e.n, e.a])).b, b.g, b.f) && + ++c; + } + for (h = a.r.a.ec().Kc(); h.Ob(); ) { + e = BD(h.Pb(), 11); + aRc(l7c(OC(GC(m1, 1), nie, 8, 0, [e.i.n, e.n, e.a])).b, b.g, b.f) && + --c; + } + for (i = b.w.a.ec().Kc(); i.Ob(); ) { + e = BD(i.Pb(), 11); + aRc(l7c(OC(GC(m1, 1), nie, 8, 0, [e.i.n, e.n, e.a])).b, a.g, a.f) && + ++d; + } + for (f = b.r.a.ec().Kc(); f.Ob(); ) { + e = BD(f.Pb(), 11); + aRc(l7c(OC(GC(m1, 1), nie, 8, 0, [e.i.n, e.n, e.a])).b, a.g, a.f) && + --d; + } + if (c < d) { + new BQc(a, b, d - c); + } else if (d < c) { + new BQc(b, a, c - d); + } else { + new BQc(b, a, 0); + new BQc(a, b, 0); + } + } + function JPb(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s; + j = b.c; + e = IOb(a.e); + l = Y6c(b7c(R6c(HOb(a.e)), a.d * a.a, a.c * a.b), -0.5); + c = e.a - l.a; + d = e.b - l.b; + g = b.a; + c = g.c - c; + d = g.d - d; + for (i = new olb(j); i.a < i.c.c.length; ) { + h = BD(mlb(i), 395); + m = h.b; + n = c + m.a; + q = d + m.b; + o = QD(n / a.a); + r = QD(q / a.b); + f = h.a; + switch (f.g) { + case 0: + k = (RMb(), OMb); + break; + case 1: + k = (RMb(), NMb); + break; + case 2: + k = (RMb(), PMb); + break; + default: + k = (RMb(), QMb); + } + if (f.a) { + s = QD((q + h.c) / a.b); + Ekb(a.f, new uOb(k, meb(r), meb(s))); + f == (ROb(), QOb) ? nNb(a, 0, r, o, s) : nNb(a, o, r, a.d - 1, s); + } else { + p = QD((n + h.c) / a.a); + Ekb(a.f, new uOb(k, meb(o), meb(p))); + f == (ROb(), OOb) ? nNb(a, o, 0, p, r) : nNb(a, o, r, p, a.c - 1); + } + } + } + function coc(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u; + m = new Rkb(); + e = new Rkb(); + p = null; + for (h = b.Kc(); h.Ob(); ) { + g = BD(h.Pb(), 19); + f = new qoc(g.a); + e.c[e.c.length] = f; + if (p) { + f.d = p; + p.e = f; + } + p = f; + } + t = boc(a); + for (k = 0; k < e.c.length; ++k) { + n = null; + q = poc((tCb(0, e.c.length), BD(e.c[0], 652))); + c = null; + d = Pje; + for (l = 1; l < a.b.c.length; ++l) { + r = q ? Math.abs(q.b - l) : Math.abs(l - n.b) + 1; + o = n ? Math.abs(l - n.b) : r + 1; + if (o < r) { + j = n; + i = o; + } else { + j = q; + i = r; + } + s = ((u = Edb(ED(vNb(a, (Nyc(), Hyc))))), t[l] + Math.pow(i, u)); + if (s < d) { + d = s; + c = j; + c.c = l; + } + if (!!q && l == q.b) { + n = q; + q = koc(q); + } + } + if (c) { + Ekb(m, meb(c.c)); + c.a = true; + loc(c); + } + } + mmb(); + Mlb(m.c, m.c.length, null); + return m; + } + function qNd(a) { + var b, c, d, e, f, g, h, i, j, k; + b = new zNd(); + c = new zNd(); + j = dfb( + Qve, + ((e = Dmd(a.b, Rve)), + !e + ? null + : GD(AAd((!e.b && (e.b = new sId((jGd(), fGd), x6, e)), e.b), Sve))) + ); + for (i = 0; i < a.i; ++i) { + h = BD(a.g[i], 170); + if (JD(h, 99)) { + g = BD(h, 18); + (g.Bb & ote) != 0 + ? ((g.Bb & oie) == 0 || + (!j && + ((f = Dmd(g, Rve)), + (!f + ? null + : GD( + AAd( + (!f.b && (f.b = new sId((jGd(), fGd), x6, f)), f.b), + eue + ) + )) == null))) && + wtd(b, g) + : ((k = zUd(g)), + (!!k && (k.Bb & ote) != 0) || + (((g.Bb & oie) == 0 || + (!j && + ((d = Dmd(g, Rve)), + (!d + ? null + : GD( + AAd( + (!d.b && (d.b = new sId((jGd(), fGd), x6, d)), d.b), + eue + ) + )) == null))) && + wtd(c, g))); + } else { + Q6d(); + if (BD(h, 66).Oj()) { + if (!h.Jj()) { + wtd(b, h); + wtd(c, h); + } + } + } + } + vud(b); + vud(c); + a.a = BD(b.g, 247); + BD(c.g, 247); + } + function LTb(a, b, c) { + var d, e, f, g, h, i, j, k, l, m, n, o, p, q, r; + j = ITb(b); + q = BD(vNb(b, (Nyc(), Iwc)), 314); + q != (Rpc(), Ppc) && reb(j, new STb()); + r = BD(vNb(b, Cwc), 292); + reb(j, new UTb(r)); + p = 0; + k = new Rkb(); + for (f = new xkb(j); f.a != f.b; ) { + e = BD(vkb(f), 37); + aUb(a.c, e); + m = BD(vNb(e, (wtc(), itc)), 15); + p += m.gc(); + d = m.Kc(); + Ekb(k, new vgd(e, d)); + } + Odd(c, "Recursive hierarchical layout", p); + o = 0; + n = BD(BD(Ikb(k, k.c.length - 1), 46).b, 47); + while (n.Ob()) { + for (i = new olb(k); i.a < i.c.c.length; ) { + h = BD(mlb(i), 46); + m = BD(h.b, 47); + g = BD(h.a, 37); + while (m.Ob()) { + l = BD(m.Pb(), 51); + if (JD(l, 507)) { + if (!g.e) { + l.pf(g, Udd(c, 1)); + ++o; + break; + } else { + break; + } + } else { + l.pf(g, Udd(c, 1)); + ++o; + } + } + } + } + Qdd(c); + } + function rid(b, c) { + var d, e, f, g, h, i, j, k, l, m; + j = c.length - 1; + i = (BCb(j, c.length), c.charCodeAt(j)); + if (i == 93) { + h = hfb(c, wfb(91)); + if (h >= 0) { + f = wid(b, c.substr(1, h - 1)); + l = c.substr(h + 1, j - (h + 1)); + return pid(b, l, f); + } + } else { + d = -1; + Vcb == null && (Vcb = new RegExp("\\d")); + if (Vcb.test(String.fromCharCode(i))) { + d = lfb(c, wfb(46), j - 1); + if (d >= 0) { + e = BD(hid(b, Bid(b, c.substr(1, d - 1)), false), 58); + k = 0; + try { + k = Icb(c.substr(d + 1), Rie, Ohe); + } catch (a) { + a = ubb(a); + if (JD(a, 127)) { + g = a; + throw vbb(new rFd(g)); + } else throw vbb(a); + } + if (k < e.gc()) { + m = e.Xb(k); + JD(m, 72) && (m = BD(m, 72).dd()); + return BD(m, 56); + } + } + } + if (d < 0) { + return BD(hid(b, Bid(b, c.substr(1)), false), 56); + } + } + return null; + } + function e1d(a, b, c) { + var d, e, f, g, h, i, j, k, l; + if (bLd(b, c) >= 0) { + return c; + } + switch ($1d(q1d(a, c))) { + case 2: { + if (dfb("", o1d(a, c.Hj()).ne())) { + i = b2d(q1d(a, c)); + h = a2d(q1d(a, c)); + k = r1d(a, b, i, h); + if (k) { + return k; + } + e = f1d(a, b); + for (g = 0, l = e.gc(); g < l; ++g) { + k = BD(e.Xb(g), 170); + if (x1d(c2d(q1d(a, k)), i)) { + return k; + } + } + } + return null; + } + case 4: { + if (dfb("", o1d(a, c.Hj()).ne())) { + for (d = c; d; d = Z1d(q1d(a, d))) { + j = b2d(q1d(a, d)); + h = a2d(q1d(a, d)); + k = s1d(a, b, j, h); + if (k) { + return k; + } + } + i = b2d(q1d(a, c)); + if (dfb(Ewe, i)) { + return t1d(a, b); + } else { + f = g1d(a, b); + for (g = 0, l = f.gc(); g < l; ++g) { + k = BD(f.Xb(g), 170); + if (x1d(c2d(q1d(a, k)), i)) { + return k; + } + } + } + } + return null; + } + default: { + return null; + } + } + } + function t2d(a, b, c) { + var d, e, f, g, h, i, j, k; + if (c.gc() == 0) { + return false; + } + h = (Q6d(), BD(b, 66).Oj()); + f = h ? c : new zud(c.gc()); + if (T6d(a.e, b)) { + if (b.hi()) { + for (j = c.Kc(); j.Ob(); ) { + i = j.Pb(); + if (!F2d(a, b, i, JD(b, 99) && (BD(b, 18).Bb & Tje) != 0)) { + e = R6d(b, i); + f.Hc(e) || f.Fc(e); + } + } + } else if (!h) { + for (j = c.Kc(); j.Ob(); ) { + i = j.Pb(); + e = R6d(b, i); + f.Fc(e); + } + } + } else { + if (c.gc() > 1) { + throw vbb(new Wdb(Hwe)); + } + k = S6d(a.e.Tg(), b); + d = BD(a.g, 119); + for (g = 0; g < a.i; ++g) { + e = d[g]; + if (k.rl(e.ak())) { + if (c.Hc(h ? e : e.dd())) { + return false; + } else { + for (j = c.Kc(); j.Ob(); ) { + i = j.Pb(); + BD(Gtd(a, g, h ? BD(i, 72) : R6d(b, i)), 72); + } + return true; + } + } + } + if (!h) { + e = R6d(b, c.Kc().Pb()); + f.Fc(e); + } + } + return ytd(a, f); + } + function qMc(a, b) { + var c, d, e, f, g, h, i, j, k; + k = new Psb(); + for (h = ((j = new $ib(a.c).a.vc().Kc()), new djb(j)); h.a.Ob(); ) { + f = ((e = BD(h.a.Pb(), 42)), BD(e.dd(), 458)); + f.b == 0 && (Gsb(k, f, k.c.b, k.c), true); + } + while (k.b != 0) { + f = BD(k.b == 0 ? null : (sCb(k.b != 0), Nsb(k, k.a.a)), 458); + f.a == null && (f.a = 0); + for (d = new olb(f.d); d.a < d.c.c.length; ) { + c = BD(mlb(d), 654); + c.b.a == null + ? (c.b.a = Edb(f.a) + c.a) + : b.o == (eMc(), cMc) + ? (c.b.a = Math.min(Edb(c.b.a), Edb(f.a) + c.a)) + : (c.b.a = Math.max(Edb(c.b.a), Edb(f.a) + c.a)); + --c.b.b; + c.b.b == 0 && Dsb(k, c.b); + } + } + for (g = ((i = new $ib(a.c).a.vc().Kc()), new djb(i)); g.a.Ob(); ) { + f = ((e = BD(g.a.Pb(), 42)), BD(e.dd(), 458)); + b.i[f.c.p] = f.a; + } + } + function mTc() { + mTc = ccb; + dTc = new Lsd(Ime); + new Lsd(Jme); + new Msd("DEPTH", meb(0)); + ZSc = new Msd("FAN", meb(0)); + XSc = new Msd(Yqe, meb(0)); + jTc = new Msd("ROOT", (Bcb(), false)); + _Sc = new Msd("LEFTNEIGHBOR", null); + hTc = new Msd("RIGHTNEIGHBOR", null); + aTc = new Msd("LEFTSIBLING", null); + iTc = new Msd("RIGHTSIBLING", null); + YSc = new Msd("DUMMY", false); + new Msd("LEVEL", meb(0)); + gTc = new Msd("REMOVABLE_EDGES", new Psb()); + kTc = new Msd("XCOOR", meb(0)); + lTc = new Msd("YCOOR", meb(0)); + bTc = new Msd("LEVELHEIGHT", 0); + $Sc = new Msd("ID", ""); + eTc = new Msd("POSITION", meb(0)); + fTc = new Msd("PRELIM", 0); + cTc = new Msd("MODIFIER", 0); + WSc = new Lsd(Kme); + VSc = new Lsd(Lme); + } + function MNc(a, b, c, d) { + var e, f, g, h, i, j, k, l, m, n, o; + k = c + b.c.c.a; + for (n = new olb(b.j); n.a < n.c.c.length; ) { + m = BD(mlb(n), 11); + e = l7c(OC(GC(m1, 1), nie, 8, 0, [m.i.n, m.n, m.a])); + if (b.k == (j0b(), i0b)) { + h = BD(vNb(m, (wtc(), $sc)), 11); + e.a = l7c(OC(GC(m1, 1), nie, 8, 0, [h.i.n, h.n, h.a])).a; + b.n.a = e.a; + } + g = new f7c(0, e.b); + if (m.j == (Ucd(), zcd)) { + g.a = k; + } else if (m.j == Tcd) { + g.a = c; + } else { + continue; + } + o = Math.abs(e.a - g.a); + if (o <= d && !JNc(b)) { + continue; + } + f = m.g.c.length + m.e.c.length > 1; + for (j = new b1b(m.b); llb(j.a) || llb(j.b); ) { + i = BD(llb(j.a) ? mlb(j.a) : mlb(j.b), 17); + l = i.c == m ? i.d : i.c; + Math.abs(l7c(OC(GC(m1, 1), nie, 8, 0, [l.i.n, l.n, l.a])).b - g.b) > + 1 && GNc(a, i, g, f, m); + } + } + } + function XPc(a) { + var b, c, d, e, f, g; + e = new Bib(a.e, 0); + d = new Bib(a.a, 0); + if (a.d) { + for (c = 0; c < a.b; c++) { + sCb(e.b < e.d.gc()); + e.d.Xb((e.c = e.b++)); + } + } else { + for (c = 0; c < a.b - 1; c++) { + sCb(e.b < e.d.gc()); + e.d.Xb((e.c = e.b++)); + uib(e); + } + } + b = Edb((sCb(e.b < e.d.gc()), ED(e.d.Xb((e.c = e.b++))))); + while (a.f - b > Oqe) { + f = b; + g = 0; + while (Math.abs(b - f) < Oqe) { + ++g; + b = Edb((sCb(e.b < e.d.gc()), ED(e.d.Xb((e.c = e.b++))))); + sCb(d.b < d.d.gc()); + d.d.Xb((d.c = d.b++)); + } + if (g < a.b) { + sCb(e.b > 0); + e.a.Xb((e.c = --e.b)); + WPc(a, a.b - g, f, d, e); + sCb(e.b < e.d.gc()); + e.d.Xb((e.c = e.b++)); + } + sCb(d.b > 0); + d.a.Xb((d.c = --d.b)); + } + if (!a.d) { + for (c = 0; c < a.b - 1; c++) { + sCb(e.b < e.d.gc()); + e.d.Xb((e.c = e.b++)); + uib(e); + } + } + a.d = true; + a.c = true; + } + function Q8d() { + Q8d = ccb; + s8d = (r8d(), q8d).b; + v8d = BD(qud(ZKd(q8d.b), 0), 34); + t8d = BD(qud(ZKd(q8d.b), 1), 34); + u8d = BD(qud(ZKd(q8d.b), 2), 34); + F8d = q8d.bb; + BD(qud(ZKd(q8d.bb), 0), 34); + BD(qud(ZKd(q8d.bb), 1), 34); + H8d = q8d.fb; + I8d = BD(qud(ZKd(q8d.fb), 0), 34); + BD(qud(ZKd(q8d.fb), 1), 34); + BD(qud(ZKd(q8d.fb), 2), 18); + K8d = q8d.qb; + N8d = BD(qud(ZKd(q8d.qb), 0), 34); + BD(qud(ZKd(q8d.qb), 1), 18); + BD(qud(ZKd(q8d.qb), 2), 18); + L8d = BD(qud(ZKd(q8d.qb), 3), 34); + M8d = BD(qud(ZKd(q8d.qb), 4), 34); + P8d = BD(qud(ZKd(q8d.qb), 6), 34); + O8d = BD(qud(ZKd(q8d.qb), 5), 18); + w8d = q8d.j; + x8d = q8d.k; + y8d = q8d.q; + z8d = q8d.w; + A8d = q8d.B; + B8d = q8d.A; + C8d = q8d.C; + D8d = q8d.D; + E8d = q8d._; + G8d = q8d.cb; + J8d = q8d.hb; + } + function $Dc(a, b, c) { + var d, e, f, g, h, i, j, k, l, m, n; + a.c = 0; + a.b = 0; + d = 2 * b.c.a.c.length + 1; + o: for (l = c.Kc(); l.Ob(); ) { + k = BD(l.Pb(), 11); + h = k.j == (Ucd(), Acd) || k.j == Rcd; + n = 0; + if (h) { + m = BD(vNb(k, (wtc(), gtc)), 10); + if (!m) { + continue; + } + n += VDc(a, d, k, m); + } else { + for (j = new olb(k.g); j.a < j.c.c.length; ) { + i = BD(mlb(j), 17); + e = i.d; + if (e.i.c == b.c) { + Ekb(a.a, k); + continue o; + } else { + n += a.g[e.p]; + } + } + for (g = new olb(k.e); g.a < g.c.c.length; ) { + f = BD(mlb(g), 17); + e = f.c; + if (e.i.c == b.c) { + Ekb(a.a, k); + continue o; + } else { + n -= a.g[e.p]; + } + } + } + if (k.e.c.length + k.g.c.length > 0) { + a.f[k.p] = n / (k.e.c.length + k.g.c.length); + a.c = Math.min(a.c, a.f[k.p]); + a.b = Math.max(a.b, a.f[k.p]); + } else h && (a.f[k.p] = n); + } + } + function $9d(a) { + a.b = null; + a.bb = null; + a.fb = null; + a.qb = null; + a.a = null; + a.c = null; + a.d = null; + a.e = null; + a.f = null; + a.n = null; + a.M = null; + a.L = null; + a.Q = null; + a.R = null; + a.K = null; + a.db = null; + a.eb = null; + a.g = null; + a.i = null; + a.j = null; + a.k = null; + a.gb = null; + a.o = null; + a.p = null; + a.q = null; + a.r = null; + a.$ = null; + a.ib = null; + a.S = null; + a.T = null; + a.t = null; + a.s = null; + a.u = null; + a.v = null; + a.w = null; + a.B = null; + a.A = null; + a.C = null; + a.D = null; + a.F = null; + a.G = null; + a.H = null; + a.I = null; + a.J = null; + a.P = null; + a.Z = null; + a.U = null; + a.V = null; + a.W = null; + a.X = null; + a.Y = null; + a._ = null; + a.ab = null; + a.cb = null; + a.hb = null; + a.nb = null; + a.lb = null; + a.mb = null; + a.ob = null; + a.pb = null; + a.jb = null; + a.kb = null; + a.N = false; + a.O = false; + } + function l5b(a, b, c) { + var d, e, f, g; + Odd(c, "Graph transformation (" + a.a + ")", 1); + g = Mu(b.a); + for (f = new olb(b.b); f.a < f.c.c.length; ) { + e = BD(mlb(f), 29); + Gkb(g, e.a); + } + d = BD(vNb(b, (Nyc(), Mwc)), 419); + if (d == (xqc(), vqc)) { + switch (BD(vNb(b, Lwc), 103).g) { + case 2: + _4b(b, g); + break; + case 3: + p5b(b, g); + break; + case 4: + if (a.a == (y5b(), x5b)) { + p5b(b, g); + a5b(b, g); + } else { + a5b(b, g); + p5b(b, g); + } + } + } else { + if (a.a == (y5b(), x5b)) { + switch (BD(vNb(b, Lwc), 103).g) { + case 2: + _4b(b, g); + a5b(b, g); + break; + case 3: + p5b(b, g); + _4b(b, g); + break; + case 4: + _4b(b, g); + p5b(b, g); + } + } else { + switch (BD(vNb(b, Lwc), 103).g) { + case 2: + _4b(b, g); + a5b(b, g); + break; + case 3: + _4b(b, g); + p5b(b, g); + break; + case 4: + p5b(b, g); + _4b(b, g); + } + } + } + Qdd(c); + } + function j6b(a, b, c) { + var d, e, f, g, h, i, j, k, l, m, n, o, p; + j = new zsb(); + k = new zsb(); + o = new zsb(); + p = new zsb(); + i = Edb(ED(vNb(b, (Nyc(), vyc)))); + f = Edb(ED(vNb(b, lyc))); + for (h = new olb(c); h.a < h.c.c.length; ) { + g = BD(mlb(h), 10); + l = BD(vNb(g, (wtc(), Hsc)), 61); + if (l == (Ucd(), Acd)) { + k.a.zc(g, k); + for (e = new Sr(ur(R_b(g).a.Kc(), new Sq())); Qr(e); ) { + d = BD(Rr(e), 17); + Qqb(j, d.c.i); + } + } else if (l == Rcd) { + p.a.zc(g, p); + for (e = new Sr(ur(R_b(g).a.Kc(), new Sq())); Qr(e); ) { + d = BD(Rr(e), 17); + Qqb(o, d.c.i); + } + } + } + if (j.a.gc() != 0) { + m = new tPc(2, f); + n = sPc(m, b, j, k, -i - b.c.b); + if (n > 0) { + a.a = i + (n - 1) * f; + b.c.b += a.a; + b.f.b += a.a; + } + } + if (o.a.gc() != 0) { + m = new tPc(1, f); + n = sPc(m, b, o, p, b.f.b + i - b.c.b); + n > 0 && (b.f.b += i + (n - 1) * f); + } + } + function kKd(a, b) { + var c, d, e, f; + f = a.F; + if (b == null) { + a.F = null; + $Jd(a, null); + } else { + a.F = (uCb(b), b); + d = hfb(b, wfb(60)); + if (d != -1) { + e = b.substr(0, d); + hfb(b, wfb(46)) == -1 && + !dfb(e, Khe) && + !dfb(e, Eve) && + !dfb(e, Fve) && + !dfb(e, Gve) && + !dfb(e, Hve) && + !dfb(e, Ive) && + !dfb(e, Jve) && + !dfb(e, Kve) && + (e = Lve); + c = kfb(b, wfb(62)); + c != -1 && (e += "" + b.substr(c + 1)); + $Jd(a, e); + } else { + e = b; + if (hfb(b, wfb(46)) == -1) { + d = hfb(b, wfb(91)); + d != -1 && (e = b.substr(0, d)); + if ( + !dfb(e, Khe) && + !dfb(e, Eve) && + !dfb(e, Fve) && + !dfb(e, Gve) && + !dfb(e, Hve) && + !dfb(e, Ive) && + !dfb(e, Jve) && + !dfb(e, Kve) + ) { + e = Lve; + d != -1 && (e += "" + b.substr(d)); + } else { + e = b; + } + } + $Jd(a, e); + e == b && (a.F = a.D); + } + } + (a.Db & 4) != 0 && (a.Db & 1) == 0 && Uhd(a, new nSd(a, 1, 5, f, b)); + } + function AMc(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t; + p = b.b.c.length; + if (p < 3) { + return; + } + n = KC(WD, oje, 25, p, 15, 1); + l = 0; + for (k = new olb(b.b); k.a < k.c.c.length; ) { + j = BD(mlb(k), 29); + n[l++] = j.a.c.length; + } + m = new Bib(b.b, 2); + for (d = 1; d < p - 1; d++) { + c = (sCb(m.b < m.d.gc()), BD(m.d.Xb((m.c = m.b++)), 29)); + o = new olb(c.a); + f = 0; + h = 0; + for (i = 0; i < n[d + 1]; i++) { + t = BD(mlb(o), 10); + if (i == n[d + 1] - 1 || zMc(a, t, d + 1, d)) { + g = n[d] - 1; + zMc(a, t, d + 1, d) && + (g = a.c.e[BD(BD(BD(Ikb(a.c.b, t.p), 15).Xb(0), 46).a, 10).p]); + while (h <= i) { + s = BD(Ikb(c.a, h), 10); + if (!zMc(a, s, d + 1, d)) { + for (r = BD(Ikb(a.c.b, s.p), 15).Kc(); r.Ob(); ) { + q = BD(r.Pb(), 46); + e = a.c.e[BD(q.a, 10).p]; + (e < f || e > g) && Qqb(a.b, BD(q.b, 17)); + } + } + ++h; + } + f = g; + } + } + } + } + function o5c(b, c) { + var d; + if (c == null || dfb(c, Xhe)) { + return null; + } + if (c.length == 0 && b.k != (_5c(), W5c)) { + return null; + } + switch (b.k.g) { + case 1: + return efb(c, kse) ? (Bcb(), Acb) : efb(c, lse) ? (Bcb(), zcb) : null; + case 2: + try { + return meb(Icb(c, Rie, Ohe)); + } catch (a) { + a = ubb(a); + if (JD(a, 127)) { + return null; + } else throw vbb(a); + } + case 4: + try { + return Hcb(c); + } catch (a) { + a = ubb(a); + if (JD(a, 127)) { + return null; + } else throw vbb(a); + } + case 3: + return c; + case 5: + j5c(b); + return m5c(b, c); + case 6: + j5c(b); + return n5c(b, b.a, c); + case 7: + try { + d = l5c(b); + d.Jf(c); + return d; + } catch (a) { + a = ubb(a); + if (JD(a, 32)) { + return null; + } else throw vbb(a); + } + default: + throw vbb(new Zdb("Invalid type set for this layout option.")); + } + } + function JWb(a) { + AWb(); + var b, c, d, e, f, g, h; + h = new CWb(); + for (c = new olb(a); c.a < c.c.c.length; ) { + b = BD(mlb(c), 140); + (!h.b || b.c >= h.b.c) && (h.b = b); + if (!h.c || b.c <= h.c.c) { + h.d = h.c; + h.c = b; + } + (!h.e || b.d >= h.e.d) && (h.e = b); + (!h.f || b.d <= h.f.d) && (h.f = b); + } + d = new NWb((lWb(), hWb)); + rXb(a, yWb, new amb(OC(GC(bQ, 1), Uhe, 369, 0, [d]))); + g = new NWb(kWb); + rXb(a, xWb, new amb(OC(GC(bQ, 1), Uhe, 369, 0, [g]))); + e = new NWb(iWb); + rXb(a, wWb, new amb(OC(GC(bQ, 1), Uhe, 369, 0, [e]))); + f = new NWb(jWb); + rXb(a, vWb, new amb(OC(GC(bQ, 1), Uhe, 369, 0, [f]))); + DWb(d.c, hWb); + DWb(e.c, iWb); + DWb(f.c, jWb); + DWb(g.c, kWb); + h.a.c = KC(SI, Uhe, 1, 0, 5, 1); + Gkb(h.a, d.c); + Gkb(h.a, Su(e.c)); + Gkb(h.a, f.c); + Gkb(h.a, Su(g.c)); + return h; + } + function jxd(a) { + var b; + switch (a.d) { + case 1: { + if (a.hj()) { + return a.o != -2; + } + break; + } + case 2: { + if (a.hj()) { + return a.o == -2; + } + break; + } + case 3: + case 5: + case 4: + case 6: + case 7: { + return a.o > -2; + } + default: { + return false; + } + } + b = a.gj(); + switch (a.p) { + case 0: + return b != null && Ccb(DD(b)) != Kbb(a.k, 0); + case 1: + return b != null && BD(b, 217).a != (Tbb(a.k) << 24) >> 24; + case 2: + return b != null && BD(b, 172).a != (Tbb(a.k) & aje); + case 6: + return b != null && Kbb(BD(b, 162).a, a.k); + case 5: + return b != null && BD(b, 19).a != Tbb(a.k); + case 7: + return b != null && BD(b, 184).a != (Tbb(a.k) << 16) >> 16; + case 3: + return b != null && Edb(ED(b)) != a.j; + case 4: + return b != null && BD(b, 155).a != a.j; + default: + return b == null ? a.n != null : !pb(b, a.n); + } + } + function nOd(a, b, c) { + var d, e, f, g; + if (a.Fk() && a.Ek()) { + g = oOd(a, BD(c, 56)); + if (PD(g) !== PD(c)) { + a.Oi(b); + a.Ui(b, pOd(a, b, g)); + if (a.rk()) { + f = + ((e = BD(c, 49)), + a.Dk() + ? a.Bk() + ? e.ih( + a.b, + zUd(BD(XKd(wjd(a.b), a.aj()), 18)).n, + BD(XKd(wjd(a.b), a.aj()).Yj(), 26).Bj(), + null + ) + : e.ih( + a.b, + bLd(e.Tg(), zUd(BD(XKd(wjd(a.b), a.aj()), 18))), + null, + null + ) + : e.ih(a.b, -1 - a.aj(), null, null)); + !BD(g, 49).eh() && + (f = + ((d = BD(g, 49)), + a.Dk() + ? a.Bk() + ? d.gh( + a.b, + zUd(BD(XKd(wjd(a.b), a.aj()), 18)).n, + BD(XKd(wjd(a.b), a.aj()).Yj(), 26).Bj(), + f + ) + : d.gh( + a.b, + bLd(d.Tg(), zUd(BD(XKd(wjd(a.b), a.aj()), 18))), + null, + f + ) + : d.gh(a.b, -1 - a.aj(), null, f))); + !!f && f.Fi(); + } + oid(a.b) && a.$i(a.Zi(9, c, g, b, false)); + return g; + } + } + return c; + } + function Noc(a, b, c) { + var d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u; + k = Edb(ED(vNb(a, (Nyc(), oyc)))); + d = Edb(ED(vNb(a, Cyc))); + m = new _fd(); + yNb(m, oyc, k + d); + j = b; + r = j.d; + p = j.c.i; + s = j.d.i; + q = G1b(p.c); + t = G1b(s.c); + e = new Rkb(); + for (l = q; l <= t; l++) { + h = new b0b(a); + __b(h, (j0b(), g0b)); + yNb(h, (wtc(), $sc), j); + yNb(h, Vxc, (dcd(), $bd)); + yNb(h, qyc, m); + n = BD(Ikb(a.b, l), 29); + l == q ? Z_b(h, n.a.c.length - c, n) : $_b(h, n); + u = Edb(ED(vNb(j, Zwc))); + if (u < 0) { + u = 0; + yNb(j, Zwc, u); + } + h.o.b = u; + o = Math.floor(u / 2); + g = new H0b(); + G0b(g, (Ucd(), Tcd)); + F0b(g, h); + g.n.b = o; + i = new H0b(); + G0b(i, zcd); + F0b(i, h); + i.n.b = o; + RZb(j, g); + f = new UZb(); + tNb(f, j); + yNb(f, jxc, null); + QZb(f, i); + RZb(f, r); + Ooc(h, j, f); + e.c[e.c.length] = f; + j = f; + } + return e; + } + function sbc(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t; + i = BD( + Y_b(a, (Ucd(), Tcd)) + .Kc() + .Pb(), + 11 + ).e; + n = BD(Y_b(a, zcd).Kc().Pb(), 11).g; + h = i.c.length; + t = A0b(BD(Ikb(a.j, 0), 11)); + while (h-- > 0) { + p = (tCb(0, i.c.length), BD(i.c[0], 17)); + e = (tCb(0, n.c.length), BD(n.c[0], 17)); + s = e.d.e; + f = Jkb(s, e, 0); + SZb(p, e.d, f); + QZb(e, null); + RZb(e, null); + o = p.a; + b && Dsb(o, new g7c(t)); + for (d = Jsb(e.a, 0); d.b != d.d.c; ) { + c = BD(Xsb(d), 8); + Dsb(o, new g7c(c)); + } + r = p.b; + for (m = new olb(e.b); m.a < m.c.c.length; ) { + l = BD(mlb(m), 70); + r.c[r.c.length] = l; + } + q = BD(vNb(p, (Nyc(), jxc)), 74); + g = BD(vNb(e, jxc), 74); + if (g) { + if (!q) { + q = new s7c(); + yNb(p, jxc, q); + } + for (k = Jsb(g, 0); k.b != k.d.c; ) { + j = BD(Xsb(k), 8); + Dsb(q, new g7c(j)); + } + } + } + } + function EJb(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n; + c = BD(Mpb(a.b, b), 124); + i = BD(BD(Qc(a.r, b), 21), 84); + if (i.dc()) { + c.n.b = 0; + c.n.c = 0; + return; + } + j = a.u.Hc((rcd(), ncd)); + g = 0; + h = i.Kc(); + k = null; + l = 0; + m = 0; + while (h.Ob()) { + d = BD(h.Pb(), 111); + e = Edb(ED(d.b.We((CKb(), BKb)))); + f = d.b.rf().a; + a.A.Hc((tdd(), sdd)) && KJb(a, b); + if (!k) { + !!a.C && a.C.b > 0 && (g = Math.max(g, IJb(a.C.b + d.d.b, e))); + } else { + n = m + k.d.c + a.w + d.d.b; + g = Math.max( + g, + (Iy(), + My(ple), + Math.abs(l - e) <= ple || l == e || (isNaN(l) && isNaN(e)) + ? 0 + : n / (e - l)) + ); + } + k = d; + l = e; + m = f; + } + if (!!a.C && a.C.c > 0) { + n = m + a.C.c; + j && (n += k.d.c); + g = Math.max( + g, + (Iy(), + My(ple), + Math.abs(l - 1) <= ple || l == 1 || (isNaN(l) && isNaN(1)) + ? 0 + : n / (1 - l)) + ); + } + c.n.b = 0; + c.a.a = g; + } + function NKb(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n; + c = BD(Mpb(a.b, b), 124); + i = BD(BD(Qc(a.r, b), 21), 84); + if (i.dc()) { + c.n.d = 0; + c.n.a = 0; + return; + } + j = a.u.Hc((rcd(), ncd)); + g = 0; + a.A.Hc((tdd(), sdd)) && SKb(a, b); + h = i.Kc(); + k = null; + m = 0; + l = 0; + while (h.Ob()) { + d = BD(h.Pb(), 111); + f = Edb(ED(d.b.We((CKb(), BKb)))); + e = d.b.rf().b; + if (!k) { + !!a.C && a.C.d > 0 && (g = Math.max(g, IJb(a.C.d + d.d.d, f))); + } else { + n = l + k.d.a + a.w + d.d.d; + g = Math.max( + g, + (Iy(), + My(ple), + Math.abs(m - f) <= ple || m == f || (isNaN(m) && isNaN(f)) + ? 0 + : n / (f - m)) + ); + } + k = d; + m = f; + l = e; + } + if (!!a.C && a.C.a > 0) { + n = l + a.C.a; + j && (n += k.d.a); + g = Math.max( + g, + (Iy(), + My(ple), + Math.abs(m - 1) <= ple || m == 1 || (isNaN(m) && isNaN(1)) + ? 0 + : n / (1 - m)) + ); + } + c.n.d = 0; + c.a.b = g; + } + function _Ec(a, b, c) { + var d, e, f, g, h, i; + this.g = a; + h = b.d.length; + i = c.d.length; + this.d = KC(OQ, kne, 10, h + i, 0, 1); + for (g = 0; g < h; g++) { + this.d[g] = b.d[g]; + } + for (f = 0; f < i; f++) { + this.d[h + f] = c.d[f]; + } + if (b.e) { + this.e = Ru(b.e); + this.e.Mc(c); + if (c.e) { + for (e = c.e.Kc(); e.Ob(); ) { + d = BD(e.Pb(), 233); + if (d == b) { + continue; + } else this.e.Hc(d) ? --d.c : this.e.Fc(d); + } + } + } else if (c.e) { + this.e = Ru(c.e); + this.e.Mc(b); + } + this.f = b.f + c.f; + this.a = b.a + c.a; + this.a > 0 + ? ZEc(this, this.f / this.a) + : REc(b.g, b.d[0]).a != null && REc(c.g, c.d[0]).a != null + ? ZEc(this, (Edb(REc(b.g, b.d[0]).a) + Edb(REc(c.g, c.d[0]).a)) / 2) + : REc(b.g, b.d[0]).a != null + ? ZEc(this, REc(b.g, b.d[0]).a) + : REc(c.g, c.d[0]).a != null && ZEc(this, REc(c.g, c.d[0]).a); + } + function BUb(a, b) { + var c, d, e, f, g, h, i, j, k, l; + a.a = new dVb(oqb(t1)); + for (d = new olb(b.a); d.a < d.c.c.length; ) { + c = BD(mlb(d), 841); + h = new gVb(OC(GC(IP, 1), Uhe, 81, 0, [])); + Ekb(a.a.a, h); + for (j = new olb(c.d); j.a < j.c.c.length; ) { + i = BD(mlb(j), 110); + k = new GUb(a, i); + AUb(k, BD(vNb(c.c, (wtc(), Esc)), 21)); + if (!Mhb(a.g, c)) { + Rhb(a.g, c, new f7c(i.c, i.d)); + Rhb(a.f, c, k); + } + Ekb(a.a.b, k); + eVb(h, k); + } + for (g = new olb(c.b); g.a < g.c.c.length; ) { + f = BD(mlb(g), 594); + k = new GUb(a, f.kf()); + Rhb(a.b, f, new vgd(h, k)); + AUb(k, BD(vNb(c.c, (wtc(), Esc)), 21)); + if (f.hf()) { + l = new HUb(a, f.hf(), 1); + AUb(l, BD(vNb(c.c, Esc), 21)); + e = new gVb(OC(GC(IP, 1), Uhe, 81, 0, [])); + eVb(e, l); + Rc(a.c, f.gf(), new vgd(h, l)); + } + } + } + return a.a; + } + function oBc(a) { + var b; + this.a = a; + b = (j0b(), OC(GC(NQ, 1), Kie, 267, 0, [h0b, g0b, e0b, i0b, f0b, d0b])) + .length; + this.b = IC(Q3, [nie, zqe], [593, 146], 0, [b, b], 2); + this.c = IC(Q3, [nie, zqe], [593, 146], 0, [b, b], 2); + nBc(this, h0b, (Nyc(), vyc), wyc); + lBc(this, h0b, g0b, oyc, pyc); + kBc(this, h0b, i0b, oyc); + kBc(this, h0b, e0b, oyc); + lBc(this, h0b, f0b, vyc, wyc); + nBc(this, g0b, lyc, myc); + kBc(this, g0b, i0b, lyc); + kBc(this, g0b, e0b, lyc); + lBc(this, g0b, f0b, oyc, pyc); + mBc(this, i0b, lyc); + kBc(this, i0b, e0b, lyc); + kBc(this, i0b, f0b, syc); + mBc(this, e0b, zyc); + lBc(this, e0b, f0b, uyc, tyc); + nBc(this, f0b, lyc, lyc); + nBc(this, d0b, lyc, myc); + lBc(this, d0b, h0b, oyc, pyc); + lBc(this, d0b, f0b, oyc, pyc); + lBc(this, d0b, g0b, oyc, pyc); + } + function _2d(a, b, c) { + var d, e, f, g, h, i, j, k, l, m, n, o, p, q; + g = c.ak(); + if (JD(g, 99) && (BD(g, 18).Bb & Tje) != 0) { + m = BD(c.dd(), 49); + p = xid(a.e, m); + if (p != m) { + k = R6d(g, p); + mud(a, b, t3d(a, b, k)); + l = null; + if (oid(a.e)) { + d = e1d((O6d(), M6d), a.e.Tg(), g); + if (d != XKd(a.e.Tg(), a.c)) { + q = S6d(a.e.Tg(), g); + h = 0; + f = BD(a.g, 119); + for (i = 0; i < b; ++i) { + e = f[i]; + q.rl(e.ak()) && ++h; + } + l = new O7d(a.e, 9, d, m, p, h, false); + l.Ei(new pSd(a.e, 9, a.c, c, k, b, false)); + } + } + o = BD(g, 18); + n = zUd(o); + if (n) { + l = m.ih(a.e, bLd(m.Tg(), n), null, l); + l = BD(p, 49).gh(a.e, bLd(p.Tg(), n), null, l); + } else if ((o.Bb & ote) != 0) { + j = -1 - bLd(a.e.Tg(), o); + l = m.ih(a.e, j, null, null); + !BD(p, 49).eh() && (l = BD(p, 49).gh(a.e, j, null, l)); + } + !!l && l.Fi(); + return k; + } + } + return c; + } + function yUb(a) { + var b, c, d, e, f, g, h, i; + for (f = new olb(a.a.b); f.a < f.c.c.length; ) { + e = BD(mlb(f), 81); + e.b.c = e.g.c; + e.b.d = e.g.d; + } + i = new f7c(Pje, Pje); + b = new f7c(Qje, Qje); + for (d = new olb(a.a.b); d.a < d.c.c.length; ) { + c = BD(mlb(d), 81); + i.a = Math.min(i.a, c.g.c); + i.b = Math.min(i.b, c.g.d); + b.a = Math.max(b.a, c.g.c + c.g.b); + b.b = Math.max(b.b, c.g.d + c.g.a); + } + for (h = Uc(a.c).a.nc(); h.Ob(); ) { + g = BD(h.Pb(), 46); + c = BD(g.b, 81); + i.a = Math.min(i.a, c.g.c); + i.b = Math.min(i.b, c.g.d); + b.a = Math.max(b.a, c.g.c + c.g.b); + b.b = Math.max(b.b, c.g.d + c.g.a); + } + a.d = V6c(new f7c(i.a, i.b)); + a.e = c7c(new f7c(b.a, b.b), i); + a.a.a.c = KC(SI, Uhe, 1, 0, 5, 1); + a.a.b.c = KC(SI, Uhe, 1, 0, 5, 1); + } + function svd(a) { + var b, c, d; + l4c(lvd, OC(GC(C0, 1), Uhe, 130, 0, [new Z9c()])); + c = new xB(a); + for (d = 0; d < c.a.length; ++d) { + b = tB(c, d).je().a; + dfb(b, "layered") + ? l4c(lvd, OC(GC(C0, 1), Uhe, 130, 0, [new kwc()])) + : dfb(b, "force") + ? l4c(lvd, OC(GC(C0, 1), Uhe, 130, 0, [new TRb()])) + : dfb(b, "stress") + ? l4c(lvd, OC(GC(C0, 1), Uhe, 130, 0, [new PSb()])) + : dfb(b, "mrtree") + ? l4c(lvd, OC(GC(C0, 1), Uhe, 130, 0, [new sTc()])) + : dfb(b, "radial") + ? l4c(lvd, OC(GC(C0, 1), Uhe, 130, 0, [new IWc()])) + : dfb(b, "disco") + ? l4c(lvd, OC(GC(C0, 1), Uhe, 130, 0, [new gFb(), new oPb()])) + : dfb(b, "sporeOverlap") || dfb(b, "sporeCompaction") + ? l4c(lvd, OC(GC(C0, 1), Uhe, 130, 0, [new B0c()])) + : dfb(b, "rectpacking") && + l4c(lvd, OC(GC(C0, 1), Uhe, 130, 0, [new PYc()])); + } + } + function j_b(a, b, c) { + var d, e, f, g, h, i, j, k, l, m, n, o, p, q, r; + m = new g7c(a.o); + r = b.a / m.a; + h = b.b / m.b; + p = b.a - m.a; + f = b.b - m.b; + if (c) { + e = PD(vNb(a, (Nyc(), Vxc))) === PD((dcd(), $bd)); + for (o = new olb(a.j); o.a < o.c.c.length; ) { + n = BD(mlb(o), 11); + switch (n.j.g) { + case 1: + e || (n.n.a *= r); + break; + case 2: + n.n.a += p; + e || (n.n.b *= h); + break; + case 3: + e || (n.n.a *= r); + n.n.b += f; + break; + case 4: + e || (n.n.b *= h); + } + } + } + for (j = new olb(a.b); j.a < j.c.c.length; ) { + i = BD(mlb(j), 70); + k = i.n.a + i.o.a / 2; + l = i.n.b + i.o.b / 2; + q = k / m.a; + g = l / m.b; + if (q + g >= 1) { + if (q - g > 0 && l >= 0) { + i.n.a += p; + i.n.b += f * g; + } else if (q - g < 0 && k >= 0) { + i.n.a += p * q; + i.n.b += f; + } + } + } + a.o.a = b.a; + a.o.b = b.b; + yNb( + a, + (Nyc(), Fxc), + (tdd(), (d = BD(gdb(I1), 9)), new xqb(d, BD(_Bb(d, d.length), 9), 0)) + ); + } + function iFd(a, b, c, d, e, f) { + var g; + if (!(b == null || !OEd(b, zEd, AEd))) { + throw vbb(new Wdb("invalid scheme: " + b)); + } + if ( + !a && + !( + c != null && + hfb(c, wfb(35)) == -1 && + c.length > 0 && + (BCb(0, c.length), c.charCodeAt(0) != 47) + ) + ) { + throw vbb(new Wdb("invalid opaquePart: " + c)); + } + if ( + a && + !(b != null && hnb(GEd, b.toLowerCase())) && + !(c == null || !OEd(c, CEd, DEd)) + ) { + throw vbb(new Wdb(mve + c)); + } + if (a && b != null && hnb(GEd, b.toLowerCase()) && !eFd(c)) { + throw vbb(new Wdb(mve + c)); + } + if (!fFd(d)) { + throw vbb(new Wdb("invalid device: " + d)); + } + if (!hFd(e)) { + g = e == null ? "invalid segments: null" : "invalid segment: " + VEd(e); + throw vbb(new Wdb(g)); + } + if (!(f == null || hfb(f, wfb(35)) == -1)) { + throw vbb(new Wdb("invalid query: " + f)); + } + } + function nVc(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r; + Odd(b, "Calculate Graph Size", 1); + b.n && !!a && Tdd(b, i6d(a), (pgd(), mgd)); + h = dme; + i = dme; + f = ere; + g = ere; + for ( + l = new Fyd((!a.a && (a.a = new cUd(E2, a, 10, 11)), a.a)); + l.e != l.i.gc(); + + ) { + j = BD(Dyd(l), 33); + o = j.i; + p = j.j; + r = j.g; + d = j.f; + e = BD(hkd(j, (Y9c(), S8c)), 142); + h = Math.min(h, o - e.b); + i = Math.min(i, p - e.d); + f = Math.max(f, o + r + e.c); + g = Math.max(g, p + d + e.a); + } + n = BD(hkd(a, (Y9c(), f9c)), 116); + m = new f7c(h - n.b, i - n.d); + for ( + k = new Fyd((!a.a && (a.a = new cUd(E2, a, 10, 11)), a.a)); + k.e != k.i.gc(); + + ) { + j = BD(Dyd(k), 33); + dld(j, j.i - m.a); + eld(j, j.j - m.b); + } + q = f - h + (n.b + n.c); + c = g - i + (n.d + n.a); + cld(a, q); + ald(a, c); + b.n && !!a && Tdd(b, i6d(a), (pgd(), mgd)); + } + function rGb(a) { + var b, c, d, e, f, g, h, i, j, k; + d = new Rkb(); + for (g = new olb(a.e.a); g.a < g.c.c.length; ) { + e = BD(mlb(g), 121); + k = 0; + e.k.c = KC(SI, Uhe, 1, 0, 5, 1); + for (c = new olb(LFb(e)); c.a < c.c.c.length; ) { + b = BD(mlb(c), 213); + if (b.f) { + Ekb(e.k, b); + ++k; + } + } + k == 1 && ((d.c[d.c.length] = e), true); + } + for (f = new olb(d); f.a < f.c.c.length; ) { + e = BD(mlb(f), 121); + while (e.k.c.length == 1) { + j = BD(mlb(new olb(e.k)), 213); + a.b[j.c] = j.g; + h = j.d; + i = j.e; + for (c = new olb(LFb(e)); c.a < c.c.c.length; ) { + b = BD(mlb(c), 213); + pb(b, j) || + (b.f + ? h == b.d || i == b.e + ? (a.b[j.c] -= a.b[b.c] - b.g) + : (a.b[j.c] += a.b[b.c] - b.g) + : e == h + ? b.d == e + ? (a.b[j.c] += b.g) + : (a.b[j.c] -= b.g) + : b.d == e + ? (a.b[j.c] -= b.g) + : (a.b[j.c] += b.g)); + } + Lkb(h.k, j); + Lkb(i.k, j); + h == e ? (e = j.e) : (e = j.d); + } + } + } + function k4c(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o; + if (b == null || b.length == 0) { + return null; + } + f = BD(Phb(a.f, b), 23); + if (!f) { + for (e = ((n = new $ib(a.d).a.vc().Kc()), new djb(n)); e.a.Ob(); ) { + c = ((g = BD(e.a.Pb(), 42)), BD(g.dd(), 23)); + h = c.f; + o = b.length; + if ( + dfb(h.substr(h.length - o, o), b) && + (b.length == h.length || bfb(h, h.length - b.length - 1) == 46) + ) { + if (f) { + return null; + } + f = c; + } + } + if (!f) { + for (d = ((m = new $ib(a.d).a.vc().Kc()), new djb(m)); d.a.Ob(); ) { + c = ((g = BD(d.a.Pb(), 42)), BD(g.dd(), 23)); + l = c.g; + if (l != null) { + for (i = l, j = 0, k = i.length; j < k; ++j) { + h = i[j]; + o = b.length; + if ( + dfb(h.substr(h.length - o, o), b) && + (b.length == h.length || + bfb(h, h.length - b.length - 1) == 46) + ) { + if (f) { + return null; + } + f = c; + } + } + } + } + } + !!f && Shb(a.f, b, f); + } + return f; + } + function sA(a, b) { + var c, d, e, f, g; + c = new Vfb(); + g = false; + for (f = 0; f < b.length; f++) { + d = (BCb(f, b.length), b.charCodeAt(f)); + if (d == 32) { + gA(a, c, 0); + c.a += " "; + gA(a, c, 0); + while ( + f + 1 < b.length && + (BCb(f + 1, b.length), b.charCodeAt(f + 1) == 32) + ) { + ++f; + } + continue; + } + if (g) { + if (d == 39) { + if ( + f + 1 < b.length && + (BCb(f + 1, b.length), b.charCodeAt(f + 1) == 39) + ) { + c.a += String.fromCharCode(d); + ++f; + } else { + g = false; + } + } else { + c.a += String.fromCharCode(d); + } + continue; + } + if (hfb("GyMLdkHmsSEcDahKzZv", wfb(d)) > 0) { + gA(a, c, 0); + c.a += String.fromCharCode(d); + e = lA(b, f); + gA(a, c, e); + f += e - 1; + continue; + } + if (d == 39) { + if ( + f + 1 < b.length && + (BCb(f + 1, b.length), b.charCodeAt(f + 1) == 39) + ) { + c.a += "'"; + ++f; + } else { + g = true; + } + } else { + c.a += String.fromCharCode(d); + } + } + gA(a, c, 0); + mA(a); + } + function wDc(a, b, c) { + var d, e, f, g, h, i, j, k, l, m, n, o, p, q, r; + Odd(c, "Network simplex layering", 1); + a.b = b; + r = BD(vNb(b, (Nyc(), Ayc)), 19).a * 4; + q = a.b.a; + if (q.c.length < 1) { + Qdd(c); + return; + } + f = sDc(a, q); + p = null; + for (e = Jsb(f, 0); e.b != e.d.c; ) { + d = BD(Xsb(e), 15); + h = r * QD(Math.sqrt(d.gc())); + g = vDc(d); + uGb(HGb(JGb(IGb(LGb(g), h), p), true), Udd(c, 1)); + m = a.b.b; + for (o = new olb(g.a); o.a < o.c.c.length; ) { + n = BD(mlb(o), 121); + while (m.c.length <= n.e) { + Dkb(m, m.c.length, new H1b(a.b)); + } + k = BD(n.f, 10); + $_b(k, BD(Ikb(m, n.e), 29)); + } + if (f.b > 1) { + p = KC(WD, oje, 25, a.b.b.c.length, 15, 1); + l = 0; + for (j = new olb(a.b.b); j.a < j.c.c.length; ) { + i = BD(mlb(j), 29); + p[l++] = i.a.c.length; + } + } + } + q.c = KC(SI, Uhe, 1, 0, 5, 1); + a.a = null; + a.b = null; + a.c = null; + Qdd(c); + } + function OUb(a) { + var b, c, d, e, f, g, h; + b = 0; + for (f = new olb(a.b.a); f.a < f.c.c.length; ) { + d = BD(mlb(f), 189); + d.b = 0; + d.c = 0; + } + NUb(a, 0); + MUb(a, a.g); + sVb(a.c); + wVb(a.c); + c = (ead(), aad); + uVb(oVb(tVb(uVb(oVb(tVb(uVb(tVb(a.c, c)), had(c)))), c))); + tVb(a.c, aad); + RUb(a, a.g); + SUb(a, 0); + TUb(a, 0); + UUb(a, 1); + NUb(a, 1); + MUb(a, a.d); + sVb(a.c); + for (g = new olb(a.b.a); g.a < g.c.c.length; ) { + d = BD(mlb(g), 189); + b += Math.abs(d.c); + } + for (h = new olb(a.b.a); h.a < h.c.c.length; ) { + d = BD(mlb(h), 189); + d.b = 0; + d.c = 0; + } + c = dad; + uVb(oVb(tVb(uVb(oVb(tVb(uVb(wVb(tVb(a.c, c))), had(c)))), c))); + tVb(a.c, aad); + RUb(a, a.d); + SUb(a, 1); + TUb(a, 1); + UUb(a, 0); + wVb(a.c); + for (e = new olb(a.b.a); e.a < e.c.c.length; ) { + d = BD(mlb(e), 189); + b += Math.abs(d.c); + } + return b; + } + function Wfe(a, b) { + var c, d, e, f, g, h, i, j, k; + j = b; + if (j.b == null || a.b == null) return; + Yfe(a); + Vfe(a); + Yfe(j); + Vfe(j); + c = KC(WD, oje, 25, a.b.length + j.b.length, 15, 1); + k = 0; + d = 0; + g = 0; + while (d < a.b.length && g < j.b.length) { + e = a.b[d]; + f = a.b[d + 1]; + h = j.b[g]; + i = j.b[g + 1]; + if (f < h) { + d += 2; + } else if (f >= h && e <= i) { + if (h <= e && f <= i) { + c[k++] = e; + c[k++] = f; + d += 2; + } else if (h <= e) { + c[k++] = e; + c[k++] = i; + a.b[d] = i + 1; + g += 2; + } else if (f <= i) { + c[k++] = h; + c[k++] = f; + d += 2; + } else { + c[k++] = h; + c[k++] = i; + a.b[d] = i + 1; + } + } else if (i < e) { + g += 2; + } else { + throw vbb( + new hz( + "Token#intersectRanges(): Internal Error: [" + + a.b[d] + + "," + + a.b[d + 1] + + "] & [" + + j.b[g] + + "," + + j.b[g + 1] + + "]" + ) + ); + } + } + while (d < a.b.length) { + c[k++] = a.b[d++]; + c[k++] = a.b[d++]; + } + a.b = KC(WD, oje, 25, k, 15, 1); + $fb(c, 0, a.b, 0, k); + } + function PUb(a) { + var b, c, d, e, f, g, h; + b = new Rkb(); + a.g = new Rkb(); + a.d = new Rkb(); + for (g = new nib(new eib(a.f.b).a); g.b; ) { + f = lib(g); + Ekb(b, BD(BD(f.dd(), 46).b, 81)); + fad(BD(f.cd(), 594).gf()) + ? Ekb(a.d, BD(f.dd(), 46)) + : Ekb(a.g, BD(f.dd(), 46)); + } + MUb(a, a.d); + MUb(a, a.g); + a.c = new CVb(a.b); + AVb(a.c, (xUb(), wUb)); + RUb(a, a.d); + RUb(a, a.g); + Gkb(b, a.c.a.b); + a.e = new f7c(Pje, Pje); + a.a = new f7c(Qje, Qje); + for (d = new olb(b); d.a < d.c.c.length; ) { + c = BD(mlb(d), 81); + a.e.a = Math.min(a.e.a, c.g.c); + a.e.b = Math.min(a.e.b, c.g.d); + a.a.a = Math.max(a.a.a, c.g.c + c.g.b); + a.a.b = Math.max(a.a.b, c.g.d + c.g.a); + } + zVb(a.c, new YUb()); + h = 0; + do { + e = OUb(a); + ++h; + } while ((h < 2 || e > Qie) && h < 10); + zVb(a.c, new _Ub()); + OUb(a); + vVb(a.c); + yUb(a.f); + } + function sZb(a, b, c) { + var d, e, f, g, h, i, j, k, l, m, n, o, p, q; + if (!Ccb(DD(vNb(c, (Nyc(), fxc))))) { + return; + } + for (h = new olb(c.j); h.a < h.c.c.length; ) { + g = BD(mlb(h), 11); + m = k_b(g.g); + for (j = m, k = 0, l = j.length; k < l; ++k) { + i = j[k]; + f = i.d.i == c; + e = f && Ccb(DD(vNb(i, gxc))); + if (e) { + o = i.c; + n = BD(Ohb(a.b, o), 10); + if (!n) { + n = Z$b( + o, + (dcd(), bcd), + o.j, + -1, + null, + null, + o.o, + BD(vNb(b, Lwc), 103), + b + ); + yNb(n, (wtc(), $sc), o); + Rhb(a.b, o, n); + Ekb(b.a, n); + } + q = i.d; + p = BD(Ohb(a.b, q), 10); + if (!p) { + p = Z$b( + q, + (dcd(), bcd), + q.j, + 1, + null, + null, + q.o, + BD(vNb(b, Lwc), 103), + b + ); + yNb(p, (wtc(), $sc), q); + Rhb(a.b, q, p); + Ekb(b.a, p); + } + d = kZb(i); + QZb(d, BD(Ikb(n.j, 0), 11)); + RZb(d, BD(Ikb(p.j, 0), 11)); + Rc(a.a, i, new BZb(d, b, (KAc(), IAc))); + BD(vNb(b, (wtc(), Ksc)), 21).Fc((Orc(), Hrc)); + } + } + } + } + function W9b(a, b, c) { + var d, e, f, g, h, i, j, k, l, m, n, o; + Odd(c, "Label dummy switching", 1); + d = BD(vNb(b, (Nyc(), Owc)), 227); + J9b(b); + e = T9b(b, d); + a.a = KC(UD, Vje, 25, b.b.c.length, 15, 1); + for ( + h = (Apc(), OC(GC(EW, 1), Kie, 227, 0, [wpc, ypc, vpc, xpc, zpc, upc])), + k = 0, + n = h.length; + k < n; + ++k + ) { + f = h[k]; + if ( + (f == zpc || f == upc || f == xpc) && + !BD(uqb(e.a, f) ? e.b[f.g] : null, 15).dc() + ) { + M9b(a, b); + break; + } + } + for ( + i = OC(GC(EW, 1), Kie, 227, 0, [wpc, ypc, vpc, xpc, zpc, upc]), + l = 0, + o = i.length; + l < o; + ++l + ) { + f = i[l]; + f == zpc || + f == upc || + f == xpc || + X9b(a, BD(uqb(e.a, f) ? e.b[f.g] : null, 15)); + } + for ( + g = OC(GC(EW, 1), Kie, 227, 0, [wpc, ypc, vpc, xpc, zpc, upc]), + j = 0, + m = g.length; + j < m; + ++j + ) { + f = g[j]; + (f == zpc || f == upc || f == xpc) && + X9b(a, BD(uqb(e.a, f) ? e.b[f.g] : null, 15)); + } + a.a = null; + Qdd(c); + } + function AFc(a, b) { + var c, d, e, f, g, h, i, j, k, l, m; + switch (a.k.g) { + case 1: + d = BD(vNb(a, (wtc(), $sc)), 17); + c = BD(vNb(d, _sc), 74); + !c ? (c = new s7c()) : Ccb(DD(vNb(d, ltc))) && (c = w7c(c)); + j = BD(vNb(a, Vsc), 11); + if (j) { + k = l7c(OC(GC(m1, 1), nie, 8, 0, [j.i.n, j.n, j.a])); + if (b <= k.a) { + return k.b; + } + Gsb(c, k, c.a, c.a.a); + } + l = BD(vNb(a, Wsc), 11); + if (l) { + m = l7c(OC(GC(m1, 1), nie, 8, 0, [l.i.n, l.n, l.a])); + if (m.a <= b) { + return m.b; + } + Gsb(c, m, c.c.b, c.c); + } + if (c.b >= 2) { + i = Jsb(c, 0); + g = BD(Xsb(i), 8); + h = BD(Xsb(i), 8); + while (h.a < b && i.b != i.d.c) { + g = h; + h = BD(Xsb(i), 8); + } + return g.b + ((b - g.a) / (h.a - g.a)) * (h.b - g.b); + } + break; + case 3: + f = BD(vNb(BD(Ikb(a.j, 0), 11), (wtc(), $sc)), 11); + e = f.i; + switch (f.j.g) { + case 1: + return e.n.b; + case 3: + return e.n.b + e.o.b; + } + } + return T_b(a).b; + } + function Wgc(a) { + var b, c, d, e, f, g, h, i, j, k, l; + for (g = new olb(a.d.b); g.a < g.c.c.length; ) { + f = BD(mlb(g), 29); + for (i = new olb(f.a); i.a < i.c.c.length; ) { + h = BD(mlb(i), 10); + if (Ccb(DD(vNb(h, (Nyc(), pwc))))) { + if (!Qq(O_b(h))) { + d = BD(Oq(O_b(h)), 17); + k = d.c.i; + k == h && (k = d.d.i); + l = new vgd(k, c7c(R6c(h.n), k.n)); + Rhb(a.b, h, l); + continue; + } + } + e = new J6c( + h.n.a - h.d.b, + h.n.b - h.d.d, + h.o.a + h.d.b + h.d.c, + h.o.b + h.d.d + h.d.a + ); + b = vDb(yDb(wDb(xDb(new zDb(), h), e), Fgc), a.a); + pDb(qDb(rDb(new sDb(), OC(GC(PM, 1), Uhe, 57, 0, [b])), b), a.a); + j = new lEb(); + Rhb(a.e, b, j); + c = + sr(new Sr(ur(R_b(h).a.Kc(), new Sq()))) - + sr(new Sr(ur(U_b(h).a.Kc(), new Sq()))); + c < 0 + ? jEb(j, true, (ead(), aad)) + : c > 0 && jEb(j, true, (ead(), bad)); + h.k == (j0b(), e0b) && kEb(j); + Rhb(a.f, h, b); + } + } + } + function Bbc(a, b, c) { + var d, e, f, g, h, i, j, k, l, m; + Odd(c, "Node promotion heuristic", 1); + a.g = b; + Abc(a); + a.q = BD(vNb(b, (Nyc(), rxc)), 260); + k = BD(vNb(a.g, qxc), 19).a; + f = new Jbc(); + switch (a.q.g) { + case 2: + case 1: + Dbc(a, f); + break; + case 3: + a.q = (kAc(), jAc); + Dbc(a, f); + i = 0; + for (h = new olb(a.a); h.a < h.c.c.length; ) { + g = BD(mlb(h), 19); + i = Math.max(i, g.a); + } + if (i > a.j) { + a.q = dAc; + Dbc(a, f); + } + break; + case 4: + a.q = (kAc(), jAc); + Dbc(a, f); + j = 0; + for (e = new olb(a.b); e.a < e.c.c.length; ) { + d = ED(mlb(e)); + j = Math.max(j, (uCb(d), d)); + } + if (j > a.k) { + a.q = gAc; + Dbc(a, f); + } + break; + case 6: + m = QD(Math.ceil((a.f.length * k) / 100)); + Dbc(a, new Mbc(m)); + break; + case 5: + l = QD(Math.ceil((a.d * k) / 100)); + Dbc(a, new Pbc(l)); + break; + default: + Dbc(a, f); + } + Ebc(a, b); + Qdd(c); + } + function fFc(a, b, c) { + var d, e, f, g; + this.j = a; + this.e = WZb(a); + this.o = this.j.e; + this.i = !!this.o; + this.p = this.i ? BD(Ikb(c, Q_b(this.o).p), 214) : null; + e = BD(vNb(a, (wtc(), Ksc)), 21); + this.g = e.Hc((Orc(), Hrc)); + this.b = new Rkb(); + this.d = new rHc(this.e); + g = BD(vNb(this.j, jtc), 230); + this.q = wFc(b, g, this.e); + this.k = new BGc(this); + f = Ou(OC(GC(qY, 1), Uhe, 225, 0, [this, this.d, this.k, this.q])); + if (b == (rGc(), oGc) && !Ccb(DD(vNb(a, (Nyc(), Awc))))) { + d = new SEc(this.e); + f.c[f.c.length] = d; + this.c = new uEc(d, g, BD(this.q, 402)); + } else if (b == oGc && Ccb(DD(vNb(a, (Nyc(), Awc))))) { + d = new SEc(this.e); + f.c[f.c.length] = d; + this.c = new XGc(d, g, BD(this.q, 402)); + } else { + this.c = new Oic(b, this); + } + Ekb(f, this.c); + $Ic(f, this.e); + this.s = AGc(this.k); + } + function xUc(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u; + l = BD(pr(((g = Jsb(new ZRc(b).a.d, 0)), new aSc(g))), 86); + o = l ? BD(vNb(l, (mTc(), _Sc)), 86) : null; + e = 1; + while (!!l && !!o) { + i = 0; + u = 0; + c = l; + d = o; + for (h = 0; h < e; h++) { + c = VRc(c); + d = VRc(d); + u += Edb(ED(vNb(c, (mTc(), cTc)))); + i += Edb(ED(vNb(d, cTc))); + } + t = Edb(ED(vNb(o, (mTc(), fTc)))); + s = Edb(ED(vNb(l, fTc))); + m = zUc(l, o); + n = t + i + a.a + m - s - u; + if (0 < n) { + j = b; + k = 0; + while (!!j && j != d) { + ++k; + j = BD(vNb(j, aTc), 86); + } + if (j) { + r = n / k; + j = b; + while (j != d) { + q = Edb(ED(vNb(j, fTc))) + n; + yNb(j, fTc, q); + p = Edb(ED(vNb(j, cTc))) + n; + yNb(j, cTc, p); + n -= r; + j = BD(vNb(j, aTc), 86); + } + } else { + return; + } + } + ++e; + l.d.b == 0 + ? (l = JRc(new ZRc(b), e)) + : (l = BD(pr(((f = Jsb(new ZRc(l).a.d, 0)), new aSc(f))), 86)); + o = l ? BD(vNb(l, _Sc), 86) : null; + } + } + function Cbc(a, b) { + var c, d, e, f, g, h, i, j, k, l; + i = true; + e = 0; + j = a.f[b.p]; + k = b.o.b + a.n; + c = a.c[b.p][2]; + Nkb(a.a, j, meb(BD(Ikb(a.a, j), 19).a - 1 + c)); + Nkb(a.b, j, Edb(ED(Ikb(a.b, j))) - k + c * a.e); + ++j; + if (j >= a.i) { + ++a.i; + Ekb(a.a, meb(1)); + Ekb(a.b, k); + } else { + d = a.c[b.p][1]; + Nkb(a.a, j, meb(BD(Ikb(a.a, j), 19).a + 1 - d)); + Nkb(a.b, j, Edb(ED(Ikb(a.b, j))) + k - d * a.e); + } + ((a.q == (kAc(), dAc) && + (BD(Ikb(a.a, j), 19).a > a.j || BD(Ikb(a.a, j - 1), 19).a > a.j)) || + (a.q == gAc && + (Edb(ED(Ikb(a.b, j))) > a.k || Edb(ED(Ikb(a.b, j - 1))) > a.k))) && + (i = false); + for (g = new Sr(ur(R_b(b).a.Kc(), new Sq())); Qr(g); ) { + f = BD(Rr(g), 17); + h = f.c.i; + if (a.f[h.p] == j) { + l = Cbc(a, h); + e = e + BD(l.a, 19).a; + i = i && Ccb(DD(l.b)); + } + } + a.f[b.p] = j; + e = e + a.c[b.p][0]; + return new vgd(meb(e), (Bcb(), i ? true : false)); + } + function sPc(a, b, c, d, e) { + var f, g, h, i, j, k, l, m, n, o, p, q, r; + l = new Lqb(); + g = new Rkb(); + qPc(a, c, a.d.fg(), g, l); + qPc(a, d, a.d.gg(), g, l); + a.b = + 0.2 * + ((p = rPc(LAb(new YAb(null, new Kub(g, 16)), new xPc()))), + (q = rPc(LAb(new YAb(null, new Kub(g, 16)), new zPc()))), + Math.min(p, q)); + f = 0; + for (h = 0; h < g.c.length - 1; h++) { + i = (tCb(h, g.c.length), BD(g.c[h], 112)); + for (o = h + 1; o < g.c.length; o++) { + f += pPc(a, i, (tCb(o, g.c.length), BD(g.c[o], 112))); + } + } + m = BD(vNb(b, (wtc(), jtc)), 230); + f >= 2 && + ((r = WNc(g, true, m)), + !a.e && (a.e = new ZOc(a)), + VOc(a.e, r, g, a.b), + undefined); + uPc(g, m); + wPc(g); + n = -1; + for (k = new olb(g); k.a < k.c.c.length; ) { + j = BD(mlb(k), 112); + if (Math.abs(j.s - j.c) < qme) { + continue; + } + n = Math.max(n, j.o); + a.d.dg(j, e, a.c); + } + a.d.a.a.$b(); + return n + 1; + } + function aUb(a, b) { + var c, d, e, f, g; + c = Edb(ED(vNb(b, (Nyc(), lyc)))); + c < 2 && yNb(b, lyc, 2); + d = BD(vNb(b, Lwc), 103); + d == (ead(), cad) && yNb(b, Lwc, a_b(b)); + e = BD(vNb(b, fyc), 19); + e.a == 0 + ? yNb(b, (wtc(), jtc), new Gub()) + : yNb(b, (wtc(), jtc), new Hub(e.a)); + f = DD(vNb(b, Axc)); + f == null && + yNb( + b, + Axc, + (Bcb(), PD(vNb(b, Swc)) === PD((Aad(), wad)) ? true : false) + ); + MAb(new YAb(null, new Kub(b.a, 16)), new dUb(a)); + MAb(LAb(new YAb(null, new Kub(b.b, 16)), new fUb()), new hUb(a)); + g = new oBc(b); + yNb(b, (wtc(), otc), g); + H2c(a.a); + K2c(a.a, (qUb(), lUb), BD(vNb(b, Jwc), 246)); + K2c(a.a, mUb, BD(vNb(b, sxc), 246)); + K2c(a.a, nUb, BD(vNb(b, Iwc), 246)); + K2c(a.a, oUb, BD(vNb(b, Exc), 246)); + K2c(a.a, pUb, kNc(BD(vNb(b, Swc), 218))); + E2c(a.a, _Tb(b)); + yNb(b, itc, F2c(a.a, b)); + } + function fjc(a, b, c) { + var d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w; + if ( + ((m = a.c[b]), + (n = a.c[c]), + ((o = BD(vNb(m, (wtc(), Qsc)), 15)), !!o && o.gc() != 0 && o.Hc(n)) || + ((p = m.k != (j0b(), g0b) && n.k != g0b), + (q = BD(vNb(m, Psc), 10)), + (r = BD(vNb(n, Psc), 10)), + (s = q != r), + (t = (!!q && q != m) || (!!r && r != n)), + (u = gjc(m, (Ucd(), Acd))), + (v = gjc(n, Rcd)), + (t = t | (gjc(m, Rcd) || gjc(n, Acd))), + (w = (t && s) || u || v), + p && w) || + (m.k == (j0b(), i0b) && n.k == h0b) || + (n.k == (j0b(), i0b) && m.k == h0b)) + ) { + return false; + } + k = a.c[b]; + f = a.c[c]; + e = LHc(a.e, k, f, (Ucd(), Tcd)); + i = LHc(a.i, k, f, zcd); + Yic(a.f, k, f); + j = Hic(a.b, k, f) + BD(e.a, 19).a + BD(i.a, 19).a + a.f.d; + h = Hic(a.b, f, k) + BD(e.b, 19).a + BD(i.b, 19).a + a.f.b; + if (a.a) { + l = BD(vNb(k, $sc), 11); + g = BD(vNb(f, $sc), 11); + d = JHc(a.g, l, g); + j += BD(d.a, 19).a; + h += BD(d.b, 19).a; + } + return j > h; + } + function k6b(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o, p; + c = BD(vNb(a, (Nyc(), Vxc)), 98); + g = a.f; + f = a.d; + h = g.a + f.b + f.c; + i = 0 - f.d - a.c.b; + k = g.b + f.d + f.a - a.c.b; + j = new Rkb(); + l = new Rkb(); + for (e = new olb(b); e.a < e.c.c.length; ) { + d = BD(mlb(e), 10); + switch (c.g) { + case 1: + case 2: + case 3: + a6b(d); + break; + case 4: + m = BD(vNb(d, Txc), 8); + n = !m ? 0 : m.a; + d.n.a = h * Edb(ED(vNb(d, (wtc(), htc)))) - n; + M_b(d, true, false); + break; + case 5: + o = BD(vNb(d, Txc), 8); + p = !o ? 0 : o.a; + d.n.a = Edb(ED(vNb(d, (wtc(), htc)))) - p; + M_b(d, true, false); + g.a = Math.max(g.a, d.n.a + d.o.a / 2); + } + switch (BD(vNb(d, (wtc(), Hsc)), 61).g) { + case 1: + d.n.b = i; + j.c[j.c.length] = d; + break; + case 3: + d.n.b = k; + l.c[l.c.length] = d; + } + } + switch (c.g) { + case 1: + case 2: + c6b(j, a); + c6b(l, a); + break; + case 3: + i6b(j, a); + i6b(l, a); + } + } + function VHc(a, b) { + var c, d, e, f, g, h, i, j, k, l; + k = new Rkb(); + l = new jkb(); + f = null; + e = 0; + for (d = 0; d < b.length; ++d) { + c = b[d]; + XHc(f, c) && (e = QHc(a, l, k, EHc, e)); + wNb(c, (wtc(), Psc)) && (f = BD(vNb(c, Psc), 10)); + switch (c.k.g) { + case 0: + for (i = Vq(Nq(V_b(c, (Ucd(), Acd)), new GIc())); xc(i); ) { + g = BD(yc(i), 11); + a.d[g.p] = e++; + k.c[k.c.length] = g; + } + e = QHc(a, l, k, EHc, e); + for (j = Vq(Nq(V_b(c, Rcd), new GIc())); xc(j); ) { + g = BD(yc(j), 11); + a.d[g.p] = e++; + k.c[k.c.length] = g; + } + break; + case 3: + if (!V_b(c, DHc).dc()) { + g = BD(V_b(c, DHc).Xb(0), 11); + a.d[g.p] = e++; + k.c[k.c.length] = g; + } + V_b(c, EHc).dc() || Wjb(l, c); + break; + case 1: + for (h = V_b(c, (Ucd(), Tcd)).Kc(); h.Ob(); ) { + g = BD(h.Pb(), 11); + a.d[g.p] = e++; + k.c[k.c.length] = g; + } + V_b(c, zcd).Jc(new EIc(l, c)); + } + } + QHc(a, l, k, EHc, e); + return k; + } + function y$c(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s; + j = Pje; + k = Pje; + h = Qje; + i = Qje; + for (m = new olb(b.i); m.a < m.c.c.length; ) { + l = BD(mlb(m), 65); + e = BD(BD(Ohb(a.g, l.a), 46).b, 33); + bld(e, l.b.c, l.b.d); + j = Math.min(j, e.i); + k = Math.min(k, e.j); + h = Math.max(h, e.i + e.g); + i = Math.max(i, e.j + e.f); + } + n = BD(hkd(a.c, (d0c(), W_c)), 116); + Afd(a.c, h - j + (n.b + n.c), i - k + (n.d + n.a), true, true); + Efd(a.c, -j + n.b, -k + n.d); + for (d = new Fyd(Wod(a.c)); d.e != d.i.gc(); ) { + c = BD(Dyd(d), 79); + g = itd(c, true, true); + o = jtd(c); + q = ltd(c); + p = new f7c(o.i + o.g / 2, o.j + o.f / 2); + f = new f7c(q.i + q.g / 2, q.j + q.f / 2); + r = c7c(new f7c(f.a, f.b), p); + l6c(r, o.g, o.f); + P6c(p, r); + s = c7c(new f7c(p.a, p.b), f); + l6c(s, q.g, q.f); + P6c(f, s); + nmd(g, p.a, p.b); + gmd(g, f.a, f.b); + } + } + function EYb(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o; + a.c = a.d; + o = DD(vNb(b, (Nyc(), gyc))); + n = o == null || (uCb(o), o); + f = BD(vNb(b, (wtc(), Ksc)), 21).Hc((Orc(), Hrc)); + e = BD(vNb(b, Vxc), 98); + c = !(e == (dcd(), Zbd) || e == _bd || e == $bd); + if (n && (c || !f)) { + for (l = new olb(b.a); l.a < l.c.c.length; ) { + j = BD(mlb(l), 10); + j.p = 0; + } + m = new Rkb(); + for (k = new olb(b.a); k.a < k.c.c.length; ) { + j = BD(mlb(k), 10); + d = DYb(a, j, null); + if (d) { + i = new XZb(); + tNb(i, b); + yNb(i, Esc, BD(d.b, 21)); + u_b(i.d, b.d); + yNb(i, Hxc, null); + for (h = BD(d.a, 15).Kc(); h.Ob(); ) { + g = BD(h.Pb(), 10); + Ekb(i.a, g); + g.a = i; + } + m.Fc(i); + } + } + f && (PD(vNb(b, twc)) === PD((RXb(), OXb)) ? (a.c = a.b) : (a.c = a.a)); + } else { + m = new amb(OC(GC(KQ, 1), cne, 37, 0, [b])); + } + PD(vNb(b, twc)) !== PD((RXb(), QXb)) && (mmb(), m.ad(new HYb())); + return m; + } + function KTc(a) { + r4c( + a, + new E3c( + Q3c( + L3c( + P3c( + M3c( + O3c(N3c(new R3c(), are), "ELK Mr. Tree"), + "Tree-based algorithm provided by the Eclipse Layout Kernel. Computes a spanning tree of the input graph and arranges all nodes according to the resulting parent-children hierarchy. I pity the fool who doesn't use Mr. Tree Layout." + ), + new NTc() + ), + bre + ), + pqb((Csd(), wsd)) + ) + ) + ); + p4c(a, are, ame, CTc); + p4c(a, are, wme, 20); + p4c(a, are, _le, tme); + p4c(a, are, vme, meb(1)); + p4c(a, are, zme, (Bcb(), true)); + p4c(a, are, Zpe, Ksd(vTc)); + p4c(a, are, Fme, Ksd(xTc)); + p4c(a, are, Tme, Ksd(yTc)); + p4c(a, are, Eme, Ksd(zTc)); + p4c(a, are, Gme, Ksd(wTc)); + p4c(a, are, Dme, Ksd(ATc)); + p4c(a, are, Hme, Ksd(DTc)); + p4c(a, are, Zqe, Ksd(ITc)); + p4c(a, are, $qe, Ksd(FTc)); + } + function zod(a) { + if (a.q) return; + a.q = true; + a.p = Lnd(a, 0); + a.a = Lnd(a, 1); + Qnd(a.a, 0); + a.f = Lnd(a, 2); + Qnd(a.f, 1); + Knd(a.f, 2); + a.n = Lnd(a, 3); + Knd(a.n, 3); + Knd(a.n, 4); + Knd(a.n, 5); + Knd(a.n, 6); + a.g = Lnd(a, 4); + Qnd(a.g, 7); + Knd(a.g, 8); + a.c = Lnd(a, 5); + Qnd(a.c, 7); + Qnd(a.c, 8); + a.i = Lnd(a, 6); + Qnd(a.i, 9); + Qnd(a.i, 10); + Qnd(a.i, 11); + Qnd(a.i, 12); + Knd(a.i, 13); + a.j = Lnd(a, 7); + Qnd(a.j, 9); + a.d = Lnd(a, 8); + Qnd(a.d, 3); + Qnd(a.d, 4); + Qnd(a.d, 5); + Qnd(a.d, 6); + Knd(a.d, 7); + Knd(a.d, 8); + Knd(a.d, 9); + Knd(a.d, 10); + a.b = Lnd(a, 9); + Knd(a.b, 0); + Knd(a.b, 1); + a.e = Lnd(a, 10); + Knd(a.e, 1); + Knd(a.e, 2); + Knd(a.e, 3); + Knd(a.e, 4); + Qnd(a.e, 5); + Qnd(a.e, 6); + Qnd(a.e, 7); + Qnd(a.e, 8); + Qnd(a.e, 9); + Qnd(a.e, 10); + Knd(a.e, 11); + a.k = Lnd(a, 11); + Knd(a.k, 0); + Knd(a.k, 1); + a.o = Mnd(a, 12); + a.s = Mnd(a, 13); + } + function AUb(a, b) { + b.dc() && HVb(a.j, true, true, true, true); + pb(b, (Ucd(), Gcd)) && HVb(a.j, true, true, true, false); + pb(b, Bcd) && HVb(a.j, false, true, true, true); + pb(b, Ocd) && HVb(a.j, true, true, false, true); + pb(b, Qcd) && HVb(a.j, true, false, true, true); + pb(b, Hcd) && HVb(a.j, false, true, true, false); + pb(b, Ccd) && HVb(a.j, false, true, false, true); + pb(b, Pcd) && HVb(a.j, true, false, false, true); + pb(b, Ncd) && HVb(a.j, true, false, true, false); + pb(b, Lcd) && HVb(a.j, true, true, true, true); + pb(b, Ecd) && HVb(a.j, true, true, true, true); + pb(b, Lcd) && HVb(a.j, true, true, true, true); + pb(b, Dcd) && HVb(a.j, true, true, true, true); + pb(b, Mcd) && HVb(a.j, true, true, true, true); + pb(b, Kcd) && HVb(a.j, true, true, true, true); + pb(b, Jcd) && HVb(a.j, true, true, true, true); + } + function rZb(a, b, c, d, e) { + var f, g, h, i, j, k, l, m, n, o, p, q; + f = new Rkb(); + for (j = new olb(d); j.a < j.c.c.length; ) { + h = BD(mlb(j), 441); + g = null; + if (h.f == (KAc(), IAc)) { + for (o = new olb(h.e); o.a < o.c.c.length; ) { + n = BD(mlb(o), 17); + q = n.d.i; + if (Q_b(q) == b) { + iZb(a, b, h, n, h.b, n.d); + } else if (!c || f_b(q, c)) { + jZb(a, b, h, d, n); + } else { + m = oZb(a, b, c, n, h.b, IAc, g); + m != g && ((f.c[f.c.length] = m), true); + m.c && (g = m); + } + } + } else { + for (l = new olb(h.e); l.a < l.c.c.length; ) { + k = BD(mlb(l), 17); + p = k.c.i; + if (Q_b(p) == b) { + iZb(a, b, h, k, k.c, h.b); + } else if (!c || f_b(p, c)) { + continue; + } else { + m = oZb(a, b, c, k, h.b, HAc, g); + m != g && ((f.c[f.c.length] = m), true); + m.c && (g = m); + } + } + } + } + for (i = new olb(f); i.a < i.c.c.length; ) { + h = BD(mlb(i), 441); + Jkb(b.a, h.a, 0) != -1 || Ekb(b.a, h.a); + h.c && ((e.c[e.c.length] = h), true); + } + } + function SJc(a, b, c) { + var d, e, f, g, h, i, j, k, l, m; + j = new Rkb(); + for (i = new olb(b.a); i.a < i.c.c.length; ) { + g = BD(mlb(i), 10); + for (m = V_b(g, (Ucd(), zcd)).Kc(); m.Ob(); ) { + l = BD(m.Pb(), 11); + for (e = new olb(l.g); e.a < e.c.c.length; ) { + d = BD(mlb(e), 17); + if ((!OZb(d) && d.c.i.c == d.d.i.c) || OZb(d) || d.d.i.c != c) { + continue; + } + j.c[j.c.length] = d; + } + } + } + for (h = Su(c.a).Kc(); h.Ob(); ) { + g = BD(h.Pb(), 10); + for (m = V_b(g, (Ucd(), Tcd)).Kc(); m.Ob(); ) { + l = BD(m.Pb(), 11); + for (e = new olb(l.e); e.a < e.c.c.length; ) { + d = BD(mlb(e), 17); + if ((!OZb(d) && d.c.i.c == d.d.i.c) || OZb(d) || d.c.i.c != b) { + continue; + } + k = new Bib(j, j.c.length); + f = (sCb(k.b > 0), BD(k.a.Xb((k.c = --k.b)), 17)); + while (f != d && k.b > 0) { + a.a[f.p] = true; + a.a[d.p] = true; + f = (sCb(k.b > 0), BD(k.a.Xb((k.c = --k.b)), 17)); + } + k.b > 0 && uib(k); + } + } + } + } + function Vmd(b, c, d) { + var e, f, g, h, i, j, k, l, m; + if (b.a != c.Aj()) { + throw vbb(new Wdb(tte + c.ne() + ute)); + } + e = o1d((O6d(), M6d), c).$k(); + if (e) { + return e.Aj().Nh().Ih(e, d); + } + h = o1d(M6d, c).al(); + if (h) { + if (d == null) { + return null; + } + i = BD(d, 15); + if (i.dc()) { + return ""; + } + m = new Hfb(); + for (g = i.Kc(); g.Ob(); ) { + f = g.Pb(); + Efb(m, h.Aj().Nh().Ih(h, f)); + m.a += " "; + } + return lcb(m, m.a.length - 1); + } + l = o1d(M6d, c).bl(); + if (!l.dc()) { + for (k = l.Kc(); k.Ob(); ) { + j = BD(k.Pb(), 148); + if (j.wj(d)) { + try { + m = j.Aj().Nh().Ih(j, d); + if (m != null) { + return m; + } + } catch (a) { + a = ubb(a); + if (!JD(a, 102)) throw vbb(a); + } + } + } + throw vbb( + new Wdb("Invalid value: '" + d + "' for datatype :" + c.ne()) + ); + } + BD(c, 834).Fj(); + return d == null + ? null + : JD(d, 172) + ? "" + BD(d, 172).a + : rb(d) == $J + ? CQd(Pmd[0], BD(d, 199)) + : fcb(d); + } + function zQc(a) { + var b, c, d, e, f, g, h, i, j, k; + j = new Psb(); + h = new Psb(); + for (f = new olb(a); f.a < f.c.c.length; ) { + d = BD(mlb(f), 128); + d.v = 0; + d.n = d.i.c.length; + d.u = d.t.c.length; + d.n == 0 && (Gsb(j, d, j.c.b, j.c), true); + d.u == 0 && d.r.a.gc() == 0 && (Gsb(h, d, h.c.b, h.c), true); + } + g = -1; + while (j.b != 0) { + d = BD(Vt(j, 0), 128); + for (c = new olb(d.t); c.a < c.c.c.length; ) { + b = BD(mlb(c), 268); + k = b.b; + k.v = Math.max(k.v, d.v + 1); + g = Math.max(g, k.v); + --k.n; + k.n == 0 && (Gsb(j, k, j.c.b, j.c), true); + } + } + if (g > -1) { + for (e = Jsb(h, 0); e.b != e.d.c; ) { + d = BD(Xsb(e), 128); + d.v = g; + } + while (h.b != 0) { + d = BD(Vt(h, 0), 128); + for (c = new olb(d.i); c.a < c.c.c.length; ) { + b = BD(mlb(c), 268); + i = b.a; + if (i.r.a.gc() != 0) { + continue; + } + i.v = Math.min(i.v, d.v - 1); + --i.u; + i.u == 0 && (Gsb(h, i, h.c.b, h.c), true); + } + } + } + } + function A6c(a, b, c, d, e) { + var f, g, h, i; + i = Pje; + g = false; + h = v6c( + a, + c7c(new f7c(b.a, b.b), a), + P6c(new f7c(c.a, c.b), e), + c7c(new f7c(d.a, d.b), c) + ); + f = + !!h && + !( + (Math.abs(h.a - a.a) <= nse && Math.abs(h.b - a.b) <= nse) || + (Math.abs(h.a - b.a) <= nse && Math.abs(h.b - b.b) <= nse) + ); + h = v6c(a, c7c(new f7c(b.a, b.b), a), c, e); + !!h && + ((Math.abs(h.a - a.a) <= nse && Math.abs(h.b - a.b) <= nse) == + (Math.abs(h.a - b.a) <= nse && Math.abs(h.b - b.b) <= nse) || f + ? (i = Math.min(i, U6c(c7c(h, c)))) + : (g = true)); + h = v6c(a, c7c(new f7c(b.a, b.b), a), d, e); + !!h && + (g || + (Math.abs(h.a - a.a) <= nse && Math.abs(h.b - a.b) <= nse) == + (Math.abs(h.a - b.a) <= nse && Math.abs(h.b - b.b) <= nse) || + f) && + (i = Math.min(i, U6c(c7c(h, d)))); + return i; + } + function cTb(a) { + r4c( + a, + new E3c( + L3c( + P3c( + M3c( + O3c(N3c(new R3c(), Rme), Sme), + "Minimizes the stress within a layout using stress majorization. Stress exists if the euclidean distance between a pair of nodes doesn't match their graph theoretic distance, that is, the shortest path between the two nodes. The method allows to specify individual edge lengths." + ), + new fTb() + ), + ume + ) + ) + ); + p4c(a, Rme, Ame, Ksd(VSb)); + p4c(a, Rme, Cme, (Bcb(), true)); + p4c(a, Rme, Fme, Ksd(YSb)); + p4c(a, Rme, Tme, Ksd(ZSb)); + p4c(a, Rme, Eme, Ksd($Sb)); + p4c(a, Rme, Gme, Ksd(XSb)); + p4c(a, Rme, Dme, Ksd(_Sb)); + p4c(a, Rme, Hme, Ksd(aTb)); + p4c(a, Rme, Mme, Ksd(USb)); + p4c(a, Rme, Ome, Ksd(SSb)); + p4c(a, Rme, Pme, Ksd(TSb)); + p4c(a, Rme, Qme, Ksd(WSb)); + p4c(a, Rme, Nme, Ksd(RSb)); + } + function BFc(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r; + Odd(b, "Interactive crossing minimization", 1); + g = 0; + for (f = new olb(a.b); f.a < f.c.c.length; ) { + d = BD(mlb(f), 29); + d.p = g++; + } + m = WZb(a); + q = new iHc(m.length); + $Ic(new amb(OC(GC(qY, 1), Uhe, 225, 0, [q])), m); + p = 0; + g = 0; + for (e = new olb(a.b); e.a < e.c.c.length; ) { + d = BD(mlb(e), 29); + c = 0; + l = 0; + for (k = new olb(d.a); k.a < k.c.c.length; ) { + i = BD(mlb(k), 10); + if (i.n.a > 0) { + c += i.n.a + i.o.a / 2; + ++l; + } + for (o = new olb(i.j); o.a < o.c.c.length; ) { + n = BD(mlb(o), 11); + n.p = p++; + } + } + l > 0 && (c /= l); + r = KC(UD, Vje, 25, d.a.c.length, 15, 1); + h = 0; + for (j = new olb(d.a); j.a < j.c.c.length; ) { + i = BD(mlb(j), 10); + i.p = h++; + r[i.p] = AFc(i, c); + i.k == (j0b(), g0b) && yNb(i, (wtc(), atc), r[i.p]); + } + mmb(); + Okb(d.a, new GFc(r)); + YDc(q, m, g, true); + ++g; + } + Qdd(b); + } + function Zfe(a, b) { + var c, d, e, f, g, h, i, j, k; + if (b.e == 5) { + Wfe(a, b); + return; + } + j = b; + if (j.b == null || a.b == null) return; + Yfe(a); + Vfe(a); + Yfe(j); + Vfe(j); + c = KC(WD, oje, 25, a.b.length + j.b.length, 15, 1); + k = 0; + d = 0; + g = 0; + while (d < a.b.length && g < j.b.length) { + e = a.b[d]; + f = a.b[d + 1]; + h = j.b[g]; + i = j.b[g + 1]; + if (f < h) { + c[k++] = a.b[d++]; + c[k++] = a.b[d++]; + } else if (f >= h && e <= i) { + if (h <= e && f <= i) { + d += 2; + } else if (h <= e) { + a.b[d] = i + 1; + g += 2; + } else if (f <= i) { + c[k++] = e; + c[k++] = h - 1; + d += 2; + } else { + c[k++] = e; + c[k++] = h - 1; + a.b[d] = i + 1; + g += 2; + } + } else if (i < e) { + g += 2; + } else { + throw vbb( + new hz( + "Token#subtractRanges(): Internal Error: [" + + a.b[d] + + "," + + a.b[d + 1] + + "] - [" + + j.b[g] + + "," + + j.b[g + 1] + + "]" + ) + ); + } + } + while (d < a.b.length) { + c[k++] = a.b[d++]; + c[k++] = a.b[d++]; + } + a.b = KC(WD, oje, 25, k, 15, 1); + $fb(c, 0, a.b, 0, k); + } + function BJb(a) { + var b, c, d, e, f, g, h; + if (a.A.dc()) { + return; + } + if (a.A.Hc((tdd(), rdd))) { + BD(Mpb(a.b, (Ucd(), Acd)), 124).k = true; + BD(Mpb(a.b, Rcd), 124).k = true; + b = a.q != (dcd(), _bd) && a.q != $bd; + ZGb(BD(Mpb(a.b, zcd), 124), b); + ZGb(BD(Mpb(a.b, Tcd), 124), b); + ZGb(a.g, b); + if (a.A.Hc(sdd)) { + BD(Mpb(a.b, Acd), 124).j = true; + BD(Mpb(a.b, Rcd), 124).j = true; + BD(Mpb(a.b, zcd), 124).k = true; + BD(Mpb(a.b, Tcd), 124).k = true; + a.g.k = true; + } + } + if (a.A.Hc(qdd)) { + a.a.j = true; + a.a.k = true; + a.g.j = true; + a.g.k = true; + h = a.B.Hc((Idd(), Edd)); + for (e = wJb(), f = 0, g = e.length; f < g; ++f) { + d = e[f]; + c = BD(Mpb(a.i, d), 306); + if (c) { + if (sJb(d)) { + c.j = true; + c.k = true; + } else { + c.j = !h; + c.k = !h; + } + } + } + } + if (a.A.Hc(pdd) && a.B.Hc((Idd(), Ddd))) { + a.g.j = true; + a.g.j = true; + if (!a.a.j) { + a.a.j = true; + a.a.k = true; + a.a.e = true; + } + } + } + function GJc(a) { + var b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r; + for (d = new olb(a.e.b); d.a < d.c.c.length; ) { + c = BD(mlb(d), 29); + for (f = new olb(c.a); f.a < f.c.c.length; ) { + e = BD(mlb(f), 10); + n = a.i[e.p]; + j = n.a.e; + i = n.d.e; + e.n.b = j; + r = i - j - e.o.b; + b = bKc(e); + m = + (Izc(), + (!e.q ? (mmb(), mmb(), kmb) : e.q)._b((Nyc(), Cxc)) + ? (l = BD(vNb(e, Cxc), 197)) + : (l = BD(vNb(Q_b(e), Dxc), 197)), + l); + b && (m == Fzc || m == Ezc) && (e.o.b += r); + if (b && (m == Hzc || m == Fzc || m == Ezc)) { + for (p = new olb(e.j); p.a < p.c.c.length; ) { + o = BD(mlb(p), 11); + if ((Ucd(), Ecd).Hc(o.j)) { + k = BD(Ohb(a.k, o), 121); + o.n.b = k.e - j; + } + } + for (h = new olb(e.b); h.a < h.c.c.length; ) { + g = BD(mlb(h), 70); + q = BD(vNb(e, xxc), 21); + q.Hc((Hbd(), Ebd)) ? (g.n.b += r) : q.Hc(Fbd) && (g.n.b += r / 2); + } + (m == Fzc || m == Ezc) && V_b(e, (Ucd(), Rcd)).Jc(new $Kc(r)); + } + } + } + } + function Lwb(a, b, c) { + var d, e, f, g, h, i, j, k, l, m, n; + if (!a.b) { + return false; + } + g = null; + m = null; + i = new exb(null, null); + e = 1; + i.a[1] = a.b; + l = i; + while (l.a[e]) { + j = e; + h = m; + m = l; + l = l.a[e]; + d = a.a.ue(b, l.d); + e = d < 0 ? 0 : 1; + d == 0 && (!c.c || wtb(l.e, c.d)) && (g = l); + if (!(!!l && l.b) && !Hwb(l.a[e])) { + if (Hwb(l.a[1 - e])) { + m = m.a[j] = Owb(l, e); + } else if (!Hwb(l.a[1 - e])) { + n = m.a[1 - j]; + if (n) { + if (!Hwb(n.a[1 - j]) && !Hwb(n.a[j])) { + m.b = false; + n.b = true; + l.b = true; + } else { + f = h.a[1] == m ? 1 : 0; + Hwb(n.a[j]) + ? (h.a[f] = Nwb(m, j)) + : Hwb(n.a[1 - j]) && (h.a[f] = Owb(m, j)); + l.b = h.a[f].b = true; + h.a[f].a[0].b = false; + h.a[f].a[1].b = false; + } + } + } + } + } + if (g) { + c.b = true; + c.d = g.e; + if (l != g) { + k = new exb(l.d, l.e); + Mwb(a, i, g, k); + m == g && (m = k); + } + m.a[m.a[1] == l ? 1 : 0] = l.a[!l.a[0] ? 1 : 0]; + --a.c; + } + a.b = i.a[1]; + !!a.b && (a.b.b = false); + return c.b; + } + function cic(a) { + var b, c, d, e, f, g, h, i, j, k, l, m; + for (e = new olb(a.a.a.b); e.a < e.c.c.length; ) { + d = BD(mlb(e), 57); + for (i = d.c.Kc(); i.Ob(); ) { + h = BD(i.Pb(), 57); + if (d.a == h.a) { + continue; + } + fad(a.a.d) ? (l = a.a.g.Oe(d, h)) : (l = a.a.g.Pe(d, h)); + f = d.b.a + d.d.b + l - h.b.a; + f = Math.ceil(f); + f = Math.max(0, f); + if (vgc(d, h)) { + g = nGb(new pGb(), a.d); + j = QD(Math.ceil(h.b.a - d.b.a)); + b = j - (h.b.a - d.b.a); + k = ugc(d).a; + c = d; + if (!k) { + k = ugc(h).a; + b = -b; + c = h; + } + if (k) { + c.b.a -= b; + k.n.a -= b; + } + AFb( + DFb(CFb(EFb(BFb(new FFb(), Math.max(0, j)), 1), g), a.c[d.a.d]) + ); + AFb( + DFb(CFb(EFb(BFb(new FFb(), Math.max(0, -j)), 1), g), a.c[h.a.d]) + ); + } else { + m = 1; + ((JD(d.g, 145) && JD(h.g, 10)) || (JD(h.g, 145) && JD(d.g, 10))) && + (m = 2); + AFb( + DFb(CFb(EFb(BFb(new FFb(), QD(f)), m), a.c[d.a.d]), a.c[h.a.d]) + ); + } + } + } + } + function pEc(a, b, c) { + var d, e, f, g, h, i, j, k, l, m; + if (c) { + d = -1; + k = new Bib(b, 0); + while (k.b < k.d.gc()) { + h = (sCb(k.b < k.d.gc()), BD(k.d.Xb((k.c = k.b++)), 10)); + l = a.c[h.c.p][h.p].a; + if (l == null) { + g = d + 1; + f = new Bib(b, k.b); + while (f.b < f.d.gc()) { + m = tEc( + a, + (sCb(f.b < f.d.gc()), BD(f.d.Xb((f.c = f.b++)), 10)) + ).a; + if (m != null) { + g = (uCb(m), m); + break; + } + } + l = (d + g) / 2; + a.c[h.c.p][h.p].a = l; + a.c[h.c.p][h.p].d = (uCb(l), l); + a.c[h.c.p][h.p].b = 1; + } + d = (uCb(l), l); + } + } else { + e = 0; + for (j = new olb(b); j.a < j.c.c.length; ) { + h = BD(mlb(j), 10); + a.c[h.c.p][h.p].a != null && + (e = Math.max(e, Edb(a.c[h.c.p][h.p].a))); + } + e += 2; + for (i = new olb(b); i.a < i.c.c.length; ) { + h = BD(mlb(i), 10); + if (a.c[h.c.p][h.p].a == null) { + l = Cub(a.i, 24) * lke * e - 1; + a.c[h.c.p][h.p].a = l; + a.c[h.c.p][h.p].d = l; + a.c[h.c.p][h.p].b = 1; + } + } + } + } + function CZd() { + rEd(b5, new i$d()); + rEd(a5, new P$d()); + rEd(c5, new u_d()); + rEd(d5, new M_d()); + rEd(f5, new P_d()); + rEd(h5, new S_d()); + rEd(g5, new V_d()); + rEd(i5, new Y_d()); + rEd(k5, new GZd()); + rEd(l5, new JZd()); + rEd(m5, new MZd()); + rEd(n5, new PZd()); + rEd(o5, new SZd()); + rEd(p5, new VZd()); + rEd(q5, new YZd()); + rEd(t5, new _Zd()); + rEd(v5, new c$d()); + rEd(x6, new f$d()); + rEd(j5, new l$d()); + rEd(u5, new o$d()); + rEd(wI, new r$d()); + rEd(GC(SD, 1), new u$d()); + rEd(xI, new x$d()); + rEd(yI, new A$d()); + rEd($J, new D$d()); + rEd(O4, new G$d()); + rEd(BI, new J$d()); + rEd(T4, new M$d()); + rEd(U4, new S$d()); + rEd(O9, new V$d()); + rEd(E9, new Y$d()); + rEd(FI, new _$d()); + rEd(JI, new c_d()); + rEd(AI, new f_d()); + rEd(MI, new i_d()); + rEd(DK, new l_d()); + rEd(v8, new o_d()); + rEd(u8, new r_d()); + rEd(UI, new x_d()); + rEd(ZI, new A_d()); + rEd(X4, new D_d()); + rEd(V4, new G_d()); + } + function hA(a, b, c) { + var d, e, f, g, h, i, j, k, l; + !c && (c = TA(b.q.getTimezoneOffset())); + e = (b.q.getTimezoneOffset() - c.a) * 60000; + h = new gB(wbb(Cbb(b.q.getTime()), e)); + i = h; + if (h.q.getTimezoneOffset() != b.q.getTimezoneOffset()) { + e > 0 ? (e -= 86400000) : (e += 86400000); + i = new gB(wbb(Cbb(b.q.getTime()), e)); + } + k = new Vfb(); + j = a.a.length; + for (f = 0; f < j; ) { + d = bfb(a.a, f); + if ((d >= 97 && d <= 122) || (d >= 65 && d <= 90)) { + for (g = f + 1; g < j && bfb(a.a, g) == d; ++g); + vA(k, d, g - f, h, i, c); + f = g; + } else if (d == 39) { + ++f; + if (f < j && bfb(a.a, f) == 39) { + k.a += "'"; + ++f; + continue; + } + l = false; + while (!l) { + g = f; + while (g < j && bfb(a.a, g) != 39) { + ++g; + } + if (g >= j) { + throw vbb(new Wdb("Missing trailing '")); + } + g + 1 < j && bfb(a.a, g + 1) == 39 ? ++g : (l = true); + Qfb(k, qfb(a.a, f, g)); + f = g + 1; + } + } else { + k.a += String.fromCharCode(d); + ++f; + } + } + return k.a; + } + function MEc(a) { + var b, c, d, e, f, g, h, i; + b = null; + for (d = new olb(a); d.a < d.c.c.length; ) { + c = BD(mlb(d), 233); + Edb(REc(c.g, c.d[0]).a); + c.b = null; + if (!!c.e && c.e.gc() > 0 && c.c == 0) { + !b && (b = new Rkb()); + b.c[b.c.length] = c; + } + } + if (b) { + while (b.c.length != 0) { + c = BD(Kkb(b, 0), 233); + if (!!c.b && c.b.c.length > 0) { + for ( + f = (!c.b && (c.b = new Rkb()), new olb(c.b)); + f.a < f.c.c.length; + + ) { + e = BD(mlb(f), 233); + if (Gdb(REc(e.g, e.d[0]).a) == Gdb(REc(c.g, c.d[0]).a)) { + if (Jkb(a, e, 0) > Jkb(a, c, 0)) { + return new vgd(e, c); + } + } else if (Edb(REc(e.g, e.d[0]).a) > Edb(REc(c.g, c.d[0]).a)) { + return new vgd(e, c); + } + } + } + for (h = (!c.e && (c.e = new Rkb()), c.e).Kc(); h.Ob(); ) { + g = BD(h.Pb(), 233); + i = (!g.b && (g.b = new Rkb()), g.b); + wCb(0, i.c.length); + aCb(i.c, 0, c); + g.c == i.c.length && ((b.c[b.c.length] = g), true); + } + } + } + return null; + } + function wlb(a, b) { + var c, d, e, f, g, h, i, j, k; + if (a == null) { + return Xhe; + } + i = b.a.zc(a, b); + if (i != null) { + return "[...]"; + } + c = new xwb(She, "[", "]"); + for (e = a, f = 0, g = e.length; f < g; ++f) { + d = e[f]; + if (d != null && (rb(d).i & 4) != 0) { + if (Array.isArray(d) && ((k = HC(d)), !(k >= 14 && k <= 16))) { + if (b.a._b(d)) { + !c.a ? (c.a = new Wfb(c.d)) : Qfb(c.a, c.b); + Nfb(c.a, "[...]"); + } else { + h = CD(d); + j = new Vqb(b); + uwb(c, wlb(h, j)); + } + } else + JD(d, 177) + ? uwb(c, Xlb(BD(d, 177))) + : JD(d, 190) + ? uwb(c, Qlb(BD(d, 190))) + : JD(d, 195) + ? uwb(c, Rlb(BD(d, 195))) + : JD(d, 2012) + ? uwb(c, Wlb(BD(d, 2012))) + : JD(d, 48) + ? uwb(c, Ulb(BD(d, 48))) + : JD(d, 364) + ? uwb(c, Vlb(BD(d, 364))) + : JD(d, 832) + ? uwb(c, Tlb(BD(d, 832))) + : JD(d, 104) && uwb(c, Slb(BD(d, 104))); + } else { + uwb(c, d == null ? Xhe : fcb(d)); + } + } + return !c.a ? c.c : c.e.length == 0 ? c.a.a : c.a.a + ("" + c.e); + } + function xQb(a, b, c, d) { + var e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t; + h = itd(b, false, false); + r = ofd(h); + d && (r = w7c(r)); + t = Edb(ED(hkd(b, (CPb(), vPb)))); + q = (sCb(r.b != 0), BD(r.a.a.c, 8)); + l = BD(Ut(r, 1), 8); + if (r.b > 2) { + k = new Rkb(); + Gkb(k, new Jib(r, 1, r.b)); + f = sQb(k, t + a.a); + s = new XOb(f); + tNb(s, b); + c.c[c.c.length] = s; + } else { + d ? (s = BD(Ohb(a.b, jtd(b)), 266)) : (s = BD(Ohb(a.b, ltd(b)), 266)); + } + i = jtd(b); + d && (i = ltd(b)); + g = zQb(q, i); + j = t + a.a; + if (g.a) { + j += Math.abs(q.b - l.b); + p = new f7c(l.a, (l.b + q.b) / 2); + } else { + j += Math.abs(q.a - l.a); + p = new f7c((l.a + q.a) / 2, l.b); + } + d ? Rhb(a.d, b, new ZOb(s, g, p, j)) : Rhb(a.c, b, new ZOb(s, g, p, j)); + Rhb(a.b, b, s); + o = (!b.n && (b.n = new cUd(D2, b, 1, 7)), b.n); + for (n = new Fyd(o); n.e != n.i.gc(); ) { + m = BD(Dyd(n), 137); + e = wQb(a, m, true, 0, 0); + c.c[c.c.length] = e; + } + } + function wPc(a) { + var b, c, d, e, f, g, h, i, j, k; + j = new Rkb(); + h = new Rkb(); + for (g = new olb(a); g.a < g.c.c.length; ) { + e = BD(mlb(g), 112); + pOc(e, e.f.c.length); + qOc(e, e.k.c.length); + e.d == 0 && ((j.c[j.c.length] = e), true); + e.i == 0 && e.e.b == 0 && ((h.c[h.c.length] = e), true); + } + d = -1; + while (j.c.length != 0) { + e = BD(Kkb(j, 0), 112); + for (c = new olb(e.k); c.a < c.c.c.length; ) { + b = BD(mlb(c), 129); + k = b.b; + rOc(k, Math.max(k.o, e.o + 1)); + d = Math.max(d, k.o); + pOc(k, k.d - 1); + k.d == 0 && ((j.c[j.c.length] = k), true); + } + } + if (d > -1) { + for (f = new olb(h); f.a < f.c.c.length; ) { + e = BD(mlb(f), 112); + e.o = d; + } + while (h.c.length != 0) { + e = BD(Kkb(h, 0), 112); + for (c = new olb(e.f); c.a < c.c.c.length; ) { + b = BD(mlb(c), 129); + i = b.a; + if (i.e.b > 0) { + continue; + } + rOc(i, Math.min(i.o, e.o - 1)); + qOc(i, i.i - 1); + i.i == 0 && ((h.c[h.c.length] = i), true); + } + } + } + } + function QQd(a, b, c) { + var d, e, f, g, h, i, j; + j = a.c; + !b && (b = FQd); + a.c = b; + if ((a.Db & 4) != 0 && (a.Db & 1) == 0) { + i = new nSd(a, 1, 2, j, a.c); + !c ? (c = i) : c.Ei(i); + } + if (j != b) { + if (JD(a.Cb, 284)) { + if (a.Db >> 16 == -10) { + c = BD(a.Cb, 284).nk(b, c); + } else if (a.Db >> 16 == -15) { + !b && (b = (jGd(), YFd)); + !j && (j = (jGd(), YFd)); + if (a.Cb.nh()) { + i = new pSd(a.Cb, 1, 13, j, b, HLd(QSd(BD(a.Cb, 59)), a), false); + !c ? (c = i) : c.Ei(i); + } + } + } else if (JD(a.Cb, 88)) { + if (a.Db >> 16 == -23) { + JD(b, 88) || (b = (jGd(), _Fd)); + JD(j, 88) || (j = (jGd(), _Fd)); + if (a.Cb.nh()) { + i = new pSd(a.Cb, 1, 10, j, b, HLd(VKd(BD(a.Cb, 26)), a), false); + !c ? (c = i) : c.Ei(i); + } + } + } else if (JD(a.Cb, 444)) { + h = BD(a.Cb, 836); + g = (!h.b && (h.b = new RYd(new NYd())), h.b); + for (f = ((d = new nib(new eib(g.a).a)), new ZYd(d)); f.a.b; ) { + e = BD(lib(f.a).cd(), 87); + c = QQd(e, MQd(e, h), c); + } + } + } + return c; + } + function O1b(a, b) { + var c, d, e, f, g, h, i, j, k, l, m; + g = Ccb(DD(hkd(a, (Nyc(), fxc)))); + m = BD(hkd(a, Yxc), 21); + i = false; + j = false; + l = new Fyd((!a.c && (a.c = new cUd(F2, a, 9, 9)), a.c)); + while (l.e != l.i.gc() && (!i || !j)) { + f = BD(Dyd(l), 118); + h = 0; + for ( + e = ul( + pl( + OC(GC(KI, 1), Uhe, 20, 0, [ + (!f.d && (f.d = new y5d(B2, f, 8, 5)), f.d), + (!f.e && (f.e = new y5d(B2, f, 7, 4)), f.e), + ]) + ) + ); + Qr(e); + + ) { + d = BD(Rr(e), 79); + k = g && Qld(d) && Ccb(DD(hkd(d, gxc))); + c = ELd((!d.b && (d.b = new y5d(z2, d, 4, 7)), d.b), f) + ? a == + Xod( + atd(BD(qud((!d.c && (d.c = new y5d(z2, d, 5, 8)), d.c), 0), 82)) + ) + : a == + Xod( + atd(BD(qud((!d.b && (d.b = new y5d(z2, d, 4, 7)), d.b), 0), 82)) + ); + if (k || c) { + ++h; + if (h > 1) { + break; + } + } + } + h > 0 + ? (i = true) + : m.Hc((rcd(), ncd)) && + (!f.n && (f.n = new cUd(D2, f, 1, 7)), f.n).i > 0 && + (i = true); + h > 1 && (j = true); + } + i && b.Fc((Orc(), Hrc)); + j && b.Fc((Orc(), Irc)); + } + function zfd(a) { + var b, c, d, e, f, g, h, i, j, k, l, m; + m = BD(hkd(a, (Y9c(), Y8c)), 21); + if (m.dc()) { + return null; + } + h = 0; + g = 0; + if (m.Hc((tdd(), rdd))) { + k = BD(hkd(a, t9c), 98); + d = 2; + c = 2; + e = 2; + f = 2; + b = !Xod(a) ? BD(hkd(a, z8c), 103) : BD(hkd(Xod(a), z8c), 103); + for ( + j = new Fyd((!a.c && (a.c = new cUd(F2, a, 9, 9)), a.c)); + j.e != j.i.gc(); + + ) { + i = BD(Dyd(j), 118); + l = BD(hkd(i, A9c), 61); + if (l == (Ucd(), Scd)) { + l = lfd(i, b); + jkd(i, A9c, l); + } + if (k == (dcd(), $bd)) { + switch (l.g) { + case 1: + d = Math.max(d, i.i + i.g); + break; + case 2: + c = Math.max(c, i.j + i.f); + break; + case 3: + e = Math.max(e, i.i + i.g); + break; + case 4: + f = Math.max(f, i.j + i.f); + } + } else { + switch (l.g) { + case 1: + d += i.g + 2; + break; + case 2: + c += i.f + 2; + break; + case 3: + e += i.g + 2; + break; + case 4: + f += i.f + 2; + } + } + } + h = Math.max(d, e); + g = Math.max(c, f); + } + return Afd(a, h, g, true, true); + } + function lnc(a, b, c, d, e) { + var f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u; + s = BD( + GAb( + VAb(JAb(new YAb(null, new Kub(b.d, 16)), new pnc(c)), new rnc(c)), + Byb( + new fzb(), + new dzb(), + new Ezb(), + OC(GC(xL, 1), Kie, 132, 0, [(Fyb(), Dyb)]) + ) + ), + 15 + ); + l = Ohe; + k = Rie; + for (i = new olb(b.b.j); i.a < i.c.c.length; ) { + h = BD(mlb(i), 11); + if (h.j == c) { + l = Math.min(l, h.p); + k = Math.max(k, h.p); + } + } + if (l == Ohe) { + for (g = 0; g < s.gc(); g++) { + ojc(BD(s.Xb(g), 101), c, g); + } + } else { + t = KC(WD, oje, 25, e.length, 15, 1); + Elb(t, t.length); + for (r = s.Kc(); r.Ob(); ) { + q = BD(r.Pb(), 101); + f = BD(Ohb(a.b, q), 177); + j = 0; + for (p = l; p <= k; p++) { + f[p] && (j = Math.max(j, d[p])); + } + if (q.i) { + n = q.i.c; + u = new Tqb(); + for (m = 0; m < e.length; m++) { + e[n][m] && Qqb(u, meb(t[m])); + } + while (Rqb(u, meb(j))) { + ++j; + } + } + ojc(q, c, j); + for (o = l; o <= k; o++) { + f[o] && (d[o] = j + 1); + } + !!q.i && (t[q.i.c] = j); + } + } + } + function YJc(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o, p; + e = null; + for (d = new olb(b.a); d.a < d.c.c.length; ) { + c = BD(mlb(d), 10); + bKc(c) + ? (f = + ((h = nGb(oGb(new pGb(), c), a.f)), + (i = nGb(oGb(new pGb(), c), a.f)), + (j = new rKc(c, true, h, i)), + (k = c.o.b), + (l = + (Izc(), + (!c.q ? (mmb(), mmb(), kmb) : c.q)._b((Nyc(), Cxc)) + ? (m = BD(vNb(c, Cxc), 197)) + : (m = BD(vNb(Q_b(c), Dxc), 197)), + m)), + (n = 10000), + l == Ezc && (n = 1), + (o = AFb( + DFb(CFb(BFb(EFb(new FFb(), n), QD(Math.ceil(k))), h), i) + )), + l == Fzc && Qqb(a.d, o), + ZJc(a, Su(V_b(c, (Ucd(), Tcd))), j), + ZJc(a, V_b(c, zcd), j), + j)) + : (f = + ((p = nGb(oGb(new pGb(), c), a.f)), + MAb( + JAb(new YAb(null, new Kub(c.j, 16)), new EKc()), + new GKc(a, p) + ), + new rKc(c, false, p, p))); + a.i[c.p] = f; + if (e) { + g = e.c.d.a + jBc(a.n, e.c, c) + c.d.d; + e.b || (g += e.c.o.b); + AFb(DFb(CFb(EFb(BFb(new FFb(), QD(Math.ceil(g))), 0), e.d), f.a)); + } + e = f; + } + } + function s9b(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o, p; + Odd(b, "Label dummy insertions", 1); + l = new Rkb(); + g = Edb(ED(vNb(a, (Nyc(), nyc)))); + j = Edb(ED(vNb(a, ryc))); + k = BD(vNb(a, Lwc), 103); + for (n = new olb(a.a); n.a < n.c.c.length; ) { + m = BD(mlb(n), 10); + for (f = new Sr(ur(U_b(m).a.Kc(), new Sq())); Qr(f); ) { + e = BD(Rr(f), 17); + if (e.c.i != e.d.i && Lq(e.b, p9b)) { + p = t9b(e); + o = Pu(e.b.c.length); + c = r9b(a, e, p, o); + l.c[l.c.length] = c; + d = c.o; + h = new Bib(e.b, 0); + while (h.b < h.d.gc()) { + i = (sCb(h.b < h.d.gc()), BD(h.d.Xb((h.c = h.b++)), 70)); + if (PD(vNb(i, Qwc)) === PD((qad(), nad))) { + if (k == (ead(), dad) || k == _9c) { + d.a += i.o.a + j; + d.b = Math.max(d.b, i.o.b); + } else { + d.a = Math.max(d.a, i.o.a); + d.b += i.o.b + j; + } + o.c[o.c.length] = i; + uib(h); + } + } + if (k == (ead(), dad) || k == _9c) { + d.a -= j; + d.b += g + p; + } else { + d.b += g - j + p; + } + } + } + } + Gkb(a.a, l); + Qdd(b); + } + function eYb(a, b, c, d) { + var e, f, g, h, i, j, k, l, m, n; + f = new qYb(b); + l = _Xb(a, b, f); + n = Math.max(Edb(ED(vNb(b, (Nyc(), Zwc)))), 1); + for (k = new olb(l.a); k.a < k.c.c.length; ) { + j = BD(mlb(k), 46); + i = dYb(BD(j.a, 8), BD(j.b, 8), n); + o = true; + o = o & iYb(c, new f7c(i.c, i.d)); + o = o & iYb(c, O6c(new f7c(i.c, i.d), i.b, 0)); + o = o & iYb(c, O6c(new f7c(i.c, i.d), 0, i.a)); + o & iYb(c, O6c(new f7c(i.c, i.d), i.b, i.a)); + } + m = f.d; + h = dYb(BD(l.b.a, 8), BD(l.b.b, 8), n); + if (m == (Ucd(), Tcd) || m == zcd) { + d.c[m.g] = Math.min(d.c[m.g], h.d); + d.b[m.g] = Math.max(d.b[m.g], h.d + h.a); + } else { + d.c[m.g] = Math.min(d.c[m.g], h.c); + d.b[m.g] = Math.max(d.b[m.g], h.c + h.b); + } + e = Qje; + g = f.c.i.d; + switch (m.g) { + case 4: + e = g.c; + break; + case 2: + e = g.b; + break; + case 1: + e = g.a; + break; + case 3: + e = g.d; + } + d.a[m.g] = Math.max(d.a[m.g], e); + return f; + } + function eKd(b) { + var c, d, e, f; + d = b.D != null ? b.D : b.B; + c = hfb(d, wfb(91)); + if (c != -1) { + e = d.substr(0, c); + f = new Hfb(); + do f.a += "["; + while ((c = gfb(d, 91, ++c)) != -1); + if (dfb(e, Khe)) f.a += "Z"; + else if (dfb(e, Eve)) f.a += "B"; + else if (dfb(e, Fve)) f.a += "C"; + else if (dfb(e, Gve)) f.a += "D"; + else if (dfb(e, Hve)) f.a += "F"; + else if (dfb(e, Ive)) f.a += "I"; + else if (dfb(e, Jve)) f.a += "J"; + else if (dfb(e, Kve)) f.a += "S"; + else { + f.a += "L"; + f.a += "" + e; + f.a += ";"; + } + try { + return null; + } catch (a) { + a = ubb(a); + if (!JD(a, 60)) throw vbb(a); + } + } else if (hfb(d, wfb(46)) == -1) { + if (dfb(d, Khe)) return sbb; + else if (dfb(d, Eve)) return SD; + else if (dfb(d, Fve)) return TD; + else if (dfb(d, Gve)) return UD; + else if (dfb(d, Hve)) return VD; + else if (dfb(d, Ive)) return WD; + else if (dfb(d, Jve)) return XD; + else if (dfb(d, Kve)) return rbb; + } + return null; + } + function $1b(a, b, c) { + var d, e, f, g, h, i, j, k; + j = new b0b(c); + tNb(j, b); + yNb(j, (wtc(), $sc), b); + j.o.a = b.g; + j.o.b = b.f; + j.n.a = b.i; + j.n.b = b.j; + Ekb(c.a, j); + Rhb(a.a, b, j); + ((!b.a && (b.a = new cUd(E2, b, 10, 11)), b.a).i != 0 || + Ccb(DD(hkd(b, (Nyc(), fxc))))) && + yNb(j, wsc, (Bcb(), true)); + i = BD(vNb(c, Ksc), 21); + k = BD(vNb(j, (Nyc(), Vxc)), 98); + k == (dcd(), ccd) ? yNb(j, Vxc, bcd) : k != bcd && i.Fc((Orc(), Krc)); + d = BD(vNb(c, Lwc), 103); + for ( + h = new Fyd((!b.c && (b.c = new cUd(F2, b, 9, 9)), b.c)); + h.e != h.i.gc(); + + ) { + g = BD(Dyd(h), 118); + Ccb(DD(hkd(g, Jxc))) || _1b(a, g, j, i, d, k); + } + for ( + f = new Fyd((!b.n && (b.n = new cUd(D2, b, 1, 7)), b.n)); + f.e != f.i.gc(); + + ) { + e = BD(Dyd(f), 137); + !Ccb(DD(hkd(e, Jxc))) && !!e.a && Ekb(j.b, Z1b(e)); + } + Ccb(DD(vNb(j, pwc))) && i.Fc((Orc(), Frc)); + if (Ccb(DD(vNb(j, exc)))) { + i.Fc((Orc(), Jrc)); + i.Fc(Irc); + yNb(j, Vxc, bcd); + } + return j; + } + function F4b(a, b) { + var c, + d, + e, + f, + g, + h, + i, + j, + k, + l, + m, + n, + o, + p, + q, + r, + s, + t, + u, + v, + w, + A, + B, + C, + D; + h = BD(Ohb(b.c, a), 459); + s = b.a.c; + i = b.a.c + b.a.b; + C = h.f; + D = h.a; + g = C < D; + p = new f7c(s, C); + t = new f7c(i, D); + e = (s + i) / 2; + q = new f7c(e, C); + u = new f7c(e, D); + f = G4b(a, C, D); + w = A0b(b.B); + A = new f7c(e, f); + B = A0b(b.D); + c = j6c(OC(GC(m1, 1), nie, 8, 0, [w, A, B])); + n = false; + r = b.B.i; + if (!!r && !!r.c && h.d) { + j = (g && r.p < r.c.a.c.length - 1) || (!g && r.p > 0); + if (j) { + if (j) { + m = r.p; + g ? ++m : --m; + l = BD(Ikb(r.c.a, m), 10); + d = I4b(l); + n = !(s6c(d, w, c[0]) || n6c(d, w, c[0])); + } + } else { + n = true; + } + } + o = false; + v = b.D.i; + if (!!v && !!v.c && h.e) { + k = (g && v.p > 0) || (!g && v.p < v.c.a.c.length - 1); + if (k) { + m = v.p; + g ? --m : ++m; + l = BD(Ikb(v.c.a, m), 10); + d = I4b(l); + o = !(s6c(d, c[0], B) || n6c(d, c[0], B)); + } else { + o = true; + } + } + n && o && Dsb(a.a, A); + n || n7c(a.a, OC(GC(m1, 1), nie, 8, 0, [p, q])); + o || n7c(a.a, OC(GC(m1, 1), nie, 8, 0, [u, t])); + } + function yfd(a, b) { + var c, d, e, f, g, h, i, j; + if (JD(a.Ug(), 160)) { + yfd(BD(a.Ug(), 160), b); + b.a += " > "; + } else { + b.a += "Root "; + } + c = a.Tg().zb; + dfb(c.substr(0, 3), "Elk") ? Qfb(b, c.substr(3)) : ((b.a += "" + c), b); + e = a.zg(); + if (e) { + Qfb(((b.a += " "), b), e); + return; + } + if (JD(a, 354)) { + j = BD(a, 137).a; + if (j) { + Qfb(((b.a += " "), b), j); + return; + } + } + for (g = new Fyd(a.Ag()); g.e != g.i.gc(); ) { + f = BD(Dyd(g), 137); + j = f.a; + if (j) { + Qfb(((b.a += " "), b), j); + return; + } + } + if (JD(a, 352)) { + d = BD(a, 79); + !d.b && (d.b = new y5d(z2, d, 4, 7)); + if (d.b.i != 0 && (!d.c && (d.c = new y5d(z2, d, 5, 8)), d.c.i != 0)) { + b.a += " ("; + h = new Oyd((!d.b && (d.b = new y5d(z2, d, 4, 7)), d.b)); + while (h.e != h.i.gc()) { + h.e > 0 && ((b.a += She), b); + yfd(BD(Dyd(h), 160), b); + } + b.a += gne; + i = new Oyd((!d.c && (d.c = new y5d(z2, d, 5, 8)), d.c)); + while (i.e != i.i.gc()) { + i.e > 0 && ((b.a += She), b); + yfd(BD(Dyd(i), 160), b); + } + b.a += ")"; + } + } + } + function y2b(a, b, c) { + var d, e, f, g, h, i, j, k, l, m, n; + f = BD(vNb(a, (wtc(), $sc)), 79); + if (!f) { + return; + } + d = a.a; + e = new g7c(c); + P6c(e, C2b(a)); + if (f_b(a.d.i, a.c.i)) { + m = a.c; + l = l7c(OC(GC(m1, 1), nie, 8, 0, [m.n, m.a])); + c7c(l, c); + } else { + l = A0b(a.c); + } + Gsb(d, l, d.a, d.a.a); + n = A0b(a.d); + vNb(a, utc) != null && P6c(n, BD(vNb(a, utc), 8)); + Gsb(d, n, d.c.b, d.c); + q7c(d, e); + g = itd(f, true, true); + kmd(g, BD(qud((!f.b && (f.b = new y5d(z2, f, 4, 7)), f.b), 0), 82)); + lmd(g, BD(qud((!f.c && (f.c = new y5d(z2, f, 5, 8)), f.c), 0), 82)); + ifd(d, g); + for (k = new olb(a.b); k.a < k.c.c.length; ) { + j = BD(mlb(k), 70); + h = BD(vNb(j, $sc), 137); + cld(h, j.o.a); + ald(h, j.o.b); + bld(h, j.n.a + e.a, j.n.b + e.b); + jkd(h, (I9b(), H9b), DD(vNb(j, H9b))); + } + i = BD(vNb(a, (Nyc(), jxc)), 74); + if (i) { + q7c(i, e); + jkd(f, jxc, i); + } else { + jkd(f, jxc, null); + } + b == (Aad(), yad) ? jkd(f, Swc, yad) : jkd(f, Swc, null); + } + function mJc(a, b, c, d) { + var e, f, g, h, i, j, k, l, m, n, o, p, q, r, s; + n = b.c.length; + m = 0; + for (l = new olb(a.b); l.a < l.c.c.length; ) { + k = BD(mlb(l), 29); + r = k.a; + if (r.c.length == 0) { + continue; + } + q = new olb(r); + j = 0; + s = null; + e = BD(mlb(q), 10); + f = null; + while (e) { + f = BD(Ikb(b, e.p), 257); + if (f.c >= 0) { + i = null; + h = new Bib(k.a, j + 1); + while (h.b < h.d.gc()) { + g = (sCb(h.b < h.d.gc()), BD(h.d.Xb((h.c = h.b++)), 10)); + i = BD(Ikb(b, g.p), 257); + if (i.d == f.d && i.c < f.c) { + break; + } else { + i = null; + } + } + if (i) { + if (s) { + Nkb(d, e.p, meb(BD(Ikb(d, e.p), 19).a - 1)); + BD(Ikb(c, s.p), 15).Mc(f); + } + f = yJc(f, e, n++); + b.c[b.c.length] = f; + Ekb(c, new Rkb()); + if (s) { + BD(Ikb(c, s.p), 15).Fc(f); + Ekb(d, meb(1)); + } else { + Ekb(d, meb(0)); + } + } + } + o = null; + if (q.a < q.c.c.length) { + o = BD(mlb(q), 10); + p = BD(Ikb(b, o.p), 257); + BD(Ikb(c, e.p), 15).Fc(p); + Nkb(d, o.p, meb(BD(Ikb(d, o.p), 19).a + 1)); + } + f.d = m; + f.c = j++; + s = e; + e = o; + } + ++m; + } + } + function u6c(a, b, c, d) { + var e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t; + i = a; + k = c7c(new f7c(b.a, b.b), a); + j = c; + l = c7c(new f7c(d.a, d.b), c); + m = i.a; + q = i.b; + o = j.a; + s = j.b; + n = k.a; + r = k.b; + p = l.a; + t = l.b; + e = p * r - n * t; + Iy(); + My(Jqe); + if (Math.abs(0 - e) <= Jqe || 0 == e || (isNaN(0) && isNaN(e))) { + return false; + } + g = (1 / e) * ((m - o) * r - (q - s) * n); + h = (1 / e) * -(-(m - o) * t + (q - s) * p); + f = + (null, + My(Jqe), + (Math.abs(0 - g) <= Jqe || 0 == g || (isNaN(0) && isNaN(g)) + ? 0 + : 0 < g + ? -1 + : 0 > g + ? 1 + : Ny(isNaN(0), isNaN(g))) < 0 && + (null, + My(Jqe), + (Math.abs(g - 1) <= Jqe || g == 1 || (isNaN(g) && isNaN(1)) + ? 0 + : g < 1 + ? -1 + : g > 1 + ? 1 + : Ny(isNaN(g), isNaN(1))) < 0) && + (null, + My(Jqe), + (Math.abs(0 - h) <= Jqe || 0 == h || (isNaN(0) && isNaN(h)) + ? 0 + : 0 < h + ? -1 + : 0 > h + ? 1 + : Ny(isNaN(0), isNaN(h))) < 0) && + (null, + My(Jqe), + (Math.abs(h - 1) <= Jqe || h == 1 || (isNaN(h) && isNaN(1)) + ? 0 + : h < 1 + ? -1 + : h > 1 + ? 1 + : Ny(isNaN(h), isNaN(1))) < 0)); + return f; + } + function z6d(a) { + var b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w; + for (l = new usb(new nsb(a)); l.b != l.c.a.d; ) { + k = tsb(l); + h = BD(k.d, 56); + b = BD(k.e, 56); + g = h.Tg(); + for (p = 0, u = (g.i == null && TKd(g), g.i).length; p < u; ++p) { + j = + ((f = (g.i == null && TKd(g), g.i)), + p >= 0 && p < f.length ? f[p] : null); + if (j.Ij() && !j.Jj()) { + if (JD(j, 99)) { + i = BD(j, 18); + (i.Bb & ote) == 0 && + ((w = zUd(i)), !(!!w && (w.Bb & ote) != 0)) && + y6d(a, i, h, b); + } else { + Q6d(); + if (BD(j, 66).Oj()) { + c = ((v = j), BD(!v ? null : BD(b, 49).xh(v), 153)); + if (c) { + n = BD(h.ah(j), 153); + d = c.gc(); + for (q = 0, o = n.gc(); q < o; ++q) { + m = n.il(q); + if (JD(m, 99)) { + t = n.jl(q); + e = Wrb(a, t); + if (e == null && t != null) { + s = BD(m, 18); + if (!a.b || (s.Bb & ote) != 0 || !!zUd(s)) { + continue; + } + e = t; + } + if (!c.dl(m, e)) { + for (r = 0; r < d; ++r) { + if (c.il(r) == m && PD(c.jl(r)) === PD(e)) { + c.ii(c.gc() - 1, r); + --d; + break; + } + } + } + } else { + c.dl(n.il(q), n.jl(q)); + } + } + } + } + } + } + } + } + } + function CZc(a, b, c, d, e, f, g) { + var h, i, j, k, l, m, n, o, p, q, r, s, t; + r = xZc(b, c, a.g); + e.n && e.n && !!f && Tdd(e, i6d(f), (pgd(), mgd)); + if (a.b) { + for (q = 0; q < r.c.length; q++) { + l = (tCb(q, r.c.length), BD(r.c[q], 200)); + if (q != 0) { + n = (tCb(q - 1, r.c.length), BD(r.c[q - 1], 200)); + w$c(l, n.f + n.b + a.g); + } + tZc(q, r, c, a.g); + AZc(a, l); + e.n && !!f && Tdd(e, i6d(f), (pgd(), mgd)); + } + } else { + for (p = new olb(r); p.a < p.c.c.length; ) { + o = BD(mlb(p), 200); + for (k = new olb(o.a); k.a < k.c.c.length; ) { + j = BD(mlb(k), 187); + s = new b$c(j.s, j.t, a.g); + WZc(s, j); + Ekb(o.d, s); + } + } + } + BZc(a, r); + e.n && e.n && !!f && Tdd(e, i6d(f), (pgd(), mgd)); + t = Math.max(a.d, d.a - (g.b + g.c)); + m = Math.max(a.c, d.b - (g.d + g.a)); + h = m - a.c; + if (a.e && a.f) { + i = t / m; + i < a.a ? (t = m * a.a) : (h += t / a.a - m); + } + a.e && zZc(r, t, h); + e.n && e.n && !!f && Tdd(e, i6d(f), (pgd(), mgd)); + return new d$c(a.a, t, a.c + h, (k$c(), j$c)); + } + function UJc(a) { + var b, c, d, e, f, g, h, i, j, k, l; + a.j = KC(WD, oje, 25, a.g, 15, 1); + a.o = new Rkb(); + MAb(LAb(new YAb(null, new Kub(a.e.b, 16)), new aLc()), new cLc(a)); + a.a = KC(sbb, dle, 25, a.b, 16, 1); + TAb(new YAb(null, new Kub(a.e.b, 16)), new rLc(a)); + d = + ((l = new Rkb()), + MAb( + JAb(LAb(new YAb(null, new Kub(a.e.b, 16)), new hLc()), new jLc(a)), + new lLc(a, l) + ), + l); + for (i = new olb(d); i.a < i.c.c.length; ) { + h = BD(mlb(i), 508); + if (h.c.length <= 1) { + continue; + } + if (h.c.length == 2) { + uKc(h); + bKc((tCb(0, h.c.length), BD(h.c[0], 17)).d.i) || Ekb(a.o, h); + continue; + } + if (tKc(h) || sKc(h, new fLc())) { + continue; + } + j = new olb(h); + e = null; + while (j.a < j.c.c.length) { + b = BD(mlb(j), 17); + c = a.c[b.p]; + !e || j.a >= j.c.c.length + ? (k = JJc((j0b(), h0b), g0b)) + : (k = JJc((j0b(), g0b), g0b)); + k *= 2; + f = c.a.g; + c.a.g = Math.max(f, f + (k - f)); + g = c.b.g; + c.b.g = Math.max(g, g + (k - g)); + e = b; + } + } + } + function VNc(a, b, c, d, e) { + var f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v; + v = Hx(a); + k = new Rkb(); + h = a.c.length; + l = h - 1; + m = h + 1; + while (v.a.c != 0) { + while (c.b != 0) { + t = (sCb(c.b != 0), BD(Nsb(c, c.a.a), 112)); + Jwb(v.a, t) != null; + t.g = l--; + YNc(t, b, c, d); + } + while (b.b != 0) { + u = (sCb(b.b != 0), BD(Nsb(b, b.a.a), 112)); + Jwb(v.a, u) != null; + u.g = m++; + YNc(u, b, c, d); + } + j = Rie; + for ( + r = ((g = new Ywb(new cxb(new Gjb(v.a).a).b)), new Njb(g)); + sib(r.a.a); + + ) { + q = ((f = Wwb(r.a)), BD(f.cd(), 112)); + if (!d && q.b > 0 && q.a <= 0) { + k.c = KC(SI, Uhe, 1, 0, 5, 1); + k.c[k.c.length] = q; + break; + } + p = q.i - q.d; + if (p >= j) { + if (p > j) { + k.c = KC(SI, Uhe, 1, 0, 5, 1); + j = p; + } + k.c[k.c.length] = q; + } + } + if (k.c.length != 0) { + i = BD(Ikb(k, Bub(e, k.c.length)), 112); + Jwb(v.a, i) != null; + i.g = m++; + YNc(i, b, c, d); + k.c = KC(SI, Uhe, 1, 0, 5, 1); + } + } + s = a.c.length + 1; + for (o = new olb(a); o.a < o.c.c.length; ) { + n = BD(mlb(o), 112); + n.g < h && (n.g = n.g + s); + } + } + function SDb(a, b) { + var c; + if (a.e) { + throw vbb(new Zdb((fdb(TM), Jke + TM.k + Kke))); + } + if (!lDb(a.a, b)) { + throw vbb(new hz(Lke + b + Mke)); + } + if (b == a.d) { + return a; + } + c = a.d; + a.d = b; + switch (c.g) { + case 0: + switch (b.g) { + case 2: + PDb(a); + break; + case 1: + XDb(a); + PDb(a); + break; + case 4: + bEb(a); + PDb(a); + break; + case 3: + bEb(a); + XDb(a); + PDb(a); + } + break; + case 2: + switch (b.g) { + case 1: + XDb(a); + YDb(a); + break; + case 4: + bEb(a); + PDb(a); + break; + case 3: + bEb(a); + XDb(a); + PDb(a); + } + break; + case 1: + switch (b.g) { + case 2: + XDb(a); + YDb(a); + break; + case 4: + XDb(a); + bEb(a); + PDb(a); + break; + case 3: + XDb(a); + bEb(a); + XDb(a); + PDb(a); + } + break; + case 4: + switch (b.g) { + case 2: + bEb(a); + PDb(a); + break; + case 1: + bEb(a); + XDb(a); + PDb(a); + break; + case 3: + XDb(a); + YDb(a); + } + break; + case 3: + switch (b.g) { + case 2: + XDb(a); + bEb(a); + PDb(a); + break; + case 1: + XDb(a); + bEb(a); + XDb(a); + PDb(a); + break; + case 4: + XDb(a); + YDb(a); + } + } + return a; + } + function tVb(a, b) { + var c; + if (a.d) { + throw vbb(new Zdb((fdb(LP), Jke + LP.k + Kke))); + } + if (!cVb(a.a, b)) { + throw vbb(new hz(Lke + b + Mke)); + } + if (b == a.c) { + return a; + } + c = a.c; + a.c = b; + switch (c.g) { + case 0: + switch (b.g) { + case 2: + qVb(a); + break; + case 1: + xVb(a); + qVb(a); + break; + case 4: + BVb(a); + qVb(a); + break; + case 3: + BVb(a); + xVb(a); + qVb(a); + } + break; + case 2: + switch (b.g) { + case 1: + xVb(a); + yVb(a); + break; + case 4: + BVb(a); + qVb(a); + break; + case 3: + BVb(a); + xVb(a); + qVb(a); + } + break; + case 1: + switch (b.g) { + case 2: + xVb(a); + yVb(a); + break; + case 4: + xVb(a); + BVb(a); + qVb(a); + break; + case 3: + xVb(a); + BVb(a); + xVb(a); + qVb(a); + } + break; + case 4: + switch (b.g) { + case 2: + BVb(a); + qVb(a); + break; + case 1: + BVb(a); + xVb(a); + qVb(a); + break; + case 3: + xVb(a); + yVb(a); + } + break; + case 3: + switch (b.g) { + case 2: + xVb(a); + BVb(a); + qVb(a); + break; + case 1: + xVb(a); + BVb(a); + xVb(a); + qVb(a); + break; + case 4: + xVb(a); + yVb(a); + } + } + return a; + } + function UQb(a, b, c) { + var d, e, f, g, h, i, j, k; + for ( + i = new Fyd((!a.a && (a.a = new cUd(E2, a, 10, 11)), a.a)); + i.e != i.i.gc(); + + ) { + h = BD(Dyd(i), 33); + for (e = new Sr(ur(_sd(h).a.Kc(), new Sq())); Qr(e); ) { + d = BD(Rr(e), 79); + !d.b && (d.b = new y5d(z2, d, 4, 7)); + if ( + !(d.b.i <= 1 && (!d.c && (d.c = new y5d(z2, d, 5, 8)), d.c.i <= 1)) + ) { + throw vbb(new z2c("Graph must not contain hyperedges.")); + } + if ( + !Pld(d) && + h != + atd(BD(qud((!d.c && (d.c = new y5d(z2, d, 5, 8)), d.c), 0), 82)) + ) { + j = new gRb(); + tNb(j, d); + yNb(j, (HSb(), FSb), d); + dRb(j, BD(Wd(irb(c.f, h)), 144)); + eRb( + j, + BD( + Ohb( + c, + atd( + BD(qud((!d.c && (d.c = new y5d(z2, d, 5, 8)), d.c), 0), 82) + ) + ), + 144 + ) + ); + Ekb(b.c, j); + for ( + g = new Fyd((!d.n && (d.n = new cUd(D2, d, 1, 7)), d.n)); + g.e != g.i.gc(); + + ) { + f = BD(Dyd(g), 137); + k = new mRb(j, f.a); + tNb(k, f); + yNb(k, FSb, f); + k.e.a = Math.max(f.g, 1); + k.e.b = Math.max(f.f, 1); + lRb(k); + Ekb(b.d, k); + } + } + } + } + } + function OGb(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t; + l = new LIb(a); + iKb(l, !(b == (ead(), dad) || b == _9c)); + k = l.a; + m = new p0b(); + for ( + e = (gHb(), OC(GC(pN, 1), Kie, 232, 0, [dHb, eHb, fHb])), + g = 0, + i = e.length; + g < i; + ++g + ) { + c = e[g]; + j = xHb(k, dHb, c); + !!j && (m.d = Math.max(m.d, j.Re())); + } + for ( + d = OC(GC(pN, 1), Kie, 232, 0, [dHb, eHb, fHb]), f = 0, h = d.length; + f < h; + ++f + ) { + c = d[f]; + j = xHb(k, fHb, c); + !!j && (m.a = Math.max(m.a, j.Re())); + } + for ( + p = OC(GC(pN, 1), Kie, 232, 0, [dHb, eHb, fHb]), r = 0, t = p.length; + r < t; + ++r + ) { + n = p[r]; + j = xHb(k, n, dHb); + !!j && (m.b = Math.max(m.b, j.Se())); + } + for ( + o = OC(GC(pN, 1), Kie, 232, 0, [dHb, eHb, fHb]), q = 0, s = o.length; + q < s; + ++q + ) { + n = o[q]; + j = xHb(k, n, fHb); + !!j && (m.c = Math.max(m.c, j.Se())); + } + if (m.d > 0) { + m.d += k.n.d; + m.d += k.d; + } + if (m.a > 0) { + m.a += k.n.a; + m.a += k.d; + } + if (m.b > 0) { + m.b += k.n.b; + m.b += k.d; + } + if (m.c > 0) { + m.c += k.n.c; + m.c += k.d; + } + return m; + } + function d6b(a, b, c) { + var d, e, f, g, h, i, j, k, l, m, n, o; + m = c.d; + l = c.c; + f = new f7c(c.f.a + c.d.b + c.d.c, c.f.b + c.d.d + c.d.a); + g = f.b; + for (j = new olb(a.a); j.a < j.c.c.length; ) { + h = BD(mlb(j), 10); + if (h.k != (j0b(), e0b)) { + continue; + } + d = BD(vNb(h, (wtc(), Hsc)), 61); + e = BD(vNb(h, Isc), 8); + k = h.n; + switch (d.g) { + case 2: + k.a = c.f.a + m.c - l.a; + break; + case 4: + k.a = -l.a - m.b; + } + o = 0; + switch (d.g) { + case 2: + case 4: + if (b == (dcd(), _bd)) { + n = Edb(ED(vNb(h, htc))); + k.b = f.b * n - BD(vNb(h, (Nyc(), Txc)), 8).b; + o = k.b + e.b; + M_b(h, false, true); + } else if (b == $bd) { + k.b = Edb(ED(vNb(h, htc))) - BD(vNb(h, (Nyc(), Txc)), 8).b; + o = k.b + e.b; + M_b(h, false, true); + } + } + g = Math.max(g, o); + } + c.f.b += g - f.b; + for (i = new olb(a.a); i.a < i.c.c.length; ) { + h = BD(mlb(i), 10); + if (h.k != (j0b(), e0b)) { + continue; + } + d = BD(vNb(h, (wtc(), Hsc)), 61); + k = h.n; + switch (d.g) { + case 1: + k.b = -l.b - m.d; + break; + case 3: + k.b = c.f.b + m.a - l.b; + } + } + } + function nRc(a) { + var b, + c, + d, + e, + f, + g, + h, + i, + j, + k, + l, + m, + n, + o, + p, + q, + r, + s, + t, + u, + v, + w, + A, + B; + e = BD(vNb(a, (mTc(), dTc)), 33); + j = Ohe; + k = Ohe; + h = Rie; + i = Rie; + for (w = Jsb(a.b, 0); w.b != w.d.c; ) { + u = BD(Xsb(w), 86); + p = u.e; + q = u.f; + j = Math.min(j, p.a - q.a / 2); + k = Math.min(k, p.b - q.b / 2); + h = Math.max(h, p.a + q.a / 2); + i = Math.max(i, p.b + q.b / 2); + } + o = BD(hkd(e, (JTc(), BTc)), 116); + n = new f7c(o.b - j, o.d - k); + for (v = Jsb(a.b, 0); v.b != v.d.c; ) { + u = BD(Xsb(v), 86); + m = vNb(u, dTc); + if (JD(m, 239)) { + f = BD(m, 33); + l = P6c(u.e, n); + bld(f, l.a - f.g / 2, l.b - f.f / 2); + } + } + for (t = Jsb(a.a, 0); t.b != t.d.c; ) { + s = BD(Xsb(t), 188); + d = BD(vNb(s, dTc), 79); + if (d) { + b = s.a; + r = new g7c(s.b.e); + Gsb(b, r, b.a, b.a.a); + A = new g7c(s.c.e); + Gsb(b, A, b.c.b, b.c); + qRc(r, BD(Ut(b, 1), 8), s.b.f); + qRc(A, BD(Ut(b, b.b - 2), 8), s.c.f); + c = itd(d, true, true); + ifd(b, c); + } + } + B = h - j + (o.b + o.c); + g = i - k + (o.d + o.a); + Afd(e, B, g, false, false); + } + function xoc(a) { + var b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t; + l = a.b; + k = new Bib(l, 0); + Aib(k, new H1b(a)); + s = false; + g = 1; + while (k.b < k.d.gc()) { + j = (sCb(k.b < k.d.gc()), BD(k.d.Xb((k.c = k.b++)), 29)); + p = (tCb(g, l.c.length), BD(l.c[g], 29)); + q = Mu(j.a); + r = q.c.length; + for (o = new olb(q); o.a < o.c.c.length; ) { + m = BD(mlb(o), 10); + $_b(m, p); + } + if (s) { + for (n = av(new ov(q), 0); n.c.Sb(); ) { + m = BD(pv(n), 10); + for (f = new olb(Mu(R_b(m))); f.a < f.c.c.length; ) { + e = BD(mlb(f), 17); + PZb(e, true); + yNb(a, (wtc(), Asc), (Bcb(), true)); + d = Noc(a, e, r); + c = BD(vNb(m, usc), 305); + t = BD(Ikb(d, d.c.length - 1), 17); + c.k = t.c.i; + c.n = t; + c.b = e.d.i; + c.c = e; + } + } + s = false; + } else { + if (q.c.length != 0) { + b = (tCb(0, q.c.length), BD(q.c[0], 10)); + if (b.k == (j0b(), d0b)) { + s = true; + g = -1; + } + } + } + ++g; + } + h = new Bib(a.b, 0); + while (h.b < h.d.gc()) { + i = (sCb(h.b < h.d.gc()), BD(h.d.Xb((h.c = h.b++)), 29)); + i.a.c.length == 0 && uib(h); + } + } + function wKb(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r; + k = BD(BD(Qc(a.r, b), 21), 84); + if (k.gc() <= 2 || b == (Ucd(), zcd) || b == (Ucd(), Tcd)) { + AKb(a, b); + return; + } + p = a.u.Hc((rcd(), qcd)); + c = b == (Ucd(), Acd) ? (vLb(), uLb) : (vLb(), rLb); + r = b == Acd ? (EIb(), BIb) : (EIb(), DIb); + d = dLb(iLb(c), a.s); + q = b == Acd ? Pje : Qje; + for (j = k.Kc(); j.Ob(); ) { + h = BD(j.Pb(), 111); + if (!h.c || h.c.d.c.length <= 0) { + continue; + } + o = h.b.rf(); + n = h.e; + l = h.c; + m = l.i; + m.b = ((f = l.n), l.e.a + f.b + f.c); + m.a = ((g = l.n), l.e.b + g.d + g.a); + if (p) { + m.c = n.a - ((e = l.n), l.e.a + e.b + e.c) - a.s; + p = false; + } else { + m.c = n.a + o.a + a.s; + } + ytb(r, lle); + l.f = r; + $Hb(l, (NHb(), MHb)); + Ekb(d.d, new BLb(m, bLb(d, m))); + q = b == Acd ? Math.min(q, n.b) : Math.max(q, n.b + h.b.rf().b); + } + q += b == Acd ? -a.t : a.t; + cLb(((d.e = q), d)); + for (i = k.Kc(); i.Ob(); ) { + h = BD(i.Pb(), 111); + if (!h.c || h.c.d.c.length <= 0) { + continue; + } + m = h.c.i; + m.c -= h.e.a; + m.d -= h.e.b; + } + } + function IDc(a, b, c) { + var d; + Odd(c, "StretchWidth layering", 1); + if (b.a.c.length == 0) { + Qdd(c); + return; + } + a.c = b; + a.t = 0; + a.u = 0; + a.i = Pje; + a.g = Qje; + a.d = Edb(ED(vNb(b, (Nyc(), lyc)))); + CDc(a); + DDc(a); + ADc(a); + HDc(a); + BDc(a); + a.i = Math.max(1, a.i); + a.g = Math.max(1, a.g); + a.d = a.d / a.i; + a.f = a.g / a.i; + a.s = FDc(a); + d = new H1b(a.c); + Ekb(a.c.b, d); + a.r = Mu(a.p); + a.n = tlb(a.k, a.k.length); + while (a.r.c.length != 0) { + a.o = JDc(a); + if (!a.o || (EDc(a) && a.b.a.gc() != 0)) { + KDc(a, d); + d = new H1b(a.c); + Ekb(a.c.b, d); + ye(a.a, a.b); + a.b.a.$b(); + a.t = a.u; + a.u = 0; + } else { + if (EDc(a)) { + a.c.b.c = KC(SI, Uhe, 1, 0, 5, 1); + d = new H1b(a.c); + Ekb(a.c.b, d); + a.t = 0; + a.u = 0; + a.b.a.$b(); + a.a.a.$b(); + ++a.f; + a.r = Mu(a.p); + a.n = tlb(a.k, a.k.length); + } else { + $_b(a.o, d); + Lkb(a.r, a.o); + Qqb(a.b, a.o); + a.t = a.t - a.k[a.o.p] * a.d + a.j[a.o.p]; + a.u += a.e[a.o.p] * a.d; + } + } + } + b.a.c = KC(SI, Uhe, 1, 0, 5, 1); + smb(b.b); + Qdd(c); + } + function Mgc(a) { + var b, c, d, e; + MAb(JAb(new YAb(null, new Kub(a.a.b, 16)), new khc()), new mhc()); + Kgc(a); + MAb(JAb(new YAb(null, new Kub(a.a.b, 16)), new ohc()), new qhc()); + if (a.c == (Aad(), yad)) { + MAb( + JAb( + LAb(new YAb(null, new Kub(new Pib(a.f), 1)), new yhc()), + new Ahc() + ), + new Chc(a) + ); + MAb( + JAb( + NAb( + LAb(LAb(new YAb(null, new Kub(a.d.b, 16)), new Ghc()), new Ihc()), + new Khc() + ), + new Mhc() + ), + new Ohc(a) + ); + } + e = new f7c(Pje, Pje); + b = new f7c(Qje, Qje); + for (d = new olb(a.a.b); d.a < d.c.c.length; ) { + c = BD(mlb(d), 57); + e.a = Math.min(e.a, c.d.c); + e.b = Math.min(e.b, c.d.d); + b.a = Math.max(b.a, c.d.c + c.d.b); + b.b = Math.max(b.b, c.d.d + c.d.a); + } + P6c(X6c(a.d.c), V6c(new f7c(e.a, e.b))); + P6c(X6c(a.d.f), c7c(new f7c(b.a, b.b), e)); + Lgc(a, e, b); + Uhb(a.f); + Uhb(a.b); + Uhb(a.g); + Uhb(a.e); + a.a.a.c = KC(SI, Uhe, 1, 0, 5, 1); + a.a.b.c = KC(SI, Uhe, 1, 0, 5, 1); + a.a = null; + a.d = null; + } + function vZb(a, b, c) { + var d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t; + e = new Rkb(); + for (p = new olb(b.a); p.a < p.c.c.length; ) { + o = BD(mlb(p), 10); + n = o.e; + if (n) { + d = vZb(a, n, o); + Gkb(e, d); + sZb(a, n, o); + if (BD(vNb(n, (wtc(), Ksc)), 21).Hc((Orc(), Hrc))) { + s = BD(vNb(o, (Nyc(), Vxc)), 98); + m = BD(vNb(o, Yxc), 174).Hc((rcd(), ncd)); + for (r = new olb(o.j); r.a < r.c.c.length; ) { + q = BD(mlb(r), 11); + f = BD(Ohb(a.b, q), 10); + if (!f) { + f = Z$b( + q, + s, + q.j, + -(q.e.c.length - q.g.c.length), + null, + new d7c(), + q.o, + BD(vNb(n, Lwc), 103), + n + ); + yNb(f, $sc, q); + Rhb(a.b, q, f); + Ekb(n.a, f); + } + g = BD(Ikb(f.j, 0), 11); + for (k = new olb(q.f); k.a < k.c.c.length; ) { + j = BD(mlb(k), 70); + h = new p_b(); + h.o.a = j.o.a; + h.o.b = j.o.b; + Ekb(g.f, h); + if (!m) { + t = q.j; + l = 0; + tcd(BD(vNb(o, Yxc), 21)) && (l = mfd(j.n, j.o, q.o, 0, t)); + s == (dcd(), bcd) || (Ucd(), Ecd).Hc(t) + ? (h.o.a = l) + : (h.o.b = l); + } + } + } + } + } + } + i = new Rkb(); + rZb(a, b, c, e, i); + !!c && tZb(a, b, c, i); + return i; + } + function nEc(a, b, c) { + var d, e, f, g, h, i, j, k, l; + if (a.c[b.c.p][b.p].e) { + return; + } else { + a.c[b.c.p][b.p].e = true; + } + a.c[b.c.p][b.p].b = 0; + a.c[b.c.p][b.p].d = 0; + a.c[b.c.p][b.p].a = null; + for (k = new olb(b.j); k.a < k.c.c.length; ) { + j = BD(mlb(k), 11); + l = c ? new J0b(j) : new R0b(j); + for (i = l.Kc(); i.Ob(); ) { + h = BD(i.Pb(), 11); + g = h.i; + if (g.c == b.c) { + if (g != b) { + nEc(a, g, c); + a.c[b.c.p][b.p].b += a.c[g.c.p][g.p].b; + a.c[b.c.p][b.p].d += a.c[g.c.p][g.p].d; + } + } else { + a.c[b.c.p][b.p].d += a.g[h.p]; + ++a.c[b.c.p][b.p].b; + } + } + } + f = BD(vNb(b, (wtc(), ssc)), 15); + if (f) { + for (e = f.Kc(); e.Ob(); ) { + d = BD(e.Pb(), 10); + if (b.c == d.c) { + nEc(a, d, c); + a.c[b.c.p][b.p].b += a.c[d.c.p][d.p].b; + a.c[b.c.p][b.p].d += a.c[d.c.p][d.p].d; + } + } + } + if (a.c[b.c.p][b.p].b > 0) { + a.c[b.c.p][b.p].d += + Cub(a.i, 24) * lke * 0.07000000029802322 - 0.03500000014901161; + a.c[b.c.p][b.p].a = a.c[b.c.p][b.p].d / a.c[b.c.p][b.p].b; + } + } + function m5b(a) { + var b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q; + for (o = new olb(a); o.a < o.c.c.length; ) { + n = BD(mlb(o), 10); + n5b(n.n); + n5b(n.o); + o5b(n.f); + r5b(n); + t5b(n); + for (q = new olb(n.j); q.a < q.c.c.length; ) { + p = BD(mlb(q), 11); + n5b(p.n); + n5b(p.a); + n5b(p.o); + G0b(p, s5b(p.j)); + f = BD(vNb(p, (Nyc(), Wxc)), 19); + !!f && yNb(p, Wxc, meb(-f.a)); + for (e = new olb(p.g); e.a < e.c.c.length; ) { + d = BD(mlb(e), 17); + for (c = Jsb(d.a, 0); c.b != c.d.c; ) { + b = BD(Xsb(c), 8); + n5b(b); + } + i = BD(vNb(d, jxc), 74); + if (i) { + for (h = Jsb(i, 0); h.b != h.d.c; ) { + g = BD(Xsb(h), 8); + n5b(g); + } + } + for (l = new olb(d.b); l.a < l.c.c.length; ) { + j = BD(mlb(l), 70); + n5b(j.n); + n5b(j.o); + } + } + for (m = new olb(p.f); m.a < m.c.c.length; ) { + j = BD(mlb(m), 70); + n5b(j.n); + n5b(j.o); + } + } + if (n.k == (j0b(), e0b)) { + yNb(n, (wtc(), Hsc), s5b(BD(vNb(n, Hsc), 61))); + q5b(n); + } + for (k = new olb(n.b); k.a < k.c.c.length; ) { + j = BD(mlb(k), 70); + r5b(j); + n5b(j.o); + n5b(j.n); + } + } + } + function yQb(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, A; + a.e = b; + h = $Pb(b); + w = new Rkb(); + for (d = new olb(h); d.a < d.c.c.length; ) { + c = BD(mlb(d), 15); + A = new Rkb(); + w.c[w.c.length] = A; + i = new Tqb(); + for (o = c.Kc(); o.Ob(); ) { + n = BD(o.Pb(), 33); + f = wQb(a, n, true, 0, 0); + A.c[A.c.length] = f; + p = n.i; + q = n.j; + new f7c(p, q); + m = (!n.n && (n.n = new cUd(D2, n, 1, 7)), n.n); + for (l = new Fyd(m); l.e != l.i.gc(); ) { + j = BD(Dyd(l), 137); + e = wQb(a, j, false, p, q); + A.c[A.c.length] = e; + } + v = (!n.c && (n.c = new cUd(F2, n, 9, 9)), n.c); + for (s = new Fyd(v); s.e != s.i.gc(); ) { + r = BD(Dyd(s), 118); + g = wQb(a, r, false, p, q); + A.c[A.c.length] = g; + t = r.i + p; + u = r.j + q; + m = (!r.n && (r.n = new cUd(D2, r, 1, 7)), r.n); + for (k = new Fyd(m); k.e != k.i.gc(); ) { + j = BD(Dyd(k), 137); + e = wQb(a, j, false, t, u); + A.c[A.c.length] = e; + } + } + ye(i, Dx(pl(OC(GC(KI, 1), Uhe, 20, 0, [_sd(n), $sd(n)])))); + } + vQb(a, i, A); + } + a.f = new aPb(w); + tNb(a.f, b); + return a.f; + } + function Kqd(a, b, c, d, e) { + var f, + g, + h, + i, + j, + k, + l, + m, + n, + o, + p, + q, + r, + s, + t, + u, + v, + w, + A, + B, + C, + D, + F, + G; + D = Ohb(a.e, d); + if (D == null) { + D = new eC(); + n = BD(D, 183); + s = b + "_s"; + t = s + e; + m = new yC(t); + cC(n, Vte, m); + } + C = BD(D, 183); + Qpd(c, C); + G = new eC(); + Spd(G, "x", d.j); + Spd(G, "y", d.k); + cC(C, Yte, G); + A = new eC(); + Spd(A, "x", d.b); + Spd(A, "y", d.c); + cC(C, "endPoint", A); + l = Fhe((!d.a && (d.a = new xMd(y2, d, 5)), d.a)); + o = !l; + if (o) { + w = new wB(); + f = new Srd(w); + reb((!d.a && (d.a = new xMd(y2, d, 5)), d.a), f); + cC(C, Ote, w); + } + i = dmd(d); + u = !!i; + u && Tpd(a.a, C, Qte, kqd(a, dmd(d))); + r = emd(d); + v = !!r; + v && Tpd(a.a, C, Pte, kqd(a, emd(d))); + j = (!d.e && (d.e = new y5d(A2, d, 10, 9)), d.e).i == 0; + p = !j; + if (p) { + B = new wB(); + g = new Urd(a, B); + reb((!d.e && (d.e = new y5d(A2, d, 10, 9)), d.e), g); + cC(C, Ste, B); + } + k = (!d.g && (d.g = new y5d(A2, d, 9, 10)), d.g).i == 0; + q = !k; + if (q) { + F = new wB(); + h = new Wrd(a, F); + reb((!d.g && (d.g = new y5d(A2, d, 9, 10)), d.g), h); + cC(C, Rte, F); + } + } + function eKb(a) { + $Jb(); + var b, c, d, e, f, g, h; + d = a.f.n; + for (g = ci(a.r).a.nc(); g.Ob(); ) { + f = BD(g.Pb(), 111); + e = 0; + if (f.b.Xe((Y9c(), s9c))) { + e = Edb(ED(f.b.We(s9c))); + if (e < 0) { + switch (f.b.Hf().g) { + case 1: + d.d = Math.max(d.d, -e); + break; + case 3: + d.a = Math.max(d.a, -e); + break; + case 2: + d.c = Math.max(d.c, -e); + break; + case 4: + d.b = Math.max(d.b, -e); + } + } + } + if (tcd(a.u)) { + b = nfd(f.b, e); + h = !BD(a.e.We(b9c), 174).Hc((Idd(), zdd)); + c = false; + switch (f.b.Hf().g) { + case 1: + c = b > d.d; + d.d = Math.max(d.d, b); + if (h && c) { + d.d = Math.max(d.d, d.a); + d.a = d.d + e; + } + break; + case 3: + c = b > d.a; + d.a = Math.max(d.a, b); + if (h && c) { + d.a = Math.max(d.a, d.d); + d.d = d.a + e; + } + break; + case 2: + c = b > d.c; + d.c = Math.max(d.c, b); + if (h && c) { + d.c = Math.max(d.b, d.c); + d.b = d.c + e; + } + break; + case 4: + c = b > d.b; + d.b = Math.max(d.b, b); + if (h && c) { + d.b = Math.max(d.b, d.c); + d.c = d.b + e; + } + } + } + } + } + function l3b(a) { + var b, c, d, e, f, g, h, i, j, k, l; + for (j = new olb(a); j.a < j.c.c.length; ) { + i = BD(mlb(j), 10); + g = BD(vNb(i, (Nyc(), mxc)), 163); + f = null; + switch (g.g) { + case 1: + case 2: + f = (Gqc(), Fqc); + break; + case 3: + case 4: + f = (Gqc(), Dqc); + } + if (f) { + yNb(i, (wtc(), Bsc), (Gqc(), Fqc)); + f == Dqc + ? o3b(i, g, (KAc(), HAc)) + : f == Fqc && o3b(i, g, (KAc(), IAc)); + } else { + if (fcd(BD(vNb(i, Vxc), 98)) && i.j.c.length != 0) { + b = true; + for (l = new olb(i.j); l.a < l.c.c.length; ) { + k = BD(mlb(l), 11); + if ( + !( + (k.j == (Ucd(), zcd) && k.e.c.length - k.g.c.length > 0) || + (k.j == Tcd && k.e.c.length - k.g.c.length < 0) + ) + ) { + b = false; + break; + } + for (e = new olb(k.g); e.a < e.c.c.length; ) { + c = BD(mlb(e), 17); + h = BD(vNb(c.d.i, mxc), 163); + if (h == (Ctc(), ztc) || h == Atc) { + b = false; + break; + } + } + for (d = new olb(k.e); d.a < d.c.c.length; ) { + c = BD(mlb(d), 17); + h = BD(vNb(c.c.i, mxc), 163); + if (h == (Ctc(), xtc) || h == ytc) { + b = false; + break; + } + } + } + b && o3b(i, g, (KAc(), JAc)); + } + } + } + } + function lJc(a, b, c, d, e) { + var f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w; + w = 0; + n = 0; + for (l = new olb(b.e); l.a < l.c.c.length; ) { + k = BD(mlb(l), 10); + m = 0; + h = 0; + i = c ? BD(vNb(k, hJc), 19).a : Rie; + r = d ? BD(vNb(k, iJc), 19).a : Rie; + j = Math.max(i, r); + for (t = new olb(k.j); t.a < t.c.c.length; ) { + s = BD(mlb(t), 11); + u = k.n.b + s.n.b + s.a.b; + if (d) { + for (g = new olb(s.g); g.a < g.c.c.length; ) { + f = BD(mlb(g), 17); + p = f.d; + o = p.i; + if (b != a.a[o.p]) { + q = Math.max(BD(vNb(o, hJc), 19).a, BD(vNb(o, iJc), 19).a); + v = BD(vNb(f, (Nyc(), eyc)), 19).a; + if (v >= j && v >= q) { + m += o.n.b + p.n.b + p.a.b - u; + ++h; + } + } + } + } + if (c) { + for (g = new olb(s.e); g.a < g.c.c.length; ) { + f = BD(mlb(g), 17); + p = f.c; + o = p.i; + if (b != a.a[o.p]) { + q = Math.max(BD(vNb(o, hJc), 19).a, BD(vNb(o, iJc), 19).a); + v = BD(vNb(f, (Nyc(), eyc)), 19).a; + if (v >= j && v >= q) { + m += o.n.b + p.n.b + p.a.b - u; + ++h; + } + } + } + } + } + if (h > 0) { + w += m / h; + ++n; + } + } + if (n > 0) { + b.a = (e * w) / n; + b.g = n; + } else { + b.a = 0; + b.g = 0; + } + } + function oMc(a, b) { + var c, d, e, f, g, h, i, j, k, l, m; + for (e = new olb(a.a.b); e.a < e.c.c.length; ) { + c = BD(mlb(e), 29); + for (i = new olb(c.a); i.a < i.c.c.length; ) { + h = BD(mlb(i), 10); + b.j[h.p] = h; + b.i[h.p] = b.o == (eMc(), dMc) ? Qje : Pje; + } + } + Uhb(a.c); + g = a.a.b; + b.c == (YLc(), WLc) && + (g = JD(g, 152) + ? km(BD(g, 152)) + : JD(g, 131) + ? BD(g, 131).a + : JD(g, 54) + ? new ov(g) + : new dv(g)); + UMc(a.e, b, a.b); + Alb(b.p, null); + for (f = g.Kc(); f.Ob(); ) { + c = BD(f.Pb(), 29); + j = c.a; + b.o == (eMc(), dMc) && + (j = JD(j, 152) + ? km(BD(j, 152)) + : JD(j, 131) + ? BD(j, 131).a + : JD(j, 54) + ? new ov(j) + : new dv(j)); + for (m = j.Kc(); m.Ob(); ) { + l = BD(m.Pb(), 10); + b.g[l.p] == l && pMc(a, l, b); + } + } + qMc(a, b); + for (d = g.Kc(); d.Ob(); ) { + c = BD(d.Pb(), 29); + for (m = new olb(c.a); m.a < m.c.c.length; ) { + l = BD(mlb(m), 10); + b.p[l.p] = b.p[b.g[l.p].p]; + if (l == b.g[l.p]) { + k = Edb(b.i[b.j[l.p].p]); + ((b.o == (eMc(), dMc) && k > Qje) || (b.o == cMc && k < Pje)) && + (b.p[l.p] = Edb(b.p[l.p]) + k); + } + } + } + a.e.cg(); + } + function PGb(a, b, c, d) { + var e, f, g, h, i; + h = new LIb(b); + rKb(h, d); + e = true; + if (!!a && a.Xe((Y9c(), z8c))) { + f = BD(a.We((Y9c(), z8c)), 103); + e = f == (ead(), cad) || f == aad || f == bad; + } + hKb(h, false); + Hkb(h.e.wf(), new mKb(h, false, e)); + NJb(h, h.f, (gHb(), dHb), (Ucd(), Acd)); + NJb(h, h.f, fHb, Rcd); + NJb(h, h.g, dHb, Tcd); + NJb(h, h.g, fHb, zcd); + PJb(h, Acd); + PJb(h, Rcd); + OJb(h, zcd); + OJb(h, Tcd); + $Jb(); + g = h.A.Hc((tdd(), pdd)) && h.B.Hc((Idd(), Ddd)) ? _Jb(h) : null; + !!g && DHb(h.a, g); + eKb(h); + GJb(h); + PKb(h); + BJb(h); + pKb(h); + HKb(h); + xKb(h, Acd); + xKb(h, Rcd); + CJb(h); + oKb(h); + if (!c) { + return h.o; + } + cKb(h); + LKb(h); + xKb(h, zcd); + xKb(h, Tcd); + i = h.B.Hc((Idd(), Edd)); + RJb(h, i, Acd); + RJb(h, i, Rcd); + SJb(h, i, zcd); + SJb(h, i, Tcd); + MAb(new YAb(null, new Kub(new $ib(h.i), 0)), new TJb()); + MAb(JAb(new YAb(null, ci(h.r).a.oc()), new VJb()), new XJb()); + dKb(h); + h.e.uf(h.o); + MAb(new YAb(null, ci(h.r).a.oc()), new fKb()); + return h.o; + } + function JVb(a) { + var b, c, d, e, f, g, h, i, j, k, l, m, n, o, p; + j = Pje; + for (d = new olb(a.a.b); d.a < d.c.c.length; ) { + b = BD(mlb(d), 81); + j = Math.min(j, b.d.f.g.c + b.e.a); + } + n = new Psb(); + for (g = new olb(a.a.a); g.a < g.c.c.length; ) { + f = BD(mlb(g), 189); + f.i = j; + f.e == 0 && (Gsb(n, f, n.c.b, n.c), true); + } + while (n.b != 0) { + f = BD(n.b == 0 ? null : (sCb(n.b != 0), Nsb(n, n.a.a)), 189); + e = f.f.g.c; + for (m = f.a.a.ec().Kc(); m.Ob(); ) { + k = BD(m.Pb(), 81); + p = f.i + k.e.a; + k.d.g || k.g.c < p ? (k.o = p) : (k.o = k.g.c); + } + e -= f.f.o; + f.b += e; + a.c == (ead(), bad) || a.c == _9c ? (f.c += e) : (f.c -= e); + for (l = f.a.a.ec().Kc(); l.Ob(); ) { + k = BD(l.Pb(), 81); + for (i = k.f.Kc(); i.Ob(); ) { + h = BD(i.Pb(), 81); + fad(a.c) ? (o = a.f.ef(k, h)) : (o = a.f.ff(k, h)); + h.d.i = Math.max(h.d.i, k.o + k.g.b + o - h.e.a); + h.k || (h.d.i = Math.max(h.d.i, h.g.c - h.e.a)); + --h.d.e; + h.d.e == 0 && Dsb(n, h.d); + } + } + } + for (c = new olb(a.a.b); c.a < c.c.c.length; ) { + b = BD(mlb(c), 81); + b.g.c = b.o; + } + } + function ELb(a) { + var b, c, d, e, f, g, h, i; + h = a.b; + b = a.a; + switch (BD(vNb(a, (fFb(), bFb)), 427).g) { + case 0: + Okb(h, new tpb(new bMb())); + break; + case 1: + default: + Okb(h, new tpb(new gMb())); + } + switch (BD(vNb(a, _Eb), 428).g) { + case 1: + Okb(h, new YLb()); + Okb(h, new lMb()); + Okb(h, new GLb()); + break; + case 0: + default: + Okb(h, new YLb()); + Okb(h, new RLb()); + } + switch (BD(vNb(a, dFb), 250).g) { + case 0: + i = new FMb(); + break; + case 1: + i = new zMb(); + break; + case 2: + i = new CMb(); + break; + case 3: + i = new wMb(); + break; + case 5: + i = new JMb(new CMb()); + break; + case 4: + i = new JMb(new zMb()); + break; + case 7: + i = new tMb(new JMb(new zMb()), new JMb(new CMb())); + break; + case 8: + i = new tMb(new JMb(new wMb()), new JMb(new CMb())); + break; + case 6: + default: + i = new JMb(new wMb()); + } + for (g = new olb(h); g.a < g.c.c.length; ) { + f = BD(mlb(g), 167); + d = 0; + e = 0; + c = new vgd(meb(d), meb(e)); + while (gNb(b, f, d, e)) { + c = BD(i.Ce(c, f), 46); + d = BD(c.a, 19).a; + e = BD(c.b, 19).a; + } + dNb(b, f, d, e); + } + } + function qQb(a) { + var b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, A; + f = a.f.b; + m = f.a; + k = f.b; + o = a.e.g; + n = a.e.f; + _kd(a.e, f.a, f.b); + w = m / o; + A = k / n; + for (j = new Fyd(Kkd(a.e)); j.e != j.i.gc(); ) { + i = BD(Dyd(j), 137); + dld(i, i.i * w); + eld(i, i.j * A); + } + for (s = new Fyd(Yod(a.e)); s.e != s.i.gc(); ) { + r = BD(Dyd(s), 118); + u = r.i; + v = r.j; + u > 0 && dld(r, u * w); + v > 0 && eld(r, v * A); + } + stb(a.b, new CQb()); + b = new Rkb(); + for (h = new nib(new eib(a.c).a); h.b; ) { + g = lib(h); + d = BD(g.cd(), 79); + c = BD(g.dd(), 395).a; + e = itd(d, false, false); + l = oQb(jtd(d), ofd(e), c); + ifd(l, e); + t = ktd(d); + if (!!t && Jkb(b, t, 0) == -1) { + b.c[b.c.length] = t; + pQb(t, (sCb(l.b != 0), BD(l.a.a.c, 8)), c); + } + } + for (q = new nib(new eib(a.d).a); q.b; ) { + p = lib(q); + d = BD(p.cd(), 79); + c = BD(p.dd(), 395).a; + e = itd(d, false, false); + l = oQb(ltd(d), w7c(ofd(e)), c); + l = w7c(l); + ifd(l, e); + t = mtd(d); + if (!!t && Jkb(b, t, 0) == -1) { + b.c[b.c.length] = t; + pQb(t, (sCb(l.b != 0), BD(l.c.b.c, 8)), c); + } + } + } + function _Vc(a, b, c, d) { + var e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, A, B; + if (c.c.length != 0) { + o = new Rkb(); + for (n = new olb(c); n.a < n.c.c.length; ) { + m = BD(mlb(n), 33); + Ekb(o, new f7c(m.i, m.j)); + } + d.n && !!b && Tdd(d, i6d(b), (pgd(), mgd)); + while (CVc(a, c)) { + AVc(a, c, false); + } + d.n && !!b && Tdd(d, i6d(b), (pgd(), mgd)); + h = 0; + i = 0; + e = null; + if (c.c.length != 0) { + e = (tCb(0, c.c.length), BD(c.c[0], 33)); + h = e.i - (tCb(0, o.c.length), BD(o.c[0], 8)).a; + i = e.j - (tCb(0, o.c.length), BD(o.c[0], 8)).b; + } + g = Math.sqrt(h * h + i * i); + l = cVc(c); + f = 1; + while (l.a.gc() != 0) { + for (k = l.a.ec().Kc(); k.Ob(); ) { + j = BD(k.Pb(), 33); + p = a.f; + q = p.i + p.g / 2; + r = p.j + p.f / 2; + s = j.i + j.g / 2; + t = j.j + j.f / 2; + u = s - q; + v = t - r; + w = Math.sqrt(u * u + v * v); + A = u / w; + B = v / w; + dld(j, j.i + A * g); + eld(j, j.j + B * g); + } + d.n && !!b && Tdd(d, i6d(b), (pgd(), mgd)); + l = cVc(new Tkb(l)); + ++f; + } + !!a.a && a.a.lg(new Tkb(l)); + d.n && !!b && Tdd(d, i6d(b), (pgd(), mgd)); + _Vc(a, b, new Tkb(l), d); + } + } + function $2b(a, b, c) { + var d, e, f, g, h, i, j, k, l, m, n, o, p, q, r; + p = a.n; + q = a.o; + m = a.d; + l = Edb(ED(pBc(a, (Nyc(), iyc)))); + if (b) { + k = l * (b.gc() - 1); + n = 0; + for (i = b.Kc(); i.Ob(); ) { + g = BD(i.Pb(), 10); + k += g.o.a; + n = Math.max(n, g.o.b); + } + r = p.a - (k - q.a) / 2; + f = p.b - m.d + n; + d = q.a / (b.gc() + 1); + e = d; + for (h = b.Kc(); h.Ob(); ) { + g = BD(h.Pb(), 10); + g.n.a = r; + g.n.b = f - g.o.b; + r += g.o.a + l; + j = Y2b(g); + j.n.a = g.o.a / 2 - j.a.a; + j.n.b = g.o.b; + o = BD(vNb(g, (wtc(), vsc)), 11); + if (o.e.c.length + o.g.c.length == 1) { + o.n.a = e - o.a.a; + o.n.b = 0; + F0b(o, a); + } + e += d; + } + } + if (c) { + k = l * (c.gc() - 1); + n = 0; + for (i = c.Kc(); i.Ob(); ) { + g = BD(i.Pb(), 10); + k += g.o.a; + n = Math.max(n, g.o.b); + } + r = p.a - (k - q.a) / 2; + f = p.b + q.b + m.a - n; + d = q.a / (c.gc() + 1); + e = d; + for (h = c.Kc(); h.Ob(); ) { + g = BD(h.Pb(), 10); + g.n.a = r; + g.n.b = f; + r += g.o.a + l; + j = Y2b(g); + j.n.a = g.o.a / 2 - j.a.a; + j.n.b = 0; + o = BD(vNb(g, (wtc(), vsc)), 11); + if (o.e.c.length + o.g.c.length == 1) { + o.n.a = e - o.a.a; + o.n.b = q.b; + F0b(o, a); + } + e += d; + } + } + } + function q7b(a, b) { + var c, d, e, f, g, h; + if (!BD(vNb(b, (wtc(), Ksc)), 21).Hc((Orc(), Hrc))) { + return; + } + for (h = new olb(b.a); h.a < h.c.c.length; ) { + f = BD(mlb(h), 10); + if (f.k == (j0b(), h0b)) { + e = BD(vNb(f, (Nyc(), txc)), 142); + a.c = Math.min(a.c, f.n.a - e.b); + a.a = Math.max(a.a, f.n.a + f.o.a + e.c); + a.d = Math.min(a.d, f.n.b - e.d); + a.b = Math.max(a.b, f.n.b + f.o.b + e.a); + } + } + for (g = new olb(b.a); g.a < g.c.c.length; ) { + f = BD(mlb(g), 10); + if (f.k != (j0b(), h0b)) { + switch (f.k.g) { + case 2: + d = BD(vNb(f, (Nyc(), mxc)), 163); + if (d == (Ctc(), ytc)) { + f.n.a = a.c - 10; + p7b(f, new x7b()).Jb(new A7b(f)); + break; + } + if (d == Atc) { + f.n.a = a.a + 10; + p7b(f, new D7b()).Jb(new G7b(f)); + break; + } + c = BD(vNb(f, Osc), 303); + if (c == (esc(), dsc)) { + o7b(f).Jb(new J7b(f)); + f.n.b = a.d - 10; + break; + } + if (c == bsc) { + o7b(f).Jb(new M7b(f)); + f.n.b = a.b + 10; + break; + } + break; + default: + throw vbb( + new Wdb( + "The node type " + f.k + " is not supported by the " + zS + ) + ); + } + } + } + } + function Y1b(a, b, c, d) { + var e, f, g, h, i, j, k, l, m, n, o, p, q; + i = new f7c(d.i + d.g / 2, d.j + d.f / 2); + n = M1b(d); + o = BD(hkd(b, (Nyc(), Vxc)), 98); + q = BD(hkd(d, $xc), 61); + if (!hCd(gkd(d), Uxc)) { + d.i == 0 && d.j == 0 ? (p = 0) : (p = kfd(d, q)); + jkd(d, Uxc, p); + } + j = new f7c(b.g, b.f); + e = Z$b(d, o, q, n, j, i, new f7c(d.g, d.f), BD(vNb(c, Lwc), 103), c); + yNb(e, (wtc(), $sc), d); + f = BD(Ikb(e.j, 0), 11); + E0b(f, W1b(d)); + yNb(e, Yxc, (rcd(), pqb(pcd))); + l = BD(hkd(b, Yxc), 174).Hc(ncd); + for ( + h = new Fyd((!d.n && (d.n = new cUd(D2, d, 1, 7)), d.n)); + h.e != h.i.gc(); + + ) { + g = BD(Dyd(h), 137); + if (!Ccb(DD(hkd(g, Jxc))) && !!g.a) { + m = Z1b(g); + Ekb(f.f, m); + if (!l) { + k = 0; + tcd(BD(hkd(b, Yxc), 21)) && + (k = mfd( + new f7c(g.i, g.j), + new f7c(g.g, g.f), + new f7c(d.g, d.f), + 0, + q + )); + switch (q.g) { + case 2: + case 4: + m.o.a = k; + break; + case 1: + case 3: + m.o.b = k; + } + } + } + } + yNb(e, tyc, ED(hkd(Xod(b), tyc))); + yNb(e, uyc, ED(hkd(Xod(b), uyc))); + yNb(e, ryc, ED(hkd(Xod(b), ryc))); + Ekb(c.a, e); + Rhb(a.a, d, e); + } + function qUc(a, b, c) { + var d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v; + Odd(c, "Processor arrange level", 1); + k = 0; + mmb(); + ktb(b, new Wsd((mTc(), ZSc))); + f = b.b; + h = Jsb(b, b.b); + j = true; + while (j && h.b.b != h.d.a) { + r = BD(Ysb(h), 86); + BD(vNb(r, ZSc), 19).a == 0 ? --f : (j = false); + } + v = new Jib(b, 0, f); + g = new Qsb(v); + v = new Jib(b, f, b.b); + i = new Qsb(v); + if (g.b == 0) { + for (o = Jsb(i, 0); o.b != o.d.c; ) { + n = BD(Xsb(o), 86); + yNb(n, eTc, meb(k++)); + } + } else { + l = g.b; + for (u = Jsb(g, 0); u.b != u.d.c; ) { + t = BD(Xsb(u), 86); + yNb(t, eTc, meb(k++)); + d = URc(t); + qUc(a, d, Udd(c, (1 / l) | 0)); + ktb(d, tmb(new Wsd(eTc))); + m = new Psb(); + for (s = Jsb(d, 0); s.b != s.d.c; ) { + r = BD(Xsb(s), 86); + for (q = Jsb(t.d, 0); q.b != q.d.c; ) { + p = BD(Xsb(q), 188); + p.c == r && (Gsb(m, p, m.c.b, m.c), true); + } + } + Osb(t.d); + ye(t.d, m); + h = Jsb(i, i.b); + e = t.d.b; + j = true; + while (0 < e && j && h.b.b != h.d.a) { + r = BD(Ysb(h), 86); + if (BD(vNb(r, ZSc), 19).a == 0) { + yNb(r, eTc, meb(k++)); + --e; + Zsb(h); + } else { + j = false; + } + } + } + } + Qdd(c); + } + function _8b(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t; + Odd(b, "Inverted port preprocessing", 1); + k = a.b; + j = new Bib(k, 0); + c = null; + t = new Rkb(); + while (j.b < j.d.gc()) { + s = c; + c = (sCb(j.b < j.d.gc()), BD(j.d.Xb((j.c = j.b++)), 29)); + for (n = new olb(t); n.a < n.c.c.length; ) { + l = BD(mlb(n), 10); + $_b(l, s); + } + t.c = KC(SI, Uhe, 1, 0, 5, 1); + for (o = new olb(c.a); o.a < o.c.c.length; ) { + l = BD(mlb(o), 10); + if (l.k != (j0b(), h0b)) { + continue; + } + if (!fcd(BD(vNb(l, (Nyc(), Vxc)), 98))) { + continue; + } + for (r = X_b(l, (KAc(), HAc), (Ucd(), zcd)).Kc(); r.Ob(); ) { + p = BD(r.Pb(), 11); + i = p.e; + h = BD(Qkb(i, KC(AQ, jne, 17, i.c.length, 0, 1)), 474); + for (e = h, f = 0, g = e.length; f < g; ++f) { + d = e[f]; + Z8b(a, p, d, t); + } + } + for (q = X_b(l, IAc, Tcd).Kc(); q.Ob(); ) { + p = BD(q.Pb(), 11); + i = p.g; + h = BD(Qkb(i, KC(AQ, jne, 17, i.c.length, 0, 1)), 474); + for (e = h, f = 0, g = e.length; f < g; ++f) { + d = e[f]; + $8b(a, p, d, t); + } + } + } + } + for (m = new olb(t); m.a < m.c.c.length; ) { + l = BD(mlb(m), 10); + $_b(l, c); + } + Qdd(b); + } + function _1b(a, b, c, d, e, f) { + var g, h, i, j, k, l; + j = new H0b(); + tNb(j, b); + G0b(j, BD(hkd(b, (Nyc(), $xc)), 61)); + yNb(j, (wtc(), $sc), b); + F0b(j, c); + l = j.o; + l.a = b.g; + l.b = b.f; + k = j.n; + k.a = b.i; + k.b = b.j; + Rhb(a.a, b, j); + g = FAb( + NAb( + LAb( + new YAb( + null, + (!b.e && (b.e = new y5d(B2, b, 7, 4)), new Kub(b.e, 16)) + ), + new m2b() + ), + new e2b() + ), + new o2b(b) + ); + g || + (g = FAb( + NAb( + LAb( + new YAb( + null, + (!b.d && (b.d = new y5d(B2, b, 8, 5)), new Kub(b.d, 16)) + ), + new q2b() + ), + new g2b() + ), + new s2b(b) + )); + g || + (g = FAb( + new YAb( + null, + (!b.e && (b.e = new y5d(B2, b, 7, 4)), new Kub(b.e, 16)) + ), + new u2b() + )); + yNb(j, Nsc, (Bcb(), g ? true : false)); + e_b(j, f, e, BD(hkd(b, Txc), 8)); + for ( + i = new Fyd((!b.n && (b.n = new cUd(D2, b, 1, 7)), b.n)); + i.e != i.i.gc(); + + ) { + h = BD(Dyd(i), 137); + !Ccb(DD(hkd(h, Jxc))) && !!h.a && Ekb(j.f, Z1b(h)); + } + switch (e.g) { + case 2: + case 1: + (j.j == (Ucd(), Acd) || j.j == Rcd) && d.Fc((Orc(), Lrc)); + break; + case 4: + case 3: + (j.j == (Ucd(), zcd) || j.j == Tcd) && d.Fc((Orc(), Lrc)); + } + return j; + } + function nQc(a, b, c, d, e, f, g) { + var h, i, j, k, l, m, n, o, p, q, r, s, t; + m = null; + d == (FQc(), DQc) ? (m = b) : d == EQc && (m = c); + for (p = m.a.ec().Kc(); p.Ob(); ) { + o = BD(p.Pb(), 11); + q = l7c(OC(GC(m1, 1), nie, 8, 0, [o.i.n, o.n, o.a])).b; + t = new Tqb(); + h = new Tqb(); + for (j = new b1b(o.b); llb(j.a) || llb(j.b); ) { + i = BD(llb(j.a) ? mlb(j.a) : mlb(j.b), 17); + if (Ccb(DD(vNb(i, (wtc(), ltc)))) != e) { + continue; + } + if (Jkb(f, i, 0) != -1) { + i.d == o ? (r = i.c) : (r = i.d); + s = l7c(OC(GC(m1, 1), nie, 8, 0, [r.i.n, r.n, r.a])).b; + if (Math.abs(s - q) < 0.2) { + continue; + } + s < q + ? b.a._b(r) + ? Qqb(t, new vgd(DQc, i)) + : Qqb(t, new vgd(EQc, i)) + : b.a._b(r) + ? Qqb(h, new vgd(DQc, i)) + : Qqb(h, new vgd(EQc, i)); + } + } + if (t.a.gc() > 1) { + n = new ZQc(o, t, d); + reb(t, new PQc(a, n)); + g.c[g.c.length] = n; + for (l = t.a.ec().Kc(); l.Ob(); ) { + k = BD(l.Pb(), 46); + Lkb(f, k.b); + } + } + if (h.a.gc() > 1) { + n = new ZQc(o, h, d); + reb(h, new RQc(a, n)); + g.c[g.c.length] = n; + for (l = h.a.ec().Kc(); l.Ob(); ) { + k = BD(l.Pb(), 46); + Lkb(f, k.b); + } + } + } + } + function $Wc(a) { + r4c( + a, + new E3c( + L3c( + P3c( + M3c( + O3c(N3c(new R3c(), sre), "ELK Radial"), + 'A radial layout provider which is based on the algorithm of Peter Eades published in "Drawing free trees.", published by International Institute for Advanced Study of Social Information Science, Fujitsu Limited in 1991. The radial layouter takes a tree and places the nodes in radial order around the root. The nodes of the same tree level are placed on the same radius.' + ), + new bXc() + ), + sre + ) + ) + ); + p4c(a, sre, uqe, Ksd(UWc)); + p4c(a, sre, wme, Ksd(XWc)); + p4c(a, sre, Fme, Ksd(NWc)); + p4c(a, sre, Tme, Ksd(OWc)); + p4c(a, sre, Eme, Ksd(PWc)); + p4c(a, sre, Gme, Ksd(MWc)); + p4c(a, sre, Dme, Ksd(QWc)); + p4c(a, sre, Hme, Ksd(TWc)); + p4c(a, sre, ore, Ksd(KWc)); + p4c(a, sre, nre, Ksd(LWc)); + p4c(a, sre, rre, Ksd(RWc)); + p4c(a, sre, lre, Ksd(SWc)); + p4c(a, sre, mre, Ksd(VWc)); + p4c(a, sre, pre, Ksd(WWc)); + p4c(a, sre, qre, Ksd(YWc)); + } + function LIb(a) { + var b; + this.r = Cy(new OIb(), new SIb()); + this.b = new Rpb(BD(Qb(F1), 290)); + this.p = new Rpb(BD(Qb(F1), 290)); + this.i = new Rpb(BD(Qb(DN), 290)); + this.e = a; + this.o = new g7c(a.rf()); + this.D = a.Df() || Ccb(DD(a.We((Y9c(), M8c)))); + this.A = BD(a.We((Y9c(), Y8c)), 21); + this.B = BD(a.We(b9c), 21); + this.q = BD(a.We(t9c), 98); + this.u = BD(a.We(x9c), 21); + if (!ucd(this.u)) { + throw vbb(new y2c("Invalid port label placement: " + this.u)); + } + this.v = Ccb(DD(a.We(z9c))); + this.j = BD(a.We(W8c), 21); + if (!Jbd(this.j)) { + throw vbb(new y2c("Invalid node label placement: " + this.j)); + } + this.n = BD(bgd(a, U8c), 116); + this.k = Edb(ED(bgd(a, Q9c))); + this.d = Edb(ED(bgd(a, P9c))); + this.w = Edb(ED(bgd(a, X9c))); + this.s = Edb(ED(bgd(a, R9c))); + this.t = Edb(ED(bgd(a, S9c))); + this.C = BD(bgd(a, V9c), 142); + this.c = 2 * this.d; + b = !this.B.Hc((Idd(), zdd)); + this.f = new mIb(0, b, 0); + this.g = new mIb(1, b, 0); + lIb(this.f, (gHb(), eHb), this.g); + } + function Lgd(a, b, c, d, e) { + var f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, A, B, C, D; + t = 0; + o = 0; + n = 0; + m = 1; + for ( + s = new Fyd((!a.a && (a.a = new cUd(E2, a, 10, 11)), a.a)); + s.e != s.i.gc(); + + ) { + q = BD(Dyd(s), 33); + m += sr(new Sr(ur(_sd(q).a.Kc(), new Sq()))); + B = q.g; + o = Math.max(o, B); + l = q.f; + n = Math.max(n, l); + t += B * l; + } + p = (!a.a && (a.a = new cUd(E2, a, 10, 11)), a.a).i; + g = t + 2 * d * d * m * p; + f = Math.sqrt(g); + i = Math.max(f * c, o); + h = Math.max(f / c, n); + for ( + r = new Fyd((!a.a && (a.a = new cUd(E2, a, 10, 11)), a.a)); + r.e != r.i.gc(); + + ) { + q = BD(Dyd(r), 33); + C = e.b + (Cub(b, 26) * ike + Cub(b, 27) * jke) * (i - q.g); + D = e.b + (Cub(b, 26) * ike + Cub(b, 27) * jke) * (h - q.f); + dld(q, C); + eld(q, D); + } + A = i + (e.b + e.c); + w = h + (e.d + e.a); + for ( + v = new Fyd((!a.a && (a.a = new cUd(E2, a, 10, 11)), a.a)); + v.e != v.i.gc(); + + ) { + u = BD(Dyd(v), 33); + for (k = new Sr(ur(_sd(u).a.Kc(), new Sq())); Qr(k); ) { + j = BD(Rr(k), 79); + Pld(j) || Kgd(j, b, A, w); + } + } + A += e.b + e.c; + w += e.d + e.a; + Afd(a, A, w, false, true); + } + function Jcb(a) { + var b, c, d, e, f, g, h, i, j, k, l; + if (a == null) { + throw vbb(new Oeb(Xhe)); + } + j = a; + f = a.length; + i = false; + if (f > 0) { + b = (BCb(0, a.length), a.charCodeAt(0)); + if (b == 45 || b == 43) { + a = a.substr(1); + --f; + i = b == 45; + } + } + if (f == 0) { + throw vbb(new Oeb(Oje + j + '"')); + } + while (a.length > 0 && (BCb(0, a.length), a.charCodeAt(0) == 48)) { + a = a.substr(1); + --f; + } + if (f > (Neb(), Leb)[10]) { + throw vbb(new Oeb(Oje + j + '"')); + } + for (e = 0; e < f; e++) { + if (Zcb((BCb(e, a.length), a.charCodeAt(e))) == -1) { + throw vbb(new Oeb(Oje + j + '"')); + } + } + l = 0; + g = Jeb[10]; + k = Keb[10]; + h = Jbb(Meb[10]); + c = true; + d = f % g; + if (d > 0) { + l = -parseInt(a.substr(0, d), 10); + a = a.substr(d); + f -= d; + c = false; + } + while (f >= g) { + d = parseInt(a.substr(0, g), 10); + a = a.substr(g); + f -= g; + if (c) { + c = false; + } else { + if (ybb(l, h) < 0) { + throw vbb(new Oeb(Oje + j + '"')); + } + l = Ibb(l, k); + } + l = Qbb(l, d); + } + if (ybb(l, 0) > 0) { + throw vbb(new Oeb(Oje + j + '"')); + } + if (!i) { + l = Jbb(l); + if (ybb(l, 0) < 0) { + throw vbb(new Oeb(Oje + j + '"')); + } + } + return l; + } + function Z6d(a, b) { + X6d(); + var c, d, e, f, g, h, i; + this.a = new a7d(this); + this.b = a; + this.c = b; + this.f = c2d(q1d((O6d(), M6d), b)); + if (this.f.dc()) { + if ((h = t1d(M6d, a)) == b) { + this.e = true; + this.d = new Rkb(); + this.f = new oFd(); + this.f.Fc(Ewe); + BD(V1d(p1d(M6d, bKd(a)), ""), 26) == a && this.f.Fc(u1d(M6d, bKd(a))); + for (e = g1d(M6d, a).Kc(); e.Ob(); ) { + d = BD(e.Pb(), 170); + switch ($1d(q1d(M6d, d))) { + case 4: { + this.d.Fc(d); + break; + } + case 5: { + this.f.Gc(c2d(q1d(M6d, d))); + break; + } + } + } + } else { + Q6d(); + if (BD(b, 66).Oj()) { + this.e = true; + this.f = null; + this.d = new Rkb(); + for (g = 0, i = (a.i == null && TKd(a), a.i).length; g < i; ++g) { + d = + ((c = (a.i == null && TKd(a), a.i)), + g >= 0 && g < c.length ? c[g] : null); + for (f = _1d(q1d(M6d, d)); f; f = _1d(q1d(M6d, f))) { + f == b && this.d.Fc(d); + } + } + } else if ($1d(q1d(M6d, b)) == 1 && !!h) { + this.f = null; + this.d = (m8d(), l8d); + } else { + this.f = null; + this.e = true; + this.d = (mmb(), new anb(b)); + } + } + } else { + this.e = $1d(q1d(M6d, b)) == 5; + this.f.Fb(W6d) && (this.f = W6d); + } + } + function zKb(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o; + c = 0; + d = yKb(a, b); + m = a.s; + n = a.t; + for (j = BD(BD(Qc(a.r, b), 21), 84).Kc(); j.Ob(); ) { + i = BD(j.Pb(), 111); + if (!i.c || i.c.d.c.length <= 0) { + continue; + } + o = i.b.rf(); + h = i.b.Xe((Y9c(), s9c)) ? Edb(ED(i.b.We(s9c))) : 0; + k = i.c; + l = k.i; + l.b = ((g = k.n), k.e.a + g.b + g.c); + l.a = ((f = k.n), k.e.b + f.d + f.a); + switch (b.g) { + case 1: + l.c = i.a ? (o.a - l.b) / 2 : o.a + m; + l.d = o.b + h + d; + $Hb(k, (NHb(), KHb)); + _Hb(k, (EIb(), DIb)); + break; + case 3: + l.c = i.a ? (o.a - l.b) / 2 : o.a + m; + l.d = -h - d - l.a; + $Hb(k, (NHb(), KHb)); + _Hb(k, (EIb(), BIb)); + break; + case 2: + l.c = -h - d - l.b; + if (i.a) { + e = a.v ? l.a : BD(Ikb(k.d, 0), 181).rf().b; + l.d = (o.b - e) / 2; + } else { + l.d = o.b + n; + } + $Hb(k, (NHb(), MHb)); + _Hb(k, (EIb(), CIb)); + break; + case 4: + l.c = o.a + h + d; + if (i.a) { + e = a.v ? l.a : BD(Ikb(k.d, 0), 181).rf().b; + l.d = (o.b - e) / 2; + } else { + l.d = o.b + n; + } + $Hb(k, (NHb(), LHb)); + _Hb(k, (EIb(), CIb)); + } + (b == (Ucd(), Acd) || b == Rcd) && (c = Math.max(c, l.a)); + } + c > 0 && (BD(Mpb(a.b, b), 124).a.b = c); + } + function b3b(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r; + Odd(b, "Comment pre-processing", 1); + c = 0; + i = new olb(a.a); + while (i.a < i.c.c.length) { + h = BD(mlb(i), 10); + if (Ccb(DD(vNb(h, (Nyc(), pwc))))) { + ++c; + e = 0; + d = null; + j = null; + for (o = new olb(h.j); o.a < o.c.c.length; ) { + m = BD(mlb(o), 11); + e += m.e.c.length + m.g.c.length; + if (m.e.c.length == 1) { + d = BD(Ikb(m.e, 0), 17); + j = d.c; + } + if (m.g.c.length == 1) { + d = BD(Ikb(m.g, 0), 17); + j = d.d; + } + } + if ( + e == 1 && + j.e.c.length + j.g.c.length == 1 && + !Ccb(DD(vNb(j.i, pwc))) + ) { + c3b(h, d, j, j.i); + nlb(i); + } else { + r = new Rkb(); + for (n = new olb(h.j); n.a < n.c.c.length; ) { + m = BD(mlb(n), 11); + for (l = new olb(m.g); l.a < l.c.c.length; ) { + k = BD(mlb(l), 17); + k.d.g.c.length == 0 || ((r.c[r.c.length] = k), true); + } + for (g = new olb(m.e); g.a < g.c.c.length; ) { + f = BD(mlb(g), 17); + f.c.e.c.length == 0 || ((r.c[r.c.length] = f), true); + } + } + for (q = new olb(r); q.a < q.c.c.length; ) { + p = BD(mlb(q), 17); + PZb(p, true); + } + } + } + } + b.n && Sdd(b, "Found " + c + " comment boxes"); + Qdd(b); + } + function f9b(a, b, c, d) { + var e, f, g, h, i, j, k, l, m, n, o, p; + m = Edb(ED(vNb(a, (Nyc(), tyc)))); + n = Edb(ED(vNb(a, uyc))); + l = Edb(ED(vNb(a, ryc))); + h = a.o; + f = BD(Ikb(a.j, 0), 11); + g = f.n; + p = d9b(f, l); + if (!p) { + return; + } + if (b.Hc((rcd(), ncd))) { + switch (BD(vNb(a, (wtc(), Hsc)), 61).g) { + case 1: + p.c = (h.a - p.b) / 2 - g.a; + p.d = n; + break; + case 3: + p.c = (h.a - p.b) / 2 - g.a; + p.d = -n - p.a; + break; + case 2: + if (c && f.e.c.length == 0 && f.g.c.length == 0) { + k = d ? p.a : BD(Ikb(f.f, 0), 70).o.b; + p.d = (h.b - k) / 2 - g.b; + } else { + p.d = h.b + n - g.b; + } + p.c = -m - p.b; + break; + case 4: + if (c && f.e.c.length == 0 && f.g.c.length == 0) { + k = d ? p.a : BD(Ikb(f.f, 0), 70).o.b; + p.d = (h.b - k) / 2 - g.b; + } else { + p.d = h.b + n - g.b; + } + p.c = m; + } + } else if (b.Hc(pcd)) { + switch (BD(vNb(a, (wtc(), Hsc)), 61).g) { + case 1: + case 3: + p.c = g.a + m; + break; + case 2: + case 4: + if (c && !f.c) { + k = d ? p.a : BD(Ikb(f.f, 0), 70).o.b; + p.d = (h.b - k) / 2 - g.b; + } else { + p.d = g.b + n; + } + } + } + e = p.d; + for (j = new olb(f.f); j.a < j.c.c.length; ) { + i = BD(mlb(j), 70); + o = i.n; + o.a = p.c; + o.b = e; + e += i.o.b + l; + } + } + function eae() { + rEd(Q9, new Lae()); + rEd(S9, new qbe()); + rEd(T9, new Xbe()); + rEd(U9, new Cce()); + rEd(ZI, new Oce()); + rEd(GC(SD, 1), new Rce()); + rEd(wI, new Uce()); + rEd(xI, new Xce()); + rEd(ZI, new hae()); + rEd(ZI, new kae()); + rEd(ZI, new nae()); + rEd(BI, new qae()); + rEd(ZI, new tae()); + rEd(yK, new wae()); + rEd(yK, new zae()); + rEd(ZI, new Cae()); + rEd(FI, new Fae()); + rEd(ZI, new Iae()); + rEd(ZI, new Oae()); + rEd(ZI, new Rae()); + rEd(ZI, new Uae()); + rEd(ZI, new Xae()); + rEd(GC(SD, 1), new $ae()); + rEd(ZI, new bbe()); + rEd(ZI, new ebe()); + rEd(yK, new hbe()); + rEd(yK, new kbe()); + rEd(ZI, new nbe()); + rEd(JI, new tbe()); + rEd(ZI, new wbe()); + rEd(MI, new zbe()); + rEd(ZI, new Cbe()); + rEd(ZI, new Fbe()); + rEd(ZI, new Ibe()); + rEd(ZI, new Lbe()); + rEd(yK, new Obe()); + rEd(yK, new Rbe()); + rEd(ZI, new Ube()); + rEd(ZI, new $be()); + rEd(ZI, new bce()); + rEd(ZI, new ece()); + rEd(ZI, new hce()); + rEd(ZI, new kce()); + rEd(UI, new nce()); + rEd(ZI, new qce()); + rEd(ZI, new tce()); + rEd(ZI, new wce()); + rEd(UI, new zce()); + rEd(MI, new Fce()); + rEd(ZI, new Ice()); + rEd(JI, new Lce()); + } + function Bmd(b, c) { + var d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u; + n = c.length; + if (n > 0) { + j = (BCb(0, c.length), c.charCodeAt(0)); + if (j != 64) { + if (j == 37) { + m = c.lastIndexOf("%"); + k = false; + if ( + m != 0 && + (m == n - 1 || + (k = (BCb(m + 1, c.length), c.charCodeAt(m + 1) == 46))) + ) { + h = c.substr(1, m - 1); + u = dfb("%", h) ? null : QEd(h); + e = 0; + if (k) { + try { + e = Icb(c.substr(m + 2), Rie, Ohe); + } catch (a) { + a = ubb(a); + if (JD(a, 127)) { + i = a; + throw vbb(new rFd(i)); + } else throw vbb(a); + } + } + for (r = pRd(b.Wg()); r.Ob(); ) { + p = MRd(r); + if (JD(p, 510)) { + f = BD(p, 590); + t = f.d; + if ((u == null ? t == null : dfb(u, t)) && e-- == 0) { + return f; + } + } + } + return null; + } + } + l = c.lastIndexOf("."); + o = l == -1 ? c : c.substr(0, l); + d = 0; + if (l != -1) { + try { + d = Icb(c.substr(l + 1), Rie, Ohe); + } catch (a) { + a = ubb(a); + if (JD(a, 127)) { + o = c; + } else throw vbb(a); + } + } + o = dfb("%", o) ? null : QEd(o); + for (q = pRd(b.Wg()); q.Ob(); ) { + p = MRd(q); + if (JD(p, 191)) { + g = BD(p, 191); + s = g.ne(); + if ((o == null ? s == null : dfb(o, s)) && d-- == 0) { + return g; + } + } + } + return null; + } + } + return rid(b, c); + } + function f6b(a) { + var b, + c, + d, + e, + f, + g, + h, + i, + j, + k, + l, + m, + n, + o, + p, + q, + r, + s, + t, + u, + v, + w, + A, + B, + C, + D, + F; + w = new Rkb(); + for (o = new olb(a.b); o.a < o.c.c.length; ) { + n = BD(mlb(o), 29); + for (r = new olb(n.a); r.a < r.c.c.length; ) { + p = BD(mlb(r), 10); + if (p.k != (j0b(), e0b)) { + continue; + } + if (!wNb(p, (wtc(), Gsc))) { + continue; + } + s = null; + u = null; + t = null; + for (C = new olb(p.j); C.a < C.c.c.length; ) { + B = BD(mlb(C), 11); + switch (B.j.g) { + case 4: + s = B; + break; + case 2: + u = B; + break; + default: + t = B; + } + } + v = BD(Ikb(t.g, 0), 17); + k = new t7c(v.a); + j = new g7c(t.n); + P6c(j, p.n); + l = Jsb(k, 0); + Vsb(l, j); + A = w7c(v.a); + m = new g7c(t.n); + P6c(m, p.n); + Gsb(A, m, A.c.b, A.c); + D = BD(vNb(p, Gsc), 10); + F = BD(Ikb(D.j, 0), 11); + i = BD(Qkb(s.e, KC(AQ, jne, 17, 0, 0, 1)), 474); + for (d = i, f = 0, h = d.length; f < h; ++f) { + b = d[f]; + RZb(b, F); + o7c(b.a, b.a.b, k); + } + i = k_b(u.g); + for (c = i, e = 0, g = c.length; e < g; ++e) { + b = c[e]; + QZb(b, F); + o7c(b.a, 0, A); + } + QZb(v, null); + RZb(v, null); + w.c[w.c.length] = p; + } + } + for (q = new olb(w); q.a < q.c.c.length; ) { + p = BD(mlb(q), 10); + $_b(p, null); + } + } + function lgb() { + lgb = ccb; + var a, b, c; + new sgb(1, 0); + new sgb(10, 0); + new sgb(0, 0); + dgb = KC(bJ, nie, 240, 11, 0, 1); + egb = KC(TD, $ie, 25, 100, 15, 1); + fgb = OC( + GC(UD, 1), + Vje, + 25, + 15, + [ + 1, 5, 25, 125, 625, 3125, 15625, 78125, 390625, 1953125, 9765625, + 48828125, 244140625, 1220703125, 6103515625, 30517578125, + 152587890625, 762939453125, 3814697265625, 19073486328125, + 95367431640625, 476837158203125, 2384185791015625, + ] + ); + ggb = KC(WD, oje, 25, fgb.length, 15, 1); + hgb = OC(GC(UD, 1), Vje, 25, 15, [ + 1, + 10, + 100, + _ie, + 10000, + Wje, + 1000000, + 10000000, + 100000000, + Jje, + 10000000000, + 100000000000, + 1000000000000, + 10000000000000, + 100000000000000, + 1000000000000000, + 10000000000000000, + ]); + igb = KC(WD, oje, 25, hgb.length, 15, 1); + jgb = KC(bJ, nie, 240, 11, 0, 1); + a = 0; + for (; a < jgb.length; a++) { + dgb[a] = new sgb(a, 0); + jgb[a] = new sgb(0, a); + egb[a] = 48; + } + for (; a < egb.length; a++) { + egb[a] = 48; + } + for (c = 0; c < ggb.length; c++) { + ggb[c] = ugb(fgb[c]); + } + for (b = 0; b < igb.length; b++) { + igb[b] = ugb(hgb[b]); + } + Dhb(); + } + function zrb() { + function e() { + this.obj = this.createObject(); + } + e.prototype.createObject = function (a) { + return Object.create(null); + }; + e.prototype.get = function (a) { + return this.obj[a]; + }; + e.prototype.set = function (a, b) { + this.obj[a] = b; + }; + e.prototype[hke] = function (a) { + delete this.obj[a]; + }; + e.prototype.keys = function () { + return Object.getOwnPropertyNames(this.obj); + }; + e.prototype.entries = function () { + var b = this.keys(); + var c = this; + var d = 0; + return { + next: function () { + if (d >= b.length) return { done: true }; + var a = b[d++]; + return { value: [a, c.get(a)], done: false }; + }, + }; + }; + if (!xrb()) { + e.prototype.createObject = function () { + return {}; + }; + e.prototype.get = function (a) { + return this.obj[":" + a]; + }; + e.prototype.set = function (a, b) { + this.obj[":" + a] = b; + }; + e.prototype[hke] = function (a) { + delete this.obj[":" + a]; + }; + e.prototype.keys = function () { + var a = []; + for (var b in this.obj) { + b.charCodeAt(0) == 58 && a.push(b.substring(1)); + } + return a; + }; + } + return e; + } + function cde(a) { + ade(); + var b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q; + if (a == null) return null; + l = a.length * 8; + if (l == 0) { + return ""; + } + h = l % 24; + n = (l / 24) | 0; + m = h != 0 ? n + 1 : n; + f = null; + f = KC(TD, $ie, 25, m * 4, 15, 1); + j = 0; + k = 0; + b = 0; + c = 0; + d = 0; + g = 0; + e = 0; + for (i = 0; i < n; i++) { + b = a[e++]; + c = a[e++]; + d = a[e++]; + k = ((c & 15) << 24) >> 24; + j = ((b & 3) << 24) >> 24; + o = + (b & -128) == 0 + ? ((b >> 2) << 24) >> 24 + : (((b >> 2) ^ 192) << 24) >> 24; + p = + (c & -128) == 0 + ? ((c >> 4) << 24) >> 24 + : (((c >> 4) ^ 240) << 24) >> 24; + q = + (d & -128) == 0 + ? ((d >> 6) << 24) >> 24 + : (((d >> 6) ^ 252) << 24) >> 24; + f[g++] = _ce[o]; + f[g++] = _ce[p | (j << 4)]; + f[g++] = _ce[(k << 2) | q]; + f[g++] = _ce[d & 63]; + } + if (h == 8) { + b = a[e]; + j = ((b & 3) << 24) >> 24; + o = + (b & -128) == 0 + ? ((b >> 2) << 24) >> 24 + : (((b >> 2) ^ 192) << 24) >> 24; + f[g++] = _ce[o]; + f[g++] = _ce[j << 4]; + f[g++] = 61; + f[g++] = 61; + } else if (h == 16) { + b = a[e]; + c = a[e + 1]; + k = ((c & 15) << 24) >> 24; + j = ((b & 3) << 24) >> 24; + o = + (b & -128) == 0 + ? ((b >> 2) << 24) >> 24 + : (((b >> 2) ^ 192) << 24) >> 24; + p = + (c & -128) == 0 + ? ((c >> 4) << 24) >> 24 + : (((c >> 4) ^ 240) << 24) >> 24; + f[g++] = _ce[o]; + f[g++] = _ce[p | (j << 4)]; + f[g++] = _ce[k << 2]; + f[g++] = 61; + } + return zfb(f, 0, f.length); + } + function mB(a, b) { + var c, d, e, f, g, h, i; + a.e == 0 && a.p > 0 && (a.p = -(a.p - 1)); + a.p > Rie && dB(b, a.p - nje); + g = b.q.getDate(); + ZA(b, 1); + a.k >= 0 && aB(b, a.k); + if (a.c >= 0) { + ZA(b, a.c); + } else if (a.k >= 0) { + i = new fB(b.q.getFullYear() - nje, b.q.getMonth(), 35); + d = 35 - i.q.getDate(); + ZA(b, Math.min(d, g)); + } else { + ZA(b, g); + } + a.f < 0 && (a.f = b.q.getHours()); + a.b > 0 && a.f < 12 && (a.f += 12); + $A(b, a.f == 24 && a.g ? 0 : a.f); + a.j >= 0 && _A(b, a.j); + a.n >= 0 && bB(b, a.n); + a.i >= 0 && cB(b, wbb(Ibb(Abb(Cbb(b.q.getTime()), _ie), _ie), a.i)); + if (a.a) { + e = new eB(); + dB(e, e.q.getFullYear() - nje - 80); + Gbb(Cbb(b.q.getTime()), Cbb(e.q.getTime())) && + dB(b, e.q.getFullYear() - nje + 100); + } + if (a.d >= 0) { + if (a.c == -1) { + c = (7 + a.d - b.q.getDay()) % 7; + c > 3 && (c -= 7); + h = b.q.getMonth(); + ZA(b, b.q.getDate() + c); + b.q.getMonth() != h && ZA(b, b.q.getDate() + (c > 0 ? -7 : 7)); + } else { + if (b.q.getDay() != a.d) { + return false; + } + } + } + if (a.o > Rie) { + f = b.q.getTimezoneOffset(); + cB(b, wbb(Cbb(b.q.getTime()), (a.o - f) * 60 * _ie)); + } + return true; + } + function z2b(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u; + e = vNb(b, (wtc(), $sc)); + if (!JD(e, 239)) { + return; + } + o = BD(e, 33); + p = b.e; + m = new g7c(b.c); + f = b.d; + m.a += f.b; + m.b += f.d; + u = BD(hkd(o, (Nyc(), Ixc)), 174); + if (uqb(u, (Idd(), Add))) { + n = BD(hkd(o, Kxc), 116); + w_b(n, f.a); + z_b(n, f.d); + x_b(n, f.b); + y_b(n, f.c); + } + c = new Rkb(); + for (k = new olb(b.a); k.a < k.c.c.length; ) { + i = BD(mlb(k), 10); + if (JD(vNb(i, $sc), 239)) { + A2b(i, m); + } else if (JD(vNb(i, $sc), 186) && !p) { + d = BD(vNb(i, $sc), 118); + s = b_b(b, i, d.g, d.f); + bld(d, s.a, s.b); + } + for (r = new olb(i.j); r.a < r.c.c.length; ) { + q = BD(mlb(r), 11); + MAb(JAb(new YAb(null, new Kub(q.g, 16)), new G2b(i)), new I2b(c)); + } + } + if (p) { + for (r = new olb(p.j); r.a < r.c.c.length; ) { + q = BD(mlb(r), 11); + MAb(JAb(new YAb(null, new Kub(q.g, 16)), new K2b(p)), new M2b(c)); + } + } + t = BD(hkd(o, Swc), 218); + for (h = new olb(c); h.a < h.c.c.length; ) { + g = BD(mlb(h), 17); + y2b(g, t, m); + } + B2b(b); + for (j = new olb(b.a); j.a < j.c.c.length; ) { + i = BD(mlb(j), 10); + l = i.e; + !!l && z2b(a, l); + } + } + function xSb(a) { + r4c( + a, + new E3c( + Q3c( + L3c( + P3c( + M3c( + O3c(N3c(new R3c(), ume), "ELK Force"), + "Force-based algorithm provided by the Eclipse Layout Kernel. Implements methods that follow physical analogies by simulating forces that move the nodes into a balanced distribution. Currently the original Eades model and the Fruchterman - Reingold model are supported." + ), + new ASb() + ), + ume + ), + qqb((Csd(), zsd), OC(GC(O3, 1), Kie, 237, 0, [xsd])) + ) + ) + ); + p4c(a, ume, vme, meb(1)); + p4c(a, ume, wme, 80); + p4c(a, ume, xme, 5); + p4c(a, ume, _le, tme); + p4c(a, ume, yme, meb(1)); + p4c(a, ume, zme, (Bcb(), true)); + p4c(a, ume, ame, lSb); + p4c(a, ume, Ame, Ksd(dSb)); + p4c(a, ume, Bme, Ksd(mSb)); + p4c(a, ume, Cme, false); + p4c(a, ume, Dme, Ksd(jSb)); + p4c(a, ume, Eme, Ksd(iSb)); + p4c(a, ume, Fme, Ksd(hSb)); + p4c(a, ume, Gme, Ksd(gSb)); + p4c(a, ume, Hme, Ksd(nSb)); + p4c(a, ume, mme, Ksd(fSb)); + p4c(a, ume, pme, Ksd(vSb)); + p4c(a, ume, nme, Ksd(eSb)); + p4c(a, ume, rme, Ksd(qSb)); + p4c(a, ume, ome, Ksd(rSb)); + } + function GKb(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n; + if (BD(BD(Qc(a.r, b), 21), 84).dc()) { + return; + } + g = BD(Mpb(a.b, b), 124); + i = g.i; + h = g.n; + k = KIb(a, b); + d = i.b - h.b - h.c; + e = g.a.a; + f = i.c + h.b; + n = a.w; + if ( + (k == (Tbd(), Qbd) || k == Sbd) && + BD(BD(Qc(a.r, b), 21), 84).gc() == 1 + ) { + e = k == Qbd ? e - 2 * a.w : e; + k = Pbd; + } + if (d < e && !a.B.Hc((Idd(), Fdd))) { + if (k == Qbd) { + n += (d - e) / (BD(BD(Qc(a.r, b), 21), 84).gc() + 1); + f += n; + } else { + n += (d - e) / (BD(BD(Qc(a.r, b), 21), 84).gc() - 1); + } + } else { + if (d < e) { + e = k == Qbd ? e - 2 * a.w : e; + k = Pbd; + } + switch (k.g) { + case 3: + f += (d - e) / 2; + break; + case 4: + f += d - e; + break; + case 0: + c = (d - e) / (BD(BD(Qc(a.r, b), 21), 84).gc() + 1); + n += Math.max(0, c); + f += n; + break; + case 1: + c = (d - e) / (BD(BD(Qc(a.r, b), 21), 84).gc() - 1); + n += Math.max(0, c); + } + } + for (m = BD(BD(Qc(a.r, b), 21), 84).Kc(); m.Ob(); ) { + l = BD(m.Pb(), 111); + l.e.a = f + l.d.b; + l.e.b = + ((j = l.b), + j.Xe((Y9c(), s9c)) + ? j.Hf() == (Ucd(), Acd) + ? -j.rf().b - Edb(ED(j.We(s9c))) + : Edb(ED(j.We(s9c))) + : j.Hf() == (Ucd(), Acd) + ? -j.rf().b + : 0); + f += l.d.b + l.b.rf().a + l.d.c + n; + } + } + function KKb(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o; + if (BD(BD(Qc(a.r, b), 21), 84).dc()) { + return; + } + g = BD(Mpb(a.b, b), 124); + i = g.i; + h = g.n; + l = KIb(a, b); + d = i.a - h.d - h.a; + e = g.a.b; + f = i.d + h.d; + o = a.w; + j = a.o.a; + if ( + (l == (Tbd(), Qbd) || l == Sbd) && + BD(BD(Qc(a.r, b), 21), 84).gc() == 1 + ) { + e = l == Qbd ? e - 2 * a.w : e; + l = Pbd; + } + if (d < e && !a.B.Hc((Idd(), Fdd))) { + if (l == Qbd) { + o += (d - e) / (BD(BD(Qc(a.r, b), 21), 84).gc() + 1); + f += o; + } else { + o += (d - e) / (BD(BD(Qc(a.r, b), 21), 84).gc() - 1); + } + } else { + if (d < e) { + e = l == Qbd ? e - 2 * a.w : e; + l = Pbd; + } + switch (l.g) { + case 3: + f += (d - e) / 2; + break; + case 4: + f += d - e; + break; + case 0: + c = (d - e) / (BD(BD(Qc(a.r, b), 21), 84).gc() + 1); + o += Math.max(0, c); + f += o; + break; + case 1: + c = (d - e) / (BD(BD(Qc(a.r, b), 21), 84).gc() - 1); + o += Math.max(0, c); + } + } + for (n = BD(BD(Qc(a.r, b), 21), 84).Kc(); n.Ob(); ) { + m = BD(n.Pb(), 111); + m.e.a = + ((k = m.b), + k.Xe((Y9c(), s9c)) + ? k.Hf() == (Ucd(), Tcd) + ? -k.rf().a - Edb(ED(k.We(s9c))) + : j + Edb(ED(k.We(s9c))) + : k.Hf() == (Ucd(), Tcd) + ? -k.rf().a + : j); + m.e.b = f + m.d.d; + f += m.d.d + m.b.rf().b + m.d.a + o; + } + } + function Abc(a) { + var b, c, d, e, f, g, h, i, j, k, l, m, n, o, p; + a.n = Edb(ED(vNb(a.g, (Nyc(), vyc)))); + a.e = Edb(ED(vNb(a.g, pyc))); + a.i = a.g.b.c.length; + h = a.i - 1; + m = 0; + a.j = 0; + a.k = 0; + a.a = Ou(KC(JI, nie, 19, a.i, 0, 1)); + a.b = Ou(KC(BI, nie, 333, a.i, 7, 1)); + for (g = new olb(a.g.b); g.a < g.c.c.length; ) { + e = BD(mlb(g), 29); + e.p = h; + for (l = new olb(e.a); l.a < l.c.c.length; ) { + k = BD(mlb(l), 10); + k.p = m; + ++m; + } + --h; + } + a.f = KC(WD, oje, 25, m, 15, 1); + a.c = IC(WD, [nie, oje], [48, 25], 15, [m, 3], 2); + a.o = new Rkb(); + a.p = new Rkb(); + b = 0; + a.d = 0; + for (f = new olb(a.g.b); f.a < f.c.c.length; ) { + e = BD(mlb(f), 29); + h = e.p; + d = 0; + p = 0; + i = e.a.c.length; + j = 0; + for (l = new olb(e.a); l.a < l.c.c.length; ) { + k = BD(mlb(l), 10); + m = k.p; + a.f[m] = k.c.p; + j += k.o.b + a.n; + c = sr(new Sr(ur(R_b(k).a.Kc(), new Sq()))); + o = sr(new Sr(ur(U_b(k).a.Kc(), new Sq()))); + a.c[m][0] = o - c; + a.c[m][1] = c; + a.c[m][2] = o; + d += c; + p += o; + c > 0 && Ekb(a.p, k); + Ekb(a.o, k); + } + b -= d; + n = i + b; + j += b * a.e; + Nkb(a.a, h, meb(n)); + Nkb(a.b, h, j); + a.j = Math.max(a.j, n); + a.k = Math.max(a.k, j); + a.d += b; + b += p; + } + } + function Ucd() { + Ucd = ccb; + var a; + Scd = new Ycd(ole, 0); + Acd = new Ycd(xle, 1); + zcd = new Ycd(yle, 2); + Rcd = new Ycd(zle, 3); + Tcd = new Ycd(Ale, 4); + Fcd = + (mmb(), + new zob( + ((a = BD(gdb(F1), 9)), new xqb(a, BD(_Bb(a, a.length), 9), 0)) + )); + Gcd = Up(qqb(Acd, OC(GC(F1, 1), bne, 61, 0, []))); + Bcd = Up(qqb(zcd, OC(GC(F1, 1), bne, 61, 0, []))); + Ocd = Up(qqb(Rcd, OC(GC(F1, 1), bne, 61, 0, []))); + Qcd = Up(qqb(Tcd, OC(GC(F1, 1), bne, 61, 0, []))); + Lcd = Up(qqb(Acd, OC(GC(F1, 1), bne, 61, 0, [Rcd]))); + Ecd = Up(qqb(zcd, OC(GC(F1, 1), bne, 61, 0, [Tcd]))); + Ncd = Up(qqb(Acd, OC(GC(F1, 1), bne, 61, 0, [Tcd]))); + Hcd = Up(qqb(Acd, OC(GC(F1, 1), bne, 61, 0, [zcd]))); + Pcd = Up(qqb(Rcd, OC(GC(F1, 1), bne, 61, 0, [Tcd]))); + Ccd = Up(qqb(zcd, OC(GC(F1, 1), bne, 61, 0, [Rcd]))); + Kcd = Up(qqb(Acd, OC(GC(F1, 1), bne, 61, 0, [zcd, Tcd]))); + Dcd = Up(qqb(zcd, OC(GC(F1, 1), bne, 61, 0, [Rcd, Tcd]))); + Mcd = Up(qqb(Acd, OC(GC(F1, 1), bne, 61, 0, [Rcd, Tcd]))); + Icd = Up(qqb(Acd, OC(GC(F1, 1), bne, 61, 0, [zcd, Rcd]))); + Jcd = Up(qqb(Acd, OC(GC(F1, 1), bne, 61, 0, [zcd, Rcd, Tcd]))); + } + function fSc(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t; + if (b.b != 0) { + n = new Psb(); + h = null; + o = null; + d = QD(Math.floor(Math.log(b.b) * Math.LOG10E) + 1); + i = 0; + for (t = Jsb(b, 0); t.b != t.d.c; ) { + r = BD(Xsb(t), 86); + if (PD(o) !== PD(vNb(r, (mTc(), $Sc)))) { + o = GD(vNb(r, $Sc)); + i = 0; + } + o != null ? (h = o + iSc(i++, d)) : (h = iSc(i++, d)); + yNb(r, $Sc, h); + for (q = ((e = Jsb(new ZRc(r).a.d, 0)), new aSc(e)); Wsb(q.a); ) { + p = BD(Xsb(q.a), 188).c; + Gsb(n, p, n.c.b, n.c); + yNb(p, $Sc, h); + } + } + m = new Lqb(); + for (g = 0; g < h.length - d; g++) { + for (s = Jsb(b, 0); s.b != s.d.c; ) { + r = BD(Xsb(s), 86); + j = qfb(GD(vNb(r, (mTc(), $Sc))), 0, g + 1); + c = + (j == null ? Wd(irb(m.f, null)) : Crb(m.g, j)) != null + ? BD(j == null ? Wd(irb(m.f, null)) : Crb(m.g, j), 19).a + 1 + : 1; + Shb(m, j, meb(c)); + } + } + for (l = new nib(new eib(m).a); l.b; ) { + k = lib(l); + f = meb(Ohb(a.a, k.cd()) != null ? BD(Ohb(a.a, k.cd()), 19).a : 0); + Shb(a.a, GD(k.cd()), meb(BD(k.dd(), 19).a + f.a)); + f = BD(Ohb(a.b, k.cd()), 19); + (!f || f.a < BD(k.dd(), 19).a) && + Shb(a.b, GD(k.cd()), BD(k.dd(), 19)); + } + fSc(a, n); + } + } + function PCc(a, b, c) { + var d, e, f, g, h, i, j, k, l, m, n, o, p, q, r; + Odd(c, "Interactive node layering", 1); + d = new Rkb(); + for (n = new olb(b.a); n.a < n.c.c.length; ) { + l = BD(mlb(n), 10); + j = l.n.a; + i = j + l.o.a; + i = Math.max(j + 1, i); + r = new Bib(d, 0); + e = null; + while (r.b < r.d.gc()) { + p = (sCb(r.b < r.d.gc()), BD(r.d.Xb((r.c = r.b++)), 569)); + if (p.c >= i) { + sCb(r.b > 0); + r.a.Xb((r.c = --r.b)); + break; + } else if (p.a > j) { + if (!e) { + Ekb(p.b, l); + p.c = Math.min(p.c, j); + p.a = Math.max(p.a, i); + e = p; + } else { + Gkb(e.b, p.b); + e.a = Math.max(e.a, p.a); + uib(r); + } + } + } + if (!e) { + e = new TCc(); + e.c = j; + e.a = i; + Aib(r, e); + Ekb(e.b, l); + } + } + h = b.b; + k = 0; + for (q = new olb(d); q.a < q.c.c.length; ) { + p = BD(mlb(q), 569); + f = new H1b(b); + f.p = k++; + h.c[h.c.length] = f; + for (o = new olb(p.b); o.a < o.c.c.length; ) { + l = BD(mlb(o), 10); + $_b(l, f); + l.p = 0; + } + } + for (m = new olb(b.a); m.a < m.c.c.length; ) { + l = BD(mlb(m), 10); + l.p == 0 && OCc(a, l, b); + } + g = new Bib(h, 0); + while (g.b < g.d.gc()) { + (sCb(g.b < g.d.gc()), BD(g.d.Xb((g.c = g.b++)), 29)).a.c.length == 0 && + uib(g); + } + b.a.c = KC(SI, Uhe, 1, 0, 5, 1); + Qdd(c); + } + function Snc(a, b, c) { + var d, e, f, g, h, i, j, k, l, m; + if (b.e.c.length != 0 && c.e.c.length != 0) { + d = BD(Ikb(b.e, 0), 17).c.i; + g = BD(Ikb(c.e, 0), 17).c.i; + if (d == g) { + return beb( + BD(vNb(BD(Ikb(b.e, 0), 17), (wtc(), Zsc)), 19).a, + BD(vNb(BD(Ikb(c.e, 0), 17), Zsc), 19).a + ); + } + for (k = a.a, l = 0, m = k.length; l < m; ++l) { + j = k[l]; + if (j == d) { + return 1; + } else if (j == g) { + return -1; + } + } + } + if (b.g.c.length != 0 && c.g.c.length != 0) { + f = BD(vNb(b, (wtc(), Xsc)), 10); + i = BD(vNb(c, Xsc), 10); + e = 0; + h = 0; + wNb(BD(Ikb(b.g, 0), 17), Zsc) && + (e = BD(vNb(BD(Ikb(b.g, 0), 17), Zsc), 19).a); + wNb(BD(Ikb(c.g, 0), 17), Zsc) && + (h = BD(vNb(BD(Ikb(b.g, 0), 17), Zsc), 19).a); + if (!!f && f == i) { + if ( + Ccb(DD(vNb(BD(Ikb(b.g, 0), 17), ltc))) && + !Ccb(DD(vNb(BD(Ikb(c.g, 0), 17), ltc))) + ) { + return 1; + } else if ( + !Ccb(DD(vNb(BD(Ikb(b.g, 0), 17), ltc))) && + Ccb(DD(vNb(BD(Ikb(c.g, 0), 17), ltc))) + ) { + return -1; + } + return e < h ? -1 : e > h ? 1 : 0; + } + if (a.b) { + a.b._b(f) && (e = BD(a.b.xc(f), 19).a); + a.b._b(i) && (h = BD(a.b.xc(i), 19).a); + } + return e < h ? -1 : e > h ? 1 : 0; + } + return b.e.c.length != 0 && c.g.c.length != 0 ? 1 : -1; + } + function acc(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, A; + Odd(b, Ine, 1); + p = new Rkb(); + w = new Rkb(); + for (j = new olb(a.b); j.a < j.c.c.length; ) { + i = BD(mlb(j), 29); + r = -1; + o = l_b(i.a); + for (l = o, m = 0, n = l.length; m < n; ++m) { + k = l[m]; + ++r; + if (!(k.k == (j0b(), h0b) && fcd(BD(vNb(k, (Nyc(), Vxc)), 98)))) { + continue; + } + ecd(BD(vNb(k, (Nyc(), Vxc)), 98)) || bcc(k); + yNb(k, (wtc(), Psc), k); + p.c = KC(SI, Uhe, 1, 0, 5, 1); + w.c = KC(SI, Uhe, 1, 0, 5, 1); + c = new Rkb(); + u = new Psb(); + Jq(u, Y_b(k, (Ucd(), Acd))); + $bc(a, u, p, w, c); + h = r; + A = k; + for (f = new olb(p); f.a < f.c.c.length; ) { + d = BD(mlb(f), 10); + Z_b(d, h, i); + ++r; + yNb(d, Psc, k); + g = BD(Ikb(d.j, 0), 11); + q = BD(vNb(g, $sc), 11); + Ccb(DD(vNb(q, nwc))) || BD(vNb(d, Qsc), 15).Fc(A); + } + Osb(u); + for (t = Y_b(k, Rcd).Kc(); t.Ob(); ) { + s = BD(t.Pb(), 11); + Gsb(u, s, u.a, u.a.a); + } + $bc(a, u, w, null, c); + v = k; + for (e = new olb(w); e.a < e.c.c.length; ) { + d = BD(mlb(e), 10); + Z_b(d, ++r, i); + yNb(d, Psc, k); + g = BD(Ikb(d.j, 0), 11); + q = BD(vNb(g, $sc), 11); + Ccb(DD(vNb(q, nwc))) || BD(vNb(v, Qsc), 15).Fc(d); + } + c.c.length == 0 || yNb(k, ssc, c); + } + } + Qdd(b); + } + function SQb(a) { + var b, + c, + d, + e, + f, + g, + h, + i, + j, + k, + l, + m, + n, + o, + p, + q, + r, + s, + t, + u, + v, + w, + A, + B, + C, + D, + F, + G, + H, + I; + l = BD(vNb(a, (HSb(), FSb)), 33); + r = Ohe; + s = Ohe; + p = Rie; + q = Rie; + for (u = new olb(a.e); u.a < u.c.c.length; ) { + t = BD(mlb(u), 144); + C = t.d; + D = t.e; + r = Math.min(r, C.a - D.a / 2); + s = Math.min(s, C.b - D.b / 2); + p = Math.max(p, C.a + D.a / 2); + q = Math.max(q, C.b + D.b / 2); + } + B = BD(hkd(l, (wSb(), kSb)), 116); + A = new f7c(B.b - r, B.d - s); + for (h = new olb(a.e); h.a < h.c.c.length; ) { + g = BD(mlb(h), 144); + w = vNb(g, FSb); + if (JD(w, 239)) { + n = BD(w, 33); + v = P6c(g.d, A); + bld(n, v.a - n.g / 2, v.b - n.f / 2); + } + } + for (d = new olb(a.c); d.a < d.c.c.length; ) { + c = BD(mlb(d), 282); + j = BD(vNb(c, FSb), 79); + k = itd(j, true, true); + F = + ((H = c7c(R6c(c.d.d), c.c.d)), + l6c(H, c.c.e.a, c.c.e.b), + P6c(H, c.c.d)); + nmd(k, F.a, F.b); + b = + ((I = c7c(R6c(c.c.d), c.d.d)), + l6c(I, c.d.e.a, c.d.e.b), + P6c(I, c.d.d)); + gmd(k, b.a, b.b); + } + for (f = new olb(a.d); f.a < f.c.c.length; ) { + e = BD(mlb(f), 447); + m = BD(vNb(e, FSb), 137); + o = P6c(e.d, A); + bld(m, o.a, o.b); + } + G = p - r + (B.b + B.c); + i = q - s + (B.d + B.a); + Afd(l, G, i, false, true); + } + function bmc(a) { + var b, c, d, e, f, g, h, i, j, k, l, m; + c = null; + i = null; + e = BD(vNb(a.b, (Nyc(), Wwc)), 376); + if (e == (_Ac(), ZAc)) { + c = new Rkb(); + i = new Rkb(); + } + for (h = new olb(a.d); h.a < h.c.c.length; ) { + g = BD(mlb(h), 101); + f = g.i; + if (!f) { + continue; + } + switch (g.e.g) { + case 0: + b = BD(Fqb(new Gqb(g.b)), 61); + e == ZAc && b == (Ucd(), Acd) + ? ((c.c[c.c.length] = g), true) + : e == ZAc && b == (Ucd(), Rcd) + ? ((i.c[i.c.length] = g), true) + : _lc(g, b); + break; + case 1: + j = g.a.d.j; + k = g.c.d.j; + j == (Ucd(), Acd) + ? amc(g, Acd, (Ajc(), xjc), g.a) + : k == Acd + ? amc(g, Acd, (Ajc(), yjc), g.c) + : j == Rcd + ? amc(g, Rcd, (Ajc(), yjc), g.a) + : k == Rcd && amc(g, Rcd, (Ajc(), xjc), g.c); + break; + case 2: + case 3: + d = g.b; + uqb(d, (Ucd(), Acd)) + ? uqb(d, Rcd) + ? uqb(d, Tcd) + ? uqb(d, zcd) || amc(g, Acd, (Ajc(), yjc), g.c) + : amc(g, Acd, (Ajc(), xjc), g.a) + : amc(g, Acd, (Ajc(), wjc), null) + : amc(g, Rcd, (Ajc(), wjc), null); + break; + case 4: + l = g.a.d.j; + m = g.a.d.j; + l == (Ucd(), Acd) || m == Acd + ? amc(g, Rcd, (Ajc(), wjc), null) + : amc(g, Acd, (Ajc(), wjc), null); + } + } + if (c) { + c.c.length == 0 || $lc(c, (Ucd(), Acd)); + i.c.length == 0 || $lc(i, (Ucd(), Rcd)); + } + } + function A2b(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o, p; + d = BD(vNb(a, (wtc(), $sc)), 33); + o = BD(vNb(a, (Nyc(), Gwc)), 19).a; + f = BD(vNb(a, nxc), 19).a; + jkd(d, Gwc, meb(o)); + jkd(d, nxc, meb(f)); + dld(d, a.n.a + b.a); + eld(d, a.n.b + b.b); + if ( + BD(hkd(d, Fxc), 174).gc() != 0 || + !!a.e || + (PD(vNb(Q_b(a), Exc)) === PD((Vzc(), Tzc)) && + Jzc( + (Izc(), + (!a.q ? (mmb(), mmb(), kmb) : a.q)._b(Cxc) + ? (m = BD(vNb(a, Cxc), 197)) + : (m = BD(vNb(Q_b(a), Dxc), 197)), + m) + )) + ) { + cld(d, a.o.a); + ald(d, a.o.b); + } + for (l = new olb(a.j); l.a < l.c.c.length; ) { + j = BD(mlb(l), 11); + p = vNb(j, $sc); + if (JD(p, 186)) { + e = BD(p, 118); + bld(e, j.n.a, j.n.b); + jkd(e, $xc, j.j); + } + } + n = BD(vNb(a, xxc), 174).gc() != 0; + for (i = new olb(a.b); i.a < i.c.c.length; ) { + g = BD(mlb(i), 70); + if (n || BD(vNb(g, xxc), 174).gc() != 0) { + c = BD(vNb(g, $sc), 137); + _kd(c, g.o.a, g.o.b); + bld(c, g.n.a, g.n.b); + } + } + if (!tcd(BD(vNb(a, Yxc), 21))) { + for (k = new olb(a.j); k.a < k.c.c.length; ) { + j = BD(mlb(k), 11); + for (h = new olb(j.f); h.a < h.c.c.length; ) { + g = BD(mlb(h), 70); + c = BD(vNb(g, $sc), 137); + cld(c, g.o.a); + ald(c, g.o.b); + bld(c, g.n.a, g.n.b); + } + } + } + } + function gtd(a) { + var b, c, d, e, f; + ytb(a, hue); + switch ( + (!a.b && (a.b = new y5d(z2, a, 4, 7)), a.b).i + + (!a.c && (a.c = new y5d(z2, a, 5, 8)), a.c).i + ) { + case 0: + throw vbb( + new Wdb("The edge must have at least one source or target.") + ); + case 1: + return (!a.b && (a.b = new y5d(z2, a, 4, 7)), a.b).i == 0 + ? Xod( + atd(BD(qud((!a.c && (a.c = new y5d(z2, a, 5, 8)), a.c), 0), 82)) + ) + : Xod( + atd(BD(qud((!a.b && (a.b = new y5d(z2, a, 4, 7)), a.b), 0), 82)) + ); + } + if ( + (!a.b && (a.b = new y5d(z2, a, 4, 7)), a.b).i == 1 && + (!a.c && (a.c = new y5d(z2, a, 5, 8)), a.c).i == 1 + ) { + e = atd(BD(qud((!a.b && (a.b = new y5d(z2, a, 4, 7)), a.b), 0), 82)); + f = atd(BD(qud((!a.c && (a.c = new y5d(z2, a, 5, 8)), a.c), 0), 82)); + if (Xod(e) == Xod(f)) { + return Xod(e); + } else if (e == Xod(f)) { + return e; + } else if (f == Xod(e)) { + return f; + } + } + d = ul( + pl( + OC(GC(KI, 1), Uhe, 20, 0, [ + (!a.b && (a.b = new y5d(z2, a, 4, 7)), a.b), + (!a.c && (a.c = new y5d(z2, a, 5, 8)), a.c), + ]) + ) + ); + b = atd(BD(Rr(d), 82)); + while (Qr(d)) { + c = atd(BD(Rr(d), 82)); + if (c != b && !ntd(c, b)) { + if (Xod(c) == Xod(b)) { + b = Xod(c); + } else { + b = htd(b, c); + if (!b) { + return null; + } + } + } + } + return b; + } + function KNc(a, b, c) { + var d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u; + Odd(c, "Polyline edge routing", 1); + q = Edb(ED(vNb(b, (Nyc(), Uwc)))); + n = Edb(ED(vNb(b, wyc))); + e = Edb(ED(vNb(b, myc))); + d = Math.min(1, e / n); + t = 0; + i = 0; + if (b.b.c.length != 0) { + u = HNc(BD(Ikb(b.b, 0), 29)); + t = 0.4 * d * u; + } + h = new Bib(b.b, 0); + while (h.b < h.d.gc()) { + g = (sCb(h.b < h.d.gc()), BD(h.d.Xb((h.c = h.b++)), 29)); + f = Kq(g, DNc); + f && t > 0 && (t -= n); + h_b(g, t); + k = 0; + for (m = new olb(g.a); m.a < m.c.c.length; ) { + l = BD(mlb(m), 10); + j = 0; + for (p = new Sr(ur(U_b(l).a.Kc(), new Sq())); Qr(p); ) { + o = BD(Rr(p), 17); + r = A0b(o.c).b; + s = A0b(o.d).b; + if (g == o.d.i.c && !OZb(o)) { + LNc(o, t, 0.4 * d * Math.abs(r - s)); + if (o.c.j == (Ucd(), Tcd)) { + r = 0; + s = 0; + } + } + j = Math.max(j, Math.abs(s - r)); + } + switch (l.k.g) { + case 0: + case 4: + case 1: + case 3: + case 5: + MNc(a, l, t, q); + } + k = Math.max(k, j); + } + if (h.b < h.d.gc()) { + u = HNc((sCb(h.b < h.d.gc()), BD(h.d.Xb((h.c = h.b++)), 29))); + k = Math.max(k, u); + sCb(h.b > 0); + h.a.Xb((h.c = --h.b)); + } + i = 0.4 * d * k; + !f && h.b < h.d.gc() && (i += n); + t += g.c.a + i; + } + a.a.a.$b(); + b.f.a = t; + Qdd(c); + } + function bic(a) { + var b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s; + k = new Lqb(); + i = new Hp(); + for (d = new olb(a.a.a.b); d.a < d.c.c.length; ) { + b = BD(mlb(d), 57); + j = tgc(b); + if (j) { + jrb(k.f, j, b); + } else { + s = ugc(b); + if (s) { + for (f = new olb(s.k); f.a < f.c.c.length; ) { + e = BD(mlb(f), 17); + Rc(i, e, b); + } + } + } + } + for (c = new olb(a.a.a.b); c.a < c.c.c.length; ) { + b = BD(mlb(c), 57); + j = tgc(b); + if (j) { + for (h = new Sr(ur(U_b(j).a.Kc(), new Sq())); Qr(h); ) { + g = BD(Rr(h), 17); + if (OZb(g)) { + continue; + } + o = g.c; + r = g.d; + if ((Ucd(), Lcd).Hc(g.c.j) && Lcd.Hc(g.d.j)) { + continue; + } + p = BD(Ohb(k, g.d.i), 57); + AFb(DFb(CFb(EFb(BFb(new FFb(), 0), 100), a.c[b.a.d]), a.c[p.a.d])); + if (o.j == Tcd && l1b((z0b(), w0b, o))) { + for (m = BD(Qc(i, g), 21).Kc(); m.Ob(); ) { + l = BD(m.Pb(), 57); + if (l.d.c < b.d.c) { + n = a.c[l.a.d]; + q = a.c[b.a.d]; + if (n == q) { + continue; + } + AFb(DFb(CFb(EFb(BFb(new FFb(), 1), 100), n), q)); + } + } + } + if (r.j == zcd && g1b((z0b(), u0b, r))) { + for (m = BD(Qc(i, g), 21).Kc(); m.Ob(); ) { + l = BD(m.Pb(), 57); + if (l.d.c > b.d.c) { + n = a.c[b.a.d]; + q = a.c[l.a.d]; + if (n == q) { + continue; + } + AFb(DFb(CFb(EFb(BFb(new FFb(), 1), 100), n), q)); + } + } + } + } + } + } + } + function QEd(a) { + IEd(); + var b, c, d, e, f, g, h, i; + if (a == null) return null; + e = hfb(a, wfb(37)); + if (e < 0) { + return a; + } else { + i = new Wfb(a.substr(0, e)); + b = KC(SD, wte, 25, 4, 15, 1); + h = 0; + d = 0; + for (g = a.length; e < g; e++) { + BCb(e, a.length); + if ( + a.charCodeAt(e) == 37 && + a.length > e + 2 && + _Ed((BCb(e + 1, a.length), a.charCodeAt(e + 1)), xEd, yEd) && + _Ed((BCb(e + 2, a.length), a.charCodeAt(e + 2)), xEd, yEd) + ) { + c = dFd( + (BCb(e + 1, a.length), a.charCodeAt(e + 1)), + (BCb(e + 2, a.length), a.charCodeAt(e + 2)) + ); + e += 2; + if (d > 0) { + (c & 192) == 128 ? (b[h++] = (c << 24) >> 24) : (d = 0); + } else if (c >= 128) { + if ((c & 224) == 192) { + b[h++] = (c << 24) >> 24; + d = 2; + } else if ((c & 240) == 224) { + b[h++] = (c << 24) >> 24; + d = 3; + } else if ((c & 248) == 240) { + b[h++] = (c << 24) >> 24; + d = 4; + } + } + if (d > 0) { + if (h == d) { + switch (h) { + case 2: { + Kfb(i, (((b[0] & 31) << 6) | (b[1] & 63)) & aje); + break; + } + case 3: { + Kfb( + i, + (((b[0] & 15) << 12) | ((b[1] & 63) << 6) | (b[2] & 63)) & + aje + ); + break; + } + } + h = 0; + d = 0; + } + } else { + for (f = 0; f < h; ++f) { + Kfb(i, b[f] & aje); + } + h = 0; + i.a += String.fromCharCode(c); + } + } else { + for (f = 0; f < h; ++f) { + Kfb(i, b[f] & aje); + } + h = 0; + Kfb(i, (BCb(e, a.length), a.charCodeAt(e))); + } + } + return i.a; + } + } + function wA(a, b, c, d, e) { + var f, g, h; + uA(a, b); + g = b[0]; + f = bfb(c.c, 0); + h = -1; + if (nA(c)) { + if (d > 0) { + if (g + d > a.length) { + return false; + } + h = rA(a.substr(0, g + d), b); + } else { + h = rA(a, b); + } + } + switch (f) { + case 71: + h = oA(a, g, OC(GC(ZI, 1), nie, 2, 6, [pje, qje]), b); + e.e = h; + return true; + case 77: + return zA(a, b, e, h, g); + case 76: + return BA(a, b, e, h, g); + case 69: + return xA(a, b, g, e); + case 99: + return AA(a, b, g, e); + case 97: + h = oA(a, g, OC(GC(ZI, 1), nie, 2, 6, ["AM", "PM"]), b); + e.b = h; + return true; + case 121: + return DA(a, b, g, h, c, e); + case 100: + if (h <= 0) { + return false; + } + e.c = h; + return true; + case 83: + if (h < 0) { + return false; + } + return yA(h, g, b[0], e); + case 104: + h == 12 && (h = 0); + case 75: + case 72: + if (h < 0) { + return false; + } + e.f = h; + e.g = false; + return true; + case 107: + if (h < 0) { + return false; + } + e.f = h; + e.g = true; + return true; + case 109: + if (h < 0) { + return false; + } + e.j = h; + return true; + case 115: + if (h < 0) { + return false; + } + e.n = h; + return true; + case 90: + if (g < a.length && (BCb(g, a.length), a.charCodeAt(g) == 90)) { + ++b[0]; + e.o = 0; + return true; + } + case 122: + case 118: + return CA(a, g, b, e); + default: + return false; + } + } + function vKb(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w; + m = BD(BD(Qc(a.r, b), 21), 84); + if (b == (Ucd(), zcd) || b == Tcd) { + zKb(a, b); + return; + } + f = b == Acd ? (vLb(), rLb) : (vLb(), uLb); + u = b == Acd ? (EIb(), DIb) : (EIb(), BIb); + c = BD(Mpb(a.b, b), 124); + d = c.i; + e = d.c + w6c(OC(GC(UD, 1), Vje, 25, 15, [c.n.b, a.C.b, a.k])); + r = d.c + d.b - w6c(OC(GC(UD, 1), Vje, 25, 15, [c.n.c, a.C.c, a.k])); + g = dLb(iLb(f), a.t); + s = b == Acd ? Qje : Pje; + for (l = m.Kc(); l.Ob(); ) { + j = BD(l.Pb(), 111); + if (!j.c || j.c.d.c.length <= 0) { + continue; + } + q = j.b.rf(); + p = j.e; + n = j.c; + o = n.i; + o.b = ((i = n.n), n.e.a + i.b + i.c); + o.a = ((h = n.n), n.e.b + h.d + h.a); + ytb(u, lle); + n.f = u; + $Hb(n, (NHb(), MHb)); + o.c = p.a - (o.b - q.a) / 2; + v = Math.min(e, p.a); + w = Math.max(r, p.a + q.a); + o.c < v ? (o.c = v) : o.c + o.b > w && (o.c = w - o.b); + Ekb(g.d, new BLb(o, bLb(g, o))); + s = b == Acd ? Math.max(s, p.b + j.b.rf().b) : Math.min(s, p.b); + } + s += b == Acd ? a.t : -a.t; + t = cLb(((g.e = s), g)); + t > 0 && (BD(Mpb(a.b, b), 124).a.b = t); + for (k = m.Kc(); k.Ob(); ) { + j = BD(k.Pb(), 111); + if (!j.c || j.c.d.c.length <= 0) { + continue; + } + o = j.c.i; + o.c -= j.e.a; + o.d -= j.e.b; + } + } + function SPb(a) { + var b, c, d, e, f, g, h, i, j, k, l, m, n; + b = new Lqb(); + for (i = new Fyd(a); i.e != i.i.gc(); ) { + h = BD(Dyd(i), 33); + c = new Tqb(); + Rhb(OPb, h, c); + n = new aQb(); + e = BD( + GAb( + new YAb(null, new Lub(new Sr(ur($sd(h).a.Kc(), new Sq())))), + Wyb( + n, + Byb( + new fzb(), + new dzb(), + new Ezb(), + OC(GC(xL, 1), Kie, 132, 0, [(Fyb(), Dyb)]) + ) + ) + ), + 83 + ); + RPb(c, BD(e.xc((Bcb(), true)), 14), new cQb()); + d = BD( + GAb( + JAb(BD(e.xc(false), 15).Lc(), new eQb()), + Byb( + new fzb(), + new dzb(), + new Ezb(), + OC(GC(xL, 1), Kie, 132, 0, [Dyb]) + ) + ), + 15 + ); + for (g = d.Kc(); g.Ob(); ) { + f = BD(g.Pb(), 79); + m = ktd(f); + if (m) { + j = BD(Wd(irb(b.f, m)), 21); + if (!j) { + j = UPb(m); + jrb(b.f, m, j); + } + ye(c, j); + } + } + e = BD( + GAb( + new YAb(null, new Lub(new Sr(ur(_sd(h).a.Kc(), new Sq())))), + Wyb( + n, + Byb( + new fzb(), + new dzb(), + new Ezb(), + OC(GC(xL, 1), Kie, 132, 0, [Dyb]) + ) + ) + ), + 83 + ); + RPb(c, BD(e.xc(true), 14), new gQb()); + d = BD( + GAb( + JAb(BD(e.xc(false), 15).Lc(), new iQb()), + Byb( + new fzb(), + new dzb(), + new Ezb(), + OC(GC(xL, 1), Kie, 132, 0, [Dyb]) + ) + ), + 15 + ); + for (l = d.Kc(); l.Ob(); ) { + k = BD(l.Pb(), 79); + m = mtd(k); + if (m) { + j = BD(Wd(irb(b.f, m)), 21); + if (!j) { + j = UPb(m); + jrb(b.f, m, j); + } + ye(c, j); + } + } + } + } + function rhb(a, b) { + phb(); + var c, d, e, f, g, h, i, j, k, l, m, n, o, p; + i = ybb(a, 0) < 0; + i && (a = Jbb(a)); + if (ybb(a, 0) == 0) { + switch (b) { + case 0: + return "0"; + case 1: + return $je; + case 2: + return "0.00"; + case 3: + return "0.000"; + case 4: + return "0.0000"; + case 5: + return "0.00000"; + case 6: + return "0.000000"; + default: + n = new Ufb(); + b < 0 ? ((n.a += "0E+"), n) : ((n.a += "0E"), n); + n.a += b == Rie ? "2147483648" : "" + -b; + return n.a; + } + } + k = 18; + l = KC(TD, $ie, 25, k + 1, 15, 1); + c = k; + p = a; + do { + j = p; + p = Abb(p, 10); + l[--c] = Tbb(wbb(48, Qbb(j, Ibb(p, 10)))) & aje; + } while (ybb(p, 0) != 0); + e = Qbb(Qbb(Qbb(k, c), b), 1); + if (b == 0) { + i && (l[--c] = 45); + return zfb(l, c, k - c); + } + if (b > 0 && ybb(e, -6) >= 0) { + if (ybb(e, 0) >= 0) { + f = c + Tbb(e); + for (h = k - 1; h >= f; h--) { + l[h + 1] = l[h]; + } + l[++f] = 46; + i && (l[--c] = 45); + return zfb(l, c, k - c + 1); + } + for (g = 2; Gbb(g, wbb(Jbb(e), 1)); g++) { + l[--c] = 48; + } + l[--c] = 46; + l[--c] = 48; + i && (l[--c] = 45); + return zfb(l, c, k - c); + } + o = c + 1; + d = k; + m = new Vfb(); + i && ((m.a += "-"), m); + if (d - o >= 1) { + Kfb(m, l[c]); + m.a += "."; + m.a += zfb(l, c + 1, k - c - 1); + } else { + m.a += zfb(l, c, k - c); + } + m.a += "E"; + ybb(e, 0) > 0 && ((m.a += "+"), m); + m.a += "" + Ubb(e); + return m.a; + } + function iQc(a, b, c) { + var d, e, f, g, h, i, j, k, l, m, n; + a.e.a.$b(); + a.f.a.$b(); + a.c.c = KC(SI, Uhe, 1, 0, 5, 1); + a.i.c = KC(SI, Uhe, 1, 0, 5, 1); + a.g.a.$b(); + if (b) { + for (g = new olb(b.a); g.a < g.c.c.length; ) { + f = BD(mlb(g), 10); + for (l = Y_b(f, (Ucd(), zcd)).Kc(); l.Ob(); ) { + k = BD(l.Pb(), 11); + Qqb(a.e, k); + for (e = new olb(k.g); e.a < e.c.c.length; ) { + d = BD(mlb(e), 17); + if (OZb(d)) { + continue; + } + Ekb(a.c, d); + oQc(a, d); + h = d.c.i.k; + (h == (j0b(), h0b) || h == i0b || h == e0b || h == d0b) && + Ekb(a.j, d); + n = d.d; + m = n.i.c; + m == c ? Qqb(a.f, n) : m == b ? Qqb(a.e, n) : Lkb(a.c, d); + } + } + } + } + if (c) { + for (g = new olb(c.a); g.a < g.c.c.length; ) { + f = BD(mlb(g), 10); + for (j = new olb(f.j); j.a < j.c.c.length; ) { + i = BD(mlb(j), 11); + for (e = new olb(i.g); e.a < e.c.c.length; ) { + d = BD(mlb(e), 17); + OZb(d) && Qqb(a.g, d); + } + } + for (l = Y_b(f, (Ucd(), Tcd)).Kc(); l.Ob(); ) { + k = BD(l.Pb(), 11); + Qqb(a.f, k); + for (e = new olb(k.g); e.a < e.c.c.length; ) { + d = BD(mlb(e), 17); + if (OZb(d)) { + continue; + } + Ekb(a.c, d); + oQc(a, d); + h = d.c.i.k; + (h == (j0b(), h0b) || h == i0b || h == e0b || h == d0b) && + Ekb(a.j, d); + n = d.d; + m = n.i.c; + m == c ? Qqb(a.f, n) : m == b ? Qqb(a.e, n) : Lkb(a.c, d); + } + } + } + } + } + function Afd(a, b, c, d, e) { + var f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w; + q = new f7c(a.g, a.f); + p = rfd(a); + p.a = Math.max(p.a, b); + p.b = Math.max(p.b, c); + w = p.a / q.a; + k = p.b / q.b; + u = p.a - q.a; + i = p.b - q.b; + if (d) { + g = !Xod(a) + ? BD(hkd(a, (Y9c(), z8c)), 103) + : BD(hkd(Xod(a), (Y9c(), z8c)), 103); + h = PD(hkd(a, (Y9c(), t9c))) === PD((dcd(), $bd)); + for ( + s = new Fyd((!a.c && (a.c = new cUd(F2, a, 9, 9)), a.c)); + s.e != s.i.gc(); + + ) { + r = BD(Dyd(s), 118); + t = BD(hkd(r, A9c), 61); + if (t == (Ucd(), Scd)) { + t = lfd(r, g); + jkd(r, A9c, t); + } + switch (t.g) { + case 1: + h || dld(r, r.i * w); + break; + case 2: + dld(r, r.i + u); + h || eld(r, r.j * k); + break; + case 3: + h || dld(r, r.i * w); + eld(r, r.j + i); + break; + case 4: + h || eld(r, r.j * k); + } + } + } + _kd(a, p.a, p.b); + if (e) { + for ( + m = new Fyd((!a.n && (a.n = new cUd(D2, a, 1, 7)), a.n)); + m.e != m.i.gc(); + + ) { + l = BD(Dyd(m), 137); + n = l.i + l.g / 2; + o = l.j + l.f / 2; + v = n / q.a; + j = o / q.b; + if (v + j >= 1) { + if (v - j > 0 && o >= 0) { + dld(l, l.i + u); + eld(l, l.j + i * j); + } else if (v - j < 0 && n >= 0) { + dld(l, l.i + u * v); + eld(l, l.j + i); + } + } + } + } + jkd( + a, + (Y9c(), Y8c), + (tdd(), (f = BD(gdb(I1), 9)), new xqb(f, BD(_Bb(f, f.length), 9), 0)) + ); + return new f7c(w, k); + } + function Yfd(a) { + var b, c, d, e, f, g, h, i, j, k, l, m, n, o; + n = Xod(atd(BD(qud((!a.b && (a.b = new y5d(z2, a, 4, 7)), a.b), 0), 82))); + o = Xod(atd(BD(qud((!a.c && (a.c = new y5d(z2, a, 5, 8)), a.c), 0), 82))); + l = n == o; + h = new d7c(); + b = BD(hkd(a, (Zad(), Sad)), 74); + if (!!b && b.b >= 2) { + if ((!a.a && (a.a = new cUd(A2, a, 6, 6)), a.a).i == 0) { + c = (Fhd(), (e = new rmd()), e); + wtd((!a.a && (a.a = new cUd(A2, a, 6, 6)), a.a), c); + } else if ((!a.a && (a.a = new cUd(A2, a, 6, 6)), a.a).i > 1) { + m = new Oyd((!a.a && (a.a = new cUd(A2, a, 6, 6)), a.a)); + while (m.e != m.i.gc()) { + Eyd(m); + } + } + ifd(b, BD(qud((!a.a && (a.a = new cUd(A2, a, 6, 6)), a.a), 0), 202)); + } + if (l) { + for ( + d = new Fyd((!a.a && (a.a = new cUd(A2, a, 6, 6)), a.a)); + d.e != d.i.gc(); + + ) { + c = BD(Dyd(d), 202); + for ( + j = new Fyd((!c.a && (c.a = new xMd(y2, c, 5)), c.a)); + j.e != j.i.gc(); + + ) { + i = BD(Dyd(j), 469); + h.a = Math.max(h.a, i.a); + h.b = Math.max(h.b, i.b); + } + } + } + for ( + g = new Fyd((!a.n && (a.n = new cUd(D2, a, 1, 7)), a.n)); + g.e != g.i.gc(); + + ) { + f = BD(Dyd(g), 137); + k = BD(hkd(f, Yad), 8); + !!k && bld(f, k.a, k.b); + if (l) { + h.a = Math.max(h.a, f.i + f.g); + h.b = Math.max(h.b, f.j + f.f); + } + } + return h; + } + function yMc(a, b, c) { + var d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, A, B; + t = b.c.length; + e = new ULc(a.a, c, null, null); + B = KC(UD, Vje, 25, t, 15, 1); + p = KC(UD, Vje, 25, t, 15, 1); + o = KC(UD, Vje, 25, t, 15, 1); + q = 0; + for (h = 0; h < t; h++) { + p[h] = Ohe; + o[h] = Rie; + } + for (i = 0; i < t; i++) { + d = (tCb(i, b.c.length), BD(b.c[i], 180)); + B[i] = SLc(d); + B[q] > B[i] && (q = i); + for (l = new olb(a.a.b); l.a < l.c.c.length; ) { + k = BD(mlb(l), 29); + for (s = new olb(k.a); s.a < s.c.c.length; ) { + r = BD(mlb(s), 10); + w = Edb(d.p[r.p]) + Edb(d.d[r.p]); + p[i] = Math.min(p[i], w); + o[i] = Math.max(o[i], w + r.o.b); + } + } + } + A = KC(UD, Vje, 25, t, 15, 1); + for (j = 0; j < t; j++) { + (tCb(j, b.c.length), BD(b.c[j], 180)).o == (eMc(), cMc) + ? (A[j] = p[q] - p[j]) + : (A[j] = o[q] - o[j]); + } + f = KC(UD, Vje, 25, t, 15, 1); + for (n = new olb(a.a.b); n.a < n.c.c.length; ) { + m = BD(mlb(n), 29); + for (v = new olb(m.a); v.a < v.c.c.length; ) { + u = BD(mlb(v), 10); + for (g = 0; g < t; g++) { + f[g] = + Edb((tCb(g, b.c.length), BD(b.c[g], 180)).p[u.p]) + + Edb((tCb(g, b.c.length), BD(b.c[g], 180)).d[u.p]) + + A[g]; + } + f.sort(dcb(Ylb.prototype.te, Ylb, [])); + e.p[u.p] = (f[1] + f[2]) / 2; + e.d[u.p] = 0; + } + } + return e; + } + function G3b(a, b, c) { + var d, e, f, g, h; + d = b.i; + f = a.i.o; + e = a.i.d; + h = a.n; + g = l7c(OC(GC(m1, 1), nie, 8, 0, [h, a.a])); + switch (a.j.g) { + case 1: + _Hb(b, (EIb(), BIb)); + d.d = -e.d - c - d.a; + if (BD(BD(Ikb(b.d, 0), 181).We((wtc(), Ssc)), 285) == (rbd(), nbd)) { + $Hb(b, (NHb(), MHb)); + d.c = g.a - Edb(ED(vNb(a, Ysc))) - c - d.b; + } else { + $Hb(b, (NHb(), LHb)); + d.c = g.a + Edb(ED(vNb(a, Ysc))) + c; + } + break; + case 2: + $Hb(b, (NHb(), LHb)); + d.c = f.a + e.c + c; + if (BD(BD(Ikb(b.d, 0), 181).We((wtc(), Ssc)), 285) == (rbd(), nbd)) { + _Hb(b, (EIb(), BIb)); + d.d = g.b - Edb(ED(vNb(a, Ysc))) - c - d.a; + } else { + _Hb(b, (EIb(), DIb)); + d.d = g.b + Edb(ED(vNb(a, Ysc))) + c; + } + break; + case 3: + _Hb(b, (EIb(), DIb)); + d.d = f.b + e.a + c; + if (BD(BD(Ikb(b.d, 0), 181).We((wtc(), Ssc)), 285) == (rbd(), nbd)) { + $Hb(b, (NHb(), MHb)); + d.c = g.a - Edb(ED(vNb(a, Ysc))) - c - d.b; + } else { + $Hb(b, (NHb(), LHb)); + d.c = g.a + Edb(ED(vNb(a, Ysc))) + c; + } + break; + case 4: + $Hb(b, (NHb(), MHb)); + d.c = -e.b - c - d.b; + if (BD(BD(Ikb(b.d, 0), 181).We((wtc(), Ssc)), 285) == (rbd(), nbd)) { + _Hb(b, (EIb(), BIb)); + d.d = g.b - Edb(ED(vNb(a, Ysc))) - c - d.a; + } else { + _Hb(b, (EIb(), DIb)); + d.d = g.b + Edb(ED(vNb(a, Ysc))) + c; + } + } + } + function ded(a, b, c, d, e, f, g) { + var h, + i, + j, + k, + l, + m, + n, + o, + p, + q, + r, + s, + t, + u, + v, + w, + A, + B, + C, + D, + F, + G, + H, + I; + n = 0; + D = 0; + for (i = new olb(a); i.a < i.c.c.length; ) { + h = BD(mlb(i), 33); + zfd(h); + n = Math.max(n, h.g); + D += h.g * h.f; + } + o = D / a.c.length; + C = $dd(a, o); + D += a.c.length * C; + n = Math.max(n, Math.sqrt(D * g)) + c.b; + H = c.b; + I = c.d; + m = 0; + k = c.b + c.c; + B = new Psb(); + Dsb(B, meb(0)); + w = new Psb(); + j = new Bib(a, 0); + while (j.b < j.d.gc()) { + h = (sCb(j.b < j.d.gc()), BD(j.d.Xb((j.c = j.b++)), 33)); + G = h.g; + l = h.f; + if (H + G > n) { + if (f) { + Fsb(w, m); + Fsb(B, meb(j.b - 1)); + } + H = c.b; + I += m + b; + m = 0; + k = Math.max(k, c.b + c.c + G); + } + dld(h, H); + eld(h, I); + k = Math.max(k, H + G + c.c); + m = Math.max(m, l); + H += G + b; + } + k = Math.max(k, d); + F = I + m + c.a; + if (F < e) { + m += e - F; + F = e; + } + if (f) { + H = c.b; + j = new Bib(a, 0); + Fsb(B, meb(a.c.length)); + A = Jsb(B, 0); + r = BD(Xsb(A), 19).a; + Fsb(w, m); + v = Jsb(w, 0); + u = 0; + while (j.b < j.d.gc()) { + if (j.b == r) { + H = c.b; + u = Edb(ED(Xsb(v))); + r = BD(Xsb(A), 19).a; + } + h = (sCb(j.b < j.d.gc()), BD(j.d.Xb((j.c = j.b++)), 33)); + s = h.f; + ald(h, u); + p = u; + if (j.b == r) { + q = k - H - c.c; + t = h.g; + cld(h, q); + Ffd(h, new f7c(q, p), new f7c(t, s)); + } + H += h.g + b; + } + } + return new f7c(k, F); + } + function _Yb(a, b) { + var c, + d, + e, + f, + g, + h, + i, + j, + k, + l, + m, + n, + o, + p, + q, + r, + s, + t, + u, + v, + w, + A, + B, + C; + Odd(b, "Compound graph postprocessor", 1); + c = Ccb(DD(vNb(a, (Nyc(), Byc)))); + h = BD(vNb(a, (wtc(), zsc)), 224); + k = new Tqb(); + for (r = h.ec().Kc(); r.Ob(); ) { + q = BD(r.Pb(), 17); + g = new Tkb(h.cc(q)); + mmb(); + Okb(g, new EZb(a)); + v = zZb((tCb(0, g.c.length), BD(g.c[0], 243))); + A = AZb(BD(Ikb(g, g.c.length - 1), 243)); + t = v.i; + f_b(A.i, t) ? (s = t.e) : (s = Q_b(t)); + l = aZb(q, g); + Osb(q.a); + m = null; + for (f = new olb(g); f.a < f.c.c.length; ) { + e = BD(mlb(f), 243); + p = new d7c(); + Y$b(p, e.a, s); + n = e.b; + d = new s7c(); + o7c(d, 0, n.a); + q7c(d, p); + u = new g7c(A0b(n.c)); + w = new g7c(A0b(n.d)); + P6c(u, p); + P6c(w, p); + if (m) { + d.b == 0 ? (o = w) : (o = (sCb(d.b != 0), BD(d.a.a.c, 8))); + B = Math.abs(m.a - o.a) > qme; + C = Math.abs(m.b - o.b) > qme; + ((!c && B && C) || (c && (B || C))) && Dsb(q.a, u); + } + ye(q.a, d); + d.b == 0 ? (m = u) : (m = (sCb(d.b != 0), BD(d.c.b.c, 8))); + bZb(n, l, p); + if (AZb(e) == A) { + if (Q_b(A.i) != e.a) { + p = new d7c(); + Y$b(p, Q_b(A.i), s); + } + yNb(q, utc, p); + } + cZb(n, q, s); + k.a.zc(n, k); + } + QZb(q, v); + RZb(q, A); + } + for (j = k.a.ec().Kc(); j.Ob(); ) { + i = BD(j.Pb(), 17); + QZb(i, null); + RZb(i, null); + } + Qdd(b); + } + function KQb(a) { + var b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u; + if (a.gc() == 1) { + return BD(a.Xb(0), 231); + } else if (a.gc() <= 0) { + return new kRb(); + } + for (e = a.Kc(); e.Ob(); ) { + c = BD(e.Pb(), 231); + o = 0; + k = Ohe; + l = Ohe; + i = Rie; + j = Rie; + for (n = new olb(c.e); n.a < n.c.c.length; ) { + m = BD(mlb(n), 144); + o += BD(vNb(m, (wSb(), oSb)), 19).a; + k = Math.min(k, m.d.a - m.e.a / 2); + l = Math.min(l, m.d.b - m.e.b / 2); + i = Math.max(i, m.d.a + m.e.a / 2); + j = Math.max(j, m.d.b + m.e.b / 2); + } + yNb(c, (wSb(), oSb), meb(o)); + yNb(c, (HSb(), ESb), new f7c(k, l)); + yNb(c, DSb, new f7c(i, j)); + } + mmb(); + a.ad(new OQb()); + p = new kRb(); + tNb(p, BD(a.Xb(0), 94)); + h = 0; + s = 0; + for (f = a.Kc(); f.Ob(); ) { + c = BD(f.Pb(), 231); + q = c7c(R6c(BD(vNb(c, (HSb(), DSb)), 8)), BD(vNb(c, ESb), 8)); + h = Math.max(h, q.a); + s += q.a * q.b; + } + h = Math.max(h, Math.sqrt(s) * Edb(ED(vNb(p, (wSb(), bSb))))); + r = Edb(ED(vNb(p, uSb))); + t = 0; + u = 0; + g = 0; + b = r; + for (d = a.Kc(); d.Ob(); ) { + c = BD(d.Pb(), 231); + q = c7c(R6c(BD(vNb(c, (HSb(), DSb)), 8)), BD(vNb(c, ESb), 8)); + if (t + q.a > h) { + t = 0; + u += g + r; + g = 0; + } + JQb(p, c, t, u); + b = Math.max(b, t + q.a); + g = Math.max(g, q.b); + t += q.a + r; + } + return p; + } + function Ioc(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o; + k = new s7c(); + switch (a.a.g) { + case 3: + m = BD(vNb(b.e, (wtc(), rtc)), 15); + n = BD(vNb(b.j, rtc), 15); + o = BD(vNb(b.f, rtc), 15); + c = BD(vNb(b.e, ptc), 15); + d = BD(vNb(b.j, ptc), 15); + e = BD(vNb(b.f, ptc), 15); + g = new Rkb(); + Gkb(g, m); + n.Jc(new Loc()); + Gkb( + g, + JD(n, 152) + ? km(BD(n, 152)) + : JD(n, 131) + ? BD(n, 131).a + : JD(n, 54) + ? new ov(n) + : new dv(n) + ); + Gkb(g, o); + f = new Rkb(); + Gkb(f, c); + Gkb( + f, + JD(d, 152) + ? km(BD(d, 152)) + : JD(d, 131) + ? BD(d, 131).a + : JD(d, 54) + ? new ov(d) + : new dv(d) + ); + Gkb(f, e); + yNb(b.f, rtc, g); + yNb(b.f, ptc, f); + yNb(b.f, stc, b.f); + yNb(b.e, rtc, null); + yNb(b.e, ptc, null); + yNb(b.j, rtc, null); + yNb(b.j, ptc, null); + break; + case 1: + ye(k, b.e.a); + Dsb(k, b.i.n); + ye(k, Su(b.j.a)); + Dsb(k, b.a.n); + ye(k, b.f.a); + break; + default: + ye(k, b.e.a); + ye(k, Su(b.j.a)); + ye(k, b.f.a); + } + Osb(b.f.a); + ye(b.f.a, k); + QZb(b.f, b.e.c); + h = BD(vNb(b.e, (Nyc(), jxc)), 74); + j = BD(vNb(b.j, jxc), 74); + i = BD(vNb(b.f, jxc), 74); + if (!!h || !!j || !!i) { + l = new s7c(); + Goc(l, i); + Goc(l, j); + Goc(l, h); + yNb(b.f, jxc, l); + } + QZb(b.j, null); + RZb(b.j, null); + QZb(b.e, null); + RZb(b.e, null); + $_b(b.a, null); + $_b(b.i, null); + !!b.g && Ioc(a, b.g); + } + function bde(a) { + ade(); + var b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q; + if (a == null) return null; + f = rfb(a); + o = ede(f); + if (o % 4 != 0) { + return null; + } + p = (o / 4) | 0; + if (p == 0) return KC(SD, wte, 25, 0, 15, 1); + l = null; + b = 0; + c = 0; + d = 0; + e = 0; + g = 0; + h = 0; + i = 0; + j = 0; + n = 0; + m = 0; + k = 0; + l = KC(SD, wte, 25, p * 3, 15, 1); + for (; n < p - 1; n++) { + if ( + !dde((g = f[k++])) || + !dde((h = f[k++])) || + !dde((i = f[k++])) || + !dde((j = f[k++])) + ) + return null; + b = $ce[g]; + c = $ce[h]; + d = $ce[i]; + e = $ce[j]; + l[m++] = (((b << 2) | (c >> 4)) << 24) >> 24; + l[m++] = ((((c & 15) << 4) | ((d >> 2) & 15)) << 24) >> 24; + l[m++] = (((d << 6) | e) << 24) >> 24; + } + if (!dde((g = f[k++])) || !dde((h = f[k++]))) { + return null; + } + b = $ce[g]; + c = $ce[h]; + i = f[k++]; + j = f[k++]; + if ($ce[i] == -1 || $ce[j] == -1) { + if (i == 61 && j == 61) { + if ((c & 15) != 0) return null; + q = KC(SD, wte, 25, n * 3 + 1, 15, 1); + $fb(l, 0, q, 0, n * 3); + q[m] = (((b << 2) | (c >> 4)) << 24) >> 24; + return q; + } else if (i != 61 && j == 61) { + d = $ce[i]; + if ((d & 3) != 0) return null; + q = KC(SD, wte, 25, n * 3 + 2, 15, 1); + $fb(l, 0, q, 0, n * 3); + q[m++] = (((b << 2) | (c >> 4)) << 24) >> 24; + q[m] = ((((c & 15) << 4) | ((d >> 2) & 15)) << 24) >> 24; + return q; + } else { + return null; + } + } else { + d = $ce[i]; + e = $ce[j]; + l[m++] = (((b << 2) | (c >> 4)) << 24) >> 24; + l[m++] = ((((c & 15) << 4) | ((d >> 2) & 15)) << 24) >> 24; + l[m++] = (((d << 6) | e) << 24) >> 24; + } + return l; + } + function Sbc(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v; + Odd(b, Ine, 1); + o = BD(vNb(a, (Nyc(), Swc)), 218); + for (e = new olb(a.b); e.a < e.c.c.length; ) { + d = BD(mlb(e), 29); + j = l_b(d.a); + for (g = j, h = 0, i = g.length; h < i; ++h) { + f = g[h]; + if (f.k != (j0b(), i0b)) { + continue; + } + if (o == (Aad(), yad)) { + for (l = new olb(f.j); l.a < l.c.c.length; ) { + k = BD(mlb(l), 11); + k.e.c.length == 0 || Vbc(k); + k.g.c.length == 0 || Wbc(k); + } + } else if (JD(vNb(f, (wtc(), $sc)), 17)) { + q = BD(vNb(f, $sc), 17); + r = BD( + Y_b(f, (Ucd(), Tcd)) + .Kc() + .Pb(), + 11 + ); + s = BD(Y_b(f, zcd).Kc().Pb(), 11); + t = BD(vNb(r, $sc), 11); + u = BD(vNb(s, $sc), 11); + QZb(q, u); + RZb(q, t); + v = new g7c(s.i.n); + v.a = l7c(OC(GC(m1, 1), nie, 8, 0, [u.i.n, u.n, u.a])).a; + Dsb(q.a, v); + v = new g7c(r.i.n); + v.a = l7c(OC(GC(m1, 1), nie, 8, 0, [t.i.n, t.n, t.a])).a; + Dsb(q.a, v); + } else { + if (f.j.c.length >= 2) { + p = true; + m = new olb(f.j); + c = BD(mlb(m), 11); + n = null; + while (m.a < m.c.c.length) { + n = c; + c = BD(mlb(m), 11); + if (!pb(vNb(n, $sc), vNb(c, $sc))) { + p = false; + break; + } + } + } else { + p = false; + } + for (l = new olb(f.j); l.a < l.c.c.length; ) { + k = BD(mlb(l), 11); + k.e.c.length == 0 || Tbc(k, p); + k.g.c.length == 0 || Ubc(k, p); + } + } + $_b(f, null); + } + } + Qdd(b); + } + function KJc(a, b, c) { + var d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, A, B; + t = a.c[(tCb(0, b.c.length), BD(b.c[0], 17)).p]; + A = a.c[(tCb(1, b.c.length), BD(b.c[1], 17)).p]; + if ( + t.a.e.e - t.a.a - (t.b.e.e - t.b.a) == 0 && + A.a.e.e - A.a.a - (A.b.e.e - A.b.a) == 0 + ) { + return false; + } + r = t.b.e.f; + if (!JD(r, 10)) { + return false; + } + q = BD(r, 10); + v = a.i[q.p]; + w = !q.c ? -1 : Jkb(q.c.a, q, 0); + f = Pje; + if (w > 0) { + e = BD(Ikb(q.c.a, w - 1), 10); + g = a.i[e.p]; + B = Math.ceil(jBc(a.n, e, q)); + f = v.a.e - q.d.d - (g.a.e + e.o.b + e.d.a) - B; + } + j = Pje; + if (w < q.c.a.c.length - 1) { + i = BD(Ikb(q.c.a, w + 1), 10); + k = a.i[i.p]; + B = Math.ceil(jBc(a.n, i, q)); + j = k.a.e - i.d.d - (v.a.e + q.o.b + q.d.a) - B; + } + if ( + c && + (Iy(), + My(Jqe), + Math.abs(f - j) <= Jqe || f == j || (isNaN(f) && isNaN(j))) + ) { + return true; + } + d = gKc(t.a); + h = -gKc(t.b); + l = -gKc(A.a); + s = gKc(A.b); + p = + t.a.e.e - t.a.a - (t.b.e.e - t.b.a) > 0 && + A.a.e.e - A.a.a - (A.b.e.e - A.b.a) < 0; + o = + t.a.e.e - t.a.a - (t.b.e.e - t.b.a) < 0 && + A.a.e.e - A.a.a - (A.b.e.e - A.b.a) > 0; + n = t.a.e.e + t.b.a < A.b.e.e + A.a.a; + m = t.a.e.e + t.b.a > A.b.e.e + A.a.a; + u = 0; + !p && + !o && + (m + ? f + l > 0 + ? (u = l) + : j - d > 0 && (u = d) + : n && (f + h > 0 ? (u = h) : j - s > 0 && (u = s))); + v.a.e += u; + v.b && (v.d.e += u); + return false; + } + function XGb(a, b, c) { + var d, e, f, g, h, i, j, k, l, m; + d = new J6c(b.qf().a, b.qf().b, b.rf().a, b.rf().b); + e = new I6c(); + if (a.c) { + for (g = new olb(b.wf()); g.a < g.c.c.length; ) { + f = BD(mlb(g), 181); + e.c = f.qf().a + b.qf().a; + e.d = f.qf().b + b.qf().b; + e.b = f.rf().a; + e.a = f.rf().b; + H6c(d, e); + } + } + for (j = new olb(b.Cf()); j.a < j.c.c.length; ) { + i = BD(mlb(j), 838); + k = i.qf().a + b.qf().a; + l = i.qf().b + b.qf().b; + if (a.e) { + e.c = k; + e.d = l; + e.b = i.rf().a; + e.a = i.rf().b; + H6c(d, e); + } + if (a.d) { + for (g = new olb(i.wf()); g.a < g.c.c.length; ) { + f = BD(mlb(g), 181); + e.c = f.qf().a + k; + e.d = f.qf().b + l; + e.b = f.rf().a; + e.a = f.rf().b; + H6c(d, e); + } + } + if (a.b) { + m = new f7c(-c, -c); + if (BD(b.We((Y9c(), x9c)), 174).Hc((rcd(), pcd))) { + for (g = new olb(i.wf()); g.a < g.c.c.length; ) { + f = BD(mlb(g), 181); + m.a += f.rf().a + c; + m.b += f.rf().b + c; + } + } + m.a = Math.max(m.a, 0); + m.b = Math.max(m.b, 0); + VGb(d, i.Bf(), i.zf(), b, i, m, c); + } + } + a.b && VGb(d, b.Bf(), b.zf(), b, null, null, c); + h = new K_b(b.Af()); + h.d = Math.max(0, b.qf().b - d.d); + h.a = Math.max(0, d.d + d.a - (b.qf().b + b.rf().b)); + h.b = Math.max(0, b.qf().a - d.c); + h.c = Math.max(0, d.c + d.b - (b.qf().a + b.rf().a)); + b.Ef(h); + } + function wz() { + var a = [ + "\\u0000", + "\\u0001", + "\\u0002", + "\\u0003", + "\\u0004", + "\\u0005", + "\\u0006", + "\\u0007", + "\\b", + "\\t", + "\\n", + "\\u000B", + "\\f", + "\\r", + "\\u000E", + "\\u000F", + "\\u0010", + "\\u0011", + "\\u0012", + "\\u0013", + "\\u0014", + "\\u0015", + "\\u0016", + "\\u0017", + "\\u0018", + "\\u0019", + "\\u001A", + "\\u001B", + "\\u001C", + "\\u001D", + "\\u001E", + "\\u001F", + ]; + a[34] = '\\"'; + a[92] = "\\\\"; + a[173] = "\\u00ad"; + a[1536] = "\\u0600"; + a[1537] = "\\u0601"; + a[1538] = "\\u0602"; + a[1539] = "\\u0603"; + a[1757] = "\\u06dd"; + a[1807] = "\\u070f"; + a[6068] = "\\u17b4"; + a[6069] = "\\u17b5"; + a[8203] = "\\u200b"; + a[8204] = "\\u200c"; + a[8205] = "\\u200d"; + a[8206] = "\\u200e"; + a[8207] = "\\u200f"; + a[8232] = "\\u2028"; + a[8233] = "\\u2029"; + a[8234] = "\\u202a"; + a[8235] = "\\u202b"; + a[8236] = "\\u202c"; + a[8237] = "\\u202d"; + a[8238] = "\\u202e"; + a[8288] = "\\u2060"; + a[8289] = "\\u2061"; + a[8290] = "\\u2062"; + a[8291] = "\\u2063"; + a[8292] = "\\u2064"; + a[8298] = "\\u206a"; + a[8299] = "\\u206b"; + a[8300] = "\\u206c"; + a[8301] = "\\u206d"; + a[8302] = "\\u206e"; + a[8303] = "\\u206f"; + a[65279] = "\\ufeff"; + a[65529] = "\\ufff9"; + a[65530] = "\\ufffa"; + a[65531] = "\\ufffb"; + return a; + } + function pid(a, b, c) { + var d, e, f, g, h, i, j, k, l, m; + i = new Rkb(); + l = b.length; + g = AUd(c); + for (j = 0; j < l; ++j) { + k = ifb(b, wfb(61), j); + d = $hd(g, b.substr(j, k - j)); + e = KJd(d); + f = e.Aj().Nh(); + switch (bfb(b, ++k)) { + case 39: { + h = gfb(b, 39, ++k); + Ekb(i, new kGd(d, Pid(b.substr(k, h - k), f, e))); + j = h + 1; + break; + } + case 34: { + h = gfb(b, 34, ++k); + Ekb(i, new kGd(d, Pid(b.substr(k, h - k), f, e))); + j = h + 1; + break; + } + case 91: { + m = new Rkb(); + Ekb(i, new kGd(d, m)); + n: for (;;) { + switch (bfb(b, ++k)) { + case 39: { + h = gfb(b, 39, ++k); + Ekb(m, Pid(b.substr(k, h - k), f, e)); + k = h + 1; + break; + } + case 34: { + h = gfb(b, 34, ++k); + Ekb(m, Pid(b.substr(k, h - k), f, e)); + k = h + 1; + break; + } + case 110: { + ++k; + if (b.indexOf("ull", k) == k) { + m.c[m.c.length] = null; + } else { + throw vbb(new hz(kte)); + } + k += 3; + break; + } + } + if (k < l) { + switch ((BCb(k, b.length), b.charCodeAt(k))) { + case 44: { + break; + } + case 93: { + break n; + } + default: { + throw vbb(new hz("Expecting , or ]")); + } + } + } else { + break; + } + } + j = k + 1; + break; + } + case 110: { + ++k; + if (b.indexOf("ull", k) == k) { + Ekb(i, new kGd(d, null)); + } else { + throw vbb(new hz(kte)); + } + j = k + 3; + break; + } + } + if (j < l) { + BCb(j, b.length); + if (b.charCodeAt(j) != 44) { + throw vbb(new hz("Expecting ,")); + } + } else { + break; + } + } + return qid(a, i, c); + } + function AKb(a, b) { + var c, d, e, f, g, h, i, j, k, l, m; + j = BD(BD(Qc(a.r, b), 21), 84); + g = bKb(a, b); + c = a.u.Hc((rcd(), lcd)); + for (i = j.Kc(); i.Ob(); ) { + h = BD(i.Pb(), 111); + if (!h.c || h.c.d.c.length <= 0) { + continue; + } + m = h.b.rf(); + k = h.c; + l = k.i; + l.b = ((f = k.n), k.e.a + f.b + f.c); + l.a = ((e = k.n), k.e.b + e.d + e.a); + switch (b.g) { + case 1: + if (h.a) { + l.c = (m.a - l.b) / 2; + $Hb(k, (NHb(), KHb)); + } else if (g || c) { + l.c = -l.b - a.s; + $Hb(k, (NHb(), MHb)); + } else { + l.c = m.a + a.s; + $Hb(k, (NHb(), LHb)); + } + l.d = -l.a - a.t; + _Hb(k, (EIb(), BIb)); + break; + case 3: + if (h.a) { + l.c = (m.a - l.b) / 2; + $Hb(k, (NHb(), KHb)); + } else if (g || c) { + l.c = -l.b - a.s; + $Hb(k, (NHb(), MHb)); + } else { + l.c = m.a + a.s; + $Hb(k, (NHb(), LHb)); + } + l.d = m.b + a.t; + _Hb(k, (EIb(), DIb)); + break; + case 2: + if (h.a) { + d = a.v ? l.a : BD(Ikb(k.d, 0), 181).rf().b; + l.d = (m.b - d) / 2; + _Hb(k, (EIb(), CIb)); + } else if (g || c) { + l.d = -l.a - a.t; + _Hb(k, (EIb(), BIb)); + } else { + l.d = m.b + a.t; + _Hb(k, (EIb(), DIb)); + } + l.c = m.a + a.s; + $Hb(k, (NHb(), LHb)); + break; + case 4: + if (h.a) { + d = a.v ? l.a : BD(Ikb(k.d, 0), 181).rf().b; + l.d = (m.b - d) / 2; + _Hb(k, (EIb(), CIb)); + } else if (g || c) { + l.d = -l.a - a.t; + _Hb(k, (EIb(), BIb)); + } else { + l.d = m.b + a.t; + _Hb(k, (EIb(), DIb)); + } + l.c = -l.b - a.s; + $Hb(k, (NHb(), MHb)); + } + g = false; + } + } + function Kfe(a, b) { + wfe(); + var c, d, e, f, g, h, i, j, k, l, m, n, o; + if (Vhb(Zee) == 0) { + l = KC(lbb, nie, 117, _ee.length, 0, 1); + for (g = 0; g < l.length; g++) { + l[g] = (++vfe, new $fe(4)); + } + d = new Ifb(); + for (f = 0; f < Yee.length; f++) { + k = (++vfe, new $fe(4)); + if (f < 84) { + h = f * 2; + n = (BCb(h, wxe.length), wxe.charCodeAt(h)); + m = (BCb(h + 1, wxe.length), wxe.charCodeAt(h + 1)); + Ufe(k, n, m); + } else { + h = (f - 84) * 2; + Ufe(k, afe[h], afe[h + 1]); + } + i = Yee[f]; + dfb(i, "Specials") && Ufe(k, 65520, 65533); + if (dfb(i, uxe)) { + Ufe(k, 983040, 1048573); + Ufe(k, 1048576, 1114109); + } + Shb(Zee, i, k); + Shb($ee, i, _fe(k)); + j = d.a.length; + 0 < j + ? (d.a = d.a.substr(0, 0)) + : 0 > j && (d.a += yfb(KC(TD, $ie, 25, -j, 15, 1))); + d.a += "Is"; + if (hfb(i, wfb(32)) >= 0) { + for (e = 0; e < i.length; e++) { + BCb(e, i.length); + i.charCodeAt(e) != 32 && + Afb(d, (BCb(e, i.length), i.charCodeAt(e))); + } + } else { + d.a += "" + i; + } + Ofe(d.a, i, true); + } + Ofe(vxe, "Cn", false); + Ofe(xxe, "Cn", true); + c = (++vfe, new $fe(4)); + Ufe(c, 0, lxe); + Shb(Zee, "ALL", c); + Shb($ee, "ALL", _fe(c)); + !bfe && (bfe = new Lqb()); + Shb(bfe, vxe, vxe); + !bfe && (bfe = new Lqb()); + Shb(bfe, xxe, xxe); + !bfe && (bfe = new Lqb()); + Shb(bfe, "ALL", "ALL"); + } + o = b ? BD(Phb(Zee, a), 136) : BD(Phb($ee, a), 136); + return o; + } + function c3b(a, b, c, d) { + var e, f, g, h, i, j, k, l, m, n, o, p, q, r, s; + m = false; + l = false; + if (fcd(BD(vNb(d, (Nyc(), Vxc)), 98))) { + g = false; + h = false; + t: for (o = new olb(d.j); o.a < o.c.c.length; ) { + n = BD(mlb(o), 11); + for ( + q = ul(pl(OC(GC(KI, 1), Uhe, 20, 0, [new J0b(n), new R0b(n)]))); + Qr(q); + + ) { + p = BD(Rr(q), 11); + if (!Ccb(DD(vNb(p.i, pwc)))) { + if (n.j == (Ucd(), Acd)) { + g = true; + break t; + } + if (n.j == Rcd) { + h = true; + break t; + } + } + } + } + m = h && !g; + l = g && !h; + } + if (!m && !l && d.b.c.length != 0) { + k = 0; + for (j = new olb(d.b); j.a < j.c.c.length; ) { + i = BD(mlb(j), 70); + k += i.n.b + i.o.b / 2; + } + k /= d.b.c.length; + s = k >= d.o.b / 2; + } else { + s = !l; + } + if (s) { + r = BD(vNb(d, (wtc(), vtc)), 15); + if (!r) { + f = new Rkb(); + yNb(d, vtc, f); + } else if (m) { + f = r; + } else { + e = BD(vNb(d, tsc), 15); + if (!e) { + f = new Rkb(); + yNb(d, tsc, f); + } else { + r.gc() <= e.gc() ? (f = r) : (f = e); + } + } + } else { + e = BD(vNb(d, (wtc(), tsc)), 15); + if (!e) { + f = new Rkb(); + yNb(d, tsc, f); + } else if (l) { + f = e; + } else { + r = BD(vNb(d, vtc), 15); + if (!r) { + f = new Rkb(); + yNb(d, vtc, f); + } else { + e.gc() <= r.gc() ? (f = e) : (f = r); + } + } + } + f.Fc(a); + yNb(a, (wtc(), vsc), c); + if (b.d == c) { + RZb(b, null); + c.e.c.length + c.g.c.length == 0 && F0b(c, null); + d3b(c); + } else { + QZb(b, null); + c.e.c.length + c.g.c.length == 0 && F0b(c, null); + } + Osb(b.a); + } + function aoc(a, b) { + var c, + d, + e, + f, + g, + h, + i, + j, + k, + l, + m, + n, + o, + p, + q, + r, + s, + t, + u, + v, + w, + A, + B, + C, + D, + F, + G, + H; + s = new Bib(a.b, 0); + k = b.Kc(); + o = 0; + j = BD(k.Pb(), 19).a; + v = 0; + c = new Tqb(); + A = new zsb(); + while (s.b < s.d.gc()) { + r = (sCb(s.b < s.d.gc()), BD(s.d.Xb((s.c = s.b++)), 29)); + for (u = new olb(r.a); u.a < u.c.c.length; ) { + t = BD(mlb(u), 10); + for (n = new Sr(ur(U_b(t).a.Kc(), new Sq())); Qr(n); ) { + l = BD(Rr(n), 17); + A.a.zc(l, A); + } + for (m = new Sr(ur(R_b(t).a.Kc(), new Sq())); Qr(m); ) { + l = BD(Rr(m), 17); + A.a.Bc(l) != null; + } + } + if (o + 1 == j) { + e = new H1b(a); + Aib(s, e); + f = new H1b(a); + Aib(s, f); + for (C = A.a.ec().Kc(); C.Ob(); ) { + B = BD(C.Pb(), 17); + if (!c.a._b(B)) { + ++v; + c.a.zc(B, c); + } + g = new b0b(a); + yNb(g, (Nyc(), Vxc), (dcd(), acd)); + $_b(g, e); + __b(g, (j0b(), d0b)); + p = new H0b(); + F0b(p, g); + G0b(p, (Ucd(), Tcd)); + D = new H0b(); + F0b(D, g); + G0b(D, zcd); + d = new b0b(a); + yNb(d, Vxc, acd); + $_b(d, f); + __b(d, d0b); + q = new H0b(); + F0b(q, d); + G0b(q, Tcd); + F = new H0b(); + F0b(F, d); + G0b(F, zcd); + w = new UZb(); + QZb(w, B.c); + RZb(w, p); + H = new UZb(); + QZb(H, D); + RZb(H, q); + QZb(B, F); + h = new goc(g, d, w, H, B); + yNb(g, (wtc(), usc), h); + yNb(d, usc, h); + G = w.c.i; + if (G.k == d0b) { + i = BD(vNb(G, usc), 305); + i.d = h; + h.g = i; + } + } + if (k.Ob()) { + j = BD(k.Pb(), 19).a; + } else { + break; + } + } + ++o; + } + return meb(v); + } + function T1b(a, b, c) { + var d, e, f, g, h, i, j, k, l, m, n, o, p; + l = 0; + for ( + e = new Fyd((!b.a && (b.a = new cUd(E2, b, 10, 11)), b.a)); + e.e != e.i.gc(); + + ) { + d = BD(Dyd(e), 33); + if (!Ccb(DD(hkd(d, (Nyc(), Jxc))))) { + if ( + (PD(hkd(b, ywc)) !== PD((tAc(), rAc)) || + PD(hkd(b, Jwc)) === PD((mqc(), lqc)) || + PD(hkd(b, Jwc)) === PD((mqc(), jqc)) || + Ccb(DD(hkd(b, Awc))) || + PD(hkd(b, twc)) !== PD((RXb(), QXb))) && + !Ccb(DD(hkd(d, xwc))) + ) { + jkd(d, (wtc(), Zsc), meb(l)); + ++l; + } + $1b(a, d, c); + } + } + l = 0; + for ( + j = new Fyd((!b.b && (b.b = new cUd(B2, b, 12, 3)), b.b)); + j.e != j.i.gc(); + + ) { + h = BD(Dyd(j), 79); + if ( + PD(hkd(b, (Nyc(), ywc))) !== PD((tAc(), rAc)) || + PD(hkd(b, Jwc)) === PD((mqc(), lqc)) || + PD(hkd(b, Jwc)) === PD((mqc(), jqc)) || + Ccb(DD(hkd(b, Awc))) || + PD(hkd(b, twc)) !== PD((RXb(), QXb)) + ) { + jkd(h, (wtc(), Zsc), meb(l)); + ++l; + } + o = jtd(h); + p = ltd(h); + k = Ccb(DD(hkd(o, fxc))); + n = !Ccb(DD(hkd(h, Jxc))); + m = k && Qld(h) && Ccb(DD(hkd(h, gxc))); + f = Xod(o) == b && Xod(o) == Xod(p); + g = (Xod(o) == b && p == b) ^ (Xod(p) == b && o == b); + n && !m && (g || f) && X1b(a, h, b, c); + } + if (Xod(b)) { + for (i = new Fyd(Wod(Xod(b))); i.e != i.i.gc(); ) { + h = BD(Dyd(i), 79); + o = jtd(h); + if (o == b && Qld(h)) { + m = Ccb(DD(hkd(o, (Nyc(), fxc)))) && Ccb(DD(hkd(h, gxc))); + m && X1b(a, h, b, c); + } + } + } + } + function gDc(a, b, c) { + var d, + e, + f, + g, + h, + i, + j, + k, + l, + m, + n, + o, + p, + q, + r, + s, + t, + u, + v, + w, + A, + B, + C, + D, + F, + G, + H, + I; + Odd(c, "MinWidth layering", 1); + n = b.b; + A = b.a; + I = BD(vNb(b, (Nyc(), oxc)), 19).a; + h = BD(vNb(b, pxc), 19).a; + a.b = Edb(ED(vNb(b, lyc))); + a.d = Pje; + for (u = new olb(A); u.a < u.c.c.length; ) { + s = BD(mlb(u), 10); + if (s.k != (j0b(), h0b)) { + continue; + } + D = s.o.b; + a.d = Math.min(a.d, D); + } + a.d = Math.max(1, a.d); + B = A.c.length; + a.c = KC(WD, oje, 25, B, 15, 1); + a.f = KC(WD, oje, 25, B, 15, 1); + a.e = KC(UD, Vje, 25, B, 15, 1); + j = 0; + a.a = 0; + for (v = new olb(A); v.a < v.c.c.length; ) { + s = BD(mlb(v), 10); + s.p = j++; + a.c[s.p] = eDc(R_b(s)); + a.f[s.p] = eDc(U_b(s)); + a.e[s.p] = s.o.b / a.d; + a.a += a.e[s.p]; + } + a.b /= a.d; + a.a /= B; + w = fDc(A); + Okb(A, tmb(new mDc(a))); + p = Pje; + o = Ohe; + g = null; + H = I; + G = I; + f = h; + e = h; + if (I < 0) { + H = BD(bDc.a.zd(), 19).a; + G = BD(bDc.b.zd(), 19).a; + } + if (h < 0) { + f = BD(aDc.a.zd(), 19).a; + e = BD(aDc.b.zd(), 19).a; + } + for (F = H; F <= G; F++) { + for (d = f; d <= e; d++) { + C = dDc(a, F, d, A, w); + r = Edb(ED(C.a)); + m = BD(C.b, 15); + q = m.gc(); + if (r < p || (r == p && q < o)) { + p = r; + o = q; + g = m; + } + } + } + for (l = g.Kc(); l.Ob(); ) { + k = BD(l.Pb(), 15); + i = new H1b(b); + for (t = k.Kc(); t.Ob(); ) { + s = BD(t.Pb(), 10); + $_b(s, i); + } + n.c[n.c.length] = i; + } + smb(n); + A.c = KC(SI, Uhe, 1, 0, 5, 1); + Qdd(c); + } + function I6b(a, b) { + var c, + d, + e, + f, + g, + h, + i, + j, + k, + l, + m, + n, + o, + p, + q, + r, + s, + t, + u, + v, + w, + A, + B, + C, + D; + a.b = b; + a.a = BD(vNb(b, (Nyc(), bxc)), 19).a; + a.c = BD(vNb(b, dxc), 19).a; + a.c == 0 && (a.c = Ohe); + q = new Bib(b.b, 0); + while (q.b < q.d.gc()) { + p = (sCb(q.b < q.d.gc()), BD(q.d.Xb((q.c = q.b++)), 29)); + h = new Rkb(); + k = -1; + u = -1; + for (t = new olb(p.a); t.a < t.c.c.length; ) { + s = BD(mlb(t), 10); + if (sr((D6b(), new Sr(ur(O_b(s).a.Kc(), new Sq())))) >= a.a) { + d = E6b(a, s); + k = Math.max(k, d.b); + u = Math.max(u, d.d); + Ekb(h, new vgd(s, d)); + } + } + B = new Rkb(); + for (j = 0; j < k; ++j) { + Dkb( + B, + 0, + (sCb(q.b > 0), + q.a.Xb((q.c = --q.b)), + (C = new H1b(a.b)), + Aib(q, C), + sCb(q.b < q.d.gc()), + q.d.Xb((q.c = q.b++)), + C) + ); + } + for (g = new olb(h); g.a < g.c.c.length; ) { + e = BD(mlb(g), 46); + n = BD(e.b, 571).a; + if (!n) { + continue; + } + for (m = new olb(n); m.a < m.c.c.length; ) { + l = BD(mlb(m), 10); + H6b(a, l, B6b, B); + } + } + c = new Rkb(); + for (i = 0; i < u; ++i) { + Ekb(c, ((D = new H1b(a.b)), Aib(q, D), D)); + } + for (f = new olb(h); f.a < f.c.c.length; ) { + e = BD(mlb(f), 46); + A = BD(e.b, 571).c; + if (!A) { + continue; + } + for (w = new olb(A); w.a < w.c.c.length; ) { + v = BD(mlb(w), 10); + H6b(a, v, C6b, c); + } + } + } + r = new Bib(b.b, 0); + while (r.b < r.d.gc()) { + o = (sCb(r.b < r.d.gc()), BD(r.d.Xb((r.c = r.b++)), 29)); + o.a.c.length == 0 && uib(r); + } + } + function uQc(a, b, c) { + var d, + e, + f, + g, + h, + i, + j, + k, + l, + m, + n, + o, + p, + q, + r, + s, + t, + u, + v, + w, + A, + B, + C, + D, + F, + G; + Odd(c, "Spline edge routing", 1); + if (b.b.c.length == 0) { + b.f.a = 0; + Qdd(c); + return; + } + s = Edb(ED(vNb(b, (Nyc(), wyc)))); + h = Edb(ED(vNb(b, pyc))); + g = Edb(ED(vNb(b, myc))); + r = BD(vNb(b, Xwc), 336); + B = r == (tBc(), sBc); + A = Edb(ED(vNb(b, Ywc))); + a.d = b; + a.j.c = KC(SI, Uhe, 1, 0, 5, 1); + a.a.c = KC(SI, Uhe, 1, 0, 5, 1); + Uhb(a.k); + i = BD(Ikb(b.b, 0), 29); + k = Kq(i.a, (FNc(), DNc)); + o = BD(Ikb(b.b, b.b.c.length - 1), 29); + l = Kq(o.a, DNc); + p = new olb(b.b); + q = null; + G = 0; + do { + t = p.a < p.c.c.length ? BD(mlb(p), 29) : null; + iQc(a, q, t); + lQc(a); + C = Vtb( + uAb(PAb(JAb(new YAb(null, new Kub(a.i, 16)), new LQc()), new NQc())) + ); + F = 0; + u = G; + m = !q || (k && q == i); + n = !t || (l && t == o); + if (C > 0) { + j = 0; + !!q && (j += h); + j += (C - 1) * g; + !!t && (j += h); + B && !!t && (j = Math.max(j, jQc(t, g, s, A))); + if (j < s && !m && !n) { + F = (s - j) / 2; + j = s; + } + u += j; + } else !m && !n && (u += s); + !!t && h_b(t, u); + for (w = new olb(a.i); w.a < w.c.c.length; ) { + v = BD(mlb(w), 128); + v.a.c = G; + v.a.b = u - G; + v.F = F; + v.p = !q; + } + Gkb(a.a, a.i); + G = u; + !!t && (G += t.c.a); + q = t; + m = n; + } while (t); + for (e = new olb(a.j); e.a < e.c.c.length; ) { + d = BD(mlb(e), 17); + f = pQc(a, d); + yNb(d, (wtc(), ptc), f); + D = rQc(a, d); + yNb(d, rtc, D); + } + b.f.a = G; + a.d = null; + Qdd(c); + } + function Yxd(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u; + p = a.i != 0; + t = false; + r = null; + if (oid(a.e)) { + k = b.gc(); + if (k > 0) { + m = k < 100 ? null : new Ixd(k); + j = new Aud(b); + o = j.g; + r = KC(WD, oje, 25, k, 15, 1); + d = 0; + u = new zud(k); + for (e = 0; e < a.i; ++e) { + h = a.g[e]; + n = h; + v: for (s = 0; s < 2; ++s) { + for (i = k; --i >= 0; ) { + if (n != null ? pb(n, o[i]) : PD(n) === PD(o[i])) { + if (r.length <= d) { + q = r; + r = KC(WD, oje, 25, 2 * r.length, 15, 1); + $fb(q, 0, r, 0, d); + } + r[d++] = e; + wtd(u, o[i]); + break v; + } + } + n = n; + if (PD(n) === PD(h)) { + break; + } + } + } + j = u; + o = u.g; + k = d; + if (d > r.length) { + q = r; + r = KC(WD, oje, 25, d, 15, 1); + $fb(q, 0, r, 0, d); + } + if (d > 0) { + t = true; + for (f = 0; f < d; ++f) { + n = o[f]; + m = k3d(a, BD(n, 72), m); + } + for (g = d; --g >= 0; ) { + tud(a, r[g]); + } + if (d != k) { + for (e = k; --e >= d; ) { + tud(j, e); + } + q = r; + r = KC(WD, oje, 25, d, 15, 1); + $fb(q, 0, r, 0, d); + } + b = j; + } + } + } else { + b = Ctd(a, b); + for (e = a.i; --e >= 0; ) { + if (b.Hc(a.g[e])) { + tud(a, e); + t = true; + } + } + } + if (t) { + if (r != null) { + c = b.gc(); + l = + c == 1 + ? FLd(a, 4, b.Kc().Pb(), null, r[0], p) + : FLd(a, 6, b, r, r[0], p); + m = c < 100 ? null : new Ixd(c); + for (e = b.Kc(); e.Ob(); ) { + n = e.Pb(); + m = Q2d(a, BD(n, 72), m); + } + if (!m) { + Uhd(a.e, l); + } else { + m.Ei(l); + m.Fi(); + } + } else { + m = Vxd(b.gc()); + for (e = b.Kc(); e.Ob(); ) { + n = e.Pb(); + m = Q2d(a, BD(n, 72), m); + } + !!m && m.Fi(); + } + return true; + } else { + return false; + } + } + function fYb(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t; + c = new mYb(b); + c.a || $Xb(b); + j = ZXb(b); + i = new Hp(); + q = new AYb(); + for (p = new olb(b.a); p.a < p.c.c.length; ) { + o = BD(mlb(p), 10); + for (e = new Sr(ur(U_b(o).a.Kc(), new Sq())); Qr(e); ) { + d = BD(Rr(e), 17); + if (d.c.i.k == (j0b(), e0b) || d.d.i.k == e0b) { + k = eYb(a, d, j, q); + Rc(i, cYb(k.d), k.a); + } + } + } + g = new Rkb(); + for (t = BD(vNb(c.c, (wtc(), Esc)), 21).Kc(); t.Ob(); ) { + s = BD(t.Pb(), 61); + n = q.c[s.g]; + m = q.b[s.g]; + h = q.a[s.g]; + f = null; + r = null; + switch (s.g) { + case 4: + f = new J6c(a.d.a, n, j.b.a - a.d.a, m - n); + r = new J6c(a.d.a, n, h, m - n); + iYb(j, new f7c(f.c + f.b, f.d)); + iYb(j, new f7c(f.c + f.b, f.d + f.a)); + break; + case 2: + f = new J6c(j.a.a, n, a.c.a - j.a.a, m - n); + r = new J6c(a.c.a - h, n, h, m - n); + iYb(j, new f7c(f.c, f.d)); + iYb(j, new f7c(f.c, f.d + f.a)); + break; + case 1: + f = new J6c(n, a.d.b, m - n, j.b.b - a.d.b); + r = new J6c(n, a.d.b, m - n, h); + iYb(j, new f7c(f.c, f.d + f.a)); + iYb(j, new f7c(f.c + f.b, f.d + f.a)); + break; + case 3: + f = new J6c(n, j.a.b, m - n, a.c.b - j.a.b); + r = new J6c(n, a.c.b - h, m - n, h); + iYb(j, new f7c(f.c, f.d)); + iYb(j, new f7c(f.c + f.b, f.d)); + } + if (f) { + l = new vYb(); + l.d = s; + l.b = f; + l.c = r; + l.a = Dx(BD(Qc(i, cYb(s)), 21)); + g.c[g.c.length] = l; + } + } + Gkb(c.b, g); + c.d = BWb(JWb(j)); + return c; + } + function pMc(a, b, c) { + var d, e, f, g, h, i, j, k, l, m, n, o, p; + if (c.p[b.p] != null) { + return; + } + h = true; + c.p[b.p] = 0; + g = b; + p = c.o == (eMc(), cMc) ? Qje : Pje; + do { + e = a.b.e[g.p]; + f = g.c.a.c.length; + if ((c.o == cMc && e > 0) || (c.o == dMc && e < f - 1)) { + i = null; + j = null; + c.o == dMc + ? (i = BD(Ikb(g.c.a, e + 1), 10)) + : (i = BD(Ikb(g.c.a, e - 1), 10)); + j = c.g[i.p]; + pMc(a, j, c); + p = a.e.bg(p, b, g); + c.j[b.p] == b && (c.j[b.p] = c.j[j.p]); + if (c.j[b.p] == c.j[j.p]) { + o = jBc(a.d, g, i); + if (c.o == dMc) { + d = Edb(c.p[b.p]); + l = + Edb(c.p[j.p]) + + Edb(c.d[i.p]) - + i.d.d - + o - + g.d.a - + g.o.b - + Edb(c.d[g.p]); + if (h) { + h = false; + c.p[b.p] = Math.min(l, p); + } else { + c.p[b.p] = Math.min(d, Math.min(l, p)); + } + } else { + d = Edb(c.p[b.p]); + l = + Edb(c.p[j.p]) + + Edb(c.d[i.p]) + + i.o.b + + i.d.a + + o + + g.d.d - + Edb(c.d[g.p]); + if (h) { + h = false; + c.p[b.p] = Math.max(l, p); + } else { + c.p[b.p] = Math.max(d, Math.max(l, p)); + } + } + } else { + o = Edb(ED(vNb(a.a, (Nyc(), vyc)))); + n = nMc(a, c.j[b.p]); + k = nMc(a, c.j[j.p]); + if (c.o == dMc) { + m = + Edb(c.p[b.p]) + + Edb(c.d[g.p]) + + g.o.b + + g.d.a + + o - + (Edb(c.p[j.p]) + Edb(c.d[i.p]) - i.d.d); + tMc(n, k, m); + } else { + m = + Edb(c.p[b.p]) + + Edb(c.d[g.p]) - + g.d.d - + Edb(c.p[j.p]) - + Edb(c.d[i.p]) - + i.o.b - + i.d.a - + o; + tMc(n, k, m); + } + } + } else { + p = a.e.bg(p, b, g); + } + g = c.a[g.p]; + } while (g != b); + SMc(a.e, b); + } + function _qd(a, b, c) { + var d, + e, + f, + g, + h, + i, + j, + k, + l, + m, + n, + o, + p, + q, + r, + s, + t, + u, + v, + w, + A, + B, + C, + D, + F, + G; + t = b; + s = new Hp(); + u = new Hp(); + k = Ypd(t, Nte); + d = new ord(a, c, s, u); + qqd(d.a, d.b, d.c, d.d, k); + i = ((A = s.i), !A ? (s.i = new zf(s, s.c)) : A); + for (C = i.Kc(); C.Ob(); ) { + B = BD(C.Pb(), 202); + e = BD(Qc(s, B), 21); + for (p = e.Kc(); p.Ob(); ) { + o = p.Pb(); + v = BD(oo(a.d, o), 202); + if (v) { + h = (!B.e && (B.e = new y5d(A2, B, 10, 9)), B.e); + wtd(h, v); + } else { + g = _pd(t, Vte); + m = _te + o + aue + g; + n = m + $te; + throw vbb(new cqd(n)); + } + } + } + j = ((w = u.i), !w ? (u.i = new zf(u, u.c)) : w); + for (F = j.Kc(); F.Ob(); ) { + D = BD(F.Pb(), 202); + f = BD(Qc(u, D), 21); + for (r = f.Kc(); r.Ob(); ) { + q = r.Pb(); + v = BD(oo(a.d, q), 202); + if (v) { + l = (!D.g && (D.g = new y5d(A2, D, 9, 10)), D.g); + wtd(l, v); + } else { + g = _pd(t, Vte); + m = _te + q + aue + g; + n = m + $te; + throw vbb(new cqd(n)); + } + } + } + !c.b && (c.b = new y5d(z2, c, 4, 7)); + if ( + c.b.i != 0 && + (!c.c && (c.c = new y5d(z2, c, 5, 8)), c.c.i != 0) && + (!c.b && (c.b = new y5d(z2, c, 4, 7)), + c.b.i <= 1 && (!c.c && (c.c = new y5d(z2, c, 5, 8)), c.c.i <= 1)) && + (!c.a && (c.a = new cUd(A2, c, 6, 6)), c.a).i == 1 + ) { + G = BD(qud((!c.a && (c.a = new cUd(A2, c, 6, 6)), c.a), 0), 202); + if (!dmd(G) && !emd(G)) { + kmd(G, BD(qud((!c.b && (c.b = new y5d(z2, c, 4, 7)), c.b), 0), 82)); + lmd(G, BD(qud((!c.c && (c.c = new y5d(z2, c, 5, 8)), c.c), 0), 82)); + } + } + } + function qJc(a) { + var b, + c, + d, + e, + f, + g, + h, + i, + j, + k, + l, + m, + n, + o, + p, + q, + r, + s, + t, + u, + v, + w, + A, + B, + C, + D; + for (t = a.a, u = 0, v = t.length; u < v; ++u) { + s = t[u]; + j = Ohe; + k = Ohe; + for (o = new olb(s.e); o.a < o.c.c.length; ) { + m = BD(mlb(o), 10); + g = !m.c ? -1 : Jkb(m.c.a, m, 0); + if (g > 0) { + l = BD(Ikb(m.c.a, g - 1), 10); + B = jBc(a.b, m, l); + q = m.n.b - m.d.d - (l.n.b + l.o.b + l.d.a + B); + } else { + q = m.n.b - m.d.d; + } + j = Math.min(q, j); + if (g < m.c.a.c.length - 1) { + l = BD(Ikb(m.c.a, g + 1), 10); + B = jBc(a.b, m, l); + r = l.n.b - l.d.d - (m.n.b + m.o.b + m.d.a + B); + } else { + r = 2 * m.n.b; + } + k = Math.min(r, k); + } + i = Ohe; + f = false; + e = BD(Ikb(s.e, 0), 10); + for (D = new olb(e.j); D.a < D.c.c.length; ) { + C = BD(mlb(D), 11); + p = e.n.b + C.n.b + C.a.b; + for (d = new olb(C.e); d.a < d.c.c.length; ) { + c = BD(mlb(d), 17); + w = c.c; + b = w.i.n.b + w.n.b + w.a.b - p; + if (Math.abs(b) < Math.abs(i) && Math.abs(b) < (b < 0 ? j : k)) { + i = b; + f = true; + } + } + } + h = BD(Ikb(s.e, s.e.c.length - 1), 10); + for (A = new olb(h.j); A.a < A.c.c.length; ) { + w = BD(mlb(A), 11); + p = h.n.b + w.n.b + w.a.b; + for (d = new olb(w.g); d.a < d.c.c.length; ) { + c = BD(mlb(d), 17); + C = c.d; + b = C.i.n.b + C.n.b + C.a.b - p; + if (Math.abs(b) < Math.abs(i) && Math.abs(b) < (b < 0 ? j : k)) { + i = b; + f = true; + } + } + } + if (f && i != 0) { + for (n = new olb(s.e); n.a < n.c.c.length; ) { + m = BD(mlb(n), 10); + m.n.b += i; + } + } + } + } + function ync(a, b, c) { + var d, e, f, g, h, i, j, k, l, m, n, o, p, q; + if (Mhb(a.a, b)) { + if (Rqb(BD(Ohb(a.a, b), 53), c)) { + return 1; + } + } else { + Rhb(a.a, b, new Tqb()); + } + if (Mhb(a.a, c)) { + if (Rqb(BD(Ohb(a.a, c), 53), b)) { + return -1; + } + } else { + Rhb(a.a, c, new Tqb()); + } + if (Mhb(a.e, b)) { + if (Rqb(BD(Ohb(a.e, b), 53), c)) { + return -1; + } + } else { + Rhb(a.e, b, new Tqb()); + } + if (Mhb(a.e, c)) { + if (Rqb(BD(Ohb(a.a, c), 53), b)) { + return 1; + } + } else { + Rhb(a.e, c, new Tqb()); + } + if ( + a.c == (tAc(), sAc) || + !wNb(b, (wtc(), Zsc)) || + !wNb(c, (wtc(), Zsc)) + ) { + i = BD( + Etb( + Dtb(KAb(JAb(new YAb(null, new Kub(b.j, 16)), new Hnc())), new Jnc()) + ), + 11 + ); + k = BD( + Etb( + Dtb(KAb(JAb(new YAb(null, new Kub(c.j, 16)), new Lnc())), new Nnc()) + ), + 11 + ); + if (!!i && !!k) { + h = i.i; + j = k.i; + if (!!h && h == j) { + for (m = new olb(h.j); m.a < m.c.c.length; ) { + l = BD(mlb(m), 11); + if (l == i) { + Anc(a, c, b); + return -1; + } else if (l == k) { + Anc(a, b, c); + return 1; + } + } + return beb(znc(a, b), znc(a, c)); + } + for (o = a.d, p = 0, q = o.length; p < q; ++p) { + n = o[p]; + if (n == h) { + Anc(a, c, b); + return -1; + } else if (n == j) { + Anc(a, b, c); + return 1; + } + } + } + if (!wNb(b, (wtc(), Zsc)) || !wNb(c, Zsc)) { + e = znc(a, b); + g = znc(a, c); + e > g ? Anc(a, b, c) : Anc(a, c, b); + return e < g ? -1 : e > g ? 1 : 0; + } + } + d = BD(vNb(b, (wtc(), Zsc)), 19).a; + f = BD(vNb(c, Zsc), 19).a; + d > f ? Anc(a, b, c) : Anc(a, c, b); + return d < f ? -1 : d > f ? 1 : 0; + } + function u2c(a, b, c, d) { + var e, f, g, h, i, j, k, l, m, n, o, p, q, r, s; + if (Ccb(DD(hkd(b, (Y9c(), d9c))))) { + return mmb(), mmb(), jmb; + } + j = (!b.a && (b.a = new cUd(E2, b, 10, 11)), b.a).i != 0; + l = s2c(b); + k = !l.dc(); + if (j || k) { + e = BD(hkd(b, F9c), 149); + if (!e) { + throw vbb( + new y2c( + "Resolved algorithm is not set; apply a LayoutAlgorithmResolver before computing layout." + ) + ); + } + s = D3c(e, (Csd(), ysd)); + q2c(b); + if (!j && k && !s) { + return mmb(), mmb(), jmb; + } + i = new Rkb(); + if ( + PD(hkd(b, J8c)) === PD((hbd(), ebd)) && + (D3c(e, vsd) || D3c(e, usd)) + ) { + n = p2c(a, b); + o = new Psb(); + ye(o, (!b.a && (b.a = new cUd(E2, b, 10, 11)), b.a)); + while (o.b != 0) { + m = BD(o.b == 0 ? null : (sCb(o.b != 0), Nsb(o, o.a.a)), 33); + q2c(m); + r = PD(hkd(m, J8c)) === PD(gbd); + if (r || (ikd(m, o8c) && !C3c(e, hkd(m, F9c)))) { + h = u2c(a, m, c, d); + Gkb(i, h); + jkd(m, J8c, gbd); + hfd(m); + } else { + ye(o, (!m.a && (m.a = new cUd(E2, m, 10, 11)), m.a)); + } + } + } else { + n = (!b.a && (b.a = new cUd(E2, b, 10, 11)), b.a).i; + for ( + g = new Fyd((!b.a && (b.a = new cUd(E2, b, 10, 11)), b.a)); + g.e != g.i.gc(); + + ) { + f = BD(Dyd(g), 33); + h = u2c(a, f, c, d); + Gkb(i, h); + hfd(f); + } + } + for (q = new olb(i); q.a < q.c.c.length; ) { + p = BD(mlb(q), 79); + jkd(p, d9c, (Bcb(), true)); + } + r2c(b, e, Udd(d, n)); + v2c(i); + return k && s ? l : (mmb(), mmb(), jmb); + } else { + return mmb(), mmb(), jmb; + } + } + function Z$b(a, b, c, d, e, f, g, h, i) { + var j, k, l, m, n, o, p; + n = c; + k = new b0b(i); + __b(k, (j0b(), e0b)); + yNb(k, (wtc(), Isc), g); + yNb(k, (Nyc(), Vxc), (dcd(), $bd)); + p = Edb(ED(a.We(Uxc))); + yNb(k, Uxc, p); + l = new H0b(); + F0b(l, k); + if (!(b != bcd && b != ccd)) { + d >= 0 ? (n = Zcd(h)) : (n = Wcd(Zcd(h))); + a.Ye($xc, n); + } + j = new d7c(); + m = false; + if (a.Xe(Txc)) { + a7c(j, BD(a.We(Txc), 8)); + m = true; + } else { + _6c(j, g.a / 2, g.b / 2); + } + switch (n.g) { + case 4: + yNb(k, mxc, (Ctc(), ytc)); + yNb(k, Bsc, (Gqc(), Fqc)); + k.o.b = g.b; + p < 0 && (k.o.a = -p); + G0b(l, (Ucd(), zcd)); + m || (j.a = g.a); + j.a -= g.a; + break; + case 2: + yNb(k, mxc, (Ctc(), Atc)); + yNb(k, Bsc, (Gqc(), Dqc)); + k.o.b = g.b; + p < 0 && (k.o.a = -p); + G0b(l, (Ucd(), Tcd)); + m || (j.a = 0); + break; + case 1: + yNb(k, Osc, (esc(), dsc)); + k.o.a = g.a; + p < 0 && (k.o.b = -p); + G0b(l, (Ucd(), Rcd)); + m || (j.b = g.b); + j.b -= g.b; + break; + case 3: + yNb(k, Osc, (esc(), bsc)); + k.o.a = g.a; + p < 0 && (k.o.b = -p); + G0b(l, (Ucd(), Acd)); + m || (j.b = 0); + } + a7c(l.n, j); + yNb(k, Txc, j); + if (b == Zbd || b == _bd || b == $bd) { + o = 0; + if (b == Zbd && a.Xe(Wxc)) { + switch (n.g) { + case 1: + case 2: + o = BD(a.We(Wxc), 19).a; + break; + case 3: + case 4: + o = -BD(a.We(Wxc), 19).a; + } + } else { + switch (n.g) { + case 4: + case 2: + o = f.b; + b == _bd && (o /= e.b); + break; + case 1: + case 3: + o = f.a; + b == _bd && (o /= e.a); + } + } + yNb(k, htc, o); + } + yNb(k, Hsc, n); + return k; + } + function AGc(a) { + var b, + c, + d, + e, + f, + g, + h, + i, + j, + k, + l, + m, + n, + o, + p, + q, + r, + s, + t, + u, + v, + w, + A, + B, + C; + c = Edb(ED(vNb(a.a.j, (Nyc(), Ewc)))); + if ( + c < -1 || + !a.a.i || + ecd(BD(vNb(a.a.o, Vxc), 98)) || + (V_b(a.a.o, (Ucd(), zcd)).gc() < 2 && V_b(a.a.o, Tcd).gc() < 2) + ) { + return true; + } + if (a.a.c.Rf()) { + return false; + } + v = 0; + u = 0; + t = new Rkb(); + for (i = a.a.e, j = 0, k = i.length; j < k; ++j) { + h = i[j]; + for (m = h, n = 0, p = m.length; n < p; ++n) { + l = m[n]; + if (l.k == (j0b(), i0b)) { + t.c[t.c.length] = l; + continue; + } + d = a.b[l.c.p][l.p]; + if (l.k == e0b) { + d.b = 1; + BD(vNb(l, (wtc(), $sc)), 11).j == (Ucd(), zcd) && (u += d.a); + } else { + C = V_b(l, (Ucd(), Tcd)); + C.dc() || !Lq(C, new NGc()) + ? (d.c = 1) + : ((e = V_b(l, zcd)), + (e.dc() || !Lq(e, new JGc())) && (v += d.a)); + } + for (g = new Sr(ur(U_b(l).a.Kc(), new Sq())); Qr(g); ) { + f = BD(Rr(g), 17); + v += d.c; + u += d.b; + B = f.d.i; + zGc(a, d, B); + } + r = pl( + OC(GC(KI, 1), Uhe, 20, 0, [V_b(l, (Ucd(), Acd)), V_b(l, Rcd)]) + ); + for (A = new Sr(new xl(r.a.length, r.a)); Qr(A); ) { + w = BD(Rr(A), 11); + s = BD(vNb(w, (wtc(), gtc)), 10); + if (s) { + v += d.c; + u += d.b; + zGc(a, d, s); + } + } + } + for (o = new olb(t); o.a < o.c.c.length; ) { + l = BD(mlb(o), 10); + d = a.b[l.c.p][l.p]; + for (g = new Sr(ur(U_b(l).a.Kc(), new Sq())); Qr(g); ) { + f = BD(Rr(g), 17); + v += d.c; + u += d.b; + B = f.d.i; + zGc(a, d, B); + } + } + t.c = KC(SI, Uhe, 1, 0, 5, 1); + } + b = v + u; + q = b == 0 ? Pje : (v - u) / b; + return q >= c; + } + function ovd() { + mvd(); + function h(f) { + var g = this; + this.dispatch = function (a) { + var b = a.data; + switch (b.cmd) { + case "algorithms": + var c = pvd((mmb(), new lnb(new $ib(lvd.b)))); + f.postMessage({ id: b.id, data: c }); + break; + case "categories": + var d = pvd((mmb(), new lnb(new $ib(lvd.c)))); + f.postMessage({ id: b.id, data: d }); + break; + case "options": + var e = pvd((mmb(), new lnb(new $ib(lvd.d)))); + f.postMessage({ id: b.id, data: e }); + break; + case "register": + svd(b.algorithms); + f.postMessage({ id: b.id }); + break; + case "layout": + qvd(b.graph, b.layoutOptions || {}, b.options || {}); + f.postMessage({ id: b.id, data: b.graph }); + break; + } + }; + this.saveDispatch = function (b) { + try { + g.dispatch(b); + } catch (a) { + f.postMessage({ id: b.data.id, error: a }); + } + }; + } + function j(b) { + var c = this; + this.dispatcher = new h({ + postMessage: function (a) { + c.onmessage({ data: a }); + }, + }); + this.postMessage = function (a) { + setTimeout(function () { + c.dispatcher.saveDispatch({ data: a }); + }, 0); + }; + } + Object.defineProperty(exports, "__esModule", { value: true }); + module.exports = { default: j, Worker: j }; + } + function aae(a) { + if (a.N) return; + a.N = true; + a.b = Lnd(a, 0); + Knd(a.b, 0); + Knd(a.b, 1); + Knd(a.b, 2); + a.bb = Lnd(a, 1); + Knd(a.bb, 0); + Knd(a.bb, 1); + a.fb = Lnd(a, 2); + Knd(a.fb, 3); + Knd(a.fb, 4); + Qnd(a.fb, 5); + a.qb = Lnd(a, 3); + Knd(a.qb, 0); + Qnd(a.qb, 1); + Qnd(a.qb, 2); + Knd(a.qb, 3); + Knd(a.qb, 4); + Qnd(a.qb, 5); + Knd(a.qb, 6); + a.a = Mnd(a, 4); + a.c = Mnd(a, 5); + a.d = Mnd(a, 6); + a.e = Mnd(a, 7); + a.f = Mnd(a, 8); + a.g = Mnd(a, 9); + a.i = Mnd(a, 10); + a.j = Mnd(a, 11); + a.k = Mnd(a, 12); + a.n = Mnd(a, 13); + a.o = Mnd(a, 14); + a.p = Mnd(a, 15); + a.q = Mnd(a, 16); + a.s = Mnd(a, 17); + a.r = Mnd(a, 18); + a.t = Mnd(a, 19); + a.u = Mnd(a, 20); + a.v = Mnd(a, 21); + a.w = Mnd(a, 22); + a.B = Mnd(a, 23); + a.A = Mnd(a, 24); + a.C = Mnd(a, 25); + a.D = Mnd(a, 26); + a.F = Mnd(a, 27); + a.G = Mnd(a, 28); + a.H = Mnd(a, 29); + a.J = Mnd(a, 30); + a.I = Mnd(a, 31); + a.K = Mnd(a, 32); + a.M = Mnd(a, 33); + a.L = Mnd(a, 34); + a.P = Mnd(a, 35); + a.Q = Mnd(a, 36); + a.R = Mnd(a, 37); + a.S = Mnd(a, 38); + a.T = Mnd(a, 39); + a.U = Mnd(a, 40); + a.V = Mnd(a, 41); + a.X = Mnd(a, 42); + a.W = Mnd(a, 43); + a.Y = Mnd(a, 44); + a.Z = Mnd(a, 45); + a.$ = Mnd(a, 46); + a._ = Mnd(a, 47); + a.ab = Mnd(a, 48); + a.cb = Mnd(a, 49); + a.db = Mnd(a, 50); + a.eb = Mnd(a, 51); + a.gb = Mnd(a, 52); + a.hb = Mnd(a, 53); + a.ib = Mnd(a, 54); + a.jb = Mnd(a, 55); + a.kb = Mnd(a, 56); + a.lb = Mnd(a, 57); + a.mb = Mnd(a, 58); + a.nb = Mnd(a, 59); + a.ob = Mnd(a, 60); + a.pb = Mnd(a, 61); + } + function f5b(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u; + s = 0; + if (b.f.a == 0) { + for (q = new olb(a); q.a < q.c.c.length; ) { + o = BD(mlb(q), 10); + s = Math.max(s, o.n.a + o.o.a + o.d.c); + } + } else { + s = b.f.a - b.c.a; + } + s -= b.c.a; + for (p = new olb(a); p.a < p.c.c.length; ) { + o = BD(mlb(p), 10); + g5b(o.n, s - o.o.a); + h5b(o.f); + d5b(o); + (!o.q ? (mmb(), mmb(), kmb) : o.q)._b((Nyc(), ayc)) && + g5b(BD(vNb(o, ayc), 8), s - o.o.a); + switch (BD(vNb(o, mwc), 248).g) { + case 1: + yNb(o, mwc, (F7c(), D7c)); + break; + case 2: + yNb(o, mwc, (F7c(), C7c)); + } + r = o.o; + for (u = new olb(o.j); u.a < u.c.c.length; ) { + t = BD(mlb(u), 11); + g5b(t.n, r.a - t.o.a); + g5b(t.a, t.o.a); + G0b(t, Z4b(t.j)); + g = BD(vNb(t, Wxc), 19); + !!g && yNb(t, Wxc, meb(-g.a)); + for (f = new olb(t.g); f.a < f.c.c.length; ) { + e = BD(mlb(f), 17); + for (d = Jsb(e.a, 0); d.b != d.d.c; ) { + c = BD(Xsb(d), 8); + c.a = s - c.a; + } + j = BD(vNb(e, jxc), 74); + if (j) { + for (i = Jsb(j, 0); i.b != i.d.c; ) { + h = BD(Xsb(i), 8); + h.a = s - h.a; + } + } + for (m = new olb(e.b); m.a < m.c.c.length; ) { + k = BD(mlb(m), 70); + g5b(k.n, s - k.o.a); + } + } + for (n = new olb(t.f); n.a < n.c.c.length; ) { + k = BD(mlb(n), 70); + g5b(k.n, t.o.a - k.o.a); + } + } + if (o.k == (j0b(), e0b)) { + yNb(o, (wtc(), Hsc), Z4b(BD(vNb(o, Hsc), 61))); + c5b(o); + } + for (l = new olb(o.b); l.a < l.c.c.length; ) { + k = BD(mlb(l), 70); + d5b(k); + g5b(k.n, r.a - k.o.a); + } + } + } + function i5b(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u; + s = 0; + if (b.f.b == 0) { + for (q = new olb(a); q.a < q.c.c.length; ) { + o = BD(mlb(q), 10); + s = Math.max(s, o.n.b + o.o.b + o.d.a); + } + } else { + s = b.f.b - b.c.b; + } + s -= b.c.b; + for (p = new olb(a); p.a < p.c.c.length; ) { + o = BD(mlb(p), 10); + j5b(o.n, s - o.o.b); + k5b(o.f); + e5b(o); + (!o.q ? (mmb(), mmb(), kmb) : o.q)._b((Nyc(), ayc)) && + j5b(BD(vNb(o, ayc), 8), s - o.o.b); + switch (BD(vNb(o, mwc), 248).g) { + case 3: + yNb(o, mwc, (F7c(), A7c)); + break; + case 4: + yNb(o, mwc, (F7c(), E7c)); + } + r = o.o; + for (u = new olb(o.j); u.a < u.c.c.length; ) { + t = BD(mlb(u), 11); + j5b(t.n, r.b - t.o.b); + j5b(t.a, t.o.b); + G0b(t, $4b(t.j)); + g = BD(vNb(t, Wxc), 19); + !!g && yNb(t, Wxc, meb(-g.a)); + for (f = new olb(t.g); f.a < f.c.c.length; ) { + e = BD(mlb(f), 17); + for (d = Jsb(e.a, 0); d.b != d.d.c; ) { + c = BD(Xsb(d), 8); + c.b = s - c.b; + } + j = BD(vNb(e, jxc), 74); + if (j) { + for (i = Jsb(j, 0); i.b != i.d.c; ) { + h = BD(Xsb(i), 8); + h.b = s - h.b; + } + } + for (m = new olb(e.b); m.a < m.c.c.length; ) { + k = BD(mlb(m), 70); + j5b(k.n, s - k.o.b); + } + } + for (n = new olb(t.f); n.a < n.c.c.length; ) { + k = BD(mlb(n), 70); + j5b(k.n, t.o.b - k.o.b); + } + } + if (o.k == (j0b(), e0b)) { + yNb(o, (wtc(), Hsc), $4b(BD(vNb(o, Hsc), 61))); + b5b(o); + } + for (l = new olb(o.b); l.a < l.c.c.length; ) { + k = BD(mlb(l), 70); + e5b(k); + j5b(k.n, r.b - k.o.b); + } + } + } + function tZc(a, b, c, d) { + var e, f, g, h, i, j, k, l, m, n; + l = false; + j = a + 1; + k = (tCb(a, b.c.length), BD(b.c[a], 200)); + g = k.a; + h = null; + for (f = 0; f < k.a.c.length; f++) { + e = (tCb(f, g.c.length), BD(g.c[f], 187)); + if (e.c) { + continue; + } + if (e.b.c.length == 0) { + Zfb(); + v$c(k, e); + --f; + l = true; + continue; + } + if (!e.k) { + !!h && a$c(h); + h = new b$c(!h ? 0 : h.e + h.d + d, k.f, d); + OZc(e, h.e + h.d, k.f); + Ekb(k.d, h); + WZc(h, e); + e.k = true; + } + i = null; + i = + ((n = null), + f < k.a.c.length - 1 + ? (n = BD(Ikb(k.a, f + 1), 187)) + : j < b.c.length && + (tCb(j, b.c.length), BD(b.c[j], 200)).a.c.length != 0 && + (n = BD(Ikb((tCb(j, b.c.length), BD(b.c[j], 200)).a, 0), 187)), + n); + m = false; + !!i && (m = !pb(i.j, k)); + if (i) { + if (i.b.c.length == 0) { + v$c(k, i); + break; + } else { + KZc(e, c - e.s); + a$c(e.q); + l = l | sZc(k, e, i, c, d); + } + if (i.b.c.length == 0) { + v$c((tCb(j, b.c.length), BD(b.c[j], 200)), i); + i = null; + while ( + b.c.length > j && + (tCb(j, b.c.length), BD(b.c[j], 200)).a.c.length == 0 + ) { + Lkb(b, (tCb(j, b.c.length), b.c[j])); + } + } + if (!i) { + --f; + continue; + } + if (uZc(b, k, e, i, m, c, j, d)) { + l = true; + continue; + } + if (m) { + if (vZc(b, k, e, i, c, j, d)) { + l = true; + continue; + } else if (wZc(k, e)) { + e.c = true; + l = true; + continue; + } + } else if (wZc(k, e)) { + e.c = true; + l = true; + continue; + } + if (l) { + continue; + } + } + if (wZc(k, e)) { + e.c = true; + l = true; + !!i && (i.k = false); + continue; + } else { + a$c(e.q); + } + } + return l; + } + function fed(a, b, c, d, e, f, g) { + var h, + i, + j, + k, + l, + m, + n, + o, + p, + q, + r, + s, + t, + u, + v, + w, + A, + B, + C, + D, + F, + G, + H, + I; + p = 0; + D = 0; + for (j = new olb(a.b); j.a < j.c.c.length; ) { + i = BD(mlb(j), 157); + !!i.c && zfd(i.c); + p = Math.max(p, red(i)); + D += red(i) * qed(i); + } + q = D / a.b.c.length; + C = _dd(a.b, q); + D += a.b.c.length * C; + p = Math.max(p, Math.sqrt(D * g)) + c.b; + H = c.b; + I = c.d; + n = 0; + l = c.b + c.c; + B = new Psb(); + Dsb(B, meb(0)); + w = new Psb(); + k = new Bib(a.b, 0); + o = null; + h = new Rkb(); + while (k.b < k.d.gc()) { + i = (sCb(k.b < k.d.gc()), BD(k.d.Xb((k.c = k.b++)), 157)); + G = red(i); + m = qed(i); + if (H + G > p) { + if (f) { + Fsb(w, n); + Fsb(B, meb(k.b - 1)); + Ekb(a.d, o); + h.c = KC(SI, Uhe, 1, 0, 5, 1); + } + H = c.b; + I += n + b; + n = 0; + l = Math.max(l, c.b + c.c + G); + } + h.c[h.c.length] = i; + ued(i, H, I); + l = Math.max(l, H + G + c.c); + n = Math.max(n, m); + H += G + b; + o = i; + } + Gkb(a.a, h); + Ekb(a.d, BD(Ikb(h, h.c.length - 1), 157)); + l = Math.max(l, d); + F = I + n + c.a; + if (F < e) { + n += e - F; + F = e; + } + if (f) { + H = c.b; + k = new Bib(a.b, 0); + Fsb(B, meb(a.b.c.length)); + A = Jsb(B, 0); + s = BD(Xsb(A), 19).a; + Fsb(w, n); + v = Jsb(w, 0); + u = 0; + while (k.b < k.d.gc()) { + if (k.b == s) { + H = c.b; + u = Edb(ED(Xsb(v))); + s = BD(Xsb(A), 19).a; + } + i = (sCb(k.b < k.d.gc()), BD(k.d.Xb((k.c = k.b++)), 157)); + sed(i, u); + if (k.b == s) { + r = l - H - c.c; + t = red(i); + ted(i, r); + ved(i, (r - t) / 2, 0); + } + H += red(i) + b; + } + } + return new f7c(l, F); + } + function pde(a) { + var b, c, d, e, f; + b = a.c; + f = null; + switch (b) { + case 6: + return a.Vl(); + case 13: + return a.Wl(); + case 23: + return a.Nl(); + case 22: + return a.Sl(); + case 18: + return a.Pl(); + case 8: + nde(a); + f = (wfe(), efe); + break; + case 9: + return a.vl(true); + case 19: + return a.wl(); + case 10: + switch (a.a) { + case 100: + case 68: + case 119: + case 87: + case 115: + case 83: + f = a.ul(a.a); + nde(a); + return f; + case 101: + case 102: + case 110: + case 114: + case 116: + case 117: + case 118: + case 120: + { + c = a.tl(); + c < Tje + ? (f = (wfe(), wfe(), ++vfe, new ige(0, c))) + : (f = Ffe(Tee(c))); + } + break; + case 99: + return a.Fl(); + case 67: + return a.Al(); + case 105: + return a.Il(); + case 73: + return a.Bl(); + case 103: + return a.Gl(); + case 88: + return a.Cl(); + case 49: + case 50: + case 51: + case 52: + case 53: + case 54: + case 55: + case 56: + case 57: + return a.xl(); + case 80: + case 112: + f = tde(a, a.a); + if (!f) throw vbb(new mde(tvd((h0d(), Iue)))); + break; + default: + f = zfe(a.a); + } + nde(a); + break; + case 0: + if (a.a == 93 || a.a == 123 || a.a == 125) + throw vbb(new mde(tvd((h0d(), Hue)))); + f = zfe(a.a); + d = a.a; + nde(a); + if ((d & 64512) == Uje && a.c == 0 && (a.a & 64512) == 56320) { + e = KC(TD, $ie, 25, 2, 15, 1); + e[0] = d & aje; + e[1] = a.a & aje; + f = Efe(Ffe(zfb(e, 0, e.length)), 0); + nde(a); + } + break; + default: + throw vbb(new mde(tvd((h0d(), Hue)))); + } + return f; + } + function e7b(a, b, c) { + var d, e, f, g, h, i, j, k, l, m, n, o, p, q, r; + d = new Rkb(); + e = Ohe; + f = Ohe; + g = Ohe; + if (c) { + e = a.f.a; + for (p = new olb(b.j); p.a < p.c.c.length; ) { + o = BD(mlb(p), 11); + for (i = new olb(o.g); i.a < i.c.c.length; ) { + h = BD(mlb(i), 17); + if (h.a.b != 0) { + k = BD(Hsb(h.a), 8); + if (k.a < e) { + f = e - k.a; + g = Ohe; + d.c = KC(SI, Uhe, 1, 0, 5, 1); + e = k.a; + } + if (k.a <= e) { + d.c[d.c.length] = h; + h.a.b > 1 && + (g = Math.min(g, Math.abs(BD(Ut(h.a, 1), 8).b - k.b))); + } + } + } + } + } else { + for (p = new olb(b.j); p.a < p.c.c.length; ) { + o = BD(mlb(p), 11); + for (i = new olb(o.e); i.a < i.c.c.length; ) { + h = BD(mlb(i), 17); + if (h.a.b != 0) { + m = BD(Isb(h.a), 8); + if (m.a > e) { + f = m.a - e; + g = Ohe; + d.c = KC(SI, Uhe, 1, 0, 5, 1); + e = m.a; + } + if (m.a >= e) { + d.c[d.c.length] = h; + h.a.b > 1 && + (g = Math.min( + g, + Math.abs(BD(Ut(h.a, h.a.b - 2), 8).b - m.b) + )); + } + } + } + } + } + if (d.c.length != 0 && f > b.o.a / 2 && g > b.o.b / 2) { + n = new H0b(); + F0b(n, b); + G0b(n, (Ucd(), Acd)); + n.n.a = b.o.a / 2; + r = new H0b(); + F0b(r, b); + G0b(r, Rcd); + r.n.a = b.o.a / 2; + r.n.b = b.o.b; + for (i = new olb(d); i.a < i.c.c.length; ) { + h = BD(mlb(i), 17); + if (c) { + j = BD(Lsb(h.a), 8); + q = h.a.b == 0 ? A0b(h.d) : BD(Hsb(h.a), 8); + q.b >= j.b ? QZb(h, r) : QZb(h, n); + } else { + j = BD(Msb(h.a), 8); + q = h.a.b == 0 ? A0b(h.c) : BD(Isb(h.a), 8); + q.b >= j.b ? RZb(h, r) : RZb(h, n); + } + l = BD(vNb(h, (Nyc(), jxc)), 74); + !!l && ze(l, j, true); + } + b.n.a = e - b.o.a / 2; + } + } + function erd(a, b, c) { + var d, + e, + f, + g, + h, + i, + j, + k, + l, + m, + n, + o, + p, + q, + r, + s, + t, + u, + v, + w, + A, + B, + C, + D, + F, + G, + H, + I, + J, + K; + D = null; + G = b; + F = Rqd(a, dtd(c), G); + Lkd(F, _pd(G, Vte)); + H = BD(oo(a.g, Vpd(aC(G, Cte))), 33); + m = aC(G, "sourcePort"); + d = null; + !!m && (d = Vpd(m)); + I = BD(oo(a.j, d), 118); + if (!H) { + h = Wpd(G); + o = "An edge must have a source node (edge id: '" + h; + p = o + $te; + throw vbb(new cqd(p)); + } + if (!!I && !Hb(mpd(I), H)) { + i = _pd(G, Vte); + q = + "The source port of an edge must be a port of the edge's source node (edge id: '" + + i; + r = q + $te; + throw vbb(new cqd(r)); + } + B = (!F.b && (F.b = new y5d(z2, F, 4, 7)), F.b); + f = null; + I ? (f = I) : (f = H); + wtd(B, f); + J = BD(oo(a.g, Vpd(aC(G, bue))), 33); + n = aC(G, "targetPort"); + e = null; + !!n && (e = Vpd(n)); + K = BD(oo(a.j, e), 118); + if (!J) { + l = Wpd(G); + s = "An edge must have a target node (edge id: '" + l; + t = s + $te; + throw vbb(new cqd(t)); + } + if (!!K && !Hb(mpd(K), J)) { + j = _pd(G, Vte); + u = + "The target port of an edge must be a port of the edge's target node (edge id: '" + + j; + v = u + $te; + throw vbb(new cqd(v)); + } + C = (!F.c && (F.c = new y5d(z2, F, 5, 8)), F.c); + g = null; + K ? (g = K) : (g = J); + wtd(C, g); + if ( + (!F.b && (F.b = new y5d(z2, F, 4, 7)), F.b).i == 0 || + (!F.c && (F.c = new y5d(z2, F, 5, 8)), F.c).i == 0 + ) { + k = _pd(G, Vte); + w = Zte + k; + A = w + $te; + throw vbb(new cqd(A)); + } + grd(G, F); + frd(G, F); + D = crd(a, G, F); + return D; + } + function DXb(a, b) { + var c, + d, + e, + f, + g, + h, + i, + j, + k, + l, + m, + n, + o, + p, + q, + r, + s, + t, + u, + v, + w, + A, + B, + C, + D; + l = FXb(zXb(a, (Ucd(), Fcd)), b); + o = EXb(zXb(a, Gcd), b); + u = EXb(zXb(a, Ocd), b); + B = GXb(zXb(a, Qcd), b); + m = GXb(zXb(a, Bcd), b); + s = EXb(zXb(a, Ncd), b); + p = EXb(zXb(a, Hcd), b); + w = EXb(zXb(a, Pcd), b); + v = EXb(zXb(a, Ccd), b); + C = GXb(zXb(a, Ecd), b); + r = EXb(zXb(a, Lcd), b); + t = EXb(zXb(a, Kcd), b); + A = EXb(zXb(a, Dcd), b); + D = GXb(zXb(a, Mcd), b); + n = GXb(zXb(a, Icd), b); + q = EXb(zXb(a, Jcd), b); + c = w6c(OC(GC(UD, 1), Vje, 25, 15, [s.a, B.a, w.a, D.a])); + d = w6c(OC(GC(UD, 1), Vje, 25, 15, [o.a, l.a, u.a, q.a])); + e = r.a; + f = w6c(OC(GC(UD, 1), Vje, 25, 15, [p.a, m.a, v.a, n.a])); + j = w6c(OC(GC(UD, 1), Vje, 25, 15, [s.b, o.b, p.b, t.b])); + i = w6c(OC(GC(UD, 1), Vje, 25, 15, [B.b, l.b, m.b, q.b])); + k = C.b; + h = w6c(OC(GC(UD, 1), Vje, 25, 15, [w.b, u.b, v.b, A.b])); + vXb(zXb(a, Fcd), c + e, j + k); + vXb(zXb(a, Jcd), c + e, j + k); + vXb(zXb(a, Gcd), c + e, 0); + vXb(zXb(a, Ocd), c + e, j + k + i); + vXb(zXb(a, Qcd), 0, j + k); + vXb(zXb(a, Bcd), c + e + d, j + k); + vXb(zXb(a, Hcd), c + e + d, 0); + vXb(zXb(a, Pcd), 0, j + k + i); + vXb(zXb(a, Ccd), c + e + d, j + k + i); + vXb(zXb(a, Ecd), 0, j); + vXb(zXb(a, Lcd), c, 0); + vXb(zXb(a, Dcd), 0, j + k + i); + vXb(zXb(a, Icd), c + e + d, 0); + g = new d7c(); + g.a = w6c(OC(GC(UD, 1), Vje, 25, 15, [c + d + e + f, C.a, t.a, A.a])); + g.b = w6c(OC(GC(UD, 1), Vje, 25, 15, [j + i + k + h, r.b, D.b, n.b])); + return g; + } + function Ngc(a) { + var b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q; + p = new Rkb(); + for (m = new olb(a.d.b); m.a < m.c.c.length; ) { + l = BD(mlb(m), 29); + for (o = new olb(l.a); o.a < o.c.c.length; ) { + n = BD(mlb(o), 10); + e = BD(Ohb(a.f, n), 57); + for (i = new Sr(ur(U_b(n).a.Kc(), new Sq())); Qr(i); ) { + g = BD(Rr(i), 17); + d = Jsb(g.a, 0); + j = true; + k = null; + if (d.b != d.d.c) { + b = BD(Xsb(d), 8); + c = null; + if (g.c.j == (Ucd(), Acd)) { + q = new hic(b, new f7c(b.a, e.d.d), e, g); + q.f.a = true; + q.a = g.c; + p.c[p.c.length] = q; + } + if (g.c.j == Rcd) { + q = new hic(b, new f7c(b.a, e.d.d + e.d.a), e, g); + q.f.d = true; + q.a = g.c; + p.c[p.c.length] = q; + } + while (d.b != d.d.c) { + c = BD(Xsb(d), 8); + if (!ADb(b.b, c.b)) { + k = new hic(b, c, null, g); + p.c[p.c.length] = k; + if (j) { + j = false; + if (c.b < e.d.d) { + k.f.a = true; + } else if (c.b > e.d.d + e.d.a) { + k.f.d = true; + } else { + k.f.d = true; + k.f.a = true; + } + } + } + d.b != d.d.c && (b = c); + } + if (k) { + f = BD(Ohb(a.f, g.d.i), 57); + if (b.b < f.d.d) { + k.f.a = true; + } else if (b.b > f.d.d + f.d.a) { + k.f.d = true; + } else { + k.f.d = true; + k.f.a = true; + } + } + } + } + for (h = new Sr(ur(R_b(n).a.Kc(), new Sq())); Qr(h); ) { + g = BD(Rr(h), 17); + if (g.a.b != 0) { + b = BD(Isb(g.a), 8); + if (g.d.j == (Ucd(), Acd)) { + q = new hic(b, new f7c(b.a, e.d.d), e, g); + q.f.a = true; + q.a = g.d; + p.c[p.c.length] = q; + } + if (g.d.j == Rcd) { + q = new hic(b, new f7c(b.a, e.d.d + e.d.a), e, g); + q.f.d = true; + q.a = g.d; + p.c[p.c.length] = q; + } + } + } + } + } + return p; + } + function WJc(a, b, c) { + var d, e, f, g, h, i, j, k, l; + Odd(c, "Network simplex node placement", 1); + a.e = b; + a.n = BD(vNb(b, (wtc(), otc)), 304); + VJc(a); + HJc(a); + MAb(LAb(new YAb(null, new Kub(a.e.b, 16)), new KKc()), new MKc(a)); + MAb( + JAb( + LAb( + JAb(LAb(new YAb(null, new Kub(a.e.b, 16)), new zLc()), new BLc()), + new DLc() + ), + new FLc() + ), + new IKc(a) + ); + if (Ccb(DD(vNb(a.e, (Nyc(), Axc))))) { + g = Udd(c, 1); + Odd(g, "Straight Edges Pre-Processing", 1); + UJc(a); + Qdd(g); + } + JFb(a.f); + f = BD(vNb(b, Ayc), 19).a * a.f.a.c.length; + uGb(HGb(IGb(LGb(a.f), f), false), Udd(c, 1)); + if (a.d.a.gc() != 0) { + g = Udd(c, 1); + Odd(g, "Flexible Where Space Processing", 1); + h = BD( + Btb( + RAb(NAb(new YAb(null, new Kub(a.f.a, 16)), new OKc()), new iKc()) + ), + 19 + ).a; + i = BD( + Btb( + QAb(NAb(new YAb(null, new Kub(a.f.a, 16)), new QKc()), new mKc()) + ), + 19 + ).a; + j = i - h; + k = nGb(new pGb(), a.f); + l = nGb(new pGb(), a.f); + AFb(DFb(CFb(BFb(EFb(new FFb(), 20000), j), k), l)); + MAb(JAb(JAb(Plb(a.i), new SKc()), new UKc()), new WKc(h, k, j, l)); + for (e = a.d.a.ec().Kc(); e.Ob(); ) { + d = BD(e.Pb(), 213); + d.g = 1; + } + uGb(HGb(IGb(LGb(a.f), f), false), Udd(g, 1)); + Qdd(g); + } + if (Ccb(DD(vNb(b, Axc)))) { + g = Udd(c, 1); + Odd(g, "Straight Edges Post-Processing", 1); + TJc(a); + Qdd(g); + } + GJc(a); + a.e = null; + a.f = null; + a.i = null; + a.c = null; + Uhb(a.k); + a.j = null; + a.a = null; + a.o = null; + a.d.a.$b(); + Qdd(c); + } + function lMc(a, b, c) { + var d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v; + for (h = new olb(a.a.b); h.a < h.c.c.length; ) { + f = BD(mlb(h), 29); + for (t = new olb(f.a); t.a < t.c.c.length; ) { + s = BD(mlb(t), 10); + b.g[s.p] = s; + b.a[s.p] = s; + b.d[s.p] = 0; + } + } + i = a.a.b; + b.c == (YLc(), WLc) && + (i = JD(i, 152) + ? km(BD(i, 152)) + : JD(i, 131) + ? BD(i, 131).a + : JD(i, 54) + ? new ov(i) + : new dv(i)); + for (g = i.Kc(); g.Ob(); ) { + f = BD(g.Pb(), 29); + n = -1; + m = f.a; + if (b.o == (eMc(), dMc)) { + n = Ohe; + m = JD(m, 152) + ? km(BD(m, 152)) + : JD(m, 131) + ? BD(m, 131).a + : JD(m, 54) + ? new ov(m) + : new dv(m); + } + for (v = m.Kc(); v.Ob(); ) { + u = BD(v.Pb(), 10); + l = null; + b.c == WLc + ? (l = BD(Ikb(a.b.f, u.p), 15)) + : (l = BD(Ikb(a.b.b, u.p), 15)); + if (l.gc() > 0) { + d = l.gc(); + j = QD(Math.floor((d + 1) / 2)) - 1; + e = QD(Math.ceil((d + 1) / 2)) - 1; + if (b.o == dMc) { + for (k = e; k >= j; k--) { + if (b.a[u.p] == u) { + p = BD(l.Xb(k), 46); + o = BD(p.a, 10); + if (!Rqb(c, p.b) && n > a.b.e[o.p]) { + b.a[o.p] = u; + b.g[u.p] = b.g[o.p]; + b.a[u.p] = b.g[u.p]; + b.f[b.g[u.p].p] = + (Bcb(), + Ccb(b.f[b.g[u.p].p]) & (u.k == (j0b(), g0b)) + ? true + : false); + n = a.b.e[o.p]; + } + } + } + } else { + for (k = j; k <= e; k++) { + if (b.a[u.p] == u) { + r = BD(l.Xb(k), 46); + q = BD(r.a, 10); + if (!Rqb(c, r.b) && n < a.b.e[q.p]) { + b.a[q.p] = u; + b.g[u.p] = b.g[q.p]; + b.a[u.p] = b.g[u.p]; + b.f[b.g[u.p].p] = + (Bcb(), + Ccb(b.f[b.g[u.p].p]) & (u.k == (j0b(), g0b)) + ? true + : false); + n = a.b.e[q.p]; + } + } + } + } + } + } + } + } + function Thd() { + Thd = ccb; + Hhd(); + Shd = Ghd.a; + BD(qud(ZKd(Ghd.a), 0), 18); + Mhd = Ghd.f; + BD(qud(ZKd(Ghd.f), 0), 18); + BD(qud(ZKd(Ghd.f), 1), 34); + Rhd = Ghd.n; + BD(qud(ZKd(Ghd.n), 0), 34); + BD(qud(ZKd(Ghd.n), 1), 34); + BD(qud(ZKd(Ghd.n), 2), 34); + BD(qud(ZKd(Ghd.n), 3), 34); + Nhd = Ghd.g; + BD(qud(ZKd(Ghd.g), 0), 18); + BD(qud(ZKd(Ghd.g), 1), 34); + Jhd = Ghd.c; + BD(qud(ZKd(Ghd.c), 0), 18); + BD(qud(ZKd(Ghd.c), 1), 18); + Ohd = Ghd.i; + BD(qud(ZKd(Ghd.i), 0), 18); + BD(qud(ZKd(Ghd.i), 1), 18); + BD(qud(ZKd(Ghd.i), 2), 18); + BD(qud(ZKd(Ghd.i), 3), 18); + BD(qud(ZKd(Ghd.i), 4), 34); + Phd = Ghd.j; + BD(qud(ZKd(Ghd.j), 0), 18); + Khd = Ghd.d; + BD(qud(ZKd(Ghd.d), 0), 18); + BD(qud(ZKd(Ghd.d), 1), 18); + BD(qud(ZKd(Ghd.d), 2), 18); + BD(qud(ZKd(Ghd.d), 3), 18); + BD(qud(ZKd(Ghd.d), 4), 34); + BD(qud(ZKd(Ghd.d), 5), 34); + BD(qud(ZKd(Ghd.d), 6), 34); + BD(qud(ZKd(Ghd.d), 7), 34); + Ihd = Ghd.b; + BD(qud(ZKd(Ghd.b), 0), 34); + BD(qud(ZKd(Ghd.b), 1), 34); + Lhd = Ghd.e; + BD(qud(ZKd(Ghd.e), 0), 34); + BD(qud(ZKd(Ghd.e), 1), 34); + BD(qud(ZKd(Ghd.e), 2), 34); + BD(qud(ZKd(Ghd.e), 3), 34); + BD(qud(ZKd(Ghd.e), 4), 18); + BD(qud(ZKd(Ghd.e), 5), 18); + BD(qud(ZKd(Ghd.e), 6), 18); + BD(qud(ZKd(Ghd.e), 7), 18); + BD(qud(ZKd(Ghd.e), 8), 18); + BD(qud(ZKd(Ghd.e), 9), 18); + BD(qud(ZKd(Ghd.e), 10), 34); + Qhd = Ghd.k; + BD(qud(ZKd(Ghd.k), 0), 34); + BD(qud(ZKd(Ghd.k), 1), 34); + } + function wQc(a, b) { + var c, + d, + e, + f, + g, + h, + i, + j, + k, + l, + m, + n, + o, + p, + q, + r, + s, + t, + u, + v, + w, + A, + B, + C, + D, + F; + C = new Psb(); + w = new Psb(); + q = -1; + for (i = new olb(a); i.a < i.c.c.length; ) { + g = BD(mlb(i), 128); + g.s = q--; + k = 0; + t = 0; + for (f = new olb(g.t); f.a < f.c.c.length; ) { + d = BD(mlb(f), 268); + t += d.c; + } + for (e = new olb(g.i); e.a < e.c.c.length; ) { + d = BD(mlb(e), 268); + k += d.c; + } + g.n = k; + g.u = t; + t == 0 + ? (Gsb(w, g, w.c.b, w.c), true) + : k == 0 && (Gsb(C, g, C.c.b, C.c), true); + } + F = Gx(a); + l = a.c.length; + p = l + 1; + r = l - 1; + n = new Rkb(); + while (F.a.gc() != 0) { + while (w.b != 0) { + v = (sCb(w.b != 0), BD(Nsb(w, w.a.a), 128)); + F.a.Bc(v) != null; + v.s = r--; + AQc(v, C, w); + } + while (C.b != 0) { + A = (sCb(C.b != 0), BD(Nsb(C, C.a.a), 128)); + F.a.Bc(A) != null; + A.s = p++; + AQc(A, C, w); + } + o = Rie; + for (j = F.a.ec().Kc(); j.Ob(); ) { + g = BD(j.Pb(), 128); + s = g.u - g.n; + if (s >= o) { + if (s > o) { + n.c = KC(SI, Uhe, 1, 0, 5, 1); + o = s; + } + n.c[n.c.length] = g; + } + } + if (n.c.length != 0) { + m = BD(Ikb(n, Bub(b, n.c.length)), 128); + F.a.Bc(m) != null; + m.s = p++; + AQc(m, C, w); + n.c = KC(SI, Uhe, 1, 0, 5, 1); + } + } + u = a.c.length + 1; + for (h = new olb(a); h.a < h.c.c.length; ) { + g = BD(mlb(h), 128); + g.s < l && (g.s += u); + } + for (B = new olb(a); B.a < B.c.c.length; ) { + A = BD(mlb(B), 128); + c = new Bib(A.t, 0); + while (c.b < c.d.gc()) { + d = (sCb(c.b < c.d.gc()), BD(c.d.Xb((c.c = c.b++)), 268)); + D = d.b; + if (A.s > D.s) { + uib(c); + Lkb(D.i, d); + if (d.c > 0) { + d.a = D; + Ekb(D.t, d); + d.b = A; + Ekb(A.i, d); + } + } + } + } + } + function qde(a) { + var b, c, d, e, f; + b = a.c; + switch (b) { + case 11: + return a.Ml(); + case 12: + return a.Ol(); + case 14: + return a.Ql(); + case 15: + return a.Tl(); + case 16: + return a.Rl(); + case 17: + return a.Ul(); + case 21: + nde(a); + return wfe(), wfe(), ffe; + case 10: + switch (a.a) { + case 65: + return a.yl(); + case 90: + return a.Dl(); + case 122: + return a.Kl(); + case 98: + return a.El(); + case 66: + return a.zl(); + case 60: + return a.Jl(); + case 62: + return a.Hl(); + } + } + f = pde(a); + b = a.c; + switch (b) { + case 3: + return a.Zl(f); + case 4: + return a.Xl(f); + case 5: + return a.Yl(f); + case 0: + if (a.a == 123 && a.d < a.j) { + e = a.d; + d = 0; + c = -1; + if ((b = bfb(a.i, e++)) >= 48 && b <= 57) { + d = b - 48; + while (e < a.j && (b = bfb(a.i, e++)) >= 48 && b <= 57) { + d = d * 10 + b - 48; + if (d < 0) throw vbb(new mde(tvd((h0d(), bve)))); + } + } else { + throw vbb(new mde(tvd((h0d(), Zue)))); + } + c = d; + if (b == 44) { + if (e >= a.j) { + throw vbb(new mde(tvd((h0d(), _ue)))); + } else if ((b = bfb(a.i, e++)) >= 48 && b <= 57) { + c = b - 48; + while (e < a.j && (b = bfb(a.i, e++)) >= 48 && b <= 57) { + c = c * 10 + b - 48; + if (c < 0) throw vbb(new mde(tvd((h0d(), bve)))); + } + if (d > c) throw vbb(new mde(tvd((h0d(), ave)))); + } else { + c = -1; + } + } + if (b != 125) throw vbb(new mde(tvd((h0d(), $ue)))); + if (a.sl(e)) { + f = (wfe(), wfe(), ++vfe, new lge(9, f)); + a.d = e + 1; + } else { + f = (wfe(), wfe(), ++vfe, new lge(3, f)); + a.d = e; + } + f.dm(d); + f.cm(c); + nde(a); + } + } + return f; + } + function $bc(a, b, c, d, e) { + var f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, A, B, C, D, F; + p = new Skb(b.b); + u = new Skb(b.b); + m = new Skb(b.b); + B = new Skb(b.b); + q = new Skb(b.b); + for (A = Jsb(b, 0); A.b != A.d.c; ) { + v = BD(Xsb(A), 11); + for (h = new olb(v.g); h.a < h.c.c.length; ) { + f = BD(mlb(h), 17); + if (f.c.i == f.d.i) { + if (v.j == f.d.j) { + B.c[B.c.length] = f; + continue; + } else if (v.j == (Ucd(), Acd) && f.d.j == Rcd) { + q.c[q.c.length] = f; + continue; + } + } + } + } + for (i = new olb(q); i.a < i.c.c.length; ) { + f = BD(mlb(i), 17); + _bc(a, f, c, d, (Ucd(), zcd)); + } + for (g = new olb(B); g.a < g.c.c.length; ) { + f = BD(mlb(g), 17); + C = new b0b(a); + __b(C, (j0b(), i0b)); + yNb(C, (Nyc(), Vxc), (dcd(), $bd)); + yNb(C, (wtc(), $sc), f); + D = new H0b(); + yNb(D, $sc, f.d); + G0b(D, (Ucd(), Tcd)); + F0b(D, C); + F = new H0b(); + yNb(F, $sc, f.c); + G0b(F, zcd); + F0b(F, C); + yNb(f.c, gtc, C); + yNb(f.d, gtc, C); + QZb(f, null); + RZb(f, null); + c.c[c.c.length] = C; + yNb(C, ysc, meb(2)); + } + for (w = Jsb(b, 0); w.b != w.d.c; ) { + v = BD(Xsb(w), 11); + j = v.e.c.length > 0; + r = v.g.c.length > 0; + j && r + ? ((m.c[m.c.length] = v), true) + : j + ? ((p.c[p.c.length] = v), true) + : r && ((u.c[u.c.length] = v), true); + } + for (o = new olb(p); o.a < o.c.c.length; ) { + n = BD(mlb(o), 11); + Ekb(e, Zbc(a, n, null, c)); + } + for (t = new olb(u); t.a < t.c.c.length; ) { + s = BD(mlb(t), 11); + Ekb(e, Zbc(a, null, s, c)); + } + for (l = new olb(m); l.a < l.c.c.length; ) { + k = BD(mlb(l), 11); + Ekb(e, Zbc(a, k, k, c)); + } + } + function NCb(a) { + var b, + c, + d, + e, + f, + g, + h, + i, + j, + k, + l, + m, + n, + o, + p, + q, + r, + s, + t, + u, + v, + w, + A, + B, + C, + D; + s = new f7c(Pje, Pje); + b = new f7c(Qje, Qje); + for (B = new olb(a); B.a < B.c.c.length; ) { + A = BD(mlb(B), 8); + s.a = Math.min(s.a, A.a); + s.b = Math.min(s.b, A.b); + b.a = Math.max(b.a, A.a); + b.b = Math.max(b.b, A.b); + } + m = new f7c(b.a - s.a, b.b - s.b); + j = new f7c(s.a - 50, s.b - m.a - 50); + k = new f7c(s.a - 50, b.b + m.a + 50); + l = new f7c(b.a + m.b / 2 + 50, s.b + m.b / 2); + n = new eDb(j, k, l); + w = new Tqb(); + f = new Rkb(); + c = new Rkb(); + w.a.zc(n, w); + for (D = new olb(a); D.a < D.c.c.length; ) { + C = BD(mlb(D), 8); + f.c = KC(SI, Uhe, 1, 0, 5, 1); + for (v = w.a.ec().Kc(); v.Ob(); ) { + t = BD(v.Pb(), 308); + d = t.d; + S6c(d, t.a); + Jy(S6c(t.d, C), S6c(t.d, t.a)) < 0 && ((f.c[f.c.length] = t), true); + } + c.c = KC(SI, Uhe, 1, 0, 5, 1); + for (u = new olb(f); u.a < u.c.c.length; ) { + t = BD(mlb(u), 308); + for (q = new olb(t.e); q.a < q.c.c.length; ) { + o = BD(mlb(q), 168); + g = true; + for (i = new olb(f); i.a < i.c.c.length; ) { + h = BD(mlb(i), 308); + h != t && + (wtb(o, Ikb(h.e, 0)) || + wtb(o, Ikb(h.e, 1)) || + wtb(o, Ikb(h.e, 2))) && + (g = false); + } + g && ((c.c[c.c.length] = o), true); + } + } + Ve(w, f); + reb(w, new OCb()); + for (p = new olb(c); p.a < p.c.c.length; ) { + o = BD(mlb(p), 168); + Qqb(w, new eDb(C, o.a, o.b)); + } + } + r = new Tqb(); + reb(w, new QCb(r)); + e = r.a.ec().Kc(); + while (e.Ob()) { + o = BD(e.Pb(), 168); + (dDb(n, o.a) || dDb(n, o.b)) && e.Qb(); + } + reb(r, new SCb()); + return r; + } + function _Tb(a) { + var b, c, d, e, f; + c = BD(vNb(a, (wtc(), Ksc)), 21); + b = k3c(WTb); + e = BD(vNb(a, (Nyc(), axc)), 334); + e == (hbd(), ebd) && d3c(b, XTb); + Ccb(DD(vNb(a, $wc))) + ? e3c(b, (qUb(), lUb), (S8b(), I8b)) + : e3c(b, (qUb(), nUb), (S8b(), I8b)); + vNb(a, (g6c(), f6c)) != null && d3c(b, YTb); + (Ccb(DD(vNb(a, hxc))) || Ccb(DD(vNb(a, _wc)))) && + c3c(b, (qUb(), pUb), (S8b(), W7b)); + switch (BD(vNb(a, Lwc), 103).g) { + case 2: + case 3: + case 4: + c3c(e3c(b, (qUb(), lUb), (S8b(), Y7b)), pUb, X7b); + } + c.Hc((Orc(), Frc)) && + c3c(e3c(e3c(b, (qUb(), lUb), (S8b(), V7b)), oUb, T7b), pUb, U7b); + PD(vNb(a, rxc)) !== PD((kAc(), iAc)) && + e3c(b, (qUb(), nUb), (S8b(), A8b)); + if (c.Hc(Mrc)) { + e3c(b, (qUb(), lUb), (S8b(), G8b)); + e3c(b, mUb, E8b); + e3c(b, nUb, F8b); + } + PD(vNb(a, swc)) !== PD((yrc(), wrc)) && + PD(vNb(a, Swc)) !== PD((Aad(), xad)) && + c3c(b, (qUb(), pUb), (S8b(), j8b)); + Ccb(DD(vNb(a, cxc))) && e3c(b, (qUb(), nUb), (S8b(), i8b)); + Ccb(DD(vNb(a, Hwc))) && e3c(b, (qUb(), nUb), (S8b(), O8b)); + if (cUb(a)) { + PD(vNb(a, axc)) === PD(ebd) + ? (d = BD(vNb(a, Cwc), 292)) + : (d = BD(vNb(a, Dwc), 292)); + f = d == (Xrc(), Vrc) ? (S8b(), D8b) : (S8b(), R8b); + e3c(b, (qUb(), oUb), f); + } + switch (BD(vNb(a, Kyc), 377).g) { + case 1: + e3c(b, (qUb(), oUb), (S8b(), P8b)); + break; + case 2: + c3c(e3c(e3c(b, (qUb(), nUb), (S8b(), P7b)), oUb, Q7b), pUb, R7b); + } + PD(vNb(a, ywc)) !== PD((tAc(), rAc)) && + e3c(b, (qUb(), nUb), (S8b(), Q8b)); + return b; + } + function mZc(a) { + r4c( + a, + new E3c( + P3c( + M3c( + O3c(N3c(new R3c(), Kre), "ELK Rectangle Packing"), + "Algorithm for packing of unconnected boxes, i.e. graphs without edges. The given order of the boxes is always preserved and the main reading direction of the boxes is left to right. The algorithm is divided into two phases. One phase approximates the width in which the rectangles can be placed. The next phase places the rectangles in rows using the previously calculated width as bounding width and bundles rectangles with a similar height in blocks. A compaction step reduces the size of the drawing. Finally, the rectangles are expanded to fill their bounding box and eliminate empty unused spaces." + ), + new pZc() + ) + ) + ); + p4c(a, Kre, _le, 1.3); + p4c(a, Kre, Jre, Ksd(VYc)); + p4c(a, Kre, ame, gZc); + p4c(a, Kre, wme, 15); + p4c(a, Kre, lqe, Ksd(SYc)); + p4c(a, Kre, Fme, Ksd(_Yc)); + p4c(a, Kre, Tme, Ksd(aZc)); + p4c(a, Kre, Eme, Ksd(bZc)); + p4c(a, Kre, Gme, Ksd($Yc)); + p4c(a, Kre, Dme, Ksd(cZc)); + p4c(a, Kre, Hme, Ksd(hZc)); + p4c(a, Kre, Bre, Ksd(eZc)); + p4c(a, Kre, Cre, Ksd(ZYc)); + p4c(a, Kre, Fre, Ksd(dZc)); + p4c(a, Kre, Gre, Ksd(iZc)); + p4c(a, Kre, Hre, Ksd(WYc)); + p4c(a, Kre, Ame, Ksd(XYc)); + p4c(a, Kre, xqe, Ksd(YYc)); + p4c(a, Kre, Ere, Ksd(UYc)); + p4c(a, Kre, Dre, Ksd(TYc)); + p4c(a, Kre, Ire, Ksd(kZc)); + } + function Wmd(b, c, d) { + var e, f, g, h, i, j, k, l, m, n, o, p, q, r; + if (d == null) { + return null; + } + if (b.a != c.Aj()) { + throw vbb(new Wdb(tte + c.ne() + ute)); + } + if (JD(c, 457)) { + r = _Pd(BD(c, 671), d); + if (!r) { + throw vbb( + new Wdb(vte + d + "' is not a valid enumerator of '" + c.ne() + "'") + ); + } + return r; + } + switch (o1d((O6d(), M6d), c).cl()) { + case 2: { + d = Qge(d, false); + break; + } + case 3: { + d = Qge(d, true); + break; + } + } + e = o1d(M6d, c).$k(); + if (e) { + return e.Aj().Nh().Kh(e, d); + } + n = o1d(M6d, c).al(); + if (n) { + r = new Rkb(); + for (k = Zmd(d), l = 0, m = k.length; l < m; ++l) { + j = k[l]; + Ekb(r, n.Aj().Nh().Kh(n, j)); + } + return r; + } + q = o1d(M6d, c).bl(); + if (!q.dc()) { + for (p = q.Kc(); p.Ob(); ) { + o = BD(p.Pb(), 148); + try { + r = o.Aj().Nh().Kh(o, d); + if (r != null) { + return r; + } + } catch (a) { + a = ubb(a); + if (!JD(a, 60)) throw vbb(a); + } + } + throw vbb( + new Wdb( + vte + + d + + "' does not match any member types of the union datatype '" + + c.ne() + + "'" + ) + ); + } + BD(c, 834).Fj(); + f = r6d(c.Bj()); + if (!f) return null; + if (f == yI) { + h = 0; + try { + h = Icb(d, Rie, Ohe) & aje; + } catch (a) { + a = ubb(a); + if (JD(a, 127)) { + g = rfb(d); + h = g[0]; + } else throw vbb(a); + } + return bdb(h); + } + if (f == $J) { + for (i = 0; i < Pmd.length; ++i) { + try { + return DQd(Pmd[i], d); + } catch (a) { + a = ubb(a); + if (!JD(a, 32)) throw vbb(a); + } + } + throw vbb( + new Wdb( + vte + + d + + "' is not a date formatted string of the form yyyy-MM-dd'T'HH:mm:ss'.'SSSZ or a valid subset thereof" + ) + ); + } + throw vbb(new Wdb(vte + d + "' is invalid. ")); + } + function ngb(a, b) { + var c, d, e, f, g, h, i, j; + c = 0; + g = 0; + f = b.length; + h = null; + j = new Vfb(); + if (g < f && (BCb(g, b.length), b.charCodeAt(g) == 43)) { + ++g; + ++c; + if ( + g < f && + (BCb(g, b.length), + b.charCodeAt(g) == 43 || (BCb(g, b.length), b.charCodeAt(g) == 45)) + ) { + throw vbb(new Oeb(Oje + b + '"')); + } + } + while ( + g < f && + (BCb(g, b.length), b.charCodeAt(g) != 46) && + (BCb(g, b.length), b.charCodeAt(g) != 101) && + (BCb(g, b.length), b.charCodeAt(g) != 69) + ) { + ++g; + } + j.a += "" + qfb(b == null ? Xhe : (uCb(b), b), c, g); + if (g < f && (BCb(g, b.length), b.charCodeAt(g) == 46)) { + ++g; + c = g; + while ( + g < f && + (BCb(g, b.length), b.charCodeAt(g) != 101) && + (BCb(g, b.length), b.charCodeAt(g) != 69) + ) { + ++g; + } + a.e = g - c; + j.a += "" + qfb(b == null ? Xhe : (uCb(b), b), c, g); + } else { + a.e = 0; + } + if ( + g < f && + (BCb(g, b.length), + b.charCodeAt(g) == 101 || (BCb(g, b.length), b.charCodeAt(g) == 69)) + ) { + ++g; + c = g; + if (g < f && (BCb(g, b.length), b.charCodeAt(g) == 43)) { + ++g; + g < f && (BCb(g, b.length), b.charCodeAt(g) != 45) && ++c; + } + h = b.substr(c, f - c); + a.e = a.e - Icb(h, Rie, Ohe); + if (a.e != QD(a.e)) { + throw vbb(new Oeb("Scale out of range.")); + } + } + i = j.a; + if (i.length < 16) { + a.f = + (kgb == null && (kgb = new RegExp("^[+-]?\\d*$", "i")), + kgb.test(i) ? parseInt(i, 10) : NaN); + if (isNaN(a.f)) { + throw vbb(new Oeb(Oje + b + '"')); + } + a.a = ugb(a.f); + } else { + ogb(a, new Ygb(i)); + } + a.d = j.a.length; + for (e = 0; e < j.a.length; ++e) { + d = bfb(j.a, e); + if (d != 45 && d != 48) { + break; + } + --a.d; + } + a.d == 0 && (a.d = 1); + } + function xXb() { + xXb = ccb; + wXb = new Hp(); + Rc(wXb, (Ucd(), Fcd), Jcd); + Rc(wXb, Qcd, Jcd); + Rc(wXb, Qcd, Mcd); + Rc(wXb, Bcd, Icd); + Rc(wXb, Bcd, Jcd); + Rc(wXb, Gcd, Jcd); + Rc(wXb, Gcd, Kcd); + Rc(wXb, Ocd, Dcd); + Rc(wXb, Ocd, Jcd); + Rc(wXb, Lcd, Ecd); + Rc(wXb, Lcd, Jcd); + Rc(wXb, Lcd, Kcd); + Rc(wXb, Lcd, Dcd); + Rc(wXb, Ecd, Lcd); + Rc(wXb, Ecd, Mcd); + Rc(wXb, Ecd, Icd); + Rc(wXb, Ecd, Jcd); + Rc(wXb, Ncd, Ncd); + Rc(wXb, Ncd, Kcd); + Rc(wXb, Ncd, Mcd); + Rc(wXb, Hcd, Hcd); + Rc(wXb, Hcd, Kcd); + Rc(wXb, Hcd, Icd); + Rc(wXb, Pcd, Pcd); + Rc(wXb, Pcd, Dcd); + Rc(wXb, Pcd, Mcd); + Rc(wXb, Ccd, Ccd); + Rc(wXb, Ccd, Dcd); + Rc(wXb, Ccd, Icd); + Rc(wXb, Kcd, Gcd); + Rc(wXb, Kcd, Lcd); + Rc(wXb, Kcd, Ncd); + Rc(wXb, Kcd, Hcd); + Rc(wXb, Kcd, Jcd); + Rc(wXb, Kcd, Kcd); + Rc(wXb, Kcd, Mcd); + Rc(wXb, Kcd, Icd); + Rc(wXb, Dcd, Ocd); + Rc(wXb, Dcd, Lcd); + Rc(wXb, Dcd, Pcd); + Rc(wXb, Dcd, Ccd); + Rc(wXb, Dcd, Dcd); + Rc(wXb, Dcd, Mcd); + Rc(wXb, Dcd, Icd); + Rc(wXb, Dcd, Jcd); + Rc(wXb, Mcd, Qcd); + Rc(wXb, Mcd, Ecd); + Rc(wXb, Mcd, Ncd); + Rc(wXb, Mcd, Pcd); + Rc(wXb, Mcd, Kcd); + Rc(wXb, Mcd, Dcd); + Rc(wXb, Mcd, Mcd); + Rc(wXb, Mcd, Jcd); + Rc(wXb, Icd, Bcd); + Rc(wXb, Icd, Ecd); + Rc(wXb, Icd, Hcd); + Rc(wXb, Icd, Ccd); + Rc(wXb, Icd, Kcd); + Rc(wXb, Icd, Dcd); + Rc(wXb, Icd, Icd); + Rc(wXb, Icd, Jcd); + Rc(wXb, Jcd, Fcd); + Rc(wXb, Jcd, Qcd); + Rc(wXb, Jcd, Bcd); + Rc(wXb, Jcd, Gcd); + Rc(wXb, Jcd, Ocd); + Rc(wXb, Jcd, Lcd); + Rc(wXb, Jcd, Ecd); + Rc(wXb, Jcd, Kcd); + Rc(wXb, Jcd, Dcd); + Rc(wXb, Jcd, Mcd); + Rc(wXb, Jcd, Icd); + Rc(wXb, Jcd, Jcd); + } + function YXb(a, b, c) { + var d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, A, B; + a.d = new f7c(Pje, Pje); + a.c = new f7c(Qje, Qje); + for (m = b.Kc(); m.Ob(); ) { + k = BD(m.Pb(), 37); + for (t = new olb(k.a); t.a < t.c.c.length; ) { + s = BD(mlb(t), 10); + a.d.a = Math.min(a.d.a, s.n.a - s.d.b); + a.d.b = Math.min(a.d.b, s.n.b - s.d.d); + a.c.a = Math.max(a.c.a, s.n.a + s.o.a + s.d.c); + a.c.b = Math.max(a.c.b, s.n.b + s.o.b + s.d.a); + } + } + h = new nYb(); + for (l = b.Kc(); l.Ob(); ) { + k = BD(l.Pb(), 37); + d = fYb(a, k); + Ekb(h.a, d); + d.a = d.a | !BD(vNb(d.c, (wtc(), Esc)), 21).dc(); + } + a.b = + (LUb(), (B = new VUb()), (B.f = new CUb(c)), (B.b = BUb(B.f, h)), B); + PUb(((o = a.b), new Zdd(), o)); + a.e = new d7c(); + a.a = a.b.f.e; + for (g = new olb(h.a); g.a < g.c.c.length; ) { + e = BD(mlb(g), 841); + u = QUb(a.b, e); + g_b(e.c, u.a, u.b); + for (q = new olb(e.c.a); q.a < q.c.c.length; ) { + p = BD(mlb(q), 10); + if (p.k == (j0b(), e0b)) { + r = aYb(a, p.n, BD(vNb(p, (wtc(), Hsc)), 61)); + P6c(X6c(p.n), r); + } + } + } + for (f = new olb(h.a); f.a < f.c.c.length; ) { + e = BD(mlb(f), 841); + for (j = new olb(lYb(e)); j.a < j.c.c.length; ) { + i = BD(mlb(j), 17); + A = new t7c(i.a); + St(A, 0, A0b(i.c)); + Dsb(A, A0b(i.d)); + n = null; + for (w = Jsb(A, 0); w.b != w.d.c; ) { + v = BD(Xsb(w), 8); + if (!n) { + n = v; + continue; + } + if (Ky(n.a, v.a)) { + a.e.a = Math.min(a.e.a, n.a); + a.a.a = Math.max(a.a.a, n.a); + } else if (Ky(n.b, v.b)) { + a.e.b = Math.min(a.e.b, n.b); + a.a.b = Math.max(a.a.b, n.b); + } + n = v; + } + } + } + V6c(a.e); + P6c(a.a, a.e); + } + function wZd(a) { + Bnd(a.b, _ve, OC(GC(ZI, 1), nie, 2, 6, [bwe, "ConsistentTransient"])); + Bnd(a.a, _ve, OC(GC(ZI, 1), nie, 2, 6, [bwe, "WellFormedSourceURI"])); + Bnd( + a.o, + _ve, + OC(GC(ZI, 1), nie, 2, 6, [ + bwe, + "InterfaceIsAbstract AtMostOneID UniqueFeatureNames UniqueOperationSignatures NoCircularSuperTypes WellFormedMapEntryClass ConsistentSuperTypes DisjointFeatureAndOperationSignatures", + ]) + ); + Bnd( + a.p, + _ve, + OC(GC(ZI, 1), nie, 2, 6, [ + bwe, + "WellFormedInstanceTypeName UniqueTypeParameterNames", + ]) + ); + Bnd( + a.v, + _ve, + OC(GC(ZI, 1), nie, 2, 6, [ + bwe, + "UniqueEnumeratorNames UniqueEnumeratorLiterals", + ]) + ); + Bnd(a.R, _ve, OC(GC(ZI, 1), nie, 2, 6, [bwe, "WellFormedName"])); + Bnd( + a.T, + _ve, + OC(GC(ZI, 1), nie, 2, 6, [ + bwe, + "UniqueParameterNames UniqueTypeParameterNames NoRepeatingVoid", + ]) + ); + Bnd( + a.U, + _ve, + OC(GC(ZI, 1), nie, 2, 6, [ + bwe, + "WellFormedNsURI WellFormedNsPrefix UniqueSubpackageNames UniqueClassifierNames UniqueNsURIs", + ]) + ); + Bnd( + a.W, + _ve, + OC(GC(ZI, 1), nie, 2, 6, [ + bwe, + "ConsistentOpposite SingleContainer ConsistentKeys ConsistentUnique ConsistentContainer", + ]) + ); + Bnd( + a.bb, + _ve, + OC(GC(ZI, 1), nie, 2, 6, [bwe, "ValidDefaultValueLiteral"]) + ); + Bnd( + a.eb, + _ve, + OC(GC(ZI, 1), nie, 2, 6, [ + bwe, + "ValidLowerBound ValidUpperBound ConsistentBounds ValidType", + ]) + ); + Bnd( + a.H, + _ve, + OC(GC(ZI, 1), nie, 2, 6, [ + bwe, + "ConsistentType ConsistentBounds ConsistentArguments", + ]) + ); + } + function B4b(a, b, c) { + var d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, A, B, C; + if (b.dc()) { + return; + } + e = new s7c(); + h = c ? c : BD(b.Xb(0), 17); + o = h.c; + hQc(); + m = o.i.k; + if (!(m == (j0b(), h0b) || m == i0b || m == e0b || m == d0b)) { + throw vbb( + new Wdb( + "The target node of the edge must be a normal node or a northSouthPort." + ) + ); + } + Fsb(e, l7c(OC(GC(m1, 1), nie, 8, 0, [o.i.n, o.n, o.a]))); + if ((Ucd(), Lcd).Hc(o.j)) { + q = Edb(ED(vNb(o, (wtc(), qtc)))); + l = new f7c(l7c(OC(GC(m1, 1), nie, 8, 0, [o.i.n, o.n, o.a])).a, q); + Gsb(e, l, e.c.b, e.c); + } + k = null; + d = false; + i = b.Kc(); + while (i.Ob()) { + g = BD(i.Pb(), 17); + f = g.a; + if (f.b != 0) { + if (d) { + j = Y6c(P6c(k, (sCb(f.b != 0), BD(f.a.a.c, 8))), 0.5); + Gsb(e, j, e.c.b, e.c); + d = false; + } else { + d = true; + } + k = R6c((sCb(f.b != 0), BD(f.c.b.c, 8))); + ye(e, f); + Osb(f); + } + } + p = h.d; + if (Lcd.Hc(p.j)) { + q = Edb(ED(vNb(p, (wtc(), qtc)))); + l = new f7c(l7c(OC(GC(m1, 1), nie, 8, 0, [p.i.n, p.n, p.a])).a, q); + Gsb(e, l, e.c.b, e.c); + } + Fsb(e, l7c(OC(GC(m1, 1), nie, 8, 0, [p.i.n, p.n, p.a]))); + a.d == (tBc(), qBc) && + ((r = (sCb(e.b != 0), BD(e.a.a.c, 8))), + (s = BD(Ut(e, 1), 8)), + (t = new e7c(bRc(o.j))), + (t.a *= 5), + (t.b *= 5), + (u = c7c(new f7c(s.a, s.b), r)), + (v = new f7c(A4b(t.a, u.a), A4b(t.b, u.b))), + P6c(v, r), + (w = Jsb(e, 1)), + Vsb(w, v), + (A = (sCb(e.b != 0), BD(e.c.b.c, 8))), + (B = BD(Ut(e, e.b - 2), 8)), + (t = new e7c(bRc(p.j))), + (t.a *= 5), + (t.b *= 5), + (u = c7c(new f7c(B.a, B.b), A)), + (C = new f7c(A4b(t.a, u.a), A4b(t.b, u.b))), + P6c(C, A), + St(e, e.b - 1, C), + undefined); + n = new YPc(e); + ye(h.a, UPc(n)); + } + function Kgd(a, b, c, d) { + var e, + f, + g, + h, + i, + j, + k, + l, + m, + n, + o, + p, + q, + r, + s, + t, + u, + v, + w, + A, + B, + C, + D, + F, + G, + H, + I, + J, + K, + L, + M, + N, + O, + P; + t = BD(qud((!a.b && (a.b = new y5d(z2, a, 4, 7)), a.b), 0), 82); + v = t.Dg(); + w = t.Eg(); + u = t.Cg() / 2; + p = t.Bg() / 2; + if (JD(t, 186)) { + s = BD(t, 118); + v += mpd(s).i; + v += mpd(s).i; + } + v += u; + w += p; + F = BD(qud((!a.b && (a.b = new y5d(z2, a, 4, 7)), a.b), 0), 82); + H = F.Dg(); + I = F.Eg(); + G = F.Cg() / 2; + A = F.Bg() / 2; + if (JD(F, 186)) { + D = BD(F, 118); + H += mpd(D).i; + H += mpd(D).i; + } + H += G; + I += A; + if ((!a.a && (a.a = new cUd(A2, a, 6, 6)), a.a).i == 0) { + h = (Fhd(), (j = new rmd()), j); + wtd((!a.a && (a.a = new cUd(A2, a, 6, 6)), a.a), h); + } else if ((!a.a && (a.a = new cUd(A2, a, 6, 6)), a.a).i > 1) { + o = new Oyd((!a.a && (a.a = new cUd(A2, a, 6, 6)), a.a)); + while (o.e != o.i.gc()) { + Eyd(o); + } + } + g = BD(qud((!a.a && (a.a = new cUd(A2, a, 6, 6)), a.a), 0), 202); + q = H; + H > v + u ? (q = v + u) : H < v - u && (q = v - u); + r = I; + I > w + p ? (r = w + p) : I < w - p && (r = w - p); + q > v - u && q < v + u && r > w - p && r < w + p && (q = v + u); + omd(g, q); + pmd(g, r); + B = v; + v > H + G ? (B = H + G) : v < H - G && (B = H - G); + C = w; + w > I + A ? (C = I + A) : w < I - A && (C = I - A); + B > H - G && B < H + G && C > I - A && C < I + A && (C = I + A); + hmd(g, B); + imd(g, C); + Uxd((!g.a && (g.a = new xMd(y2, g, 5)), g.a)); + f = Bub(b, 5); + t == F && ++f; + L = B - q; + O = C - r; + J = Math.sqrt(L * L + O * O); + l = J * 0.20000000298023224; + M = L / (f + 1); + P = O / (f + 1); + K = q; + N = r; + for (k = 0; k < f; k++) { + K += M; + N += P; + m = K + Cub(b, 24) * lke * l - l / 2; + m < 0 ? (m = 1) : m > c && (m = c - 1); + n = N + Cub(b, 24) * lke * l - l / 2; + n < 0 ? (n = 1) : n > d && (n = d - 1); + e = (Fhd(), (i = new xkd()), i); + vkd(e, m); + wkd(e, n); + wtd((!g.a && (g.a = new xMd(y2, g, 5)), g.a), e); + } + } + function Nyc() { + Nyc = ccb; + iyc = (Y9c(), I9c); + jyc = J9c; + kyc = K9c; + lyc = L9c; + nyc = M9c; + oyc = N9c; + ryc = P9c; + tyc = R9c; + uyc = S9c; + syc = Q9c; + vyc = T9c; + xyc = U9c; + zyc = X9c; + qyc = O9c; + hyc = (jwc(), Bvc); + myc = Cvc; + pyc = Dvc; + wyc = Evc; + byc = new Osd(D9c, meb(0)); + cyc = yvc; + dyc = zvc; + eyc = Avc; + Kyc = awc; + Cyc = Hvc; + Dyc = Kvc; + Gyc = Svc; + Eyc = Nvc; + Fyc = Pvc; + Myc = fwc; + Lyc = cwc; + Iyc = Yvc; + Hyc = Wvc; + Jyc = $vc; + Cxc = pvc; + Dxc = qvc; + Xwc = Auc; + Ywc = Duc; + Lxc = new q0b(12); + Kxc = new Osd(f9c, Lxc); + Twc = (Aad(), wad); + Swc = new Osd(E8c, Twc); + Uxc = new Osd(s9c, 0); + fyc = new Osd(E9c, meb(1)); + owc = new Osd(r8c, tme); + Jxc = d9c; + Vxc = t9c; + $xc = A9c; + Kwc = y8c; + mwc = p8c; + axc = J8c; + gyc = new Osd(H9c, (Bcb(), true)); + fxc = M8c; + gxc = N8c; + Fxc = Y8c; + Ixc = b9c; + Gxc = $8c; + Nwc = (ead(), cad); + Lwc = new Osd(z8c, Nwc); + xxc = W8c; + wxc = U8c; + Yxc = x9c; + Xxc = w9c; + Zxc = z9c; + Oxc = (Tbd(), Sbd); + new Osd(l9c, Oxc); + Qxc = o9c; + Rxc = p9c; + Sxc = q9c; + Pxc = n9c; + Byc = Gvc; + sxc = avc; + rxc = $uc; + Ayc = Fvc; + mxc = Suc; + Jwc = muc; + Iwc = kuc; + Awc = Xtc; + Bwc = Ytc; + Dwc = buc; + Cwc = Ztc; + Hwc = iuc; + uxc = cvc; + vxc = dvc; + ixc = Luc; + Exc = uvc; + zxc = hvc; + $wc = Guc; + Bxc = nvc; + Vwc = wuc; + Wwc = yuc; + zwc = w8c; + yxc = evc; + swc = Mtc; + rwc = Ktc; + qwc = Jtc; + cxc = Juc; + bxc = Iuc; + dxc = Kuc; + Hxc = _8c; + jxc = Q8c; + Zwc = G8c; + Qwc = C8c; + Pwc = B8c; + Ewc = euc; + Wxc = v9c; + pwc = v8c; + exc = L8c; + Txc = r9c; + Mxc = h9c; + Nxc = j9c; + oxc = Vuc; + pxc = Xuc; + ayc = C9c; + nwc = Itc; + qxc = Zuc; + Rwc = suc; + Owc = quc; + txc = S8c; + kxc = Puc; + Axc = kvc; + yyc = V9c; + Mwc = ouc; + _xc = wvc; + Uwc = uuc; + lxc = Ruc; + Fwc = guc; + hxc = P8c; + nxc = Uuc; + Gwc = huc; + ywc = Vtc; + wwc = Stc; + uwc = Qtc; + vwc = Rtc; + xwc = Utc; + twc = Otc; + _wc = Huc; + } + function shb(a, b) { + phb(); + var c, + d, + e, + f, + g, + h, + i, + j, + k, + l, + m, + n, + o, + p, + q, + r, + s, + t, + u, + v, + w, + A, + B, + C, + D, + F, + G, + H; + B = a.e; + o = a.d; + e = a.a; + if (B == 0) { + switch (b) { + case 0: + return "0"; + case 1: + return $je; + case 2: + return "0.00"; + case 3: + return "0.000"; + case 4: + return "0.0000"; + case 5: + return "0.00000"; + case 6: + return "0.000000"; + default: + w = new Ufb(); + b < 0 ? ((w.a += "0E+"), w) : ((w.a += "0E"), w); + w.a += -b; + return w.a; + } + } + t = o * 10 + 1 + 7; + u = KC(TD, $ie, 25, t + 1, 15, 1); + c = t; + if (o == 1) { + h = e[0]; + if (h < 0) { + H = xbb(h, Yje); + do { + p = H; + H = Abb(H, 10); + u[--c] = (48 + Tbb(Qbb(p, Ibb(H, 10)))) & aje; + } while (ybb(H, 0) != 0); + } else { + H = h; + do { + p = H; + H = (H / 10) | 0; + u[--c] = (48 + (p - H * 10)) & aje; + } while (H != 0); + } + } else { + D = KC(WD, oje, 25, o, 15, 1); + G = o; + $fb(e, 0, D, 0, G); + I: while (true) { + A = 0; + for (j = G - 1; j >= 0; j--) { + F = wbb(Nbb(A, 32), xbb(D[j], Yje)); + r = qhb(F); + D[j] = Tbb(r); + A = Tbb(Obb(r, 32)); + } + s = Tbb(A); + q = c; + do { + u[--c] = (48 + (s % 10)) & aje; + } while ((s = (s / 10) | 0) != 0 && c != 0); + d = 9 - q + c; + for (i = 0; i < d && c > 0; i++) { + u[--c] = 48; + } + l = G - 1; + for (; D[l] == 0; l--) { + if (l == 0) { + break I; + } + } + G = l + 1; + } + while (u[c] == 48) { + ++c; + } + } + n = B < 0; + g = t - c - b - 1; + if (b == 0) { + n && (u[--c] = 45); + return zfb(u, c, t - c); + } + if (b > 0 && g >= -6) { + if (g >= 0) { + k = c + g; + for (m = t - 1; m >= k; m--) { + u[m + 1] = u[m]; + } + u[++k] = 46; + n && (u[--c] = 45); + return zfb(u, c, t - c + 1); + } + for (l = 2; l < -g + 1; l++) { + u[--c] = 48; + } + u[--c] = 46; + u[--c] = 48; + n && (u[--c] = 45); + return zfb(u, c, t - c); + } + C = c + 1; + f = t; + v = new Vfb(); + n && ((v.a += "-"), v); + if (f - C >= 1) { + Kfb(v, u[c]); + v.a += "."; + v.a += zfb(u, c + 1, t - c - 1); + } else { + v.a += zfb(u, c, t - c); + } + v.a += "E"; + g > 0 && ((v.a += "+"), v); + v.a += "" + g; + return v.a; + } + function z$c(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w; + a.c = b; + a.g = new Lqb(); + c = (Pgd(), new bhd(a.c)); + d = new YGb(c); + UGb(d); + t = GD(hkd(a.c, (d0c(), Y_c))); + i = BD(hkd(a.c, $_c), 316); + v = BD(hkd(a.c, __c), 429); + g = BD(hkd(a.c, T_c), 482); + u = BD(hkd(a.c, Z_c), 430); + a.j = Edb(ED(hkd(a.c, a0c))); + h = a.a; + switch (i.g) { + case 0: + h = a.a; + break; + case 1: + h = a.b; + break; + case 2: + h = a.i; + break; + case 3: + h = a.e; + break; + case 4: + h = a.f; + break; + default: + throw vbb(new Wdb(Mre + (i.f != null ? i.f : "" + i.g))); + } + a.d = new g_c(h, v, g); + yNb(a.d, (XNb(), VNb), DD(hkd(a.c, V_c))); + a.d.c = Ccb(DD(hkd(a.c, U_c))); + if (Vod(a.c).i == 0) { + return a.d; + } + for (l = new Fyd(Vod(a.c)); l.e != l.i.gc(); ) { + k = BD(Dyd(l), 33); + n = k.g / 2; + m = k.f / 2; + w = new f7c(k.i + n, k.j + m); + while (Mhb(a.g, w)) { + O6c(w, (Math.random() - 0.5) * qme, (Math.random() - 0.5) * qme); + } + p = BD(hkd(k, (Y9c(), S8c)), 142); + q = new aOb( + w, + new J6c( + w.a - n - a.j / 2 - p.b, + w.b - m - a.j / 2 - p.d, + k.g + a.j + (p.b + p.c), + k.f + a.j + (p.d + p.a) + ) + ); + Ekb(a.d.i, q); + Rhb(a.g, w, new vgd(q, k)); + } + switch (u.g) { + case 0: + if (t == null) { + a.d.d = BD(Ikb(a.d.i, 0), 65); + } else { + for (s = new olb(a.d.i); s.a < s.c.c.length; ) { + q = BD(mlb(s), 65); + o = BD(BD(Ohb(a.g, q.a), 46).b, 33).zg(); + o != null && dfb(o, t) && (a.d.d = q); + } + } + break; + case 1: + e = new f7c(a.c.g, a.c.f); + e.a *= 0.5; + e.b *= 0.5; + O6c(e, a.c.i, a.c.j); + f = Pje; + for (r = new olb(a.d.i); r.a < r.c.c.length; ) { + q = BD(mlb(r), 65); + j = S6c(q.a, e); + if (j < f) { + f = j; + a.d.d = q; + } + } + break; + default: + throw vbb(new Wdb(Mre + (u.f != null ? u.f : "" + u.g))); + } + return a.d; + } + function qfd(a, b, c) { + var d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w; + v = BD(qud((!a.a && (a.a = new cUd(A2, a, 6, 6)), a.a), 0), 202); + k = new s7c(); + u = new Lqb(); + w = tfd(v); + jrb(u.f, v, w); + m = new Lqb(); + d = new Psb(); + for ( + o = ul( + pl( + OC(GC(KI, 1), Uhe, 20, 0, [ + (!b.d && (b.d = new y5d(B2, b, 8, 5)), b.d), + (!b.e && (b.e = new y5d(B2, b, 7, 4)), b.e), + ]) + ) + ); + Qr(o); + + ) { + n = BD(Rr(o), 79); + if ((!a.a && (a.a = new cUd(A2, a, 6, 6)), a.a).i != 1) { + throw vbb( + new Wdb(Tse + (!a.a && (a.a = new cUd(A2, a, 6, 6)), a.a).i) + ); + } + if (n != a) { + q = BD(qud((!n.a && (n.a = new cUd(A2, n, 6, 6)), n.a), 0), 202); + Gsb(d, q, d.c.b, d.c); + p = BD(Wd(irb(u.f, q)), 12); + if (!p) { + p = tfd(q); + jrb(u.f, q, p); + } + l = c + ? c7c( + new g7c(BD(Ikb(w, w.c.length - 1), 8)), + BD(Ikb(p, p.c.length - 1), 8) + ) + : c7c( + new g7c((tCb(0, w.c.length), BD(w.c[0], 8))), + (tCb(0, p.c.length), BD(p.c[0], 8)) + ); + jrb(m.f, q, l); + } + } + if (d.b != 0) { + r = BD(Ikb(w, c ? w.c.length - 1 : 0), 8); + for (j = 1; j < w.c.length; j++) { + s = BD(Ikb(w, c ? w.c.length - 1 - j : j), 8); + e = Jsb(d, 0); + while (e.b != e.d.c) { + q = BD(Xsb(e), 202); + p = BD(Wd(irb(u.f, q)), 12); + if (p.c.length <= j) { + Zsb(e); + } else { + t = P6c( + new g7c(BD(Ikb(p, c ? p.c.length - 1 - j : j), 8)), + BD(Wd(irb(m.f, q)), 8) + ); + if (s.a != t.a || s.b != t.b) { + f = s.a - r.a; + h = s.b - r.b; + g = t.a - r.a; + i = t.b - r.b; + g * h == i * f && + (f == 0 || isNaN(f) ? f : f < 0 ? -1 : 1) == + (g == 0 || isNaN(g) ? g : g < 0 ? -1 : 1) && + (h == 0 || isNaN(h) ? h : h < 0 ? -1 : 1) == + (i == 0 || isNaN(i) ? i : i < 0 ? -1 : 1) + ? (Math.abs(f) < Math.abs(g) || Math.abs(h) < Math.abs(i)) && + (Gsb(k, s, k.c.b, k.c), true) + : j > 1 && (Gsb(k, r, k.c.b, k.c), true); + Zsb(e); + } + } + } + r = s; + } + } + return k; + } + function $Bc(a, b, c) { + var d, + e, + f, + g, + h, + i, + j, + k, + l, + m, + n, + o, + p, + q, + r, + s, + t, + u, + v, + w, + A, + B, + C, + D, + F, + G, + H, + I, + J, + K, + L; + Odd(c, "Greedy cycle removal", 1); + t = b.a; + L = t.c.length; + a.a = KC(WD, oje, 25, L, 15, 1); + a.c = KC(WD, oje, 25, L, 15, 1); + a.b = KC(WD, oje, 25, L, 15, 1); + j = 0; + for (r = new olb(t); r.a < r.c.c.length; ) { + p = BD(mlb(r), 10); + p.p = j; + for (C = new olb(p.j); C.a < C.c.c.length; ) { + w = BD(mlb(C), 11); + for (h = new olb(w.e); h.a < h.c.c.length; ) { + d = BD(mlb(h), 17); + if (d.c.i == p) { + continue; + } + G = BD(vNb(d, (Nyc(), cyc)), 19).a; + a.a[j] += G > 0 ? G + 1 : 1; + } + for (g = new olb(w.g); g.a < g.c.c.length; ) { + d = BD(mlb(g), 17); + if (d.d.i == p) { + continue; + } + G = BD(vNb(d, (Nyc(), cyc)), 19).a; + a.c[j] += G > 0 ? G + 1 : 1; + } + } + a.c[j] == 0 ? Dsb(a.e, p) : a.a[j] == 0 && Dsb(a.f, p); + ++j; + } + o = -1; + n = 1; + l = new Rkb(); + a.d = BD(vNb(b, (wtc(), jtc)), 230); + while (L > 0) { + while (a.e.b != 0) { + I = BD(Lsb(a.e), 10); + a.b[I.p] = o--; + _Bc(a, I); + --L; + } + while (a.f.b != 0) { + J = BD(Lsb(a.f), 10); + a.b[J.p] = n++; + _Bc(a, J); + --L; + } + if (L > 0) { + m = Rie; + for (s = new olb(t); s.a < s.c.c.length; ) { + p = BD(mlb(s), 10); + if (a.b[p.p] == 0) { + u = a.c[p.p] - a.a[p.p]; + if (u >= m) { + if (u > m) { + l.c = KC(SI, Uhe, 1, 0, 5, 1); + m = u; + } + l.c[l.c.length] = p; + } + } + } + k = a.Zf(l); + a.b[k.p] = n++; + _Bc(a, k); + --L; + } + } + H = t.c.length + 1; + for (j = 0; j < t.c.length; j++) { + a.b[j] < 0 && (a.b[j] += H); + } + for (q = new olb(t); q.a < q.c.c.length; ) { + p = BD(mlb(q), 10); + F = m_b(p.j); + for (A = F, B = 0, D = A.length; B < D; ++B) { + w = A[B]; + v = k_b(w.g); + for (e = v, f = 0, i = e.length; f < i; ++f) { + d = e[f]; + K = d.d.i.p; + if (a.b[p.p] > a.b[K]) { + PZb(d, true); + yNb(b, Asc, (Bcb(), true)); + } + } + } + } + a.a = null; + a.c = null; + a.b = null; + Osb(a.f); + Osb(a.e); + Qdd(c); + } + function sQb(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r; + d = new Rkb(); + h = new Rkb(); + q = b / 2; + n = a.gc(); + e = BD(a.Xb(0), 8); + r = BD(a.Xb(1), 8); + o = tQb(e.a, e.b, r.a, r.b, q); + Ekb(d, (tCb(0, o.c.length), BD(o.c[0], 8))); + Ekb(h, (tCb(1, o.c.length), BD(o.c[1], 8))); + for (j = 2; j < n; j++) { + p = e; + e = r; + r = BD(a.Xb(j), 8); + o = tQb(e.a, e.b, p.a, p.b, q); + Ekb(d, (tCb(1, o.c.length), BD(o.c[1], 8))); + Ekb(h, (tCb(0, o.c.length), BD(o.c[0], 8))); + o = tQb(e.a, e.b, r.a, r.b, q); + Ekb(d, (tCb(0, o.c.length), BD(o.c[0], 8))); + Ekb(h, (tCb(1, o.c.length), BD(o.c[1], 8))); + } + o = tQb(r.a, r.b, e.a, e.b, q); + Ekb(d, (tCb(1, o.c.length), BD(o.c[1], 8))); + Ekb(h, (tCb(0, o.c.length), BD(o.c[0], 8))); + c = new s7c(); + g = new Rkb(); + Dsb(c, (tCb(0, d.c.length), BD(d.c[0], 8))); + for (k = 1; k < d.c.length - 2; k += 2) { + f = (tCb(k, d.c.length), BD(d.c[k], 8)); + m = rQb( + (tCb(k - 1, d.c.length), BD(d.c[k - 1], 8)), + f, + (tCb(k + 1, d.c.length), BD(d.c[k + 1], 8)), + (tCb(k + 2, d.c.length), BD(d.c[k + 2], 8)) + ); + !isFinite(m.a) || !isFinite(m.b) + ? (Gsb(c, f, c.c.b, c.c), true) + : (Gsb(c, m, c.c.b, c.c), true); + } + Dsb(c, BD(Ikb(d, d.c.length - 1), 8)); + Ekb(g, (tCb(0, h.c.length), BD(h.c[0], 8))); + for (l = 1; l < h.c.length - 2; l += 2) { + f = (tCb(l, h.c.length), BD(h.c[l], 8)); + m = rQb( + (tCb(l - 1, h.c.length), BD(h.c[l - 1], 8)), + f, + (tCb(l + 1, h.c.length), BD(h.c[l + 1], 8)), + (tCb(l + 2, h.c.length), BD(h.c[l + 2], 8)) + ); + !isFinite(m.a) || !isFinite(m.b) + ? ((g.c[g.c.length] = f), true) + : ((g.c[g.c.length] = m), true); + } + Ekb(g, BD(Ikb(h, h.c.length - 1), 8)); + for (i = g.c.length - 1; i >= 0; i--) { + Dsb(c, (tCb(i, g.c.length), BD(g.c[i], 8))); + } + return c; + } + function aFd(a) { + var b, c, d, e, f, g, h, i, j, k, l, m, n; + g = true; + l = null; + d = null; + e = null; + b = false; + n = BEd; + j = null; + f = null; + h = 0; + i = UEd(a, h, zEd, AEd); + if (i < a.length && (BCb(i, a.length), a.charCodeAt(i) == 58)) { + l = a.substr(h, i - h); + h = i + 1; + } + c = l != null && hnb(GEd, l.toLowerCase()); + if (c) { + i = a.lastIndexOf("!/"); + if (i == -1) { + throw vbb(new Wdb("no archive separator")); + } + g = true; + d = qfb(a, h, ++i); + h = i; + } else if (h >= 0 && dfb(a.substr(h, "//".length), "//")) { + h += 2; + i = UEd(a, h, CEd, DEd); + d = a.substr(h, i - h); + h = i; + } else if ( + l != null && + (h == a.length || (BCb(h, a.length), a.charCodeAt(h) != 47)) + ) { + g = false; + i = ifb(a, wfb(35), h); + i == -1 && (i = a.length); + d = a.substr(h, i - h); + h = i; + } + if (!c && h < a.length && (BCb(h, a.length), a.charCodeAt(h) == 47)) { + i = UEd(a, h + 1, CEd, DEd); + k = a.substr(h + 1, i - (h + 1)); + if (k.length > 0 && bfb(k, k.length - 1) == 58) { + e = k; + h = i; + } + } + if (h < a.length && (BCb(h, a.length), a.charCodeAt(h) == 47)) { + ++h; + b = true; + } + if ( + h < a.length && + (BCb(h, a.length), a.charCodeAt(h) != 63) && + (BCb(h, a.length), a.charCodeAt(h) != 35) + ) { + m = new Rkb(); + while ( + h < a.length && + (BCb(h, a.length), a.charCodeAt(h) != 63) && + (BCb(h, a.length), a.charCodeAt(h) != 35) + ) { + i = UEd(a, h, CEd, DEd); + Ekb(m, a.substr(h, i - h)); + h = i; + h < a.length && + (BCb(h, a.length), a.charCodeAt(h) == 47) && + (bFd(a, ++h) || ((m.c[m.c.length] = ""), true)); + } + n = KC(ZI, nie, 2, m.c.length, 6, 1); + Qkb(m, n); + } + if (h < a.length && (BCb(h, a.length), a.charCodeAt(h) == 63)) { + i = gfb(a, 35, ++h); + i == -1 && (i = a.length); + j = a.substr(h, i - h); + h = i; + } + h < a.length && (f = pfb(a, ++h)); + iFd(g, l, d, e, n, j); + return new NEd(g, l, d, e, b, n, j, f); + } + function sJc(a, b) { + var c, + d, + e, + f, + g, + h, + i, + j, + k, + l, + m, + n, + o, + p, + q, + r, + s, + t, + u, + v, + w, + A, + B, + C, + D, + F, + G, + H, + I, + J, + K; + I = new Rkb(); + for (o = new olb(b.b); o.a < o.c.c.length; ) { + m = BD(mlb(o), 29); + for (v = new olb(m.a); v.a < v.c.c.length; ) { + u = BD(mlb(v), 10); + u.p = -1; + l = Rie; + B = Rie; + for (D = new olb(u.j); D.a < D.c.c.length; ) { + C = BD(mlb(D), 11); + for (e = new olb(C.e); e.a < e.c.c.length; ) { + c = BD(mlb(e), 17); + F = BD(vNb(c, (Nyc(), eyc)), 19).a; + l = Math.max(l, F); + } + for (d = new olb(C.g); d.a < d.c.c.length; ) { + c = BD(mlb(d), 17); + F = BD(vNb(c, (Nyc(), eyc)), 19).a; + B = Math.max(B, F); + } + } + yNb(u, hJc, meb(l)); + yNb(u, iJc, meb(B)); + } + } + r = 0; + for (n = new olb(b.b); n.a < n.c.c.length; ) { + m = BD(mlb(n), 29); + for (v = new olb(m.a); v.a < v.c.c.length; ) { + u = BD(mlb(v), 10); + if (u.p < 0) { + H = new zJc(); + H.b = r++; + oJc(a, u, H); + I.c[I.c.length] = H; + } + } + } + A = Pu(I.c.length); + k = Pu(I.c.length); + for (g = 0; g < I.c.length; g++) { + Ekb(A, new Rkb()); + Ekb(k, meb(0)); + } + mJc(b, I, A, k); + J = BD(Qkb(I, KC(sY, Iqe, 257, I.c.length, 0, 1)), 840); + w = BD(Qkb(A, KC(yK, eme, 15, A.c.length, 0, 1)), 192); + j = KC(WD, oje, 25, k.c.length, 15, 1); + for (h = 0; h < j.length; h++) { + j[h] = (tCb(h, k.c.length), BD(k.c[h], 19)).a; + } + s = 0; + t = new Rkb(); + for (i = 0; i < J.length; i++) { + j[i] == 0 && Ekb(t, J[i]); + } + q = KC(WD, oje, 25, J.length, 15, 1); + while (t.c.length != 0) { + H = BD(Kkb(t, 0), 257); + q[H.b] = s++; + while (!w[H.b].dc()) { + K = BD(w[H.b].$c(0), 257); + --j[K.b]; + j[K.b] == 0 && ((t.c[t.c.length] = K), true); + } + } + a.a = KC(sY, Iqe, 257, J.length, 0, 1); + for (f = 0; f < J.length; f++) { + p = J[f]; + G = q[f]; + a.a[G] = p; + p.b = G; + for (v = new olb(p.e); v.a < v.c.c.length; ) { + u = BD(mlb(v), 10); + u.p = G; + } + } + return a.a; + } + function nde(a) { + var b, c, d; + if (a.d >= a.j) { + a.a = -1; + a.c = 1; + return; + } + b = bfb(a.i, a.d++); + a.a = b; + if (a.b == 1) { + switch (b) { + case 92: + d = 10; + if (a.d >= a.j) throw vbb(new mde(tvd((h0d(), uue)))); + a.a = bfb(a.i, a.d++); + break; + case 45: + if ((a.e & 512) == 512 && a.d < a.j && bfb(a.i, a.d) == 91) { + ++a.d; + d = 24; + } else d = 0; + break; + case 91: + if ((a.e & 512) != 512 && a.d < a.j && bfb(a.i, a.d) == 58) { + ++a.d; + d = 20; + break; + } + default: + if ((b & 64512) == Uje && a.d < a.j) { + c = bfb(a.i, a.d); + if ((c & 64512) == 56320) { + a.a = Tje + ((b - Uje) << 10) + c - 56320; + ++a.d; + } + } + d = 0; + } + a.c = d; + return; + } + switch (b) { + case 124: + d = 2; + break; + case 42: + d = 3; + break; + case 43: + d = 4; + break; + case 63: + d = 5; + break; + case 41: + d = 7; + break; + case 46: + d = 8; + break; + case 91: + d = 9; + break; + case 94: + d = 11; + break; + case 36: + d = 12; + break; + case 40: + d = 6; + if (a.d >= a.j) break; + if (bfb(a.i, a.d) != 63) break; + if (++a.d >= a.j) throw vbb(new mde(tvd((h0d(), vue)))); + b = bfb(a.i, a.d++); + switch (b) { + case 58: + d = 13; + break; + case 61: + d = 14; + break; + case 33: + d = 15; + break; + case 91: + d = 19; + break; + case 62: + d = 18; + break; + case 60: + if (a.d >= a.j) throw vbb(new mde(tvd((h0d(), vue)))); + b = bfb(a.i, a.d++); + if (b == 61) { + d = 16; + } else if (b == 33) { + d = 17; + } else throw vbb(new mde(tvd((h0d(), wue)))); + break; + case 35: + while (a.d < a.j) { + b = bfb(a.i, a.d++); + if (b == 41) break; + } + if (b != 41) throw vbb(new mde(tvd((h0d(), xue)))); + d = 21; + break; + default: + if (b == 45 || (97 <= b && b <= 122) || (65 <= b && b <= 90)) { + --a.d; + d = 22; + break; + } else if (b == 40) { + d = 23; + break; + } + throw vbb(new mde(tvd((h0d(), vue)))); + } + break; + case 92: + d = 10; + if (a.d >= a.j) throw vbb(new mde(tvd((h0d(), uue)))); + a.a = bfb(a.i, a.d++); + break; + default: + d = 0; + } + a.c = d; + } + function P5b(a) { + var b, + c, + d, + e, + f, + g, + h, + i, + j, + k, + l, + m, + n, + o, + p, + q, + r, + s, + t, + u, + v, + w, + A, + B, + C, + D, + F, + G; + A = BD(vNb(a, (Nyc(), Vxc)), 98); + if (!(A != (dcd(), bcd) && A != ccd)) { + return; + } + o = a.b; + n = o.c.length; + k = new Skb((Xj(n + 2, Mie), Oy(wbb(wbb(5, n + 2), ((n + 2) / 10) | 0)))); + p = new Skb((Xj(n + 2, Mie), Oy(wbb(wbb(5, n + 2), ((n + 2) / 10) | 0)))); + Ekb(k, new Lqb()); + Ekb(k, new Lqb()); + Ekb(p, new Rkb()); + Ekb(p, new Rkb()); + w = new Rkb(); + for (b = 0; b < n; b++) { + c = (tCb(b, o.c.length), BD(o.c[b], 29)); + B = (tCb(b, k.c.length), BD(k.c[b], 83)); + q = new Lqb(); + k.c[k.c.length] = q; + D = (tCb(b, p.c.length), BD(p.c[b], 15)); + s = new Rkb(); + p.c[p.c.length] = s; + for (e = new olb(c.a); e.a < e.c.c.length; ) { + d = BD(mlb(e), 10); + if (L5b(d)) { + w.c[w.c.length] = d; + continue; + } + for (j = new Sr(ur(R_b(d).a.Kc(), new Sq())); Qr(j); ) { + h = BD(Rr(j), 17); + F = h.c.i; + if (!L5b(F)) { + continue; + } + C = BD(B.xc(vNb(F, (wtc(), $sc))), 10); + if (!C) { + C = K5b(a, F); + B.zc(vNb(F, $sc), C); + D.Fc(C); + } + QZb(h, BD(Ikb(C.j, 1), 11)); + } + for (i = new Sr(ur(U_b(d).a.Kc(), new Sq())); Qr(i); ) { + h = BD(Rr(i), 17); + G = h.d.i; + if (!L5b(G)) { + continue; + } + r = BD(Ohb(q, vNb(G, (wtc(), $sc))), 10); + if (!r) { + r = K5b(a, G); + Rhb(q, vNb(G, $sc), r); + s.c[s.c.length] = r; + } + RZb(h, BD(Ikb(r.j, 0), 11)); + } + } + } + for (l = 0; l < p.c.length; l++) { + t = (tCb(l, p.c.length), BD(p.c[l], 15)); + if (t.dc()) { + continue; + } + m = null; + if (l == 0) { + m = new H1b(a); + wCb(0, o.c.length); + aCb(o.c, 0, m); + } else if (l == k.c.length - 1) { + m = new H1b(a); + o.c[o.c.length] = m; + } else { + m = (tCb(l - 1, o.c.length), BD(o.c[l - 1], 29)); + } + for (g = t.Kc(); g.Ob(); ) { + f = BD(g.Pb(), 10); + $_b(f, m); + } + } + for (v = new olb(w); v.a < v.c.c.length; ) { + u = BD(mlb(v), 10); + $_b(u, null); + } + yNb(a, (wtc(), Fsc), w); + } + function BCc(a, b, c) { + var d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v; + Odd(c, "Coffman-Graham Layering", 1); + if (b.a.c.length == 0) { + Qdd(c); + return; + } + v = BD(vNb(b, (Nyc(), kxc)), 19).a; + i = 0; + g = 0; + for (m = new olb(b.a); m.a < m.c.c.length; ) { + l = BD(mlb(m), 10); + l.p = i++; + for (f = new Sr(ur(U_b(l).a.Kc(), new Sq())); Qr(f); ) { + e = BD(Rr(f), 17); + e.p = g++; + } + } + a.d = KC(sbb, dle, 25, i, 16, 1); + a.a = KC(sbb, dle, 25, g, 16, 1); + a.b = KC(WD, oje, 25, i, 15, 1); + a.e = KC(WD, oje, 25, i, 15, 1); + a.f = KC(WD, oje, 25, i, 15, 1); + Nc(a.c); + CCc(a, b); + o = new gub(new GCc(a)); + for (u = new olb(b.a); u.a < u.c.c.length; ) { + s = BD(mlb(u), 10); + for (f = new Sr(ur(R_b(s).a.Kc(), new Sq())); Qr(f); ) { + e = BD(Rr(f), 17); + a.a[e.p] || ++a.b[s.p]; + } + a.b[s.p] == 0 && (zCb(cub(o, s)), true); + } + h = 0; + while (o.b.c.length != 0) { + s = BD(dub(o), 10); + a.f[s.p] = h++; + for (f = new Sr(ur(U_b(s).a.Kc(), new Sq())); Qr(f); ) { + e = BD(Rr(f), 17); + if (a.a[e.p]) { + continue; + } + q = e.d.i; + --a.b[q.p]; + Rc(a.c, q, meb(a.f[s.p])); + a.b[q.p] == 0 && (zCb(cub(o, q)), true); + } + } + n = new gub(new KCc(a)); + for (t = new olb(b.a); t.a < t.c.c.length; ) { + s = BD(mlb(t), 10); + for (f = new Sr(ur(U_b(s).a.Kc(), new Sq())); Qr(f); ) { + e = BD(Rr(f), 17); + a.a[e.p] || ++a.e[s.p]; + } + a.e[s.p] == 0 && (zCb(cub(n, s)), true); + } + k = new Rkb(); + d = yCc(b, k); + while (n.b.c.length != 0) { + r = BD(dub(n), 10); + (d.a.c.length >= v || !wCc(r, d)) && (d = yCc(b, k)); + $_b(r, d); + for (f = new Sr(ur(R_b(r).a.Kc(), new Sq())); Qr(f); ) { + e = BD(Rr(f), 17); + if (a.a[e.p]) { + continue; + } + p = e.c.i; + --a.e[p.p]; + a.e[p.p] == 0 && (zCb(cub(n, p)), true); + } + } + for (j = k.c.length - 1; j >= 0; --j) { + Ekb(b.b, (tCb(j, k.c.length), BD(k.c[j], 29))); + } + b.a.c = KC(SI, Uhe, 1, 0, 5, 1); + Qdd(c); + } + function gee(a) { + var b, c, d, e, f, g, h, i, j; + a.b = 1; + nde(a); + b = null; + if (a.c == 0 && a.a == 94) { + nde(a); + b = (wfe(), wfe(), ++vfe, new $fe(4)); + Ufe(b, 0, lxe); + h = (null, ++vfe, new $fe(4)); + } else { + h = (wfe(), wfe(), ++vfe, new $fe(4)); + } + e = true; + while ((j = a.c) != 1) { + if (j == 0 && a.a == 93 && !e) { + if (b) { + Zfe(b, h); + h = b; + } + break; + } + c = a.a; + d = false; + if (j == 10) { + switch (c) { + case 100: + case 68: + case 119: + case 87: + case 115: + case 83: + Xfe(h, fee(c)); + d = true; + break; + case 105: + case 73: + case 99: + case 67: + c = (Xfe(h, fee(c)), -1); + c < 0 && (d = true); + break; + case 112: + case 80: + i = tde(a, c); + if (!i) throw vbb(new mde(tvd((h0d(), Iue)))); + Xfe(h, i); + d = true; + break; + default: + c = eee(a); + } + } else if (j == 24 && !e) { + if (b) { + Zfe(b, h); + h = b; + } + f = gee(a); + Zfe(h, f); + if (a.c != 0 || a.a != 93) throw vbb(new mde(tvd((h0d(), Mue)))); + break; + } + nde(a); + if (!d) { + if (j == 0) { + if (c == 91) throw vbb(new mde(tvd((h0d(), Nue)))); + if (c == 93) throw vbb(new mde(tvd((h0d(), Oue)))); + if (c == 45 && !e && a.a != 93) + throw vbb(new mde(tvd((h0d(), Pue)))); + } + if (a.c != 0 || a.a != 45 || (c == 45 && e)) { + Ufe(h, c, c); + } else { + nde(a); + if ((j = a.c) == 1) throw vbb(new mde(tvd((h0d(), Kue)))); + if (j == 0 && a.a == 93) { + Ufe(h, c, c); + Ufe(h, 45, 45); + } else if ((j == 0 && a.a == 93) || j == 24) { + throw vbb(new mde(tvd((h0d(), Pue)))); + } else { + g = a.a; + if (j == 0) { + if (g == 91) throw vbb(new mde(tvd((h0d(), Nue)))); + if (g == 93) throw vbb(new mde(tvd((h0d(), Oue)))); + if (g == 45) throw vbb(new mde(tvd((h0d(), Pue)))); + } else j == 10 && (g = eee(a)); + nde(a); + if (c > g) throw vbb(new mde(tvd((h0d(), Sue)))); + Ufe(h, c, g); + } + } + } + e = false; + } + if (a.c == 1) throw vbb(new mde(tvd((h0d(), Kue)))); + Yfe(h); + Vfe(h); + a.b = 0; + nde(a); + return h; + } + function xZd(a) { + Bnd( + a.c, + Rve, + OC(GC(ZI, 1), nie, 2, 6, [ + cwe, + "http://www.w3.org/2001/XMLSchema#decimal", + ]) + ); + Bnd( + a.d, + Rve, + OC(GC(ZI, 1), nie, 2, 6, [ + cwe, + "http://www.w3.org/2001/XMLSchema#integer", + ]) + ); + Bnd( + a.e, + Rve, + OC(GC(ZI, 1), nie, 2, 6, [ + cwe, + "http://www.w3.org/2001/XMLSchema#boolean", + ]) + ); + Bnd( + a.f, + Rve, + OC(GC(ZI, 1), nie, 2, 6, [cwe, "EBoolean", fue, "EBoolean:Object"]) + ); + Bnd( + a.i, + Rve, + OC(GC(ZI, 1), nie, 2, 6, [cwe, "http://www.w3.org/2001/XMLSchema#byte"]) + ); + Bnd( + a.g, + Rve, + OC(GC(ZI, 1), nie, 2, 6, [ + cwe, + "http://www.w3.org/2001/XMLSchema#hexBinary", + ]) + ); + Bnd( + a.j, + Rve, + OC(GC(ZI, 1), nie, 2, 6, [cwe, "EByte", fue, "EByte:Object"]) + ); + Bnd( + a.n, + Rve, + OC(GC(ZI, 1), nie, 2, 6, [cwe, "EChar", fue, "EChar:Object"]) + ); + Bnd( + a.t, + Rve, + OC(GC(ZI, 1), nie, 2, 6, [ + cwe, + "http://www.w3.org/2001/XMLSchema#double", + ]) + ); + Bnd( + a.u, + Rve, + OC(GC(ZI, 1), nie, 2, 6, [cwe, "EDouble", fue, "EDouble:Object"]) + ); + Bnd( + a.F, + Rve, + OC(GC(ZI, 1), nie, 2, 6, [ + cwe, + "http://www.w3.org/2001/XMLSchema#float", + ]) + ); + Bnd( + a.G, + Rve, + OC(GC(ZI, 1), nie, 2, 6, [cwe, "EFloat", fue, "EFloat:Object"]) + ); + Bnd( + a.I, + Rve, + OC(GC(ZI, 1), nie, 2, 6, [cwe, "http://www.w3.org/2001/XMLSchema#int"]) + ); + Bnd( + a.J, + Rve, + OC(GC(ZI, 1), nie, 2, 6, [cwe, "EInt", fue, "EInt:Object"]) + ); + Bnd( + a.N, + Rve, + OC(GC(ZI, 1), nie, 2, 6, [cwe, "http://www.w3.org/2001/XMLSchema#long"]) + ); + Bnd( + a.O, + Rve, + OC(GC(ZI, 1), nie, 2, 6, [cwe, "ELong", fue, "ELong:Object"]) + ); + Bnd( + a.Z, + Rve, + OC(GC(ZI, 1), nie, 2, 6, [ + cwe, + "http://www.w3.org/2001/XMLSchema#short", + ]) + ); + Bnd( + a.$, + Rve, + OC(GC(ZI, 1), nie, 2, 6, [cwe, "EShort", fue, "EShort:Object"]) + ); + Bnd( + a._, + Rve, + OC(GC(ZI, 1), nie, 2, 6, [ + cwe, + "http://www.w3.org/2001/XMLSchema#string", + ]) + ); + } + function fRc(a) { + var b, + c, + d, + e, + f, + g, + h, + i, + j, + k, + l, + m, + n, + o, + p, + q, + r, + s, + t, + u, + v, + w, + A, + B, + C, + D, + F, + G; + if (a.c.length == 1) { + return tCb(0, a.c.length), BD(a.c[0], 135); + } else if (a.c.length <= 0) { + return new SRc(); + } + for (i = new olb(a); i.a < i.c.c.length; ) { + g = BD(mlb(i), 135); + s = 0; + o = Ohe; + p = Ohe; + m = Rie; + n = Rie; + for (r = Jsb(g.b, 0); r.b != r.d.c; ) { + q = BD(Xsb(r), 86); + s += BD(vNb(q, (JTc(), ETc)), 19).a; + o = Math.min(o, q.e.a); + p = Math.min(p, q.e.b); + m = Math.max(m, q.e.a + q.f.a); + n = Math.max(n, q.e.b + q.f.b); + } + yNb(g, (JTc(), ETc), meb(s)); + yNb(g, (mTc(), WSc), new f7c(o, p)); + yNb(g, VSc, new f7c(m, n)); + } + mmb(); + Okb(a, new jRc()); + v = new SRc(); + tNb(v, (tCb(0, a.c.length), BD(a.c[0], 94))); + l = 0; + D = 0; + for (j = new olb(a); j.a < j.c.c.length; ) { + g = BD(mlb(j), 135); + w = c7c(R6c(BD(vNb(g, (mTc(), VSc)), 8)), BD(vNb(g, WSc), 8)); + l = Math.max(l, w.a); + D += w.a * w.b; + } + l = Math.max(l, Math.sqrt(D) * Edb(ED(vNb(v, (JTc(), uTc))))); + A = Edb(ED(vNb(v, HTc))); + F = 0; + G = 0; + k = 0; + b = A; + for (h = new olb(a); h.a < h.c.c.length; ) { + g = BD(mlb(h), 135); + w = c7c(R6c(BD(vNb(g, (mTc(), VSc)), 8)), BD(vNb(g, WSc), 8)); + if (F + w.a > l) { + F = 0; + G += k + A; + k = 0; + } + eRc(v, g, F, G); + b = Math.max(b, F + w.a); + k = Math.max(k, w.b); + F += w.a + A; + } + u = new Lqb(); + c = new Lqb(); + for (C = new olb(a); C.a < C.c.c.length; ) { + B = BD(mlb(C), 135); + d = Ccb(DD(vNb(B, (Y9c(), y8c)))); + t = !B.q ? (null, kmb) : B.q; + for (f = t.vc().Kc(); f.Ob(); ) { + e = BD(f.Pb(), 42); + if (Mhb(u, e.cd())) { + if (PD(BD(e.cd(), 146).wg()) !== PD(e.dd())) { + if (d && Mhb(c, e.cd())) { + Zfb(); + "Found different values for property " + + BD(e.cd(), 146).tg() + + " in components."; + } else { + Rhb(u, BD(e.cd(), 146), e.dd()); + yNb(v, BD(e.cd(), 146), e.dd()); + d && Rhb(c, BD(e.cd(), 146), e.dd()); + } + } + } else { + Rhb(u, BD(e.cd(), 146), e.dd()); + yNb(v, BD(e.cd(), 146), e.dd()); + } + } + } + return v; + } + function MYb() { + MYb = ccb; + xXb(); + LYb = new Hp(); + Rc(LYb, (Ucd(), Gcd), Fcd); + Rc(LYb, Qcd, Fcd); + Rc(LYb, Hcd, Fcd); + Rc(LYb, Ncd, Fcd); + Rc(LYb, Mcd, Fcd); + Rc(LYb, Kcd, Fcd); + Rc(LYb, Ncd, Gcd); + Rc(LYb, Fcd, Bcd); + Rc(LYb, Gcd, Bcd); + Rc(LYb, Qcd, Bcd); + Rc(LYb, Hcd, Bcd); + Rc(LYb, Lcd, Bcd); + Rc(LYb, Ncd, Bcd); + Rc(LYb, Mcd, Bcd); + Rc(LYb, Kcd, Bcd); + Rc(LYb, Ecd, Bcd); + Rc(LYb, Fcd, Ocd); + Rc(LYb, Gcd, Ocd); + Rc(LYb, Bcd, Ocd); + Rc(LYb, Qcd, Ocd); + Rc(LYb, Hcd, Ocd); + Rc(LYb, Lcd, Ocd); + Rc(LYb, Ncd, Ocd); + Rc(LYb, Ecd, Ocd); + Rc(LYb, Pcd, Ocd); + Rc(LYb, Mcd, Ocd); + Rc(LYb, Icd, Ocd); + Rc(LYb, Kcd, Ocd); + Rc(LYb, Gcd, Qcd); + Rc(LYb, Hcd, Qcd); + Rc(LYb, Ncd, Qcd); + Rc(LYb, Kcd, Qcd); + Rc(LYb, Gcd, Hcd); + Rc(LYb, Qcd, Hcd); + Rc(LYb, Ncd, Hcd); + Rc(LYb, Hcd, Hcd); + Rc(LYb, Mcd, Hcd); + Rc(LYb, Fcd, Ccd); + Rc(LYb, Gcd, Ccd); + Rc(LYb, Bcd, Ccd); + Rc(LYb, Ocd, Ccd); + Rc(LYb, Qcd, Ccd); + Rc(LYb, Hcd, Ccd); + Rc(LYb, Lcd, Ccd); + Rc(LYb, Ncd, Ccd); + Rc(LYb, Pcd, Ccd); + Rc(LYb, Ecd, Ccd); + Rc(LYb, Kcd, Ccd); + Rc(LYb, Mcd, Ccd); + Rc(LYb, Jcd, Ccd); + Rc(LYb, Fcd, Pcd); + Rc(LYb, Gcd, Pcd); + Rc(LYb, Bcd, Pcd); + Rc(LYb, Qcd, Pcd); + Rc(LYb, Hcd, Pcd); + Rc(LYb, Lcd, Pcd); + Rc(LYb, Ncd, Pcd); + Rc(LYb, Ecd, Pcd); + Rc(LYb, Kcd, Pcd); + Rc(LYb, Icd, Pcd); + Rc(LYb, Jcd, Pcd); + Rc(LYb, Gcd, Ecd); + Rc(LYb, Qcd, Ecd); + Rc(LYb, Hcd, Ecd); + Rc(LYb, Ncd, Ecd); + Rc(LYb, Pcd, Ecd); + Rc(LYb, Kcd, Ecd); + Rc(LYb, Mcd, Ecd); + Rc(LYb, Fcd, Dcd); + Rc(LYb, Gcd, Dcd); + Rc(LYb, Bcd, Dcd); + Rc(LYb, Qcd, Dcd); + Rc(LYb, Hcd, Dcd); + Rc(LYb, Lcd, Dcd); + Rc(LYb, Ncd, Dcd); + Rc(LYb, Ecd, Dcd); + Rc(LYb, Kcd, Dcd); + Rc(LYb, Gcd, Mcd); + Rc(LYb, Bcd, Mcd); + Rc(LYb, Ocd, Mcd); + Rc(LYb, Hcd, Mcd); + Rc(LYb, Fcd, Icd); + Rc(LYb, Gcd, Icd); + Rc(LYb, Ocd, Icd); + Rc(LYb, Qcd, Icd); + Rc(LYb, Hcd, Icd); + Rc(LYb, Lcd, Icd); + Rc(LYb, Ncd, Icd); + Rc(LYb, Ncd, Jcd); + Rc(LYb, Hcd, Jcd); + Rc(LYb, Ecd, Fcd); + Rc(LYb, Ecd, Qcd); + Rc(LYb, Ecd, Bcd); + Rc(LYb, Lcd, Fcd); + Rc(LYb, Lcd, Gcd); + Rc(LYb, Lcd, Ocd); + } + function HVd(a, b) { + switch (a.e) { + case 0: + case 2: + case 4: + case 6: + case 42: + case 44: + case 46: + case 48: + case 8: + case 10: + case 12: + case 14: + case 16: + case 18: + case 20: + case 22: + case 24: + case 26: + case 28: + case 30: + case 32: + case 34: + case 36: + case 38: + return new U5d(a.b, a.a, b, a.c); + case 1: + return new BMd(a.a, b, bLd(b.Tg(), a.c)); + case 43: + return new N4d(a.a, b, bLd(b.Tg(), a.c)); + case 3: + return new xMd(a.a, b, bLd(b.Tg(), a.c)); + case 45: + return new K4d(a.a, b, bLd(b.Tg(), a.c)); + case 41: + return new dId(BD(wId(a.c), 26), a.a, b, bLd(b.Tg(), a.c)); + case 50: + return new c6d(BD(wId(a.c), 26), a.a, b, bLd(b.Tg(), a.c)); + case 5: + return new Q4d(a.a, b, bLd(b.Tg(), a.c), a.d.n); + case 47: + return new U4d(a.a, b, bLd(b.Tg(), a.c), a.d.n); + case 7: + return new cUd(a.a, b, bLd(b.Tg(), a.c), a.d.n); + case 49: + return new gUd(a.a, b, bLd(b.Tg(), a.c), a.d.n); + case 9: + return new I4d(a.a, b, bLd(b.Tg(), a.c)); + case 11: + return new G4d(a.a, b, bLd(b.Tg(), a.c)); + case 13: + return new C4d(a.a, b, bLd(b.Tg(), a.c)); + case 15: + return new k2d(a.a, b, bLd(b.Tg(), a.c)); + case 17: + return new c5d(a.a, b, bLd(b.Tg(), a.c)); + case 19: + return new _4d(a.a, b, bLd(b.Tg(), a.c)); + case 21: + return new X4d(a.a, b, bLd(b.Tg(), a.c)); + case 23: + return new pMd(a.a, b, bLd(b.Tg(), a.c)); + case 25: + return new D5d(a.a, b, bLd(b.Tg(), a.c), a.d.n); + case 27: + return new y5d(a.a, b, bLd(b.Tg(), a.c), a.d.n); + case 29: + return new t5d(a.a, b, bLd(b.Tg(), a.c), a.d.n); + case 31: + return new n5d(a.a, b, bLd(b.Tg(), a.c), a.d.n); + case 33: + return new A5d(a.a, b, bLd(b.Tg(), a.c), a.d.n); + case 35: + return new v5d(a.a, b, bLd(b.Tg(), a.c), a.d.n); + case 37: + return new p5d(a.a, b, bLd(b.Tg(), a.c), a.d.n); + case 39: + return new i5d(a.a, b, bLd(b.Tg(), a.c), a.d.n); + case 40: + return new u3d(b, bLd(b.Tg(), a.c)); + default: + throw vbb(new hz("Unknown feature style: " + a.e)); + } + } + function BMc(a, b, c) { + var d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w; + Odd(c, "Brandes & Koepf node placement", 1); + a.a = b; + a.c = KMc(b); + d = BD(vNb(b, (Nyc(), zxc)), 274); + n = Ccb(DD(vNb(b, Axc))); + a.d = (d == (lrc(), irc) && !n) || d == frc; + AMc(a, b); + v = null; + w = null; + r = null; + s = null; + q = (Xj(4, Jie), new Skb(4)); + switch (BD(vNb(b, zxc), 274).g) { + case 3: + r = new ULc(b, a.c.d, (eMc(), cMc), (YLc(), WLc)); + q.c[q.c.length] = r; + break; + case 1: + s = new ULc(b, a.c.d, (eMc(), dMc), (YLc(), WLc)); + q.c[q.c.length] = s; + break; + case 4: + v = new ULc(b, a.c.d, (eMc(), cMc), (YLc(), XLc)); + q.c[q.c.length] = v; + break; + case 2: + w = new ULc(b, a.c.d, (eMc(), dMc), (YLc(), XLc)); + q.c[q.c.length] = w; + break; + default: + r = new ULc(b, a.c.d, (eMc(), cMc), (YLc(), WLc)); + s = new ULc(b, a.c.d, dMc, WLc); + v = new ULc(b, a.c.d, cMc, XLc); + w = new ULc(b, a.c.d, dMc, XLc); + q.c[q.c.length] = v; + q.c[q.c.length] = w; + q.c[q.c.length] = r; + q.c[q.c.length] = s; + } + e = new mMc(b, a.c); + for (h = new olb(q); h.a < h.c.c.length; ) { + f = BD(mlb(h), 180); + lMc(e, f, a.b); + kMc(f); + } + m = new rMc(b, a.c); + for (i = new olb(q); i.a < i.c.c.length; ) { + f = BD(mlb(i), 180); + oMc(m, f); + } + if (c.n) { + for (j = new olb(q); j.a < j.c.c.length; ) { + f = BD(mlb(j), 180); + Sdd(c, f + " size is " + SLc(f)); + } + } + l = null; + if (a.d) { + k = yMc(a, q, a.c.d); + xMc(b, k, c) && (l = k); + } + if (!l) { + for (j = new olb(q); j.a < j.c.c.length; ) { + f = BD(mlb(j), 180); + xMc(b, f, c) && (!l || SLc(l) > SLc(f)) && (l = f); + } + } + !l && (l = (tCb(0, q.c.length), BD(q.c[0], 180))); + for (p = new olb(b.b); p.a < p.c.c.length; ) { + o = BD(mlb(p), 29); + for (u = new olb(o.a); u.a < u.c.c.length; ) { + t = BD(mlb(u), 10); + t.n.b = Edb(l.p[t.p]) + Edb(l.d[t.p]); + } + } + if (c.n) { + Sdd(c, "Chosen node placement: " + l); + Sdd(c, "Blocks: " + DMc(l)); + Sdd(c, "Classes: " + EMc(l, c)); + Sdd(c, "Marked edges: " + a.b); + } + for (g = new olb(q); g.a < g.c.c.length; ) { + f = BD(mlb(g), 180); + f.g = null; + f.b = null; + f.a = null; + f.d = null; + f.j = null; + f.i = null; + f.p = null; + } + IMc(a.c); + a.b.a.$b(); + Qdd(c); + } + function V1b(a, b, c) { + var d, + e, + f, + g, + h, + i, + j, + k, + l, + m, + n, + o, + p, + q, + r, + s, + t, + u, + v, + w, + A, + B, + C, + D, + F; + g = new Psb(); + v = BD(vNb(c, (Nyc(), Lwc)), 103); + o = 0; + ye(g, (!b.a && (b.a = new cUd(E2, b, 10, 11)), b.a)); + while (g.b != 0) { + j = BD(g.b == 0 ? null : (sCb(g.b != 0), Nsb(g, g.a.a)), 33); + (PD(hkd(b, ywc)) !== PD((tAc(), rAc)) || + PD(hkd(b, Jwc)) === PD((mqc(), lqc)) || + PD(hkd(b, Jwc)) === PD((mqc(), jqc)) || + Ccb(DD(hkd(b, Awc))) || + PD(hkd(b, twc)) !== PD((RXb(), QXb))) && + !Ccb(DD(hkd(j, xwc))) && + jkd(j, (wtc(), Zsc), meb(o++)); + q = !Ccb(DD(hkd(j, Jxc))); + if (q) { + l = (!j.a && (j.a = new cUd(E2, j, 10, 11)), j.a).i != 0; + n = S1b(j); + m = PD(hkd(j, axc)) === PD((hbd(), ebd)); + F = !ikd(j, (Y9c(), o8c)) || dfb(GD(hkd(j, o8c)), sne); + t = null; + if (F && m && (l || n)) { + t = P1b(j); + yNb(t, Lwc, v); + wNb(t, hyc) && Wyc(new ezc(Edb(ED(vNb(t, hyc)))), t); + if (BD(hkd(j, Fxc), 174).gc() != 0) { + k = t; + MAb( + new YAb( + null, + (!j.c && (j.c = new cUd(F2, j, 9, 9)), new Kub(j.c, 16)) + ), + new k2b(k) + ); + L1b(j, t); + } + } + w = c; + A = BD(Ohb(a.a, Xod(j)), 10); + !!A && (w = A.e); + s = $1b(a, j, w); + if (t) { + s.e = t; + t.e = s; + ye(g, (!j.a && (j.a = new cUd(E2, j, 10, 11)), j.a)); + } + } + } + o = 0; + Gsb(g, b, g.c.b, g.c); + while (g.b != 0) { + f = BD(g.b == 0 ? null : (sCb(g.b != 0), Nsb(g, g.a.a)), 33); + for ( + i = new Fyd((!f.b && (f.b = new cUd(B2, f, 12, 3)), f.b)); + i.e != i.i.gc(); + + ) { + h = BD(Dyd(i), 79); + N1b(h); + (PD(hkd(b, ywc)) !== PD((tAc(), rAc)) || + PD(hkd(b, Jwc)) === PD((mqc(), lqc)) || + PD(hkd(b, Jwc)) === PD((mqc(), jqc)) || + Ccb(DD(hkd(b, Awc))) || + PD(hkd(b, twc)) !== PD((RXb(), QXb))) && + jkd(h, (wtc(), Zsc), meb(o++)); + C = atd(BD(qud((!h.b && (h.b = new y5d(z2, h, 4, 7)), h.b), 0), 82)); + D = atd(BD(qud((!h.c && (h.c = new y5d(z2, h, 5, 8)), h.c), 0), 82)); + if ( + Ccb(DD(hkd(h, Jxc))) || + Ccb(DD(hkd(C, Jxc))) || + Ccb(DD(hkd(D, Jxc))) + ) { + continue; + } + p = Qld(h) && Ccb(DD(hkd(C, fxc))) && Ccb(DD(hkd(h, gxc))); + u = f; + p || ntd(D, C) ? (u = C) : ntd(C, D) && (u = D); + w = c; + A = BD(Ohb(a.a, u), 10); + !!A && (w = A.e); + r = X1b(a, h, u, w); + yNb(r, (wtc(), xsc), R1b(a, h, b, c)); + } + m = PD(hkd(f, axc)) === PD((hbd(), ebd)); + if (m) { + for ( + e = new Fyd((!f.a && (f.a = new cUd(E2, f, 10, 11)), f.a)); + e.e != e.i.gc(); + + ) { + d = BD(Dyd(e), 33); + F = !ikd(d, (Y9c(), o8c)) || dfb(GD(hkd(d, o8c)), sne); + B = PD(hkd(d, axc)) === PD(ebd); + F && B && (Gsb(g, d, g.c.b, g.c), true); + } + } + } + } + function vA(a, b, c, d, e, f) { + var g, h, i, j, k, l, m, n, o, p, q, r; + switch (b) { + case 71: + h = d.q.getFullYear() - nje >= -1900 ? 1 : 0; + c >= 4 + ? Qfb(a, OC(GC(ZI, 1), nie, 2, 6, [pje, qje])[h]) + : Qfb(a, OC(GC(ZI, 1), nie, 2, 6, ["BC", "AD"])[h]); + break; + case 121: + kA(a, c, d); + break; + case 77: + jA(a, c, d); + break; + case 107: + i = e.q.getHours(); + i == 0 ? EA(a, 24, c) : EA(a, i, c); + break; + case 83: + iA(a, c, e); + break; + case 69: + k = d.q.getDay(); + c == 5 + ? Qfb( + a, + OC(GC(ZI, 1), nie, 2, 6, ["S", "M", "T", "W", "T", "F", "S"])[k] + ) + : c == 4 + ? Qfb( + a, + OC(GC(ZI, 1), nie, 2, 6, [rje, sje, tje, uje, vje, wje, xje])[k] + ) + : Qfb( + a, + OC(GC(ZI, 1), nie, 2, 6, [ + "Sun", + "Mon", + "Tue", + "Wed", + "Thu", + "Fri", + "Sat", + ])[k] + ); + break; + case 97: + e.q.getHours() >= 12 && e.q.getHours() < 24 + ? Qfb(a, OC(GC(ZI, 1), nie, 2, 6, ["AM", "PM"])[1]) + : Qfb(a, OC(GC(ZI, 1), nie, 2, 6, ["AM", "PM"])[0]); + break; + case 104: + l = e.q.getHours() % 12; + l == 0 ? EA(a, 12, c) : EA(a, l, c); + break; + case 75: + m = e.q.getHours() % 12; + EA(a, m, c); + break; + case 72: + n = e.q.getHours(); + EA(a, n, c); + break; + case 99: + o = d.q.getDay(); + c == 5 + ? Qfb( + a, + OC(GC(ZI, 1), nie, 2, 6, ["S", "M", "T", "W", "T", "F", "S"])[o] + ) + : c == 4 + ? Qfb( + a, + OC(GC(ZI, 1), nie, 2, 6, [rje, sje, tje, uje, vje, wje, xje])[o] + ) + : c == 3 + ? Qfb( + a, + OC(GC(ZI, 1), nie, 2, 6, [ + "Sun", + "Mon", + "Tue", + "Wed", + "Thu", + "Fri", + "Sat", + ])[o] + ) + : EA(a, o, 1); + break; + case 76: + p = d.q.getMonth(); + c == 5 + ? Qfb( + a, + OC(GC(ZI, 1), nie, 2, 6, [ + "J", + "F", + "M", + "A", + "M", + "J", + "J", + "A", + "S", + "O", + "N", + "D", + ])[p] + ) + : c == 4 + ? Qfb( + a, + OC(GC(ZI, 1), nie, 2, 6, [ + bje, + cje, + dje, + eje, + fje, + gje, + hje, + ije, + jje, + kje, + lje, + mje, + ])[p] + ) + : c == 3 + ? Qfb( + a, + OC(GC(ZI, 1), nie, 2, 6, [ + "Jan", + "Feb", + "Mar", + "Apr", + fje, + "Jun", + "Jul", + "Aug", + "Sep", + "Oct", + "Nov", + "Dec", + ])[p] + ) + : EA(a, p + 1, c); + break; + case 81: + q = (d.q.getMonth() / 3) | 0; + c < 4 + ? Qfb(a, OC(GC(ZI, 1), nie, 2, 6, ["Q1", "Q2", "Q3", "Q4"])[q]) + : Qfb( + a, + OC(GC(ZI, 1), nie, 2, 6, [ + "1st quarter", + "2nd quarter", + "3rd quarter", + "4th quarter", + ])[q] + ); + break; + case 100: + r = d.q.getDate(); + EA(a, r, c); + break; + case 109: + j = e.q.getMinutes(); + EA(a, j, c); + break; + case 115: + g = e.q.getSeconds(); + EA(a, g, c); + break; + case 122: + c < 4 ? Qfb(a, f.c[0]) : Qfb(a, f.c[1]); + break; + case 118: + Qfb(a, f.b); + break; + case 90: + c < 3 ? Qfb(a, OA(f)) : c == 3 ? Qfb(a, NA(f)) : Qfb(a, QA(f.a)); + break; + default: + return false; + } + return true; + } + function X1b(a, b, c, d) { + var e, + f, + g, + h, + i, + j, + k, + l, + m, + n, + o, + p, + q, + r, + s, + t, + u, + v, + w, + A, + B, + C, + D, + F, + G, + H; + N1b(b); + i = BD(qud((!b.b && (b.b = new y5d(z2, b, 4, 7)), b.b), 0), 82); + k = BD(qud((!b.c && (b.c = new y5d(z2, b, 5, 8)), b.c), 0), 82); + h = atd(i); + j = atd(k); + g = + (!b.a && (b.a = new cUd(A2, b, 6, 6)), b.a).i == 0 + ? null + : BD(qud((!b.a && (b.a = new cUd(A2, b, 6, 6)), b.a), 0), 202); + A = BD(Ohb(a.a, h), 10); + F = BD(Ohb(a.a, j), 10); + B = null; + G = null; + if (JD(i, 186)) { + w = BD(Ohb(a.a, i), 299); + if (JD(w, 11)) { + B = BD(w, 11); + } else if (JD(w, 10)) { + A = BD(w, 10); + B = BD(Ikb(A.j, 0), 11); + } + } + if (JD(k, 186)) { + D = BD(Ohb(a.a, k), 299); + if (JD(D, 11)) { + G = BD(D, 11); + } else if (JD(D, 10)) { + F = BD(D, 10); + G = BD(Ikb(F.j, 0), 11); + } + } + if (!A || !F) { + throw vbb( + new z2c( + "The source or the target of edge " + + b + + " could not be found. " + + "This usually happens when an edge connects a node laid out by ELK Layered to a node in " + + "another level of hierarchy laid out by either another instance of ELK Layered or another " + + "layout algorithm alltogether. The former can be solved by setting the hierarchyHandling " + + "option to INCLUDE_CHILDREN." + ) + ); + } + p = new UZb(); + tNb(p, b); + yNb(p, (wtc(), $sc), b); + yNb(p, (Nyc(), jxc), null); + n = BD(vNb(d, Ksc), 21); + A == F && n.Fc((Orc(), Nrc)); + if (!B) { + v = (KAc(), IAc); + C = null; + if (!!g && fcd(BD(vNb(A, Vxc), 98))) { + C = new f7c(g.j, g.k); + Bfd(C, Mld(b)); + Cfd(C, c); + if (ntd(j, h)) { + v = HAc; + P6c(C, A.n); + } + } + B = $$b(A, C, v, d); + } + if (!G) { + v = (KAc(), HAc); + H = null; + if (!!g && fcd(BD(vNb(F, Vxc), 98))) { + H = new f7c(g.b, g.c); + Bfd(H, Mld(b)); + Cfd(H, c); + } + G = $$b(F, H, v, Q_b(F)); + } + QZb(p, B); + RZb(p, G); + (B.e.c.length > 1 || + B.g.c.length > 1 || + G.e.c.length > 1 || + G.g.c.length > 1) && + n.Fc((Orc(), Irc)); + for ( + m = new Fyd((!b.n && (b.n = new cUd(D2, b, 1, 7)), b.n)); + m.e != m.i.gc(); + + ) { + l = BD(Dyd(m), 137); + if (!Ccb(DD(hkd(l, Jxc))) && !!l.a) { + q = Z1b(l); + Ekb(p.b, q); + switch (BD(vNb(q, Qwc), 272).g) { + case 1: + case 2: + n.Fc((Orc(), Grc)); + break; + case 0: + n.Fc((Orc(), Erc)); + yNb(q, Qwc, (qad(), nad)); + } + } + } + f = BD(vNb(d, Iwc), 314); + r = BD(vNb(d, Exc), 315); + e = f == (Rpc(), Opc) || r == (Vzc(), Rzc); + if (!!g && (!g.a && (g.a = new xMd(y2, g, 5)), g.a).i != 0 && e) { + s = ofd(g); + o = new s7c(); + for (u = Jsb(s, 0); u.b != u.d.c; ) { + t = BD(Xsb(u), 8); + Dsb(o, new g7c(t)); + } + yNb(p, _sc, o); + } + return p; + } + function yZd(a) { + if (a.gb) return; + a.gb = true; + a.b = Lnd(a, 0); + Knd(a.b, 18); + Qnd(a.b, 19); + a.a = Lnd(a, 1); + Knd(a.a, 1); + Qnd(a.a, 2); + Qnd(a.a, 3); + Qnd(a.a, 4); + Qnd(a.a, 5); + a.o = Lnd(a, 2); + Knd(a.o, 8); + Knd(a.o, 9); + Qnd(a.o, 10); + Qnd(a.o, 11); + Qnd(a.o, 12); + Qnd(a.o, 13); + Qnd(a.o, 14); + Qnd(a.o, 15); + Qnd(a.o, 16); + Qnd(a.o, 17); + Qnd(a.o, 18); + Qnd(a.o, 19); + Qnd(a.o, 20); + Qnd(a.o, 21); + Qnd(a.o, 22); + Qnd(a.o, 23); + Pnd(a.o); + Pnd(a.o); + Pnd(a.o); + Pnd(a.o); + Pnd(a.o); + Pnd(a.o); + Pnd(a.o); + Pnd(a.o); + Pnd(a.o); + Pnd(a.o); + a.p = Lnd(a, 3); + Knd(a.p, 2); + Knd(a.p, 3); + Knd(a.p, 4); + Knd(a.p, 5); + Qnd(a.p, 6); + Qnd(a.p, 7); + Pnd(a.p); + Pnd(a.p); + a.q = Lnd(a, 4); + Knd(a.q, 8); + a.v = Lnd(a, 5); + Qnd(a.v, 9); + Pnd(a.v); + Pnd(a.v); + Pnd(a.v); + a.w = Lnd(a, 6); + Knd(a.w, 2); + Knd(a.w, 3); + Knd(a.w, 4); + Qnd(a.w, 5); + a.B = Lnd(a, 7); + Qnd(a.B, 1); + Pnd(a.B); + Pnd(a.B); + Pnd(a.B); + a.Q = Lnd(a, 8); + Qnd(a.Q, 0); + Pnd(a.Q); + a.R = Lnd(a, 9); + Knd(a.R, 1); + a.S = Lnd(a, 10); + Pnd(a.S); + Pnd(a.S); + Pnd(a.S); + Pnd(a.S); + Pnd(a.S); + Pnd(a.S); + Pnd(a.S); + Pnd(a.S); + Pnd(a.S); + Pnd(a.S); + Pnd(a.S); + Pnd(a.S); + Pnd(a.S); + Pnd(a.S); + Pnd(a.S); + a.T = Lnd(a, 11); + Qnd(a.T, 10); + Qnd(a.T, 11); + Qnd(a.T, 12); + Qnd(a.T, 13); + Qnd(a.T, 14); + Pnd(a.T); + Pnd(a.T); + a.U = Lnd(a, 12); + Knd(a.U, 2); + Knd(a.U, 3); + Qnd(a.U, 4); + Qnd(a.U, 5); + Qnd(a.U, 6); + Qnd(a.U, 7); + Pnd(a.U); + a.V = Lnd(a, 13); + Qnd(a.V, 10); + a.W = Lnd(a, 14); + Knd(a.W, 18); + Knd(a.W, 19); + Knd(a.W, 20); + Qnd(a.W, 21); + Qnd(a.W, 22); + Qnd(a.W, 23); + a.bb = Lnd(a, 15); + Knd(a.bb, 10); + Knd(a.bb, 11); + Knd(a.bb, 12); + Knd(a.bb, 13); + Knd(a.bb, 14); + Knd(a.bb, 15); + Knd(a.bb, 16); + Qnd(a.bb, 17); + Pnd(a.bb); + Pnd(a.bb); + a.eb = Lnd(a, 16); + Knd(a.eb, 2); + Knd(a.eb, 3); + Knd(a.eb, 4); + Knd(a.eb, 5); + Knd(a.eb, 6); + Knd(a.eb, 7); + Qnd(a.eb, 8); + Qnd(a.eb, 9); + a.ab = Lnd(a, 17); + Knd(a.ab, 0); + Knd(a.ab, 1); + a.H = Lnd(a, 18); + Qnd(a.H, 0); + Qnd(a.H, 1); + Qnd(a.H, 2); + Qnd(a.H, 3); + Qnd(a.H, 4); + Qnd(a.H, 5); + Pnd(a.H); + a.db = Lnd(a, 19); + Qnd(a.db, 2); + a.c = Mnd(a, 20); + a.d = Mnd(a, 21); + a.e = Mnd(a, 22); + a.f = Mnd(a, 23); + a.i = Mnd(a, 24); + a.g = Mnd(a, 25); + a.j = Mnd(a, 26); + a.k = Mnd(a, 27); + a.n = Mnd(a, 28); + a.r = Mnd(a, 29); + a.s = Mnd(a, 30); + a.t = Mnd(a, 31); + a.u = Mnd(a, 32); + a.fb = Mnd(a, 33); + a.A = Mnd(a, 34); + a.C = Mnd(a, 35); + a.D = Mnd(a, 36); + a.F = Mnd(a, 37); + a.G = Mnd(a, 38); + a.I = Mnd(a, 39); + a.J = Mnd(a, 40); + a.L = Mnd(a, 41); + a.M = Mnd(a, 42); + a.N = Mnd(a, 43); + a.O = Mnd(a, 44); + a.P = Mnd(a, 45); + a.X = Mnd(a, 46); + a.Y = Mnd(a, 47); + a.Z = Mnd(a, 48); + a.$ = Mnd(a, 49); + a._ = Mnd(a, 50); + a.cb = Mnd(a, 51); + a.K = Mnd(a, 52); + } + function Y9c() { + Y9c = ccb; + var a, b; + o8c = new Lsd(sse); + F9c = new Lsd(tse); + q8c = (F7c(), z7c); + p8c = new Nsd($pe, q8c); + new Tfd(); + r8c = new Nsd(_le, null); + s8c = new Lsd(use); + x8c = (i8c(), qqb(h8c, OC(GC(r1, 1), Kie, 291, 0, [d8c]))); + w8c = new Nsd(lqe, x8c); + y8c = new Nsd(Zpe, (Bcb(), false)); + A8c = (ead(), cad); + z8c = new Nsd(cqe, A8c); + F8c = (Aad(), zad); + E8c = new Nsd(ype, F8c); + I8c = new Nsd(Jre, false); + K8c = (hbd(), fbd); + J8c = new Nsd(tpe, K8c); + g9c = new q0b(12); + f9c = new Nsd(ame, g9c); + O8c = new Nsd(Ame, false); + P8c = new Nsd(xqe, false); + e9c = new Nsd(Dme, false); + u9c = (dcd(), ccd); + t9c = new Nsd(Bme, u9c); + C9c = new Lsd(uqe); + D9c = new Lsd(vme); + E9c = new Lsd(yme); + H9c = new Lsd(zme); + R8c = new s7c(); + Q8c = new Nsd(mqe, R8c); + v8c = new Nsd(pqe, false); + L8c = new Nsd(qqe, false); + new Lsd(vse); + T8c = new H_b(); + S8c = new Nsd(vqe, T8c); + d9c = new Nsd(Xpe, false); + new Tfd(); + G9c = new Nsd(wse, 1); + new Nsd(xse, true); + meb(0); + new Nsd(yse, meb(100)); + new Nsd(zse, false); + meb(0); + new Nsd(Ase, meb(4000)); + meb(0); + new Nsd(Bse, meb(400)); + new Nsd(Cse, false); + new Nsd(Dse, false); + new Nsd(Ese, true); + new Nsd(Fse, false); + u8c = (Ded(), Ced); + t8c = new Nsd(rse, u8c); + I9c = new Nsd(Lpe, 10); + J9c = new Nsd(Mpe, 10); + K9c = new Nsd(Zle, 20); + L9c = new Nsd(Npe, 10); + M9c = new Nsd(xme, 2); + N9c = new Nsd(Ope, 10); + P9c = new Nsd(Ppe, 0); + Q9c = new Nsd(Spe, 5); + R9c = new Nsd(Qpe, 1); + S9c = new Nsd(Rpe, 1); + T9c = new Nsd(wme, 20); + U9c = new Nsd(Tpe, 10); + X9c = new Nsd(Upe, 10); + O9c = new Lsd(Vpe); + W9c = new I_b(); + V9c = new Nsd(wqe, W9c); + j9c = new Lsd(tqe); + i9c = false; + h9c = new Nsd(sqe, i9c); + V8c = new q0b(5); + U8c = new Nsd(dqe, V8c); + X8c = + (Hbd(), (b = BD(gdb(B1), 9)), new xqb(b, BD(_Bb(b, b.length), 9), 0)); + W8c = new Nsd(Gme, X8c); + m9c = (Tbd(), Qbd); + l9c = new Nsd(gqe, m9c); + o9c = new Lsd(hqe); + p9c = new Lsd(iqe); + q9c = new Lsd(jqe); + n9c = new Lsd(kqe); + Z8c = ((a = BD(gdb(I1), 9)), new xqb(a, BD(_Bb(a, a.length), 9), 0)); + Y8c = new Nsd(Fme, Z8c); + c9c = pqb((Idd(), Bdd)); + b9c = new Nsd(Eme, c9c); + a9c = new f7c(0, 0); + _8c = new Nsd(Tme, a9c); + $8c = new Nsd(bqe, false); + D8c = (qad(), nad); + C8c = new Nsd(nqe, D8c); + B8c = new Nsd(Cme, false); + new Lsd(Gse); + meb(1); + new Nsd(Hse, null); + r9c = new Lsd(rqe); + v9c = new Lsd(oqe); + B9c = (Ucd(), Scd); + A9c = new Nsd(Ype, B9c); + s9c = new Lsd(Wpe); + y9c = (rcd(), pqb(pcd)); + x9c = new Nsd(Hme, y9c); + w9c = new Nsd(eqe, false); + z9c = new Nsd(fqe, true); + M8c = new Nsd(_pe, false); + N8c = new Nsd(aqe, false); + G8c = new Nsd($le, 1); + H8c = (Mad(), Kad); + new Nsd(Ise, H8c); + k9c = true; + } + function wtc() { + wtc = ccb; + var a, b; + $sc = new Lsd(Ime); + xsc = new Lsd("coordinateOrigin"); + itc = new Lsd("processors"); + wsc = new Msd("compoundNode", (Bcb(), false)); + Nsc = new Msd("insideConnections", false); + _sc = new Lsd("originalBendpoints"); + atc = new Lsd("originalDummyNodePosition"); + btc = new Lsd("originalLabelEdge"); + ktc = new Lsd("representedLabels"); + Csc = new Lsd("endLabels"); + Dsc = new Lsd("endLabel.origin"); + Ssc = new Msd("labelSide", (rbd(), qbd)); + Ysc = new Msd("maxEdgeThickness", 0); + ltc = new Msd("reversed", false); + jtc = new Lsd(Jme); + Vsc = new Msd("longEdgeSource", null); + Wsc = new Msd("longEdgeTarget", null); + Usc = new Msd("longEdgeHasLabelDummies", false); + Tsc = new Msd("longEdgeBeforeLabelDummy", false); + Bsc = new Msd("edgeConstraint", (Gqc(), Eqc)); + Psc = new Lsd("inLayerLayoutUnit"); + Osc = new Msd("inLayerConstraint", (esc(), csc)); + Qsc = new Msd("inLayerSuccessorConstraint", new Rkb()); + Rsc = new Msd("inLayerSuccessorConstraintBetweenNonDummies", false); + gtc = new Lsd("portDummy"); + ysc = new Msd("crossingHint", meb(0)); + Ksc = new Msd( + "graphProperties", + ((b = BD(gdb(PW), 9)), new xqb(b, BD(_Bb(b, b.length), 9), 0)) + ); + Hsc = new Msd("externalPortSide", (Ucd(), Scd)); + Isc = new Msd("externalPortSize", new d7c()); + Fsc = new Lsd("externalPortReplacedDummies"); + Gsc = new Lsd("externalPortReplacedDummy"); + Esc = new Msd( + "externalPortConnections", + ((a = BD(gdb(F1), 9)), new xqb(a, BD(_Bb(a, a.length), 9), 0)) + ); + htc = new Msd(tle, 0); + ssc = new Lsd("barycenterAssociates"); + vtc = new Lsd("TopSideComments"); + tsc = new Lsd("BottomSideComments"); + vsc = new Lsd("CommentConnectionPort"); + Msc = new Msd("inputCollect", false); + etc = new Msd("outputCollect", false); + Asc = new Msd("cyclic", false); + zsc = new Lsd("crossHierarchyMap"); + utc = new Lsd("targetOffset"); + new Msd("splineLabelSize", new d7c()); + otc = new Lsd("spacings"); + ftc = new Msd("partitionConstraint", false); + usc = new Lsd("breakingPoint.info"); + stc = new Lsd("splines.survivingEdge"); + rtc = new Lsd("splines.route.start"); + ptc = new Lsd("splines.edgeChain"); + dtc = new Lsd("originalPortConstraints"); + ntc = new Lsd("selfLoopHolder"); + qtc = new Lsd("splines.nsPortY"); + Zsc = new Lsd("modelOrder"); + Xsc = new Lsd("longEdgeTargetNode"); + Jsc = new Msd(Xne, false); + mtc = new Msd(Xne, false); + Lsc = new Lsd("layerConstraints.hiddenNodes"); + ctc = new Lsd("layerConstraints.opposidePort"); + ttc = new Lsd("targetNode.modelOrder"); + } + function jwc() { + jwc = ccb; + puc = (xqc(), vqc); + ouc = new Nsd(Yne, puc); + Guc = new Nsd(Zne, (Bcb(), false)); + Muc = (msc(), ksc); + Luc = new Nsd($ne, Muc); + cvc = new Nsd(_ne, false); + dvc = new Nsd(aoe, true); + Itc = new Nsd(boe, false); + xvc = (BAc(), zAc); + wvc = new Nsd(coe, xvc); + meb(1); + Fvc = new Nsd(doe, meb(7)); + Gvc = new Nsd(eoe, false); + Huc = new Nsd(foe, false); + nuc = (mqc(), iqc); + muc = new Nsd(goe, nuc); + bvc = (lzc(), jzc); + avc = new Nsd(hoe, bvc); + Tuc = (Ctc(), Btc); + Suc = new Nsd(ioe, Tuc); + meb(-1); + Ruc = new Nsd(joe, meb(-1)); + meb(-1); + Uuc = new Nsd(koe, meb(-1)); + meb(-1); + Vuc = new Nsd(loe, meb(4)); + meb(-1); + Xuc = new Nsd(moe, meb(2)); + _uc = (kAc(), iAc); + $uc = new Nsd(noe, _uc); + meb(0); + Zuc = new Nsd(ooe, meb(0)); + Puc = new Nsd(poe, meb(Ohe)); + luc = (Rpc(), Ppc); + kuc = new Nsd(qoe, luc); + Xtc = new Nsd(roe, false); + euc = new Nsd(soe, 0.1); + iuc = new Nsd(toe, false); + meb(-1); + guc = new Nsd(uoe, meb(-1)); + meb(-1); + huc = new Nsd(voe, meb(-1)); + meb(0); + Ytc = new Nsd(woe, meb(40)); + cuc = (Xrc(), Wrc); + buc = new Nsd(xoe, cuc); + $tc = Urc; + Ztc = new Nsd(yoe, $tc); + vvc = (Vzc(), Qzc); + uvc = new Nsd(zoe, vvc); + kvc = new Lsd(Aoe); + fvc = (_qc(), Zqc); + evc = new Nsd(Boe, fvc); + ivc = (lrc(), irc); + hvc = new Nsd(Coe, ivc); + new Tfd(); + nvc = new Nsd(Doe, 0.3); + pvc = new Lsd(Eoe); + rvc = (Izc(), Gzc); + qvc = new Nsd(Foe, rvc); + xuc = (TAc(), RAc); + wuc = new Nsd(Goe, xuc); + zuc = (_Ac(), $Ac); + yuc = new Nsd(Hoe, zuc); + Buc = (tBc(), sBc); + Auc = new Nsd(Ioe, Buc); + Duc = new Nsd(Joe, 0.2); + uuc = new Nsd(Koe, 2); + Bvc = new Nsd(Loe, null); + Dvc = new Nsd(Moe, 10); + Cvc = new Nsd(Noe, 10); + Evc = new Nsd(Ooe, 20); + meb(0); + yvc = new Nsd(Poe, meb(0)); + meb(0); + zvc = new Nsd(Qoe, meb(0)); + meb(0); + Avc = new Nsd(Roe, meb(0)); + Jtc = new Nsd(Soe, false); + Ntc = (yrc(), wrc); + Mtc = new Nsd(Toe, Ntc); + Ltc = (Ipc(), Hpc); + Ktc = new Nsd(Uoe, Ltc); + Juc = new Nsd(Voe, false); + meb(0); + Iuc = new Nsd(Woe, meb(16)); + meb(0); + Kuc = new Nsd(Xoe, meb(5)); + bwc = (LBc(), JBc); + awc = new Nsd(Yoe, bwc); + Hvc = new Nsd(Zoe, 10); + Kvc = new Nsd($oe, 1); + Tvc = (bqc(), aqc); + Svc = new Nsd(_oe, Tvc); + Nvc = new Lsd(ape); + Qvc = meb(1); + meb(0); + Pvc = new Nsd(bpe, Qvc); + gwc = (CBc(), zBc); + fwc = new Nsd(cpe, gwc); + cwc = new Lsd(dpe); + Yvc = new Nsd(epe, true); + Wvc = new Nsd(fpe, 2); + $vc = new Nsd(gpe, true); + tuc = (Sqc(), Qqc); + suc = new Nsd(hpe, tuc); + ruc = (Apc(), wpc); + quc = new Nsd(ipe, ruc); + Wtc = (tAc(), rAc); + Vtc = new Nsd(jpe, Wtc); + Utc = new Nsd(kpe, false); + Ptc = (RXb(), QXb); + Otc = new Nsd(lpe, Ptc); + Ttc = (xzc(), uzc); + Stc = new Nsd(mpe, Ttc); + Qtc = new Nsd(npe, 0); + Rtc = new Nsd(ope, 0); + Ouc = kqc; + Nuc = Opc; + Wuc = izc; + Yuc = izc; + Quc = fzc; + fuc = (hbd(), ebd); + juc = Ppc; + duc = Ppc; + _tc = Ppc; + auc = ebd; + lvc = Tzc; + mvc = Qzc; + gvc = Qzc; + jvc = Qzc; + ovc = Szc; + tvc = Tzc; + svc = Tzc; + Cuc = (Aad(), yad); + Euc = yad; + Fuc = sBc; + vuc = xad; + Ivc = KBc; + Jvc = IBc; + Lvc = KBc; + Mvc = IBc; + Uvc = KBc; + Vvc = IBc; + Ovc = _pc; + Rvc = aqc; + hwc = KBc; + iwc = IBc; + dwc = KBc; + ewc = IBc; + Zvc = IBc; + Xvc = IBc; + _vc = IBc; + } + function S8b() { + S8b = ccb; + Y7b = new T8b("DIRECTION_PREPROCESSOR", 0); + V7b = new T8b("COMMENT_PREPROCESSOR", 1); + Z7b = new T8b("EDGE_AND_LAYER_CONSTRAINT_EDGE_REVERSER", 2); + n8b = new T8b("INTERACTIVE_EXTERNAL_PORT_POSITIONER", 3); + G8b = new T8b("PARTITION_PREPROCESSOR", 4); + r8b = new T8b("LABEL_DUMMY_INSERTER", 5); + M8b = new T8b("SELF_LOOP_PREPROCESSOR", 6); + w8b = new T8b("LAYER_CONSTRAINT_PREPROCESSOR", 7); + E8b = new T8b("PARTITION_MIDPROCESSOR", 8); + i8b = new T8b("HIGH_DEGREE_NODE_LAYER_PROCESSOR", 9); + A8b = new T8b("NODE_PROMOTION", 10); + v8b = new T8b("LAYER_CONSTRAINT_POSTPROCESSOR", 11); + F8b = new T8b("PARTITION_POSTPROCESSOR", 12); + e8b = new T8b("HIERARCHICAL_PORT_CONSTRAINT_PROCESSOR", 13); + O8b = new T8b("SEMI_INTERACTIVE_CROSSMIN_PROCESSOR", 14); + P7b = new T8b("BREAKING_POINT_INSERTER", 15); + z8b = new T8b("LONG_EDGE_SPLITTER", 16); + I8b = new T8b("PORT_SIDE_PROCESSOR", 17); + o8b = new T8b("INVERTED_PORT_PROCESSOR", 18); + H8b = new T8b("PORT_LIST_SORTER", 19); + Q8b = new T8b("SORT_BY_INPUT_ORDER_OF_MODEL", 20); + C8b = new T8b("NORTH_SOUTH_PORT_PREPROCESSOR", 21); + Q7b = new T8b("BREAKING_POINT_PROCESSOR", 22); + D8b = new T8b(Bne, 23); + R8b = new T8b(Cne, 24); + K8b = new T8b("SELF_LOOP_PORT_RESTORER", 25); + P8b = new T8b("SINGLE_EDGE_GRAPH_WRAPPER", 26); + p8b = new T8b("IN_LAYER_CONSTRAINT_PROCESSOR", 27); + b8b = new T8b("END_NODE_PORT_LABEL_MANAGEMENT_PROCESSOR", 28); + q8b = new T8b("LABEL_AND_NODE_SIZE_PROCESSOR", 29); + m8b = new T8b("INNERMOST_NODE_MARGIN_CALCULATOR", 30); + N8b = new T8b("SELF_LOOP_ROUTER", 31); + T7b = new T8b("COMMENT_NODE_MARGIN_CALCULATOR", 32); + _7b = new T8b("END_LABEL_PREPROCESSOR", 33); + t8b = new T8b("LABEL_DUMMY_SWITCHER", 34); + S7b = new T8b("CENTER_LABEL_MANAGEMENT_PROCESSOR", 35); + u8b = new T8b("LABEL_SIDE_SELECTOR", 36); + k8b = new T8b("HYPEREDGE_DUMMY_MERGER", 37); + f8b = new T8b("HIERARCHICAL_PORT_DUMMY_SIZE_PROCESSOR", 38); + x8b = new T8b("LAYER_SIZE_AND_GRAPH_HEIGHT_CALCULATOR", 39); + h8b = new T8b("HIERARCHICAL_PORT_POSITION_PROCESSOR", 40); + W7b = new T8b("CONSTRAINTS_POSTPROCESSOR", 41); + U7b = new T8b("COMMENT_POSTPROCESSOR", 42); + l8b = new T8b("HYPERNODE_PROCESSOR", 43); + g8b = new T8b("HIERARCHICAL_PORT_ORTHOGONAL_EDGE_ROUTER", 44); + y8b = new T8b("LONG_EDGE_JOINER", 45); + L8b = new T8b("SELF_LOOP_POSTPROCESSOR", 46); + R7b = new T8b("BREAKING_POINT_REMOVER", 47); + B8b = new T8b("NORTH_SOUTH_PORT_POSTPROCESSOR", 48); + j8b = new T8b("HORIZONTAL_COMPACTOR", 49); + s8b = new T8b("LABEL_DUMMY_REMOVER", 50); + c8b = new T8b("FINAL_SPLINE_BENDPOINTS_CALCULATOR", 51); + a8b = new T8b("END_LABEL_SORTER", 52); + J8b = new T8b("REVERSED_EDGE_RESTORER", 53); + $7b = new T8b("END_LABEL_POSTPROCESSOR", 54); + d8b = new T8b("HIERARCHICAL_NODE_RESIZER", 55); + X7b = new T8b("DIRECTION_POSTPROCESSOR", 56); + } + function KIc(a, b, c) { + var d, + e, + f, + g, + h, + i, + j, + k, + l, + m, + n, + o, + p, + q, + r, + s, + t, + u, + v, + w, + A, + B, + C, + D, + F, + G, + H, + I, + J, + K, + L, + M, + N, + O, + P, + Q, + R, + S, + T, + U, + V, + W, + X, + Y, + Z, + $, + ab, + bb, + cb, + db, + eb, + fb, + gb, + hb, + ib, + jb, + kb, + lb; + cb = 0; + for (H = b, K = 0, N = H.length; K < N; ++K) { + F = H[K]; + for (V = new olb(F.j); V.a < V.c.c.length; ) { + U = BD(mlb(V), 11); + X = 0; + for (h = new olb(U.g); h.a < h.c.c.length; ) { + g = BD(mlb(h), 17); + F.c != g.d.i.c && ++X; + } + X > 0 && (a.a[U.p] = cb++); + } + } + hb = 0; + for (I = c, L = 0, O = I.length; L < O; ++L) { + F = I[L]; + P = 0; + for (V = new olb(F.j); V.a < V.c.c.length; ) { + U = BD(mlb(V), 11); + if (U.j == (Ucd(), Acd)) { + for (h = new olb(U.e); h.a < h.c.c.length; ) { + g = BD(mlb(h), 17); + if (F.c != g.c.i.c) { + ++P; + break; + } + } + } else { + break; + } + } + R = 0; + Y = new Bib(F.j, F.j.c.length); + while (Y.b > 0) { + U = (sCb(Y.b > 0), BD(Y.a.Xb((Y.c = --Y.b)), 11)); + X = 0; + for (h = new olb(U.e); h.a < h.c.c.length; ) { + g = BD(mlb(h), 17); + F.c != g.c.i.c && ++X; + } + if (X > 0) { + if (U.j == (Ucd(), Acd)) { + a.a[U.p] = hb; + ++hb; + } else { + a.a[U.p] = hb + P + R; + ++R; + } + } + } + hb += R; + } + W = new Lqb(); + o = new zsb(); + for (G = b, J = 0, M = G.length; J < M; ++J) { + F = G[J]; + for (fb = new olb(F.j); fb.a < fb.c.c.length; ) { + eb = BD(mlb(fb), 11); + for (h = new olb(eb.g); h.a < h.c.c.length; ) { + g = BD(mlb(h), 17); + jb = g.d; + if (F.c != jb.i.c) { + db = BD(Wd(irb(W.f, eb)), 467); + ib = BD(Wd(irb(W.f, jb)), 467); + if (!db && !ib) { + n = new NIc(); + o.a.zc(n, o); + Ekb(n.a, g); + Ekb(n.d, eb); + jrb(W.f, eb, n); + Ekb(n.d, jb); + jrb(W.f, jb, n); + } else if (!db) { + Ekb(ib.a, g); + Ekb(ib.d, eb); + jrb(W.f, eb, ib); + } else if (!ib) { + Ekb(db.a, g); + Ekb(db.d, jb); + jrb(W.f, jb, db); + } else if (db == ib) { + Ekb(db.a, g); + } else { + Ekb(db.a, g); + for (T = new olb(ib.d); T.a < T.c.c.length; ) { + S = BD(mlb(T), 11); + jrb(W.f, S, db); + } + Gkb(db.a, ib.a); + Gkb(db.d, ib.d); + o.a.Bc(ib) != null; + } + } + } + } + } + p = BD( + Ee(o, KC(oY, { 3: 1, 4: 1, 5: 1, 1946: 1 }, 467, o.a.gc(), 0, 1)), + 1946 + ); + D = b[0].c; + bb = c[0].c; + for (k = p, l = 0, m = k.length; l < m; ++l) { + j = k[l]; + j.e = cb; + j.f = hb; + for (V = new olb(j.d); V.a < V.c.c.length; ) { + U = BD(mlb(V), 11); + Z = a.a[U.p]; + if (U.i.c == D) { + Z < j.e && (j.e = Z); + Z > j.b && (j.b = Z); + } else if (U.i.c == bb) { + Z < j.f && (j.f = Z); + Z > j.c && (j.c = Z); + } + } + } + Klb(p, 0, p.length, null); + gb = KC(WD, oje, 25, p.length, 15, 1); + d = KC(WD, oje, 25, hb + 1, 15, 1); + for (r = 0; r < p.length; r++) { + gb[r] = p[r].f; + d[gb[r]] = 1; + } + f = 0; + for (s = 0; s < d.length; s++) { + d[s] == 1 ? (d[s] = f) : --f; + } + $ = 0; + for (t = 0; t < gb.length; t++) { + gb[t] += d[gb[t]]; + $ = Math.max($, gb[t] + 1); + } + i = 1; + while (i < $) { + i *= 2; + } + lb = 2 * i - 1; + i -= 1; + kb = KC(WD, oje, 25, lb, 15, 1); + e = 0; + for (B = 0; B < gb.length; B++) { + A = gb[B] + i; + ++kb[A]; + while (A > 0) { + A % 2 > 0 && (e += kb[A + 1]); + A = ((A - 1) / 2) | 0; + ++kb[A]; + } + } + C = KC(nY, Uhe, 362, p.length * 2, 0, 1); + for (u = 0; u < p.length; u++) { + C[2 * u] = new QIc(p[u], p[u].e, p[u].b, (UIc(), TIc)); + C[2 * u + 1] = new QIc(p[u], p[u].b, p[u].e, SIc); + } + Klb(C, 0, C.length, null); + Q = 0; + for (v = 0; v < C.length; v++) { + switch (C[v].d.g) { + case 0: + ++Q; + break; + case 1: + --Q; + e += Q; + } + } + ab = KC(nY, Uhe, 362, p.length * 2, 0, 1); + for (w = 0; w < p.length; w++) { + ab[2 * w] = new QIc(p[w], p[w].f, p[w].c, (UIc(), TIc)); + ab[2 * w + 1] = new QIc(p[w], p[w].c, p[w].f, SIc); + } + Klb(ab, 0, ab.length, null); + Q = 0; + for (q = 0; q < ab.length; q++) { + switch (ab[q].d.g) { + case 0: + ++Q; + break; + case 1: + --Q; + e += Q; + } + } + return e; + } + function wfe() { + wfe = ccb; + ffe = new xfe(7); + hfe = (++vfe, new ige(8, 94)); + ++vfe; + new ige(8, 64); + ife = (++vfe, new ige(8, 36)); + ofe = (++vfe, new ige(8, 65)); + pfe = (++vfe, new ige(8, 122)); + qfe = (++vfe, new ige(8, 90)); + tfe = (++vfe, new ige(8, 98)); + mfe = (++vfe, new ige(8, 66)); + rfe = (++vfe, new ige(8, 60)); + ufe = (++vfe, new ige(8, 62)); + efe = new xfe(11); + cfe = (++vfe, new $fe(4)); + Ufe(cfe, 48, 57); + sfe = (++vfe, new $fe(4)); + Ufe(sfe, 48, 57); + Ufe(sfe, 65, 90); + Ufe(sfe, 95, 95); + Ufe(sfe, 97, 122); + nfe = (++vfe, new $fe(4)); + Ufe(nfe, 9, 9); + Ufe(nfe, 10, 10); + Ufe(nfe, 12, 12); + Ufe(nfe, 13, 13); + Ufe(nfe, 32, 32); + jfe = _fe(cfe); + lfe = _fe(sfe); + kfe = _fe(nfe); + Zee = new Lqb(); + $ee = new Lqb(); + _ee = OC(GC(ZI, 1), nie, 2, 6, [ + "Cn", + "Lu", + "Ll", + "Lt", + "Lm", + "Lo", + "Mn", + "Me", + "Mc", + "Nd", + "Nl", + "No", + "Zs", + "Zl", + "Zp", + "Cc", + "Cf", + null, + "Co", + "Cs", + "Pd", + "Ps", + "Pe", + "Pc", + "Po", + "Sm", + "Sc", + "Sk", + "So", + "Pi", + "Pf", + "L", + "M", + "N", + "Z", + "C", + "P", + "S", + ]); + Yee = OC(GC(ZI, 1), nie, 2, 6, [ + "Basic Latin", + "Latin-1 Supplement", + "Latin Extended-A", + "Latin Extended-B", + "IPA Extensions", + "Spacing Modifier Letters", + "Combining Diacritical Marks", + "Greek", + "Cyrillic", + "Armenian", + "Hebrew", + "Arabic", + "Syriac", + "Thaana", + "Devanagari", + "Bengali", + "Gurmukhi", + "Gujarati", + "Oriya", + "Tamil", + "Telugu", + "Kannada", + "Malayalam", + "Sinhala", + "Thai", + "Lao", + "Tibetan", + "Myanmar", + "Georgian", + "Hangul Jamo", + "Ethiopic", + "Cherokee", + "Unified Canadian Aboriginal Syllabics", + "Ogham", + "Runic", + "Khmer", + "Mongolian", + "Latin Extended Additional", + "Greek Extended", + "General Punctuation", + "Superscripts and Subscripts", + "Currency Symbols", + "Combining Marks for Symbols", + "Letterlike Symbols", + "Number Forms", + "Arrows", + "Mathematical Operators", + "Miscellaneous Technical", + "Control Pictures", + "Optical Character Recognition", + "Enclosed Alphanumerics", + "Box Drawing", + "Block Elements", + "Geometric Shapes", + "Miscellaneous Symbols", + "Dingbats", + "Braille Patterns", + "CJK Radicals Supplement", + "Kangxi Radicals", + "Ideographic Description Characters", + "CJK Symbols and Punctuation", + "Hiragana", + "Katakana", + "Bopomofo", + "Hangul Compatibility Jamo", + "Kanbun", + "Bopomofo Extended", + "Enclosed CJK Letters and Months", + "CJK Compatibility", + "CJK Unified Ideographs Extension A", + "CJK Unified Ideographs", + "Yi Syllables", + "Yi Radicals", + "Hangul Syllables", + uxe, + "CJK Compatibility Ideographs", + "Alphabetic Presentation Forms", + "Arabic Presentation Forms-A", + "Combining Half Marks", + "CJK Compatibility Forms", + "Small Form Variants", + "Arabic Presentation Forms-B", + "Specials", + "Halfwidth and Fullwidth Forms", + "Old Italic", + "Gothic", + "Deseret", + "Byzantine Musical Symbols", + "Musical Symbols", + "Mathematical Alphanumeric Symbols", + "CJK Unified Ideographs Extension B", + "CJK Compatibility Ideographs Supplement", + "Tags", + ]); + afe = OC( + GC(WD, 1), + oje, + 25, + 15, + [ + 66304, 66351, 66352, 66383, 66560, 66639, 118784, 119039, 119040, + 119295, 119808, 120831, 131072, 173782, 194560, 195103, 917504, + 917631, + ] + ); + } + function qJb() { + qJb = ccb; + nJb = new tJb( + "OUT_T_L", + 0, + (NHb(), LHb), + (EIb(), BIb), + (gHb(), dHb), + dHb, + OC(GC(LK, 1), Uhe, 21, 0, [ + qqb((Hbd(), Dbd), OC(GC(B1, 1), Kie, 93, 0, [Gbd, zbd])), + ]) + ); + mJb = new tJb( + "OUT_T_C", + 1, + KHb, + BIb, + dHb, + eHb, + OC(GC(LK, 1), Uhe, 21, 0, [ + qqb(Dbd, OC(GC(B1, 1), Kie, 93, 0, [Gbd, ybd])), + qqb(Dbd, OC(GC(B1, 1), Kie, 93, 0, [Gbd, ybd, Abd])), + ]) + ); + oJb = new tJb( + "OUT_T_R", + 2, + MHb, + BIb, + dHb, + fHb, + OC(GC(LK, 1), Uhe, 21, 0, [ + qqb(Dbd, OC(GC(B1, 1), Kie, 93, 0, [Gbd, Bbd])), + ]) + ); + eJb = new tJb( + "OUT_B_L", + 3, + LHb, + DIb, + fHb, + dHb, + OC(GC(LK, 1), Uhe, 21, 0, [ + qqb(Dbd, OC(GC(B1, 1), Kie, 93, 0, [Ebd, zbd])), + ]) + ); + dJb = new tJb( + "OUT_B_C", + 4, + KHb, + DIb, + fHb, + eHb, + OC(GC(LK, 1), Uhe, 21, 0, [ + qqb(Dbd, OC(GC(B1, 1), Kie, 93, 0, [Ebd, ybd])), + qqb(Dbd, OC(GC(B1, 1), Kie, 93, 0, [Ebd, ybd, Abd])), + ]) + ); + fJb = new tJb( + "OUT_B_R", + 5, + MHb, + DIb, + fHb, + fHb, + OC(GC(LK, 1), Uhe, 21, 0, [ + qqb(Dbd, OC(GC(B1, 1), Kie, 93, 0, [Ebd, Bbd])), + ]) + ); + iJb = new tJb( + "OUT_L_T", + 6, + MHb, + DIb, + dHb, + dHb, + OC(GC(LK, 1), Uhe, 21, 0, [ + qqb(Dbd, OC(GC(B1, 1), Kie, 93, 0, [zbd, Gbd, Abd])), + ]) + ); + hJb = new tJb( + "OUT_L_C", + 7, + MHb, + CIb, + eHb, + dHb, + OC(GC(LK, 1), Uhe, 21, 0, [ + qqb(Dbd, OC(GC(B1, 1), Kie, 93, 0, [zbd, Fbd])), + qqb(Dbd, OC(GC(B1, 1), Kie, 93, 0, [zbd, Fbd, Abd])), + ]) + ); + gJb = new tJb( + "OUT_L_B", + 8, + MHb, + BIb, + fHb, + dHb, + OC(GC(LK, 1), Uhe, 21, 0, [ + qqb(Dbd, OC(GC(B1, 1), Kie, 93, 0, [zbd, Ebd, Abd])), + ]) + ); + lJb = new tJb( + "OUT_R_T", + 9, + LHb, + DIb, + dHb, + fHb, + OC(GC(LK, 1), Uhe, 21, 0, [ + qqb(Dbd, OC(GC(B1, 1), Kie, 93, 0, [Bbd, Gbd, Abd])), + ]) + ); + kJb = new tJb( + "OUT_R_C", + 10, + LHb, + CIb, + eHb, + fHb, + OC(GC(LK, 1), Uhe, 21, 0, [ + qqb(Dbd, OC(GC(B1, 1), Kie, 93, 0, [Bbd, Fbd])), + qqb(Dbd, OC(GC(B1, 1), Kie, 93, 0, [Bbd, Fbd, Abd])), + ]) + ); + jJb = new tJb( + "OUT_R_B", + 11, + LHb, + BIb, + fHb, + fHb, + OC(GC(LK, 1), Uhe, 21, 0, [ + qqb(Dbd, OC(GC(B1, 1), Kie, 93, 0, [Bbd, Ebd, Abd])), + ]) + ); + bJb = new tJb( + "IN_T_L", + 12, + LHb, + DIb, + dHb, + dHb, + OC(GC(LK, 1), Uhe, 21, 0, [ + qqb(Cbd, OC(GC(B1, 1), Kie, 93, 0, [Gbd, zbd])), + qqb(Cbd, OC(GC(B1, 1), Kie, 93, 0, [Gbd, zbd, Abd])), + ]) + ); + aJb = new tJb( + "IN_T_C", + 13, + KHb, + DIb, + dHb, + eHb, + OC(GC(LK, 1), Uhe, 21, 0, [ + qqb(Cbd, OC(GC(B1, 1), Kie, 93, 0, [Gbd, ybd])), + qqb(Cbd, OC(GC(B1, 1), Kie, 93, 0, [Gbd, ybd, Abd])), + ]) + ); + cJb = new tJb( + "IN_T_R", + 14, + MHb, + DIb, + dHb, + fHb, + OC(GC(LK, 1), Uhe, 21, 0, [ + qqb(Cbd, OC(GC(B1, 1), Kie, 93, 0, [Gbd, Bbd])), + qqb(Cbd, OC(GC(B1, 1), Kie, 93, 0, [Gbd, Bbd, Abd])), + ]) + ); + $Ib = new tJb( + "IN_C_L", + 15, + LHb, + CIb, + eHb, + dHb, + OC(GC(LK, 1), Uhe, 21, 0, [ + qqb(Cbd, OC(GC(B1, 1), Kie, 93, 0, [Fbd, zbd])), + qqb(Cbd, OC(GC(B1, 1), Kie, 93, 0, [Fbd, zbd, Abd])), + ]) + ); + ZIb = new tJb( + "IN_C_C", + 16, + KHb, + CIb, + eHb, + eHb, + OC(GC(LK, 1), Uhe, 21, 0, [ + qqb(Cbd, OC(GC(B1, 1), Kie, 93, 0, [Fbd, ybd])), + qqb(Cbd, OC(GC(B1, 1), Kie, 93, 0, [Fbd, ybd, Abd])), + ]) + ); + _Ib = new tJb( + "IN_C_R", + 17, + MHb, + CIb, + eHb, + fHb, + OC(GC(LK, 1), Uhe, 21, 0, [ + qqb(Cbd, OC(GC(B1, 1), Kie, 93, 0, [Fbd, Bbd])), + qqb(Cbd, OC(GC(B1, 1), Kie, 93, 0, [Fbd, Bbd, Abd])), + ]) + ); + XIb = new tJb( + "IN_B_L", + 18, + LHb, + BIb, + fHb, + dHb, + OC(GC(LK, 1), Uhe, 21, 0, [ + qqb(Cbd, OC(GC(B1, 1), Kie, 93, 0, [Ebd, zbd])), + qqb(Cbd, OC(GC(B1, 1), Kie, 93, 0, [Ebd, zbd, Abd])), + ]) + ); + WIb = new tJb( + "IN_B_C", + 19, + KHb, + BIb, + fHb, + eHb, + OC(GC(LK, 1), Uhe, 21, 0, [ + qqb(Cbd, OC(GC(B1, 1), Kie, 93, 0, [Ebd, ybd])), + qqb(Cbd, OC(GC(B1, 1), Kie, 93, 0, [Ebd, ybd, Abd])), + ]) + ); + YIb = new tJb( + "IN_B_R", + 20, + MHb, + BIb, + fHb, + fHb, + OC(GC(LK, 1), Uhe, 21, 0, [ + qqb(Cbd, OC(GC(B1, 1), Kie, 93, 0, [Ebd, Bbd])), + qqb(Cbd, OC(GC(B1, 1), Kie, 93, 0, [Ebd, Bbd, Abd])), + ]) + ); + pJb = new tJb( + ole, + 21, + null, + null, + null, + null, + OC(GC(LK, 1), Uhe, 21, 0, []) + ); + } + function jGd() { + jGd = ccb; + PFd = (NFd(), MFd).b; + BD(qud(ZKd(MFd.b), 0), 34); + BD(qud(ZKd(MFd.b), 1), 18); + OFd = MFd.a; + BD(qud(ZKd(MFd.a), 0), 34); + BD(qud(ZKd(MFd.a), 1), 18); + BD(qud(ZKd(MFd.a), 2), 18); + BD(qud(ZKd(MFd.a), 3), 18); + BD(qud(ZKd(MFd.a), 4), 18); + QFd = MFd.o; + BD(qud(ZKd(MFd.o), 0), 34); + BD(qud(ZKd(MFd.o), 1), 34); + SFd = BD(qud(ZKd(MFd.o), 2), 18); + BD(qud(ZKd(MFd.o), 3), 18); + BD(qud(ZKd(MFd.o), 4), 18); + BD(qud(ZKd(MFd.o), 5), 18); + BD(qud(ZKd(MFd.o), 6), 18); + BD(qud(ZKd(MFd.o), 7), 18); + BD(qud(ZKd(MFd.o), 8), 18); + BD(qud(ZKd(MFd.o), 9), 18); + BD(qud(ZKd(MFd.o), 10), 18); + BD(qud(ZKd(MFd.o), 11), 18); + BD(qud(ZKd(MFd.o), 12), 18); + BD(qud(ZKd(MFd.o), 13), 18); + BD(qud(ZKd(MFd.o), 14), 18); + BD(qud(ZKd(MFd.o), 15), 18); + BD(qud(WKd(MFd.o), 0), 59); + BD(qud(WKd(MFd.o), 1), 59); + BD(qud(WKd(MFd.o), 2), 59); + BD(qud(WKd(MFd.o), 3), 59); + BD(qud(WKd(MFd.o), 4), 59); + BD(qud(WKd(MFd.o), 5), 59); + BD(qud(WKd(MFd.o), 6), 59); + BD(qud(WKd(MFd.o), 7), 59); + BD(qud(WKd(MFd.o), 8), 59); + BD(qud(WKd(MFd.o), 9), 59); + RFd = MFd.p; + BD(qud(ZKd(MFd.p), 0), 34); + BD(qud(ZKd(MFd.p), 1), 34); + BD(qud(ZKd(MFd.p), 2), 34); + BD(qud(ZKd(MFd.p), 3), 34); + BD(qud(ZKd(MFd.p), 4), 18); + BD(qud(ZKd(MFd.p), 5), 18); + BD(qud(WKd(MFd.p), 0), 59); + BD(qud(WKd(MFd.p), 1), 59); + TFd = MFd.q; + BD(qud(ZKd(MFd.q), 0), 34); + UFd = MFd.v; + BD(qud(ZKd(MFd.v), 0), 18); + BD(qud(WKd(MFd.v), 0), 59); + BD(qud(WKd(MFd.v), 1), 59); + BD(qud(WKd(MFd.v), 2), 59); + VFd = MFd.w; + BD(qud(ZKd(MFd.w), 0), 34); + BD(qud(ZKd(MFd.w), 1), 34); + BD(qud(ZKd(MFd.w), 2), 34); + BD(qud(ZKd(MFd.w), 3), 18); + WFd = MFd.B; + BD(qud(ZKd(MFd.B), 0), 18); + BD(qud(WKd(MFd.B), 0), 59); + BD(qud(WKd(MFd.B), 1), 59); + BD(qud(WKd(MFd.B), 2), 59); + ZFd = MFd.Q; + BD(qud(ZKd(MFd.Q), 0), 18); + BD(qud(WKd(MFd.Q), 0), 59); + $Fd = MFd.R; + BD(qud(ZKd(MFd.R), 0), 34); + _Fd = MFd.S; + BD(qud(WKd(MFd.S), 0), 59); + BD(qud(WKd(MFd.S), 1), 59); + BD(qud(WKd(MFd.S), 2), 59); + BD(qud(WKd(MFd.S), 3), 59); + BD(qud(WKd(MFd.S), 4), 59); + BD(qud(WKd(MFd.S), 5), 59); + BD(qud(WKd(MFd.S), 6), 59); + BD(qud(WKd(MFd.S), 7), 59); + BD(qud(WKd(MFd.S), 8), 59); + BD(qud(WKd(MFd.S), 9), 59); + BD(qud(WKd(MFd.S), 10), 59); + BD(qud(WKd(MFd.S), 11), 59); + BD(qud(WKd(MFd.S), 12), 59); + BD(qud(WKd(MFd.S), 13), 59); + BD(qud(WKd(MFd.S), 14), 59); + aGd = MFd.T; + BD(qud(ZKd(MFd.T), 0), 18); + BD(qud(ZKd(MFd.T), 2), 18); + bGd = BD(qud(ZKd(MFd.T), 3), 18); + BD(qud(ZKd(MFd.T), 4), 18); + BD(qud(WKd(MFd.T), 0), 59); + BD(qud(WKd(MFd.T), 1), 59); + BD(qud(ZKd(MFd.T), 1), 18); + cGd = MFd.U; + BD(qud(ZKd(MFd.U), 0), 34); + BD(qud(ZKd(MFd.U), 1), 34); + BD(qud(ZKd(MFd.U), 2), 18); + BD(qud(ZKd(MFd.U), 3), 18); + BD(qud(ZKd(MFd.U), 4), 18); + BD(qud(ZKd(MFd.U), 5), 18); + BD(qud(WKd(MFd.U), 0), 59); + dGd = MFd.V; + BD(qud(ZKd(MFd.V), 0), 18); + eGd = MFd.W; + BD(qud(ZKd(MFd.W), 0), 34); + BD(qud(ZKd(MFd.W), 1), 34); + BD(qud(ZKd(MFd.W), 2), 34); + BD(qud(ZKd(MFd.W), 3), 18); + BD(qud(ZKd(MFd.W), 4), 18); + BD(qud(ZKd(MFd.W), 5), 18); + gGd = MFd.bb; + BD(qud(ZKd(MFd.bb), 0), 34); + BD(qud(ZKd(MFd.bb), 1), 34); + BD(qud(ZKd(MFd.bb), 2), 34); + BD(qud(ZKd(MFd.bb), 3), 34); + BD(qud(ZKd(MFd.bb), 4), 34); + BD(qud(ZKd(MFd.bb), 5), 34); + BD(qud(ZKd(MFd.bb), 6), 34); + BD(qud(ZKd(MFd.bb), 7), 18); + BD(qud(WKd(MFd.bb), 0), 59); + BD(qud(WKd(MFd.bb), 1), 59); + hGd = MFd.eb; + BD(qud(ZKd(MFd.eb), 0), 34); + BD(qud(ZKd(MFd.eb), 1), 34); + BD(qud(ZKd(MFd.eb), 2), 34); + BD(qud(ZKd(MFd.eb), 3), 34); + BD(qud(ZKd(MFd.eb), 4), 34); + BD(qud(ZKd(MFd.eb), 5), 34); + BD(qud(ZKd(MFd.eb), 6), 18); + BD(qud(ZKd(MFd.eb), 7), 18); + fGd = MFd.ab; + BD(qud(ZKd(MFd.ab), 0), 34); + BD(qud(ZKd(MFd.ab), 1), 34); + XFd = MFd.H; + BD(qud(ZKd(MFd.H), 0), 18); + BD(qud(ZKd(MFd.H), 1), 18); + BD(qud(ZKd(MFd.H), 2), 18); + BD(qud(ZKd(MFd.H), 3), 18); + BD(qud(ZKd(MFd.H), 4), 18); + BD(qud(ZKd(MFd.H), 5), 18); + BD(qud(WKd(MFd.H), 0), 59); + iGd = MFd.db; + BD(qud(ZKd(MFd.db), 0), 18); + YFd = MFd.M; + } + function bae(a) { + var b; + if (a.O) return; + a.O = true; + pnd(a, "type"); + cod(a, "ecore.xml.type"); + dod(a, Ewe); + b = BD(nUd((yFd(), xFd), Ewe), 1945); + wtd(_Kd(a.fb), a.b); + Xnd(a.b, Q9, "AnyType", false, false, true); + Vnd( + BD(qud(ZKd(a.b), 0), 34), + a.wb.D, + Qve, + null, + 0, + -1, + Q9, + false, + false, + true, + false, + false, + false + ); + Vnd( + BD(qud(ZKd(a.b), 1), 34), + a.wb.D, + "any", + null, + 0, + -1, + Q9, + true, + true, + true, + false, + false, + true + ); + Vnd( + BD(qud(ZKd(a.b), 2), 34), + a.wb.D, + "anyAttribute", + null, + 0, + -1, + Q9, + false, + false, + true, + false, + false, + false + ); + Xnd(a.bb, S9, Jwe, false, false, true); + Vnd( + BD(qud(ZKd(a.bb), 0), 34), + a.gb, + "data", + null, + 0, + 1, + S9, + false, + false, + true, + false, + true, + false + ); + Vnd( + BD(qud(ZKd(a.bb), 1), 34), + a.gb, + bue, + null, + 1, + 1, + S9, + false, + false, + true, + false, + true, + false + ); + Xnd(a.fb, T9, Kwe, false, false, true); + Vnd( + BD(qud(ZKd(a.fb), 0), 34), + b.gb, + "rawValue", + null, + 0, + 1, + T9, + true, + true, + true, + false, + true, + true + ); + Vnd( + BD(qud(ZKd(a.fb), 1), 34), + b.a, + Bte, + null, + 0, + 1, + T9, + true, + true, + true, + false, + true, + true + ); + _nd( + BD(qud(ZKd(a.fb), 2), 18), + a.wb.q, + null, + "instanceType", + 1, + 1, + T9, + false, + false, + true, + false, + false, + false, + false + ); + Xnd(a.qb, U9, Lwe, false, false, true); + Vnd( + BD(qud(ZKd(a.qb), 0), 34), + a.wb.D, + Qve, + null, + 0, + -1, + null, + false, + false, + true, + false, + false, + false + ); + _nd( + BD(qud(ZKd(a.qb), 1), 18), + a.wb.ab, + null, + "xMLNSPrefixMap", + 0, + -1, + null, + true, + false, + true, + true, + false, + false, + false + ); + _nd( + BD(qud(ZKd(a.qb), 2), 18), + a.wb.ab, + null, + "xSISchemaLocation", + 0, + -1, + null, + true, + false, + true, + true, + false, + false, + false + ); + Vnd( + BD(qud(ZKd(a.qb), 3), 34), + a.gb, + "cDATA", + null, + 0, + -2, + null, + true, + true, + true, + false, + false, + true + ); + Vnd( + BD(qud(ZKd(a.qb), 4), 34), + a.gb, + "comment", + null, + 0, + -2, + null, + true, + true, + true, + false, + false, + true + ); + _nd( + BD(qud(ZKd(a.qb), 5), 18), + a.bb, + null, + jxe, + 0, + -2, + null, + true, + true, + true, + true, + false, + false, + true + ); + Vnd( + BD(qud(ZKd(a.qb), 6), 34), + a.gb, + Ite, + null, + 0, + -2, + null, + true, + true, + true, + false, + false, + true + ); + Znd(a.a, SI, "AnySimpleType", true); + Znd(a.c, ZI, "AnyURI", true); + Znd(a.d, GC(SD, 1), "Base64Binary", true); + Znd(a.e, sbb, "Boolean", true); + Znd(a.f, wI, "BooleanObject", true); + Znd(a.g, SD, "Byte", true); + Znd(a.i, xI, "ByteObject", true); + Znd(a.j, ZI, "Date", true); + Znd(a.k, ZI, "DateTime", true); + Znd(a.n, bJ, "Decimal", true); + Znd(a.o, UD, "Double", true); + Znd(a.p, BI, "DoubleObject", true); + Znd(a.q, ZI, "Duration", true); + Znd(a.s, yK, "ENTITIES", true); + Znd(a.r, yK, "ENTITIESBase", true); + Znd(a.t, ZI, Rwe, true); + Znd(a.u, VD, "Float", true); + Znd(a.v, FI, "FloatObject", true); + Znd(a.w, ZI, "GDay", true); + Znd(a.B, ZI, "GMonth", true); + Znd(a.A, ZI, "GMonthDay", true); + Znd(a.C, ZI, "GYear", true); + Znd(a.D, ZI, "GYearMonth", true); + Znd(a.F, GC(SD, 1), "HexBinary", true); + Znd(a.G, ZI, "ID", true); + Znd(a.H, ZI, "IDREF", true); + Znd(a.J, yK, "IDREFS", true); + Znd(a.I, yK, "IDREFSBase", true); + Znd(a.K, WD, "Int", true); + Znd(a.M, cJ, "Integer", true); + Znd(a.L, JI, "IntObject", true); + Znd(a.P, ZI, "Language", true); + Znd(a.Q, XD, "Long", true); + Znd(a.R, MI, "LongObject", true); + Znd(a.S, ZI, "Name", true); + Znd(a.T, ZI, Swe, true); + Znd(a.U, cJ, "NegativeInteger", true); + Znd(a.V, ZI, axe, true); + Znd(a.X, yK, "NMTOKENS", true); + Znd(a.W, yK, "NMTOKENSBase", true); + Znd(a.Y, cJ, "NonNegativeInteger", true); + Znd(a.Z, cJ, "NonPositiveInteger", true); + Znd(a.$, ZI, "NormalizedString", true); + Znd(a._, ZI, "NOTATION", true); + Znd(a.ab, ZI, "PositiveInteger", true); + Znd(a.cb, ZI, "QName", true); + Znd(a.db, rbb, "Short", true); + Znd(a.eb, UI, "ShortObject", true); + Znd(a.gb, ZI, Vie, true); + Znd(a.hb, ZI, "Time", true); + Znd(a.ib, ZI, "Token", true); + Znd(a.jb, rbb, "UnsignedByte", true); + Znd(a.kb, UI, "UnsignedByteObject", true); + Znd(a.lb, XD, "UnsignedInt", true); + Znd(a.mb, MI, "UnsignedIntObject", true); + Znd(a.nb, cJ, "UnsignedLong", true); + Znd(a.ob, WD, "UnsignedShort", true); + Znd(a.pb, JI, "UnsignedShortObject", true); + Rnd(a, Ewe); + _9d(a); + } + function Oyc(a) { + r4c( + a, + new E3c( + Q3c( + L3c( + P3c( + M3c( + O3c(N3c(new R3c(), sne), "ELK Layered"), + "Layer-based algorithm provided by the Eclipse Layout Kernel. Arranges as many edges as possible into one direction by placing nodes into subsequent layers. This implementation supports different routing styles (straight, orthogonal, splines); if orthogonal routing is selected, arbitrary port constraints are respected, thus enabling the layout of block diagrams such as actor-oriented models or circuit schematics. Furthermore, full layout of compound graphs with cross-hierarchy edges is supported when the respective option is activated on the top level." + ), + new Ryc() + ), + sne + ), + qqb( + (Csd(), Bsd), + OC(GC(O3, 1), Kie, 237, 0, [ysd, zsd, xsd, Asd, vsd, usd]) + ) + ) + ) + ); + p4c(a, sne, Lpe, Ksd(iyc)); + p4c(a, sne, Mpe, Ksd(jyc)); + p4c(a, sne, Zle, Ksd(kyc)); + p4c(a, sne, Npe, Ksd(lyc)); + p4c(a, sne, xme, Ksd(nyc)); + p4c(a, sne, Ope, Ksd(oyc)); + p4c(a, sne, Ppe, Ksd(ryc)); + p4c(a, sne, Qpe, Ksd(tyc)); + p4c(a, sne, Rpe, Ksd(uyc)); + p4c(a, sne, Spe, Ksd(syc)); + p4c(a, sne, wme, Ksd(vyc)); + p4c(a, sne, Tpe, Ksd(xyc)); + p4c(a, sne, Upe, Ksd(zyc)); + p4c(a, sne, Vpe, Ksd(qyc)); + p4c(a, sne, Loe, Ksd(hyc)); + p4c(a, sne, Noe, Ksd(myc)); + p4c(a, sne, Moe, Ksd(pyc)); + p4c(a, sne, Ooe, Ksd(wyc)); + p4c(a, sne, vme, meb(0)); + p4c(a, sne, Poe, Ksd(cyc)); + p4c(a, sne, Qoe, Ksd(dyc)); + p4c(a, sne, Roe, Ksd(eyc)); + p4c(a, sne, Yoe, Ksd(Kyc)); + p4c(a, sne, Zoe, Ksd(Cyc)); + p4c(a, sne, $oe, Ksd(Dyc)); + p4c(a, sne, _oe, Ksd(Gyc)); + p4c(a, sne, ape, Ksd(Eyc)); + p4c(a, sne, bpe, Ksd(Fyc)); + p4c(a, sne, cpe, Ksd(Myc)); + p4c(a, sne, dpe, Ksd(Lyc)); + p4c(a, sne, epe, Ksd(Iyc)); + p4c(a, sne, fpe, Ksd(Hyc)); + p4c(a, sne, gpe, Ksd(Jyc)); + p4c(a, sne, Eoe, Ksd(Cxc)); + p4c(a, sne, Foe, Ksd(Dxc)); + p4c(a, sne, Ioe, Ksd(Xwc)); + p4c(a, sne, Joe, Ksd(Ywc)); + p4c(a, sne, ame, Lxc); + p4c(a, sne, ype, Twc); + p4c(a, sne, Wpe, 0); + p4c(a, sne, yme, meb(1)); + p4c(a, sne, _le, tme); + p4c(a, sne, Xpe, Ksd(Jxc)); + p4c(a, sne, Bme, Ksd(Vxc)); + p4c(a, sne, Ype, Ksd($xc)); + p4c(a, sne, Zpe, Ksd(Kwc)); + p4c(a, sne, $pe, Ksd(mwc)); + p4c(a, sne, tpe, Ksd(axc)); + p4c(a, sne, zme, (Bcb(), true)); + p4c(a, sne, _pe, Ksd(fxc)); + p4c(a, sne, aqe, Ksd(gxc)); + p4c(a, sne, Fme, Ksd(Fxc)); + p4c(a, sne, Eme, Ksd(Ixc)); + p4c(a, sne, bqe, Ksd(Gxc)); + p4c(a, sne, cqe, Nwc); + p4c(a, sne, Gme, Ksd(xxc)); + p4c(a, sne, dqe, Ksd(wxc)); + p4c(a, sne, Hme, Ksd(Yxc)); + p4c(a, sne, eqe, Ksd(Xxc)); + p4c(a, sne, fqe, Ksd(Zxc)); + p4c(a, sne, gqe, Oxc); + p4c(a, sne, hqe, Ksd(Qxc)); + p4c(a, sne, iqe, Ksd(Rxc)); + p4c(a, sne, jqe, Ksd(Sxc)); + p4c(a, sne, kqe, Ksd(Pxc)); + p4c(a, sne, eoe, Ksd(Byc)); + p4c(a, sne, hoe, Ksd(sxc)); + p4c(a, sne, noe, Ksd(rxc)); + p4c(a, sne, doe, Ksd(Ayc)); + p4c(a, sne, ioe, Ksd(mxc)); + p4c(a, sne, goe, Ksd(Jwc)); + p4c(a, sne, qoe, Ksd(Iwc)); + p4c(a, sne, roe, Ksd(Awc)); + p4c(a, sne, woe, Ksd(Bwc)); + p4c(a, sne, xoe, Ksd(Dwc)); + p4c(a, sne, yoe, Ksd(Cwc)); + p4c(a, sne, toe, Ksd(Hwc)); + p4c(a, sne, _ne, Ksd(uxc)); + p4c(a, sne, aoe, Ksd(vxc)); + p4c(a, sne, $ne, Ksd(ixc)); + p4c(a, sne, zoe, Ksd(Exc)); + p4c(a, sne, Coe, Ksd(zxc)); + p4c(a, sne, Zne, Ksd($wc)); + p4c(a, sne, Doe, Ksd(Bxc)); + p4c(a, sne, Goe, Ksd(Vwc)); + p4c(a, sne, Hoe, Ksd(Wwc)); + p4c(a, sne, lqe, Ksd(zwc)); + p4c(a, sne, Boe, Ksd(yxc)); + p4c(a, sne, Toe, Ksd(swc)); + p4c(a, sne, Uoe, Ksd(rwc)); + p4c(a, sne, Soe, Ksd(qwc)); + p4c(a, sne, Voe, Ksd(cxc)); + p4c(a, sne, Woe, Ksd(bxc)); + p4c(a, sne, Xoe, Ksd(dxc)); + p4c(a, sne, Tme, Ksd(Hxc)); + p4c(a, sne, mqe, Ksd(jxc)); + p4c(a, sne, $le, Ksd(Zwc)); + p4c(a, sne, nqe, Ksd(Qwc)); + p4c(a, sne, Cme, Ksd(Pwc)); + p4c(a, sne, soe, Ksd(Ewc)); + p4c(a, sne, oqe, Ksd(Wxc)); + p4c(a, sne, pqe, Ksd(pwc)); + p4c(a, sne, qqe, Ksd(exc)); + p4c(a, sne, rqe, Ksd(Txc)); + p4c(a, sne, sqe, Ksd(Mxc)); + p4c(a, sne, tqe, Ksd(Nxc)); + p4c(a, sne, loe, Ksd(oxc)); + p4c(a, sne, moe, Ksd(pxc)); + p4c(a, sne, uqe, Ksd(ayc)); + p4c(a, sne, boe, Ksd(nwc)); + p4c(a, sne, ooe, Ksd(qxc)); + p4c(a, sne, hpe, Ksd(Rwc)); + p4c(a, sne, ipe, Ksd(Owc)); + p4c(a, sne, vqe, Ksd(txc)); + p4c(a, sne, poe, Ksd(kxc)); + p4c(a, sne, Aoe, Ksd(Axc)); + p4c(a, sne, wqe, Ksd(yyc)); + p4c(a, sne, Yne, Ksd(Mwc)); + p4c(a, sne, coe, Ksd(_xc)); + p4c(a, sne, Koe, Ksd(Uwc)); + p4c(a, sne, joe, Ksd(lxc)); + p4c(a, sne, uoe, Ksd(Fwc)); + p4c(a, sne, xqe, Ksd(hxc)); + p4c(a, sne, koe, Ksd(nxc)); + p4c(a, sne, voe, Ksd(Gwc)); + p4c(a, sne, jpe, Ksd(ywc)); + p4c(a, sne, mpe, Ksd(wwc)); + p4c(a, sne, npe, Ksd(uwc)); + p4c(a, sne, ope, Ksd(vwc)); + p4c(a, sne, kpe, Ksd(xwc)); + p4c(a, sne, lpe, Ksd(twc)); + p4c(a, sne, foe, Ksd(_wc)); + } + function kee(a, b) { + var c, d; + if (!cee) { + cee = new Lqb(); + dee = new Lqb(); + d = (wfe(), wfe(), ++vfe, new $fe(4)); + Ree(d, "\t\n\r\r "); + Shb(cee, pxe, d); + Shb(dee, pxe, _fe(d)); + d = (null, ++vfe, new $fe(4)); + Ree(d, sxe); + Shb(cee, nxe, d); + Shb(dee, nxe, _fe(d)); + d = (null, ++vfe, new $fe(4)); + Ree(d, sxe); + Shb(cee, nxe, d); + Shb(dee, nxe, _fe(d)); + d = (null, ++vfe, new $fe(4)); + Ree(d, txe); + Xfe(d, BD(Phb(cee, nxe), 117)); + Shb(cee, oxe, d); + Shb(dee, oxe, _fe(d)); + d = (null, ++vfe, new $fe(4)); + Ree( + d, + "-.0:AZ__az\xB7\xB7\xC0\xD6\xD8\xF6\xF8\u0131\u0134\u013E\u0141\u0148\u014A\u017E\u0180\u01C3\u01CD\u01F0\u01F4\u01F5\u01FA\u0217\u0250\u02A8\u02BB\u02C1\u02D0\u02D1\u0300\u0345\u0360\u0361\u0386\u038A\u038C\u038C\u038E\u03A1\u03A3\u03CE\u03D0\u03D6\u03DA\u03DA\u03DC\u03DC\u03DE\u03DE\u03E0\u03E0\u03E2\u03F3\u0401\u040C\u040E\u044F\u0451\u045C\u045E\u0481\u0483\u0486\u0490\u04C4\u04C7\u04C8\u04CB\u04CC\u04D0\u04EB\u04EE\u04F5\u04F8\u04F9\u0531\u0556\u0559\u0559\u0561\u0586\u0591\u05A1\u05A3\u05B9\u05BB\u05BD\u05BF\u05BF\u05C1\u05C2\u05C4\u05C4\u05D0\u05EA\u05F0\u05F2\u0621\u063A\u0640\u0652\u0660\u0669\u0670\u06B7\u06BA\u06BE\u06C0\u06CE\u06D0\u06D3\u06D5\u06E8\u06EA\u06ED\u06F0\u06F9\u0901\u0903\u0905\u0939\u093C\u094D\u0951\u0954\u0958\u0963\u0966\u096F\u0981\u0983\u0985\u098C\u098F\u0990\u0993\u09A8\u09AA\u09B0\u09B2\u09B2\u09B6\u09B9\u09BC\u09BC\u09BE\u09C4\u09C7\u09C8\u09CB\u09CD\u09D7\u09D7\u09DC\u09DD\u09DF\u09E3\u09E6\u09F1\u0A02\u0A02\u0A05\u0A0A\u0A0F\u0A10\u0A13\u0A28\u0A2A\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A3C\u0A3C\u0A3E\u0A42\u0A47\u0A48\u0A4B\u0A4D\u0A59\u0A5C\u0A5E\u0A5E\u0A66\u0A74\u0A81\u0A83\u0A85\u0A8B\u0A8D\u0A8D\u0A8F\u0A91\u0A93\u0AA8\u0AAA\u0AB0\u0AB2\u0AB3\u0AB5\u0AB9\u0ABC\u0AC5\u0AC7\u0AC9\u0ACB\u0ACD\u0AE0\u0AE0\u0AE6\u0AEF\u0B01\u0B03\u0B05\u0B0C\u0B0F\u0B10\u0B13\u0B28\u0B2A\u0B30\u0B32\u0B33\u0B36\u0B39\u0B3C\u0B43\u0B47\u0B48\u0B4B\u0B4D\u0B56\u0B57\u0B5C\u0B5D\u0B5F\u0B61\u0B66\u0B6F\u0B82\u0B83\u0B85\u0B8A\u0B8E\u0B90\u0B92\u0B95\u0B99\u0B9A\u0B9C\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8\u0BAA\u0BAE\u0BB5\u0BB7\u0BB9\u0BBE\u0BC2\u0BC6\u0BC8\u0BCA\u0BCD\u0BD7\u0BD7\u0BE7\u0BEF\u0C01\u0C03\u0C05\u0C0C\u0C0E\u0C10\u0C12\u0C28\u0C2A\u0C33\u0C35\u0C39\u0C3E\u0C44\u0C46\u0C48\u0C4A\u0C4D\u0C55\u0C56\u0C60\u0C61\u0C66\u0C6F\u0C82\u0C83\u0C85\u0C8C\u0C8E\u0C90\u0C92\u0CA8\u0CAA\u0CB3\u0CB5\u0CB9\u0CBE\u0CC4\u0CC6\u0CC8\u0CCA\u0CCD\u0CD5\u0CD6\u0CDE\u0CDE\u0CE0\u0CE1\u0CE6\u0CEF\u0D02\u0D03\u0D05\u0D0C\u0D0E\u0D10\u0D12\u0D28\u0D2A\u0D39\u0D3E\u0D43\u0D46\u0D48\u0D4A\u0D4D\u0D57\u0D57\u0D60\u0D61\u0D66\u0D6F\u0E01\u0E2E\u0E30\u0E3A\u0E40\u0E4E\u0E50\u0E59\u0E81\u0E82\u0E84\u0E84\u0E87\u0E88\u0E8A\u0E8A\u0E8D\u0E8D\u0E94\u0E97\u0E99\u0E9F\u0EA1\u0EA3\u0EA5\u0EA5\u0EA7\u0EA7\u0EAA\u0EAB\u0EAD\u0EAE\u0EB0\u0EB9\u0EBB\u0EBD\u0EC0\u0EC4\u0EC6\u0EC6\u0EC8\u0ECD\u0ED0\u0ED9\u0F18\u0F19\u0F20\u0F29\u0F35\u0F35\u0F37\u0F37\u0F39\u0F39\u0F3E\u0F47\u0F49\u0F69\u0F71\u0F84\u0F86\u0F8B\u0F90\u0F95\u0F97\u0F97\u0F99\u0FAD\u0FB1\u0FB7\u0FB9\u0FB9\u10A0\u10C5\u10D0\u10F6\u1100\u1100\u1102\u1103\u1105\u1107\u1109\u1109\u110B\u110C\u110E\u1112\u113C\u113C\u113E\u113E\u1140\u1140\u114C\u114C\u114E\u114E\u1150\u1150\u1154\u1155\u1159\u1159\u115F\u1161\u1163\u1163\u1165\u1165\u1167\u1167\u1169\u1169\u116D\u116E\u1172\u1173\u1175\u1175\u119E\u119E\u11A8\u11A8\u11AB\u11AB\u11AE\u11AF\u11B7\u11B8\u11BA\u11BA\u11BC\u11C2\u11EB\u11EB\u11F0\u11F0\u11F9\u11F9\u1E00\u1E9B\u1EA0\u1EF9\u1F00\u1F15\u1F18\u1F1D\u1F20\u1F45\u1F48\u1F4D\u1F50\u1F57\u1F59\u1F59\u1F5B\u1F5B\u1F5D\u1F5D\u1F5F\u1F7D\u1F80\u1FB4\u1FB6\u1FBC\u1FBE\u1FBE\u1FC2\u1FC4\u1FC6\u1FCC\u1FD0\u1FD3\u1FD6\u1FDB\u1FE0\u1FEC\u1FF2\u1FF4\u1FF6\u1FFC\u20D0\u20DC\u20E1\u20E1\u2126\u2126\u212A\u212B\u212E\u212E\u2180\u2182\u3005\u3005\u3007\u3007\u3021\u302F\u3031\u3035\u3041\u3094\u3099\u309A\u309D\u309E\u30A1\u30FA\u30FC\u30FE\u3105\u312C\u4E00\u9FA5\uAC00\uD7A3" + ); + Shb(cee, qxe, d); + Shb(dee, qxe, _fe(d)); + d = (null, ++vfe, new $fe(4)); + Ree(d, txe); + Ufe(d, 95, 95); + Ufe(d, 58, 58); + Shb(cee, rxe, d); + Shb(dee, rxe, _fe(d)); + } + c = b ? BD(Phb(cee, a), 136) : BD(Phb(dee, a), 136); + return c; + } + function _9d(a) { + Bnd(a.a, Rve, OC(GC(ZI, 1), nie, 2, 6, [fue, "anySimpleType"])); + Bnd(a.b, Rve, OC(GC(ZI, 1), nie, 2, 6, [fue, "anyType", Sve, Qve])); + Bnd( + BD(qud(ZKd(a.b), 0), 34), + Rve, + OC(GC(ZI, 1), nie, 2, 6, [Sve, xwe, fue, ":mixed"]) + ); + Bnd( + BD(qud(ZKd(a.b), 1), 34), + Rve, + OC(GC(ZI, 1), nie, 2, 6, [Sve, xwe, Dwe, Fwe, fue, ":1", Owe, "lax"]) + ); + Bnd( + BD(qud(ZKd(a.b), 2), 34), + Rve, + OC(GC(ZI, 1), nie, 2, 6, [Sve, vwe, Dwe, Fwe, fue, ":2", Owe, "lax"]) + ); + Bnd(a.c, Rve, OC(GC(ZI, 1), nie, 2, 6, [fue, "anyURI", Cwe, ywe])); + Bnd(a.d, Rve, OC(GC(ZI, 1), nie, 2, 6, [fue, "base64Binary", Cwe, ywe])); + Bnd(a.e, Rve, OC(GC(ZI, 1), nie, 2, 6, [fue, Khe, Cwe, ywe])); + Bnd( + a.f, + Rve, + OC(GC(ZI, 1), nie, 2, 6, [fue, "boolean:Object", cwe, Khe]) + ); + Bnd(a.g, Rve, OC(GC(ZI, 1), nie, 2, 6, [fue, Eve])); + Bnd(a.i, Rve, OC(GC(ZI, 1), nie, 2, 6, [fue, "byte:Object", cwe, Eve])); + Bnd(a.j, Rve, OC(GC(ZI, 1), nie, 2, 6, [fue, "date", Cwe, ywe])); + Bnd(a.k, Rve, OC(GC(ZI, 1), nie, 2, 6, [fue, "dateTime", Cwe, ywe])); + Bnd(a.n, Rve, OC(GC(ZI, 1), nie, 2, 6, [fue, "decimal", Cwe, ywe])); + Bnd(a.o, Rve, OC(GC(ZI, 1), nie, 2, 6, [fue, Gve, Cwe, ywe])); + Bnd(a.p, Rve, OC(GC(ZI, 1), nie, 2, 6, [fue, "double:Object", cwe, Gve])); + Bnd(a.q, Rve, OC(GC(ZI, 1), nie, 2, 6, [fue, "duration", Cwe, ywe])); + Bnd( + a.s, + Rve, + OC(GC(ZI, 1), nie, 2, 6, [fue, "ENTITIES", cwe, Pwe, Qwe, "1"]) + ); + Bnd(a.r, Rve, OC(GC(ZI, 1), nie, 2, 6, [fue, Pwe, zwe, Rwe])); + Bnd(a.t, Rve, OC(GC(ZI, 1), nie, 2, 6, [fue, Rwe, cwe, Swe])); + Bnd(a.u, Rve, OC(GC(ZI, 1), nie, 2, 6, [fue, Hve, Cwe, ywe])); + Bnd(a.v, Rve, OC(GC(ZI, 1), nie, 2, 6, [fue, "float:Object", cwe, Hve])); + Bnd(a.w, Rve, OC(GC(ZI, 1), nie, 2, 6, [fue, "gDay", Cwe, ywe])); + Bnd(a.B, Rve, OC(GC(ZI, 1), nie, 2, 6, [fue, "gMonth", Cwe, ywe])); + Bnd(a.A, Rve, OC(GC(ZI, 1), nie, 2, 6, [fue, "gMonthDay", Cwe, ywe])); + Bnd(a.C, Rve, OC(GC(ZI, 1), nie, 2, 6, [fue, "gYear", Cwe, ywe])); + Bnd(a.D, Rve, OC(GC(ZI, 1), nie, 2, 6, [fue, "gYearMonth", Cwe, ywe])); + Bnd(a.F, Rve, OC(GC(ZI, 1), nie, 2, 6, [fue, "hexBinary", Cwe, ywe])); + Bnd(a.G, Rve, OC(GC(ZI, 1), nie, 2, 6, [fue, "ID", cwe, Swe])); + Bnd(a.H, Rve, OC(GC(ZI, 1), nie, 2, 6, [fue, "IDREF", cwe, Swe])); + Bnd( + a.J, + Rve, + OC(GC(ZI, 1), nie, 2, 6, [fue, "IDREFS", cwe, Twe, Qwe, "1"]) + ); + Bnd(a.I, Rve, OC(GC(ZI, 1), nie, 2, 6, [fue, Twe, zwe, "IDREF"])); + Bnd(a.K, Rve, OC(GC(ZI, 1), nie, 2, 6, [fue, Ive])); + Bnd(a.M, Rve, OC(GC(ZI, 1), nie, 2, 6, [fue, Uwe])); + Bnd(a.L, Rve, OC(GC(ZI, 1), nie, 2, 6, [fue, "int:Object", cwe, Ive])); + Bnd( + a.P, + Rve, + OC(GC(ZI, 1), nie, 2, 6, [fue, "language", cwe, Vwe, Wwe, Xwe]) + ); + Bnd(a.Q, Rve, OC(GC(ZI, 1), nie, 2, 6, [fue, Jve])); + Bnd(a.R, Rve, OC(GC(ZI, 1), nie, 2, 6, [fue, "long:Object", cwe, Jve])); + Bnd( + a.S, + Rve, + OC(GC(ZI, 1), nie, 2, 6, [fue, "Name", cwe, Vwe, Wwe, Ywe]) + ); + Bnd( + a.T, + Rve, + OC(GC(ZI, 1), nie, 2, 6, [fue, Swe, cwe, "Name", Wwe, Zwe]) + ); + Bnd( + a.U, + Rve, + OC(GC(ZI, 1), nie, 2, 6, [fue, "negativeInteger", cwe, $we, _we, "-1"]) + ); + Bnd( + a.V, + Rve, + OC(GC(ZI, 1), nie, 2, 6, [fue, axe, cwe, Vwe, Wwe, "\\c+"]) + ); + Bnd( + a.X, + Rve, + OC(GC(ZI, 1), nie, 2, 6, [fue, "NMTOKENS", cwe, bxe, Qwe, "1"]) + ); + Bnd(a.W, Rve, OC(GC(ZI, 1), nie, 2, 6, [fue, bxe, zwe, axe])); + Bnd(a.Y, Rve, OC(GC(ZI, 1), nie, 2, 6, [fue, cxe, cwe, Uwe, dxe, "0"])); + Bnd(a.Z, Rve, OC(GC(ZI, 1), nie, 2, 6, [fue, $we, cwe, Uwe, _we, "0"])); + Bnd( + a.$, + Rve, + OC(GC(ZI, 1), nie, 2, 6, [fue, exe, cwe, Mhe, Cwe, "replace"]) + ); + Bnd(a._, Rve, OC(GC(ZI, 1), nie, 2, 6, [fue, "NOTATION", Cwe, ywe])); + Bnd( + a.ab, + Rve, + OC(GC(ZI, 1), nie, 2, 6, [fue, "positiveInteger", cwe, cxe, dxe, "1"]) + ); + Bnd( + a.bb, + Rve, + OC(GC(ZI, 1), nie, 2, 6, [ + fue, + "processingInstruction_._type", + Sve, + "empty", + ]) + ); + Bnd( + BD(qud(ZKd(a.bb), 0), 34), + Rve, + OC(GC(ZI, 1), nie, 2, 6, [Sve, uwe, fue, "data"]) + ); + Bnd( + BD(qud(ZKd(a.bb), 1), 34), + Rve, + OC(GC(ZI, 1), nie, 2, 6, [Sve, uwe, fue, bue]) + ); + Bnd(a.cb, Rve, OC(GC(ZI, 1), nie, 2, 6, [fue, "QName", Cwe, ywe])); + Bnd(a.db, Rve, OC(GC(ZI, 1), nie, 2, 6, [fue, Kve])); + Bnd(a.eb, Rve, OC(GC(ZI, 1), nie, 2, 6, [fue, "short:Object", cwe, Kve])); + Bnd( + a.fb, + Rve, + OC(GC(ZI, 1), nie, 2, 6, [fue, "simpleAnyType", Sve, twe]) + ); + Bnd( + BD(qud(ZKd(a.fb), 0), 34), + Rve, + OC(GC(ZI, 1), nie, 2, 6, [fue, ":3", Sve, twe]) + ); + Bnd( + BD(qud(ZKd(a.fb), 1), 34), + Rve, + OC(GC(ZI, 1), nie, 2, 6, [fue, ":4", Sve, twe]) + ); + Bnd( + BD(qud(ZKd(a.fb), 2), 18), + Rve, + OC(GC(ZI, 1), nie, 2, 6, [fue, ":5", Sve, twe]) + ); + Bnd(a.gb, Rve, OC(GC(ZI, 1), nie, 2, 6, [fue, Mhe, Cwe, "preserve"])); + Bnd(a.hb, Rve, OC(GC(ZI, 1), nie, 2, 6, [fue, "time", Cwe, ywe])); + Bnd(a.ib, Rve, OC(GC(ZI, 1), nie, 2, 6, [fue, Vwe, cwe, exe, Cwe, ywe])); + Bnd( + a.jb, + Rve, + OC(GC(ZI, 1), nie, 2, 6, [fue, fxe, _we, "255", dxe, "0"]) + ); + Bnd( + a.kb, + Rve, + OC(GC(ZI, 1), nie, 2, 6, [fue, "unsignedByte:Object", cwe, fxe]) + ); + Bnd( + a.lb, + Rve, + OC(GC(ZI, 1), nie, 2, 6, [fue, gxe, _we, "4294967295", dxe, "0"]) + ); + Bnd( + a.mb, + Rve, + OC(GC(ZI, 1), nie, 2, 6, [fue, "unsignedInt:Object", cwe, gxe]) + ); + Bnd( + a.nb, + Rve, + OC(GC(ZI, 1), nie, 2, 6, [ + fue, + "unsignedLong", + cwe, + cxe, + _we, + hxe, + dxe, + "0", + ]) + ); + Bnd( + a.ob, + Rve, + OC(GC(ZI, 1), nie, 2, 6, [fue, ixe, _we, "65535", dxe, "0"]) + ); + Bnd( + a.pb, + Rve, + OC(GC(ZI, 1), nie, 2, 6, [fue, "unsignedShort:Object", cwe, ixe]) + ); + Bnd(a.qb, Rve, OC(GC(ZI, 1), nie, 2, 6, [fue, "", Sve, Qve])); + Bnd( + BD(qud(ZKd(a.qb), 0), 34), + Rve, + OC(GC(ZI, 1), nie, 2, 6, [Sve, xwe, fue, ":mixed"]) + ); + Bnd( + BD(qud(ZKd(a.qb), 1), 18), + Rve, + OC(GC(ZI, 1), nie, 2, 6, [Sve, uwe, fue, "xmlns:prefix"]) + ); + Bnd( + BD(qud(ZKd(a.qb), 2), 18), + Rve, + OC(GC(ZI, 1), nie, 2, 6, [Sve, uwe, fue, "xsi:schemaLocation"]) + ); + Bnd( + BD(qud(ZKd(a.qb), 3), 34), + Rve, + OC(GC(ZI, 1), nie, 2, 6, [Sve, wwe, fue, "cDATA", Awe, Bwe]) + ); + Bnd( + BD(qud(ZKd(a.qb), 4), 34), + Rve, + OC(GC(ZI, 1), nie, 2, 6, [Sve, wwe, fue, "comment", Awe, Bwe]) + ); + Bnd( + BD(qud(ZKd(a.qb), 5), 18), + Rve, + OC(GC(ZI, 1), nie, 2, 6, [Sve, wwe, fue, jxe, Awe, Bwe]) + ); + Bnd( + BD(qud(ZKd(a.qb), 6), 34), + Rve, + OC(GC(ZI, 1), nie, 2, 6, [Sve, wwe, fue, Ite, Awe, Bwe]) + ); + } + function tvd(a) { + return dfb("_UI_EMFDiagnostic_marker", a) + ? "EMF Problem" + : dfb("_UI_CircularContainment_diagnostic", a) + ? "An object may not circularly contain itself" + : dfb(sue, a) + ? "Wrong character." + : dfb(tue, a) + ? "Invalid reference number." + : dfb(uue, a) + ? "A character is required after \\." + : dfb(vue, a) + ? "'?' is not expected. '(?:' or '(?=' or '(?!' or '(?<' or '(?#' or '(?>'?" + : dfb(wue, a) + ? "'(?<' or '(? toIndex: ", + zke = ", toIndex: ", + Ake = "Index: ", + Bke = ", Size: ", + Cke = "org.eclipse.elk.alg.common", + Dke = { 62: 1 }, + Eke = "org.eclipse.elk.alg.common.compaction", + Fke = "Scanline/EventHandler", + Gke = "org.eclipse.elk.alg.common.compaction.oned", + Hke = "CNode belongs to another CGroup.", + Ike = "ISpacingsHandler/1", + Jke = "The ", + Kke = " instance has been finished already.", + Lke = "The direction ", + Mke = " is not supported by the CGraph instance.", + Nke = "OneDimensionalCompactor", + Oke = "OneDimensionalCompactor/lambda$0$Type", + Pke = "Quadruplet", + Qke = "ScanlineConstraintCalculator", + Rke = "ScanlineConstraintCalculator/ConstraintsScanlineHandler", + Ske = + "ScanlineConstraintCalculator/ConstraintsScanlineHandler/lambda$0$Type", + Tke = "ScanlineConstraintCalculator/Timestamp", + Uke = "ScanlineConstraintCalculator/lambda$0$Type", + Vke = { 169: 1, 45: 1 }, + Wke = "org.eclipse.elk.alg.common.compaction.options", + Xke = "org.eclipse.elk.core.data", + Yke = "org.eclipse.elk.polyomino.traversalStrategy", + Zke = "org.eclipse.elk.polyomino.lowLevelSort", + $ke = "org.eclipse.elk.polyomino.highLevelSort", + _ke = "org.eclipse.elk.polyomino.fill", + ale = { 130: 1 }, + ble = "polyomino", + cle = "org.eclipse.elk.alg.common.networksimplex", + dle = { 177: 1, 3: 1, 4: 1 }, + ele = "org.eclipse.elk.alg.common.nodespacing", + fle = "org.eclipse.elk.alg.common.nodespacing.cellsystem", + gle = "CENTER", + hle = { 212: 1, 326: 1 }, + ile = { 3: 1, 4: 1, 5: 1, 595: 1 }, + jle = "LEFT", + kle = "RIGHT", + lle = "Vertical alignment cannot be null", + mle = "BOTTOM", + nle = "org.eclipse.elk.alg.common.nodespacing.internal", + ole = "UNDEFINED", + ple = 0.01, + qle = "org.eclipse.elk.alg.common.nodespacing.internal.algorithm", + rle = "LabelPlacer/lambda$0$Type", + sle = "LabelPlacer/lambda$1$Type", + tle = "portRatioOrPosition", + ule = "org.eclipse.elk.alg.common.overlaps", + vle = "DOWN", + wle = "org.eclipse.elk.alg.common.polyomino", + xle = "NORTH", + yle = "EAST", + zle = "SOUTH", + Ale = "WEST", + Ble = "org.eclipse.elk.alg.common.polyomino.structures", + Cle = "Direction", + Dle = "Grid is only of size ", + Ele = ". Requested point (", + Fle = ") is out of bounds.", + Gle = " Given center based coordinates were (", + Hle = "org.eclipse.elk.graph.properties", + Ile = "IPropertyHolder", + Jle = { 3: 1, 94: 1, 134: 1 }, + Kle = "org.eclipse.elk.alg.common.spore", + Lle = "org.eclipse.elk.alg.common.utils", + Mle = { 209: 1 }, + Nle = "org.eclipse.elk.core", + Ole = "Connected Components Compaction", + Ple = "org.eclipse.elk.alg.disco", + Qle = "org.eclipse.elk.alg.disco.graph", + Rle = "org.eclipse.elk.alg.disco.options", + Sle = "CompactionStrategy", + Tle = "org.eclipse.elk.disco.componentCompaction.strategy", + Ule = + "org.eclipse.elk.disco.componentCompaction.componentLayoutAlgorithm", + Vle = "org.eclipse.elk.disco.debug.discoGraph", + Wle = "org.eclipse.elk.disco.debug.discoPolys", + Xle = "componentCompaction", + Yle = "org.eclipse.elk.disco", + Zle = "org.eclipse.elk.spacing.componentComponent", + $le = "org.eclipse.elk.edge.thickness", + _le = "org.eclipse.elk.aspectRatio", + ame = "org.eclipse.elk.padding", + bme = "org.eclipse.elk.alg.disco.transform", + cme = 1.5707963267948966, + dme = 1.7976931348623157e308, + eme = { 3: 1, 4: 1, 5: 1, 192: 1 }, + fme = { 3: 1, 6: 1, 4: 1, 5: 1, 106: 1, 120: 1 }, + gme = "org.eclipse.elk.alg.force", + hme = "ComponentsProcessor", + ime = "ComponentsProcessor/1", + jme = "org.eclipse.elk.alg.force.graph", + kme = "Component Layout", + lme = "org.eclipse.elk.alg.force.model", + mme = "org.eclipse.elk.force.model", + nme = "org.eclipse.elk.force.iterations", + ome = "org.eclipse.elk.force.repulsivePower", + pme = "org.eclipse.elk.force.temperature", + qme = 0.001, + rme = "org.eclipse.elk.force.repulsion", + sme = "org.eclipse.elk.alg.force.options", + tme = 1.600000023841858, + ume = "org.eclipse.elk.force", + vme = "org.eclipse.elk.priority", + wme = "org.eclipse.elk.spacing.nodeNode", + xme = "org.eclipse.elk.spacing.edgeLabel", + yme = "org.eclipse.elk.randomSeed", + zme = "org.eclipse.elk.separateConnectedComponents", + Ame = "org.eclipse.elk.interactive", + Bme = "org.eclipse.elk.portConstraints", + Cme = "org.eclipse.elk.edgeLabels.inline", + Dme = "org.eclipse.elk.omitNodeMicroLayout", + Eme = "org.eclipse.elk.nodeSize.options", + Fme = "org.eclipse.elk.nodeSize.constraints", + Gme = "org.eclipse.elk.nodeLabels.placement", + Hme = "org.eclipse.elk.portLabels.placement", + Ime = "origin", + Jme = "random", + Kme = "boundingBox.upLeft", + Lme = "boundingBox.lowRight", + Mme = "org.eclipse.elk.stress.fixed", + Nme = "org.eclipse.elk.stress.desiredEdgeLength", + Ome = "org.eclipse.elk.stress.dimension", + Pme = "org.eclipse.elk.stress.epsilon", + Qme = "org.eclipse.elk.stress.iterationLimit", + Rme = "org.eclipse.elk.stress", + Sme = "ELK Stress", + Tme = "org.eclipse.elk.nodeSize.minimum", + Ume = "org.eclipse.elk.alg.force.stress", + Vme = "Layered layout", + Wme = "org.eclipse.elk.alg.layered", + Xme = "org.eclipse.elk.alg.layered.compaction.components", + Yme = "org.eclipse.elk.alg.layered.compaction.oned", + Zme = "org.eclipse.elk.alg.layered.compaction.oned.algs", + $me = "org.eclipse.elk.alg.layered.compaction.recthull", + _me = "org.eclipse.elk.alg.layered.components", + ane = "NONE", + bne = { 3: 1, 6: 1, 4: 1, 9: 1, 5: 1, 122: 1 }, + cne = { 3: 1, 6: 1, 4: 1, 5: 1, 141: 1, 106: 1, 120: 1 }, + dne = "org.eclipse.elk.alg.layered.compound", + ene = { 51: 1 }, + fne = "org.eclipse.elk.alg.layered.graph", + gne = " -> ", + hne = "Not supported by LGraph", + ine = "Port side is undefined", + jne = { 3: 1, 6: 1, 4: 1, 5: 1, 474: 1, 141: 1, 106: 1, 120: 1 }, + kne = { 3: 1, 6: 1, 4: 1, 5: 1, 141: 1, 193: 1, 203: 1, 106: 1, 120: 1 }, + lne = { 3: 1, 6: 1, 4: 1, 5: 1, 141: 1, 1943: 1, 203: 1, 106: 1, 120: 1 }, + mne = "([{\"' \t\r\n", + nne = ")]}\"' \t\r\n", + one = "The given string contains parts that cannot be parsed as numbers.", + pne = "org.eclipse.elk.core.math", + qne = { 3: 1, 4: 1, 142: 1, 207: 1, 414: 1 }, + rne = { 3: 1, 4: 1, 116: 1, 207: 1, 414: 1 }, + sne = "org.eclipse.elk.layered", + tne = "org.eclipse.elk.alg.layered.graph.transform", + une = "ElkGraphImporter", + vne = "ElkGraphImporter/lambda$0$Type", + wne = "ElkGraphImporter/lambda$1$Type", + xne = "ElkGraphImporter/lambda$2$Type", + yne = "ElkGraphImporter/lambda$4$Type", + zne = "Node margin calculation", + Ane = "org.eclipse.elk.alg.layered.intermediate", + Bne = "ONE_SIDED_GREEDY_SWITCH", + Cne = "TWO_SIDED_GREEDY_SWITCH", + Dne = "No implementation is available for the layout processor ", + Ene = "IntermediateProcessorStrategy", + Fne = "Node '", + Gne = "FIRST_SEPARATE", + Hne = "LAST_SEPARATE", + Ine = "Odd port side processing", + Jne = "org.eclipse.elk.alg.layered.intermediate.compaction", + Kne = "org.eclipse.elk.alg.layered.intermediate.greedyswitch", + Lne = "org.eclipse.elk.alg.layered.p3order.counting", + Mne = { 225: 1 }, + Nne = "org.eclipse.elk.alg.layered.intermediate.loops", + One = "org.eclipse.elk.alg.layered.intermediate.loops.ordering", + Pne = "org.eclipse.elk.alg.layered.intermediate.loops.routing", + Qne = "org.eclipse.elk.alg.layered.intermediate.preserveorder", + Rne = "org.eclipse.elk.alg.layered.intermediate.wrapping", + Sne = "org.eclipse.elk.alg.layered.options", + Tne = "INTERACTIVE", + Une = "DEPTH_FIRST", + Vne = "EDGE_LENGTH", + Wne = "SELF_LOOPS", + Xne = "firstTryWithInitialOrder", + Yne = "org.eclipse.elk.layered.directionCongruency", + Zne = "org.eclipse.elk.layered.feedbackEdges", + $ne = "org.eclipse.elk.layered.interactiveReferencePoint", + _ne = "org.eclipse.elk.layered.mergeEdges", + aoe = "org.eclipse.elk.layered.mergeHierarchyEdges", + boe = "org.eclipse.elk.layered.allowNonFlowPortsToSwitchSides", + coe = "org.eclipse.elk.layered.portSortingStrategy", + doe = "org.eclipse.elk.layered.thoroughness", + eoe = "org.eclipse.elk.layered.unnecessaryBendpoints", + foe = "org.eclipse.elk.layered.generatePositionAndLayerIds", + goe = "org.eclipse.elk.layered.cycleBreaking.strategy", + hoe = "org.eclipse.elk.layered.layering.strategy", + ioe = "org.eclipse.elk.layered.layering.layerConstraint", + joe = "org.eclipse.elk.layered.layering.layerChoiceConstraint", + koe = "org.eclipse.elk.layered.layering.layerId", + loe = "org.eclipse.elk.layered.layering.minWidth.upperBoundOnWidth", + moe = + "org.eclipse.elk.layered.layering.minWidth.upperLayerEstimationScalingFactor", + noe = "org.eclipse.elk.layered.layering.nodePromotion.strategy", + ooe = "org.eclipse.elk.layered.layering.nodePromotion.maxIterations", + poe = "org.eclipse.elk.layered.layering.coffmanGraham.layerBound", + qoe = "org.eclipse.elk.layered.crossingMinimization.strategy", + roe = "org.eclipse.elk.layered.crossingMinimization.forceNodeModelOrder", + soe = + "org.eclipse.elk.layered.crossingMinimization.hierarchicalSweepiness", + toe = "org.eclipse.elk.layered.crossingMinimization.semiInteractive", + uoe = + "org.eclipse.elk.layered.crossingMinimization.positionChoiceConstraint", + voe = "org.eclipse.elk.layered.crossingMinimization.positionId", + woe = + "org.eclipse.elk.layered.crossingMinimization.greedySwitch.activationThreshold", + xoe = "org.eclipse.elk.layered.crossingMinimization.greedySwitch.type", + yoe = + "org.eclipse.elk.layered.crossingMinimization.greedySwitchHierarchical.type", + zoe = "org.eclipse.elk.layered.nodePlacement.strategy", + Aoe = "org.eclipse.elk.layered.nodePlacement.favorStraightEdges", + Boe = "org.eclipse.elk.layered.nodePlacement.bk.edgeStraightening", + Coe = "org.eclipse.elk.layered.nodePlacement.bk.fixedAlignment", + Doe = + "org.eclipse.elk.layered.nodePlacement.linearSegments.deflectionDampening", + Eoe = + "org.eclipse.elk.layered.nodePlacement.networkSimplex.nodeFlexibility", + Foe = + "org.eclipse.elk.layered.nodePlacement.networkSimplex.nodeFlexibility.default", + Goe = "org.eclipse.elk.layered.edgeRouting.selfLoopDistribution", + Hoe = "org.eclipse.elk.layered.edgeRouting.selfLoopOrdering", + Ioe = "org.eclipse.elk.layered.edgeRouting.splines.mode", + Joe = + "org.eclipse.elk.layered.edgeRouting.splines.sloppy.layerSpacingFactor", + Koe = "org.eclipse.elk.layered.edgeRouting.polyline.slopedEdgeZoneWidth", + Loe = "org.eclipse.elk.layered.spacing.baseValue", + Moe = "org.eclipse.elk.layered.spacing.edgeNodeBetweenLayers", + Noe = "org.eclipse.elk.layered.spacing.edgeEdgeBetweenLayers", + Ooe = "org.eclipse.elk.layered.spacing.nodeNodeBetweenLayers", + Poe = "org.eclipse.elk.layered.priority.direction", + Qoe = "org.eclipse.elk.layered.priority.shortness", + Roe = "org.eclipse.elk.layered.priority.straightness", + Soe = "org.eclipse.elk.layered.compaction.connectedComponents", + Toe = "org.eclipse.elk.layered.compaction.postCompaction.strategy", + Uoe = "org.eclipse.elk.layered.compaction.postCompaction.constraints", + Voe = "org.eclipse.elk.layered.highDegreeNodes.treatment", + Woe = "org.eclipse.elk.layered.highDegreeNodes.threshold", + Xoe = "org.eclipse.elk.layered.highDegreeNodes.treeHeight", + Yoe = "org.eclipse.elk.layered.wrapping.strategy", + Zoe = "org.eclipse.elk.layered.wrapping.additionalEdgeSpacing", + $oe = "org.eclipse.elk.layered.wrapping.correctionFactor", + _oe = "org.eclipse.elk.layered.wrapping.cutting.strategy", + ape = "org.eclipse.elk.layered.wrapping.cutting.cuts", + bpe = "org.eclipse.elk.layered.wrapping.cutting.msd.freedom", + cpe = "org.eclipse.elk.layered.wrapping.validify.strategy", + dpe = "org.eclipse.elk.layered.wrapping.validify.forbiddenIndices", + epe = "org.eclipse.elk.layered.wrapping.multiEdge.improveCuts", + fpe = "org.eclipse.elk.layered.wrapping.multiEdge.distancePenalty", + gpe = "org.eclipse.elk.layered.wrapping.multiEdge.improveWrappedEdges", + hpe = "org.eclipse.elk.layered.edgeLabels.sideSelection", + ipe = "org.eclipse.elk.layered.edgeLabels.centerLabelPlacementStrategy", + jpe = "org.eclipse.elk.layered.considerModelOrder.strategy", + kpe = "org.eclipse.elk.layered.considerModelOrder.noModelOrder", + lpe = "org.eclipse.elk.layered.considerModelOrder.components", + mpe = "org.eclipse.elk.layered.considerModelOrder.longEdgeStrategy", + npe = + "org.eclipse.elk.layered.considerModelOrder.crossingCounterNodeInfluence", + ope = + "org.eclipse.elk.layered.considerModelOrder.crossingCounterPortInfluence", + ppe = "layering", + qpe = "layering.minWidth", + rpe = "layering.nodePromotion", + spe = "crossingMinimization", + tpe = "org.eclipse.elk.hierarchyHandling", + upe = "crossingMinimization.greedySwitch", + vpe = "nodePlacement", + wpe = "nodePlacement.bk", + xpe = "edgeRouting", + ype = "org.eclipse.elk.edgeRouting", + zpe = "spacing", + Ape = "priority", + Bpe = "compaction", + Cpe = "compaction.postCompaction", + Dpe = "Specifies whether and how post-process compaction is applied.", + Epe = "highDegreeNodes", + Fpe = "wrapping", + Gpe = "wrapping.cutting", + Hpe = "wrapping.validify", + Ipe = "wrapping.multiEdge", + Jpe = "edgeLabels", + Kpe = "considerModelOrder", + Lpe = "org.eclipse.elk.spacing.commentComment", + Mpe = "org.eclipse.elk.spacing.commentNode", + Npe = "org.eclipse.elk.spacing.edgeEdge", + Ope = "org.eclipse.elk.spacing.edgeNode", + Ppe = "org.eclipse.elk.spacing.labelLabel", + Qpe = "org.eclipse.elk.spacing.labelPortHorizontal", + Rpe = "org.eclipse.elk.spacing.labelPortVertical", + Spe = "org.eclipse.elk.spacing.labelNode", + Tpe = "org.eclipse.elk.spacing.nodeSelfLoop", + Upe = "org.eclipse.elk.spacing.portPort", + Vpe = "org.eclipse.elk.spacing.individual", + Wpe = "org.eclipse.elk.port.borderOffset", + Xpe = "org.eclipse.elk.noLayout", + Ype = "org.eclipse.elk.port.side", + Zpe = "org.eclipse.elk.debugMode", + $pe = "org.eclipse.elk.alignment", + _pe = "org.eclipse.elk.insideSelfLoops.activate", + aqe = "org.eclipse.elk.insideSelfLoops.yo", + bqe = "org.eclipse.elk.nodeSize.fixedGraphSize", + cqe = "org.eclipse.elk.direction", + dqe = "org.eclipse.elk.nodeLabels.padding", + eqe = "org.eclipse.elk.portLabels.nextToPortIfPossible", + fqe = "org.eclipse.elk.portLabels.treatAsGroup", + gqe = "org.eclipse.elk.portAlignment.default", + hqe = "org.eclipse.elk.portAlignment.north", + iqe = "org.eclipse.elk.portAlignment.south", + jqe = "org.eclipse.elk.portAlignment.west", + kqe = "org.eclipse.elk.portAlignment.east", + lqe = "org.eclipse.elk.contentAlignment", + mqe = "org.eclipse.elk.junctionPoints", + nqe = "org.eclipse.elk.edgeLabels.placement", + oqe = "org.eclipse.elk.port.index", + pqe = "org.eclipse.elk.commentBox", + qqe = "org.eclipse.elk.hypernode", + rqe = "org.eclipse.elk.port.anchor", + sqe = "org.eclipse.elk.partitioning.activate", + tqe = "org.eclipse.elk.partitioning.partition", + uqe = "org.eclipse.elk.position", + vqe = "org.eclipse.elk.margins", + wqe = "org.eclipse.elk.spacing.portsSurrounding", + xqe = "org.eclipse.elk.interactiveLayout", + yqe = "org.eclipse.elk.core.util", + zqe = { 3: 1, 4: 1, 5: 1, 593: 1 }, + Aqe = "NETWORK_SIMPLEX", + Bqe = { 123: 1, 51: 1 }, + Cqe = "org.eclipse.elk.alg.layered.p1cycles", + Dqe = "org.eclipse.elk.alg.layered.p2layers", + Eqe = { 402: 1, 225: 1 }, + Fqe = { 832: 1, 3: 1, 4: 1 }, + Gqe = "org.eclipse.elk.alg.layered.p3order", + Hqe = "org.eclipse.elk.alg.layered.p4nodes", + Iqe = { 3: 1, 4: 1, 5: 1, 840: 1 }, + Jqe = 1.0e-5, + Kqe = "org.eclipse.elk.alg.layered.p4nodes.bk", + Lqe = "org.eclipse.elk.alg.layered.p5edges", + Mqe = "org.eclipse.elk.alg.layered.p5edges.orthogonal", + Nqe = "org.eclipse.elk.alg.layered.p5edges.orthogonal.direction", + Oqe = 1.0e-6, + Pqe = "org.eclipse.elk.alg.layered.p5edges.splines", + Qqe = 0.09999999999999998, + Rqe = 1.0e-8, + Sqe = 4.71238898038469, + Tqe = 3.141592653589793, + Uqe = "org.eclipse.elk.alg.mrtree", + Vqe = "org.eclipse.elk.alg.mrtree.graph", + Wqe = "org.eclipse.elk.alg.mrtree.intermediate", + Xqe = "Set neighbors in level", + Yqe = "DESCENDANTS", + Zqe = "org.eclipse.elk.mrtree.weighting", + $qe = "org.eclipse.elk.mrtree.searchOrder", + _qe = "org.eclipse.elk.alg.mrtree.options", + are = "org.eclipse.elk.mrtree", + bre = "org.eclipse.elk.tree", + cre = "org.eclipse.elk.alg.radial", + dre = 6.283185307179586, + ere = 4.9e-324, + fre = "org.eclipse.elk.alg.radial.intermediate", + gre = "org.eclipse.elk.alg.radial.intermediate.compaction", + hre = { 3: 1, 4: 1, 5: 1, 106: 1 }, + ire = "org.eclipse.elk.alg.radial.intermediate.optimization", + jre = "No implementation is available for the layout option ", + kre = "org.eclipse.elk.alg.radial.options", + lre = "org.eclipse.elk.radial.orderId", + mre = "org.eclipse.elk.radial.radius", + nre = "org.eclipse.elk.radial.compactor", + ore = "org.eclipse.elk.radial.compactionStepSize", + pre = "org.eclipse.elk.radial.sorter", + qre = "org.eclipse.elk.radial.wedgeCriteria", + rre = "org.eclipse.elk.radial.optimizationCriteria", + sre = "org.eclipse.elk.radial", + tre = "org.eclipse.elk.alg.radial.p1position.wedge", + ure = "org.eclipse.elk.alg.radial.sorting", + vre = 5.497787143782138, + wre = 3.9269908169872414, + xre = 2.356194490192345, + yre = "org.eclipse.elk.alg.rectpacking", + zre = "org.eclipse.elk.alg.rectpacking.firstiteration", + Are = "org.eclipse.elk.alg.rectpacking.options", + Bre = "org.eclipse.elk.rectpacking.optimizationGoal", + Cre = "org.eclipse.elk.rectpacking.lastPlaceShift", + Dre = "org.eclipse.elk.rectpacking.currentPosition", + Ere = "org.eclipse.elk.rectpacking.desiredPosition", + Fre = "org.eclipse.elk.rectpacking.onlyFirstIteration", + Gre = "org.eclipse.elk.rectpacking.rowCompaction", + Hre = "org.eclipse.elk.rectpacking.expandToAspectRatio", + Ire = "org.eclipse.elk.rectpacking.targetWidth", + Jre = "org.eclipse.elk.expandNodes", + Kre = "org.eclipse.elk.rectpacking", + Lre = "org.eclipse.elk.alg.rectpacking.util", + Mre = "No implementation available for ", + Nre = "org.eclipse.elk.alg.spore", + Ore = "org.eclipse.elk.alg.spore.options", + Pre = "org.eclipse.elk.sporeCompaction", + Qre = "org.eclipse.elk.underlyingLayoutAlgorithm", + Rre = "org.eclipse.elk.processingOrder.treeConstruction", + Sre = "org.eclipse.elk.processingOrder.spanningTreeCostFunction", + Tre = "org.eclipse.elk.processingOrder.preferredRoot", + Ure = "org.eclipse.elk.processingOrder.rootSelection", + Vre = "org.eclipse.elk.structure.structureExtractionStrategy", + Wre = "org.eclipse.elk.compaction.compactionStrategy", + Xre = "org.eclipse.elk.compaction.orthogonal", + Yre = "org.eclipse.elk.overlapRemoval.maxIterations", + Zre = "org.eclipse.elk.overlapRemoval.runScanline", + $re = "processingOrder", + _re = "overlapRemoval", + ase = "org.eclipse.elk.sporeOverlap", + bse = "org.eclipse.elk.alg.spore.p1structure", + cse = "org.eclipse.elk.alg.spore.p2processingorder", + dse = "org.eclipse.elk.alg.spore.p3execution", + ese = "Invalid index: ", + fse = "org.eclipse.elk.core.alg", + gse = { 331: 1 }, + hse = { 288: 1 }, + ise = "Make sure its type is registered with the ", + jse = " utility class.", + kse = "true", + lse = "false", + mse = "Couldn't clone property '", + nse = 0.05, + ose = "org.eclipse.elk.core.options", + pse = 1.2999999523162842, + qse = "org.eclipse.elk.box", + rse = "org.eclipse.elk.box.packingMode", + sse = "org.eclipse.elk.algorithm", + tse = "org.eclipse.elk.resolvedAlgorithm", + use = "org.eclipse.elk.bendPoints", + vse = "org.eclipse.elk.labelManager", + wse = "org.eclipse.elk.scaleFactor", + xse = "org.eclipse.elk.animate", + yse = "org.eclipse.elk.animTimeFactor", + zse = "org.eclipse.elk.layoutAncestors", + Ase = "org.eclipse.elk.maxAnimTime", + Bse = "org.eclipse.elk.minAnimTime", + Cse = "org.eclipse.elk.progressBar", + Dse = "org.eclipse.elk.validateGraph", + Ese = "org.eclipse.elk.validateOptions", + Fse = "org.eclipse.elk.zoomToFit", + Gse = "org.eclipse.elk.font.name", + Hse = "org.eclipse.elk.font.size", + Ise = "org.eclipse.elk.edge.type", + Jse = "partitioning", + Kse = "nodeLabels", + Lse = "portAlignment", + Mse = "nodeSize", + Nse = "port", + Ose = "portLabels", + Pse = "insideSelfLoops", + Qse = "org.eclipse.elk.fixed", + Rse = "org.eclipse.elk.random", + Sse = "port must have a parent node to calculate the port side", + Tse = "The edge needs to have exactly one edge section. Found: ", + Use = "org.eclipse.elk.core.util.adapters", + Vse = "org.eclipse.emf.ecore", + Wse = "org.eclipse.elk.graph", + Xse = "EMapPropertyHolder", + Yse = "ElkBendPoint", + Zse = "ElkGraphElement", + $se = "ElkConnectableShape", + _se = "ElkEdge", + ate = "ElkEdgeSection", + bte = "EModelElement", + cte = "ENamedElement", + dte = "ElkLabel", + ete = "ElkNode", + fte = "ElkPort", + gte = { 92: 1, 90: 1 }, + hte = "org.eclipse.emf.common.notify.impl", + ite = "The feature '", + jte = "' is not a valid changeable feature", + kte = "Expecting null", + lte = "' is not a valid feature", + mte = "The feature ID", + nte = " is not a valid feature ID", + ote = 32768, + pte = { 105: 1, 92: 1, 90: 1, 56: 1, 49: 1, 97: 1 }, + qte = "org.eclipse.emf.ecore.impl", + rte = "org.eclipse.elk.graph.impl", + ste = "Recursive containment not allowed for ", + tte = "The datatype '", + ute = "' is not a valid classifier", + vte = "The value '", + wte = { 190: 1, 3: 1, 4: 1 }, + xte = "The class '", + yte = "http://www.eclipse.org/elk/ElkGraph", + zte = 1024, + Ate = "property", + Bte = "value", + Cte = "source", + Dte = "properties", + Ete = "identifier", + Fte = "height", + Gte = "width", + Hte = "parent", + Ite = "text", + Jte = "children", + Kte = "hierarchical", + Lte = "sources", + Mte = "targets", + Nte = "sections", + Ote = "bendPoints", + Pte = "outgoingShape", + Qte = "incomingShape", + Rte = "outgoingSections", + Ste = "incomingSections", + Tte = "org.eclipse.emf.common.util", + Ute = "Severe implementation error in the Json to ElkGraph importer.", + Vte = "id", + Wte = "org.eclipse.elk.graph.json", + Xte = "Unhandled parameter types: ", + Yte = "startPoint", + Zte = "An edge must have at least one source and one target (edge id: '", + $te = "').", + _te = "Referenced edge section does not exist: ", + aue = " (edge id: '", + bue = "target", + cue = "sourcePoint", + due = "targetPoint", + eue = "group", + fue = "name", + gue = "connectableShape cannot be null", + hue = "edge cannot be null", + iue = "Passed edge is not 'simple'.", + jue = "org.eclipse.elk.graph.util", + kue = "The 'no duplicates' constraint is violated", + lue = "targetIndex=", + mue = ", size=", + nue = "sourceIndex=", + oue = { + 3: 1, + 4: 1, + 20: 1, + 28: 1, + 52: 1, + 14: 1, + 15: 1, + 54: 1, + 67: 1, + 63: 1, + 58: 1, + }, + pue = { + 3: 1, + 4: 1, + 20: 1, + 28: 1, + 52: 1, + 14: 1, + 47: 1, + 15: 1, + 54: 1, + 67: 1, + 63: 1, + 58: 1, + 588: 1, + }, + que = "logging", + rue = "measureExecutionTime", + sue = "parser.parse.1", + tue = "parser.parse.2", + uue = "parser.next.1", + vue = "parser.next.2", + wue = "parser.next.3", + xue = "parser.next.4", + yue = "parser.factor.1", + zue = "parser.factor.2", + Aue = "parser.factor.3", + Bue = "parser.factor.4", + Cue = "parser.factor.5", + Due = "parser.factor.6", + Eue = "parser.atom.1", + Fue = "parser.atom.2", + Gue = "parser.atom.3", + Hue = "parser.atom.4", + Iue = "parser.atom.5", + Jue = "parser.cc.1", + Kue = "parser.cc.2", + Lue = "parser.cc.3", + Mue = "parser.cc.5", + Nue = "parser.cc.6", + Oue = "parser.cc.7", + Pue = "parser.cc.8", + Que = "parser.ope.1", + Rue = "parser.ope.2", + Sue = "parser.ope.3", + Tue = "parser.descape.1", + Uue = "parser.descape.2", + Vue = "parser.descape.3", + Wue = "parser.descape.4", + Xue = "parser.descape.5", + Yue = "parser.process.1", + Zue = "parser.quantifier.1", + $ue = "parser.quantifier.2", + _ue = "parser.quantifier.3", + ave = "parser.quantifier.4", + bve = "parser.quantifier.5", + cve = "org.eclipse.emf.common.notify", + dve = { 415: 1, 672: 1 }, + eve = { 3: 1, 4: 1, 20: 1, 28: 1, 52: 1, 14: 1, 15: 1, 67: 1, 58: 1 }, + fve = { 366: 1, 143: 1 }, + gve = "index=", + hve = { 3: 1, 4: 1, 5: 1, 126: 1 }, + ive = { + 3: 1, + 4: 1, + 20: 1, + 28: 1, + 52: 1, + 14: 1, + 15: 1, + 54: 1, + 67: 1, + 58: 1, + }, + jve = { 3: 1, 6: 1, 4: 1, 5: 1, 192: 1 }, + kve = { 3: 1, 4: 1, 5: 1, 165: 1, 367: 1 }, + lve = ";/?:@&=+$,", + mve = "invalid authority: ", + nve = "EAnnotation", + ove = "ETypedElement", + pve = "EStructuralFeature", + qve = "EAttribute", + rve = "EClassifier", + sve = "EEnumLiteral", + tve = "EGenericType", + uve = "EOperation", + vve = "EParameter", + wve = "EReference", + xve = "ETypeParameter", + yve = "org.eclipse.emf.ecore.util", + zve = { 76: 1 }, + Ave = { 3: 1, 20: 1, 14: 1, 15: 1, 58: 1, 589: 1, 76: 1, 69: 1, 95: 1 }, + Bve = "org.eclipse.emf.ecore.util.FeatureMap$Entry", + Cve = 8192, + Dve = 2048, + Eve = "byte", + Fve = "char", + Gve = "double", + Hve = "float", + Ive = "int", + Jve = "long", + Kve = "short", + Lve = "java.lang.Object", + Mve = { 3: 1, 4: 1, 5: 1, 247: 1 }, + Nve = { 3: 1, 4: 1, 5: 1, 673: 1 }, + Ove = { + 3: 1, + 4: 1, + 20: 1, + 28: 1, + 52: 1, + 14: 1, + 15: 1, + 54: 1, + 67: 1, + 63: 1, + 58: 1, + 69: 1, + }, + Pve = { + 3: 1, + 4: 1, + 20: 1, + 28: 1, + 52: 1, + 14: 1, + 15: 1, + 54: 1, + 67: 1, + 63: 1, + 58: 1, + 76: 1, + 69: 1, + 95: 1, + }, + Qve = "mixed", + Rve = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData", + Sve = "kind", + Tve = { 3: 1, 4: 1, 5: 1, 674: 1 }, + Uve = { + 3: 1, + 4: 1, + 20: 1, + 28: 1, + 52: 1, + 14: 1, + 15: 1, + 67: 1, + 58: 1, + 76: 1, + 69: 1, + 95: 1, + }, + Vve = { 20: 1, 28: 1, 52: 1, 14: 1, 15: 1, 58: 1, 69: 1 }, + Wve = { 47: 1, 125: 1, 279: 1 }, + Xve = { 72: 1, 332: 1 }, + Yve = "The value of type '", + Zve = "' must be of type '", + $ve = 1316, + _ve = "http://www.eclipse.org/emf/2002/Ecore", + awe = -32768, + bwe = "constraints", + cwe = "baseType", + dwe = "getEStructuralFeature", + ewe = "getFeatureID", + fwe = "feature", + gwe = "getOperationID", + hwe = "operation", + iwe = "defaultValue", + jwe = "eTypeParameters", + kwe = "isInstance", + lwe = "getEEnumLiteral", + mwe = "eContainingClass", + nwe = { 55: 1 }, + owe = { 3: 1, 4: 1, 5: 1, 119: 1 }, + pwe = "org.eclipse.emf.ecore.resource", + qwe = { 92: 1, 90: 1, 591: 1, 1935: 1 }, + rwe = "org.eclipse.emf.ecore.resource.impl", + swe = "unspecified", + twe = "simple", + uwe = "attribute", + vwe = "attributeWildcard", + wwe = "element", + xwe = "elementWildcard", + ywe = "collapse", + zwe = "itemType", + Awe = "namespace", + Bwe = "##targetNamespace", + Cwe = "whiteSpace", + Dwe = "wildcards", + Ewe = "http://www.eclipse.org/emf/2003/XMLType", + Fwe = "##any", + Gwe = "uninitialized", + Hwe = "The multiplicity constraint is violated", + Iwe = "org.eclipse.emf.ecore.xml.type", + Jwe = "ProcessingInstruction", + Kwe = "SimpleAnyType", + Lwe = "XMLTypeDocumentRoot", + Mwe = "org.eclipse.emf.ecore.xml.type.impl", + Nwe = "INF", + Owe = "processing", + Pwe = "ENTITIES_._base", + Qwe = "minLength", + Rwe = "ENTITY", + Swe = "NCName", + Twe = "IDREFS_._base", + Uwe = "integer", + Vwe = "token", + Wwe = "pattern", + Xwe = "[a-zA-Z]{1,8}(-[a-zA-Z0-9]{1,8})*", + Ywe = "\\i\\c*", + Zwe = "[\\i-[:]][\\c-[:]]*", + $we = "nonPositiveInteger", + _we = "maxInclusive", + axe = "NMTOKEN", + bxe = "NMTOKENS_._base", + cxe = "nonNegativeInteger", + dxe = "minInclusive", + exe = "normalizedString", + fxe = "unsignedByte", + gxe = "unsignedInt", + hxe = "18446744073709551615", + ixe = "unsignedShort", + jxe = "processingInstruction", + kxe = "org.eclipse.emf.ecore.xml.type.internal", + lxe = 1114111, + mxe = "Internal Error: shorthands: \\u", + nxe = "xml:isDigit", + oxe = "xml:isWord", + pxe = "xml:isSpace", + qxe = "xml:isNameChar", + rxe = "xml:isInitialNameChar", + sxe = + "09\u0660\u0669\u06F0\u06F9\u0966\u096F\u09E6\u09EF\u0A66\u0A6F\u0AE6\u0AEF\u0B66\u0B6F\u0BE7\u0BEF\u0C66\u0C6F\u0CE6\u0CEF\u0D66\u0D6F\u0E50\u0E59\u0ED0\u0ED9\u0F20\u0F29", + txe = + "AZaz\xC0\xD6\xD8\xF6\xF8\u0131\u0134\u013E\u0141\u0148\u014A\u017E\u0180\u01C3\u01CD\u01F0\u01F4\u01F5\u01FA\u0217\u0250\u02A8\u02BB\u02C1\u0386\u0386\u0388\u038A\u038C\u038C\u038E\u03A1\u03A3\u03CE\u03D0\u03D6\u03DA\u03DA\u03DC\u03DC\u03DE\u03DE\u03E0\u03E0\u03E2\u03F3\u0401\u040C\u040E\u044F\u0451\u045C\u045E\u0481\u0490\u04C4\u04C7\u04C8\u04CB\u04CC\u04D0\u04EB\u04EE\u04F5\u04F8\u04F9\u0531\u0556\u0559\u0559\u0561\u0586\u05D0\u05EA\u05F0\u05F2\u0621\u063A\u0641\u064A\u0671\u06B7\u06BA\u06BE\u06C0\u06CE\u06D0\u06D3\u06D5\u06D5\u06E5\u06E6\u0905\u0939\u093D\u093D\u0958\u0961\u0985\u098C\u098F\u0990\u0993\u09A8\u09AA\u09B0\u09B2\u09B2\u09B6\u09B9\u09DC\u09DD\u09DF\u09E1\u09F0\u09F1\u0A05\u0A0A\u0A0F\u0A10\u0A13\u0A28\u0A2A\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59\u0A5C\u0A5E\u0A5E\u0A72\u0A74\u0A85\u0A8B\u0A8D\u0A8D\u0A8F\u0A91\u0A93\u0AA8\u0AAA\u0AB0\u0AB2\u0AB3\u0AB5\u0AB9\u0ABD\u0ABD\u0AE0\u0AE0\u0B05\u0B0C\u0B0F\u0B10\u0B13\u0B28\u0B2A\u0B30\u0B32\u0B33\u0B36\u0B39\u0B3D\u0B3D\u0B5C\u0B5D\u0B5F\u0B61\u0B85\u0B8A\u0B8E\u0B90\u0B92\u0B95\u0B99\u0B9A\u0B9C\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8\u0BAA\u0BAE\u0BB5\u0BB7\u0BB9\u0C05\u0C0C\u0C0E\u0C10\u0C12\u0C28\u0C2A\u0C33\u0C35\u0C39\u0C60\u0C61\u0C85\u0C8C\u0C8E\u0C90\u0C92\u0CA8\u0CAA\u0CB3\u0CB5\u0CB9\u0CDE\u0CDE\u0CE0\u0CE1\u0D05\u0D0C\u0D0E\u0D10\u0D12\u0D28\u0D2A\u0D39\u0D60\u0D61\u0E01\u0E2E\u0E30\u0E30\u0E32\u0E33\u0E40\u0E45\u0E81\u0E82\u0E84\u0E84\u0E87\u0E88\u0E8A\u0E8A\u0E8D\u0E8D\u0E94\u0E97\u0E99\u0E9F\u0EA1\u0EA3\u0EA5\u0EA5\u0EA7\u0EA7\u0EAA\u0EAB\u0EAD\u0EAE\u0EB0\u0EB0\u0EB2\u0EB3\u0EBD\u0EBD\u0EC0\u0EC4\u0F40\u0F47\u0F49\u0F69\u10A0\u10C5\u10D0\u10F6\u1100\u1100\u1102\u1103\u1105\u1107\u1109\u1109\u110B\u110C\u110E\u1112\u113C\u113C\u113E\u113E\u1140\u1140\u114C\u114C\u114E\u114E\u1150\u1150\u1154\u1155\u1159\u1159\u115F\u1161\u1163\u1163\u1165\u1165\u1167\u1167\u1169\u1169\u116D\u116E\u1172\u1173\u1175\u1175\u119E\u119E\u11A8\u11A8\u11AB\u11AB\u11AE\u11AF\u11B7\u11B8\u11BA\u11BA\u11BC\u11C2\u11EB\u11EB\u11F0\u11F0\u11F9\u11F9\u1E00\u1E9B\u1EA0\u1EF9\u1F00\u1F15\u1F18\u1F1D\u1F20\u1F45\u1F48\u1F4D\u1F50\u1F57\u1F59\u1F59\u1F5B\u1F5B\u1F5D\u1F5D\u1F5F\u1F7D\u1F80\u1FB4\u1FB6\u1FBC\u1FBE\u1FBE\u1FC2\u1FC4\u1FC6\u1FCC\u1FD0\u1FD3\u1FD6\u1FDB\u1FE0\u1FEC\u1FF2\u1FF4\u1FF6\u1FFC\u2126\u2126\u212A\u212B\u212E\u212E\u2180\u2182\u3007\u3007\u3021\u3029\u3041\u3094\u30A1\u30FA\u3105\u312C\u4E00\u9FA5\uAC00\uD7A3", + uxe = "Private Use", + vxe = "ASSIGNED", + wxe = + "\x00\x7F\x80\xFF\u0100\u017F\u0180\u024F\u0250\u02AF\u02B0\u02FF\u0300\u036F\u0370\u03FF\u0400\u04FF\u0530\u058F\u0590\u05FF\u0600\u06FF\u0700\u074F\u0780\u07BF\u0900\u097F\u0980\u09FF\u0A00\u0A7F\u0A80\u0AFF\u0B00\u0B7F\u0B80\u0BFF\u0C00\u0C7F\u0C80\u0CFF\u0D00\u0D7F\u0D80\u0DFF\u0E00\u0E7F\u0E80\u0EFF\u0F00\u0FFF\u1000\u109F\u10A0\u10FF\u1100\u11FF\u1200\u137F\u13A0\u13FF\u1400\u167F\u1680\u169F\u16A0\u16FF\u1780\u17FF\u1800\u18AF\u1E00\u1EFF\u1F00\u1FFF\u2000\u206F\u2070\u209F\u20A0\u20CF\u20D0\u20FF\u2100\u214F\u2150\u218F\u2190\u21FF\u2200\u22FF\u2300\u23FF\u2400\u243F\u2440\u245F\u2460\u24FF\u2500\u257F\u2580\u259F\u25A0\u25FF\u2600\u26FF\u2700\u27BF\u2800\u28FF\u2E80\u2EFF\u2F00\u2FDF\u2FF0\u2FFF\u3000\u303F\u3040\u309F\u30A0\u30FF\u3100\u312F\u3130\u318F\u3190\u319F\u31A0\u31BF\u3200\u32FF\u3300\u33FF\u3400\u4DB5\u4E00\u9FFF\uA000\uA48F\uA490\uA4CF\uAC00\uD7A3\uE000\uF8FF\uF900\uFAFF\uFB00\uFB4F\uFB50\uFDFF\uFE20\uFE2F\uFE30\uFE4F\uFE50\uFE6F\uFE70\uFEFE\uFEFF\uFEFF\uFF00\uFFEF", + xxe = "UNASSIGNED", + yxe = { 3: 1, 117: 1 }, + zxe = "org.eclipse.emf.ecore.xml.type.util", + Axe = { 3: 1, 4: 1, 5: 1, 368: 1 }, + Bxe = "org.eclipse.xtext.xbase.lib", + Cxe = "Cannot add elements to a Range", + Dxe = "Cannot set elements in a Range", + Exe = "Cannot remove elements from a Range", + Fxe = "locale", + Gxe = "default", + Hxe = "user.agent"; + var _, + _bb, + Wbb, + tbb = -1; + var goog = goog || {}; + goog.global = goog.global || $wnd; + acb(); + bcb(1, null, {}, nb); + _.Fb = function ob(a) { + return mb(this, a); + }; + _.Gb = function qb() { + return this.gm; + }; + _.Hb = function sb() { + return FCb(this); + }; + _.Ib = function ub() { + var a; + return hdb(rb(this)) + "@" + ((a = tb(this) >>> 0), a.toString(16)); + }; + _.equals = function (a) { + return this.Fb(a); + }; + _.hashCode = function () { + return this.Hb(); + }; + _.toString = function () { + return this.Ib(); + }; + var xD, yD, zD; + bcb(290, 1, { 290: 1, 2026: 1 }, jdb); + _.le = function kdb(a) { + var b; + b = new jdb(); + b.i = 4; + a > 1 ? (b.c = rdb(this, a - 1)) : (b.c = this); + return b; + }; + _.me = function qdb() { + fdb(this); + return this.b; + }; + _.ne = function sdb() { + return hdb(this); + }; + _.oe = function udb() { + return fdb(this), this.k; + }; + _.pe = function wdb() { + return (this.i & 4) != 0; + }; + _.qe = function xdb() { + return (this.i & 1) != 0; + }; + _.Ib = function Adb() { + return idb(this); + }; + _.i = 0; + var edb = 1; + var SI = mdb(Phe, "Object", 1); + var AI = mdb(Phe, "Class", 290); + bcb(1998, 1, Qhe); + var $D = mdb(Rhe, "Optional", 1998); + bcb(1170, 1998, Qhe, xb); + _.Fb = function yb(a) { + return a === this; + }; + _.Hb = function zb() { + return 2040732332; + }; + _.Ib = function Ab() { + return "Optional.absent()"; + }; + _.Jb = function Bb(a) { + Qb(a); + return wb(), vb; + }; + var vb; + var YD = mdb(Rhe, "Absent", 1170); + bcb(628, 1, {}, Gb); + var ZD = mdb(Rhe, "Joiner", 628); + var _D = odb(Rhe, "Predicate"); + bcb(582, 1, { 169: 1, 582: 1, 3: 1, 45: 1 }, Yb); + _.Mb = function ac(a) { + return Xb(this, a); + }; + _.Lb = function Zb(a) { + return Xb(this, a); + }; + _.Fb = function $b(a) { + var b; + if (JD(a, 582)) { + b = BD(a, 582); + return At(this.a, b.a); + } + return false; + }; + _.Hb = function _b() { + return qmb(this.a) + 306654252; + }; + _.Ib = function bc() { + return Wb(this.a); + }; + var aE = mdb(Rhe, "Predicates/AndPredicate", 582); + bcb(408, 1998, { 408: 1, 3: 1 }, cc); + _.Fb = function dc(a) { + var b; + if (JD(a, 408)) { + b = BD(a, 408); + return pb(this.a, b.a); + } + return false; + }; + _.Hb = function ec() { + return 1502476572 + tb(this.a); + }; + _.Ib = function fc() { + return Whe + this.a + ")"; + }; + _.Jb = function gc(a) { + return new cc( + Rb( + a.Kb(this.a), + "the Function passed to Optional.transform() must not return null." + ) + ); + }; + var bE = mdb(Rhe, "Present", 408); + bcb(198, 1, Yhe); + _.Nb = function kc(a) { + Rrb(this, a); + }; + _.Qb = function lc() { + jc(); + }; + var MH = mdb(Zhe, "UnmodifiableIterator", 198); + bcb(1978, 198, $he); + _.Qb = function nc() { + jc(); + }; + _.Rb = function mc(a) { + throw vbb(new bgb()); + }; + _.Wb = function oc(a) { + throw vbb(new bgb()); + }; + var NH = mdb(Zhe, "UnmodifiableListIterator", 1978); + bcb(386, 1978, $he); + _.Ob = function rc() { + return this.c < this.d; + }; + _.Sb = function sc() { + return this.c > 0; + }; + _.Pb = function tc() { + if (this.c >= this.d) { + throw vbb(new utb()); + } + return this.Xb(this.c++); + }; + _.Tb = function uc() { + return this.c; + }; + _.Ub = function vc() { + if (this.c <= 0) { + throw vbb(new utb()); + } + return this.Xb(--this.c); + }; + _.Vb = function wc() { + return this.c - 1; + }; + _.c = 0; + _.d = 0; + var cE = mdb(Zhe, "AbstractIndexedListIterator", 386); + bcb(699, 198, Yhe); + _.Ob = function Ac() { + return xc(this); + }; + _.Pb = function Bc() { + return yc(this); + }; + _.e = 1; + var dE = mdb(Zhe, "AbstractIterator", 699); + bcb(1986, 1, { 224: 1 }); + _.Zb = function Hc() { + var a; + return (a = this.f), !a ? (this.f = this.ac()) : a; + }; + _.Fb = function Ic(a) { + return hw(this, a); + }; + _.Hb = function Jc() { + return tb(this.Zb()); + }; + _.dc = function Kc() { + return this.gc() == 0; + }; + _.ec = function Lc() { + return Ec(this); + }; + _.Ib = function Mc() { + return fcb(this.Zb()); + }; + var IE = mdb(Zhe, "AbstractMultimap", 1986); + bcb(726, 1986, _he); + _.$b = function Xc() { + Nc(this); + }; + _._b = function Yc(a) { + return Oc(this, a); + }; + _.ac = function Zc() { + return new ne(this, this.c); + }; + _.ic = function $c(a) { + return this.hc(); + }; + _.bc = function _c() { + return new zf(this, this.c); + }; + _.jc = function ad() { + return this.mc(this.hc()); + }; + _.kc = function bd() { + return new Hd(this); + }; + _.lc = function cd() { + return Yj(this.c.vc().Nc(), new $g(), 64, this.d); + }; + _.cc = function dd(a) { + return Qc(this, a); + }; + _.fc = function gd(a) { + return Sc(this, a); + }; + _.gc = function hd() { + return this.d; + }; + _.mc = function jd(a) { + return mmb(), new lnb(a); + }; + _.nc = function kd() { + return new Dd(this); + }; + _.oc = function ld() { + return Yj(this.c.Cc().Nc(), new Fd(), 64, this.d); + }; + _.pc = function md(a, b) { + return new dg(this, a, b, null); + }; + _.d = 0; + var DE = mdb(Zhe, "AbstractMapBasedMultimap", 726); + bcb(1631, 726, _he); + _.hc = function pd() { + return new Skb(this.a); + }; + _.jc = function qd() { + return mmb(), mmb(), jmb; + }; + _.cc = function sd(a) { + return BD(Qc(this, a), 15); + }; + _.fc = function ud(a) { + return BD(Sc(this, a), 15); + }; + _.Zb = function od() { + return nd(this); + }; + _.Fb = function rd(a) { + return hw(this, a); + }; + _.qc = function td(a) { + return BD(Qc(this, a), 15); + }; + _.rc = function vd(a) { + return BD(Sc(this, a), 15); + }; + _.mc = function wd(a) { + return vmb(BD(a, 15)); + }; + _.pc = function xd(a, b) { + return Vc(this, a, BD(b, 15), null); + }; + var eE = mdb(Zhe, "AbstractListMultimap", 1631); + bcb(732, 1, aie); + _.Nb = function zd(a) { + Rrb(this, a); + }; + _.Ob = function Ad() { + return this.c.Ob() || this.e.Ob(); + }; + _.Pb = function Bd() { + var a; + if (!this.e.Ob()) { + a = BD(this.c.Pb(), 42); + this.b = a.cd(); + this.a = BD(a.dd(), 14); + this.e = this.a.Kc(); + } + return this.sc(this.b, this.e.Pb()); + }; + _.Qb = function Cd() { + this.e.Qb(); + this.a.dc() && this.c.Qb(); + --this.d.d; + }; + var mE = mdb(Zhe, "AbstractMapBasedMultimap/Itr", 732); + bcb(1099, 732, aie, Dd); + _.sc = function Ed(a, b) { + return b; + }; + var fE = mdb(Zhe, "AbstractMapBasedMultimap/1", 1099); + bcb(1100, 1, {}, Fd); + _.Kb = function Gd(a) { + return BD(a, 14).Nc(); + }; + var gE = mdb( + Zhe, + "AbstractMapBasedMultimap/1methodref$spliterator$Type", + 1100 + ); + bcb(1101, 732, aie, Hd); + _.sc = function Id(a, b) { + return new Wo(a, b); + }; + var hE = mdb(Zhe, "AbstractMapBasedMultimap/2", 1101); + var DK = odb(bie, "Map"); + bcb(1967, 1, cie); + _.wc = function Td(a) { + stb(this, a); + }; + _.yc = function $d(a, b, c) { + return ttb(this, a, b, c); + }; + _.$b = function Od() { + this.vc().$b(); + }; + _.tc = function Pd(a) { + return Jd(this, a); + }; + _._b = function Qd(a) { + return !!Kd(this, a, false); + }; + _.uc = function Rd(a) { + var b, c, d; + for (c = this.vc().Kc(); c.Ob(); ) { + b = BD(c.Pb(), 42); + d = b.dd(); + if (PD(a) === PD(d) || (a != null && pb(a, d))) { + return true; + } + } + return false; + }; + _.Fb = function Sd(a) { + var b, c, d; + if (a === this) { + return true; + } + if (!JD(a, 83)) { + return false; + } + d = BD(a, 83); + if (this.gc() != d.gc()) { + return false; + } + for (c = d.vc().Kc(); c.Ob(); ) { + b = BD(c.Pb(), 42); + if (!this.tc(b)) { + return false; + } + } + return true; + }; + _.xc = function Ud(a) { + return Wd(Kd(this, a, false)); + }; + _.Hb = function Xd() { + return pmb(this.vc()); + }; + _.dc = function Yd() { + return this.gc() == 0; + }; + _.ec = function Zd() { + return new Pib(this); + }; + _.zc = function _d(a, b) { + throw vbb(new cgb("Put not supported on this map")); + }; + _.Ac = function ae(a) { + Ld(this, a); + }; + _.Bc = function be(a) { + return Wd(Kd(this, a, true)); + }; + _.gc = function ce() { + return this.vc().gc(); + }; + _.Ib = function de() { + return Md(this); + }; + _.Cc = function ee() { + return new $ib(this); + }; + var sJ = mdb(bie, "AbstractMap", 1967); + bcb(1987, 1967, cie); + _.bc = function ge() { + return new rf(this); + }; + _.vc = function he() { + return fe(this); + }; + _.ec = function ie() { + var a; + a = this.g; + return !a ? (this.g = this.bc()) : a; + }; + _.Cc = function je() { + var a; + a = this.i; + return !a ? (this.i = new Zv(this)) : a; + }; + var bH = mdb(Zhe, "Maps/ViewCachingAbstractMap", 1987); + bcb(389, 1987, cie, ne); + _.xc = function se(a) { + return ke(this, a); + }; + _.Bc = function ve(a) { + return le(this, a); + }; + _.$b = function oe() { + this.d == this.e.c ? this.e.$b() : ir(new mf(this)); + }; + _._b = function pe(a) { + return Gv(this.d, a); + }; + _.Ec = function qe() { + return new df(this); + }; + _.Dc = function () { + return this.Ec(); + }; + _.Fb = function re(a) { + return this === a || pb(this.d, a); + }; + _.Hb = function te() { + return tb(this.d); + }; + _.ec = function ue() { + return this.e.ec(); + }; + _.gc = function we() { + return this.d.gc(); + }; + _.Ib = function xe() { + return fcb(this.d); + }; + var lE = mdb(Zhe, "AbstractMapBasedMultimap/AsMap", 389); + var KI = odb(Phe, "Iterable"); + bcb(28, 1, die); + _.Jc = function Le(a) { + reb(this, a); + }; + _.Lc = function Ne() { + return this.Oc(); + }; + _.Nc = function Pe() { + return new Kub(this, 0); + }; + _.Oc = function Qe() { + return new YAb(null, this.Nc()); + }; + _.Fc = function Ge(a) { + throw vbb(new cgb("Add not supported on this collection")); + }; + _.Gc = function He(a) { + return ye(this, a); + }; + _.$b = function Ie() { + Ae(this); + }; + _.Hc = function Je(a) { + return ze(this, a, false); + }; + _.Ic = function Ke(a) { + return Be(this, a); + }; + _.dc = function Me() { + return this.gc() == 0; + }; + _.Mc = function Oe(a) { + return ze(this, a, true); + }; + _.Pc = function Re() { + return De(this); + }; + _.Qc = function Se(a) { + return Ee(this, a); + }; + _.Ib = function Te() { + return Fe(this); + }; + var dJ = mdb(bie, "AbstractCollection", 28); + var LK = odb(bie, "Set"); + bcb(eie, 28, fie); + _.Nc = function Ye() { + return new Kub(this, 1); + }; + _.Fb = function We(a) { + return Ue(this, a); + }; + _.Hb = function Xe() { + return pmb(this); + }; + var zJ = mdb(bie, "AbstractSet", eie); + bcb(1970, eie, fie); + var BH = mdb(Zhe, "Sets/ImprovedAbstractSet", 1970); + bcb(1971, 1970, fie); + _.$b = function $e() { + this.Rc().$b(); + }; + _.Hc = function _e(a) { + return Ze(this, a); + }; + _.dc = function af() { + return this.Rc().dc(); + }; + _.Mc = function bf(a) { + var b; + if (this.Hc(a)) { + b = BD(a, 42); + return this.Rc().ec().Mc(b.cd()); + } + return false; + }; + _.gc = function cf() { + return this.Rc().gc(); + }; + var WG = mdb(Zhe, "Maps/EntrySet", 1971); + bcb(1097, 1971, fie, df); + _.Hc = function ef(a) { + return Ck(this.a.d.vc(), a); + }; + _.Kc = function ff() { + return new mf(this.a); + }; + _.Rc = function gf() { + return this.a; + }; + _.Mc = function hf(a) { + var b; + if (!Ck(this.a.d.vc(), a)) { + return false; + } + b = BD(a, 42); + Tc(this.a.e, b.cd()); + return true; + }; + _.Nc = function jf() { + return $j(this.a.d.vc().Nc(), new kf(this.a)); + }; + var jE = mdb(Zhe, "AbstractMapBasedMultimap/AsMap/AsMapEntries", 1097); + bcb(1098, 1, {}, kf); + _.Kb = function lf(a) { + return me(this.a, BD(a, 42)); + }; + var iE = mdb( + Zhe, + "AbstractMapBasedMultimap/AsMap/AsMapEntries/0methodref$wrapEntry$Type", + 1098 + ); + bcb(730, 1, aie, mf); + _.Nb = function nf(a) { + Rrb(this, a); + }; + _.Pb = function pf() { + var a; + return ( + (a = BD(this.b.Pb(), 42)), (this.a = BD(a.dd(), 14)), me(this.c, a) + ); + }; + _.Ob = function of() { + return this.b.Ob(); + }; + _.Qb = function qf() { + Vb(!!this.a); + this.b.Qb(); + this.c.e.d -= this.a.gc(); + this.a.$b(); + this.a = null; + }; + var kE = mdb(Zhe, "AbstractMapBasedMultimap/AsMap/AsMapIterator", 730); + bcb(532, 1970, fie, rf); + _.$b = function sf() { + this.b.$b(); + }; + _.Hc = function tf(a) { + return this.b._b(a); + }; + _.Jc = function uf(a) { + Qb(a); + this.b.wc(new Xv(a)); + }; + _.dc = function vf() { + return this.b.dc(); + }; + _.Kc = function wf() { + return new Mv(this.b.vc().Kc()); + }; + _.Mc = function xf(a) { + if (this.b._b(a)) { + this.b.Bc(a); + return true; + } + return false; + }; + _.gc = function yf() { + return this.b.gc(); + }; + var $G = mdb(Zhe, "Maps/KeySet", 532); + bcb(318, 532, fie, zf); + _.$b = function Af() { + var a; + ir(((a = this.b.vc().Kc()), new Hf(this, a))); + }; + _.Ic = function Bf(a) { + return this.b.ec().Ic(a); + }; + _.Fb = function Cf(a) { + return this === a || pb(this.b.ec(), a); + }; + _.Hb = function Df() { + return tb(this.b.ec()); + }; + _.Kc = function Ef() { + var a; + return (a = this.b.vc().Kc()), new Hf(this, a); + }; + _.Mc = function Ff(a) { + var b, c; + c = 0; + b = BD(this.b.Bc(a), 14); + if (b) { + c = b.gc(); + b.$b(); + this.a.d -= c; + } + return c > 0; + }; + _.Nc = function Gf() { + return this.b.ec().Nc(); + }; + var oE = mdb(Zhe, "AbstractMapBasedMultimap/KeySet", 318); + bcb(731, 1, aie, Hf); + _.Nb = function If(a) { + Rrb(this, a); + }; + _.Ob = function Jf() { + return this.c.Ob(); + }; + _.Pb = function Kf() { + this.a = BD(this.c.Pb(), 42); + return this.a.cd(); + }; + _.Qb = function Lf() { + var a; + Vb(!!this.a); + a = BD(this.a.dd(), 14); + this.c.Qb(); + this.b.a.d -= a.gc(); + a.$b(); + this.a = null; + }; + var nE = mdb(Zhe, "AbstractMapBasedMultimap/KeySet/1", 731); + bcb(491, 389, { 83: 1, 161: 1 }, Mf); + _.bc = function Nf() { + return this.Sc(); + }; + _.ec = function Pf() { + return this.Tc(); + }; + _.Sc = function Of() { + return new Yf(this.c, this.Uc()); + }; + _.Tc = function Qf() { + var a; + return (a = this.b), !a ? (this.b = this.Sc()) : a; + }; + _.Uc = function Rf() { + return BD(this.d, 161); + }; + var sE = mdb(Zhe, "AbstractMapBasedMultimap/SortedAsMap", 491); + bcb(542, 491, gie, Sf); + _.bc = function Tf() { + return new $f(this.a, BD(BD(this.d, 161), 171)); + }; + _.Sc = function Uf() { + return new $f(this.a, BD(BD(this.d, 161), 171)); + }; + _.ec = function Vf() { + var a; + return ( + (a = this.b), + BD(!a ? (this.b = new $f(this.a, BD(BD(this.d, 161), 171))) : a, 271) + ); + }; + _.Tc = function Wf() { + var a; + return ( + (a = this.b), + BD(!a ? (this.b = new $f(this.a, BD(BD(this.d, 161), 171))) : a, 271) + ); + }; + _.Uc = function Xf() { + return BD(BD(this.d, 161), 171); + }; + var pE = mdb(Zhe, "AbstractMapBasedMultimap/NavigableAsMap", 542); + bcb(490, 318, hie, Yf); + _.Nc = function Zf() { + return this.b.ec().Nc(); + }; + var tE = mdb(Zhe, "AbstractMapBasedMultimap/SortedKeySet", 490); + bcb(388, 490, iie, $f); + var qE = mdb(Zhe, "AbstractMapBasedMultimap/NavigableKeySet", 388); + bcb(541, 28, die, dg); + _.Fc = function eg(a) { + var b, c; + ag(this); + c = this.d.dc(); + b = this.d.Fc(a); + if (b) { + ++this.f.d; + c && _f(this); + } + return b; + }; + _.Gc = function fg(a) { + var b, c, d; + if (a.dc()) { + return false; + } + d = (ag(this), this.d.gc()); + b = this.d.Gc(a); + if (b) { + c = this.d.gc(); + this.f.d += c - d; + d == 0 && _f(this); + } + return b; + }; + _.$b = function gg() { + var a; + a = (ag(this), this.d.gc()); + if (a == 0) { + return; + } + this.d.$b(); + this.f.d -= a; + bg(this); + }; + _.Hc = function hg(a) { + ag(this); + return this.d.Hc(a); + }; + _.Ic = function ig(a) { + ag(this); + return this.d.Ic(a); + }; + _.Fb = function jg(a) { + if (a === this) { + return true; + } + ag(this); + return pb(this.d, a); + }; + _.Hb = function kg() { + ag(this); + return tb(this.d); + }; + _.Kc = function lg() { + ag(this); + return new Gg(this); + }; + _.Mc = function mg(a) { + var b; + ag(this); + b = this.d.Mc(a); + if (b) { + --this.f.d; + bg(this); + } + return b; + }; + _.gc = function ng() { + return cg(this); + }; + _.Nc = function og() { + return ag(this), this.d.Nc(); + }; + _.Ib = function pg() { + ag(this); + return fcb(this.d); + }; + var vE = mdb(Zhe, "AbstractMapBasedMultimap/WrappedCollection", 541); + var yK = odb(bie, "List"); + bcb(728, 541, { 20: 1, 28: 1, 14: 1, 15: 1 }, qg); + _.ad = function zg(a) { + ktb(this, a); + }; + _.Nc = function Ag() { + return ag(this), this.d.Nc(); + }; + _.Vc = function rg(a, b) { + var c; + ag(this); + c = this.d.dc(); + BD(this.d, 15).Vc(a, b); + ++this.a.d; + c && _f(this); + }; + _.Wc = function sg(a, b) { + var c, d, e; + if (b.dc()) { + return false; + } + e = (ag(this), this.d.gc()); + c = BD(this.d, 15).Wc(a, b); + if (c) { + d = this.d.gc(); + this.a.d += d - e; + e == 0 && _f(this); + } + return c; + }; + _.Xb = function tg(a) { + ag(this); + return BD(this.d, 15).Xb(a); + }; + _.Xc = function ug(a) { + ag(this); + return BD(this.d, 15).Xc(a); + }; + _.Yc = function vg() { + ag(this); + return new Mg(this); + }; + _.Zc = function wg(a) { + ag(this); + return new Ng(this, a); + }; + _.$c = function xg(a) { + var b; + ag(this); + b = BD(this.d, 15).$c(a); + --this.a.d; + bg(this); + return b; + }; + _._c = function yg(a, b) { + ag(this); + return BD(this.d, 15)._c(a, b); + }; + _.bd = function Bg(a, b) { + ag(this); + return Vc( + this.a, + this.e, + BD(this.d, 15).bd(a, b), + !this.b ? this : this.b + ); + }; + var xE = mdb(Zhe, "AbstractMapBasedMultimap/WrappedList", 728); + bcb(1096, 728, { 20: 1, 28: 1, 14: 1, 15: 1, 54: 1 }, Cg); + var rE = mdb(Zhe, "AbstractMapBasedMultimap/RandomAccessWrappedList", 1096); + bcb(620, 1, aie, Gg); + _.Nb = function Ig(a) { + Rrb(this, a); + }; + _.Ob = function Jg() { + Fg(this); + return this.b.Ob(); + }; + _.Pb = function Kg() { + Fg(this); + return this.b.Pb(); + }; + _.Qb = function Lg() { + Eg(this); + }; + var uE = mdb( + Zhe, + "AbstractMapBasedMultimap/WrappedCollection/WrappedIterator", + 620 + ); + bcb(729, 620, jie, Mg, Ng); + _.Qb = function Tg() { + Eg(this); + }; + _.Rb = function Og(a) { + var b; + b = cg(this.a) == 0; + (Fg(this), BD(this.b, 125)).Rb(a); + ++this.a.a.d; + b && _f(this.a); + }; + _.Sb = function Pg() { + return (Fg(this), BD(this.b, 125)).Sb(); + }; + _.Tb = function Qg() { + return (Fg(this), BD(this.b, 125)).Tb(); + }; + _.Ub = function Rg() { + return (Fg(this), BD(this.b, 125)).Ub(); + }; + _.Vb = function Sg() { + return (Fg(this), BD(this.b, 125)).Vb(); + }; + _.Wb = function Ug(a) { + (Fg(this), BD(this.b, 125)).Wb(a); + }; + var wE = mdb( + Zhe, + "AbstractMapBasedMultimap/WrappedList/WrappedListIterator", + 729 + ); + bcb(727, 541, hie, Vg); + _.Nc = function Wg() { + return ag(this), this.d.Nc(); + }; + var AE = mdb(Zhe, "AbstractMapBasedMultimap/WrappedSortedSet", 727); + bcb(1095, 727, iie, Xg); + var yE = mdb(Zhe, "AbstractMapBasedMultimap/WrappedNavigableSet", 1095); + bcb(1094, 541, fie, Yg); + _.Nc = function Zg() { + return ag(this), this.d.Nc(); + }; + var zE = mdb(Zhe, "AbstractMapBasedMultimap/WrappedSet", 1094); + bcb(1103, 1, {}, $g); + _.Kb = function _g(a) { + return fd(BD(a, 42)); + }; + var BE = mdb(Zhe, "AbstractMapBasedMultimap/lambda$1$Type", 1103); + bcb(1102, 1, {}, ah); + _.Kb = function bh(a) { + return new Wo(this.a, a); + }; + var CE = mdb(Zhe, "AbstractMapBasedMultimap/lambda$2$Type", 1102); + var CK = odb(bie, "Map/Entry"); + bcb(345, 1, kie); + _.Fb = function dh(a) { + var b; + if (JD(a, 42)) { + b = BD(a, 42); + return Hb(this.cd(), b.cd()) && Hb(this.dd(), b.dd()); + } + return false; + }; + _.Hb = function eh() { + var a, b; + a = this.cd(); + b = this.dd(); + return (a == null ? 0 : tb(a)) ^ (b == null ? 0 : tb(b)); + }; + _.ed = function fh(a) { + throw vbb(new bgb()); + }; + _.Ib = function gh() { + return this.cd() + "=" + this.dd(); + }; + var EE = mdb(Zhe, lie, 345); + bcb(1988, 28, die); + _.$b = function hh() { + this.fd().$b(); + }; + _.Hc = function ih(a) { + var b; + if (JD(a, 42)) { + b = BD(a, 42); + return Cc(this.fd(), b.cd(), b.dd()); + } + return false; + }; + _.Mc = function jh(a) { + var b; + if (JD(a, 42)) { + b = BD(a, 42); + return Gc(this.fd(), b.cd(), b.dd()); + } + return false; + }; + _.gc = function kh() { + return this.fd().d; + }; + var fH = mdb(Zhe, "Multimaps/Entries", 1988); + bcb(733, 1988, die, lh); + _.Kc = function mh() { + return this.a.kc(); + }; + _.fd = function nh() { + return this.a; + }; + _.Nc = function oh() { + return this.a.lc(); + }; + var FE = mdb(Zhe, "AbstractMultimap/Entries", 733); + bcb(734, 733, fie, ph); + _.Nc = function sh() { + return this.a.lc(); + }; + _.Fb = function qh(a) { + return Ax(this, a); + }; + _.Hb = function rh() { + return Bx(this); + }; + var GE = mdb(Zhe, "AbstractMultimap/EntrySet", 734); + bcb(735, 28, die, th); + _.$b = function uh() { + this.a.$b(); + }; + _.Hc = function vh(a) { + return Dc(this.a, a); + }; + _.Kc = function wh() { + return this.a.nc(); + }; + _.gc = function xh() { + return this.a.d; + }; + _.Nc = function yh() { + return this.a.oc(); + }; + var HE = mdb(Zhe, "AbstractMultimap/Values", 735); + bcb(1989, 28, { 835: 1, 20: 1, 28: 1, 14: 1 }); + _.Jc = function Gh(a) { + Qb(a); + Ah(this).Jc(new Xw(a)); + }; + _.Nc = function Kh() { + var a; + return ( + (a = Ah(this).Nc()), Yj(a, new cx(), 64 | (a.qd() & 1296), this.a.d) + ); + }; + _.Fc = function Ch(a) { + zh(); + return true; + }; + _.Gc = function Dh(a) { + return ( + Qb(this), + Qb(a), + JD(a, 543) ? Zw(BD(a, 835)) : !a.dc() && fr(this, a.Kc()) + ); + }; + _.Hc = function Eh(a) { + var b; + return (b = BD(Hv(nd(this.a), a), 14)), (!b ? 0 : b.gc()) > 0; + }; + _.Fb = function Fh(a) { + return $w(this, a); + }; + _.Hb = function Hh() { + return tb(Ah(this)); + }; + _.dc = function Ih() { + return Ah(this).dc(); + }; + _.Mc = function Jh(a) { + return Bw(this, a, 1) > 0; + }; + _.Ib = function Lh() { + return fcb(Ah(this)); + }; + var KE = mdb(Zhe, "AbstractMultiset", 1989); + bcb(1991, 1970, fie); + _.$b = function Mh() { + Nc(this.a.a); + }; + _.Hc = function Nh(a) { + var b, c; + if (JD(a, 492)) { + c = BD(a, 416); + if (BD(c.a.dd(), 14).gc() <= 0) { + return false; + } + b = Aw(this.a, c.a.cd()); + return b == BD(c.a.dd(), 14).gc(); + } + return false; + }; + _.Mc = function Oh(a) { + var b, c, d, e; + if (JD(a, 492)) { + c = BD(a, 416); + b = c.a.cd(); + d = BD(c.a.dd(), 14).gc(); + if (d != 0) { + e = this.a; + return ax(e, b, d); + } + } + return false; + }; + var pH = mdb(Zhe, "Multisets/EntrySet", 1991); + bcb(1109, 1991, fie, Ph); + _.Kc = function Qh() { + return new Lw(fe(nd(this.a.a)).Kc()); + }; + _.gc = function Rh() { + return nd(this.a.a).gc(); + }; + var JE = mdb(Zhe, "AbstractMultiset/EntrySet", 1109); + bcb(619, 726, _he); + _.hc = function Uh() { + return this.gd(); + }; + _.jc = function Vh() { + return this.hd(); + }; + _.cc = function Yh(a) { + return this.jd(a); + }; + _.fc = function $h(a) { + return this.kd(a); + }; + _.Zb = function Th() { + var a; + return (a = this.f), !a ? (this.f = this.ac()) : a; + }; + _.hd = function Wh() { + return mmb(), mmb(), lmb; + }; + _.Fb = function Xh(a) { + return hw(this, a); + }; + _.jd = function Zh(a) { + return BD(Qc(this, a), 21); + }; + _.kd = function _h(a) { + return BD(Sc(this, a), 21); + }; + _.mc = function ai(a) { + return mmb(), new zob(BD(a, 21)); + }; + _.pc = function bi(a, b) { + return new Yg(this, a, BD(b, 21)); + }; + var LE = mdb(Zhe, "AbstractSetMultimap", 619); + bcb(1657, 619, _he); + _.hc = function ei() { + return new Hxb(this.b); + }; + _.gd = function fi() { + return new Hxb(this.b); + }; + _.jc = function gi() { + return Ix(new Hxb(this.b)); + }; + _.hd = function hi() { + return Ix(new Hxb(this.b)); + }; + _.cc = function ii(a) { + return BD(BD(Qc(this, a), 21), 84); + }; + _.jd = function ji(a) { + return BD(BD(Qc(this, a), 21), 84); + }; + _.fc = function ki(a) { + return BD(BD(Sc(this, a), 21), 84); + }; + _.kd = function li(a) { + return BD(BD(Sc(this, a), 21), 84); + }; + _.mc = function mi(a) { + return JD(a, 271) ? Ix(BD(a, 271)) : (mmb(), new Zob(BD(a, 84))); + }; + _.Zb = function di() { + var a; + return ( + (a = this.f), + !a + ? (this.f = JD(this.c, 171) + ? new Sf(this, BD(this.c, 171)) + : JD(this.c, 161) + ? new Mf(this, BD(this.c, 161)) + : new ne(this, this.c)) + : a + ); + }; + _.pc = function ni(a, b) { + return JD(b, 271) + ? new Xg(this, a, BD(b, 271)) + : new Vg(this, a, BD(b, 84)); + }; + var NE = mdb(Zhe, "AbstractSortedSetMultimap", 1657); + bcb(1658, 1657, _he); + _.Zb = function pi() { + var a; + return ( + (a = this.f), + BD( + BD( + !a + ? (this.f = JD(this.c, 171) + ? new Sf(this, BD(this.c, 171)) + : JD(this.c, 161) + ? new Mf(this, BD(this.c, 161)) + : new ne(this, this.c)) + : a, + 161 + ), + 171 + ) + ); + }; + _.ec = function ri() { + var a; + return ( + (a = this.i), + BD( + BD( + !a + ? (this.i = JD(this.c, 171) + ? new $f(this, BD(this.c, 171)) + : JD(this.c, 161) + ? new Yf(this, BD(this.c, 161)) + : new zf(this, this.c)) + : a, + 84 + ), + 271 + ) + ); + }; + _.bc = function qi() { + return JD(this.c, 171) + ? new $f(this, BD(this.c, 171)) + : JD(this.c, 161) + ? new Yf(this, BD(this.c, 161)) + : new zf(this, this.c); + }; + var ME = mdb(Zhe, "AbstractSortedKeySortedSetMultimap", 1658); + bcb(2010, 1, { 1947: 1 }); + _.Fb = function si(a) { + return zy(this, a); + }; + _.Hb = function ti() { + var a; + return pmb(((a = this.g), !a ? (this.g = new vi(this)) : a)); + }; + _.Ib = function ui() { + var a; + return Md(((a = this.f), !a ? (this.f = new Rj(this)) : a)); + }; + var QE = mdb(Zhe, "AbstractTable", 2010); + bcb(665, eie, fie, vi); + _.$b = function wi() { + Pi(); + }; + _.Hc = function xi(a) { + var b, c; + if (JD(a, 468)) { + b = BD(a, 682); + c = BD(Hv(Vi(this.a), Em(b.c.e, b.b)), 83); + return !!c && Ck(c.vc(), new Wo(Em(b.c.c, b.a), Mi(b.c, b.b, b.a))); + } + return false; + }; + _.Kc = function yi() { + return Ni(this.a); + }; + _.Mc = function zi(a) { + var b, c; + if (JD(a, 468)) { + b = BD(a, 682); + c = BD(Hv(Vi(this.a), Em(b.c.e, b.b)), 83); + return !!c && Dk(c.vc(), new Wo(Em(b.c.c, b.a), Mi(b.c, b.b, b.a))); + } + return false; + }; + _.gc = function Ai() { + return Xi(this.a); + }; + _.Nc = function Bi() { + return Oi(this.a); + }; + var OE = mdb(Zhe, "AbstractTable/CellSet", 665); + bcb(1928, 28, die, Ci); + _.$b = function Di() { + Pi(); + }; + _.Hc = function Ei(a) { + return Qi(this.a, a); + }; + _.Kc = function Fi() { + return Zi(this.a); + }; + _.gc = function Gi() { + return Xi(this.a); + }; + _.Nc = function Hi() { + return $i(this.a); + }; + var PE = mdb(Zhe, "AbstractTable/Values", 1928); + bcb(1632, 1631, _he); + var RE = mdb(Zhe, "ArrayListMultimapGwtSerializationDependencies", 1632); + bcb(513, 1632, _he, Ji, Ki); + _.hc = function Li() { + return new Skb(this.a); + }; + _.a = 0; + var SE = mdb(Zhe, "ArrayListMultimap", 513); + bcb(664, 2010, { 664: 1, 1947: 1, 3: 1 }, _i); + var cF = mdb(Zhe, "ArrayTable", 664); + bcb(1924, 386, $he, aj); + _.Xb = function bj(a) { + return new hj(this.a, a); + }; + var TE = mdb(Zhe, "ArrayTable/1", 1924); + bcb(1925, 1, {}, cj); + _.ld = function dj(a) { + return new hj(this.a, a); + }; + var UE = mdb(Zhe, "ArrayTable/1methodref$getCell$Type", 1925); + bcb(2011, 1, { 682: 1 }); + _.Fb = function ej(a) { + var b; + if (a === this) { + return true; + } + if (JD(a, 468)) { + b = BD(a, 682); + return ( + Hb(Em(this.c.e, this.b), Em(b.c.e, b.b)) && + Hb(Em(this.c.c, this.a), Em(b.c.c, b.a)) && + Hb(Mi(this.c, this.b, this.a), Mi(b.c, b.b, b.a)) + ); + } + return false; + }; + _.Hb = function fj() { + return Hlb( + OC(GC(SI, 1), Uhe, 1, 5, [ + Em(this.c.e, this.b), + Em(this.c.c, this.a), + Mi(this.c, this.b, this.a), + ]) + ); + }; + _.Ib = function gj() { + return ( + "(" + + Em(this.c.e, this.b) + + "," + + Em(this.c.c, this.a) + + ")=" + + Mi(this.c, this.b, this.a) + ); + }; + var JH = mdb(Zhe, "Tables/AbstractCell", 2011); + bcb(468, 2011, { 468: 1, 682: 1 }, hj); + _.a = 0; + _.b = 0; + _.d = 0; + var VE = mdb(Zhe, "ArrayTable/2", 468); + bcb(1927, 1, {}, ij); + _.ld = function jj(a) { + return Ti(this.a, a); + }; + var WE = mdb(Zhe, "ArrayTable/2methodref$getValue$Type", 1927); + bcb(1926, 386, $he, kj); + _.Xb = function lj(a) { + return Ti(this.a, a); + }; + var XE = mdb(Zhe, "ArrayTable/3", 1926); + bcb(1979, 1967, cie); + _.$b = function nj() { + ir(this.kc()); + }; + _.vc = function oj() { + return new Sv(this); + }; + _.lc = function pj() { + return new Mub(this.kc(), this.gc()); + }; + var YG = mdb(Zhe, "Maps/IteratorBasedAbstractMap", 1979); + bcb(828, 1979, cie); + _.$b = function tj() { + throw vbb(new bgb()); + }; + _._b = function uj(a) { + return sn(this.c, a); + }; + _.kc = function vj() { + return new Jj(this, this.c.b.c.gc()); + }; + _.lc = function wj() { + return Zj(this.c.b.c.gc(), 16, new Dj(this)); + }; + _.xc = function xj(a) { + var b; + b = BD(tn(this.c, a), 19); + return !b ? null : this.nd(b.a); + }; + _.dc = function yj() { + return this.c.b.c.dc(); + }; + _.ec = function zj() { + return Xm(this.c); + }; + _.zc = function Aj(a, b) { + var c; + c = BD(tn(this.c, a), 19); + if (!c) { + throw vbb(new Wdb(this.md() + " " + a + " not in " + Xm(this.c))); + } + return this.od(c.a, b); + }; + _.Bc = function Bj(a) { + throw vbb(new bgb()); + }; + _.gc = function Cj() { + return this.c.b.c.gc(); + }; + var _E = mdb(Zhe, "ArrayTable/ArrayMap", 828); + bcb(1923, 1, {}, Dj); + _.ld = function Ej(a) { + return qj(this.a, a); + }; + var YE = mdb(Zhe, "ArrayTable/ArrayMap/0methodref$getEntry$Type", 1923); + bcb(1921, 345, kie, Fj); + _.cd = function Gj() { + return rj(this.a, this.b); + }; + _.dd = function Hj() { + return this.a.nd(this.b); + }; + _.ed = function Ij(a) { + return this.a.od(this.b, a); + }; + _.b = 0; + var ZE = mdb(Zhe, "ArrayTable/ArrayMap/1", 1921); + bcb(1922, 386, $he, Jj); + _.Xb = function Kj(a) { + return qj(this.a, a); + }; + var $E = mdb(Zhe, "ArrayTable/ArrayMap/2", 1922); + bcb(1920, 828, cie, Lj); + _.md = function Mj() { + return "Column"; + }; + _.nd = function Nj(a) { + return Mi(this.b, this.a, a); + }; + _.od = function Oj(a, b) { + return Wi(this.b, this.a, a, b); + }; + _.a = 0; + var bF = mdb(Zhe, "ArrayTable/Row", 1920); + bcb(829, 828, cie, Rj); + _.nd = function Tj(a) { + return new Lj(this.a, a); + }; + _.zc = function Uj(a, b) { + return BD(b, 83), Pj(); + }; + _.od = function Vj(a, b) { + return BD(b, 83), Qj(); + }; + _.md = function Sj() { + return "Row"; + }; + var aF = mdb(Zhe, "ArrayTable/RowMap", 829); + bcb(1120, 1, pie, _j); + _.qd = function ak() { + return this.a.qd() & -262; + }; + _.rd = function bk() { + return this.a.rd(); + }; + _.Nb = function ck(a) { + this.a.Nb(new gk(a, this.b)); + }; + _.sd = function dk(a) { + return this.a.sd(new ek(a, this.b)); + }; + var lF = mdb(Zhe, "CollectSpliterators/1", 1120); + bcb(1121, 1, qie, ek); + _.td = function fk(a) { + this.a.td(this.b.Kb(a)); + }; + var dF = mdb(Zhe, "CollectSpliterators/1/lambda$0$Type", 1121); + bcb(1122, 1, qie, gk); + _.td = function hk(a) { + this.a.td(this.b.Kb(a)); + }; + var eF = mdb(Zhe, "CollectSpliterators/1/lambda$1$Type", 1122); + bcb(1123, 1, pie, jk); + _.qd = function kk() { + return this.a; + }; + _.rd = function lk() { + !!this.d && (this.b = Deb(this.b, this.d.rd())); + return Deb(this.b, 0); + }; + _.Nb = function mk(a) { + if (this.d) { + this.d.Nb(a); + this.d = null; + } + this.c.Nb(new rk(this.e, a)); + this.b = 0; + }; + _.sd = function ok(a) { + while (true) { + if (!!this.d && this.d.sd(a)) { + Kbb(this.b, rie) && (this.b = Qbb(this.b, 1)); + return true; + } else { + this.d = null; + } + if (!this.c.sd(new pk(this, this.e))) { + return false; + } + } + }; + _.a = 0; + _.b = 0; + var hF = mdb(Zhe, "CollectSpliterators/1FlatMapSpliterator", 1123); + bcb(1124, 1, qie, pk); + _.td = function qk(a) { + ik(this.a, this.b, a); + }; + var fF = mdb( + Zhe, + "CollectSpliterators/1FlatMapSpliterator/lambda$0$Type", + 1124 + ); + bcb(1125, 1, qie, rk); + _.td = function sk(a) { + nk(this.b, this.a, a); + }; + var gF = mdb( + Zhe, + "CollectSpliterators/1FlatMapSpliterator/lambda$1$Type", + 1125 + ); + bcb(1117, 1, pie, tk); + _.qd = function uk() { + return 16464 | this.b; + }; + _.rd = function vk() { + return this.a.rd(); + }; + _.Nb = function wk(a) { + this.a.xe(new Ak(a, this.c)); + }; + _.sd = function xk(a) { + return this.a.ye(new yk(a, this.c)); + }; + _.b = 0; + var kF = mdb(Zhe, "CollectSpliterators/1WithCharacteristics", 1117); + bcb(1118, 1, sie, yk); + _.ud = function zk(a) { + this.a.td(this.b.ld(a)); + }; + var iF = mdb( + Zhe, + "CollectSpliterators/1WithCharacteristics/lambda$0$Type", + 1118 + ); + bcb(1119, 1, sie, Ak); + _.ud = function Bk(a) { + this.a.td(this.b.ld(a)); + }; + var jF = mdb( + Zhe, + "CollectSpliterators/1WithCharacteristics/lambda$1$Type", + 1119 + ); + bcb(245, 1, tie); + _.wd = function Hk(a) { + return this.vd(BD(a, 245)); + }; + _.vd = function Gk(a) { + var b; + if (a == (_k(), $k)) { + return 1; + } + if (a == (Lk(), Kk)) { + return -1; + } + b = (ex(), Fcb(this.a, a.a)); + if (b != 0) { + return b; + } + return JD(this, 519) == JD(a, 519) ? 0 : JD(this, 519) ? 1 : -1; + }; + _.zd = function Ik() { + return this.a; + }; + _.Fb = function Jk(a) { + return Ek(this, a); + }; + var qF = mdb(Zhe, "Cut", 245); + bcb(1761, 245, tie, Mk); + _.vd = function Nk(a) { + return a == this ? 0 : 1; + }; + _.xd = function Ok(a) { + throw vbb(new xcb()); + }; + _.yd = function Pk(a) { + a.a += "+\u221E)"; + }; + _.zd = function Qk() { + throw vbb(new Zdb(uie)); + }; + _.Hb = function Rk() { + return Zfb(), kCb(this); + }; + _.Ad = function Sk(a) { + return false; + }; + _.Ib = function Tk() { + return "+\u221E"; + }; + var Kk; + var mF = mdb(Zhe, "Cut/AboveAll", 1761); + bcb(519, 245, { 245: 1, 519: 1, 3: 1, 35: 1 }, Uk); + _.xd = function Vk(a) { + Pfb(((a.a += "("), a), this.a); + }; + _.yd = function Wk(a) { + Kfb(Pfb(a, this.a), 93); + }; + _.Hb = function Xk() { + return ~tb(this.a); + }; + _.Ad = function Yk(a) { + return ex(), Fcb(this.a, a) < 0; + }; + _.Ib = function Zk() { + return "/" + this.a + "\\"; + }; + var nF = mdb(Zhe, "Cut/AboveValue", 519); + bcb(1760, 245, tie, al); + _.vd = function bl(a) { + return a == this ? 0 : -1; + }; + _.xd = function cl(a) { + a.a += "(-\u221E"; + }; + _.yd = function dl(a) { + throw vbb(new xcb()); + }; + _.zd = function el() { + throw vbb(new Zdb(uie)); + }; + _.Hb = function fl() { + return Zfb(), kCb(this); + }; + _.Ad = function gl(a) { + return true; + }; + _.Ib = function hl() { + return "-\u221E"; + }; + var $k; + var oF = mdb(Zhe, "Cut/BelowAll", 1760); + bcb(1762, 245, tie, il); + _.xd = function jl(a) { + Pfb(((a.a += "["), a), this.a); + }; + _.yd = function kl(a) { + Kfb(Pfb(a, this.a), 41); + }; + _.Hb = function ll() { + return tb(this.a); + }; + _.Ad = function ml(a) { + return ex(), Fcb(this.a, a) <= 0; + }; + _.Ib = function nl() { + return "\\" + this.a + "/"; + }; + var pF = mdb(Zhe, "Cut/BelowValue", 1762); + bcb(537, 1, vie); + _.Jc = function ql(a) { + reb(this, a); + }; + _.Ib = function rl() { + return tr( + BD( + Rb(this, "use Optional.orNull() instead of Optional.or(null)"), + 20 + ).Kc() + ); + }; + var uF = mdb(Zhe, "FluentIterable", 537); + bcb(433, 537, vie, sl); + _.Kc = function tl() { + return new Sr(ur(this.a.Kc(), new Sq())); + }; + var rF = mdb(Zhe, "FluentIterable/2", 433); + bcb(1046, 537, vie, vl); + _.Kc = function wl() { + return ul(this); + }; + var tF = mdb(Zhe, "FluentIterable/3", 1046); + bcb(708, 386, $he, xl); + _.Xb = function yl(a) { + return this.a[a].Kc(); + }; + var sF = mdb(Zhe, "FluentIterable/3/1", 708); + bcb(1972, 1, {}); + _.Ib = function zl() { + return fcb(this.Bd().b); + }; + var BF = mdb(Zhe, "ForwardingObject", 1972); + bcb(1973, 1972, wie); + _.Bd = function Fl() { + return this.Cd(); + }; + _.Jc = function Gl(a) { + reb(this, a); + }; + _.Lc = function Jl() { + return this.Oc(); + }; + _.Nc = function Ml() { + return new Kub(this, 0); + }; + _.Oc = function Nl() { + return new YAb(null, this.Nc()); + }; + _.Fc = function Al(a) { + return this.Cd(), enb(); + }; + _.Gc = function Bl(a) { + return this.Cd(), fnb(); + }; + _.$b = function Cl() { + this.Cd(), gnb(); + }; + _.Hc = function Dl(a) { + return this.Cd().Hc(a); + }; + _.Ic = function El(a) { + return this.Cd().Ic(a); + }; + _.dc = function Hl() { + return this.Cd().b.dc(); + }; + _.Kc = function Il() { + return this.Cd().Kc(); + }; + _.Mc = function Kl(a) { + return this.Cd(), jnb(); + }; + _.gc = function Ll() { + return this.Cd().b.gc(); + }; + _.Pc = function Ol() { + return this.Cd().Pc(); + }; + _.Qc = function Pl(a) { + return this.Cd().Qc(a); + }; + var vF = mdb(Zhe, "ForwardingCollection", 1973); + bcb(1980, 28, xie); + _.Kc = function Xl() { + return this.Ed(); + }; + _.Fc = function Sl(a) { + throw vbb(new bgb()); + }; + _.Gc = function Tl(a) { + throw vbb(new bgb()); + }; + _.$b = function Ul() { + throw vbb(new bgb()); + }; + _.Hc = function Vl(a) { + return a != null && ze(this, a, false); + }; + _.Dd = function Wl() { + switch (this.gc()) { + case 0: + return im(), im(), hm; + case 1: + return im(), new my(Qb(this.Ed().Pb())); + default: + return new px(this, this.Pc()); + } + }; + _.Mc = function Yl(a) { + throw vbb(new bgb()); + }; + var WF = mdb(Zhe, "ImmutableCollection", 1980); + bcb(712, 1980, xie, Zl); + _.Kc = function cm() { + return vr(this.a.Kc()); + }; + _.Hc = function $l(a) { + return a != null && this.a.Hc(a); + }; + _.Ic = function _l(a) { + return this.a.Ic(a); + }; + _.dc = function am() { + return this.a.dc(); + }; + _.Ed = function bm() { + return vr(this.a.Kc()); + }; + _.gc = function dm() { + return this.a.gc(); + }; + _.Pc = function em() { + return this.a.Pc(); + }; + _.Qc = function fm(a) { + return this.a.Qc(a); + }; + _.Ib = function gm() { + return fcb(this.a); + }; + var wF = mdb(Zhe, "ForwardingImmutableCollection", 712); + bcb(152, 1980, yie); + _.Kc = function sm() { + return this.Ed(); + }; + _.Yc = function tm() { + return this.Fd(0); + }; + _.Zc = function vm(a) { + return this.Fd(a); + }; + _.ad = function zm(a) { + ktb(this, a); + }; + _.Nc = function Am() { + return new Kub(this, 16); + }; + _.bd = function Cm(a, b) { + return this.Gd(a, b); + }; + _.Vc = function lm(a, b) { + throw vbb(new bgb()); + }; + _.Wc = function mm(a, b) { + throw vbb(new bgb()); + }; + _.Fb = function om(a) { + return Ju(this, a); + }; + _.Hb = function pm() { + return Ku(this); + }; + _.Xc = function qm(a) { + return a == null ? -1 : Lu(this, a); + }; + _.Ed = function rm() { + return this.Fd(0); + }; + _.Fd = function um(a) { + return jm(this, a); + }; + _.$c = function xm(a) { + throw vbb(new bgb()); + }; + _._c = function ym(a, b) { + throw vbb(new bgb()); + }; + _.Gd = function Bm(a, b) { + var c; + return Dm(((c = new $u(this)), new Jib(c, a, b))); + }; + var hm; + var _F = mdb(Zhe, "ImmutableList", 152); + bcb(2006, 152, yie); + _.Kc = function Nm() { + return vr(this.Hd().Kc()); + }; + _.bd = function Qm(a, b) { + return Dm(this.Hd().bd(a, b)); + }; + _.Hc = function Fm(a) { + return a != null && this.Hd().Hc(a); + }; + _.Ic = function Gm(a) { + return this.Hd().Ic(a); + }; + _.Fb = function Hm(a) { + return pb(this.Hd(), a); + }; + _.Xb = function Im(a) { + return Em(this, a); + }; + _.Hb = function Jm() { + return tb(this.Hd()); + }; + _.Xc = function Km(a) { + return this.Hd().Xc(a); + }; + _.dc = function Lm() { + return this.Hd().dc(); + }; + _.Ed = function Mm() { + return vr(this.Hd().Kc()); + }; + _.gc = function Om() { + return this.Hd().gc(); + }; + _.Gd = function Pm(a, b) { + return Dm(this.Hd().bd(a, b)); + }; + _.Pc = function Rm() { + return this.Hd().Qc(KC(SI, Uhe, 1, this.Hd().gc(), 5, 1)); + }; + _.Qc = function Sm(a) { + return this.Hd().Qc(a); + }; + _.Ib = function Tm() { + return fcb(this.Hd()); + }; + var xF = mdb(Zhe, "ForwardingImmutableList", 2006); + bcb(714, 1, Aie); + _.vc = function cn() { + return Wm(this); + }; + _.wc = function en(a) { + stb(this, a); + }; + _.ec = function jn() { + return Xm(this); + }; + _.yc = function kn(a, b, c) { + return ttb(this, a, b, c); + }; + _.Cc = function rn() { + return this.Ld(); + }; + _.$b = function Zm() { + throw vbb(new bgb()); + }; + _._b = function $m(a) { + return this.xc(a) != null; + }; + _.uc = function _m(a) { + return this.Ld().Hc(a); + }; + _.Jd = function an() { + return new jq(this); + }; + _.Kd = function bn() { + return new sq(this); + }; + _.Fb = function dn(a) { + return Dv(this, a); + }; + _.Hb = function gn() { + return Wm(this).Hb(); + }; + _.dc = function hn() { + return this.gc() == 0; + }; + _.zc = function nn(a, b) { + return Ym(); + }; + _.Bc = function on(a) { + throw vbb(new bgb()); + }; + _.Ib = function pn() { + return Jv(this); + }; + _.Ld = function qn() { + if (this.e) { + return this.e; + } + return (this.e = this.Kd()); + }; + _.c = null; + _.d = null; + _.e = null; + var Um; + var iG = mdb(Zhe, "ImmutableMap", 714); + bcb(715, 714, Aie); + _._b = function vn(a) { + return sn(this, a); + }; + _.uc = function wn(a) { + return dob(this.b, a); + }; + _.Id = function xn() { + return Vn(new Ln(this)); + }; + _.Jd = function yn() { + return Vn(gob(this.b)); + }; + _.Kd = function zn() { + return Ql(), new Zl(hob(this.b)); + }; + _.Fb = function An(a) { + return fob(this.b, a); + }; + _.xc = function Bn(a) { + return tn(this, a); + }; + _.Hb = function Cn() { + return tb(this.b.c); + }; + _.dc = function Dn() { + return this.b.c.dc(); + }; + _.gc = function En() { + return this.b.c.gc(); + }; + _.Ib = function Fn() { + return fcb(this.b.c); + }; + var zF = mdb(Zhe, "ForwardingImmutableMap", 715); + bcb(1974, 1973, Bie); + _.Bd = function Gn() { + return this.Md(); + }; + _.Cd = function Hn() { + return this.Md(); + }; + _.Nc = function Kn() { + return new Kub(this, 1); + }; + _.Fb = function In(a) { + return a === this || this.Md().Fb(a); + }; + _.Hb = function Jn() { + return this.Md().Hb(); + }; + var CF = mdb(Zhe, "ForwardingSet", 1974); + bcb(1069, 1974, Bie, Ln); + _.Bd = function Nn() { + return eob(this.a.b); + }; + _.Cd = function On() { + return eob(this.a.b); + }; + _.Hc = function Mn(b) { + if (JD(b, 42) && BD(b, 42).cd() == null) { + return false; + } + try { + return Dob(eob(this.a.b), b); + } catch (a) { + a = ubb(a); + if (JD(a, 205)) { + return false; + } else throw vbb(a); + } + }; + _.Md = function Pn() { + return eob(this.a.b); + }; + _.Qc = function Qn(a) { + var b; + b = Eob(eob(this.a.b), a); + eob(this.a.b).b.gc() < b.length && NC(b, eob(this.a.b).b.gc(), null); + return b; + }; + var yF = mdb(Zhe, "ForwardingImmutableMap/1", 1069); + bcb(1981, 1980, Cie); + _.Kc = function Tn() { + return this.Ed(); + }; + _.Nc = function Un() { + return new Kub(this, 1); + }; + _.Fb = function Rn(a) { + return Ax(this, a); + }; + _.Hb = function Sn() { + return Bx(this); + }; + var jG = mdb(Zhe, "ImmutableSet", 1981); + bcb(703, 1981, Cie); + _.Kc = function ao() { + return vr(new Dnb(this.a.b.Kc())); + }; + _.Hc = function Xn(a) { + return a != null && hnb(this.a, a); + }; + _.Ic = function Yn(a) { + return inb(this.a, a); + }; + _.Hb = function Zn() { + return tb(this.a.b); + }; + _.dc = function $n() { + return this.a.b.dc(); + }; + _.Ed = function _n() { + return vr(new Dnb(this.a.b.Kc())); + }; + _.gc = function bo() { + return this.a.b.gc(); + }; + _.Pc = function co() { + return this.a.b.Pc(); + }; + _.Qc = function eo(a) { + return knb(this.a, a); + }; + _.Ib = function fo() { + return fcb(this.a.b); + }; + var AF = mdb(Zhe, "ForwardingImmutableSet", 703); + bcb(1975, 1974, Die); + _.Bd = function go() { + return this.b; + }; + _.Cd = function ho() { + return this.b; + }; + _.Md = function io() { + return this.b; + }; + _.Nc = function jo() { + return new Rub(this); + }; + var DF = mdb(Zhe, "ForwardingSortedSet", 1975); + bcb(533, 1979, Aie, wo); + _.Ac = function Fo(a) { + Ld(this, a); + }; + _.Cc = function Io() { + var a; + return (a = this.d), new up(!a ? (this.d = new ap(this)) : a); + }; + _.$b = function xo() { + ko(this); + }; + _._b = function yo(a) { + return !!uo( + this, + a, + Tbb(Ibb(Eie, keb(Tbb(Ibb(a == null ? 0 : tb(a), Fie)), 15))) + ); + }; + _.uc = function zo(a) { + return lo(this, a); + }; + _.kc = function Ao() { + return new Qo(this, this); + }; + _.wc = function Bo(a) { + no(this, a); + }; + _.xc = function Co(a) { + return oo(this, a); + }; + _.ec = function Do() { + return new Bp(this); + }; + _.zc = function Eo(a, b) { + return ro(this, a, b); + }; + _.Bc = function Go(a) { + var b; + b = uo( + this, + a, + Tbb(Ibb(Eie, keb(Tbb(Ibb(a == null ? 0 : tb(a), Fie)), 15))) + ); + if (!b) { + return null; + } else { + mo(this, b); + b.e = null; + b.c = null; + return b.i; + } + }; + _.gc = function Ho() { + return this.i; + }; + _.pd = function Jo() { + var a; + return (a = this.d), new up(!a ? (this.d = new ap(this)) : a); + }; + _.f = 0; + _.g = 0; + _.i = 0; + var QF = mdb(Zhe, "HashBiMap", 533); + bcb(534, 1, aie); + _.Nb = function Mo(a) { + Rrb(this, a); + }; + _.Ob = function No() { + return Ko(this); + }; + _.Pb = function Oo() { + var a; + if (!Ko(this)) { + throw vbb(new utb()); + } + a = this.c; + this.c = a.c; + this.f = a; + --this.d; + return this.Nd(a); + }; + _.Qb = function Po() { + if (this.e.g != this.b) { + throw vbb(new Apb()); + } + Vb(!!this.f); + mo(this.e, this.f); + this.b = this.e.g; + this.f = null; + }; + _.b = 0; + _.d = 0; + _.f = null; + var NF = mdb(Zhe, "HashBiMap/Itr", 534); + bcb(1011, 534, aie, Qo); + _.Nd = function Ro(a) { + return new So(this, a); + }; + var FF = mdb(Zhe, "HashBiMap/1", 1011); + bcb(1012, 345, kie, So); + _.cd = function To() { + return this.a.g; + }; + _.dd = function Uo() { + return this.a.i; + }; + _.ed = function Vo(a) { + var b, c, d; + c = this.a.i; + d = Tbb(Ibb(Eie, keb(Tbb(Ibb(a == null ? 0 : tb(a), Fie)), 15))); + if (d == this.a.f && (PD(a) === PD(c) || (a != null && pb(a, c)))) { + return a; + } + Nb(!vo(this.b.a, a, d), a); + mo(this.b.a, this.a); + b = new $o(this.a.g, this.a.a, a, d); + po(this.b.a, b, this.a); + this.a.e = null; + this.a.c = null; + this.b.b = this.b.a.g; + this.b.f == this.a && (this.b.f = b); + this.a = b; + return c; + }; + var EF = mdb(Zhe, "HashBiMap/1/MapEntry", 1012); + bcb(238, 345, { 345: 1, 238: 1, 3: 1, 42: 1 }, Wo); + _.cd = function Xo() { + return this.g; + }; + _.dd = function Yo() { + return this.i; + }; + _.ed = function Zo(a) { + throw vbb(new bgb()); + }; + var XF = mdb(Zhe, "ImmutableEntry", 238); + bcb(317, 238, { 345: 1, 317: 1, 238: 1, 3: 1, 42: 1 }, $o); + _.a = 0; + _.f = 0; + var GF = mdb(Zhe, "HashBiMap/BiEntry", 317); + bcb(610, 1979, Aie, ap); + _.Ac = function jp(a) { + Ld(this, a); + }; + _.Cc = function mp() { + return new Bp(this.a); + }; + _.$b = function bp() { + ko(this.a); + }; + _._b = function cp(a) { + return lo(this.a, a); + }; + _.kc = function dp() { + return new op(this, this.a); + }; + _.wc = function ep(a) { + Qb(a); + no(this.a, new zp(a)); + }; + _.xc = function fp(a) { + return _o(this, a); + }; + _.ec = function gp() { + return new up(this); + }; + _.zc = function ip(a, b) { + return so(this.a, a, b, false); + }; + _.Bc = function kp(a) { + var b; + b = vo( + this.a, + a, + Tbb(Ibb(Eie, keb(Tbb(Ibb(a == null ? 0 : tb(a), Fie)), 15))) + ); + if (!b) { + return null; + } else { + mo(this.a, b); + b.e = null; + b.c = null; + return b.g; + } + }; + _.gc = function lp() { + return this.a.i; + }; + _.pd = function np() { + return new Bp(this.a); + }; + var MF = mdb(Zhe, "HashBiMap/Inverse", 610); + bcb(1008, 534, aie, op); + _.Nd = function pp(a) { + return new qp(this, a); + }; + var IF = mdb(Zhe, "HashBiMap/Inverse/1", 1008); + bcb(1009, 345, kie, qp); + _.cd = function rp() { + return this.a.i; + }; + _.dd = function sp() { + return this.a.g; + }; + _.ed = function tp(a) { + var b, c, d; + d = this.a.g; + b = Tbb(Ibb(Eie, keb(Tbb(Ibb(a == null ? 0 : tb(a), Fie)), 15))); + if (b == this.a.a && (PD(a) === PD(d) || (a != null && pb(a, d)))) { + return a; + } + Nb(!uo(this.b.a.a, a, b), a); + mo(this.b.a.a, this.a); + c = new $o(a, b, this.a.i, this.a.f); + this.a = c; + po(this.b.a.a, c, null); + this.b.b = this.b.a.a.g; + return d; + }; + var HF = mdb(Zhe, "HashBiMap/Inverse/1/InverseEntry", 1009); + bcb(611, 532, fie, up); + _.Kc = function vp() { + return new xp(this.a.a); + }; + _.Mc = function wp(a) { + var b; + b = vo( + this.a.a, + a, + Tbb(Ibb(Eie, keb(Tbb(Ibb(a == null ? 0 : tb(a), Fie)), 15))) + ); + if (!b) { + return false; + } else { + mo(this.a.a, b); + return true; + } + }; + var KF = mdb(Zhe, "HashBiMap/Inverse/InverseKeySet", 611); + bcb(1007, 534, aie, xp); + _.Nd = function yp(a) { + return a.i; + }; + var JF = mdb(Zhe, "HashBiMap/Inverse/InverseKeySet/1", 1007); + bcb(1010, 1, {}, zp); + _.Od = function Ap(a, b) { + hp(this.a, a, b); + }; + var LF = mdb(Zhe, "HashBiMap/Inverse/lambda$0$Type", 1010); + bcb(609, 532, fie, Bp); + _.Kc = function Cp() { + return new Ep(this.a); + }; + _.Mc = function Dp(a) { + var b; + b = uo( + this.a, + a, + Tbb(Ibb(Eie, keb(Tbb(Ibb(a == null ? 0 : tb(a), Fie)), 15))) + ); + if (!b) { + return false; + } else { + mo(this.a, b); + b.e = null; + b.c = null; + return true; + } + }; + var PF = mdb(Zhe, "HashBiMap/KeySet", 609); + bcb(1006, 534, aie, Ep); + _.Nd = function Fp(a) { + return a.g; + }; + var OF = mdb(Zhe, "HashBiMap/KeySet/1", 1006); + bcb(1093, 619, _he); + var RF = mdb(Zhe, "HashMultimapGwtSerializationDependencies", 1093); + bcb(265, 1093, _he, Hp); + _.hc = function Ip() { + return new Uqb(Cv(this.a)); + }; + _.gd = function Jp() { + return new Uqb(Cv(this.a)); + }; + _.a = 2; + var SF = mdb(Zhe, "HashMultimap", 265); + bcb(1999, 152, yie); + _.Hc = function Mp(a) { + return this.Pd().Hc(a); + }; + _.dc = function Np() { + return this.Pd().dc(); + }; + _.gc = function Op() { + return this.Pd().gc(); + }; + var TF = mdb(Zhe, "ImmutableAsList", 1999); + bcb(1931, 715, Aie); + _.Ld = function Qp() { + return Ql(), new oy(this.a); + }; + _.Cc = function Rp() { + return Ql(), new oy(this.a); + }; + _.pd = function Sp() { + return Ql(), new oy(this.a); + }; + var UF = mdb(Zhe, "ImmutableBiMap", 1931); + bcb(1977, 1, {}); + var VF = mdb(Zhe, "ImmutableCollection/Builder", 1977); + bcb(1022, 703, Cie, Tp); + var YF = mdb(Zhe, "ImmutableEnumSet", 1022); + bcb(969, 386, $he, Vp); + _.Xb = function Wp(a) { + return this.a.Xb(a); + }; + var ZF = mdb(Zhe, "ImmutableList/1", 969); + bcb(968, 1977, {}, Xp); + var $F = mdb(Zhe, "ImmutableList/Builder", 968); + bcb(614, 198, Yhe, Yp); + _.Ob = function Zp() { + return this.a.Ob(); + }; + _.Pb = function $p() { + return BD(this.a.Pb(), 42).cd(); + }; + var aG = mdb(Zhe, "ImmutableMap/1", 614); + bcb(1041, 1, {}, _p); + _.Kb = function aq(a) { + return BD(a, 42).cd(); + }; + var bG = mdb(Zhe, "ImmutableMap/2methodref$getKey$Type", 1041); + bcb(1040, 1, {}, cq); + var cG = mdb(Zhe, "ImmutableMap/Builder", 1040); + bcb(2000, 1981, Cie); + _.Kc = function gq() { + var a; + return (a = Wm(this.a).Ed()), new Yp(a); + }; + _.Dd = function dq() { + return new Fq(this); + }; + _.Jc = function eq(a) { + var b, c; + Qb(a); + c = this.gc(); + for (b = 0; b < c; b++) { + a.td(BD(Rl(Wm(this.a)).Xb(b), 42).cd()); + } + }; + _.Ed = function fq() { + var a; + return ((a = this.c), !a ? (this.c = new Fq(this)) : a).Ed(); + }; + _.Nc = function hq() { + return Zj(this.gc(), 1296, new Dq(this)); + }; + var mG = mdb(Zhe, "IndexedImmutableSet", 2000); + bcb(1180, 2000, Cie, jq); + _.Kc = function nq() { + var a; + return (a = Wm(this.a).Ed()), new Yp(a); + }; + _.Hc = function kq(a) { + return this.a._b(a); + }; + _.Jc = function lq(a) { + Qb(a); + stb(this.a, new qq(a)); + }; + _.Ed = function mq() { + var a; + return (a = Wm(this.a).Ed()), new Yp(a); + }; + _.gc = function oq() { + return this.a.gc(); + }; + _.Nc = function pq() { + return $j(Wm(this.a).Nc(), new _p()); + }; + var eG = mdb(Zhe, "ImmutableMapKeySet", 1180); + bcb(1181, 1, {}, qq); + _.Od = function rq(a, b) { + Ql(); + this.a.td(a); + }; + var dG = mdb(Zhe, "ImmutableMapKeySet/lambda$0$Type", 1181); + bcb(1178, 1980, xie, sq); + _.Kc = function vq() { + return new Aq(this); + }; + _.Hc = function tq(a) { + return a != null && jr(new Aq(this), a); + }; + _.Ed = function uq() { + return new Aq(this); + }; + _.gc = function wq() { + return this.a.gc(); + }; + _.Nc = function xq() { + return $j(Wm(this.a).Nc(), new yq()); + }; + var hG = mdb(Zhe, "ImmutableMapValues", 1178); + bcb(1179, 1, {}, yq); + _.Kb = function zq(a) { + return BD(a, 42).dd(); + }; + var fG = mdb(Zhe, "ImmutableMapValues/0methodref$getValue$Type", 1179); + bcb(626, 198, Yhe, Aq); + _.Ob = function Bq() { + return this.a.Ob(); + }; + _.Pb = function Cq() { + return BD(this.a.Pb(), 42).dd(); + }; + var gG = mdb(Zhe, "ImmutableMapValues/1", 626); + bcb(1182, 1, {}, Dq); + _.ld = function Eq(a) { + return iq(this.a, a); + }; + var kG = mdb(Zhe, "IndexedImmutableSet/0methodref$get$Type", 1182); + bcb(752, 1999, yie, Fq); + _.Pd = function Gq() { + return this.a; + }; + _.Xb = function Hq(a) { + return iq(this.a, a); + }; + _.gc = function Iq() { + return this.a.a.gc(); + }; + var lG = mdb(Zhe, "IndexedImmutableSet/1", 752); + bcb(44, 1, {}, Sq); + _.Kb = function Tq(a) { + return BD(a, 20).Kc(); + }; + _.Fb = function Uq(a) { + return this === a; + }; + var nG = mdb(Zhe, "Iterables/10", 44); + bcb(1042, 537, vie, Wq); + _.Jc = function Xq(a) { + Qb(a); + this.b.Jc(new $q(this.a, a)); + }; + _.Kc = function Yq() { + return Vq(this); + }; + var pG = mdb(Zhe, "Iterables/4", 1042); + bcb(1043, 1, qie, $q); + _.td = function _q(a) { + Zq(this.b, this.a, a); + }; + var oG = mdb(Zhe, "Iterables/4/lambda$0$Type", 1043); + bcb(1044, 537, vie, ar); + _.Jc = function br(a) { + Qb(a); + reb(this.a, new dr(a, this.b)); + }; + _.Kc = function cr() { + return ur(new Fyd(this.a), this.b); + }; + var rG = mdb(Zhe, "Iterables/5", 1044); + bcb(1045, 1, qie, dr); + _.td = function er(a) { + this.a.td(Gfd(a)); + }; + var qG = mdb(Zhe, "Iterables/5/lambda$0$Type", 1045); + bcb(1071, 198, Yhe, wr); + _.Ob = function xr() { + return this.a.Ob(); + }; + _.Pb = function yr() { + return this.a.Pb(); + }; + var sG = mdb(Zhe, "Iterators/1", 1071); + bcb(1072, 699, Yhe, zr); + _.Yb = function Ar() { + var a; + while (this.b.Ob()) { + a = this.b.Pb(); + if (this.a.Lb(a)) { + return a; + } + } + return (this.e = 2), null; + }; + var tG = mdb(Zhe, "Iterators/5", 1072); + bcb(487, 1, aie); + _.Nb = function Cr(a) { + Rrb(this, a); + }; + _.Ob = function Dr() { + return this.b.Ob(); + }; + _.Pb = function Er() { + return this.Qd(this.b.Pb()); + }; + _.Qb = function Fr() { + this.b.Qb(); + }; + var KH = mdb(Zhe, "TransformedIterator", 487); + bcb(1073, 487, aie, Gr); + _.Qd = function Hr(a) { + return this.a.Kb(a); + }; + var uG = mdb(Zhe, "Iterators/6", 1073); + bcb(717, 198, Yhe, Ir); + _.Ob = function Jr() { + return !this.a; + }; + _.Pb = function Kr() { + if (this.a) { + throw vbb(new utb()); + } + this.a = true; + return this.b; + }; + _.a = false; + var vG = mdb(Zhe, "Iterators/9", 717); + bcb(1070, 386, $he, Nr); + _.Xb = function Or(a) { + return this.a[this.b + a]; + }; + _.b = 0; + var Lr; + var wG = mdb(Zhe, "Iterators/ArrayItr", 1070); + bcb(39, 1, { 39: 1, 47: 1 }, Sr); + _.Nb = function Tr(a) { + Rrb(this, a); + }; + _.Ob = function Ur() { + return Qr(this); + }; + _.Pb = function Vr() { + return Rr(this); + }; + _.Qb = function Wr() { + Vb(!!this.c); + this.c.Qb(); + this.c = null; + }; + var xG = mdb(Zhe, "Iterators/ConcatenatedIterator", 39); + bcb(22, 1, { 3: 1, 35: 1, 22: 1 }); + _.wd = function _r(a) { + return Xr(this, BD(a, 22)); + }; + _.Fb = function bs(a) { + return this === a; + }; + _.Hb = function cs() { + return FCb(this); + }; + _.Ib = function ds() { + return Zr(this); + }; + _.g = 0; + var CI = mdb(Phe, "Enum", 22); + bcb(538, 22, { 538: 1, 3: 1, 35: 1, 22: 1, 47: 1 }, is); + _.Nb = function js(a) { + Rrb(this, a); + }; + _.Ob = function ks() { + return false; + }; + _.Pb = function ls() { + throw vbb(new utb()); + }; + _.Qb = function ms() { + Vb(false); + }; + var gs; + var yG = ndb(Zhe, "Iterators/EmptyModifiableIterator", 538, CI, os, ns); + var ps; + bcb(1834, 619, _he); + var EG = mdb(Zhe, "LinkedHashMultimapGwtSerializationDependencies", 1834); + bcb(1835, 1834, _he, ss); + _.hc = function us() { + return new Asb(Cv(this.b)); + }; + _.$b = function ts() { + Nc(this); + As(this.a, this.a); + }; + _.gd = function vs() { + return new Asb(Cv(this.b)); + }; + _.ic = function ws(a) { + return new Ss(this, a, this.b); + }; + _.kc = function xs() { + return new Hs(this); + }; + _.lc = function ys() { + var a; + return new Kub( + ((a = this.g), BD(!a ? (this.g = new ph(this)) : a, 21)), + 17 + ); + }; + _.ec = function zs() { + var a; + return (a = this.i), !a ? (this.i = new zf(this, this.c)) : a; + }; + _.nc = function Cs() { + return new Ov(new Hs(this)); + }; + _.oc = function Ds() { + var a; + return $j( + new Kub(((a = this.g), BD(!a ? (this.g = new ph(this)) : a, 21)), 17), + new Es() + ); + }; + _.b = 2; + var FG = mdb(Zhe, "LinkedHashMultimap", 1835); + bcb(1838, 1, {}, Es); + _.Kb = function Fs(a) { + return BD(a, 42).dd(); + }; + var zG = mdb(Zhe, "LinkedHashMultimap/0methodref$getValue$Type", 1838); + bcb(824, 1, aie, Hs); + _.Nb = function Is(a) { + Rrb(this, a); + }; + _.Pb = function Ks() { + return Gs(this); + }; + _.Ob = function Js() { + return this.a != this.b.a; + }; + _.Qb = function Ls() { + Vb(!!this.c); + Gc(this.b, this.c.g, this.c.i); + this.c = null; + }; + var AG = mdb(Zhe, "LinkedHashMultimap/1", 824); + bcb(330, 238, { 345: 1, 238: 1, 330: 1, 2020: 1, 3: 1, 42: 1 }, Ms); + _.Rd = function Ns() { + return this.f; + }; + _.Sd = function Os(a) { + this.c = a; + }; + _.Td = function Ps(a) { + this.f = a; + }; + _.d = 0; + var BG = mdb(Zhe, "LinkedHashMultimap/ValueEntry", 330); + bcb(1836, 1970, { 2020: 1, 20: 1, 28: 1, 14: 1, 21: 1 }, Ss); + _.Fc = function Ts(a) { + var b, c, d, e, f; + f = Tbb(Ibb(Eie, keb(Tbb(Ibb(a == null ? 0 : tb(a), Fie)), 15))); + b = f & (this.b.length - 1); + e = this.b[b]; + for (c = e; c; c = c.a) { + if (c.d == f && Hb(c.i, a)) { + return false; + } + } + d = new Ms(this.c, a, f, e); + Bs(this.d, d); + d.f = this; + this.d = d; + As(this.g.a.b, d); + As(d, this.g.a); + this.b[b] = d; + ++this.f; + ++this.e; + Qs(this); + return true; + }; + _.$b = function Us() { + var a, b; + Alb(this.b, null); + this.f = 0; + for (a = this.a; a != this; a = a.Rd()) { + b = BD(a, 330); + As(b.b, b.e); + } + this.a = this; + this.d = this; + ++this.e; + }; + _.Hc = function Vs(a) { + var b, c; + c = Tbb(Ibb(Eie, keb(Tbb(Ibb(a == null ? 0 : tb(a), Fie)), 15))); + for (b = this.b[c & (this.b.length - 1)]; b; b = b.a) { + if (b.d == c && Hb(b.i, a)) { + return true; + } + } + return false; + }; + _.Jc = function Ws(a) { + var b; + Qb(a); + for (b = this.a; b != this; b = b.Rd()) { + a.td(BD(b, 330).i); + } + }; + _.Rd = function Xs() { + return this.a; + }; + _.Kc = function Ys() { + return new ct(this); + }; + _.Mc = function Zs(a) { + return Rs(this, a); + }; + _.Sd = function $s(a) { + this.d = a; + }; + _.Td = function _s(a) { + this.a = a; + }; + _.gc = function at() { + return this.f; + }; + _.e = 0; + _.f = 0; + var DG = mdb(Zhe, "LinkedHashMultimap/ValueSet", 1836); + bcb(1837, 1, aie, ct); + _.Nb = function dt(a) { + Rrb(this, a); + }; + _.Ob = function et() { + return bt(this), this.b != this.c; + }; + _.Pb = function ft() { + var a, b; + bt(this); + if (this.b == this.c) { + throw vbb(new utb()); + } + a = BD(this.b, 330); + b = a.i; + this.d = a; + this.b = a.f; + return b; + }; + _.Qb = function gt() { + bt(this); + Vb(!!this.d); + Rs(this.c, this.d.i); + this.a = this.c.e; + this.d = null; + }; + _.a = 0; + var CG = mdb(Zhe, "LinkedHashMultimap/ValueSet/1", 1837); + bcb(766, 1986, _he, mt); + _.Zb = function nt() { + var a; + return (a = this.f), !a ? (this.f = new jw(this)) : a; + }; + _.Fb = function tt(a) { + return hw(this, a); + }; + _.cc = function ut(a) { + return new bu(this, a); + }; + _.fc = function xt(a) { + return kt(this, a); + }; + _.$b = function pt() { + it(this); + }; + _._b = function qt(a) { + return jt(this, a); + }; + _.ac = function rt() { + return new jw(this); + }; + _.bc = function st() { + return new eu(this); + }; + _.qc = function vt(a) { + return new bu(this, a); + }; + _.dc = function wt() { + return !this.a; + }; + _.rc = function yt(a) { + return kt(this, a); + }; + _.gc = function zt() { + return this.d; + }; + _.c = 0; + _.d = 0; + var MG = mdb(Zhe, "LinkedListMultimap", 766); + bcb(52, 28, Lie); + _.ad = function Pt(a) { + ktb(this, a); + }; + _.Nc = function Qt() { + return new Kub(this, 16); + }; + _.Vc = function Ct(a, b) { + throw vbb(new cgb("Add not supported on this list")); + }; + _.Fc = function Dt(a) { + this.Vc(this.gc(), a); + return true; + }; + _.Wc = function Et(a, b) { + var c, d, e; + uCb(b); + c = false; + for (e = b.Kc(); e.Ob(); ) { + d = e.Pb(); + this.Vc(a++, d); + c = true; + } + return c; + }; + _.$b = function Ft() { + this.Ud(0, this.gc()); + }; + _.Fb = function Gt(a) { + return At(this, a); + }; + _.Hb = function Ht() { + return qmb(this); + }; + _.Xc = function It(a) { + return Bt(this, a); + }; + _.Kc = function Jt() { + return new vib(this); + }; + _.Yc = function Kt() { + return this.Zc(0); + }; + _.Zc = function Lt(a) { + return new Bib(this, a); + }; + _.$c = function Mt(a) { + throw vbb(new cgb("Remove not supported on this list")); + }; + _.Ud = function Nt(a, b) { + var c, d; + d = this.Zc(a); + for (c = a; c < b; ++c) { + d.Pb(); + d.Qb(); + } + }; + _._c = function Ot(a, b) { + throw vbb(new cgb("Set not supported on this list")); + }; + _.bd = function Rt(a, b) { + return new Jib(this, a, b); + }; + _.j = 0; + var kJ = mdb(bie, "AbstractList", 52); + bcb(1964, 52, Lie); + _.Vc = function Wt(a, b) { + St(this, a, b); + }; + _.Wc = function Xt(a, b) { + return Tt(this, a, b); + }; + _.Xb = function Yt(a) { + return Ut(this, a); + }; + _.Kc = function Zt() { + return this.Zc(0); + }; + _.$c = function $t(a) { + return Vt(this, a); + }; + _._c = function _t(b, c) { + var d, e; + d = this.Zc(b); + try { + e = d.Pb(); + d.Wb(c); + return e; + } catch (a) { + a = ubb(a); + if (JD(a, 109)) { + throw vbb(new qcb("Can't set element " + b)); + } else throw vbb(a); + } + }; + var yJ = mdb(bie, "AbstractSequentialList", 1964); + bcb(636, 1964, Lie, bu); + _.Zc = function cu(a) { + return au(this, a); + }; + _.gc = function du() { + var a; + a = BD(Ohb(this.a.b, this.b), 283); + return !a ? 0 : a.a; + }; + var HG = mdb(Zhe, "LinkedListMultimap/1", 636); + bcb(1297, 1970, fie, eu); + _.Hc = function fu(a) { + return jt(this.a, a); + }; + _.Kc = function gu() { + return new ku(this.a); + }; + _.Mc = function hu(a) { + return !kt(this.a, a).a.dc(); + }; + _.gc = function iu() { + return Vhb(this.a.b); + }; + var GG = mdb(Zhe, "LinkedListMultimap/1KeySetImpl", 1297); + bcb(1296, 1, aie, ku); + _.Nb = function lu(a) { + Rrb(this, a); + }; + _.Ob = function mu() { + ju(this); + return !!this.c; + }; + _.Pb = function nu() { + ju(this); + ot(this.c); + this.a = this.c; + Qqb(this.d, this.a.a); + do { + this.c = this.c.b; + } while (!!this.c && !Qqb(this.d, this.c.a)); + return this.a.a; + }; + _.Qb = function ou() { + ju(this); + Vb(!!this.a); + ir(new wu(this.e, this.a.a)); + this.a = null; + this.b = this.e.c; + }; + _.b = 0; + var IG = mdb(Zhe, "LinkedListMultimap/DistinctKeyIterator", 1296); + bcb(283, 1, { 283: 1 }, pu); + _.a = 0; + var JG = mdb(Zhe, "LinkedListMultimap/KeyList", 283); + bcb(1295, 345, kie, qu); + _.cd = function ru() { + return this.a; + }; + _.dd = function su() { + return this.f; + }; + _.ed = function tu(a) { + var b; + b = this.f; + this.f = a; + return b; + }; + var KG = mdb(Zhe, "LinkedListMultimap/Node", 1295); + bcb(560, 1, jie, wu, xu); + _.Nb = function zu(a) { + Rrb(this, a); + }; + _.Rb = function yu(a) { + this.e = ht(this.f, this.b, a, this.c); + ++this.d; + this.a = null; + }; + _.Ob = function Au() { + return !!this.c; + }; + _.Sb = function Bu() { + return !!this.e; + }; + _.Pb = function Cu() { + return uu(this); + }; + _.Tb = function Du() { + return this.d; + }; + _.Ub = function Eu() { + return vu(this); + }; + _.Vb = function Fu() { + return this.d - 1; + }; + _.Qb = function Gu() { + Vb(!!this.a); + if (this.a != this.c) { + this.e = this.a.e; + --this.d; + } else { + this.c = this.a.c; + } + lt(this.f, this.a); + this.a = null; + }; + _.Wb = function Hu(a) { + Ub(!!this.a); + this.a.f = a; + }; + _.d = 0; + var LG = mdb(Zhe, "LinkedListMultimap/ValueForKeyIterator", 560); + bcb(1018, 52, Lie); + _.Vc = function Tu(a, b) { + this.a.Vc(a, b); + }; + _.Wc = function Uu(a, b) { + return this.a.Wc(a, b); + }; + _.Hc = function Vu(a) { + return this.a.Hc(a); + }; + _.Xb = function Wu(a) { + return this.a.Xb(a); + }; + _.$c = function Xu(a) { + return this.a.$c(a); + }; + _._c = function Yu(a, b) { + return this.a._c(a, b); + }; + _.gc = function Zu() { + return this.a.gc(); + }; + var OG = mdb(Zhe, "Lists/AbstractListWrapper", 1018); + bcb(1019, 1018, Nie); + var PG = mdb(Zhe, "Lists/RandomAccessListWrapper", 1019); + bcb(1021, 1019, Nie, $u); + _.Zc = function _u(a) { + return this.a.Zc(a); + }; + var NG = mdb(Zhe, "Lists/1", 1021); + bcb(131, 52, { 131: 1, 20: 1, 28: 1, 52: 1, 14: 1, 15: 1 }, dv); + _.Vc = function ev(a, b) { + this.a.Vc(cv(this, a), b); + }; + _.$b = function fv() { + this.a.$b(); + }; + _.Xb = function gv(a) { + return this.a.Xb(bv(this, a)); + }; + _.Kc = function hv() { + return av(this, 0); + }; + _.Zc = function iv(a) { + return av(this, a); + }; + _.$c = function jv(a) { + return this.a.$c(bv(this, a)); + }; + _.Ud = function kv(a, b) { + (Tb(a, b, this.a.gc()), Su(this.a.bd(cv(this, b), cv(this, a)))).$b(); + }; + _._c = function lv(a, b) { + return this.a._c(bv(this, a), b); + }; + _.gc = function mv() { + return this.a.gc(); + }; + _.bd = function nv(a, b) { + return Tb(a, b, this.a.gc()), Su(this.a.bd(cv(this, b), cv(this, a))); + }; + var SG = mdb(Zhe, "Lists/ReverseList", 131); + bcb(280, 131, { 131: 1, 20: 1, 28: 1, 52: 1, 14: 1, 15: 1, 54: 1 }, ov); + var QG = mdb(Zhe, "Lists/RandomAccessReverseList", 280); + bcb(1020, 1, jie, qv); + _.Nb = function sv(a) { + Rrb(this, a); + }; + _.Rb = function rv(a) { + this.c.Rb(a); + this.c.Ub(); + this.a = false; + }; + _.Ob = function tv() { + return this.c.Sb(); + }; + _.Sb = function uv() { + return this.c.Ob(); + }; + _.Pb = function vv() { + return pv(this); + }; + _.Tb = function wv() { + return cv(this.b, this.c.Tb()); + }; + _.Ub = function xv() { + if (!this.c.Ob()) { + throw vbb(new utb()); + } + this.a = true; + return this.c.Pb(); + }; + _.Vb = function yv() { + return cv(this.b, this.c.Tb()) - 1; + }; + _.Qb = function zv() { + Vb(this.a); + this.c.Qb(); + this.a = false; + }; + _.Wb = function Av(a) { + Ub(this.a); + this.c.Wb(a); + }; + _.a = false; + var RG = mdb(Zhe, "Lists/ReverseList/1", 1020); + bcb(432, 487, aie, Mv); + _.Qd = function Nv(a) { + return Lv(a); + }; + var TG = mdb(Zhe, "Maps/1", 432); + bcb(698, 487, aie, Ov); + _.Qd = function Pv(a) { + return BD(a, 42).dd(); + }; + var UG = mdb(Zhe, "Maps/2", 698); + bcb(962, 487, aie, Qv); + _.Qd = function Rv(a) { + return new Wo(a, ww(this.a, a)); + }; + var VG = mdb(Zhe, "Maps/3", 962); + bcb(959, 1971, fie, Sv); + _.Jc = function Tv(a) { + mj(this.a, a); + }; + _.Kc = function Uv() { + return this.a.kc(); + }; + _.Rc = function Vv() { + return this.a; + }; + _.Nc = function Wv() { + return this.a.lc(); + }; + var XG = mdb(Zhe, "Maps/IteratorBasedAbstractMap/1", 959); + bcb(960, 1, {}, Xv); + _.Od = function Yv(a, b) { + this.a.td(a); + }; + var ZG = mdb(Zhe, "Maps/KeySet/lambda$0$Type", 960); + bcb(958, 28, die, Zv); + _.$b = function $v() { + this.a.$b(); + }; + _.Hc = function _v(a) { + return this.a.uc(a); + }; + _.Jc = function aw(a) { + Qb(a); + this.a.wc(new fw(a)); + }; + _.dc = function bw() { + return this.a.dc(); + }; + _.Kc = function cw() { + return new Ov(this.a.vc().Kc()); + }; + _.Mc = function dw(b) { + var c, d; + try { + return ze(this, b, true); + } catch (a) { + a = ubb(a); + if (JD(a, 41)) { + for (d = this.a.vc().Kc(); d.Ob(); ) { + c = BD(d.Pb(), 42); + if (Hb(b, c.dd())) { + this.a.Bc(c.cd()); + return true; + } + } + return false; + } else throw vbb(a); + } + }; + _.gc = function ew() { + return this.a.gc(); + }; + var aH = mdb(Zhe, "Maps/Values", 958); + bcb(961, 1, {}, fw); + _.Od = function gw(a, b) { + this.a.td(b); + }; + var _G = mdb(Zhe, "Maps/Values/lambda$0$Type", 961); + bcb(736, 1987, cie, jw); + _.xc = function nw(a) { + return this.a._b(a) ? this.a.cc(a) : null; + }; + _.Bc = function qw(a) { + return this.a._b(a) ? this.a.fc(a) : null; + }; + _.$b = function kw() { + this.a.$b(); + }; + _._b = function lw(a) { + return this.a._b(a); + }; + _.Ec = function mw() { + return new sw(this); + }; + _.Dc = function () { + return this.Ec(); + }; + _.dc = function ow() { + return this.a.dc(); + }; + _.ec = function pw() { + return this.a.ec(); + }; + _.gc = function rw() { + return this.a.ec().gc(); + }; + var eH = mdb(Zhe, "Multimaps/AsMap", 736); + bcb(1104, 1971, fie, sw); + _.Kc = function tw() { + return Bv(this.a.a.ec(), new xw(this)); + }; + _.Rc = function uw() { + return this.a; + }; + _.Mc = function vw(a) { + var b; + if (!Ze(this, a)) { + return false; + } + b = BD(a, 42); + iw(this.a, b.cd()); + return true; + }; + var dH = mdb(Zhe, "Multimaps/AsMap/EntrySet", 1104); + bcb(1108, 1, {}, xw); + _.Kb = function yw(a) { + return ww(this, a); + }; + _.Fb = function zw(a) { + return this === a; + }; + var cH = mdb(Zhe, "Multimaps/AsMap/EntrySet/1", 1108); + bcb(543, 1989, { 543: 1, 835: 1, 20: 1, 28: 1, 14: 1 }, Cw); + _.$b = function Dw() { + Nc(this.a); + }; + _.Hc = function Ew(a) { + return Oc(this.a, a); + }; + _.Jc = function Fw(a) { + Qb(a); + reb(Pc(this.a), new Rw(a)); + }; + _.Kc = function Gw() { + return new Mv(Pc(this.a).a.kc()); + }; + _.gc = function Hw() { + return this.a.d; + }; + _.Nc = function Iw() { + return $j(Pc(this.a).Nc(), new Jw()); + }; + var kH = mdb(Zhe, "Multimaps/Keys", 543); + bcb(1106, 1, {}, Jw); + _.Kb = function Kw(a) { + return BD(a, 42).cd(); + }; + var gH = mdb(Zhe, "Multimaps/Keys/0methodref$getKey$Type", 1106); + bcb(1105, 487, aie, Lw); + _.Qd = function Mw(a) { + return new Qw(BD(a, 42)); + }; + var iH = mdb(Zhe, "Multimaps/Keys/1", 1105); + bcb(1990, 1, { 416: 1 }); + _.Fb = function Nw(a) { + var b; + if (JD(a, 492)) { + b = BD(a, 416); + return ( + BD(this.a.dd(), 14).gc() == BD(b.a.dd(), 14).gc() && + Hb(this.a.cd(), b.a.cd()) + ); + } + return false; + }; + _.Hb = function Ow() { + var a; + a = this.a.cd(); + return (a == null ? 0 : tb(a)) ^ BD(this.a.dd(), 14).gc(); + }; + _.Ib = function Pw() { + var a, b; + b = xfb(this.a.cd()); + a = BD(this.a.dd(), 14).gc(); + return a == 1 ? b : b + " x " + a; + }; + var oH = mdb(Zhe, "Multisets/AbstractEntry", 1990); + bcb(492, 1990, { 492: 1, 416: 1 }, Qw); + var hH = mdb(Zhe, "Multimaps/Keys/1/1", 492); + bcb(1107, 1, qie, Rw); + _.td = function Sw(a) { + this.a.td(BD(a, 42).cd()); + }; + var jH = mdb(Zhe, "Multimaps/Keys/lambda$1$Type", 1107); + bcb(1110, 1, qie, Vw); + _.td = function Ww(a) { + Tw(BD(a, 416)); + }; + var lH = mdb(Zhe, "Multiset/lambda$0$Type", 1110); + bcb(737, 1, qie, Xw); + _.td = function Yw(a) { + Uw(this.a, BD(a, 416)); + }; + var mH = mdb(Zhe, "Multiset/lambda$1$Type", 737); + bcb(1111, 1, {}, bx); + var nH = mdb(Zhe, "Multisets/0methodref$add$Type", 1111); + bcb(738, 1, {}, cx); + _.Kb = function dx(a) { + return _w(BD(a, 416)); + }; + var qH = mdb(Zhe, "Multisets/lambda$3$Type", 738); + bcb(2008, 1, Qhe); + var rH = mdb(Zhe, "RangeGwtSerializationDependencies", 2008); + bcb(514, 2008, { 169: 1, 514: 1, 3: 1, 45: 1 }, gx); + _.Lb = function hx(a) { + return fx(this, BD(a, 35)); + }; + _.Mb = function lx(a) { + return fx(this, BD(a, 35)); + }; + _.Fb = function jx(a) { + var b; + if (JD(a, 514)) { + b = BD(a, 514); + return Ek(this.a, b.a) && Ek(this.b, b.b); + } + return false; + }; + _.Hb = function kx() { + return this.a.Hb() * 31 + this.b.Hb(); + }; + _.Ib = function mx() { + return nx(this.a, this.b); + }; + var sH = mdb(Zhe, "Range", 514); + bcb(778, 1999, yie, px); + _.Zc = function tx(a) { + return jm(this.b, a); + }; + _.Pd = function qx() { + return this.a; + }; + _.Xb = function rx(a) { + return Em(this.b, a); + }; + _.Fd = function sx(a) { + return jm(this.b, a); + }; + var tH = mdb(Zhe, "RegularImmutableAsList", 778); + bcb(646, 2006, yie, ux); + _.Hd = function vx() { + return this.a; + }; + var uH = mdb(Zhe, "RegularImmutableList", 646); + bcb(616, 715, Aie, wx); + var vH = mdb(Zhe, "RegularImmutableMap", 616); + bcb(716, 703, Cie, zx); + var xx; + var wH = mdb(Zhe, "RegularImmutableSet", 716); + bcb(1976, eie, fie); + _.Kc = function Mx() { + return new Xx(this.a, this.b); + }; + _.Fc = function Jx(a) { + throw vbb(new bgb()); + }; + _.Gc = function Kx(a) { + throw vbb(new bgb()); + }; + _.$b = function Lx() { + throw vbb(new bgb()); + }; + _.Mc = function Nx(a) { + throw vbb(new bgb()); + }; + var CH = mdb(Zhe, "Sets/SetView", 1976); + bcb(963, 1976, fie, Px); + _.Kc = function Tx() { + return new Xx(this.a, this.b); + }; + _.Hc = function Qx(a) { + return tqb(this.a, a) && this.b.Hc(a); + }; + _.Ic = function Rx(a) { + return Be(this.a, a) && this.b.Ic(a); + }; + _.dc = function Sx() { + return omb(this.b, this.a); + }; + _.Lc = function Ux() { + return JAb(new YAb(null, new Kub(this.a, 1)), new _x(this.b)); + }; + _.gc = function Vx() { + return Ox(this); + }; + _.Oc = function Wx() { + return JAb(new YAb(null, new Kub(this.a, 1)), new Zx(this.b)); + }; + var AH = mdb(Zhe, "Sets/2", 963); + bcb(700, 699, Yhe, Xx); + _.Yb = function Yx() { + var a; + while (Eqb(this.a)) { + a = Fqb(this.a); + if (this.c.Hc(a)) { + return a; + } + } + return (this.e = 2), null; + }; + var xH = mdb(Zhe, "Sets/2/1", 700); + bcb(964, 1, Oie, Zx); + _.Mb = function $x(a) { + return this.a.Hc(a); + }; + var yH = mdb(Zhe, "Sets/2/4methodref$contains$Type", 964); + bcb(965, 1, Oie, _x); + _.Mb = function ay(a) { + return this.a.Hc(a); + }; + var zH = mdb(Zhe, "Sets/2/5methodref$contains$Type", 965); + bcb(607, 1975, { 607: 1, 3: 1, 20: 1, 14: 1, 271: 1, 21: 1, 84: 1 }, by); + _.Bd = function cy() { + return this.b; + }; + _.Cd = function dy() { + return this.b; + }; + _.Md = function ey() { + return this.b; + }; + _.Jc = function fy(a) { + this.a.Jc(a); + }; + _.Lc = function gy() { + return this.a.Lc(); + }; + _.Oc = function hy() { + return this.a.Oc(); + }; + var DH = mdb(Zhe, "Sets/UnmodifiableNavigableSet", 607); + bcb(1932, 1931, Aie, iy); + _.Ld = function jy() { + return Ql(), new oy(this.a); + }; + _.Cc = function ky() { + return Ql(), new oy(this.a); + }; + _.pd = function ly() { + return Ql(), new oy(this.a); + }; + var EH = mdb(Zhe, "SingletonImmutableBiMap", 1932); + bcb(647, 2006, yie, my); + _.Hd = function ny() { + return this.a; + }; + var FH = mdb(Zhe, "SingletonImmutableList", 647); + bcb(350, 1981, Cie, oy); + _.Kc = function ry() { + return new Ir(this.a); + }; + _.Hc = function py(a) { + return pb(this.a, a); + }; + _.Ed = function qy() { + return new Ir(this.a); + }; + _.gc = function sy() { + return 1; + }; + var GH = mdb(Zhe, "SingletonImmutableSet", 350); + bcb(1115, 1, {}, vy); + _.Kb = function wy(a) { + return BD(a, 164); + }; + var HH = mdb(Zhe, "Streams/lambda$0$Type", 1115); + bcb(1116, 1, Pie, xy); + _.Vd = function yy() { + uy(this.a); + }; + var IH = mdb(Zhe, "Streams/lambda$1$Type", 1116); + bcb(1659, 1658, _he, Ay); + _.Zb = function By() { + var a; + return ( + (a = this.f), + BD( + BD( + !a + ? (this.f = JD(this.c, 171) + ? new Sf(this, BD(this.c, 171)) + : JD(this.c, 161) + ? new Mf(this, BD(this.c, 161)) + : new ne(this, this.c)) + : a, + 161 + ), + 171 + ) + ); + }; + _.hc = function Ey() { + return new Hxb(this.b); + }; + _.gd = function Fy() { + return new Hxb(this.b); + }; + _.ec = function Hy() { + var a; + return ( + (a = this.i), + BD( + BD( + !a + ? (this.i = JD(this.c, 171) + ? new $f(this, BD(this.c, 171)) + : JD(this.c, 161) + ? new Yf(this, BD(this.c, 161)) + : new zf(this, this.c)) + : a, + 84 + ), + 271 + ) + ); + }; + _.ac = function Dy() { + return JD(this.c, 171) + ? new Sf(this, BD(this.c, 171)) + : JD(this.c, 161) + ? new Mf(this, BD(this.c, 161)) + : new ne(this, this.c); + }; + _.ic = function Gy(a) { + a == null && this.a.ue(a, a); + return new Hxb(this.b); + }; + var LH = mdb(Zhe, "TreeMultimap", 1659); + bcb(78, 1, { 3: 1, 78: 1 }); + _.Wd = function $y(a) { + return new Error(a); + }; + _.Xd = function az() { + return this.e; + }; + _.Yd = function bz() { + return XAb( + NAb( + Plb((this.k == null && (this.k = KC(_I, nie, 78, 0, 0, 1)), this.k)), + new _fb() + ), + new bBb() + ); + }; + _.Zd = function cz() { + return this.f; + }; + _.$d = function dz() { + return this.g; + }; + _._d = function ez() { + Vy(this, _y(this.Wd(Wy(this, this.g)))); + Sz(this); + }; + _.Ib = function fz() { + return Wy(this, this.$d()); + }; + _.e = Sie; + _.i = false; + _.n = true; + var _I = mdb(Phe, "Throwable", 78); + bcb(102, 78, { 3: 1, 102: 1, 78: 1 }); + var EI = mdb(Phe, "Exception", 102); + bcb(60, 102, Tie, gz, hz); + var TI = mdb(Phe, "RuntimeException", 60); + bcb(598, 60, Tie); + var LI = mdb(Phe, "JsException", 598); + bcb(863, 598, Tie); + var RH = mdb(Uie, "JavaScriptExceptionBase", 863); + bcb(477, 863, { 477: 1, 3: 1, 102: 1, 60: 1, 78: 1 }, lz); + _.$d = function oz() { + kz(this); + return this.c; + }; + _.ae = function pz() { + return PD(this.b) === PD(iz) ? null : this.b; + }; + var iz; + var OH = mdb(Wie, "JavaScriptException", 477); + var PH = mdb(Wie, "JavaScriptObject$", 0); + var tz; + bcb(1948, 1, {}); + var QH = mdb(Wie, "Scheduler", 1948); + var xz = 0, + yz = 0, + zz = -1; + bcb(890, 1948, {}, Nz); + var Jz; + var SH = mdb(Uie, "SchedulerImpl", 890); + var Qz; + bcb(1960, 1, {}); + var WH = mdb(Uie, "StackTraceCreator/Collector", 1960); + bcb(864, 1960, {}, Yz); + _.be = function Zz(a) { + var b = {}, + j; + var c = []; + a[Yie] = c; + var d = arguments.callee.caller; + while (d) { + var e = (Rz(), d.name || (d.name = Uz(d.toString()))); + c.push(e); + var f = ":" + e; + var g = b[f]; + if (g) { + var h, i; + for (h = 0, i = g.length; h < i; h++) { + if (g[h] === d) { + return; + } + } + } + (g || (b[f] = [])).push(d); + d = d.caller; + } + }; + _.ce = function $z(a) { + var b, c, d, e; + d = (Rz(), a && a[Yie] ? a[Yie] : []); + c = d.length; + e = KC(VI, nie, 310, c, 0, 1); + for (b = 0; b < c; b++) { + e[b] = new Zeb(d[b], null, -1); + } + return e; + }; + var TH = mdb(Uie, "StackTraceCreator/CollectorLegacy", 864); + bcb(1961, 1960, {}); + _.be = function aA(a) {}; + _.de = function bA(a, b, c, d) { + return new Zeb(b, a + "@" + d, c < 0 ? -1 : c); + }; + _.ce = function cA(a) { + var b, c, d, e, f, g; + e = Wz(a); + f = KC(VI, nie, 310, 0, 0, 1); + b = 0; + d = e.length; + if (d == 0) { + return f; + } + g = _z(this, e[0]); + dfb(g.d, Xie) || (f[b++] = g); + for (c = 1; c < d; c++) { + f[b++] = _z(this, e[c]); + } + return f; + }; + var VH = mdb(Uie, "StackTraceCreator/CollectorModern", 1961); + bcb(865, 1961, {}, dA); + _.de = function eA(a, b, c, d) { + return new Zeb(b, a, -1); + }; + var UH = mdb(Uie, "StackTraceCreator/CollectorModernNoSourceMap", 865); + bcb(1050, 1, {}); + var cI = mdb(yje, zje, 1050); + bcb(615, 1050, { 615: 1 }, HA); + var FA; + var XH = mdb(Aje, zje, 615); + bcb(2001, 1, {}); + var dI = mdb(yje, Bje, 2001); + bcb(2002, 2001, {}); + var YH = mdb(Aje, Bje, 2002); + bcb(1090, 1, {}, MA); + var JA; + var ZH = mdb(Aje, "LocaleInfo", 1090); + bcb(1918, 1, {}, PA); + _.a = 0; + var _H = mdb(Aje, "TimeZone", 1918); + bcb(1258, 2002, {}, VA); + var aI = mdb( + "com.google.gwt.i18n.client.impl.cldr", + "DateTimeFormatInfoImpl", + 1258 + ); + bcb(434, 1, { 434: 1 }, WA); + _.a = false; + _.b = 0; + var bI = mdb(yje, "DateTimeFormat/PatternPart", 434); + bcb(199, 1, Cje, eB, fB, gB); + _.wd = function hB(a) { + return XA(this, BD(a, 199)); + }; + _.Fb = function iB(a) { + return ( + JD(a, 199) && Bbb(Cbb(this.q.getTime()), Cbb(BD(a, 199).q.getTime())) + ); + }; + _.Hb = function jB() { + var a; + a = Cbb(this.q.getTime()); + return Tbb(Vbb(a, Pbb(a, 32))); + }; + _.Ib = function lB() { + var a, b, c; + c = -this.q.getTimezoneOffset(); + a = (c >= 0 ? "+" : "") + ((c / 60) | 0); + b = kB(Math.abs(c) % 60); + return ( + (Dpb(), Bpb)[this.q.getDay()] + + " " + + Cpb[this.q.getMonth()] + + " " + + kB(this.q.getDate()) + + " " + + kB(this.q.getHours()) + + ":" + + kB(this.q.getMinutes()) + + ":" + + kB(this.q.getSeconds()) + + " GMT" + + a + + b + + " " + + this.q.getFullYear() + ); + }; + var $J = mdb(bie, "Date", 199); + bcb(1915, 199, Cje, nB); + _.a = false; + _.b = 0; + _.c = 0; + _.d = 0; + _.e = 0; + _.f = 0; + _.g = false; + _.i = 0; + _.j = 0; + _.k = 0; + _.n = 0; + _.o = 0; + _.p = 0; + var eI = mdb("com.google.gwt.i18n.shared.impl", "DateRecord", 1915); + bcb(1966, 1, {}); + _.fe = function oB() { + return null; + }; + _.ge = function pB() { + return null; + }; + _.he = function qB() { + return null; + }; + _.ie = function rB() { + return null; + }; + _.je = function sB() { + return null; + }; + var nI = mdb(Dje, "JSONValue", 1966); + bcb(216, 1966, { 216: 1 }, wB, xB); + _.Fb = function yB(a) { + if (!JD(a, 216)) { + return false; + } + return qz(this.a, BD(a, 216).a); + }; + _.ee = function zB() { + return DB; + }; + _.Hb = function AB() { + return rz(this.a); + }; + _.fe = function BB() { + return this; + }; + _.Ib = function CB() { + var a, b, c; + c = new Wfb("["); + for (b = 0, a = this.a.length; b < a; b++) { + b > 0 && ((c.a += ","), c); + Pfb(c, tB(this, b)); + } + c.a += "]"; + return c.a; + }; + var fI = mdb(Dje, "JSONArray", 216); + bcb(483, 1966, { 483: 1 }, HB); + _.ee = function IB() { + return LB; + }; + _.ge = function JB() { + return this; + }; + _.Ib = function KB() { + return Bcb(), "" + this.a; + }; + _.a = false; + var EB, FB; + var gI = mdb(Dje, "JSONBoolean", 483); + bcb(985, 60, Tie, MB); + var hI = mdb(Dje, "JSONException", 985); + bcb(1023, 1966, {}, PB); + _.ee = function QB() { + return SB; + }; + _.Ib = function RB() { + return Xhe; + }; + var NB; + var iI = mdb(Dje, "JSONNull", 1023); + bcb(258, 1966, { 258: 1 }, TB); + _.Fb = function UB(a) { + if (!JD(a, 258)) { + return false; + } + return this.a == BD(a, 258).a; + }; + _.ee = function VB() { + return ZB; + }; + _.Hb = function WB() { + return Hdb(this.a); + }; + _.he = function XB() { + return this; + }; + _.Ib = function YB() { + return this.a + ""; + }; + _.a = 0; + var jI = mdb(Dje, "JSONNumber", 258); + bcb(183, 1966, { 183: 1 }, eC, fC); + _.Fb = function gC(a) { + if (!JD(a, 183)) { + return false; + } + return qz(this.a, BD(a, 183).a); + }; + _.ee = function hC() { + return lC; + }; + _.Hb = function iC() { + return rz(this.a); + }; + _.ie = function jC() { + return this; + }; + _.Ib = function kC() { + var a, b, c, d, e, f, g; + g = new Wfb("{"); + a = true; + f = $B(this, KC(ZI, nie, 2, 0, 6, 1)); + for (c = f, d = 0, e = c.length; d < e; ++d) { + b = c[d]; + a ? (a = false) : ((g.a += She), g); + Qfb(g, vz(b)); + g.a += ":"; + Pfb(g, aC(this, b)); + } + g.a += "}"; + return g.a; + }; + var lI = mdb(Dje, "JSONObject", 183); + bcb(596, eie, fie, mC); + _.Hc = function nC(a) { + return ND(a) && _B(this.a, GD(a)); + }; + _.Kc = function oC() { + return new vib(new amb(this.b)); + }; + _.gc = function pC() { + return this.b.length; + }; + var kI = mdb(Dje, "JSONObject/1", 596); + var qC; + bcb(204, 1966, { 204: 1 }, yC); + _.Fb = function zC(a) { + if (!JD(a, 204)) { + return false; + } + return dfb(this.a, BD(a, 204).a); + }; + _.ee = function AC() { + return EC; + }; + _.Hb = function BC() { + return LCb(this.a); + }; + _.je = function CC() { + return this; + }; + _.Ib = function DC() { + return vz(this.a); + }; + var mI = mdb(Dje, "JSONString", 204); + var QC; + var sD, tD, uD, vD; + bcb(1962, 1, { 525: 1 }); + var pI = mdb(Lje, "OutputStream", 1962); + bcb(1963, 1962, { 525: 1 }); + var oI = mdb(Lje, "FilterOutputStream", 1963); + bcb(866, 1963, { 525: 1 }, jcb); + var qI = mdb(Lje, "PrintStream", 866); + bcb(418, 1, { 475: 1 }); + _.Ib = function ncb() { + return this.a; + }; + var rI = mdb(Phe, "AbstractStringBuilder", 418); + bcb(529, 60, Tie, ocb); + var sI = mdb(Phe, "ArithmeticException", 529); + bcb(73, 60, Mje, pcb, qcb); + var II = mdb(Phe, "IndexOutOfBoundsException", 73); + bcb(320, 73, { 3: 1, 320: 1, 102: 1, 73: 1, 60: 1, 78: 1 }, rcb, scb); + var tI = mdb(Phe, "ArrayIndexOutOfBoundsException", 320); + bcb(528, 60, Tie, tcb, ucb); + var uI = mdb(Phe, "ArrayStoreException", 528); + bcb(289, 78, Nje, vcb); + var DI = mdb(Phe, "Error", 289); + bcb(194, 289, Nje, xcb, ycb); + var vI = mdb(Phe, "AssertionError", 194); + xD = { 3: 1, 476: 1, 35: 1 }; + var zcb, Acb; + var wI = mdb(Phe, "Boolean", 476); + bcb(236, 1, { 3: 1, 236: 1 }); + var Gcb; + var RI = mdb(Phe, "Number", 236); + bcb(217, 236, { 3: 1, 217: 1, 35: 1, 236: 1 }, Mcb); + _.wd = function Ncb(a) { + return Lcb(this, BD(a, 217)); + }; + _.ke = function Ocb() { + return this.a; + }; + _.Fb = function Pcb(a) { + return JD(a, 217) && BD(a, 217).a == this.a; + }; + _.Hb = function Qcb() { + return this.a; + }; + _.Ib = function Rcb() { + return "" + this.a; + }; + _.a = 0; + var xI = mdb(Phe, "Byte", 217); + var Tcb; + bcb(172, 1, { 3: 1, 172: 1, 35: 1 }, Xcb); + _.wd = function Ycb(a) { + return Wcb(this, BD(a, 172)); + }; + _.Fb = function $cb(a) { + return JD(a, 172) && BD(a, 172).a == this.a; + }; + _.Hb = function _cb() { + return this.a; + }; + _.Ib = function adb() { + return String.fromCharCode(this.a); + }; + _.a = 0; + var Vcb; + var yI = mdb(Phe, "Character", 172); + var cdb; + bcb(205, 60, { 3: 1, 205: 1, 102: 1, 60: 1, 78: 1 }, Bdb, Cdb); + var zI = mdb(Phe, "ClassCastException", 205); + yD = { 3: 1, 35: 1, 333: 1, 236: 1 }; + var BI = mdb(Phe, "Double", 333); + bcb(155, 236, { 3: 1, 35: 1, 155: 1, 236: 1 }, Ndb, Odb); + _.wd = function Pdb(a) { + return Mdb(this, BD(a, 155)); + }; + _.ke = function Qdb() { + return this.a; + }; + _.Fb = function Rdb(a) { + return JD(a, 155) && Fdb(this.a, BD(a, 155).a); + }; + _.Hb = function Sdb() { + return QD(this.a); + }; + _.Ib = function Udb() { + return "" + this.a; + }; + _.a = 0; + var FI = mdb(Phe, "Float", 155); + bcb(32, 60, { 3: 1, 102: 1, 32: 1, 60: 1, 78: 1 }, Vdb, Wdb, Xdb); + var GI = mdb(Phe, "IllegalArgumentException", 32); + bcb(71, 60, Tie, Ydb, Zdb); + var HI = mdb(Phe, "IllegalStateException", 71); + bcb(19, 236, { 3: 1, 35: 1, 19: 1, 236: 1 }, _db); + _.wd = function ceb(a) { + return $db(this, BD(a, 19)); + }; + _.ke = function deb() { + return this.a; + }; + _.Fb = function eeb(a) { + return JD(a, 19) && BD(a, 19).a == this.a; + }; + _.Hb = function feb() { + return this.a; + }; + _.Ib = function leb() { + return "" + this.a; + }; + _.a = 0; + var JI = mdb(Phe, "Integer", 19); + var neb; + var peb; + bcb(162, 236, { 3: 1, 35: 1, 162: 1, 236: 1 }, teb); + _.wd = function veb(a) { + return seb(this, BD(a, 162)); + }; + _.ke = function web() { + return Sbb(this.a); + }; + _.Fb = function xeb(a) { + return JD(a, 162) && Bbb(BD(a, 162).a, this.a); + }; + _.Hb = function yeb() { + return Tbb(this.a); + }; + _.Ib = function zeb() { + return "" + Ubb(this.a); + }; + _.a = 0; + var MI = mdb(Phe, "Long", 162); + var Beb; + bcb(2039, 1, {}); + bcb(1831, 60, Tie, Feb); + var NI = mdb(Phe, "NegativeArraySizeException", 1831); + bcb(173, 598, { 3: 1, 102: 1, 173: 1, 60: 1, 78: 1 }, Geb, Heb); + _.Wd = function Ieb(a) { + return new TypeError(a); + }; + var OI = mdb(Phe, "NullPointerException", 173); + var Jeb, Keb, Leb, Meb; + bcb(127, 32, { 3: 1, 102: 1, 32: 1, 127: 1, 60: 1, 78: 1 }, Oeb); + var QI = mdb(Phe, "NumberFormatException", 127); + bcb(184, 236, { 3: 1, 35: 1, 236: 1, 184: 1 }, Qeb); + _.wd = function Reb(a) { + return Peb(this, BD(a, 184)); + }; + _.ke = function Seb() { + return this.a; + }; + _.Fb = function Teb(a) { + return JD(a, 184) && BD(a, 184).a == this.a; + }; + _.Hb = function Ueb() { + return this.a; + }; + _.Ib = function Veb() { + return "" + this.a; + }; + _.a = 0; + var UI = mdb(Phe, "Short", 184); + var Xeb; + bcb(310, 1, { 3: 1, 310: 1 }, Zeb); + _.Fb = function $eb(a) { + var b; + if (JD(a, 310)) { + b = BD(a, 310); + return this.c == b.c && this.d == b.d && this.a == b.a && this.b == b.b; + } + return false; + }; + _.Hb = function _eb() { + return Hlb( + OC(GC(SI, 1), Uhe, 1, 5, [meb(this.c), this.a, this.d, this.b]) + ); + }; + _.Ib = function afb() { + return ( + this.a + + "." + + this.d + + "(" + + (this.b != null ? this.b : "Unknown Source") + + (this.c >= 0 ? ":" + this.c : "") + + ")" + ); + }; + _.c = 0; + var VI = mdb(Phe, "StackTraceElement", 310); + zD = { 3: 1, 475: 1, 35: 1, 2: 1 }; + var ZI = mdb(Phe, Vie, 2); + bcb(107, 418, { 475: 1 }, Hfb, Ifb, Jfb); + var WI = mdb(Phe, "StringBuffer", 107); + bcb(100, 418, { 475: 1 }, Ufb, Vfb, Wfb); + var XI = mdb(Phe, "StringBuilder", 100); + bcb(687, 73, Mje, Xfb); + var YI = mdb(Phe, "StringIndexOutOfBoundsException", 687); + bcb(2043, 1, {}); + var Yfb; + bcb(844, 1, {}, _fb); + _.Kb = function agb(a) { + return BD(a, 78).e; + }; + var $I = mdb(Phe, "Throwable/lambda$0$Type", 844); + bcb(41, 60, { 3: 1, 102: 1, 60: 1, 78: 1, 41: 1 }, bgb, cgb); + var aJ = mdb(Phe, "UnsupportedOperationException", 41); + bcb(240, 236, { 3: 1, 35: 1, 236: 1, 240: 1 }, sgb, tgb); + _.wd = function wgb(a) { + return mgb(this, BD(a, 240)); + }; + _.ke = function xgb() { + return Hcb(rgb(this)); + }; + _.Fb = function ygb(a) { + var b; + if (this === a) { + return true; + } + if (JD(a, 240)) { + b = BD(a, 240); + return this.e == b.e && mgb(this, b) == 0; + } + return false; + }; + _.Hb = function zgb() { + var a; + if (this.b != 0) { + return this.b; + } + if (this.a < 54) { + a = Cbb(this.f); + this.b = Tbb(xbb(a, -1)); + this.b = 33 * this.b + Tbb(xbb(Obb(a, 32), -1)); + this.b = 17 * this.b + QD(this.e); + return this.b; + } + this.b = 17 * Ngb(this.c) + QD(this.e); + return this.b; + }; + _.Ib = function Agb() { + return rgb(this); + }; + _.a = 0; + _.b = 0; + _.d = 0; + _.e = 0; + _.f = 0; + var dgb, egb, fgb, ggb, hgb, igb, jgb, kgb; + var bJ = mdb("java.math", "BigDecimal", 240); + bcb(91, 236, { 3: 1, 35: 1, 236: 1, 91: 1 }, Tgb, Ugb, Vgb, Wgb, Xgb, Ygb); + _.wd = function $gb(a) { + return Igb(this, BD(a, 91)); + }; + _.ke = function _gb() { + return Hcb(shb(this, 0)); + }; + _.Fb = function ahb(a) { + return Kgb(this, a); + }; + _.Hb = function chb() { + return Ngb(this); + }; + _.Ib = function ehb() { + return shb(this, 0); + }; + _.b = -2; + _.c = 0; + _.d = 0; + _.e = 0; + var Bgb, Cgb, Dgb, Egb, Fgb, Ggb; + var cJ = mdb("java.math", "BigInteger", 91); + var nhb, ohb; + var Bhb, Chb; + bcb(488, 1967, cie); + _.$b = function Xhb() { + Uhb(this); + }; + _._b = function Yhb(a) { + return Mhb(this, a); + }; + _.uc = function Zhb(a) { + return Nhb(this, a, this.g) || Nhb(this, a, this.f); + }; + _.vc = function $hb() { + return new eib(this); + }; + _.xc = function _hb(a) { + return Ohb(this, a); + }; + _.zc = function aib(a, b) { + return Rhb(this, a, b); + }; + _.Bc = function bib(a) { + return Thb(this, a); + }; + _.gc = function cib() { + return Vhb(this); + }; + var gJ = mdb(bie, "AbstractHashMap", 488); + bcb(261, eie, fie, eib); + _.$b = function fib() { + this.a.$b(); + }; + _.Hc = function gib(a) { + return dib(this, a); + }; + _.Kc = function hib() { + return new nib(this.a); + }; + _.Mc = function iib(a) { + var b; + if (dib(this, a)) { + b = BD(a, 42).cd(); + this.a.Bc(b); + return true; + } + return false; + }; + _.gc = function jib() { + return this.a.gc(); + }; + var fJ = mdb(bie, "AbstractHashMap/EntrySet", 261); + bcb(262, 1, aie, nib); + _.Nb = function oib(a) { + Rrb(this, a); + }; + _.Pb = function qib() { + return lib(this); + }; + _.Ob = function pib() { + return this.b; + }; + _.Qb = function rib() { + mib(this); + }; + _.b = false; + var eJ = mdb(bie, "AbstractHashMap/EntrySetIterator", 262); + bcb(417, 1, aie, vib); + _.Nb = function wib(a) { + Rrb(this, a); + }; + _.Ob = function xib() { + return sib(this); + }; + _.Pb = function yib() { + return tib(this); + }; + _.Qb = function zib() { + uib(this); + }; + _.b = 0; + _.c = -1; + var hJ = mdb(bie, "AbstractList/IteratorImpl", 417); + bcb(96, 417, jie, Bib); + _.Qb = function Hib() { + uib(this); + }; + _.Rb = function Cib(a) { + Aib(this, a); + }; + _.Sb = function Dib() { + return this.b > 0; + }; + _.Tb = function Eib() { + return this.b; + }; + _.Ub = function Fib() { + return sCb(this.b > 0), this.a.Xb((this.c = --this.b)); + }; + _.Vb = function Gib() { + return this.b - 1; + }; + _.Wb = function Iib(a) { + yCb(this.c != -1); + this.a._c(this.c, a); + }; + var iJ = mdb(bie, "AbstractList/ListIteratorImpl", 96); + bcb(219, 52, Lie, Jib); + _.Vc = function Kib(a, b) { + wCb(a, this.b); + this.c.Vc(this.a + a, b); + ++this.b; + }; + _.Xb = function Lib(a) { + tCb(a, this.b); + return this.c.Xb(this.a + a); + }; + _.$c = function Mib(a) { + var b; + tCb(a, this.b); + b = this.c.$c(this.a + a); + --this.b; + return b; + }; + _._c = function Nib(a, b) { + tCb(a, this.b); + return this.c._c(this.a + a, b); + }; + _.gc = function Oib() { + return this.b; + }; + _.a = 0; + _.b = 0; + var jJ = mdb(bie, "AbstractList/SubList", 219); + bcb(384, eie, fie, Pib); + _.$b = function Qib() { + this.a.$b(); + }; + _.Hc = function Rib(a) { + return this.a._b(a); + }; + _.Kc = function Sib() { + var a; + return (a = this.a.vc().Kc()), new Vib(a); + }; + _.Mc = function Tib(a) { + if (this.a._b(a)) { + this.a.Bc(a); + return true; + } + return false; + }; + _.gc = function Uib() { + return this.a.gc(); + }; + var mJ = mdb(bie, "AbstractMap/1", 384); + bcb(691, 1, aie, Vib); + _.Nb = function Wib(a) { + Rrb(this, a); + }; + _.Ob = function Xib() { + return this.a.Ob(); + }; + _.Pb = function Yib() { + var a; + return (a = BD(this.a.Pb(), 42)), a.cd(); + }; + _.Qb = function Zib() { + this.a.Qb(); + }; + var lJ = mdb(bie, "AbstractMap/1/1", 691); + bcb(226, 28, die, $ib); + _.$b = function _ib() { + this.a.$b(); + }; + _.Hc = function ajb(a) { + return this.a.uc(a); + }; + _.Kc = function bjb() { + var a; + return (a = this.a.vc().Kc()), new djb(a); + }; + _.gc = function cjb() { + return this.a.gc(); + }; + var oJ = mdb(bie, "AbstractMap/2", 226); + bcb(294, 1, aie, djb); + _.Nb = function ejb(a) { + Rrb(this, a); + }; + _.Ob = function fjb() { + return this.a.Ob(); + }; + _.Pb = function gjb() { + var a; + return (a = BD(this.a.Pb(), 42)), a.dd(); + }; + _.Qb = function hjb() { + this.a.Qb(); + }; + var nJ = mdb(bie, "AbstractMap/2/1", 294); + bcb(484, 1, { 484: 1, 42: 1 }); + _.Fb = function jjb(a) { + var b; + if (!JD(a, 42)) { + return false; + } + b = BD(a, 42); + return wtb(this.d, b.cd()) && wtb(this.e, b.dd()); + }; + _.cd = function kjb() { + return this.d; + }; + _.dd = function ljb() { + return this.e; + }; + _.Hb = function mjb() { + return xtb(this.d) ^ xtb(this.e); + }; + _.ed = function njb(a) { + return ijb(this, a); + }; + _.Ib = function ojb() { + return this.d + "=" + this.e; + }; + var pJ = mdb(bie, "AbstractMap/AbstractEntry", 484); + bcb(383, 484, { 484: 1, 383: 1, 42: 1 }, pjb); + var qJ = mdb(bie, "AbstractMap/SimpleEntry", 383); + bcb(1984, 1, _je); + _.Fb = function qjb(a) { + var b; + if (!JD(a, 42)) { + return false; + } + b = BD(a, 42); + return wtb(this.cd(), b.cd()) && wtb(this.dd(), b.dd()); + }; + _.Hb = function rjb() { + return xtb(this.cd()) ^ xtb(this.dd()); + }; + _.Ib = function sjb() { + return this.cd() + "=" + this.dd(); + }; + var rJ = mdb(bie, lie, 1984); + bcb(1992, 1967, gie); + _.tc = function vjb(a) { + return tjb(this, a); + }; + _._b = function wjb(a) { + return ujb(this, a); + }; + _.vc = function xjb() { + return new Bjb(this); + }; + _.xc = function yjb(a) { + var b; + b = a; + return Wd(Awb(this, b)); + }; + _.ec = function Ajb() { + return new Gjb(this); + }; + var wJ = mdb(bie, "AbstractNavigableMap", 1992); + bcb(739, eie, fie, Bjb); + _.Hc = function Cjb(a) { + return JD(a, 42) && tjb(this.b, BD(a, 42)); + }; + _.Kc = function Djb() { + return new Ywb(this.b); + }; + _.Mc = function Ejb(a) { + var b; + if (JD(a, 42)) { + b = BD(a, 42); + return Kwb(this.b, b); + } + return false; + }; + _.gc = function Fjb() { + return this.b.c; + }; + var tJ = mdb(bie, "AbstractNavigableMap/EntrySet", 739); + bcb(493, eie, iie, Gjb); + _.Nc = function Mjb() { + return new Rub(this); + }; + _.$b = function Hjb() { + zwb(this.a); + }; + _.Hc = function Ijb(a) { + return ujb(this.a, a); + }; + _.Kc = function Jjb() { + var a; + return (a = new Ywb(new cxb(this.a).b)), new Njb(a); + }; + _.Mc = function Kjb(a) { + if (ujb(this.a, a)) { + Jwb(this.a, a); + return true; + } + return false; + }; + _.gc = function Ljb() { + return this.a.c; + }; + var vJ = mdb(bie, "AbstractNavigableMap/NavigableKeySet", 493); + bcb(494, 1, aie, Njb); + _.Nb = function Ojb(a) { + Rrb(this, a); + }; + _.Ob = function Pjb() { + return sib(this.a.a); + }; + _.Pb = function Qjb() { + var a; + return (a = Wwb(this.a)), a.cd(); + }; + _.Qb = function Rjb() { + Xwb(this.a); + }; + var uJ = mdb(bie, "AbstractNavigableMap/NavigableKeySet/1", 494); + bcb(2004, 28, die); + _.Fc = function Sjb(a) { + return zCb(cub(this, a)), true; + }; + _.Gc = function Tjb(a) { + uCb(a); + mCb(a != this, "Can't add a queue to itself"); + return ye(this, a); + }; + _.$b = function Ujb() { + while (dub(this) != null); + }; + var xJ = mdb(bie, "AbstractQueue", 2004); + bcb(302, 28, { 4: 1, 20: 1, 28: 1, 14: 1 }, jkb, kkb); + _.Fc = function lkb(a) { + return Xjb(this, a), true; + }; + _.$b = function nkb() { + Yjb(this); + }; + _.Hc = function okb(a) { + return Zjb(new xkb(this), a); + }; + _.dc = function pkb() { + return akb(this); + }; + _.Kc = function qkb() { + return new xkb(this); + }; + _.Mc = function rkb(a) { + return dkb(new xkb(this), a); + }; + _.gc = function skb() { + return (this.c - this.b) & (this.a.length - 1); + }; + _.Nc = function tkb() { + return new Kub(this, 272); + }; + _.Qc = function ukb(a) { + var b; + b = (this.c - this.b) & (this.a.length - 1); + a.length < b && (a = eCb(new Array(b), a)); + $jb(this, a, b); + a.length > b && NC(a, b, null); + return a; + }; + _.b = 0; + _.c = 0; + var BJ = mdb(bie, "ArrayDeque", 302); + bcb(446, 1, aie, xkb); + _.Nb = function ykb(a) { + Rrb(this, a); + }; + _.Ob = function zkb() { + return this.a != this.b; + }; + _.Pb = function Akb() { + return vkb(this); + }; + _.Qb = function Bkb() { + wkb(this); + }; + _.a = 0; + _.b = 0; + _.c = -1; + var AJ = mdb(bie, "ArrayDeque/IteratorImpl", 446); + bcb(12, 52, ake, Rkb, Skb, Tkb); + _.Vc = function Ukb(a, b) { + Dkb(this, a, b); + }; + _.Fc = function Vkb(a) { + return Ekb(this, a); + }; + _.Wc = function Wkb(a, b) { + return Fkb(this, a, b); + }; + _.Gc = function Xkb(a) { + return Gkb(this, a); + }; + _.$b = function Ykb() { + this.c = KC(SI, Uhe, 1, 0, 5, 1); + }; + _.Hc = function Zkb(a) { + return Jkb(this, a, 0) != -1; + }; + _.Jc = function $kb(a) { + Hkb(this, a); + }; + _.Xb = function _kb(a) { + return Ikb(this, a); + }; + _.Xc = function alb(a) { + return Jkb(this, a, 0); + }; + _.dc = function blb() { + return this.c.length == 0; + }; + _.Kc = function clb() { + return new olb(this); + }; + _.$c = function dlb(a) { + return Kkb(this, a); + }; + _.Mc = function elb(a) { + return Lkb(this, a); + }; + _.Ud = function flb(a, b) { + Mkb(this, a, b); + }; + _._c = function glb(a, b) { + return Nkb(this, a, b); + }; + _.gc = function hlb() { + return this.c.length; + }; + _.ad = function ilb(a) { + Okb(this, a); + }; + _.Pc = function jlb() { + return Pkb(this); + }; + _.Qc = function klb(a) { + return Qkb(this, a); + }; + var DJ = mdb(bie, "ArrayList", 12); + bcb(7, 1, aie, olb); + _.Nb = function plb(a) { + Rrb(this, a); + }; + _.Ob = function qlb() { + return llb(this); + }; + _.Pb = function rlb() { + return mlb(this); + }; + _.Qb = function slb() { + nlb(this); + }; + _.a = 0; + _.b = -1; + var CJ = mdb(bie, "ArrayList/1", 7); + bcb(2013, Function, {}, Ylb); + _.te = function Zlb(a, b) { + return Kdb(a, b); + }; + bcb(154, 52, bke, amb); + _.Hc = function bmb(a) { + return Bt(this, a) != -1; + }; + _.Jc = function cmb(a) { + var b, c, d, e; + uCb(a); + for (c = this.a, d = 0, e = c.length; d < e; ++d) { + b = c[d]; + a.td(b); + } + }; + _.Xb = function dmb(a) { + return $lb(this, a); + }; + _._c = function emb(a, b) { + var c; + c = (tCb(a, this.a.length), this.a[a]); + NC(this.a, a, b); + return c; + }; + _.gc = function fmb() { + return this.a.length; + }; + _.ad = function gmb(a) { + Mlb(this.a, this.a.length, a); + }; + _.Pc = function hmb() { + return _lb(this, KC(SI, Uhe, 1, this.a.length, 5, 1)); + }; + _.Qc = function imb(a) { + return _lb(this, a); + }; + var EJ = mdb(bie, "Arrays/ArrayList", 154); + var jmb, kmb, lmb; + bcb(940, 52, bke, xmb); + _.Hc = function ymb(a) { + return false; + }; + _.Xb = function zmb(a) { + return wmb(a); + }; + _.Kc = function Amb() { + return mmb(), Emb(), Dmb; + }; + _.Yc = function Bmb() { + return mmb(), Emb(), Dmb; + }; + _.gc = function Cmb() { + return 0; + }; + var GJ = mdb(bie, "Collections/EmptyList", 940); + bcb(941, 1, jie, Fmb); + _.Nb = function Hmb(a) { + Rrb(this, a); + }; + _.Rb = function Gmb(a) { + throw vbb(new bgb()); + }; + _.Ob = function Imb() { + return false; + }; + _.Sb = function Jmb() { + return false; + }; + _.Pb = function Kmb() { + throw vbb(new utb()); + }; + _.Tb = function Lmb() { + return 0; + }; + _.Ub = function Mmb() { + throw vbb(new utb()); + }; + _.Vb = function Nmb() { + return -1; + }; + _.Qb = function Omb() { + throw vbb(new Ydb()); + }; + _.Wb = function Pmb(a) { + throw vbb(new Ydb()); + }; + var Dmb; + var FJ = mdb(bie, "Collections/EmptyListIterator", 941); + bcb(943, 1967, Aie, Qmb); + _._b = function Rmb(a) { + return false; + }; + _.uc = function Smb(a) { + return false; + }; + _.vc = function Tmb() { + return mmb(), lmb; + }; + _.xc = function Umb(a) { + return null; + }; + _.ec = function Vmb() { + return mmb(), lmb; + }; + _.gc = function Wmb() { + return 0; + }; + _.Cc = function Xmb() { + return mmb(), jmb; + }; + var HJ = mdb(bie, "Collections/EmptyMap", 943); + bcb(942, eie, Cie, Ymb); + _.Hc = function Zmb(a) { + return false; + }; + _.Kc = function $mb() { + return mmb(), Emb(), Dmb; + }; + _.gc = function _mb() { + return 0; + }; + var IJ = mdb(bie, "Collections/EmptySet", 942); + bcb(599, 52, { 3: 1, 20: 1, 28: 1, 52: 1, 14: 1, 15: 1 }, anb); + _.Hc = function bnb(a) { + return wtb(this.a, a); + }; + _.Xb = function cnb(a) { + tCb(a, 1); + return this.a; + }; + _.gc = function dnb() { + return 1; + }; + var JJ = mdb(bie, "Collections/SingletonList", 599); + bcb(372, 1, wie, lnb); + _.Jc = function rnb(a) { + reb(this, a); + }; + _.Lc = function unb() { + return new YAb(null, this.Nc()); + }; + _.Nc = function xnb() { + return new Kub(this, 0); + }; + _.Oc = function ynb() { + return new YAb(null, this.Nc()); + }; + _.Fc = function mnb(a) { + return enb(); + }; + _.Gc = function nnb(a) { + return fnb(); + }; + _.$b = function onb() { + gnb(); + }; + _.Hc = function pnb(a) { + return hnb(this, a); + }; + _.Ic = function qnb(a) { + return inb(this, a); + }; + _.dc = function snb() { + return this.b.dc(); + }; + _.Kc = function tnb() { + return new Dnb(this.b.Kc()); + }; + _.Mc = function vnb(a) { + return jnb(); + }; + _.gc = function wnb() { + return this.b.gc(); + }; + _.Pc = function znb() { + return this.b.Pc(); + }; + _.Qc = function Anb(a) { + return knb(this, a); + }; + _.Ib = function Bnb() { + return fcb(this.b); + }; + var LJ = mdb(bie, "Collections/UnmodifiableCollection", 372); + bcb(371, 1, aie, Dnb); + _.Nb = function Enb(a) { + Rrb(this, a); + }; + _.Ob = function Fnb() { + return this.b.Ob(); + }; + _.Pb = function Gnb() { + return this.b.Pb(); + }; + _.Qb = function Hnb() { + Cnb(); + }; + var KJ = mdb(bie, "Collections/UnmodifiableCollectionIterator", 371); + bcb(531, 372, cke, Inb); + _.Nc = function Vnb() { + return new Kub(this, 16); + }; + _.Vc = function Jnb(a, b) { + throw vbb(new bgb()); + }; + _.Wc = function Knb(a, b) { + throw vbb(new bgb()); + }; + _.Fb = function Lnb(a) { + return pb(this.a, a); + }; + _.Xb = function Mnb(a) { + return this.a.Xb(a); + }; + _.Hb = function Nnb() { + return tb(this.a); + }; + _.Xc = function Onb(a) { + return this.a.Xc(a); + }; + _.dc = function Pnb() { + return this.a.dc(); + }; + _.Yc = function Qnb() { + return new Xnb(this.a.Zc(0)); + }; + _.Zc = function Rnb(a) { + return new Xnb(this.a.Zc(a)); + }; + _.$c = function Snb(a) { + throw vbb(new bgb()); + }; + _._c = function Tnb(a, b) { + throw vbb(new bgb()); + }; + _.ad = function Unb(a) { + throw vbb(new bgb()); + }; + _.bd = function Wnb(a, b) { + return new Inb(this.a.bd(a, b)); + }; + var NJ = mdb(bie, "Collections/UnmodifiableList", 531); + bcb(690, 371, jie, Xnb); + _.Qb = function bob() { + Cnb(); + }; + _.Rb = function Ynb(a) { + throw vbb(new bgb()); + }; + _.Sb = function Znb() { + return this.a.Sb(); + }; + _.Tb = function $nb() { + return this.a.Tb(); + }; + _.Ub = function _nb() { + return this.a.Ub(); + }; + _.Vb = function aob() { + return this.a.Vb(); + }; + _.Wb = function cob(a) { + throw vbb(new bgb()); + }; + var MJ = mdb(bie, "Collections/UnmodifiableListIterator", 690); + bcb(600, 1, cie, iob); + _.wc = function oob(a) { + stb(this, a); + }; + _.yc = function tob(a, b, c) { + return ttb(this, a, b, c); + }; + _.$b = function job() { + throw vbb(new bgb()); + }; + _._b = function kob(a) { + return this.c._b(a); + }; + _.uc = function lob(a) { + return dob(this, a); + }; + _.vc = function mob() { + return eob(this); + }; + _.Fb = function nob(a) { + return fob(this, a); + }; + _.xc = function pob(a) { + return this.c.xc(a); + }; + _.Hb = function qob() { + return tb(this.c); + }; + _.dc = function rob() { + return this.c.dc(); + }; + _.ec = function sob() { + return gob(this); + }; + _.zc = function uob(a, b) { + throw vbb(new bgb()); + }; + _.Bc = function vob(a) { + throw vbb(new bgb()); + }; + _.gc = function wob() { + return this.c.gc(); + }; + _.Ib = function xob() { + return fcb(this.c); + }; + _.Cc = function yob() { + return hob(this); + }; + var RJ = mdb(bie, "Collections/UnmodifiableMap", 600); + bcb(382, 372, Bie, zob); + _.Nc = function Cob() { + return new Kub(this, 1); + }; + _.Fb = function Aob(a) { + return pb(this.b, a); + }; + _.Hb = function Bob() { + return tb(this.b); + }; + var TJ = mdb(bie, "Collections/UnmodifiableSet", 382); + bcb(944, 382, Bie, Gob); + _.Hc = function Hob(a) { + return Dob(this, a); + }; + _.Ic = function Iob(a) { + return this.b.Ic(a); + }; + _.Kc = function Job() { + var a; + a = this.b.Kc(); + return new Mob(a); + }; + _.Pc = function Kob() { + var a; + a = this.b.Pc(); + Fob(a, a.length); + return a; + }; + _.Qc = function Lob(a) { + return Eob(this, a); + }; + var QJ = mdb(bie, "Collections/UnmodifiableMap/UnmodifiableEntrySet", 944); + bcb(945, 1, aie, Mob); + _.Nb = function Nob(a) { + Rrb(this, a); + }; + _.Pb = function Pob() { + return new Rob(BD(this.a.Pb(), 42)); + }; + _.Ob = function Oob() { + return this.a.Ob(); + }; + _.Qb = function Qob() { + throw vbb(new bgb()); + }; + var OJ = mdb( + bie, + "Collections/UnmodifiableMap/UnmodifiableEntrySet/1", + 945 + ); + bcb(688, 1, _je, Rob); + _.Fb = function Sob(a) { + return this.a.Fb(a); + }; + _.cd = function Tob() { + return this.a.cd(); + }; + _.dd = function Uob() { + return this.a.dd(); + }; + _.Hb = function Vob() { + return this.a.Hb(); + }; + _.ed = function Wob(a) { + throw vbb(new bgb()); + }; + _.Ib = function Xob() { + return fcb(this.a); + }; + var PJ = mdb( + bie, + "Collections/UnmodifiableMap/UnmodifiableEntrySet/UnmodifiableEntry", + 688 + ); + bcb(601, 531, { 20: 1, 14: 1, 15: 1, 54: 1 }, Yob); + var SJ = mdb(bie, "Collections/UnmodifiableRandomAccessList", 601); + bcb(689, 382, Die, Zob); + _.Nc = function apb() { + return new Rub(this); + }; + _.Fb = function $ob(a) { + return pb(this.a, a); + }; + _.Hb = function _ob() { + return tb(this.a); + }; + var UJ = mdb(bie, "Collections/UnmodifiableSortedSet", 689); + bcb(847, 1, dke, bpb); + _.ue = function cpb(a, b) { + var c; + return ( + (c = Ucc(BD(a, 11), BD(b, 11))), c != 0 ? c : Wcc(BD(a, 11), BD(b, 11)) + ); + }; + _.Fb = function dpb(a) { + return this === a; + }; + _.ve = function epb() { + return new tpb(this); + }; + var VJ = mdb(bie, "Comparator/lambda$0$Type", 847); + var fpb, gpb, hpb; + bcb(751, 1, dke, kpb); + _.ue = function lpb(a, b) { + return jpb(BD(a, 35), BD(b, 35)); + }; + _.Fb = function mpb(a) { + return this === a; + }; + _.ve = function npb() { + return ipb(), hpb; + }; + var WJ = mdb(bie, "Comparators/NaturalOrderComparator", 751); + bcb(1177, 1, dke, ppb); + _.ue = function qpb(a, b) { + return opb(BD(a, 35), BD(b, 35)); + }; + _.Fb = function rpb(a) { + return this === a; + }; + _.ve = function spb() { + return ipb(), gpb; + }; + var XJ = mdb(bie, "Comparators/ReverseNaturalOrderComparator", 1177); + bcb(64, 1, dke, tpb); + _.Fb = function vpb(a) { + return this === a; + }; + _.ue = function upb(a, b) { + return this.a.ue(b, a); + }; + _.ve = function wpb() { + return this.a; + }; + var YJ = mdb(bie, "Comparators/ReversedComparator", 64); + bcb(166, 60, Tie, Apb); + var ZJ = mdb(bie, "ConcurrentModificationException", 166); + var Bpb, Cpb; + bcb(1904, 1, eke, Gpb); + _.we = function Hpb(a) { + Epb(this, a); + }; + _.Ib = function Ipb() { + return ( + "DoubleSummaryStatistics[count = " + + Ubb(this.a) + + ", avg = " + + (Dbb(this.a, 0) ? Fpb(this) / Sbb(this.a) : 0) + + ", min = " + + this.c + + ", max = " + + this.b + + ", sum = " + + Fpb(this) + + "]" + ); + }; + _.a = 0; + _.b = Qje; + _.c = Pje; + _.d = 0; + _.e = 0; + _.f = 0; + var _J = mdb(bie, "DoubleSummaryStatistics", 1904); + bcb(1805, 60, Tie, Jpb); + var aK = mdb(bie, "EmptyStackException", 1805); + bcb(451, 1967, cie, Rpb); + _.zc = function Xpb(a, b) { + return Opb(this, a, b); + }; + _.$b = function Spb() { + Kpb(this); + }; + _._b = function Tpb(a) { + return Lpb(this, a); + }; + _.uc = function Upb(a) { + var b, c; + for (c = new Gqb(this.a); c.a < c.c.a.length; ) { + b = Fqb(c); + if (wtb(a, this.b[b.g])) { + return true; + } + } + return false; + }; + _.vc = function Vpb() { + return new _pb(this); + }; + _.xc = function Wpb(a) { + return Mpb(this, a); + }; + _.Bc = function Ypb(a) { + return Ppb(this, a); + }; + _.gc = function Zpb() { + return this.a.c; + }; + var eK = mdb(bie, "EnumMap", 451); + bcb(1352, eie, fie, _pb); + _.$b = function aqb() { + Kpb(this.a); + }; + _.Hc = function bqb(a) { + return $pb(this, a); + }; + _.Kc = function cqb() { + return new fqb(this.a); + }; + _.Mc = function dqb(a) { + var b; + if ($pb(this, a)) { + b = BD(a, 42).cd(); + Ppb(this.a, b); + return true; + } + return false; + }; + _.gc = function eqb() { + return this.a.a.c; + }; + var cK = mdb(bie, "EnumMap/EntrySet", 1352); + bcb(1353, 1, aie, fqb); + _.Nb = function gqb(a) { + Rrb(this, a); + }; + _.Pb = function iqb() { + return (this.b = Fqb(this.a)), new kqb(this.c, this.b); + }; + _.Ob = function hqb() { + return Eqb(this.a); + }; + _.Qb = function jqb() { + yCb(!!this.b); + Ppb(this.c, this.b); + this.b = null; + }; + var bK = mdb(bie, "EnumMap/EntrySetIterator", 1353); + bcb(1354, 1984, _je, kqb); + _.cd = function lqb() { + return this.a; + }; + _.dd = function mqb() { + return this.b.b[this.a.g]; + }; + _.ed = function nqb(a) { + return Qpb(this.b, this.a.g, a); + }; + var dK = mdb(bie, "EnumMap/MapEntry", 1354); + bcb(174, eie, { 20: 1, 28: 1, 14: 1, 174: 1, 21: 1 }); + var hK = mdb(bie, "EnumSet", 174); + bcb(156, 174, { 20: 1, 28: 1, 14: 1, 174: 1, 156: 1, 21: 1 }, xqb); + _.Fc = function yqb(a) { + return rqb(this, BD(a, 22)); + }; + _.Hc = function zqb(a) { + return tqb(this, a); + }; + _.Kc = function Aqb() { + return new Gqb(this); + }; + _.Mc = function Bqb(a) { + return vqb(this, a); + }; + _.gc = function Cqb() { + return this.c; + }; + _.c = 0; + var gK = mdb(bie, "EnumSet/EnumSetImpl", 156); + bcb(343, 1, aie, Gqb); + _.Nb = function Hqb(a) { + Rrb(this, a); + }; + _.Pb = function Jqb() { + return Fqb(this); + }; + _.Ob = function Iqb() { + return Eqb(this); + }; + _.Qb = function Kqb() { + yCb(this.b != -1); + NC(this.c.b, this.b, null); + --this.c.c; + this.b = -1; + }; + _.a = -1; + _.b = -1; + var fK = mdb(bie, "EnumSet/EnumSetImpl/IteratorImpl", 343); + bcb(43, 488, fke, Lqb, Mqb, Nqb); + _.re = function Oqb(a, b) { + return PD(a) === PD(b) || (a != null && pb(a, b)); + }; + _.se = function Pqb(a) { + var b; + b = tb(a); + return b | 0; + }; + var iK = mdb(bie, "HashMap", 43); + bcb(53, eie, gke, Tqb, Uqb, Vqb); + _.Fc = function Xqb(a) { + return Qqb(this, a); + }; + _.$b = function Yqb() { + this.a.$b(); + }; + _.Hc = function Zqb(a) { + return Rqb(this, a); + }; + _.dc = function $qb() { + return this.a.gc() == 0; + }; + _.Kc = function _qb() { + return this.a.ec().Kc(); + }; + _.Mc = function arb(a) { + return Sqb(this, a); + }; + _.gc = function brb() { + return this.a.gc(); + }; + var jK = mdb(bie, "HashSet", 53); + bcb(1781, 1, sie, drb); + _.ud = function erb(a) { + crb(this, a); + }; + _.Ib = function frb() { + return ( + "IntSummaryStatistics[count = " + + Ubb(this.a) + + ", avg = " + + (Dbb(this.a, 0) ? Sbb(this.d) / Sbb(this.a) : 0) + + ", min = " + + this.c + + ", max = " + + this.b + + ", sum = " + + Ubb(this.d) + + "]" + ); + }; + _.a = 0; + _.b = Rie; + _.c = Ohe; + _.d = 0; + var kK = mdb(bie, "IntSummaryStatistics", 1781); + bcb(1049, 1, vie, lrb); + _.Jc = function mrb(a) { + reb(this, a); + }; + _.Kc = function nrb() { + return new orb(this); + }; + _.c = 0; + var mK = mdb(bie, "InternalHashCodeMap", 1049); + bcb(711, 1, aie, orb); + _.Nb = function prb(a) { + Rrb(this, a); + }; + _.Pb = function rrb() { + return (this.d = this.a[this.c++]), this.d; + }; + _.Ob = function qrb() { + var a; + if (this.c < this.a.length) { + return true; + } + a = this.b.next(); + if (!a.done) { + this.a = a.value[1]; + this.c = 0; + return true; + } + return false; + }; + _.Qb = function srb() { + krb(this.e, this.d.cd()); + this.c != 0 && --this.c; + }; + _.c = 0; + _.d = null; + var lK = mdb(bie, "InternalHashCodeMap/1", 711); + var vrb; + bcb(1047, 1, vie, Frb); + _.Jc = function Grb(a) { + reb(this, a); + }; + _.Kc = function Hrb() { + return new Irb(this); + }; + _.c = 0; + _.d = 0; + var pK = mdb(bie, "InternalStringMap", 1047); + bcb(710, 1, aie, Irb); + _.Nb = function Jrb(a) { + Rrb(this, a); + }; + _.Pb = function Lrb() { + return ( + (this.c = this.a), + (this.a = this.b.next()), + new Nrb(this.d, this.c, this.d.d) + ); + }; + _.Ob = function Krb() { + return !this.a.done; + }; + _.Qb = function Mrb() { + Erb(this.d, this.c.value[0]); + }; + var nK = mdb(bie, "InternalStringMap/1", 710); + bcb(1048, 1984, _je, Nrb); + _.cd = function Orb() { + return this.b.value[0]; + }; + _.dd = function Prb() { + if (this.a.d != this.c) { + return Crb(this.a, this.b.value[0]); + } + return this.b.value[1]; + }; + _.ed = function Qrb(a) { + return Drb(this.a, this.b.value[0], a); + }; + _.c = 0; + var oK = mdb(bie, "InternalStringMap/2", 1048); + bcb(228, 43, fke, $rb, _rb); + _.$b = function asb() { + Urb(this); + }; + _._b = function bsb(a) { + return Vrb(this, a); + }; + _.uc = function csb(a) { + var b; + b = this.d.a; + while (b != this.d) { + if (wtb(b.e, a)) { + return true; + } + b = b.a; + } + return false; + }; + _.vc = function dsb() { + return new nsb(this); + }; + _.xc = function esb(a) { + return Wrb(this, a); + }; + _.zc = function fsb(a, b) { + return Xrb(this, a, b); + }; + _.Bc = function gsb(a) { + return Zrb(this, a); + }; + _.gc = function hsb() { + return Vhb(this.e); + }; + _.c = false; + var tK = mdb(bie, "LinkedHashMap", 228); + bcb(387, 383, { 484: 1, 383: 1, 387: 1, 42: 1 }, ksb, lsb); + var qK = mdb(bie, "LinkedHashMap/ChainEntry", 387); + bcb(701, eie, fie, nsb); + _.$b = function osb() { + Urb(this.a); + }; + _.Hc = function psb(a) { + return msb(this, a); + }; + _.Kc = function qsb() { + return new usb(this); + }; + _.Mc = function rsb(a) { + var b; + if (msb(this, a)) { + b = BD(a, 42).cd(); + Zrb(this.a, b); + return true; + } + return false; + }; + _.gc = function ssb() { + return Vhb(this.a.e); + }; + var sK = mdb(bie, "LinkedHashMap/EntrySet", 701); + bcb(702, 1, aie, usb); + _.Nb = function vsb(a) { + Rrb(this, a); + }; + _.Pb = function xsb() { + return tsb(this); + }; + _.Ob = function wsb() { + return this.b != this.c.a.d; + }; + _.Qb = function ysb() { + yCb(!!this.a); + xpb(this.c.a.e, this); + jsb(this.a); + Thb(this.c.a.e, this.a.d); + ypb(this.c.a.e, this); + this.a = null; + }; + var rK = mdb(bie, "LinkedHashMap/EntrySet/EntryIterator", 702); + bcb(178, 53, gke, zsb, Asb, Bsb); + var uK = mdb(bie, "LinkedHashSet", 178); + bcb( + 68, + 1964, + { 3: 1, 4: 1, 20: 1, 28: 1, 52: 1, 14: 1, 68: 1, 15: 1 }, + Psb, + Qsb + ); + _.Fc = function Rsb(a) { + return Dsb(this, a); + }; + _.$b = function Ssb() { + Osb(this); + }; + _.Zc = function Tsb(a) { + return Jsb(this, a); + }; + _.gc = function Usb() { + return this.b; + }; + _.b = 0; + var xK = mdb(bie, "LinkedList", 68); + bcb(970, 1, jie, $sb); + _.Nb = function atb(a) { + Rrb(this, a); + }; + _.Rb = function _sb(a) { + Vsb(this, a); + }; + _.Ob = function btb() { + return Wsb(this); + }; + _.Sb = function ctb() { + return this.b.b != this.d.a; + }; + _.Pb = function dtb() { + return Xsb(this); + }; + _.Tb = function etb() { + return this.a; + }; + _.Ub = function ftb() { + return Ysb(this); + }; + _.Vb = function gtb() { + return this.a - 1; + }; + _.Qb = function htb() { + Zsb(this); + }; + _.Wb = function itb(a) { + yCb(!!this.c); + this.c.c = a; + }; + _.a = 0; + _.c = null; + var vK = mdb(bie, "LinkedList/ListIteratorImpl", 970); + bcb(608, 1, {}, jtb); + var wK = mdb(bie, "LinkedList/Node", 608); + bcb(1959, 1, {}); + var ltb, mtb; + var BK = mdb(bie, "Locale", 1959); + bcb(861, 1959, {}, otb); + _.Ib = function ptb() { + return ""; + }; + var zK = mdb(bie, "Locale/1", 861); + bcb(862, 1959, {}, qtb); + _.Ib = function rtb() { + return "unknown"; + }; + var AK = mdb(bie, "Locale/4", 862); + bcb(109, 60, { 3: 1, 102: 1, 60: 1, 78: 1, 109: 1 }, utb, vtb); + var EK = mdb(bie, "NoSuchElementException", 109); + bcb(404, 1, { 404: 1 }, Ftb); + _.Fb = function Gtb(a) { + var b; + if (a === this) { + return true; + } + if (!JD(a, 404)) { + return false; + } + b = BD(a, 404); + return wtb(this.a, b.a); + }; + _.Hb = function Htb() { + return xtb(this.a); + }; + _.Ib = function Jtb() { + return this.a != null ? Whe + xfb(this.a) + ")" : "Optional.empty()"; + }; + var ztb; + var HK = mdb(bie, "Optional", 404); + bcb(463, 1, { 463: 1 }, Otb, Ptb); + _.Fb = function Qtb(a) { + var b; + if (a === this) { + return true; + } + if (!JD(a, 463)) { + return false; + } + b = BD(a, 463); + return this.a == b.a && Kdb(this.b, b.b) == 0; + }; + _.Hb = function Rtb() { + return this.a ? QD(this.b) : 0; + }; + _.Ib = function Stb() { + return this.a + ? "OptionalDouble.of(" + ("" + this.b) + ")" + : "OptionalDouble.empty()"; + }; + _.a = false; + _.b = 0; + var Ktb; + var FK = mdb(bie, "OptionalDouble", 463); + bcb(517, 1, { 517: 1 }, Wtb, Xtb); + _.Fb = function Ytb(a) { + var b; + if (a === this) { + return true; + } + if (!JD(a, 517)) { + return false; + } + b = BD(a, 517); + return this.a == b.a && beb(this.b, b.b) == 0; + }; + _.Hb = function Ztb() { + return this.a ? this.b : 0; + }; + _.Ib = function $tb() { + return this.a + ? "OptionalInt.of(" + ("" + this.b) + ")" + : "OptionalInt.empty()"; + }; + _.a = false; + _.b = 0; + var Ttb; + var GK = mdb(bie, "OptionalInt", 517); + bcb(503, 2004, die, gub); + _.Gc = function hub(a) { + return _tb(this, a); + }; + _.$b = function iub() { + this.b.c = KC(SI, Uhe, 1, 0, 5, 1); + }; + _.Hc = function jub(a) { + return (a == null ? -1 : Jkb(this.b, a, 0)) != -1; + }; + _.Kc = function kub() { + return new qub(this); + }; + _.Mc = function lub(a) { + return eub(this, a); + }; + _.gc = function mub() { + return this.b.c.length; + }; + _.Nc = function nub() { + return new Kub(this, 256); + }; + _.Pc = function oub() { + return Pkb(this.b); + }; + _.Qc = function pub(a) { + return Qkb(this.b, a); + }; + var JK = mdb(bie, "PriorityQueue", 503); + bcb(1277, 1, aie, qub); + _.Nb = function rub(a) { + Rrb(this, a); + }; + _.Ob = function tub() { + return this.a < this.c.b.c.length; + }; + _.Pb = function uub() { + sCb(this.a < this.c.b.c.length); + this.b = this.a++; + return Ikb(this.c.b, this.b); + }; + _.Qb = function vub() { + yCb(this.b != -1); + fub(this.c, (this.a = this.b)); + this.b = -1; + }; + _.a = 0; + _.b = -1; + var IK = mdb(bie, "PriorityQueue/1", 1277); + bcb(230, 1, { 230: 1 }, Gub, Hub); + _.a = 0; + _.b = 0; + var wub, + xub, + yub = 0; + var KK = mdb(bie, "Random", 230); + bcb(27, 1, pie, Kub, Lub, Mub); + _.qd = function Nub() { + return this.a; + }; + _.rd = function Oub() { + Iub(this); + return this.c; + }; + _.Nb = function Pub(a) { + Iub(this); + this.d.Nb(a); + }; + _.sd = function Qub(a) { + return Jub(this, a); + }; + _.a = 0; + _.c = 0; + var $K = mdb(bie, "Spliterators/IteratorSpliterator", 27); + bcb(485, 27, pie, Rub); + var MK = mdb(bie, "SortedSet/1", 485); + bcb(602, 1, eke, Tub); + _.we = function Uub(a) { + this.a.td(a); + }; + var NK = mdb(bie, "Spliterator/OfDouble/0methodref$accept$Type", 602); + bcb(603, 1, eke, Vub); + _.we = function Wub(a) { + this.a.td(a); + }; + var OK = mdb(bie, "Spliterator/OfDouble/1methodref$accept$Type", 603); + bcb(604, 1, sie, Xub); + _.ud = function Yub(a) { + this.a.td(meb(a)); + }; + var PK = mdb(bie, "Spliterator/OfInt/2methodref$accept$Type", 604); + bcb(605, 1, sie, Zub); + _.ud = function $ub(a) { + this.a.td(meb(a)); + }; + var QK = mdb(bie, "Spliterator/OfInt/3methodref$accept$Type", 605); + bcb(617, 1, pie); + _.Nb = function evb(a) { + Sub(this, a); + }; + _.qd = function cvb() { + return this.d; + }; + _.rd = function dvb() { + return this.e; + }; + _.d = 0; + _.e = 0; + var WK = mdb(bie, "Spliterators/BaseSpliterator", 617); + bcb(721, 617, pie); + _.xe = function gvb(a) { + _ub(this, a); + }; + _.Nb = function hvb(a) { + JD(a, 182) ? _ub(this, BD(a, 182)) : _ub(this, new Vub(a)); + }; + _.sd = function ivb(a) { + return JD(a, 182) ? this.ye(BD(a, 182)) : this.ye(new Tub(a)); + }; + var RK = mdb(bie, "Spliterators/AbstractDoubleSpliterator", 721); + bcb(720, 617, pie); + _.xe = function kvb(a) { + _ub(this, a); + }; + _.Nb = function lvb(a) { + JD(a, 196) ? _ub(this, BD(a, 196)) : _ub(this, new Zub(a)); + }; + _.sd = function mvb(a) { + return JD(a, 196) ? this.ye(BD(a, 196)) : this.ye(new Xub(a)); + }; + var SK = mdb(bie, "Spliterators/AbstractIntSpliterator", 720); + bcb(540, 617, pie); + var TK = mdb(bie, "Spliterators/AbstractSpliterator", 540); + bcb(692, 1, pie); + _.Nb = function tvb(a) { + Sub(this, a); + }; + _.qd = function rvb() { + return this.b; + }; + _.rd = function svb() { + return this.d - this.c; + }; + _.b = 0; + _.c = 0; + _.d = 0; + var VK = mdb(bie, "Spliterators/BaseArraySpliterator", 692); + bcb(947, 692, pie, vvb); + _.ze = function wvb(a, b) { + uvb(this, BD(a, 38), b); + }; + _.Nb = function xvb(a) { + ovb(this, a); + }; + _.sd = function yvb(a) { + return pvb(this, a); + }; + var UK = mdb(bie, "Spliterators/ArraySpliterator", 947); + bcb(693, 692, pie, Avb); + _.ze = function Cvb(a, b) { + zvb(this, BD(a, 182), b); + }; + _.xe = function Dvb(a) { + ovb(this, a); + }; + _.Nb = function Evb(a) { + JD(a, 182) ? ovb(this, BD(a, 182)) : ovb(this, new Vub(a)); + }; + _.ye = function Fvb(a) { + return pvb(this, a); + }; + _.sd = function Gvb(a) { + return JD(a, 182) ? pvb(this, BD(a, 182)) : pvb(this, new Tub(a)); + }; + var XK = mdb(bie, "Spliterators/DoubleArraySpliterator", 693); + bcb(1968, 1, pie); + _.Nb = function Lvb(a) { + Sub(this, a); + }; + _.qd = function Jvb() { + return 16448; + }; + _.rd = function Kvb() { + return 0; + }; + var Hvb; + var ZK = mdb(bie, "Spliterators/EmptySpliterator", 1968); + bcb(946, 1968, pie, Ovb); + _.xe = function Pvb(a) { + Mvb(a); + }; + _.Nb = function Qvb(a) { + JD(a, 196) ? Mvb(BD(a, 196)) : Mvb(new Zub(a)); + }; + _.ye = function Rvb(a) { + return Nvb(a); + }; + _.sd = function Svb(a) { + return JD(a, 196) ? Nvb(BD(a, 196)) : Nvb(new Xub(a)); + }; + var YK = mdb(bie, "Spliterators/EmptySpliterator/OfInt", 946); + bcb(580, 52, pke, Wvb); + _.Vc = function Xvb(a, b) { + _vb(a, this.a.c.length + 1); + Dkb(this.a, a, b); + }; + _.Fc = function Yvb(a) { + return Ekb(this.a, a); + }; + _.Wc = function Zvb(a, b) { + _vb(a, this.a.c.length + 1); + return Fkb(this.a, a, b); + }; + _.Gc = function $vb(a) { + return Gkb(this.a, a); + }; + _.$b = function awb() { + this.a.c = KC(SI, Uhe, 1, 0, 5, 1); + }; + _.Hc = function bwb(a) { + return Jkb(this.a, a, 0) != -1; + }; + _.Ic = function cwb(a) { + return Be(this.a, a); + }; + _.Jc = function dwb(a) { + Hkb(this.a, a); + }; + _.Xb = function ewb(a) { + return _vb(a, this.a.c.length), Ikb(this.a, a); + }; + _.Xc = function fwb(a) { + return Jkb(this.a, a, 0); + }; + _.dc = function gwb() { + return this.a.c.length == 0; + }; + _.Kc = function hwb() { + return new olb(this.a); + }; + _.$c = function iwb(a) { + return _vb(a, this.a.c.length), Kkb(this.a, a); + }; + _.Ud = function jwb(a, b) { + Mkb(this.a, a, b); + }; + _._c = function kwb(a, b) { + return _vb(a, this.a.c.length), Nkb(this.a, a, b); + }; + _.gc = function lwb() { + return this.a.c.length; + }; + _.ad = function mwb(a) { + Okb(this.a, a); + }; + _.bd = function nwb(a, b) { + return new Jib(this.a, a, b); + }; + _.Pc = function owb() { + return Pkb(this.a); + }; + _.Qc = function pwb(a) { + return Qkb(this.a, a); + }; + _.Ib = function qwb() { + return Fe(this.a); + }; + var lL = mdb(bie, "Vector", 580); + bcb(809, 580, pke, twb); + var _K = mdb(bie, "Stack", 809); + bcb(206, 1, { 206: 1 }, xwb); + _.Ib = function ywb() { + return wwb(this); + }; + var aL = mdb(bie, "StringJoiner", 206); + bcb(544, 1992, { 3: 1, 83: 1, 171: 1, 161: 1 }, Pwb, Qwb); + _.$b = function Rwb() { + zwb(this); + }; + _.vc = function Swb() { + return new cxb(this); + }; + _.zc = function Twb(a, b) { + return Iwb(this, a, b); + }; + _.Bc = function Uwb(a) { + return Jwb(this, a); + }; + _.gc = function Vwb() { + return this.c; + }; + _.c = 0; + var jL = mdb(bie, "TreeMap", 544); + bcb(390, 1, aie, Ywb); + _.Nb = function $wb(a) { + Rrb(this, a); + }; + _.Pb = function axb() { + return Wwb(this); + }; + _.Ob = function _wb() { + return sib(this.a); + }; + _.Qb = function bxb() { + Xwb(this); + }; + var bL = mdb(bie, "TreeMap/EntryIterator", 390); + bcb(435, 739, fie, cxb); + _.$b = function dxb() { + zwb(this.a); + }; + var cL = mdb(bie, "TreeMap/EntrySet", 435); + bcb(436, 383, { 484: 1, 383: 1, 42: 1, 436: 1 }, exb); + _.b = false; + var dL = mdb(bie, "TreeMap/Node", 436); + bcb(621, 1, {}, fxb); + _.Ib = function gxb() { + return ( + "State: mv=" + + this.c + + " value=" + + this.d + + " done=" + + this.a + + " found=" + + this.b + ); + }; + _.a = false; + _.b = false; + _.c = false; + var eL = mdb(bie, "TreeMap/State", 621); + bcb(297, 22, qke, mxb); + _.Ae = function nxb() { + return false; + }; + _.Be = function oxb() { + return false; + }; + var hxb, ixb, jxb, kxb; + var iL = ndb(bie, "TreeMap/SubMapType", 297, CI, qxb, pxb); + bcb(1112, 297, qke, rxb); + _.Be = function sxb() { + return true; + }; + var fL = ndb(bie, "TreeMap/SubMapType/1", 1112, iL, null, null); + bcb(1113, 297, qke, txb); + _.Ae = function uxb() { + return true; + }; + _.Be = function vxb() { + return true; + }; + var gL = ndb(bie, "TreeMap/SubMapType/2", 1113, iL, null, null); + bcb(1114, 297, qke, wxb); + _.Ae = function xxb() { + return true; + }; + var hL = ndb(bie, "TreeMap/SubMapType/3", 1114, iL, null, null); + var yxb; + bcb( + 208, + eie, + { 3: 1, 20: 1, 28: 1, 14: 1, 271: 1, 21: 1, 84: 1, 208: 1 }, + Gxb, + Hxb + ); + _.Nc = function Oxb() { + return new Rub(this); + }; + _.Fc = function Ixb(a) { + return Axb(this, a); + }; + _.$b = function Jxb() { + zwb(this.a); + }; + _.Hc = function Kxb(a) { + return ujb(this.a, a); + }; + _.Kc = function Lxb() { + var a; + return (a = new Ywb(new cxb(new Gjb(this.a).a).b)), new Njb(a); + }; + _.Mc = function Mxb(a) { + return Fxb(this, a); + }; + _.gc = function Nxb() { + return this.a.c; + }; + var kL = mdb(bie, "TreeSet", 208); + bcb(966, 1, {}, Rxb); + _.Ce = function Sxb(a, b) { + return Pxb(this.a, a, b); + }; + var mL = mdb(rke, "BinaryOperator/lambda$0$Type", 966); + bcb(967, 1, {}, Txb); + _.Ce = function Uxb(a, b) { + return Qxb(this.a, a, b); + }; + var nL = mdb(rke, "BinaryOperator/lambda$1$Type", 967); + bcb(846, 1, {}, Vxb); + _.Kb = function Wxb(a) { + return a; + }; + var oL = mdb(rke, "Function/lambda$0$Type", 846); + bcb(431, 1, Oie, Xxb); + _.Mb = function Yxb(a) { + return !this.a.Mb(a); + }; + var pL = mdb(rke, "Predicate/lambda$2$Type", 431); + bcb(572, 1, { 572: 1 }); + var qL = mdb(ske, "Handler", 572); + bcb(2007, 1, Qhe); + _.ne = function _xb() { + return "DUMMY"; + }; + _.Ib = function ayb() { + return this.ne(); + }; + var Zxb; + var sL = mdb(ske, "Level", 2007); + bcb(1621, 2007, Qhe, byb); + _.ne = function cyb() { + return "INFO"; + }; + var rL = mdb(ske, "Level/LevelInfo", 1621); + bcb(1640, 1, {}, gyb); + var dyb; + var tL = mdb(ske, "LogManager", 1640); + bcb(1780, 1, Qhe, iyb); + _.b = null; + var uL = mdb(ske, "LogRecord", 1780); + bcb(512, 1, { 512: 1 }, wyb); + _.e = false; + var jyb = false, + kyb = false, + lyb = false, + myb = false, + nyb = false; + var vL = mdb(ske, "Logger", 512); + bcb(819, 572, { 572: 1 }, zyb); + var wL = mdb(ske, "SimpleConsoleLogHandler", 819); + bcb(132, 22, { 3: 1, 35: 1, 22: 1, 132: 1 }, Gyb); + var Cyb, Dyb, Eyb; + var xL = ndb(vke, "Collector/Characteristics", 132, CI, Iyb, Hyb); + var Jyb; + bcb(744, 1, {}, Lyb); + var yL = mdb(vke, "CollectorImpl", 744); + bcb(1060, 1, {}, Zyb); + _.Ce = function $yb(a, b) { + return vwb(BD(a, 206), BD(b, 206)); + }; + var zL = mdb(vke, "Collectors/10methodref$merge$Type", 1060); + bcb(1061, 1, {}, _yb); + _.Kb = function azb(a) { + return wwb(BD(a, 206)); + }; + var AL = mdb(vke, "Collectors/11methodref$toString$Type", 1061); + bcb(1062, 1, {}, bzb); + _.Kb = function czb(a) { + return Bcb(), _Pb(a) ? true : false; + }; + var BL = mdb(vke, "Collectors/12methodref$test$Type", 1062); + bcb(251, 1, {}, dzb); + _.Od = function ezb(a, b) { + BD(a, 14).Fc(b); + }; + var CL = mdb(vke, "Collectors/20methodref$add$Type", 251); + bcb(253, 1, {}, fzb); + _.Ee = function gzb() { + return new Rkb(); + }; + var DL = mdb(vke, "Collectors/21methodref$ctor$Type", 253); + bcb(346, 1, {}, hzb); + _.Ee = function izb() { + return new Tqb(); + }; + var EL = mdb(vke, "Collectors/23methodref$ctor$Type", 346); + bcb(347, 1, {}, jzb); + _.Od = function kzb(a, b) { + Qqb(BD(a, 53), b); + }; + var FL = mdb(vke, "Collectors/24methodref$add$Type", 347); + bcb(1055, 1, {}, lzb); + _.Ce = function mzb(a, b) { + return Myb(BD(a, 15), BD(b, 14)); + }; + var GL = mdb(vke, "Collectors/4methodref$addAll$Type", 1055); + bcb(1059, 1, {}, nzb); + _.Od = function ozb(a, b) { + uwb(BD(a, 206), BD(b, 475)); + }; + var HL = mdb(vke, "Collectors/9methodref$add$Type", 1059); + bcb(1058, 1, {}, pzb); + _.Ee = function qzb() { + return new xwb(this.a, this.b, this.c); + }; + var IL = mdb(vke, "Collectors/lambda$15$Type", 1058); + bcb(1063, 1, {}, rzb); + _.Ee = function szb() { + var a; + return ( + (a = new $rb()), + Xrb(a, (Bcb(), false), new Rkb()), + Xrb(a, true, new Rkb()), + a + ); + }; + var JL = mdb(vke, "Collectors/lambda$22$Type", 1063); + bcb(1064, 1, {}, tzb); + _.Ee = function uzb() { + return OC(GC(SI, 1), Uhe, 1, 5, [this.a]); + }; + var KL = mdb(vke, "Collectors/lambda$25$Type", 1064); + bcb(1065, 1, {}, vzb); + _.Od = function wzb(a, b) { + Oyb(this.a, CD(a)); + }; + var LL = mdb(vke, "Collectors/lambda$26$Type", 1065); + bcb(1066, 1, {}, xzb); + _.Ce = function yzb(a, b) { + return Pyb(this.a, CD(a), CD(b)); + }; + var ML = mdb(vke, "Collectors/lambda$27$Type", 1066); + bcb(1067, 1, {}, zzb); + _.Kb = function Azb(a) { + return CD(a)[0]; + }; + var NL = mdb(vke, "Collectors/lambda$28$Type", 1067); + bcb(713, 1, {}, Czb); + _.Ce = function Dzb(a, b) { + return Bzb(a, b); + }; + var OL = mdb(vke, "Collectors/lambda$4$Type", 713); + bcb(252, 1, {}, Ezb); + _.Ce = function Fzb(a, b) { + return Ryb(BD(a, 14), BD(b, 14)); + }; + var PL = mdb(vke, "Collectors/lambda$42$Type", 252); + bcb(348, 1, {}, Gzb); + _.Ce = function Hzb(a, b) { + return Syb(BD(a, 53), BD(b, 53)); + }; + var QL = mdb(vke, "Collectors/lambda$50$Type", 348); + bcb(349, 1, {}, Izb); + _.Kb = function Jzb(a) { + return BD(a, 53); + }; + var RL = mdb(vke, "Collectors/lambda$51$Type", 349); + bcb(1054, 1, {}, Kzb); + _.Od = function Lzb(a, b) { + Tyb(this.a, BD(a, 83), b); + }; + var SL = mdb(vke, "Collectors/lambda$7$Type", 1054); + bcb(1056, 1, {}, Mzb); + _.Ce = function Nzb(a, b) { + return Vyb(BD(a, 83), BD(b, 83), new lzb()); + }; + var TL = mdb(vke, "Collectors/lambda$8$Type", 1056); + bcb(1057, 1, {}, Ozb); + _.Kb = function Pzb(a) { + return Uyb(this.a, BD(a, 83)); + }; + var UL = mdb(vke, "Collectors/lambda$9$Type", 1057); + bcb(539, 1, {}); + _.He = function Wzb() { + Qzb(this); + }; + _.d = false; + var zM = mdb(vke, "TerminatableStream", 539); + bcb(812, 539, wke, bAb); + _.He = function cAb() { + Qzb(this); + }; + var ZL = mdb(vke, "DoubleStreamImpl", 812); + bcb(1784, 721, pie, fAb); + _.ye = function hAb(a) { + return eAb(this, BD(a, 182)); + }; + _.a = null; + var WL = mdb(vke, "DoubleStreamImpl/2", 1784); + bcb(1785, 1, eke, iAb); + _.we = function jAb(a) { + gAb(this.a, a); + }; + var VL = mdb(vke, "DoubleStreamImpl/2/lambda$0$Type", 1785); + bcb(1782, 1, eke, kAb); + _.we = function lAb(a) { + dAb(this.a, a); + }; + var XL = mdb(vke, "DoubleStreamImpl/lambda$0$Type", 1782); + bcb(1783, 1, eke, mAb); + _.we = function nAb(a) { + Epb(this.a, a); + }; + var YL = mdb(vke, "DoubleStreamImpl/lambda$2$Type", 1783); + bcb(1358, 720, pie, rAb); + _.ye = function sAb(a) { + return qAb(this, BD(a, 196)); + }; + _.a = 0; + _.b = 0; + _.c = 0; + var $L = mdb(vke, "IntStream/5", 1358); + bcb(787, 539, wke, vAb); + _.He = function wAb() { + Qzb(this); + }; + _.Ie = function xAb() { + return Tzb(this), this.a; + }; + var bM = mdb(vke, "IntStreamImpl", 787); + bcb(788, 539, wke, yAb); + _.He = function zAb() { + Qzb(this); + }; + _.Ie = function AAb() { + return Tzb(this), Ivb(), Hvb; + }; + var _L = mdb(vke, "IntStreamImpl/Empty", 788); + bcb(1463, 1, sie, BAb); + _.ud = function CAb(a) { + crb(this.a, a); + }; + var aM = mdb(vke, "IntStreamImpl/lambda$4$Type", 1463); + var xM = odb(vke, "Stream"); + bcb(30, 539, { 525: 1, 670: 1, 833: 1 }, YAb); + _.He = function ZAb() { + Qzb(this); + }; + var DAb; + var wM = mdb(vke, "StreamImpl", 30); + bcb(845, 1, {}, bBb); + _.ld = function cBb(a) { + return aBb(a); + }; + var cM = mdb(vke, "StreamImpl/0methodref$lambda$2$Type", 845); + bcb(1084, 540, pie, fBb); + _.sd = function gBb(a) { + while (dBb(this)) { + if (this.a.sd(a)) { + return true; + } else { + Qzb(this.b); + this.b = null; + this.a = null; + } + } + return false; + }; + var eM = mdb(vke, "StreamImpl/1", 1084); + bcb(1085, 1, qie, hBb); + _.td = function iBb(a) { + eBb(this.a, BD(a, 833)); + }; + var dM = mdb(vke, "StreamImpl/1/lambda$0$Type", 1085); + bcb(1086, 1, Oie, jBb); + _.Mb = function kBb(a) { + return Qqb(this.a, a); + }; + var fM = mdb(vke, "StreamImpl/1methodref$add$Type", 1086); + bcb(1087, 540, pie, lBb); + _.sd = function mBb(a) { + var b; + if (!this.a) { + b = new Rkb(); + this.b.a.Nb(new nBb(b)); + mmb(); + Okb(b, this.c); + this.a = new Kub(b, 16); + } + return Jub(this.a, a); + }; + _.a = null; + var hM = mdb(vke, "StreamImpl/5", 1087); + bcb(1088, 1, qie, nBb); + _.td = function oBb(a) { + Ekb(this.a, a); + }; + var gM = mdb(vke, "StreamImpl/5/2methodref$add$Type", 1088); + bcb(722, 540, pie, qBb); + _.sd = function rBb(a) { + this.b = false; + while (!this.b && this.c.sd(new sBb(this, a))); + return this.b; + }; + _.b = false; + var jM = mdb(vke, "StreamImpl/FilterSpliterator", 722); + bcb(1079, 1, qie, sBb); + _.td = function tBb(a) { + pBb(this.a, this.b, a); + }; + var iM = mdb(vke, "StreamImpl/FilterSpliterator/lambda$0$Type", 1079); + bcb(1075, 721, pie, wBb); + _.ye = function xBb(a) { + return vBb(this, BD(a, 182)); + }; + var lM = mdb(vke, "StreamImpl/MapToDoubleSpliterator", 1075); + bcb(1078, 1, qie, yBb); + _.td = function zBb(a) { + uBb(this.a, this.b, a); + }; + var kM = mdb(vke, "StreamImpl/MapToDoubleSpliterator/lambda$0$Type", 1078); + bcb(1074, 720, pie, CBb); + _.ye = function DBb(a) { + return BBb(this, BD(a, 196)); + }; + var nM = mdb(vke, "StreamImpl/MapToIntSpliterator", 1074); + bcb(1077, 1, qie, EBb); + _.td = function FBb(a) { + ABb(this.a, this.b, a); + }; + var mM = mdb(vke, "StreamImpl/MapToIntSpliterator/lambda$0$Type", 1077); + bcb(719, 540, pie, IBb); + _.sd = function JBb(a) { + return HBb(this, a); + }; + var pM = mdb(vke, "StreamImpl/MapToObjSpliterator", 719); + bcb(1076, 1, qie, KBb); + _.td = function LBb(a) { + GBb(this.a, this.b, a); + }; + var oM = mdb(vke, "StreamImpl/MapToObjSpliterator/lambda$0$Type", 1076); + bcb(618, 1, qie, NBb); + _.td = function OBb(a) { + MBb(this, a); + }; + var qM = mdb(vke, "StreamImpl/ValueConsumer", 618); + bcb(1080, 1, qie, PBb); + _.td = function QBb(a) { + EAb(); + }; + var rM = mdb(vke, "StreamImpl/lambda$0$Type", 1080); + bcb(1081, 1, qie, RBb); + _.td = function SBb(a) { + EAb(); + }; + var sM = mdb(vke, "StreamImpl/lambda$1$Type", 1081); + bcb(1082, 1, {}, TBb); + _.Ce = function UBb(a, b) { + return $Ab(this.a, a, b); + }; + var uM = mdb(vke, "StreamImpl/lambda$4$Type", 1082); + bcb(1083, 1, qie, VBb); + _.td = function WBb(a) { + _Ab(this.b, this.a, a); + }; + var vM = mdb(vke, "StreamImpl/lambda$5$Type", 1083); + bcb(1089, 1, qie, XBb); + _.td = function YBb(a) { + Xzb(this.a, BD(a, 365)); + }; + var yM = mdb(vke, "TerminatableStream/lambda$0$Type", 1089); + bcb(2041, 1, {}); + bcb(1914, 1, {}, iCb); + var AM = mdb("javaemul.internal", "ConsoleLogger", 1914); + bcb(2038, 1, {}); + var ECb = 0; + var GCb, + HCb = 0, + ICb; + bcb(1768, 1, qie, OCb); + _.td = function PCb(a) { + BD(a, 308); + }; + var BM = mdb(Cke, "BowyerWatsonTriangulation/lambda$0$Type", 1768); + bcb(1769, 1, qie, QCb); + _.td = function RCb(a) { + ye(this.a, BD(a, 308).e); + }; + var CM = mdb(Cke, "BowyerWatsonTriangulation/lambda$1$Type", 1769); + bcb(1770, 1, qie, SCb); + _.td = function TCb(a) { + BD(a, 168); + }; + var DM = mdb(Cke, "BowyerWatsonTriangulation/lambda$2$Type", 1770); + bcb(1765, 1, Dke, WCb); + _.ue = function XCb(a, b) { + return VCb(this.a, BD(a, 168), BD(b, 168)); + }; + _.Fb = function YCb(a) { + return this === a; + }; + _.ve = function ZCb() { + return new tpb(this); + }; + var EM = mdb(Cke, "NaiveMinST/lambda$0$Type", 1765); + bcb(499, 1, {}, _Cb); + var FM = mdb(Cke, "NodeMicroLayout", 499); + bcb(168, 1, { 168: 1 }, aDb); + _.Fb = function bDb(a) { + var b; + if (JD(a, 168)) { + b = BD(a, 168); + return ( + (wtb(this.a, b.a) && wtb(this.b, b.b)) || + (wtb(this.a, b.b) && wtb(this.b, b.a)) + ); + } else { + return false; + } + }; + _.Hb = function cDb() { + return xtb(this.a) + xtb(this.b); + }; + var GM = mdb(Cke, "TEdge", 168); + bcb(308, 1, { 308: 1 }, eDb); + _.Fb = function fDb(a) { + var b; + if (JD(a, 308)) { + b = BD(a, 308); + return dDb(this, b.a) && dDb(this, b.b) && dDb(this, b.c); + } else { + return false; + } + }; + _.Hb = function gDb() { + return xtb(this.a) + xtb(this.b) + xtb(this.c); + }; + var HM = mdb(Cke, "TTriangle", 308); + bcb(221, 1, { 221: 1 }, hDb); + var IM = mdb(Cke, "Tree", 221); + bcb(1254, 1, {}, jDb); + var KM = mdb(Eke, "Scanline", 1254); + var JM = odb(Eke, Fke); + bcb(1692, 1, {}, mDb); + var LM = mdb(Gke, "CGraph", 1692); + bcb(307, 1, { 307: 1 }, oDb); + _.b = 0; + _.c = 0; + _.d = 0; + _.g = 0; + _.i = 0; + _.k = Qje; + var NM = mdb(Gke, "CGroup", 307); + bcb(815, 1, {}, sDb); + var MM = mdb(Gke, "CGroup/CGroupBuilder", 815); + bcb(57, 1, { 57: 1 }, tDb); + _.Ib = function uDb() { + var a; + if (this.j) { + return GD(this.j.Kb(this)); + } + return fdb(PM), PM.o + "@" + ((a = FCb(this) >>> 0), a.toString(16)); + }; + _.f = 0; + _.i = Qje; + var PM = mdb(Gke, "CNode", 57); + bcb(814, 1, {}, zDb); + var OM = mdb(Gke, "CNode/CNodeBuilder", 814); + var EDb; + bcb(1525, 1, {}, GDb); + _.Oe = function HDb(a, b) { + return 0; + }; + _.Pe = function IDb(a, b) { + return 0; + }; + var QM = mdb(Gke, Ike, 1525); + bcb(1790, 1, {}, JDb); + _.Le = function KDb(a) { + var b, c, d, e, f, g, h, i, j, k, l, m, n, o, p; + j = Pje; + for (d = new olb(a.a.b); d.a < d.c.c.length; ) { + b = BD(mlb(d), 57); + j = Math.min(j, b.a.j.d.c + b.b.a); + } + n = new Psb(); + for (g = new olb(a.a.a); g.a < g.c.c.length; ) { + f = BD(mlb(g), 307); + f.k = j; + f.g == 0 && (Gsb(n, f, n.c.b, n.c), true); + } + while (n.b != 0) { + f = BD(n.b == 0 ? null : (sCb(n.b != 0), Nsb(n, n.a.a)), 307); + e = f.j.d.c; + for (m = f.a.a.ec().Kc(); m.Ob(); ) { + k = BD(m.Pb(), 57); + p = f.k + k.b.a; + !UDb(a, f, a.d) || k.d.c < p ? (k.i = p) : (k.i = k.d.c); + } + e -= f.j.i; + f.b += e; + a.d == (ead(), bad) || a.d == _9c ? (f.c += e) : (f.c -= e); + for (l = f.a.a.ec().Kc(); l.Ob(); ) { + k = BD(l.Pb(), 57); + for (i = k.c.Kc(); i.Ob(); ) { + h = BD(i.Pb(), 57); + fad(a.d) ? (o = a.g.Oe(k, h)) : (o = a.g.Pe(k, h)); + h.a.k = Math.max(h.a.k, k.i + k.d.b + o - h.b.a); + VDb(a, h, a.d) && (h.a.k = Math.max(h.a.k, h.d.c - h.b.a)); + --h.a.g; + h.a.g == 0 && Dsb(n, h.a); + } + } + } + for (c = new olb(a.a.b); c.a < c.c.c.length; ) { + b = BD(mlb(c), 57); + b.d.c = b.i; + } + }; + var RM = mdb(Gke, "LongestPathCompaction", 1790); + bcb(1690, 1, {}, cEb); + _.e = false; + var LDb, MDb, NDb; + var TM = mdb(Gke, Nke, 1690); + bcb(1691, 1, qie, dEb); + _.td = function eEb(a) { + WDb(this.a, BD(a, 46)); + }; + var SM = mdb(Gke, Oke, 1691); + bcb(1791, 1, {}, fEb); + _.Me = function gEb(a) { + var b, c, d, e, f, g, h; + for (c = new olb(a.a.b); c.a < c.c.c.length; ) { + b = BD(mlb(c), 57); + b.c.$b(); + } + for (e = new olb(a.a.b); e.a < e.c.c.length; ) { + d = BD(mlb(e), 57); + for (g = new olb(a.a.b); g.a < g.c.c.length; ) { + f = BD(mlb(g), 57); + if (d == f) { + continue; + } + if (!!d.a && d.a == f.a) { + continue; + } + fad(a.d) ? (h = a.g.Pe(d, f)) : (h = a.g.Oe(d, f)); + (f.d.c > d.d.c || (d.d.c == f.d.c && d.d.b < f.d.b)) && + BDb(f.d.d + f.d.a + h, d.d.d) && + DDb(f.d.d, d.d.d + d.d.a + h) && + d.c.Fc(f); + } + } + }; + var UM = mdb(Gke, "QuadraticConstraintCalculation", 1791); + bcb(522, 1, { 522: 1 }, lEb); + _.a = false; + _.b = false; + _.c = false; + _.d = false; + var VM = mdb(Gke, Pke, 522); + bcb(803, 1, {}, oEb); + _.Me = function pEb(a) { + this.c = a; + nEb(this, new GEb()); + }; + var _M = mdb(Gke, Qke, 803); + bcb(1718, 1, { 679: 1 }, uEb); + _.Ke = function vEb(a) { + rEb(this, BD(a, 464)); + }; + var XM = mdb(Gke, Rke, 1718); + bcb(1719, 1, Dke, xEb); + _.ue = function yEb(a, b) { + return wEb(BD(a, 57), BD(b, 57)); + }; + _.Fb = function zEb(a) { + return this === a; + }; + _.ve = function AEb() { + return new tpb(this); + }; + var WM = mdb(Gke, Ske, 1719); + bcb(464, 1, { 464: 1 }, BEb); + _.a = false; + var YM = mdb(Gke, Tke, 464); + bcb(1720, 1, Dke, CEb); + _.ue = function DEb(a, b) { + return qEb(BD(a, 464), BD(b, 464)); + }; + _.Fb = function EEb(a) { + return this === a; + }; + _.ve = function FEb() { + return new tpb(this); + }; + var ZM = mdb(Gke, Uke, 1720); + bcb(1721, 1, Vke, GEb); + _.Lb = function HEb(a) { + return BD(a, 57), true; + }; + _.Fb = function IEb(a) { + return this === a; + }; + _.Mb = function JEb(a) { + return BD(a, 57), true; + }; + var $M = mdb(Gke, "ScanlineConstraintCalculator/lambda$1$Type", 1721); + bcb(428, 22, { 3: 1, 35: 1, 22: 1, 428: 1 }, NEb); + var KEb, LEb; + var aN = ndb(Wke, "HighLevelSortingCriterion", 428, CI, PEb, OEb); + var QEb; + bcb(427, 22, { 3: 1, 35: 1, 22: 1, 427: 1 }, VEb); + var SEb, TEb; + var bN = ndb(Wke, "LowLevelSortingCriterion", 427, CI, XEb, WEb); + var YEb; + var C0 = odb(Xke, "ILayoutMetaDataProvider"); + bcb(853, 1, ale, gFb); + _.Qe = function hFb(a) { + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), Yke), ble), + "Polyomino Traversal Strategy" + ), + "Traversal strategy for trying different candidate positions for polyominoes." + ), + eFb + ), + (_5c(), V5c) + ), + dN + ), + pqb((N5c(), L5c)) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), Zke), ble), + "Polyomino Secondary Sorting Criterion" + ), + "Possible secondary sorting criteria for the processing order of polyominoes. They are used when polyominoes are equal according to the primary sorting criterion HighLevelSortingCriterion." + ), + cFb + ), + V5c + ), + bN + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), $ke), ble), + "Polyomino Primary Sorting Criterion" + ), + "Possible primary sorting criteria for the processing order of polyominoes." + ), + aFb + ), + V5c + ), + aN + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), _ke), ble), "Fill Polyominoes"), + "Use the Profile Fill algorithm to fill polyominoes to prevent small polyominoes from being placed inside of big polyominoes with large holes. Might increase packing area." + ), + (Bcb(), true) + ), + T5c + ), + wI + ), + pqb(L5c) + ) + ) + ); + }; + var $Eb, _Eb, aFb, bFb, cFb, dFb, eFb; + var cN = mdb(Wke, "PolyominoOptions", 853); + bcb(250, 22, { 3: 1, 35: 1, 22: 1, 250: 1 }, sFb); + var iFb, jFb, kFb, lFb, mFb, nFb, oFb, pFb, qFb; + var dN = ndb(Wke, "TraversalStrategy", 250, CI, uFb, tFb); + var vFb; + bcb(213, 1, { 213: 1 }, yFb); + _.Ib = function zFb() { + return "NEdge[id=" + this.b + " w=" + this.g + " d=" + this.a + "]"; + }; + _.a = 1; + _.b = 0; + _.c = 0; + _.f = false; + _.g = 0; + var fN = mdb(cle, "NEdge", 213); + bcb(176, 1, {}, FFb); + var eN = mdb(cle, "NEdge/NEdgeBuilder", 176); + bcb(653, 1, {}, KFb); + var gN = mdb(cle, "NGraph", 653); + bcb(121, 1, { 121: 1 }, MFb); + _.c = -1; + _.d = 0; + _.e = 0; + _.i = -1; + _.j = false; + var jN = mdb(cle, "NNode", 121); + bcb(795, 1, cke, PFb); + _.Jc = function XFb(a) { + reb(this, a); + }; + _.Lc = function cGb() { + return new YAb(null, new Kub(this, 16)); + }; + _.ad = function hGb(a) { + ktb(this, a); + }; + _.Nc = function iGb() { + return new Kub(this, 16); + }; + _.Oc = function jGb() { + return new YAb(null, new Kub(this, 16)); + }; + _.Vc = function QFb(a, b) { + ++this.b; + Dkb(this.a, a, b); + }; + _.Fc = function RFb(a) { + return NFb(this, a); + }; + _.Wc = function SFb(a, b) { + ++this.b; + return Fkb(this.a, a, b); + }; + _.Gc = function TFb(a) { + ++this.b; + return Gkb(this.a, a); + }; + _.$b = function UFb() { + ++this.b; + this.a.c = KC(SI, Uhe, 1, 0, 5, 1); + }; + _.Hc = function VFb(a) { + return Jkb(this.a, a, 0) != -1; + }; + _.Ic = function WFb(a) { + return Be(this.a, a); + }; + _.Xb = function YFb(a) { + return Ikb(this.a, a); + }; + _.Xc = function ZFb(a) { + return Jkb(this.a, a, 0); + }; + _.dc = function $Fb() { + return this.a.c.length == 0; + }; + _.Kc = function _Fb() { + return vr(new olb(this.a)); + }; + _.Yc = function aGb() { + throw vbb(new bgb()); + }; + _.Zc = function bGb(a) { + throw vbb(new bgb()); + }; + _.$c = function dGb(a) { + ++this.b; + return Kkb(this.a, a); + }; + _.Mc = function eGb(a) { + return OFb(this, a); + }; + _._c = function fGb(a, b) { + ++this.b; + return Nkb(this.a, a, b); + }; + _.gc = function gGb() { + return this.a.c.length; + }; + _.bd = function kGb(a, b) { + return new Jib(this.a, a, b); + }; + _.Pc = function lGb() { + return Pkb(this.a); + }; + _.Qc = function mGb(a) { + return Qkb(this.a, a); + }; + _.b = 0; + var hN = mdb(cle, "NNode/ChangeAwareArrayList", 795); + bcb(269, 1, {}, pGb); + var iN = mdb(cle, "NNode/NNodeBuilder", 269); + bcb(1630, 1, {}, KGb); + _.a = false; + _.f = Ohe; + _.j = 0; + var kN = mdb(cle, "NetworkSimplex", 1630); + bcb(1294, 1, qie, QGb); + _.td = function RGb(a) { + PGb(this.a, BD(a, 680), true, false); + }; + var lN = mdb(ele, "NodeLabelAndSizeCalculator/lambda$0$Type", 1294); + bcb(558, 1, {}, YGb); + _.b = true; + _.c = true; + _.d = true; + _.e = true; + var mN = mdb(ele, "NodeMarginCalculator", 558); + bcb(212, 1, { 212: 1 }); + _.j = false; + _.k = false; + var oN = mdb(fle, "Cell", 212); + bcb(124, 212, { 124: 1, 212: 1 }, aHb); + _.Re = function bHb() { + return _Gb(this); + }; + _.Se = function cHb() { + var a; + a = this.n; + return this.a.a + a.b + a.c; + }; + var nN = mdb(fle, "AtomicCell", 124); + bcb(232, 22, { 3: 1, 35: 1, 22: 1, 232: 1 }, hHb); + var dHb, eHb, fHb; + var pN = ndb(fle, "ContainerArea", 232, CI, jHb, iHb); + var kHb; + bcb(326, 212, hle); + var qN = mdb(fle, "ContainerCell", 326); + bcb(1473, 326, hle, FHb); + _.Re = function GHb() { + var a; + a = 0; + this.e + ? this.b + ? (a = this.b.b) + : !!this.a[1][1] && (a = this.a[1][1].Re()) + : (a = EHb(this, AHb(this, true))); + return a > 0 ? a + this.n.d + this.n.a : 0; + }; + _.Se = function HHb() { + var a, b, c, d, e; + e = 0; + if (this.e) { + this.b ? (e = this.b.a) : !!this.a[1][1] && (e = this.a[1][1].Se()); + } else if (this.g) { + e = EHb(this, yHb(this, null, true)); + } else { + for ( + b = (gHb(), OC(GC(pN, 1), Kie, 232, 0, [dHb, eHb, fHb])), + c = 0, + d = b.length; + c < d; + ++c + ) { + a = b[c]; + e = Math.max(e, EHb(this, yHb(this, a, true))); + } + } + return e > 0 ? e + this.n.b + this.n.c : 0; + }; + _.Te = function IHb() { + var a, b, c, d, e; + if (this.g) { + a = yHb(this, null, false); + for ( + c = (gHb(), OC(GC(pN, 1), Kie, 232, 0, [dHb, eHb, fHb])), + d = 0, + e = c.length; + d < e; + ++d + ) { + b = c[d]; + wHb(this, b, a); + } + } else { + for ( + c = (gHb(), OC(GC(pN, 1), Kie, 232, 0, [dHb, eHb, fHb])), + d = 0, + e = c.length; + d < e; + ++d + ) { + b = c[d]; + a = yHb(this, b, false); + wHb(this, b, a); + } + } + }; + _.Ue = function JHb() { + var a, b, c, d; + b = this.i; + a = this.n; + d = AHb(this, false); + uHb(this, (gHb(), dHb), b.d + a.d, d); + uHb(this, fHb, b.d + b.a - a.a - d[2], d); + c = b.a - a.d - a.a; + if (d[0] > 0) { + d[0] += this.d; + c -= d[0]; + } + if (d[2] > 0) { + d[2] += this.d; + c -= d[2]; + } + this.c.a = Math.max(0, c); + this.c.d = b.d + a.d + (this.c.a - c) / 2; + d[1] = Math.max(d[1], c); + uHb(this, eHb, b.d + a.d + d[0] - (d[1] - c) / 2, d); + }; + _.b = null; + _.d = 0; + _.e = false; + _.f = false; + _.g = false; + var rHb = 0, + sHb = 0; + var rN = mdb(fle, "GridContainerCell", 1473); + bcb(461, 22, { 3: 1, 35: 1, 22: 1, 461: 1 }, OHb); + var KHb, LHb, MHb; + var sN = ndb(fle, "HorizontalLabelAlignment", 461, CI, QHb, PHb); + var RHb; + bcb(306, 212, { 212: 1, 306: 1 }, aIb, bIb, cIb); + _.Re = function dIb() { + return YHb(this); + }; + _.Se = function eIb() { + return ZHb(this); + }; + _.a = 0; + _.c = false; + var tN = mdb(fle, "LabelCell", 306); + bcb(244, 326, { 212: 1, 326: 1, 244: 1 }, mIb); + _.Re = function nIb() { + return fIb(this); + }; + _.Se = function oIb() { + return gIb(this); + }; + _.Te = function rIb() { + hIb(this); + }; + _.Ue = function sIb() { + iIb(this); + }; + _.b = 0; + _.c = 0; + _.d = false; + var yN = mdb(fle, "StripContainerCell", 244); + bcb(1626, 1, Oie, tIb); + _.Mb = function uIb(a) { + return pIb(BD(a, 212)); + }; + var uN = mdb(fle, "StripContainerCell/lambda$0$Type", 1626); + bcb(1627, 1, {}, vIb); + _.Fe = function wIb(a) { + return BD(a, 212).Se(); + }; + var vN = mdb(fle, "StripContainerCell/lambda$1$Type", 1627); + bcb(1628, 1, Oie, xIb); + _.Mb = function yIb(a) { + return qIb(BD(a, 212)); + }; + var wN = mdb(fle, "StripContainerCell/lambda$2$Type", 1628); + bcb(1629, 1, {}, zIb); + _.Fe = function AIb(a) { + return BD(a, 212).Re(); + }; + var xN = mdb(fle, "StripContainerCell/lambda$3$Type", 1629); + bcb(462, 22, { 3: 1, 35: 1, 22: 1, 462: 1 }, FIb); + var BIb, CIb, DIb; + var zN = ndb(fle, "VerticalLabelAlignment", 462, CI, HIb, GIb); + var IIb; + bcb(789, 1, {}, LIb); + _.c = 0; + _.d = 0; + _.k = 0; + _.s = 0; + _.t = 0; + _.v = false; + _.w = 0; + _.D = false; + var CN = mdb(nle, "NodeContext", 789); + bcb(1471, 1, Dke, OIb); + _.ue = function PIb(a, b) { + return NIb(BD(a, 61), BD(b, 61)); + }; + _.Fb = function QIb(a) { + return this === a; + }; + _.ve = function RIb() { + return new tpb(this); + }; + var AN = mdb(nle, "NodeContext/0methodref$comparePortSides$Type", 1471); + bcb(1472, 1, Dke, SIb); + _.ue = function TIb(a, b) { + return MIb(BD(a, 111), BD(b, 111)); + }; + _.Fb = function UIb(a) { + return this === a; + }; + _.ve = function VIb() { + return new tpb(this); + }; + var BN = mdb(nle, "NodeContext/1methodref$comparePortContexts$Type", 1472); + bcb(159, 22, { 3: 1, 35: 1, 22: 1, 159: 1 }, tJb); + var WIb, + XIb, + YIb, + ZIb, + $Ib, + _Ib, + aJb, + bJb, + cJb, + dJb, + eJb, + fJb, + gJb, + hJb, + iJb, + jJb, + kJb, + lJb, + mJb, + nJb, + oJb, + pJb; + var DN = ndb(nle, "NodeLabelLocation", 159, CI, wJb, vJb); + var xJb; + bcb(111, 1, { 111: 1 }, AJb); + _.a = false; + var EN = mdb(nle, "PortContext", 111); + bcb(1476, 1, qie, TJb); + _.td = function UJb(a) { + WHb(BD(a, 306)); + }; + var FN = mdb(qle, rle, 1476); + bcb(1477, 1, Oie, VJb); + _.Mb = function WJb(a) { + return !!BD(a, 111).c; + }; + var GN = mdb(qle, sle, 1477); + bcb(1478, 1, qie, XJb); + _.td = function YJb(a) { + WHb(BD(a, 111).c); + }; + var HN = mdb(qle, "LabelPlacer/lambda$2$Type", 1478); + var ZJb; + bcb(1475, 1, qie, fKb); + _.td = function gKb(a) { + $Jb(); + zJb(BD(a, 111)); + }; + var IN = mdb(qle, "NodeLabelAndSizeUtilities/lambda$0$Type", 1475); + bcb(790, 1, qie, mKb); + _.td = function nKb(a) { + kKb(this.b, this.c, this.a, BD(a, 181)); + }; + _.a = false; + _.c = false; + var JN = mdb(qle, "NodeLabelCellCreator/lambda$0$Type", 790); + bcb(1474, 1, qie, tKb); + _.td = function uKb(a) { + sKb(this.a, BD(a, 181)); + }; + var KN = mdb(qle, "PortContextCreator/lambda$0$Type", 1474); + var BKb; + bcb(1829, 1, {}, VKb); + var MN = mdb(ule, "GreedyRectangleStripOverlapRemover", 1829); + bcb(1830, 1, Dke, XKb); + _.ue = function YKb(a, b) { + return WKb(BD(a, 222), BD(b, 222)); + }; + _.Fb = function ZKb(a) { + return this === a; + }; + _.ve = function $Kb() { + return new tpb(this); + }; + var LN = mdb( + ule, + "GreedyRectangleStripOverlapRemover/0methodref$compareByYCoordinate$Type", + 1830 + ); + bcb(1786, 1, {}, fLb); + _.a = 5; + _.e = 0; + var SN = mdb(ule, "RectangleStripOverlapRemover", 1786); + bcb(1787, 1, Dke, jLb); + _.ue = function kLb(a, b) { + return gLb(BD(a, 222), BD(b, 222)); + }; + _.Fb = function lLb(a) { + return this === a; + }; + _.ve = function mLb() { + return new tpb(this); + }; + var NN = mdb( + ule, + "RectangleStripOverlapRemover/0methodref$compareLeftRectangleBorders$Type", + 1787 + ); + bcb(1789, 1, Dke, nLb); + _.ue = function oLb(a, b) { + return hLb(BD(a, 222), BD(b, 222)); + }; + _.Fb = function pLb(a) { + return this === a; + }; + _.ve = function qLb() { + return new tpb(this); + }; + var ON = mdb( + ule, + "RectangleStripOverlapRemover/1methodref$compareRightRectangleBorders$Type", + 1789 + ); + bcb(406, 22, { 3: 1, 35: 1, 22: 1, 406: 1 }, wLb); + var rLb, sLb, tLb, uLb; + var PN = ndb( + ule, + "RectangleStripOverlapRemover/OverlapRemovalDirection", + 406, + CI, + yLb, + xLb + ); + var zLb; + bcb(222, 1, { 222: 1 }, BLb); + var QN = mdb(ule, "RectangleStripOverlapRemover/RectangleNode", 222); + bcb(1788, 1, qie, CLb); + _.td = function DLb(a) { + aLb(this.a, BD(a, 222)); + }; + var RN = mdb(ule, "RectangleStripOverlapRemover/lambda$1$Type", 1788); + bcb(1304, 1, Dke, GLb); + _.ue = function HLb(a, b) { + return FLb(BD(a, 167), BD(b, 167)); + }; + _.Fb = function ILb(a) { + return this === a; + }; + _.ve = function JLb() { + return new tpb(this); + }; + var WN = mdb( + wle, + "PolyominoCompactor/CornerCasesGreaterThanRestComparator", + 1304 + ); + bcb(1307, 1, {}, KLb); + _.Kb = function LLb(a) { + return BD(a, 324).a; + }; + var TN = mdb( + wle, + "PolyominoCompactor/CornerCasesGreaterThanRestComparator/lambda$0$Type", + 1307 + ); + bcb(1308, 1, Oie, MLb); + _.Mb = function NLb(a) { + return BD(a, 323).a; + }; + var UN = mdb( + wle, + "PolyominoCompactor/CornerCasesGreaterThanRestComparator/lambda$1$Type", + 1308 + ); + bcb(1309, 1, Oie, OLb); + _.Mb = function PLb(a) { + return BD(a, 323).a; + }; + var VN = mdb( + wle, + "PolyominoCompactor/CornerCasesGreaterThanRestComparator/lambda$2$Type", + 1309 + ); + bcb(1302, 1, Dke, RLb); + _.ue = function SLb(a, b) { + return QLb(BD(a, 167), BD(b, 167)); + }; + _.Fb = function TLb(a) { + return this === a; + }; + _.ve = function ULb() { + return new tpb(this); + }; + var YN = mdb( + wle, + "PolyominoCompactor/MinNumOfExtensionDirectionsComparator", + 1302 + ); + bcb(1305, 1, {}, VLb); + _.Kb = function WLb(a) { + return BD(a, 324).a; + }; + var XN = mdb( + wle, + "PolyominoCompactor/MinNumOfExtensionDirectionsComparator/lambda$0$Type", + 1305 + ); + bcb(767, 1, Dke, YLb); + _.ue = function ZLb(a, b) { + return XLb(BD(a, 167), BD(b, 167)); + }; + _.Fb = function $Lb(a) { + return this === a; + }; + _.ve = function _Lb() { + return new tpb(this); + }; + var ZN = mdb(wle, "PolyominoCompactor/MinNumOfExtensionsComparator", 767); + bcb(1300, 1, Dke, bMb); + _.ue = function cMb(a, b) { + return aMb(BD(a, 321), BD(b, 321)); + }; + _.Fb = function dMb(a) { + return this === a; + }; + _.ve = function eMb() { + return new tpb(this); + }; + var _N = mdb(wle, "PolyominoCompactor/MinPerimeterComparator", 1300); + bcb(1301, 1, Dke, gMb); + _.ue = function hMb(a, b) { + return fMb(BD(a, 321), BD(b, 321)); + }; + _.Fb = function iMb(a) { + return this === a; + }; + _.ve = function jMb() { + return new tpb(this); + }; + var $N = mdb( + wle, + "PolyominoCompactor/MinPerimeterComparatorWithShape", + 1301 + ); + bcb(1303, 1, Dke, lMb); + _.ue = function mMb(a, b) { + return kMb(BD(a, 167), BD(b, 167)); + }; + _.Fb = function nMb(a) { + return this === a; + }; + _.ve = function oMb() { + return new tpb(this); + }; + var bO = mdb( + wle, + "PolyominoCompactor/SingleExtensionSideGreaterThanRestComparator", + 1303 + ); + bcb(1306, 1, {}, pMb); + _.Kb = function qMb(a) { + return BD(a, 324).a; + }; + var aO = mdb( + wle, + "PolyominoCompactor/SingleExtensionSideGreaterThanRestComparator/lambda$0$Type", + 1306 + ); + bcb(777, 1, {}, tMb); + _.Ce = function uMb(a, b) { + return sMb(this, BD(a, 46), BD(b, 167)); + }; + var cO = mdb(wle, "SuccessorCombination", 777); + bcb(644, 1, {}, wMb); + _.Ce = function xMb(a, b) { + var c; + return vMb(((c = BD(a, 46)), BD(b, 167), c)); + }; + var dO = mdb(wle, "SuccessorJitter", 644); + bcb(643, 1, {}, zMb); + _.Ce = function AMb(a, b) { + var c; + return yMb(((c = BD(a, 46)), BD(b, 167), c)); + }; + var eO = mdb(wle, "SuccessorLineByLine", 643); + bcb(568, 1, {}, CMb); + _.Ce = function DMb(a, b) { + var c; + return BMb(((c = BD(a, 46)), BD(b, 167), c)); + }; + var fO = mdb(wle, "SuccessorManhattan", 568); + bcb(1356, 1, {}, FMb); + _.Ce = function GMb(a, b) { + var c; + return EMb(((c = BD(a, 46)), BD(b, 167), c)); + }; + var gO = mdb(wle, "SuccessorMaxNormWindingInMathPosSense", 1356); + bcb(400, 1, {}, JMb); + _.Ce = function KMb(a, b) { + return HMb(this, a, b); + }; + _.c = false; + _.d = false; + _.e = false; + _.f = false; + var iO = mdb(wle, "SuccessorQuadrantsGeneric", 400); + bcb(1357, 1, {}, LMb); + _.Kb = function MMb(a) { + return BD(a, 324).a; + }; + var hO = mdb(wle, "SuccessorQuadrantsGeneric/lambda$0$Type", 1357); + bcb(323, 22, { 3: 1, 35: 1, 22: 1, 323: 1 }, SMb); + _.a = false; + var NMb, OMb, PMb, QMb; + var jO = ndb(Ble, Cle, 323, CI, UMb, TMb); + var VMb; + bcb(1298, 1, {}); + _.Ib = function bNb() { + var a, b, c, d, e, f; + c = " "; + a = meb(0); + for (e = 0; e < this.o; e++) { + c += "" + a.a; + a = meb(XMb(a.a)); + } + c += "\n"; + a = meb(0); + for (f = 0; f < this.p; f++) { + c += "" + a.a; + a = meb(XMb(a.a)); + for (d = 0; d < this.o; d++) { + b = _Mb(this, d, f); + ybb(b, 0) == 0 + ? (c += "_") + : ybb(b, 1) == 0 + ? (c += "X") + : (c += "0"); + } + c += "\n"; + } + return qfb(c, 0, c.length - 1); + }; + _.o = 0; + _.p = 0; + var nO = mdb(Ble, "TwoBitGrid", 1298); + bcb(321, 1298, { 321: 1 }, pNb); + _.j = 0; + _.k = 0; + var kO = mdb(Ble, "PlanarGrid", 321); + bcb(167, 321, { 321: 1, 167: 1 }); + _.g = 0; + _.i = 0; + var lO = mdb(Ble, "Polyomino", 167); + var P3 = odb(Hle, Ile); + bcb(134, 1, Jle, zNb); + _.Ye = function DNb(a, b) { + return xNb(this, a, b); + }; + _.Ve = function ANb() { + return uNb(this); + }; + _.We = function BNb(a) { + return vNb(this, a); + }; + _.Xe = function CNb(a) { + return wNb(this, a); + }; + var R3 = mdb(Hle, "MapPropertyHolder", 134); + bcb(1299, 134, Jle, ENb); + var mO = mdb(Ble, "Polyominoes", 1299); + var FNb = false, + GNb, + HNb; + bcb(1766, 1, qie, PNb); + _.td = function QNb(a) { + JNb(BD(a, 221)); + }; + var oO = mdb(Kle, "DepthFirstCompaction/0methodref$compactTree$Type", 1766); + bcb(810, 1, qie, RNb); + _.td = function SNb(a) { + MNb(this.a, BD(a, 221)); + }; + var pO = mdb(Kle, "DepthFirstCompaction/lambda$1$Type", 810); + bcb(1767, 1, qie, TNb); + _.td = function UNb(a) { + NNb(this.a, this.b, this.c, BD(a, 221)); + }; + var qO = mdb(Kle, "DepthFirstCompaction/lambda$2$Type", 1767); + var VNb, WNb; + bcb(65, 1, { 65: 1 }, aOb); + var rO = mdb(Kle, "Node", 65); + bcb(1250, 1, {}, dOb); + var wO = mdb(Kle, "ScanlineOverlapCheck", 1250); + bcb(1251, 1, { 679: 1 }, hOb); + _.Ke = function iOb(a) { + fOb(this, BD(a, 440)); + }; + var tO = mdb(Kle, "ScanlineOverlapCheck/OverlapsScanlineHandler", 1251); + bcb(1252, 1, Dke, kOb); + _.ue = function lOb(a, b) { + return jOb(BD(a, 65), BD(b, 65)); + }; + _.Fb = function mOb(a) { + return this === a; + }; + _.ve = function nOb() { + return new tpb(this); + }; + var sO = mdb( + Kle, + "ScanlineOverlapCheck/OverlapsScanlineHandler/lambda$0$Type", + 1252 + ); + bcb(440, 1, { 440: 1 }, oOb); + _.a = false; + var uO = mdb(Kle, "ScanlineOverlapCheck/Timestamp", 440); + bcb(1253, 1, Dke, pOb); + _.ue = function qOb(a, b) { + return eOb(BD(a, 440), BD(b, 440)); + }; + _.Fb = function rOb(a) { + return this === a; + }; + _.ve = function sOb() { + return new tpb(this); + }; + var vO = mdb(Kle, "ScanlineOverlapCheck/lambda$0$Type", 1253); + bcb(550, 1, {}, tOb); + var xO = mdb(Lle, "SVGImage", 550); + bcb(324, 1, { 324: 1 }, uOb); + _.Ib = function vOb() { + return "(" + this.a + She + this.b + She + this.c + ")"; + }; + var yO = mdb(Lle, "UniqueTriple", 324); + bcb(209, 1, Mle); + var g0 = mdb(Nle, "AbstractLayoutProvider", 209); + bcb(1132, 209, Mle, yOb); + _.Ze = function zOb(a, b) { + var c, d, e, f; + Odd(b, Ole, 1); + this.a = Edb(ED(hkd(a, (CPb(), BPb)))); + if (ikd(a, rPb)) { + e = GD(hkd(a, rPb)); + c = h4c(n4c(), e); + if (c) { + d = BD(hgd(c.f), 209); + d.Ze(a, Udd(b, 1)); + } + } + f = new AQb(this.a); + this.b = yQb(f, a); + switch (BD(hkd(a, (nPb(), jPb)), 481).g) { + case 0: + BOb(new FOb(), this.b); + jkd(a, uPb, vNb(this.b, uPb)); + break; + default: + Zfb(); + } + qQb(f); + jkd(a, tPb, this.b); + Qdd(b); + }; + _.a = 0; + var zO = mdb(Ple, "DisCoLayoutProvider", 1132); + bcb(1244, 1, {}, FOb); + _.c = false; + _.e = 0; + _.f = 0; + var AO = mdb(Ple, "DisCoPolyominoCompactor", 1244); + bcb(561, 1, { 561: 1 }, MOb); + _.b = true; + var BO = mdb(Qle, "DCComponent", 561); + bcb(394, 22, { 3: 1, 35: 1, 22: 1, 394: 1 }, SOb); + _.a = false; + var NOb, OOb, POb, QOb; + var CO = ndb(Qle, "DCDirection", 394, CI, UOb, TOb); + var VOb; + bcb(266, 134, { 3: 1, 266: 1, 94: 1, 134: 1 }, XOb); + var DO = mdb(Qle, "DCElement", 266); + bcb(395, 1, { 395: 1 }, ZOb); + _.c = 0; + var EO = mdb(Qle, "DCExtension", 395); + bcb(755, 134, Jle, aPb); + var FO = mdb(Qle, "DCGraph", 755); + bcb(481, 22, { 3: 1, 35: 1, 22: 1, 481: 1 }, dPb); + var bPb; + var GO = ndb(Rle, Sle, 481, CI, fPb, ePb); + var gPb; + bcb(854, 1, ale, oPb); + _.Qe = function pPb(a) { + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), Tle), Xle), + "Connected Components Compaction Strategy" + ), + "Strategy for packing different connected components in order to save space and enhance readability of a graph." + ), + kPb + ), + (_5c(), V5c) + ), + GO + ), + pqb((N5c(), L5c)) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + z5c( + D5c( + A5c(B5c(new H5c(), Ule), Xle), + "Connected Components Layout Algorithm" + ), + "A layout algorithm that is to be applied to each connected component before the components themselves are compacted. If unspecified, the positions of the components' nodes are not altered." + ), + Z5c + ), + ZI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + z5c( + D5c(A5c(B5c(new H5c(), Vle), "debug"), "DCGraph"), + "Access to the DCGraph is intended for the debug view," + ), + Y5c + ), + SI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + z5c( + D5c(A5c(B5c(new H5c(), Wle), "debug"), "List of Polyominoes"), + "Access to the polyominoes is intended for the debug view," + ), + Y5c + ), + SI + ), + pqb(L5c) + ) + ) + ); + DPb((new EPb(), a)); + }; + var iPb, jPb, kPb, lPb, mPb; + var HO = mdb(Rle, "DisCoMetaDataProvider", 854); + bcb(998, 1, ale, EPb); + _.Qe = function FPb(a) { + DPb(a); + }; + var qPb, rPb, sPb, tPb, uPb, vPb, wPb, xPb, yPb, zPb, APb, BPb; + var JO = mdb(Rle, "DisCoOptions", 998); + bcb(999, 1, {}, GPb); + _.$e = function HPb() { + var a; + return (a = new yOb()), a; + }; + _._e = function IPb(a) {}; + var IO = mdb(Rle, "DisCoOptions/DiscoFactory", 999); + bcb(562, 167, { 321: 1, 167: 1, 562: 1 }, MPb); + _.a = 0; + _.b = 0; + _.c = 0; + _.d = 0; + var KO = mdb("org.eclipse.elk.alg.disco.structures", "DCPolyomino", 562); + var NPb, OPb, PPb; + bcb(1268, 1, Oie, aQb); + _.Mb = function bQb(a) { + return _Pb(a); + }; + var LO = mdb(bme, "ElkGraphComponentsProcessor/lambda$0$Type", 1268); + bcb(1269, 1, {}, cQb); + _.Kb = function dQb(a) { + return QPb(), jtd(BD(a, 79)); + }; + var MO = mdb(bme, "ElkGraphComponentsProcessor/lambda$1$Type", 1269); + bcb(1270, 1, Oie, eQb); + _.Mb = function fQb(a) { + return WPb(BD(a, 79)); + }; + var NO = mdb(bme, "ElkGraphComponentsProcessor/lambda$2$Type", 1270); + bcb(1271, 1, {}, gQb); + _.Kb = function hQb(a) { + return QPb(), ltd(BD(a, 79)); + }; + var OO = mdb(bme, "ElkGraphComponentsProcessor/lambda$3$Type", 1271); + bcb(1272, 1, Oie, iQb); + _.Mb = function jQb(a) { + return XPb(BD(a, 79)); + }; + var PO = mdb(bme, "ElkGraphComponentsProcessor/lambda$4$Type", 1272); + bcb(1273, 1, Oie, kQb); + _.Mb = function lQb(a) { + return YPb(this.a, BD(a, 79)); + }; + var QO = mdb(bme, "ElkGraphComponentsProcessor/lambda$5$Type", 1273); + bcb(1274, 1, {}, mQb); + _.Kb = function nQb(a) { + return ZPb(this.a, BD(a, 79)); + }; + var RO = mdb(bme, "ElkGraphComponentsProcessor/lambda$6$Type", 1274); + bcb(1241, 1, {}, AQb); + _.a = 0; + var UO = mdb(bme, "ElkGraphTransformer", 1241); + bcb(1242, 1, {}, CQb); + _.Od = function DQb(a, b) { + BQb(this, BD(a, 160), BD(b, 266)); + }; + var TO = mdb(bme, "ElkGraphTransformer/OffsetApplier", 1242); + bcb(1243, 1, qie, FQb); + _.td = function GQb(a) { + EQb(this, BD(a, 8)); + }; + var SO = mdb( + bme, + "ElkGraphTransformer/OffsetApplier/OffSetToChainApplier", + 1243 + ); + bcb(753, 1, {}, MQb); + var WO = mdb(gme, hme, 753); + bcb(1232, 1, Dke, OQb); + _.ue = function PQb(a, b) { + return NQb(BD(a, 231), BD(b, 231)); + }; + _.Fb = function QQb(a) { + return this === a; + }; + _.ve = function RQb() { + return new tpb(this); + }; + var VO = mdb(gme, ime, 1232); + bcb(740, 209, Mle, ZQb); + _.Ze = function $Qb(a, b) { + WQb(this, a, b); + }; + var XO = mdb(gme, "ForceLayoutProvider", 740); + bcb(357, 134, { 3: 1, 357: 1, 94: 1, 134: 1 }); + var bP = mdb(jme, "FParticle", 357); + bcb(559, 357, { 3: 1, 559: 1, 357: 1, 94: 1, 134: 1 }, aRb); + _.Ib = function bRb() { + var a; + if (this.a) { + a = Jkb(this.a.a, this, 0); + return a >= 0 + ? "b" + a + "[" + fRb(this.a) + "]" + : "b[" + fRb(this.a) + "]"; + } + return "b_" + FCb(this); + }; + var YO = mdb(jme, "FBendpoint", 559); + bcb(282, 134, { 3: 1, 282: 1, 94: 1, 134: 1 }, gRb); + _.Ib = function hRb() { + return fRb(this); + }; + var ZO = mdb(jme, "FEdge", 282); + bcb(231, 134, { 3: 1, 231: 1, 94: 1, 134: 1 }, kRb); + var $O = mdb(jme, "FGraph", 231); + bcb(447, 357, { 3: 1, 447: 1, 357: 1, 94: 1, 134: 1 }, mRb); + _.Ib = function nRb() { + return this.b == null || this.b.length == 0 + ? "l[" + fRb(this.a) + "]" + : "l_" + this.b; + }; + var _O = mdb(jme, "FLabel", 447); + bcb(144, 357, { 3: 1, 144: 1, 357: 1, 94: 1, 134: 1 }, pRb); + _.Ib = function qRb() { + return oRb(this); + }; + _.b = 0; + var aP = mdb(jme, "FNode", 144); + bcb(2003, 1, {}); + _.bf = function vRb(a) { + rRb(this, a); + }; + _.cf = function wRb() { + sRb(this); + }; + _.d = 0; + var cP = mdb(lme, "AbstractForceModel", 2003); + bcb(631, 2003, { 631: 1 }, xRb); + _.af = function zRb(a, b) { + var c, d, e, f, g; + uRb(this.f, a, b); + e = c7c(R6c(b.d), a.d); + g = Math.sqrt(e.a * e.a + e.b * e.b); + d = Math.max(0, g - U6c(a.e) / 2 - U6c(b.e) / 2); + c = jRb(this.e, a, b); + c > 0 + ? (f = -yRb(d, this.c) * c) + : (f = CRb(d, this.b) * BD(vNb(a, (wSb(), oSb)), 19).a); + Y6c(e, f / g); + return e; + }; + _.bf = function ARb(a) { + rRb(this, a); + this.a = BD(vNb(a, (wSb(), eSb)), 19).a; + this.c = Edb(ED(vNb(a, uSb))); + this.b = Edb(ED(vNb(a, qSb))); + }; + _.df = function BRb(a) { + return a < this.a; + }; + _.a = 0; + _.b = 0; + _.c = 0; + var dP = mdb(lme, "EadesModel", 631); + bcb(632, 2003, { 632: 1 }, DRb); + _.af = function FRb(a, b) { + var c, d, e, f, g; + uRb(this.f, a, b); + e = c7c(R6c(b.d), a.d); + g = Math.sqrt(e.a * e.a + e.b * e.b); + d = Math.max(0, g - U6c(a.e) / 2 - U6c(b.e) / 2); + f = JRb(d, this.a) * BD(vNb(a, (wSb(), oSb)), 19).a; + c = jRb(this.e, a, b); + c > 0 && (f -= ERb(d, this.a) * c); + Y6c(e, (f * this.b) / g); + return e; + }; + _.bf = function GRb(a) { + var b, c, d, e, f, g, h; + rRb(this, a); + this.b = Edb(ED(vNb(a, (wSb(), vSb)))); + this.c = this.b / BD(vNb(a, eSb), 19).a; + d = a.e.c.length; + f = 0; + e = 0; + for (h = new olb(a.e); h.a < h.c.c.length; ) { + g = BD(mlb(h), 144); + f += g.e.a; + e += g.e.b; + } + b = f * e; + c = Edb(ED(vNb(a, uSb))) * ple; + this.a = Math.sqrt(b / (2 * d)) * c; + }; + _.cf = function HRb() { + sRb(this); + this.b -= this.c; + }; + _.df = function IRb(a) { + return this.b > 0; + }; + _.a = 0; + _.b = 0; + _.c = 0; + var eP = mdb(lme, "FruchtermanReingoldModel", 632); + bcb(849, 1, ale, TRb); + _.Qe = function URb(a) { + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), mme), ""), "Force Model"), + "Determines the model for force calculation." + ), + MRb + ), + (_5c(), V5c) + ), + gP + ), + pqb((N5c(), L5c)) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), nme), ""), "Iterations"), + "The number of iterations on the force model." + ), + meb(300) + ), + X5c + ), + JI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), ome), ""), "Repulsive Power"), + "Determines how many bend points are added to the edge; such bend points are regarded as repelling particles in the force model" + ), + meb(0) + ), + X5c + ), + JI + ), + pqb(I5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), pme), ""), "FR Temperature"), + "The temperature is used as a scaling factor for particle displacements." + ), + qme + ), + U5c + ), + BI + ), + pqb(L5c) + ) + ) + ); + o4c(a, pme, mme, RRb); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), rme), ""), "Eades Repulsion"), + "Factor for repulsive forces in Eades' model." + ), + 5 + ), + U5c + ), + BI + ), + pqb(L5c) + ) + ) + ); + o4c(a, rme, mme, ORb); + xSb((new ySb(), a)); + }; + var KRb, LRb, MRb, NRb, ORb, PRb, QRb, RRb; + var fP = mdb(sme, "ForceMetaDataProvider", 849); + bcb(424, 22, { 3: 1, 35: 1, 22: 1, 424: 1 }, YRb); + var VRb, WRb; + var gP = ndb(sme, "ForceModelStrategy", 424, CI, $Rb, ZRb); + var _Rb; + bcb(988, 1, ale, ySb); + _.Qe = function zSb(a) { + xSb(a); + }; + var bSb, + cSb, + dSb, + eSb, + fSb, + gSb, + hSb, + iSb, + jSb, + kSb, + lSb, + mSb, + nSb, + oSb, + pSb, + qSb, + rSb, + sSb, + tSb, + uSb, + vSb; + var iP = mdb(sme, "ForceOptions", 988); + bcb(989, 1, {}, ASb); + _.$e = function BSb() { + var a; + return (a = new ZQb()), a; + }; + _._e = function CSb(a) {}; + var hP = mdb(sme, "ForceOptions/ForceFactory", 989); + var DSb, ESb, FSb, GSb; + bcb(850, 1, ale, PSb); + _.Qe = function QSb(a) { + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Mme), ""), "Fixed Position"), + "Prevent that the node is moved by the layout algorithm." + ), + (Bcb(), false) + ), + (_5c(), T5c) + ), + wI + ), + pqb((N5c(), K5c)) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Nme), ""), "Desired Edge Length"), + "Either specified for parent nodes or for individual edges, where the latter takes higher precedence." + ), + 100 + ), + U5c + ), + BI + ), + qqb(L5c, OC(GC(e1, 1), Kie, 175, 0, [I5c])) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Ome), ""), "Layout Dimension"), + "Dimensions that are permitted to be altered during layout." + ), + KSb + ), + V5c + ), + oP + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Pme), ""), "Stress Epsilon"), + "Termination criterion for the iterative process." + ), + qme + ), + U5c + ), + BI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Qme), ""), "Iteration Limit"), + "Maximum number of performed iterations. Takes higher precedence than 'epsilon'." + ), + meb(Ohe) + ), + X5c + ), + JI + ), + pqb(L5c) + ) + ) + ); + cTb((new dTb(), a)); + }; + var ISb, JSb, KSb, LSb, MSb, NSb; + var jP = mdb(sme, "StressMetaDataProvider", 850); + bcb(992, 1, ale, dTb); + _.Qe = function eTb(a) { + cTb(a); + }; + var RSb, SSb, TSb, USb, VSb, WSb, XSb, YSb, ZSb, $Sb, _Sb, aTb; + var lP = mdb(sme, "StressOptions", 992); + bcb(993, 1, {}, fTb); + _.$e = function gTb() { + var a; + return (a = new iTb()), a; + }; + _._e = function hTb(a) {}; + var kP = mdb(sme, "StressOptions/StressFactory", 993); + bcb(1128, 209, Mle, iTb); + _.Ze = function jTb(a, b) { + var c, d, e, f, g; + Odd(b, Sme, 1); + Ccb(DD(hkd(a, (bTb(), VSb)))) + ? Ccb(DD(hkd(a, _Sb))) || $Cb(((c = new _Cb((Pgd(), new bhd(a)))), c)) + : WQb(new ZQb(), a, Udd(b, 1)); + e = TQb(a); + d = LQb(this.a, e); + for (g = d.Kc(); g.Ob(); ) { + f = BD(g.Pb(), 231); + if (f.e.c.length <= 1) { + continue; + } + sTb(this.b, f); + qTb(this.b); + Hkb(f.d, new kTb()); + } + e = KQb(d); + SQb(e); + Qdd(b); + }; + var nP = mdb(Ume, "StressLayoutProvider", 1128); + bcb(1129, 1, qie, kTb); + _.td = function lTb(a) { + lRb(BD(a, 447)); + }; + var mP = mdb(Ume, "StressLayoutProvider/lambda$0$Type", 1129); + bcb(990, 1, {}, tTb); + _.c = 0; + _.e = 0; + _.g = 0; + var qP = mdb(Ume, "StressMajorization", 990); + bcb(379, 22, { 3: 1, 35: 1, 22: 1, 379: 1 }, zTb); + var vTb, wTb, xTb; + var oP = ndb(Ume, "StressMajorization/Dimension", 379, CI, BTb, ATb); + var CTb; + bcb(991, 1, Dke, ETb); + _.ue = function FTb(a, b) { + return uTb(this.a, BD(a, 144), BD(b, 144)); + }; + _.Fb = function GTb(a) { + return this === a; + }; + _.ve = function HTb() { + return new tpb(this); + }; + var pP = mdb(Ume, "StressMajorization/lambda$0$Type", 991); + bcb(1229, 1, {}, PTb); + var tP = mdb(Wme, "ElkLayered", 1229); + bcb(1230, 1, qie, STb); + _.td = function TTb(a) { + QTb(BD(a, 37)); + }; + var rP = mdb(Wme, "ElkLayered/lambda$0$Type", 1230); + bcb(1231, 1, qie, UTb); + _.td = function VTb(a) { + RTb(this.a, BD(a, 37)); + }; + var sP = mdb(Wme, "ElkLayered/lambda$1$Type", 1231); + bcb(1263, 1, {}, bUb); + var WTb, XTb, YTb; + var xP = mdb(Wme, "GraphConfigurator", 1263); + bcb(759, 1, qie, dUb); + _.td = function eUb(a) { + $Tb(this.a, BD(a, 10)); + }; + var uP = mdb(Wme, "GraphConfigurator/lambda$0$Type", 759); + bcb(760, 1, {}, fUb); + _.Kb = function gUb(a) { + return ZTb(), new YAb(null, new Kub(BD(a, 29).a, 16)); + }; + var vP = mdb(Wme, "GraphConfigurator/lambda$1$Type", 760); + bcb(761, 1, qie, hUb); + _.td = function iUb(a) { + $Tb(this.a, BD(a, 10)); + }; + var wP = mdb(Wme, "GraphConfigurator/lambda$2$Type", 761); + bcb(1127, 209, Mle, jUb); + _.Ze = function kUb(a, b) { + var c; + c = U1b(new a2b(), a); + PD(hkd(a, (Nyc(), axc))) === PD((hbd(), ebd)) + ? JTb(this.a, c, b) + : KTb(this.a, c, b); + z2b(new D2b(), c); + }; + var yP = mdb(Wme, "LayeredLayoutProvider", 1127); + bcb(356, 22, { 3: 1, 35: 1, 22: 1, 356: 1 }, rUb); + var lUb, mUb, nUb, oUb, pUb; + var zP = ndb(Wme, "LayeredPhases", 356, CI, tUb, sUb); + var uUb; + bcb(1651, 1, {}, CUb); + _.i = 0; + var wUb; + var CP = mdb(Xme, "ComponentsToCGraphTransformer", 1651); + var hVb; + bcb(1652, 1, {}, DUb); + _.ef = function EUb(a, b) { + return Math.min( + a.a != null ? Edb(a.a) : a.c.i, + b.a != null ? Edb(b.a) : b.c.i + ); + }; + _.ff = function FUb(a, b) { + return Math.min( + a.a != null ? Edb(a.a) : a.c.i, + b.a != null ? Edb(b.a) : b.c.i + ); + }; + var AP = mdb(Xme, "ComponentsToCGraphTransformer/1", 1652); + bcb(81, 1, { 81: 1 }); + _.i = 0; + _.k = true; + _.o = Qje; + var IP = mdb(Yme, "CNode", 81); + bcb(460, 81, { 460: 1, 81: 1 }, GUb, HUb); + _.Ib = function IUb() { + return ""; + }; + var BP = mdb(Xme, "ComponentsToCGraphTransformer/CRectNode", 460); + bcb(1623, 1, {}, VUb); + var JUb, KUb; + var FP = mdb(Xme, "OneDimensionalComponentsCompaction", 1623); + bcb(1624, 1, {}, YUb); + _.Kb = function ZUb(a) { + return WUb(BD(a, 46)); + }; + _.Fb = function $Ub(a) { + return this === a; + }; + var DP = mdb(Xme, "OneDimensionalComponentsCompaction/lambda$0$Type", 1624); + bcb(1625, 1, {}, _Ub); + _.Kb = function aVb(a) { + return XUb(BD(a, 46)); + }; + _.Fb = function bVb(a) { + return this === a; + }; + var EP = mdb(Xme, "OneDimensionalComponentsCompaction/lambda$1$Type", 1625); + bcb(1654, 1, {}, dVb); + var GP = mdb(Yme, "CGraph", 1654); + bcb(189, 1, { 189: 1 }, gVb); + _.b = 0; + _.c = 0; + _.e = 0; + _.g = true; + _.i = Qje; + var HP = mdb(Yme, "CGroup", 189); + bcb(1653, 1, {}, jVb); + _.ef = function kVb(a, b) { + return Math.max( + a.a != null ? Edb(a.a) : a.c.i, + b.a != null ? Edb(b.a) : b.c.i + ); + }; + _.ff = function lVb(a, b) { + return Math.max( + a.a != null ? Edb(a.a) : a.c.i, + b.a != null ? Edb(b.a) : b.c.i + ); + }; + var JP = mdb(Yme, Ike, 1653); + bcb(1655, 1, {}, CVb); + _.d = false; + var mVb; + var LP = mdb(Yme, Nke, 1655); + bcb(1656, 1, {}, DVb); + _.Kb = function EVb(a) { + return nVb(), Bcb(), BD(BD(a, 46).a, 81).d.e != 0 ? true : false; + }; + _.Fb = function FVb(a) { + return this === a; + }; + var KP = mdb(Yme, Oke, 1656); + bcb(823, 1, {}, IVb); + _.a = false; + _.b = false; + _.c = false; + _.d = false; + var MP = mdb(Yme, Pke, 823); + bcb(1825, 1, {}, OVb); + var RP = mdb(Zme, Qke, 1825); + var bQ = odb($me, Fke); + bcb(1826, 1, { 369: 1 }, SVb); + _.Ke = function TVb(a) { + QVb(this, BD(a, 466)); + }; + var OP = mdb(Zme, Rke, 1826); + bcb(1827, 1, Dke, VVb); + _.ue = function WVb(a, b) { + return UVb(BD(a, 81), BD(b, 81)); + }; + _.Fb = function XVb(a) { + return this === a; + }; + _.ve = function YVb() { + return new tpb(this); + }; + var NP = mdb(Zme, Ske, 1827); + bcb(466, 1, { 466: 1 }, ZVb); + _.a = false; + var PP = mdb(Zme, Tke, 466); + bcb(1828, 1, Dke, $Vb); + _.ue = function _Vb(a, b) { + return PVb(BD(a, 466), BD(b, 466)); + }; + _.Fb = function aWb(a) { + return this === a; + }; + _.ve = function bWb() { + return new tpb(this); + }; + var QP = mdb(Zme, Uke, 1828); + bcb(140, 1, { 140: 1 }, cWb, dWb); + _.Fb = function eWb(a) { + var b; + if (a == null) { + return false; + } + if (TP != rb(a)) { + return false; + } + b = BD(a, 140); + return wtb(this.c, b.c) && wtb(this.d, b.d); + }; + _.Hb = function fWb() { + return Hlb(OC(GC(SI, 1), Uhe, 1, 5, [this.c, this.d])); + }; + _.Ib = function gWb() { + return "(" + this.c + She + this.d + (this.a ? "cx" : "") + this.b + ")"; + }; + _.a = true; + _.c = 0; + _.d = 0; + var TP = mdb($me, "Point", 140); + bcb(405, 22, { 3: 1, 35: 1, 22: 1, 405: 1 }, oWb); + var hWb, iWb, jWb, kWb; + var SP = ndb($me, "Point/Quadrant", 405, CI, sWb, rWb); + var tWb; + bcb(1642, 1, {}, CWb); + _.b = null; + _.c = null; + _.d = null; + _.e = null; + _.f = null; + var vWb, wWb, xWb, yWb, zWb; + var aQ = mdb($me, "RectilinearConvexHull", 1642); + bcb(574, 1, { 369: 1 }, NWb); + _.Ke = function OWb(a) { + MWb(this, BD(a, 140)); + }; + _.b = 0; + var KWb; + var VP = mdb($me, "RectilinearConvexHull/MaximalElementsEventHandler", 574); + bcb(1644, 1, Dke, QWb); + _.ue = function RWb(a, b) { + return PWb(ED(a), ED(b)); + }; + _.Fb = function SWb(a) { + return this === a; + }; + _.ve = function TWb() { + return new tpb(this); + }; + var UP = mdb( + $me, + "RectilinearConvexHull/MaximalElementsEventHandler/lambda$0$Type", + 1644 + ); + bcb(1643, 1, { 369: 1 }, VWb); + _.Ke = function WWb(a) { + UWb(this, BD(a, 140)); + }; + _.a = 0; + _.b = null; + _.c = null; + _.d = null; + _.e = null; + var WP = mdb($me, "RectilinearConvexHull/RectangleEventHandler", 1643); + bcb(1645, 1, Dke, XWb); + _.ue = function YWb(a, b) { + return EWb(BD(a, 140), BD(b, 140)); + }; + _.Fb = function ZWb(a) { + return this === a; + }; + _.ve = function $Wb() { + return new tpb(this); + }; + var XP = mdb($me, "RectilinearConvexHull/lambda$0$Type", 1645); + bcb(1646, 1, Dke, _Wb); + _.ue = function aXb(a, b) { + return FWb(BD(a, 140), BD(b, 140)); + }; + _.Fb = function bXb(a) { + return this === a; + }; + _.ve = function cXb() { + return new tpb(this); + }; + var YP = mdb($me, "RectilinearConvexHull/lambda$1$Type", 1646); + bcb(1647, 1, Dke, dXb); + _.ue = function eXb(a, b) { + return GWb(BD(a, 140), BD(b, 140)); + }; + _.Fb = function fXb(a) { + return this === a; + }; + _.ve = function gXb() { + return new tpb(this); + }; + var ZP = mdb($me, "RectilinearConvexHull/lambda$2$Type", 1647); + bcb(1648, 1, Dke, hXb); + _.ue = function iXb(a, b) { + return HWb(BD(a, 140), BD(b, 140)); + }; + _.Fb = function jXb(a) { + return this === a; + }; + _.ve = function kXb() { + return new tpb(this); + }; + var $P = mdb($me, "RectilinearConvexHull/lambda$3$Type", 1648); + bcb(1649, 1, Dke, lXb); + _.ue = function mXb(a, b) { + return IWb(BD(a, 140), BD(b, 140)); + }; + _.Fb = function nXb(a) { + return this === a; + }; + _.ve = function oXb() { + return new tpb(this); + }; + var _P = mdb($me, "RectilinearConvexHull/lambda$4$Type", 1649); + bcb(1650, 1, {}, qXb); + var cQ = mdb($me, "Scanline", 1650); + bcb(2005, 1, {}); + var dQ = mdb(_me, "AbstractGraphPlacer", 2005); + bcb(325, 1, { 325: 1 }, AXb); + _.mf = function BXb(a) { + if (this.nf(a)) { + Rc(this.b, BD(vNb(a, (wtc(), Esc)), 21), a); + return true; + } else { + return false; + } + }; + _.nf = function CXb(a) { + var b, c, d, e; + b = BD(vNb(a, (wtc(), Esc)), 21); + e = BD(Qc(wXb, b), 21); + for (d = e.Kc(); d.Ob(); ) { + c = BD(d.Pb(), 21); + if (!BD(Qc(this.b, c), 15).dc()) { + return false; + } + } + return true; + }; + var wXb; + var gQ = mdb(_me, "ComponentGroup", 325); + bcb(765, 2005, {}, HXb); + _.of = function IXb(a) { + var b, c; + for (c = new olb(this.a); c.a < c.c.c.length; ) { + b = BD(mlb(c), 325); + if (b.mf(a)) { + return; + } + } + Ekb(this.a, new AXb(a)); + }; + _.lf = function JXb(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o; + this.a.c = KC(SI, Uhe, 1, 0, 5, 1); + b.a.c = KC(SI, Uhe, 1, 0, 5, 1); + if (a.dc()) { + b.f.a = 0; + b.f.b = 0; + return; + } + g = BD(a.Xb(0), 37); + tNb(b, g); + for (e = a.Kc(); e.Ob(); ) { + d = BD(e.Pb(), 37); + this.of(d); + } + o = new d7c(); + f = Edb(ED(vNb(g, (Nyc(), kyc)))); + for (j = new olb(this.a); j.a < j.c.c.length; ) { + h = BD(mlb(j), 325); + k = DXb(h, f); + vXb(Uc(h.b), o.a, o.b); + o.a += k.a; + o.b += k.b; + } + b.f.a = o.a - f; + b.f.b = o.b - f; + if (Ccb(DD(vNb(g, qwc))) && PD(vNb(g, Swc)) === PD((Aad(), wad))) { + for (n = a.Kc(); n.Ob(); ) { + l = BD(n.Pb(), 37); + uXb(l, l.c.a, l.c.b); + } + c = new gYb(); + YXb(c, a, f); + for (m = a.Kc(); m.Ob(); ) { + l = BD(m.Pb(), 37); + P6c(X6c(l.c), c.e); + } + P6c(X6c(b.f), c.a); + } + for (i = new olb(this.a); i.a < i.c.c.length; ) { + h = BD(mlb(i), 325); + tXb(b, Uc(h.b)); + } + }; + var eQ = mdb(_me, "ComponentGroupGraphPlacer", 765); + bcb(1293, 765, {}, LXb); + _.of = function MXb(a) { + KXb(this, a); + }; + _.lf = function NXb(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t; + this.a.c = KC(SI, Uhe, 1, 0, 5, 1); + b.a.c = KC(SI, Uhe, 1, 0, 5, 1); + if (a.dc()) { + b.f.a = 0; + b.f.b = 0; + return; + } + g = BD(a.Xb(0), 37); + tNb(b, g); + for (e = a.Kc(); e.Ob(); ) { + d = BD(e.Pb(), 37); + KXb(this, d); + } + t = new d7c(); + s = new d7c(); + p = new d7c(); + o = new d7c(); + f = Edb(ED(vNb(g, (Nyc(), kyc)))); + for (j = new olb(this.a); j.a < j.c.c.length; ) { + h = BD(mlb(j), 325); + if (fad(BD(vNb(b, (Y9c(), z8c)), 103))) { + p.a = t.a; + for (r = new Mv(Pc(Fc(h.b).a).a.kc()); r.b.Ob(); ) { + q = BD(Lv(r.b.Pb()), 21); + if (q.Hc((Ucd(), Acd))) { + p.a = s.a; + break; + } + } + } else if (gad(BD(vNb(b, z8c), 103))) { + p.b = t.b; + for (r = new Mv(Pc(Fc(h.b).a).a.kc()); r.b.Ob(); ) { + q = BD(Lv(r.b.Pb()), 21); + if (q.Hc((Ucd(), Tcd))) { + p.b = s.b; + break; + } + } + } + k = DXb(BD(h, 570), f); + vXb(Uc(h.b), p.a, p.b); + if (fad(BD(vNb(b, z8c), 103))) { + s.a = p.a + k.a; + o.a = Math.max(o.a, s.a); + for (r = new Mv(Pc(Fc(h.b).a).a.kc()); r.b.Ob(); ) { + q = BD(Lv(r.b.Pb()), 21); + if (q.Hc((Ucd(), Rcd))) { + t.a = p.a + k.a; + break; + } + } + s.b = p.b + k.b; + p.b = s.b; + o.b = Math.max(o.b, p.b); + } else if (gad(BD(vNb(b, z8c), 103))) { + s.b = p.b + k.b; + o.b = Math.max(o.b, s.b); + for (r = new Mv(Pc(Fc(h.b).a).a.kc()); r.b.Ob(); ) { + q = BD(Lv(r.b.Pb()), 21); + if (q.Hc((Ucd(), zcd))) { + t.b = p.b + k.b; + break; + } + } + s.a = p.a + k.a; + p.a = s.a; + o.a = Math.max(o.a, p.a); + } + } + b.f.a = o.a - f; + b.f.b = o.b - f; + if (Ccb(DD(vNb(g, qwc))) && PD(vNb(g, Swc)) === PD((Aad(), wad))) { + for (n = a.Kc(); n.Ob(); ) { + l = BD(n.Pb(), 37); + uXb(l, l.c.a, l.c.b); + } + c = new gYb(); + YXb(c, a, f); + for (m = a.Kc(); m.Ob(); ) { + l = BD(m.Pb(), 37); + P6c(X6c(l.c), c.e); + } + P6c(X6c(b.f), c.a); + } + for (i = new olb(this.a); i.a < i.c.c.length; ) { + h = BD(mlb(i), 325); + tXb(b, Uc(h.b)); + } + }; + var fQ = mdb(_me, "ComponentGroupModelOrderGraphPlacer", 1293); + bcb(423, 22, { 3: 1, 35: 1, 22: 1, 423: 1 }, SXb); + var OXb, PXb, QXb; + var hQ = ndb(_me, "ComponentOrderingStrategy", 423, CI, UXb, TXb); + var VXb; + bcb(650, 1, {}, gYb); + var pQ = mdb(_me, "ComponentsCompactor", 650); + bcb(1468, 12, ake, jYb); + _.Fc = function kYb(a) { + return hYb(this, BD(a, 140)); + }; + var iQ = mdb(_me, "ComponentsCompactor/Hullpoints", 1468); + bcb(1465, 1, { 841: 1 }, mYb); + _.a = false; + var jQ = mdb(_me, "ComponentsCompactor/InternalComponent", 1465); + bcb(1464, 1, vie, nYb); + _.Jc = function oYb(a) { + reb(this, a); + }; + _.Kc = function pYb() { + return new olb(this.a); + }; + var kQ = mdb(_me, "ComponentsCompactor/InternalConnectedComponents", 1464); + bcb(1467, 1, { 594: 1 }, qYb); + _.hf = function sYb() { + return null; + }; + _.jf = function tYb() { + return this.a; + }; + _.gf = function rYb() { + return cYb(this.d); + }; + _.kf = function uYb() { + return this.b; + }; + var lQ = mdb(_me, "ComponentsCompactor/InternalExternalExtension", 1467); + bcb(1466, 1, { 594: 1 }, vYb); + _.jf = function yYb() { + return this.a; + }; + _.gf = function wYb() { + return cYb(this.d); + }; + _.hf = function xYb() { + return this.c; + }; + _.kf = function zYb() { + return this.b; + }; + var mQ = mdb( + _me, + "ComponentsCompactor/InternalUnionExternalExtension", + 1466 + ); + bcb(1470, 1, {}, AYb); + var nQ = mdb(_me, "ComponentsCompactor/OuterSegments", 1470); + bcb(1469, 1, {}, BYb); + var oQ = mdb(_me, "ComponentsCompactor/Segments", 1469); + bcb(1264, 1, {}, FYb); + var rQ = mdb(_me, hme, 1264); + bcb(1265, 1, Dke, HYb); + _.ue = function IYb(a, b) { + return GYb(BD(a, 37), BD(b, 37)); + }; + _.Fb = function JYb(a) { + return this === a; + }; + _.ve = function KYb() { + return new tpb(this); + }; + var qQ = mdb(_me, "ComponentsProcessor/lambda$0$Type", 1265); + bcb(570, 325, { 325: 1, 570: 1 }, PYb); + _.mf = function QYb(a) { + return NYb(this, a); + }; + _.nf = function RYb(a) { + return OYb(this, a); + }; + var LYb; + var sQ = mdb(_me, "ModelOrderComponentGroup", 570); + bcb(1291, 2005, {}, SYb); + _.lf = function TYb(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w; + if (a.gc() == 1) { + t = BD(a.Xb(0), 37); + if (t != b) { + b.a.c = KC(SI, Uhe, 1, 0, 5, 1); + sXb(b, t, 0, 0); + tNb(b, t); + u_b(b.d, t.d); + b.f.a = t.f.a; + b.f.b = t.f.b; + } + return; + } else if (a.dc()) { + b.a.c = KC(SI, Uhe, 1, 0, 5, 1); + b.f.a = 0; + b.f.b = 0; + return; + } + if (PD(vNb(b, (Nyc(), twc))) === PD((RXb(), QXb))) { + for (i = a.Kc(); i.Ob(); ) { + g = BD(i.Pb(), 37); + r = 0; + for (p = new olb(g.a); p.a < p.c.c.length; ) { + o = BD(mlb(p), 10); + r += BD(vNb(o, byc), 19).a; + } + g.p = r; + } + mmb(); + a.ad(new VYb()); + } + f = BD(a.Xb(0), 37); + b.a.c = KC(SI, Uhe, 1, 0, 5, 1); + tNb(b, f); + n = 0; + u = 0; + for (j = a.Kc(); j.Ob(); ) { + g = BD(j.Pb(), 37); + s = g.f; + n = Math.max(n, s.a); + u += s.a * s.b; + } + n = Math.max(n, Math.sqrt(u) * Edb(ED(vNb(b, owc)))); + e = Edb(ED(vNb(b, kyc))); + v = 0; + w = 0; + m = 0; + c = e; + for (h = a.Kc(); h.Ob(); ) { + g = BD(h.Pb(), 37); + s = g.f; + if (v + s.a > n) { + v = 0; + w += m + e; + m = 0; + } + q = g.c; + uXb(g, v + q.a, w + q.b); + X6c(q); + c = Math.max(c, v + s.a); + m = Math.max(m, s.b); + v += s.a + e; + } + b.f.a = c; + b.f.b = w + m; + if (Ccb(DD(vNb(f, qwc)))) { + d = new gYb(); + YXb(d, a, e); + for (l = a.Kc(); l.Ob(); ) { + k = BD(l.Pb(), 37); + P6c(X6c(k.c), d.e); + } + P6c(X6c(b.f), d.a); + } + tXb(b, a); + }; + var uQ = mdb(_me, "SimpleRowGraphPlacer", 1291); + bcb(1292, 1, Dke, VYb); + _.ue = function WYb(a, b) { + return UYb(BD(a, 37), BD(b, 37)); + }; + _.Fb = function XYb(a) { + return this === a; + }; + _.ve = function YYb() { + return new tpb(this); + }; + var tQ = mdb(_me, "SimpleRowGraphPlacer/1", 1292); + var ZYb; + bcb(1262, 1, Vke, dZb); + _.Lb = function eZb(a) { + var b; + return (b = BD(vNb(BD(a, 243).b, (Nyc(), jxc)), 74)), !!b && b.b != 0; + }; + _.Fb = function fZb(a) { + return this === a; + }; + _.Mb = function gZb(a) { + var b; + return (b = BD(vNb(BD(a, 243).b, (Nyc(), jxc)), 74)), !!b && b.b != 0; + }; + var vQ = mdb(dne, "CompoundGraphPostprocessor/1", 1262); + bcb(1261, 1, ene, wZb); + _.pf = function xZb(a, b) { + qZb(this, BD(a, 37), b); + }; + var xQ = mdb(dne, "CompoundGraphPreprocessor", 1261); + bcb(441, 1, { 441: 1 }, yZb); + _.c = false; + var wQ = mdb(dne, "CompoundGraphPreprocessor/ExternalPort", 441); + bcb(243, 1, { 243: 1 }, BZb); + _.Ib = function CZb() { + return Zr(this.c) + ":" + TZb(this.b); + }; + var zQ = mdb(dne, "CrossHierarchyEdge", 243); + bcb(763, 1, Dke, EZb); + _.ue = function FZb(a, b) { + return DZb(this, BD(a, 243), BD(b, 243)); + }; + _.Fb = function GZb(a) { + return this === a; + }; + _.ve = function IZb() { + return new tpb(this); + }; + var yQ = mdb(dne, "CrossHierarchyEdgeComparator", 763); + bcb(299, 134, { 3: 1, 299: 1, 94: 1, 134: 1 }); + _.p = 0; + var JQ = mdb(fne, "LGraphElement", 299); + bcb(17, 299, { 3: 1, 17: 1, 299: 1, 94: 1, 134: 1 }, UZb); + _.Ib = function VZb() { + return TZb(this); + }; + var AQ = mdb(fne, "LEdge", 17); + bcb(37, 299, { 3: 1, 20: 1, 37: 1, 299: 1, 94: 1, 134: 1 }, XZb); + _.Jc = function YZb(a) { + reb(this, a); + }; + _.Kc = function ZZb() { + return new olb(this.b); + }; + _.Ib = function $Zb() { + if (this.b.c.length == 0) { + return "G-unlayered" + Fe(this.a); + } else if (this.a.c.length == 0) { + return "G-layered" + Fe(this.b); + } + return "G[layerless" + Fe(this.a) + ", layers" + Fe(this.b) + "]"; + }; + var KQ = mdb(fne, "LGraph", 37); + var _Zb; + bcb(657, 1, {}); + _.qf = function b$b() { + return this.e.n; + }; + _.We = function c$b(a) { + return vNb(this.e, a); + }; + _.rf = function d$b() { + return this.e.o; + }; + _.sf = function e$b() { + return this.e.p; + }; + _.Xe = function f$b(a) { + return wNb(this.e, a); + }; + _.tf = function g$b(a) { + this.e.n.a = a.a; + this.e.n.b = a.b; + }; + _.uf = function h$b(a) { + this.e.o.a = a.a; + this.e.o.b = a.b; + }; + _.vf = function i$b(a) { + this.e.p = a; + }; + var BQ = mdb(fne, "LGraphAdapters/AbstractLShapeAdapter", 657); + bcb(577, 1, { 839: 1 }, j$b); + _.wf = function k$b() { + var a, b; + if (!this.b) { + this.b = Pu(this.a.b.c.length); + for (b = new olb(this.a.b); b.a < b.c.c.length; ) { + a = BD(mlb(b), 70); + Ekb(this.b, new v$b(a)); + } + } + return this.b; + }; + _.b = null; + var CQ = mdb(fne, "LGraphAdapters/LEdgeAdapter", 577); + bcb(656, 1, {}, l$b); + _.xf = function m$b() { + var a, b, c, d, e, f; + if (!this.b) { + this.b = new Rkb(); + for (d = new olb(this.a.b); d.a < d.c.c.length; ) { + c = BD(mlb(d), 29); + for (f = new olb(c.a); f.a < f.c.c.length; ) { + e = BD(mlb(f), 10); + if (this.c.Mb(e)) { + Ekb(this.b, new x$b(this, e, this.e)); + if (this.d) { + if (wNb(e, (wtc(), vtc))) { + for (b = BD(vNb(e, vtc), 15).Kc(); b.Ob(); ) { + a = BD(b.Pb(), 10); + Ekb(this.b, new x$b(this, a, false)); + } + } + if (wNb(e, tsc)) { + for (b = BD(vNb(e, tsc), 15).Kc(); b.Ob(); ) { + a = BD(b.Pb(), 10); + Ekb(this.b, new x$b(this, a, false)); + } + } + } + } + } + } + } + return this.b; + }; + _.qf = function n$b() { + throw vbb(new cgb(hne)); + }; + _.We = function o$b(a) { + return vNb(this.a, a); + }; + _.rf = function p$b() { + return this.a.f; + }; + _.sf = function q$b() { + return this.a.p; + }; + _.Xe = function r$b(a) { + return wNb(this.a, a); + }; + _.tf = function s$b(a) { + throw vbb(new cgb(hne)); + }; + _.uf = function t$b(a) { + this.a.f.a = a.a; + this.a.f.b = a.b; + }; + _.vf = function u$b(a) { + this.a.p = a; + }; + _.b = null; + _.d = false; + _.e = false; + var DQ = mdb(fne, "LGraphAdapters/LGraphAdapter", 656); + bcb(576, 657, { 181: 1 }, v$b); + var EQ = mdb(fne, "LGraphAdapters/LLabelAdapter", 576); + bcb(575, 657, { 680: 1 }, x$b); + _.yf = function y$b() { + return this.b; + }; + _.zf = function z$b() { + return mmb(), mmb(), jmb; + }; + _.wf = function A$b() { + var a, b; + if (!this.a) { + this.a = Pu(BD(this.e, 10).b.c.length); + for (b = new olb(BD(this.e, 10).b); b.a < b.c.c.length; ) { + a = BD(mlb(b), 70); + Ekb(this.a, new v$b(a)); + } + } + return this.a; + }; + _.Af = function B$b() { + var a; + a = BD(this.e, 10).d; + return new J_b(a.d, a.c, a.a, a.b); + }; + _.Bf = function C$b() { + return mmb(), mmb(), jmb; + }; + _.Cf = function D$b() { + var a, b; + if (!this.c) { + this.c = Pu(BD(this.e, 10).j.c.length); + for (b = new olb(BD(this.e, 10).j); b.a < b.c.c.length; ) { + a = BD(mlb(b), 11); + Ekb(this.c, new I$b(a, this.d)); + } + } + return this.c; + }; + _.Df = function E$b() { + return Ccb(DD(vNb(BD(this.e, 10), (wtc(), wsc)))); + }; + _.Ef = function F$b(a) { + BD(this.e, 10).d.b = a.b; + BD(this.e, 10).d.d = a.d; + BD(this.e, 10).d.c = a.c; + BD(this.e, 10).d.a = a.a; + }; + _.Ff = function G$b(a) { + BD(this.e, 10).f.b = a.b; + BD(this.e, 10).f.d = a.d; + BD(this.e, 10).f.c = a.c; + BD(this.e, 10).f.a = a.a; + }; + _.Gf = function H$b() { + w$b(this, (a$b(), _Zb)); + }; + _.a = null; + _.b = null; + _.c = null; + _.d = false; + var FQ = mdb(fne, "LGraphAdapters/LNodeAdapter", 575); + bcb(1722, 657, { 838: 1 }, I$b); + _.zf = function J$b() { + var a, b, c, d; + if (this.d && BD(this.e, 11).i.k == (j0b(), i0b)) { + return mmb(), mmb(), jmb; + } else if (!this.a) { + this.a = new Rkb(); + for (c = new olb(BD(this.e, 11).e); c.a < c.c.c.length; ) { + a = BD(mlb(c), 17); + Ekb(this.a, new j$b(a)); + } + if (this.d) { + d = BD(vNb(BD(this.e, 11), (wtc(), gtc)), 10); + if (d) { + for (b = new Sr(ur(R_b(d).a.Kc(), new Sq())); Qr(b); ) { + a = BD(Rr(b), 17); + Ekb(this.a, new j$b(a)); + } + } + } + } + return this.a; + }; + _.wf = function K$b() { + var a, b; + if (!this.b) { + this.b = Pu(BD(this.e, 11).f.c.length); + for (b = new olb(BD(this.e, 11).f); b.a < b.c.c.length; ) { + a = BD(mlb(b), 70); + Ekb(this.b, new v$b(a)); + } + } + return this.b; + }; + _.Bf = function L$b() { + var a, b, c, d; + if (this.d && BD(this.e, 11).i.k == (j0b(), i0b)) { + return mmb(), mmb(), jmb; + } else if (!this.c) { + this.c = new Rkb(); + for (c = new olb(BD(this.e, 11).g); c.a < c.c.c.length; ) { + a = BD(mlb(c), 17); + Ekb(this.c, new j$b(a)); + } + if (this.d) { + d = BD(vNb(BD(this.e, 11), (wtc(), gtc)), 10); + if (d) { + for (b = new Sr(ur(U_b(d).a.Kc(), new Sq())); Qr(b); ) { + a = BD(Rr(b), 17); + Ekb(this.c, new j$b(a)); + } + } + } + } + return this.c; + }; + _.Hf = function M$b() { + return BD(this.e, 11).j; + }; + _.If = function N$b() { + return Ccb(DD(vNb(BD(this.e, 11), (wtc(), Nsc)))); + }; + _.a = null; + _.b = null; + _.c = null; + _.d = false; + var GQ = mdb(fne, "LGraphAdapters/LPortAdapter", 1722); + bcb(1723, 1, Dke, P$b); + _.ue = function Q$b(a, b) { + return O$b(BD(a, 11), BD(b, 11)); + }; + _.Fb = function R$b(a) { + return this === a; + }; + _.ve = function S$b() { + return new tpb(this); + }; + var HQ = mdb(fne, "LGraphAdapters/PortComparator", 1723); + bcb(804, 1, Oie, T$b); + _.Mb = function U$b(a) { + return BD(a, 10), a$b(), true; + }; + var IQ = mdb(fne, "LGraphAdapters/lambda$0$Type", 804); + bcb(392, 299, { 3: 1, 299: 1, 392: 1, 94: 1, 134: 1 }); + var bR = mdb(fne, "LShape", 392); + bcb(70, 392, { 3: 1, 299: 1, 70: 1, 392: 1, 94: 1, 134: 1 }, p_b, q_b); + _.Ib = function r_b() { + var a; + a = o_b(this); + return a == null ? "label" : "l_" + a; + }; + var LQ = mdb(fne, "LLabel", 70); + bcb(207, 1, { 3: 1, 4: 1, 207: 1, 414: 1 }); + _.Fb = function C_b(a) { + var b; + if (JD(a, 207)) { + b = BD(a, 207); + return this.d == b.d && this.a == b.a && this.b == b.b && this.c == b.c; + } else { + return false; + } + }; + _.Hb = function D_b() { + var a, b; + a = Hdb(this.b) << 16; + a |= Hdb(this.a) & aje; + b = Hdb(this.c) << 16; + b |= Hdb(this.d) & aje; + return a ^ b; + }; + _.Jf = function F_b(b) { + var c, d, e, f, g, h, i, j, k, l, m; + g = 0; + while (g < b.length && E_b((BCb(g, b.length), b.charCodeAt(g)), mne)) { + ++g; + } + c = b.length; + while (c > 0 && E_b((BCb(c - 1, b.length), b.charCodeAt(c - 1)), nne)) { + --c; + } + if (g < c) { + l = mfb(b.substr(g, c - g), ",|;"); + try { + for (i = l, j = 0, k = i.length; j < k; ++j) { + h = i[j]; + f = mfb(h, "="); + if (f.length != 2) { + throw vbb(new Wdb("Expecting a list of key-value pairs.")); + } + e = ufb(f[0]); + m = Hcb(ufb(f[1])); + dfb(e, "top") + ? (this.d = m) + : dfb(e, "left") + ? (this.b = m) + : dfb(e, "bottom") + ? (this.a = m) + : dfb(e, "right") && (this.c = m); + } + } catch (a) { + a = ubb(a); + if (JD(a, 127)) { + d = a; + throw vbb(new Wdb(one + d)); + } else throw vbb(a); + } + } + }; + _.Ib = function G_b() { + return ( + "[top=" + + this.d + + ",left=" + + this.b + + ",bottom=" + + this.a + + ",right=" + + this.c + + "]" + ); + }; + _.a = 0; + _.b = 0; + _.c = 0; + _.d = 0; + var n1 = mdb(pne, "Spacing", 207); + bcb(142, 207, qne, H_b, I_b, J_b, K_b); + var i1 = mdb(pne, "ElkMargin", 142); + bcb(651, 142, qne, L_b); + var MQ = mdb(fne, "LMargin", 651); + bcb(10, 392, { 3: 1, 299: 1, 10: 1, 392: 1, 94: 1, 134: 1 }, b0b); + _.Ib = function c0b() { + return a0b(this); + }; + _.i = false; + var OQ = mdb(fne, "LNode", 10); + bcb(267, 22, { 3: 1, 35: 1, 22: 1, 267: 1 }, k0b); + var d0b, e0b, f0b, g0b, h0b, i0b; + var NQ = ndb(fne, "LNode/NodeType", 267, CI, m0b, l0b); + var n0b; + bcb(116, 207, rne, p0b, q0b, r0b); + var j1 = mdb(pne, "ElkPadding", 116); + bcb(764, 116, rne, s0b); + var PQ = mdb(fne, "LPadding", 764); + bcb(11, 392, { 3: 1, 299: 1, 11: 1, 392: 1, 94: 1, 134: 1 }, H0b); + _.Ib = function I0b() { + var a, b, c; + a = new Ufb(); + Qfb(((a.a += "p_"), a), C0b(this)); + !!this.i && Qfb(Pfb(((a.a += "["), a), this.i), "]"); + if ( + this.e.c.length == 1 && + this.g.c.length == 0 && + BD(Ikb(this.e, 0), 17).c != this + ) { + b = BD(Ikb(this.e, 0), 17).c; + Qfb(((a.a += " << "), a), C0b(b)); + Qfb(Pfb(((a.a += "["), a), b.i), "]"); + } + if ( + this.e.c.length == 0 && + this.g.c.length == 1 && + BD(Ikb(this.g, 0), 17).d != this + ) { + c = BD(Ikb(this.g, 0), 17).d; + Qfb(((a.a += " >> "), a), C0b(c)); + Qfb(Pfb(((a.a += "["), a), c.i), "]"); + } + return a.a; + }; + _.c = true; + _.d = false; + var t0b, u0b, v0b, w0b, x0b, y0b; + var aR = mdb(fne, "LPort", 11); + bcb(397, 1, vie, J0b); + _.Jc = function K0b(a) { + reb(this, a); + }; + _.Kc = function L0b() { + var a; + a = new olb(this.a.e); + return new M0b(a); + }; + var RQ = mdb(fne, "LPort/1", 397); + bcb(1290, 1, aie, M0b); + _.Nb = function N0b(a) { + Rrb(this, a); + }; + _.Pb = function P0b() { + return BD(mlb(this.a), 17).c; + }; + _.Ob = function O0b() { + return llb(this.a); + }; + _.Qb = function Q0b() { + nlb(this.a); + }; + var QQ = mdb(fne, "LPort/1/1", 1290); + bcb(359, 1, vie, R0b); + _.Jc = function S0b(a) { + reb(this, a); + }; + _.Kc = function T0b() { + var a; + return (a = new olb(this.a.g)), new U0b(a); + }; + var TQ = mdb(fne, "LPort/2", 359); + bcb(762, 1, aie, U0b); + _.Nb = function V0b(a) { + Rrb(this, a); + }; + _.Pb = function X0b() { + return BD(mlb(this.a), 17).d; + }; + _.Ob = function W0b() { + return llb(this.a); + }; + _.Qb = function Y0b() { + nlb(this.a); + }; + var SQ = mdb(fne, "LPort/2/1", 762); + bcb(1283, 1, vie, Z0b); + _.Jc = function $0b(a) { + reb(this, a); + }; + _.Kc = function _0b() { + return new b1b(this); + }; + var VQ = mdb(fne, "LPort/CombineIter", 1283); + bcb(201, 1, aie, b1b); + _.Nb = function c1b(a) { + Rrb(this, a); + }; + _.Qb = function f1b() { + Srb(); + }; + _.Ob = function d1b() { + return a1b(this); + }; + _.Pb = function e1b() { + return llb(this.a) ? mlb(this.a) : mlb(this.b); + }; + var UQ = mdb(fne, "LPort/CombineIter/1", 201); + bcb(1285, 1, Vke, h1b); + _.Lb = function i1b(a) { + return g1b(a); + }; + _.Fb = function j1b(a) { + return this === a; + }; + _.Mb = function k1b(a) { + return z0b(), BD(a, 11).e.c.length != 0; + }; + var WQ = mdb(fne, "LPort/lambda$0$Type", 1285); + bcb(1284, 1, Vke, m1b); + _.Lb = function n1b(a) { + return l1b(a); + }; + _.Fb = function o1b(a) { + return this === a; + }; + _.Mb = function p1b(a) { + return z0b(), BD(a, 11).g.c.length != 0; + }; + var XQ = mdb(fne, "LPort/lambda$1$Type", 1284); + bcb(1286, 1, Vke, q1b); + _.Lb = function r1b(a) { + return z0b(), BD(a, 11).j == (Ucd(), Acd); + }; + _.Fb = function s1b(a) { + return this === a; + }; + _.Mb = function t1b(a) { + return z0b(), BD(a, 11).j == (Ucd(), Acd); + }; + var YQ = mdb(fne, "LPort/lambda$2$Type", 1286); + bcb(1287, 1, Vke, u1b); + _.Lb = function v1b(a) { + return z0b(), BD(a, 11).j == (Ucd(), zcd); + }; + _.Fb = function w1b(a) { + return this === a; + }; + _.Mb = function x1b(a) { + return z0b(), BD(a, 11).j == (Ucd(), zcd); + }; + var ZQ = mdb(fne, "LPort/lambda$3$Type", 1287); + bcb(1288, 1, Vke, y1b); + _.Lb = function z1b(a) { + return z0b(), BD(a, 11).j == (Ucd(), Rcd); + }; + _.Fb = function A1b(a) { + return this === a; + }; + _.Mb = function B1b(a) { + return z0b(), BD(a, 11).j == (Ucd(), Rcd); + }; + var $Q = mdb(fne, "LPort/lambda$4$Type", 1288); + bcb(1289, 1, Vke, C1b); + _.Lb = function D1b(a) { + return z0b(), BD(a, 11).j == (Ucd(), Tcd); + }; + _.Fb = function E1b(a) { + return this === a; + }; + _.Mb = function F1b(a) { + return z0b(), BD(a, 11).j == (Ucd(), Tcd); + }; + var _Q = mdb(fne, "LPort/lambda$5$Type", 1289); + bcb(29, 299, { 3: 1, 20: 1, 299: 1, 29: 1, 94: 1, 134: 1 }, H1b); + _.Jc = function I1b(a) { + reb(this, a); + }; + _.Kc = function J1b() { + return new olb(this.a); + }; + _.Ib = function K1b() { + return "L_" + Jkb(this.b.b, this, 0) + Fe(this.a); + }; + var cR = mdb(fne, "Layer", 29); + bcb(1342, 1, {}, a2b); + var mR = mdb(tne, une, 1342); + bcb(1346, 1, {}, e2b); + _.Kb = function f2b(a) { + return atd(BD(a, 82)); + }; + var dR = mdb( + tne, + "ElkGraphImporter/0methodref$connectableShapeToNode$Type", + 1346 + ); + bcb(1349, 1, {}, g2b); + _.Kb = function h2b(a) { + return atd(BD(a, 82)); + }; + var eR = mdb( + tne, + "ElkGraphImporter/1methodref$connectableShapeToNode$Type", + 1349 + ); + bcb(1343, 1, qie, i2b); + _.td = function j2b(a) { + Q1b(this.a, BD(a, 118)); + }; + var fR = mdb(tne, vne, 1343); + bcb(1344, 1, qie, k2b); + _.td = function l2b(a) { + Q1b(this.a, BD(a, 118)); + }; + var gR = mdb(tne, wne, 1344); + bcb(1345, 1, {}, m2b); + _.Kb = function n2b(a) { + return new YAb(null, new Kub(Old(BD(a, 79)), 16)); + }; + var hR = mdb(tne, xne, 1345); + bcb(1347, 1, Oie, o2b); + _.Mb = function p2b(a) { + return b2b(this.a, BD(a, 33)); + }; + var iR = mdb(tne, yne, 1347); + bcb(1348, 1, {}, q2b); + _.Kb = function r2b(a) { + return new YAb(null, new Kub(Nld(BD(a, 79)), 16)); + }; + var jR = mdb(tne, "ElkGraphImporter/lambda$5$Type", 1348); + bcb(1350, 1, Oie, s2b); + _.Mb = function t2b(a) { + return c2b(this.a, BD(a, 33)); + }; + var kR = mdb(tne, "ElkGraphImporter/lambda$7$Type", 1350); + bcb(1351, 1, Oie, u2b); + _.Mb = function v2b(a) { + return d2b(BD(a, 79)); + }; + var lR = mdb(tne, "ElkGraphImporter/lambda$8$Type", 1351); + bcb(1278, 1, {}, D2b); + var w2b; + var rR = mdb(tne, "ElkGraphLayoutTransferrer", 1278); + bcb(1279, 1, Oie, G2b); + _.Mb = function H2b(a) { + return E2b(this.a, BD(a, 17)); + }; + var nR = mdb(tne, "ElkGraphLayoutTransferrer/lambda$0$Type", 1279); + bcb(1280, 1, qie, I2b); + _.td = function J2b(a) { + x2b(); + Ekb(this.a, BD(a, 17)); + }; + var oR = mdb(tne, "ElkGraphLayoutTransferrer/lambda$1$Type", 1280); + bcb(1281, 1, Oie, K2b); + _.Mb = function L2b(a) { + return F2b(this.a, BD(a, 17)); + }; + var pR = mdb(tne, "ElkGraphLayoutTransferrer/lambda$2$Type", 1281); + bcb(1282, 1, qie, M2b); + _.td = function N2b(a) { + x2b(); + Ekb(this.a, BD(a, 17)); + }; + var qR = mdb(tne, "ElkGraphLayoutTransferrer/lambda$3$Type", 1282); + bcb(1485, 1, ene, S2b); + _.pf = function T2b(a, b) { + Q2b(BD(a, 37), b); + }; + var uR = mdb(Ane, "CommentNodeMarginCalculator", 1485); + bcb(1486, 1, {}, U2b); + _.Kb = function V2b(a) { + return new YAb(null, new Kub(BD(a, 29).a, 16)); + }; + var sR = mdb(Ane, "CommentNodeMarginCalculator/lambda$0$Type", 1486); + bcb(1487, 1, qie, W2b); + _.td = function X2b(a) { + R2b(BD(a, 10)); + }; + var tR = mdb(Ane, "CommentNodeMarginCalculator/lambda$1$Type", 1487); + bcb(1488, 1, ene, _2b); + _.pf = function a3b(a, b) { + Z2b(BD(a, 37), b); + }; + var vR = mdb(Ane, "CommentPostprocessor", 1488); + bcb(1489, 1, ene, e3b); + _.pf = function f3b(a, b) { + b3b(BD(a, 37), b); + }; + var wR = mdb(Ane, "CommentPreprocessor", 1489); + bcb(1490, 1, ene, h3b); + _.pf = function i3b(a, b) { + g3b(BD(a, 37), b); + }; + var xR = mdb(Ane, "ConstraintsPostprocessor", 1490); + bcb(1491, 1, ene, p3b); + _.pf = function q3b(a, b) { + n3b(BD(a, 37), b); + }; + var yR = mdb(Ane, "EdgeAndLayerConstraintEdgeReverser", 1491); + bcb(1492, 1, ene, t3b); + _.pf = function v3b(a, b) { + r3b(BD(a, 37), b); + }; + var CR = mdb(Ane, "EndLabelPostprocessor", 1492); + bcb(1493, 1, {}, w3b); + _.Kb = function x3b(a) { + return new YAb(null, new Kub(BD(a, 29).a, 16)); + }; + var zR = mdb(Ane, "EndLabelPostprocessor/lambda$0$Type", 1493); + bcb(1494, 1, Oie, y3b); + _.Mb = function z3b(a) { + return u3b(BD(a, 10)); + }; + var AR = mdb(Ane, "EndLabelPostprocessor/lambda$1$Type", 1494); + bcb(1495, 1, qie, A3b); + _.td = function B3b(a) { + s3b(BD(a, 10)); + }; + var BR = mdb(Ane, "EndLabelPostprocessor/lambda$2$Type", 1495); + bcb(1496, 1, ene, M3b); + _.pf = function P3b(a, b) { + I3b(BD(a, 37), b); + }; + var JR = mdb(Ane, "EndLabelPreprocessor", 1496); + bcb(1497, 1, {}, Q3b); + _.Kb = function R3b(a) { + return new YAb(null, new Kub(BD(a, 29).a, 16)); + }; + var DR = mdb(Ane, "EndLabelPreprocessor/lambda$0$Type", 1497); + bcb(1498, 1, qie, S3b); + _.td = function T3b(a) { + E3b(this.a, this.b, this.c, BD(a, 10)); + }; + _.a = 0; + _.b = 0; + _.c = false; + var ER = mdb(Ane, "EndLabelPreprocessor/lambda$1$Type", 1498); + bcb(1499, 1, Oie, U3b); + _.Mb = function V3b(a) { + return PD(vNb(BD(a, 70), (Nyc(), Qwc))) === PD((qad(), pad)); + }; + var FR = mdb(Ane, "EndLabelPreprocessor/lambda$2$Type", 1499); + bcb(1500, 1, qie, W3b); + _.td = function X3b(a) { + Dsb(this.a, BD(a, 70)); + }; + var GR = mdb(Ane, "EndLabelPreprocessor/lambda$3$Type", 1500); + bcb(1501, 1, Oie, Y3b); + _.Mb = function Z3b(a) { + return PD(vNb(BD(a, 70), (Nyc(), Qwc))) === PD((qad(), oad)); + }; + var HR = mdb(Ane, "EndLabelPreprocessor/lambda$4$Type", 1501); + bcb(1502, 1, qie, $3b); + _.td = function _3b(a) { + Dsb(this.a, BD(a, 70)); + }; + var IR = mdb(Ane, "EndLabelPreprocessor/lambda$5$Type", 1502); + bcb(1551, 1, ene, i4b); + _.pf = function j4b(a, b) { + f4b(BD(a, 37), b); + }; + var a4b; + var RR = mdb(Ane, "EndLabelSorter", 1551); + bcb(1552, 1, Dke, l4b); + _.ue = function m4b(a, b) { + return k4b(BD(a, 456), BD(b, 456)); + }; + _.Fb = function n4b(a) { + return this === a; + }; + _.ve = function o4b() { + return new tpb(this); + }; + var KR = mdb(Ane, "EndLabelSorter/1", 1552); + bcb(456, 1, { 456: 1 }, p4b); + var LR = mdb(Ane, "EndLabelSorter/LabelGroup", 456); + bcb(1553, 1, {}, q4b); + _.Kb = function r4b(a) { + return b4b(), new YAb(null, new Kub(BD(a, 29).a, 16)); + }; + var MR = mdb(Ane, "EndLabelSorter/lambda$0$Type", 1553); + bcb(1554, 1, Oie, s4b); + _.Mb = function t4b(a) { + return b4b(), BD(a, 10).k == (j0b(), h0b); + }; + var NR = mdb(Ane, "EndLabelSorter/lambda$1$Type", 1554); + bcb(1555, 1, qie, u4b); + _.td = function v4b(a) { + g4b(BD(a, 10)); + }; + var OR = mdb(Ane, "EndLabelSorter/lambda$2$Type", 1555); + bcb(1556, 1, Oie, w4b); + _.Mb = function x4b(a) { + return b4b(), PD(vNb(BD(a, 70), (Nyc(), Qwc))) === PD((qad(), oad)); + }; + var PR = mdb(Ane, "EndLabelSorter/lambda$3$Type", 1556); + bcb(1557, 1, Oie, y4b); + _.Mb = function z4b(a) { + return b4b(), PD(vNb(BD(a, 70), (Nyc(), Qwc))) === PD((qad(), pad)); + }; + var QR = mdb(Ane, "EndLabelSorter/lambda$4$Type", 1557); + bcb(1503, 1, ene, L4b); + _.pf = function M4b(a, b) { + J4b(this, BD(a, 37)); + }; + _.b = 0; + _.c = 0; + var YR = mdb(Ane, "FinalSplineBendpointsCalculator", 1503); + bcb(1504, 1, {}, N4b); + _.Kb = function O4b(a) { + return new YAb(null, new Kub(BD(a, 29).a, 16)); + }; + var SR = mdb(Ane, "FinalSplineBendpointsCalculator/lambda$0$Type", 1504); + bcb(1505, 1, {}, P4b); + _.Kb = function Q4b(a) { + return new YAb( + null, + new Lub(new Sr(ur(U_b(BD(a, 10)).a.Kc(), new Sq()))) + ); + }; + var TR = mdb(Ane, "FinalSplineBendpointsCalculator/lambda$1$Type", 1505); + bcb(1506, 1, Oie, R4b); + _.Mb = function S4b(a) { + return !OZb(BD(a, 17)); + }; + var UR = mdb(Ane, "FinalSplineBendpointsCalculator/lambda$2$Type", 1506); + bcb(1507, 1, Oie, T4b); + _.Mb = function U4b(a) { + return wNb(BD(a, 17), (wtc(), rtc)); + }; + var VR = mdb(Ane, "FinalSplineBendpointsCalculator/lambda$3$Type", 1507); + bcb(1508, 1, qie, V4b); + _.td = function W4b(a) { + C4b(this.a, BD(a, 128)); + }; + var WR = mdb(Ane, "FinalSplineBendpointsCalculator/lambda$4$Type", 1508); + bcb(1509, 1, qie, X4b); + _.td = function Y4b(a) { + smb(BD(a, 17).a); + }; + var XR = mdb(Ane, "FinalSplineBendpointsCalculator/lambda$5$Type", 1509); + bcb(792, 1, ene, u5b); + _.pf = function v5b(a, b) { + l5b(this, BD(a, 37), b); + }; + var $R = mdb(Ane, "GraphTransformer", 792); + bcb(511, 22, { 3: 1, 35: 1, 22: 1, 511: 1 }, z5b); + var w5b, x5b; + var ZR = ndb(Ane, "GraphTransformer/Mode", 511, CI, B5b, A5b); + var C5b; + bcb(1510, 1, ene, I5b); + _.pf = function J5b(a, b) { + F5b(BD(a, 37), b); + }; + var _R = mdb(Ane, "HierarchicalNodeResizingProcessor", 1510); + bcb(1511, 1, ene, Q5b); + _.pf = function R5b(a, b) { + M5b(BD(a, 37), b); + }; + var bS = mdb(Ane, "HierarchicalPortConstraintProcessor", 1511); + bcb(1512, 1, Dke, T5b); + _.ue = function U5b(a, b) { + return S5b(BD(a, 10), BD(b, 10)); + }; + _.Fb = function V5b(a) { + return this === a; + }; + _.ve = function W5b() { + return new tpb(this); + }; + var aS = mdb( + Ane, + "HierarchicalPortConstraintProcessor/NodeComparator", + 1512 + ); + bcb(1513, 1, ene, Z5b); + _.pf = function $5b(a, b) { + X5b(BD(a, 37), b); + }; + var cS = mdb(Ane, "HierarchicalPortDummySizeProcessor", 1513); + bcb(1514, 1, ene, l6b); + _.pf = function m6b(a, b) { + e6b(this, BD(a, 37), b); + }; + _.a = 0; + var fS = mdb(Ane, "HierarchicalPortOrthogonalEdgeRouter", 1514); + bcb(1515, 1, Dke, o6b); + _.ue = function p6b(a, b) { + return n6b(BD(a, 10), BD(b, 10)); + }; + _.Fb = function q6b(a) { + return this === a; + }; + _.ve = function r6b() { + return new tpb(this); + }; + var dS = mdb(Ane, "HierarchicalPortOrthogonalEdgeRouter/1", 1515); + bcb(1516, 1, Dke, t6b); + _.ue = function u6b(a, b) { + return s6b(BD(a, 10), BD(b, 10)); + }; + _.Fb = function v6b(a) { + return this === a; + }; + _.ve = function w6b() { + return new tpb(this); + }; + var eS = mdb(Ane, "HierarchicalPortOrthogonalEdgeRouter/2", 1516); + bcb(1517, 1, ene, z6b); + _.pf = function A6b(a, b) { + y6b(BD(a, 37), b); + }; + var gS = mdb(Ane, "HierarchicalPortPositionProcessor", 1517); + bcb(1518, 1, ene, J6b); + _.pf = function K6b(a, b) { + I6b(this, BD(a, 37)); + }; + _.a = 0; + _.c = 0; + var B6b, C6b; + var kS = mdb(Ane, "HighDegreeNodeLayeringProcessor", 1518); + bcb(571, 1, { 571: 1 }, L6b); + _.b = -1; + _.d = -1; + var hS = mdb( + Ane, + "HighDegreeNodeLayeringProcessor/HighDegreeNodeInformation", + 571 + ); + bcb(1519, 1, {}, M6b); + _.Kb = function N6b(a) { + return D6b(), R_b(BD(a, 10)); + }; + _.Fb = function O6b(a) { + return this === a; + }; + var iS = mdb(Ane, "HighDegreeNodeLayeringProcessor/lambda$0$Type", 1519); + bcb(1520, 1, {}, P6b); + _.Kb = function Q6b(a) { + return D6b(), U_b(BD(a, 10)); + }; + _.Fb = function R6b(a) { + return this === a; + }; + var jS = mdb(Ane, "HighDegreeNodeLayeringProcessor/lambda$1$Type", 1520); + bcb(1526, 1, ene, X6b); + _.pf = function Y6b(a, b) { + W6b(this, BD(a, 37), b); + }; + var pS = mdb(Ane, "HyperedgeDummyMerger", 1526); + bcb(793, 1, {}, Z6b); + _.a = false; + _.b = false; + _.c = false; + var lS = mdb(Ane, "HyperedgeDummyMerger/MergeState", 793); + bcb(1527, 1, {}, $6b); + _.Kb = function _6b(a) { + return new YAb(null, new Kub(BD(a, 29).a, 16)); + }; + var mS = mdb(Ane, "HyperedgeDummyMerger/lambda$0$Type", 1527); + bcb(1528, 1, {}, a7b); + _.Kb = function b7b(a) { + return new YAb(null, new Kub(BD(a, 10).j, 16)); + }; + var nS = mdb(Ane, "HyperedgeDummyMerger/lambda$1$Type", 1528); + bcb(1529, 1, qie, c7b); + _.td = function d7b(a) { + BD(a, 11).p = -1; + }; + var oS = mdb(Ane, "HyperedgeDummyMerger/lambda$2$Type", 1529); + bcb(1530, 1, ene, g7b); + _.pf = function h7b(a, b) { + f7b(BD(a, 37), b); + }; + var qS = mdb(Ane, "HypernodesProcessor", 1530); + bcb(1531, 1, ene, j7b); + _.pf = function k7b(a, b) { + i7b(BD(a, 37), b); + }; + var rS = mdb(Ane, "InLayerConstraintProcessor", 1531); + bcb(1532, 1, ene, m7b); + _.pf = function n7b(a, b) { + l7b(BD(a, 37), b); + }; + var sS = mdb(Ane, "InnermostNodeMarginCalculator", 1532); + bcb(1533, 1, ene, r7b); + _.pf = function w7b(a, b) { + q7b(this, BD(a, 37)); + }; + _.a = Qje; + _.b = Qje; + _.c = Pje; + _.d = Pje; + var zS = mdb(Ane, "InteractiveExternalPortPositioner", 1533); + bcb(1534, 1, {}, x7b); + _.Kb = function y7b(a) { + return BD(a, 17).d.i; + }; + _.Fb = function z7b(a) { + return this === a; + }; + var tS = mdb(Ane, "InteractiveExternalPortPositioner/lambda$0$Type", 1534); + bcb(1535, 1, {}, A7b); + _.Kb = function B7b(a) { + return s7b(this.a, ED(a)); + }; + _.Fb = function C7b(a) { + return this === a; + }; + var uS = mdb(Ane, "InteractiveExternalPortPositioner/lambda$1$Type", 1535); + bcb(1536, 1, {}, D7b); + _.Kb = function E7b(a) { + return BD(a, 17).c.i; + }; + _.Fb = function F7b(a) { + return this === a; + }; + var vS = mdb(Ane, "InteractiveExternalPortPositioner/lambda$2$Type", 1536); + bcb(1537, 1, {}, G7b); + _.Kb = function H7b(a) { + return t7b(this.a, ED(a)); + }; + _.Fb = function I7b(a) { + return this === a; + }; + var wS = mdb(Ane, "InteractiveExternalPortPositioner/lambda$3$Type", 1537); + bcb(1538, 1, {}, J7b); + _.Kb = function K7b(a) { + return u7b(this.a, ED(a)); + }; + _.Fb = function L7b(a) { + return this === a; + }; + var xS = mdb(Ane, "InteractiveExternalPortPositioner/lambda$4$Type", 1538); + bcb(1539, 1, {}, M7b); + _.Kb = function N7b(a) { + return v7b(this.a, ED(a)); + }; + _.Fb = function O7b(a) { + return this === a; + }; + var yS = mdb(Ane, "InteractiveExternalPortPositioner/lambda$5$Type", 1539); + bcb(77, 22, { 3: 1, 35: 1, 22: 1, 77: 1, 234: 1 }, T8b); + _.Kf = function U8b() { + switch (this.g) { + case 15: + return new eoc(); + case 22: + return new Aoc(); + case 47: + return new Joc(); + case 28: + case 35: + return new uac(); + case 32: + return new S2b(); + case 42: + return new _2b(); + case 1: + return new e3b(); + case 41: + return new h3b(); + case 56: + return new u5b((y5b(), x5b)); + case 0: + return new u5b((y5b(), w5b)); + case 2: + return new p3b(); + case 54: + return new t3b(); + case 33: + return new M3b(); + case 51: + return new L4b(); + case 55: + return new I5b(); + case 13: + return new Q5b(); + case 38: + return new Z5b(); + case 44: + return new l6b(); + case 40: + return new z6b(); + case 9: + return new J6b(); + case 49: + return new sgc(); + case 37: + return new X6b(); + case 43: + return new g7b(); + case 27: + return new j7b(); + case 30: + return new m7b(); + case 3: + return new r7b(); + case 18: + return new b9b(); + case 29: + return new h9b(); + case 5: + return new u9b(); + case 50: + return new D9b(); + case 34: + return new $9b(); + case 36: + return new Iac(); + case 52: + return new i4b(); + case 11: + return new Sac(); + case 7: + return new abc(); + case 39: + return new obc(); + case 45: + return new rbc(); + case 16: + return new vbc(); + case 10: + return new Fbc(); + case 48: + return new Xbc(); + case 21: + return new ccc(); + case 23: + return new fGc((rGc(), pGc)); + case 8: + return new lcc(); + case 12: + return new tcc(); + case 4: + return new ycc(); + case 19: + return new Tcc(); + case 17: + return new pdc(); + case 53: + return new sdc(); + case 6: + return new hec(); + case 25: + return new wdc(); + case 46: + return new Ndc(); + case 31: + return new sec(); + case 14: + return new Fec(); + case 26: + return new ppc(); + case 20: + return new Uec(); + case 24: + return new fGc((rGc(), qGc)); + default: + throw vbb(new Wdb(Dne + (this.f != null ? this.f : "" + this.g))); + } + }; + var P7b, + Q7b, + R7b, + S7b, + T7b, + U7b, + V7b, + W7b, + X7b, + Y7b, + Z7b, + $7b, + _7b, + a8b, + b8b, + c8b, + d8b, + e8b, + f8b, + g8b, + h8b, + i8b, + j8b, + k8b, + l8b, + m8b, + n8b, + o8b, + p8b, + q8b, + r8b, + s8b, + t8b, + u8b, + v8b, + w8b, + x8b, + y8b, + z8b, + A8b, + B8b, + C8b, + D8b, + E8b, + F8b, + G8b, + H8b, + I8b, + J8b, + K8b, + L8b, + M8b, + N8b, + O8b, + P8b, + Q8b, + R8b; + var AS = ndb(Ane, Ene, 77, CI, W8b, V8b); + var X8b; + bcb(1540, 1, ene, b9b); + _.pf = function c9b(a, b) { + _8b(BD(a, 37), b); + }; + var BS = mdb(Ane, "InvertedPortProcessor", 1540); + bcb(1541, 1, ene, h9b); + _.pf = function i9b(a, b) { + g9b(BD(a, 37), b); + }; + var FS = mdb(Ane, "LabelAndNodeSizeProcessor", 1541); + bcb(1542, 1, Oie, j9b); + _.Mb = function k9b(a) { + return BD(a, 10).k == (j0b(), h0b); + }; + var CS = mdb(Ane, "LabelAndNodeSizeProcessor/lambda$0$Type", 1542); + bcb(1543, 1, Oie, l9b); + _.Mb = function m9b(a) { + return BD(a, 10).k == (j0b(), e0b); + }; + var DS = mdb(Ane, "LabelAndNodeSizeProcessor/lambda$1$Type", 1543); + bcb(1544, 1, qie, n9b); + _.td = function o9b(a) { + e9b(this.b, this.a, this.c, BD(a, 10)); + }; + _.a = false; + _.c = false; + var ES = mdb(Ane, "LabelAndNodeSizeProcessor/lambda$2$Type", 1544); + bcb(1545, 1, ene, u9b); + _.pf = function v9b(a, b) { + s9b(BD(a, 37), b); + }; + var p9b; + var HS = mdb(Ane, "LabelDummyInserter", 1545); + bcb(1546, 1, Vke, w9b); + _.Lb = function x9b(a) { + return PD(vNb(BD(a, 70), (Nyc(), Qwc))) === PD((qad(), nad)); + }; + _.Fb = function y9b(a) { + return this === a; + }; + _.Mb = function z9b(a) { + return PD(vNb(BD(a, 70), (Nyc(), Qwc))) === PD((qad(), nad)); + }; + var GS = mdb(Ane, "LabelDummyInserter/1", 1546); + bcb(1547, 1, ene, D9b); + _.pf = function E9b(a, b) { + C9b(BD(a, 37), b); + }; + var JS = mdb(Ane, "LabelDummyRemover", 1547); + bcb(1548, 1, Oie, F9b); + _.Mb = function G9b(a) { + return Ccb(DD(vNb(BD(a, 70), (Nyc(), Pwc)))); + }; + var IS = mdb(Ane, "LabelDummyRemover/lambda$0$Type", 1548); + bcb(1359, 1, ene, $9b); + _.pf = function cac(a, b) { + W9b(this, BD(a, 37), b); + }; + _.a = null; + var H9b; + var QS = mdb(Ane, "LabelDummySwitcher", 1359); + bcb(286, 1, { 286: 1 }, gac); + _.c = 0; + _.d = null; + _.f = 0; + var KS = mdb(Ane, "LabelDummySwitcher/LabelDummyInfo", 286); + bcb(1360, 1, {}, hac); + _.Kb = function iac(a) { + return I9b(), new YAb(null, new Kub(BD(a, 29).a, 16)); + }; + var LS = mdb(Ane, "LabelDummySwitcher/lambda$0$Type", 1360); + bcb(1361, 1, Oie, jac); + _.Mb = function kac(a) { + return I9b(), BD(a, 10).k == (j0b(), f0b); + }; + var MS = mdb(Ane, "LabelDummySwitcher/lambda$1$Type", 1361); + bcb(1362, 1, {}, lac); + _.Kb = function mac(a) { + return _9b(this.a, BD(a, 10)); + }; + var NS = mdb(Ane, "LabelDummySwitcher/lambda$2$Type", 1362); + bcb(1363, 1, qie, nac); + _.td = function oac(a) { + aac(this.a, BD(a, 286)); + }; + var OS = mdb(Ane, "LabelDummySwitcher/lambda$3$Type", 1363); + bcb(1364, 1, Dke, pac); + _.ue = function qac(a, b) { + return bac(BD(a, 286), BD(b, 286)); + }; + _.Fb = function rac(a) { + return this === a; + }; + _.ve = function sac() { + return new tpb(this); + }; + var PS = mdb(Ane, "LabelDummySwitcher/lambda$4$Type", 1364); + bcb(791, 1, ene, uac); + _.pf = function vac(a, b) { + tac(BD(a, 37), b); + }; + var RS = mdb(Ane, "LabelManagementProcessor", 791); + bcb(1549, 1, ene, Iac); + _.pf = function Jac(a, b) { + Cac(BD(a, 37), b); + }; + var TS = mdb(Ane, "LabelSideSelector", 1549); + bcb(1550, 1, Oie, Kac); + _.Mb = function Lac(a) { + return Ccb(DD(vNb(BD(a, 70), (Nyc(), Pwc)))); + }; + var SS = mdb(Ane, "LabelSideSelector/lambda$0$Type", 1550); + bcb(1558, 1, ene, Sac); + _.pf = function Tac(a, b) { + Oac(BD(a, 37), b); + }; + var US = mdb(Ane, "LayerConstraintPostprocessor", 1558); + bcb(1559, 1, ene, abc); + _.pf = function bbc(a, b) { + $ac(BD(a, 37), b); + }; + var Uac; + var WS = mdb(Ane, "LayerConstraintPreprocessor", 1559); + bcb(360, 22, { 3: 1, 35: 1, 22: 1, 360: 1 }, ibc); + var cbc, dbc, ebc, fbc; + var VS = ndb( + Ane, + "LayerConstraintPreprocessor/HiddenNodeConnections", + 360, + CI, + kbc, + jbc + ); + var lbc; + bcb(1560, 1, ene, obc); + _.pf = function pbc(a, b) { + nbc(BD(a, 37), b); + }; + var XS = mdb(Ane, "LayerSizeAndGraphHeightCalculator", 1560); + bcb(1561, 1, ene, rbc); + _.pf = function tbc(a, b) { + qbc(BD(a, 37), b); + }; + var YS = mdb(Ane, "LongEdgeJoiner", 1561); + bcb(1562, 1, ene, vbc); + _.pf = function xbc(a, b) { + ubc(BD(a, 37), b); + }; + var ZS = mdb(Ane, "LongEdgeSplitter", 1562); + bcb(1563, 1, ene, Fbc); + _.pf = function Ibc(a, b) { + Bbc(this, BD(a, 37), b); + }; + _.d = 0; + _.e = 0; + _.i = 0; + _.j = 0; + _.k = 0; + _.n = 0; + var bT = mdb(Ane, "NodePromotion", 1563); + bcb(1564, 1, {}, Jbc); + _.Kb = function Kbc(a) { + return BD(a, 46), Bcb(), true; + }; + _.Fb = function Lbc(a) { + return this === a; + }; + var $S = mdb(Ane, "NodePromotion/lambda$0$Type", 1564); + bcb(1565, 1, {}, Mbc); + _.Kb = function Nbc(a) { + return Gbc(this.a, BD(a, 46)); + }; + _.Fb = function Obc(a) { + return this === a; + }; + _.a = 0; + var _S = mdb(Ane, "NodePromotion/lambda$1$Type", 1565); + bcb(1566, 1, {}, Pbc); + _.Kb = function Qbc(a) { + return Hbc(this.a, BD(a, 46)); + }; + _.Fb = function Rbc(a) { + return this === a; + }; + _.a = 0; + var aT = mdb(Ane, "NodePromotion/lambda$2$Type", 1566); + bcb(1567, 1, ene, Xbc); + _.pf = function Ybc(a, b) { + Sbc(BD(a, 37), b); + }; + var cT = mdb(Ane, "NorthSouthPortPostprocessor", 1567); + bcb(1568, 1, ene, ccc); + _.pf = function ecc(a, b) { + acc(BD(a, 37), b); + }; + var eT = mdb(Ane, "NorthSouthPortPreprocessor", 1568); + bcb(1569, 1, Dke, fcc); + _.ue = function gcc(a, b) { + return dcc(BD(a, 11), BD(b, 11)); + }; + _.Fb = function hcc(a) { + return this === a; + }; + _.ve = function icc() { + return new tpb(this); + }; + var dT = mdb(Ane, "NorthSouthPortPreprocessor/lambda$0$Type", 1569); + bcb(1570, 1, ene, lcc); + _.pf = function ncc(a, b) { + kcc(BD(a, 37), b); + }; + var hT = mdb(Ane, "PartitionMidprocessor", 1570); + bcb(1571, 1, Oie, occ); + _.Mb = function pcc(a) { + return wNb(BD(a, 10), (Nyc(), Nxc)); + }; + var fT = mdb(Ane, "PartitionMidprocessor/lambda$0$Type", 1571); + bcb(1572, 1, qie, qcc); + _.td = function rcc(a) { + mcc(this.a, BD(a, 10)); + }; + var gT = mdb(Ane, "PartitionMidprocessor/lambda$1$Type", 1572); + bcb(1573, 1, ene, tcc); + _.pf = function ucc(a, b) { + scc(BD(a, 37), b); + }; + var iT = mdb(Ane, "PartitionPostprocessor", 1573); + bcb(1574, 1, ene, ycc); + _.pf = function zcc(a, b) { + wcc(BD(a, 37), b); + }; + var nT = mdb(Ane, "PartitionPreprocessor", 1574); + bcb(1575, 1, Oie, Acc); + _.Mb = function Bcc(a) { + return wNb(BD(a, 10), (Nyc(), Nxc)); + }; + var jT = mdb(Ane, "PartitionPreprocessor/lambda$0$Type", 1575); + bcb(1576, 1, {}, Ccc); + _.Kb = function Dcc(a) { + return new YAb( + null, + new Lub(new Sr(ur(U_b(BD(a, 10)).a.Kc(), new Sq()))) + ); + }; + var kT = mdb(Ane, "PartitionPreprocessor/lambda$1$Type", 1576); + bcb(1577, 1, Oie, Ecc); + _.Mb = function Fcc(a) { + return vcc(BD(a, 17)); + }; + var lT = mdb(Ane, "PartitionPreprocessor/lambda$2$Type", 1577); + bcb(1578, 1, qie, Gcc); + _.td = function Hcc(a) { + xcc(BD(a, 17)); + }; + var mT = mdb(Ane, "PartitionPreprocessor/lambda$3$Type", 1578); + bcb(1579, 1, ene, Tcc); + _.pf = function Xcc(a, b) { + Qcc(BD(a, 37), b); + }; + var Icc, Jcc, Kcc, Lcc, Mcc, Ncc; + var tT = mdb(Ane, "PortListSorter", 1579); + bcb(1580, 1, {}, Zcc); + _.Kb = function $cc(a) { + return Occ(), BD(a, 11).e; + }; + var oT = mdb(Ane, "PortListSorter/lambda$0$Type", 1580); + bcb(1581, 1, {}, _cc); + _.Kb = function adc(a) { + return Occ(), BD(a, 11).g; + }; + var pT = mdb(Ane, "PortListSorter/lambda$1$Type", 1581); + bcb(1582, 1, Dke, bdc); + _.ue = function cdc(a, b) { + return Ucc(BD(a, 11), BD(b, 11)); + }; + _.Fb = function ddc(a) { + return this === a; + }; + _.ve = function edc() { + return new tpb(this); + }; + var qT = mdb(Ane, "PortListSorter/lambda$2$Type", 1582); + bcb(1583, 1, Dke, fdc); + _.ue = function gdc(a, b) { + return Vcc(BD(a, 11), BD(b, 11)); + }; + _.Fb = function hdc(a) { + return this === a; + }; + _.ve = function idc() { + return new tpb(this); + }; + var rT = mdb(Ane, "PortListSorter/lambda$3$Type", 1583); + bcb(1584, 1, Dke, jdc); + _.ue = function kdc(a, b) { + return Wcc(BD(a, 11), BD(b, 11)); + }; + _.Fb = function ldc(a) { + return this === a; + }; + _.ve = function mdc() { + return new tpb(this); + }; + var sT = mdb(Ane, "PortListSorter/lambda$4$Type", 1584); + bcb(1585, 1, ene, pdc); + _.pf = function qdc(a, b) { + ndc(BD(a, 37), b); + }; + var uT = mdb(Ane, "PortSideProcessor", 1585); + bcb(1586, 1, ene, sdc); + _.pf = function tdc(a, b) { + rdc(BD(a, 37), b); + }; + var vT = mdb(Ane, "ReversedEdgeRestorer", 1586); + bcb(1591, 1, ene, wdc); + _.pf = function xdc(a, b) { + udc(this, BD(a, 37), b); + }; + var CT = mdb(Ane, "SelfLoopPortRestorer", 1591); + bcb(1592, 1, {}, ydc); + _.Kb = function zdc(a) { + return new YAb(null, new Kub(BD(a, 29).a, 16)); + }; + var wT = mdb(Ane, "SelfLoopPortRestorer/lambda$0$Type", 1592); + bcb(1593, 1, Oie, Adc); + _.Mb = function Bdc(a) { + return BD(a, 10).k == (j0b(), h0b); + }; + var xT = mdb(Ane, "SelfLoopPortRestorer/lambda$1$Type", 1593); + bcb(1594, 1, Oie, Cdc); + _.Mb = function Ddc(a) { + return wNb(BD(a, 10), (wtc(), ntc)); + }; + var yT = mdb(Ane, "SelfLoopPortRestorer/lambda$2$Type", 1594); + bcb(1595, 1, {}, Edc); + _.Kb = function Fdc(a) { + return BD(vNb(BD(a, 10), (wtc(), ntc)), 403); + }; + var zT = mdb(Ane, "SelfLoopPortRestorer/lambda$3$Type", 1595); + bcb(1596, 1, qie, Gdc); + _.td = function Hdc(a) { + vdc(this.a, BD(a, 403)); + }; + var AT = mdb(Ane, "SelfLoopPortRestorer/lambda$4$Type", 1596); + bcb(794, 1, qie, Idc); + _.td = function Jdc(a) { + ljc(BD(a, 101)); + }; + var BT = mdb(Ane, "SelfLoopPortRestorer/lambda$5$Type", 794); + bcb(1597, 1, ene, Ndc); + _.pf = function Pdc(a, b) { + Kdc(BD(a, 37), b); + }; + var LT = mdb(Ane, "SelfLoopPostProcessor", 1597); + bcb(1598, 1, {}, Qdc); + _.Kb = function Rdc(a) { + return new YAb(null, new Kub(BD(a, 29).a, 16)); + }; + var DT = mdb(Ane, "SelfLoopPostProcessor/lambda$0$Type", 1598); + bcb(1599, 1, Oie, Sdc); + _.Mb = function Tdc(a) { + return BD(a, 10).k == (j0b(), h0b); + }; + var ET = mdb(Ane, "SelfLoopPostProcessor/lambda$1$Type", 1599); + bcb(1600, 1, Oie, Udc); + _.Mb = function Vdc(a) { + return wNb(BD(a, 10), (wtc(), ntc)); + }; + var FT = mdb(Ane, "SelfLoopPostProcessor/lambda$2$Type", 1600); + bcb(1601, 1, qie, Wdc); + _.td = function Xdc(a) { + Ldc(BD(a, 10)); + }; + var GT = mdb(Ane, "SelfLoopPostProcessor/lambda$3$Type", 1601); + bcb(1602, 1, {}, Ydc); + _.Kb = function Zdc(a) { + return new YAb(null, new Kub(BD(a, 101).f, 1)); + }; + var HT = mdb(Ane, "SelfLoopPostProcessor/lambda$4$Type", 1602); + bcb(1603, 1, qie, $dc); + _.td = function _dc(a) { + Mdc(this.a, BD(a, 409)); + }; + var IT = mdb(Ane, "SelfLoopPostProcessor/lambda$5$Type", 1603); + bcb(1604, 1, Oie, aec); + _.Mb = function bec(a) { + return !!BD(a, 101).i; + }; + var JT = mdb(Ane, "SelfLoopPostProcessor/lambda$6$Type", 1604); + bcb(1605, 1, qie, cec); + _.td = function dec(a) { + Odc(this.a, BD(a, 101)); + }; + var KT = mdb(Ane, "SelfLoopPostProcessor/lambda$7$Type", 1605); + bcb(1587, 1, ene, hec); + _.pf = function iec(a, b) { + gec(BD(a, 37), b); + }; + var PT = mdb(Ane, "SelfLoopPreProcessor", 1587); + bcb(1588, 1, {}, jec); + _.Kb = function kec(a) { + return new YAb(null, new Kub(BD(a, 101).f, 1)); + }; + var MT = mdb(Ane, "SelfLoopPreProcessor/lambda$0$Type", 1588); + bcb(1589, 1, {}, lec); + _.Kb = function mec(a) { + return BD(a, 409).a; + }; + var NT = mdb(Ane, "SelfLoopPreProcessor/lambda$1$Type", 1589); + bcb(1590, 1, qie, nec); + _.td = function oec(a) { + fec(BD(a, 17)); + }; + var OT = mdb(Ane, "SelfLoopPreProcessor/lambda$2$Type", 1590); + bcb(1606, 1, ene, sec); + _.pf = function tec(a, b) { + qec(this, BD(a, 37), b); + }; + var VT = mdb(Ane, "SelfLoopRouter", 1606); + bcb(1607, 1, {}, uec); + _.Kb = function vec(a) { + return new YAb(null, new Kub(BD(a, 29).a, 16)); + }; + var QT = mdb(Ane, "SelfLoopRouter/lambda$0$Type", 1607); + bcb(1608, 1, Oie, wec); + _.Mb = function xec(a) { + return BD(a, 10).k == (j0b(), h0b); + }; + var RT = mdb(Ane, "SelfLoopRouter/lambda$1$Type", 1608); + bcb(1609, 1, Oie, yec); + _.Mb = function zec(a) { + return wNb(BD(a, 10), (wtc(), ntc)); + }; + var ST = mdb(Ane, "SelfLoopRouter/lambda$2$Type", 1609); + bcb(1610, 1, {}, Aec); + _.Kb = function Bec(a) { + return BD(vNb(BD(a, 10), (wtc(), ntc)), 403); + }; + var TT = mdb(Ane, "SelfLoopRouter/lambda$3$Type", 1610); + bcb(1611, 1, qie, Cec); + _.td = function Dec(a) { + pec(this.a, this.b, BD(a, 403)); + }; + var UT = mdb(Ane, "SelfLoopRouter/lambda$4$Type", 1611); + bcb(1612, 1, ene, Fec); + _.pf = function Iec(a, b) { + Eec(BD(a, 37), b); + }; + var $T = mdb(Ane, "SemiInteractiveCrossMinProcessor", 1612); + bcb(1613, 1, Oie, Jec); + _.Mb = function Kec(a) { + return BD(a, 10).k == (j0b(), h0b); + }; + var WT = mdb(Ane, "SemiInteractiveCrossMinProcessor/lambda$0$Type", 1613); + bcb(1614, 1, Oie, Lec); + _.Mb = function Mec(a) { + return uNb(BD(a, 10))._b((Nyc(), ayc)); + }; + var XT = mdb(Ane, "SemiInteractiveCrossMinProcessor/lambda$1$Type", 1614); + bcb(1615, 1, Dke, Nec); + _.ue = function Oec(a, b) { + return Gec(BD(a, 10), BD(b, 10)); + }; + _.Fb = function Pec(a) { + return this === a; + }; + _.ve = function Qec() { + return new tpb(this); + }; + var YT = mdb(Ane, "SemiInteractiveCrossMinProcessor/lambda$2$Type", 1615); + bcb(1616, 1, {}, Rec); + _.Ce = function Sec(a, b) { + return Hec(BD(a, 10), BD(b, 10)); + }; + var ZT = mdb(Ane, "SemiInteractiveCrossMinProcessor/lambda$3$Type", 1616); + bcb(1618, 1, ene, Uec); + _.pf = function Yec(a, b) { + Tec(BD(a, 37), b); + }; + var bU = mdb(Ane, "SortByInputModelProcessor", 1618); + bcb(1619, 1, Oie, Zec); + _.Mb = function $ec(a) { + return BD(a, 11).g.c.length != 0; + }; + var _T = mdb(Ane, "SortByInputModelProcessor/lambda$0$Type", 1619); + bcb(1620, 1, qie, _ec); + _.td = function afc(a) { + Wec(this.a, BD(a, 11)); + }; + var aU = mdb(Ane, "SortByInputModelProcessor/lambda$1$Type", 1620); + bcb(1693, 803, {}, jfc); + _.Me = function kfc(a) { + var b, c, d, e; + this.c = a; + switch (this.a.g) { + case 2: + b = new Rkb(); + MAb( + JAb(new YAb(null, new Kub(this.c.a.b, 16)), new lgc()), + new ngc(this, b) + ); + nEb(this, new tfc()); + Hkb(b, new xfc()); + b.c = KC(SI, Uhe, 1, 0, 5, 1); + MAb( + JAb(new YAb(null, new Kub(this.c.a.b, 16)), new zfc()), + new Bfc(b) + ); + nEb(this, new Ffc()); + Hkb(b, new Jfc()); + b.c = KC(SI, Uhe, 1, 0, 5, 1); + c = Ntb( + $zb(OAb(new YAb(null, new Kub(this.c.a.b, 16)), new Lfc(this))), + new Nfc() + ); + MAb(new YAb(null, new Kub(this.c.a.a, 16)), new Rfc(c, b)); + nEb(this, new Vfc()); + Hkb(b, new Zfc()); + b.c = KC(SI, Uhe, 1, 0, 5, 1); + break; + case 3: + d = new Rkb(); + nEb(this, new lfc()); + e = Ntb( + $zb(OAb(new YAb(null, new Kub(this.c.a.b, 16)), new pfc(this))), + new Pfc() + ); + MAb( + JAb(new YAb(null, new Kub(this.c.a.b, 16)), new _fc()), + new bgc(e, d) + ); + nEb(this, new fgc()); + Hkb(d, new jgc()); + d.c = KC(SI, Uhe, 1, 0, 5, 1); + break; + default: + throw vbb(new x2c()); + } + }; + _.b = 0; + var AU = mdb(Jne, "EdgeAwareScanlineConstraintCalculation", 1693); + bcb(1694, 1, Vke, lfc); + _.Lb = function mfc(a) { + return JD(BD(a, 57).g, 145); + }; + _.Fb = function nfc(a) { + return this === a; + }; + _.Mb = function ofc(a) { + return JD(BD(a, 57).g, 145); + }; + var cU = mdb( + Jne, + "EdgeAwareScanlineConstraintCalculation/lambda$0$Type", + 1694 + ); + bcb(1695, 1, {}, pfc); + _.Fe = function qfc(a) { + return dfc(this.a, BD(a, 57)); + }; + var dU = mdb( + Jne, + "EdgeAwareScanlineConstraintCalculation/lambda$1$Type", + 1695 + ); + bcb(1703, 1, Pie, rfc); + _.Vd = function sfc() { + cfc(this.a, this.b, -1); + }; + _.b = 0; + var eU = mdb( + Jne, + "EdgeAwareScanlineConstraintCalculation/lambda$10$Type", + 1703 + ); + bcb(1705, 1, Vke, tfc); + _.Lb = function ufc(a) { + return JD(BD(a, 57).g, 145); + }; + _.Fb = function vfc(a) { + return this === a; + }; + _.Mb = function wfc(a) { + return JD(BD(a, 57).g, 145); + }; + var fU = mdb( + Jne, + "EdgeAwareScanlineConstraintCalculation/lambda$11$Type", + 1705 + ); + bcb(1706, 1, qie, xfc); + _.td = function yfc(a) { + BD(a, 365).Vd(); + }; + var gU = mdb( + Jne, + "EdgeAwareScanlineConstraintCalculation/lambda$12$Type", + 1706 + ); + bcb(1707, 1, Oie, zfc); + _.Mb = function Afc(a) { + return JD(BD(a, 57).g, 10); + }; + var hU = mdb( + Jne, + "EdgeAwareScanlineConstraintCalculation/lambda$13$Type", + 1707 + ); + bcb(1709, 1, qie, Bfc); + _.td = function Cfc(a) { + efc(this.a, BD(a, 57)); + }; + var iU = mdb( + Jne, + "EdgeAwareScanlineConstraintCalculation/lambda$14$Type", + 1709 + ); + bcb(1708, 1, Pie, Dfc); + _.Vd = function Efc() { + cfc(this.b, this.a, -1); + }; + _.a = 0; + var jU = mdb( + Jne, + "EdgeAwareScanlineConstraintCalculation/lambda$15$Type", + 1708 + ); + bcb(1710, 1, Vke, Ffc); + _.Lb = function Gfc(a) { + return JD(BD(a, 57).g, 10); + }; + _.Fb = function Hfc(a) { + return this === a; + }; + _.Mb = function Ifc(a) { + return JD(BD(a, 57).g, 10); + }; + var kU = mdb( + Jne, + "EdgeAwareScanlineConstraintCalculation/lambda$16$Type", + 1710 + ); + bcb(1711, 1, qie, Jfc); + _.td = function Kfc(a) { + BD(a, 365).Vd(); + }; + var lU = mdb( + Jne, + "EdgeAwareScanlineConstraintCalculation/lambda$17$Type", + 1711 + ); + bcb(1712, 1, {}, Lfc); + _.Fe = function Mfc(a) { + return ffc(this.a, BD(a, 57)); + }; + var mU = mdb( + Jne, + "EdgeAwareScanlineConstraintCalculation/lambda$18$Type", + 1712 + ); + bcb(1713, 1, {}, Nfc); + _.De = function Ofc() { + return 0; + }; + var nU = mdb( + Jne, + "EdgeAwareScanlineConstraintCalculation/lambda$19$Type", + 1713 + ); + bcb(1696, 1, {}, Pfc); + _.De = function Qfc() { + return 0; + }; + var oU = mdb( + Jne, + "EdgeAwareScanlineConstraintCalculation/lambda$2$Type", + 1696 + ); + bcb(1715, 1, qie, Rfc); + _.td = function Sfc(a) { + gfc(this.a, this.b, BD(a, 307)); + }; + _.a = 0; + var pU = mdb( + Jne, + "EdgeAwareScanlineConstraintCalculation/lambda$20$Type", + 1715 + ); + bcb(1714, 1, Pie, Tfc); + _.Vd = function Ufc() { + bfc(this.a, this.b, -1); + }; + _.b = 0; + var qU = mdb( + Jne, + "EdgeAwareScanlineConstraintCalculation/lambda$21$Type", + 1714 + ); + bcb(1716, 1, Vke, Vfc); + _.Lb = function Wfc(a) { + return BD(a, 57), true; + }; + _.Fb = function Xfc(a) { + return this === a; + }; + _.Mb = function Yfc(a) { + return BD(a, 57), true; + }; + var rU = mdb( + Jne, + "EdgeAwareScanlineConstraintCalculation/lambda$22$Type", + 1716 + ); + bcb(1717, 1, qie, Zfc); + _.td = function $fc(a) { + BD(a, 365).Vd(); + }; + var sU = mdb( + Jne, + "EdgeAwareScanlineConstraintCalculation/lambda$23$Type", + 1717 + ); + bcb(1697, 1, Oie, _fc); + _.Mb = function agc(a) { + return JD(BD(a, 57).g, 10); + }; + var tU = mdb( + Jne, + "EdgeAwareScanlineConstraintCalculation/lambda$3$Type", + 1697 + ); + bcb(1699, 1, qie, bgc); + _.td = function cgc(a) { + hfc(this.a, this.b, BD(a, 57)); + }; + _.a = 0; + var uU = mdb( + Jne, + "EdgeAwareScanlineConstraintCalculation/lambda$4$Type", + 1699 + ); + bcb(1698, 1, Pie, dgc); + _.Vd = function egc() { + cfc(this.b, this.a, -1); + }; + _.a = 0; + var vU = mdb( + Jne, + "EdgeAwareScanlineConstraintCalculation/lambda$5$Type", + 1698 + ); + bcb(1700, 1, Vke, fgc); + _.Lb = function ggc(a) { + return BD(a, 57), true; + }; + _.Fb = function hgc(a) { + return this === a; + }; + _.Mb = function igc(a) { + return BD(a, 57), true; + }; + var wU = mdb( + Jne, + "EdgeAwareScanlineConstraintCalculation/lambda$6$Type", + 1700 + ); + bcb(1701, 1, qie, jgc); + _.td = function kgc(a) { + BD(a, 365).Vd(); + }; + var xU = mdb( + Jne, + "EdgeAwareScanlineConstraintCalculation/lambda$7$Type", + 1701 + ); + bcb(1702, 1, Oie, lgc); + _.Mb = function mgc(a) { + return JD(BD(a, 57).g, 145); + }; + var yU = mdb( + Jne, + "EdgeAwareScanlineConstraintCalculation/lambda$8$Type", + 1702 + ); + bcb(1704, 1, qie, ngc); + _.td = function ogc(a) { + ifc(this.a, this.b, BD(a, 57)); + }; + var zU = mdb( + Jne, + "EdgeAwareScanlineConstraintCalculation/lambda$9$Type", + 1704 + ); + bcb(1521, 1, ene, sgc); + _.pf = function xgc(a, b) { + rgc(this, BD(a, 37), b); + }; + var pgc; + var EU = mdb(Jne, "HorizontalGraphCompactor", 1521); + bcb(1522, 1, {}, ygc); + _.Oe = function zgc(a, b) { + var c, d, e; + if (vgc(a, b)) { + return 0; + } + c = tgc(a); + d = tgc(b); + if ((!!c && c.k == (j0b(), e0b)) || (!!d && d.k == (j0b(), e0b))) { + return 0; + } + e = BD(vNb(this.a.a, (wtc(), otc)), 304); + return fBc(e, c ? c.k : (j0b(), g0b), d ? d.k : (j0b(), g0b)); + }; + _.Pe = function Agc(a, b) { + var c, d, e; + if (vgc(a, b)) { + return 1; + } + c = tgc(a); + d = tgc(b); + e = BD(vNb(this.a.a, (wtc(), otc)), 304); + return iBc(e, c ? c.k : (j0b(), g0b), d ? d.k : (j0b(), g0b)); + }; + var BU = mdb(Jne, "HorizontalGraphCompactor/1", 1522); + bcb(1523, 1, {}, Bgc); + _.Ne = function Cgc(a, b) { + return qgc(), a.a.i == 0; + }; + var CU = mdb(Jne, "HorizontalGraphCompactor/lambda$0$Type", 1523); + bcb(1524, 1, {}, Dgc); + _.Ne = function Egc(a, b) { + return wgc(this.a, a, b); + }; + var DU = mdb(Jne, "HorizontalGraphCompactor/lambda$1$Type", 1524); + bcb(1664, 1, {}, Ygc); + var Fgc, Ggc; + var cV = mdb(Jne, "LGraphToCGraphTransformer", 1664); + bcb(1672, 1, Oie, ehc); + _.Mb = function fhc(a) { + return a != null; + }; + var FU = mdb( + Jne, + "LGraphToCGraphTransformer/0methodref$nonNull$Type", + 1672 + ); + bcb(1665, 1, {}, ghc); + _.Kb = function hhc(a) { + return Hgc(), fcb(vNb(BD(BD(a, 57).g, 10), (wtc(), $sc))); + }; + var GU = mdb(Jne, "LGraphToCGraphTransformer/lambda$0$Type", 1665); + bcb(1666, 1, {}, ihc); + _.Kb = function jhc(a) { + return Hgc(), gic(BD(BD(a, 57).g, 145)); + }; + var HU = mdb(Jne, "LGraphToCGraphTransformer/lambda$1$Type", 1666); + bcb(1675, 1, Oie, khc); + _.Mb = function lhc(a) { + return Hgc(), JD(BD(a, 57).g, 10); + }; + var IU = mdb(Jne, "LGraphToCGraphTransformer/lambda$10$Type", 1675); + bcb(1676, 1, qie, mhc); + _.td = function nhc(a) { + Zgc(BD(a, 57)); + }; + var JU = mdb(Jne, "LGraphToCGraphTransformer/lambda$11$Type", 1676); + bcb(1677, 1, Oie, ohc); + _.Mb = function phc(a) { + return Hgc(), JD(BD(a, 57).g, 145); + }; + var KU = mdb(Jne, "LGraphToCGraphTransformer/lambda$12$Type", 1677); + bcb(1681, 1, qie, qhc); + _.td = function rhc(a) { + $gc(BD(a, 57)); + }; + var LU = mdb(Jne, "LGraphToCGraphTransformer/lambda$13$Type", 1681); + bcb(1678, 1, qie, shc); + _.td = function thc(a) { + _gc(this.a, BD(a, 8)); + }; + _.a = 0; + var MU = mdb(Jne, "LGraphToCGraphTransformer/lambda$14$Type", 1678); + bcb(1679, 1, qie, uhc); + _.td = function vhc(a) { + ahc(this.a, BD(a, 110)); + }; + _.a = 0; + var NU = mdb(Jne, "LGraphToCGraphTransformer/lambda$15$Type", 1679); + bcb(1680, 1, qie, whc); + _.td = function xhc(a) { + bhc(this.a, BD(a, 8)); + }; + _.a = 0; + var OU = mdb(Jne, "LGraphToCGraphTransformer/lambda$16$Type", 1680); + bcb(1682, 1, {}, yhc); + _.Kb = function zhc(a) { + return ( + Hgc(), + new YAb(null, new Lub(new Sr(ur(U_b(BD(a, 10)).a.Kc(), new Sq())))) + ); + }; + var PU = mdb(Jne, "LGraphToCGraphTransformer/lambda$17$Type", 1682); + bcb(1683, 1, Oie, Ahc); + _.Mb = function Bhc(a) { + return Hgc(), OZb(BD(a, 17)); + }; + var QU = mdb(Jne, "LGraphToCGraphTransformer/lambda$18$Type", 1683); + bcb(1684, 1, qie, Chc); + _.td = function Dhc(a) { + Qgc(this.a, BD(a, 17)); + }; + var RU = mdb(Jne, "LGraphToCGraphTransformer/lambda$19$Type", 1684); + bcb(1668, 1, qie, Ehc); + _.td = function Fhc(a) { + Rgc(this.a, BD(a, 145)); + }; + var SU = mdb(Jne, "LGraphToCGraphTransformer/lambda$2$Type", 1668); + bcb(1685, 1, {}, Ghc); + _.Kb = function Hhc(a) { + return Hgc(), new YAb(null, new Kub(BD(a, 29).a, 16)); + }; + var TU = mdb(Jne, "LGraphToCGraphTransformer/lambda$20$Type", 1685); + bcb(1686, 1, {}, Ihc); + _.Kb = function Jhc(a) { + return ( + Hgc(), + new YAb(null, new Lub(new Sr(ur(U_b(BD(a, 10)).a.Kc(), new Sq())))) + ); + }; + var UU = mdb(Jne, "LGraphToCGraphTransformer/lambda$21$Type", 1686); + bcb(1687, 1, {}, Khc); + _.Kb = function Lhc(a) { + return Hgc(), BD(vNb(BD(a, 17), (wtc(), rtc)), 15); + }; + var VU = mdb(Jne, "LGraphToCGraphTransformer/lambda$22$Type", 1687); + bcb(1688, 1, Oie, Mhc); + _.Mb = function Nhc(a) { + return chc(BD(a, 15)); + }; + var WU = mdb(Jne, "LGraphToCGraphTransformer/lambda$23$Type", 1688); + bcb(1689, 1, qie, Ohc); + _.td = function Phc(a) { + Jgc(this.a, BD(a, 15)); + }; + var XU = mdb(Jne, "LGraphToCGraphTransformer/lambda$24$Type", 1689); + bcb(1667, 1, qie, Qhc); + _.td = function Rhc(a) { + Sgc(this.a, this.b, BD(a, 145)); + }; + var YU = mdb(Jne, "LGraphToCGraphTransformer/lambda$3$Type", 1667); + bcb(1669, 1, {}, Shc); + _.Kb = function Thc(a) { + return Hgc(), new YAb(null, new Kub(BD(a, 29).a, 16)); + }; + var ZU = mdb(Jne, "LGraphToCGraphTransformer/lambda$4$Type", 1669); + bcb(1670, 1, {}, Uhc); + _.Kb = function Vhc(a) { + return ( + Hgc(), + new YAb(null, new Lub(new Sr(ur(U_b(BD(a, 10)).a.Kc(), new Sq())))) + ); + }; + var $U = mdb(Jne, "LGraphToCGraphTransformer/lambda$5$Type", 1670); + bcb(1671, 1, {}, Whc); + _.Kb = function Xhc(a) { + return Hgc(), BD(vNb(BD(a, 17), (wtc(), rtc)), 15); + }; + var _U = mdb(Jne, "LGraphToCGraphTransformer/lambda$6$Type", 1671); + bcb(1673, 1, qie, Yhc); + _.td = function Zhc(a) { + dhc(this.a, BD(a, 15)); + }; + var aV = mdb(Jne, "LGraphToCGraphTransformer/lambda$8$Type", 1673); + bcb(1674, 1, qie, $hc); + _.td = function _hc(a) { + Tgc(this.a, this.b, BD(a, 145)); + }; + var bV = mdb(Jne, "LGraphToCGraphTransformer/lambda$9$Type", 1674); + bcb(1663, 1, {}, dic); + _.Le = function eic(a) { + var b, c, d, e, f; + this.a = a; + this.d = new KFb(); + this.c = KC(jN, Uhe, 121, this.a.a.a.c.length, 0, 1); + this.b = 0; + for (c = new olb(this.a.a.a); c.a < c.c.c.length; ) { + b = BD(mlb(c), 307); + b.d = this.b; + f = nGb(oGb(new pGb(), b), this.d); + this.c[this.b] = f; + ++this.b; + } + cic(this); + bic(this); + aic(this); + uGb(LGb(this.d), new Zdd()); + for (e = new olb(this.a.a.b); e.a < e.c.c.length; ) { + d = BD(mlb(e), 57); + d.d.c = this.c[d.a.d].e + d.b.a; + } + }; + _.b = 0; + var dV = mdb(Jne, "NetworkSimplexCompaction", 1663); + bcb(145, 1, { 35: 1, 145: 1 }, hic); + _.wd = function iic(a) { + return fic(this, BD(a, 145)); + }; + _.Ib = function jic() { + return gic(this); + }; + var eV = mdb(Jne, "VerticalSegment", 145); + bcb(827, 1, {}, sic); + _.c = 0; + _.e = 0; + _.i = 0; + var hV = mdb(Kne, "BetweenLayerEdgeTwoNodeCrossingsCounter", 827); + bcb(663, 1, { 663: 1 }, zic); + _.Ib = function Aic() { + return "AdjacencyList [node=" + this.d + ", adjacencies= " + this.a + "]"; + }; + _.b = 0; + _.c = 0; + _.f = 0; + var gV = mdb( + Kne, + "BetweenLayerEdgeTwoNodeCrossingsCounter/AdjacencyList", + 663 + ); + bcb(287, 1, { 35: 1, 287: 1 }, Dic); + _.wd = function Eic(a) { + return Bic(this, BD(a, 287)); + }; + _.Ib = function Fic() { + return ( + "Adjacency [position=" + + this.c + + ", cardinality=" + + this.a + + ", currentCardinality=" + + this.b + + "]" + ); + }; + _.a = 0; + _.b = 0; + _.c = 0; + var fV = mdb( + Kne, + "BetweenLayerEdgeTwoNodeCrossingsCounter/AdjacencyList/Adjacency", + 287 + ); + bcb(1929, 1, {}, Iic); + _.b = 0; + _.e = false; + var iV = mdb(Kne, "CrossingMatrixFiller", 1929); + var qY = odb(Lne, "IInitializable"); + bcb(1804, 1, Mne, Oic); + _.Nf = function Ric(a, b, c, d, e, f) {}; + _.Pf = function Tic(a, b, c) {}; + _.Lf = function Pic() { + return this.c != (rGc(), pGc); + }; + _.Mf = function Qic() { + this.e = KC(WD, oje, 25, this.d, 15, 1); + }; + _.Of = function Sic(a, b) { + b[a][0].c.p = a; + }; + _.Qf = function Uic(a, b, c, d) { + ++this.d; + }; + _.Rf = function Vic() { + return true; + }; + _.Sf = function Wic(a, b, c, d) { + Kic(this, a, b, c); + return Jic(this, b); + }; + _.Tf = function Xic(a, b) { + var c; + c = Lic(b, a.length); + Kic(this, a, c, b); + return Mic(this, c); + }; + _.d = 0; + var jV = mdb(Kne, "GreedySwitchHeuristic", 1804); + bcb(1930, 1, {}, ejc); + _.b = 0; + _.d = 0; + var kV = mdb(Kne, "NorthSouthEdgeNeighbouringNodeCrossingsCounter", 1930); + bcb(1917, 1, {}, jjc); + _.a = false; + var lV = mdb(Kne, "SwitchDecider", 1917); + bcb(101, 1, { 101: 1 }, pjc); + _.a = null; + _.c = null; + _.i = null; + var oV = mdb(Nne, "SelfHyperLoop", 101); + bcb(1916, 1, {}, vjc); + _.c = 0; + _.e = 0; + var nV = mdb(Nne, "SelfHyperLoopLabels", 1916); + bcb(411, 22, { 3: 1, 35: 1, 22: 1, 411: 1 }, Bjc); + var wjc, xjc, yjc, zjc; + var mV = ndb(Nne, "SelfHyperLoopLabels/Alignment", 411, CI, Djc, Cjc); + var Ejc; + bcb(409, 1, { 409: 1 }, Gjc); + var pV = mdb(Nne, "SelfLoopEdge", 409); + bcb(403, 1, { 403: 1 }, Kjc); + _.a = false; + var rV = mdb(Nne, "SelfLoopHolder", 403); + bcb(1724, 1, Oie, Mjc); + _.Mb = function Njc(a) { + return OZb(BD(a, 17)); + }; + var qV = mdb(Nne, "SelfLoopHolder/lambda$0$Type", 1724); + bcb(113, 1, { 113: 1 }, Pjc); + _.a = false; + _.c = false; + var tV = mdb(Nne, "SelfLoopPort", 113); + bcb(1792, 1, Oie, Qjc); + _.Mb = function Rjc(a) { + return OZb(BD(a, 17)); + }; + var sV = mdb(Nne, "SelfLoopPort/lambda$0$Type", 1792); + bcb(363, 22, { 3: 1, 35: 1, 22: 1, 363: 1 }, Yjc); + var Sjc, Tjc, Ujc, Vjc, Wjc; + var uV = ndb(Nne, "SelfLoopType", 363, CI, _jc, $jc); + var akc; + bcb(1732, 1, {}, xkc); + var ckc, dkc, ekc, fkc; + var JV = mdb(One, "PortRestorer", 1732); + bcb(361, 22, { 3: 1, 35: 1, 22: 1, 361: 1 }, Gkc); + var Ckc, Dkc, Ekc; + var vV = ndb(One, "PortRestorer/PortSideArea", 361, CI, Ikc, Hkc); + var Jkc; + bcb(1733, 1, {}, Lkc); + _.Kb = function Mkc(a) { + return gkc(), BD(a, 15).Oc(); + }; + var wV = mdb(One, "PortRestorer/lambda$0$Type", 1733); + bcb(1734, 1, qie, Nkc); + _.td = function Okc(a) { + gkc(); + BD(a, 113).c = false; + }; + var xV = mdb(One, "PortRestorer/lambda$1$Type", 1734); + bcb(1743, 1, Oie, Pkc); + _.Mb = function Qkc(a) { + return gkc(), BD(a, 11).j == (Ucd(), Tcd); + }; + var yV = mdb(One, "PortRestorer/lambda$10$Type", 1743); + bcb(1744, 1, {}, Rkc); + _.Kb = function Skc(a) { + return gkc(), BD(a, 113).d; + }; + var zV = mdb(One, "PortRestorer/lambda$11$Type", 1744); + bcb(1745, 1, qie, Tkc); + _.td = function Ukc(a) { + ykc(this.a, BD(a, 11)); + }; + var AV = mdb(One, "PortRestorer/lambda$12$Type", 1745); + bcb(1735, 1, qie, Vkc); + _.td = function Wkc(a) { + zkc(this.a, BD(a, 101)); + }; + var BV = mdb(One, "PortRestorer/lambda$2$Type", 1735); + bcb(1736, 1, Dke, Xkc); + _.ue = function Ykc(a, b) { + return Akc(BD(a, 113), BD(b, 113)); + }; + _.Fb = function Zkc(a) { + return this === a; + }; + _.ve = function $kc() { + return new tpb(this); + }; + var CV = mdb(One, "PortRestorer/lambda$3$Type", 1736); + bcb(1737, 1, Oie, _kc); + _.Mb = function alc(a) { + return gkc(), BD(a, 113).c; + }; + var DV = mdb(One, "PortRestorer/lambda$4$Type", 1737); + bcb(1738, 1, Oie, blc); + _.Mb = function clc(a) { + return nkc(BD(a, 11)); + }; + var EV = mdb(One, "PortRestorer/lambda$5$Type", 1738); + bcb(1739, 1, Oie, dlc); + _.Mb = function elc(a) { + return gkc(), BD(a, 11).j == (Ucd(), Acd); + }; + var FV = mdb(One, "PortRestorer/lambda$6$Type", 1739); + bcb(1740, 1, Oie, flc); + _.Mb = function glc(a) { + return gkc(), BD(a, 11).j == (Ucd(), zcd); + }; + var GV = mdb(One, "PortRestorer/lambda$7$Type", 1740); + bcb(1741, 1, Oie, hlc); + _.Mb = function ilc(a) { + return okc(BD(a, 11)); + }; + var HV = mdb(One, "PortRestorer/lambda$8$Type", 1741); + bcb(1742, 1, Oie, jlc); + _.Mb = function klc(a) { + return gkc(), BD(a, 11).j == (Ucd(), Rcd); + }; + var IV = mdb(One, "PortRestorer/lambda$9$Type", 1742); + bcb(270, 22, { 3: 1, 35: 1, 22: 1, 270: 1 }, Blc); + var slc, tlc, ulc, vlc, wlc, xlc, ylc, zlc; + var KV = ndb(One, "PortSideAssigner/Target", 270, CI, Dlc, Clc); + var Elc; + bcb(1725, 1, {}, Glc); + _.Kb = function Hlc(a) { + return JAb(new YAb(null, new Kub(BD(a, 101).j, 16)), new Ylc()); + }; + var LV = mdb(One, "PortSideAssigner/lambda$1$Type", 1725); + bcb(1726, 1, {}, Ilc); + _.Kb = function Jlc(a) { + return BD(a, 113).d; + }; + var MV = mdb(One, "PortSideAssigner/lambda$2$Type", 1726); + bcb(1727, 1, qie, Klc); + _.td = function Llc(a) { + G0b(BD(a, 11), (Ucd(), Acd)); + }; + var NV = mdb(One, "PortSideAssigner/lambda$3$Type", 1727); + bcb(1728, 1, {}, Mlc); + _.Kb = function Nlc(a) { + return BD(a, 113).d; + }; + var OV = mdb(One, "PortSideAssigner/lambda$4$Type", 1728); + bcb(1729, 1, qie, Olc); + _.td = function Plc(a) { + plc(this.a, BD(a, 11)); + }; + var PV = mdb(One, "PortSideAssigner/lambda$5$Type", 1729); + bcb(1730, 1, Dke, Qlc); + _.ue = function Rlc(a, b) { + return qlc(BD(a, 101), BD(b, 101)); + }; + _.Fb = function Slc(a) { + return this === a; + }; + _.ve = function Tlc() { + return new tpb(this); + }; + var QV = mdb(One, "PortSideAssigner/lambda$6$Type", 1730); + bcb(1731, 1, Dke, Ulc); + _.ue = function Vlc(a, b) { + return rlc(BD(a, 113), BD(b, 113)); + }; + _.Fb = function Wlc(a) { + return this === a; + }; + _.ve = function Xlc() { + return new tpb(this); + }; + var RV = mdb(One, "PortSideAssigner/lambda$7$Type", 1731); + bcb(805, 1, Oie, Ylc); + _.Mb = function Zlc(a) { + return BD(a, 113).c; + }; + var SV = mdb(One, "PortSideAssigner/lambda$8$Type", 805); + bcb(2009, 1, {}); + var TV = mdb(Pne, "AbstractSelfLoopRouter", 2009); + bcb(1750, 1, Dke, gmc); + _.ue = function hmc(a, b) { + return emc(BD(a, 101), BD(b, 101)); + }; + _.Fb = function imc(a) { + return this === a; + }; + _.ve = function jmc() { + return new tpb(this); + }; + var UV = mdb(Pne, rle, 1750); + bcb(1751, 1, Dke, kmc); + _.ue = function lmc(a, b) { + return fmc(BD(a, 101), BD(b, 101)); + }; + _.Fb = function mmc(a) { + return this === a; + }; + _.ve = function nmc() { + return new tpb(this); + }; + var VV = mdb(Pne, sle, 1751); + bcb(1793, 2009, {}, zmc); + _.Uf = function Amc(a, b, c) { + return c; + }; + var XV = mdb(Pne, "OrthogonalSelfLoopRouter", 1793); + bcb(1795, 1, qie, Bmc); + _.td = function Cmc(a) { + ymc(this.b, this.a, BD(a, 8)); + }; + var WV = mdb(Pne, "OrthogonalSelfLoopRouter/lambda$0$Type", 1795); + bcb(1794, 1793, {}, Fmc); + _.Uf = function Gmc(a, b, c) { + var d, e; + d = a.c.d; + St(c, 0, P6c(R6c(d.n), d.a)); + e = a.d.d; + Dsb(c, P6c(R6c(e.n), e.a)); + return Dmc(c); + }; + var YV = mdb(Pne, "PolylineSelfLoopRouter", 1794); + bcb(1746, 1, {}, Umc); + _.a = null; + var Hmc; + var aW = mdb(Pne, "RoutingDirector", 1746); + bcb(1747, 1, Dke, Wmc); + _.ue = function Xmc(a, b) { + return Vmc(BD(a, 113), BD(b, 113)); + }; + _.Fb = function Ymc(a) { + return this === a; + }; + _.ve = function Zmc() { + return new tpb(this); + }; + var ZV = mdb(Pne, "RoutingDirector/lambda$0$Type", 1747); + bcb(1748, 1, {}, $mc); + _.Kb = function _mc(a) { + return Imc(), BD(a, 101).j; + }; + var $V = mdb(Pne, "RoutingDirector/lambda$1$Type", 1748); + bcb(1749, 1, qie, anc); + _.td = function bnc(a) { + Imc(); + BD(a, 15).ad(Hmc); + }; + var _V = mdb(Pne, "RoutingDirector/lambda$2$Type", 1749); + bcb(1752, 1, {}, mnc); + var dW = mdb(Pne, "RoutingSlotAssigner", 1752); + bcb(1753, 1, Oie, pnc); + _.Mb = function qnc(a) { + return nnc(this.a, BD(a, 101)); + }; + var bW = mdb(Pne, "RoutingSlotAssigner/lambda$0$Type", 1753); + bcb(1754, 1, Dke, rnc); + _.ue = function snc(a, b) { + return onc(this.a, BD(a, 101), BD(b, 101)); + }; + _.Fb = function tnc(a) { + return this === a; + }; + _.ve = function unc() { + return new tpb(this); + }; + var cW = mdb(Pne, "RoutingSlotAssigner/lambda$1$Type", 1754); + bcb(1796, 1793, {}, wnc); + _.Uf = function xnc(a, b, c) { + var d, e, f, g; + d = Edb(ED(c_b(a.b.g.b, (Nyc(), nyc)))); + g = new u7c( + OC(GC(m1, 1), nie, 8, 0, [((f = a.c.d), P6c(new g7c(f.n), f.a))]) + ); + vnc(a, b, c, g, d); + Dsb(g, ((e = a.d.d), P6c(new g7c(e.n), e.a))); + return UPc(new YPc(g)); + }; + var eW = mdb(Pne, "SplineSelfLoopRouter", 1796); + bcb(578, 1, Dke, Bnc, Dnc); + _.ue = function Enc(a, b) { + return ync(this, BD(a, 10), BD(b, 10)); + }; + _.Fb = function Fnc(a) { + return this === a; + }; + _.ve = function Gnc() { + return new tpb(this); + }; + var kW = mdb(Qne, "ModelOrderNodeComparator", 578); + bcb(1755, 1, Oie, Hnc); + _.Mb = function Inc(a) { + return BD(a, 11).e.c.length != 0; + }; + var fW = mdb(Qne, "ModelOrderNodeComparator/lambda$0$Type", 1755); + bcb(1756, 1, {}, Jnc); + _.Kb = function Knc(a) { + return BD(Ikb(BD(a, 11).e, 0), 17).c; + }; + var gW = mdb(Qne, "ModelOrderNodeComparator/lambda$1$Type", 1756); + bcb(1757, 1, Oie, Lnc); + _.Mb = function Mnc(a) { + return BD(a, 11).e.c.length != 0; + }; + var hW = mdb(Qne, "ModelOrderNodeComparator/lambda$2$Type", 1757); + bcb(1758, 1, {}, Nnc); + _.Kb = function Onc(a) { + return BD(Ikb(BD(a, 11).e, 0), 17).c; + }; + var iW = mdb(Qne, "ModelOrderNodeComparator/lambda$3$Type", 1758); + bcb(1759, 1, Oie, Pnc); + _.Mb = function Qnc(a) { + return BD(a, 11).e.c.length != 0; + }; + var jW = mdb(Qne, "ModelOrderNodeComparator/lambda$4$Type", 1759); + bcb(806, 1, Dke, Tnc, Unc); + _.ue = function Vnc(a, b) { + return Rnc(this, a, b); + }; + _.Fb = function Wnc(a) { + return this === a; + }; + _.ve = function Xnc() { + return new tpb(this); + }; + var lW = mdb(Qne, "ModelOrderPortComparator", 806); + bcb(801, 1, {}, Ync); + _.Vf = function $nc(a, b) { + var c, d, e, f; + e = Znc(b); + c = new Rkb(); + f = b.f / e; + for (d = 1; d < e; ++d) { + Ekb(c, meb(Tbb(Cbb(Math.round(d * f))))); + } + return c; + }; + _.Wf = function _nc() { + return false; + }; + var mW = mdb(Rne, "ARDCutIndexHeuristic", 801); + bcb(1479, 1, ene, eoc); + _.pf = function foc(a, b) { + doc(BD(a, 37), b); + }; + var pW = mdb(Rne, "BreakingPointInserter", 1479); + bcb(305, 1, { 305: 1 }, goc); + _.Ib = function joc() { + var a; + a = new Ufb(); + a.a += "BPInfo["; + a.a += "\n\tstart="; + Pfb(a, this.i); + a.a += "\n\tend="; + Pfb(a, this.a); + a.a += "\n\tnodeStartEdge="; + Pfb(a, this.e); + a.a += "\n\tstartEndEdge="; + Pfb(a, this.j); + a.a += "\n\toriginalEdge="; + Pfb(a, this.f); + a.a += "\n\tstartInLayerDummy="; + Pfb(a, this.k); + a.a += "\n\tstartInLayerEdge="; + Pfb(a, this.n); + a.a += "\n\tendInLayerDummy="; + Pfb(a, this.b); + a.a += "\n\tendInLayerEdge="; + Pfb(a, this.c); + return a.a; + }; + var nW = mdb(Rne, "BreakingPointInserter/BPInfo", 305); + bcb(652, 1, { 652: 1 }, qoc); + _.a = false; + _.b = 0; + _.c = 0; + var oW = mdb(Rne, "BreakingPointInserter/Cut", 652); + bcb(1480, 1, ene, Aoc); + _.pf = function Boc(a, b) { + yoc(BD(a, 37), b); + }; + var sW = mdb(Rne, "BreakingPointProcessor", 1480); + bcb(1481, 1, Oie, Coc); + _.Mb = function Doc(a) { + return hoc(BD(a, 10)); + }; + var qW = mdb(Rne, "BreakingPointProcessor/0methodref$isEnd$Type", 1481); + bcb(1482, 1, Oie, Eoc); + _.Mb = function Foc(a) { + return ioc(BD(a, 10)); + }; + var rW = mdb(Rne, "BreakingPointProcessor/1methodref$isStart$Type", 1482); + bcb(1483, 1, ene, Joc); + _.pf = function Koc(a, b) { + Hoc(this, BD(a, 37), b); + }; + var uW = mdb(Rne, "BreakingPointRemover", 1483); + bcb(1484, 1, qie, Loc); + _.td = function Moc(a) { + BD(a, 128).k = true; + }; + var tW = mdb(Rne, "BreakingPointRemover/lambda$0$Type", 1484); + bcb(797, 1, {}, Xoc); + _.b = 0; + _.e = 0; + _.f = 0; + _.j = 0; + var AW = mdb(Rne, "GraphStats", 797); + bcb(798, 1, {}, Zoc); + _.Ce = function $oc(a, b) { + return Math.max(Edb(ED(a)), Edb(ED(b))); + }; + var vW = mdb(Rne, "GraphStats/0methodref$max$Type", 798); + bcb(799, 1, {}, _oc); + _.Ce = function apc(a, b) { + return Math.max(Edb(ED(a)), Edb(ED(b))); + }; + var wW = mdb(Rne, "GraphStats/2methodref$max$Type", 799); + bcb(1660, 1, {}, bpc); + _.Ce = function cpc(a, b) { + return Yoc(ED(a), ED(b)); + }; + var xW = mdb(Rne, "GraphStats/lambda$1$Type", 1660); + bcb(1661, 1, {}, dpc); + _.Kb = function epc(a) { + return Roc(this.a, BD(a, 29)); + }; + var yW = mdb(Rne, "GraphStats/lambda$2$Type", 1661); + bcb(1662, 1, {}, fpc); + _.Kb = function gpc(a) { + return Qoc(this.a, BD(a, 29)); + }; + var zW = mdb(Rne, "GraphStats/lambda$6$Type", 1662); + bcb(800, 1, {}, hpc); + _.Vf = function ipc(a, b) { + var c; + c = BD(vNb(a, (Nyc(), Eyc)), 15); + return c ? c : (mmb(), mmb(), jmb); + }; + _.Wf = function jpc() { + return false; + }; + var BW = mdb(Rne, "ICutIndexCalculator/ManualCutIndexCalculator", 800); + bcb(802, 1, {}, kpc); + _.Vf = function lpc(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u; + u = (b.n == null && Uoc(b), b.n); + i = (b.d == null && Uoc(b), b.d); + t = KC(UD, Vje, 25, u.length, 15, 1); + t[0] = u[0]; + r = u[0]; + for (j = 1; j < u.length; j++) { + t[j] = t[j - 1] + u[j]; + r += u[j]; + } + e = Znc(b) - 1; + g = BD(vNb(a, (Nyc(), Fyc)), 19).a; + d = Qje; + c = new Rkb(); + for (m = Math.max(0, e - g); m <= Math.min(b.f - 1, e + g); m++) { + p = r / (m + 1); + q = 0; + k = 1; + f = new Rkb(); + s = Qje; + l = 0; + h = 0; + o = i[0]; + if (m == 0) { + s = r; + h = (b.g == null && (b.g = Poc(b, new _oc())), Edb(b.g)); + } else { + while (k < b.f) { + if (t[k - 1] - q >= p) { + Ekb(f, meb(k)); + s = Math.max(s, t[k - 1] - l); + h += o; + q += t[k - 1] - q; + l = t[k - 1]; + o = i[k]; + } + o = Math.max(o, i[k]); + ++k; + } + h += o; + } + n = Math.min(1 / s, 1 / b.b / h); + if (n > d) { + d = n; + c = f; + } + } + return c; + }; + _.Wf = function mpc() { + return false; + }; + var CW = mdb(Rne, "MSDCutIndexHeuristic", 802); + bcb(1617, 1, ene, ppc); + _.pf = function qpc(a, b) { + opc(BD(a, 37), b); + }; + var DW = mdb(Rne, "SingleEdgeGraphWrapper", 1617); + bcb(227, 22, { 3: 1, 35: 1, 22: 1, 227: 1 }, Bpc); + var upc, vpc, wpc, xpc, ypc, zpc; + var EW = ndb(Sne, "CenterEdgeLabelPlacementStrategy", 227, CI, Dpc, Cpc); + var Epc; + bcb(422, 22, { 3: 1, 35: 1, 22: 1, 422: 1 }, Jpc); + var Gpc, Hpc; + var FW = ndb(Sne, "ConstraintCalculationStrategy", 422, CI, Lpc, Kpc); + var Mpc; + bcb(314, 22, { 3: 1, 35: 1, 22: 1, 314: 1, 246: 1, 234: 1 }, Tpc); + _.Kf = function Vpc() { + return Spc(this); + }; + _.Xf = function Upc() { + return Spc(this); + }; + var Opc, Ppc, Qpc; + var GW = ndb(Sne, "CrossingMinimizationStrategy", 314, CI, Xpc, Wpc); + var Ypc; + bcb(337, 22, { 3: 1, 35: 1, 22: 1, 337: 1 }, cqc); + var $pc, _pc, aqc; + var HW = ndb(Sne, "CuttingStrategy", 337, CI, eqc, dqc); + var fqc; + bcb(335, 22, { 3: 1, 35: 1, 22: 1, 335: 1, 246: 1, 234: 1 }, oqc); + _.Kf = function qqc() { + return nqc(this); + }; + _.Xf = function pqc() { + return nqc(this); + }; + var hqc, iqc, jqc, kqc, lqc; + var IW = ndb(Sne, "CycleBreakingStrategy", 335, CI, sqc, rqc); + var tqc; + bcb(419, 22, { 3: 1, 35: 1, 22: 1, 419: 1 }, yqc); + var vqc, wqc; + var JW = ndb(Sne, "DirectionCongruency", 419, CI, Aqc, zqc); + var Bqc; + bcb(450, 22, { 3: 1, 35: 1, 22: 1, 450: 1 }, Hqc); + var Dqc, Eqc, Fqc; + var KW = ndb(Sne, "EdgeConstraint", 450, CI, Jqc, Iqc); + var Kqc; + bcb(276, 22, { 3: 1, 35: 1, 22: 1, 276: 1 }, Uqc); + var Mqc, Nqc, Oqc, Pqc, Qqc, Rqc; + var LW = ndb(Sne, "EdgeLabelSideSelection", 276, CI, Wqc, Vqc); + var Xqc; + bcb(479, 22, { 3: 1, 35: 1, 22: 1, 479: 1 }, arc); + var Zqc, $qc; + var MW = ndb(Sne, "EdgeStraighteningStrategy", 479, CI, crc, brc); + var drc; + bcb(274, 22, { 3: 1, 35: 1, 22: 1, 274: 1 }, mrc); + var frc, grc, hrc, irc, jrc, krc; + var NW = ndb(Sne, "FixedAlignment", 274, CI, orc, nrc); + var prc; + bcb(275, 22, { 3: 1, 35: 1, 22: 1, 275: 1 }, zrc); + var rrc, trc, urc, vrc, wrc, xrc; + var OW = ndb(Sne, "GraphCompactionStrategy", 275, CI, Brc, Arc); + var Crc; + bcb(256, 22, { 3: 1, 35: 1, 22: 1, 256: 1 }, Prc); + var Erc, Frc, Grc, Hrc, Irc, Jrc, Krc, Lrc, Mrc, Nrc; + var PW = ndb(Sne, "GraphProperties", 256, CI, Rrc, Qrc); + var Src; + bcb(292, 22, { 3: 1, 35: 1, 22: 1, 292: 1 }, Yrc); + var Urc, Vrc, Wrc; + var QW = ndb(Sne, "GreedySwitchType", 292, CI, $rc, Zrc); + var _rc; + bcb(303, 22, { 3: 1, 35: 1, 22: 1, 303: 1 }, fsc); + var bsc, csc, dsc; + var RW = ndb(Sne, "InLayerConstraint", 303, CI, hsc, gsc); + var isc; + bcb(420, 22, { 3: 1, 35: 1, 22: 1, 420: 1 }, nsc); + var ksc, lsc; + var SW = ndb(Sne, "InteractiveReferencePoint", 420, CI, psc, osc); + var qsc; + var ssc, + tsc, + usc, + vsc, + wsc, + xsc, + ysc, + zsc, + Asc, + Bsc, + Csc, + Dsc, + Esc, + Fsc, + Gsc, + Hsc, + Isc, + Jsc, + Ksc, + Lsc, + Msc, + Nsc, + Osc, + Psc, + Qsc, + Rsc, + Ssc, + Tsc, + Usc, + Vsc, + Wsc, + Xsc, + Ysc, + Zsc, + $sc, + _sc, + atc, + btc, + ctc, + dtc, + etc, + ftc, + gtc, + htc, + itc, + jtc, + ktc, + ltc, + mtc, + ntc, + otc, + ptc, + qtc, + rtc, + stc, + ttc, + utc, + vtc; + bcb(163, 22, { 3: 1, 35: 1, 22: 1, 163: 1 }, Dtc); + var xtc, ytc, ztc, Atc, Btc; + var TW = ndb(Sne, "LayerConstraint", 163, CI, Ftc, Etc); + var Gtc; + bcb(848, 1, ale, kwc); + _.Qe = function lwc(a) { + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Yne), ""), "Direction Congruency"), + "Specifies how drawings of the same graph with different layout directions compare to each other: either a natural reading direction is preserved or the drawings are rotated versions of each other." + ), + puc + ), + (_5c(), V5c) + ), + JW + ), + pqb((N5c(), L5c)) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Zne), ""), "Feedback Edges"), + "Whether feedback edges should be highlighted by routing around the nodes." + ), + (Bcb(), false) + ), + T5c + ), + wI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), $ne), ""), + "Interactive Reference Point" + ), + "Determines which point of a node is considered by interactive layout phases." + ), + Muc + ), + V5c + ), + SW + ), + pqb(L5c) + ) + ) + ); + o4c(a, $ne, goe, Ouc); + o4c(a, $ne, qoe, Nuc); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), _ne), ""), "Merge Edges"), + "Edges that have no ports are merged so they touch the connected nodes at the same points. When this option is disabled, one port is created for each edge directly connected to a node. When it is enabled, all such incoming edges share an input port, and all outgoing edges share an output port." + ), + false + ), + T5c + ), + wI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), aoe), ""), + "Merge Hierarchy-Crossing Edges" + ), + "If hierarchical layout is active, hierarchy-crossing edges use as few hierarchical ports as possible. They are broken by the algorithm, with hierarchical ports inserted as required. Usually, one such port is created for each edge at each hierarchy crossing point. With this option set to true, we try to create as few hierarchical ports as possible in the process. In particular, all edges that form a hyperedge can share a port." + ), + true + ), + T5c + ), + wI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + C5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), boe), ""), + "Allow Non-Flow Ports To Switch Sides" + ), + "Specifies whether non-flow ports may switch sides if their node's port constraints are either FIXED_SIDE or FIXED_ORDER. A non-flow port is a port on a side that is not part of the currently configured layout flow. For instance, given a left-to-right layout direction, north and south ports would be considered non-flow ports. Further note that the underlying criterium whether to switch sides or not solely relies on the minimization of edge crossings. Hence, edge length and other aesthetics criteria are not addressed." + ), + false + ), + T5c + ), + wI + ), + pqb(M5c) + ), + OC(GC(ZI, 1), nie, 2, 6, [ + "org.eclipse.elk.layered.northOrSouthPort", + ]) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), coe), ""), "Port Sorting Strategy"), + "Only relevant for nodes with FIXED_SIDE port constraints. Determines the way a node's ports are distributed on the sides of a node if their order is not prescribed. The option is set on parent nodes." + ), + xvc + ), + V5c + ), + cX + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), doe), ""), "Thoroughness"), + "How much effort should be spent to produce a nice layout." + ), + meb(7) + ), + X5c + ), + JI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), eoe), ""), + "Add Unnecessary Bendpoints" + ), + "Adds bend points even if an edge does not change direction. If true, each long edge dummy will contribute a bend point to its edges and hierarchy-crossing edges will always get a bend point where they cross hierarchy boundaries. By default, bend points are only added where an edge changes direction." + ), + false + ), + T5c + ), + wI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), foe), ""), + "Generate Position and Layer IDs" + ), + "If enabled position id and layer id are generated, which are usually only used internally when setting the interactiveLayout option. This option should be specified on the root node." + ), + false + ), + T5c + ), + wI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), goe), "cycleBreaking"), + "Cycle Breaking Strategy" + ), + "Strategy for cycle breaking. Cycle breaking looks for cycles in the graph and determines which edges to reverse to break the cycles. Reversed edges will end up pointing to the opposite direction of regular edges (that is, reversed edges will point left if edges usually point right)." + ), + nuc + ), + V5c + ), + IW + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), hoe), ppe), + "Node Layering Strategy" + ), + "Strategy for node layering." + ), + bvc + ), + V5c + ), + YW + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), ioe), ppe), "Layer Constraint"), + "Determines a constraint on the placement of the node regarding the layering." + ), + Tuc + ), + V5c + ), + TW + ), + pqb(K5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), joe), ppe), + "Layer Choice Constraint" + ), + "Allows to set a constraint regarding the layer placement of a node. Let i be the value of teh constraint. Assumed the drawing has n layers and i < n. If set to i, it expresses that the node should be placed in i-th layer. Should i>=n be true then the node is placed in the last layer of the drawing. Note that this option is not part of any of ELK Layered's default configurations but is only evaluated as part of the `InteractiveLayeredGraphVisitor`, which must be applied manually or used via the `DiagramLayoutEngine." + ), + meb(-1) + ), + X5c + ), + JI + ), + pqb(K5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), koe), ppe), "Layer ID"), + "Layer identifier that was calculated by ELK Layered for a node. This is only generated if interactiveLayot or generatePositionAndLayerIds is set." + ), + meb(-1) + ), + X5c + ), + JI + ), + pqb(K5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), loe), qpe), + "Upper Bound On Width [MinWidth Layerer]" + ), + "Defines a loose upper bound on the width of the MinWidth layerer. If set to '-1' multiple values are tested and the best result is selected." + ), + meb(4) + ), + X5c + ), + JI + ), + pqb(L5c) + ) + ) + ); + o4c(a, loe, hoe, Wuc); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), moe), qpe), + "Upper Layer Estimation Scaling Factor [MinWidth Layerer]" + ), + "Multiplied with Upper Bound On Width for defining an upper bound on the width of layers which haven't been determined yet, but whose maximum width had been (roughly) estimated by the MinWidth algorithm. Compensates for too high estimations. If set to '-1' multiple values are tested and the best result is selected." + ), + meb(2) + ), + X5c + ), + JI + ), + pqb(L5c) + ) + ) + ); + o4c(a, moe, hoe, Yuc); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), noe), rpe), + "Node Promotion Strategy" + ), + "Reduces number of dummy nodes after layering phase (if possible)." + ), + _uc + ), + V5c + ), + aX + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), ooe), rpe), + "Max Node Promotion Iterations" + ), + "Limits the number of iterations for node promotion." + ), + meb(0) + ), + X5c + ), + JI + ), + pqb(L5c) + ) + ) + ); + o4c(a, ooe, noe, null); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), poe), "layering.coffmanGraham"), + "Layer Bound" + ), + "The maximum number of nodes allowed per layer." + ), + meb(Ohe) + ), + X5c + ), + JI + ), + pqb(L5c) + ) + ) + ); + o4c(a, poe, hoe, Quc); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), qoe), spe), + "Crossing Minimization Strategy" + ), + "Strategy for crossing minimization." + ), + luc + ), + V5c + ), + GW + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), roe), spe), + "Force Node Model Order" + ), + "The node order given by the model does not change to produce a better layout. E.g. if node A is before node B in the model this is not changed during crossing minimization. This assumes that the node model order is already respected before crossing minimization. This can be achieved by setting considerModelOrder.strategy to NODES_AND_EDGES." + ), + false + ), + T5c + ), + wI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), soe), spe), + "Hierarchical Sweepiness" + ), + "How likely it is to use cross-hierarchy (1) vs bottom-up (-1)." + ), + 0.1 + ), + U5c + ), + BI + ), + pqb(L5c) + ) + ) + ); + o4c(a, soe, tpe, fuc); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), toe), spe), + "Semi-Interactive Crossing Minimization" + ), + "Preserves the order of nodes within a layer but still minimizes crossings between edges connecting long edge dummies. Derives the desired order from positions specified by the 'org.eclipse.elk.position' layout option. Requires a crossing minimization strategy that is able to process 'in-layer' constraints." + ), + false + ), + T5c + ), + wI + ), + pqb(L5c) + ) + ) + ); + o4c(a, toe, qoe, juc); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), uoe), spe), + "Position Choice Constraint" + ), + "Allows to set a constraint regarding the position placement of a node in a layer. Assumed the layer in which the node placed includes n other nodes and i < n. If set to i, it expresses that the node should be placed at the i-th position. Should i>=n be true then the node is placed at the last position in the layer. Note that this option is not part of any of ELK Layered's default configurations but is only evaluated as part of the `InteractiveLayeredGraphVisitor`, which must be applied manually or used via the `DiagramLayoutEngine." + ), + meb(-1) + ), + X5c + ), + JI + ), + pqb(K5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), voe), spe), "Position ID"), + "Position within a layer that was determined by ELK Layered for a node. This is only generated if interactiveLayot or generatePositionAndLayerIds is set." + ), + meb(-1) + ), + X5c + ), + JI + ), + pqb(K5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), woe), upe), + "Greedy Switch Activation Threshold" + ), + "By default it is decided automatically if the greedy switch is activated or not. The decision is based on whether the size of the input graph (without dummy nodes) is smaller than the value of this option. A '0' enforces the activation." + ), + meb(40) + ), + X5c + ), + JI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), xoe), upe), + "Greedy Switch Crossing Minimization" + ), + "Greedy Switch strategy for crossing minimization. The greedy switch heuristic is executed after the regular crossing minimization as a post-processor. Note that if 'hierarchyHandling' is set to 'INCLUDE_CHILDREN', the 'greedySwitchHierarchical.type' option must be used." + ), + cuc + ), + V5c + ), + QW + ), + pqb(L5c) + ) + ) + ); + o4c(a, xoe, qoe, duc); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c( + B5c(new H5c(), yoe), + "crossingMinimization.greedySwitchHierarchical" + ), + "Greedy Switch Crossing Minimization (hierarchical)" + ), + "Activates the greedy switch heuristic in case hierarchical layout is used. The differences to the non-hierarchical case (see 'greedySwitch.type') are: 1) greedy switch is inactive by default, 3) only the option value set on the node at which hierarchical layout starts is relevant, and 2) if it's activated by the user, it properly addresses hierarchy-crossing edges." + ), + $tc + ), + V5c + ), + QW + ), + pqb(L5c) + ) + ) + ); + o4c(a, yoe, qoe, _tc); + o4c(a, yoe, tpe, auc); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), zoe), vpe), + "Node Placement Strategy" + ), + "Strategy for node placement." + ), + vvc + ), + V5c + ), + _W + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + z5c( + D5c( + A5c(B5c(new H5c(), Aoe), vpe), + "Favor Straight Edges Over Balancing" + ), + "Favor straight edges over a balanced node placement. The default behavior is determined automatically based on the used 'edgeRouting'. For an orthogonal style it is set to true, for all other styles to false." + ), + T5c + ), + wI + ), + pqb(L5c) + ) + ) + ); + o4c(a, Aoe, zoe, lvc); + o4c(a, Aoe, zoe, mvc); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Boe), wpe), "BK Edge Straightening"), + "Specifies whether the Brandes Koepf node placer tries to increase the number of straight edges at the expense of diagram size. There is a subtle difference to the 'favorStraightEdges' option, which decides whether a balanced placement of the nodes is desired, or not. In bk terms this means combining the four alignments into a single balanced one, or not. This option on the other hand tries to straighten additional edges during the creation of each of the four alignments." + ), + fvc + ), + V5c + ), + MW + ), + pqb(L5c) + ) + ) + ); + o4c(a, Boe, zoe, gvc); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Coe), wpe), "BK Fixed Alignment"), + "Tells the BK node placer to use a certain alignment (out of its four) instead of the one producing the smallest height, or the combination of all four." + ), + ivc + ), + V5c + ), + NW + ), + pqb(L5c) + ) + ) + ); + o4c(a, Coe, zoe, jvc); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), Doe), "nodePlacement.linearSegments"), + "Linear Segments Deflection Dampening" + ), + "Dampens the movement of nodes to keep the diagram from getting too large." + ), + 0.3 + ), + U5c + ), + BI + ), + pqb(L5c) + ) + ) + ); + o4c(a, Doe, zoe, ovc); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + z5c( + D5c( + A5c(B5c(new H5c(), Eoe), "nodePlacement.networkSimplex"), + "Node Flexibility" + ), + "Aims at shorter and straighter edges. Two configurations are possible: (a) allow ports to move freely on the side they are assigned to (the order is always defined beforehand), (b) additionally allow to enlarge a node wherever it helps. If this option is not configured for a node, the 'nodeFlexibility.default' value is used, which is specified for the node's parent." + ), + V5c + ), + $W + ), + pqb(K5c) + ) + ) + ); + o4c(a, Eoe, zoe, tvc); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c( + B5c(new H5c(), Foe), + "nodePlacement.networkSimplex.nodeFlexibility" + ), + "Node Flexibility Default" + ), + "Default value of the 'nodeFlexibility' option for the children of a hierarchical node." + ), + rvc + ), + V5c + ), + $W + ), + pqb(L5c) + ) + ) + ); + o4c(a, Foe, zoe, svc); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), Goe), xpe), + "Self-Loop Distribution" + ), + "Alter the distribution of the loops around the node. It only takes effect for PortConstraints.FREE." + ), + xuc + ), + V5c + ), + eX + ), + pqb(K5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Hoe), xpe), "Self-Loop Ordering"), + "Alter the ordering of the loops they can either be stacked or sequenced. It only takes effect for PortConstraints.FREE." + ), + zuc + ), + V5c + ), + fX + ), + pqb(K5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), Ioe), "edgeRouting.splines"), + "Spline Routing Mode" + ), + "Specifies the way control points are assembled for each individual edge. CONSERVATIVE ensures that edges are properly routed around the nodes but feels rather orthogonal at times. SLOPPY uses fewer control points to obtain curvier edge routes but may result in edges overlapping nodes." + ), + Buc + ), + V5c + ), + hX + ), + pqb(L5c) + ) + ) + ); + o4c(a, Ioe, ype, Cuc); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), Joe), "edgeRouting.splines.sloppy"), + "Sloppy Spline Layer Spacing Factor" + ), + "Spacing factor for routing area between layers when using sloppy spline routing." + ), + 0.2 + ), + U5c + ), + BI + ), + pqb(L5c) + ) + ) + ); + o4c(a, Joe, ype, Euc); + o4c(a, Joe, Ioe, Fuc); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), Koe), "edgeRouting.polyline"), + "Sloped Edge Zone Width" + ), + "Width of the strip to the left and to the right of each layer where the polyline edge router is allowed to refrain from ensuring that edges are routed horizontally. This prevents awkward bend points for nodes that extent almost to the edge of their layer." + ), + 2 + ), + U5c + ), + BI + ), + pqb(L5c) + ) + ) + ); + o4c(a, Koe, ype, vuc); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + z5c( + D5c(A5c(B5c(new H5c(), Loe), zpe), "Spacing Base Value"), + "An optional base value for all other layout options of the 'spacing' group. It can be used to conveniently alter the overall 'spaciousness' of the drawing. Whenever an explicit value is set for the other layout options, this base value will have no effect. The base value is not inherited, i.e. it must be set for each hierarchical node." + ), + U5c + ), + BI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), Moe), zpe), + "Edge Node Between Layers Spacing" + ), + "The spacing to be preserved between nodes and edges that are routed next to the node's layer. For the spacing between nodes and edges that cross the node's layer 'spacing.edgeNode' is used." + ), + 10 + ), + U5c + ), + BI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), Noe), zpe), + "Edge Edge Between Layer Spacing" + ), + "Spacing to be preserved between pairs of edges that are routed between the same pair of layers. Note that 'spacing.edgeEdge' is used for the spacing between pairs of edges crossing the same layer." + ), + 10 + ), + U5c + ), + BI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), Ooe), zpe), + "Node Node Between Layers Spacing" + ), + "The spacing to be preserved between any pair of nodes of two adjacent layers. Note that 'spacing.nodeNode' is used for the spacing between nodes within the layer itself." + ), + 20 + ), + U5c + ), + BI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Poe), Ape), "Direction Priority"), + "Defines how important it is to have a certain edge point into the direction of the overall layout. This option is evaluated during the cycle breaking phase." + ), + meb(0) + ), + X5c + ), + JI + ), + pqb(I5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Qoe), Ape), "Shortness Priority"), + "Defines how important it is to keep an edge as short as possible. This option is evaluated during the layering phase." + ), + meb(0) + ), + X5c + ), + JI + ), + pqb(I5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Roe), Ape), "Straightness Priority"), + "Defines how important it is to keep an edge straight, i.e. aligned with one of the two axes. This option is evaluated during node placement." + ), + meb(0) + ), + X5c + ), + JI + ), + pqb(I5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Soe), Bpe), Ole), + "Tries to further compact components (disconnected sub-graphs)." + ), + false + ), + T5c + ), + wI + ), + pqb(L5c) + ) + ) + ); + o4c(a, Soe, zme, true); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), Toe), Cpe), + "Post Compaction Strategy" + ), + Dpe + ), + Ntc + ), + V5c + ), + OW + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), Uoe), Cpe), + "Post Compaction Constraint Calculation" + ), + Dpe + ), + Ltc + ), + V5c + ), + FW + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), Voe), Epe), + "High Degree Node Treatment" + ), + "Makes room around high degree nodes to place leafs and trees." + ), + false + ), + T5c + ), + wI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), Woe), Epe), + "High Degree Node Threshold" + ), + "Whether a node is considered to have a high degree." + ), + meb(16) + ), + X5c + ), + JI + ), + pqb(L5c) + ) + ) + ); + o4c(a, Woe, Voe, true); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), Xoe), Epe), + "High Degree Node Maximum Tree Height" + ), + "Maximum height of a subtree connected to a high degree node to be moved to separate layers." + ), + meb(5) + ), + X5c + ), + JI + ), + pqb(L5c) + ) + ) + ); + o4c(a, Xoe, Voe, true); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), Yoe), Fpe), + "Graph Wrapping Strategy" + ), + "For certain graphs and certain prescribed drawing areas it may be desirable to split the laid out graph into chunks that are placed side by side. The edges that connect different chunks are 'wrapped' around from the end of one chunk to the start of the other chunk. The points between the chunks are referred to as 'cuts'." + ), + bwc + ), + V5c + ), + jX + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), Zoe), Fpe), + "Additional Wrapped Edges Spacing" + ), + "To visually separate edges that are wrapped from regularly routed edges an additional spacing value can be specified in form of this layout option. The spacing is added to the regular edgeNode spacing." + ), + 10 + ), + U5c + ), + BI + ), + pqb(L5c) + ) + ) + ); + o4c(a, Zoe, Yoe, Ivc); + o4c(a, Zoe, Yoe, Jvc); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), $oe), Fpe), + "Correction Factor for Wrapping" + ), + "At times and for certain types of graphs the executed wrapping may produce results that are consistently biased in the same fashion: either wrapping to often or to rarely. This factor can be used to correct the bias. Internally, it is simply multiplied with the 'aspect ratio' layout option." + ), + 1 + ), + U5c + ), + BI + ), + pqb(L5c) + ) + ) + ); + o4c(a, $oe, Yoe, Lvc); + o4c(a, $oe, Yoe, Mvc); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), _oe), Gpe), "Cutting Strategy"), + "The strategy by which the layer indexes are determined at which the layering crumbles into chunks." + ), + Tvc + ), + V5c + ), + HW + ), + pqb(L5c) + ) + ) + ); + o4c(a, _oe, Yoe, Uvc); + o4c(a, _oe, Yoe, Vvc); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + z5c( + D5c(A5c(B5c(new H5c(), ape), Gpe), "Manually Specified Cuts"), + "Allows the user to specify her own cuts for a certain graph." + ), + Y5c + ), + yK + ), + pqb(L5c) + ) + ) + ); + o4c(a, ape, _oe, Ovc); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), bpe), "wrapping.cutting.msd"), + "MSD Freedom" + ), + "The MSD cutting strategy starts with an initial guess on the number of chunks the graph should be split into. The freedom specifies how much the strategy may deviate from this guess. E.g. if an initial number of 3 is computed, a freedom of 1 allows 2, 3, and 4 cuts." + ), + Qvc + ), + X5c + ), + JI + ), + pqb(L5c) + ) + ) + ); + o4c(a, bpe, _oe, Rvc); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), cpe), Hpe), + "Validification Strategy" + ), + "When wrapping graphs, one can specify indices that are not allowed as split points. The validification strategy makes sure every computed split point is allowed." + ), + gwc + ), + V5c + ), + iX + ), + pqb(L5c) + ) + ) + ); + o4c(a, cpe, Yoe, hwc); + o4c(a, cpe, Yoe, iwc); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + z5c( + D5c( + A5c(B5c(new H5c(), dpe), Hpe), + "Valid Indices for Wrapping" + ), + null + ), + Y5c + ), + yK + ), + pqb(L5c) + ) + ) + ); + o4c(a, dpe, Yoe, dwc); + o4c(a, dpe, Yoe, ewc); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), epe), Ipe), "Improve Cuts"), + "For general graphs it is important that not too many edges wrap backwards. Thus a compromise between evenly-distributed cuts and the total number of cut edges is sought." + ), + true + ), + T5c + ), + wI + ), + pqb(L5c) + ) + ) + ); + o4c(a, epe, Yoe, Zvc); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), fpe), Ipe), + "Distance Penalty When Improving Cuts" + ), + null + ), + 2 + ), + U5c + ), + BI + ), + pqb(L5c) + ) + ) + ); + o4c(a, fpe, Yoe, Xvc); + o4c(a, fpe, epe, true); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), gpe), Ipe), "Improve Wrapped Edges"), + "The initial wrapping is performed in a very simple way. As a consequence, edges that wrap from one chunk to another may be unnecessarily long. Activating this option tries to shorten such edges." + ), + true + ), + T5c + ), + wI + ), + pqb(L5c) + ) + ) + ); + o4c(a, gpe, Yoe, _vc); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), hpe), Jpe), + "Edge Label Side Selection" + ), + "Method to decide on edge label sides." + ), + tuc + ), + V5c + ), + LW + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), ipe), Jpe), + "Edge Center Label Placement Strategy" + ), + "Determines in which layer center labels of long edges should be placed." + ), + ruc + ), + V5c + ), + EW + ), + qqb(L5c, OC(GC(e1, 1), Kie, 175, 0, [J5c])) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), jpe), Kpe), "Consider Model Order"), + "Preserves the order of nodes and edges in the model file if this does not lead to additional edge crossings. Depending on the strategy this is not always possible since the node and edge order might be conflicting." + ), + Wtc + ), + V5c + ), + bX + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), kpe), Kpe), "No Model Order"), + "Set on a node to not set a model order for this node even though it is a real node." + ), + false + ), + T5c + ), + wI + ), + pqb(K5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), lpe), Kpe), + "Consider Model Order for Components" + ), + "If set to NONE the usual ordering strategy (by cumulative node priority and size of nodes) is used. INSIDE_PORT_SIDES orders the components with external ports only inside the groups with the same port side. FORCE_MODEL_ORDER enforces the mode order on components. This option might produce bad alignments and sub optimal drawings in terms of used area since the ordering should be respected." + ), + Ptc + ), + V5c + ), + hQ + ), + pqb(L5c) + ) + ) + ); + o4c(a, lpe, zme, null); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), mpe), Kpe), + "Long Edge Ordering Strategy" + ), + "Indicates whether long edges are sorted under, over, or equal to nodes that have no connection to a previous layer in a left-to-right or right-to-left layout. Under and over changes to right and left in a vertical layout." + ), + Ttc + ), + V5c + ), + ZW + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), npe), Kpe), + "Crossing Counter Node Order Influence" + ), + "Indicates with what percentage (1 for 100%) violations of the node model order are weighted against the crossings e.g. a value of 0.5 means two model order violations are as important as on edge crossing. This allows some edge crossings in favor of preserving the model order. It is advised to set this value to a very small positive value (e.g. 0.001) to have minimal crossing and a optimal node order. Defaults to no influence (0)." + ), + 0 + ), + U5c + ), + BI + ), + pqb(L5c) + ) + ) + ); + o4c(a, npe, jpe, null); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), ope), Kpe), + "Crossing Counter Port Order Influence" + ), + "Indicates with what percentage (1 for 100%) violations of the port model order are weighted against the crossings e.g. a value of 0.5 means two model order violations are as important as on edge crossing. This allows some edge crossings in favor of preserving the model order. It is advised to set this value to a very small positive value (e.g. 0.001) to have minimal crossing and a optimal port order. Defaults to no influence (0)." + ), + 0 + ), + U5c + ), + BI + ), + pqb(L5c) + ) + ) + ); + o4c(a, ope, jpe, null); + Oyc((new Pyc(), a)); + }; + var Itc, + Jtc, + Ktc, + Ltc, + Mtc, + Ntc, + Otc, + Ptc, + Qtc, + Rtc, + Stc, + Ttc, + Utc, + Vtc, + Wtc, + Xtc, + Ytc, + Ztc, + $tc, + _tc, + auc, + buc, + cuc, + duc, + euc, + fuc, + guc, + huc, + iuc, + juc, + kuc, + luc, + muc, + nuc, + ouc, + puc, + quc, + ruc, + suc, + tuc, + uuc, + vuc, + wuc, + xuc, + yuc, + zuc, + Auc, + Buc, + Cuc, + Duc, + Euc, + Fuc, + Guc, + Huc, + Iuc, + Juc, + Kuc, + Luc, + Muc, + Nuc, + Ouc, + Puc, + Quc, + Ruc, + Suc, + Tuc, + Uuc, + Vuc, + Wuc, + Xuc, + Yuc, + Zuc, + $uc, + _uc, + avc, + bvc, + cvc, + dvc, + evc, + fvc, + gvc, + hvc, + ivc, + jvc, + kvc, + lvc, + mvc, + nvc, + ovc, + pvc, + qvc, + rvc, + svc, + tvc, + uvc, + vvc, + wvc, + xvc, + yvc, + zvc, + Avc, + Bvc, + Cvc, + Dvc, + Evc, + Fvc, + Gvc, + Hvc, + Ivc, + Jvc, + Kvc, + Lvc, + Mvc, + Nvc, + Ovc, + Pvc, + Qvc, + Rvc, + Svc, + Tvc, + Uvc, + Vvc, + Wvc, + Xvc, + Yvc, + Zvc, + $vc, + _vc, + awc, + bwc, + cwc, + dwc, + ewc, + fwc, + gwc, + hwc, + iwc; + var UW = mdb(Sne, "LayeredMetaDataProvider", 848); + bcb(986, 1, ale, Pyc); + _.Qe = function Qyc(a) { + Oyc(a); + }; + var mwc, + nwc, + owc, + pwc, + qwc, + rwc, + swc, + twc, + uwc, + vwc, + wwc, + xwc, + ywc, + zwc, + Awc, + Bwc, + Cwc, + Dwc, + Ewc, + Fwc, + Gwc, + Hwc, + Iwc, + Jwc, + Kwc, + Lwc, + Mwc, + Nwc, + Owc, + Pwc, + Qwc, + Rwc, + Swc, + Twc, + Uwc, + Vwc, + Wwc, + Xwc, + Ywc, + Zwc, + $wc, + _wc, + axc, + bxc, + cxc, + dxc, + exc, + fxc, + gxc, + hxc, + ixc, + jxc, + kxc, + lxc, + mxc, + nxc, + oxc, + pxc, + qxc, + rxc, + sxc, + txc, + uxc, + vxc, + wxc, + xxc, + yxc, + zxc, + Axc, + Bxc, + Cxc, + Dxc, + Exc, + Fxc, + Gxc, + Hxc, + Ixc, + Jxc, + Kxc, + Lxc, + Mxc, + Nxc, + Oxc, + Pxc, + Qxc, + Rxc, + Sxc, + Txc, + Uxc, + Vxc, + Wxc, + Xxc, + Yxc, + Zxc, + $xc, + _xc, + ayc, + byc, + cyc, + dyc, + eyc, + fyc, + gyc, + hyc, + iyc, + jyc, + kyc, + lyc, + myc, + nyc, + oyc, + pyc, + qyc, + ryc, + syc, + tyc, + uyc, + vyc, + wyc, + xyc, + yyc, + zyc, + Ayc, + Byc, + Cyc, + Dyc, + Eyc, + Fyc, + Gyc, + Hyc, + Iyc, + Jyc, + Kyc, + Lyc, + Myc; + var WW = mdb(Sne, "LayeredOptions", 986); + bcb(987, 1, {}, Ryc); + _.$e = function Syc() { + var a; + return (a = new jUb()), a; + }; + _._e = function Tyc(a) {}; + var VW = mdb(Sne, "LayeredOptions/LayeredFactory", 987); + bcb(1372, 1, {}); + _.a = 0; + var Uyc; + var $1 = mdb(yqe, "ElkSpacings/AbstractSpacingsBuilder", 1372); + bcb(779, 1372, {}, ezc); + var bzc, czc; + var XW = mdb(Sne, "LayeredSpacings/LayeredSpacingsBuilder", 779); + bcb(313, 22, { 3: 1, 35: 1, 22: 1, 313: 1, 246: 1, 234: 1 }, nzc); + _.Kf = function pzc() { + return mzc(this); + }; + _.Xf = function ozc() { + return mzc(this); + }; + var fzc, gzc, hzc, izc, jzc, kzc; + var YW = ndb(Sne, "LayeringStrategy", 313, CI, rzc, qzc); + var szc; + bcb(378, 22, { 3: 1, 35: 1, 22: 1, 378: 1 }, zzc); + var uzc, vzc, wzc; + var ZW = ndb(Sne, "LongEdgeOrderingStrategy", 378, CI, Bzc, Azc); + var Czc; + bcb(197, 22, { 3: 1, 35: 1, 22: 1, 197: 1 }, Kzc); + var Ezc, Fzc, Gzc, Hzc; + var $W = ndb(Sne, "NodeFlexibility", 197, CI, Nzc, Mzc); + var Ozc; + bcb(315, 22, { 3: 1, 35: 1, 22: 1, 315: 1, 246: 1, 234: 1 }, Xzc); + _.Kf = function Zzc() { + return Wzc(this); + }; + _.Xf = function Yzc() { + return Wzc(this); + }; + var Qzc, Rzc, Szc, Tzc, Uzc; + var _W = ndb(Sne, "NodePlacementStrategy", 315, CI, _zc, $zc); + var aAc; + bcb(260, 22, { 3: 1, 35: 1, 22: 1, 260: 1 }, lAc); + var cAc, dAc, eAc, fAc, gAc, hAc, iAc, jAc; + var aX = ndb(Sne, "NodePromotionStrategy", 260, CI, nAc, mAc); + var oAc; + bcb(339, 22, { 3: 1, 35: 1, 22: 1, 339: 1 }, uAc); + var qAc, rAc, sAc; + var bX = ndb(Sne, "OrderingStrategy", 339, CI, wAc, vAc); + var xAc; + bcb(421, 22, { 3: 1, 35: 1, 22: 1, 421: 1 }, CAc); + var zAc, AAc; + var cX = ndb(Sne, "PortSortingStrategy", 421, CI, EAc, DAc); + var FAc; + bcb(452, 22, { 3: 1, 35: 1, 22: 1, 452: 1 }, LAc); + var HAc, IAc, JAc; + var dX = ndb(Sne, "PortType", 452, CI, NAc, MAc); + var OAc; + bcb(375, 22, { 3: 1, 35: 1, 22: 1, 375: 1 }, UAc); + var QAc, RAc, SAc; + var eX = ndb(Sne, "SelfLoopDistributionStrategy", 375, CI, WAc, VAc); + var XAc; + bcb(376, 22, { 3: 1, 35: 1, 22: 1, 376: 1 }, aBc); + var ZAc, $Ac; + var fX = ndb(Sne, "SelfLoopOrderingStrategy", 376, CI, cBc, bBc); + var dBc; + bcb(304, 1, { 304: 1 }, oBc); + var gX = mdb(Sne, "Spacings", 304); + bcb(336, 22, { 3: 1, 35: 1, 22: 1, 336: 1 }, uBc); + var qBc, rBc, sBc; + var hX = ndb(Sne, "SplineRoutingMode", 336, CI, wBc, vBc); + var xBc; + bcb(338, 22, { 3: 1, 35: 1, 22: 1, 338: 1 }, DBc); + var zBc, ABc, BBc; + var iX = ndb(Sne, "ValidifyStrategy", 338, CI, FBc, EBc); + var GBc; + bcb(377, 22, { 3: 1, 35: 1, 22: 1, 377: 1 }, MBc); + var IBc, JBc, KBc; + var jX = ndb(Sne, "WrappingStrategy", 377, CI, OBc, NBc); + var PBc; + bcb(1383, 1, Bqe, VBc); + _.Yf = function WBc(a) { + return BD(a, 37), RBc; + }; + _.pf = function XBc(a, b) { + UBc(this, BD(a, 37), b); + }; + var RBc; + var kX = mdb(Cqe, "DepthFirstCycleBreaker", 1383); + bcb(782, 1, Bqe, aCc); + _.Yf = function cCc(a) { + return BD(a, 37), YBc; + }; + _.pf = function dCc(a, b) { + $Bc(this, BD(a, 37), b); + }; + _.Zf = function bCc(a) { + return BD(Ikb(a, Bub(this.d, a.c.length)), 10); + }; + var YBc; + var lX = mdb(Cqe, "GreedyCycleBreaker", 782); + bcb(1386, 782, Bqe, eCc); + _.Zf = function fCc(a) { + var b, c, d, e; + e = null; + b = Ohe; + for (d = new olb(a); d.a < d.c.c.length; ) { + c = BD(mlb(d), 10); + if (wNb(c, (wtc(), Zsc)) && BD(vNb(c, Zsc), 19).a < b) { + b = BD(vNb(c, Zsc), 19).a; + e = c; + } + } + if (!e) { + return BD(Ikb(a, Bub(this.d, a.c.length)), 10); + } + return e; + }; + var mX = mdb(Cqe, "GreedyModelOrderCycleBreaker", 1386); + bcb(1384, 1, Bqe, kCc); + _.Yf = function lCc(a) { + return BD(a, 37), gCc; + }; + _.pf = function mCc(a, b) { + jCc(this, BD(a, 37), b); + }; + var gCc; + var nX = mdb(Cqe, "InteractiveCycleBreaker", 1384); + bcb(1385, 1, Bqe, rCc); + _.Yf = function sCc(a) { + return BD(a, 37), nCc; + }; + _.pf = function tCc(a, b) { + qCc(this, BD(a, 37), b); + }; + _.a = 0; + _.b = 0; + var nCc; + var oX = mdb(Cqe, "ModelOrderCycleBreaker", 1385); + bcb(1389, 1, Bqe, DCc); + _.Yf = function ECc(a) { + return BD(a, 37), uCc; + }; + _.pf = function FCc(a, b) { + BCc(this, BD(a, 37), b); + }; + var uCc; + var rX = mdb(Dqe, "CoffmanGrahamLayerer", 1389); + bcb(1390, 1, Dke, GCc); + _.ue = function HCc(a, b) { + return xCc(this.a, BD(a, 10), BD(b, 10)); + }; + _.Fb = function ICc(a) { + return this === a; + }; + _.ve = function JCc() { + return new tpb(this); + }; + var pX = mdb( + Dqe, + "CoffmanGrahamLayerer/0methodref$compareNodesInTopo$Type", + 1390 + ); + bcb(1391, 1, Dke, KCc); + _.ue = function LCc(a, b) { + return ACc(this.a, BD(a, 10), BD(b, 10)); + }; + _.Fb = function MCc(a) { + return this === a; + }; + _.ve = function NCc() { + return new tpb(this); + }; + var qX = mdb(Dqe, "CoffmanGrahamLayerer/lambda$1$Type", 1391); + bcb(1392, 1, Bqe, QCc); + _.Yf = function RCc(a) { + return ( + BD(a, 37), + e3c(e3c(e3c(new j3c(), (qUb(), lUb), (S8b(), n8b)), mUb, w8b), nUb, v8b) + ); + }; + _.pf = function SCc(a, b) { + PCc(this, BD(a, 37), b); + }; + var tX = mdb(Dqe, "InteractiveLayerer", 1392); + bcb(569, 1, { 569: 1 }, TCc); + _.a = 0; + _.c = 0; + var sX = mdb(Dqe, "InteractiveLayerer/LayerSpan", 569); + bcb(1388, 1, Bqe, ZCc); + _.Yf = function $Cc(a) { + return BD(a, 37), UCc; + }; + _.pf = function _Cc(a, b) { + WCc(this, BD(a, 37), b); + }; + var UCc; + var uX = mdb(Dqe, "LongestPathLayerer", 1388); + bcb(1395, 1, Bqe, iDc); + _.Yf = function jDc(a) { + return ( + BD(a, 37), + e3c(e3c(e3c(new j3c(), (qUb(), lUb), (S8b(), Z7b)), mUb, w8b), nUb, v8b) + ); + }; + _.pf = function kDc(a, b) { + gDc(this, BD(a, 37), b); + }; + _.a = 0; + _.b = 0; + _.d = 0; + var aDc, bDc; + var wX = mdb(Dqe, "MinWidthLayerer", 1395); + bcb(1396, 1, Dke, mDc); + _.ue = function nDc(a, b) { + return lDc(this, BD(a, 10), BD(b, 10)); + }; + _.Fb = function oDc(a) { + return this === a; + }; + _.ve = function pDc() { + return new tpb(this); + }; + var vX = mdb(Dqe, "MinWidthLayerer/MinOutgoingEdgesComparator", 1396); + bcb(1387, 1, Bqe, xDc); + _.Yf = function yDc(a) { + return BD(a, 37), qDc; + }; + _.pf = function zDc(a, b) { + wDc(this, BD(a, 37), b); + }; + var qDc; + var xX = mdb(Dqe, "NetworkSimplexLayerer", 1387); + bcb(1393, 1, Bqe, LDc); + _.Yf = function MDc(a) { + return ( + BD(a, 37), + e3c(e3c(e3c(new j3c(), (qUb(), lUb), (S8b(), Z7b)), mUb, w8b), nUb, v8b) + ); + }; + _.pf = function NDc(a, b) { + IDc(this, BD(a, 37), b); + }; + _.d = 0; + _.f = 0; + _.g = 0; + _.i = 0; + _.s = 0; + _.t = 0; + _.u = 0; + var zX = mdb(Dqe, "StretchWidthLayerer", 1393); + bcb(1394, 1, Dke, PDc); + _.ue = function QDc(a, b) { + return ODc(BD(a, 10), BD(b, 10)); + }; + _.Fb = function RDc(a) { + return this === a; + }; + _.ve = function SDc() { + return new tpb(this); + }; + var yX = mdb(Dqe, "StretchWidthLayerer/1", 1394); + bcb(402, 1, Eqe); + _.Nf = function fEc(a, b, c, d, e, f) {}; + _._f = function dEc(a, b, c) { + return YDc(this, a, b, c); + }; + _.Mf = function eEc() { + this.g = KC(VD, Fqe, 25, this.d, 15, 1); + this.f = KC(VD, Fqe, 25, this.d, 15, 1); + }; + _.Of = function gEc(a, b) { + this.e[a] = KC(WD, oje, 25, b[a].length, 15, 1); + }; + _.Pf = function hEc(a, b, c) { + var d; + d = c[a][b]; + d.p = b; + this.e[a][b] = b; + }; + _.Qf = function iEc(a, b, c, d) { + BD(Ikb(d[a][b].j, c), 11).p = this.d++; + }; + _.b = 0; + _.c = 0; + _.d = 0; + var BX = mdb(Gqe, "AbstractBarycenterPortDistributor", 402); + bcb(1633, 1, Dke, jEc); + _.ue = function kEc(a, b) { + return _Dc(this.a, BD(a, 11), BD(b, 11)); + }; + _.Fb = function lEc(a) { + return this === a; + }; + _.ve = function mEc() { + return new tpb(this); + }; + var AX = mdb(Gqe, "AbstractBarycenterPortDistributor/lambda$0$Type", 1633); + bcb(817, 1, Mne, uEc); + _.Nf = function xEc(a, b, c, d, e, f) {}; + _.Pf = function zEc(a, b, c) {}; + _.Qf = function AEc(a, b, c, d) {}; + _.Lf = function vEc() { + return false; + }; + _.Mf = function wEc() { + this.c = this.e.a; + this.g = this.f.g; + }; + _.Of = function yEc(a, b) { + b[a][0].c.p = a; + }; + _.Rf = function BEc() { + return false; + }; + _.ag = function CEc(a, b, c, d) { + if (c) { + rEc(this, a); + } else { + oEc(this, a, d); + pEc(this, a, b); + } + if (a.c.length > 1) { + Ccb(DD(vNb(Q_b((tCb(0, a.c.length), BD(a.c[0], 10))), (Nyc(), Awc)))) + ? YGc(a, this.d, BD(this, 660)) + : (mmb(), Okb(a, this.d)); + PEc(this.e, a); + } + }; + _.Sf = function DEc(a, b, c, d) { + var e, f, g, h, i, j, k; + if (b != sEc(c, a.length)) { + f = a[b - (c ? 1 : -1)]; + UDc(this.f, f, c ? (KAc(), IAc) : (KAc(), HAc)); + } + e = a[b][0]; + k = !d || e.k == (j0b(), e0b); + j = Ou(a[b]); + this.ag(j, k, false, c); + g = 0; + for (i = new olb(j); i.a < i.c.c.length; ) { + h = BD(mlb(i), 10); + a[b][g++] = h; + } + return false; + }; + _.Tf = function EEc(a, b) { + var c, d, e, f, g; + g = sEc(b, a.length); + f = Ou(a[g]); + this.ag(f, false, true, b); + c = 0; + for (e = new olb(f); e.a < e.c.c.length; ) { + d = BD(mlb(e), 10); + a[g][c++] = d; + } + return false; + }; + var EX = mdb(Gqe, "BarycenterHeuristic", 817); + bcb(658, 1, { 658: 1 }, FEc); + _.Ib = function GEc() { + return ( + "BarycenterState [node=" + + this.c + + ", summedWeight=" + + this.d + + ", degree=" + + this.b + + ", barycenter=" + + this.a + + ", visited=" + + this.e + + "]" + ); + }; + _.b = 0; + _.d = 0; + _.e = false; + var CX = mdb(Gqe, "BarycenterHeuristic/BarycenterState", 658); + bcb(1802, 1, Dke, HEc); + _.ue = function IEc(a, b) { + return qEc(this.a, BD(a, 10), BD(b, 10)); + }; + _.Fb = function JEc(a) { + return this === a; + }; + _.ve = function KEc() { + return new tpb(this); + }; + var DX = mdb(Gqe, "BarycenterHeuristic/lambda$0$Type", 1802); + bcb(816, 1, Mne, SEc); + _.Mf = function TEc() {}; + _.Nf = function UEc(a, b, c, d, e, f) {}; + _.Qf = function XEc(a, b, c, d) {}; + _.Of = function VEc(a, b) { + this.a[a] = KC(CX, { 3: 1, 4: 1, 5: 1, 2018: 1 }, 658, b[a].length, 0, 1); + this.b[a] = KC(FX, { 3: 1, 4: 1, 5: 1, 2019: 1 }, 233, b[a].length, 0, 1); + }; + _.Pf = function WEc(a, b, c) { + OEc(this, c[a][b], true); + }; + _.c = false; + var HX = mdb(Gqe, "ForsterConstraintResolver", 816); + bcb(233, 1, { 233: 1 }, $Ec, _Ec); + _.Ib = function aFc() { + var a, b; + b = new Ufb(); + b.a += "["; + for (a = 0; a < this.d.length; a++) { + Qfb(b, a0b(this.d[a])); + REc(this.g, this.d[0]).a != null && + Qfb(Qfb(((b.a += "<"), b), Jdb(REc(this.g, this.d[0]).a)), ">"); + a < this.d.length - 1 && ((b.a += She), b); + } + return ((b.a += "]"), b).a; + }; + _.a = 0; + _.c = 0; + _.f = 0; + var FX = mdb(Gqe, "ForsterConstraintResolver/ConstraintGroup", 233); + bcb(1797, 1, qie, bFc); + _.td = function cFc(a) { + OEc(this.a, BD(a, 10), false); + }; + var GX = mdb(Gqe, "ForsterConstraintResolver/lambda$0$Type", 1797); + bcb(214, 1, { 214: 1, 225: 1 }, fFc); + _.Nf = function hFc(a, b, c, d, e, f) {}; + _.Of = function iFc(a, b) {}; + _.Mf = function gFc() { + this.r = KC(WD, oje, 25, this.n, 15, 1); + }; + _.Pf = function jFc(a, b, c) { + var d, e; + e = c[a][b]; + d = e.e; + !!d && Ekb(this.b, d); + }; + _.Qf = function kFc(a, b, c, d) { + ++this.n; + }; + _.Ib = function lFc() { + return wlb(this.e, new Tqb()); + }; + _.g = false; + _.i = false; + _.n = 0; + _.s = false; + var IX = mdb(Gqe, "GraphInfoHolder", 214); + bcb(1832, 1, Mne, pFc); + _.Nf = function sFc(a, b, c, d, e, f) {}; + _.Of = function tFc(a, b) {}; + _.Qf = function vFc(a, b, c, d) {}; + _._f = function qFc(a, b, c) { + c && b > 0 + ? (RHc(this.a, a[b - 1], a[b]), undefined) + : !c && b < a.length - 1 + ? (RHc(this.a, a[b], a[b + 1]), undefined) + : THc(this.a, a[b], c ? (Ucd(), Tcd) : (Ucd(), zcd)); + return mFc(this, a, b, c); + }; + _.Mf = function rFc() { + this.d = KC(WD, oje, 25, this.c, 15, 1); + this.a = new dIc(this.d); + }; + _.Pf = function uFc(a, b, c) { + var d; + d = c[a][b]; + this.c += d.j.c.length; + }; + _.c = 0; + var JX = mdb(Gqe, "GreedyPortDistributor", 1832); + bcb(1401, 1, Bqe, CFc); + _.Yf = function DFc(a) { + return zFc(BD(a, 37)); + }; + _.pf = function EFc(a, b) { + BFc(BD(a, 37), b); + }; + var xFc; + var LX = mdb(Gqe, "InteractiveCrossingMinimizer", 1401); + bcb(1402, 1, Dke, GFc); + _.ue = function HFc(a, b) { + return FFc(this, BD(a, 10), BD(b, 10)); + }; + _.Fb = function IFc(a) { + return this === a; + }; + _.ve = function JFc() { + return new tpb(this); + }; + var KX = mdb(Gqe, "InteractiveCrossingMinimizer/1", 1402); + bcb(507, 1, { 507: 1, 123: 1, 51: 1 }, fGc); + _.Yf = function gGc(a) { + var b; + return BD(a, 37), (b = k3c(KFc)), e3c(b, (qUb(), nUb), (S8b(), H8b)), b; + }; + _.pf = function hGc(a, b) { + YFc(this, BD(a, 37), b); + }; + _.e = 0; + var KFc; + var RX = mdb(Gqe, "LayerSweepCrossingMinimizer", 507); + bcb(1398, 1, qie, iGc); + _.td = function jGc(a) { + MFc(this.a, BD(a, 214)); + }; + var MX = mdb( + Gqe, + "LayerSweepCrossingMinimizer/0methodref$compareDifferentRandomizedLayouts$Type", + 1398 + ); + bcb(1399, 1, qie, kGc); + _.td = function lGc(a) { + VFc(this.a, BD(a, 214)); + }; + var NX = mdb( + Gqe, + "LayerSweepCrossingMinimizer/1methodref$minimizeCrossingsNoCounter$Type", + 1399 + ); + bcb(1400, 1, qie, mGc); + _.td = function nGc(a) { + XFc(this.a, BD(a, 214)); + }; + var OX = mdb( + Gqe, + "LayerSweepCrossingMinimizer/2methodref$minimizeCrossingsWithCounter$Type", + 1400 + ); + bcb(454, 22, { 3: 1, 35: 1, 22: 1, 454: 1 }, sGc); + var oGc, pGc, qGc; + var PX = ndb( + Gqe, + "LayerSweepCrossingMinimizer/CrossMinType", + 454, + CI, + uGc, + tGc + ); + var vGc; + bcb(1397, 1, Oie, xGc); + _.Mb = function yGc(a) { + return LFc(), BD(a, 29).a.c.length == 0; + }; + var QX = mdb(Gqe, "LayerSweepCrossingMinimizer/lambda$0$Type", 1397); + bcb(1799, 1, Mne, BGc); + _.Mf = function CGc() {}; + _.Nf = function DGc(a, b, c, d, e, f) {}; + _.Qf = function GGc(a, b, c, d) {}; + _.Of = function EGc(a, b) { + b[a][0].c.p = a; + this.b[a] = KC(SX, { 3: 1, 4: 1, 5: 1, 1944: 1 }, 659, b[a].length, 0, 1); + }; + _.Pf = function FGc(a, b, c) { + var d; + d = c[a][b]; + d.p = b; + NC(this.b[a], b, new HGc()); + }; + var VX = mdb(Gqe, "LayerSweepTypeDecider", 1799); + bcb(659, 1, { 659: 1 }, HGc); + _.Ib = function IGc() { + return ( + "NodeInfo [connectedEdges=" + + this.a + + ", hierarchicalInfluence=" + + this.b + + ", randomInfluence=" + + this.c + + "]" + ); + }; + _.a = 0; + _.b = 0; + _.c = 0; + var SX = mdb(Gqe, "LayerSweepTypeDecider/NodeInfo", 659); + bcb(1800, 1, Vke, JGc); + _.Lb = function KGc(a) { + return a1b(new b1b(BD(a, 11).b)); + }; + _.Fb = function LGc(a) { + return this === a; + }; + _.Mb = function MGc(a) { + return a1b(new b1b(BD(a, 11).b)); + }; + var TX = mdb(Gqe, "LayerSweepTypeDecider/lambda$0$Type", 1800); + bcb(1801, 1, Vke, NGc); + _.Lb = function OGc(a) { + return a1b(new b1b(BD(a, 11).b)); + }; + _.Fb = function PGc(a) { + return this === a; + }; + _.Mb = function QGc(a) { + return a1b(new b1b(BD(a, 11).b)); + }; + var UX = mdb(Gqe, "LayerSweepTypeDecider/lambda$1$Type", 1801); + bcb(1833, 402, Eqe, RGc); + _.$f = function SGc(a, b, c) { + var d, e, f, g, h, i, j, k, l; + j = this.g; + switch (c.g) { + case 1: { + d = 0; + e = 0; + for (i = new olb(a.j); i.a < i.c.c.length; ) { + g = BD(mlb(i), 11); + if (g.e.c.length != 0) { + ++d; + g.j == (Ucd(), Acd) && ++e; + } + } + f = b + e; + l = b + d; + for (h = W_b(a, (KAc(), HAc)).Kc(); h.Ob(); ) { + g = BD(h.Pb(), 11); + if (g.j == (Ucd(), Acd)) { + j[g.p] = f; + --f; + } else { + j[g.p] = l; + --l; + } + } + return d; + } + case 2: { + k = 0; + for (h = W_b(a, (KAc(), IAc)).Kc(); h.Ob(); ) { + g = BD(h.Pb(), 11); + ++k; + j[g.p] = b + k; + } + return k; + } + default: + throw vbb(new Vdb()); + } + }; + var WX = mdb(Gqe, "LayerTotalPortDistributor", 1833); + bcb(660, 817, { 660: 1, 225: 1 }, XGc); + _.ag = function ZGc(a, b, c, d) { + if (c) { + rEc(this, a); + } else { + oEc(this, a, d); + pEc(this, a, b); + } + if (a.c.length > 1) { + Ccb(DD(vNb(Q_b((tCb(0, a.c.length), BD(a.c[0], 10))), (Nyc(), Awc)))) + ? YGc(a, this.d, this) + : (mmb(), Okb(a, this.d)); + Ccb(DD(vNb(Q_b((tCb(0, a.c.length), BD(a.c[0], 10))), Awc))) || + PEc(this.e, a); + } + }; + var YX = mdb(Gqe, "ModelOrderBarycenterHeuristic", 660); + bcb(1803, 1, Dke, $Gc); + _.ue = function _Gc(a, b) { + return VGc(this.a, BD(a, 10), BD(b, 10)); + }; + _.Fb = function aHc(a) { + return this === a; + }; + _.ve = function bHc() { + return new tpb(this); + }; + var XX = mdb(Gqe, "ModelOrderBarycenterHeuristic/lambda$0$Type", 1803); + bcb(1403, 1, Bqe, fHc); + _.Yf = function gHc(a) { + var b; + return BD(a, 37), (b = k3c(cHc)), e3c(b, (qUb(), nUb), (S8b(), H8b)), b; + }; + _.pf = function hHc(a, b) { + eHc((BD(a, 37), b)); + }; + var cHc; + var ZX = mdb(Gqe, "NoCrossingMinimizer", 1403); + bcb(796, 402, Eqe, iHc); + _.$f = function jHc(a, b, c) { + var d, e, f, g, h, i, j, k, l, m, n; + l = this.g; + switch (c.g) { + case 1: { + e = 0; + f = 0; + for (k = new olb(a.j); k.a < k.c.c.length; ) { + i = BD(mlb(k), 11); + if (i.e.c.length != 0) { + ++e; + i.j == (Ucd(), Acd) && ++f; + } + } + d = 1 / (e + 1); + g = b + f * d; + n = b + 1 - d; + for (j = W_b(a, (KAc(), HAc)).Kc(); j.Ob(); ) { + i = BD(j.Pb(), 11); + if (i.j == (Ucd(), Acd)) { + l[i.p] = g; + g -= d; + } else { + l[i.p] = n; + n -= d; + } + } + break; + } + case 2: { + h = 0; + for (k = new olb(a.j); k.a < k.c.c.length; ) { + i = BD(mlb(k), 11); + i.g.c.length == 0 || ++h; + } + d = 1 / (h + 1); + m = b + d; + for (j = W_b(a, (KAc(), IAc)).Kc(); j.Ob(); ) { + i = BD(j.Pb(), 11); + l[i.p] = m; + m += d; + } + break; + } + default: + throw vbb(new Wdb("Port type is undefined")); + } + return 1; + }; + var $X = mdb(Gqe, "NodeRelativePortDistributor", 796); + bcb(807, 1, {}, nHc, oHc); + var _X = mdb(Gqe, "SweepCopy", 807); + bcb(1798, 1, Mne, rHc); + _.Of = function uHc(a, b) {}; + _.Mf = function sHc() { + var a; + a = KC(WD, oje, 25, this.f, 15, 1); + this.d = new LIc(a); + this.a = new dIc(a); + }; + _.Nf = function tHc(a, b, c, d, e, f) { + var g; + g = BD(Ikb(f[a][b].j, c), 11); + e.c == g && e.c.i.c == e.d.i.c && ++this.e[a]; + }; + _.Pf = function vHc(a, b, c) { + var d; + d = c[a][b]; + this.c[a] = this.c[a] | (d.k == (j0b(), i0b)); + }; + _.Qf = function wHc(a, b, c, d) { + var e; + e = BD(Ikb(d[a][b].j, c), 11); + e.p = this.f++; + e.g.c.length + e.e.c.length > 1 && + (e.j == (Ucd(), zcd) + ? (this.b[a] = true) + : e.j == Tcd && a > 0 && (this.b[a - 1] = true)); + }; + _.f = 0; + var aY = mdb(Lne, "AllCrossingsCounter", 1798); + bcb(587, 1, {}, BHc); + _.b = 0; + _.d = 0; + var bY = mdb(Lne, "BinaryIndexedTree", 587); + bcb(524, 1, {}, dIc); + var DHc, EHc; + var lY = mdb(Lne, "CrossingsCounter", 524); + bcb(1906, 1, Dke, hIc); + _.ue = function iIc(a, b) { + return YHc(this.a, BD(a, 11), BD(b, 11)); + }; + _.Fb = function jIc(a) { + return this === a; + }; + _.ve = function kIc() { + return new tpb(this); + }; + var cY = mdb(Lne, "CrossingsCounter/lambda$0$Type", 1906); + bcb(1907, 1, Dke, lIc); + _.ue = function mIc(a, b) { + return ZHc(this.a, BD(a, 11), BD(b, 11)); + }; + _.Fb = function nIc(a) { + return this === a; + }; + _.ve = function oIc() { + return new tpb(this); + }; + var dY = mdb(Lne, "CrossingsCounter/lambda$1$Type", 1907); + bcb(1908, 1, Dke, pIc); + _.ue = function qIc(a, b) { + return $Hc(this.a, BD(a, 11), BD(b, 11)); + }; + _.Fb = function rIc(a) { + return this === a; + }; + _.ve = function sIc() { + return new tpb(this); + }; + var eY = mdb(Lne, "CrossingsCounter/lambda$2$Type", 1908); + bcb(1909, 1, Dke, tIc); + _.ue = function uIc(a, b) { + return _Hc(this.a, BD(a, 11), BD(b, 11)); + }; + _.Fb = function vIc(a) { + return this === a; + }; + _.ve = function wIc() { + return new tpb(this); + }; + var fY = mdb(Lne, "CrossingsCounter/lambda$3$Type", 1909); + bcb(1910, 1, qie, xIc); + _.td = function yIc(a) { + eIc(this.a, BD(a, 11)); + }; + var gY = mdb(Lne, "CrossingsCounter/lambda$4$Type", 1910); + bcb(1911, 1, Oie, zIc); + _.Mb = function AIc(a) { + return fIc(this.a, BD(a, 11)); + }; + var hY = mdb(Lne, "CrossingsCounter/lambda$5$Type", 1911); + bcb(1912, 1, qie, CIc); + _.td = function DIc(a) { + BIc(this, a); + }; + var iY = mdb(Lne, "CrossingsCounter/lambda$6$Type", 1912); + bcb(1913, 1, qie, EIc); + _.td = function FIc(a) { + var b; + FHc(); + Wjb(this.b, ((b = this.a), BD(a, 11), b)); + }; + var jY = mdb(Lne, "CrossingsCounter/lambda$7$Type", 1913); + bcb(826, 1, Vke, GIc); + _.Lb = function HIc(a) { + return FHc(), wNb(BD(a, 11), (wtc(), gtc)); + }; + _.Fb = function IIc(a) { + return this === a; + }; + _.Mb = function JIc(a) { + return FHc(), wNb(BD(a, 11), (wtc(), gtc)); + }; + var kY = mdb(Lne, "CrossingsCounter/lambda$8$Type", 826); + bcb(1905, 1, {}, LIc); + var pY = mdb(Lne, "HyperedgeCrossingsCounter", 1905); + bcb(467, 1, { 35: 1, 467: 1 }, NIc); + _.wd = function OIc(a) { + return MIc(this, BD(a, 467)); + }; + _.b = 0; + _.c = 0; + _.e = 0; + _.f = 0; + var oY = mdb(Lne, "HyperedgeCrossingsCounter/Hyperedge", 467); + bcb(362, 1, { 35: 1, 362: 1 }, QIc); + _.wd = function RIc(a) { + return PIc(this, BD(a, 362)); + }; + _.b = 0; + _.c = 0; + var nY = mdb(Lne, "HyperedgeCrossingsCounter/HyperedgeCorner", 362); + bcb(523, 22, { 3: 1, 35: 1, 22: 1, 523: 1 }, VIc); + var SIc, TIc; + var mY = ndb( + Lne, + "HyperedgeCrossingsCounter/HyperedgeCorner/Type", + 523, + CI, + XIc, + WIc + ); + var YIc; + bcb(1405, 1, Bqe, dJc); + _.Yf = function eJc(a) { + return BD(vNb(BD(a, 37), (wtc(), Ksc)), 21).Hc((Orc(), Hrc)) ? _Ic : null; + }; + _.pf = function fJc(a, b) { + cJc(this, BD(a, 37), b); + }; + var _Ic; + var rY = mdb(Hqe, "InteractiveNodePlacer", 1405); + bcb(1406, 1, Bqe, tJc); + _.Yf = function uJc(a) { + return BD(vNb(BD(a, 37), (wtc(), Ksc)), 21).Hc((Orc(), Hrc)) ? gJc : null; + }; + _.pf = function vJc(a, b) { + rJc(this, BD(a, 37), b); + }; + var gJc, hJc, iJc; + var tY = mdb(Hqe, "LinearSegmentsNodePlacer", 1406); + bcb(257, 1, { 35: 1, 257: 1 }, zJc); + _.wd = function AJc(a) { + return wJc(this, BD(a, 257)); + }; + _.Fb = function BJc(a) { + var b; + if (JD(a, 257)) { + b = BD(a, 257); + return this.b == b.b; + } + return false; + }; + _.Hb = function CJc() { + return this.b; + }; + _.Ib = function DJc() { + return "ls" + Fe(this.e); + }; + _.a = 0; + _.b = 0; + _.c = -1; + _.d = -1; + _.g = 0; + var sY = mdb(Hqe, "LinearSegmentsNodePlacer/LinearSegment", 257); + bcb(1408, 1, Bqe, $Jc); + _.Yf = function _Jc(a) { + return BD(vNb(BD(a, 37), (wtc(), Ksc)), 21).Hc((Orc(), Hrc)) ? EJc : null; + }; + _.pf = function hKc(a, b) { + WJc(this, BD(a, 37), b); + }; + _.b = 0; + _.g = 0; + var EJc; + var dZ = mdb(Hqe, "NetworkSimplexPlacer", 1408); + bcb(1427, 1, Dke, iKc); + _.ue = function jKc(a, b) { + return beb(BD(a, 19).a, BD(b, 19).a); + }; + _.Fb = function kKc(a) { + return this === a; + }; + _.ve = function lKc() { + return new tpb(this); + }; + var uY = mdb(Hqe, "NetworkSimplexPlacer/0methodref$compare$Type", 1427); + bcb(1429, 1, Dke, mKc); + _.ue = function nKc(a, b) { + return beb(BD(a, 19).a, BD(b, 19).a); + }; + _.Fb = function oKc(a) { + return this === a; + }; + _.ve = function pKc() { + return new tpb(this); + }; + var vY = mdb(Hqe, "NetworkSimplexPlacer/1methodref$compare$Type", 1429); + bcb(649, 1, { 649: 1 }, qKc); + var wY = mdb(Hqe, "NetworkSimplexPlacer/EdgeRep", 649); + bcb(401, 1, { 401: 1 }, rKc); + _.b = false; + var xY = mdb(Hqe, "NetworkSimplexPlacer/NodeRep", 401); + bcb( + 508, + 12, + { 3: 1, 4: 1, 20: 1, 28: 1, 52: 1, 12: 1, 14: 1, 15: 1, 54: 1, 508: 1 }, + vKc + ); + var CY = mdb(Hqe, "NetworkSimplexPlacer/Path", 508); + bcb(1409, 1, {}, wKc); + _.Kb = function xKc(a) { + return BD(a, 17).d.i.k; + }; + var yY = mdb(Hqe, "NetworkSimplexPlacer/Path/lambda$0$Type", 1409); + bcb(1410, 1, Oie, yKc); + _.Mb = function zKc(a) { + return BD(a, 267) == (j0b(), g0b); + }; + var zY = mdb(Hqe, "NetworkSimplexPlacer/Path/lambda$1$Type", 1410); + bcb(1411, 1, {}, AKc); + _.Kb = function BKc(a) { + return BD(a, 17).d.i; + }; + var AY = mdb(Hqe, "NetworkSimplexPlacer/Path/lambda$2$Type", 1411); + bcb(1412, 1, Oie, CKc); + _.Mb = function DKc(a) { + return eLc(Lzc(BD(a, 10))); + }; + var BY = mdb(Hqe, "NetworkSimplexPlacer/Path/lambda$3$Type", 1412); + bcb(1413, 1, Oie, EKc); + _.Mb = function FKc(a) { + return dKc(BD(a, 11)); + }; + var DY = mdb(Hqe, "NetworkSimplexPlacer/lambda$0$Type", 1413); + bcb(1414, 1, qie, GKc); + _.td = function HKc(a) { + LJc(this.a, this.b, BD(a, 11)); + }; + var EY = mdb(Hqe, "NetworkSimplexPlacer/lambda$1$Type", 1414); + bcb(1423, 1, qie, IKc); + _.td = function JKc(a) { + MJc(this.a, BD(a, 17)); + }; + var FY = mdb(Hqe, "NetworkSimplexPlacer/lambda$10$Type", 1423); + bcb(1424, 1, {}, KKc); + _.Kb = function LKc(a) { + return FJc(), new YAb(null, new Kub(BD(a, 29).a, 16)); + }; + var GY = mdb(Hqe, "NetworkSimplexPlacer/lambda$11$Type", 1424); + bcb(1425, 1, qie, MKc); + _.td = function NKc(a) { + NJc(this.a, BD(a, 10)); + }; + var HY = mdb(Hqe, "NetworkSimplexPlacer/lambda$12$Type", 1425); + bcb(1426, 1, {}, OKc); + _.Kb = function PKc(a) { + return FJc(), meb(BD(a, 121).e); + }; + var IY = mdb(Hqe, "NetworkSimplexPlacer/lambda$13$Type", 1426); + bcb(1428, 1, {}, QKc); + _.Kb = function RKc(a) { + return FJc(), meb(BD(a, 121).e); + }; + var JY = mdb(Hqe, "NetworkSimplexPlacer/lambda$15$Type", 1428); + bcb(1430, 1, Oie, SKc); + _.Mb = function TKc(a) { + return FJc(), BD(a, 401).c.k == (j0b(), h0b); + }; + var KY = mdb(Hqe, "NetworkSimplexPlacer/lambda$17$Type", 1430); + bcb(1431, 1, Oie, UKc); + _.Mb = function VKc(a) { + return FJc(), BD(a, 401).c.j.c.length > 1; + }; + var LY = mdb(Hqe, "NetworkSimplexPlacer/lambda$18$Type", 1431); + bcb(1432, 1, qie, WKc); + _.td = function XKc(a) { + eKc(this.c, this.b, this.d, this.a, BD(a, 401)); + }; + _.c = 0; + _.d = 0; + var MY = mdb(Hqe, "NetworkSimplexPlacer/lambda$19$Type", 1432); + bcb(1415, 1, {}, YKc); + _.Kb = function ZKc(a) { + return FJc(), new YAb(null, new Kub(BD(a, 29).a, 16)); + }; + var NY = mdb(Hqe, "NetworkSimplexPlacer/lambda$2$Type", 1415); + bcb(1433, 1, qie, $Kc); + _.td = function _Kc(a) { + fKc(this.a, BD(a, 11)); + }; + _.a = 0; + var OY = mdb(Hqe, "NetworkSimplexPlacer/lambda$20$Type", 1433); + bcb(1434, 1, {}, aLc); + _.Kb = function bLc(a) { + return FJc(), new YAb(null, new Kub(BD(a, 29).a, 16)); + }; + var PY = mdb(Hqe, "NetworkSimplexPlacer/lambda$21$Type", 1434); + bcb(1435, 1, qie, cLc); + _.td = function dLc(a) { + OJc(this.a, BD(a, 10)); + }; + var QY = mdb(Hqe, "NetworkSimplexPlacer/lambda$22$Type", 1435); + bcb(1436, 1, Oie, fLc); + _.Mb = function gLc(a) { + return eLc(a); + }; + var RY = mdb(Hqe, "NetworkSimplexPlacer/lambda$23$Type", 1436); + bcb(1437, 1, {}, hLc); + _.Kb = function iLc(a) { + return FJc(), new YAb(null, new Kub(BD(a, 29).a, 16)); + }; + var SY = mdb(Hqe, "NetworkSimplexPlacer/lambda$24$Type", 1437); + bcb(1438, 1, Oie, jLc); + _.Mb = function kLc(a) { + return PJc(this.a, BD(a, 10)); + }; + var TY = mdb(Hqe, "NetworkSimplexPlacer/lambda$25$Type", 1438); + bcb(1439, 1, qie, lLc); + _.td = function mLc(a) { + QJc(this.a, this.b, BD(a, 10)); + }; + var UY = mdb(Hqe, "NetworkSimplexPlacer/lambda$26$Type", 1439); + bcb(1440, 1, Oie, nLc); + _.Mb = function oLc(a) { + return FJc(), !OZb(BD(a, 17)); + }; + var VY = mdb(Hqe, "NetworkSimplexPlacer/lambda$27$Type", 1440); + bcb(1441, 1, Oie, pLc); + _.Mb = function qLc(a) { + return FJc(), !OZb(BD(a, 17)); + }; + var WY = mdb(Hqe, "NetworkSimplexPlacer/lambda$28$Type", 1441); + bcb(1442, 1, {}, rLc); + _.Ce = function sLc(a, b) { + return RJc(this.a, BD(a, 29), BD(b, 29)); + }; + var XY = mdb(Hqe, "NetworkSimplexPlacer/lambda$29$Type", 1442); + bcb(1416, 1, {}, tLc); + _.Kb = function uLc(a) { + return ( + FJc(), + new YAb(null, new Lub(new Sr(ur(U_b(BD(a, 10)).a.Kc(), new Sq())))) + ); + }; + var YY = mdb(Hqe, "NetworkSimplexPlacer/lambda$3$Type", 1416); + bcb(1417, 1, Oie, vLc); + _.Mb = function wLc(a) { + return FJc(), cKc(BD(a, 17)); + }; + var ZY = mdb(Hqe, "NetworkSimplexPlacer/lambda$4$Type", 1417); + bcb(1418, 1, qie, xLc); + _.td = function yLc(a) { + XJc(this.a, BD(a, 17)); + }; + var $Y = mdb(Hqe, "NetworkSimplexPlacer/lambda$5$Type", 1418); + bcb(1419, 1, {}, zLc); + _.Kb = function ALc(a) { + return FJc(), new YAb(null, new Kub(BD(a, 29).a, 16)); + }; + var _Y = mdb(Hqe, "NetworkSimplexPlacer/lambda$6$Type", 1419); + bcb(1420, 1, Oie, BLc); + _.Mb = function CLc(a) { + return FJc(), BD(a, 10).k == (j0b(), h0b); + }; + var aZ = mdb(Hqe, "NetworkSimplexPlacer/lambda$7$Type", 1420); + bcb(1421, 1, {}, DLc); + _.Kb = function ELc(a) { + return ( + FJc(), + new YAb(null, new Lub(new Sr(ur(O_b(BD(a, 10)).a.Kc(), new Sq())))) + ); + }; + var bZ = mdb(Hqe, "NetworkSimplexPlacer/lambda$8$Type", 1421); + bcb(1422, 1, Oie, FLc); + _.Mb = function GLc(a) { + return FJc(), NZb(BD(a, 17)); + }; + var cZ = mdb(Hqe, "NetworkSimplexPlacer/lambda$9$Type", 1422); + bcb(1404, 1, Bqe, KLc); + _.Yf = function LLc(a) { + return BD(vNb(BD(a, 37), (wtc(), Ksc)), 21).Hc((Orc(), Hrc)) ? HLc : null; + }; + _.pf = function MLc(a, b) { + JLc(BD(a, 37), b); + }; + var HLc; + var eZ = mdb(Hqe, "SimpleNodePlacer", 1404); + bcb(180, 1, { 180: 1 }, ULc); + _.Ib = function VLc() { + var a; + a = ""; + this.c == (YLc(), XLc) ? (a += kle) : this.c == WLc && (a += jle); + this.o == (eMc(), cMc) + ? (a += vle) + : this.o == dMc + ? (a += "UP") + : (a += "BALANCED"); + return a; + }; + var hZ = mdb(Kqe, "BKAlignedLayout", 180); + bcb(516, 22, { 3: 1, 35: 1, 22: 1, 516: 1 }, ZLc); + var WLc, XLc; + var fZ = ndb(Kqe, "BKAlignedLayout/HDirection", 516, CI, _Lc, $Lc); + var aMc; + bcb(515, 22, { 3: 1, 35: 1, 22: 1, 515: 1 }, fMc); + var cMc, dMc; + var gZ = ndb(Kqe, "BKAlignedLayout/VDirection", 515, CI, hMc, gMc); + var iMc; + bcb(1634, 1, {}, mMc); + var iZ = mdb(Kqe, "BKAligner", 1634); + bcb(1637, 1, {}, rMc); + var lZ = mdb(Kqe, "BKCompactor", 1637); + bcb(654, 1, { 654: 1 }, sMc); + _.a = 0; + var jZ = mdb(Kqe, "BKCompactor/ClassEdge", 654); + bcb(458, 1, { 458: 1 }, uMc); + _.a = null; + _.b = 0; + var kZ = mdb(Kqe, "BKCompactor/ClassNode", 458); + bcb(1407, 1, Bqe, CMc); + _.Yf = function GMc(a) { + return BD(vNb(BD(a, 37), (wtc(), Ksc)), 21).Hc((Orc(), Hrc)) ? vMc : null; + }; + _.pf = function HMc(a, b) { + BMc(this, BD(a, 37), b); + }; + _.d = false; + var vMc; + var mZ = mdb(Kqe, "BKNodePlacer", 1407); + bcb(1635, 1, {}, JMc); + _.d = 0; + var oZ = mdb(Kqe, "NeighborhoodInformation", 1635); + bcb(1636, 1, Dke, OMc); + _.ue = function PMc(a, b) { + return NMc(this, BD(a, 46), BD(b, 46)); + }; + _.Fb = function QMc(a) { + return this === a; + }; + _.ve = function RMc() { + return new tpb(this); + }; + var nZ = mdb(Kqe, "NeighborhoodInformation/NeighborComparator", 1636); + bcb(808, 1, {}); + var sZ = mdb(Kqe, "ThresholdStrategy", 808); + bcb(1763, 808, {}, WMc); + _.bg = function XMc(a, b, c) { + return this.a.o == (eMc(), dMc) ? Pje : Qje; + }; + _.cg = function YMc() {}; + var pZ = mdb(Kqe, "ThresholdStrategy/NullThresholdStrategy", 1763); + bcb(579, 1, { 579: 1 }, ZMc); + _.c = false; + _.d = false; + var qZ = mdb(Kqe, "ThresholdStrategy/Postprocessable", 579); + bcb(1764, 808, {}, bNc); + _.bg = function cNc(a, b, c) { + var d, e, f; + e = b == c; + d = this.a.a[c.p] == b; + if (!(e || d)) { + return a; + } + f = a; + if (this.a.c == (YLc(), XLc)) { + e && (f = $Mc(this, b, true)); + !isNaN(f) && !isFinite(f) && d && (f = $Mc(this, c, false)); + } else { + e && (f = $Mc(this, b, true)); + !isNaN(f) && !isFinite(f) && d && (f = $Mc(this, c, false)); + } + return f; + }; + _.cg = function dNc() { + var a, b, c, d, e; + while (this.d.b != 0) { + e = BD(Ksb(this.d), 579); + d = _Mc(this, e); + if (!d.a) { + continue; + } + a = d.a; + c = Ccb(this.a.f[this.a.g[e.b.p].p]); + if (!c && !OZb(a) && a.c.i.c == a.d.i.c) { + continue; + } + b = aNc(this, e); + b || swb(this.e, e); + } + while (this.e.a.c.length != 0) { + aNc(this, BD(rwb(this.e), 579)); + } + }; + var rZ = mdb(Kqe, "ThresholdStrategy/SimpleThresholdStrategy", 1764); + bcb(635, 1, { 635: 1, 246: 1, 234: 1 }, hNc); + _.Kf = function jNc() { + return gNc(this); + }; + _.Xf = function iNc() { + return gNc(this); + }; + var eNc; + var tZ = mdb(Lqe, "EdgeRouterFactory", 635); + bcb(1458, 1, Bqe, wNc); + _.Yf = function xNc(a) { + return uNc(BD(a, 37)); + }; + _.pf = function yNc(a, b) { + vNc(BD(a, 37), b); + }; + var lNc, mNc, nNc, oNc, pNc, qNc, rNc, sNc; + var uZ = mdb(Lqe, "OrthogonalEdgeRouter", 1458); + bcb(1451, 1, Bqe, NNc); + _.Yf = function ONc(a) { + return INc(BD(a, 37)); + }; + _.pf = function PNc(a, b) { + KNc(this, BD(a, 37), b); + }; + var zNc, ANc, BNc, CNc, DNc, ENc; + var wZ = mdb(Lqe, "PolylineEdgeRouter", 1451); + bcb(1452, 1, Vke, RNc); + _.Lb = function SNc(a) { + return QNc(BD(a, 10)); + }; + _.Fb = function TNc(a) { + return this === a; + }; + _.Mb = function UNc(a) { + return QNc(BD(a, 10)); + }; + var vZ = mdb(Lqe, "PolylineEdgeRouter/1", 1452); + bcb(1809, 1, Oie, ZNc); + _.Mb = function $Nc(a) { + return BD(a, 129).c == (HOc(), FOc); + }; + var xZ = mdb(Mqe, "HyperEdgeCycleDetector/lambda$0$Type", 1809); + bcb(1810, 1, {}, _Nc); + _.Ge = function aOc(a) { + return BD(a, 129).d; + }; + var yZ = mdb(Mqe, "HyperEdgeCycleDetector/lambda$1$Type", 1810); + bcb(1811, 1, Oie, bOc); + _.Mb = function cOc(a) { + return BD(a, 129).c == (HOc(), FOc); + }; + var zZ = mdb(Mqe, "HyperEdgeCycleDetector/lambda$2$Type", 1811); + bcb(1812, 1, {}, dOc); + _.Ge = function eOc(a) { + return BD(a, 129).d; + }; + var AZ = mdb(Mqe, "HyperEdgeCycleDetector/lambda$3$Type", 1812); + bcb(1813, 1, {}, fOc); + _.Ge = function gOc(a) { + return BD(a, 129).d; + }; + var BZ = mdb(Mqe, "HyperEdgeCycleDetector/lambda$4$Type", 1813); + bcb(1814, 1, {}, hOc); + _.Ge = function iOc(a) { + return BD(a, 129).d; + }; + var CZ = mdb(Mqe, "HyperEdgeCycleDetector/lambda$5$Type", 1814); + bcb(112, 1, { 35: 1, 112: 1 }, uOc); + _.wd = function vOc(a) { + return kOc(this, BD(a, 112)); + }; + _.Fb = function wOc(a) { + var b; + if (JD(a, 112)) { + b = BD(a, 112); + return this.g == b.g; + } + return false; + }; + _.Hb = function xOc() { + return this.g; + }; + _.Ib = function zOc() { + var a, b, c, d; + a = new Wfb("{"); + d = new olb(this.n); + while (d.a < d.c.c.length) { + c = BD(mlb(d), 11); + b = P_b(c.i); + b == null && (b = "n" + S_b(c.i)); + a.a += "" + b; + d.a < d.c.c.length && ((a.a += ","), a); + } + a.a += "}"; + return a.a; + }; + _.a = 0; + _.b = 0; + _.c = NaN; + _.d = 0; + _.g = 0; + _.i = 0; + _.o = 0; + _.s = NaN; + var NZ = mdb(Mqe, "HyperEdgeSegment", 112); + bcb(129, 1, { 129: 1 }, DOc); + _.Ib = function EOc() { + return this.a + "->" + this.b + " (" + Yr(this.c) + ")"; + }; + _.d = 0; + var EZ = mdb(Mqe, "HyperEdgeSegmentDependency", 129); + bcb(520, 22, { 3: 1, 35: 1, 22: 1, 520: 1 }, IOc); + var FOc, GOc; + var DZ = ndb( + Mqe, + "HyperEdgeSegmentDependency/DependencyType", + 520, + CI, + KOc, + JOc + ); + var LOc; + bcb(1815, 1, {}, ZOc); + var MZ = mdb(Mqe, "HyperEdgeSegmentSplitter", 1815); + bcb(1816, 1, {}, aPc); + _.a = 0; + _.b = 0; + var FZ = mdb(Mqe, "HyperEdgeSegmentSplitter/AreaRating", 1816); + bcb(329, 1, { 329: 1 }, bPc); + _.a = 0; + _.b = 0; + _.c = 0; + var GZ = mdb(Mqe, "HyperEdgeSegmentSplitter/FreeArea", 329); + bcb(1817, 1, Dke, cPc); + _.ue = function dPc(a, b) { + return _Oc(BD(a, 112), BD(b, 112)); + }; + _.Fb = function ePc(a) { + return this === a; + }; + _.ve = function fPc() { + return new tpb(this); + }; + var HZ = mdb(Mqe, "HyperEdgeSegmentSplitter/lambda$0$Type", 1817); + bcb(1818, 1, qie, gPc); + _.td = function hPc(a) { + TOc(this.a, this.d, this.c, this.b, BD(a, 112)); + }; + _.b = 0; + var IZ = mdb(Mqe, "HyperEdgeSegmentSplitter/lambda$1$Type", 1818); + bcb(1819, 1, {}, iPc); + _.Kb = function jPc(a) { + return new YAb(null, new Kub(BD(a, 112).e, 16)); + }; + var JZ = mdb(Mqe, "HyperEdgeSegmentSplitter/lambda$2$Type", 1819); + bcb(1820, 1, {}, kPc); + _.Kb = function lPc(a) { + return new YAb(null, new Kub(BD(a, 112).j, 16)); + }; + var KZ = mdb(Mqe, "HyperEdgeSegmentSplitter/lambda$3$Type", 1820); + bcb(1821, 1, {}, mPc); + _.Fe = function nPc(a) { + return Edb(ED(a)); + }; + var LZ = mdb(Mqe, "HyperEdgeSegmentSplitter/lambda$4$Type", 1821); + bcb(655, 1, {}, tPc); + _.a = 0; + _.b = 0; + _.c = 0; + var QZ = mdb(Mqe, "OrthogonalRoutingGenerator", 655); + bcb(1638, 1, {}, xPc); + _.Kb = function yPc(a) { + return new YAb(null, new Kub(BD(a, 112).e, 16)); + }; + var OZ = mdb(Mqe, "OrthogonalRoutingGenerator/lambda$0$Type", 1638); + bcb(1639, 1, {}, zPc); + _.Kb = function APc(a) { + return new YAb(null, new Kub(BD(a, 112).j, 16)); + }; + var PZ = mdb(Mqe, "OrthogonalRoutingGenerator/lambda$1$Type", 1639); + bcb(661, 1, {}); + var RZ = mdb(Nqe, "BaseRoutingDirectionStrategy", 661); + bcb(1807, 661, {}, EPc); + _.dg = function FPc(a, b, c) { + var d, e, f, g, h, i, j, k, l, m, n, o, p; + if (!!a.r && !a.q) { + return; + } + k = b + a.o * c; + for (j = new olb(a.n); j.a < j.c.c.length; ) { + i = BD(mlb(j), 11); + l = l7c(OC(GC(m1, 1), nie, 8, 0, [i.i.n, i.n, i.a])).a; + for (h = new olb(i.g); h.a < h.c.c.length; ) { + g = BD(mlb(h), 17); + if (!OZb(g)) { + o = g.d; + p = l7c(OC(GC(m1, 1), nie, 8, 0, [o.i.n, o.n, o.a])).a; + if (Math.abs(l - p) > qme) { + f = k; + e = a; + d = new f7c(l, f); + Dsb(g.a, d); + BPc(this, g, e, d, false); + m = a.r; + if (m) { + n = Edb(ED(Ut(m.e, 0))); + d = new f7c(n, f); + Dsb(g.a, d); + BPc(this, g, e, d, false); + f = b + m.o * c; + e = m; + d = new f7c(n, f); + Dsb(g.a, d); + BPc(this, g, e, d, false); + } + d = new f7c(p, f); + Dsb(g.a, d); + BPc(this, g, e, d, false); + } + } + } + } + }; + _.eg = function GPc(a) { + return a.i.n.a + a.n.a + a.a.a; + }; + _.fg = function HPc() { + return Ucd(), Rcd; + }; + _.gg = function IPc() { + return Ucd(), Acd; + }; + var SZ = mdb(Nqe, "NorthToSouthRoutingStrategy", 1807); + bcb(1808, 661, {}, JPc); + _.dg = function KPc(a, b, c) { + var d, e, f, g, h, i, j, k, l, m, n, o, p; + if (!!a.r && !a.q) { + return; + } + k = b - a.o * c; + for (j = new olb(a.n); j.a < j.c.c.length; ) { + i = BD(mlb(j), 11); + l = l7c(OC(GC(m1, 1), nie, 8, 0, [i.i.n, i.n, i.a])).a; + for (h = new olb(i.g); h.a < h.c.c.length; ) { + g = BD(mlb(h), 17); + if (!OZb(g)) { + o = g.d; + p = l7c(OC(GC(m1, 1), nie, 8, 0, [o.i.n, o.n, o.a])).a; + if (Math.abs(l - p) > qme) { + f = k; + e = a; + d = new f7c(l, f); + Dsb(g.a, d); + BPc(this, g, e, d, false); + m = a.r; + if (m) { + n = Edb(ED(Ut(m.e, 0))); + d = new f7c(n, f); + Dsb(g.a, d); + BPc(this, g, e, d, false); + f = b - m.o * c; + e = m; + d = new f7c(n, f); + Dsb(g.a, d); + BPc(this, g, e, d, false); + } + d = new f7c(p, f); + Dsb(g.a, d); + BPc(this, g, e, d, false); + } + } + } + } + }; + _.eg = function LPc(a) { + return a.i.n.a + a.n.a + a.a.a; + }; + _.fg = function MPc() { + return Ucd(), Acd; + }; + _.gg = function NPc() { + return Ucd(), Rcd; + }; + var TZ = mdb(Nqe, "SouthToNorthRoutingStrategy", 1808); + bcb(1806, 661, {}, OPc); + _.dg = function PPc(a, b, c) { + var d, e, f, g, h, i, j, k, l, m, n, o, p; + if (!!a.r && !a.q) { + return; + } + k = b + a.o * c; + for (j = new olb(a.n); j.a < j.c.c.length; ) { + i = BD(mlb(j), 11); + l = l7c(OC(GC(m1, 1), nie, 8, 0, [i.i.n, i.n, i.a])).b; + for (h = new olb(i.g); h.a < h.c.c.length; ) { + g = BD(mlb(h), 17); + if (!OZb(g)) { + o = g.d; + p = l7c(OC(GC(m1, 1), nie, 8, 0, [o.i.n, o.n, o.a])).b; + if (Math.abs(l - p) > qme) { + f = k; + e = a; + d = new f7c(f, l); + Dsb(g.a, d); + BPc(this, g, e, d, true); + m = a.r; + if (m) { + n = Edb(ED(Ut(m.e, 0))); + d = new f7c(f, n); + Dsb(g.a, d); + BPc(this, g, e, d, true); + f = b + m.o * c; + e = m; + d = new f7c(f, n); + Dsb(g.a, d); + BPc(this, g, e, d, true); + } + d = new f7c(f, p); + Dsb(g.a, d); + BPc(this, g, e, d, true); + } + } + } + } + }; + _.eg = function QPc(a) { + return a.i.n.b + a.n.b + a.a.b; + }; + _.fg = function RPc() { + return Ucd(), zcd; + }; + _.gg = function SPc() { + return Ucd(), Tcd; + }; + var UZ = mdb(Nqe, "WestToEastRoutingStrategy", 1806); + bcb(813, 1, {}, YPc); + _.Ib = function ZPc() { + return Fe(this.a); + }; + _.b = 0; + _.c = false; + _.d = false; + _.f = 0; + var WZ = mdb(Pqe, "NubSpline", 813); + bcb(407, 1, { 407: 1 }, aQc, bQc); + var VZ = mdb(Pqe, "NubSpline/PolarCP", 407); + bcb(1453, 1, Bqe, vQc); + _.Yf = function xQc(a) { + return qQc(BD(a, 37)); + }; + _.pf = function yQc(a, b) { + uQc(this, BD(a, 37), b); + }; + var cQc, dQc, eQc, fQc, gQc; + var b$ = mdb(Pqe, "SplineEdgeRouter", 1453); + bcb(268, 1, { 268: 1 }, BQc); + _.Ib = function CQc() { + return this.a + " ->(" + this.c + ") " + this.b; + }; + _.c = 0; + var XZ = mdb(Pqe, "SplineEdgeRouter/Dependency", 268); + bcb(455, 22, { 3: 1, 35: 1, 22: 1, 455: 1 }, GQc); + var DQc, EQc; + var YZ = ndb(Pqe, "SplineEdgeRouter/SideToProcess", 455, CI, IQc, HQc); + var JQc; + bcb(1454, 1, Oie, LQc); + _.Mb = function MQc(a) { + return hQc(), !BD(a, 128).o; + }; + var ZZ = mdb(Pqe, "SplineEdgeRouter/lambda$0$Type", 1454); + bcb(1455, 1, {}, NQc); + _.Ge = function OQc(a) { + return hQc(), BD(a, 128).v + 1; + }; + var $Z = mdb(Pqe, "SplineEdgeRouter/lambda$1$Type", 1455); + bcb(1456, 1, qie, PQc); + _.td = function QQc(a) { + sQc(this.a, this.b, BD(a, 46)); + }; + var _Z = mdb(Pqe, "SplineEdgeRouter/lambda$2$Type", 1456); + bcb(1457, 1, qie, RQc); + _.td = function SQc(a) { + tQc(this.a, this.b, BD(a, 46)); + }; + var a$ = mdb(Pqe, "SplineEdgeRouter/lambda$3$Type", 1457); + bcb(128, 1, { 35: 1, 128: 1 }, YQc, ZQc); + _.wd = function $Qc(a) { + return WQc(this, BD(a, 128)); + }; + _.b = 0; + _.e = false; + _.f = 0; + _.g = 0; + _.j = false; + _.k = false; + _.n = 0; + _.o = false; + _.p = false; + _.q = false; + _.s = 0; + _.u = 0; + _.v = 0; + _.F = 0; + var d$ = mdb(Pqe, "SplineSegment", 128); + bcb(459, 1, { 459: 1 }, _Qc); + _.a = 0; + _.b = false; + _.c = false; + _.d = false; + _.e = false; + _.f = 0; + var c$ = mdb(Pqe, "SplineSegment/EdgeInformation", 459); + bcb(1234, 1, {}, hRc); + var f$ = mdb(Uqe, hme, 1234); + bcb(1235, 1, Dke, jRc); + _.ue = function kRc(a, b) { + return iRc(BD(a, 135), BD(b, 135)); + }; + _.Fb = function lRc(a) { + return this === a; + }; + _.ve = function mRc() { + return new tpb(this); + }; + var e$ = mdb(Uqe, ime, 1235); + bcb(1233, 1, {}, tRc); + var g$ = mdb(Uqe, "MrTree", 1233); + bcb(393, 22, { 3: 1, 35: 1, 22: 1, 393: 1, 246: 1, 234: 1 }, ARc); + _.Kf = function CRc() { + return zRc(this); + }; + _.Xf = function BRc() { + return zRc(this); + }; + var uRc, vRc, wRc, xRc; + var h$ = ndb(Uqe, "TreeLayoutPhases", 393, CI, ERc, DRc); + var FRc; + bcb(1130, 209, Mle, HRc); + _.Ze = function IRc(a, b) { + var c, d, e, f, g, h, i; + Ccb(DD(hkd(a, (JTc(), ATc)))) || + $Cb(((c = new _Cb((Pgd(), new bhd(a)))), c)); + g = + ((h = new SRc()), + tNb(h, a), + yNb(h, (mTc(), dTc), a), + (i = new Lqb()), + pRc(a, h, i), + oRc(a, h, i), + h); + f = gRc(this.a, g); + for (e = new olb(f); e.a < e.c.c.length; ) { + d = BD(mlb(e), 135); + rRc(this.b, d, Udd(b, 1 / f.c.length)); + } + g = fRc(f); + nRc(g); + }; + var i$ = mdb(Uqe, "TreeLayoutProvider", 1130); + bcb(1847, 1, vie, KRc); + _.Jc = function LRc(a) { + reb(this, a); + }; + _.Kc = function MRc() { + return mmb(), Emb(), Dmb; + }; + var j$ = mdb(Uqe, "TreeUtil/1", 1847); + bcb(1848, 1, vie, NRc); + _.Jc = function ORc(a) { + reb(this, a); + }; + _.Kc = function PRc() { + return mmb(), Emb(), Dmb; + }; + var k$ = mdb(Uqe, "TreeUtil/2", 1848); + bcb(502, 134, { 3: 1, 502: 1, 94: 1, 134: 1 }); + _.g = 0; + var m$ = mdb(Vqe, "TGraphElement", 502); + bcb(188, 502, { 3: 1, 188: 1, 502: 1, 94: 1, 134: 1 }, QRc); + _.Ib = function RRc() { + return !!this.b && !!this.c + ? WRc(this.b) + "->" + WRc(this.c) + : "e_" + tb(this); + }; + var l$ = mdb(Vqe, "TEdge", 188); + bcb(135, 134, { 3: 1, 135: 1, 94: 1, 134: 1 }, SRc); + _.Ib = function TRc() { + var a, b, c, d, e; + e = null; + for (d = Jsb(this.b, 0); d.b != d.d.c; ) { + c = BD(Xsb(d), 86); + e += (c.c == null || c.c.length == 0 ? "n_" + c.g : "n_" + c.c) + "\n"; + } + for (b = Jsb(this.a, 0); b.b != b.d.c; ) { + a = BD(Xsb(b), 188); + e += + (!!a.b && !!a.c ? WRc(a.b) + "->" + WRc(a.c) : "e_" + tb(a)) + "\n"; + } + return e; + }; + var n$ = mdb(Vqe, "TGraph", 135); + bcb(633, 502, { 3: 1, 502: 1, 633: 1, 94: 1, 134: 1 }); + var r$ = mdb(Vqe, "TShape", 633); + bcb(86, 633, { 3: 1, 502: 1, 86: 1, 633: 1, 94: 1, 134: 1 }, XRc); + _.Ib = function YRc() { + return WRc(this); + }; + var q$ = mdb(Vqe, "TNode", 86); + bcb(255, 1, vie, ZRc); + _.Jc = function $Rc(a) { + reb(this, a); + }; + _.Kc = function _Rc() { + var a; + return (a = Jsb(this.a.d, 0)), new aSc(a); + }; + var p$ = mdb(Vqe, "TNode/2", 255); + bcb(358, 1, aie, aSc); + _.Nb = function bSc(a) { + Rrb(this, a); + }; + _.Pb = function dSc() { + return BD(Xsb(this.a), 188).c; + }; + _.Ob = function cSc() { + return Wsb(this.a); + }; + _.Qb = function eSc() { + Zsb(this.a); + }; + var o$ = mdb(Vqe, "TNode/2/1", 358); + bcb(1840, 1, ene, hSc); + _.pf = function jSc(a, b) { + gSc(this, BD(a, 135), b); + }; + var s$ = mdb(Wqe, "FanProcessor", 1840); + bcb(327, 22, { 3: 1, 35: 1, 22: 1, 327: 1, 234: 1 }, rSc); + _.Kf = function sSc() { + switch (this.g) { + case 0: + return new QSc(); + case 1: + return new hSc(); + case 2: + return new GSc(); + case 3: + return new zSc(); + case 4: + return new NSc(); + case 5: + return new TSc(); + default: + throw vbb(new Wdb(Dne + (this.f != null ? this.f : "" + this.g))); + } + }; + var kSc, lSc, mSc, nSc, oSc, pSc; + var t$ = ndb(Wqe, Ene, 327, CI, uSc, tSc); + var vSc; + bcb(1843, 1, ene, zSc); + _.pf = function ASc(a, b) { + xSc(this, BD(a, 135), b); + }; + _.a = 0; + var v$ = mdb(Wqe, "LevelHeightProcessor", 1843); + bcb(1844, 1, vie, BSc); + _.Jc = function CSc(a) { + reb(this, a); + }; + _.Kc = function DSc() { + return mmb(), Emb(), Dmb; + }; + var u$ = mdb(Wqe, "LevelHeightProcessor/1", 1844); + bcb(1841, 1, ene, GSc); + _.pf = function HSc(a, b) { + ESc(this, BD(a, 135), b); + }; + _.a = 0; + var x$ = mdb(Wqe, "NeighborsProcessor", 1841); + bcb(1842, 1, vie, ISc); + _.Jc = function JSc(a) { + reb(this, a); + }; + _.Kc = function KSc() { + return mmb(), Emb(), Dmb; + }; + var w$ = mdb(Wqe, "NeighborsProcessor/1", 1842); + bcb(1845, 1, ene, NSc); + _.pf = function OSc(a, b) { + LSc(this, BD(a, 135), b); + }; + _.a = 0; + var y$ = mdb(Wqe, "NodePositionProcessor", 1845); + bcb(1839, 1, ene, QSc); + _.pf = function RSc(a, b) { + PSc(this, BD(a, 135)); + }; + var z$ = mdb(Wqe, "RootProcessor", 1839); + bcb(1846, 1, ene, TSc); + _.pf = function USc(a, b) { + SSc(BD(a, 135)); + }; + var A$ = mdb(Wqe, "Untreeifyer", 1846); + var VSc, + WSc, + XSc, + YSc, + ZSc, + $Sc, + _Sc, + aTc, + bTc, + cTc, + dTc, + eTc, + fTc, + gTc, + hTc, + iTc, + jTc, + kTc, + lTc; + bcb(851, 1, ale, sTc); + _.Qe = function tTc(a) { + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Zqe), ""), "Weighting of Nodes"), + "Which weighting to use when computing a node order." + ), + qTc + ), + (_5c(), V5c) + ), + E$ + ), + pqb((N5c(), L5c)) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), $qe), ""), "Search Order"), + "Which search order to use when computing a spanning tree." + ), + oTc + ), + V5c + ), + F$ + ), + pqb(L5c) + ) + ) + ); + KTc((new LTc(), a)); + }; + var nTc, oTc, pTc, qTc; + var B$ = mdb(_qe, "MrTreeMetaDataProvider", 851); + bcb(994, 1, ale, LTc); + _.Qe = function MTc(a) { + KTc(a); + }; + var uTc, + vTc, + wTc, + xTc, + yTc, + zTc, + ATc, + BTc, + CTc, + DTc, + ETc, + FTc, + GTc, + HTc, + ITc; + var D$ = mdb(_qe, "MrTreeOptions", 994); + bcb(995, 1, {}, NTc); + _.$e = function OTc() { + var a; + return (a = new HRc()), a; + }; + _._e = function PTc(a) {}; + var C$ = mdb(_qe, "MrTreeOptions/MrtreeFactory", 995); + bcb(480, 22, { 3: 1, 35: 1, 22: 1, 480: 1 }, TTc); + var QTc, RTc; + var E$ = ndb(_qe, "OrderWeighting", 480, CI, VTc, UTc); + var WTc; + bcb(425, 22, { 3: 1, 35: 1, 22: 1, 425: 1 }, _Tc); + var YTc, ZTc; + var F$ = ndb(_qe, "TreeifyingOrder", 425, CI, bUc, aUc); + var cUc; + bcb(1459, 1, Bqe, lUc); + _.Yf = function mUc(a) { + return BD(a, 135), eUc; + }; + _.pf = function nUc(a, b) { + kUc(this, BD(a, 135), b); + }; + var eUc; + var G$ = mdb("org.eclipse.elk.alg.mrtree.p1treeify", "DFSTreeifyer", 1459); + bcb(1460, 1, Bqe, sUc); + _.Yf = function tUc(a) { + return BD(a, 135), oUc; + }; + _.pf = function uUc(a, b) { + rUc(this, BD(a, 135), b); + }; + var oUc; + var H$ = mdb("org.eclipse.elk.alg.mrtree.p2order", "NodeOrderer", 1460); + bcb(1461, 1, Bqe, CUc); + _.Yf = function DUc(a) { + return BD(a, 135), vUc; + }; + _.pf = function EUc(a, b) { + AUc(this, BD(a, 135), b); + }; + _.a = 0; + var vUc; + var I$ = mdb("org.eclipse.elk.alg.mrtree.p3place", "NodePlacer", 1461); + bcb(1462, 1, Bqe, IUc); + _.Yf = function JUc(a) { + return BD(a, 135), FUc; + }; + _.pf = function KUc(a, b) { + HUc(BD(a, 135), b); + }; + var FUc; + var J$ = mdb("org.eclipse.elk.alg.mrtree.p4route", "EdgeRouter", 1462); + var LUc; + bcb(495, 22, { 3: 1, 35: 1, 22: 1, 495: 1, 246: 1, 234: 1 }, RUc); + _.Kf = function TUc() { + return QUc(this); + }; + _.Xf = function SUc() { + return QUc(this); + }; + var NUc, OUc; + var K$ = ndb(cre, "RadialLayoutPhases", 495, CI, VUc, UUc); + var WUc; + bcb(1131, 209, Mle, ZUc); + _.Ze = function $Uc(a, b) { + var c, d, e, f, g, h; + c = YUc(this, a); + Odd(b, "Radial layout", c.c.length); + Ccb(DD(hkd(a, (ZWc(), QWc)))) || + $Cb(((d = new _Cb((Pgd(), new bhd(a)))), d)); + h = aVc(a); + jkd(a, (MUc(), LUc), h); + if (!h) { + throw vbb(new Wdb("The given graph is not a tree!")); + } + e = Edb(ED(hkd(a, VWc))); + e == 0 && (e = _Uc(a)); + jkd(a, VWc, e); + for (g = new olb(YUc(this, a)); g.a < g.c.c.length; ) { + f = BD(mlb(g), 51); + f.pf(a, Udd(b, 1)); + } + Qdd(b); + }; + var L$ = mdb(cre, "RadialLayoutProvider", 1131); + bcb(549, 1, Dke, jVc); + _.ue = function kVc(a, b) { + return iVc(this.a, this.b, BD(a, 33), BD(b, 33)); + }; + _.Fb = function lVc(a) { + return this === a; + }; + _.ve = function mVc() { + return new tpb(this); + }; + _.a = 0; + _.b = 0; + var M$ = mdb(cre, "RadialUtil/lambda$0$Type", 549); + bcb(1375, 1, ene, oVc); + _.pf = function pVc(a, b) { + nVc(BD(a, 33), b); + }; + var N$ = mdb(fre, "CalculateGraphSize", 1375); + bcb(442, 22, { 3: 1, 35: 1, 22: 1, 442: 1, 234: 1 }, uVc); + _.Kf = function vVc() { + switch (this.g) { + case 0: + return new bWc(); + case 1: + return new NVc(); + case 2: + return new oVc(); + default: + throw vbb(new Wdb(Dne + (this.f != null ? this.f : "" + this.g))); + } + }; + var qVc, rVc, sVc; + var O$ = ndb(fre, Ene, 442, CI, xVc, wVc); + var yVc; + bcb(645, 1, {}); + _.e = 1; + _.g = 0; + var P$ = mdb(gre, "AbstractRadiusExtensionCompaction", 645); + bcb(1772, 645, {}, KVc); + _.hg = function LVc(a) { + var b, c, d, e, f, g, h, i, j; + this.c = BD(hkd(a, (MUc(), LUc)), 33); + EVc(this, this.c); + this.d = tXc(BD(hkd(a, (ZWc(), WWc)), 293)); + i = BD(hkd(a, KWc), 19); + !!i && DVc(this, i.a); + h = ED(hkd(a, (Y9c(), T9c))); + FVc(this, (uCb(h), h)); + j = gVc(this.c); + !!this.d && this.d.lg(j); + GVc(this, j); + g = new amb(OC(GC(E2, 1), hre, 33, 0, [this.c])); + for (c = 0; c < 2; c++) { + for (b = 0; b < j.c.length; b++) { + e = new amb( + OC(GC(E2, 1), hre, 33, 0, [(tCb(b, j.c.length), BD(j.c[b], 33))]) + ); + f = + b < j.c.length - 1 + ? (tCb(b + 1, j.c.length), BD(j.c[b + 1], 33)) + : (tCb(0, j.c.length), BD(j.c[0], 33)); + d = + b == 0 + ? BD(Ikb(j, j.c.length - 1), 33) + : (tCb(b - 1, j.c.length), BD(j.c[b - 1], 33)); + IVc(this, (tCb(b, j.c.length), BD(j.c[b], 33), g), d, f, e); + } + } + }; + var Q$ = mdb(gre, "AnnulusWedgeCompaction", 1772); + bcb(1374, 1, ene, NVc); + _.pf = function OVc(a, b) { + MVc(BD(a, 33), b); + }; + var R$ = mdb(gre, "GeneralCompactor", 1374); + bcb(1771, 645, {}, SVc); + _.hg = function TVc(a) { + var b, c, d, e; + c = BD(hkd(a, (MUc(), LUc)), 33); + this.f = c; + this.b = tXc(BD(hkd(a, (ZWc(), WWc)), 293)); + e = BD(hkd(a, KWc), 19); + !!e && DVc(this, e.a); + d = ED(hkd(a, (Y9c(), T9c))); + FVc(this, (uCb(d), d)); + b = gVc(c); + !!this.b && this.b.lg(b); + QVc(this, b); + }; + _.a = 0; + var S$ = mdb(gre, "RadialCompaction", 1771); + bcb(1779, 1, {}, VVc); + _.ig = function WVc(a) { + var b, c, d, e, f, g; + this.a = a; + b = 0; + g = gVc(a); + d = 0; + for (f = new olb(g); f.a < f.c.c.length; ) { + e = BD(mlb(f), 33); + ++d; + for (c = d; c < g.c.length; c++) { + UVc(this, e, (tCb(c, g.c.length), BD(g.c[c], 33))) && (b += 1); + } + } + return b; + }; + var T$ = mdb(ire, "CrossingMinimizationPosition", 1779); + bcb(1777, 1, {}, XVc); + _.ig = function YVc(a) { + var b, c, d, e, f, g, h, i, j, k, l, m, n; + d = 0; + for (c = new Sr(ur(_sd(a).a.Kc(), new Sq())); Qr(c); ) { + b = BD(Rr(c), 79); + h = atd(BD(qud((!b.c && (b.c = new y5d(z2, b, 5, 8)), b.c), 0), 82)); + j = h.i + h.g / 2; + k = h.j + h.f / 2; + e = a.i + a.g / 2; + f = a.j + a.f / 2; + l = new d7c(); + l.a = j - e; + l.b = k - f; + g = new f7c(l.a, l.b); + l6c(g, a.g, a.f); + l.a -= g.a; + l.b -= g.b; + e = j - l.a; + f = k - l.b; + i = new f7c(l.a, l.b); + l6c(i, h.g, h.f); + l.a -= i.a; + l.b -= i.b; + j = e + l.a; + k = f + l.b; + m = j - e; + n = k - f; + d += Math.sqrt(m * m + n * n); + } + return d; + }; + var U$ = mdb(ire, "EdgeLengthOptimization", 1777); + bcb(1778, 1, {}, ZVc); + _.ig = function $Vc(a) { + var b, c, d, e, f, g, h, i, j, k, l; + d = 0; + for (c = new Sr(ur(_sd(a).a.Kc(), new Sq())); Qr(c); ) { + b = BD(Rr(c), 79); + h = atd(BD(qud((!b.c && (b.c = new y5d(z2, b, 5, 8)), b.c), 0), 82)); + i = h.i + h.g / 2; + j = h.j + h.f / 2; + e = BD(hkd(h, (Y9c(), C9c)), 8); + f = a.i + e.a + a.g / 2; + g = a.j + e.b + a.f; + k = i - f; + l = j - g; + d += Math.sqrt(k * k + l * l); + } + return d; + }; + var V$ = mdb(ire, "EdgeLengthPositionOptimization", 1778); + bcb(1373, 645, ene, bWc); + _.pf = function cWc(a, b) { + aWc(this, BD(a, 33), b); + }; + var W$ = mdb( + "org.eclipse.elk.alg.radial.intermediate.overlaps", + "RadiusExtensionOverlapRemoval", + 1373 + ); + bcb(426, 22, { 3: 1, 35: 1, 22: 1, 426: 1 }, hWc); + var dWc, eWc; + var X$ = ndb(kre, "AnnulusWedgeCriteria", 426, CI, jWc, iWc); + var kWc; + bcb(380, 22, { 3: 1, 35: 1, 22: 1, 380: 1 }, rWc); + var mWc, nWc, oWc; + var Y$ = ndb(kre, Sle, 380, CI, tWc, sWc); + var uWc; + bcb(852, 1, ale, IWc); + _.Qe = function JWc(a) { + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), lre), ""), "Order ID"), + "The id can be used to define an order for nodes of one radius. This can be used to sort them in the layer accordingly." + ), + meb(0) + ), + (_5c(), X5c) + ), + JI + ), + pqb((N5c(), K5c)) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), mre), ""), "Radius"), + "The radius option can be used to set the initial radius for the radial layouter." + ), + 0 + ), + U5c + ), + BI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), nre), ""), "Compaction"), + "With the compacter option it can be determined how compaction on the graph is done. It can be chosen between none, the radial compaction or the compaction of wedges separately." + ), + yWc + ), + V5c + ), + Y$ + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), ore), ""), "Compaction Step Size"), + "Determine the size of steps with which the compaction is done. Step size 1 correlates to a compaction of 1 pixel per Iteration." + ), + meb(1) + ), + X5c + ), + JI + ), + pqb(L5c) + ) + ) + ); + o4c(a, ore, nre, null); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), pre), ""), "Sorter"), + "Sort the nodes per radius according to the sorting algorithm. The strategies are none, by the given order id, or sorting them by polar coordinates." + ), + EWc + ), + V5c + ), + b_ + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), qre), ""), "Annulus Wedge Criteria"), + "Determine how the wedge for the node placement is calculated. It can be chosen between wedge determination by the number of leaves or by the maximum sum of diagonals." + ), + GWc + ), + V5c + ), + X$ + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), rre), ""), + "Translation Optimization" + ), + "Find the optimal translation of the nodes of the first radii according to this criteria. For example edge crossings can be minimized." + ), + AWc + ), + V5c + ), + a_ + ), + pqb(L5c) + ) + ) + ); + $Wc((new _Wc(), a)); + }; + var wWc, xWc, yWc, zWc, AWc, BWc, CWc, DWc, EWc, FWc, GWc; + var Z$ = mdb(kre, "RadialMetaDataProvider", 852); + bcb(996, 1, ale, _Wc); + _.Qe = function aXc(a) { + $Wc(a); + }; + var KWc, + LWc, + MWc, + NWc, + OWc, + PWc, + QWc, + RWc, + SWc, + TWc, + UWc, + VWc, + WWc, + XWc, + YWc; + var _$ = mdb(kre, "RadialOptions", 996); + bcb(997, 1, {}, bXc); + _.$e = function cXc() { + var a; + return (a = new ZUc()), a; + }; + _._e = function dXc(a) {}; + var $$ = mdb(kre, "RadialOptions/RadialFactory", 997); + bcb(340, 22, { 3: 1, 35: 1, 22: 1, 340: 1 }, kXc); + var eXc, fXc, gXc, hXc; + var a_ = ndb(kre, "RadialTranslationStrategy", 340, CI, mXc, lXc); + var nXc; + bcb(293, 22, { 3: 1, 35: 1, 22: 1, 293: 1 }, uXc); + var pXc, qXc, rXc; + var b_ = ndb(kre, "SortingStrategy", 293, CI, wXc, vXc); + var xXc; + bcb(1449, 1, Bqe, CXc); + _.Yf = function DXc(a) { + return BD(a, 33), null; + }; + _.pf = function EXc(a, b) { + AXc(this, BD(a, 33), b); + }; + _.c = 0; + var c_ = mdb("org.eclipse.elk.alg.radial.p1position", "EadesRadial", 1449); + bcb(1775, 1, {}, FXc); + _.jg = function GXc(a) { + return eVc(a); + }; + var d_ = mdb(tre, "AnnulusWedgeByLeafs", 1775); + bcb(1776, 1, {}, IXc); + _.jg = function JXc(a) { + return HXc(this, a); + }; + var e_ = mdb(tre, "AnnulusWedgeByNodeSpace", 1776); + bcb(1450, 1, Bqe, MXc); + _.Yf = function NXc(a) { + return BD(a, 33), null; + }; + _.pf = function OXc(a, b) { + KXc(this, BD(a, 33), b); + }; + var f_ = mdb( + "org.eclipse.elk.alg.radial.p2routing", + "StraightLineEdgeRouter", + 1450 + ); + bcb(811, 1, {}, QXc); + _.kg = function RXc(a) {}; + _.lg = function TXc(a) { + PXc(this, a); + }; + var h_ = mdb(ure, "IDSorter", 811); + bcb(1774, 1, Dke, UXc); + _.ue = function VXc(a, b) { + return SXc(BD(a, 33), BD(b, 33)); + }; + _.Fb = function WXc(a) { + return this === a; + }; + _.ve = function XXc() { + return new tpb(this); + }; + var g_ = mdb(ure, "IDSorter/lambda$0$Type", 1774); + bcb(1773, 1, {}, $Xc); + _.kg = function _Xc(a) { + YXc(this, a); + }; + _.lg = function aYc(a) { + var b; + if (!a.dc()) { + if (!this.e) { + b = bVc(BD(a.Xb(0), 33)); + YXc(this, b); + } + PXc(this.e, a); + } + }; + var i_ = mdb(ure, "PolarCoordinateSorter", 1773); + bcb(1136, 209, Mle, bYc); + _.Ze = function eYc(a, b) { + var c, + d, + e, + f, + g, + h, + i, + j, + k, + l, + m, + n, + o, + p, + q, + r, + s, + t, + u, + v, + w, + A, + B, + C, + D, + F; + Odd(b, "Rectangle Packing", 1); + b.n && b.n && !!a && Tdd(b, i6d(a), (pgd(), mgd)); + c = Edb(ED(hkd(a, (lZc(), RYc)))); + p = BD(hkd(a, eZc), 381); + s = Ccb(DD(hkd(a, ZYc))); + w = Ccb(DD(hkd(a, dZc))); + l = Ccb(DD(hkd(a, VYc))); + A = BD(hkd(a, fZc), 116); + v = Edb(ED(hkd(a, jZc))); + e = Ccb(DD(hkd(a, iZc))); + m = Ccb(DD(hkd(a, WYc))); + r = Ccb(DD(hkd(a, XYc))); + F = Edb(ED(hkd(a, kZc))); + C = (!a.a && (a.a = new cUd(E2, a, 10, 11)), a.a); + r$c(C); + if (r) { + o = new Rkb(); + for (i = new Fyd(C); i.e != i.i.gc(); ) { + g = BD(Dyd(i), 33); + ikd(g, UYc) && ((o.c[o.c.length] = g), true); + } + for (j = new olb(o); j.a < j.c.c.length; ) { + g = BD(mlb(j), 33); + Ftd(C, g); + } + mmb(); + Okb(o, new fYc()); + for (k = new olb(o); k.a < k.c.c.length; ) { + g = BD(mlb(k), 33); + B = BD(hkd(g, UYc), 19).a; + B = Math.min(B, C.i); + vtd(C, B, g); + } + q = 0; + for (h = new Fyd(C); h.e != h.i.gc(); ) { + g = BD(Dyd(h), 33); + jkd(g, TYc, meb(q)); + ++q; + } + } + u = rfd(a); + u.a -= A.b + A.c; + u.b -= A.d + A.a; + t = u.a; + if (F < 0 || F < u.a) { + n = new nYc(c, p, s); + f = jYc(n, C, v, A); + b.n && b.n && !!a && Tdd(b, i6d(a), (pgd(), mgd)); + } else { + f = new d$c(c, F, 0, (k$c(), j$c)); + } + u.a += A.b + A.c; + u.b += A.d + A.a; + if (!w) { + r$c(C); + D = new DZc(c, l, m, e, v); + t = Math.max(u.a, f.c); + f = CZc(D, C, t, u, b, a, A); + } + cYc(C, A); + Afd(a, f.c + (A.b + A.c), f.b + (A.d + A.a), false, true); + Ccb(DD(hkd(a, cZc))) || $Cb(((d = new _Cb((Pgd(), new bhd(a)))), d)); + b.n && b.n && !!a && Tdd(b, i6d(a), (pgd(), mgd)); + Qdd(b); + }; + var k_ = mdb(yre, "RectPackingLayoutProvider", 1136); + bcb(1137, 1, Dke, fYc); + _.ue = function gYc(a, b) { + return dYc(BD(a, 33), BD(b, 33)); + }; + _.Fb = function hYc(a) { + return this === a; + }; + _.ve = function iYc() { + return new tpb(this); + }; + var j_ = mdb(yre, "RectPackingLayoutProvider/lambda$0$Type", 1137); + bcb(1256, 1, {}, nYc); + _.a = 0; + _.c = false; + var l_ = mdb(zre, "AreaApproximation", 1256); + var o_ = odb(zre, "BestCandidateFilter"); + bcb(638, 1, { 526: 1 }, oYc); + _.mg = function pYc(a, b, c) { + var d, e, f, g, h, i; + i = new Rkb(); + f = Pje; + for (h = new olb(a); h.a < h.c.c.length; ) { + g = BD(mlb(h), 220); + f = Math.min(f, (g.c + (c.b + c.c)) * (g.b + (c.d + c.a))); + } + for (e = new olb(a); e.a < e.c.c.length; ) { + d = BD(mlb(e), 220); + (d.c + (c.b + c.c)) * (d.b + (c.d + c.a)) == f && + ((i.c[i.c.length] = d), true); + } + return i; + }; + var m_ = mdb(zre, "AreaFilter", 638); + bcb(639, 1, { 526: 1 }, qYc); + _.mg = function rYc(a, b, c) { + var d, e, f, g, h, i; + h = new Rkb(); + i = Pje; + for (g = new olb(a); g.a < g.c.c.length; ) { + f = BD(mlb(g), 220); + i = Math.min( + i, + Math.abs((f.c + (c.b + c.c)) / (f.b + (c.d + c.a)) - b) + ); + } + for (e = new olb(a); e.a < e.c.c.length; ) { + d = BD(mlb(e), 220); + Math.abs((d.c + (c.b + c.c)) / (d.b + (c.d + c.a)) - b) == i && + ((h.c[h.c.length] = d), true); + } + return h; + }; + var n_ = mdb(zre, "AspectRatioFilter", 639); + bcb(637, 1, { 526: 1 }, uYc); + _.mg = function vYc(a, b, c) { + var d, e, f, g, h, i; + i = new Rkb(); + f = Qje; + for (h = new olb(a); h.a < h.c.c.length; ) { + g = BD(mlb(h), 220); + f = Math.max(f, q$c(g.c + (c.b + c.c), g.b + (c.d + c.a), g.a)); + } + for (e = new olb(a); e.a < e.c.c.length; ) { + d = BD(mlb(e), 220); + q$c(d.c + (c.b + c.c), d.b + (c.d + c.a), d.a) == f && + ((i.c[i.c.length] = d), true); + } + return i; + }; + var p_ = mdb(zre, "ScaleMeasureFilter", 637); + bcb(381, 22, { 3: 1, 35: 1, 22: 1, 381: 1 }, AYc); + var wYc, xYc, yYc; + var q_ = ndb(Are, "OptimizationGoal", 381, CI, CYc, BYc); + var DYc; + bcb(856, 1, ale, PYc); + _.Qe = function QYc(a) { + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Bre), ""), "Optimization Goal"), + "Optimization goal for approximation of the bounding box given by the first iteration. Determines whether layout is sorted by the maximum scaling, aspect ratio, or area. Depending on the strategy the aspect ratio might be nearly ignored." + ), + LYc + ), + (_5c(), V5c) + ), + q_ + ), + pqb((N5c(), K5c)) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Cre), ""), "Shift Last Placed."), + "When placing a rectangle behind or below the last placed rectangle in the first iteration, it is sometimes possible to shift the rectangle further to the left or right, resulting in less whitespace. True (default) enables the shift and false disables it. Disabling the shift produces a greater approximated area by the first iteration and a layout, when using ONLY the first iteration (default not the case), where it is sometimes impossible to implement a size transformation of rectangles that will fill the bounding box and eliminate empty spaces." + ), + (Bcb(), true) + ), + T5c + ), + wI + ), + pqb(K5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), Dre), ""), + "Current position of a node in the order of nodes" + ), + "The rectangles are ordered. Normally according to their definition the the model. This option specifies the current position of a node." + ), + meb(-1) + ), + X5c + ), + JI + ), + pqb(K5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Ere), ""), "Desired index of node"), + "The rectangles are ordered. Normally according to their definition the the model. This option allows to specify a desired position that has preference over the original position." + ), + meb(-1) + ), + X5c + ), + JI + ), + pqb(K5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), Fre), ""), + "Only Area Approximation" + ), + "If enabled only the width approximation step is executed and the nodes are placed accordingly. The nodes are layouted according to the packingStrategy. If set to true not expansion of nodes is taking place." + ), + false + ), + T5c + ), + wI + ), + pqb(K5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Gre), ""), "Compact Rows"), + "Enables compaction. Compacts blocks if they do not use the full height of the row. This option allows to have a smaller drawing. If this option is disabled all nodes are placed next to each other in rows." + ), + true + ), + T5c + ), + wI + ), + pqb(K5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Hre), ""), "Fit Aspect Ratio"), + "Expands nodes if expandNodes is true to fit the aspect ratio instead of only in their bounds. The option is only useful if the used packingStrategy is ASPECT_RATIO_DRIVEN, otherwise this may result in unreasonable ndoe expansion." + ), + false + ), + T5c + ), + wI + ), + pqb(K5c) + ) + ) + ); + o4c(a, Hre, Jre, null); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Ire), ""), "Target Width"), + "Option to place the rectangles in the given target width instead of approximating the width using the desired aspect ratio. The padding is not included in this. Meaning a drawing will have width of targetwidth + horizontal padding." + ), + -1 + ), + U5c + ), + BI + ), + pqb(K5c) + ) + ) + ); + mZc((new nZc(), a)); + }; + var FYc, GYc, HYc, IYc, JYc, KYc, LYc, MYc, NYc; + var r_ = mdb(Are, "RectPackingMetaDataProvider", 856); + bcb(1004, 1, ale, nZc); + _.Qe = function oZc(a) { + mZc(a); + }; + var RYc, + SYc, + TYc, + UYc, + VYc, + WYc, + XYc, + YYc, + ZYc, + $Yc, + _Yc, + aZc, + bZc, + cZc, + dZc, + eZc, + fZc, + gZc, + hZc, + iZc, + jZc, + kZc; + var t_ = mdb(Are, "RectPackingOptions", 1004); + bcb(1005, 1, {}, pZc); + _.$e = function qZc() { + var a; + return (a = new bYc()), a; + }; + _._e = function rZc(a) {}; + var s_ = mdb(Are, "RectPackingOptions/RectpackingFactory", 1005); + bcb(1257, 1, {}, DZc); + _.a = 0; + _.b = false; + _.c = 0; + _.d = 0; + _.e = false; + _.f = false; + _.g = 0; + var u_ = mdb( + "org.eclipse.elk.alg.rectpacking.seconditeration", + "RowFillingAndCompaction", + 1257 + ); + bcb(187, 1, { 187: 1 }, PZc); + _.a = 0; + _.c = false; + _.d = 0; + _.e = 0; + _.f = 0; + _.g = 0; + _.i = 0; + _.k = false; + _.o = Pje; + _.p = Pje; + _.r = 0; + _.s = 0; + _.t = 0; + var x_ = mdb(Lre, "Block", 187); + bcb(211, 1, { 211: 1 }, VZc); + _.a = 0; + _.b = 0; + _.d = 0; + _.e = 0; + _.f = 0; + var v_ = mdb(Lre, "BlockRow", 211); + bcb(443, 1, { 443: 1 }, b$c); + _.b = 0; + _.c = 0; + _.d = 0; + _.e = 0; + _.f = 0; + var w_ = mdb(Lre, "BlockStack", 443); + bcb(220, 1, { 220: 1 }, d$c, e$c); + _.a = 0; + _.b = 0; + _.c = 0; + _.d = 0; + _.e = 0; + var z_ = mdb(Lre, "DrawingData", 220); + bcb(355, 22, { 3: 1, 35: 1, 22: 1, 355: 1 }, l$c); + var f$c, g$c, h$c, i$c, j$c; + var y_ = ndb(Lre, "DrawingDataDescriptor", 355, CI, n$c, m$c); + var o$c; + bcb(200, 1, { 200: 1 }, x$c); + _.b = 0; + _.c = 0; + _.e = 0; + _.f = 0; + var A_ = mdb(Lre, "RectRow", 200); + bcb(756, 1, {}, F$c); + _.j = 0; + var G_ = mdb(Nre, une, 756); + bcb(1245, 1, {}, G$c); + _.Je = function H$c(a) { + return S6c(a.a, a.b); + }; + var B_ = mdb(Nre, vne, 1245); + bcb(1246, 1, {}, I$c); + _.Je = function J$c(a) { + return A$c(this.a, a); + }; + var C_ = mdb(Nre, wne, 1246); + bcb(1247, 1, {}, K$c); + _.Je = function L$c(a) { + return B$c(this.a, a); + }; + var D_ = mdb(Nre, xne, 1247); + bcb(1248, 1, {}, M$c); + _.Je = function N$c(a) { + return C$c(this.a, a); + }; + var E_ = mdb(Nre, "ElkGraphImporter/lambda$3$Type", 1248); + bcb(1249, 1, {}, O$c); + _.Je = function P$c(a) { + return D$c(this.a, a); + }; + var F_ = mdb(Nre, yne, 1249); + bcb(1133, 209, Mle, Q$c); + _.Ze = function S$c(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n; + if (ikd(a, (d0c(), c0c))) { + n = GD(hkd(a, (J0c(), I0c))); + f = h4c(n4c(), n); + if (f) { + g = BD(hgd(f.f), 209); + g.Ze(a, Udd(b, 1)); + } + } + jkd(a, Z_c, (C_c(), A_c)); + jkd(a, $_c, (N_c(), K_c)); + jkd(a, __c, (a1c(), _0c)); + h = BD(hkd(a, (J0c(), E0c)), 19).a; + Odd(b, "Overlap removal", 1); + Ccb(DD(hkd(a, D0c))) && "null45scanlineOverlaps"; + i = new Tqb(); + j = new U$c(i); + d = new F$c(); + c = z$c(d, a); + k = true; + e = 0; + while (e < h && k) { + if (Ccb(DD(hkd(a, F0c)))) { + i.a.$b(); + cOb(new dOb(j), c.i); + if (i.a.gc() == 0) { + break; + } + c.e = i; + } + H2c(this.b); + K2c(this.b, (Y$c(), V$c), (R0c(), Q0c)); + K2c(this.b, W$c, c.g); + K2c(this.b, X$c, (s_c(), r_c)); + this.a = F2c(this.b, c); + for (m = new olb(this.a); m.a < m.c.c.length; ) { + l = BD(mlb(m), 51); + l.pf(c, Udd(b, 1)); + } + E$c(d, c); + k = Ccb(DD(vNb(c, (XNb(), WNb)))); + ++e; + } + y$c(d, c); + Qdd(b); + }; + var I_ = mdb(Nre, "OverlapRemovalLayoutProvider", 1133); + bcb(1134, 1, {}, U$c); + var H_ = mdb(Nre, "OverlapRemovalLayoutProvider/lambda$0$Type", 1134); + bcb(437, 22, { 3: 1, 35: 1, 22: 1, 437: 1 }, Z$c); + var V$c, W$c, X$c; + var J_ = ndb(Nre, "SPOrEPhases", 437, CI, _$c, $$c); + var a_c; + bcb(1255, 1, {}, d_c); + var L_ = mdb(Nre, "ShrinkTree", 1255); + bcb(1135, 209, Mle, e_c); + _.Ze = function f_c(a, b) { + var c, d, e, f, g; + if (ikd(a, (d0c(), c0c))) { + g = GD(hkd(a, c0c)); + e = h4c(n4c(), g); + if (e) { + f = BD(hgd(e.f), 209); + f.Ze(a, Udd(b, 1)); + } + } + d = new F$c(); + c = z$c(d, a); + c_c(this.a, c, Udd(b, 1)); + y$c(d, c); + }; + var K_ = mdb(Nre, "ShrinkTreeLayoutProvider", 1135); + bcb(300, 134, { 3: 1, 300: 1, 94: 1, 134: 1 }, g_c); + _.c = false; + var M_ = mdb("org.eclipse.elk.alg.spore.graph", "Graph", 300); + bcb(482, 22, { 3: 1, 35: 1, 22: 1, 482: 1, 246: 1, 234: 1 }, k_c); + _.Kf = function m_c() { + return j_c(this); + }; + _.Xf = function l_c() { + return j_c(this); + }; + var h_c; + var N_ = ndb(Ore, Sle, 482, CI, o_c, n_c); + var p_c; + bcb(551, 22, { 3: 1, 35: 1, 22: 1, 551: 1, 246: 1, 234: 1 }, t_c); + _.Kf = function v_c() { + return new I1c(); + }; + _.Xf = function u_c() { + return new I1c(); + }; + var r_c; + var O_ = ndb(Ore, "OverlapRemovalStrategy", 551, CI, x_c, w_c); + var y_c; + bcb(430, 22, { 3: 1, 35: 1, 22: 1, 430: 1 }, D_c); + var A_c, B_c; + var P_ = ndb(Ore, "RootSelection", 430, CI, F_c, E_c); + var G_c; + bcb(316, 22, { 3: 1, 35: 1, 22: 1, 316: 1 }, O_c); + var I_c, J_c, K_c, L_c, M_c; + var Q_ = ndb(Ore, "SpanningTreeCostFunction", 316, CI, Q_c, P_c); + var R_c; + bcb(1002, 1, ale, f0c); + _.Qe = function g0c(a) { + e0c(a); + }; + var T_c, U_c, V_c, W_c, X_c, Y_c, Z_c, $_c, __c, a0c, b0c, c0c; + var S_ = mdb(Ore, "SporeCompactionOptions", 1002); + bcb(1003, 1, {}, h0c); + _.$e = function i0c() { + var a; + return (a = new e_c()), a; + }; + _._e = function j0c(a) {}; + var R_ = mdb(Ore, "SporeCompactionOptions/SporeCompactionFactory", 1003); + bcb(855, 1, ale, B0c); + _.Qe = function C0c(a) { + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + z5c( + D5c( + A5c(B5c(new H5c(), Qre), ""), + "Underlying Layout Algorithm" + ), + "A layout algorithm that is applied to the graph before it is compacted. If this is null, nothing is applied before compaction." + ), + (_5c(), Z5c) + ), + ZI + ), + pqb((N5c(), L5c)) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), Vre), "structure"), + "Structure Extraction Strategy" + ), + "This option defines what kind of triangulation or other partitioning of the plane is applied to the vertices." + ), + y0c + ), + V5c + ), + W_ + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), Rre), $re), + "Tree Construction Strategy" + ), + "Whether a minimum spanning tree or a maximum spanning tree should be constructed." + ), + w0c + ), + V5c + ), + X_ + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), Sre), $re), + "Cost Function for Spanning Tree" + ), + "The cost function is used in the creation of the spanning tree." + ), + u0c + ), + V5c + ), + Q_ + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), Tre), $re), + "Root node for spanning tree construction" + ), + "The identifier of the node that is preferred as the root of the spanning tree. If this is null, the first node is chosen." + ), + null + ), + Z5c + ), + ZI + ), + pqb(L5c) + ) + ) + ); + o4c(a, Tre, Ure, q0c); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), Ure), $re), + "Root selection for spanning tree" + ), + "This sets the method used to select a root node for the construction of a spanning tree" + ), + s0c + ), + V5c + ), + P_ + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Wre), Bpe), "Compaction Strategy"), + "This option defines how the compaction is applied." + ), + l0c + ), + V5c + ), + N_ + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Xre), Bpe), "Orthogonal Compaction"), + "Restricts the translation of nodes to orthogonal directions in the compaction phase." + ), + (Bcb(), false) + ), + T5c + ), + wI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), Yre), _re), + "Upper limit for iterations of overlap removal" + ), + null + ), + meb(64) + ), + X5c + ), + JI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), Zre), _re), + "Whether to run a supplementary scanline overlap check." + ), + null + ), + true + ), + T5c + ), + wI + ), + pqb(L5c) + ) + ) + ); + K0c((new L0c(), a)); + e0c((new f0c(), a)); + }; + var k0c, + l0c, + m0c, + n0c, + o0c, + p0c, + q0c, + r0c, + s0c, + t0c, + u0c, + v0c, + w0c, + x0c, + y0c, + z0c; + var T_ = mdb(Ore, "SporeMetaDataProvider", 855); + bcb(_ie, 1, ale, L0c); + _.Qe = function M0c(a) { + K0c(a); + }; + var D0c, E0c, F0c, G0c, H0c, I0c; + var V_ = mdb(Ore, "SporeOverlapRemovalOptions", _ie); + bcb(1001, 1, {}, N0c); + _.$e = function O0c() { + var a; + return (a = new Q$c()), a; + }; + _._e = function P0c(a) {}; + var U_ = mdb(Ore, "SporeOverlapRemovalOptions/SporeOverlapFactory", 1001); + bcb(530, 22, { 3: 1, 35: 1, 22: 1, 530: 1, 246: 1, 234: 1 }, T0c); + _.Kf = function V0c() { + return S0c(this); + }; + _.Xf = function U0c() { + return S0c(this); + }; + var Q0c; + var W_ = ndb(Ore, "StructureExtractionStrategy", 530, CI, X0c, W0c); + var Y0c; + bcb(429, 22, { 3: 1, 35: 1, 22: 1, 429: 1, 246: 1, 234: 1 }, c1c); + _.Kf = function e1c() { + return b1c(this); + }; + _.Xf = function d1c() { + return b1c(this); + }; + var $0c, _0c; + var X_ = ndb(Ore, "TreeConstructionStrategy", 429, CI, g1c, f1c); + var h1c; + bcb(1443, 1, Bqe, k1c); + _.Yf = function l1c(a) { + return BD(a, 300), new j3c(); + }; + _.pf = function m1c(a, b) { + j1c(BD(a, 300), b); + }; + var Z_ = mdb(bse, "DelaunayTriangulationPhase", 1443); + bcb(1444, 1, qie, n1c); + _.td = function o1c(a) { + Ekb(this.a, BD(a, 65).a); + }; + var Y_ = mdb(bse, "DelaunayTriangulationPhase/lambda$0$Type", 1444); + bcb(783, 1, Bqe, s1c); + _.Yf = function t1c(a) { + return BD(a, 300), new j3c(); + }; + _.pf = function u1c(a, b) { + this.ng(BD(a, 300), b); + }; + _.ng = function v1c(a, b) { + var c, d, e; + Odd(b, "Minimum spanning tree construction", 1); + a.d ? (d = a.d.a) : (d = BD(Ikb(a.i, 0), 65).a); + Ccb(DD(vNb(a, (XNb(), VNb)))) + ? (e = UCb(a.e, d, ((c = a.b), c))) + : (e = UCb(a.e, d, a.b)); + q1c(this, e, a); + Qdd(b); + }; + var b0 = mdb(cse, "MinSTPhase", 783); + bcb(1446, 783, Bqe, w1c); + _.ng = function y1c(a, b) { + var c, d, e, f; + Odd(b, "Maximum spanning tree construction", 1); + c = new z1c(a); + a.d ? (e = a.d.c) : (e = BD(Ikb(a.i, 0), 65).c); + Ccb(DD(vNb(a, (XNb(), VNb)))) + ? (f = UCb(a.e, e, ((d = c), d))) + : (f = UCb(a.e, e, c)); + q1c(this, f, a); + Qdd(b); + }; + var __ = mdb(cse, "MaxSTPhase", 1446); + bcb(1447, 1, {}, z1c); + _.Je = function A1c(a) { + return x1c(this.a, a); + }; + var $_ = mdb(cse, "MaxSTPhase/lambda$0$Type", 1447); + bcb(1445, 1, qie, B1c); + _.td = function C1c(a) { + r1c(this.a, BD(a, 65)); + }; + var a0 = mdb(cse, "MinSTPhase/lambda$0$Type", 1445); + bcb(785, 1, Bqe, I1c); + _.Yf = function J1c(a) { + return BD(a, 300), new j3c(); + }; + _.pf = function K1c(a, b) { + H1c(this, BD(a, 300), b); + }; + _.a = false; + var d0 = mdb(dse, "GrowTreePhase", 785); + bcb(786, 1, qie, L1c); + _.td = function M1c(a) { + G1c(this.a, this.b, this.c, BD(a, 221)); + }; + var c0 = mdb(dse, "GrowTreePhase/lambda$0$Type", 786); + bcb(1448, 1, Bqe, Q1c); + _.Yf = function R1c(a) { + return BD(a, 300), new j3c(); + }; + _.pf = function S1c(a, b) { + P1c(this, BD(a, 300), b); + }; + var f0 = mdb(dse, "ShrinkTreeCompactionPhase", 1448); + bcb(784, 1, qie, T1c); + _.td = function U1c(a) { + O1c(this.a, this.b, this.c, BD(a, 221)); + }; + var e0 = mdb(dse, "ShrinkTreeCompactionPhase/lambda$0$Type", 784); + var g2 = odb(yqe, "IGraphElementVisitor"); + bcb(860, 1, { 527: 1 }, b2c); + _.og = function e2c(a) { + var b; + b = a2c(this, a); + tNb(b, BD(Ohb(this.b, a), 94)); + $1c(this, a, b); + }; + var V1c, W1c, X1c; + var m0 = mdb(Nle, "LayoutConfigurator", 860); + var h0 = odb(Nle, "LayoutConfigurator/IPropertyHolderOptionFilter"); + bcb(932, 1, { 1933: 1 }, f2c); + _.pg = function g2c(a, b) { + return Y1c(), !a.Xe(b); + }; + var i0 = mdb(Nle, "LayoutConfigurator/lambda$0$Type", 932); + bcb(933, 1, { 1933: 1 }, i2c); + _.pg = function j2c(a, b) { + return h2c(a, b); + }; + var j0 = mdb(Nle, "LayoutConfigurator/lambda$1$Type", 933); + bcb(931, 1, { 831: 1 }, k2c); + _.qg = function l2c(a, b) { + return Y1c(), !a.Xe(b); + }; + var k0 = mdb(Nle, "LayoutConfigurator/lambda$2$Type", 931); + bcb(934, 1, Oie, m2c); + _.Mb = function n2c(a) { + return d2c(this.a, this.b, BD(a, 1933)); + }; + var l0 = mdb(Nle, "LayoutConfigurator/lambda$3$Type", 934); + bcb(858, 1, {}, w2c); + var n0 = mdb(Nle, "RecursiveGraphLayoutEngine", 858); + bcb(296, 60, Tie, x2c, y2c); + var o0 = mdb(Nle, "UnsupportedConfigurationException", 296); + bcb(453, 60, Tie, z2c); + var p0 = mdb(Nle, "UnsupportedGraphException", 453); + bcb(754, 1, {}); + var K1 = mdb(yqe, "AbstractRandomListAccessor", 754); + bcb(500, 754, {}, L2c); + _.rg = function N2c() { + return null; + }; + _.d = true; + _.e = true; + _.f = 0; + var v0 = mdb(fse, "AlgorithmAssembler", 500); + bcb(1236, 1, Oie, O2c); + _.Mb = function P2c(a) { + return !!BD(a, 123); + }; + var q0 = mdb(fse, "AlgorithmAssembler/lambda$0$Type", 1236); + bcb(1237, 1, {}, Q2c); + _.Kb = function R2c(a) { + return M2c(this.a, BD(a, 123)); + }; + var r0 = mdb(fse, "AlgorithmAssembler/lambda$1$Type", 1237); + bcb(1238, 1, Oie, S2c); + _.Mb = function T2c(a) { + return !!BD(a, 80); + }; + var s0 = mdb(fse, "AlgorithmAssembler/lambda$2$Type", 1238); + bcb(1239, 1, qie, U2c); + _.td = function V2c(a) { + d3c(this.a, BD(a, 80)); + }; + var t0 = mdb(fse, "AlgorithmAssembler/lambda$3$Type", 1239); + bcb(1240, 1, qie, W2c); + _.td = function X2c(a) { + G2c(this.a, this.b, BD(a, 234)); + }; + var u0 = mdb(fse, "AlgorithmAssembler/lambda$4$Type", 1240); + bcb(1355, 1, Dke, Z2c); + _.ue = function $2c(a, b) { + return Y2c(BD(a, 234), BD(b, 234)); + }; + _.Fb = function _2c(a) { + return this === a; + }; + _.ve = function a3c() { + return new tpb(this); + }; + var w0 = mdb(fse, "EnumBasedFactoryComparator", 1355); + bcb(80, 754, { 80: 1 }, j3c); + _.rg = function l3c() { + return new Tqb(); + }; + _.a = 0; + var x0 = mdb(fse, "LayoutProcessorConfiguration", 80); + bcb(1013, 1, { 527: 1 }, q3c); + _.og = function u3c(a) { + stb(n3c, new z3c(a)); + }; + var m3c, n3c, o3c; + var B0 = mdb(Xke, "DeprecatedLayoutOptionReplacer", 1013); + bcb(1014, 1, qie, v3c); + _.td = function w3c(a) { + r3c(BD(a, 160)); + }; + var y0 = mdb(Xke, "DeprecatedLayoutOptionReplacer/lambda$0$Type", 1014); + bcb(1015, 1, qie, x3c); + _.td = function y3c(a) { + s3c(BD(a, 160)); + }; + var z0 = mdb(Xke, "DeprecatedLayoutOptionReplacer/lambda$1$Type", 1015); + bcb(1016, 1, {}, z3c); + _.Od = function A3c(a, b) { + t3c(this.a, BD(a, 146), BD(b, 38)); + }; + var A0 = mdb(Xke, "DeprecatedLayoutOptionReplacer/lambda$2$Type", 1016); + bcb(149, 1, { 686: 1, 149: 1 }, E3c); + _.Fb = function F3c(a) { + return C3c(this, a); + }; + _.sg = function G3c() { + return this.b; + }; + _.tg = function H3c() { + return this.c; + }; + _.ne = function I3c() { + return this.e; + }; + _.Hb = function J3c() { + return LCb(this.c); + }; + _.Ib = function K3c() { + return "Layout Algorithm: " + this.c; + }; + var E0 = mdb(Xke, "LayoutAlgorithmData", 149); + bcb(263, 1, {}, R3c); + var D0 = mdb(Xke, "LayoutAlgorithmData/Builder", 263); + bcb(1017, 1, { 527: 1 }, U3c); + _.og = function V3c(a) { + JD(a, 239) && !Ccb(DD(a.We((Y9c(), d9c)))) && S3c(BD(a, 33)); + }; + var F0 = mdb(Xke, "LayoutAlgorithmResolver", 1017); + bcb(229, 1, { 686: 1, 229: 1 }, W3c); + _.Fb = function X3c(a) { + if (JD(a, 229)) { + return dfb(this.b, BD(a, 229).b); + } + return false; + }; + _.sg = function Y3c() { + return this.a; + }; + _.tg = function Z3c() { + return this.b; + }; + _.ne = function $3c() { + return this.d; + }; + _.Hb = function _3c() { + return LCb(this.b); + }; + _.Ib = function a4c() { + return "Layout Type: " + this.b; + }; + var H0 = mdb(Xke, "LayoutCategoryData", 229); + bcb(344, 1, {}, e4c); + var G0 = mdb(Xke, "LayoutCategoryData/Builder", 344); + bcb(867, 1, {}, m4c); + var f4c; + var c1 = mdb(Xke, "LayoutMetaDataService", 867); + bcb(868, 1, {}, v4c); + var J0 = mdb(Xke, "LayoutMetaDataService/Registry", 868); + bcb(478, 1, { 478: 1 }, w4c); + var I0 = mdb(Xke, "LayoutMetaDataService/Registry/Triple", 478); + bcb(869, 1, gse, x4c); + _.ug = function y4c() { + return new d7c(); + }; + var K0 = mdb(Xke, "LayoutMetaDataService/lambda$0$Type", 869); + bcb(870, 1, hse, z4c); + _.vg = function A4c(a) { + return R6c(BD(a, 8)); + }; + var L0 = mdb(Xke, "LayoutMetaDataService/lambda$1$Type", 870); + bcb(879, 1, gse, B4c); + _.ug = function C4c() { + return new Rkb(); + }; + var M0 = mdb(Xke, "LayoutMetaDataService/lambda$10$Type", 879); + bcb(880, 1, hse, D4c); + _.vg = function E4c(a) { + return new Tkb(BD(a, 12)); + }; + var N0 = mdb(Xke, "LayoutMetaDataService/lambda$11$Type", 880); + bcb(881, 1, gse, F4c); + _.ug = function G4c() { + return new Psb(); + }; + var O0 = mdb(Xke, "LayoutMetaDataService/lambda$12$Type", 881); + bcb(882, 1, hse, H4c); + _.vg = function I4c(a) { + return Ru(BD(a, 68)); + }; + var P0 = mdb(Xke, "LayoutMetaDataService/lambda$13$Type", 882); + bcb(883, 1, gse, J4c); + _.ug = function K4c() { + return new Tqb(); + }; + var Q0 = mdb(Xke, "LayoutMetaDataService/lambda$14$Type", 883); + bcb(884, 1, hse, L4c); + _.vg = function M4c(a) { + return Dx(BD(a, 53)); + }; + var R0 = mdb(Xke, "LayoutMetaDataService/lambda$15$Type", 884); + bcb(885, 1, gse, N4c); + _.ug = function O4c() { + return new zsb(); + }; + var S0 = mdb(Xke, "LayoutMetaDataService/lambda$16$Type", 885); + bcb(886, 1, hse, P4c); + _.vg = function Q4c(a) { + return Gx(BD(a, 53)); + }; + var T0 = mdb(Xke, "LayoutMetaDataService/lambda$17$Type", 886); + bcb(887, 1, gse, R4c); + _.ug = function S4c() { + return new Gxb(); + }; + var U0 = mdb(Xke, "LayoutMetaDataService/lambda$18$Type", 887); + bcb(888, 1, hse, T4c); + _.vg = function U4c(a) { + return Hx(BD(a, 208)); + }; + var V0 = mdb(Xke, "LayoutMetaDataService/lambda$19$Type", 888); + bcb(871, 1, gse, V4c); + _.ug = function W4c() { + return new s7c(); + }; + var W0 = mdb(Xke, "LayoutMetaDataService/lambda$2$Type", 871); + bcb(872, 1, hse, X4c); + _.vg = function Y4c(a) { + return new t7c(BD(a, 74)); + }; + var X0 = mdb(Xke, "LayoutMetaDataService/lambda$3$Type", 872); + bcb(873, 1, gse, Z4c); + _.ug = function $4c() { + return new H_b(); + }; + var Y0 = mdb(Xke, "LayoutMetaDataService/lambda$4$Type", 873); + bcb(874, 1, hse, _4c); + _.vg = function a5c(a) { + return new K_b(BD(a, 142)); + }; + var Z0 = mdb(Xke, "LayoutMetaDataService/lambda$5$Type", 874); + bcb(875, 1, gse, b5c); + _.ug = function c5c() { + return new p0b(); + }; + var $0 = mdb(Xke, "LayoutMetaDataService/lambda$6$Type", 875); + bcb(876, 1, hse, d5c); + _.vg = function e5c(a) { + return new r0b(BD(a, 116)); + }; + var _0 = mdb(Xke, "LayoutMetaDataService/lambda$7$Type", 876); + bcb(877, 1, gse, f5c); + _.ug = function g5c() { + return new _fd(); + }; + var a1 = mdb(Xke, "LayoutMetaDataService/lambda$8$Type", 877); + bcb(878, 1, hse, h5c); + _.vg = function i5c(a) { + return new agd(BD(a, 373)); + }; + var b1 = mdb(Xke, "LayoutMetaDataService/lambda$9$Type", 878); + var Q3 = odb(Hle, "IProperty"); + bcb(23, 1, { 35: 1, 686: 1, 23: 1, 146: 1 }, p5c); + _.wd = function q5c(a) { + return k5c(this, BD(a, 146)); + }; + _.Fb = function r5c(a) { + return JD(a, 23) + ? dfb(this.f, BD(a, 23).f) + : JD(a, 146) && dfb(this.f, BD(a, 146).tg()); + }; + _.wg = function s5c() { + var a; + if (JD(this.b, 4)) { + a = fvd(this.b); + if (a == null) { + throw vbb( + new Zdb( + mse + + this.f + + "'. " + + "Make sure it's type is registered with the " + + (fdb(Y3), Y3.k) + + jse + ) + ); + } + return a; + } else { + return this.b; + } + }; + _.sg = function t5c() { + return this.d; + }; + _.tg = function u5c() { + return this.f; + }; + _.ne = function v5c() { + return this.i; + }; + _.Hb = function w5c() { + return LCb(this.f); + }; + _.Ib = function x5c() { + return "Layout Option: " + this.f; + }; + var g1 = mdb(Xke, "LayoutOptionData", 23); + bcb(24, 1, {}, H5c); + var d1 = mdb(Xke, "LayoutOptionData/Builder", 24); + bcb(175, 22, { 3: 1, 35: 1, 22: 1, 175: 1 }, O5c); + var I5c, J5c, K5c, L5c, M5c; + var e1 = ndb(Xke, "LayoutOptionData/Target", 175, CI, Q5c, P5c); + var R5c; + bcb(277, 22, { 3: 1, 35: 1, 22: 1, 277: 1 }, a6c); + var T5c, U5c, V5c, W5c, X5c, Y5c, Z5c, $5c; + var f1 = ndb(Xke, "LayoutOptionData/Type", 277, CI, c6c, b6c); + var d6c; + var f6c; + var h6c; + bcb(110, 1, { 110: 1 }, I6c, J6c, K6c); + _.Fb = function L6c(a) { + var b; + if (a == null || !JD(a, 110)) { + return false; + } + b = BD(a, 110); + return ( + wtb(this.c, b.c) && + wtb(this.d, b.d) && + wtb(this.b, b.b) && + wtb(this.a, b.a) + ); + }; + _.Hb = function M6c() { + return Hlb(OC(GC(SI, 1), Uhe, 1, 5, [this.c, this.d, this.b, this.a])); + }; + _.Ib = function N6c() { + return ( + "Rect[x=" + + this.c + + ",y=" + + this.d + + ",w=" + + this.b + + ",h=" + + this.a + + "]" + ); + }; + _.a = 0; + _.b = 0; + _.c = 0; + _.d = 0; + var k1 = mdb(pne, "ElkRectangle", 110); + bcb(8, 1, { 3: 1, 4: 1, 8: 1, 414: 1 }, d7c, e7c, f7c, g7c); + _.Fb = function h7c(a) { + return T6c(this, a); + }; + _.Hb = function i7c() { + return Hdb(this.a) + jeb(Hdb(this.b)); + }; + _.Jf = function k7c(b) { + var c, d, e, f; + e = 0; + while (e < b.length && j7c((BCb(e, b.length), b.charCodeAt(e)), mne)) { + ++e; + } + c = b.length; + while (c > 0 && j7c((BCb(c - 1, b.length), b.charCodeAt(c - 1)), nne)) { + --c; + } + if (e >= c) { + throw vbb(new Wdb("The given string does not contain any numbers.")); + } + f = mfb(b.substr(e, c - e), ",|;|\r|\n"); + if (f.length != 2) { + throw vbb( + new Wdb( + "Exactly two numbers are expected, " + f.length + " were found." + ) + ); + } + try { + this.a = Hcb(ufb(f[0])); + this.b = Hcb(ufb(f[1])); + } catch (a) { + a = ubb(a); + if (JD(a, 127)) { + d = a; + throw vbb(new Wdb(one + d)); + } else throw vbb(a); + } + }; + _.Ib = function m7c() { + return "(" + this.a + "," + this.b + ")"; + }; + _.a = 0; + _.b = 0; + var m1 = mdb(pne, "KVector", 8); + bcb( + 74, + 68, + { 3: 1, 4: 1, 20: 1, 28: 1, 52: 1, 14: 1, 68: 1, 15: 1, 74: 1, 414: 1 }, + s7c, + t7c, + u7c + ); + _.Pc = function x7c() { + return r7c(this); + }; + _.Jf = function v7c(b) { + var c, d, e, f, g, h; + e = mfb(b, ",|;|\\(|\\)|\\[|\\]|\\{|\\}| |\t|\n"); + Osb(this); + try { + d = 0; + g = 0; + f = 0; + h = 0; + while (d < e.length) { + if (e[d] != null && ufb(e[d]).length > 0) { + g % 2 == 0 ? (f = Hcb(e[d])) : (h = Hcb(e[d])); + g > 0 && g % 2 != 0 && Dsb(this, new f7c(f, h)); + ++g; + } + ++d; + } + } catch (a) { + a = ubb(a); + if (JD(a, 127)) { + c = a; + throw vbb( + new Wdb( + "The given string does not match the expected format for vectors." + + c + ) + ); + } else throw vbb(a); + } + }; + _.Ib = function y7c() { + var a, b, c; + a = new Wfb("("); + b = Jsb(this, 0); + while (b.b != b.d.c) { + c = BD(Xsb(b), 8); + Qfb(a, c.a + "," + c.b); + b.b != b.d.c && ((a.a += "; "), a); + } + return ((a.a += ")"), a).a; + }; + var l1 = mdb(pne, "KVectorChain", 74); + bcb(248, 22, { 3: 1, 35: 1, 22: 1, 248: 1 }, G7c); + var z7c, A7c, B7c, C7c, D7c, E7c; + var o1 = ndb(ose, "Alignment", 248, CI, I7c, H7c); + var J7c; + bcb(979, 1, ale, Z7c); + _.Qe = function $7c(a) { + Y7c(a); + }; + var L7c, M7c, N7c, O7c, P7c, Q7c, R7c, S7c, T7c, U7c, V7c, W7c; + var q1 = mdb(ose, "BoxLayouterOptions", 979); + bcb(980, 1, {}, _7c); + _.$e = function a8c() { + var a; + return (a = new ged()), a; + }; + _._e = function b8c(a) {}; + var p1 = mdb(ose, "BoxLayouterOptions/BoxFactory", 980); + bcb(291, 22, { 3: 1, 35: 1, 22: 1, 291: 1 }, j8c); + var c8c, d8c, e8c, f8c, g8c, h8c; + var r1 = ndb(ose, "ContentAlignment", 291, CI, l8c, k8c); + var m8c; + bcb(684, 1, ale, Z9c); + _.Qe = function $9c(a) { + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + z5c( + D5c(A5c(B5c(new H5c(), sse), ""), "Layout Algorithm"), + "Select a specific layout algorithm." + ), + (_5c(), Z5c) + ), + ZI + ), + pqb((N5c(), L5c)) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + z5c( + D5c( + A5c(B5c(new H5c(), tse), ""), + "Resolved Layout Algorithm" + ), + "Meta data associated with the selected algorithm." + ), + Y5c + ), + E0 + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), $pe), ""), "Alignment"), + "Alignment of the selected node relative to other nodes; the exact meaning depends on the used algorithm." + ), + q8c + ), + V5c + ), + o1 + ), + pqb(K5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + z5c( + D5c(A5c(B5c(new H5c(), _le), ""), "Aspect Ratio"), + "The desired aspect ratio of the drawing, that is the quotient of width by height." + ), + U5c + ), + BI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + z5c( + D5c(A5c(B5c(new H5c(), use), ""), "Bend Points"), + "A fixed list of bend points for the edge. This is used by the 'Fixed Layout' algorithm to specify a pre-defined routing for an edge. The vector chain must include the source point, any bend points, and the target point, so it must have at least two points." + ), + Y5c + ), + l1 + ), + pqb(I5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), lqe), ""), "Content Alignment"), + "Specifies how the content of a node are aligned. Each node can individually control the alignment of its contents. I.e. if a node should be aligned top left in its parent node, the parent node should specify that option." + ), + x8c + ), + W5c + ), + r1 + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Zpe), ""), "Debug Mode"), + "Whether additional debug information shall be generated." + ), + (Bcb(), false) + ), + T5c + ), + wI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), cqe), ""), Cle), + "Overall direction of edges: horizontal (right / left) or vertical (down / up)." + ), + A8c + ), + V5c + ), + t1 + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), ype), ""), "Edge Routing"), + "What kind of edge routing style should be applied for the content of a parent node. Algorithms may also set this option to single edges in order to mark them as splines. The bend point list of edges with this option set to SPLINES must be interpreted as control points for a piecewise cubic spline." + ), + F8c + ), + V5c + ), + v1 + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Jre), ""), "Expand Nodes"), + "If active, nodes are expanded to fill the area of their parent." + ), + false + ), + T5c + ), + wI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), tpe), ""), "Hierarchy Handling"), + "Determines whether separate layout runs are triggered for different compound nodes in a hierarchical graph. Setting a node's hierarchy handling to `INCLUDE_CHILDREN` will lay out that node and all of its descendants in a single layout run, until a descendant is encountered which has its hierarchy handling set to `SEPARATE_CHILDREN`. In general, `SEPARATE_CHILDREN` will ensure that a new layout run is triggered for a node with that setting. Including multiple levels of hierarchy in a single layout run may allow cross-hierarchical edges to be laid out properly. If the root node is set to `INHERIT` (or not set at all), the default behavior is `SEPARATE_CHILDREN`." + ), + K8c + ), + V5c + ), + z1 + ), + qqb(L5c, OC(GC(e1, 1), Kie, 175, 0, [K5c])) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), ame), ""), "Padding"), + "The padding to be left to a parent element's border when placing child elements. This can also serve as an output option of a layout algorithm if node size calculation is setup appropriately." + ), + g9c + ), + Y5c + ), + j1 + ), + qqb(L5c, OC(GC(e1, 1), Kie, 175, 0, [K5c])) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Ame), ""), "Interactive"), + "Whether the algorithm should be run in interactive mode for the content of a parent node. What this means exactly depends on how the specific algorithm interprets this option. Usually in the interactive mode algorithms try to modify the current layout as little as possible." + ), + false + ), + T5c + ), + wI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), xqe), ""), "interactive Layout"), + "Whether the graph should be changeable interactively and by setting constraints" + ), + false + ), + T5c + ), + wI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Dme), ""), "Omit Node Micro Layout"), + "Node micro layout comprises the computation of node dimensions (if requested), the placement of ports and their labels, and the placement of node labels. The functionality is implemented independent of any specific layout algorithm and shouldn't have any negative impact on the layout algorithm's performance itself. Yet, if any unforeseen behavior occurs, this option allows to deactivate the micro layout." + ), + false + ), + T5c + ), + wI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Bme), ""), "Port Constraints"), + "Defines constraints of the position of the ports of a node." + ), + u9c + ), + V5c + ), + D1 + ), + pqb(K5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + z5c( + D5c(A5c(B5c(new H5c(), uqe), ""), "Position"), + "The position of a node, port, or label. This is used by the 'Fixed Layout' algorithm to specify a pre-defined position." + ), + Y5c + ), + m1 + ), + qqb(K5c, OC(GC(e1, 1), Kie, 175, 0, [M5c, J5c])) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + z5c( + D5c(A5c(B5c(new H5c(), vme), ""), "Priority"), + "Defines the priority of an object; its meaning depends on the specific layout algorithm and the context where it is used." + ), + X5c + ), + JI + ), + qqb(K5c, OC(GC(e1, 1), Kie, 175, 0, [I5c])) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + z5c( + D5c(A5c(B5c(new H5c(), yme), ""), "Randomization Seed"), + "Seed used for pseudo-random number generators to control the layout algorithm. If the value is 0, the seed shall be determined pseudo-randomly (e.g. from the system time)." + ), + X5c + ), + JI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + z5c( + D5c( + A5c(B5c(new H5c(), zme), ""), + "Separate Connected Components" + ), + "Whether each connected component should be processed separately." + ), + T5c + ), + wI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), mqe), ""), "Junction Points"), + "This option is not used as option, but as output of the layout algorithms. It is attached to edges and determines the points where junction symbols should be drawn in order to represent hyperedges with orthogonal routing. Whether such points are computed depends on the chosen layout algorithm and edge routing style. The points are put into the vector chain with no specific order." + ), + R8c + ), + Y5c + ), + l1 + ), + pqb(I5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), pqe), ""), "Comment Box"), + "Whether the node should be regarded as a comment box instead of a regular node. In that case its placement should be similar to how labels are handled. Any edges incident to a comment box specify to which graph elements the comment is related." + ), + false + ), + T5c + ), + wI + ), + pqb(K5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), qqe), ""), "Hypernode"), + "Whether the node should be handled as a hypernode." + ), + false + ), + T5c + ), + wI + ), + pqb(K5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + z5c( + D5c(A5c(B5c(new H5c(), vse), ""), "Label Manager"), + "Label managers can shorten labels upon a layout algorithm's request." + ), + Y5c + ), + h1 + ), + qqb(L5c, OC(GC(e1, 1), Kie, 175, 0, [J5c])) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), vqe), ""), "Margins"), + "Margins define additional space around the actual bounds of a graph element. For instance, ports or labels being placed on the outside of a node's border might introduce such a margin. The margin is used to guarantee non-overlap of other graph elements with those ports or labels." + ), + T8c + ), + Y5c + ), + i1 + ), + pqb(K5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Xpe), ""), "No Layout"), + "No layout is done for the associated element. This is used to mark parts of a diagram to avoid their inclusion in the layout graph, or to mark parts of the layout graph to prevent layout engines from processing them. If you wish to exclude the contents of a compound node from automatic layout, while the node itself is still considered on its own layer, use the 'Fixed Layout' algorithm for that node." + ), + false + ), + T5c + ), + wI + ), + qqb(K5c, OC(GC(e1, 1), Kie, 175, 0, [I5c, M5c, J5c])) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), wse), ""), "Scale Factor"), + "The scaling factor to be applied to the corresponding node in recursive layout. It causes the corresponding node's size to be adjusted, and its ports and labels to be sized and placed accordingly after the layout of that node has been determined (and before the node itself and its siblings are arranged). The scaling is not reverted afterwards, so the resulting layout graph contains the adjusted size and position data. This option is currently not supported if 'Layout Hierarchy' is set." + ), + 1 + ), + U5c + ), + BI + ), + pqb(K5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), xse), ""), "Animate"), + "Whether the shift from the old layout to the new computed layout shall be animated." + ), + true + ), + T5c + ), + wI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), yse), ""), "Animation Time Factor"), + "Factor for computation of animation time. The higher the value, the longer the animation time. If the value is 0, the resulting time is always equal to the minimum defined by 'Minimal Animation Time'." + ), + meb(100) + ), + X5c + ), + JI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), zse), ""), "Layout Ancestors"), + "Whether the hierarchy levels on the path from the selected element to the root of the diagram shall be included in the layout process." + ), + false + ), + T5c + ), + wI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Ase), ""), "Maximal Animation Time"), + "The maximal time for animations, in milliseconds." + ), + meb(4000) + ), + X5c + ), + JI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Bse), ""), "Minimal Animation Time"), + "The minimal time for animations, in milliseconds." + ), + meb(400) + ), + X5c + ), + JI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Cse), ""), "Progress Bar"), + "Whether a progress bar shall be displayed during layout computations." + ), + false + ), + T5c + ), + wI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Dse), ""), "Validate Graph"), + "Whether the graph shall be validated before any layout algorithm is applied. If this option is enabled and at least one error is found, the layout process is aborted and a message is shown to the user." + ), + false + ), + T5c + ), + wI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Ese), ""), "Validate Options"), + "Whether layout options shall be validated before any layout algorithm is applied. If this option is enabled and at least one error is found, the layout process is aborted and a message is shown to the user." + ), + true + ), + T5c + ), + wI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Fse), ""), "Zoom to Fit"), + "Whether the zoom level shall be set to view the whole diagram after layout." + ), + false + ), + T5c + ), + wI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), rse), "box"), "Box Layout Mode"), + "Configures the packing mode used by the {@link BoxLayoutProvider}. If SIMPLE is not required (neither priorities are used nor the interactive mode), GROUP_DEC can improve the packing and decrease the area. GROUP_MIXED and GROUP_INC may, in very specific scenarios, work better." + ), + u8c + ), + V5c + ), + O1 + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), Lpe), zpe), + "Comment Comment Spacing" + ), + "Spacing to be preserved between a comment box and other comment boxes connected to the same node. The space left between comment boxes of different nodes is controlled by the node-node spacing." + ), + 10 + ), + U5c + ), + BI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Mpe), zpe), "Comment Node Spacing"), + "Spacing to be preserved between a node and its connected comment boxes. The space left between a node and the comments of another node is controlled by the node-node spacing." + ), + 10 + ), + U5c + ), + BI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Zle), zpe), "Components Spacing"), + "Spacing to be preserved between pairs of connected components. This option is only relevant if 'separateConnectedComponents' is activated." + ), + 20 + ), + U5c + ), + BI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Npe), zpe), "Edge Spacing"), + "Spacing to be preserved between any two edges. Note that while this can somewhat easily be satisfied for the segments of orthogonally drawn edges, it is harder for general polylines or splines." + ), + 10 + ), + U5c + ), + BI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), xme), zpe), "Edge Label Spacing"), + "The minimal distance to be preserved between a label and the edge it is associated with. Note that the placement of a label is influenced by the 'edgelabels.placement' option." + ), + 2 + ), + U5c + ), + BI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Ope), zpe), "Edge Node Spacing"), + "Spacing to be preserved between nodes and edges." + ), + 10 + ), + U5c + ), + BI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Ppe), zpe), "Label Spacing"), + "Determines the amount of space to be left between two labels of the same graph element." + ), + 0 + ), + U5c + ), + BI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Spe), zpe), "Label Node Spacing"), + "Spacing to be preserved between labels and the border of node they are associated with. Note that the placement of a label is influenced by the 'nodelabels.placement' option." + ), + 5 + ), + U5c + ), + BI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), Qpe), zpe), + "Horizontal spacing between Label and Port" + ), + "Horizontal spacing to be preserved between labels and the ports they are associated with. Note that the placement of a label is influenced by the 'portlabels.placement' option." + ), + 1 + ), + U5c + ), + BI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), Rpe), zpe), + "Vertical spacing between Label and Port" + ), + "Vertical spacing to be preserved between labels and the ports they are associated with. Note that the placement of a label is influenced by the 'portlabels.placement' option." + ), + 1 + ), + U5c + ), + BI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), wme), zpe), "Node Spacing"), + "The minimal distance to be preserved between each two nodes." + ), + 20 + ), + U5c + ), + BI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), Tpe), zpe), + "Node Self Loop Spacing" + ), + "Spacing to be preserved between a node and its self loops." + ), + 10 + ), + U5c + ), + BI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Upe), zpe), "Port Spacing"), + "Spacing between pairs of ports of the same node." + ), + 10 + ), + U5c + ), + BI + ), + qqb(L5c, OC(GC(e1, 1), Kie, 175, 0, [K5c])) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + z5c( + D5c(A5c(B5c(new H5c(), Vpe), zpe), "Individual Spacing"), + "Allows to specify individual spacing values for graph elements that shall be different from the value specified for the element's parent." + ), + Y5c + ), + i2 + ), + qqb(K5c, OC(GC(e1, 1), Kie, 175, 0, [I5c, M5c, J5c])) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), wqe), zpe), "Additional Port Space"), + "Additional space around the sets of ports on each node side. For each side of a node, this option can reserve additional space before and after the ports on each side. For example, a top spacing of 20 makes sure that the first port on the western and eastern side is 20 units away from the northern border." + ), + W9c + ), + Y5c + ), + i1 + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + z5c( + D5c(A5c(B5c(new H5c(), tqe), Jse), "Layout Partition"), + "Partition to which the node belongs. This requires Layout Partitioning to be active. Nodes with lower partition IDs will appear to the left of nodes with higher partition IDs (assuming a left-to-right layout direction)." + ), + X5c + ), + JI + ), + qqb(L5c, OC(GC(e1, 1), Kie, 175, 0, [K5c])) + ) + ) + ); + o4c(a, tqe, sqe, k9c); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), sqe), Jse), "Layout Partitioning"), + "Whether to activate partitioned layout. This will allow to group nodes through the Layout Partition option. a pair of nodes with different partition indices is then placed such that the node with lower index is placed to the left of the other node (with left-to-right layout direction). Depending on the layout algorithm, this may only be guaranteed to work if all nodes have a layout partition configured, or at least if edges that cross partitions are not part of a partition-crossing cycle." + ), + i9c + ), + T5c + ), + wI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), dqe), Kse), "Node Label Padding"), + "Define padding for node labels that are placed inside of a node." + ), + V8c + ), + Y5c + ), + j1 + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Gme), Kse), "Node Label Placement"), + "Hints for where node labels are to be placed; if empty, the node label's position is not modified." + ), + X8c + ), + W5c + ), + B1 + ), + qqb(K5c, OC(GC(e1, 1), Kie, 175, 0, [J5c])) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), gqe), Lse), "Port Alignment"), + "Defines the default port distribution for a node. May be overridden for each side individually." + ), + m9c + ), + V5c + ), + C1 + ), + pqb(K5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + z5c( + D5c(A5c(B5c(new H5c(), hqe), Lse), "Port Alignment (North)"), + "Defines how ports on the northern side are placed, overriding the node's general port alignment." + ), + V5c + ), + C1 + ), + pqb(K5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + z5c( + D5c(A5c(B5c(new H5c(), iqe), Lse), "Port Alignment (South)"), + "Defines how ports on the southern side are placed, overriding the node's general port alignment." + ), + V5c + ), + C1 + ), + pqb(K5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + z5c( + D5c(A5c(B5c(new H5c(), jqe), Lse), "Port Alignment (West)"), + "Defines how ports on the western side are placed, overriding the node's general port alignment." + ), + V5c + ), + C1 + ), + pqb(K5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + z5c( + D5c(A5c(B5c(new H5c(), kqe), Lse), "Port Alignment (East)"), + "Defines how ports on the eastern side are placed, overriding the node's general port alignment." + ), + V5c + ), + C1 + ), + pqb(K5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Fme), Mse), "Node Size Constraints"), + "What should be taken into account when calculating a node's size. Empty size constraints specify that a node's size is already fixed and should not be changed." + ), + Z8c + ), + W5c + ), + I1 + ), + pqb(K5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Eme), Mse), "Node Size Options"), + "Options modifying the behavior of the size constraints set on a node. Each member of the set specifies something that should be taken into account when calculating node sizes. The empty set corresponds to no further modifications." + ), + c9c + ), + W5c + ), + J1 + ), + pqb(K5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Tme), Mse), "Node Size Minimum"), + "The minimal size to which a node can be reduced." + ), + a9c + ), + Y5c + ), + m1 + ), + pqb(K5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), bqe), Mse), "Fixed Graph Size"), + "By default, the fixed layout provider will enlarge a graph until it is large enough to contain its children. If this option is set, it won't do so." + ), + false + ), + T5c + ), + wI + ), + pqb(L5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), nqe), Jpe), "Edge Label Placement"), + "Gives a hint on where to put edge labels." + ), + D8c + ), + V5c + ), + u1 + ), + pqb(J5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Cme), Jpe), "Inline Edge Labels"), + "If true, an edge label is placed directly on its edge. May only apply to center edge labels. This kind of label placement is only advisable if the label's rendering is such that it is not crossed by its edge and thus stays legible." + ), + false + ), + T5c + ), + wI + ), + pqb(J5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + z5c( + D5c(A5c(B5c(new H5c(), Gse), "font"), "Font Name"), + "Font name used for a label." + ), + Z5c + ), + ZI + ), + pqb(J5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + z5c( + D5c(A5c(B5c(new H5c(), Hse), "font"), "Font Size"), + "Font size used for a label." + ), + X5c + ), + JI + ), + pqb(J5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + z5c( + D5c(A5c(B5c(new H5c(), rqe), Nse), "Port Anchor Offset"), + "The offset to the port position where connections shall be attached." + ), + Y5c + ), + m1 + ), + pqb(M5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + z5c( + D5c(A5c(B5c(new H5c(), oqe), Nse), "Port Index"), + "The index of a port in the fixed order around a node. The order is assumed as clockwise, starting with the leftmost port on the top side. This option must be set if 'Port Constraints' is set to FIXED_ORDER and no specific positions are given for the ports. Additionally, the option 'Port Side' must be defined in this case." + ), + X5c + ), + JI + ), + pqb(M5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Ype), Nse), "Port Side"), + "The side of a node on which a port is situated. This option must be set if 'Port Constraints' is set to FIXED_SIDE or FIXED_ORDER and no specific positions are given for the ports." + ), + B9c + ), + V5c + ), + F1 + ), + pqb(M5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + z5c( + D5c(A5c(B5c(new H5c(), Wpe), Nse), "Port Border Offset"), + "The offset of ports on the node border. With a positive offset the port is moved outside of the node, while with a negative offset the port is moved towards the inside. An offset of 0 means that the port is placed directly on the node border, i.e. if the port side is north, the port's south border touches the nodes's north border; if the port side is east, the port's west border touches the nodes's east border; if the port side is south, the port's north border touches the node's south border; if the port side is west, the port's east border touches the node's west border." + ), + U5c + ), + BI + ), + pqb(M5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Hme), Ose), "Port Label Placement"), + "Decides on a placement method for port labels; if empty, the node label's position is not modified." + ), + y9c + ), + W5c + ), + E1 + ), + pqb(K5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), eqe), Ose), + "Port Labels Next to Port" + ), + "Use 'portLabels.placement': NEXT_TO_PORT_OF_POSSIBLE." + ), + false + ), + T5c + ), + wI + ), + pqb(K5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), fqe), Ose), + "Treat Port Labels as Group" + ), + "If this option is true (default), the labels of a port will be treated as a group when it comes to centering them next to their port. If this option is false, only the first label will be centered next to the port, with the others being placed below. This only applies to labels of eastern and western ports and will have no effect if labels are not placed next to their port." + ), + true + ), + T5c + ), + wI + ), + pqb(K5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c( + A5c(B5c(new H5c(), _pe), Pse), + "Activate Inside Self Loops" + ), + "Whether this node allows to route self loops inside of it instead of around it. If set to true, this will make the node a compound node if it isn't already, and will require the layout algorithm to support compound nodes with hierarchical ports." + ), + false + ), + T5c + ), + wI + ), + pqb(K5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), aqe), Pse), "Inside Self Loop"), + "Whether a self loop should be routed inside a node instead of around that node." + ), + false + ), + T5c + ), + wI + ), + pqb(I5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), $le), "edge"), "Edge Thickness"), + "The thickness of an edge. This is a hint on the line width used to draw an edge, possibly requiring more space to be reserved for it." + ), + 1 + ), + U5c + ), + BI + ), + pqb(I5c) + ) + ) + ); + t4c( + a, + new p5c( + F5c( + E5c( + G5c( + y5c( + z5c( + D5c(A5c(B5c(new H5c(), Ise), "edge"), "Edge Type"), + "The type of an edge. This is usually used for UML class diagrams, where associations must be handled differently from generalizations." + ), + H8c + ), + V5c + ), + w1 + ), + pqb(I5c) + ) + ) + ); + s4c( + a, + new W3c( + b4c( + d4c(c4c(new e4c(), sne), "Layered"), + 'The layer-based method was introduced by Sugiyama, Tagawa and Toda in 1981. It emphasizes the direction of edges by pointing as many edges as possible into the same direction. The nodes are arranged in layers, which are sometimes called "hierarchies", and then reordered such that the number of edge crossings is minimized. Afterwards, concrete coordinates are computed for the nodes and edge bend points.' + ) + ) + ); + s4c( + a, + new W3c( + b4c( + d4c(c4c(new e4c(), "org.eclipse.elk.orthogonal"), "Orthogonal"), + 'Orthogonal methods that follow the "topology-shape-metrics" approach by Batini, Nardelli and Tamassia \'86. The first phase determines the topology of the drawing by applying a planarization technique, which results in a planar representation of the graph. The orthogonal shape is computed in the second phase, which aims at minimizing the number of edge bends, and is called orthogonalization. The third phase leads to concrete coordinates for nodes and edge bend points by applying a compaction method, thus defining the metrics.' + ) + ) + ); + s4c( + a, + new W3c( + b4c( + d4c(c4c(new e4c(), ume), "Force"), + "Layout algorithms that follow physical analogies by simulating a system of attractive and repulsive forces. The first successful method of this kind was proposed by Eades in 1984." + ) + ) + ); + s4c( + a, + new W3c( + b4c( + d4c(c4c(new e4c(), "org.eclipse.elk.circle"), "Circle"), + "Circular layout algorithms emphasize cycles or biconnected components of a graph by arranging them in circles. This is useful if a drawing is desired where such components are clearly grouped, or where cycles are shown as prominent OPTIONS of the graph." + ) + ) + ); + s4c( + a, + new W3c( + b4c( + d4c(c4c(new e4c(), bre), "Tree"), + "Specialized layout methods for trees, i.e. acyclic graphs. The regular structure of graphs that have no undirected cycles can be emphasized using an algorithm of this type." + ) + ) + ); + s4c( + a, + new W3c( + b4c( + d4c(c4c(new e4c(), "org.eclipse.elk.planar"), "Planar"), + "Algorithms that require a planar or upward planar graph. Most of these algorithms are theoretically interesting, but not practically usable." + ) + ) + ); + s4c( + a, + new W3c( + b4c( + d4c(c4c(new e4c(), sre), "Radial"), + "Radial layout algorithms usually position the nodes of the graph on concentric circles." + ) + ) + ); + $ad((new _ad(), a)); + Y7c((new Z7c(), a)); + jdd((new kdd(), a)); + }; + var o8c, + p8c, + q8c, + r8c, + s8c, + t8c, + u8c, + v8c, + w8c, + x8c, + y8c, + z8c, + A8c, + B8c, + C8c, + D8c, + E8c, + F8c, + G8c, + H8c, + I8c, + J8c, + K8c, + L8c, + M8c, + N8c, + O8c, + P8c, + Q8c, + R8c, + S8c, + T8c, + U8c, + V8c, + W8c, + X8c, + Y8c, + Z8c, + $8c, + _8c, + a9c, + b9c, + c9c, + d9c, + e9c, + f9c, + g9c, + h9c, + i9c, + j9c, + k9c, + l9c, + m9c, + n9c, + o9c, + p9c, + q9c, + r9c, + s9c, + t9c, + u9c, + v9c, + w9c, + x9c, + y9c, + z9c, + A9c, + B9c, + C9c, + D9c, + E9c, + F9c, + G9c, + H9c, + I9c, + J9c, + K9c, + L9c, + M9c, + N9c, + O9c, + P9c, + Q9c, + R9c, + S9c, + T9c, + U9c, + V9c, + W9c, + X9c; + var s1 = mdb(ose, "CoreOptions", 684); + bcb(103, 22, { 3: 1, 35: 1, 22: 1, 103: 1 }, iad); + var _9c, aad, bad, cad, dad; + var t1 = ndb(ose, Cle, 103, CI, kad, jad); + var lad; + bcb(272, 22, { 3: 1, 35: 1, 22: 1, 272: 1 }, rad); + var nad, oad, pad; + var u1 = ndb(ose, "EdgeLabelPlacement", 272, CI, tad, sad); + var uad; + bcb(218, 22, { 3: 1, 35: 1, 22: 1, 218: 1 }, Bad); + var wad, xad, yad, zad; + var v1 = ndb(ose, "EdgeRouting", 218, CI, Dad, Cad); + var Ead; + bcb(312, 22, { 3: 1, 35: 1, 22: 1, 312: 1 }, Nad); + var Gad, Had, Iad, Jad, Kad, Lad; + var w1 = ndb(ose, "EdgeType", 312, CI, Pad, Oad); + var Qad; + bcb(977, 1, ale, _ad); + _.Qe = function abd(a) { + $ad(a); + }; + var Sad, Tad, Uad, Vad, Wad, Xad, Yad; + var y1 = mdb(ose, "FixedLayouterOptions", 977); + bcb(978, 1, {}, bbd); + _.$e = function cbd() { + var a; + return (a = new Zfd()), a; + }; + _._e = function dbd(a) {}; + var x1 = mdb(ose, "FixedLayouterOptions/FixedFactory", 978); + bcb(334, 22, { 3: 1, 35: 1, 22: 1, 334: 1 }, ibd); + var ebd, fbd, gbd; + var z1 = ndb(ose, "HierarchyHandling", 334, CI, kbd, jbd); + var lbd; + bcb(285, 22, { 3: 1, 35: 1, 22: 1, 285: 1 }, tbd); + var nbd, obd, pbd, qbd; + var A1 = ndb(ose, "LabelSide", 285, CI, vbd, ubd); + var wbd; + bcb(93, 22, { 3: 1, 35: 1, 22: 1, 93: 1 }, Ibd); + var ybd, zbd, Abd, Bbd, Cbd, Dbd, Ebd, Fbd, Gbd; + var B1 = ndb(ose, "NodeLabelPlacement", 93, CI, Lbd, Kbd); + var Mbd; + bcb(249, 22, { 3: 1, 35: 1, 22: 1, 249: 1 }, Ubd); + var Obd, Pbd, Qbd, Rbd, Sbd; + var C1 = ndb(ose, "PortAlignment", 249, CI, Wbd, Vbd); + var Xbd; + bcb(98, 22, { 3: 1, 35: 1, 22: 1, 98: 1 }, gcd); + var Zbd, $bd, _bd, acd, bcd, ccd; + var D1 = ndb(ose, "PortConstraints", 98, CI, icd, hcd); + var jcd; + bcb(273, 22, { 3: 1, 35: 1, 22: 1, 273: 1 }, scd); + var lcd, mcd, ncd, ocd, pcd, qcd; + var E1 = ndb(ose, "PortLabelPlacement", 273, CI, wcd, vcd); + var xcd; + bcb(61, 22, { 3: 1, 35: 1, 22: 1, 61: 1 }, Ycd); + var zcd, + Acd, + Bcd, + Ccd, + Dcd, + Ecd, + Fcd, + Gcd, + Hcd, + Icd, + Jcd, + Kcd, + Lcd, + Mcd, + Ncd, + Ocd, + Pcd, + Qcd, + Rcd, + Scd, + Tcd; + var F1 = ndb(ose, "PortSide", 61, CI, _cd, $cd); + var bdd; + bcb(981, 1, ale, kdd); + _.Qe = function ldd(a) { + jdd(a); + }; + var ddd, edd, fdd, gdd, hdd; + var H1 = mdb(ose, "RandomLayouterOptions", 981); + bcb(982, 1, {}, mdd); + _.$e = function ndd() { + var a; + return (a = new Mgd()), a; + }; + _._e = function odd(a) {}; + var G1 = mdb(ose, "RandomLayouterOptions/RandomFactory", 982); + bcb(374, 22, { 3: 1, 35: 1, 22: 1, 374: 1 }, udd); + var pdd, qdd, rdd, sdd; + var I1 = ndb(ose, "SizeConstraint", 374, CI, wdd, vdd); + var xdd; + bcb(259, 22, { 3: 1, 35: 1, 22: 1, 259: 1 }, Jdd); + var zdd, Add, Bdd, Cdd, Ddd, Edd, Fdd, Gdd, Hdd; + var J1 = ndb(ose, "SizeOptions", 259, CI, Ldd, Kdd); + var Mdd; + bcb(370, 1, { 1949: 1 }, Zdd); + _.b = false; + _.c = 0; + _.d = -1; + _.e = null; + _.f = null; + _.g = -1; + _.j = false; + _.k = false; + _.n = false; + _.o = 0; + _.q = 0; + _.r = 0; + var L1 = mdb(yqe, "BasicProgressMonitor", 370); + bcb(972, 209, Mle, ged); + _.Ze = function ked(a, b) { + var c, d, e, f, g, h, i, j, k; + Odd(b, "Box layout", 2); + e = Gdb(ED(hkd(a, (X7c(), W7c)))); + f = BD(hkd(a, T7c), 116); + c = Ccb(DD(hkd(a, O7c))); + d = Ccb(DD(hkd(a, P7c))); + switch (BD(hkd(a, M7c), 311).g) { + case 0: + g = + ((h = new Tkb((!a.a && (a.a = new cUd(E2, a, 10, 11)), a.a))), + mmb(), + Okb(h, new med(d)), + h); + i = rfd(a); + j = ED(hkd(a, L7c)); + (j == null || (uCb(j), j) <= 0) && (j = 1.3); + k = ded(g, e, f, i.a, i.b, c, (uCb(j), j)); + Afd(a, k.a, k.b, false, true); + break; + default: + eed(a, e, f, c); + } + Qdd(b); + }; + var S1 = mdb(yqe, "BoxLayoutProvider", 972); + bcb(973, 1, Dke, med); + _.ue = function ned(a, b) { + return led(this, BD(a, 33), BD(b, 33)); + }; + _.Fb = function oed(a) { + return this === a; + }; + _.ve = function ped() { + return new tpb(this); + }; + _.a = false; + var M1 = mdb(yqe, "BoxLayoutProvider/1", 973); + bcb(157, 1, { 157: 1 }, wed, xed); + _.Ib = function yed() { + return this.c ? _od(this.c) : Fe(this.b); + }; + var N1 = mdb(yqe, "BoxLayoutProvider/Group", 157); + bcb(311, 22, { 3: 1, 35: 1, 22: 1, 311: 1 }, Eed); + var zed, Aed, Bed, Ced; + var O1 = ndb(yqe, "BoxLayoutProvider/PackingMode", 311, CI, Ged, Fed); + var Hed; + bcb(974, 1, Dke, Jed); + _.ue = function Ked(a, b) { + return hed(BD(a, 157), BD(b, 157)); + }; + _.Fb = function Led(a) { + return this === a; + }; + _.ve = function Med() { + return new tpb(this); + }; + var P1 = mdb(yqe, "BoxLayoutProvider/lambda$0$Type", 974); + bcb(975, 1, Dke, Ned); + _.ue = function Oed(a, b) { + return ied(BD(a, 157), BD(b, 157)); + }; + _.Fb = function Ped(a) { + return this === a; + }; + _.ve = function Qed() { + return new tpb(this); + }; + var Q1 = mdb(yqe, "BoxLayoutProvider/lambda$1$Type", 975); + bcb(976, 1, Dke, Red); + _.ue = function Sed(a, b) { + return jed(BD(a, 157), BD(b, 157)); + }; + _.Fb = function Ted(a) { + return this === a; + }; + _.ve = function Ued() { + return new tpb(this); + }; + var R1 = mdb(yqe, "BoxLayoutProvider/lambda$2$Type", 976); + bcb(1365, 1, { 831: 1 }, Ved); + _.qg = function Wed(a, b) { + return Vyc(), !JD(b, 160) || h2c((Y1c(), X1c, BD(a, 160)), b); + }; + var T1 = mdb( + yqe, + "ElkSpacings/AbstractSpacingsBuilder/lambda$0$Type", + 1365 + ); + bcb(1366, 1, qie, Xed); + _.td = function Yed(a) { + Yyc(this.a, BD(a, 146)); + }; + var U1 = mdb( + yqe, + "ElkSpacings/AbstractSpacingsBuilder/lambda$1$Type", + 1366 + ); + bcb(1367, 1, qie, Zed); + _.td = function $ed(a) { + BD(a, 94); + Vyc(); + }; + var V1 = mdb( + yqe, + "ElkSpacings/AbstractSpacingsBuilder/lambda$2$Type", + 1367 + ); + bcb(1371, 1, qie, _ed); + _.td = function afd(a) { + Zyc(this.a, BD(a, 94)); + }; + var W1 = mdb( + yqe, + "ElkSpacings/AbstractSpacingsBuilder/lambda$3$Type", + 1371 + ); + bcb(1369, 1, Oie, bfd); + _.Mb = function cfd(a) { + return $yc(this.a, this.b, BD(a, 146)); + }; + var X1 = mdb( + yqe, + "ElkSpacings/AbstractSpacingsBuilder/lambda$4$Type", + 1369 + ); + bcb(1368, 1, Oie, dfd); + _.Mb = function efd(a) { + return azc(this.a, this.b, BD(a, 831)); + }; + var Y1 = mdb( + yqe, + "ElkSpacings/AbstractSpacingsBuilder/lambda$5$Type", + 1368 + ); + bcb(1370, 1, qie, ffd); + _.td = function gfd(a) { + _yc(this.a, this.b, BD(a, 146)); + }; + var Z1 = mdb( + yqe, + "ElkSpacings/AbstractSpacingsBuilder/lambda$6$Type", + 1370 + ); + bcb(935, 1, {}, Hfd); + _.Kb = function Ifd(a) { + return Gfd(a); + }; + _.Fb = function Jfd(a) { + return this === a; + }; + var _1 = mdb(yqe, "ElkUtil/lambda$0$Type", 935); + bcb(936, 1, qie, Kfd); + _.td = function Lfd(a) { + ufd(this.a, this.b, BD(a, 79)); + }; + _.a = 0; + _.b = 0; + var a2 = mdb(yqe, "ElkUtil/lambda$1$Type", 936); + bcb(937, 1, qie, Mfd); + _.td = function Nfd(a) { + vfd(this.a, this.b, BD(a, 202)); + }; + _.a = 0; + _.b = 0; + var b2 = mdb(yqe, "ElkUtil/lambda$2$Type", 937); + bcb(938, 1, qie, Ofd); + _.td = function Pfd(a) { + wfd(this.a, this.b, BD(a, 137)); + }; + _.a = 0; + _.b = 0; + var c2 = mdb(yqe, "ElkUtil/lambda$3$Type", 938); + bcb(939, 1, qie, Qfd); + _.td = function Rfd(a) { + xfd(this.a, BD(a, 469)); + }; + var d2 = mdb(yqe, "ElkUtil/lambda$4$Type", 939); + bcb(342, 1, { 35: 1, 342: 1 }, Tfd); + _.wd = function Ufd(a) { + return Sfd(this, BD(a, 236)); + }; + _.Fb = function Vfd(a) { + var b; + if (JD(a, 342)) { + b = BD(a, 342); + return this.a == b.a; + } + return false; + }; + _.Hb = function Wfd() { + return QD(this.a); + }; + _.Ib = function Xfd() { + return this.a + " (exclusive)"; + }; + _.a = 0; + var e2 = mdb(yqe, "ExclusiveBounds/ExclusiveLowerBound", 342); + bcb(1138, 209, Mle, Zfd); + _.Ze = function $fd(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, A, B; + Odd(b, "Fixed Layout", 1); + f = BD(hkd(a, (Y9c(), E8c)), 218); + l = 0; + m = 0; + for ( + s = new Fyd((!a.a && (a.a = new cUd(E2, a, 10, 11)), a.a)); + s.e != s.i.gc(); + + ) { + q = BD(Dyd(s), 33); + B = BD(hkd(q, (Zad(), Yad)), 8); + if (B) { + bld(q, B.a, B.b); + if (BD(hkd(q, Tad), 174).Hc((tdd(), pdd))) { + n = BD(hkd(q, Vad), 8); + n.a > 0 && n.b > 0 && Afd(q, n.a, n.b, true, true); + } + } + l = Math.max(l, q.i + q.g); + m = Math.max(m, q.j + q.f); + for ( + j = new Fyd((!q.n && (q.n = new cUd(D2, q, 1, 7)), q.n)); + j.e != j.i.gc(); + + ) { + h = BD(Dyd(j), 137); + B = BD(hkd(h, Yad), 8); + !!B && bld(h, B.a, B.b); + l = Math.max(l, q.i + h.i + h.g); + m = Math.max(m, q.j + h.j + h.f); + } + for ( + v = new Fyd((!q.c && (q.c = new cUd(F2, q, 9, 9)), q.c)); + v.e != v.i.gc(); + + ) { + u = BD(Dyd(v), 118); + B = BD(hkd(u, Yad), 8); + !!B && bld(u, B.a, B.b); + w = q.i + u.i; + A = q.j + u.j; + l = Math.max(l, w + u.g); + m = Math.max(m, A + u.f); + for ( + i = new Fyd((!u.n && (u.n = new cUd(D2, u, 1, 7)), u.n)); + i.e != i.i.gc(); + + ) { + h = BD(Dyd(i), 137); + B = BD(hkd(h, Yad), 8); + !!B && bld(h, B.a, B.b); + l = Math.max(l, w + h.i + h.g); + m = Math.max(m, A + h.j + h.f); + } + } + for (e = new Sr(ur(_sd(q).a.Kc(), new Sq())); Qr(e); ) { + c = BD(Rr(e), 79); + k = Yfd(c); + l = Math.max(l, k.a); + m = Math.max(m, k.b); + } + for (d = new Sr(ur($sd(q).a.Kc(), new Sq())); Qr(d); ) { + c = BD(Rr(d), 79); + if (Xod(jtd(c)) != a) { + k = Yfd(c); + l = Math.max(l, k.a); + m = Math.max(m, k.b); + } + } + } + if (f == (Aad(), wad)) { + for ( + r = new Fyd((!a.a && (a.a = new cUd(E2, a, 10, 11)), a.a)); + r.e != r.i.gc(); + + ) { + q = BD(Dyd(r), 33); + for (d = new Sr(ur(_sd(q).a.Kc(), new Sq())); Qr(d); ) { + c = BD(Rr(d), 79); + g = pfd(c); + g.b == 0 ? jkd(c, Q8c, null) : jkd(c, Q8c, g); + } + } + } + if (!Ccb(DD(hkd(a, (Zad(), Uad))))) { + t = BD(hkd(a, Wad), 116); + p = l + t.b + t.c; + o = m + t.d + t.a; + Afd(a, p, o, true, true); + } + Qdd(b); + }; + var f2 = mdb(yqe, "FixedLayoutProvider", 1138); + bcb(373, 134, { 3: 1, 414: 1, 373: 1, 94: 1, 134: 1 }, _fd, agd); + _.Jf = function dgd(b) { + var c, d, e, f, g, h, i, j, k; + if (!b) { + return; + } + try { + j = mfb(b, ";,;"); + for (g = j, h = 0, i = g.length; h < i; ++h) { + f = g[h]; + d = mfb(f, "\\:"); + e = k4c(n4c(), d[0]); + if (!e) { + throw vbb(new Wdb("Invalid option id: " + d[0])); + } + k = o5c(e, d[1]); + if (k == null) { + throw vbb(new Wdb("Invalid option value: " + d[1])); + } + k == null + ? (!this.q && (this.q = new Lqb()), Thb(this.q, e)) + : (!this.q && (this.q = new Lqb()), Rhb(this.q, e, k)); + } + } catch (a) { + a = ubb(a); + if (JD(a, 102)) { + c = a; + throw vbb(new Xdb(c)); + } else throw vbb(a); + } + }; + _.Ib = function egd() { + var a; + a = GD( + GAb( + NAb((!this.q ? (mmb(), mmb(), kmb) : this.q).vc().Oc(), new fgd()), + Ayb( + new pzb(), + new nzb(), + new Zyb(), + new _yb(), + OC(GC(xL, 1), Kie, 132, 0, []) + ) + ) + ); + return a; + }; + var i2 = mdb(yqe, "IndividualSpacings", 373); + bcb(971, 1, {}, fgd); + _.Kb = function ggd(a) { + return cgd(BD(a, 42)); + }; + var h2 = mdb(yqe, "IndividualSpacings/lambda$0$Type", 971); + bcb(709, 1, {}, jgd); + _.c = 0; + var j2 = mdb(yqe, "InstancePool", 709); + bcb(1275, 1, {}, kgd); + var l2 = mdb(yqe, "LoggedGraph", 1275); + bcb(396, 22, { 3: 1, 35: 1, 22: 1, 396: 1 }, qgd); + var lgd, mgd, ngd, ogd; + var k2 = ndb(yqe, "LoggedGraph/Type", 396, CI, sgd, rgd); + var tgd; + bcb(46, 1, { 20: 1, 46: 1 }, vgd); + _.Jc = function xgd(a) { + reb(this, a); + }; + _.Fb = function wgd(a) { + var b, c, d; + if (JD(a, 46)) { + c = BD(a, 46); + b = this.a == null ? c.a == null : pb(this.a, c.a); + d = this.b == null ? c.b == null : pb(this.b, c.b); + return b && d; + } else { + return false; + } + }; + _.Hb = function ygd() { + var a, b, c, d, e, f; + c = this.a == null ? 0 : tb(this.a); + a = c & aje; + b = c & -65536; + f = this.b == null ? 0 : tb(this.b); + d = f & aje; + e = f & -65536; + return (a ^ ((e >> 16) & aje)) | (b ^ (d << 16)); + }; + _.Kc = function zgd() { + return new Bgd(this); + }; + _.Ib = function Agd() { + return this.a == null && this.b == null + ? "pair(null,null)" + : this.a == null + ? "pair(null," + fcb(this.b) + ")" + : this.b == null + ? "pair(" + fcb(this.a) + ",null)" + : "pair(" + fcb(this.a) + "," + fcb(this.b) + ")"; + }; + var n2 = mdb(yqe, "Pair", 46); + bcb(983, 1, aie, Bgd); + _.Nb = function Cgd(a) { + Rrb(this, a); + }; + _.Ob = function Dgd() { + return !this.c && ((!this.b && this.a.a != null) || this.a.b != null); + }; + _.Pb = function Egd() { + if (!this.c && !this.b && this.a.a != null) { + this.b = true; + return this.a.a; + } else if (!this.c && this.a.b != null) { + this.c = true; + return this.a.b; + } + throw vbb(new utb()); + }; + _.Qb = function Fgd() { + this.c && this.a.b != null + ? (this.a.b = null) + : this.b && this.a.a != null && (this.a.a = null); + throw vbb(new Ydb()); + }; + _.b = false; + _.c = false; + var m2 = mdb(yqe, "Pair/1", 983); + bcb(448, 1, { 448: 1 }, Ggd); + _.Fb = function Hgd(a) { + return ( + wtb(this.a, BD(a, 448).a) && + wtb(this.c, BD(a, 448).c) && + wtb(this.d, BD(a, 448).d) && + wtb(this.b, BD(a, 448).b) + ); + }; + _.Hb = function Igd() { + return Hlb(OC(GC(SI, 1), Uhe, 1, 5, [this.a, this.c, this.d, this.b])); + }; + _.Ib = function Jgd() { + return "(" + this.a + She + this.c + She + this.d + She + this.b + ")"; + }; + var o2 = mdb(yqe, "Quadruple", 448); + bcb(1126, 209, Mle, Mgd); + _.Ze = function Ngd(a, b) { + var c, d, e, f, g; + Odd(b, "Random Layout", 1); + if ((!a.a && (a.a = new cUd(E2, a, 10, 11)), a.a).i == 0) { + Qdd(b); + return; + } + f = BD(hkd(a, (idd(), gdd)), 19); + !!f && f.a != 0 ? (e = new Hub(f.a)) : (e = new Gub()); + c = Gdb(ED(hkd(a, ddd))); + g = Gdb(ED(hkd(a, hdd))); + d = BD(hkd(a, edd), 116); + Lgd(a, e, c, g, d); + Qdd(b); + }; + var p2 = mdb(yqe, "RandomLayoutProvider", 1126); + var Ogd; + bcb(553, 1, {}); + _.qf = function Sgd() { + return new f7c(this.f.i, this.f.j); + }; + _.We = function Tgd(a) { + if (Jsd(a, (Y9c(), s9c))) { + return hkd(this.f, Qgd); + } + return hkd(this.f, a); + }; + _.rf = function Ugd() { + return new f7c(this.f.g, this.f.f); + }; + _.sf = function Vgd() { + return this.g; + }; + _.Xe = function Wgd(a) { + return ikd(this.f, a); + }; + _.tf = function Xgd(a) { + dld(this.f, a.a); + eld(this.f, a.b); + }; + _.uf = function Ygd(a) { + cld(this.f, a.a); + ald(this.f, a.b); + }; + _.vf = function Zgd(a) { + this.g = a; + }; + _.g = 0; + var Qgd; + var q2 = mdb(Use, "ElkGraphAdapters/AbstractElkGraphElementAdapter", 553); + bcb(554, 1, { 839: 1 }, $gd); + _.wf = function _gd() { + var a, b; + if (!this.b) { + this.b = Qu(Kkd(this.a).i); + for (b = new Fyd(Kkd(this.a)); b.e != b.i.gc(); ) { + a = BD(Dyd(b), 137); + Ekb(this.b, new dhd(a)); + } + } + return this.b; + }; + _.b = null; + var r2 = mdb(Use, "ElkGraphAdapters/ElkEdgeAdapter", 554); + bcb(301, 553, {}, bhd); + _.xf = function chd() { + return ahd(this); + }; + _.a = null; + var s2 = mdb(Use, "ElkGraphAdapters/ElkGraphAdapter", 301); + bcb(630, 553, { 181: 1 }, dhd); + var t2 = mdb(Use, "ElkGraphAdapters/ElkLabelAdapter", 630); + bcb(629, 553, { 680: 1 }, hhd); + _.wf = function khd() { + return ehd(this); + }; + _.Af = function lhd() { + var a; + return (a = BD(hkd(this.f, (Y9c(), S8c)), 142)), !a && (a = new H_b()), a; + }; + _.Cf = function nhd() { + return fhd(this); + }; + _.Ef = function phd(a) { + var b; + b = new K_b(a); + jkd(this.f, (Y9c(), S8c), b); + }; + _.Ff = function qhd(a) { + jkd(this.f, (Y9c(), f9c), new r0b(a)); + }; + _.yf = function ihd() { + return this.d; + }; + _.zf = function jhd() { + var a, b; + if (!this.a) { + this.a = new Rkb(); + for (b = new Sr(ur($sd(BD(this.f, 33)).a.Kc(), new Sq())); Qr(b); ) { + a = BD(Rr(b), 79); + Ekb(this.a, new $gd(a)); + } + } + return this.a; + }; + _.Bf = function mhd() { + var a, b; + if (!this.c) { + this.c = new Rkb(); + for (b = new Sr(ur(_sd(BD(this.f, 33)).a.Kc(), new Sq())); Qr(b); ) { + a = BD(Rr(b), 79); + Ekb(this.c, new $gd(a)); + } + } + return this.c; + }; + _.Df = function ohd() { + return ( + Vod(BD(this.f, 33)).i != 0 || Ccb(DD(BD(this.f, 33).We((Y9c(), M8c)))) + ); + }; + _.Gf = function rhd() { + ghd(this, (Pgd(), Ogd)); + }; + _.a = null; + _.b = null; + _.c = null; + _.d = null; + _.e = null; + var u2 = mdb(Use, "ElkGraphAdapters/ElkNodeAdapter", 629); + bcb(1266, 553, { 838: 1 }, thd); + _.wf = function vhd() { + return shd(this); + }; + _.zf = function uhd() { + var a, b; + if (!this.a) { + this.a = Pu(BD(this.f, 118).xg().i); + for (b = new Fyd(BD(this.f, 118).xg()); b.e != b.i.gc(); ) { + a = BD(Dyd(b), 79); + Ekb(this.a, new $gd(a)); + } + } + return this.a; + }; + _.Bf = function whd() { + var a, b; + if (!this.c) { + this.c = Pu(BD(this.f, 118).yg().i); + for (b = new Fyd(BD(this.f, 118).yg()); b.e != b.i.gc(); ) { + a = BD(Dyd(b), 79); + Ekb(this.c, new $gd(a)); + } + } + return this.c; + }; + _.Hf = function xhd() { + return BD(BD(this.f, 118).We((Y9c(), A9c)), 61); + }; + _.If = function yhd() { + var a, b, c, d, e, f, g, h; + d = mpd(BD(this.f, 118)); + for (c = new Fyd(BD(this.f, 118).yg()); c.e != c.i.gc(); ) { + a = BD(Dyd(c), 79); + for ( + h = new Fyd((!a.c && (a.c = new y5d(z2, a, 5, 8)), a.c)); + h.e != h.i.gc(); + + ) { + g = BD(Dyd(h), 82); + if (ntd(atd(g), d)) { + return true; + } else if (atd(g) == d && Ccb(DD(hkd(a, (Y9c(), N8c))))) { + return true; + } + } + } + for (b = new Fyd(BD(this.f, 118).xg()); b.e != b.i.gc(); ) { + a = BD(Dyd(b), 79); + for ( + f = new Fyd((!a.b && (a.b = new y5d(z2, a, 4, 7)), a.b)); + f.e != f.i.gc(); + + ) { + e = BD(Dyd(f), 82); + if (ntd(atd(e), d)) { + return true; + } + } + } + return false; + }; + _.a = null; + _.b = null; + _.c = null; + var v2 = mdb(Use, "ElkGraphAdapters/ElkPortAdapter", 1266); + bcb(1267, 1, Dke, Ahd); + _.ue = function Bhd(a, b) { + return zhd(BD(a, 118), BD(b, 118)); + }; + _.Fb = function Chd(a) { + return this === a; + }; + _.ve = function Dhd() { + return new tpb(this); + }; + var w2 = mdb(Use, "ElkGraphAdapters/PortComparator", 1267); + var m5 = odb(Vse, "EObject"); + var x2 = odb(Wse, Xse); + var y2 = odb(Wse, Yse); + var C2 = odb(Wse, Zse); + var G2 = odb(Wse, "ElkShape"); + var z2 = odb(Wse, $se); + var B2 = odb(Wse, _se); + var A2 = odb(Wse, ate); + var k5 = odb(Vse, bte); + var i5 = odb(Vse, "EFactory"); + var Ehd; + var l5 = odb(Vse, cte); + var o5 = odb(Vse, "EPackage"); + var Ghd; + var Ihd, Jhd, Khd, Lhd, Mhd, Nhd, Ohd, Phd, Qhd, Rhd, Shd; + var D2 = odb(Wse, dte); + var E2 = odb(Wse, ete); + var F2 = odb(Wse, fte); + bcb(90, 1, gte); + _.Jg = function Vhd() { + this.Kg(); + return null; + }; + _.Kg = function Whd() { + return null; + }; + _.Lg = function Xhd() { + return this.Kg(), false; + }; + _.Mg = function Yhd() { + return false; + }; + _.Ng = function Zhd(a) { + Uhd(this, a); + }; + var b4 = mdb(hte, "BasicNotifierImpl", 90); + bcb(97, 90, pte); + _.nh = function fjd() { + return oid(this); + }; + _.Og = function Fid(a, b) { + return a; + }; + _.Pg = function Gid() { + throw vbb(new bgb()); + }; + _.Qg = function Hid(a) { + var b; + return ( + (b = zUd(BD(XKd(this.Tg(), this.Vg()), 18))), + this.eh().ih(this, b.n, b.f, a) + ); + }; + _.Rg = function Iid(a, b) { + throw vbb(new bgb()); + }; + _.Sg = function Jid(a, b, c) { + return _hd(this, a, b, c); + }; + _.Tg = function Kid() { + var a; + if (this.Pg()) { + a = this.Pg().ck(); + if (a) { + return a; + } + } + return this.zh(); + }; + _.Ug = function Lid() { + return aid(this); + }; + _.Vg = function Mid() { + throw vbb(new bgb()); + }; + _.Wg = function Oid() { + var a, b; + b = this.ph().dk(); + !b && + this.Pg().ik( + (b = + (nRd(), + (a = pNd(TKd(this.Tg()))), + a == null ? mRd : new qRd(this, a))) + ); + return b; + }; + _.Xg = function Qid(a, b) { + return a; + }; + _.Yg = function Rid(a) { + var b; + b = a.Gj(); + return !b ? bLd(this.Tg(), a) : a.aj(); + }; + _.Zg = function Sid() { + var a; + a = this.Pg(); + return !a ? null : a.fk(); + }; + _.$g = function Tid() { + return !this.Pg() ? null : this.Pg().ck(); + }; + _._g = function Uid(a, b, c) { + return fid(this, a, b, c); + }; + _.ah = function Vid(a) { + return gid(this, a); + }; + _.bh = function Wid(a, b) { + return hid(this, a, b); + }; + _.dh = function Xid() { + var a; + a = this.Pg(); + return !!a && a.gk(); + }; + _.eh = function Yid() { + throw vbb(new bgb()); + }; + _.fh = function Zid() { + return jid(this); + }; + _.gh = function $id(a, b, c, d) { + return kid(this, a, b, d); + }; + _.hh = function _id(a, b, c) { + var d; + return ( + (d = BD(XKd(this.Tg(), b), 66)), + d.Nj().Qj(this, this.yh(), b - this.Ah(), a, c) + ); + }; + _.ih = function ajd(a, b, c, d) { + return lid(this, a, b, d); + }; + _.jh = function bjd(a, b, c) { + var d; + return ( + (d = BD(XKd(this.Tg(), b), 66)), + d.Nj().Rj(this, this.yh(), b - this.Ah(), a, c) + ); + }; + _.kh = function cjd() { + return !!this.Pg() && !!this.Pg().ek(); + }; + _.lh = function djd(a) { + return mid(this, a); + }; + _.mh = function ejd(a) { + return nid(this, a); + }; + _.oh = function gjd(a) { + return rid(this, a); + }; + _.ph = function hjd() { + throw vbb(new bgb()); + }; + _.qh = function ijd() { + return !this.Pg() ? null : this.Pg().ek(); + }; + _.rh = function jjd() { + return jid(this); + }; + _.sh = function kjd(a, b) { + yid(this, a, b); + }; + _.th = function ljd(a) { + this.ph().hk(a); + }; + _.uh = function mjd(a) { + this.ph().kk(a); + }; + _.vh = function njd(a) { + this.ph().jk(a); + }; + _.wh = function ojd(a, b) { + var c, d, e, f; + f = this.Zg(); + if (!!f && !!a) { + b = Txd(f.Vk(), this, b); + f.Zk(this); + } + d = this.eh(); + if (d) { + if ((Nid(this, this.eh(), this.Vg()).Bb & Tje) != 0) { + e = d.fh(); + !!e && (!a ? e.Yk(this) : !f && e.Zk(this)); + } else { + b = + ((c = this.Vg()), + c >= 0 ? this.Qg(b) : this.eh().ih(this, -1 - c, null, b)); + b = this.Sg(null, -1, b); + } + } + this.uh(a); + return b; + }; + _.xh = function pjd(a) { + var b, c, d, e, f, g, h, i; + c = this.Tg(); + f = bLd(c, a); + b = this.Ah(); + if (f >= b) { + return BD(a, 66) + .Nj() + .Uj(this, this.yh(), f - b); + } else if (f <= -1) { + g = e1d((O6d(), M6d), c, a); + if (g) { + Q6d(); + BD(g, 66).Oj() || (g = _1d(q1d(M6d, g))); + e = + ((d = this.Yg(g)), + BD(d >= 0 ? this._g(d, true, true) : sid(this, g, true), 153)); + i = g.Zj(); + if (i > 1 || i == -1) { + return BD(BD(e, 215).hl(a, false), 76); + } + } else { + throw vbb(new Wdb(ite + a.ne() + lte)); + } + } else if (a.$j()) { + return ( + (d = this.Yg(a)), + BD(d >= 0 ? this._g(d, false, true) : sid(this, a, false), 76) + ); + } + h = new nGd(this, a); + return h; + }; + _.yh = function qjd() { + return Aid(this); + }; + _.zh = function rjd() { + return (NFd(), MFd).S; + }; + _.Ah = function sjd() { + return aLd(this.zh()); + }; + _.Bh = function tjd(a) { + Cid(this, a); + }; + _.Ib = function ujd() { + return Eid(this); + }; + var B5 = mdb(qte, "BasicEObjectImpl", 97); + var zFd; + bcb(114, 97, { 105: 1, 92: 1, 90: 1, 56: 1, 108: 1, 49: 1, 97: 1, 114: 1 }); + _.Ch = function Djd(a) { + var b; + b = xjd(this); + return b[a]; + }; + _.Dh = function Ejd(a, b) { + var c; + c = xjd(this); + NC(c, a, b); + }; + _.Eh = function Fjd(a) { + var b; + b = xjd(this); + NC(b, a, null); + }; + _.Jg = function Gjd() { + return BD(Ajd(this, 4), 126); + }; + _.Kg = function Hjd() { + throw vbb(new bgb()); + }; + _.Lg = function Ijd() { + return (this.Db & 4) != 0; + }; + _.Pg = function Jjd() { + throw vbb(new bgb()); + }; + _.Fh = function Kjd(a) { + Cjd(this, 2, a); + }; + _.Rg = function Ljd(a, b) { + this.Db = (b << 16) | (this.Db & 255); + this.Fh(a); + }; + _.Tg = function Mjd() { + return wjd(this); + }; + _.Vg = function Njd() { + return this.Db >> 16; + }; + _.Wg = function Ojd() { + var a, b; + return ( + nRd(), + (b = pNd(TKd(((a = BD(Ajd(this, 16), 26)), !a ? this.zh() : a)))), + b == null ? (null, mRd) : new qRd(this, b) + ); + }; + _.Mg = function Pjd() { + return (this.Db & 1) == 0; + }; + _.Zg = function Qjd() { + return BD(Ajd(this, 128), 1935); + }; + _.$g = function Rjd() { + return BD(Ajd(this, 16), 26); + }; + _.dh = function Sjd() { + return (this.Db & 32) != 0; + }; + _.eh = function Tjd() { + return BD(Ajd(this, 2), 49); + }; + _.kh = function Ujd() { + return (this.Db & 64) != 0; + }; + _.ph = function Vjd() { + throw vbb(new bgb()); + }; + _.qh = function Wjd() { + return BD(Ajd(this, 64), 281); + }; + _.th = function Xjd(a) { + Cjd(this, 16, a); + }; + _.uh = function Yjd(a) { + Cjd(this, 128, a); + }; + _.vh = function Zjd(a) { + Cjd(this, 64, a); + }; + _.yh = function $jd() { + return yjd(this); + }; + _.Db = 0; + var s8 = mdb(qte, "MinimalEObjectImpl", 114); + bcb(115, 114, { + 105: 1, + 92: 1, + 90: 1, + 56: 1, + 108: 1, + 49: 1, + 97: 1, + 114: 1, + 115: 1, + }); + _.Fh = function _jd(a) { + this.Cb = a; + }; + _.eh = function akd() { + return this.Cb; + }; + var r8 = mdb(qte, "MinimalEObjectImpl/Container", 115); + bcb(1985, 115, { + 105: 1, + 413: 1, + 94: 1, + 92: 1, + 90: 1, + 56: 1, + 108: 1, + 49: 1, + 97: 1, + 114: 1, + 115: 1, + }); + _._g = function kkd(a, b, c) { + return bkd(this, a, b, c); + }; + _.jh = function lkd(a, b, c) { + return ckd(this, a, b, c); + }; + _.lh = function mkd(a) { + return dkd(this, a); + }; + _.sh = function nkd(a, b) { + ekd(this, a, b); + }; + _.zh = function okd() { + return Thd(), Shd; + }; + _.Bh = function pkd(a) { + fkd(this, a); + }; + _.Ve = function qkd() { + return gkd(this); + }; + _.We = function rkd(a) { + return hkd(this, a); + }; + _.Xe = function skd(a) { + return ikd(this, a); + }; + _.Ye = function tkd(a, b) { + return jkd(this, a, b); + }; + var H2 = mdb(rte, "EMapPropertyHolderImpl", 1985); + bcb( + 567, + 115, + { + 105: 1, + 469: 1, + 92: 1, + 90: 1, + 56: 1, + 108: 1, + 49: 1, + 97: 1, + 114: 1, + 115: 1, + }, + xkd + ); + _._g = function ykd(a, b, c) { + switch (a) { + case 0: + return this.a; + case 1: + return this.b; + } + return fid(this, a, b, c); + }; + _.lh = function zkd(a) { + switch (a) { + case 0: + return this.a != 0; + case 1: + return this.b != 0; + } + return mid(this, a); + }; + _.sh = function Akd(a, b) { + switch (a) { + case 0: + vkd(this, Edb(ED(b))); + return; + case 1: + wkd(this, Edb(ED(b))); + return; + } + yid(this, a, b); + }; + _.zh = function Bkd() { + return Thd(), Ihd; + }; + _.Bh = function Ckd(a) { + switch (a) { + case 0: + vkd(this, 0); + return; + case 1: + wkd(this, 0); + return; + } + Cid(this, a); + }; + _.Ib = function Dkd() { + var a; + if ((this.Db & 64) != 0) return Eid(this); + a = new Jfb(Eid(this)); + a.a += " (x: "; + Bfb(a, this.a); + a.a += ", y: "; + Bfb(a, this.b); + a.a += ")"; + return a.a; + }; + _.a = 0; + _.b = 0; + var I2 = mdb(rte, "ElkBendPointImpl", 567); + bcb(723, 1985, { + 105: 1, + 413: 1, + 160: 1, + 94: 1, + 92: 1, + 90: 1, + 56: 1, + 108: 1, + 49: 1, + 97: 1, + 114: 1, + 115: 1, + }); + _._g = function Nkd(a, b, c) { + return Ekd(this, a, b, c); + }; + _.hh = function Okd(a, b, c) { + return Fkd(this, a, b, c); + }; + _.jh = function Pkd(a, b, c) { + return Gkd(this, a, b, c); + }; + _.lh = function Qkd(a) { + return Hkd(this, a); + }; + _.sh = function Rkd(a, b) { + Ikd(this, a, b); + }; + _.zh = function Skd() { + return Thd(), Mhd; + }; + _.Bh = function Tkd(a) { + Jkd(this, a); + }; + _.zg = function Ukd() { + return this.k; + }; + _.Ag = function Vkd() { + return Kkd(this); + }; + _.Ib = function Wkd() { + return Mkd(this); + }; + _.k = null; + var M2 = mdb(rte, "ElkGraphElementImpl", 723); + bcb(724, 723, { + 105: 1, + 413: 1, + 160: 1, + 470: 1, + 94: 1, + 92: 1, + 90: 1, + 56: 1, + 108: 1, + 49: 1, + 97: 1, + 114: 1, + 115: 1, + }); + _._g = function gld(a, b, c) { + return Xkd(this, a, b, c); + }; + _.lh = function hld(a) { + return Ykd(this, a); + }; + _.sh = function ild(a, b) { + Zkd(this, a, b); + }; + _.zh = function jld() { + return Thd(), Rhd; + }; + _.Bh = function kld(a) { + $kd(this, a); + }; + _.Bg = function lld() { + return this.f; + }; + _.Cg = function mld() { + return this.g; + }; + _.Dg = function nld() { + return this.i; + }; + _.Eg = function old() { + return this.j; + }; + _.Fg = function pld(a, b) { + _kd(this, a, b); + }; + _.Gg = function qld(a, b) { + bld(this, a, b); + }; + _.Hg = function rld(a) { + dld(this, a); + }; + _.Ig = function sld(a) { + eld(this, a); + }; + _.Ib = function tld() { + return fld(this); + }; + _.f = 0; + _.g = 0; + _.i = 0; + _.j = 0; + var T2 = mdb(rte, "ElkShapeImpl", 724); + bcb(725, 724, { + 105: 1, + 413: 1, + 82: 1, + 160: 1, + 470: 1, + 94: 1, + 92: 1, + 90: 1, + 56: 1, + 108: 1, + 49: 1, + 97: 1, + 114: 1, + 115: 1, + }); + _._g = function Bld(a, b, c) { + return uld(this, a, b, c); + }; + _.hh = function Cld(a, b, c) { + return vld(this, a, b, c); + }; + _.jh = function Dld(a, b, c) { + return wld(this, a, b, c); + }; + _.lh = function Eld(a) { + return xld(this, a); + }; + _.sh = function Fld(a, b) { + yld(this, a, b); + }; + _.zh = function Gld() { + return Thd(), Jhd; + }; + _.Bh = function Hld(a) { + zld(this, a); + }; + _.xg = function Ild() { + return !this.d && (this.d = new y5d(B2, this, 8, 5)), this.d; + }; + _.yg = function Jld() { + return !this.e && (this.e = new y5d(B2, this, 7, 4)), this.e; + }; + var J2 = mdb(rte, "ElkConnectableShapeImpl", 725); + bcb( + 352, + 723, + { + 105: 1, + 413: 1, + 79: 1, + 160: 1, + 352: 1, + 94: 1, + 92: 1, + 90: 1, + 56: 1, + 108: 1, + 49: 1, + 97: 1, + 114: 1, + 115: 1, + }, + Tld + ); + _.Qg = function Uld(a) { + return Lld(this, a); + }; + _._g = function Vld(a, b, c) { + switch (a) { + case 3: + return Mld(this); + case 4: + return !this.b && (this.b = new y5d(z2, this, 4, 7)), this.b; + case 5: + return !this.c && (this.c = new y5d(z2, this, 5, 8)), this.c; + case 6: + return !this.a && (this.a = new cUd(A2, this, 6, 6)), this.a; + case 7: + return ( + Bcb(), + !this.b && (this.b = new y5d(z2, this, 4, 7)), + this.b.i <= 1 && + (!this.c && (this.c = new y5d(z2, this, 5, 8)), this.c.i <= 1) + ? false + : true + ); + case 8: + return Bcb(), Pld(this) ? true : false; + case 9: + return Bcb(), Qld(this) ? true : false; + case 10: + return ( + Bcb(), + !this.b && (this.b = new y5d(z2, this, 4, 7)), + this.b.i != 0 && + (!this.c && (this.c = new y5d(z2, this, 5, 8)), this.c.i != 0) + ? true + : false + ); + } + return Ekd(this, a, b, c); + }; + _.hh = function Wld(a, b, c) { + var d; + switch (b) { + case 3: + !!this.Cb && + (c = + ((d = this.Db >> 16), + d >= 0 ? Lld(this, c) : this.Cb.ih(this, -1 - d, null, c))); + return Kld(this, BD(a, 33), c); + case 4: + return ( + !this.b && (this.b = new y5d(z2, this, 4, 7)), Sxd(this.b, a, c) + ); + case 5: + return ( + !this.c && (this.c = new y5d(z2, this, 5, 8)), Sxd(this.c, a, c) + ); + case 6: + return ( + !this.a && (this.a = new cUd(A2, this, 6, 6)), Sxd(this.a, a, c) + ); + } + return Fkd(this, a, b, c); + }; + _.jh = function Xld(a, b, c) { + switch (b) { + case 3: + return Kld(this, null, c); + case 4: + return ( + !this.b && (this.b = new y5d(z2, this, 4, 7)), Txd(this.b, a, c) + ); + case 5: + return ( + !this.c && (this.c = new y5d(z2, this, 5, 8)), Txd(this.c, a, c) + ); + case 6: + return ( + !this.a && (this.a = new cUd(A2, this, 6, 6)), Txd(this.a, a, c) + ); + } + return Gkd(this, a, b, c); + }; + _.lh = function Yld(a) { + switch (a) { + case 3: + return !!Mld(this); + case 4: + return !!this.b && this.b.i != 0; + case 5: + return !!this.c && this.c.i != 0; + case 6: + return !!this.a && this.a.i != 0; + case 7: + return ( + !this.b && (this.b = new y5d(z2, this, 4, 7)), + !( + this.b.i <= 1 && + (!this.c && (this.c = new y5d(z2, this, 5, 8)), this.c.i <= 1) + ) + ); + case 8: + return Pld(this); + case 9: + return Qld(this); + case 10: + return ( + !this.b && (this.b = new y5d(z2, this, 4, 7)), + this.b.i != 0 && + (!this.c && (this.c = new y5d(z2, this, 5, 8)), this.c.i != 0) + ); + } + return Hkd(this, a); + }; + _.sh = function Zld(a, b) { + switch (a) { + case 3: + Rld(this, BD(b, 33)); + return; + case 4: + !this.b && (this.b = new y5d(z2, this, 4, 7)); + Uxd(this.b); + !this.b && (this.b = new y5d(z2, this, 4, 7)); + ytd(this.b, BD(b, 14)); + return; + case 5: + !this.c && (this.c = new y5d(z2, this, 5, 8)); + Uxd(this.c); + !this.c && (this.c = new y5d(z2, this, 5, 8)); + ytd(this.c, BD(b, 14)); + return; + case 6: + !this.a && (this.a = new cUd(A2, this, 6, 6)); + Uxd(this.a); + !this.a && (this.a = new cUd(A2, this, 6, 6)); + ytd(this.a, BD(b, 14)); + return; + } + Ikd(this, a, b); + }; + _.zh = function $ld() { + return Thd(), Khd; + }; + _.Bh = function _ld(a) { + switch (a) { + case 3: + Rld(this, null); + return; + case 4: + !this.b && (this.b = new y5d(z2, this, 4, 7)); + Uxd(this.b); + return; + case 5: + !this.c && (this.c = new y5d(z2, this, 5, 8)); + Uxd(this.c); + return; + case 6: + !this.a && (this.a = new cUd(A2, this, 6, 6)); + Uxd(this.a); + return; + } + Jkd(this, a); + }; + _.Ib = function amd() { + return Sld(this); + }; + var K2 = mdb(rte, "ElkEdgeImpl", 352); + bcb( + 439, + 1985, + { + 105: 1, + 413: 1, + 202: 1, + 439: 1, + 94: 1, + 92: 1, + 90: 1, + 56: 1, + 108: 1, + 49: 1, + 97: 1, + 114: 1, + 115: 1, + }, + rmd + ); + _.Qg = function smd(a) { + return cmd(this, a); + }; + _._g = function tmd(a, b, c) { + switch (a) { + case 1: + return this.j; + case 2: + return this.k; + case 3: + return this.b; + case 4: + return this.c; + case 5: + return !this.a && (this.a = new xMd(y2, this, 5)), this.a; + case 6: + return fmd(this); + case 7: + if (b) return emd(this); + return this.i; + case 8: + if (b) return dmd(this); + return this.f; + case 9: + return !this.g && (this.g = new y5d(A2, this, 9, 10)), this.g; + case 10: + return !this.e && (this.e = new y5d(A2, this, 10, 9)), this.e; + case 11: + return this.d; + } + return bkd(this, a, b, c); + }; + _.hh = function umd(a, b, c) { + var d, e, f; + switch (b) { + case 6: + !!this.Cb && + (c = + ((e = this.Db >> 16), + e >= 0 ? cmd(this, c) : this.Cb.ih(this, -1 - e, null, c))); + return bmd(this, BD(a, 79), c); + case 9: + return ( + !this.g && (this.g = new y5d(A2, this, 9, 10)), Sxd(this.g, a, c) + ); + case 10: + return ( + !this.e && (this.e = new y5d(A2, this, 10, 9)), Sxd(this.e, a, c) + ); + } + return ( + (f = BD( + XKd(((d = BD(Ajd(this, 16), 26)), !d ? (Thd(), Lhd) : d), b), + 66 + )), + f.Nj().Qj(this, yjd(this), b - aLd((Thd(), Lhd)), a, c) + ); + }; + _.jh = function vmd(a, b, c) { + switch (b) { + case 5: + return !this.a && (this.a = new xMd(y2, this, 5)), Txd(this.a, a, c); + case 6: + return bmd(this, null, c); + case 9: + return ( + !this.g && (this.g = new y5d(A2, this, 9, 10)), Txd(this.g, a, c) + ); + case 10: + return ( + !this.e && (this.e = new y5d(A2, this, 10, 9)), Txd(this.e, a, c) + ); + } + return ckd(this, a, b, c); + }; + _.lh = function wmd(a) { + switch (a) { + case 1: + return this.j != 0; + case 2: + return this.k != 0; + case 3: + return this.b != 0; + case 4: + return this.c != 0; + case 5: + return !!this.a && this.a.i != 0; + case 6: + return !!fmd(this); + case 7: + return !!this.i; + case 8: + return !!this.f; + case 9: + return !!this.g && this.g.i != 0; + case 10: + return !!this.e && this.e.i != 0; + case 11: + return this.d != null; + } + return dkd(this, a); + }; + _.sh = function xmd(a, b) { + switch (a) { + case 1: + omd(this, Edb(ED(b))); + return; + case 2: + pmd(this, Edb(ED(b))); + return; + case 3: + hmd(this, Edb(ED(b))); + return; + case 4: + imd(this, Edb(ED(b))); + return; + case 5: + !this.a && (this.a = new xMd(y2, this, 5)); + Uxd(this.a); + !this.a && (this.a = new xMd(y2, this, 5)); + ytd(this.a, BD(b, 14)); + return; + case 6: + mmd(this, BD(b, 79)); + return; + case 7: + lmd(this, BD(b, 82)); + return; + case 8: + kmd(this, BD(b, 82)); + return; + case 9: + !this.g && (this.g = new y5d(A2, this, 9, 10)); + Uxd(this.g); + !this.g && (this.g = new y5d(A2, this, 9, 10)); + ytd(this.g, BD(b, 14)); + return; + case 10: + !this.e && (this.e = new y5d(A2, this, 10, 9)); + Uxd(this.e); + !this.e && (this.e = new y5d(A2, this, 10, 9)); + ytd(this.e, BD(b, 14)); + return; + case 11: + jmd(this, GD(b)); + return; + } + ekd(this, a, b); + }; + _.zh = function ymd() { + return Thd(), Lhd; + }; + _.Bh = function zmd(a) { + switch (a) { + case 1: + omd(this, 0); + return; + case 2: + pmd(this, 0); + return; + case 3: + hmd(this, 0); + return; + case 4: + imd(this, 0); + return; + case 5: + !this.a && (this.a = new xMd(y2, this, 5)); + Uxd(this.a); + return; + case 6: + mmd(this, null); + return; + case 7: + lmd(this, null); + return; + case 8: + kmd(this, null); + return; + case 9: + !this.g && (this.g = new y5d(A2, this, 9, 10)); + Uxd(this.g); + return; + case 10: + !this.e && (this.e = new y5d(A2, this, 10, 9)); + Uxd(this.e); + return; + case 11: + jmd(this, null); + return; + } + fkd(this, a); + }; + _.Ib = function Amd() { + return qmd(this); + }; + _.b = 0; + _.c = 0; + _.d = null; + _.j = 0; + _.k = 0; + var L2 = mdb(rte, "ElkEdgeSectionImpl", 439); + bcb(150, 115, { + 105: 1, + 92: 1, + 90: 1, + 147: 1, + 56: 1, + 108: 1, + 49: 1, + 97: 1, + 150: 1, + 114: 1, + 115: 1, + }); + _._g = function Emd(a, b, c) { + var d; + if (a == 0) { + return !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)), this.Ab; + } + return bid( + this, + a - aLd(this.zh()), + XKd(((d = BD(Ajd(this, 16), 26)), !d ? this.zh() : d), a), + b, + c + ); + }; + _.hh = function Fmd(a, b, c) { + var d, e; + if (b == 0) { + return ( + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)), Sxd(this.Ab, a, c) + ); + } + return ( + (e = BD(XKd(((d = BD(Ajd(this, 16), 26)), !d ? this.zh() : d), b), 66)), + e.Nj().Qj(this, yjd(this), b - aLd(this.zh()), a, c) + ); + }; + _.jh = function Gmd(a, b, c) { + var d, e; + if (b == 0) { + return ( + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)), Txd(this.Ab, a, c) + ); + } + return ( + (e = BD(XKd(((d = BD(Ajd(this, 16), 26)), !d ? this.zh() : d), b), 66)), + e.Nj().Rj(this, yjd(this), b - aLd(this.zh()), a, c) + ); + }; + _.lh = function Hmd(a) { + var b; + if (a == 0) { + return !!this.Ab && this.Ab.i != 0; + } + return cid( + this, + a - aLd(this.zh()), + XKd(((b = BD(Ajd(this, 16), 26)), !b ? this.zh() : b), a) + ); + }; + _.oh = function Imd(a) { + return Bmd(this, a); + }; + _.sh = function Jmd(a, b) { + var c; + switch (a) { + case 0: + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + Uxd(this.Ab); + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + ytd(this.Ab, BD(b, 14)); + return; + } + did( + this, + a - aLd(this.zh()), + XKd(((c = BD(Ajd(this, 16), 26)), !c ? this.zh() : c), a), + b + ); + }; + _.uh = function Kmd(a) { + Cjd(this, 128, a); + }; + _.zh = function Lmd() { + return jGd(), ZFd; + }; + _.Bh = function Mmd(a) { + var b; + switch (a) { + case 0: + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + Uxd(this.Ab); + return; + } + eid( + this, + a - aLd(this.zh()), + XKd(((b = BD(Ajd(this, 16), 26)), !b ? this.zh() : b), a) + ); + }; + _.Gh = function Nmd() { + this.Bb |= 1; + }; + _.Hh = function Omd(a) { + return Dmd(this, a); + }; + _.Bb = 0; + var f6 = mdb(qte, "EModelElementImpl", 150); + bcb( + 704, + 150, + { + 105: 1, + 92: 1, + 90: 1, + 471: 1, + 147: 1, + 56: 1, + 108: 1, + 49: 1, + 97: 1, + 150: 1, + 114: 1, + 115: 1, + }, + $md + ); + _.Ih = function _md(a, b) { + return Vmd(this, a, b); + }; + _.Jh = function and(a) { + var b, c, d, e, f; + if (this.a != bKd(a) || (a.Bb & 256) != 0) { + throw vbb(new Wdb(xte + a.zb + ute)); + } + for (d = _Kd(a); VKd(d.a).i != 0; ) { + c = BD( + nOd( + d, + 0, + ((b = BD(qud(VKd(d.a), 0), 87)), + (f = b.c), + JD(f, 88) ? BD(f, 26) : (jGd(), _Fd)) + ), + 26 + ); + if (dKd(c)) { + e = bKd(c).Nh().Jh(c); + BD(e, 49).th(a); + return e; + } + d = _Kd(c); + } + return (a.D != null ? a.D : a.B) == "java.util.Map$Entry" + ? new lHd(a) + : new _Gd(a); + }; + _.Kh = function bnd(a, b) { + return Wmd(this, a, b); + }; + _._g = function cnd(a, b, c) { + var d; + switch (a) { + case 0: + return !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)), this.Ab; + case 1: + return this.a; + } + return bid( + this, + a - aLd((jGd(), WFd)), + XKd(((d = BD(Ajd(this, 16), 26)), !d ? WFd : d), a), + b, + c + ); + }; + _.hh = function dnd(a, b, c) { + var d, e; + switch (b) { + case 0: + return ( + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)), Sxd(this.Ab, a, c) + ); + case 1: + !!this.a && (c = BD(this.a, 49).ih(this, 4, o5, c)); + return Tmd(this, BD(a, 235), c); + } + return ( + (e = BD( + XKd(((d = BD(Ajd(this, 16), 26)), !d ? (jGd(), WFd) : d), b), + 66 + )), + e.Nj().Qj(this, yjd(this), b - aLd((jGd(), WFd)), a, c) + ); + }; + _.jh = function end(a, b, c) { + var d, e; + switch (b) { + case 0: + return ( + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)), Txd(this.Ab, a, c) + ); + case 1: + return Tmd(this, null, c); + } + return ( + (e = BD( + XKd(((d = BD(Ajd(this, 16), 26)), !d ? (jGd(), WFd) : d), b), + 66 + )), + e.Nj().Rj(this, yjd(this), b - aLd((jGd(), WFd)), a, c) + ); + }; + _.lh = function fnd(a) { + var b; + switch (a) { + case 0: + return !!this.Ab && this.Ab.i != 0; + case 1: + return !!this.a; + } + return cid( + this, + a - aLd((jGd(), WFd)), + XKd(((b = BD(Ajd(this, 16), 26)), !b ? WFd : b), a) + ); + }; + _.sh = function gnd(a, b) { + var c; + switch (a) { + case 0: + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + Uxd(this.Ab); + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + ytd(this.Ab, BD(b, 14)); + return; + case 1: + Ymd(this, BD(b, 235)); + return; + } + did( + this, + a - aLd((jGd(), WFd)), + XKd(((c = BD(Ajd(this, 16), 26)), !c ? WFd : c), a), + b + ); + }; + _.zh = function hnd() { + return jGd(), WFd; + }; + _.Bh = function ind(a) { + var b; + switch (a) { + case 0: + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + Uxd(this.Ab); + return; + case 1: + Ymd(this, null); + return; + } + eid( + this, + a - aLd((jGd(), WFd)), + XKd(((b = BD(Ajd(this, 16), 26)), !b ? WFd : b), a) + ); + }; + var Pmd, Qmd, Rmd; + var d6 = mdb(qte, "EFactoryImpl", 704); + bcb( + zte, + 704, + { + 105: 1, + 2014: 1, + 92: 1, + 90: 1, + 471: 1, + 147: 1, + 56: 1, + 108: 1, + 49: 1, + 97: 1, + 150: 1, + 114: 1, + 115: 1, + }, + knd + ); + _.Ih = function lnd(a, b) { + switch (a.yj()) { + case 12: + return BD(b, 146).tg(); + case 13: + return fcb(b); + default: + throw vbb(new Wdb(tte + a.ne() + ute)); + } + }; + _.Jh = function mnd(a) { + var b, c, d, e, f, g, h, i; + switch ( + (a.G == -1 && (a.G = ((b = bKd(a)), b ? HLd(b.Mh(), a) : -1)), a.G) + ) { + case 4: + return (f = new Jod()), f; + case 6: + return (g = new apd()), g; + case 7: + return (h = new ppd()), h; + case 8: + return (d = new Tld()), d; + case 9: + return (c = new xkd()), c; + case 10: + return (e = new rmd()), e; + case 11: + return (i = new Bpd()), i; + default: + throw vbb(new Wdb(xte + a.zb + ute)); + } + }; + _.Kh = function nnd(a, b) { + switch (a.yj()) { + case 13: + case 12: + return null; + default: + throw vbb(new Wdb(tte + a.ne() + ute)); + } + }; + var N2 = mdb(rte, "ElkGraphFactoryImpl", zte); + bcb(438, 150, { + 105: 1, + 92: 1, + 90: 1, + 147: 1, + 191: 1, + 56: 1, + 108: 1, + 49: 1, + 97: 1, + 150: 1, + 114: 1, + 115: 1, + }); + _.Wg = function rnd() { + var a, b; + b = ((a = BD(Ajd(this, 16), 26)), pNd(TKd(!a ? this.zh() : a))); + return b == null ? (nRd(), nRd(), mRd) : new GRd(this, b); + }; + _._g = function snd(a, b, c) { + var d; + switch (a) { + case 0: + return !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)), this.Ab; + case 1: + return this.ne(); + } + return bid( + this, + a - aLd(this.zh()), + XKd(((d = BD(Ajd(this, 16), 26)), !d ? this.zh() : d), a), + b, + c + ); + }; + _.lh = function tnd(a) { + var b; + switch (a) { + case 0: + return !!this.Ab && this.Ab.i != 0; + case 1: + return this.zb != null; + } + return cid( + this, + a - aLd(this.zh()), + XKd(((b = BD(Ajd(this, 16), 26)), !b ? this.zh() : b), a) + ); + }; + _.sh = function und(a, b) { + var c; + switch (a) { + case 0: + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + Uxd(this.Ab); + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + ytd(this.Ab, BD(b, 14)); + return; + case 1: + this.Lh(GD(b)); + return; + } + did( + this, + a - aLd(this.zh()), + XKd(((c = BD(Ajd(this, 16), 26)), !c ? this.zh() : c), a), + b + ); + }; + _.zh = function vnd() { + return jGd(), $Fd; + }; + _.Bh = function wnd(a) { + var b; + switch (a) { + case 0: + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + Uxd(this.Ab); + return; + case 1: + this.Lh(null); + return; + } + eid( + this, + a - aLd(this.zh()), + XKd(((b = BD(Ajd(this, 16), 26)), !b ? this.zh() : b), a) + ); + }; + _.ne = function xnd() { + return this.zb; + }; + _.Lh = function ynd(a) { + pnd(this, a); + }; + _.Ib = function znd() { + return qnd(this); + }; + _.zb = null; + var j6 = mdb(qte, "ENamedElementImpl", 438); + bcb( + 179, + 438, + { + 105: 1, + 92: 1, + 90: 1, + 147: 1, + 191: 1, + 56: 1, + 235: 1, + 108: 1, + 49: 1, + 97: 1, + 150: 1, + 179: 1, + 114: 1, + 115: 1, + 675: 1, + }, + eod + ); + _.Qg = function god(a) { + return Snd(this, a); + }; + _._g = function hod(a, b, c) { + var d; + switch (a) { + case 0: + return !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)), this.Ab; + case 1: + return this.zb; + case 2: + return this.yb; + case 3: + return this.xb; + case 4: + return this.sb; + case 5: + return !this.rb && (this.rb = new jUd(this, d5, this)), this.rb; + case 6: + return !this.vb && (this.vb = new gUd(o5, this, 6, 7)), this.vb; + case 7: + if (b) return this.Db >> 16 == 7 ? BD(this.Cb, 235) : null; + return Ind(this); + } + return bid( + this, + a - aLd((jGd(), cGd)), + XKd(((d = BD(Ajd(this, 16), 26)), !d ? cGd : d), a), + b, + c + ); + }; + _.hh = function iod(a, b, c) { + var d, e, f; + switch (b) { + case 0: + return ( + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)), Sxd(this.Ab, a, c) + ); + case 4: + !!this.sb && (c = BD(this.sb, 49).ih(this, 1, i5, c)); + return Jnd(this, BD(a, 471), c); + case 5: + return ( + !this.rb && (this.rb = new jUd(this, d5, this)), Sxd(this.rb, a, c) + ); + case 6: + return ( + !this.vb && (this.vb = new gUd(o5, this, 6, 7)), Sxd(this.vb, a, c) + ); + case 7: + !!this.Cb && + (c = + ((e = this.Db >> 16), + e >= 0 ? Snd(this, c) : this.Cb.ih(this, -1 - e, null, c))); + return _hd(this, a, 7, c); + } + return ( + (f = BD( + XKd(((d = BD(Ajd(this, 16), 26)), !d ? (jGd(), cGd) : d), b), + 66 + )), + f.Nj().Qj(this, yjd(this), b - aLd((jGd(), cGd)), a, c) + ); + }; + _.jh = function jod(a, b, c) { + var d, e; + switch (b) { + case 0: + return ( + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)), Txd(this.Ab, a, c) + ); + case 4: + return Jnd(this, null, c); + case 5: + return ( + !this.rb && (this.rb = new jUd(this, d5, this)), Txd(this.rb, a, c) + ); + case 6: + return ( + !this.vb && (this.vb = new gUd(o5, this, 6, 7)), Txd(this.vb, a, c) + ); + case 7: + return _hd(this, null, 7, c); + } + return ( + (e = BD( + XKd(((d = BD(Ajd(this, 16), 26)), !d ? (jGd(), cGd) : d), b), + 66 + )), + e.Nj().Rj(this, yjd(this), b - aLd((jGd(), cGd)), a, c) + ); + }; + _.lh = function kod(a) { + var b; + switch (a) { + case 0: + return !!this.Ab && this.Ab.i != 0; + case 1: + return this.zb != null; + case 2: + return this.yb != null; + case 3: + return this.xb != null; + case 4: + return !!this.sb; + case 5: + return !!this.rb && this.rb.i != 0; + case 6: + return !!this.vb && this.vb.i != 0; + case 7: + return !!Ind(this); + } + return cid( + this, + a - aLd((jGd(), cGd)), + XKd(((b = BD(Ajd(this, 16), 26)), !b ? cGd : b), a) + ); + }; + _.oh = function lod(a) { + var b; + b = Und(this, a); + return b ? b : Bmd(this, a); + }; + _.sh = function mod(a, b) { + var c; + switch (a) { + case 0: + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + Uxd(this.Ab); + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + ytd(this.Ab, BD(b, 14)); + return; + case 1: + pnd(this, GD(b)); + return; + case 2: + dod(this, GD(b)); + return; + case 3: + cod(this, GD(b)); + return; + case 4: + bod(this, BD(b, 471)); + return; + case 5: + !this.rb && (this.rb = new jUd(this, d5, this)); + Uxd(this.rb); + !this.rb && (this.rb = new jUd(this, d5, this)); + ytd(this.rb, BD(b, 14)); + return; + case 6: + !this.vb && (this.vb = new gUd(o5, this, 6, 7)); + Uxd(this.vb); + !this.vb && (this.vb = new gUd(o5, this, 6, 7)); + ytd(this.vb, BD(b, 14)); + return; + } + did( + this, + a - aLd((jGd(), cGd)), + XKd(((c = BD(Ajd(this, 16), 26)), !c ? cGd : c), a), + b + ); + }; + _.vh = function nod(a) { + var b, c; + if (!!a && !!this.rb) { + for (c = new Fyd(this.rb); c.e != c.i.gc(); ) { + b = Dyd(c); + JD(b, 351) && (BD(b, 351).w = null); + } + } + Cjd(this, 64, a); + }; + _.zh = function ood() { + return jGd(), cGd; + }; + _.Bh = function pod(a) { + var b; + switch (a) { + case 0: + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + Uxd(this.Ab); + return; + case 1: + pnd(this, null); + return; + case 2: + dod(this, null); + return; + case 3: + cod(this, null); + return; + case 4: + bod(this, null); + return; + case 5: + !this.rb && (this.rb = new jUd(this, d5, this)); + Uxd(this.rb); + return; + case 6: + !this.vb && (this.vb = new gUd(o5, this, 6, 7)); + Uxd(this.vb); + return; + } + eid( + this, + a - aLd((jGd(), cGd)), + XKd(((b = BD(Ajd(this, 16), 26)), !b ? cGd : b), a) + ); + }; + _.Gh = function qod() { + Tnd(this); + }; + _.Mh = function rod() { + return !this.rb && (this.rb = new jUd(this, d5, this)), this.rb; + }; + _.Nh = function sod() { + return this.sb; + }; + _.Oh = function tod() { + return this.ub; + }; + _.Ph = function uod() { + return this.xb; + }; + _.Qh = function vod() { + return this.yb; + }; + _.Rh = function wod(a) { + this.ub = a; + }; + _.Ib = function xod() { + var a; + if ((this.Db & 64) != 0) return qnd(this); + a = new Jfb(qnd(this)); + a.a += " (nsURI: "; + Efb(a, this.yb); + a.a += ", nsPrefix: "; + Efb(a, this.xb); + a.a += ")"; + return a.a; + }; + _.xb = null; + _.yb = null; + var And; + var t6 = mdb(qte, "EPackageImpl", 179); + bcb( + 555, + 179, + { + 105: 1, + 2016: 1, + 555: 1, + 92: 1, + 90: 1, + 147: 1, + 191: 1, + 56: 1, + 235: 1, + 108: 1, + 49: 1, + 97: 1, + 150: 1, + 179: 1, + 114: 1, + 115: 1, + 675: 1, + }, + Bod + ); + _.q = false; + _.r = false; + var yod = false; + var O2 = mdb(rte, "ElkGraphPackageImpl", 555); + bcb( + 354, + 724, + { + 105: 1, + 413: 1, + 160: 1, + 137: 1, + 470: 1, + 354: 1, + 94: 1, + 92: 1, + 90: 1, + 56: 1, + 108: 1, + 49: 1, + 97: 1, + 114: 1, + 115: 1, + }, + Jod + ); + _.Qg = function Kod(a) { + return Eod(this, a); + }; + _._g = function Lod(a, b, c) { + switch (a) { + case 7: + return Fod(this); + case 8: + return this.a; + } + return Xkd(this, a, b, c); + }; + _.hh = function Mod(a, b, c) { + var d; + switch (b) { + case 7: + !!this.Cb && + (c = + ((d = this.Db >> 16), + d >= 0 ? Eod(this, c) : this.Cb.ih(this, -1 - d, null, c))); + return Dod(this, BD(a, 160), c); + } + return Fkd(this, a, b, c); + }; + _.jh = function Nod(a, b, c) { + if (b == 7) { + return Dod(this, null, c); + } + return Gkd(this, a, b, c); + }; + _.lh = function Ood(a) { + switch (a) { + case 7: + return !!Fod(this); + case 8: + return !dfb("", this.a); + } + return Ykd(this, a); + }; + _.sh = function Pod(a, b) { + switch (a) { + case 7: + God(this, BD(b, 160)); + return; + case 8: + Hod(this, GD(b)); + return; + } + Zkd(this, a, b); + }; + _.zh = function Qod() { + return Thd(), Nhd; + }; + _.Bh = function Rod(a) { + switch (a) { + case 7: + God(this, null); + return; + case 8: + Hod(this, ""); + return; + } + $kd(this, a); + }; + _.Ib = function Sod() { + return Iod(this); + }; + _.a = ""; + var P2 = mdb(rte, "ElkLabelImpl", 354); + bcb( + 239, + 725, + { + 105: 1, + 413: 1, + 82: 1, + 160: 1, + 33: 1, + 470: 1, + 239: 1, + 94: 1, + 92: 1, + 90: 1, + 56: 1, + 108: 1, + 49: 1, + 97: 1, + 114: 1, + 115: 1, + }, + apd + ); + _.Qg = function bpd(a) { + return Uod(this, a); + }; + _._g = function cpd(a, b, c) { + switch (a) { + case 9: + return !this.c && (this.c = new cUd(F2, this, 9, 9)), this.c; + case 10: + return !this.a && (this.a = new cUd(E2, this, 10, 11)), this.a; + case 11: + return Xod(this); + case 12: + return !this.b && (this.b = new cUd(B2, this, 12, 3)), this.b; + case 13: + return ( + Bcb(), + !this.a && (this.a = new cUd(E2, this, 10, 11)), + this.a.i > 0 ? true : false + ); + } + return uld(this, a, b, c); + }; + _.hh = function dpd(a, b, c) { + var d; + switch (b) { + case 9: + return ( + !this.c && (this.c = new cUd(F2, this, 9, 9)), Sxd(this.c, a, c) + ); + case 10: + return ( + !this.a && (this.a = new cUd(E2, this, 10, 11)), Sxd(this.a, a, c) + ); + case 11: + !!this.Cb && + (c = + ((d = this.Db >> 16), + d >= 0 ? Uod(this, c) : this.Cb.ih(this, -1 - d, null, c))); + return Tod(this, BD(a, 33), c); + case 12: + return ( + !this.b && (this.b = new cUd(B2, this, 12, 3)), Sxd(this.b, a, c) + ); + } + return vld(this, a, b, c); + }; + _.jh = function epd(a, b, c) { + switch (b) { + case 9: + return ( + !this.c && (this.c = new cUd(F2, this, 9, 9)), Txd(this.c, a, c) + ); + case 10: + return ( + !this.a && (this.a = new cUd(E2, this, 10, 11)), Txd(this.a, a, c) + ); + case 11: + return Tod(this, null, c); + case 12: + return ( + !this.b && (this.b = new cUd(B2, this, 12, 3)), Txd(this.b, a, c) + ); + } + return wld(this, a, b, c); + }; + _.lh = function fpd(a) { + switch (a) { + case 9: + return !!this.c && this.c.i != 0; + case 10: + return !!this.a && this.a.i != 0; + case 11: + return !!Xod(this); + case 12: + return !!this.b && this.b.i != 0; + case 13: + return !this.a && (this.a = new cUd(E2, this, 10, 11)), this.a.i > 0; + } + return xld(this, a); + }; + _.sh = function gpd(a, b) { + switch (a) { + case 9: + !this.c && (this.c = new cUd(F2, this, 9, 9)); + Uxd(this.c); + !this.c && (this.c = new cUd(F2, this, 9, 9)); + ytd(this.c, BD(b, 14)); + return; + case 10: + !this.a && (this.a = new cUd(E2, this, 10, 11)); + Uxd(this.a); + !this.a && (this.a = new cUd(E2, this, 10, 11)); + ytd(this.a, BD(b, 14)); + return; + case 11: + $od(this, BD(b, 33)); + return; + case 12: + !this.b && (this.b = new cUd(B2, this, 12, 3)); + Uxd(this.b); + !this.b && (this.b = new cUd(B2, this, 12, 3)); + ytd(this.b, BD(b, 14)); + return; + } + yld(this, a, b); + }; + _.zh = function hpd() { + return Thd(), Ohd; + }; + _.Bh = function ipd(a) { + switch (a) { + case 9: + !this.c && (this.c = new cUd(F2, this, 9, 9)); + Uxd(this.c); + return; + case 10: + !this.a && (this.a = new cUd(E2, this, 10, 11)); + Uxd(this.a); + return; + case 11: + $od(this, null); + return; + case 12: + !this.b && (this.b = new cUd(B2, this, 12, 3)); + Uxd(this.b); + return; + } + zld(this, a); + }; + _.Ib = function jpd() { + return _od(this); + }; + var Q2 = mdb(rte, "ElkNodeImpl", 239); + bcb( + 186, + 725, + { + 105: 1, + 413: 1, + 82: 1, + 160: 1, + 118: 1, + 470: 1, + 186: 1, + 94: 1, + 92: 1, + 90: 1, + 56: 1, + 108: 1, + 49: 1, + 97: 1, + 114: 1, + 115: 1, + }, + ppd + ); + _.Qg = function qpd(a) { + return lpd(this, a); + }; + _._g = function rpd(a, b, c) { + if (a == 9) { + return mpd(this); + } + return uld(this, a, b, c); + }; + _.hh = function spd(a, b, c) { + var d; + switch (b) { + case 9: + !!this.Cb && + (c = + ((d = this.Db >> 16), + d >= 0 ? lpd(this, c) : this.Cb.ih(this, -1 - d, null, c))); + return kpd(this, BD(a, 33), c); + } + return vld(this, a, b, c); + }; + _.jh = function tpd(a, b, c) { + if (b == 9) { + return kpd(this, null, c); + } + return wld(this, a, b, c); + }; + _.lh = function upd(a) { + if (a == 9) { + return !!mpd(this); + } + return xld(this, a); + }; + _.sh = function vpd(a, b) { + switch (a) { + case 9: + npd(this, BD(b, 33)); + return; + } + yld(this, a, b); + }; + _.zh = function wpd() { + return Thd(), Phd; + }; + _.Bh = function xpd(a) { + switch (a) { + case 9: + npd(this, null); + return; + } + zld(this, a); + }; + _.Ib = function ypd() { + return opd(this); + }; + var R2 = mdb(rte, "ElkPortImpl", 186); + var J4 = odb(Tte, "BasicEMap/Entry"); + bcb( + 1092, + 115, + { + 105: 1, + 42: 1, + 92: 1, + 90: 1, + 133: 1, + 56: 1, + 108: 1, + 49: 1, + 97: 1, + 114: 1, + 115: 1, + }, + Bpd + ); + _.Fb = function Hpd(a) { + return this === a; + }; + _.cd = function Jpd() { + return this.b; + }; + _.Hb = function Lpd() { + return FCb(this); + }; + _.Uh = function Npd(a) { + zpd(this, BD(a, 146)); + }; + _._g = function Cpd(a, b, c) { + switch (a) { + case 0: + return this.b; + case 1: + return this.c; + } + return fid(this, a, b, c); + }; + _.lh = function Dpd(a) { + switch (a) { + case 0: + return !!this.b; + case 1: + return this.c != null; + } + return mid(this, a); + }; + _.sh = function Epd(a, b) { + switch (a) { + case 0: + zpd(this, BD(b, 146)); + return; + case 1: + Apd(this, b); + return; + } + yid(this, a, b); + }; + _.zh = function Fpd() { + return Thd(), Qhd; + }; + _.Bh = function Gpd(a) { + switch (a) { + case 0: + zpd(this, null); + return; + case 1: + Apd(this, null); + return; + } + Cid(this, a); + }; + _.Sh = function Ipd() { + var a; + if (this.a == -1) { + a = this.b; + this.a = !a ? 0 : tb(a); + } + return this.a; + }; + _.dd = function Kpd() { + return this.c; + }; + _.Th = function Mpd(a) { + this.a = a; + }; + _.ed = function Opd(a) { + var b; + b = this.c; + Apd(this, a); + return b; + }; + _.Ib = function Ppd() { + var a; + if ((this.Db & 64) != 0) return Eid(this); + a = new Ufb(); + Qfb(Qfb(Qfb(a, this.b ? this.b.tg() : Xhe), gne), xfb(this.c)); + return a.a; + }; + _.a = -1; + _.c = null; + var S2 = mdb(rte, "ElkPropertyToValueMapEntryImpl", 1092); + bcb(984, 1, {}, bqd); + var U2 = mdb(Wte, "JsonAdapter", 984); + bcb(210, 60, Tie, cqd); + var V2 = mdb(Wte, "JsonImportException", 210); + bcb(857, 1, {}, ird); + var J3 = mdb(Wte, "JsonImporter", 857); + bcb(891, 1, {}, jrd); + var W2 = mdb(Wte, "JsonImporter/lambda$0$Type", 891); + bcb(892, 1, {}, krd); + var X2 = mdb(Wte, "JsonImporter/lambda$1$Type", 892); + bcb(900, 1, {}, lrd); + var Y2 = mdb(Wte, "JsonImporter/lambda$10$Type", 900); + bcb(902, 1, {}, mrd); + var Z2 = mdb(Wte, "JsonImporter/lambda$11$Type", 902); + bcb(903, 1, {}, nrd); + var $2 = mdb(Wte, "JsonImporter/lambda$12$Type", 903); + bcb(909, 1, {}, ord); + var _2 = mdb(Wte, "JsonImporter/lambda$13$Type", 909); + bcb(908, 1, {}, prd); + var a3 = mdb(Wte, "JsonImporter/lambda$14$Type", 908); + bcb(904, 1, {}, qrd); + var b3 = mdb(Wte, "JsonImporter/lambda$15$Type", 904); + bcb(905, 1, {}, rrd); + var c3 = mdb(Wte, "JsonImporter/lambda$16$Type", 905); + bcb(906, 1, {}, srd); + var d3 = mdb(Wte, "JsonImporter/lambda$17$Type", 906); + bcb(907, 1, {}, trd); + var e3 = mdb(Wte, "JsonImporter/lambda$18$Type", 907); + bcb(912, 1, {}, urd); + var f3 = mdb(Wte, "JsonImporter/lambda$19$Type", 912); + bcb(893, 1, {}, vrd); + var g3 = mdb(Wte, "JsonImporter/lambda$2$Type", 893); + bcb(910, 1, {}, wrd); + var h3 = mdb(Wte, "JsonImporter/lambda$20$Type", 910); + bcb(911, 1, {}, xrd); + var i3 = mdb(Wte, "JsonImporter/lambda$21$Type", 911); + bcb(915, 1, {}, yrd); + var j3 = mdb(Wte, "JsonImporter/lambda$22$Type", 915); + bcb(913, 1, {}, zrd); + var k3 = mdb(Wte, "JsonImporter/lambda$23$Type", 913); + bcb(914, 1, {}, Ard); + var l3 = mdb(Wte, "JsonImporter/lambda$24$Type", 914); + bcb(917, 1, {}, Brd); + var m3 = mdb(Wte, "JsonImporter/lambda$25$Type", 917); + bcb(916, 1, {}, Crd); + var n3 = mdb(Wte, "JsonImporter/lambda$26$Type", 916); + bcb(918, 1, qie, Drd); + _.td = function Erd(a) { + Bqd(this.b, this.a, GD(a)); + }; + var o3 = mdb(Wte, "JsonImporter/lambda$27$Type", 918); + bcb(919, 1, qie, Frd); + _.td = function Grd(a) { + Cqd(this.b, this.a, GD(a)); + }; + var p3 = mdb(Wte, "JsonImporter/lambda$28$Type", 919); + bcb(920, 1, {}, Hrd); + var q3 = mdb(Wte, "JsonImporter/lambda$29$Type", 920); + bcb(896, 1, {}, Ird); + var r3 = mdb(Wte, "JsonImporter/lambda$3$Type", 896); + bcb(921, 1, {}, Jrd); + var s3 = mdb(Wte, "JsonImporter/lambda$30$Type", 921); + bcb(922, 1, {}, Krd); + var t3 = mdb(Wte, "JsonImporter/lambda$31$Type", 922); + bcb(923, 1, {}, Lrd); + var u3 = mdb(Wte, "JsonImporter/lambda$32$Type", 923); + bcb(924, 1, {}, Mrd); + var v3 = mdb(Wte, "JsonImporter/lambda$33$Type", 924); + bcb(925, 1, {}, Nrd); + var w3 = mdb(Wte, "JsonImporter/lambda$34$Type", 925); + bcb(859, 1, {}, Prd); + var x3 = mdb(Wte, "JsonImporter/lambda$35$Type", 859); + bcb(929, 1, {}, Rrd); + var y3 = mdb(Wte, "JsonImporter/lambda$36$Type", 929); + bcb(926, 1, qie, Srd); + _.td = function Trd(a) { + Lqd(this.a, BD(a, 469)); + }; + var z3 = mdb(Wte, "JsonImporter/lambda$37$Type", 926); + bcb(927, 1, qie, Urd); + _.td = function Vrd(a) { + Mqd(this.a, this.b, BD(a, 202)); + }; + var A3 = mdb(Wte, "JsonImporter/lambda$38$Type", 927); + bcb(928, 1, qie, Wrd); + _.td = function Xrd(a) { + Nqd(this.a, this.b, BD(a, 202)); + }; + var B3 = mdb(Wte, "JsonImporter/lambda$39$Type", 928); + bcb(894, 1, {}, Yrd); + var C3 = mdb(Wte, "JsonImporter/lambda$4$Type", 894); + bcb(930, 1, qie, Zrd); + _.td = function $rd(a) { + Oqd(this.a, BD(a, 8)); + }; + var D3 = mdb(Wte, "JsonImporter/lambda$40$Type", 930); + bcb(895, 1, {}, _rd); + var E3 = mdb(Wte, "JsonImporter/lambda$5$Type", 895); + bcb(899, 1, {}, asd); + var F3 = mdb(Wte, "JsonImporter/lambda$6$Type", 899); + bcb(897, 1, {}, bsd); + var G3 = mdb(Wte, "JsonImporter/lambda$7$Type", 897); + bcb(898, 1, {}, csd); + var H3 = mdb(Wte, "JsonImporter/lambda$8$Type", 898); + bcb(901, 1, {}, dsd); + var I3 = mdb(Wte, "JsonImporter/lambda$9$Type", 901); + bcb(948, 1, qie, msd); + _.td = function nsd(a) { + Qpd(this.a, new yC(GD(a))); + }; + var K3 = mdb(Wte, "JsonMetaDataConverter/lambda$0$Type", 948); + bcb(949, 1, qie, osd); + _.td = function psd(a) { + isd(this.a, BD(a, 237)); + }; + var L3 = mdb(Wte, "JsonMetaDataConverter/lambda$1$Type", 949); + bcb(950, 1, qie, qsd); + _.td = function rsd(a) { + jsd(this.a, BD(a, 149)); + }; + var M3 = mdb(Wte, "JsonMetaDataConverter/lambda$2$Type", 950); + bcb(951, 1, qie, ssd); + _.td = function tsd(a) { + ksd(this.a, BD(a, 175)); + }; + var N3 = mdb(Wte, "JsonMetaDataConverter/lambda$3$Type", 951); + bcb(237, 22, { 3: 1, 35: 1, 22: 1, 237: 1 }, Dsd); + var usd, vsd, wsd, xsd, ysd, zsd, Asd, Bsd; + var O3 = ndb(Hle, "GraphFeature", 237, CI, Fsd, Esd); + var Gsd; + bcb(13, 1, { 35: 1, 146: 1 }, Lsd, Msd, Nsd, Osd); + _.wd = function Psd(a) { + return Isd(this, BD(a, 146)); + }; + _.Fb = function Qsd(a) { + return Jsd(this, a); + }; + _.wg = function Rsd() { + return Ksd(this); + }; + _.tg = function Ssd() { + return this.b; + }; + _.Hb = function Tsd() { + return LCb(this.b); + }; + _.Ib = function Usd() { + return this.b; + }; + var T3 = mdb(Hle, "Property", 13); + bcb(818, 1, Dke, Wsd); + _.ue = function Xsd(a, b) { + return Vsd(this, BD(a, 94), BD(b, 94)); + }; + _.Fb = function Ysd(a) { + return this === a; + }; + _.ve = function Zsd() { + return new tpb(this); + }; + var S3 = mdb(Hle, "PropertyHolderComparator", 818); + bcb(695, 1, aie, qtd); + _.Nb = function rtd(a) { + Rrb(this, a); + }; + _.Pb = function ttd() { + return ptd(this); + }; + _.Qb = function utd() { + Srb(); + }; + _.Ob = function std() { + return !!this.a; + }; + var U3 = mdb(jue, "ElkGraphUtil/AncestorIterator", 695); + var T4 = odb(Tte, "EList"); + bcb(67, 52, { 20: 1, 28: 1, 52: 1, 14: 1, 15: 1, 67: 1, 58: 1 }); + _.Vc = function Jtd(a, b) { + vtd(this, a, b); + }; + _.Fc = function Ktd(a) { + return wtd(this, a); + }; + _.Wc = function Ltd(a, b) { + return xtd(this, a, b); + }; + _.Gc = function Mtd(a) { + return ytd(this, a); + }; + _.Zh = function Ntd() { + return new $yd(this); + }; + _.$h = function Otd() { + return new bzd(this); + }; + _._h = function Ptd(a) { + return ztd(this, a); + }; + _.ai = function Qtd() { + return true; + }; + _.bi = function Rtd(a, b) {}; + _.ci = function Std() {}; + _.di = function Ttd(a, b) { + Atd(this, a, b); + }; + _.ei = function Utd(a, b, c) {}; + _.fi = function Vtd(a, b) {}; + _.gi = function Wtd(a, b, c) {}; + _.Fb = function Xtd(a) { + return Btd(this, a); + }; + _.Hb = function Ytd() { + return Etd(this); + }; + _.hi = function Ztd() { + return false; + }; + _.Kc = function $td() { + return new Fyd(this); + }; + _.Yc = function _td() { + return new Oyd(this); + }; + _.Zc = function aud(a) { + var b; + b = this.gc(); + if (a < 0 || a > b) throw vbb(new Cyd(a, b)); + return new Pyd(this, a); + }; + _.ji = function bud(a, b) { + this.ii(a, this.Xc(b)); + }; + _.Mc = function cud(a) { + return Ftd(this, a); + }; + _.li = function dud(a, b) { + return b; + }; + _._c = function eud(a, b) { + return Gtd(this, a, b); + }; + _.Ib = function fud() { + return Htd(this); + }; + _.ni = function gud() { + return true; + }; + _.oi = function hud(a, b) { + return Itd(this, b); + }; + var p4 = mdb(Tte, "AbstractEList", 67); + bcb(63, 67, oue, yud, zud, Aud); + _.Vh = function Bud(a, b) { + return iud(this, a, b); + }; + _.Wh = function Cud(a) { + return jud(this, a); + }; + _.Xh = function Dud(a, b) { + kud(this, a, b); + }; + _.Yh = function Eud(a) { + lud(this, a); + }; + _.pi = function Fud(a) { + return nud(this, a); + }; + _.$b = function Gud() { + oud(this); + }; + _.Hc = function Hud(a) { + return pud(this, a); + }; + _.Xb = function Iud(a) { + return qud(this, a); + }; + _.qi = function Jud(a) { + var b, c, d; + ++this.j; + c = this.g == null ? 0 : this.g.length; + if (a > c) { + d = this.g; + b = c + ((c / 2) | 0) + 4; + b < a && (b = a); + this.g = this.ri(b); + d != null && $fb(d, 0, this.g, 0, this.i); + } + }; + _.Xc = function Kud(a) { + return rud(this, a); + }; + _.dc = function Lud() { + return this.i == 0; + }; + _.ii = function Mud(a, b) { + return sud(this, a, b); + }; + _.ri = function Nud(a) { + return KC(SI, Uhe, 1, a, 5, 1); + }; + _.ki = function Oud(a) { + return this.g[a]; + }; + _.$c = function Pud(a) { + return tud(this, a); + }; + _.mi = function Qud(a, b) { + return uud(this, a, b); + }; + _.gc = function Rud() { + return this.i; + }; + _.Pc = function Sud() { + return wud(this); + }; + _.Qc = function Tud(a) { + return xud(this, a); + }; + _.i = 0; + var y4 = mdb(Tte, "BasicEList", 63); + var X4 = odb(Tte, "TreeIterator"); + bcb(694, 63, pue); + _.Nb = function Xud(a) { + Rrb(this, a); + }; + _.Ob = function Yud() { + return this.g == null && !this.c + ? Uud(this) + : this.g == null || (this.i != 0 && BD(this.g[this.i - 1], 47).Ob()); + }; + _.Pb = function Zud() { + return Vud(this); + }; + _.Qb = function $ud() { + if (!this.e) { + throw vbb(new Zdb("There is no valid object to remove.")); + } + this.e.Qb(); + }; + _.c = false; + var q4 = mdb(Tte, "AbstractTreeIterator", 694); + bcb(685, 694, pue, _ud); + _.si = function avd(a) { + var b; + b = BD(a, 56).Wg().Kc(); + JD(b, 279) && BD(b, 279).Nk(new bvd()); + return b; + }; + var W3 = mdb(jue, "ElkGraphUtil/PropertiesSkippingTreeIterator", 685); + bcb(952, 1, {}, bvd); + var V3 = mdb(jue, "ElkGraphUtil/PropertiesSkippingTreeIterator/1", 952); + var cvd, dvd; + var Y3 = mdb(jue, "ElkReflect", null); + bcb(889, 1, hse, jvd); + _.vg = function kvd(a) { + return evd(), sqb(BD(a, 174)); + }; + var X3 = mdb(jue, "ElkReflect/lambda$0$Type", 889); + var lvd; + var W4 = odb(Tte, "ResourceLocator"); + bcb(1051, 1, {}); + var N4 = mdb(Tte, "DelegatingResourceLocator", 1051); + bcb(1052, 1051, {}); + var Z3 = mdb("org.eclipse.emf.common", "EMFPlugin", 1052); + var $3 = odb(cve, "Adapter"); + var _3 = odb(cve, "Notification"); + bcb(1153, 1, dve); + _.ti = function vvd() { + return this.d; + }; + _.ui = function wvd(a) {}; + _.vi = function xvd(a) { + this.d = a; + }; + _.wi = function yvd(a) { + this.d == a && (this.d = null); + }; + _.d = null; + var a4 = mdb(hte, "AdapterImpl", 1153); + bcb(1995, 67, eve); + _.Vh = function Fvd(a, b) { + return zvd(this, a, b); + }; + _.Wh = function Gvd(a) { + var b, c, d; + ++this.j; + if (a.dc()) { + return false; + } else { + b = this.Vi(); + for (d = a.Kc(); d.Ob(); ) { + c = d.Pb(); + this.Ii(this.oi(b, c)); + ++b; + } + return true; + } + }; + _.Xh = function Hvd(a, b) { + Avd(this, a, b); + }; + _.Yh = function Ivd(a) { + Bvd(this, a); + }; + _.Gi = function Jvd() { + return this.Ji(); + }; + _.$b = function Kvd() { + Cvd(this, this.Vi(), this.Wi()); + }; + _.Hc = function Lvd(a) { + return this.Li(a); + }; + _.Ic = function Mvd(a) { + return this.Mi(a); + }; + _.Hi = function Nvd(a, b) { + this.Si().jm(); + }; + _.Ii = function Ovd(a) { + this.Si().jm(); + }; + _.Ji = function Pvd() { + return this.Si(); + }; + _.Ki = function Qvd() { + this.Si().jm(); + }; + _.Li = function Rvd(a) { + return this.Si().jm(); + }; + _.Mi = function Svd(a) { + return this.Si().jm(); + }; + _.Ni = function Tvd(a) { + return this.Si().jm(); + }; + _.Oi = function Uvd(a) { + return this.Si().jm(); + }; + _.Pi = function Vvd() { + return this.Si().jm(); + }; + _.Qi = function Wvd(a) { + return this.Si().jm(); + }; + _.Ri = function Xvd() { + return this.Si().jm(); + }; + _.Ti = function Yvd(a) { + return this.Si().jm(); + }; + _.Ui = function Zvd(a, b) { + return this.Si().jm(); + }; + _.Vi = function $vd() { + return this.Si().jm(); + }; + _.Wi = function _vd() { + return this.Si().jm(); + }; + _.Xi = function awd(a) { + return this.Si().jm(); + }; + _.Yi = function bwd() { + return this.Si().jm(); + }; + _.Fb = function cwd(a) { + return this.Ni(a); + }; + _.Xb = function dwd(a) { + return this.li(a, this.Oi(a)); + }; + _.Hb = function ewd() { + return this.Pi(); + }; + _.Xc = function fwd(a) { + return this.Qi(a); + }; + _.dc = function gwd() { + return this.Ri(); + }; + _.ii = function hwd(a, b) { + return Dvd(this, a, b); + }; + _.ki = function iwd(a) { + return this.Oi(a); + }; + _.$c = function jwd(a) { + return Evd(this, a); + }; + _.Mc = function kwd(a) { + var b; + b = this.Xc(a); + if (b >= 0) { + this.$c(b); + return true; + } else { + return false; + } + }; + _.mi = function lwd(a, b) { + return this.Ui(a, this.oi(a, b)); + }; + _.gc = function mwd() { + return this.Vi(); + }; + _.Pc = function nwd() { + return this.Wi(); + }; + _.Qc = function owd(a) { + return this.Xi(a); + }; + _.Ib = function pwd() { + return this.Yi(); + }; + var M4 = mdb(Tte, "DelegatingEList", 1995); + bcb(1996, 1995, eve); + _.Vh = function xwd(a, b) { + return qwd(this, a, b); + }; + _.Wh = function ywd(a) { + return this.Vh(this.Vi(), a); + }; + _.Xh = function zwd(a, b) { + rwd(this, a, b); + }; + _.Yh = function Awd(a) { + swd(this, a); + }; + _.ai = function Bwd() { + return !this.bj(); + }; + _.$b = function Cwd() { + vwd(this); + }; + _.Zi = function Dwd(a, b, c, d, e) { + return new Cxd(this, a, b, c, d, e); + }; + _.$i = function Ewd(a) { + Uhd(this.Ai(), a); + }; + _._i = function Fwd() { + return null; + }; + _.aj = function Gwd() { + return -1; + }; + _.Ai = function Hwd() { + return null; + }; + _.bj = function Iwd() { + return false; + }; + _.cj = function Jwd(a, b) { + return b; + }; + _.dj = function Kwd(a, b) { + return b; + }; + _.ej = function Lwd() { + return false; + }; + _.fj = function Mwd() { + return !this.Ri(); + }; + _.ii = function Nwd(a, b) { + var c, d; + if (this.ej()) { + d = this.fj(); + c = Dvd(this, a, b); + this.$i(this.Zi(7, meb(b), c, a, d)); + return c; + } else { + return Dvd(this, a, b); + } + }; + _.$c = function Owd(a) { + var b, c, d, e; + if (this.ej()) { + c = null; + d = this.fj(); + b = this.Zi(4, (e = Evd(this, a)), null, a, d); + if (this.bj() && !!e) { + c = this.dj(e, c); + if (!c) { + this.$i(b); + } else { + c.Ei(b); + c.Fi(); + } + } else { + if (!c) { + this.$i(b); + } else { + c.Ei(b); + c.Fi(); + } + } + return e; + } else { + e = Evd(this, a); + if (this.bj() && !!e) { + c = this.dj(e, null); + !!c && c.Fi(); + } + return e; + } + }; + _.mi = function Pwd(a, b) { + return wwd(this, a, b); + }; + var d4 = mdb(hte, "DelegatingNotifyingListImpl", 1996); + bcb(143, 1, fve); + _.Ei = function pxd(a) { + return Qwd(this, a); + }; + _.Fi = function qxd() { + Rwd(this); + }; + _.xi = function rxd() { + return this.d; + }; + _._i = function sxd() { + return null; + }; + _.gj = function txd() { + return null; + }; + _.yi = function uxd(a) { + return -1; + }; + _.zi = function vxd() { + return $wd(this); + }; + _.Ai = function wxd() { + return null; + }; + _.Bi = function xxd() { + return hxd(this); + }; + _.Ci = function yxd() { + return this.o < 0 ? (this.o < -2 ? -2 - this.o - 1 : -1) : this.o; + }; + _.hj = function zxd() { + return false; + }; + _.Di = function Axd(a) { + var b, c, d, e, f, g, h, i, j, k, l; + switch (this.d) { + case 1: + case 2: { + e = a.xi(); + switch (e) { + case 1: + case 2: { + f = a.Ai(); + if (PD(f) === PD(this.Ai()) && this.yi(null) == a.yi(null)) { + this.g = a.zi(); + a.xi() == 1 && (this.d = 1); + return true; + } + } + } + } + case 4: { + e = a.xi(); + switch (e) { + case 4: { + f = a.Ai(); + if (PD(f) === PD(this.Ai()) && this.yi(null) == a.yi(null)) { + j = jxd(this); + i = this.o < 0 ? (this.o < -2 ? -2 - this.o - 1 : -1) : this.o; + g = a.Ci(); + this.d = 6; + l = new zud(2); + if (i <= g) { + wtd(l, this.n); + wtd(l, a.Bi()); + this.g = OC(GC(WD, 1), oje, 25, 15, [(this.o = i), g + 1]); + } else { + wtd(l, a.Bi()); + wtd(l, this.n); + this.g = OC(GC(WD, 1), oje, 25, 15, [(this.o = g), i]); + } + this.n = l; + j || (this.o = -2 - this.o - 1); + return true; + } + break; + } + } + break; + } + case 6: { + e = a.xi(); + switch (e) { + case 4: { + f = a.Ai(); + if (PD(f) === PD(this.Ai()) && this.yi(null) == a.yi(null)) { + j = jxd(this); + g = a.Ci(); + k = BD(this.g, 48); + d = KC(WD, oje, 25, k.length + 1, 15, 1); + b = 0; + while (b < k.length) { + h = k[b]; + if (h <= g) { + d[b++] = h; + ++g; + } else { + break; + } + } + c = BD(this.n, 15); + c.Vc(b, a.Bi()); + d[b] = g; + while (++b < d.length) { + d[b] = k[b - 1]; + } + this.g = d; + j || (this.o = -2 - d[0]); + return true; + } + break; + } + } + break; + } + } + return false; + }; + _.Ib = function Bxd() { + var a, b, c, d; + d = new Jfb(hdb(this.gm) + "@" + ((b = tb(this) >>> 0), b.toString(16))); + d.a += " (eventType: "; + switch (this.d) { + case 1: { + d.a += "SET"; + break; + } + case 2: { + d.a += "UNSET"; + break; + } + case 3: { + d.a += "ADD"; + break; + } + case 5: { + d.a += "ADD_MANY"; + break; + } + case 4: { + d.a += "REMOVE"; + break; + } + case 6: { + d.a += "REMOVE_MANY"; + break; + } + case 7: { + d.a += "MOVE"; + break; + } + case 8: { + d.a += "REMOVING_ADAPTER"; + break; + } + case 9: { + d.a += "RESOLVE"; + break; + } + default: { + Cfb(d, this.d); + break; + } + } + ixd(this) && ((d.a += ", touch: true"), d); + d.a += ", position: "; + Cfb(d, this.o < 0 ? (this.o < -2 ? -2 - this.o - 1 : -1) : this.o); + d.a += ", notifier: "; + Dfb(d, this.Ai()); + d.a += ", feature: "; + Dfb(d, this._i()); + d.a += ", oldValue: "; + Dfb(d, hxd(this)); + d.a += ", newValue: "; + if (this.d == 6 && JD(this.g, 48)) { + c = BD(this.g, 48); + d.a += "["; + for (a = 0; a < c.length; ) { + d.a += c[a]; + ++a < c.length && ((d.a += She), d); + } + d.a += "]"; + } else { + Dfb(d, $wd(this)); + } + d.a += ", isTouch: "; + Ffb(d, ixd(this)); + d.a += ", wasSet: "; + Ffb(d, jxd(this)); + d.a += ")"; + return d.a; + }; + _.d = 0; + _.e = 0; + _.f = 0; + _.j = 0; + _.k = 0; + _.o = 0; + _.p = 0; + var f4 = mdb(hte, "NotificationImpl", 143); + bcb(1167, 143, fve, Cxd); + _._i = function Dxd() { + return this.a._i(); + }; + _.yi = function Exd(a) { + return this.a.aj(); + }; + _.Ai = function Fxd() { + return this.a.Ai(); + }; + var c4 = mdb(hte, "DelegatingNotifyingListImpl/1", 1167); + bcb(242, 63, oue, Hxd, Ixd); + _.Fc = function Jxd(a) { + return Gxd(this, BD(a, 366)); + }; + _.Ei = function Kxd(a) { + return Gxd(this, a); + }; + _.Fi = function Lxd() { + var a, b, c; + for (a = 0; a < this.i; ++a) { + b = BD(this.g[a], 366); + c = b.Ai(); + c != null && b.xi() != -1 && BD(c, 92).Ng(b); + } + }; + _.ri = function Mxd(a) { + return KC(_3, Uhe, 366, a, 0, 1); + }; + var e4 = mdb(hte, "NotificationChainImpl", 242); + bcb(1378, 90, gte); + _.Kg = function Nxd() { + return this.e; + }; + _.Mg = function Oxd() { + return (this.f & 1) != 0; + }; + _.f = 1; + var g4 = mdb(hte, "NotifierImpl", 1378); + bcb(1993, 63, oue); + _.Vh = function $xd(a, b) { + return Pxd(this, a, b); + }; + _.Wh = function _xd(a) { + return this.Vh(this.i, a); + }; + _.Xh = function ayd(a, b) { + Qxd(this, a, b); + }; + _.Yh = function byd(a) { + Rxd(this, a); + }; + _.ai = function cyd() { + return !this.bj(); + }; + _.$b = function dyd() { + Uxd(this); + }; + _.Zi = function eyd(a, b, c, d, e) { + return new vyd(this, a, b, c, d, e); + }; + _.$i = function fyd(a) { + Uhd(this.Ai(), a); + }; + _._i = function gyd() { + return null; + }; + _.aj = function hyd() { + return -1; + }; + _.Ai = function iyd() { + return null; + }; + _.bj = function jyd() { + return false; + }; + _.ij = function kyd() { + return false; + }; + _.cj = function lyd(a, b) { + return b; + }; + _.dj = function myd(a, b) { + return b; + }; + _.ej = function nyd() { + return false; + }; + _.fj = function oyd() { + return this.i != 0; + }; + _.ii = function pyd(a, b) { + return Wxd(this, a, b); + }; + _.$c = function qyd(a) { + return Xxd(this, a); + }; + _.mi = function ryd(a, b) { + return Zxd(this, a, b); + }; + _.jj = function syd(a, b) { + return b; + }; + _.kj = function tyd(a, b) { + return b; + }; + _.lj = function uyd(a, b, c) { + return c; + }; + var i4 = mdb(hte, "NotifyingListImpl", 1993); + bcb(1166, 143, fve, vyd); + _._i = function wyd() { + return this.a._i(); + }; + _.yi = function xyd(a) { + return this.a.aj(); + }; + _.Ai = function yyd() { + return this.a.Ai(); + }; + var h4 = mdb(hte, "NotifyingListImpl/1", 1166); + bcb(953, 63, oue, zyd); + _.Hc = function Ayd(a) { + if (this.i > 10) { + if (!this.b || this.c.j != this.a) { + this.b = new Vqb(this); + this.a = this.j; + } + return Rqb(this.b, a); + } else { + return pud(this, a); + } + }; + _.ni = function Byd() { + return true; + }; + _.a = 0; + var j4 = mdb(Tte, "AbstractEList/1", 953); + bcb(295, 73, Mje, Cyd); + var k4 = mdb(Tte, "AbstractEList/BasicIndexOutOfBoundsException", 295); + bcb(40, 1, aie, Fyd); + _.Nb = function Iyd(a) { + Rrb(this, a); + }; + _.mj = function Gyd() { + if (this.i.j != this.f) { + throw vbb(new Apb()); + } + }; + _.nj = function Hyd() { + return Dyd(this); + }; + _.Ob = function Jyd() { + return this.e != this.i.gc(); + }; + _.Pb = function Kyd() { + return this.nj(); + }; + _.Qb = function Lyd() { + Eyd(this); + }; + _.e = 0; + _.f = 0; + _.g = -1; + var l4 = mdb(Tte, "AbstractEList/EIterator", 40); + bcb(278, 40, jie, Oyd, Pyd); + _.Qb = function Xyd() { + Eyd(this); + }; + _.Rb = function Qyd(a) { + Myd(this, a); + }; + _.oj = function Ryd() { + var b; + try { + b = this.d.Xb(--this.e); + this.mj(); + this.g = this.e; + return b; + } catch (a) { + a = ubb(a); + if (JD(a, 73)) { + this.mj(); + throw vbb(new utb()); + } else throw vbb(a); + } + }; + _.pj = function Syd(a) { + Nyd(this, a); + }; + _.Sb = function Tyd() { + return this.e != 0; + }; + _.Tb = function Uyd() { + return this.e; + }; + _.Ub = function Vyd() { + return this.oj(); + }; + _.Vb = function Wyd() { + return this.e - 1; + }; + _.Wb = function Yyd(a) { + this.pj(a); + }; + var m4 = mdb(Tte, "AbstractEList/EListIterator", 278); + bcb(341, 40, aie, $yd); + _.nj = function _yd() { + return Zyd(this); + }; + _.Qb = function azd() { + throw vbb(new bgb()); + }; + var n4 = mdb(Tte, "AbstractEList/NonResolvingEIterator", 341); + bcb(385, 278, jie, bzd, czd); + _.Rb = function dzd(a) { + throw vbb(new bgb()); + }; + _.nj = function ezd() { + var b; + try { + b = this.c.ki(this.e); + this.mj(); + this.g = this.e++; + return b; + } catch (a) { + a = ubb(a); + if (JD(a, 73)) { + this.mj(); + throw vbb(new utb()); + } else throw vbb(a); + } + }; + _.oj = function fzd() { + var b; + try { + b = this.c.ki(--this.e); + this.mj(); + this.g = this.e; + return b; + } catch (a) { + a = ubb(a); + if (JD(a, 73)) { + this.mj(); + throw vbb(new utb()); + } else throw vbb(a); + } + }; + _.Qb = function gzd() { + throw vbb(new bgb()); + }; + _.Wb = function hzd(a) { + throw vbb(new bgb()); + }; + var o4 = mdb(Tte, "AbstractEList/NonResolvingEListIterator", 385); + bcb(1982, 67, ive); + _.Vh = function pzd(a, b) { + var c, d, e, f, g, h, i, j, k, l, m; + e = b.gc(); + if (e != 0) { + j = BD(Ajd(this.a, 4), 126); + k = j == null ? 0 : j.length; + m = k + e; + d = nzd(this, m); + l = k - a; + l > 0 && $fb(j, a, d, a + e, l); + i = b.Kc(); + for (g = 0; g < e; ++g) { + h = i.Pb(); + c = a + g; + lzd(d, c, Itd(this, h)); + } + b0d(this, d); + for (f = 0; f < e; ++f) { + h = d[a]; + this.bi(a, h); + ++a; + } + return true; + } else { + ++this.j; + return false; + } + }; + _.Wh = function qzd(a) { + var b, c, d, e, f, g, h, i, j; + d = a.gc(); + if (d != 0) { + i = ((c = BD(Ajd(this.a, 4), 126)), c == null ? 0 : c.length); + j = i + d; + b = nzd(this, j); + h = a.Kc(); + for (f = i; f < j; ++f) { + g = h.Pb(); + lzd(b, f, Itd(this, g)); + } + b0d(this, b); + for (e = i; e < j; ++e) { + g = b[e]; + this.bi(e, g); + } + return true; + } else { + ++this.j; + return false; + } + }; + _.Xh = function rzd(a, b) { + var c, d, e, f; + d = BD(Ajd(this.a, 4), 126); + e = d == null ? 0 : d.length; + c = nzd(this, e + 1); + f = Itd(this, b); + a != e && $fb(d, a, c, a + 1, e - a); + NC(c, a, f); + b0d(this, c); + this.bi(a, b); + }; + _.Yh = function szd(a) { + var b, c, d; + d = ((c = BD(Ajd(this.a, 4), 126)), c == null ? 0 : c.length); + b = nzd(this, d + 1); + lzd(b, d, Itd(this, a)); + b0d(this, b); + this.bi(d, a); + }; + _.Zh = function tzd() { + return new Uzd(this); + }; + _.$h = function uzd() { + return new Xzd(this); + }; + _._h = function vzd(a) { + var b, c; + c = ((b = BD(Ajd(this.a, 4), 126)), b == null ? 0 : b.length); + if (a < 0 || a > c) throw vbb(new Cyd(a, c)); + return new Yzd(this, a); + }; + _.$b = function wzd() { + var a, b; + ++this.j; + a = BD(Ajd(this.a, 4), 126); + b = a == null ? 0 : a.length; + b0d(this, null); + Atd(this, b, a); + }; + _.Hc = function xzd(a) { + var b, c, d, e, f; + b = BD(Ajd(this.a, 4), 126); + if (b != null) { + if (a != null) { + for (d = b, e = 0, f = d.length; e < f; ++e) { + c = d[e]; + if (pb(a, c)) { + return true; + } + } + } else { + for (d = b, e = 0, f = d.length; e < f; ++e) { + c = d[e]; + if (PD(c) === PD(a)) { + return true; + } + } + } + } + return false; + }; + _.Xb = function yzd(a) { + var b, c; + b = BD(Ajd(this.a, 4), 126); + c = b == null ? 0 : b.length; + if (a >= c) throw vbb(new Cyd(a, c)); + return b[a]; + }; + _.Xc = function zzd(a) { + var b, c, d; + b = BD(Ajd(this.a, 4), 126); + if (b != null) { + if (a != null) { + for (c = 0, d = b.length; c < d; ++c) { + if (pb(a, b[c])) { + return c; + } + } + } else { + for (c = 0, d = b.length; c < d; ++c) { + if (PD(b[c]) === PD(a)) { + return c; + } + } + } + } + return -1; + }; + _.dc = function Azd() { + return BD(Ajd(this.a, 4), 126) == null; + }; + _.Kc = function Bzd() { + return new Lzd(this); + }; + _.Yc = function Czd() { + return new Pzd(this); + }; + _.Zc = function Dzd(a) { + var b, c; + c = ((b = BD(Ajd(this.a, 4), 126)), b == null ? 0 : b.length); + if (a < 0 || a > c) throw vbb(new Cyd(a, c)); + return new Qzd(this, a); + }; + _.ii = function Ezd(a, b) { + var c, d, e; + c = mzd(this); + e = c == null ? 0 : c.length; + if (a >= e) throw vbb(new qcb(lue + a + mue + e)); + if (b >= e) throw vbb(new qcb(nue + b + mue + e)); + d = c[b]; + if (a != b) { + a < b ? $fb(c, a, c, a + 1, b - a) : $fb(c, b + 1, c, b, a - b); + NC(c, a, d); + b0d(this, c); + } + return d; + }; + _.ki = function Fzd(a) { + return BD(Ajd(this.a, 4), 126)[a]; + }; + _.$c = function Gzd(a) { + return ozd(this, a); + }; + _.mi = function Hzd(a, b) { + var c, d; + c = mzd(this); + d = c[a]; + lzd(c, a, Itd(this, b)); + b0d(this, c); + return d; + }; + _.gc = function Izd() { + var a; + return (a = BD(Ajd(this.a, 4), 126)), a == null ? 0 : a.length; + }; + _.Pc = function Jzd() { + var a, b, c; + a = BD(Ajd(this.a, 4), 126); + c = a == null ? 0 : a.length; + b = KC($3, hve, 415, c, 0, 1); + c > 0 && $fb(a, 0, b, 0, c); + return b; + }; + _.Qc = function Kzd(a) { + var b, c, d; + b = BD(Ajd(this.a, 4), 126); + d = b == null ? 0 : b.length; + if (d > 0) { + if (a.length < d) { + c = izd(rb(a).c, d); + a = c; + } + $fb(b, 0, a, 0, d); + } + a.length > d && NC(a, d, null); + return a; + }; + var jzd; + var v4 = mdb(Tte, "ArrayDelegatingEList", 1982); + bcb(1038, 40, aie, Lzd); + _.mj = function Mzd() { + if (this.b.j != this.f || PD(BD(Ajd(this.b.a, 4), 126)) !== PD(this.a)) { + throw vbb(new Apb()); + } + }; + _.Qb = function Nzd() { + Eyd(this); + this.a = BD(Ajd(this.b.a, 4), 126); + }; + var r4 = mdb(Tte, "ArrayDelegatingEList/EIterator", 1038); + bcb(706, 278, jie, Pzd, Qzd); + _.mj = function Rzd() { + if (this.b.j != this.f || PD(BD(Ajd(this.b.a, 4), 126)) !== PD(this.a)) { + throw vbb(new Apb()); + } + }; + _.pj = function Szd(a) { + Nyd(this, a); + this.a = BD(Ajd(this.b.a, 4), 126); + }; + _.Qb = function Tzd() { + Eyd(this); + this.a = BD(Ajd(this.b.a, 4), 126); + }; + var s4 = mdb(Tte, "ArrayDelegatingEList/EListIterator", 706); + bcb(1039, 341, aie, Uzd); + _.mj = function Vzd() { + if (this.b.j != this.f || PD(BD(Ajd(this.b.a, 4), 126)) !== PD(this.a)) { + throw vbb(new Apb()); + } + }; + var t4 = mdb(Tte, "ArrayDelegatingEList/NonResolvingEIterator", 1039); + bcb(707, 385, jie, Xzd, Yzd); + _.mj = function Zzd() { + if (this.b.j != this.f || PD(BD(Ajd(this.b.a, 4), 126)) !== PD(this.a)) { + throw vbb(new Apb()); + } + }; + var u4 = mdb(Tte, "ArrayDelegatingEList/NonResolvingEListIterator", 707); + bcb(606, 295, Mje, $zd); + var w4 = mdb(Tte, "BasicEList/BasicIndexOutOfBoundsException", 606); + bcb(696, 63, oue, _zd); + _.Vc = function aAd(a, b) { + throw vbb(new bgb()); + }; + _.Fc = function bAd(a) { + throw vbb(new bgb()); + }; + _.Wc = function cAd(a, b) { + throw vbb(new bgb()); + }; + _.Gc = function dAd(a) { + throw vbb(new bgb()); + }; + _.$b = function eAd() { + throw vbb(new bgb()); + }; + _.qi = function fAd(a) { + throw vbb(new bgb()); + }; + _.Kc = function gAd() { + return this.Zh(); + }; + _.Yc = function hAd() { + return this.$h(); + }; + _.Zc = function iAd(a) { + return this._h(a); + }; + _.ii = function jAd(a, b) { + throw vbb(new bgb()); + }; + _.ji = function kAd(a, b) { + throw vbb(new bgb()); + }; + _.$c = function lAd(a) { + throw vbb(new bgb()); + }; + _.Mc = function mAd(a) { + throw vbb(new bgb()); + }; + _._c = function nAd(a, b) { + throw vbb(new bgb()); + }; + var x4 = mdb(Tte, "BasicEList/UnmodifiableEList", 696); + bcb(705, 1, { 3: 1, 20: 1, 14: 1, 15: 1, 58: 1, 589: 1 }); + _.Vc = function OAd(a, b) { + oAd(this, a, BD(b, 42)); + }; + _.Fc = function PAd(a) { + return pAd(this, BD(a, 42)); + }; + _.Jc = function XAd(a) { + reb(this, a); + }; + _.Xb = function YAd(a) { + return BD(qud(this.c, a), 133); + }; + _.ii = function fBd(a, b) { + return BD(this.c.ii(a, b), 42); + }; + _.ji = function gBd(a, b) { + GAd(this, a, BD(b, 42)); + }; + _.Lc = function jBd() { + return new YAb(null, new Kub(this, 16)); + }; + _.$c = function kBd(a) { + return BD(this.c.$c(a), 42); + }; + _._c = function mBd(a, b) { + return MAd(this, a, BD(b, 42)); + }; + _.ad = function oBd(a) { + ktb(this, a); + }; + _.Nc = function pBd() { + return new Kub(this, 16); + }; + _.Oc = function qBd() { + return new YAb(null, new Kub(this, 16)); + }; + _.Wc = function QAd(a, b) { + return this.c.Wc(a, b); + }; + _.Gc = function RAd(a) { + return this.c.Gc(a); + }; + _.$b = function SAd() { + this.c.$b(); + }; + _.Hc = function TAd(a) { + return this.c.Hc(a); + }; + _.Ic = function UAd(a) { + return Be(this.c, a); + }; + _.qj = function VAd() { + var a, b, c; + if (this.d == null) { + this.d = KC(y4, jve, 63, 2 * this.f + 1, 0, 1); + c = this.e; + this.f = 0; + for (b = this.c.Kc(); b.e != b.i.gc(); ) { + a = BD(b.nj(), 133); + uAd(this, a); + } + this.e = c; + } + }; + _.Fb = function WAd(a) { + return zAd(this, a); + }; + _.Hb = function ZAd() { + return Etd(this.c); + }; + _.Xc = function $Ad(a) { + return this.c.Xc(a); + }; + _.rj = function _Ad() { + this.c = new yBd(this); + }; + _.dc = function aBd() { + return this.f == 0; + }; + _.Kc = function bBd() { + return this.c.Kc(); + }; + _.Yc = function cBd() { + return this.c.Yc(); + }; + _.Zc = function dBd(a) { + return this.c.Zc(a); + }; + _.sj = function eBd() { + return FAd(this); + }; + _.tj = function hBd(a, b, c) { + return new zCd(a, b, c); + }; + _.uj = function iBd() { + return new EBd(); + }; + _.Mc = function lBd(a) { + return JAd(this, a); + }; + _.gc = function nBd() { + return this.f; + }; + _.bd = function rBd(a, b) { + return new Jib(this.c, a, b); + }; + _.Pc = function sBd() { + return this.c.Pc(); + }; + _.Qc = function tBd(a) { + return this.c.Qc(a); + }; + _.Ib = function uBd() { + return Htd(this.c); + }; + _.e = 0; + _.f = 0; + var L4 = mdb(Tte, "BasicEMap", 705); + bcb(1033, 63, oue, yBd); + _.bi = function zBd(a, b) { + vBd(this, BD(b, 133)); + }; + _.ei = function BBd(a, b, c) { + var d; + ++((d = this), BD(b, 133), d).a.e; + }; + _.fi = function CBd(a, b) { + wBd(this, BD(b, 133)); + }; + _.gi = function DBd(a, b, c) { + xBd(this, BD(b, 133), BD(c, 133)); + }; + _.di = function ABd(a, b) { + tAd(this.a); + }; + var z4 = mdb(Tte, "BasicEMap/1", 1033); + bcb(1034, 63, oue, EBd); + _.ri = function FBd(a) { + return KC(I4, kve, 612, a, 0, 1); + }; + var A4 = mdb(Tte, "BasicEMap/2", 1034); + bcb(1035, eie, fie, GBd); + _.$b = function HBd() { + this.a.c.$b(); + }; + _.Hc = function IBd(a) { + return qAd(this.a, a); + }; + _.Kc = function JBd() { + return this.a.f == 0 ? (LCd(), KCd.a) : new dCd(this.a); + }; + _.Mc = function KBd(a) { + var b; + b = this.a.f; + LAd(this.a, a); + return this.a.f != b; + }; + _.gc = function LBd() { + return this.a.f; + }; + var B4 = mdb(Tte, "BasicEMap/3", 1035); + bcb(1036, 28, die, MBd); + _.$b = function NBd() { + this.a.c.$b(); + }; + _.Hc = function OBd(a) { + return rAd(this.a, a); + }; + _.Kc = function PBd() { + return this.a.f == 0 ? (LCd(), KCd.a) : new fCd(this.a); + }; + _.gc = function QBd() { + return this.a.f; + }; + var C4 = mdb(Tte, "BasicEMap/4", 1036); + bcb(1037, eie, fie, SBd); + _.$b = function TBd() { + this.a.c.$b(); + }; + _.Hc = function UBd(a) { + var b, c, d, e, f, g, h, i, j; + if (this.a.f > 0 && JD(a, 42)) { + this.a.qj(); + i = BD(a, 42); + h = i.cd(); + e = h == null ? 0 : tb(h); + f = DAd(this.a, e); + b = this.a.d[f]; + if (b) { + c = BD(b.g, 367); + j = b.i; + for (g = 0; g < j; ++g) { + d = c[g]; + if (d.Sh() == e && d.Fb(i)) { + return true; + } + } + } + } + return false; + }; + _.Kc = function VBd() { + return this.a.f == 0 ? (LCd(), KCd.a) : new ZBd(this.a); + }; + _.Mc = function WBd(a) { + return RBd(this, a); + }; + _.gc = function XBd() { + return this.a.f; + }; + var D4 = mdb(Tte, "BasicEMap/5", 1037); + bcb(613, 1, aie, ZBd); + _.Nb = function $Bd(a) { + Rrb(this, a); + }; + _.Ob = function _Bd() { + return this.b != -1; + }; + _.Pb = function aCd() { + var a; + if (this.f.e != this.c) { + throw vbb(new Apb()); + } + if (this.b == -1) { + throw vbb(new utb()); + } + this.d = this.a; + this.e = this.b; + YBd(this); + a = BD(this.f.d[this.d].g[this.e], 133); + return this.vj(a); + }; + _.Qb = function bCd() { + if (this.f.e != this.c) { + throw vbb(new Apb()); + } + if (this.e == -1) { + throw vbb(new Ydb()); + } + this.f.c.Mc(qud(this.f.d[this.d], this.e)); + this.c = this.f.e; + this.e = -1; + this.a == this.d && this.b != -1 && --this.b; + }; + _.vj = function cCd(a) { + return a; + }; + _.a = 0; + _.b = -1; + _.c = 0; + _.d = 0; + _.e = 0; + var E4 = mdb(Tte, "BasicEMap/BasicEMapIterator", 613); + bcb(1031, 613, aie, dCd); + _.vj = function eCd(a) { + return a.cd(); + }; + var F4 = mdb(Tte, "BasicEMap/BasicEMapKeyIterator", 1031); + bcb(1032, 613, aie, fCd); + _.vj = function gCd(a) { + return a.dd(); + }; + var G4 = mdb(Tte, "BasicEMap/BasicEMapValueIterator", 1032); + bcb(1030, 1, cie, iCd); + _.wc = function oCd(a) { + stb(this, a); + }; + _.yc = function tCd(a, b, c) { + return ttb(this, a, b, c); + }; + _.$b = function jCd() { + this.a.c.$b(); + }; + _._b = function kCd(a) { + return hCd(this, a); + }; + _.uc = function lCd(a) { + return rAd(this.a, a); + }; + _.vc = function mCd() { + return yAd(this.a); + }; + _.Fb = function nCd(a) { + return zAd(this.a, a); + }; + _.xc = function pCd(a) { + return AAd(this.a, a); + }; + _.Hb = function qCd() { + return Etd(this.a.c); + }; + _.dc = function rCd() { + return this.a.f == 0; + }; + _.ec = function sCd() { + return EAd(this.a); + }; + _.zc = function uCd(a, b) { + return HAd(this.a, a, b); + }; + _.Bc = function vCd(a) { + return LAd(this.a, a); + }; + _.gc = function wCd() { + return this.a.f; + }; + _.Ib = function xCd() { + return Htd(this.a.c); + }; + _.Cc = function yCd() { + return NAd(this.a); + }; + var H4 = mdb(Tte, "BasicEMap/DelegatingMap", 1030); + bcb(612, 1, { 42: 1, 133: 1, 612: 1 }, zCd); + _.Fb = function ACd(a) { + var b; + if (JD(a, 42)) { + b = BD(a, 42); + return ( + (this.b != null ? pb(this.b, b.cd()) : PD(this.b) === PD(b.cd())) && + (this.c != null ? pb(this.c, b.dd()) : PD(this.c) === PD(b.dd())) + ); + } else { + return false; + } + }; + _.Sh = function BCd() { + return this.a; + }; + _.cd = function CCd() { + return this.b; + }; + _.dd = function DCd() { + return this.c; + }; + _.Hb = function ECd() { + return this.a ^ (this.c == null ? 0 : tb(this.c)); + }; + _.Th = function FCd(a) { + this.a = a; + }; + _.Uh = function GCd(a) { + throw vbb(new gz()); + }; + _.ed = function HCd(a) { + var b; + b = this.c; + this.c = a; + return b; + }; + _.Ib = function ICd() { + return this.b + "->" + this.c; + }; + _.a = 0; + var I4 = mdb(Tte, "BasicEMap/EntryImpl", 612); + bcb(536, 1, {}, JCd); + var K4 = mdb(Tte, "BasicEMap/View", 536); + var KCd; + bcb(768, 1, {}); + _.Fb = function ZCd(a) { + return At((mmb(), jmb), a); + }; + _.Hb = function $Cd() { + return qmb((mmb(), jmb)); + }; + _.Ib = function _Cd() { + return Fe((mmb(), jmb)); + }; + var Q4 = mdb(Tte, "ECollections/BasicEmptyUnmodifiableEList", 768); + bcb(1312, 1, jie, aDd); + _.Nb = function cDd(a) { + Rrb(this, a); + }; + _.Rb = function bDd(a) { + throw vbb(new bgb()); + }; + _.Ob = function dDd() { + return false; + }; + _.Sb = function eDd() { + return false; + }; + _.Pb = function fDd() { + throw vbb(new utb()); + }; + _.Tb = function gDd() { + return 0; + }; + _.Ub = function hDd() { + throw vbb(new utb()); + }; + _.Vb = function iDd() { + return -1; + }; + _.Qb = function jDd() { + throw vbb(new bgb()); + }; + _.Wb = function kDd(a) { + throw vbb(new bgb()); + }; + var P4 = mdb(Tte, "ECollections/BasicEmptyUnmodifiableEList/1", 1312); + bcb(1310, 768, { 20: 1, 14: 1, 15: 1, 58: 1 }, lDd); + _.Vc = function mDd(a, b) { + OCd(); + }; + _.Fc = function nDd(a) { + return PCd(); + }; + _.Wc = function oDd(a, b) { + return QCd(); + }; + _.Gc = function pDd(a) { + return RCd(); + }; + _.$b = function qDd() { + SCd(); + }; + _.Hc = function rDd(a) { + return false; + }; + _.Ic = function sDd(a) { + return false; + }; + _.Jc = function tDd(a) { + reb(this, a); + }; + _.Xb = function uDd(a) { + return wmb((mmb(), jmb, a)), null; + }; + _.Xc = function vDd(a) { + return -1; + }; + _.dc = function wDd() { + return true; + }; + _.Kc = function xDd() { + return this.a; + }; + _.Yc = function yDd() { + return this.a; + }; + _.Zc = function zDd(a) { + return this.a; + }; + _.ii = function ADd(a, b) { + return TCd(); + }; + _.ji = function BDd(a, b) { + UCd(); + }; + _.Lc = function CDd() { + return new YAb(null, new Kub(this, 16)); + }; + _.$c = function DDd(a) { + return VCd(); + }; + _.Mc = function EDd(a) { + return WCd(); + }; + _._c = function FDd(a, b) { + return XCd(); + }; + _.gc = function GDd() { + return 0; + }; + _.ad = function HDd(a) { + ktb(this, a); + }; + _.Nc = function IDd() { + return new Kub(this, 16); + }; + _.Oc = function JDd() { + return new YAb(null, new Kub(this, 16)); + }; + _.bd = function KDd(a, b) { + return mmb(), new Jib(jmb, a, b); + }; + _.Pc = function LDd() { + return De((mmb(), jmb)); + }; + _.Qc = function MDd(a) { + return mmb(), Ee(jmb, a); + }; + var R4 = mdb(Tte, "ECollections/EmptyUnmodifiableEList", 1310); + bcb(1311, 768, { 20: 1, 14: 1, 15: 1, 58: 1, 589: 1 }, NDd); + _.Vc = function ODd(a, b) { + OCd(); + }; + _.Fc = function PDd(a) { + return PCd(); + }; + _.Wc = function QDd(a, b) { + return QCd(); + }; + _.Gc = function RDd(a) { + return RCd(); + }; + _.$b = function SDd() { + SCd(); + }; + _.Hc = function TDd(a) { + return false; + }; + _.Ic = function UDd(a) { + return false; + }; + _.Jc = function VDd(a) { + reb(this, a); + }; + _.Xb = function WDd(a) { + return wmb((mmb(), jmb, a)), null; + }; + _.Xc = function XDd(a) { + return -1; + }; + _.dc = function YDd() { + return true; + }; + _.Kc = function ZDd() { + return this.a; + }; + _.Yc = function $Dd() { + return this.a; + }; + _.Zc = function _Dd(a) { + return this.a; + }; + _.ii = function bEd(a, b) { + return TCd(); + }; + _.ji = function cEd(a, b) { + UCd(); + }; + _.Lc = function dEd() { + return new YAb(null, new Kub(this, 16)); + }; + _.$c = function eEd(a) { + return VCd(); + }; + _.Mc = function fEd(a) { + return WCd(); + }; + _._c = function gEd(a, b) { + return XCd(); + }; + _.gc = function hEd() { + return 0; + }; + _.ad = function iEd(a) { + ktb(this, a); + }; + _.Nc = function jEd() { + return new Kub(this, 16); + }; + _.Oc = function kEd() { + return new YAb(null, new Kub(this, 16)); + }; + _.bd = function lEd(a, b) { + return mmb(), new Jib(jmb, a, b); + }; + _.Pc = function mEd() { + return De((mmb(), jmb)); + }; + _.Qc = function nEd(a) { + return mmb(), Ee(jmb, a); + }; + _.sj = function aEd() { + return mmb(), mmb(), kmb; + }; + var S4 = mdb(Tte, "ECollections/EmptyUnmodifiableEMap", 1311); + var U4 = odb(Tte, "Enumerator"); + var oEd; + bcb(281, 1, { 281: 1 }, NEd); + _.Fb = function REd(a) { + var b; + if (this === a) return true; + if (!JD(a, 281)) return false; + b = BD(a, 281); + return ( + this.f == b.f && + TEd(this.i, b.i) && + SEd( + this.a, + (this.f & 256) != 0 + ? (b.f & 256) != 0 + ? b.a + : null + : (b.f & 256) != 0 + ? null + : b.a + ) && + SEd(this.d, b.d) && + SEd(this.g, b.g) && + SEd(this.e, b.e) && + KEd(this, b) + ); + }; + _.Hb = function WEd() { + return this.f; + }; + _.Ib = function cFd() { + return LEd(this); + }; + _.f = 0; + var sEd = 0, + tEd = 0, + uEd = 0, + vEd = 0, + wEd = 0, + xEd = 0, + yEd = 0, + zEd = 0, + AEd = 0, + BEd, + CEd = 0, + DEd = 0, + EEd = 0, + FEd = 0, + GEd, + HEd; + var Z4 = mdb(Tte, "URI", 281); + bcb(1091, 43, fke, mFd); + _.zc = function nFd(a, b) { + return BD(Shb(this, GD(a), BD(b, 281)), 281); + }; + var Y4 = mdb(Tte, "URI/URICache", 1091); + bcb(497, 63, oue, oFd, pFd); + _.hi = function qFd() { + return true; + }; + var $4 = mdb(Tte, "UniqueEList", 497); + bcb(581, 60, Tie, rFd); + var _4 = mdb(Tte, "WrappedException", 581); + var a5 = odb(Vse, nve); + var v5 = odb(Vse, ove); + var t5 = odb(Vse, pve); + var b5 = odb(Vse, qve); + var d5 = odb(Vse, rve); + var c5 = odb(Vse, "EClass"); + var f5 = odb(Vse, "EDataType"); + var sFd; + bcb(1183, 43, fke, vFd); + _.xc = function wFd(a) { + return ND(a) ? Phb(this, a) : Wd(irb(this.f, a)); + }; + var e5 = mdb( + Vse, + "EDataType/Internal/ConversionDelegate/Factory/Registry/Impl", + 1183 + ); + var h5 = odb(Vse, "EEnum"); + var g5 = odb(Vse, sve); + var j5 = odb(Vse, tve); + var n5 = odb(Vse, uve); + var xFd; + var p5 = odb(Vse, vve); + var q5 = odb(Vse, wve); + bcb(1029, 1, {}, BFd); + _.Ib = function CFd() { + return "NIL"; + }; + var r5 = mdb(Vse, "EStructuralFeature/Internal/DynamicValueHolder/1", 1029); + var DFd; + bcb(1028, 43, fke, GFd); + _.xc = function HFd(a) { + return ND(a) ? Phb(this, a) : Wd(irb(this.f, a)); + }; + var s5 = mdb( + Vse, + "EStructuralFeature/Internal/SettingDelegate/Factory/Registry/Impl", + 1028 + ); + var u5 = odb(Vse, xve); + var w5 = odb(Vse, "EValidator/PatternMatcher"); + var IFd; + var KFd; + var MFd; + var OFd, + PFd, + QFd, + RFd, + SFd, + TFd, + UFd, + VFd, + WFd, + XFd, + YFd, + ZFd, + $Fd, + _Fd, + aGd, + bGd, + cGd, + dGd, + eGd, + fGd, + gGd, + hGd, + iGd; + var E9 = odb(yve, "FeatureMap/Entry"); + bcb(535, 1, { 72: 1 }, kGd); + _.ak = function lGd() { + return this.a; + }; + _.dd = function mGd() { + return this.b; + }; + var x5 = mdb(qte, "BasicEObjectImpl/1", 535); + bcb(1027, 1, zve, nGd); + _.Wj = function oGd(a) { + return hid(this.a, this.b, a); + }; + _.fj = function pGd() { + return nid(this.a, this.b); + }; + _.Wb = function qGd(a) { + zid(this.a, this.b, a); + }; + _.Xj = function rGd() { + Did(this.a, this.b); + }; + var y5 = mdb(qte, "BasicEObjectImpl/4", 1027); + bcb(1983, 1, { 108: 1 }); + _.bk = function uGd(a) { + this.e = a == 0 ? sGd : KC(SI, Uhe, 1, a, 5, 1); + }; + _.Ch = function vGd(a) { + return this.e[a]; + }; + _.Dh = function wGd(a, b) { + this.e[a] = b; + }; + _.Eh = function xGd(a) { + this.e[a] = null; + }; + _.ck = function yGd() { + return this.c; + }; + _.dk = function zGd() { + throw vbb(new bgb()); + }; + _.ek = function AGd() { + throw vbb(new bgb()); + }; + _.fk = function BGd() { + return this.d; + }; + _.gk = function CGd() { + return this.e != null; + }; + _.hk = function DGd(a) { + this.c = a; + }; + _.ik = function EGd(a) { + throw vbb(new bgb()); + }; + _.jk = function FGd(a) { + throw vbb(new bgb()); + }; + _.kk = function GGd(a) { + this.d = a; + }; + var sGd; + var z5 = mdb(qte, "BasicEObjectImpl/EPropertiesHolderBaseImpl", 1983); + bcb(185, 1983, { 108: 1 }, HGd); + _.dk = function IGd() { + return this.a; + }; + _.ek = function JGd() { + return this.b; + }; + _.ik = function KGd(a) { + this.a = a; + }; + _.jk = function LGd(a) { + this.b = a; + }; + var A5 = mdb(qte, "BasicEObjectImpl/EPropertiesHolderImpl", 185); + bcb(506, 97, pte, MGd); + _.Kg = function NGd() { + return this.f; + }; + _.Pg = function OGd() { + return this.k; + }; + _.Rg = function PGd(a, b) { + this.g = a; + this.i = b; + }; + _.Tg = function QGd() { + return (this.j & 2) == 0 ? this.zh() : this.ph().ck(); + }; + _.Vg = function RGd() { + return this.i; + }; + _.Mg = function SGd() { + return (this.j & 1) != 0; + }; + _.eh = function TGd() { + return this.g; + }; + _.kh = function UGd() { + return (this.j & 4) != 0; + }; + _.ph = function VGd() { + return !this.k && (this.k = new HGd()), this.k; + }; + _.th = function WGd(a) { + this.ph().hk(a); + a ? (this.j |= 2) : (this.j &= -3); + }; + _.vh = function XGd(a) { + this.ph().jk(a); + a ? (this.j |= 4) : (this.j &= -5); + }; + _.zh = function YGd() { + return (NFd(), MFd).S; + }; + _.i = 0; + _.j = 1; + var l6 = mdb(qte, "EObjectImpl", 506); + bcb(780, 506, { 105: 1, 92: 1, 90: 1, 56: 1, 108: 1, 49: 1, 97: 1 }, _Gd); + _.Ch = function aHd(a) { + return this.e[a]; + }; + _.Dh = function bHd(a, b) { + this.e[a] = b; + }; + _.Eh = function cHd(a) { + this.e[a] = null; + }; + _.Tg = function dHd() { + return this.d; + }; + _.Yg = function eHd(a) { + return bLd(this.d, a); + }; + _.$g = function fHd() { + return this.d; + }; + _.dh = function gHd() { + return this.e != null; + }; + _.ph = function hHd() { + !this.k && (this.k = new vHd()); + return this.k; + }; + _.th = function iHd(a) { + this.d = a; + }; + _.yh = function jHd() { + var a; + if (this.e == null) { + a = aLd(this.d); + this.e = a == 0 ? ZGd : KC(SI, Uhe, 1, a, 5, 1); + } + return this; + }; + _.Ah = function kHd() { + return 0; + }; + var ZGd; + var E5 = mdb(qte, "DynamicEObjectImpl", 780); + bcb( + 1376, + 780, + { 105: 1, 42: 1, 92: 1, 90: 1, 133: 1, 56: 1, 108: 1, 49: 1, 97: 1 }, + lHd + ); + _.Fb = function nHd(a) { + return this === a; + }; + _.Hb = function rHd() { + return FCb(this); + }; + _.th = function mHd(a) { + this.d = a; + this.b = YKd(a, "key"); + this.c = YKd(a, Bte); + }; + _.Sh = function oHd() { + var a; + if (this.a == -1) { + a = iid(this, this.b); + this.a = a == null ? 0 : tb(a); + } + return this.a; + }; + _.cd = function pHd() { + return iid(this, this.b); + }; + _.dd = function qHd() { + return iid(this, this.c); + }; + _.Th = function sHd(a) { + this.a = a; + }; + _.Uh = function tHd(a) { + zid(this, this.b, a); + }; + _.ed = function uHd(a) { + var b; + b = iid(this, this.c); + zid(this, this.c, a); + return b; + }; + _.a = 0; + var C5 = mdb(qte, "DynamicEObjectImpl/BasicEMapEntry", 1376); + bcb(1377, 1, { 108: 1 }, vHd); + _.bk = function wHd(a) { + throw vbb(new bgb()); + }; + _.Ch = function xHd(a) { + throw vbb(new bgb()); + }; + _.Dh = function yHd(a, b) { + throw vbb(new bgb()); + }; + _.Eh = function zHd(a) { + throw vbb(new bgb()); + }; + _.ck = function AHd() { + throw vbb(new bgb()); + }; + _.dk = function BHd() { + return this.a; + }; + _.ek = function CHd() { + return this.b; + }; + _.fk = function DHd() { + return this.c; + }; + _.gk = function EHd() { + throw vbb(new bgb()); + }; + _.hk = function FHd(a) { + throw vbb(new bgb()); + }; + _.ik = function GHd(a) { + this.a = a; + }; + _.jk = function HHd(a) { + this.b = a; + }; + _.kk = function IHd(a) { + this.c = a; + }; + var D5 = mdb(qte, "DynamicEObjectImpl/DynamicEPropertiesHolderImpl", 1377); + bcb( + 510, + 150, + { + 105: 1, + 92: 1, + 90: 1, + 590: 1, + 147: 1, + 56: 1, + 108: 1, + 49: 1, + 97: 1, + 510: 1, + 150: 1, + 114: 1, + 115: 1, + }, + RHd + ); + _.Qg = function SHd(a) { + return KHd(this, a); + }; + _._g = function THd(a, b, c) { + var d; + switch (a) { + case 0: + return !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)), this.Ab; + case 1: + return this.d; + case 2: + return c + ? (!this.b && (this.b = new sId((jGd(), fGd), x6, this)), this.b) + : (!this.b && (this.b = new sId((jGd(), fGd), x6, this)), + FAd(this.b)); + case 3: + return MHd(this); + case 4: + return !this.a && (this.a = new xMd(m5, this, 4)), this.a; + case 5: + return !this.c && (this.c = new _4d(m5, this, 5)), this.c; + } + return bid( + this, + a - aLd((jGd(), OFd)), + XKd(((d = BD(Ajd(this, 16), 26)), !d ? OFd : d), a), + b, + c + ); + }; + _.hh = function UHd(a, b, c) { + var d, e, f; + switch (b) { + case 0: + return ( + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)), Sxd(this.Ab, a, c) + ); + case 3: + !!this.Cb && + (c = + ((e = this.Db >> 16), + e >= 0 ? KHd(this, c) : this.Cb.ih(this, -1 - e, null, c))); + return JHd(this, BD(a, 147), c); + } + return ( + (f = BD( + XKd(((d = BD(Ajd(this, 16), 26)), !d ? (jGd(), OFd) : d), b), + 66 + )), + f.Nj().Qj(this, yjd(this), b - aLd((jGd(), OFd)), a, c) + ); + }; + _.jh = function VHd(a, b, c) { + var d, e; + switch (b) { + case 0: + return ( + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)), Txd(this.Ab, a, c) + ); + case 2: + return ( + !this.b && (this.b = new sId((jGd(), fGd), x6, this)), + bId(this.b, a, c) + ); + case 3: + return JHd(this, null, c); + case 4: + return !this.a && (this.a = new xMd(m5, this, 4)), Txd(this.a, a, c); + } + return ( + (e = BD( + XKd(((d = BD(Ajd(this, 16), 26)), !d ? (jGd(), OFd) : d), b), + 66 + )), + e.Nj().Rj(this, yjd(this), b - aLd((jGd(), OFd)), a, c) + ); + }; + _.lh = function WHd(a) { + var b; + switch (a) { + case 0: + return !!this.Ab && this.Ab.i != 0; + case 1: + return this.d != null; + case 2: + return !!this.b && this.b.f != 0; + case 3: + return !!MHd(this); + case 4: + return !!this.a && this.a.i != 0; + case 5: + return !!this.c && this.c.i != 0; + } + return cid( + this, + a - aLd((jGd(), OFd)), + XKd(((b = BD(Ajd(this, 16), 26)), !b ? OFd : b), a) + ); + }; + _.sh = function XHd(a, b) { + var c; + switch (a) { + case 0: + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + Uxd(this.Ab); + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + ytd(this.Ab, BD(b, 14)); + return; + case 1: + OHd(this, GD(b)); + return; + case 2: + !this.b && (this.b = new sId((jGd(), fGd), x6, this)); + cId(this.b, b); + return; + case 3: + NHd(this, BD(b, 147)); + return; + case 4: + !this.a && (this.a = new xMd(m5, this, 4)); + Uxd(this.a); + !this.a && (this.a = new xMd(m5, this, 4)); + ytd(this.a, BD(b, 14)); + return; + case 5: + !this.c && (this.c = new _4d(m5, this, 5)); + Uxd(this.c); + !this.c && (this.c = new _4d(m5, this, 5)); + ytd(this.c, BD(b, 14)); + return; + } + did( + this, + a - aLd((jGd(), OFd)), + XKd(((c = BD(Ajd(this, 16), 26)), !c ? OFd : c), a), + b + ); + }; + _.zh = function YHd() { + return jGd(), OFd; + }; + _.Bh = function ZHd(a) { + var b; + switch (a) { + case 0: + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + Uxd(this.Ab); + return; + case 1: + PHd(this, null); + return; + case 2: + !this.b && (this.b = new sId((jGd(), fGd), x6, this)); + this.b.c.$b(); + return; + case 3: + NHd(this, null); + return; + case 4: + !this.a && (this.a = new xMd(m5, this, 4)); + Uxd(this.a); + return; + case 5: + !this.c && (this.c = new _4d(m5, this, 5)); + Uxd(this.c); + return; + } + eid( + this, + a - aLd((jGd(), OFd)), + XKd(((b = BD(Ajd(this, 16), 26)), !b ? OFd : b), a) + ); + }; + _.Ib = function $Hd() { + return QHd(this); + }; + _.d = null; + var G5 = mdb(qte, "EAnnotationImpl", 510); + bcb(151, 705, Ave, dId); + _.Xh = function eId(a, b) { + _Hd(this, a, BD(b, 42)); + }; + _.lk = function fId(a, b) { + return aId(this, BD(a, 42), b); + }; + _.pi = function gId(a) { + return BD(BD(this.c, 69).pi(a), 133); + }; + _.Zh = function hId() { + return BD(this.c, 69).Zh(); + }; + _.$h = function iId() { + return BD(this.c, 69).$h(); + }; + _._h = function jId(a) { + return BD(this.c, 69)._h(a); + }; + _.mk = function kId(a, b) { + return bId(this, a, b); + }; + _.Wj = function lId(a) { + return BD(this.c, 76).Wj(a); + }; + _.rj = function mId() {}; + _.fj = function nId() { + return BD(this.c, 76).fj(); + }; + _.tj = function oId(a, b, c) { + var d; + d = BD(bKd(this.b).Nh().Jh(this.b), 133); + d.Th(a); + d.Uh(b); + d.ed(c); + return d; + }; + _.uj = function pId() { + return new W5d(this); + }; + _.Wb = function qId(a) { + cId(this, a); + }; + _.Xj = function rId() { + BD(this.c, 76).Xj(); + }; + var y9 = mdb(yve, "EcoreEMap", 151); + bcb(158, 151, Ave, sId); + _.qj = function tId() { + var a, b, c, d, e, f; + if (this.d == null) { + f = KC(y4, jve, 63, 2 * this.f + 1, 0, 1); + for (c = this.c.Kc(); c.e != c.i.gc(); ) { + b = BD(c.nj(), 133); + d = b.Sh(); + e = (d & Ohe) % f.length; + a = f[e]; + !a && (a = f[e] = new W5d(this)); + a.Fc(b); + } + this.d = f; + } + }; + var F5 = mdb(qte, "EAnnotationImpl/1", 158); + bcb(284, 438, { + 105: 1, + 92: 1, + 90: 1, + 147: 1, + 191: 1, + 56: 1, + 108: 1, + 472: 1, + 49: 1, + 97: 1, + 150: 1, + 284: 1, + 114: 1, + 115: 1, + }); + _._g = function GId(a, b, c) { + var d, e; + switch (a) { + case 0: + return !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)), this.Ab; + case 1: + return this.zb; + case 2: + return Bcb(), (this.Bb & 256) != 0 ? true : false; + case 3: + return Bcb(), (this.Bb & 512) != 0 ? true : false; + case 4: + return meb(this.s); + case 5: + return meb(this.t); + case 6: + return Bcb(), this.$j() ? true : false; + case 7: + return Bcb(), (e = this.s), e >= 1 ? true : false; + case 8: + if (b) return wId(this); + return this.r; + case 9: + return this.q; + } + return bid( + this, + a - aLd(this.zh()), + XKd(((d = BD(Ajd(this, 16), 26)), !d ? this.zh() : d), a), + b, + c + ); + }; + _.jh = function HId(a, b, c) { + var d, e; + switch (b) { + case 0: + return ( + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)), Txd(this.Ab, a, c) + ); + case 9: + return vId(this, c); + } + return ( + (e = BD(XKd(((d = BD(Ajd(this, 16), 26)), !d ? this.zh() : d), b), 66)), + e.Nj().Rj(this, yjd(this), b - aLd(this.zh()), a, c) + ); + }; + _.lh = function IId(a) { + var b, c; + switch (a) { + case 0: + return !!this.Ab && this.Ab.i != 0; + case 1: + return this.zb != null; + case 2: + return (this.Bb & 256) == 0; + case 3: + return (this.Bb & 512) == 0; + case 4: + return this.s != 0; + case 5: + return this.t != 1; + case 6: + return this.$j(); + case 7: + return (c = this.s), c >= 1; + case 8: + return !!this.r && !this.q.e && LQd(this.q).i == 0; + case 9: + return !!this.q && !(!!this.r && !this.q.e && LQd(this.q).i == 0); + } + return cid( + this, + a - aLd(this.zh()), + XKd(((b = BD(Ajd(this, 16), 26)), !b ? this.zh() : b), a) + ); + }; + _.sh = function JId(a, b) { + var c, d; + switch (a) { + case 0: + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + Uxd(this.Ab); + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + ytd(this.Ab, BD(b, 14)); + return; + case 1: + this.Lh(GD(b)); + return; + case 2: + BId(this, Ccb(DD(b))); + return; + case 3: + CId(this, Ccb(DD(b))); + return; + case 4: + AId(this, BD(b, 19).a); + return; + case 5: + this.ok(BD(b, 19).a); + return; + case 8: + yId(this, BD(b, 138)); + return; + case 9: + d = xId(this, BD(b, 87), null); + !!d && d.Fi(); + return; + } + did( + this, + a - aLd(this.zh()), + XKd(((c = BD(Ajd(this, 16), 26)), !c ? this.zh() : c), a), + b + ); + }; + _.zh = function KId() { + return jGd(), hGd; + }; + _.Bh = function LId(a) { + var b, c; + switch (a) { + case 0: + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + Uxd(this.Ab); + return; + case 1: + this.Lh(null); + return; + case 2: + BId(this, true); + return; + case 3: + CId(this, true); + return; + case 4: + AId(this, 0); + return; + case 5: + this.ok(1); + return; + case 8: + yId(this, null); + return; + case 9: + c = xId(this, null, null); + !!c && c.Fi(); + return; + } + eid( + this, + a - aLd(this.zh()), + XKd(((b = BD(Ajd(this, 16), 26)), !b ? this.zh() : b), a) + ); + }; + _.Gh = function MId() { + wId(this); + this.Bb |= 1; + }; + _.Yj = function NId() { + return wId(this); + }; + _.Zj = function OId() { + return this.t; + }; + _.$j = function PId() { + var a; + return (a = this.t), a > 1 || a == -1; + }; + _.hi = function QId() { + return (this.Bb & 512) != 0; + }; + _.nk = function RId(a, b) { + return zId(this, a, b); + }; + _.ok = function SId(a) { + DId(this, a); + }; + _.Ib = function TId() { + return EId(this); + }; + _.s = 0; + _.t = 1; + var v7 = mdb(qte, "ETypedElementImpl", 284); + bcb(449, 284, { + 105: 1, + 92: 1, + 90: 1, + 147: 1, + 191: 1, + 56: 1, + 170: 1, + 66: 1, + 108: 1, + 472: 1, + 49: 1, + 97: 1, + 150: 1, + 449: 1, + 284: 1, + 114: 1, + 115: 1, + 677: 1, + }); + _.Qg = function iJd(a) { + return UId(this, a); + }; + _._g = function jJd(a, b, c) { + var d, e; + switch (a) { + case 0: + return !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)), this.Ab; + case 1: + return this.zb; + case 2: + return Bcb(), (this.Bb & 256) != 0 ? true : false; + case 3: + return Bcb(), (this.Bb & 512) != 0 ? true : false; + case 4: + return meb(this.s); + case 5: + return meb(this.t); + case 6: + return Bcb(), this.$j() ? true : false; + case 7: + return Bcb(), (e = this.s), e >= 1 ? true : false; + case 8: + if (b) return wId(this); + return this.r; + case 9: + return this.q; + case 10: + return Bcb(), (this.Bb & zte) != 0 ? true : false; + case 11: + return Bcb(), (this.Bb & Dve) != 0 ? true : false; + case 12: + return Bcb(), (this.Bb & Rje) != 0 ? true : false; + case 13: + return this.j; + case 14: + return VId(this); + case 15: + return Bcb(), (this.Bb & Cve) != 0 ? true : false; + case 16: + return Bcb(), (this.Bb & oie) != 0 ? true : false; + case 17: + return WId(this); + } + return bid( + this, + a - aLd(this.zh()), + XKd(((d = BD(Ajd(this, 16), 26)), !d ? this.zh() : d), a), + b, + c + ); + }; + _.hh = function kJd(a, b, c) { + var d, e, f; + switch (b) { + case 0: + return ( + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)), Sxd(this.Ab, a, c) + ); + case 17: + !!this.Cb && + (c = + ((e = this.Db >> 16), + e >= 0 ? UId(this, c) : this.Cb.ih(this, -1 - e, null, c))); + return _hd(this, a, 17, c); + } + return ( + (f = BD(XKd(((d = BD(Ajd(this, 16), 26)), !d ? this.zh() : d), b), 66)), + f.Nj().Qj(this, yjd(this), b - aLd(this.zh()), a, c) + ); + }; + _.jh = function lJd(a, b, c) { + var d, e; + switch (b) { + case 0: + return ( + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)), Txd(this.Ab, a, c) + ); + case 9: + return vId(this, c); + case 17: + return _hd(this, null, 17, c); + } + return ( + (e = BD(XKd(((d = BD(Ajd(this, 16), 26)), !d ? this.zh() : d), b), 66)), + e.Nj().Rj(this, yjd(this), b - aLd(this.zh()), a, c) + ); + }; + _.lh = function mJd(a) { + var b, c; + switch (a) { + case 0: + return !!this.Ab && this.Ab.i != 0; + case 1: + return this.zb != null; + case 2: + return (this.Bb & 256) == 0; + case 3: + return (this.Bb & 512) == 0; + case 4: + return this.s != 0; + case 5: + return this.t != 1; + case 6: + return this.$j(); + case 7: + return (c = this.s), c >= 1; + case 8: + return !!this.r && !this.q.e && LQd(this.q).i == 0; + case 9: + return !!this.q && !(!!this.r && !this.q.e && LQd(this.q).i == 0); + case 10: + return (this.Bb & zte) == 0; + case 11: + return (this.Bb & Dve) != 0; + case 12: + return (this.Bb & Rje) != 0; + case 13: + return this.j != null; + case 14: + return VId(this) != null; + case 15: + return (this.Bb & Cve) != 0; + case 16: + return (this.Bb & oie) != 0; + case 17: + return !!WId(this); + } + return cid( + this, + a - aLd(this.zh()), + XKd(((b = BD(Ajd(this, 16), 26)), !b ? this.zh() : b), a) + ); + }; + _.sh = function nJd(a, b) { + var c, d; + switch (a) { + case 0: + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + Uxd(this.Ab); + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + ytd(this.Ab, BD(b, 14)); + return; + case 1: + cJd(this, GD(b)); + return; + case 2: + BId(this, Ccb(DD(b))); + return; + case 3: + CId(this, Ccb(DD(b))); + return; + case 4: + AId(this, BD(b, 19).a); + return; + case 5: + this.ok(BD(b, 19).a); + return; + case 8: + yId(this, BD(b, 138)); + return; + case 9: + d = xId(this, BD(b, 87), null); + !!d && d.Fi(); + return; + case 10: + ZId(this, Ccb(DD(b))); + return; + case 11: + fJd(this, Ccb(DD(b))); + return; + case 12: + dJd(this, Ccb(DD(b))); + return; + case 13: + $Id(this, GD(b)); + return; + case 15: + eJd(this, Ccb(DD(b))); + return; + case 16: + aJd(this, Ccb(DD(b))); + return; + } + did( + this, + a - aLd(this.zh()), + XKd(((c = BD(Ajd(this, 16), 26)), !c ? this.zh() : c), a), + b + ); + }; + _.zh = function oJd() { + return jGd(), gGd; + }; + _.Bh = function pJd(a) { + var b, c; + switch (a) { + case 0: + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + Uxd(this.Ab); + return; + case 1: + JD(this.Cb, 88) && XMd($Kd(BD(this.Cb, 88)), 4); + pnd(this, null); + return; + case 2: + BId(this, true); + return; + case 3: + CId(this, true); + return; + case 4: + AId(this, 0); + return; + case 5: + this.ok(1); + return; + case 8: + yId(this, null); + return; + case 9: + c = xId(this, null, null); + !!c && c.Fi(); + return; + case 10: + ZId(this, true); + return; + case 11: + fJd(this, false); + return; + case 12: + dJd(this, false); + return; + case 13: + this.i = null; + _Id(this, null); + return; + case 15: + eJd(this, false); + return; + case 16: + aJd(this, false); + return; + } + eid( + this, + a - aLd(this.zh()), + XKd(((b = BD(Ajd(this, 16), 26)), !b ? this.zh() : b), a) + ); + }; + _.Gh = function qJd() { + a2d(q1d((O6d(), M6d), this)); + wId(this); + this.Bb |= 1; + }; + _.Gj = function rJd() { + return this.f; + }; + _.zj = function sJd() { + return VId(this); + }; + _.Hj = function tJd() { + return WId(this); + }; + _.Lj = function uJd() { + return null; + }; + _.pk = function vJd() { + return this.k; + }; + _.aj = function wJd() { + return this.n; + }; + _.Mj = function xJd() { + return XId(this); + }; + _.Nj = function yJd() { + var a, b, c, d, e, f, g, h, i; + if (!this.p) { + c = WId(this); + (c.i == null && TKd(c), c.i).length; + d = this.Lj(); + !!d && aLd(WId(d)); + e = wId(this); + g = e.Bj(); + a = !g + ? null + : (g.i & 1) != 0 + ? g == sbb + ? wI + : g == WD + ? JI + : g == VD + ? FI + : g == UD + ? BI + : g == XD + ? MI + : g == rbb + ? UI + : g == SD + ? xI + : yI + : g; + b = VId(this); + h = e.zj(); + n6d(this); + (this.Bb & oie) != 0 && + ((!!(f = t1d((O6d(), M6d), c)) && f != this) || + !!(f = _1d(q1d(M6d, this)))) + ? (this.p = new zVd(this, f)) + : this.$j() + ? this.rk() + ? !d + ? (this.Bb & Cve) != 0 + ? !a + ? this.sk() + ? (this.p = new KVd(42, this)) + : (this.p = new KVd(0, this)) + : a == CK + ? (this.p = new IVd(50, J4, this)) + : this.sk() + ? (this.p = new IVd(43, a, this)) + : (this.p = new IVd(1, a, this)) + : !a + ? this.sk() + ? (this.p = new KVd(44, this)) + : (this.p = new KVd(2, this)) + : a == CK + ? (this.p = new IVd(41, J4, this)) + : this.sk() + ? (this.p = new IVd(45, a, this)) + : (this.p = new IVd(3, a, this)) + : (this.Bb & Cve) != 0 + ? !a + ? this.sk() + ? (this.p = new LVd(46, this, d)) + : (this.p = new LVd(4, this, d)) + : this.sk() + ? (this.p = new JVd(47, a, this, d)) + : (this.p = new JVd(5, a, this, d)) + : !a + ? this.sk() + ? (this.p = new LVd(48, this, d)) + : (this.p = new LVd(6, this, d)) + : this.sk() + ? (this.p = new JVd(49, a, this, d)) + : (this.p = new JVd(7, a, this, d)) + : JD(e, 148) + ? a == E9 + ? (this.p = new KVd(40, this)) + : (this.Bb & 512) != 0 + ? (this.Bb & Cve) != 0 + ? !a + ? (this.p = new KVd(8, this)) + : (this.p = new IVd(9, a, this)) + : !a + ? (this.p = new KVd(10, this)) + : (this.p = new IVd(11, a, this)) + : (this.Bb & Cve) != 0 + ? !a + ? (this.p = new KVd(12, this)) + : (this.p = new IVd(13, a, this)) + : !a + ? (this.p = new KVd(14, this)) + : (this.p = new IVd(15, a, this)) + : !d + ? this.sk() + ? (this.Bb & Cve) != 0 + ? !a + ? (this.p = new KVd(16, this)) + : (this.p = new IVd(17, a, this)) + : !a + ? (this.p = new KVd(18, this)) + : (this.p = new IVd(19, a, this)) + : (this.Bb & Cve) != 0 + ? !a + ? (this.p = new KVd(20, this)) + : (this.p = new IVd(21, a, this)) + : !a + ? (this.p = new KVd(22, this)) + : (this.p = new IVd(23, a, this)) + : ((i = d.t), + i > 1 || i == -1 + ? this.sk() + ? (this.Bb & Cve) != 0 + ? !a + ? (this.p = new LVd(24, this, d)) + : (this.p = new JVd(25, a, this, d)) + : !a + ? (this.p = new LVd(26, this, d)) + : (this.p = new JVd(27, a, this, d)) + : (this.Bb & Cve) != 0 + ? !a + ? (this.p = new LVd(28, this, d)) + : (this.p = new JVd(29, a, this, d)) + : !a + ? (this.p = new LVd(30, this, d)) + : (this.p = new JVd(31, a, this, d)) + : this.sk() + ? (this.Bb & Cve) != 0 + ? !a + ? (this.p = new LVd(32, this, d)) + : (this.p = new JVd(33, a, this, d)) + : !a + ? (this.p = new LVd(34, this, d)) + : (this.p = new JVd(35, a, this, d)) + : (this.Bb & Cve) != 0 + ? !a + ? (this.p = new LVd(36, this, d)) + : (this.p = new JVd(37, a, this, d)) + : !a + ? (this.p = new LVd(38, this, d)) + : (this.p = new JVd(39, a, this, d))) + : this.qk() + ? this.sk() + ? (this.p = new kWd(BD(e, 26), this, d)) + : (this.p = new cWd(BD(e, 26), this, d)) + : JD(e, 148) + ? a == E9 + ? (this.p = new KVd(40, this)) + : (this.Bb & Cve) != 0 + ? !a + ? (this.p = new jXd(BD(e, 148), b, h, this)) + : (this.p = new lXd( + b, + h, + this, + (CWd(), + g == WD + ? yWd + : g == sbb + ? tWd + : g == XD + ? zWd + : g == VD + ? xWd + : g == UD + ? wWd + : g == rbb + ? BWd + : g == SD + ? uWd + : g == TD + ? vWd + : AWd) + )) + : !a + ? (this.p = new cXd(BD(e, 148), b, h, this)) + : (this.p = new eXd( + b, + h, + this, + (CWd(), + g == WD + ? yWd + : g == sbb + ? tWd + : g == XD + ? zWd + : g == VD + ? xWd + : g == UD + ? wWd + : g == rbb + ? BWd + : g == SD + ? uWd + : g == TD + ? vWd + : AWd) + )) + : this.rk() + ? !d + ? (this.Bb & Cve) != 0 + ? this.sk() + ? (this.p = new FXd(BD(e, 26), this)) + : (this.p = new DXd(BD(e, 26), this)) + : this.sk() + ? (this.p = new BXd(BD(e, 26), this)) + : (this.p = new zXd(BD(e, 26), this)) + : (this.Bb & Cve) != 0 + ? this.sk() + ? (this.p = new NXd(BD(e, 26), this, d)) + : (this.p = new LXd(BD(e, 26), this, d)) + : this.sk() + ? (this.p = new JXd(BD(e, 26), this, d)) + : (this.p = new HXd(BD(e, 26), this, d)) + : this.sk() + ? !d + ? (this.Bb & Cve) != 0 + ? (this.p = new RXd(BD(e, 26), this)) + : (this.p = new PXd(BD(e, 26), this)) + : (this.Bb & Cve) != 0 + ? (this.p = new VXd(BD(e, 26), this, d)) + : (this.p = new TXd(BD(e, 26), this, d)) + : !d + ? (this.Bb & Cve) != 0 + ? (this.p = new XXd(BD(e, 26), this)) + : (this.p = new nXd(BD(e, 26), this)) + : (this.Bb & Cve) != 0 + ? (this.p = new _Xd(BD(e, 26), this, d)) + : (this.p = new ZXd(BD(e, 26), this, d)); + } + return this.p; + }; + _.Ij = function zJd() { + return (this.Bb & zte) != 0; + }; + _.qk = function AJd() { + return false; + }; + _.rk = function BJd() { + return false; + }; + _.Jj = function CJd() { + return (this.Bb & oie) != 0; + }; + _.Oj = function DJd() { + return YId(this); + }; + _.sk = function EJd() { + return false; + }; + _.Kj = function FJd() { + return (this.Bb & Cve) != 0; + }; + _.tk = function GJd(a) { + this.k = a; + }; + _.Lh = function HJd(a) { + cJd(this, a); + }; + _.Ib = function IJd() { + return gJd(this); + }; + _.e = false; + _.n = 0; + var n7 = mdb(qte, "EStructuralFeatureImpl", 449); + bcb( + 322, + 449, + { + 105: 1, + 92: 1, + 90: 1, + 34: 1, + 147: 1, + 191: 1, + 56: 1, + 170: 1, + 66: 1, + 108: 1, + 472: 1, + 49: 1, + 97: 1, + 322: 1, + 150: 1, + 449: 1, + 284: 1, + 114: 1, + 115: 1, + 677: 1, + }, + OJd + ); + _._g = function PJd(a, b, c) { + var d, e; + switch (a) { + case 0: + return !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)), this.Ab; + case 1: + return this.zb; + case 2: + return Bcb(), (this.Bb & 256) != 0 ? true : false; + case 3: + return Bcb(), (this.Bb & 512) != 0 ? true : false; + case 4: + return meb(this.s); + case 5: + return meb(this.t); + case 6: + return Bcb(), LJd(this) ? true : false; + case 7: + return Bcb(), (e = this.s), e >= 1 ? true : false; + case 8: + if (b) return wId(this); + return this.r; + case 9: + return this.q; + case 10: + return Bcb(), (this.Bb & zte) != 0 ? true : false; + case 11: + return Bcb(), (this.Bb & Dve) != 0 ? true : false; + case 12: + return Bcb(), (this.Bb & Rje) != 0 ? true : false; + case 13: + return this.j; + case 14: + return VId(this); + case 15: + return Bcb(), (this.Bb & Cve) != 0 ? true : false; + case 16: + return Bcb(), (this.Bb & oie) != 0 ? true : false; + case 17: + return WId(this); + case 18: + return Bcb(), (this.Bb & ote) != 0 ? true : false; + case 19: + if (b) return KJd(this); + return JJd(this); + } + return bid( + this, + a - aLd((jGd(), PFd)), + XKd(((d = BD(Ajd(this, 16), 26)), !d ? PFd : d), a), + b, + c + ); + }; + _.lh = function QJd(a) { + var b, c; + switch (a) { + case 0: + return !!this.Ab && this.Ab.i != 0; + case 1: + return this.zb != null; + case 2: + return (this.Bb & 256) == 0; + case 3: + return (this.Bb & 512) == 0; + case 4: + return this.s != 0; + case 5: + return this.t != 1; + case 6: + return LJd(this); + case 7: + return (c = this.s), c >= 1; + case 8: + return !!this.r && !this.q.e && LQd(this.q).i == 0; + case 9: + return !!this.q && !(!!this.r && !this.q.e && LQd(this.q).i == 0); + case 10: + return (this.Bb & zte) == 0; + case 11: + return (this.Bb & Dve) != 0; + case 12: + return (this.Bb & Rje) != 0; + case 13: + return this.j != null; + case 14: + return VId(this) != null; + case 15: + return (this.Bb & Cve) != 0; + case 16: + return (this.Bb & oie) != 0; + case 17: + return !!WId(this); + case 18: + return (this.Bb & ote) != 0; + case 19: + return !!JJd(this); + } + return cid( + this, + a - aLd((jGd(), PFd)), + XKd(((b = BD(Ajd(this, 16), 26)), !b ? PFd : b), a) + ); + }; + _.sh = function RJd(a, b) { + var c, d; + switch (a) { + case 0: + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + Uxd(this.Ab); + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + ytd(this.Ab, BD(b, 14)); + return; + case 1: + cJd(this, GD(b)); + return; + case 2: + BId(this, Ccb(DD(b))); + return; + case 3: + CId(this, Ccb(DD(b))); + return; + case 4: + AId(this, BD(b, 19).a); + return; + case 5: + NJd(this, BD(b, 19).a); + return; + case 8: + yId(this, BD(b, 138)); + return; + case 9: + d = xId(this, BD(b, 87), null); + !!d && d.Fi(); + return; + case 10: + ZId(this, Ccb(DD(b))); + return; + case 11: + fJd(this, Ccb(DD(b))); + return; + case 12: + dJd(this, Ccb(DD(b))); + return; + case 13: + $Id(this, GD(b)); + return; + case 15: + eJd(this, Ccb(DD(b))); + return; + case 16: + aJd(this, Ccb(DD(b))); + return; + case 18: + MJd(this, Ccb(DD(b))); + return; + } + did( + this, + a - aLd((jGd(), PFd)), + XKd(((c = BD(Ajd(this, 16), 26)), !c ? PFd : c), a), + b + ); + }; + _.zh = function SJd() { + return jGd(), PFd; + }; + _.Bh = function TJd(a) { + var b, c; + switch (a) { + case 0: + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + Uxd(this.Ab); + return; + case 1: + JD(this.Cb, 88) && XMd($Kd(BD(this.Cb, 88)), 4); + pnd(this, null); + return; + case 2: + BId(this, true); + return; + case 3: + CId(this, true); + return; + case 4: + AId(this, 0); + return; + case 5: + this.b = 0; + DId(this, 1); + return; + case 8: + yId(this, null); + return; + case 9: + c = xId(this, null, null); + !!c && c.Fi(); + return; + case 10: + ZId(this, true); + return; + case 11: + fJd(this, false); + return; + case 12: + dJd(this, false); + return; + case 13: + this.i = null; + _Id(this, null); + return; + case 15: + eJd(this, false); + return; + case 16: + aJd(this, false); + return; + case 18: + MJd(this, false); + return; + } + eid( + this, + a - aLd((jGd(), PFd)), + XKd(((b = BD(Ajd(this, 16), 26)), !b ? PFd : b), a) + ); + }; + _.Gh = function UJd() { + KJd(this); + a2d(q1d((O6d(), M6d), this)); + wId(this); + this.Bb |= 1; + }; + _.$j = function VJd() { + return LJd(this); + }; + _.nk = function WJd(a, b) { + this.b = 0; + this.a = null; + return zId(this, a, b); + }; + _.ok = function XJd(a) { + NJd(this, a); + }; + _.Ib = function YJd() { + var a; + if ((this.Db & 64) != 0) return gJd(this); + a = new Jfb(gJd(this)); + a.a += " (iD: "; + Ffb(a, (this.Bb & ote) != 0); + a.a += ")"; + return a.a; + }; + _.b = 0; + var H5 = mdb(qte, "EAttributeImpl", 322); + bcb(351, 438, { + 105: 1, + 92: 1, + 90: 1, + 138: 1, + 147: 1, + 191: 1, + 56: 1, + 108: 1, + 49: 1, + 97: 1, + 351: 1, + 150: 1, + 114: 1, + 115: 1, + 676: 1, + }); + _.uk = function nKd(a) { + return a.Tg() == this; + }; + _.Qg = function oKd(a) { + return aKd(this, a); + }; + _.Rg = function pKd(a, b) { + this.w = null; + this.Db = (b << 16) | (this.Db & 255); + this.Cb = a; + }; + _._g = function qKd(a, b, c) { + var d; + switch (a) { + case 0: + return !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)), this.Ab; + case 1: + return this.zb; + case 2: + return this.D != null ? this.D : this.B; + case 3: + return dKd(this); + case 4: + return this.zj(); + case 5: + return this.F; + case 6: + if (b) return bKd(this); + return ZJd(this); + case 7: + return !this.A && (this.A = new K4d(u5, this, 7)), this.A; + } + return bid( + this, + a - aLd(this.zh()), + XKd(((d = BD(Ajd(this, 16), 26)), !d ? this.zh() : d), a), + b, + c + ); + }; + _.hh = function rKd(a, b, c) { + var d, e, f; + switch (b) { + case 0: + return ( + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)), Sxd(this.Ab, a, c) + ); + case 6: + !!this.Cb && + (c = + ((e = this.Db >> 16), + e >= 0 ? aKd(this, c) : this.Cb.ih(this, -1 - e, null, c))); + return _hd(this, a, 6, c); + } + return ( + (f = BD(XKd(((d = BD(Ajd(this, 16), 26)), !d ? this.zh() : d), b), 66)), + f.Nj().Qj(this, yjd(this), b - aLd(this.zh()), a, c) + ); + }; + _.jh = function sKd(a, b, c) { + var d, e; + switch (b) { + case 0: + return ( + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)), Txd(this.Ab, a, c) + ); + case 6: + return _hd(this, null, 6, c); + case 7: + return !this.A && (this.A = new K4d(u5, this, 7)), Txd(this.A, a, c); + } + return ( + (e = BD(XKd(((d = BD(Ajd(this, 16), 26)), !d ? this.zh() : d), b), 66)), + e.Nj().Rj(this, yjd(this), b - aLd(this.zh()), a, c) + ); + }; + _.lh = function tKd(a) { + var b; + switch (a) { + case 0: + return !!this.Ab && this.Ab.i != 0; + case 1: + return this.zb != null; + case 2: + return this.D != null && this.D == this.F; + case 3: + return !!dKd(this); + case 4: + return this.zj() != null; + case 5: + return this.F != null && this.F != this.D && this.F != this.B; + case 6: + return !!ZJd(this); + case 7: + return !!this.A && this.A.i != 0; + } + return cid( + this, + a - aLd(this.zh()), + XKd(((b = BD(Ajd(this, 16), 26)), !b ? this.zh() : b), a) + ); + }; + _.sh = function uKd(a, b) { + var c; + switch (a) { + case 0: + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + Uxd(this.Ab); + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + ytd(this.Ab, BD(b, 14)); + return; + case 1: + lKd(this, GD(b)); + return; + case 2: + iKd(this, GD(b)); + return; + case 5: + kKd(this, GD(b)); + return; + case 7: + !this.A && (this.A = new K4d(u5, this, 7)); + Uxd(this.A); + !this.A && (this.A = new K4d(u5, this, 7)); + ytd(this.A, BD(b, 14)); + return; + } + did( + this, + a - aLd(this.zh()), + XKd(((c = BD(Ajd(this, 16), 26)), !c ? this.zh() : c), a), + b + ); + }; + _.zh = function vKd() { + return jGd(), RFd; + }; + _.Bh = function wKd(a) { + var b; + switch (a) { + case 0: + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + Uxd(this.Ab); + return; + case 1: + JD(this.Cb, 179) && (BD(this.Cb, 179).tb = null); + pnd(this, null); + return; + case 2: + $Jd(this, null); + _Jd(this, this.D); + return; + case 5: + kKd(this, null); + return; + case 7: + !this.A && (this.A = new K4d(u5, this, 7)); + Uxd(this.A); + return; + } + eid( + this, + a - aLd(this.zh()), + XKd(((b = BD(Ajd(this, 16), 26)), !b ? this.zh() : b), a) + ); + }; + _.yj = function xKd() { + var a; + return ( + this.G == -1 && + (this.G = ((a = bKd(this)), a ? HLd(a.Mh(), this) : -1)), + this.G + ); + }; + _.zj = function yKd() { + return null; + }; + _.Aj = function zKd() { + return bKd(this); + }; + _.vk = function AKd() { + return this.v; + }; + _.Bj = function BKd() { + return dKd(this); + }; + _.Cj = function CKd() { + return this.D != null ? this.D : this.B; + }; + _.Dj = function DKd() { + return this.F; + }; + _.wj = function EKd(a) { + return fKd(this, a); + }; + _.wk = function FKd(a) { + this.v = a; + }; + _.xk = function GKd(a) { + gKd(this, a); + }; + _.yk = function HKd(a) { + this.C = a; + }; + _.Lh = function IKd(a) { + lKd(this, a); + }; + _.Ib = function JKd() { + return mKd(this); + }; + _.C = null; + _.D = null; + _.G = -1; + var Z5 = mdb(qte, "EClassifierImpl", 351); + bcb( + 88, + 351, + { + 105: 1, + 92: 1, + 90: 1, + 26: 1, + 138: 1, + 147: 1, + 191: 1, + 56: 1, + 108: 1, + 49: 1, + 97: 1, + 88: 1, + 351: 1, + 150: 1, + 473: 1, + 114: 1, + 115: 1, + 676: 1, + }, + hLd + ); + _.uk = function iLd(a) { + return dLd(this, a.Tg()); + }; + _._g = function jLd(a, b, c) { + var d; + switch (a) { + case 0: + return !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)), this.Ab; + case 1: + return this.zb; + case 2: + return this.D != null ? this.D : this.B; + case 3: + return dKd(this); + case 4: + return null; + case 5: + return this.F; + case 6: + if (b) return bKd(this); + return ZJd(this); + case 7: + return !this.A && (this.A = new K4d(u5, this, 7)), this.A; + case 8: + return Bcb(), (this.Bb & 256) != 0 ? true : false; + case 9: + return Bcb(), (this.Bb & 512) != 0 ? true : false; + case 10: + return _Kd(this); + case 11: + return !this.q && (this.q = new cUd(n5, this, 11, 10)), this.q; + case 12: + return OKd(this); + case 13: + return SKd(this); + case 14: + return SKd(this), this.r; + case 15: + return OKd(this), this.k; + case 16: + return PKd(this); + case 17: + return RKd(this); + case 18: + return TKd(this); + case 19: + return UKd(this); + case 20: + return OKd(this), this.o; + case 21: + return !this.s && (this.s = new cUd(t5, this, 21, 17)), this.s; + case 22: + return VKd(this); + case 23: + return QKd(this); + } + return bid( + this, + a - aLd((jGd(), QFd)), + XKd(((d = BD(Ajd(this, 16), 26)), !d ? QFd : d), a), + b, + c + ); + }; + _.hh = function kLd(a, b, c) { + var d, e, f; + switch (b) { + case 0: + return ( + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)), Sxd(this.Ab, a, c) + ); + case 6: + !!this.Cb && + (c = + ((e = this.Db >> 16), + e >= 0 ? aKd(this, c) : this.Cb.ih(this, -1 - e, null, c))); + return _hd(this, a, 6, c); + case 11: + return ( + !this.q && (this.q = new cUd(n5, this, 11, 10)), Sxd(this.q, a, c) + ); + case 21: + return ( + !this.s && (this.s = new cUd(t5, this, 21, 17)), Sxd(this.s, a, c) + ); + } + return ( + (f = BD( + XKd(((d = BD(Ajd(this, 16), 26)), !d ? (jGd(), QFd) : d), b), + 66 + )), + f.Nj().Qj(this, yjd(this), b - aLd((jGd(), QFd)), a, c) + ); + }; + _.jh = function lLd(a, b, c) { + var d, e; + switch (b) { + case 0: + return ( + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)), Txd(this.Ab, a, c) + ); + case 6: + return _hd(this, null, 6, c); + case 7: + return !this.A && (this.A = new K4d(u5, this, 7)), Txd(this.A, a, c); + case 11: + return ( + !this.q && (this.q = new cUd(n5, this, 11, 10)), Txd(this.q, a, c) + ); + case 21: + return ( + !this.s && (this.s = new cUd(t5, this, 21, 17)), Txd(this.s, a, c) + ); + case 22: + return Txd(VKd(this), a, c); + } + return ( + (e = BD( + XKd(((d = BD(Ajd(this, 16), 26)), !d ? (jGd(), QFd) : d), b), + 66 + )), + e.Nj().Rj(this, yjd(this), b - aLd((jGd(), QFd)), a, c) + ); + }; + _.lh = function mLd(a) { + var b; + switch (a) { + case 0: + return !!this.Ab && this.Ab.i != 0; + case 1: + return this.zb != null; + case 2: + return this.D != null && this.D == this.F; + case 3: + return !!dKd(this); + case 4: + return false; + case 5: + return this.F != null && this.F != this.D && this.F != this.B; + case 6: + return !!ZJd(this); + case 7: + return !!this.A && this.A.i != 0; + case 8: + return (this.Bb & 256) != 0; + case 9: + return (this.Bb & 512) != 0; + case 10: + return !!this.u && VKd(this.u.a).i != 0 && !(!!this.n && FMd(this.n)); + case 11: + return !!this.q && this.q.i != 0; + case 12: + return OKd(this).i != 0; + case 13: + return SKd(this).i != 0; + case 14: + return SKd(this), this.r.i != 0; + case 15: + return OKd(this), this.k.i != 0; + case 16: + return PKd(this).i != 0; + case 17: + return RKd(this).i != 0; + case 18: + return TKd(this).i != 0; + case 19: + return UKd(this).i != 0; + case 20: + return OKd(this), !!this.o; + case 21: + return !!this.s && this.s.i != 0; + case 22: + return !!this.n && FMd(this.n); + case 23: + return QKd(this).i != 0; + } + return cid( + this, + a - aLd((jGd(), QFd)), + XKd(((b = BD(Ajd(this, 16), 26)), !b ? QFd : b), a) + ); + }; + _.oh = function nLd(a) { + var b; + b = this.i == null || (!!this.q && this.q.i != 0) ? null : YKd(this, a); + return b ? b : Bmd(this, a); + }; + _.sh = function oLd(a, b) { + var c; + switch (a) { + case 0: + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + Uxd(this.Ab); + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + ytd(this.Ab, BD(b, 14)); + return; + case 1: + lKd(this, GD(b)); + return; + case 2: + iKd(this, GD(b)); + return; + case 5: + kKd(this, GD(b)); + return; + case 7: + !this.A && (this.A = new K4d(u5, this, 7)); + Uxd(this.A); + !this.A && (this.A = new K4d(u5, this, 7)); + ytd(this.A, BD(b, 14)); + return; + case 8: + eLd(this, Ccb(DD(b))); + return; + case 9: + fLd(this, Ccb(DD(b))); + return; + case 10: + vwd(_Kd(this)); + ytd(_Kd(this), BD(b, 14)); + return; + case 11: + !this.q && (this.q = new cUd(n5, this, 11, 10)); + Uxd(this.q); + !this.q && (this.q = new cUd(n5, this, 11, 10)); + ytd(this.q, BD(b, 14)); + return; + case 21: + !this.s && (this.s = new cUd(t5, this, 21, 17)); + Uxd(this.s); + !this.s && (this.s = new cUd(t5, this, 21, 17)); + ytd(this.s, BD(b, 14)); + return; + case 22: + Uxd(VKd(this)); + ytd(VKd(this), BD(b, 14)); + return; + } + did( + this, + a - aLd((jGd(), QFd)), + XKd(((c = BD(Ajd(this, 16), 26)), !c ? QFd : c), a), + b + ); + }; + _.zh = function pLd() { + return jGd(), QFd; + }; + _.Bh = function qLd(a) { + var b; + switch (a) { + case 0: + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + Uxd(this.Ab); + return; + case 1: + JD(this.Cb, 179) && (BD(this.Cb, 179).tb = null); + pnd(this, null); + return; + case 2: + $Jd(this, null); + _Jd(this, this.D); + return; + case 5: + kKd(this, null); + return; + case 7: + !this.A && (this.A = new K4d(u5, this, 7)); + Uxd(this.A); + return; + case 8: + eLd(this, false); + return; + case 9: + fLd(this, false); + return; + case 10: + !!this.u && vwd(this.u); + return; + case 11: + !this.q && (this.q = new cUd(n5, this, 11, 10)); + Uxd(this.q); + return; + case 21: + !this.s && (this.s = new cUd(t5, this, 21, 17)); + Uxd(this.s); + return; + case 22: + !!this.n && Uxd(this.n); + return; + } + eid( + this, + a - aLd((jGd(), QFd)), + XKd(((b = BD(Ajd(this, 16), 26)), !b ? QFd : b), a) + ); + }; + _.Gh = function rLd() { + var a, b; + OKd(this); + SKd(this); + PKd(this); + RKd(this); + TKd(this); + UKd(this); + QKd(this); + oud(SMd($Kd(this))); + if (this.s) { + for (a = 0, b = this.s.i; a < b; ++a) { + Cmd(qud(this.s, a)); + } + } + if (this.q) { + for (a = 0, b = this.q.i; a < b; ++a) { + Cmd(qud(this.q, a)); + } + } + o1d((O6d(), M6d), this).ne(); + this.Bb |= 1; + }; + _.Ib = function sLd() { + return gLd(this); + }; + _.k = null; + _.r = null; + var KKd, LKd, MKd; + var Y5 = mdb(qte, "EClassImpl", 88); + bcb(1994, 1993, Ove); + _.Vh = function tLd(a, b) { + return Pxd(this, a, b); + }; + _.Wh = function uLd(a) { + return Pxd(this, this.i, a); + }; + _.Xh = function vLd(a, b) { + Qxd(this, a, b); + }; + _.Yh = function wLd(a) { + Rxd(this, a); + }; + _.lk = function xLd(a, b) { + return Sxd(this, a, b); + }; + _.pi = function yLd(a) { + return nud(this, a); + }; + _.mk = function CLd(a, b) { + return Txd(this, a, b); + }; + _.mi = function DLd(a, b) { + return Zxd(this, a, b); + }; + _.Zh = function zLd() { + return new $yd(this); + }; + _.$h = function ALd() { + return new bzd(this); + }; + _._h = function BLd(a) { + return ztd(this, a); + }; + var P9 = mdb(yve, "NotifyingInternalEListImpl", 1994); + bcb(622, 1994, Pve); + _.Hc = function NLd(a) { + return ELd(this, a); + }; + _.Zi = function OLd(a, b, c, d, e) { + return FLd(this, a, b, c, d, e); + }; + _.$i = function PLd(a) { + GLd(this, a); + }; + _.Wj = function QLd(a) { + return this; + }; + _.ak = function RLd() { + return XKd(this.e.Tg(), this.aj()); + }; + _._i = function SLd() { + return this.ak(); + }; + _.aj = function TLd() { + return bLd(this.e.Tg(), this.ak()); + }; + _.zk = function ULd() { + return BD(this.ak().Yj(), 26).Bj(); + }; + _.Ak = function VLd() { + return zUd(BD(this.ak(), 18)).n; + }; + _.Ai = function WLd() { + return this.e; + }; + _.Bk = function XLd() { + return true; + }; + _.Ck = function YLd() { + return false; + }; + _.Dk = function ZLd() { + return false; + }; + _.Ek = function $Ld() { + return false; + }; + _.Xc = function _Ld(a) { + return HLd(this, a); + }; + _.cj = function aMd(a, b) { + var c; + return ( + (c = BD(a, 49)), + this.Dk() + ? this.Bk() + ? c.gh(this.e, this.Ak(), this.zk(), b) + : c.gh(this.e, bLd(c.Tg(), zUd(BD(this.ak(), 18))), null, b) + : c.gh(this.e, -1 - this.aj(), null, b) + ); + }; + _.dj = function bMd(a, b) { + var c; + return ( + (c = BD(a, 49)), + this.Dk() + ? this.Bk() + ? c.ih(this.e, this.Ak(), this.zk(), b) + : c.ih(this.e, bLd(c.Tg(), zUd(BD(this.ak(), 18))), null, b) + : c.ih(this.e, -1 - this.aj(), null, b) + ); + }; + _.rk = function cMd() { + return false; + }; + _.Fk = function dMd() { + return true; + }; + _.wj = function eMd(a) { + return qEd(this.d, a); + }; + _.ej = function fMd() { + return oid(this.e); + }; + _.fj = function gMd() { + return this.i != 0; + }; + _.ri = function hMd(a) { + return izd(this.d, a); + }; + _.li = function iMd(a, b) { + return this.Fk() && this.Ek() ? ILd(this, a, BD(b, 56)) : b; + }; + _.Gk = function jMd(a) { + return a.kh() ? xid(this.e, BD(a, 49)) : a; + }; + _.Wb = function kMd(a) { + JLd(this, a); + }; + _.Pc = function lMd() { + return KLd(this); + }; + _.Qc = function mMd(a) { + var b; + if (this.Ek()) { + for (b = this.i - 1; b >= 0; --b) { + qud(this, b); + } + } + return xud(this, a); + }; + _.Xj = function nMd() { + Uxd(this); + }; + _.oi = function oMd(a, b) { + return LLd(this, a, b); + }; + var t9 = mdb(yve, "EcoreEList", 622); + bcb(496, 622, Pve, pMd); + _.ai = function qMd() { + return false; + }; + _.aj = function rMd() { + return this.c; + }; + _.bj = function sMd() { + return false; + }; + _.Fk = function tMd() { + return true; + }; + _.hi = function uMd() { + return true; + }; + _.li = function vMd(a, b) { + return b; + }; + _.ni = function wMd() { + return false; + }; + _.c = 0; + var d9 = mdb(yve, "EObjectEList", 496); + bcb(85, 496, Pve, xMd); + _.bj = function yMd() { + return true; + }; + _.Dk = function zMd() { + return false; + }; + _.rk = function AMd() { + return true; + }; + var Z8 = mdb(yve, "EObjectContainmentEList", 85); + bcb(545, 85, Pve, BMd); + _.ci = function CMd() { + this.b = true; + }; + _.fj = function DMd() { + return this.b; + }; + _.Xj = function EMd() { + var a; + Uxd(this); + if (oid(this.e)) { + a = this.b; + this.b = false; + Uhd(this.e, new qSd(this.e, 2, this.c, a, false)); + } else { + this.b = false; + } + }; + _.b = false; + var Y8 = mdb(yve, "EObjectContainmentEList/Unsettable", 545); + bcb(1140, 545, Pve, JMd); + _.ii = function NMd(a, b) { + var c, d; + return ( + (c = BD(Wxd(this, a, b), 87)), + oid(this.e) && + GLd( + this, + new ESd( + this.a, + 7, + (jGd(), SFd), + meb(b), + ((d = c.c), JD(d, 88) ? BD(d, 26) : _Fd), + a + ) + ), + c + ); + }; + _.jj = function OMd(a, b) { + return GMd(this, BD(a, 87), b); + }; + _.kj = function PMd(a, b) { + return HMd(this, BD(a, 87), b); + }; + _.lj = function QMd(a, b, c) { + return IMd(this, BD(a, 87), BD(b, 87), c); + }; + _.Zi = function KMd(a, b, c, d, e) { + switch (a) { + case 3: { + return FLd(this, a, b, c, d, this.i > 1); + } + case 5: { + return FLd(this, a, b, c, d, this.i - BD(c, 15).gc() > 0); + } + default: { + return new pSd(this.e, a, this.c, b, c, d, true); + } + } + }; + _.ij = function LMd() { + return true; + }; + _.fj = function MMd() { + return FMd(this); + }; + _.Xj = function RMd() { + Uxd(this); + }; + var N5 = mdb(qte, "EClassImpl/1", 1140); + bcb(1154, 1153, dve); + _.ui = function VMd(a) { + var b, c, d, e, f, g, h; + c = a.xi(); + if (c != 8) { + d = UMd(a); + if (d == 0) { + switch (c) { + case 1: + case 9: { + h = a.Bi(); + if (h != null) { + b = $Kd(BD(h, 473)); + !b.c && (b.c = new xYd()); + Ftd(b.c, a.Ai()); + } + g = a.zi(); + if (g != null) { + e = BD(g, 473); + if ((e.Bb & 1) == 0) { + b = $Kd(e); + !b.c && (b.c = new xYd()); + wtd(b.c, BD(a.Ai(), 26)); + } + } + break; + } + case 3: { + g = a.zi(); + if (g != null) { + e = BD(g, 473); + if ((e.Bb & 1) == 0) { + b = $Kd(e); + !b.c && (b.c = new xYd()); + wtd(b.c, BD(a.Ai(), 26)); + } + } + break; + } + case 5: { + g = a.zi(); + if (g != null) { + for (f = BD(g, 14).Kc(); f.Ob(); ) { + e = BD(f.Pb(), 473); + if ((e.Bb & 1) == 0) { + b = $Kd(e); + !b.c && (b.c = new xYd()); + wtd(b.c, BD(a.Ai(), 26)); + } + } + } + break; + } + case 4: { + h = a.Bi(); + if (h != null) { + e = BD(h, 473); + if ((e.Bb & 1) == 0) { + b = $Kd(e); + !b.c && (b.c = new xYd()); + Ftd(b.c, a.Ai()); + } + } + break; + } + case 6: { + h = a.Bi(); + if (h != null) { + for (f = BD(h, 14).Kc(); f.Ob(); ) { + e = BD(f.Pb(), 473); + if ((e.Bb & 1) == 0) { + b = $Kd(e); + !b.c && (b.c = new xYd()); + Ftd(b.c, a.Ai()); + } + } + } + break; + } + } + } + this.Hk(d); + } + }; + _.Hk = function WMd(a) { + TMd(this, a); + }; + _.b = 63; + var p7 = mdb(qte, "ESuperAdapter", 1154); + bcb(1155, 1154, dve, YMd); + _.Hk = function ZMd(a) { + XMd(this, a); + }; + var I5 = mdb(qte, "EClassImpl/10", 1155); + bcb(1144, 696, Pve); + _.Vh = function $Md(a, b) { + return iud(this, a, b); + }; + _.Wh = function _Md(a) { + return jud(this, a); + }; + _.Xh = function aNd(a, b) { + kud(this, a, b); + }; + _.Yh = function bNd(a) { + lud(this, a); + }; + _.pi = function dNd(a) { + return nud(this, a); + }; + _.mi = function lNd(a, b) { + return uud(this, a, b); + }; + _.lk = function cNd(a, b) { + throw vbb(new bgb()); + }; + _.Zh = function eNd() { + return new $yd(this); + }; + _.$h = function fNd() { + return new bzd(this); + }; + _._h = function gNd(a) { + return ztd(this, a); + }; + _.mk = function hNd(a, b) { + throw vbb(new bgb()); + }; + _.Wj = function iNd(a) { + return this; + }; + _.fj = function jNd() { + return this.i != 0; + }; + _.Wb = function kNd(a) { + throw vbb(new bgb()); + }; + _.Xj = function mNd() { + throw vbb(new bgb()); + }; + var s9 = mdb(yve, "EcoreEList/UnmodifiableEList", 1144); + bcb(319, 1144, Pve, nNd); + _.ni = function oNd() { + return false; + }; + var r9 = mdb(yve, "EcoreEList/UnmodifiableEList/FastCompare", 319); + bcb(1147, 319, Pve, rNd); + _.Xc = function sNd(a) { + var b, c, d; + if (JD(a, 170)) { + b = BD(a, 170); + c = b.aj(); + if (c != -1) { + for (d = this.i; c < d; ++c) { + if (PD(this.g[c]) === PD(a)) { + return c; + } + } + } + } + return -1; + }; + var J5 = mdb(qte, "EClassImpl/1EAllStructuralFeaturesList", 1147); + bcb(1141, 497, oue, wNd); + _.ri = function xNd(a) { + return KC(j5, Tve, 87, a, 0, 1); + }; + _.ni = function yNd() { + return false; + }; + var K5 = mdb(qte, "EClassImpl/1EGenericSuperTypeEList", 1141); + bcb(623, 497, oue, zNd); + _.ri = function ANd(a) { + return KC(t5, Mve, 170, a, 0, 1); + }; + _.ni = function BNd() { + return false; + }; + var L5 = mdb(qte, "EClassImpl/1EStructuralFeatureUniqueEList", 623); + bcb(741, 497, oue, CNd); + _.ri = function DNd(a) { + return KC(q5, Mve, 18, a, 0, 1); + }; + _.ni = function ENd() { + return false; + }; + var M5 = mdb(qte, "EClassImpl/1ReferenceList", 741); + bcb(1142, 497, oue, GNd); + _.bi = function HNd(a, b) { + FNd(this, BD(b, 34)); + }; + _.ri = function INd(a) { + return KC(b5, Mve, 34, a, 0, 1); + }; + _.ni = function JNd() { + return false; + }; + var O5 = mdb(qte, "EClassImpl/2", 1142); + bcb(1143, 497, oue, KNd); + _.ri = function LNd(a) { + return KC(b5, Mve, 34, a, 0, 1); + }; + _.ni = function MNd() { + return false; + }; + var P5 = mdb(qte, "EClassImpl/3", 1143); + bcb(1145, 319, Pve, PNd); + _.Fc = function QNd(a) { + return NNd(this, BD(a, 34)); + }; + _.Yh = function RNd(a) { + ONd(this, BD(a, 34)); + }; + var Q5 = mdb(qte, "EClassImpl/4", 1145); + bcb(1146, 319, Pve, UNd); + _.Fc = function VNd(a) { + return SNd(this, BD(a, 18)); + }; + _.Yh = function WNd(a) { + TNd(this, BD(a, 18)); + }; + var R5 = mdb(qte, "EClassImpl/5", 1146); + bcb(1148, 497, oue, XNd); + _.ri = function YNd(a) { + return KC(n5, Nve, 59, a, 0, 1); + }; + _.ni = function ZNd() { + return false; + }; + var S5 = mdb(qte, "EClassImpl/6", 1148); + bcb(1149, 497, oue, $Nd); + _.ri = function _Nd(a) { + return KC(q5, Mve, 18, a, 0, 1); + }; + _.ni = function aOd() { + return false; + }; + var T5 = mdb(qte, "EClassImpl/7", 1149); + bcb(1997, 1996, { + 3: 1, + 4: 1, + 20: 1, + 28: 1, + 52: 1, + 14: 1, + 15: 1, + 67: 1, + 58: 1, + 69: 1, + }); + _.Vh = function bOd(a, b) { + return qwd(this, a, b); + }; + _.Wh = function cOd(a) { + return qwd(this, this.Vi(), a); + }; + _.Xh = function dOd(a, b) { + rwd(this, a, b); + }; + _.Yh = function eOd(a) { + swd(this, a); + }; + _.lk = function fOd(a, b) { + return twd(this, a, b); + }; + _.mk = function lOd(a, b) { + return uwd(this, a, b); + }; + _.mi = function mOd(a, b) { + return wwd(this, a, b); + }; + _.pi = function gOd(a) { + return this.Oi(a); + }; + _.Zh = function hOd() { + return new $yd(this); + }; + _.Gi = function iOd() { + return this.Ji(); + }; + _.$h = function jOd() { + return new bzd(this); + }; + _._h = function kOd(a) { + return ztd(this, a); + }; + var L8 = mdb(yve, "DelegatingNotifyingInternalEListImpl", 1997); + bcb(742, 1997, Uve); + _.ai = function rOd() { + var a; + a = XKd(wjd(this.b), this.aj()).Yj(); + return JD(a, 148) && !JD(a, 457) && (a.Bj().i & 1) == 0; + }; + _.Hc = function sOd(a) { + var b, c, d, e, f, g, h, i; + if (this.Fk()) { + i = this.Vi(); + if (i > 4) { + if (this.wj(a)) { + if (this.rk()) { + d = BD(a, 49); + c = d.Ug(); + h = + c == this.b && + (this.Dk() + ? d.Og( + d.Vg(), + BD(XKd(wjd(this.b), this.aj()).Yj(), 26).Bj() + ) == zUd(BD(XKd(wjd(this.b), this.aj()), 18)).n + : -1 - d.Vg() == this.aj()); + if (this.Ek() && !h && !c && !!d.Zg()) { + for (e = 0; e < i; ++e) { + b = oOd(this, this.Oi(e)); + if (PD(b) === PD(a)) { + return true; + } + } + } + return h; + } else if (this.Dk() && !this.Ck()) { + f = BD(a, 56).ah(zUd(BD(XKd(wjd(this.b), this.aj()), 18))); + if (PD(f) === PD(this.b)) { + return true; + } else if (f == null || !BD(f, 56).kh()) { + return false; + } + } + } else { + return false; + } + } + g = this.Li(a); + if (this.Ek() && !g) { + for (e = 0; e < i; ++e) { + d = oOd(this, this.Oi(e)); + if (PD(d) === PD(a)) { + return true; + } + } + } + return g; + } else { + return this.Li(a); + } + }; + _.Zi = function tOd(a, b, c, d, e) { + return new pSd(this.b, a, this.aj(), b, c, d, e); + }; + _.$i = function uOd(a) { + Uhd(this.b, a); + }; + _.Wj = function vOd(a) { + return this; + }; + _._i = function wOd() { + return XKd(wjd(this.b), this.aj()); + }; + _.aj = function xOd() { + return bLd(wjd(this.b), XKd(wjd(this.b), this.aj())); + }; + _.Ai = function yOd() { + return this.b; + }; + _.Bk = function zOd() { + return !!XKd(wjd(this.b), this.aj()).Yj().Bj(); + }; + _.bj = function AOd() { + var a, b; + b = XKd(wjd(this.b), this.aj()); + if (JD(b, 99)) { + a = BD(b, 18); + return (a.Bb & ote) != 0 || !!zUd(BD(b, 18)); + } else { + return false; + } + }; + _.Ck = function BOd() { + var a, b, c, d; + b = XKd(wjd(this.b), this.aj()); + if (JD(b, 99)) { + a = BD(b, 18); + c = zUd(a); + return !!c && ((d = c.t), d > 1 || d == -1); + } else { + return false; + } + }; + _.Dk = function COd() { + var a, b, c; + b = XKd(wjd(this.b), this.aj()); + if (JD(b, 99)) { + a = BD(b, 18); + c = zUd(a); + return !!c; + } else { + return false; + } + }; + _.Ek = function DOd() { + var a, b; + b = XKd(wjd(this.b), this.aj()); + if (JD(b, 99)) { + a = BD(b, 18); + return (a.Bb & Tje) != 0; + } else { + return false; + } + }; + _.Xc = function EOd(a) { + var b, c, d, e; + d = this.Qi(a); + if (d >= 0) return d; + if (this.Fk()) { + for (c = 0, e = this.Vi(); c < e; ++c) { + b = oOd(this, this.Oi(c)); + if (PD(b) === PD(a)) { + return c; + } + } + } + return -1; + }; + _.cj = function FOd(a, b) { + var c; + return ( + (c = BD(a, 49)), + this.Dk() + ? this.Bk() + ? c.gh( + this.b, + zUd(BD(XKd(wjd(this.b), this.aj()), 18)).n, + BD(XKd(wjd(this.b), this.aj()).Yj(), 26).Bj(), + b + ) + : c.gh( + this.b, + bLd(c.Tg(), zUd(BD(XKd(wjd(this.b), this.aj()), 18))), + null, + b + ) + : c.gh(this.b, -1 - this.aj(), null, b) + ); + }; + _.dj = function GOd(a, b) { + var c; + return ( + (c = BD(a, 49)), + this.Dk() + ? this.Bk() + ? c.ih( + this.b, + zUd(BD(XKd(wjd(this.b), this.aj()), 18)).n, + BD(XKd(wjd(this.b), this.aj()).Yj(), 26).Bj(), + b + ) + : c.ih( + this.b, + bLd(c.Tg(), zUd(BD(XKd(wjd(this.b), this.aj()), 18))), + null, + b + ) + : c.ih(this.b, -1 - this.aj(), null, b) + ); + }; + _.rk = function HOd() { + var a, b; + b = XKd(wjd(this.b), this.aj()); + if (JD(b, 99)) { + a = BD(b, 18); + return (a.Bb & ote) != 0; + } else { + return false; + } + }; + _.Fk = function IOd() { + return JD(XKd(wjd(this.b), this.aj()).Yj(), 88); + }; + _.wj = function JOd(a) { + return XKd(wjd(this.b), this.aj()).Yj().wj(a); + }; + _.ej = function KOd() { + return oid(this.b); + }; + _.fj = function LOd() { + return !this.Ri(); + }; + _.hi = function MOd() { + return XKd(wjd(this.b), this.aj()).hi(); + }; + _.li = function NOd(a, b) { + return nOd(this, a, b); + }; + _.Wb = function OOd(a) { + vwd(this); + ytd(this, BD(a, 15)); + }; + _.Pc = function POd() { + var a; + if (this.Ek()) { + for (a = this.Vi() - 1; a >= 0; --a) { + nOd(this, a, this.Oi(a)); + } + } + return this.Wi(); + }; + _.Qc = function QOd(a) { + var b; + if (this.Ek()) { + for (b = this.Vi() - 1; b >= 0; --b) { + nOd(this, b, this.Oi(b)); + } + } + return this.Xi(a); + }; + _.Xj = function ROd() { + vwd(this); + }; + _.oi = function SOd(a, b) { + return pOd(this, a, b); + }; + var K8 = mdb(yve, "DelegatingEcoreEList", 742); + bcb(1150, 742, Uve, YOd); + _.Hi = function _Od(a, b) { + TOd(this, a, BD(b, 26)); + }; + _.Ii = function aPd(a) { + UOd(this, BD(a, 26)); + }; + _.Oi = function gPd(a) { + var b, c; + return ( + (b = BD(qud(VKd(this.a), a), 87)), + (c = b.c), + JD(c, 88) ? BD(c, 26) : (jGd(), _Fd) + ); + }; + _.Ti = function lPd(a) { + var b, c; + return ( + (b = BD(Xxd(VKd(this.a), a), 87)), + (c = b.c), + JD(c, 88) ? BD(c, 26) : (jGd(), _Fd) + ); + }; + _.Ui = function mPd(a, b) { + return WOd(this, a, BD(b, 26)); + }; + _.ai = function ZOd() { + return false; + }; + _.Zi = function $Od(a, b, c, d, e) { + return null; + }; + _.Ji = function bPd() { + return new EPd(this); + }; + _.Ki = function cPd() { + Uxd(VKd(this.a)); + }; + _.Li = function dPd(a) { + return VOd(this, a); + }; + _.Mi = function ePd(a) { + var b, c; + for (c = a.Kc(); c.Ob(); ) { + b = c.Pb(); + if (!VOd(this, b)) { + return false; + } + } + return true; + }; + _.Ni = function fPd(a) { + var b, c, d; + if (JD(a, 15)) { + d = BD(a, 15); + if (d.gc() == VKd(this.a).i) { + for (b = d.Kc(), c = new Fyd(this); b.Ob(); ) { + if (PD(b.Pb()) !== PD(Dyd(c))) { + return false; + } + } + return true; + } + } + return false; + }; + _.Pi = function hPd() { + var a, b, c, d, e; + c = 1; + for (b = new Fyd(VKd(this.a)); b.e != b.i.gc(); ) { + a = BD(Dyd(b), 87); + d = ((e = a.c), JD(e, 88) ? BD(e, 26) : (jGd(), _Fd)); + c = 31 * c + (!d ? 0 : FCb(d)); + } + return c; + }; + _.Qi = function iPd(a) { + var b, c, d, e; + d = 0; + for (c = new Fyd(VKd(this.a)); c.e != c.i.gc(); ) { + b = BD(Dyd(c), 87); + if (PD(a) === PD(((e = b.c), JD(e, 88) ? BD(e, 26) : (jGd(), _Fd)))) { + return d; + } + ++d; + } + return -1; + }; + _.Ri = function jPd() { + return VKd(this.a).i == 0; + }; + _.Si = function kPd() { + return null; + }; + _.Vi = function nPd() { + return VKd(this.a).i; + }; + _.Wi = function oPd() { + var a, b, c, d, e, f; + f = VKd(this.a).i; + e = KC(SI, Uhe, 1, f, 5, 1); + c = 0; + for (b = new Fyd(VKd(this.a)); b.e != b.i.gc(); ) { + a = BD(Dyd(b), 87); + e[c++] = ((d = a.c), JD(d, 88) ? BD(d, 26) : (jGd(), _Fd)); + } + return e; + }; + _.Xi = function pPd(a) { + var b, c, d, e, f, g, h; + h = VKd(this.a).i; + if (a.length < h) { + e = izd(rb(a).c, h); + a = e; + } + a.length > h && NC(a, h, null); + d = 0; + for (c = new Fyd(VKd(this.a)); c.e != c.i.gc(); ) { + b = BD(Dyd(c), 87); + f = ((g = b.c), JD(g, 88) ? BD(g, 26) : (jGd(), _Fd)); + NC(a, d++, f); + } + return a; + }; + _.Yi = function qPd() { + var a, b, c, d, e; + e = new Hfb(); + e.a += "["; + a = VKd(this.a); + for (b = 0, d = VKd(this.a).i; b < d; ) { + Efb( + e, + xfb(((c = BD(qud(a, b), 87).c), JD(c, 88) ? BD(c, 26) : (jGd(), _Fd))) + ); + ++b < d && ((e.a += She), e); + } + e.a += "]"; + return e.a; + }; + _.$i = function rPd(a) {}; + _.aj = function sPd() { + return 10; + }; + _.Bk = function tPd() { + return true; + }; + _.bj = function uPd() { + return false; + }; + _.Ck = function vPd() { + return false; + }; + _.Dk = function wPd() { + return false; + }; + _.Ek = function xPd() { + return true; + }; + _.rk = function yPd() { + return false; + }; + _.Fk = function zPd() { + return true; + }; + _.wj = function APd(a) { + return JD(a, 88); + }; + _.fj = function BPd() { + return cLd(this.a); + }; + _.hi = function CPd() { + return true; + }; + _.ni = function DPd() { + return true; + }; + var V5 = mdb(qte, "EClassImpl/8", 1150); + bcb(1151, 1964, Lie, EPd); + _.Zc = function FPd(a) { + return ztd(this.a, a); + }; + _.gc = function GPd() { + return VKd(this.a.a).i; + }; + var U5 = mdb(qte, "EClassImpl/8/1", 1151); + bcb(1152, 497, oue, HPd); + _.ri = function IPd(a) { + return KC(d5, Uhe, 138, a, 0, 1); + }; + _.ni = function JPd() { + return false; + }; + var W5 = mdb(qte, "EClassImpl/9", 1152); + bcb(1139, 53, gke, KPd); + var X5 = mdb(qte, "EClassImpl/MyHashSet", 1139); + bcb( + 566, + 351, + { + 105: 1, + 92: 1, + 90: 1, + 138: 1, + 148: 1, + 834: 1, + 147: 1, + 191: 1, + 56: 1, + 108: 1, + 49: 1, + 97: 1, + 351: 1, + 150: 1, + 114: 1, + 115: 1, + 676: 1, + }, + MPd + ); + _._g = function NPd(a, b, c) { + var d; + switch (a) { + case 0: + return !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)), this.Ab; + case 1: + return this.zb; + case 2: + return this.D != null ? this.D : this.B; + case 3: + return dKd(this); + case 4: + return this.zj(); + case 5: + return this.F; + case 6: + if (b) return bKd(this); + return ZJd(this); + case 7: + return !this.A && (this.A = new K4d(u5, this, 7)), this.A; + case 8: + return Bcb(), (this.Bb & 256) != 0 ? true : false; + } + return bid( + this, + a - aLd(this.zh()), + XKd(((d = BD(Ajd(this, 16), 26)), !d ? this.zh() : d), a), + b, + c + ); + }; + _.lh = function OPd(a) { + var b; + switch (a) { + case 0: + return !!this.Ab && this.Ab.i != 0; + case 1: + return this.zb != null; + case 2: + return this.D != null && this.D == this.F; + case 3: + return !!dKd(this); + case 4: + return this.zj() != null; + case 5: + return this.F != null && this.F != this.D && this.F != this.B; + case 6: + return !!ZJd(this); + case 7: + return !!this.A && this.A.i != 0; + case 8: + return (this.Bb & 256) == 0; + } + return cid( + this, + a - aLd(this.zh()), + XKd(((b = BD(Ajd(this, 16), 26)), !b ? this.zh() : b), a) + ); + }; + _.sh = function PPd(a, b) { + var c; + switch (a) { + case 0: + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + Uxd(this.Ab); + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + ytd(this.Ab, BD(b, 14)); + return; + case 1: + lKd(this, GD(b)); + return; + case 2: + iKd(this, GD(b)); + return; + case 5: + kKd(this, GD(b)); + return; + case 7: + !this.A && (this.A = new K4d(u5, this, 7)); + Uxd(this.A); + !this.A && (this.A = new K4d(u5, this, 7)); + ytd(this.A, BD(b, 14)); + return; + case 8: + LPd(this, Ccb(DD(b))); + return; + } + did( + this, + a - aLd(this.zh()), + XKd(((c = BD(Ajd(this, 16), 26)), !c ? this.zh() : c), a), + b + ); + }; + _.zh = function QPd() { + return jGd(), TFd; + }; + _.Bh = function RPd(a) { + var b; + switch (a) { + case 0: + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + Uxd(this.Ab); + return; + case 1: + JD(this.Cb, 179) && (BD(this.Cb, 179).tb = null); + pnd(this, null); + return; + case 2: + $Jd(this, null); + _Jd(this, this.D); + return; + case 5: + kKd(this, null); + return; + case 7: + !this.A && (this.A = new K4d(u5, this, 7)); + Uxd(this.A); + return; + case 8: + LPd(this, true); + return; + } + eid( + this, + a - aLd(this.zh()), + XKd(((b = BD(Ajd(this, 16), 26)), !b ? this.zh() : b), a) + ); + }; + _.Gh = function SPd() { + o1d((O6d(), M6d), this).ne(); + this.Bb |= 1; + }; + _.Fj = function TPd() { + var a, b, c; + if (!this.c) { + a = l6d(bKd(this)); + if (!a.dc()) { + for (c = a.Kc(); c.Ob(); ) { + b = GD(c.Pb()); + !!Dmd(this, b) && k6d(this); + } + } + } + return this.b; + }; + _.zj = function UPd() { + var b; + if (!this.e) { + b = null; + try { + b = dKd(this); + } catch (a) { + a = ubb(a); + if (!JD(a, 102)) throw vbb(a); + } + this.d = null; + !!b && + (b.i & 1) != 0 && + (b == sbb + ? (this.d = (Bcb(), zcb)) + : b == WD + ? (this.d = meb(0)) + : b == VD + ? (this.d = new Ndb(0)) + : b == UD + ? (this.d = 0) + : b == XD + ? (this.d = Aeb(0)) + : b == rbb + ? (this.d = Web(0)) + : b == SD + ? (this.d = Scb(0)) + : (this.d = bdb(0))); + this.e = true; + } + return this.d; + }; + _.Ej = function VPd() { + return (this.Bb & 256) != 0; + }; + _.Ik = function WPd(a) { + a && (this.D = "org.eclipse.emf.common.util.AbstractEnumerator"); + }; + _.xk = function XPd(a) { + gKd(this, a); + this.Ik(a); + }; + _.yk = function YPd(a) { + this.C = a; + this.e = false; + }; + _.Ib = function ZPd() { + var a; + if ((this.Db & 64) != 0) return mKd(this); + a = new Jfb(mKd(this)); + a.a += " (serializable: "; + Ffb(a, (this.Bb & 256) != 0); + a.a += ")"; + return a.a; + }; + _.c = false; + _.d = null; + _.e = false; + var $5 = mdb(qte, "EDataTypeImpl", 566); + bcb( + 457, + 566, + { + 105: 1, + 92: 1, + 90: 1, + 138: 1, + 148: 1, + 834: 1, + 671: 1, + 147: 1, + 191: 1, + 56: 1, + 108: 1, + 49: 1, + 97: 1, + 351: 1, + 457: 1, + 150: 1, + 114: 1, + 115: 1, + 676: 1, + }, + aQd + ); + _._g = function bQd(a, b, c) { + var d; + switch (a) { + case 0: + return !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)), this.Ab; + case 1: + return this.zb; + case 2: + return this.D != null ? this.D : this.B; + case 3: + return dKd(this); + case 4: + return $Pd(this); + case 5: + return this.F; + case 6: + if (b) return bKd(this); + return ZJd(this); + case 7: + return !this.A && (this.A = new K4d(u5, this, 7)), this.A; + case 8: + return Bcb(), (this.Bb & 256) != 0 ? true : false; + case 9: + return !this.a && (this.a = new cUd(g5, this, 9, 5)), this.a; + } + return bid( + this, + a - aLd((jGd(), UFd)), + XKd(((d = BD(Ajd(this, 16), 26)), !d ? UFd : d), a), + b, + c + ); + }; + _.hh = function cQd(a, b, c) { + var d, e, f; + switch (b) { + case 0: + return ( + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)), Sxd(this.Ab, a, c) + ); + case 6: + !!this.Cb && + (c = + ((e = this.Db >> 16), + e >= 0 ? aKd(this, c) : this.Cb.ih(this, -1 - e, null, c))); + return _hd(this, a, 6, c); + case 9: + return ( + !this.a && (this.a = new cUd(g5, this, 9, 5)), Sxd(this.a, a, c) + ); + } + return ( + (f = BD( + XKd(((d = BD(Ajd(this, 16), 26)), !d ? (jGd(), UFd) : d), b), + 66 + )), + f.Nj().Qj(this, yjd(this), b - aLd((jGd(), UFd)), a, c) + ); + }; + _.jh = function dQd(a, b, c) { + var d, e; + switch (b) { + case 0: + return ( + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)), Txd(this.Ab, a, c) + ); + case 6: + return _hd(this, null, 6, c); + case 7: + return !this.A && (this.A = new K4d(u5, this, 7)), Txd(this.A, a, c); + case 9: + return ( + !this.a && (this.a = new cUd(g5, this, 9, 5)), Txd(this.a, a, c) + ); + } + return ( + (e = BD( + XKd(((d = BD(Ajd(this, 16), 26)), !d ? (jGd(), UFd) : d), b), + 66 + )), + e.Nj().Rj(this, yjd(this), b - aLd((jGd(), UFd)), a, c) + ); + }; + _.lh = function eQd(a) { + var b; + switch (a) { + case 0: + return !!this.Ab && this.Ab.i != 0; + case 1: + return this.zb != null; + case 2: + return this.D != null && this.D == this.F; + case 3: + return !!dKd(this); + case 4: + return !!$Pd(this); + case 5: + return this.F != null && this.F != this.D && this.F != this.B; + case 6: + return !!ZJd(this); + case 7: + return !!this.A && this.A.i != 0; + case 8: + return (this.Bb & 256) == 0; + case 9: + return !!this.a && this.a.i != 0; + } + return cid( + this, + a - aLd((jGd(), UFd)), + XKd(((b = BD(Ajd(this, 16), 26)), !b ? UFd : b), a) + ); + }; + _.sh = function fQd(a, b) { + var c; + switch (a) { + case 0: + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + Uxd(this.Ab); + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + ytd(this.Ab, BD(b, 14)); + return; + case 1: + lKd(this, GD(b)); + return; + case 2: + iKd(this, GD(b)); + return; + case 5: + kKd(this, GD(b)); + return; + case 7: + !this.A && (this.A = new K4d(u5, this, 7)); + Uxd(this.A); + !this.A && (this.A = new K4d(u5, this, 7)); + ytd(this.A, BD(b, 14)); + return; + case 8: + LPd(this, Ccb(DD(b))); + return; + case 9: + !this.a && (this.a = new cUd(g5, this, 9, 5)); + Uxd(this.a); + !this.a && (this.a = new cUd(g5, this, 9, 5)); + ytd(this.a, BD(b, 14)); + return; + } + did( + this, + a - aLd((jGd(), UFd)), + XKd(((c = BD(Ajd(this, 16), 26)), !c ? UFd : c), a), + b + ); + }; + _.zh = function gQd() { + return jGd(), UFd; + }; + _.Bh = function hQd(a) { + var b; + switch (a) { + case 0: + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + Uxd(this.Ab); + return; + case 1: + JD(this.Cb, 179) && (BD(this.Cb, 179).tb = null); + pnd(this, null); + return; + case 2: + $Jd(this, null); + _Jd(this, this.D); + return; + case 5: + kKd(this, null); + return; + case 7: + !this.A && (this.A = new K4d(u5, this, 7)); + Uxd(this.A); + return; + case 8: + LPd(this, true); + return; + case 9: + !this.a && (this.a = new cUd(g5, this, 9, 5)); + Uxd(this.a); + return; + } + eid( + this, + a - aLd((jGd(), UFd)), + XKd(((b = BD(Ajd(this, 16), 26)), !b ? UFd : b), a) + ); + }; + _.Gh = function iQd() { + var a, b; + if (this.a) { + for (a = 0, b = this.a.i; a < b; ++a) { + Cmd(qud(this.a, a)); + } + } + o1d((O6d(), M6d), this).ne(); + this.Bb |= 1; + }; + _.zj = function jQd() { + return $Pd(this); + }; + _.wj = function kQd(a) { + if (a != null) { + return true; + } + return false; + }; + _.Ik = function lQd(a) {}; + var _5 = mdb(qte, "EEnumImpl", 457); + bcb( + 573, + 438, + { + 105: 1, + 92: 1, + 90: 1, + 1940: 1, + 678: 1, + 147: 1, + 191: 1, + 56: 1, + 108: 1, + 49: 1, + 97: 1, + 573: 1, + 150: 1, + 114: 1, + 115: 1, + }, + rQd + ); + _.ne = function AQd() { + return this.zb; + }; + _.Qg = function sQd(a) { + return mQd(this, a); + }; + _._g = function tQd(a, b, c) { + var d, e; + switch (a) { + case 0: + return !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)), this.Ab; + case 1: + return this.zb; + case 2: + return meb(this.d); + case 3: + return this.b ? this.b : this.a; + case 4: + return (e = this.c), e == null ? this.zb : e; + case 5: + return this.Db >> 16 == 5 ? BD(this.Cb, 671) : null; + } + return bid( + this, + a - aLd((jGd(), VFd)), + XKd(((d = BD(Ajd(this, 16), 26)), !d ? VFd : d), a), + b, + c + ); + }; + _.hh = function uQd(a, b, c) { + var d, e, f; + switch (b) { + case 0: + return ( + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)), Sxd(this.Ab, a, c) + ); + case 5: + !!this.Cb && + (c = + ((e = this.Db >> 16), + e >= 0 ? mQd(this, c) : this.Cb.ih(this, -1 - e, null, c))); + return _hd(this, a, 5, c); + } + return ( + (f = BD( + XKd(((d = BD(Ajd(this, 16), 26)), !d ? (jGd(), VFd) : d), b), + 66 + )), + f.Nj().Qj(this, yjd(this), b - aLd((jGd(), VFd)), a, c) + ); + }; + _.jh = function vQd(a, b, c) { + var d, e; + switch (b) { + case 0: + return ( + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)), Txd(this.Ab, a, c) + ); + case 5: + return _hd(this, null, 5, c); + } + return ( + (e = BD( + XKd(((d = BD(Ajd(this, 16), 26)), !d ? (jGd(), VFd) : d), b), + 66 + )), + e.Nj().Rj(this, yjd(this), b - aLd((jGd(), VFd)), a, c) + ); + }; + _.lh = function wQd(a) { + var b; + switch (a) { + case 0: + return !!this.Ab && this.Ab.i != 0; + case 1: + return this.zb != null; + case 2: + return this.d != 0; + case 3: + return !!this.b; + case 4: + return this.c != null; + case 5: + return !!(this.Db >> 16 == 5 ? BD(this.Cb, 671) : null); + } + return cid( + this, + a - aLd((jGd(), VFd)), + XKd(((b = BD(Ajd(this, 16), 26)), !b ? VFd : b), a) + ); + }; + _.sh = function xQd(a, b) { + var c; + switch (a) { + case 0: + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + Uxd(this.Ab); + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + ytd(this.Ab, BD(b, 14)); + return; + case 1: + pnd(this, GD(b)); + return; + case 2: + qQd(this, BD(b, 19).a); + return; + case 3: + oQd(this, BD(b, 1940)); + return; + case 4: + pQd(this, GD(b)); + return; + } + did( + this, + a - aLd((jGd(), VFd)), + XKd(((c = BD(Ajd(this, 16), 26)), !c ? VFd : c), a), + b + ); + }; + _.zh = function yQd() { + return jGd(), VFd; + }; + _.Bh = function zQd(a) { + var b; + switch (a) { + case 0: + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + Uxd(this.Ab); + return; + case 1: + pnd(this, null); + return; + case 2: + qQd(this, 0); + return; + case 3: + oQd(this, null); + return; + case 4: + pQd(this, null); + return; + } + eid( + this, + a - aLd((jGd(), VFd)), + XKd(((b = BD(Ajd(this, 16), 26)), !b ? VFd : b), a) + ); + }; + _.Ib = function BQd() { + var a; + return (a = this.c), a == null ? this.zb : a; + }; + _.b = null; + _.c = null; + _.d = 0; + var a6 = mdb(qte, "EEnumLiteralImpl", 573); + var c6 = odb(qte, "EFactoryImpl/InternalEDateTimeFormat"); + bcb(489, 1, { 2015: 1 }, EQd); + var b6 = mdb(qte, "EFactoryImpl/1ClientInternalEDateTimeFormat", 489); + bcb( + 241, + 115, + { + 105: 1, + 92: 1, + 90: 1, + 87: 1, + 56: 1, + 108: 1, + 49: 1, + 97: 1, + 241: 1, + 114: 1, + 115: 1, + }, + UQd + ); + _.Sg = function VQd(a, b, c) { + var d; + c = _hd(this, a, b, c); + if (!!this.e && JD(a, 170)) { + d = MQd(this, this.e); + d != this.c && (c = QQd(this, d, c)); + } + return c; + }; + _._g = function WQd(a, b, c) { + var d; + switch (a) { + case 0: + return this.f; + case 1: + return !this.d && (this.d = new xMd(j5, this, 1)), this.d; + case 2: + if (b) return KQd(this); + return this.c; + case 3: + return this.b; + case 4: + return this.e; + case 5: + if (b) return JQd(this); + return this.a; + } + return bid( + this, + a - aLd((jGd(), XFd)), + XKd(((d = BD(Ajd(this, 16), 26)), !d ? XFd : d), a), + b, + c + ); + }; + _.jh = function XQd(a, b, c) { + var d, e; + switch (b) { + case 0: + return IQd(this, null, c); + case 1: + return !this.d && (this.d = new xMd(j5, this, 1)), Txd(this.d, a, c); + case 3: + return GQd(this, null, c); + } + return ( + (e = BD( + XKd(((d = BD(Ajd(this, 16), 26)), !d ? (jGd(), XFd) : d), b), + 66 + )), + e.Nj().Rj(this, yjd(this), b - aLd((jGd(), XFd)), a, c) + ); + }; + _.lh = function YQd(a) { + var b; + switch (a) { + case 0: + return !!this.f; + case 1: + return !!this.d && this.d.i != 0; + case 2: + return !!this.c; + case 3: + return !!this.b; + case 4: + return !!this.e; + case 5: + return !!this.a; + } + return cid( + this, + a - aLd((jGd(), XFd)), + XKd(((b = BD(Ajd(this, 16), 26)), !b ? XFd : b), a) + ); + }; + _.sh = function ZQd(a, b) { + var c; + switch (a) { + case 0: + SQd(this, BD(b, 87)); + return; + case 1: + !this.d && (this.d = new xMd(j5, this, 1)); + Uxd(this.d); + !this.d && (this.d = new xMd(j5, this, 1)); + ytd(this.d, BD(b, 14)); + return; + case 3: + PQd(this, BD(b, 87)); + return; + case 4: + RQd(this, BD(b, 836)); + return; + case 5: + NQd(this, BD(b, 138)); + return; + } + did( + this, + a - aLd((jGd(), XFd)), + XKd(((c = BD(Ajd(this, 16), 26)), !c ? XFd : c), a), + b + ); + }; + _.zh = function $Qd() { + return jGd(), XFd; + }; + _.Bh = function _Qd(a) { + var b; + switch (a) { + case 0: + SQd(this, null); + return; + case 1: + !this.d && (this.d = new xMd(j5, this, 1)); + Uxd(this.d); + return; + case 3: + PQd(this, null); + return; + case 4: + RQd(this, null); + return; + case 5: + NQd(this, null); + return; + } + eid( + this, + a - aLd((jGd(), XFd)), + XKd(((b = BD(Ajd(this, 16), 26)), !b ? XFd : b), a) + ); + }; + _.Ib = function aRd() { + var a; + a = new Wfb(Eid(this)); + a.a += " (expression: "; + TQd(this, a); + a.a += ")"; + return a.a; + }; + var FQd; + var e6 = mdb(qte, "EGenericTypeImpl", 241); + bcb(1969, 1964, Vve); + _.Xh = function cRd(a, b) { + bRd(this, a, b); + }; + _.lk = function dRd(a, b) { + bRd(this, this.gc(), a); + return b; + }; + _.pi = function eRd(a) { + return Ut(this.Gi(), a); + }; + _.Zh = function fRd() { + return this.$h(); + }; + _.Gi = function gRd() { + return new O0d(this); + }; + _.$h = function hRd() { + return this._h(0); + }; + _._h = function iRd(a) { + return this.Gi().Zc(a); + }; + _.mk = function jRd(a, b) { + ze(this, a, true); + return b; + }; + _.ii = function kRd(a, b) { + var c, d; + d = Vt(this, b); + c = this.Zc(a); + c.Rb(d); + return d; + }; + _.ji = function lRd(a, b) { + var c; + ze(this, b, true); + c = this.Zc(a); + c.Rb(b); + }; + var B8 = mdb(yve, "AbstractSequentialInternalEList", 1969); + bcb(486, 1969, Vve, qRd); + _.pi = function rRd(a) { + return Ut(this.Gi(), a); + }; + _.Zh = function sRd() { + if (this.b == null) { + return LRd(), LRd(), KRd; + } + return this.Jk(); + }; + _.Gi = function tRd() { + return new w4d(this.a, this.b); + }; + _.$h = function uRd() { + if (this.b == null) { + return LRd(), LRd(), KRd; + } + return this.Jk(); + }; + _._h = function vRd(a) { + var b, c; + if (this.b == null) { + if (a < 0 || a > 1) { + throw vbb(new qcb(gve + a + ", size=0")); + } + return LRd(), LRd(), KRd; + } + c = this.Jk(); + for (b = 0; b < a; ++b) { + MRd(c); + } + return c; + }; + _.dc = function wRd() { + var a, b, c, d, e, f; + if (this.b != null) { + for (c = 0; c < this.b.length; ++c) { + a = this.b[c]; + if (!this.Mk() || this.a.mh(a)) { + f = this.a.bh(a, false); + Q6d(); + if (BD(a, 66).Oj()) { + b = BD(f, 153); + for (d = 0, e = b.gc(); d < e; ++d) { + if (oRd(b.il(d)) && b.jl(d) != null) { + return false; + } + } + } else if (a.$j()) { + if (!BD(f, 14).dc()) { + return false; + } + } else if (f != null) { + return false; + } + } + } + } + return true; + }; + _.Kc = function xRd() { + return pRd(this); + }; + _.Zc = function yRd(a) { + var b, c; + if (this.b == null) { + if (a != 0) { + throw vbb(new qcb(gve + a + ", size=0")); + } + return LRd(), LRd(), KRd; + } + c = this.Lk() ? this.Kk() : this.Jk(); + for (b = 0; b < a; ++b) { + MRd(c); + } + return c; + }; + _.ii = function zRd(a, b) { + throw vbb(new bgb()); + }; + _.ji = function ARd(a, b) { + throw vbb(new bgb()); + }; + _.Jk = function BRd() { + return new RRd(this.a, this.b); + }; + _.Kk = function CRd() { + return new dSd(this.a, this.b); + }; + _.Lk = function DRd() { + return true; + }; + _.gc = function ERd() { + var a, b, c, d, e, f, g; + e = 0; + if (this.b != null) { + for (c = 0; c < this.b.length; ++c) { + a = this.b[c]; + if (!this.Mk() || this.a.mh(a)) { + g = this.a.bh(a, false); + Q6d(); + if (BD(a, 66).Oj()) { + b = BD(g, 153); + for (d = 0, f = b.gc(); d < f; ++d) { + oRd(b.il(d)) && b.jl(d) != null && ++e; + } + } else a.$j() ? (e += BD(g, 14).gc()) : g != null && ++e; + } + } + } + return e; + }; + _.Mk = function FRd() { + return true; + }; + var mRd; + var R8 = mdb(yve, "EContentsEList", 486); + bcb(1156, 486, Vve, GRd); + _.Jk = function HRd() { + return new hSd(this.a, this.b); + }; + _.Kk = function IRd() { + return new fSd(this.a, this.b); + }; + _.Mk = function JRd() { + return false; + }; + var i6 = mdb(qte, "ENamedElementImpl/1", 1156); + bcb(279, 1, Wve, RRd); + _.Nb = function URd(a) { + Rrb(this, a); + }; + _.Rb = function SRd(a) { + throw vbb(new bgb()); + }; + _.Nk = function TRd(a) { + if (this.g != 0 || !!this.e) { + throw vbb(new Zdb("Iterator already in use or already filtered")); + } + this.e = a; + }; + _.Ob = function VRd() { + var a, b, c, d, e, f; + switch (this.g) { + case 3: + case 2: { + return true; + } + case 1: { + return false; + } + case -3: { + !this.p ? ++this.n : this.p.Pb(); + } + default: { + if (!this.k || (!this.p ? !NRd(this) : !ORd(this, this.p))) { + while (this.d < this.c.length) { + b = this.c[this.d++]; + if ( + (!this.e || b.Gj() != x2 || b.aj() != 0) && + (!this.Mk() || this.b.mh(b)) + ) { + f = this.b.bh(b, this.Lk()); + this.f = (Q6d(), BD(b, 66).Oj()); + if (this.f || b.$j()) { + if (this.Lk()) { + d = BD(f, 15); + this.k = d; + } else { + d = BD(f, 69); + this.k = this.j = d; + } + if (JD(this.k, 54)) { + this.p = null; + this.o = this.k.gc(); + this.n = 0; + } else { + this.p = !this.j ? this.k.Yc() : this.j.$h(); + } + if (!this.p ? NRd(this) : ORd(this, this.p)) { + e = !this.p + ? !this.j + ? this.k.Xb(this.n++) + : this.j.pi(this.n++) + : this.p.Pb(); + if (this.f) { + a = BD(e, 72); + a.ak(); + c = a.dd(); + this.i = c; + } else { + c = e; + this.i = c; + } + this.g = 3; + return true; + } + } else if (f != null) { + this.k = null; + this.p = null; + c = f; + this.i = c; + this.g = 2; + return true; + } + } + } + this.k = null; + this.p = null; + this.f = false; + this.g = 1; + return false; + } else { + e = !this.p + ? !this.j + ? this.k.Xb(this.n++) + : this.j.pi(this.n++) + : this.p.Pb(); + if (this.f) { + a = BD(e, 72); + a.ak(); + c = a.dd(); + this.i = c; + } else { + c = e; + this.i = c; + } + this.g = 3; + return true; + } + } + } + }; + _.Sb = function WRd() { + var a, b, c, d, e, f; + switch (this.g) { + case -3: + case -2: { + return true; + } + case -1: { + return false; + } + case 3: { + !this.p ? --this.n : this.p.Ub(); + } + default: { + if (!this.k || (!this.p ? !PRd(this) : !QRd(this, this.p))) { + while (this.d > 0) { + b = this.c[--this.d]; + if ( + (!this.e || b.Gj() != x2 || b.aj() != 0) && + (!this.Mk() || this.b.mh(b)) + ) { + f = this.b.bh(b, this.Lk()); + this.f = (Q6d(), BD(b, 66).Oj()); + if (this.f || b.$j()) { + if (this.Lk()) { + d = BD(f, 15); + this.k = d; + } else { + d = BD(f, 69); + this.k = this.j = d; + } + if (JD(this.k, 54)) { + this.o = this.k.gc(); + this.n = this.o; + } else { + this.p = !this.j + ? this.k.Zc(this.k.gc()) + : this.j._h(this.k.gc()); + } + if (!this.p ? PRd(this) : QRd(this, this.p)) { + e = !this.p + ? !this.j + ? this.k.Xb(--this.n) + : this.j.pi(--this.n) + : this.p.Ub(); + if (this.f) { + a = BD(e, 72); + a.ak(); + c = a.dd(); + this.i = c; + } else { + c = e; + this.i = c; + } + this.g = -3; + return true; + } + } else if (f != null) { + this.k = null; + this.p = null; + c = f; + this.i = c; + this.g = -2; + return true; + } + } + } + this.k = null; + this.p = null; + this.g = -1; + return false; + } else { + e = !this.p + ? !this.j + ? this.k.Xb(--this.n) + : this.j.pi(--this.n) + : this.p.Ub(); + if (this.f) { + a = BD(e, 72); + a.ak(); + c = a.dd(); + this.i = c; + } else { + c = e; + this.i = c; + } + this.g = -3; + return true; + } + } + } + }; + _.Pb = function XRd() { + return MRd(this); + }; + _.Tb = function YRd() { + return this.a; + }; + _.Ub = function ZRd() { + var a; + if (this.g < -1 || this.Sb()) { + --this.a; + this.g = 0; + a = this.i; + this.Sb(); + return a; + } else { + throw vbb(new utb()); + } + }; + _.Vb = function $Rd() { + return this.a - 1; + }; + _.Qb = function _Rd() { + throw vbb(new bgb()); + }; + _.Lk = function aSd() { + return false; + }; + _.Wb = function bSd(a) { + throw vbb(new bgb()); + }; + _.Mk = function cSd() { + return true; + }; + _.a = 0; + _.d = 0; + _.f = false; + _.g = 0; + _.n = 0; + _.o = 0; + var KRd; + var P8 = mdb(yve, "EContentsEList/FeatureIteratorImpl", 279); + bcb(697, 279, Wve, dSd); + _.Lk = function eSd() { + return true; + }; + var Q8 = mdb(yve, "EContentsEList/ResolvingFeatureIteratorImpl", 697); + bcb(1157, 697, Wve, fSd); + _.Mk = function gSd() { + return false; + }; + var g6 = mdb(qte, "ENamedElementImpl/1/1", 1157); + bcb(1158, 279, Wve, hSd); + _.Mk = function iSd() { + return false; + }; + var h6 = mdb(qte, "ENamedElementImpl/1/2", 1158); + bcb( + 36, + 143, + fve, + lSd, + mSd, + nSd, + oSd, + pSd, + qSd, + rSd, + sSd, + tSd, + uSd, + vSd, + wSd, + xSd, + ySd, + zSd, + ASd, + BSd, + CSd, + DSd, + ESd, + FSd, + GSd, + HSd, + ISd, + JSd + ); + _._i = function KSd() { + return kSd(this); + }; + _.gj = function LSd() { + var a; + a = kSd(this); + if (a) { + return a.zj(); + } + return null; + }; + _.yi = function MSd(a) { + this.b == -1 && + !!this.a && + (this.b = this.c.Xg(this.a.aj(), this.a.Gj())); + return this.c.Og(this.b, a); + }; + _.Ai = function NSd() { + return this.c; + }; + _.hj = function OSd() { + var a; + a = kSd(this); + if (a) { + return a.Kj(); + } + return false; + }; + _.b = -1; + var k6 = mdb(qte, "ENotificationImpl", 36); + bcb( + 399, + 284, + { + 105: 1, + 92: 1, + 90: 1, + 147: 1, + 191: 1, + 56: 1, + 59: 1, + 108: 1, + 472: 1, + 49: 1, + 97: 1, + 150: 1, + 399: 1, + 284: 1, + 114: 1, + 115: 1, + }, + SSd + ); + _.Qg = function TSd(a) { + return PSd(this, a); + }; + _._g = function USd(a, b, c) { + var d, e, f; + switch (a) { + case 0: + return !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)), this.Ab; + case 1: + return this.zb; + case 2: + return Bcb(), (this.Bb & 256) != 0 ? true : false; + case 3: + return Bcb(), (this.Bb & 512) != 0 ? true : false; + case 4: + return meb(this.s); + case 5: + return meb(this.t); + case 6: + return Bcb(), (f = this.t), f > 1 || f == -1 ? true : false; + case 7: + return Bcb(), (e = this.s), e >= 1 ? true : false; + case 8: + if (b) return wId(this); + return this.r; + case 9: + return this.q; + case 10: + return this.Db >> 16 == 10 ? BD(this.Cb, 26) : null; + case 11: + return !this.d && (this.d = new K4d(u5, this, 11)), this.d; + case 12: + return !this.c && (this.c = new cUd(p5, this, 12, 10)), this.c; + case 13: + return !this.a && (this.a = new fTd(this, this)), this.a; + case 14: + return QSd(this); + } + return bid( + this, + a - aLd((jGd(), aGd)), + XKd(((d = BD(Ajd(this, 16), 26)), !d ? aGd : d), a), + b, + c + ); + }; + _.hh = function VSd(a, b, c) { + var d, e, f; + switch (b) { + case 0: + return ( + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)), Sxd(this.Ab, a, c) + ); + case 10: + !!this.Cb && + (c = + ((e = this.Db >> 16), + e >= 0 ? PSd(this, c) : this.Cb.ih(this, -1 - e, null, c))); + return _hd(this, a, 10, c); + case 12: + return ( + !this.c && (this.c = new cUd(p5, this, 12, 10)), Sxd(this.c, a, c) + ); + } + return ( + (f = BD( + XKd(((d = BD(Ajd(this, 16), 26)), !d ? (jGd(), aGd) : d), b), + 66 + )), + f.Nj().Qj(this, yjd(this), b - aLd((jGd(), aGd)), a, c) + ); + }; + _.jh = function WSd(a, b, c) { + var d, e; + switch (b) { + case 0: + return ( + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)), Txd(this.Ab, a, c) + ); + case 9: + return vId(this, c); + case 10: + return _hd(this, null, 10, c); + case 11: + return !this.d && (this.d = new K4d(u5, this, 11)), Txd(this.d, a, c); + case 12: + return ( + !this.c && (this.c = new cUd(p5, this, 12, 10)), Txd(this.c, a, c) + ); + case 14: + return Txd(QSd(this), a, c); + } + return ( + (e = BD( + XKd(((d = BD(Ajd(this, 16), 26)), !d ? (jGd(), aGd) : d), b), + 66 + )), + e.Nj().Rj(this, yjd(this), b - aLd((jGd(), aGd)), a, c) + ); + }; + _.lh = function XSd(a) { + var b, c, d; + switch (a) { + case 0: + return !!this.Ab && this.Ab.i != 0; + case 1: + return this.zb != null; + case 2: + return (this.Bb & 256) == 0; + case 3: + return (this.Bb & 512) == 0; + case 4: + return this.s != 0; + case 5: + return this.t != 1; + case 6: + return (d = this.t), d > 1 || d == -1; + case 7: + return (c = this.s), c >= 1; + case 8: + return !!this.r && !this.q.e && LQd(this.q).i == 0; + case 9: + return !!this.q && !(!!this.r && !this.q.e && LQd(this.q).i == 0); + case 10: + return !!(this.Db >> 16 == 10 ? BD(this.Cb, 26) : null); + case 11: + return !!this.d && this.d.i != 0; + case 12: + return !!this.c && this.c.i != 0; + case 13: + return !!this.a && QSd(this.a.a).i != 0 && !(!!this.b && QTd(this.b)); + case 14: + return !!this.b && QTd(this.b); + } + return cid( + this, + a - aLd((jGd(), aGd)), + XKd(((b = BD(Ajd(this, 16), 26)), !b ? aGd : b), a) + ); + }; + _.sh = function YSd(a, b) { + var c, d; + switch (a) { + case 0: + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + Uxd(this.Ab); + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + ytd(this.Ab, BD(b, 14)); + return; + case 1: + pnd(this, GD(b)); + return; + case 2: + BId(this, Ccb(DD(b))); + return; + case 3: + CId(this, Ccb(DD(b))); + return; + case 4: + AId(this, BD(b, 19).a); + return; + case 5: + DId(this, BD(b, 19).a); + return; + case 8: + yId(this, BD(b, 138)); + return; + case 9: + d = xId(this, BD(b, 87), null); + !!d && d.Fi(); + return; + case 11: + !this.d && (this.d = new K4d(u5, this, 11)); + Uxd(this.d); + !this.d && (this.d = new K4d(u5, this, 11)); + ytd(this.d, BD(b, 14)); + return; + case 12: + !this.c && (this.c = new cUd(p5, this, 12, 10)); + Uxd(this.c); + !this.c && (this.c = new cUd(p5, this, 12, 10)); + ytd(this.c, BD(b, 14)); + return; + case 13: + !this.a && (this.a = new fTd(this, this)); + vwd(this.a); + !this.a && (this.a = new fTd(this, this)); + ytd(this.a, BD(b, 14)); + return; + case 14: + Uxd(QSd(this)); + ytd(QSd(this), BD(b, 14)); + return; + } + did( + this, + a - aLd((jGd(), aGd)), + XKd(((c = BD(Ajd(this, 16), 26)), !c ? aGd : c), a), + b + ); + }; + _.zh = function ZSd() { + return jGd(), aGd; + }; + _.Bh = function $Sd(a) { + var b, c; + switch (a) { + case 0: + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + Uxd(this.Ab); + return; + case 1: + pnd(this, null); + return; + case 2: + BId(this, true); + return; + case 3: + CId(this, true); + return; + case 4: + AId(this, 0); + return; + case 5: + DId(this, 1); + return; + case 8: + yId(this, null); + return; + case 9: + c = xId(this, null, null); + !!c && c.Fi(); + return; + case 11: + !this.d && (this.d = new K4d(u5, this, 11)); + Uxd(this.d); + return; + case 12: + !this.c && (this.c = new cUd(p5, this, 12, 10)); + Uxd(this.c); + return; + case 13: + !!this.a && vwd(this.a); + return; + case 14: + !!this.b && Uxd(this.b); + return; + } + eid( + this, + a - aLd((jGd(), aGd)), + XKd(((b = BD(Ajd(this, 16), 26)), !b ? aGd : b), a) + ); + }; + _.Gh = function _Sd() { + var a, b; + if (this.c) { + for (a = 0, b = this.c.i; a < b; ++a) { + Cmd(qud(this.c, a)); + } + } + wId(this); + this.Bb |= 1; + }; + var p6 = mdb(qte, "EOperationImpl", 399); + bcb(505, 742, Uve, fTd); + _.Hi = function iTd(a, b) { + aTd(this, a, BD(b, 138)); + }; + _.Ii = function jTd(a) { + bTd(this, BD(a, 138)); + }; + _.Oi = function pTd(a) { + var b, c; + return (b = BD(qud(QSd(this.a), a), 87)), (c = b.c), c ? c : (jGd(), YFd); + }; + _.Ti = function uTd(a) { + var b, c; + return (b = BD(Xxd(QSd(this.a), a), 87)), (c = b.c), c ? c : (jGd(), YFd); + }; + _.Ui = function vTd(a, b) { + return dTd(this, a, BD(b, 138)); + }; + _.ai = function gTd() { + return false; + }; + _.Zi = function hTd(a, b, c, d, e) { + return null; + }; + _.Ji = function kTd() { + return new NTd(this); + }; + _.Ki = function lTd() { + Uxd(QSd(this.a)); + }; + _.Li = function mTd(a) { + return cTd(this, a); + }; + _.Mi = function nTd(a) { + var b, c; + for (c = a.Kc(); c.Ob(); ) { + b = c.Pb(); + if (!cTd(this, b)) { + return false; + } + } + return true; + }; + _.Ni = function oTd(a) { + var b, c, d; + if (JD(a, 15)) { + d = BD(a, 15); + if (d.gc() == QSd(this.a).i) { + for (b = d.Kc(), c = new Fyd(this); b.Ob(); ) { + if (PD(b.Pb()) !== PD(Dyd(c))) { + return false; + } + } + return true; + } + } + return false; + }; + _.Pi = function qTd() { + var a, b, c, d, e; + c = 1; + for (b = new Fyd(QSd(this.a)); b.e != b.i.gc(); ) { + a = BD(Dyd(b), 87); + d = ((e = a.c), e ? e : (jGd(), YFd)); + c = 31 * c + (!d ? 0 : tb(d)); + } + return c; + }; + _.Qi = function rTd(a) { + var b, c, d, e; + d = 0; + for (c = new Fyd(QSd(this.a)); c.e != c.i.gc(); ) { + b = BD(Dyd(c), 87); + if (PD(a) === PD(((e = b.c), e ? e : (jGd(), YFd)))) { + return d; + } + ++d; + } + return -1; + }; + _.Ri = function sTd() { + return QSd(this.a).i == 0; + }; + _.Si = function tTd() { + return null; + }; + _.Vi = function wTd() { + return QSd(this.a).i; + }; + _.Wi = function xTd() { + var a, b, c, d, e, f; + f = QSd(this.a).i; + e = KC(SI, Uhe, 1, f, 5, 1); + c = 0; + for (b = new Fyd(QSd(this.a)); b.e != b.i.gc(); ) { + a = BD(Dyd(b), 87); + e[c++] = ((d = a.c), d ? d : (jGd(), YFd)); + } + return e; + }; + _.Xi = function yTd(a) { + var b, c, d, e, f, g, h; + h = QSd(this.a).i; + if (a.length < h) { + e = izd(rb(a).c, h); + a = e; + } + a.length > h && NC(a, h, null); + d = 0; + for (c = new Fyd(QSd(this.a)); c.e != c.i.gc(); ) { + b = BD(Dyd(c), 87); + f = ((g = b.c), g ? g : (jGd(), YFd)); + NC(a, d++, f); + } + return a; + }; + _.Yi = function zTd() { + var a, b, c, d, e; + e = new Hfb(); + e.a += "["; + a = QSd(this.a); + for (b = 0, d = QSd(this.a).i; b < d; ) { + Efb(e, xfb(((c = BD(qud(a, b), 87).c), c ? c : (jGd(), YFd)))); + ++b < d && ((e.a += She), e); + } + e.a += "]"; + return e.a; + }; + _.$i = function ATd(a) {}; + _.aj = function BTd() { + return 13; + }; + _.Bk = function CTd() { + return true; + }; + _.bj = function DTd() { + return false; + }; + _.Ck = function ETd() { + return false; + }; + _.Dk = function FTd() { + return false; + }; + _.Ek = function GTd() { + return true; + }; + _.rk = function HTd() { + return false; + }; + _.Fk = function ITd() { + return true; + }; + _.wj = function JTd(a) { + return JD(a, 138); + }; + _.fj = function KTd() { + return RSd(this.a); + }; + _.hi = function LTd() { + return true; + }; + _.ni = function MTd() { + return true; + }; + var n6 = mdb(qte, "EOperationImpl/1", 505); + bcb(1340, 1964, Lie, NTd); + _.Zc = function OTd(a) { + return ztd(this.a, a); + }; + _.gc = function PTd() { + return QSd(this.a.a).i; + }; + var m6 = mdb(qte, "EOperationImpl/1/1", 1340); + bcb(1341, 545, Pve, UTd); + _.ii = function YTd(a, b) { + var c, d; + return ( + (c = BD(Wxd(this, a, b), 87)), + oid(this.e) && + GLd( + this, + new ESd( + this.a, + 7, + (jGd(), bGd), + meb(b), + ((d = c.c), d ? d : YFd), + a + ) + ), + c + ); + }; + _.jj = function ZTd(a, b) { + return RTd(this, BD(a, 87), b); + }; + _.kj = function $Td(a, b) { + return STd(this, BD(a, 87), b); + }; + _.lj = function _Td(a, b, c) { + return TTd(this, BD(a, 87), BD(b, 87), c); + }; + _.Zi = function VTd(a, b, c, d, e) { + switch (a) { + case 3: { + return FLd(this, a, b, c, d, this.i > 1); + } + case 5: { + return FLd(this, a, b, c, d, this.i - BD(c, 15).gc() > 0); + } + default: { + return new pSd(this.e, a, this.c, b, c, d, true); + } + } + }; + _.ij = function WTd() { + return true; + }; + _.fj = function XTd() { + return QTd(this); + }; + _.Xj = function aUd() { + Uxd(this); + }; + var o6 = mdb(qte, "EOperationImpl/2", 1341); + bcb(498, 1, { 1938: 1, 498: 1 }, bUd); + var q6 = mdb(qte, "EPackageImpl/1", 498); + bcb(16, 85, Pve, cUd); + _.zk = function dUd() { + return this.d; + }; + _.Ak = function eUd() { + return this.b; + }; + _.Dk = function fUd() { + return true; + }; + _.b = 0; + var b9 = mdb(yve, "EObjectContainmentWithInverseEList", 16); + bcb(353, 16, Pve, gUd); + _.Ek = function hUd() { + return true; + }; + _.li = function iUd(a, b) { + return ILd(this, a, BD(b, 56)); + }; + var $8 = mdb(yve, "EObjectContainmentWithInverseEList/Resolving", 353); + bcb(298, 353, Pve, jUd); + _.ci = function kUd() { + this.a.tb = null; + }; + var r6 = mdb(qte, "EPackageImpl/2", 298); + bcb(1228, 1, {}, lUd); + var s6 = mdb(qte, "EPackageImpl/3", 1228); + bcb(718, 43, fke, oUd); + _._b = function pUd(a) { + return ND(a) ? Qhb(this, a) : !!irb(this.f, a); + }; + var u6 = mdb(qte, "EPackageRegistryImpl", 718); + bcb( + 509, + 284, + { + 105: 1, + 92: 1, + 90: 1, + 147: 1, + 191: 1, + 56: 1, + 2017: 1, + 108: 1, + 472: 1, + 49: 1, + 97: 1, + 150: 1, + 509: 1, + 284: 1, + 114: 1, + 115: 1, + }, + rUd + ); + _.Qg = function sUd(a) { + return qUd(this, a); + }; + _._g = function tUd(a, b, c) { + var d, e, f; + switch (a) { + case 0: + return !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)), this.Ab; + case 1: + return this.zb; + case 2: + return Bcb(), (this.Bb & 256) != 0 ? true : false; + case 3: + return Bcb(), (this.Bb & 512) != 0 ? true : false; + case 4: + return meb(this.s); + case 5: + return meb(this.t); + case 6: + return Bcb(), (f = this.t), f > 1 || f == -1 ? true : false; + case 7: + return Bcb(), (e = this.s), e >= 1 ? true : false; + case 8: + if (b) return wId(this); + return this.r; + case 9: + return this.q; + case 10: + return this.Db >> 16 == 10 ? BD(this.Cb, 59) : null; + } + return bid( + this, + a - aLd((jGd(), dGd)), + XKd(((d = BD(Ajd(this, 16), 26)), !d ? dGd : d), a), + b, + c + ); + }; + _.hh = function uUd(a, b, c) { + var d, e, f; + switch (b) { + case 0: + return ( + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)), Sxd(this.Ab, a, c) + ); + case 10: + !!this.Cb && + (c = + ((e = this.Db >> 16), + e >= 0 ? qUd(this, c) : this.Cb.ih(this, -1 - e, null, c))); + return _hd(this, a, 10, c); + } + return ( + (f = BD( + XKd(((d = BD(Ajd(this, 16), 26)), !d ? (jGd(), dGd) : d), b), + 66 + )), + f.Nj().Qj(this, yjd(this), b - aLd((jGd(), dGd)), a, c) + ); + }; + _.jh = function vUd(a, b, c) { + var d, e; + switch (b) { + case 0: + return ( + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)), Txd(this.Ab, a, c) + ); + case 9: + return vId(this, c); + case 10: + return _hd(this, null, 10, c); + } + return ( + (e = BD( + XKd(((d = BD(Ajd(this, 16), 26)), !d ? (jGd(), dGd) : d), b), + 66 + )), + e.Nj().Rj(this, yjd(this), b - aLd((jGd(), dGd)), a, c) + ); + }; + _.lh = function wUd(a) { + var b, c, d; + switch (a) { + case 0: + return !!this.Ab && this.Ab.i != 0; + case 1: + return this.zb != null; + case 2: + return (this.Bb & 256) == 0; + case 3: + return (this.Bb & 512) == 0; + case 4: + return this.s != 0; + case 5: + return this.t != 1; + case 6: + return (d = this.t), d > 1 || d == -1; + case 7: + return (c = this.s), c >= 1; + case 8: + return !!this.r && !this.q.e && LQd(this.q).i == 0; + case 9: + return !!this.q && !(!!this.r && !this.q.e && LQd(this.q).i == 0); + case 10: + return !!(this.Db >> 16 == 10 ? BD(this.Cb, 59) : null); + } + return cid( + this, + a - aLd((jGd(), dGd)), + XKd(((b = BD(Ajd(this, 16), 26)), !b ? dGd : b), a) + ); + }; + _.zh = function xUd() { + return jGd(), dGd; + }; + var v6 = mdb(qte, "EParameterImpl", 509); + bcb( + 99, + 449, + { + 105: 1, + 92: 1, + 90: 1, + 147: 1, + 191: 1, + 56: 1, + 18: 1, + 170: 1, + 66: 1, + 108: 1, + 472: 1, + 49: 1, + 97: 1, + 150: 1, + 99: 1, + 449: 1, + 284: 1, + 114: 1, + 115: 1, + 677: 1, + }, + FUd + ); + _._g = function GUd(a, b, c) { + var d, e, f, g; + switch (a) { + case 0: + return !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)), this.Ab; + case 1: + return this.zb; + case 2: + return Bcb(), (this.Bb & 256) != 0 ? true : false; + case 3: + return Bcb(), (this.Bb & 512) != 0 ? true : false; + case 4: + return meb(this.s); + case 5: + return meb(this.t); + case 6: + return Bcb(), (g = this.t), g > 1 || g == -1 ? true : false; + case 7: + return Bcb(), (e = this.s), e >= 1 ? true : false; + case 8: + if (b) return wId(this); + return this.r; + case 9: + return this.q; + case 10: + return Bcb(), (this.Bb & zte) != 0 ? true : false; + case 11: + return Bcb(), (this.Bb & Dve) != 0 ? true : false; + case 12: + return Bcb(), (this.Bb & Rje) != 0 ? true : false; + case 13: + return this.j; + case 14: + return VId(this); + case 15: + return Bcb(), (this.Bb & Cve) != 0 ? true : false; + case 16: + return Bcb(), (this.Bb & oie) != 0 ? true : false; + case 17: + return WId(this); + case 18: + return Bcb(), (this.Bb & ote) != 0 ? true : false; + case 19: + return ( + Bcb(), (f = zUd(this)), !!f && (f.Bb & ote) != 0 ? true : false + ); + case 20: + return Bcb(), (this.Bb & Tje) != 0 ? true : false; + case 21: + if (b) return zUd(this); + return this.b; + case 22: + if (b) return AUd(this); + return yUd(this); + case 23: + return !this.a && (this.a = new _4d(b5, this, 23)), this.a; + } + return bid( + this, + a - aLd((jGd(), eGd)), + XKd(((d = BD(Ajd(this, 16), 26)), !d ? eGd : d), a), + b, + c + ); + }; + _.lh = function HUd(a) { + var b, c, d, e; + switch (a) { + case 0: + return !!this.Ab && this.Ab.i != 0; + case 1: + return this.zb != null; + case 2: + return (this.Bb & 256) == 0; + case 3: + return (this.Bb & 512) == 0; + case 4: + return this.s != 0; + case 5: + return this.t != 1; + case 6: + return (e = this.t), e > 1 || e == -1; + case 7: + return (c = this.s), c >= 1; + case 8: + return !!this.r && !this.q.e && LQd(this.q).i == 0; + case 9: + return !!this.q && !(!!this.r && !this.q.e && LQd(this.q).i == 0); + case 10: + return (this.Bb & zte) == 0; + case 11: + return (this.Bb & Dve) != 0; + case 12: + return (this.Bb & Rje) != 0; + case 13: + return this.j != null; + case 14: + return VId(this) != null; + case 15: + return (this.Bb & Cve) != 0; + case 16: + return (this.Bb & oie) != 0; + case 17: + return !!WId(this); + case 18: + return (this.Bb & ote) != 0; + case 19: + return (d = zUd(this)), !!d && (d.Bb & ote) != 0; + case 20: + return (this.Bb & Tje) == 0; + case 21: + return !!this.b; + case 22: + return !!yUd(this); + case 23: + return !!this.a && this.a.i != 0; + } + return cid( + this, + a - aLd((jGd(), eGd)), + XKd(((b = BD(Ajd(this, 16), 26)), !b ? eGd : b), a) + ); + }; + _.sh = function IUd(a, b) { + var c, d; + switch (a) { + case 0: + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + Uxd(this.Ab); + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + ytd(this.Ab, BD(b, 14)); + return; + case 1: + cJd(this, GD(b)); + return; + case 2: + BId(this, Ccb(DD(b))); + return; + case 3: + CId(this, Ccb(DD(b))); + return; + case 4: + AId(this, BD(b, 19).a); + return; + case 5: + DId(this, BD(b, 19).a); + return; + case 8: + yId(this, BD(b, 138)); + return; + case 9: + d = xId(this, BD(b, 87), null); + !!d && d.Fi(); + return; + case 10: + ZId(this, Ccb(DD(b))); + return; + case 11: + fJd(this, Ccb(DD(b))); + return; + case 12: + dJd(this, Ccb(DD(b))); + return; + case 13: + $Id(this, GD(b)); + return; + case 15: + eJd(this, Ccb(DD(b))); + return; + case 16: + aJd(this, Ccb(DD(b))); + return; + case 18: + BUd(this, Ccb(DD(b))); + return; + case 20: + EUd(this, Ccb(DD(b))); + return; + case 21: + DUd(this, BD(b, 18)); + return; + case 23: + !this.a && (this.a = new _4d(b5, this, 23)); + Uxd(this.a); + !this.a && (this.a = new _4d(b5, this, 23)); + ytd(this.a, BD(b, 14)); + return; + } + did( + this, + a - aLd((jGd(), eGd)), + XKd(((c = BD(Ajd(this, 16), 26)), !c ? eGd : c), a), + b + ); + }; + _.zh = function JUd() { + return jGd(), eGd; + }; + _.Bh = function KUd(a) { + var b, c; + switch (a) { + case 0: + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + Uxd(this.Ab); + return; + case 1: + JD(this.Cb, 88) && XMd($Kd(BD(this.Cb, 88)), 4); + pnd(this, null); + return; + case 2: + BId(this, true); + return; + case 3: + CId(this, true); + return; + case 4: + AId(this, 0); + return; + case 5: + DId(this, 1); + return; + case 8: + yId(this, null); + return; + case 9: + c = xId(this, null, null); + !!c && c.Fi(); + return; + case 10: + ZId(this, true); + return; + case 11: + fJd(this, false); + return; + case 12: + dJd(this, false); + return; + case 13: + this.i = null; + _Id(this, null); + return; + case 15: + eJd(this, false); + return; + case 16: + aJd(this, false); + return; + case 18: + CUd(this, false); + JD(this.Cb, 88) && XMd($Kd(BD(this.Cb, 88)), 2); + return; + case 20: + EUd(this, true); + return; + case 21: + DUd(this, null); + return; + case 23: + !this.a && (this.a = new _4d(b5, this, 23)); + Uxd(this.a); + return; + } + eid( + this, + a - aLd((jGd(), eGd)), + XKd(((b = BD(Ajd(this, 16), 26)), !b ? eGd : b), a) + ); + }; + _.Gh = function LUd() { + AUd(this); + a2d(q1d((O6d(), M6d), this)); + wId(this); + this.Bb |= 1; + }; + _.Lj = function MUd() { + return zUd(this); + }; + _.qk = function NUd() { + var a; + return (a = zUd(this)), !!a && (a.Bb & ote) != 0; + }; + _.rk = function OUd() { + return (this.Bb & ote) != 0; + }; + _.sk = function PUd() { + return (this.Bb & Tje) != 0; + }; + _.nk = function QUd(a, b) { + this.c = null; + return zId(this, a, b); + }; + _.Ib = function RUd() { + var a; + if ((this.Db & 64) != 0) return gJd(this); + a = new Jfb(gJd(this)); + a.a += " (containment: "; + Ffb(a, (this.Bb & ote) != 0); + a.a += ", resolveProxies: "; + Ffb(a, (this.Bb & Tje) != 0); + a.a += ")"; + return a.a; + }; + var w6 = mdb(qte, "EReferenceImpl", 99); + bcb( + 548, + 115, + { + 105: 1, + 42: 1, + 92: 1, + 90: 1, + 133: 1, + 56: 1, + 108: 1, + 49: 1, + 97: 1, + 548: 1, + 114: 1, + 115: 1, + }, + XUd + ); + _.Fb = function bVd(a) { + return this === a; + }; + _.cd = function dVd() { + return this.b; + }; + _.dd = function eVd() { + return this.c; + }; + _.Hb = function fVd() { + return FCb(this); + }; + _.Uh = function hVd(a) { + SUd(this, GD(a)); + }; + _.ed = function iVd(a) { + return WUd(this, GD(a)); + }; + _._g = function YUd(a, b, c) { + var d; + switch (a) { + case 0: + return this.b; + case 1: + return this.c; + } + return bid( + this, + a - aLd((jGd(), fGd)), + XKd(((d = BD(Ajd(this, 16), 26)), !d ? fGd : d), a), + b, + c + ); + }; + _.lh = function ZUd(a) { + var b; + switch (a) { + case 0: + return this.b != null; + case 1: + return this.c != null; + } + return cid( + this, + a - aLd((jGd(), fGd)), + XKd(((b = BD(Ajd(this, 16), 26)), !b ? fGd : b), a) + ); + }; + _.sh = function $Ud(a, b) { + var c; + switch (a) { + case 0: + TUd(this, GD(b)); + return; + case 1: + VUd(this, GD(b)); + return; + } + did( + this, + a - aLd((jGd(), fGd)), + XKd(((c = BD(Ajd(this, 16), 26)), !c ? fGd : c), a), + b + ); + }; + _.zh = function _Ud() { + return jGd(), fGd; + }; + _.Bh = function aVd(a) { + var b; + switch (a) { + case 0: + UUd(this, null); + return; + case 1: + VUd(this, null); + return; + } + eid( + this, + a - aLd((jGd(), fGd)), + XKd(((b = BD(Ajd(this, 16), 26)), !b ? fGd : b), a) + ); + }; + _.Sh = function cVd() { + var a; + if (this.a == -1) { + a = this.b; + this.a = a == null ? 0 : LCb(a); + } + return this.a; + }; + _.Th = function gVd(a) { + this.a = a; + }; + _.Ib = function jVd() { + var a; + if ((this.Db & 64) != 0) return Eid(this); + a = new Jfb(Eid(this)); + a.a += " (key: "; + Efb(a, this.b); + a.a += ", value: "; + Efb(a, this.c); + a.a += ")"; + return a.a; + }; + _.a = -1; + _.b = null; + _.c = null; + var x6 = mdb(qte, "EStringToStringMapEntryImpl", 548); + var D9 = odb(yve, "FeatureMap/Entry/Internal"); + bcb(565, 1, Xve); + _.Ok = function mVd(a) { + return this.Pk(BD(a, 49)); + }; + _.Pk = function nVd(a) { + return this.Ok(a); + }; + _.Fb = function oVd(a) { + var b, c; + if (this === a) { + return true; + } else if (JD(a, 72)) { + b = BD(a, 72); + if (b.ak() == this.c) { + c = this.dd(); + return c == null ? b.dd() == null : pb(c, b.dd()); + } else { + return false; + } + } else { + return false; + } + }; + _.ak = function pVd() { + return this.c; + }; + _.Hb = function qVd() { + var a; + a = this.dd(); + return tb(this.c) ^ (a == null ? 0 : tb(a)); + }; + _.Ib = function rVd() { + var a, b; + a = this.c; + b = bKd(a.Hj()).Ph(); + a.ne(); + return ( + (b != null && b.length != 0 ? b + ":" + a.ne() : a.ne()) + + "=" + + this.dd() + ); + }; + var y6 = mdb(qte, "EStructuralFeatureImpl/BasicFeatureMapEntry", 565); + bcb(776, 565, Xve, uVd); + _.Pk = function vVd(a) { + return new uVd(this.c, a); + }; + _.dd = function wVd() { + return this.a; + }; + _.Qk = function xVd(a, b, c) { + return sVd(this, a, this.a, b, c); + }; + _.Rk = function yVd(a, b, c) { + return tVd(this, a, this.a, b, c); + }; + var z6 = mdb( + qte, + "EStructuralFeatureImpl/ContainmentUpdatingFeatureMapEntry", + 776 + ); + bcb(1314, 1, {}, zVd); + _.Pj = function AVd(a, b, c, d, e) { + var f; + f = BD(gid(a, this.b), 215); + return f.nl(this.a).Wj(d); + }; + _.Qj = function BVd(a, b, c, d, e) { + var f; + f = BD(gid(a, this.b), 215); + return f.el(this.a, d, e); + }; + _.Rj = function CVd(a, b, c, d, e) { + var f; + f = BD(gid(a, this.b), 215); + return f.fl(this.a, d, e); + }; + _.Sj = function DVd(a, b, c) { + var d; + d = BD(gid(a, this.b), 215); + return d.nl(this.a).fj(); + }; + _.Tj = function EVd(a, b, c, d) { + var e; + e = BD(gid(a, this.b), 215); + e.nl(this.a).Wb(d); + }; + _.Uj = function FVd(a, b, c) { + return BD(gid(a, this.b), 215).nl(this.a); + }; + _.Vj = function GVd(a, b, c) { + var d; + d = BD(gid(a, this.b), 215); + d.nl(this.a).Xj(); + }; + var A6 = mdb( + qte, + "EStructuralFeatureImpl/InternalSettingDelegateFeatureMapDelegator", + 1314 + ); + bcb(89, 1, {}, IVd, JVd, KVd, LVd); + _.Pj = function MVd(a, b, c, d, e) { + var f; + f = b.Ch(c); + f == null && b.Dh(c, (f = HVd(this, a))); + if (!e) { + switch (this.e) { + case 50: + case 41: + return BD(f, 589).sj(); + case 40: + return BD(f, 215).kl(); + } + } + return f; + }; + _.Qj = function NVd(a, b, c, d, e) { + var f, g; + g = b.Ch(c); + g == null && b.Dh(c, (g = HVd(this, a))); + f = BD(g, 69).lk(d, e); + return f; + }; + _.Rj = function OVd(a, b, c, d, e) { + var f; + f = b.Ch(c); + f != null && (e = BD(f, 69).mk(d, e)); + return e; + }; + _.Sj = function PVd(a, b, c) { + var d; + d = b.Ch(c); + return d != null && BD(d, 76).fj(); + }; + _.Tj = function QVd(a, b, c, d) { + var e; + e = BD(b.Ch(c), 76); + !e && b.Dh(c, (e = HVd(this, a))); + e.Wb(d); + }; + _.Uj = function RVd(a, b, c) { + var d, e; + e = b.Ch(c); + e == null && b.Dh(c, (e = HVd(this, a))); + if (JD(e, 76)) { + return BD(e, 76); + } else { + d = BD(b.Ch(c), 15); + return new iYd(d); + } + }; + _.Vj = function SVd(a, b, c) { + var d; + d = BD(b.Ch(c), 76); + !d && b.Dh(c, (d = HVd(this, a))); + d.Xj(); + }; + _.b = 0; + _.e = 0; + var B6 = mdb(qte, "EStructuralFeatureImpl/InternalSettingDelegateMany", 89); + bcb(504, 1, {}); + _.Qj = function WVd(a, b, c, d, e) { + throw vbb(new bgb()); + }; + _.Rj = function XVd(a, b, c, d, e) { + throw vbb(new bgb()); + }; + _.Uj = function YVd(a, b, c) { + return new ZVd(this, a, b, c); + }; + var TVd; + var i7 = mdb( + qte, + "EStructuralFeatureImpl/InternalSettingDelegateSingle", + 504 + ); + bcb(1331, 1, zve, ZVd); + _.Wj = function $Vd(a) { + return this.a.Pj(this.c, this.d, this.b, a, true); + }; + _.fj = function _Vd() { + return this.a.Sj(this.c, this.d, this.b); + }; + _.Wb = function aWd(a) { + this.a.Tj(this.c, this.d, this.b, a); + }; + _.Xj = function bWd() { + this.a.Vj(this.c, this.d, this.b); + }; + _.b = 0; + var C6 = mdb( + qte, + "EStructuralFeatureImpl/InternalSettingDelegateSingle/1", + 1331 + ); + bcb(769, 504, {}, cWd); + _.Pj = function dWd(a, b, c, d, e) { + return Nid(a, a.eh(), a.Vg()) == this.b + ? this.sk() && d + ? aid(a) + : a.eh() + : null; + }; + _.Qj = function eWd(a, b, c, d, e) { + var f, g; + !!a.eh() && + (e = ((f = a.Vg()), f >= 0 ? a.Qg(e) : a.eh().ih(a, -1 - f, null, e))); + g = bLd(a.Tg(), this.e); + return a.Sg(d, g, e); + }; + _.Rj = function fWd(a, b, c, d, e) { + var f; + f = bLd(a.Tg(), this.e); + return a.Sg(null, f, e); + }; + _.Sj = function gWd(a, b, c) { + var d; + d = bLd(a.Tg(), this.e); + return !!a.eh() && a.Vg() == d; + }; + _.Tj = function hWd(a, b, c, d) { + var e, f, g, h, i; + if (d != null && !fKd(this.a, d)) { + throw vbb( + new Cdb( + Yve + + (JD(d, 56) ? gLd(BD(d, 56).Tg()) : idb(rb(d))) + + Zve + + this.a + + "'" + ) + ); + } + e = a.eh(); + g = bLd(a.Tg(), this.e); + if (PD(d) !== PD(e) || (a.Vg() != g && d != null)) { + if (p6d(a, BD(d, 56))) throw vbb(new Wdb(ste + a.Ib())); + i = null; + !!e && + (i = + ((f = a.Vg()), f >= 0 ? a.Qg(i) : a.eh().ih(a, -1 - f, null, i))); + h = BD(d, 49); + !!h && (i = h.gh(a, bLd(h.Tg(), this.b), null, i)); + i = a.Sg(h, g, i); + !!i && i.Fi(); + } else { + a.Lg() && a.Mg() && Uhd(a, new nSd(a, 1, g, d, d)); + } + }; + _.Vj = function iWd(a, b, c) { + var d, e, f, g; + d = a.eh(); + if (d) { + g = + ((e = a.Vg()), + e >= 0 ? a.Qg(null) : a.eh().ih(a, -1 - e, null, null)); + f = bLd(a.Tg(), this.e); + g = a.Sg(null, f, g); + !!g && g.Fi(); + } else { + a.Lg() && a.Mg() && Uhd(a, new DSd(a, 1, this.e, null, null)); + } + }; + _.sk = function jWd() { + return false; + }; + var E6 = mdb( + qte, + "EStructuralFeatureImpl/InternalSettingDelegateSingleContainer", + 769 + ); + bcb(1315, 769, {}, kWd); + _.sk = function lWd() { + return true; + }; + var D6 = mdb( + qte, + "EStructuralFeatureImpl/InternalSettingDelegateSingleContainerResolving", + 1315 + ); + bcb(563, 504, {}); + _.Pj = function oWd(a, b, c, d, e) { + var f; + return (f = b.Ch(c)), f == null ? this.b : PD(f) === PD(TVd) ? null : f; + }; + _.Sj = function pWd(a, b, c) { + var d; + d = b.Ch(c); + return d != null && (PD(d) === PD(TVd) || !pb(d, this.b)); + }; + _.Tj = function qWd(a, b, c, d) { + var e, f; + if (a.Lg() && a.Mg()) { + e = ((f = b.Ch(c)), f == null ? this.b : PD(f) === PD(TVd) ? null : f); + if (d == null) { + if (this.c != null) { + b.Dh(c, null); + d = this.b; + } else this.b != null ? b.Dh(c, TVd) : b.Dh(c, null); + } else { + this.Sk(d); + b.Dh(c, d); + } + Uhd(a, this.d.Tk(a, 1, this.e, e, d)); + } else { + if (d == null) { + this.c != null + ? b.Dh(c, null) + : this.b != null + ? b.Dh(c, TVd) + : b.Dh(c, null); + } else { + this.Sk(d); + b.Dh(c, d); + } + } + }; + _.Vj = function rWd(a, b, c) { + var d, e; + if (a.Lg() && a.Mg()) { + d = ((e = b.Ch(c)), e == null ? this.b : PD(e) === PD(TVd) ? null : e); + b.Eh(c); + Uhd(a, this.d.Tk(a, 1, this.e, d, this.b)); + } else { + b.Eh(c); + } + }; + _.Sk = function sWd(a) { + throw vbb(new Bdb()); + }; + var T6 = mdb( + qte, + "EStructuralFeatureImpl/InternalSettingDelegateSingleData", + 563 + ); + bcb($ve, 1, {}, DWd); + _.Tk = function EWd(a, b, c, d, e) { + return new DSd(a, b, c, d, e); + }; + _.Uk = function FWd(a, b, c, d, e, f) { + return new FSd(a, b, c, d, e, f); + }; + var tWd, uWd, vWd, wWd, xWd, yWd, zWd, AWd, BWd; + var N6 = mdb( + qte, + "EStructuralFeatureImpl/InternalSettingDelegateSingleData/NotificationCreator", + $ve + ); + bcb(1332, $ve, {}, GWd); + _.Tk = function HWd(a, b, c, d, e) { + return new ISd(a, b, c, Ccb(DD(d)), Ccb(DD(e))); + }; + _.Uk = function IWd(a, b, c, d, e, f) { + return new JSd(a, b, c, Ccb(DD(d)), Ccb(DD(e)), f); + }; + var F6 = mdb( + qte, + "EStructuralFeatureImpl/InternalSettingDelegateSingleData/NotificationCreator/1", + 1332 + ); + bcb(1333, $ve, {}, JWd); + _.Tk = function KWd(a, b, c, d, e) { + return new rSd(a, b, c, BD(d, 217).a, BD(e, 217).a); + }; + _.Uk = function LWd(a, b, c, d, e, f) { + return new sSd(a, b, c, BD(d, 217).a, BD(e, 217).a, f); + }; + var G6 = mdb( + qte, + "EStructuralFeatureImpl/InternalSettingDelegateSingleData/NotificationCreator/2", + 1333 + ); + bcb(1334, $ve, {}, MWd); + _.Tk = function NWd(a, b, c, d, e) { + return new tSd(a, b, c, BD(d, 172).a, BD(e, 172).a); + }; + _.Uk = function OWd(a, b, c, d, e, f) { + return new uSd(a, b, c, BD(d, 172).a, BD(e, 172).a, f); + }; + var H6 = mdb( + qte, + "EStructuralFeatureImpl/InternalSettingDelegateSingleData/NotificationCreator/3", + 1334 + ); + bcb(1335, $ve, {}, PWd); + _.Tk = function QWd(a, b, c, d, e) { + return new vSd(a, b, c, Edb(ED(d)), Edb(ED(e))); + }; + _.Uk = function RWd(a, b, c, d, e, f) { + return new wSd(a, b, c, Edb(ED(d)), Edb(ED(e)), f); + }; + var I6 = mdb( + qte, + "EStructuralFeatureImpl/InternalSettingDelegateSingleData/NotificationCreator/4", + 1335 + ); + bcb(1336, $ve, {}, SWd); + _.Tk = function TWd(a, b, c, d, e) { + return new xSd(a, b, c, BD(d, 155).a, BD(e, 155).a); + }; + _.Uk = function UWd(a, b, c, d, e, f) { + return new ySd(a, b, c, BD(d, 155).a, BD(e, 155).a, f); + }; + var J6 = mdb( + qte, + "EStructuralFeatureImpl/InternalSettingDelegateSingleData/NotificationCreator/5", + 1336 + ); + bcb(1337, $ve, {}, VWd); + _.Tk = function WWd(a, b, c, d, e) { + return new zSd(a, b, c, BD(d, 19).a, BD(e, 19).a); + }; + _.Uk = function XWd(a, b, c, d, e, f) { + return new ASd(a, b, c, BD(d, 19).a, BD(e, 19).a, f); + }; + var K6 = mdb( + qte, + "EStructuralFeatureImpl/InternalSettingDelegateSingleData/NotificationCreator/6", + 1337 + ); + bcb(1338, $ve, {}, YWd); + _.Tk = function ZWd(a, b, c, d, e) { + return new BSd(a, b, c, BD(d, 162).a, BD(e, 162).a); + }; + _.Uk = function $Wd(a, b, c, d, e, f) { + return new CSd(a, b, c, BD(d, 162).a, BD(e, 162).a, f); + }; + var L6 = mdb( + qte, + "EStructuralFeatureImpl/InternalSettingDelegateSingleData/NotificationCreator/7", + 1338 + ); + bcb(1339, $ve, {}, _Wd); + _.Tk = function aXd(a, b, c, d, e) { + return new GSd(a, b, c, BD(d, 184).a, BD(e, 184).a); + }; + _.Uk = function bXd(a, b, c, d, e, f) { + return new HSd(a, b, c, BD(d, 184).a, BD(e, 184).a, f); + }; + var M6 = mdb( + qte, + "EStructuralFeatureImpl/InternalSettingDelegateSingleData/NotificationCreator/8", + 1339 + ); + bcb(1317, 563, {}, cXd); + _.Sk = function dXd(a) { + if (!this.a.wj(a)) { + throw vbb(new Cdb(Yve + rb(a) + Zve + this.a + "'")); + } + }; + var O6 = mdb( + qte, + "EStructuralFeatureImpl/InternalSettingDelegateSingleDataDynamic", + 1317 + ); + bcb(1318, 563, {}, eXd); + _.Sk = function fXd(a) {}; + var P6 = mdb( + qte, + "EStructuralFeatureImpl/InternalSettingDelegateSingleDataStatic", + 1318 + ); + bcb(770, 563, {}); + _.Sj = function gXd(a, b, c) { + var d; + d = b.Ch(c); + return d != null; + }; + _.Tj = function hXd(a, b, c, d) { + var e, f; + if (a.Lg() && a.Mg()) { + e = true; + f = b.Ch(c); + if (f == null) { + e = false; + f = this.b; + } else PD(f) === PD(TVd) && (f = null); + if (d == null) { + if (this.c != null) { + b.Dh(c, null); + d = this.b; + } else { + b.Dh(c, TVd); + } + } else { + this.Sk(d); + b.Dh(c, d); + } + Uhd(a, this.d.Uk(a, 1, this.e, f, d, !e)); + } else { + if (d == null) { + this.c != null ? b.Dh(c, null) : b.Dh(c, TVd); + } else { + this.Sk(d); + b.Dh(c, d); + } + } + }; + _.Vj = function iXd(a, b, c) { + var d, e; + if (a.Lg() && a.Mg()) { + d = true; + e = b.Ch(c); + if (e == null) { + d = false; + e = this.b; + } else PD(e) === PD(TVd) && (e = null); + b.Eh(c); + Uhd(a, this.d.Uk(a, 2, this.e, e, this.b, d)); + } else { + b.Eh(c); + } + }; + var S6 = mdb( + qte, + "EStructuralFeatureImpl/InternalSettingDelegateSingleDataUnsettable", + 770 + ); + bcb(1319, 770, {}, jXd); + _.Sk = function kXd(a) { + if (!this.a.wj(a)) { + throw vbb(new Cdb(Yve + rb(a) + Zve + this.a + "'")); + } + }; + var Q6 = mdb( + qte, + "EStructuralFeatureImpl/InternalSettingDelegateSingleDataUnsettableDynamic", + 1319 + ); + bcb(1320, 770, {}, lXd); + _.Sk = function mXd(a) {}; + var R6 = mdb( + qte, + "EStructuralFeatureImpl/InternalSettingDelegateSingleDataUnsettableStatic", + 1320 + ); + bcb(398, 504, {}, nXd); + _.Pj = function pXd(a, b, c, d, e) { + var f, g, h, i, j; + j = b.Ch(c); + if (this.Kj() && PD(j) === PD(TVd)) { + return null; + } else if (this.sk() && d && j != null) { + h = BD(j, 49); + if (h.kh()) { + i = xid(a, h); + if (h != i) { + if (!fKd(this.a, i)) { + throw vbb(new Cdb(Yve + rb(i) + Zve + this.a + "'")); + } + b.Dh(c, (j = i)); + if (this.rk()) { + f = BD(i, 49); + g = h.ih( + a, + !this.b ? -1 - bLd(a.Tg(), this.e) : bLd(h.Tg(), this.b), + null, + null + ); + !f.eh() && + (g = f.gh( + a, + !this.b ? -1 - bLd(a.Tg(), this.e) : bLd(f.Tg(), this.b), + null, + g + )); + !!g && g.Fi(); + } + a.Lg() && a.Mg() && Uhd(a, new DSd(a, 9, this.e, h, i)); + } + } + return j; + } else { + return j; + } + }; + _.Qj = function qXd(a, b, c, d, e) { + var f, g; + g = b.Ch(c); + PD(g) === PD(TVd) && (g = null); + b.Dh(c, d); + if (this.bj()) { + if (PD(g) !== PD(d) && g != null) { + f = BD(g, 49); + e = f.ih(a, bLd(f.Tg(), this.b), null, e); + } + } else + this.rk() && + g != null && + (e = BD(g, 49).ih(a, -1 - bLd(a.Tg(), this.e), null, e)); + if (a.Lg() && a.Mg()) { + !e && (e = new Ixd(4)); + e.Ei(new DSd(a, 1, this.e, g, d)); + } + return e; + }; + _.Rj = function rXd(a, b, c, d, e) { + var f; + f = b.Ch(c); + PD(f) === PD(TVd) && (f = null); + b.Eh(c); + if (a.Lg() && a.Mg()) { + !e && (e = new Ixd(4)); + this.Kj() + ? e.Ei(new DSd(a, 2, this.e, f, null)) + : e.Ei(new DSd(a, 1, this.e, f, null)); + } + return e; + }; + _.Sj = function sXd(a, b, c) { + var d; + d = b.Ch(c); + return d != null; + }; + _.Tj = function tXd(a, b, c, d) { + var e, f, g, h, i; + if (d != null && !fKd(this.a, d)) { + throw vbb( + new Cdb( + Yve + + (JD(d, 56) ? gLd(BD(d, 56).Tg()) : idb(rb(d))) + + Zve + + this.a + + "'" + ) + ); + } + i = b.Ch(c); + h = i != null; + this.Kj() && PD(i) === PD(TVd) && (i = null); + g = null; + if (this.bj()) { + if (PD(i) !== PD(d)) { + if (i != null) { + e = BD(i, 49); + g = e.ih(a, bLd(e.Tg(), this.b), null, g); + } + if (d != null) { + e = BD(d, 49); + g = e.gh(a, bLd(e.Tg(), this.b), null, g); + } + } + } else if (this.rk()) { + if (PD(i) !== PD(d)) { + i != null && (g = BD(i, 49).ih(a, -1 - bLd(a.Tg(), this.e), null, g)); + d != null && (g = BD(d, 49).gh(a, -1 - bLd(a.Tg(), this.e), null, g)); + } + } + d == null && this.Kj() ? b.Dh(c, TVd) : b.Dh(c, d); + if (a.Lg() && a.Mg()) { + f = new FSd(a, 1, this.e, i, d, this.Kj() && !h); + if (!g) { + Uhd(a, f); + } else { + g.Ei(f); + g.Fi(); + } + } else !!g && g.Fi(); + }; + _.Vj = function uXd(a, b, c) { + var d, e, f, g, h; + h = b.Ch(c); + g = h != null; + this.Kj() && PD(h) === PD(TVd) && (h = null); + f = null; + if (h != null) { + if (this.bj()) { + d = BD(h, 49); + f = d.ih(a, bLd(d.Tg(), this.b), null, f); + } else + this.rk() && (f = BD(h, 49).ih(a, -1 - bLd(a.Tg(), this.e), null, f)); + } + b.Eh(c); + if (a.Lg() && a.Mg()) { + e = new FSd(a, this.Kj() ? 2 : 1, this.e, h, null, g); + if (!f) { + Uhd(a, e); + } else { + f.Ei(e); + f.Fi(); + } + } else !!f && f.Fi(); + }; + _.bj = function vXd() { + return false; + }; + _.rk = function wXd() { + return false; + }; + _.sk = function xXd() { + return false; + }; + _.Kj = function yXd() { + return false; + }; + var h7 = mdb( + qte, + "EStructuralFeatureImpl/InternalSettingDelegateSingleEObject", + 398 + ); + bcb(564, 398, {}, zXd); + _.rk = function AXd() { + return true; + }; + var _6 = mdb( + qte, + "EStructuralFeatureImpl/InternalSettingDelegateSingleEObjectContainment", + 564 + ); + bcb(1323, 564, {}, BXd); + _.sk = function CXd() { + return true; + }; + var U6 = mdb( + qte, + "EStructuralFeatureImpl/InternalSettingDelegateSingleEObjectContainmentResolving", + 1323 + ); + bcb(772, 564, {}, DXd); + _.Kj = function EXd() { + return true; + }; + var W6 = mdb( + qte, + "EStructuralFeatureImpl/InternalSettingDelegateSingleEObjectContainmentUnsettable", + 772 + ); + bcb(1325, 772, {}, FXd); + _.sk = function GXd() { + return true; + }; + var V6 = mdb( + qte, + "EStructuralFeatureImpl/InternalSettingDelegateSingleEObjectContainmentUnsettableResolving", + 1325 + ); + bcb(640, 564, {}, HXd); + _.bj = function IXd() { + return true; + }; + var $6 = mdb( + qte, + "EStructuralFeatureImpl/InternalSettingDelegateSingleEObjectContainmentWithInverse", + 640 + ); + bcb(1324, 640, {}, JXd); + _.sk = function KXd() { + return true; + }; + var X6 = mdb( + qte, + "EStructuralFeatureImpl/InternalSettingDelegateSingleEObjectContainmentWithInverseResolving", + 1324 + ); + bcb(773, 640, {}, LXd); + _.Kj = function MXd() { + return true; + }; + var Z6 = mdb( + qte, + "EStructuralFeatureImpl/InternalSettingDelegateSingleEObjectContainmentWithInverseUnsettable", + 773 + ); + bcb(1326, 773, {}, NXd); + _.sk = function OXd() { + return true; + }; + var Y6 = mdb( + qte, + "EStructuralFeatureImpl/InternalSettingDelegateSingleEObjectContainmentWithInverseUnsettableResolving", + 1326 + ); + bcb(641, 398, {}, PXd); + _.sk = function QXd() { + return true; + }; + var d7 = mdb( + qte, + "EStructuralFeatureImpl/InternalSettingDelegateSingleEObjectResolving", + 641 + ); + bcb(1327, 641, {}, RXd); + _.Kj = function SXd() { + return true; + }; + var a7 = mdb( + qte, + "EStructuralFeatureImpl/InternalSettingDelegateSingleEObjectResolvingUnsettable", + 1327 + ); + bcb(774, 641, {}, TXd); + _.bj = function UXd() { + return true; + }; + var c7 = mdb( + qte, + "EStructuralFeatureImpl/InternalSettingDelegateSingleEObjectResolvingWithInverse", + 774 + ); + bcb(1328, 774, {}, VXd); + _.Kj = function WXd() { + return true; + }; + var b7 = mdb( + qte, + "EStructuralFeatureImpl/InternalSettingDelegateSingleEObjectResolvingWithInverseUnsettable", + 1328 + ); + bcb(1321, 398, {}, XXd); + _.Kj = function YXd() { + return true; + }; + var e7 = mdb( + qte, + "EStructuralFeatureImpl/InternalSettingDelegateSingleEObjectUnsettable", + 1321 + ); + bcb(771, 398, {}, ZXd); + _.bj = function $Xd() { + return true; + }; + var g7 = mdb( + qte, + "EStructuralFeatureImpl/InternalSettingDelegateSingleEObjectWithInverse", + 771 + ); + bcb(1322, 771, {}, _Xd); + _.Kj = function aYd() { + return true; + }; + var f7 = mdb( + qte, + "EStructuralFeatureImpl/InternalSettingDelegateSingleEObjectWithInverseUnsettable", + 1322 + ); + bcb(775, 565, Xve, dYd); + _.Pk = function eYd(a) { + return new dYd(this.a, this.c, a); + }; + _.dd = function fYd() { + return this.b; + }; + _.Qk = function gYd(a, b, c) { + return bYd(this, a, this.b, c); + }; + _.Rk = function hYd(a, b, c) { + return cYd(this, a, this.b, c); + }; + var j7 = mdb( + qte, + "EStructuralFeatureImpl/InverseUpdatingFeatureMapEntry", + 775 + ); + bcb(1329, 1, zve, iYd); + _.Wj = function jYd(a) { + return this.a; + }; + _.fj = function kYd() { + return JD(this.a, 95) ? BD(this.a, 95).fj() : !this.a.dc(); + }; + _.Wb = function lYd(a) { + this.a.$b(); + this.a.Gc(BD(a, 15)); + }; + _.Xj = function mYd() { + JD(this.a, 95) ? BD(this.a, 95).Xj() : this.a.$b(); + }; + var k7 = mdb(qte, "EStructuralFeatureImpl/SettingMany", 1329); + bcb(1330, 565, Xve, nYd); + _.Ok = function oYd(a) { + return new sYd((Q8d(), P8d), this.b.Ih(this.a, a)); + }; + _.dd = function pYd() { + return null; + }; + _.Qk = function qYd(a, b, c) { + return c; + }; + _.Rk = function rYd(a, b, c) { + return c; + }; + var l7 = mdb( + qte, + "EStructuralFeatureImpl/SimpleContentFeatureMapEntry", + 1330 + ); + bcb(642, 565, Xve, sYd); + _.Ok = function tYd(a) { + return new sYd(this.c, a); + }; + _.dd = function uYd() { + return this.a; + }; + _.Qk = function vYd(a, b, c) { + return c; + }; + _.Rk = function wYd(a, b, c) { + return c; + }; + var m7 = mdb(qte, "EStructuralFeatureImpl/SimpleFeatureMapEntry", 642); + bcb(391, 497, oue, xYd); + _.ri = function yYd(a) { + return KC(c5, Uhe, 26, a, 0, 1); + }; + _.ni = function zYd() { + return false; + }; + var o7 = mdb(qte, "ESuperAdapter/1", 391); + bcb( + 444, + 438, + { + 105: 1, + 92: 1, + 90: 1, + 147: 1, + 191: 1, + 56: 1, + 108: 1, + 836: 1, + 49: 1, + 97: 1, + 150: 1, + 444: 1, + 114: 1, + 115: 1, + }, + BYd + ); + _._g = function CYd(a, b, c) { + var d; + switch (a) { + case 0: + return !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)), this.Ab; + case 1: + return this.zb; + case 2: + return !this.a && (this.a = new KYd(this, j5, this)), this.a; + } + return bid( + this, + a - aLd((jGd(), iGd)), + XKd(((d = BD(Ajd(this, 16), 26)), !d ? iGd : d), a), + b, + c + ); + }; + _.jh = function DYd(a, b, c) { + var d, e; + switch (b) { + case 0: + return ( + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)), Txd(this.Ab, a, c) + ); + case 2: + return ( + !this.a && (this.a = new KYd(this, j5, this)), Txd(this.a, a, c) + ); + } + return ( + (e = BD( + XKd(((d = BD(Ajd(this, 16), 26)), !d ? (jGd(), iGd) : d), b), + 66 + )), + e.Nj().Rj(this, yjd(this), b - aLd((jGd(), iGd)), a, c) + ); + }; + _.lh = function EYd(a) { + var b; + switch (a) { + case 0: + return !!this.Ab && this.Ab.i != 0; + case 1: + return this.zb != null; + case 2: + return !!this.a && this.a.i != 0; + } + return cid( + this, + a - aLd((jGd(), iGd)), + XKd(((b = BD(Ajd(this, 16), 26)), !b ? iGd : b), a) + ); + }; + _.sh = function FYd(a, b) { + var c; + switch (a) { + case 0: + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + Uxd(this.Ab); + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + ytd(this.Ab, BD(b, 14)); + return; + case 1: + pnd(this, GD(b)); + return; + case 2: + !this.a && (this.a = new KYd(this, j5, this)); + Uxd(this.a); + !this.a && (this.a = new KYd(this, j5, this)); + ytd(this.a, BD(b, 14)); + return; + } + did( + this, + a - aLd((jGd(), iGd)), + XKd(((c = BD(Ajd(this, 16), 26)), !c ? iGd : c), a), + b + ); + }; + _.zh = function GYd() { + return jGd(), iGd; + }; + _.Bh = function HYd(a) { + var b; + switch (a) { + case 0: + !this.Ab && (this.Ab = new cUd(a5, this, 0, 3)); + Uxd(this.Ab); + return; + case 1: + pnd(this, null); + return; + case 2: + !this.a && (this.a = new KYd(this, j5, this)); + Uxd(this.a); + return; + } + eid( + this, + a - aLd((jGd(), iGd)), + XKd(((b = BD(Ajd(this, 16), 26)), !b ? iGd : b), a) + ); + }; + var u7 = mdb(qte, "ETypeParameterImpl", 444); + bcb(445, 85, Pve, KYd); + _.cj = function LYd(a, b) { + return IYd(this, BD(a, 87), b); + }; + _.dj = function MYd(a, b) { + return JYd(this, BD(a, 87), b); + }; + var q7 = mdb(qte, "ETypeParameterImpl/1", 445); + bcb(634, 43, fke, NYd); + _.ec = function OYd() { + return new RYd(this); + }; + var t7 = mdb(qte, "ETypeParameterImpl/2", 634); + bcb(556, eie, fie, RYd); + _.Fc = function SYd(a) { + return PYd(this, BD(a, 87)); + }; + _.Gc = function TYd(a) { + var b, c, d; + d = false; + for (c = a.Kc(); c.Ob(); ) { + b = BD(c.Pb(), 87); + Rhb(this.a, b, "") == null && (d = true); + } + return d; + }; + _.$b = function UYd() { + Uhb(this.a); + }; + _.Hc = function VYd(a) { + return Mhb(this.a, a); + }; + _.Kc = function WYd() { + var a; + return (a = new nib(new eib(this.a).a)), new ZYd(a); + }; + _.Mc = function XYd(a) { + return QYd(this, a); + }; + _.gc = function YYd() { + return Vhb(this.a); + }; + var s7 = mdb(qte, "ETypeParameterImpl/2/1", 556); + bcb(557, 1, aie, ZYd); + _.Nb = function $Yd(a) { + Rrb(this, a); + }; + _.Pb = function aZd() { + return BD(lib(this.a).cd(), 87); + }; + _.Ob = function _Yd() { + return this.a.b; + }; + _.Qb = function bZd() { + mib(this.a); + }; + var r7 = mdb(qte, "ETypeParameterImpl/2/1/1", 557); + bcb(1276, 43, fke, cZd); + _._b = function dZd(a) { + return ND(a) ? Qhb(this, a) : !!irb(this.f, a); + }; + _.xc = function eZd(a) { + var b, c; + b = ND(a) ? Phb(this, a) : Wd(irb(this.f, a)); + if (JD(b, 837)) { + c = BD(b, 837); + b = c._j(); + Rhb(this, BD(a, 235), b); + return b; + } else return b != null ? b : a == null ? (g5d(), f5d) : null; + }; + var w7 = mdb(qte, "EValidatorRegistryImpl", 1276); + bcb( + 1313, + 704, + { + 105: 1, + 92: 1, + 90: 1, + 471: 1, + 147: 1, + 56: 1, + 108: 1, + 1941: 1, + 49: 1, + 97: 1, + 150: 1, + 114: 1, + 115: 1, + }, + mZd + ); + _.Ih = function nZd(a, b) { + switch (a.yj()) { + case 21: + case 22: + case 23: + case 24: + case 26: + case 31: + case 32: + case 37: + case 38: + case 39: + case 40: + case 43: + case 44: + case 48: + case 49: + case 20: + return b == null ? null : fcb(b); + case 25: + return gZd(b); + case 27: + return hZd(b); + case 28: + return iZd(b); + case 29: + return b == null ? null : CQd(Pmd[0], BD(b, 199)); + case 41: + return b == null ? "" : hdb(BD(b, 290)); + case 42: + return fcb(b); + case 50: + return GD(b); + default: + throw vbb(new Wdb(tte + a.ne() + ute)); + } + }; + _.Jh = function oZd(a) { + var b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q; + switch ( + (a.G == -1 && (a.G = ((m = bKd(a)), m ? HLd(m.Mh(), a) : -1)), a.G) + ) { + case 0: + return (c = new OJd()), c; + case 1: + return (b = new RHd()), b; + case 2: + return (d = new hLd()), d; + case 4: + return (e = new MPd()), e; + case 5: + return (f = new aQd()), f; + case 6: + return (g = new rQd()), g; + case 7: + return (h = new $md()), h; + case 10: + return (j = new MGd()), j; + case 11: + return (k = new SSd()), k; + case 12: + return (l = new eod()), l; + case 13: + return (n = new rUd()), n; + case 14: + return (o = new FUd()), o; + case 17: + return (p = new XUd()), p; + case 18: + return (i = new UQd()), i; + case 19: + return (q = new BYd()), q; + default: + throw vbb(new Wdb(xte + a.zb + ute)); + } + }; + _.Kh = function pZd(a, b) { + switch (a.yj()) { + case 20: + return b == null ? null : new tgb(b); + case 21: + return b == null ? null : new Ygb(b); + case 23: + case 22: + return b == null ? null : fZd(b); + case 26: + case 24: + return b == null ? null : Scb((Icb(b, -128, 127) << 24) >> 24); + case 25: + return Xmd(b); + case 27: + return jZd(b); + case 28: + return kZd(b); + case 29: + return lZd(b); + case 32: + case 31: + return b == null ? null : Hcb(b); + case 38: + case 37: + return b == null ? null : new Odb(b); + case 40: + case 39: + return b == null ? null : meb(Icb(b, Rie, Ohe)); + case 41: + return null; + case 42: + return b == null ? null : null; + case 44: + case 43: + return b == null ? null : Aeb(Jcb(b)); + case 49: + case 48: + return b == null ? null : Web((Icb(b, awe, 32767) << 16) >> 16); + case 50: + return b; + default: + throw vbb(new Wdb(tte + a.ne() + ute)); + } + }; + var x7 = mdb(qte, "EcoreFactoryImpl", 1313); + bcb( + 547, + 179, + { + 105: 1, + 92: 1, + 90: 1, + 147: 1, + 191: 1, + 56: 1, + 235: 1, + 108: 1, + 1939: 1, + 49: 1, + 97: 1, + 150: 1, + 179: 1, + 547: 1, + 114: 1, + 115: 1, + 675: 1, + }, + AZd + ); + _.gb = false; + _.hb = false; + var rZd, + sZd = false; + var o8 = mdb(qte, "EcorePackageImpl", 547); + bcb(1184, 1, { 837: 1 }, EZd); + _._j = function FZd() { + return I6d(), H6d; + }; + var I7 = mdb(qte, "EcorePackageImpl/1", 1184); + bcb(1193, 1, nwe, GZd); + _.wj = function HZd(a) { + return JD(a, 147); + }; + _.xj = function IZd(a) { + return KC(k5, Uhe, 147, a, 0, 1); + }; + var y7 = mdb(qte, "EcorePackageImpl/10", 1193); + bcb(1194, 1, nwe, JZd); + _.wj = function KZd(a) { + return JD(a, 191); + }; + _.xj = function LZd(a) { + return KC(l5, Uhe, 191, a, 0, 1); + }; + var z7 = mdb(qte, "EcorePackageImpl/11", 1194); + bcb(1195, 1, nwe, MZd); + _.wj = function NZd(a) { + return JD(a, 56); + }; + _.xj = function OZd(a) { + return KC(m5, Uhe, 56, a, 0, 1); + }; + var A7 = mdb(qte, "EcorePackageImpl/12", 1195); + bcb(1196, 1, nwe, PZd); + _.wj = function QZd(a) { + return JD(a, 399); + }; + _.xj = function RZd(a) { + return KC(n5, Nve, 59, a, 0, 1); + }; + var B7 = mdb(qte, "EcorePackageImpl/13", 1196); + bcb(1197, 1, nwe, SZd); + _.wj = function TZd(a) { + return JD(a, 235); + }; + _.xj = function UZd(a) { + return KC(o5, Uhe, 235, a, 0, 1); + }; + var C7 = mdb(qte, "EcorePackageImpl/14", 1197); + bcb(1198, 1, nwe, VZd); + _.wj = function WZd(a) { + return JD(a, 509); + }; + _.xj = function XZd(a) { + return KC(p5, Uhe, 2017, a, 0, 1); + }; + var D7 = mdb(qte, "EcorePackageImpl/15", 1198); + bcb(1199, 1, nwe, YZd); + _.wj = function ZZd(a) { + return JD(a, 99); + }; + _.xj = function $Zd(a) { + return KC(q5, Mve, 18, a, 0, 1); + }; + var E7 = mdb(qte, "EcorePackageImpl/16", 1199); + bcb(1200, 1, nwe, _Zd); + _.wj = function a$d(a) { + return JD(a, 170); + }; + _.xj = function b$d(a) { + return KC(t5, Mve, 170, a, 0, 1); + }; + var F7 = mdb(qte, "EcorePackageImpl/17", 1200); + bcb(1201, 1, nwe, c$d); + _.wj = function d$d(a) { + return JD(a, 472); + }; + _.xj = function e$d(a) { + return KC(v5, Uhe, 472, a, 0, 1); + }; + var G7 = mdb(qte, "EcorePackageImpl/18", 1201); + bcb(1202, 1, nwe, f$d); + _.wj = function g$d(a) { + return JD(a, 548); + }; + _.xj = function h$d(a) { + return KC(x6, kve, 548, a, 0, 1); + }; + var H7 = mdb(qte, "EcorePackageImpl/19", 1202); + bcb(1185, 1, nwe, i$d); + _.wj = function j$d(a) { + return JD(a, 322); + }; + _.xj = function k$d(a) { + return KC(b5, Mve, 34, a, 0, 1); + }; + var T7 = mdb(qte, "EcorePackageImpl/2", 1185); + bcb(1203, 1, nwe, l$d); + _.wj = function m$d(a) { + return JD(a, 241); + }; + _.xj = function n$d(a) { + return KC(j5, Tve, 87, a, 0, 1); + }; + var J7 = mdb(qte, "EcorePackageImpl/20", 1203); + bcb(1204, 1, nwe, o$d); + _.wj = function p$d(a) { + return JD(a, 444); + }; + _.xj = function q$d(a) { + return KC(u5, Uhe, 836, a, 0, 1); + }; + var K7 = mdb(qte, "EcorePackageImpl/21", 1204); + bcb(1205, 1, nwe, r$d); + _.wj = function s$d(a) { + return KD(a); + }; + _.xj = function t$d(a) { + return KC(wI, nie, 476, a, 8, 1); + }; + var L7 = mdb(qte, "EcorePackageImpl/22", 1205); + bcb(1206, 1, nwe, u$d); + _.wj = function v$d(a) { + return JD(a, 190); + }; + _.xj = function w$d(a) { + return KC(SD, nie, 190, a, 0, 2); + }; + var M7 = mdb(qte, "EcorePackageImpl/23", 1206); + bcb(1207, 1, nwe, x$d); + _.wj = function y$d(a) { + return JD(a, 217); + }; + _.xj = function z$d(a) { + return KC(xI, nie, 217, a, 0, 1); + }; + var N7 = mdb(qte, "EcorePackageImpl/24", 1207); + bcb(1208, 1, nwe, A$d); + _.wj = function B$d(a) { + return JD(a, 172); + }; + _.xj = function C$d(a) { + return KC(yI, nie, 172, a, 0, 1); + }; + var O7 = mdb(qte, "EcorePackageImpl/25", 1208); + bcb(1209, 1, nwe, D$d); + _.wj = function E$d(a) { + return JD(a, 199); + }; + _.xj = function F$d(a) { + return KC($J, nie, 199, a, 0, 1); + }; + var P7 = mdb(qte, "EcorePackageImpl/26", 1209); + bcb(1210, 1, nwe, G$d); + _.wj = function H$d(a) { + return false; + }; + _.xj = function I$d(a) { + return KC(O4, Uhe, 2110, a, 0, 1); + }; + var Q7 = mdb(qte, "EcorePackageImpl/27", 1210); + bcb(1211, 1, nwe, J$d); + _.wj = function K$d(a) { + return LD(a); + }; + _.xj = function L$d(a) { + return KC(BI, nie, 333, a, 7, 1); + }; + var R7 = mdb(qte, "EcorePackageImpl/28", 1211); + bcb(1212, 1, nwe, M$d); + _.wj = function N$d(a) { + return JD(a, 58); + }; + _.xj = function O$d(a) { + return KC(T4, eme, 58, a, 0, 1); + }; + var S7 = mdb(qte, "EcorePackageImpl/29", 1212); + bcb(1186, 1, nwe, P$d); + _.wj = function Q$d(a) { + return JD(a, 510); + }; + _.xj = function R$d(a) { + return KC(a5, { 3: 1, 4: 1, 5: 1, 1934: 1 }, 590, a, 0, 1); + }; + var c8 = mdb(qte, "EcorePackageImpl/3", 1186); + bcb(1213, 1, nwe, S$d); + _.wj = function T$d(a) { + return JD(a, 573); + }; + _.xj = function U$d(a) { + return KC(U4, Uhe, 1940, a, 0, 1); + }; + var U7 = mdb(qte, "EcorePackageImpl/30", 1213); + bcb(1214, 1, nwe, V$d); + _.wj = function W$d(a) { + return JD(a, 153); + }; + _.xj = function X$d(a) { + return KC(O9, eme, 153, a, 0, 1); + }; + var V7 = mdb(qte, "EcorePackageImpl/31", 1214); + bcb(1215, 1, nwe, Y$d); + _.wj = function Z$d(a) { + return JD(a, 72); + }; + _.xj = function $$d(a) { + return KC(E9, owe, 72, a, 0, 1); + }; + var W7 = mdb(qte, "EcorePackageImpl/32", 1215); + bcb(1216, 1, nwe, _$d); + _.wj = function a_d(a) { + return JD(a, 155); + }; + _.xj = function b_d(a) { + return KC(FI, nie, 155, a, 0, 1); + }; + var X7 = mdb(qte, "EcorePackageImpl/33", 1216); + bcb(1217, 1, nwe, c_d); + _.wj = function d_d(a) { + return JD(a, 19); + }; + _.xj = function e_d(a) { + return KC(JI, nie, 19, a, 0, 1); + }; + var Y7 = mdb(qte, "EcorePackageImpl/34", 1217); + bcb(1218, 1, nwe, f_d); + _.wj = function g_d(a) { + return JD(a, 290); + }; + _.xj = function h_d(a) { + return KC(AI, Uhe, 290, a, 0, 1); + }; + var Z7 = mdb(qte, "EcorePackageImpl/35", 1218); + bcb(1219, 1, nwe, i_d); + _.wj = function j_d(a) { + return JD(a, 162); + }; + _.xj = function k_d(a) { + return KC(MI, nie, 162, a, 0, 1); + }; + var $7 = mdb(qte, "EcorePackageImpl/36", 1219); + bcb(1220, 1, nwe, l_d); + _.wj = function m_d(a) { + return JD(a, 83); + }; + _.xj = function n_d(a) { + return KC(DK, Uhe, 83, a, 0, 1); + }; + var _7 = mdb(qte, "EcorePackageImpl/37", 1220); + bcb(1221, 1, nwe, o_d); + _.wj = function p_d(a) { + return JD(a, 591); + }; + _.xj = function q_d(a) { + return KC(v8, Uhe, 591, a, 0, 1); + }; + var a8 = mdb(qte, "EcorePackageImpl/38", 1221); + bcb(1222, 1, nwe, r_d); + _.wj = function s_d(a) { + return false; + }; + _.xj = function t_d(a) { + return KC(u8, Uhe, 2111, a, 0, 1); + }; + var b8 = mdb(qte, "EcorePackageImpl/39", 1222); + bcb(1187, 1, nwe, u_d); + _.wj = function v_d(a) { + return JD(a, 88); + }; + _.xj = function w_d(a) { + return KC(c5, Uhe, 26, a, 0, 1); + }; + var i8 = mdb(qte, "EcorePackageImpl/4", 1187); + bcb(1223, 1, nwe, x_d); + _.wj = function y_d(a) { + return JD(a, 184); + }; + _.xj = function z_d(a) { + return KC(UI, nie, 184, a, 0, 1); + }; + var d8 = mdb(qte, "EcorePackageImpl/40", 1223); + bcb(1224, 1, nwe, A_d); + _.wj = function B_d(a) { + return ND(a); + }; + _.xj = function C_d(a) { + return KC(ZI, nie, 2, a, 6, 1); + }; + var e8 = mdb(qte, "EcorePackageImpl/41", 1224); + bcb(1225, 1, nwe, D_d); + _.wj = function E_d(a) { + return JD(a, 588); + }; + _.xj = function F_d(a) { + return KC(X4, Uhe, 588, a, 0, 1); + }; + var f8 = mdb(qte, "EcorePackageImpl/42", 1225); + bcb(1226, 1, nwe, G_d); + _.wj = function H_d(a) { + return false; + }; + _.xj = function I_d(a) { + return KC(V4, nie, 2112, a, 0, 1); + }; + var g8 = mdb(qte, "EcorePackageImpl/43", 1226); + bcb(1227, 1, nwe, J_d); + _.wj = function K_d(a) { + return JD(a, 42); + }; + _.xj = function L_d(a) { + return KC(CK, zie, 42, a, 0, 1); + }; + var h8 = mdb(qte, "EcorePackageImpl/44", 1227); + bcb(1188, 1, nwe, M_d); + _.wj = function N_d(a) { + return JD(a, 138); + }; + _.xj = function O_d(a) { + return KC(d5, Uhe, 138, a, 0, 1); + }; + var j8 = mdb(qte, "EcorePackageImpl/5", 1188); + bcb(1189, 1, nwe, P_d); + _.wj = function Q_d(a) { + return JD(a, 148); + }; + _.xj = function R_d(a) { + return KC(f5, Uhe, 148, a, 0, 1); + }; + var k8 = mdb(qte, "EcorePackageImpl/6", 1189); + bcb(1190, 1, nwe, S_d); + _.wj = function T_d(a) { + return JD(a, 457); + }; + _.xj = function U_d(a) { + return KC(h5, Uhe, 671, a, 0, 1); + }; + var l8 = mdb(qte, "EcorePackageImpl/7", 1190); + bcb(1191, 1, nwe, V_d); + _.wj = function W_d(a) { + return JD(a, 573); + }; + _.xj = function X_d(a) { + return KC(g5, Uhe, 678, a, 0, 1); + }; + var m8 = mdb(qte, "EcorePackageImpl/8", 1191); + bcb(1192, 1, nwe, Y_d); + _.wj = function Z_d(a) { + return JD(a, 471); + }; + _.xj = function $_d(a) { + return KC(i5, Uhe, 471, a, 0, 1); + }; + var n8 = mdb(qte, "EcorePackageImpl/9", 1192); + bcb(1025, 1982, ive, c0d); + _.bi = function d0d(a, b) { + __d(this, BD(b, 415)); + }; + _.fi = function e0d(a, b) { + a0d(this, a, BD(b, 415)); + }; + var q8 = mdb(qte, "MinimalEObjectImpl/1ArrayDelegatingAdapterList", 1025); + bcb(1026, 143, fve, f0d); + _.Ai = function g0d() { + return this.a.a; + }; + var p8 = mdb(qte, "MinimalEObjectImpl/1ArrayDelegatingAdapterList/1", 1026); + bcb(1053, 1052, {}, i0d); + var t8 = mdb("org.eclipse.emf.ecore.plugin", "EcorePlugin", 1053); + var v8 = odb(pwe, "Resource"); + bcb(781, 1378, qwe); + _.Yk = function m0d(a) {}; + _.Zk = function n0d(a) {}; + _.Vk = function o0d() { + return !this.a && (this.a = new z0d(this)), this.a; + }; + _.Wk = function p0d(a) { + var b, c, d, e, f; + d = a.length; + if (d > 0) { + BCb(0, a.length); + if (a.charCodeAt(0) == 47) { + f = new Skb(4); + e = 1; + for (b = 1; b < d; ++b) { + BCb(b, a.length); + if (a.charCodeAt(b) == 47) { + Ekb(f, e == b ? "" : a.substr(e, b - e)); + e = b + 1; + } + } + Ekb(f, a.substr(e)); + return j0d(this, f); + } else { + BCb(d - 1, a.length); + if (a.charCodeAt(d - 1) == 63) { + c = lfb(a, wfb(63), d - 2); + c > 0 && (a = a.substr(0, c)); + } + } + } + return k0d(this, a); + }; + _.Xk = function q0d() { + return this.c; + }; + _.Ib = function r0d() { + var a; + return ( + hdb(this.gm) + + "@" + + ((a = tb(this) >>> 0), a.toString(16)) + + " uri='" + + this.d + + "'" + ); + }; + _.b = false; + var z8 = mdb(rwe, "ResourceImpl", 781); + bcb(1379, 781, qwe, s0d); + var w8 = mdb(rwe, "BinaryResourceImpl", 1379); + bcb(1169, 694, pue); + _.si = function v0d(a) { + return JD(a, 56) + ? t0d(this, BD(a, 56)) + : JD(a, 591) + ? new Fyd(BD(a, 591).Vk()) + : PD(a) === PD(this.f) + ? BD(a, 14).Kc() + : (LCd(), KCd.a); + }; + _.Ob = function w0d() { + return u0d(this); + }; + _.a = false; + var z9 = mdb(yve, "EcoreUtil/ContentTreeIterator", 1169); + bcb(1380, 1169, pue, x0d); + _.si = function y0d(a) { + return PD(a) === PD(this.f) ? BD(a, 15).Kc() : new C6d(BD(a, 56)); + }; + var x8 = mdb(rwe, "ResourceImpl/5", 1380); + bcb(648, 1994, Ove, z0d); + _.Hc = function A0d(a) { + return this.i <= 4 ? pud(this, a) : JD(a, 49) && BD(a, 49).Zg() == this.a; + }; + _.bi = function B0d(a, b) { + a == this.i - 1 && (this.a.b || ((this.a.b = true), null)); + }; + _.di = function C0d(a, b) { + a == 0 ? this.a.b || ((this.a.b = true), null) : Atd(this, a, b); + }; + _.fi = function D0d(a, b) {}; + _.gi = function E0d(a, b, c) {}; + _.aj = function F0d() { + return 2; + }; + _.Ai = function G0d() { + return this.a; + }; + _.bj = function H0d() { + return true; + }; + _.cj = function I0d(a, b) { + var c; + c = BD(a, 49); + b = c.wh(this.a, b); + return b; + }; + _.dj = function J0d(a, b) { + var c; + c = BD(a, 49); + return c.wh(null, b); + }; + _.ej = function K0d() { + return false; + }; + _.hi = function L0d() { + return true; + }; + _.ri = function M0d(a) { + return KC(m5, Uhe, 56, a, 0, 1); + }; + _.ni = function N0d() { + return false; + }; + var y8 = mdb(rwe, "ResourceImpl/ContentsEList", 648); + bcb(957, 1964, Lie, O0d); + _.Zc = function P0d(a) { + return this.a._h(a); + }; + _.gc = function Q0d() { + return this.a.gc(); + }; + var A8 = mdb(yve, "AbstractSequentialInternalEList/1", 957); + var K6d, L6d, M6d, N6d; + bcb(624, 1, {}, y1d); + var R0d, S0d; + var G8 = mdb(yve, "BasicExtendedMetaData", 624); + bcb(1160, 1, {}, C1d); + _.$k = function D1d() { + return null; + }; + _._k = function E1d() { + this.a == -2 && A1d(this, W0d(this.d, this.b)); + return this.a; + }; + _.al = function F1d() { + return null; + }; + _.bl = function G1d() { + return mmb(), mmb(), jmb; + }; + _.ne = function H1d() { + this.c == Gwe && B1d(this, _0d(this.d, this.b)); + return this.c; + }; + _.cl = function I1d() { + return 0; + }; + _.a = -2; + _.c = Gwe; + var C8 = mdb(yve, "BasicExtendedMetaData/EClassExtendedMetaDataImpl", 1160); + bcb(1161, 1, {}, O1d); + _.$k = function P1d() { + this.a == (T0d(), R0d) && J1d(this, V0d(this.f, this.b)); + return this.a; + }; + _._k = function Q1d() { + return 0; + }; + _.al = function R1d() { + this.c == (T0d(), R0d) && K1d(this, Z0d(this.f, this.b)); + return this.c; + }; + _.bl = function S1d() { + !this.d && L1d(this, $0d(this.f, this.b)); + return this.d; + }; + _.ne = function T1d() { + this.e == Gwe && M1d(this, _0d(this.f, this.b)); + return this.e; + }; + _.cl = function U1d() { + this.g == -2 && N1d(this, c1d(this.f, this.b)); + return this.g; + }; + _.e = Gwe; + _.g = -2; + var D8 = mdb( + yve, + "BasicExtendedMetaData/EDataTypeExtendedMetaDataImpl", + 1161 + ); + bcb(1159, 1, {}, Y1d); + _.b = false; + _.c = false; + var E8 = mdb( + yve, + "BasicExtendedMetaData/EPackageExtendedMetaDataImpl", + 1159 + ); + bcb(1162, 1, {}, j2d); + _.c = -2; + _.e = Gwe; + _.f = Gwe; + var F8 = mdb( + yve, + "BasicExtendedMetaData/EStructuralFeatureExtendedMetaDataImpl", + 1162 + ); + bcb(585, 622, Pve, k2d); + _.aj = function l2d() { + return this.c; + }; + _.Fk = function m2d() { + return false; + }; + _.li = function n2d(a, b) { + return b; + }; + _.c = 0; + var T8 = mdb(yve, "EDataTypeEList", 585); + var O9 = odb(yve, "FeatureMap"); + bcb( + 75, + 585, + { + 3: 1, + 4: 1, + 20: 1, + 28: 1, + 52: 1, + 14: 1, + 15: 1, + 54: 1, + 67: 1, + 63: 1, + 58: 1, + 76: 1, + 153: 1, + 215: 1, + 1937: 1, + 69: 1, + 95: 1, + }, + u3d + ); + _.Vc = function v3d(a, b) { + o2d(this, a, BD(b, 72)); + }; + _.Fc = function w3d(a) { + return r2d(this, BD(a, 72)); + }; + _.Yh = function B3d(a) { + w2d(this, BD(a, 72)); + }; + _.cj = function M3d(a, b) { + return O2d(this, BD(a, 72), b); + }; + _.dj = function N3d(a, b) { + return Q2d(this, BD(a, 72), b); + }; + _.ii = function P3d(a, b) { + return W2d(this, a, b); + }; + _.li = function R3d(a, b) { + return _2d(this, a, BD(b, 72)); + }; + _._c = function T3d(a, b) { + return c3d(this, a, BD(b, 72)); + }; + _.jj = function X3d(a, b) { + return i3d(this, BD(a, 72), b); + }; + _.kj = function Y3d(a, b) { + return k3d(this, BD(a, 72), b); + }; + _.lj = function Z3d(a, b, c) { + return l3d(this, BD(a, 72), BD(b, 72), c); + }; + _.oi = function _3d(a, b) { + return t3d(this, a, BD(b, 72)); + }; + _.dl = function x3d(a, b) { + return q2d(this, a, b); + }; + _.Wc = function y3d(a, b) { + var c, d, e, f, g, h, i, j, k; + j = new zud(b.gc()); + for (e = b.Kc(); e.Ob(); ) { + d = BD(e.Pb(), 72); + f = d.ak(); + if (T6d(this.e, f)) { + (!f.hi() || (!E2d(this, f, d.dd()) && !pud(j, d))) && wtd(j, d); + } else { + k = S6d(this.e.Tg(), f); + c = BD(this.g, 119); + g = true; + for (h = 0; h < this.i; ++h) { + i = c[h]; + if (k.rl(i.ak())) { + BD(Gtd(this, h, d), 72); + g = false; + break; + } + } + g && wtd(j, d); + } + } + return xtd(this, a, j); + }; + _.Gc = function z3d(a) { + var b, c, d, e, f, g, h, i, j; + i = new zud(a.gc()); + for (d = a.Kc(); d.Ob(); ) { + c = BD(d.Pb(), 72); + e = c.ak(); + if (T6d(this.e, e)) { + (!e.hi() || (!E2d(this, e, c.dd()) && !pud(i, c))) && wtd(i, c); + } else { + j = S6d(this.e.Tg(), e); + b = BD(this.g, 119); + f = true; + for (g = 0; g < this.i; ++g) { + h = b[g]; + if (j.rl(h.ak())) { + BD(Gtd(this, g, c), 72); + f = false; + break; + } + } + f && wtd(i, c); + } + } + return ytd(this, i); + }; + _.Wh = function A3d(a) { + this.j = -1; + return Pxd(this, this.i, a); + }; + _.el = function C3d(a, b, c) { + return x2d(this, a, b, c); + }; + _.mk = function D3d(a, b) { + return B2d(this, a, b); + }; + _.fl = function E3d(a, b, c) { + return C2d(this, a, b, c); + }; + _.gl = function F3d() { + return this; + }; + _.hl = function G3d(a, b) { + return K2d(this, a, b); + }; + _.il = function H3d(a) { + return BD(qud(this, a), 72).ak(); + }; + _.jl = function I3d(a) { + return BD(qud(this, a), 72).dd(); + }; + _.kl = function J3d() { + return this.b; + }; + _.bj = function K3d() { + return true; + }; + _.ij = function L3d() { + return true; + }; + _.ll = function O3d(a) { + return !R2d(this, a); + }; + _.ri = function Q3d(a) { + return KC(D9, owe, 332, a, 0, 1); + }; + _.Gk = function S3d(a) { + return a3d(this, a); + }; + _.Wb = function U3d(a) { + d3d(this, a); + }; + _.ml = function V3d(a, b) { + f3d(this, a, b); + }; + _.nl = function W3d(a) { + return g3d(this, a); + }; + _.ol = function $3d(a) { + s3d(this, a); + }; + var J8 = mdb(yve, "BasicFeatureMap", 75); + bcb(1851, 1, jie); + _.Nb = function f4d(a) { + Rrb(this, a); + }; + _.Rb = function e4d(b) { + if (this.g == -1) { + throw vbb(new Ydb()); + } + a4d(this); + try { + p2d(this.e, this.b, this.a, b); + this.d = this.e.j; + d4d(this); + } catch (a) { + a = ubb(a); + if (JD(a, 73)) { + throw vbb(new Apb()); + } else throw vbb(a); + } + }; + _.Ob = function g4d() { + return b4d(this); + }; + _.Sb = function h4d() { + return c4d(this); + }; + _.Pb = function i4d() { + return d4d(this); + }; + _.Tb = function j4d() { + return this.a; + }; + _.Ub = function k4d() { + var a; + if (c4d(this)) { + a4d(this); + this.g = --this.a; + if (this.Lk()) { + a = b3d(this.e, this.b, this.c, this.a, this.j); + this.j = a; + } + this.i = 0; + return this.j; + } else { + throw vbb(new utb()); + } + }; + _.Vb = function l4d() { + return this.a - 1; + }; + _.Qb = function m4d() { + if (this.g == -1) { + throw vbb(new Ydb()); + } + a4d(this); + try { + Z2d(this.e, this.b, this.g); + this.d = this.e.j; + if (this.g < this.a) { + --this.a; + --this.c; + } + --this.g; + } catch (a) { + a = ubb(a); + if (JD(a, 73)) { + throw vbb(new Apb()); + } else throw vbb(a); + } + }; + _.Lk = function n4d() { + return false; + }; + _.Wb = function o4d(b) { + if (this.g == -1) { + throw vbb(new Ydb()); + } + a4d(this); + try { + e3d(this.e, this.b, this.g, b); + this.d = this.e.j; + } catch (a) { + a = ubb(a); + if (JD(a, 73)) { + throw vbb(new Apb()); + } else throw vbb(a); + } + }; + _.a = 0; + _.c = 0; + _.d = 0; + _.f = false; + _.g = 0; + _.i = 0; + var G9 = mdb(yve, "FeatureMapUtil/BasicFeatureEIterator", 1851); + bcb(410, 1851, jie, p4d); + _.pl = function q4d() { + var a, b, c; + c = this.e.i; + a = BD(this.e.g, 119); + while (this.c < c) { + b = a[this.c]; + if (this.k.rl(b.ak())) { + this.j = this.f ? b : b.dd(); + this.i = 2; + return true; + } + ++this.c; + } + this.i = 1; + this.g = -1; + return false; + }; + _.ql = function r4d() { + var a, b; + a = BD(this.e.g, 119); + while (--this.c >= 0) { + b = a[this.c]; + if (this.k.rl(b.ak())) { + this.j = this.f ? b : b.dd(); + this.i = -2; + return true; + } + } + this.i = -1; + this.g = -1; + return false; + }; + var H8 = mdb(yve, "BasicFeatureMap/FeatureEIterator", 410); + bcb(662, 410, jie, s4d); + _.Lk = function t4d() { + return true; + }; + var I8 = mdb(yve, "BasicFeatureMap/ResolvingFeatureEIterator", 662); + bcb(955, 486, Vve, u4d); + _.Gi = function v4d() { + return this; + }; + var M8 = mdb(yve, "EContentsEList/1", 955); + bcb(956, 486, Vve, w4d); + _.Lk = function x4d() { + return false; + }; + var N8 = mdb(yve, "EContentsEList/2", 956); + bcb(954, 279, Wve, y4d); + _.Nk = function z4d(a) {}; + _.Ob = function A4d() { + return false; + }; + _.Sb = function B4d() { + return false; + }; + var O8 = mdb(yve, "EContentsEList/FeatureIteratorImpl/1", 954); + bcb(825, 585, Pve, C4d); + _.ci = function D4d() { + this.a = true; + }; + _.fj = function E4d() { + return this.a; + }; + _.Xj = function F4d() { + var a; + Uxd(this); + if (oid(this.e)) { + a = this.a; + this.a = false; + Uhd(this.e, new qSd(this.e, 2, this.c, a, false)); + } else { + this.a = false; + } + }; + _.a = false; + var S8 = mdb(yve, "EDataTypeEList/Unsettable", 825); + bcb(1849, 585, Pve, G4d); + _.hi = function H4d() { + return true; + }; + var V8 = mdb(yve, "EDataTypeUniqueEList", 1849); + bcb(1850, 825, Pve, I4d); + _.hi = function J4d() { + return true; + }; + var U8 = mdb(yve, "EDataTypeUniqueEList/Unsettable", 1850); + bcb(139, 85, Pve, K4d); + _.Ek = function L4d() { + return true; + }; + _.li = function M4d(a, b) { + return ILd(this, a, BD(b, 56)); + }; + var W8 = mdb(yve, "EObjectContainmentEList/Resolving", 139); + bcb(1163, 545, Pve, N4d); + _.Ek = function O4d() { + return true; + }; + _.li = function P4d(a, b) { + return ILd(this, a, BD(b, 56)); + }; + var X8 = mdb(yve, "EObjectContainmentEList/Unsettable/Resolving", 1163); + bcb(748, 16, Pve, Q4d); + _.ci = function R4d() { + this.a = true; + }; + _.fj = function S4d() { + return this.a; + }; + _.Xj = function T4d() { + var a; + Uxd(this); + if (oid(this.e)) { + a = this.a; + this.a = false; + Uhd(this.e, new qSd(this.e, 2, this.c, a, false)); + } else { + this.a = false; + } + }; + _.a = false; + var a9 = mdb(yve, "EObjectContainmentWithInverseEList/Unsettable", 748); + bcb(1173, 748, Pve, U4d); + _.Ek = function V4d() { + return true; + }; + _.li = function W4d(a, b) { + return ILd(this, a, BD(b, 56)); + }; + var _8 = mdb( + yve, + "EObjectContainmentWithInverseEList/Unsettable/Resolving", + 1173 + ); + bcb(743, 496, Pve, X4d); + _.ci = function Y4d() { + this.a = true; + }; + _.fj = function Z4d() { + return this.a; + }; + _.Xj = function $4d() { + var a; + Uxd(this); + if (oid(this.e)) { + a = this.a; + this.a = false; + Uhd(this.e, new qSd(this.e, 2, this.c, a, false)); + } else { + this.a = false; + } + }; + _.a = false; + var c9 = mdb(yve, "EObjectEList/Unsettable", 743); + bcb(328, 496, Pve, _4d); + _.Ek = function a5d() { + return true; + }; + _.li = function b5d(a, b) { + return ILd(this, a, BD(b, 56)); + }; + var f9 = mdb(yve, "EObjectResolvingEList", 328); + bcb(1641, 743, Pve, c5d); + _.Ek = function d5d() { + return true; + }; + _.li = function e5d(a, b) { + return ILd(this, a, BD(b, 56)); + }; + var e9 = mdb(yve, "EObjectResolvingEList/Unsettable", 1641); + bcb(1381, 1, {}, h5d); + var f5d; + var g9 = mdb(yve, "EObjectValidator", 1381); + bcb(546, 496, Pve, i5d); + _.zk = function j5d() { + return this.d; + }; + _.Ak = function k5d() { + return this.b; + }; + _.bj = function l5d() { + return true; + }; + _.Dk = function m5d() { + return true; + }; + _.b = 0; + var k9 = mdb(yve, "EObjectWithInverseEList", 546); + bcb(1176, 546, Pve, n5d); + _.Ck = function o5d() { + return true; + }; + var h9 = mdb(yve, "EObjectWithInverseEList/ManyInverse", 1176); + bcb(625, 546, Pve, p5d); + _.ci = function q5d() { + this.a = true; + }; + _.fj = function r5d() { + return this.a; + }; + _.Xj = function s5d() { + var a; + Uxd(this); + if (oid(this.e)) { + a = this.a; + this.a = false; + Uhd(this.e, new qSd(this.e, 2, this.c, a, false)); + } else { + this.a = false; + } + }; + _.a = false; + var j9 = mdb(yve, "EObjectWithInverseEList/Unsettable", 625); + bcb(1175, 625, Pve, t5d); + _.Ck = function u5d() { + return true; + }; + var i9 = mdb(yve, "EObjectWithInverseEList/Unsettable/ManyInverse", 1175); + bcb(749, 546, Pve, v5d); + _.Ek = function w5d() { + return true; + }; + _.li = function x5d(a, b) { + return ILd(this, a, BD(b, 56)); + }; + var o9 = mdb(yve, "EObjectWithInverseResolvingEList", 749); + bcb(31, 749, Pve, y5d); + _.Ck = function z5d() { + return true; + }; + var l9 = mdb(yve, "EObjectWithInverseResolvingEList/ManyInverse", 31); + bcb(750, 625, Pve, A5d); + _.Ek = function B5d() { + return true; + }; + _.li = function C5d(a, b) { + return ILd(this, a, BD(b, 56)); + }; + var n9 = mdb(yve, "EObjectWithInverseResolvingEList/Unsettable", 750); + bcb(1174, 750, Pve, D5d); + _.Ck = function E5d() { + return true; + }; + var m9 = mdb( + yve, + "EObjectWithInverseResolvingEList/Unsettable/ManyInverse", + 1174 + ); + bcb(1164, 622, Pve); + _.ai = function F5d() { + return (this.b & 1792) == 0; + }; + _.ci = function G5d() { + this.b |= 1; + }; + _.Bk = function H5d() { + return (this.b & 4) != 0; + }; + _.bj = function I5d() { + return (this.b & 40) != 0; + }; + _.Ck = function J5d() { + return (this.b & 16) != 0; + }; + _.Dk = function K5d() { + return (this.b & 8) != 0; + }; + _.Ek = function L5d() { + return (this.b & Dve) != 0; + }; + _.rk = function M5d() { + return (this.b & 32) != 0; + }; + _.Fk = function N5d() { + return (this.b & zte) != 0; + }; + _.wj = function O5d(a) { + return !this.d ? this.ak().Yj().wj(a) : qEd(this.d, a); + }; + _.fj = function P5d() { + return (this.b & 2) != 0 ? (this.b & 1) != 0 : this.i != 0; + }; + _.hi = function Q5d() { + return (this.b & 128) != 0; + }; + _.Xj = function S5d() { + var a; + Uxd(this); + if ((this.b & 2) != 0) { + if (oid(this.e)) { + a = (this.b & 1) != 0; + this.b &= -2; + GLd(this, new qSd(this.e, 2, bLd(this.e.Tg(), this.ak()), a, false)); + } else { + this.b &= -2; + } + } + }; + _.ni = function T5d() { + return (this.b & 1536) == 0; + }; + _.b = 0; + var q9 = mdb(yve, "EcoreEList/Generic", 1164); + bcb(1165, 1164, Pve, U5d); + _.ak = function V5d() { + return this.a; + }; + var p9 = mdb(yve, "EcoreEList/Dynamic", 1165); + bcb(747, 63, oue, W5d); + _.ri = function X5d(a) { + return izd(this.a.a, a); + }; + var u9 = mdb(yve, "EcoreEMap/1", 747); + bcb(746, 85, Pve, Y5d); + _.bi = function Z5d(a, b) { + uAd(this.b, BD(b, 133)); + }; + _.di = function $5d(a, b) { + tAd(this.b); + }; + _.ei = function _5d(a, b, c) { + var d; + ++((d = this.b), BD(b, 133), d).e; + }; + _.fi = function a6d(a, b) { + vAd(this.b, BD(b, 133)); + }; + _.gi = function b6d(a, b, c) { + vAd(this.b, BD(c, 133)); + PD(c) === PD(b) && BD(c, 133).Th(CAd(BD(b, 133).cd())); + uAd(this.b, BD(b, 133)); + }; + var v9 = mdb(yve, "EcoreEMap/DelegateEObjectContainmentEList", 746); + bcb(1171, 151, Ave, c6d); + var x9 = mdb(yve, "EcoreEMap/Unsettable", 1171); + bcb(1172, 746, Pve, d6d); + _.ci = function e6d() { + this.a = true; + }; + _.fj = function f6d() { + return this.a; + }; + _.Xj = function g6d() { + var a; + Uxd(this); + if (oid(this.e)) { + a = this.a; + this.a = false; + Uhd(this.e, new qSd(this.e, 2, this.c, a, false)); + } else { + this.a = false; + } + }; + _.a = false; + var w9 = mdb( + yve, + "EcoreEMap/Unsettable/UnsettableDelegateEObjectContainmentEList", + 1172 + ); + bcb(1168, 228, fke, A6d); + _.a = false; + _.b = false; + var A9 = mdb(yve, "EcoreUtil/Copier", 1168); + bcb(745, 1, aie, C6d); + _.Nb = function D6d(a) { + Rrb(this, a); + }; + _.Ob = function E6d() { + return B6d(this); + }; + _.Pb = function F6d() { + var a; + B6d(this); + a = this.b; + this.b = null; + return a; + }; + _.Qb = function G6d() { + this.a.Qb(); + }; + var B9 = mdb(yve, "EcoreUtil/ProperContentIterator", 745); + bcb(1382, 1381, {}, J6d); + var H6d; + var C9 = mdb(yve, "EcoreValidator", 1382); + var P6d; + var N9 = odb(yve, "FeatureMapUtil/Validator"); + bcb(1260, 1, { 1942: 1 }, U6d); + _.rl = function V6d(a) { + return true; + }; + var F9 = mdb(yve, "FeatureMapUtil/1", 1260); + bcb(757, 1, { 1942: 1 }, Z6d); + _.rl = function $6d(a) { + var b; + if (this.c == a) return true; + b = DD(Ohb(this.a, a)); + if (b == null) { + if (Y6d(this, a)) { + _6d(this.a, a, (Bcb(), Acb)); + return true; + } else { + _6d(this.a, a, (Bcb(), zcb)); + return false; + } + } else { + return b == (Bcb(), Acb); + } + }; + _.e = false; + var W6d; + var I9 = mdb(yve, "FeatureMapUtil/BasicValidator", 757); + bcb(758, 43, fke, a7d); + var H9 = mdb(yve, "FeatureMapUtil/BasicValidator/Cache", 758); + bcb( + 501, + 52, + { 20: 1, 28: 1, 52: 1, 14: 1, 15: 1, 58: 1, 76: 1, 69: 1, 95: 1 }, + f7d + ); + _.Vc = function g7d(a, b) { + p2d(this.c, this.b, a, b); + }; + _.Fc = function h7d(a) { + return q2d(this.c, this.b, a); + }; + _.Wc = function i7d(a, b) { + return s2d(this.c, this.b, a, b); + }; + _.Gc = function j7d(a) { + return b7d(this, a); + }; + _.Xh = function k7d(a, b) { + u2d(this.c, this.b, a, b); + }; + _.lk = function l7d(a, b) { + return x2d(this.c, this.b, a, b); + }; + _.pi = function m7d(a) { + return J2d(this.c, this.b, a, false); + }; + _.Zh = function n7d() { + return y2d(this.c, this.b); + }; + _.$h = function o7d() { + return z2d(this.c, this.b); + }; + _._h = function p7d(a) { + return A2d(this.c, this.b, a); + }; + _.mk = function q7d(a, b) { + return c7d(this, a, b); + }; + _.$b = function r7d() { + d7d(this); + }; + _.Hc = function s7d(a) { + return E2d(this.c, this.b, a); + }; + _.Ic = function t7d(a) { + return G2d(this.c, this.b, a); + }; + _.Xb = function u7d(a) { + return J2d(this.c, this.b, a, true); + }; + _.Wj = function v7d(a) { + return this; + }; + _.Xc = function w7d(a) { + return L2d(this.c, this.b, a); + }; + _.dc = function x7d() { + return e7d(this); + }; + _.fj = function y7d() { + return !R2d(this.c, this.b); + }; + _.Kc = function z7d() { + return S2d(this.c, this.b); + }; + _.Yc = function A7d() { + return U2d(this.c, this.b); + }; + _.Zc = function B7d(a) { + return V2d(this.c, this.b, a); + }; + _.ii = function C7d(a, b) { + return X2d(this.c, this.b, a, b); + }; + _.ji = function D7d(a, b) { + Y2d(this.c, this.b, a, b); + }; + _.$c = function E7d(a) { + return Z2d(this.c, this.b, a); + }; + _.Mc = function F7d(a) { + return $2d(this.c, this.b, a); + }; + _._c = function G7d(a, b) { + return e3d(this.c, this.b, a, b); + }; + _.Wb = function H7d(a) { + D2d(this.c, this.b); + b7d(this, BD(a, 15)); + }; + _.gc = function I7d() { + return n3d(this.c, this.b); + }; + _.Pc = function J7d() { + return o3d(this.c, this.b); + }; + _.Qc = function K7d(a) { + return q3d(this.c, this.b, a); + }; + _.Ib = function L7d() { + var a, b; + b = new Hfb(); + b.a += "["; + for (a = y2d(this.c, this.b); b4d(a); ) { + Efb(b, xfb(d4d(a))); + b4d(a) && ((b.a += She), b); + } + b.a += "]"; + return b.a; + }; + _.Xj = function M7d() { + D2d(this.c, this.b); + }; + var J9 = mdb(yve, "FeatureMapUtil/FeatureEList", 501); + bcb(627, 36, fve, O7d); + _.yi = function P7d(a) { + return N7d(this, a); + }; + _.Di = function Q7d(a) { + var b, c, d, e, f, g, h; + switch (this.d) { + case 1: + case 2: { + f = a.Ai(); + if (PD(f) === PD(this.c) && N7d(this, null) == a.yi(null)) { + this.g = a.zi(); + a.xi() == 1 && (this.d = 1); + return true; + } + break; + } + case 3: { + e = a.xi(); + switch (e) { + case 3: { + f = a.Ai(); + if (PD(f) === PD(this.c) && N7d(this, null) == a.yi(null)) { + this.d = 5; + b = new zud(2); + wtd(b, this.g); + wtd(b, a.zi()); + this.g = b; + return true; + } + break; + } + } + break; + } + case 5: { + e = a.xi(); + switch (e) { + case 3: { + f = a.Ai(); + if (PD(f) === PD(this.c) && N7d(this, null) == a.yi(null)) { + c = BD(this.g, 14); + c.Fc(a.zi()); + return true; + } + break; + } + } + break; + } + case 4: { + e = a.xi(); + switch (e) { + case 3: { + f = a.Ai(); + if (PD(f) === PD(this.c) && N7d(this, null) == a.yi(null)) { + this.d = 1; + this.g = a.zi(); + return true; + } + break; + } + case 4: { + f = a.Ai(); + if (PD(f) === PD(this.c) && N7d(this, null) == a.yi(null)) { + this.d = 6; + h = new zud(2); + wtd(h, this.n); + wtd(h, a.Bi()); + this.n = h; + g = OC(GC(WD, 1), oje, 25, 15, [this.o, a.Ci()]); + this.g = g; + return true; + } + break; + } + } + break; + } + case 6: { + e = a.xi(); + switch (e) { + case 4: { + f = a.Ai(); + if (PD(f) === PD(this.c) && N7d(this, null) == a.yi(null)) { + c = BD(this.n, 14); + c.Fc(a.Bi()); + g = BD(this.g, 48); + d = KC(WD, oje, 25, g.length + 1, 15, 1); + $fb(g, 0, d, 0, g.length); + d[g.length] = a.Ci(); + this.g = d; + return true; + } + break; + } + } + break; + } + } + return false; + }; + var K9 = mdb(yve, "FeatureMapUtil/FeatureENotificationImpl", 627); + bcb( + 552, + 501, + { + 20: 1, + 28: 1, + 52: 1, + 14: 1, + 15: 1, + 58: 1, + 76: 1, + 153: 1, + 215: 1, + 1937: 1, + 69: 1, + 95: 1, + }, + R7d + ); + _.dl = function S7d(a, b) { + return q2d(this.c, a, b); + }; + _.el = function T7d(a, b, c) { + return x2d(this.c, a, b, c); + }; + _.fl = function U7d(a, b, c) { + return C2d(this.c, a, b, c); + }; + _.gl = function V7d() { + return this; + }; + _.hl = function W7d(a, b) { + return K2d(this.c, a, b); + }; + _.il = function X7d(a) { + return BD(J2d(this.c, this.b, a, false), 72).ak(); + }; + _.jl = function Y7d(a) { + return BD(J2d(this.c, this.b, a, false), 72).dd(); + }; + _.kl = function Z7d() { + return this.a; + }; + _.ll = function $7d(a) { + return !R2d(this.c, a); + }; + _.ml = function _7d(a, b) { + f3d(this.c, a, b); + }; + _.nl = function a8d(a) { + return g3d(this.c, a); + }; + _.ol = function b8d(a) { + s3d(this.c, a); + }; + var L9 = mdb(yve, "FeatureMapUtil/FeatureFeatureMap", 552); + bcb(1259, 1, zve, c8d); + _.Wj = function d8d(a) { + return J2d(this.b, this.a, -1, a); + }; + _.fj = function e8d() { + return !R2d(this.b, this.a); + }; + _.Wb = function f8d(a) { + f3d(this.b, this.a, a); + }; + _.Xj = function g8d() { + D2d(this.b, this.a); + }; + var M9 = mdb(yve, "FeatureMapUtil/FeatureValue", 1259); + var h8d, i8d, j8d, k8d, l8d; + var Q9 = odb(Iwe, "AnyType"); + bcb(666, 60, Tie, n8d); + var R9 = mdb(Iwe, "InvalidDatatypeValueException", 666); + var S9 = odb(Iwe, Jwe); + var T9 = odb(Iwe, Kwe); + var U9 = odb(Iwe, Lwe); + var o8d; + var q8d; + var s8d, + t8d, + u8d, + v8d, + w8d, + x8d, + y8d, + z8d, + A8d, + B8d, + C8d, + D8d, + E8d, + F8d, + G8d, + H8d, + I8d, + J8d, + K8d, + L8d, + M8d, + N8d, + O8d, + P8d; + bcb(830, 506, { 105: 1, 92: 1, 90: 1, 56: 1, 49: 1, 97: 1, 843: 1 }, R8d); + _._g = function S8d(a, b, c) { + switch (a) { + case 0: + if (c) return !this.c && (this.c = new u3d(this, 0)), this.c; + return !this.c && (this.c = new u3d(this, 0)), this.c.b; + case 1: + if (c) + return ( + !this.c && (this.c = new u3d(this, 0)), + BD(T2d(this.c, (Q8d(), t8d)), 153) + ); + return (!this.c && (this.c = new u3d(this, 0)), + BD(BD(T2d(this.c, (Q8d(), t8d)), 153), 215)).kl(); + case 2: + if (c) return !this.b && (this.b = new u3d(this, 2)), this.b; + return !this.b && (this.b = new u3d(this, 2)), this.b.b; + } + return bid( + this, + a - aLd(this.zh()), + XKd( + (this.j & 2) == 0 + ? this.zh() + : (!this.k && (this.k = new HGd()), this.k).ck(), + a + ), + b, + c + ); + }; + _.jh = function T8d(a, b, c) { + var d; + switch (b) { + case 0: + return !this.c && (this.c = new u3d(this, 0)), B2d(this.c, a, c); + case 1: + return (!this.c && (this.c = new u3d(this, 0)), + BD(BD(T2d(this.c, (Q8d(), t8d)), 153), 69)).mk(a, c); + case 2: + return !this.b && (this.b = new u3d(this, 2)), B2d(this.b, a, c); + } + return ( + (d = BD( + XKd( + (this.j & 2) == 0 + ? this.zh() + : (!this.k && (this.k = new HGd()), this.k).ck(), + b + ), + 66 + )), + d.Nj().Rj(this, Aid(this), b - aLd(this.zh()), a, c) + ); + }; + _.lh = function U8d(a) { + switch (a) { + case 0: + return !!this.c && this.c.i != 0; + case 1: + return !(!this.c && (this.c = new u3d(this, 0)), + BD(T2d(this.c, (Q8d(), t8d)), 153)).dc(); + case 2: + return !!this.b && this.b.i != 0; + } + return cid( + this, + a - aLd(this.zh()), + XKd( + (this.j & 2) == 0 + ? this.zh() + : (!this.k && (this.k = new HGd()), this.k).ck(), + a + ) + ); + }; + _.sh = function V8d(a, b) { + switch (a) { + case 0: + !this.c && (this.c = new u3d(this, 0)); + d3d(this.c, b); + return; + case 1: + (!this.c && (this.c = new u3d(this, 0)), + BD(BD(T2d(this.c, (Q8d(), t8d)), 153), 215)).Wb(b); + return; + case 2: + !this.b && (this.b = new u3d(this, 2)); + d3d(this.b, b); + return; + } + did( + this, + a - aLd(this.zh()), + XKd( + (this.j & 2) == 0 + ? this.zh() + : (!this.k && (this.k = new HGd()), this.k).ck(), + a + ), + b + ); + }; + _.zh = function W8d() { + return Q8d(), s8d; + }; + _.Bh = function X8d(a) { + switch (a) { + case 0: + !this.c && (this.c = new u3d(this, 0)); + Uxd(this.c); + return; + case 1: + (!this.c && (this.c = new u3d(this, 0)), + BD(T2d(this.c, (Q8d(), t8d)), 153)).$b(); + return; + case 2: + !this.b && (this.b = new u3d(this, 2)); + Uxd(this.b); + return; + } + eid( + this, + a - aLd(this.zh()), + XKd( + (this.j & 2) == 0 + ? this.zh() + : (!this.k && (this.k = new HGd()), this.k).ck(), + a + ) + ); + }; + _.Ib = function Y8d() { + var a; + if ((this.j & 4) != 0) return Eid(this); + a = new Jfb(Eid(this)); + a.a += " (mixed: "; + Dfb(a, this.c); + a.a += ", anyAttribute: "; + Dfb(a, this.b); + a.a += ")"; + return a.a; + }; + var V9 = mdb(Mwe, "AnyTypeImpl", 830); + bcb( + 667, + 506, + { 105: 1, 92: 1, 90: 1, 56: 1, 49: 1, 97: 1, 2021: 1, 667: 1 }, + _8d + ); + _._g = function a9d(a, b, c) { + switch (a) { + case 0: + return this.a; + case 1: + return this.b; + } + return bid( + this, + a - aLd((Q8d(), F8d)), + XKd( + (this.j & 2) == 0 + ? F8d + : (!this.k && (this.k = new HGd()), this.k).ck(), + a + ), + b, + c + ); + }; + _.lh = function b9d(a) { + switch (a) { + case 0: + return this.a != null; + case 1: + return this.b != null; + } + return cid( + this, + a - aLd((Q8d(), F8d)), + XKd( + (this.j & 2) == 0 + ? F8d + : (!this.k && (this.k = new HGd()), this.k).ck(), + a + ) + ); + }; + _.sh = function c9d(a, b) { + switch (a) { + case 0: + Z8d(this, GD(b)); + return; + case 1: + $8d(this, GD(b)); + return; + } + did( + this, + a - aLd((Q8d(), F8d)), + XKd( + (this.j & 2) == 0 + ? F8d + : (!this.k && (this.k = new HGd()), this.k).ck(), + a + ), + b + ); + }; + _.zh = function d9d() { + return Q8d(), F8d; + }; + _.Bh = function e9d(a) { + switch (a) { + case 0: + this.a = null; + return; + case 1: + this.b = null; + return; + } + eid( + this, + a - aLd((Q8d(), F8d)), + XKd( + (this.j & 2) == 0 + ? F8d + : (!this.k && (this.k = new HGd()), this.k).ck(), + a + ) + ); + }; + _.Ib = function f9d() { + var a; + if ((this.j & 4) != 0) return Eid(this); + a = new Jfb(Eid(this)); + a.a += " (data: "; + Efb(a, this.a); + a.a += ", target: "; + Efb(a, this.b); + a.a += ")"; + return a.a; + }; + _.a = null; + _.b = null; + var W9 = mdb(Mwe, "ProcessingInstructionImpl", 667); + bcb( + 668, + 830, + { 105: 1, 92: 1, 90: 1, 56: 1, 49: 1, 97: 1, 843: 1, 2022: 1, 668: 1 }, + i9d + ); + _._g = function j9d(a, b, c) { + switch (a) { + case 0: + if (c) return !this.c && (this.c = new u3d(this, 0)), this.c; + return !this.c && (this.c = new u3d(this, 0)), this.c.b; + case 1: + if (c) + return ( + !this.c && (this.c = new u3d(this, 0)), + BD(T2d(this.c, (Q8d(), t8d)), 153) + ); + return (!this.c && (this.c = new u3d(this, 0)), + BD(BD(T2d(this.c, (Q8d(), t8d)), 153), 215)).kl(); + case 2: + if (c) return !this.b && (this.b = new u3d(this, 2)), this.b; + return !this.b && (this.b = new u3d(this, 2)), this.b.b; + case 3: + return ( + !this.c && (this.c = new u3d(this, 0)), + GD(K2d(this.c, (Q8d(), I8d), true)) + ); + case 4: + return j6d( + this.a, + (!this.c && (this.c = new u3d(this, 0)), + GD(K2d(this.c, (Q8d(), I8d), true))) + ); + case 5: + return this.a; + } + return bid( + this, + a - aLd((Q8d(), H8d)), + XKd( + (this.j & 2) == 0 + ? H8d + : (!this.k && (this.k = new HGd()), this.k).ck(), + a + ), + b, + c + ); + }; + _.lh = function k9d(a) { + switch (a) { + case 0: + return !!this.c && this.c.i != 0; + case 1: + return !(!this.c && (this.c = new u3d(this, 0)), + BD(T2d(this.c, (Q8d(), t8d)), 153)).dc(); + case 2: + return !!this.b && this.b.i != 0; + case 3: + return ( + !this.c && (this.c = new u3d(this, 0)), + GD(K2d(this.c, (Q8d(), I8d), true)) != null + ); + case 4: + return ( + j6d( + this.a, + (!this.c && (this.c = new u3d(this, 0)), + GD(K2d(this.c, (Q8d(), I8d), true))) + ) != null + ); + case 5: + return !!this.a; + } + return cid( + this, + a - aLd((Q8d(), H8d)), + XKd( + (this.j & 2) == 0 + ? H8d + : (!this.k && (this.k = new HGd()), this.k).ck(), + a + ) + ); + }; + _.sh = function l9d(a, b) { + switch (a) { + case 0: + !this.c && (this.c = new u3d(this, 0)); + d3d(this.c, b); + return; + case 1: + (!this.c && (this.c = new u3d(this, 0)), + BD(BD(T2d(this.c, (Q8d(), t8d)), 153), 215)).Wb(b); + return; + case 2: + !this.b && (this.b = new u3d(this, 2)); + d3d(this.b, b); + return; + case 3: + h9d(this, GD(b)); + return; + case 4: + h9d(this, h6d(this.a, b)); + return; + case 5: + g9d(this, BD(b, 148)); + return; + } + did( + this, + a - aLd((Q8d(), H8d)), + XKd( + (this.j & 2) == 0 + ? H8d + : (!this.k && (this.k = new HGd()), this.k).ck(), + a + ), + b + ); + }; + _.zh = function m9d() { + return Q8d(), H8d; + }; + _.Bh = function n9d(a) { + switch (a) { + case 0: + !this.c && (this.c = new u3d(this, 0)); + Uxd(this.c); + return; + case 1: + (!this.c && (this.c = new u3d(this, 0)), + BD(T2d(this.c, (Q8d(), t8d)), 153)).$b(); + return; + case 2: + !this.b && (this.b = new u3d(this, 2)); + Uxd(this.b); + return; + case 3: + !this.c && (this.c = new u3d(this, 0)); + f3d(this.c, (Q8d(), I8d), null); + return; + case 4: + h9d(this, h6d(this.a, null)); + return; + case 5: + this.a = null; + return; + } + eid( + this, + a - aLd((Q8d(), H8d)), + XKd( + (this.j & 2) == 0 + ? H8d + : (!this.k && (this.k = new HGd()), this.k).ck(), + a + ) + ); + }; + var X9 = mdb(Mwe, "SimpleAnyTypeImpl", 668); + bcb( + 669, + 506, + { 105: 1, 92: 1, 90: 1, 56: 1, 49: 1, 97: 1, 2023: 1, 669: 1 }, + o9d + ); + _._g = function p9d(a, b, c) { + switch (a) { + case 0: + if (c) return !this.a && (this.a = new u3d(this, 0)), this.a; + return !this.a && (this.a = new u3d(this, 0)), this.a.b; + case 1: + return c + ? (!this.b && (this.b = new dId((jGd(), fGd), x6, this, 1)), this.b) + : (!this.b && (this.b = new dId((jGd(), fGd), x6, this, 1)), + FAd(this.b)); + case 2: + return c + ? (!this.c && (this.c = new dId((jGd(), fGd), x6, this, 2)), this.c) + : (!this.c && (this.c = new dId((jGd(), fGd), x6, this, 2)), + FAd(this.c)); + case 3: + return ( + !this.a && (this.a = new u3d(this, 0)), T2d(this.a, (Q8d(), L8d)) + ); + case 4: + return ( + !this.a && (this.a = new u3d(this, 0)), T2d(this.a, (Q8d(), M8d)) + ); + case 5: + return ( + !this.a && (this.a = new u3d(this, 0)), T2d(this.a, (Q8d(), O8d)) + ); + case 6: + return ( + !this.a && (this.a = new u3d(this, 0)), T2d(this.a, (Q8d(), P8d)) + ); + } + return bid( + this, + a - aLd((Q8d(), K8d)), + XKd( + (this.j & 2) == 0 + ? K8d + : (!this.k && (this.k = new HGd()), this.k).ck(), + a + ), + b, + c + ); + }; + _.jh = function q9d(a, b, c) { + var d; + switch (b) { + case 0: + return !this.a && (this.a = new u3d(this, 0)), B2d(this.a, a, c); + case 1: + return ( + !this.b && (this.b = new dId((jGd(), fGd), x6, this, 1)), + bId(this.b, a, c) + ); + case 2: + return ( + !this.c && (this.c = new dId((jGd(), fGd), x6, this, 2)), + bId(this.c, a, c) + ); + case 5: + return ( + !this.a && (this.a = new u3d(this, 0)), + c7d(T2d(this.a, (Q8d(), O8d)), a, c) + ); + } + return ( + (d = BD( + XKd( + (this.j & 2) == 0 + ? (Q8d(), K8d) + : (!this.k && (this.k = new HGd()), this.k).ck(), + b + ), + 66 + )), + d.Nj().Rj(this, Aid(this), b - aLd((Q8d(), K8d)), a, c) + ); + }; + _.lh = function r9d(a) { + switch (a) { + case 0: + return !!this.a && this.a.i != 0; + case 1: + return !!this.b && this.b.f != 0; + case 2: + return !!this.c && this.c.f != 0; + case 3: + return ( + !this.a && (this.a = new u3d(this, 0)), + !e7d(T2d(this.a, (Q8d(), L8d))) + ); + case 4: + return ( + !this.a && (this.a = new u3d(this, 0)), + !e7d(T2d(this.a, (Q8d(), M8d))) + ); + case 5: + return ( + !this.a && (this.a = new u3d(this, 0)), + !e7d(T2d(this.a, (Q8d(), O8d))) + ); + case 6: + return ( + !this.a && (this.a = new u3d(this, 0)), + !e7d(T2d(this.a, (Q8d(), P8d))) + ); + } + return cid( + this, + a - aLd((Q8d(), K8d)), + XKd( + (this.j & 2) == 0 + ? K8d + : (!this.k && (this.k = new HGd()), this.k).ck(), + a + ) + ); + }; + _.sh = function s9d(a, b) { + switch (a) { + case 0: + !this.a && (this.a = new u3d(this, 0)); + d3d(this.a, b); + return; + case 1: + !this.b && (this.b = new dId((jGd(), fGd), x6, this, 1)); + cId(this.b, b); + return; + case 2: + !this.c && (this.c = new dId((jGd(), fGd), x6, this, 2)); + cId(this.c, b); + return; + case 3: + !this.a && (this.a = new u3d(this, 0)); + d7d(T2d(this.a, (Q8d(), L8d))); + !this.a && (this.a = new u3d(this, 0)); + b7d(T2d(this.a, L8d), BD(b, 14)); + return; + case 4: + !this.a && (this.a = new u3d(this, 0)); + d7d(T2d(this.a, (Q8d(), M8d))); + !this.a && (this.a = new u3d(this, 0)); + b7d(T2d(this.a, M8d), BD(b, 14)); + return; + case 5: + !this.a && (this.a = new u3d(this, 0)); + d7d(T2d(this.a, (Q8d(), O8d))); + !this.a && (this.a = new u3d(this, 0)); + b7d(T2d(this.a, O8d), BD(b, 14)); + return; + case 6: + !this.a && (this.a = new u3d(this, 0)); + d7d(T2d(this.a, (Q8d(), P8d))); + !this.a && (this.a = new u3d(this, 0)); + b7d(T2d(this.a, P8d), BD(b, 14)); + return; + } + did( + this, + a - aLd((Q8d(), K8d)), + XKd( + (this.j & 2) == 0 + ? K8d + : (!this.k && (this.k = new HGd()), this.k).ck(), + a + ), + b + ); + }; + _.zh = function t9d() { + return Q8d(), K8d; + }; + _.Bh = function u9d(a) { + switch (a) { + case 0: + !this.a && (this.a = new u3d(this, 0)); + Uxd(this.a); + return; + case 1: + !this.b && (this.b = new dId((jGd(), fGd), x6, this, 1)); + this.b.c.$b(); + return; + case 2: + !this.c && (this.c = new dId((jGd(), fGd), x6, this, 2)); + this.c.c.$b(); + return; + case 3: + !this.a && (this.a = new u3d(this, 0)); + d7d(T2d(this.a, (Q8d(), L8d))); + return; + case 4: + !this.a && (this.a = new u3d(this, 0)); + d7d(T2d(this.a, (Q8d(), M8d))); + return; + case 5: + !this.a && (this.a = new u3d(this, 0)); + d7d(T2d(this.a, (Q8d(), O8d))); + return; + case 6: + !this.a && (this.a = new u3d(this, 0)); + d7d(T2d(this.a, (Q8d(), P8d))); + return; + } + eid( + this, + a - aLd((Q8d(), K8d)), + XKd( + (this.j & 2) == 0 + ? K8d + : (!this.k && (this.k = new HGd()), this.k).ck(), + a + ) + ); + }; + _.Ib = function v9d() { + var a; + if ((this.j & 4) != 0) return Eid(this); + a = new Jfb(Eid(this)); + a.a += " (mixed: "; + Dfb(a, this.a); + a.a += ")"; + return a.a; + }; + var Y9 = mdb(Mwe, "XMLTypeDocumentRootImpl", 669); + bcb( + 1919, + 704, + { + 105: 1, + 92: 1, + 90: 1, + 471: 1, + 147: 1, + 56: 1, + 108: 1, + 49: 1, + 97: 1, + 150: 1, + 114: 1, + 115: 1, + 2024: 1, + }, + U9d + ); + _.Ih = function V9d(a, b) { + switch (a.yj()) { + case 7: + case 8: + case 9: + case 10: + case 16: + case 22: + case 23: + case 24: + case 25: + case 26: + case 32: + case 33: + case 34: + case 36: + case 37: + case 44: + case 45: + case 50: + case 51: + case 53: + case 55: + case 56: + case 57: + case 58: + case 60: + case 61: + case 4: + return b == null ? null : fcb(b); + case 19: + case 28: + case 29: + case 35: + case 38: + case 39: + case 41: + case 46: + case 52: + case 54: + case 5: + return GD(b); + case 6: + return C9d(BD(b, 190)); + case 12: + case 47: + case 49: + case 11: + return Vmd(this, a, b); + case 13: + return b == null ? null : qgb(BD(b, 240)); + case 15: + case 14: + return b == null ? null : D9d(Edb(ED(b))); + case 17: + return E9d((Q8d(), b)); + case 18: + return E9d(b); + case 21: + case 20: + return b == null ? null : F9d(BD(b, 155).a); + case 27: + return G9d(BD(b, 190)); + case 30: + return H9d((Q8d(), BD(b, 15))); + case 31: + return H9d(BD(b, 15)); + case 40: + return K9d((Q8d(), b)); + case 42: + return I9d((Q8d(), b)); + case 43: + return I9d(b); + case 59: + case 48: + return J9d((Q8d(), b)); + default: + throw vbb(new Wdb(tte + a.ne() + ute)); + } + }; + _.Jh = function W9d(a) { + var b, c, d, e, f; + switch ( + (a.G == -1 && (a.G = ((c = bKd(a)), c ? HLd(c.Mh(), a) : -1)), a.G) + ) { + case 0: + return (b = new R8d()), b; + case 1: + return (d = new _8d()), d; + case 2: + return (e = new i9d()), e; + case 3: + return (f = new o9d()), f; + default: + throw vbb(new Wdb(xte + a.zb + ute)); + } + }; + _.Kh = function X9d(a, b) { + var c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r; + switch (a.yj()) { + case 5: + case 52: + case 4: + return b; + case 6: + return L9d(b); + case 8: + case 7: + return b == null ? null : B9d(b); + case 9: + return b == null + ? null + : Scb( + (Icb( + ((d = Qge(b, true)), + d.length > 0 && (BCb(0, d.length), d.charCodeAt(0) == 43) + ? d.substr(1) + : d), + -128, + 127 + ) << + 24) >> + 24 + ); + case 10: + return b == null + ? null + : Scb( + (Icb( + ((e = Qge(b, true)), + e.length > 0 && (BCb(0, e.length), e.charCodeAt(0) == 43) + ? e.substr(1) + : e), + -128, + 127 + ) << + 24) >> + 24 + ); + case 11: + return GD(Wmd(this, (Q8d(), w8d), b)); + case 12: + return GD(Wmd(this, (Q8d(), x8d), b)); + case 13: + return b == null ? null : new tgb(Qge(b, true)); + case 15: + case 14: + return M9d(b); + case 16: + return GD(Wmd(this, (Q8d(), y8d), b)); + case 17: + return N9d((Q8d(), b)); + case 18: + return N9d(b); + case 28: + case 29: + case 35: + case 38: + case 39: + case 41: + case 54: + case 19: + return Qge(b, true); + case 21: + case 20: + return O9d(b); + case 22: + return GD(Wmd(this, (Q8d(), z8d), b)); + case 23: + return GD(Wmd(this, (Q8d(), A8d), b)); + case 24: + return GD(Wmd(this, (Q8d(), B8d), b)); + case 25: + return GD(Wmd(this, (Q8d(), C8d), b)); + case 26: + return GD(Wmd(this, (Q8d(), D8d), b)); + case 27: + return P9d(b); + case 30: + return Q9d((Q8d(), b)); + case 31: + return Q9d(b); + case 32: + return b == null + ? null + : meb( + Icb( + ((k = Qge(b, true)), + k.length > 0 && (BCb(0, k.length), k.charCodeAt(0) == 43) + ? k.substr(1) + : k), + Rie, + Ohe + ) + ); + case 33: + return b == null + ? null + : new Ygb( + ((l = Qge(b, true)), + l.length > 0 && (BCb(0, l.length), l.charCodeAt(0) == 43) + ? l.substr(1) + : l) + ); + case 34: + return b == null + ? null + : meb( + Icb( + ((m = Qge(b, true)), + m.length > 0 && (BCb(0, m.length), m.charCodeAt(0) == 43) + ? m.substr(1) + : m), + Rie, + Ohe + ) + ); + case 36: + return b == null + ? null + : Aeb( + Jcb( + ((n = Qge(b, true)), + n.length > 0 && (BCb(0, n.length), n.charCodeAt(0) == 43) + ? n.substr(1) + : n) + ) + ); + case 37: + return b == null + ? null + : Aeb( + Jcb( + ((o = Qge(b, true)), + o.length > 0 && (BCb(0, o.length), o.charCodeAt(0) == 43) + ? o.substr(1) + : o) + ) + ); + case 40: + return T9d((Q8d(), b)); + case 42: + return R9d((Q8d(), b)); + case 43: + return R9d(b); + case 44: + return b == null + ? null + : new Ygb( + ((p = Qge(b, true)), + p.length > 0 && (BCb(0, p.length), p.charCodeAt(0) == 43) + ? p.substr(1) + : p) + ); + case 45: + return b == null + ? null + : new Ygb( + ((q = Qge(b, true)), + q.length > 0 && (BCb(0, q.length), q.charCodeAt(0) == 43) + ? q.substr(1) + : q) + ); + case 46: + return Qge(b, false); + case 47: + return GD(Wmd(this, (Q8d(), E8d), b)); + case 59: + case 48: + return S9d((Q8d(), b)); + case 49: + return GD(Wmd(this, (Q8d(), G8d), b)); + case 50: + return b == null + ? null + : Web( + (Icb( + ((r = Qge(b, true)), + r.length > 0 && (BCb(0, r.length), r.charCodeAt(0) == 43) + ? r.substr(1) + : r), + awe, + 32767 + ) << + 16) >> + 16 + ); + case 51: + return b == null + ? null + : Web( + (Icb( + ((f = Qge(b, true)), + f.length > 0 && (BCb(0, f.length), f.charCodeAt(0) == 43) + ? f.substr(1) + : f), + awe, + 32767 + ) << + 16) >> + 16 + ); + case 53: + return GD(Wmd(this, (Q8d(), J8d), b)); + case 55: + return b == null + ? null + : Web( + (Icb( + ((g = Qge(b, true)), + g.length > 0 && (BCb(0, g.length), g.charCodeAt(0) == 43) + ? g.substr(1) + : g), + awe, + 32767 + ) << + 16) >> + 16 + ); + case 56: + return b == null + ? null + : Web( + (Icb( + ((h = Qge(b, true)), + h.length > 0 && (BCb(0, h.length), h.charCodeAt(0) == 43) + ? h.substr(1) + : h), + awe, + 32767 + ) << + 16) >> + 16 + ); + case 57: + return b == null + ? null + : Aeb( + Jcb( + ((i = Qge(b, true)), + i.length > 0 && (BCb(0, i.length), i.charCodeAt(0) == 43) + ? i.substr(1) + : i) + ) + ); + case 58: + return b == null + ? null + : Aeb( + Jcb( + ((j = Qge(b, true)), + j.length > 0 && (BCb(0, j.length), j.charCodeAt(0) == 43) + ? j.substr(1) + : j) + ) + ); + case 60: + return b == null + ? null + : meb( + Icb( + ((c = Qge(b, true)), + c.length > 0 && (BCb(0, c.length), c.charCodeAt(0) == 43) + ? c.substr(1) + : c), + Rie, + Ohe + ) + ); + case 61: + return b == null ? null : meb(Icb(Qge(b, true), Rie, Ohe)); + default: + throw vbb(new Wdb(tte + a.ne() + ute)); + } + }; + var w9d, x9d, y9d, z9d; + var Z9 = mdb(Mwe, "XMLTypeFactoryImpl", 1919); + bcb( + 586, + 179, + { + 105: 1, + 92: 1, + 90: 1, + 147: 1, + 191: 1, + 56: 1, + 235: 1, + 108: 1, + 49: 1, + 97: 1, + 150: 1, + 179: 1, + 114: 1, + 115: 1, + 675: 1, + 1945: 1, + 586: 1, + }, + cae + ); + _.N = false; + _.O = false; + var Z9d = false; + var Yab = mdb(Mwe, "XMLTypePackageImpl", 586); + bcb(1852, 1, { 837: 1 }, fae); + _._j = function gae() { + return Uge(), Tge; + }; + var iab = mdb(Mwe, "XMLTypePackageImpl/1", 1852); + bcb(1861, 1, nwe, hae); + _.wj = function iae(a) { + return ND(a); + }; + _.xj = function jae(a) { + return KC(ZI, nie, 2, a, 6, 1); + }; + var $9 = mdb(Mwe, "XMLTypePackageImpl/10", 1861); + bcb(1862, 1, nwe, kae); + _.wj = function lae(a) { + return ND(a); + }; + _.xj = function mae(a) { + return KC(ZI, nie, 2, a, 6, 1); + }; + var _9 = mdb(Mwe, "XMLTypePackageImpl/11", 1862); + bcb(1863, 1, nwe, nae); + _.wj = function oae(a) { + return ND(a); + }; + _.xj = function pae(a) { + return KC(ZI, nie, 2, a, 6, 1); + }; + var aab = mdb(Mwe, "XMLTypePackageImpl/12", 1863); + bcb(1864, 1, nwe, qae); + _.wj = function rae(a) { + return LD(a); + }; + _.xj = function sae(a) { + return KC(BI, nie, 333, a, 7, 1); + }; + var bab = mdb(Mwe, "XMLTypePackageImpl/13", 1864); + bcb(1865, 1, nwe, tae); + _.wj = function uae(a) { + return ND(a); + }; + _.xj = function vae(a) { + return KC(ZI, nie, 2, a, 6, 1); + }; + var cab = mdb(Mwe, "XMLTypePackageImpl/14", 1865); + bcb(1866, 1, nwe, wae); + _.wj = function xae(a) { + return JD(a, 15); + }; + _.xj = function yae(a) { + return KC(yK, eme, 15, a, 0, 1); + }; + var dab = mdb(Mwe, "XMLTypePackageImpl/15", 1866); + bcb(1867, 1, nwe, zae); + _.wj = function Aae(a) { + return JD(a, 15); + }; + _.xj = function Bae(a) { + return KC(yK, eme, 15, a, 0, 1); + }; + var eab = mdb(Mwe, "XMLTypePackageImpl/16", 1867); + bcb(1868, 1, nwe, Cae); + _.wj = function Dae(a) { + return ND(a); + }; + _.xj = function Eae(a) { + return KC(ZI, nie, 2, a, 6, 1); + }; + var fab = mdb(Mwe, "XMLTypePackageImpl/17", 1868); + bcb(1869, 1, nwe, Fae); + _.wj = function Gae(a) { + return JD(a, 155); + }; + _.xj = function Hae(a) { + return KC(FI, nie, 155, a, 0, 1); + }; + var gab = mdb(Mwe, "XMLTypePackageImpl/18", 1869); + bcb(1870, 1, nwe, Iae); + _.wj = function Jae(a) { + return ND(a); + }; + _.xj = function Kae(a) { + return KC(ZI, nie, 2, a, 6, 1); + }; + var hab = mdb(Mwe, "XMLTypePackageImpl/19", 1870); + bcb(1853, 1, nwe, Lae); + _.wj = function Mae(a) { + return JD(a, 843); + }; + _.xj = function Nae(a) { + return KC(Q9, Uhe, 843, a, 0, 1); + }; + var tab = mdb(Mwe, "XMLTypePackageImpl/2", 1853); + bcb(1871, 1, nwe, Oae); + _.wj = function Pae(a) { + return ND(a); + }; + _.xj = function Qae(a) { + return KC(ZI, nie, 2, a, 6, 1); + }; + var jab = mdb(Mwe, "XMLTypePackageImpl/20", 1871); + bcb(1872, 1, nwe, Rae); + _.wj = function Sae(a) { + return ND(a); + }; + _.xj = function Tae(a) { + return KC(ZI, nie, 2, a, 6, 1); + }; + var kab = mdb(Mwe, "XMLTypePackageImpl/21", 1872); + bcb(1873, 1, nwe, Uae); + _.wj = function Vae(a) { + return ND(a); + }; + _.xj = function Wae(a) { + return KC(ZI, nie, 2, a, 6, 1); + }; + var lab = mdb(Mwe, "XMLTypePackageImpl/22", 1873); + bcb(1874, 1, nwe, Xae); + _.wj = function Yae(a) { + return ND(a); + }; + _.xj = function Zae(a) { + return KC(ZI, nie, 2, a, 6, 1); + }; + var mab = mdb(Mwe, "XMLTypePackageImpl/23", 1874); + bcb(1875, 1, nwe, $ae); + _.wj = function _ae(a) { + return JD(a, 190); + }; + _.xj = function abe(a) { + return KC(SD, nie, 190, a, 0, 2); + }; + var nab = mdb(Mwe, "XMLTypePackageImpl/24", 1875); + bcb(1876, 1, nwe, bbe); + _.wj = function cbe(a) { + return ND(a); + }; + _.xj = function dbe(a) { + return KC(ZI, nie, 2, a, 6, 1); + }; + var oab = mdb(Mwe, "XMLTypePackageImpl/25", 1876); + bcb(1877, 1, nwe, ebe); + _.wj = function fbe(a) { + return ND(a); + }; + _.xj = function gbe(a) { + return KC(ZI, nie, 2, a, 6, 1); + }; + var pab = mdb(Mwe, "XMLTypePackageImpl/26", 1877); + bcb(1878, 1, nwe, hbe); + _.wj = function ibe(a) { + return JD(a, 15); + }; + _.xj = function jbe(a) { + return KC(yK, eme, 15, a, 0, 1); + }; + var qab = mdb(Mwe, "XMLTypePackageImpl/27", 1878); + bcb(1879, 1, nwe, kbe); + _.wj = function lbe(a) { + return JD(a, 15); + }; + _.xj = function mbe(a) { + return KC(yK, eme, 15, a, 0, 1); + }; + var rab = mdb(Mwe, "XMLTypePackageImpl/28", 1879); + bcb(1880, 1, nwe, nbe); + _.wj = function obe(a) { + return ND(a); + }; + _.xj = function pbe(a) { + return KC(ZI, nie, 2, a, 6, 1); + }; + var sab = mdb(Mwe, "XMLTypePackageImpl/29", 1880); + bcb(1854, 1, nwe, qbe); + _.wj = function rbe(a) { + return JD(a, 667); + }; + _.xj = function sbe(a) { + return KC(S9, Uhe, 2021, a, 0, 1); + }; + var Eab = mdb(Mwe, "XMLTypePackageImpl/3", 1854); + bcb(1881, 1, nwe, tbe); + _.wj = function ube(a) { + return JD(a, 19); + }; + _.xj = function vbe(a) { + return KC(JI, nie, 19, a, 0, 1); + }; + var uab = mdb(Mwe, "XMLTypePackageImpl/30", 1881); + bcb(1882, 1, nwe, wbe); + _.wj = function xbe(a) { + return ND(a); + }; + _.xj = function ybe(a) { + return KC(ZI, nie, 2, a, 6, 1); + }; + var vab = mdb(Mwe, "XMLTypePackageImpl/31", 1882); + bcb(1883, 1, nwe, zbe); + _.wj = function Abe(a) { + return JD(a, 162); + }; + _.xj = function Bbe(a) { + return KC(MI, nie, 162, a, 0, 1); + }; + var wab = mdb(Mwe, "XMLTypePackageImpl/32", 1883); + bcb(1884, 1, nwe, Cbe); + _.wj = function Dbe(a) { + return ND(a); + }; + _.xj = function Ebe(a) { + return KC(ZI, nie, 2, a, 6, 1); + }; + var xab = mdb(Mwe, "XMLTypePackageImpl/33", 1884); + bcb(1885, 1, nwe, Fbe); + _.wj = function Gbe(a) { + return ND(a); + }; + _.xj = function Hbe(a) { + return KC(ZI, nie, 2, a, 6, 1); + }; + var yab = mdb(Mwe, "XMLTypePackageImpl/34", 1885); + bcb(1886, 1, nwe, Ibe); + _.wj = function Jbe(a) { + return ND(a); + }; + _.xj = function Kbe(a) { + return KC(ZI, nie, 2, a, 6, 1); + }; + var zab = mdb(Mwe, "XMLTypePackageImpl/35", 1886); + bcb(1887, 1, nwe, Lbe); + _.wj = function Mbe(a) { + return ND(a); + }; + _.xj = function Nbe(a) { + return KC(ZI, nie, 2, a, 6, 1); + }; + var Aab = mdb(Mwe, "XMLTypePackageImpl/36", 1887); + bcb(1888, 1, nwe, Obe); + _.wj = function Pbe(a) { + return JD(a, 15); + }; + _.xj = function Qbe(a) { + return KC(yK, eme, 15, a, 0, 1); + }; + var Bab = mdb(Mwe, "XMLTypePackageImpl/37", 1888); + bcb(1889, 1, nwe, Rbe); + _.wj = function Sbe(a) { + return JD(a, 15); + }; + _.xj = function Tbe(a) { + return KC(yK, eme, 15, a, 0, 1); + }; + var Cab = mdb(Mwe, "XMLTypePackageImpl/38", 1889); + bcb(1890, 1, nwe, Ube); + _.wj = function Vbe(a) { + return ND(a); + }; + _.xj = function Wbe(a) { + return KC(ZI, nie, 2, a, 6, 1); + }; + var Dab = mdb(Mwe, "XMLTypePackageImpl/39", 1890); + bcb(1855, 1, nwe, Xbe); + _.wj = function Ybe(a) { + return JD(a, 668); + }; + _.xj = function Zbe(a) { + return KC(T9, Uhe, 2022, a, 0, 1); + }; + var Pab = mdb(Mwe, "XMLTypePackageImpl/4", 1855); + bcb(1891, 1, nwe, $be); + _.wj = function _be(a) { + return ND(a); + }; + _.xj = function ace(a) { + return KC(ZI, nie, 2, a, 6, 1); + }; + var Fab = mdb(Mwe, "XMLTypePackageImpl/40", 1891); + bcb(1892, 1, nwe, bce); + _.wj = function cce(a) { + return ND(a); + }; + _.xj = function dce(a) { + return KC(ZI, nie, 2, a, 6, 1); + }; + var Gab = mdb(Mwe, "XMLTypePackageImpl/41", 1892); + bcb(1893, 1, nwe, ece); + _.wj = function fce(a) { + return ND(a); + }; + _.xj = function gce(a) { + return KC(ZI, nie, 2, a, 6, 1); + }; + var Hab = mdb(Mwe, "XMLTypePackageImpl/42", 1893); + bcb(1894, 1, nwe, hce); + _.wj = function ice(a) { + return ND(a); + }; + _.xj = function jce(a) { + return KC(ZI, nie, 2, a, 6, 1); + }; + var Iab = mdb(Mwe, "XMLTypePackageImpl/43", 1894); + bcb(1895, 1, nwe, kce); + _.wj = function lce(a) { + return ND(a); + }; + _.xj = function mce(a) { + return KC(ZI, nie, 2, a, 6, 1); + }; + var Jab = mdb(Mwe, "XMLTypePackageImpl/44", 1895); + bcb(1896, 1, nwe, nce); + _.wj = function oce(a) { + return JD(a, 184); + }; + _.xj = function pce(a) { + return KC(UI, nie, 184, a, 0, 1); + }; + var Kab = mdb(Mwe, "XMLTypePackageImpl/45", 1896); + bcb(1897, 1, nwe, qce); + _.wj = function rce(a) { + return ND(a); + }; + _.xj = function sce(a) { + return KC(ZI, nie, 2, a, 6, 1); + }; + var Lab = mdb(Mwe, "XMLTypePackageImpl/46", 1897); + bcb(1898, 1, nwe, tce); + _.wj = function uce(a) { + return ND(a); + }; + _.xj = function vce(a) { + return KC(ZI, nie, 2, a, 6, 1); + }; + var Mab = mdb(Mwe, "XMLTypePackageImpl/47", 1898); + bcb(1899, 1, nwe, wce); + _.wj = function xce(a) { + return ND(a); + }; + _.xj = function yce(a) { + return KC(ZI, nie, 2, a, 6, 1); + }; + var Nab = mdb(Mwe, "XMLTypePackageImpl/48", 1899); + bcb(nje, 1, nwe, zce); + _.wj = function Ace(a) { + return JD(a, 184); + }; + _.xj = function Bce(a) { + return KC(UI, nie, 184, a, 0, 1); + }; + var Oab = mdb(Mwe, "XMLTypePackageImpl/49", nje); + bcb(1856, 1, nwe, Cce); + _.wj = function Dce(a) { + return JD(a, 669); + }; + _.xj = function Ece(a) { + return KC(U9, Uhe, 2023, a, 0, 1); + }; + var Tab = mdb(Mwe, "XMLTypePackageImpl/5", 1856); + bcb(1901, 1, nwe, Fce); + _.wj = function Gce(a) { + return JD(a, 162); + }; + _.xj = function Hce(a) { + return KC(MI, nie, 162, a, 0, 1); + }; + var Qab = mdb(Mwe, "XMLTypePackageImpl/50", 1901); + bcb(1902, 1, nwe, Ice); + _.wj = function Jce(a) { + return ND(a); + }; + _.xj = function Kce(a) { + return KC(ZI, nie, 2, a, 6, 1); + }; + var Rab = mdb(Mwe, "XMLTypePackageImpl/51", 1902); + bcb(1903, 1, nwe, Lce); + _.wj = function Mce(a) { + return JD(a, 19); + }; + _.xj = function Nce(a) { + return KC(JI, nie, 19, a, 0, 1); + }; + var Sab = mdb(Mwe, "XMLTypePackageImpl/52", 1903); + bcb(1857, 1, nwe, Oce); + _.wj = function Pce(a) { + return ND(a); + }; + _.xj = function Qce(a) { + return KC(ZI, nie, 2, a, 6, 1); + }; + var Uab = mdb(Mwe, "XMLTypePackageImpl/6", 1857); + bcb(1858, 1, nwe, Rce); + _.wj = function Sce(a) { + return JD(a, 190); + }; + _.xj = function Tce(a) { + return KC(SD, nie, 190, a, 0, 2); + }; + var Vab = mdb(Mwe, "XMLTypePackageImpl/7", 1858); + bcb(1859, 1, nwe, Uce); + _.wj = function Vce(a) { + return KD(a); + }; + _.xj = function Wce(a) { + return KC(wI, nie, 476, a, 8, 1); + }; + var Wab = mdb(Mwe, "XMLTypePackageImpl/8", 1859); + bcb(1860, 1, nwe, Xce); + _.wj = function Yce(a) { + return JD(a, 217); + }; + _.xj = function Zce(a) { + return KC(xI, nie, 217, a, 0, 1); + }; + var Xab = mdb(Mwe, "XMLTypePackageImpl/9", 1860); + var $ce, _ce; + var fde, gde; + var kde; + bcb(50, 60, Tie, mde); + var Zab = mdb(kxe, "RegEx/ParseException", 50); + bcb(820, 1, {}, ude); + _.sl = function vde(a) { + return a < this.j && bfb(this.i, a) == 63; + }; + _.tl = function wde() { + var a, b, c, d, e; + if (this.c != 10) throw vbb(new mde(tvd((h0d(), uue)))); + a = this.a; + switch (a) { + case 101: + a = 27; + break; + case 102: + a = 12; + break; + case 110: + a = 10; + break; + case 114: + a = 13; + break; + case 116: + a = 9; + break; + case 120: + nde(this); + if (this.c != 0) throw vbb(new mde(tvd((h0d(), Tue)))); + if (this.a == 123) { + e = 0; + c = 0; + do { + nde(this); + if (this.c != 0) throw vbb(new mde(tvd((h0d(), Tue)))); + if ((e = yde(this.a)) < 0) break; + if (c > c * 16) throw vbb(new mde(tvd((h0d(), Uue)))); + c = c * 16 + e; + } while (true); + if (this.a != 125) throw vbb(new mde(tvd((h0d(), Vue)))); + if (c > lxe) throw vbb(new mde(tvd((h0d(), Wue)))); + a = c; + } else { + e = 0; + if (this.c != 0 || (e = yde(this.a)) < 0) + throw vbb(new mde(tvd((h0d(), Tue)))); + c = e; + nde(this); + if (this.c != 0 || (e = yde(this.a)) < 0) + throw vbb(new mde(tvd((h0d(), Tue)))); + c = c * 16 + e; + a = c; + } + break; + case 117: + d = 0; + nde(this); + if (this.c != 0 || (d = yde(this.a)) < 0) + throw vbb(new mde(tvd((h0d(), Tue)))); + b = d; + nde(this); + if (this.c != 0 || (d = yde(this.a)) < 0) + throw vbb(new mde(tvd((h0d(), Tue)))); + b = b * 16 + d; + nde(this); + if (this.c != 0 || (d = yde(this.a)) < 0) + throw vbb(new mde(tvd((h0d(), Tue)))); + b = b * 16 + d; + nde(this); + if (this.c != 0 || (d = yde(this.a)) < 0) + throw vbb(new mde(tvd((h0d(), Tue)))); + b = b * 16 + d; + a = b; + break; + case 118: + nde(this); + if (this.c != 0 || (d = yde(this.a)) < 0) + throw vbb(new mde(tvd((h0d(), Tue)))); + b = d; + nde(this); + if (this.c != 0 || (d = yde(this.a)) < 0) + throw vbb(new mde(tvd((h0d(), Tue)))); + b = b * 16 + d; + nde(this); + if (this.c != 0 || (d = yde(this.a)) < 0) + throw vbb(new mde(tvd((h0d(), Tue)))); + b = b * 16 + d; + nde(this); + if (this.c != 0 || (d = yde(this.a)) < 0) + throw vbb(new mde(tvd((h0d(), Tue)))); + b = b * 16 + d; + nde(this); + if (this.c != 0 || (d = yde(this.a)) < 0) + throw vbb(new mde(tvd((h0d(), Tue)))); + b = b * 16 + d; + nde(this); + if (this.c != 0 || (d = yde(this.a)) < 0) + throw vbb(new mde(tvd((h0d(), Tue)))); + b = b * 16 + d; + if (b > lxe) throw vbb(new mde(tvd((h0d(), "parser.descappe.4")))); + a = b; + break; + case 65: + case 90: + case 122: + throw vbb(new mde(tvd((h0d(), Xue)))); + } + return a; + }; + _.ul = function xde(a) { + var b, c; + switch (a) { + case 100: + c = (this.e & 32) == 32 ? Kfe("Nd", true) : (wfe(), cfe); + break; + case 68: + c = (this.e & 32) == 32 ? Kfe("Nd", false) : (wfe(), jfe); + break; + case 119: + c = (this.e & 32) == 32 ? Kfe("IsWord", true) : (wfe(), sfe); + break; + case 87: + c = (this.e & 32) == 32 ? Kfe("IsWord", false) : (wfe(), lfe); + break; + case 115: + c = (this.e & 32) == 32 ? Kfe("IsSpace", true) : (wfe(), nfe); + break; + case 83: + c = (this.e & 32) == 32 ? Kfe("IsSpace", false) : (wfe(), kfe); + break; + default: + throw vbb(new hz(((b = a), mxe + b.toString(16)))); + } + return c; + }; + _.vl = function zde(a) { + var b, c, d, e, f, g, h, i, j, k, l, m; + this.b = 1; + nde(this); + b = null; + if (this.c == 0 && this.a == 94) { + nde(this); + if (a) { + k = (wfe(), wfe(), ++vfe, new $fe(5)); + } else { + b = (wfe(), wfe(), ++vfe, new $fe(4)); + Ufe(b, 0, lxe); + k = (null, ++vfe, new $fe(4)); + } + } else { + k = (wfe(), wfe(), ++vfe, new $fe(4)); + } + e = true; + while ((m = this.c) != 1) { + if (m == 0 && this.a == 93 && !e) break; + e = false; + c = this.a; + d = false; + if (m == 10) { + switch (c) { + case 100: + case 68: + case 119: + case 87: + case 115: + case 83: + Xfe(k, this.ul(c)); + d = true; + break; + case 105: + case 73: + case 99: + case 67: + c = this.Ll(k, c); + c < 0 && (d = true); + break; + case 112: + case 80: + l = tde(this, c); + if (!l) throw vbb(new mde(tvd((h0d(), Iue)))); + Xfe(k, l); + d = true; + break; + default: + c = this.tl(); + } + } else if (m == 20) { + g = gfb(this.i, 58, this.d); + if (g < 0) throw vbb(new mde(tvd((h0d(), Jue)))); + h = true; + if (bfb(this.i, this.d) == 94) { + ++this.d; + h = false; + } + f = qfb(this.i, this.d, g); + i = Lfe(f, h, (this.e & 512) == 512); + if (!i) throw vbb(new mde(tvd((h0d(), Lue)))); + Xfe(k, i); + d = true; + if (g + 1 >= this.j || bfb(this.i, g + 1) != 93) + throw vbb(new mde(tvd((h0d(), Jue)))); + this.d = g + 2; + } + nde(this); + if (!d) { + if (this.c != 0 || this.a != 45) { + Ufe(k, c, c); + } else { + nde(this); + if ((m = this.c) == 1) throw vbb(new mde(tvd((h0d(), Kue)))); + if (m == 0 && this.a == 93) { + Ufe(k, c, c); + Ufe(k, 45, 45); + } else { + j = this.a; + m == 10 && (j = this.tl()); + nde(this); + Ufe(k, c, j); + } + } + } + (this.e & zte) == zte && this.c == 0 && this.a == 44 && nde(this); + } + if (this.c == 1) throw vbb(new mde(tvd((h0d(), Kue)))); + if (b) { + Zfe(b, k); + k = b; + } + Yfe(k); + Vfe(k); + this.b = 0; + nde(this); + return k; + }; + _.wl = function Ade() { + var a, b, c, d; + c = this.vl(false); + while ((d = this.c) != 7) { + a = this.a; + if ((d == 0 && (a == 45 || a == 38)) || d == 4) { + nde(this); + if (this.c != 9) throw vbb(new mde(tvd((h0d(), Que)))); + b = this.vl(false); + if (d == 4) Xfe(c, b); + else if (a == 45) Zfe(c, b); + else if (a == 38) Wfe(c, b); + else throw vbb(new hz("ASSERT")); + } else { + throw vbb(new mde(tvd((h0d(), Rue)))); + } + } + nde(this); + return c; + }; + _.xl = function Bde() { + var a, b; + a = this.a - 48; + b = (wfe(), wfe(), ++vfe, new Hge(12, null, a)); + !this.g && (this.g = new Wvb()); + Tvb(this.g, new cge(a)); + nde(this); + return b; + }; + _.yl = function Cde() { + nde(this); + return wfe(), ofe; + }; + _.zl = function Dde() { + nde(this); + return wfe(), mfe; + }; + _.Al = function Ede() { + throw vbb(new mde(tvd((h0d(), Yue)))); + }; + _.Bl = function Fde() { + throw vbb(new mde(tvd((h0d(), Yue)))); + }; + _.Cl = function Gde() { + nde(this); + return Ife(); + }; + _.Dl = function Hde() { + nde(this); + return wfe(), qfe; + }; + _.El = function Ide() { + nde(this); + return wfe(), tfe; + }; + _.Fl = function Jde() { + var a; + if (this.d >= this.j || ((a = bfb(this.i, this.d++)) & 65504) != 64) + throw vbb(new mde(tvd((h0d(), Eue)))); + nde(this); + return wfe(), wfe(), ++vfe, new ige(0, a - 64); + }; + _.Gl = function Kde() { + nde(this); + return Jfe(); + }; + _.Hl = function Lde() { + nde(this); + return wfe(), ufe; + }; + _.Il = function Mde() { + var a; + a = (wfe(), wfe(), ++vfe, new ige(0, 105)); + nde(this); + return a; + }; + _.Jl = function Nde() { + nde(this); + return wfe(), rfe; + }; + _.Kl = function Ode() { + nde(this); + return wfe(), pfe; + }; + _.Ll = function Pde(a, b) { + return this.tl(); + }; + _.Ml = function Qde() { + nde(this); + return wfe(), hfe; + }; + _.Nl = function Rde() { + var a, b, c, d, e; + if (this.d + 1 >= this.j) throw vbb(new mde(tvd((h0d(), Bue)))); + d = -1; + b = null; + a = bfb(this.i, this.d); + if (49 <= a && a <= 57) { + d = a - 48; + !this.g && (this.g = new Wvb()); + Tvb(this.g, new cge(d)); + ++this.d; + if (bfb(this.i, this.d) != 41) throw vbb(new mde(tvd((h0d(), yue)))); + ++this.d; + } else { + a == 63 && --this.d; + nde(this); + b = qde(this); + switch (b.e) { + case 20: + case 21: + case 22: + case 23: + break; + case 8: + if (this.c != 7) throw vbb(new mde(tvd((h0d(), yue)))); + break; + default: + throw vbb(new mde(tvd((h0d(), Cue)))); + } + } + nde(this); + e = rde(this); + c = null; + if (e.e == 2) { + if (e.em() != 2) throw vbb(new mde(tvd((h0d(), Due)))); + c = e.am(1); + e = e.am(0); + } + if (this.c != 7) throw vbb(new mde(tvd((h0d(), yue)))); + nde(this); + return wfe(), wfe(), ++vfe, new vge(d, b, e, c); + }; + _.Ol = function Sde() { + nde(this); + return wfe(), ife; + }; + _.Pl = function Tde() { + var a; + nde(this); + a = Cfe(24, rde(this)); + if (this.c != 7) throw vbb(new mde(tvd((h0d(), yue)))); + nde(this); + return a; + }; + _.Ql = function Ude() { + var a; + nde(this); + a = Cfe(20, rde(this)); + if (this.c != 7) throw vbb(new mde(tvd((h0d(), yue)))); + nde(this); + return a; + }; + _.Rl = function Vde() { + var a; + nde(this); + a = Cfe(22, rde(this)); + if (this.c != 7) throw vbb(new mde(tvd((h0d(), yue)))); + nde(this); + return a; + }; + _.Sl = function Wde() { + var a, b, c, d, e; + a = 0; + c = 0; + b = -1; + while (this.d < this.j) { + b = bfb(this.i, this.d); + e = Uee(b); + if (e == 0) break; + a |= e; + ++this.d; + } + if (this.d >= this.j) throw vbb(new mde(tvd((h0d(), zue)))); + if (b == 45) { + ++this.d; + while (this.d < this.j) { + b = bfb(this.i, this.d); + e = Uee(b); + if (e == 0) break; + c |= e; + ++this.d; + } + if (this.d >= this.j) throw vbb(new mde(tvd((h0d(), zue)))); + } + if (b == 58) { + ++this.d; + nde(this); + d = Dfe(rde(this), a, c); + if (this.c != 7) throw vbb(new mde(tvd((h0d(), yue)))); + nde(this); + } else if (b == 41) { + ++this.d; + nde(this); + d = Dfe(rde(this), a, c); + } else throw vbb(new mde(tvd((h0d(), Aue)))); + return d; + }; + _.Tl = function Xde() { + var a; + nde(this); + a = Cfe(21, rde(this)); + if (this.c != 7) throw vbb(new mde(tvd((h0d(), yue)))); + nde(this); + return a; + }; + _.Ul = function Yde() { + var a; + nde(this); + a = Cfe(23, rde(this)); + if (this.c != 7) throw vbb(new mde(tvd((h0d(), yue)))); + nde(this); + return a; + }; + _.Vl = function Zde() { + var a, b; + nde(this); + a = this.f++; + b = Efe(rde(this), a); + if (this.c != 7) throw vbb(new mde(tvd((h0d(), yue)))); + nde(this); + return b; + }; + _.Wl = function $de() { + var a; + nde(this); + a = Efe(rde(this), 0); + if (this.c != 7) throw vbb(new mde(tvd((h0d(), yue)))); + nde(this); + return a; + }; + _.Xl = function _de(a) { + nde(this); + if (this.c == 5) { + nde(this); + return Bfe(a, (wfe(), wfe(), ++vfe, new lge(9, a))); + } else return Bfe(a, (wfe(), wfe(), ++vfe, new lge(3, a))); + }; + _.Yl = function aee(a) { + var b; + nde(this); + b = (wfe(), wfe(), ++vfe, new Lge(2)); + if (this.c == 5) { + nde(this); + Kge(b, (null, ffe)); + Kge(b, a); + } else { + Kge(b, a); + Kge(b, (null, ffe)); + } + return b; + }; + _.Zl = function bee(a) { + nde(this); + if (this.c == 5) { + nde(this); + return wfe(), wfe(), ++vfe, new lge(9, a); + } else return wfe(), wfe(), ++vfe, new lge(3, a); + }; + _.a = 0; + _.b = 0; + _.c = 0; + _.d = 0; + _.e = 0; + _.f = 1; + _.g = null; + _.j = 0; + var bbb = mdb(kxe, "RegEx/RegexParser", 820); + bcb(1824, 820, {}, hee); + _.sl = function iee(a) { + return false; + }; + _.tl = function jee() { + return eee(this); + }; + _.ul = function lee(a) { + return fee(a); + }; + _.vl = function mee(a) { + return gee(this); + }; + _.wl = function nee() { + throw vbb(new mde(tvd((h0d(), Yue)))); + }; + _.xl = function oee() { + throw vbb(new mde(tvd((h0d(), Yue)))); + }; + _.yl = function pee() { + throw vbb(new mde(tvd((h0d(), Yue)))); + }; + _.zl = function qee() { + throw vbb(new mde(tvd((h0d(), Yue)))); + }; + _.Al = function ree() { + nde(this); + return fee(67); + }; + _.Bl = function see() { + nde(this); + return fee(73); + }; + _.Cl = function tee() { + throw vbb(new mde(tvd((h0d(), Yue)))); + }; + _.Dl = function uee() { + throw vbb(new mde(tvd((h0d(), Yue)))); + }; + _.El = function vee() { + throw vbb(new mde(tvd((h0d(), Yue)))); + }; + _.Fl = function wee() { + nde(this); + return fee(99); + }; + _.Gl = function xee() { + throw vbb(new mde(tvd((h0d(), Yue)))); + }; + _.Hl = function yee() { + throw vbb(new mde(tvd((h0d(), Yue)))); + }; + _.Il = function zee() { + nde(this); + return fee(105); + }; + _.Jl = function Aee() { + throw vbb(new mde(tvd((h0d(), Yue)))); + }; + _.Kl = function Bee() { + throw vbb(new mde(tvd((h0d(), Yue)))); + }; + _.Ll = function Cee(a, b) { + return Xfe(a, fee(b)), -1; + }; + _.Ml = function Dee() { + nde(this); + return wfe(), wfe(), ++vfe, new ige(0, 94); + }; + _.Nl = function Eee() { + throw vbb(new mde(tvd((h0d(), Yue)))); + }; + _.Ol = function Fee() { + nde(this); + return wfe(), wfe(), ++vfe, new ige(0, 36); + }; + _.Pl = function Gee() { + throw vbb(new mde(tvd((h0d(), Yue)))); + }; + _.Ql = function Hee() { + throw vbb(new mde(tvd((h0d(), Yue)))); + }; + _.Rl = function Iee() { + throw vbb(new mde(tvd((h0d(), Yue)))); + }; + _.Sl = function Jee() { + throw vbb(new mde(tvd((h0d(), Yue)))); + }; + _.Tl = function Kee() { + throw vbb(new mde(tvd((h0d(), Yue)))); + }; + _.Ul = function Lee() { + throw vbb(new mde(tvd((h0d(), Yue)))); + }; + _.Vl = function Mee() { + var a; + nde(this); + a = Efe(rde(this), 0); + if (this.c != 7) throw vbb(new mde(tvd((h0d(), yue)))); + nde(this); + return a; + }; + _.Wl = function Nee() { + throw vbb(new mde(tvd((h0d(), Yue)))); + }; + _.Xl = function Oee(a) { + nde(this); + return Bfe(a, (wfe(), wfe(), ++vfe, new lge(3, a))); + }; + _.Yl = function Pee(a) { + var b; + nde(this); + b = (wfe(), wfe(), ++vfe, new Lge(2)); + Kge(b, a); + Kge(b, (null, ffe)); + return b; + }; + _.Zl = function Qee(a) { + nde(this); + return wfe(), wfe(), ++vfe, new lge(3, a); + }; + var cee = null, + dee = null; + var $ab = mdb(kxe, "RegEx/ParserForXMLSchema", 1824); + bcb(117, 1, yxe, xfe); + _.$l = function yfe(a) { + throw vbb(new hz("Not supported.")); + }; + _._l = function Gfe() { + return -1; + }; + _.am = function Hfe(a) { + return null; + }; + _.bm = function Mfe() { + return null; + }; + _.cm = function Pfe(a) {}; + _.dm = function Qfe(a) {}; + _.em = function Rfe() { + return 0; + }; + _.Ib = function Sfe() { + return this.fm(0); + }; + _.fm = function Tfe(a) { + return this.e == 11 ? "." : ""; + }; + _.e = 0; + var Yee, + Zee, + $ee, + _ee, + afe, + bfe = null, + cfe, + dfe = null, + efe, + ffe, + gfe = null, + hfe, + ife, + jfe, + kfe, + lfe, + mfe, + nfe, + ofe, + pfe, + qfe, + rfe, + sfe, + tfe, + ufe, + vfe = 0; + var lbb = mdb(kxe, "RegEx/Token", 117); + bcb(136, 117, { 3: 1, 136: 1, 117: 1 }, $fe); + _.fm = function bge(a) { + var b, c, d; + if (this.e == 4) { + if (this == efe) c = "."; + else if (this == cfe) c = "\\d"; + else if (this == sfe) c = "\\w"; + else if (this == nfe) c = "\\s"; + else { + d = new Hfb(); + d.a += "["; + for (b = 0; b < this.b.length; b += 2) { + (a & zte) != 0 && b > 0 && ((d.a += ","), d); + if (this.b[b] === this.b[b + 1]) { + Efb(d, age(this.b[b])); + } else { + Efb(d, age(this.b[b])); + d.a += "-"; + Efb(d, age(this.b[b + 1])); + } + } + d.a += "]"; + c = d.a; + } + } else { + if (this == jfe) c = "\\D"; + else if (this == lfe) c = "\\W"; + else if (this == kfe) c = "\\S"; + else { + d = new Hfb(); + d.a += "[^"; + for (b = 0; b < this.b.length; b += 2) { + (a & zte) != 0 && b > 0 && ((d.a += ","), d); + if (this.b[b] === this.b[b + 1]) { + Efb(d, age(this.b[b])); + } else { + Efb(d, age(this.b[b])); + d.a += "-"; + Efb(d, age(this.b[b + 1])); + } + } + d.a += "]"; + c = d.a; + } + } + return c; + }; + _.a = false; + _.c = false; + var _ab = mdb(kxe, "RegEx/RangeToken", 136); + bcb(584, 1, { 584: 1 }, cge); + _.a = 0; + var abb = mdb(kxe, "RegEx/RegexParser/ReferencePosition", 584); + bcb(583, 1, { 3: 1, 583: 1 }, ege); + _.Fb = function fge(a) { + var b; + if (a == null) return false; + if (!JD(a, 583)) return false; + b = BD(a, 583); + return dfb(this.b, b.b) && this.a == b.a; + }; + _.Hb = function gge() { + return LCb(this.b + "/" + See(this.a)); + }; + _.Ib = function hge() { + return this.c.fm(this.a); + }; + _.a = 0; + var cbb = mdb(kxe, "RegEx/RegularExpression", 583); + bcb(223, 117, yxe, ige); + _._l = function jge() { + return this.a; + }; + _.fm = function kge(a) { + var b, c, d; + switch (this.e) { + case 0: + switch (this.a) { + case 124: + case 42: + case 43: + case 63: + case 40: + case 41: + case 46: + case 91: + case 123: + case 92: + d = "\\" + HD(this.a & aje); + break; + case 12: + d = "\\f"; + break; + case 10: + d = "\\n"; + break; + case 13: + d = "\\r"; + break; + case 9: + d = "\\t"; + break; + case 27: + d = "\\e"; + break; + default: + if (this.a >= Tje) { + c = ((b = this.a >>> 0), "0" + b.toString(16)); + d = "\\v" + qfb(c, c.length - 6, c.length); + } else d = "" + HD(this.a & aje); + } + break; + case 8: + this == hfe || this == ife + ? (d = "" + HD(this.a & aje)) + : (d = "\\" + HD(this.a & aje)); + break; + default: + d = null; + } + return d; + }; + _.a = 0; + var dbb = mdb(kxe, "RegEx/Token/CharToken", 223); + bcb(309, 117, yxe, lge); + _.am = function mge(a) { + return this.a; + }; + _.cm = function nge(a) { + this.b = a; + }; + _.dm = function oge(a) { + this.c = a; + }; + _.em = function pge() { + return 1; + }; + _.fm = function qge(a) { + var b; + if (this.e == 3) { + if (this.c < 0 && this.b < 0) { + b = this.a.fm(a) + "*"; + } else if (this.c == this.b) { + b = this.a.fm(a) + "{" + this.c + "}"; + } else if (this.c >= 0 && this.b >= 0) { + b = this.a.fm(a) + "{" + this.c + "," + this.b + "}"; + } else if (this.c >= 0 && this.b < 0) { + b = this.a.fm(a) + "{" + this.c + ",}"; + } else + throw vbb( + new hz("Token#toString(): CLOSURE " + this.c + She + this.b) + ); + } else { + if (this.c < 0 && this.b < 0) { + b = this.a.fm(a) + "*?"; + } else if (this.c == this.b) { + b = this.a.fm(a) + "{" + this.c + "}?"; + } else if (this.c >= 0 && this.b >= 0) { + b = this.a.fm(a) + "{" + this.c + "," + this.b + "}?"; + } else if (this.c >= 0 && this.b < 0) { + b = this.a.fm(a) + "{" + this.c + ",}?"; + } else + throw vbb( + new hz( + "Token#toString(): NONGREEDYCLOSURE " + this.c + She + this.b + ) + ); + } + return b; + }; + _.b = 0; + _.c = 0; + var ebb = mdb(kxe, "RegEx/Token/ClosureToken", 309); + bcb(821, 117, yxe, rge); + _.am = function sge(a) { + return a == 0 ? this.a : this.b; + }; + _.em = function tge() { + return 2; + }; + _.fm = function uge(a) { + var b; + this.b.e == 3 && this.b.am(0) == this.a + ? (b = this.a.fm(a) + "+") + : this.b.e == 9 && this.b.am(0) == this.a + ? (b = this.a.fm(a) + "+?") + : (b = this.a.fm(a) + ("" + this.b.fm(a))); + return b; + }; + var fbb = mdb(kxe, "RegEx/Token/ConcatToken", 821); + bcb(1822, 117, yxe, vge); + _.am = function wge(a) { + if (a == 0) return this.d; + if (a == 1) return this.b; + throw vbb(new hz("Internal Error: " + a)); + }; + _.em = function xge() { + return !this.b ? 1 : 2; + }; + _.fm = function yge(a) { + var b; + this.c > 0 + ? (b = "(?(" + this.c + ")") + : this.a.e == 8 + ? (b = "(?(" + this.a + ")") + : (b = "(?" + this.a); + !this.b ? (b += this.d + ")") : (b += this.d + "|" + this.b + ")"); + return b; + }; + _.c = 0; + var gbb = mdb(kxe, "RegEx/Token/ConditionToken", 1822); + bcb(1823, 117, yxe, zge); + _.am = function Age(a) { + return this.b; + }; + _.em = function Bge() { + return 1; + }; + _.fm = function Cge(a) { + return ( + "(?" + + (this.a == 0 ? "" : See(this.a)) + + (this.c == 0 ? "" : See(this.c)) + + ":" + + this.b.fm(a) + + ")" + ); + }; + _.a = 0; + _.c = 0; + var hbb = mdb(kxe, "RegEx/Token/ModifierToken", 1823); + bcb(822, 117, yxe, Dge); + _.am = function Ege(a) { + return this.a; + }; + _.em = function Fge() { + return 1; + }; + _.fm = function Gge(a) { + var b; + b = null; + switch (this.e) { + case 6: + this.b == 0 + ? (b = "(?:" + this.a.fm(a) + ")") + : (b = "(" + this.a.fm(a) + ")"); + break; + case 20: + b = "(?=" + this.a.fm(a) + ")"; + break; + case 21: + b = "(?!" + this.a.fm(a) + ")"; + break; + case 22: + b = "(?<=" + this.a.fm(a) + ")"; + break; + case 23: + b = "(?" + this.a.fm(a) + ")"; + } + return b; + }; + _.b = 0; + var ibb = mdb(kxe, "RegEx/Token/ParenToken", 822); + bcb(521, 117, { 3: 1, 117: 1, 521: 1 }, Hge); + _.bm = function Ige() { + return this.b; + }; + _.fm = function Jge(a) { + return this.e == 12 ? "\\" + this.a : Wee(this.b); + }; + _.a = 0; + var jbb = mdb(kxe, "RegEx/Token/StringToken", 521); + bcb(465, 117, yxe, Lge); + _.$l = function Mge(a) { + Kge(this, a); + }; + _.am = function Nge(a) { + return BD(Uvb(this.a, a), 117); + }; + _.em = function Oge() { + return !this.a ? 0 : this.a.a.c.length; + }; + _.fm = function Pge(a) { + var b, c, d, e, f; + if (this.e == 1) { + if (this.a.a.c.length == 2) { + b = BD(Uvb(this.a, 0), 117); + c = BD(Uvb(this.a, 1), 117); + c.e == 3 && c.am(0) == b + ? (e = b.fm(a) + "+") + : c.e == 9 && c.am(0) == b + ? (e = b.fm(a) + "+?") + : (e = b.fm(a) + ("" + c.fm(a))); + } else { + f = new Hfb(); + for (d = 0; d < this.a.a.c.length; d++) { + Efb(f, BD(Uvb(this.a, d), 117).fm(a)); + } + e = f.a; + } + return e; + } + if (this.a.a.c.length == 2 && BD(Uvb(this.a, 1), 117).e == 7) { + e = BD(Uvb(this.a, 0), 117).fm(a) + "?"; + } else if (this.a.a.c.length == 2 && BD(Uvb(this.a, 0), 117).e == 7) { + e = BD(Uvb(this.a, 1), 117).fm(a) + "??"; + } else { + f = new Hfb(); + Efb(f, BD(Uvb(this.a, 0), 117).fm(a)); + for (d = 1; d < this.a.a.c.length; d++) { + f.a += "|"; + Efb(f, BD(Uvb(this.a, d), 117).fm(a)); + } + e = f.a; + } + return e; + }; + var kbb = mdb(kxe, "RegEx/Token/UnionToken", 465); + bcb(518, 1, { 592: 1 }, Rge); + _.Ib = function Sge() { + return this.a.b; + }; + var mbb = mdb(zxe, "XMLTypeUtil/PatternMatcherImpl", 518); + bcb(1622, 1381, {}, Vge); + var Tge; + var nbb = mdb(zxe, "XMLTypeValidator", 1622); + bcb(264, 1, vie, Yge); + _.Jc = function Zge(a) { + reb(this, a); + }; + _.Kc = function $ge() { + return (this.b - this.a) * this.c < 0 ? Wge : new she(this); + }; + _.a = 0; + _.b = 0; + _.c = 0; + var Wge; + var qbb = mdb(Bxe, "ExclusiveRange", 264); + bcb(1068, 1, jie, dhe); + _.Rb = function ehe(a) { + BD(a, 19); + _ge(); + }; + _.Nb = function fhe(a) { + Rrb(this, a); + }; + _.Pb = function ihe() { + return ahe(); + }; + _.Ub = function khe() { + return bhe(); + }; + _.Wb = function nhe(a) { + BD(a, 19); + che(); + }; + _.Ob = function ghe() { + return false; + }; + _.Sb = function hhe() { + return false; + }; + _.Tb = function jhe() { + return -1; + }; + _.Vb = function lhe() { + return -1; + }; + _.Qb = function mhe() { + throw vbb(new cgb(Exe)); + }; + var obb = mdb(Bxe, "ExclusiveRange/1", 1068); + bcb(254, 1, jie, she); + _.Rb = function the(a) { + BD(a, 19); + ohe(); + }; + _.Nb = function uhe(a) { + Rrb(this, a); + }; + _.Pb = function xhe() { + return phe(this); + }; + _.Ub = function zhe() { + return qhe(this); + }; + _.Wb = function Che(a) { + BD(a, 19); + rhe(); + }; + _.Ob = function vhe() { + return this.c.c < 0 ? this.a >= this.c.b : this.a <= this.c.b; + }; + _.Sb = function whe() { + return this.b > 0; + }; + _.Tb = function yhe() { + return this.b; + }; + _.Vb = function Ahe() { + return this.b - 1; + }; + _.Qb = function Bhe() { + throw vbb(new cgb(Exe)); + }; + _.a = 0; + _.b = 0; + var pbb = mdb(Bxe, "ExclusiveRange/RangeIterator", 254); + var TD = pdb(Fve, "C"); + var WD = pdb(Ive, "I"); + var sbb = pdb(Khe, "Z"); + var XD = pdb(Jve, "J"); + var SD = pdb(Eve, "B"); + var UD = pdb(Gve, "D"); + var VD = pdb(Hve, "F"); + var rbb = pdb(Kve, "S"); + var h1 = odb("org.eclipse.elk.core.labels", "ILabelManager"); + var O4 = odb(Tte, "DiagnosticChain"); + var u8 = odb(pwe, "ResourceSet"); + var V4 = mdb(Tte, "InvocationTargetException", null); + var Ihe = (Az(), Dz); + var gwtOnLoad = (gwtOnLoad = Zbb); + Xbb(hcb); + $bb("permProps", [ + [ + [Fxe, Gxe], + [Hxe, "gecko1_8"], + ], + [ + [Fxe, Gxe], + [Hxe, "ie10"], + ], + [ + [Fxe, Gxe], + [Hxe, "ie8"], + ], + [ + [Fxe, Gxe], + [Hxe, "ie9"], + ], + [ + [Fxe, Gxe], + [Hxe, "safari"], + ], + ]); + // -------------- RUN GWT INITIALIZATION CODE -------------- + gwtOnLoad(null, "elk", null); + }.call(this)); + }.call(this, {})); + }, + {}, + ], + 3: [ + function (require, module, exports) { + "use strict"; + + function _classCallCheck(instance, Constructor) { + if (!(instance instanceof Constructor)) { + throw new TypeError("Cannot call a class as a function"); + } + } + + function _possibleConstructorReturn(self, call) { + if (!self) { + throw new ReferenceError( + "this hasn't been initialised - super() hasn't been called" + ); + } + return call && (typeof call === "object" || typeof call === "function") + ? call + : self; + } + + function _inherits(subClass, superClass) { + if (typeof superClass !== "function" && superClass !== null) { + throw new TypeError( + "Super expression must either be null or a function, not " + + typeof superClass + ); + } + subClass.prototype = Object.create(superClass && superClass.prototype, { + constructor: { + value: subClass, + enumerable: false, + writable: true, + configurable: true, + }, + }); + if (superClass) + Object.setPrototypeOf + ? Object.setPrototypeOf(subClass, superClass) + : (subClass.__proto__ = superClass); + } + + /******************************************************************************* + * Copyright (c) 2021 Kiel University and others. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License 2.0 which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * SPDX-License-Identifier: EPL-2.0 + *******************************************************************************/ + var ELK = require("./elk-api.js").default; + + var ELKNode = (function (_ELK) { + _inherits(ELKNode, _ELK); + + function ELKNode() { + var options = + arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {}; + + _classCallCheck(this, ELKNode); + + var optionsClone = Object.assign({}, options); + + var workerThreadsExist = false; + try { + require.resolve("web-worker"); + workerThreadsExist = true; + } catch (e) {} + + // user requested a worker + if (options.workerUrl) { + if (workerThreadsExist) { + var Worker = require("web-worker"); + optionsClone.workerFactory = function (url) { + return new Worker(url); + }; + } else { + console.warn( + "Web worker requested but 'web-worker' package not installed. \nConsider installing the package or pass your own 'workerFactory' to ELK's constructor.\n... Falling back to non-web worker version." + ); + } + } + + // unless no other workerFactory is registered, use the fake worker + if (!optionsClone.workerFactory) { + var _require = require("./elk-worker.min.js"), + _Worker = _require.Worker; + + optionsClone.workerFactory = function (url) { + return new _Worker(url); + }; + } + + return _possibleConstructorReturn( + this, + (ELKNode.__proto__ || Object.getPrototypeOf(ELKNode)).call( + this, + optionsClone + ) + ); + } + + return ELKNode; + })(ELK); + + Object.defineProperty(module.exports, "__esModule", { + value: true, + }); + module.exports = ELKNode; + ELKNode.default = ELKNode; + }, + { "./elk-api.js": 1, "./elk-worker.min.js": 2, "web-worker": 4 }, + ], + 4: [ + function (require, module, exports) { + /** + * Copyright 2020 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + module.exports = Worker; + }, + {}, + ], + }, + {}, + [3] + )(3); +}); diff --git a/d2js/js/src/index.js b/d2js/js/src/index.js new file mode 100644 index 000000000..a2c28adbf --- /dev/null +++ b/d2js/js/src/index.js @@ -0,0 +1,102 @@ +import { createWorker, loadFile } from "./platform.js"; + +export class D2 { + constructor() { + this.ready = this.init(); + } + + setupMessageHandler() { + const isNode = typeof window === "undefined"; + return new Promise((resolve, reject) => { + if (isNode) { + this.worker.on("message", (data) => { + if (data.type === "ready") resolve(); + if (data.type === "error") reject(new Error(data.error)); + if (data.type === "result" && this.currentResolve) { + this.currentResolve(data.data); + } + if (data.type === "error" && this.currentReject) { + this.currentReject(new Error(data.error)); + } + }); + } else { + this.worker.onmessage = (e) => { + if (e.data.type === "ready") resolve(); + if (e.data.type === "error") reject(new Error(e.data.error)); + if (e.data.type === "result" && this.currentResolve) { + this.currentResolve(e.data.data); + } + if (e.data.type === "error" && this.currentReject) { + this.currentReject(new Error(e.data.error)); + } + }; + } + }); + } + + async init() { + this.worker = await createWorker(); + + const elkContent = await loadFile("./elk.js"); + const wasmExecContent = await loadFile("./wasm_exec.js"); + const wasmBinary = await loadFile("./d2.wasm"); + + const isNode = typeof window === "undefined"; + const messageHandler = this.setupMessageHandler(); + + if (isNode) { + this.worker.on("error", (error) => { + console.error("Worker (node) encountered an error:", error.message || error); + }); + } else { + this.worker.onerror = (error) => { + console.error("Worker encountered an error:", error.message || error); + }; + } + + this.worker.postMessage({ + type: "init", + data: { + wasm: wasmBinary, + wasmExecContent: isNode ? wasmExecContent.toString() : null, + elkContent: isNode ? elkContent.toString() : null, + wasmExecUrl: isNode + ? null + : URL.createObjectURL( + new Blob([wasmExecContent], { type: "application/javascript" }) + ), + }, + }); + + return messageHandler; + } + + async sendMessage(type, data) { + await this.ready; + return new Promise((resolve, reject) => { + this.currentResolve = resolve; + this.currentReject = reject; + this.worker.postMessage({ type, data }); + }); + } + + async compile(input, options = {}) { + const request = + typeof input === "string" + ? { fs: { index: input }, options } + : { ...input, options: { ...options, ...input.options } }; + return this.sendMessage("compile", request); + } + + async render(diagram, options = {}) { + return this.sendMessage("render", { diagram, options }); + } + + async encode(script) { + return this.sendMessage("encode", script); + } + + async decode(encoded) { + return this.sendMessage("decode", encoded); + } +} diff --git a/d2js/js/src/platform.browser.js b/d2js/js/src/platform.browser.js new file mode 100644 index 000000000..742a2f1ca --- /dev/null +++ b/d2js/js/src/platform.browser.js @@ -0,0 +1,26 @@ +import { wasmBinary, wasmExecJs } from "./wasm-loader.browser.js"; +import workerScript from "./worker.js" with { type: "text" }; +import elkScript from "./elk.js" with { type: "text" }; + +// For the browser version, we build the wasm files into a file (wasm-loader.browser.js) +// and loading a file just reads the text, so there's no external dependency calls +export async function loadFile(path) { + if (path === "./d2.wasm") { + return wasmBinary.buffer; + } + if (path === "./wasm_exec.js") { + return new TextEncoder().encode(wasmExecJs).buffer; + } + return null; +} + +export async function createWorker() { + let blob = new Blob([wasmExecJs, elkScript, workerScript], { + type: "text/javascript;charset=utf-8", + }); + + const worker = new Worker(URL.createObjectURL(blob), { + type: "module", + }); + return worker; +} diff --git a/d2js/js/src/platform.js b/d2js/js/src/platform.js new file mode 100644 index 000000000..fdcbaa051 --- /dev/null +++ b/d2js/js/src/platform.js @@ -0,0 +1 @@ +export * from "./platform.node.js"; \ No newline at end of file diff --git a/d2js/js/src/platform.node.js b/d2js/js/src/platform.node.js new file mode 100644 index 000000000..ffaa65c20 --- /dev/null +++ b/d2js/js/src/platform.node.js @@ -0,0 +1,40 @@ +let nodeModules = null; + +async function loadNodeModules() { + if (!nodeModules) { + nodeModules = { + fs: await import("fs/promises"), + path: await import("path"), + url: await import("url"), + worker: await import("worker_threads"), + }; + } + return nodeModules; +} + +export async function loadFile(path) { + const modules = await loadNodeModules(); + const readFile = modules.fs.readFile; + const { join, dirname } = modules.path; + const { fileURLToPath } = modules.url; + const __dirname = dirname(fileURLToPath(import.meta.url)); + + try { + return await readFile(join(__dirname, path)); + } catch (err) { + if (err.code === "ENOENT") { + return await readFile(join(__dirname, "../../../wasm", path.replace("./", ""))); + } + throw err; + } +} + +export async function createWorker() { + const modules = await loadNodeModules(); + const { Worker } = modules.worker; + const { join, dirname } = modules.path; + const { fileURLToPath } = modules.url; + const __dirname = dirname(fileURLToPath(import.meta.url)); + const workerPath = join(__dirname, "worker.js"); + return new Worker(workerPath); +} diff --git a/d2js/js/src/wasm-loader.node.js b/d2js/js/src/wasm-loader.node.js new file mode 100644 index 000000000..34292bfec --- /dev/null +++ b/d2js/js/src/wasm-loader.node.js @@ -0,0 +1,8 @@ +import { readFile } from "fs/promises"; +import { fileURLToPath } from "url"; +import { dirname, resolve } from "path"; + +const __dirname = dirname(fileURLToPath(import.meta.url)); +export async function getWasmBinary() { + return readFile(resolve(__dirname, "./d2.wasm")); +} diff --git a/d2js/js/src/worker.browser.js b/d2js/js/src/worker.browser.js new file mode 100644 index 000000000..a9cff400f --- /dev/null +++ b/d2js/js/src/worker.browser.js @@ -0,0 +1,82 @@ +let currentPort; +let d2; +let elk; + +export function setupMessageHandler(isNode, port, initWasm) { + currentPort = port; + + const handleMessage = async (e) => { + const { type, data } = e; + + switch (type) { + case "init": + try { + if (isNode) { + eval(data.wasmExecContent); + } + d2 = await initWasm(data.wasm); + elk = new ELK(); + currentPort.postMessage({ type: "ready" }); + } catch (err) { + currentPort.postMessage({ type: "error", error: err.message }); + } + break; + + case "compile": + try { + // We use Go to get the intermediate ELK graph + // Then natively run elk layout + // This is due to elk.layout being an async function, which a + // single-threaded WASM call cannot complete without giving control back + // So we compute it, store it here, then during elk layout, instead + // of computing again, we use this variable (and unset it for next call) + // If the layout option has not been set, we generate the elk layout now + // anyway to support `layout-engine: elk` in d2-config vars + if (data.options.layout === "elk" || data.options.layout == null) { + const elkGraph = await d2.getELKGraph(JSON.stringify(data)); + const response = JSON.parse(elkGraph); + if (response.error) throw new Error(response.error.message); + const elkGraph2 = response.data; + const layout = await elk.layout(elkGraph2); + globalThis.elkResult = layout; + } + const result = await d2.compile(JSON.stringify(data)); + const response = JSON.parse(result); + if (response.error) throw new Error(response.error.message); + currentPort.postMessage({ type: "result", data: response.data }); + } catch (err) { + currentPort.postMessage({ type: "error", error: err.message }); + } + break; + + case "render": + try { + const result = await d2.render(JSON.stringify(data)); + const response = JSON.parse(result); + if (response.error) throw new Error(response.error.message); + const decoded = new TextDecoder().decode( + Uint8Array.from(atob(response.data), (c) => c.charCodeAt(0)) + ); + currentPort.postMessage({ type: "result", data: decoded }); + } catch (err) { + currentPort.postMessage({ type: "error", error: err.message }); + } + break; + } + }; + + if (isNode) { + port.on("message", handleMessage); + } else { + port.onmessage = (e) => handleMessage(e.data); + } +} + +async function initWasmBrowser(wasmBinary) { + const go = new Go(); + const result = await WebAssembly.instantiate(wasmBinary, go.importObject); + go.run(result.instance); + return self.d2; +} + +setupMessageHandler(false, self, initWasmBrowser); diff --git a/d2js/js/src/worker.js b/d2js/js/src/worker.js new file mode 100644 index 000000000..427fbfffb --- /dev/null +++ b/d2js/js/src/worker.js @@ -0,0 +1,70 @@ +import { parentPort } from "node:worker_threads"; + +let currentPort; +let d2; +let elk; + +export function setupMessageHandler(isNode, port, initWasm) { + currentPort = port; + + const handleMessage = async (e) => { + const { type, data } = e; + + switch (type) { + case "init": + try { + if (isNode) { + eval(data.wasmExecContent); + eval(data.elkContent); + } + d2 = await initWasm(data.wasm); + elk = new ELK(); + currentPort.postMessage({ type: "ready" }); + } catch (err) { + currentPort.postMessage({ type: "error", error: err.message }); + } + break; + + case "compile": + try { + const elkGraph = await d2.getELKGraph(JSON.stringify(data)); + const elkGraph2 = JSON.parse(elkGraph).data; + const layout = await elk.layout(elkGraph2); + globalThis.elkResult = layout; + const result = await d2.compile(JSON.stringify(data)); + const response = JSON.parse(result); + if (response.error) throw new Error(response.error.message); + currentPort.postMessage({ type: "result", data: response.data }); + } catch (err) { + currentPort.postMessage({ type: "error", error: err.message }); + } + break; + + case "render": + try { + const result = await d2.render(JSON.stringify(data)); + const response = JSON.parse(result); + if (response.error) throw new Error(response.error.message); + currentPort.postMessage({ type: "result", data: atob(response.data) }); + } catch (err) { + currentPort.postMessage({ type: "error", error: err.message }); + } + break; + } + }; + + if (isNode) { + port.on("message", handleMessage); + } else { + port.onmessage = (e) => handleMessage(e.data); + } +} + +async function initWasmNode(wasmBinary) { + const go = new Go(); + const result = await WebAssembly.instantiate(wasmBinary, go.importObject); + go.run(result.instance); + return global.d2; +} + +setupMessageHandler(true, parentPort, initWasmNode); diff --git a/d2js/js/src/worker.node.js b/d2js/js/src/worker.node.js new file mode 100644 index 000000000..33e6c8dd0 --- /dev/null +++ b/d2js/js/src/worker.node.js @@ -0,0 +1,77 @@ +import { parentPort } from "node:worker_threads"; + +let currentPort; +let d2; +let elk; + +export function setupMessageHandler(isNode, port, initWasm) { + currentPort = port; + + const handleMessage = async (e) => { + const { type, data } = e; + + switch (type) { + case "init": + try { + if (isNode) { + eval(data.wasmExecContent); + eval(data.elkContent); + } + d2 = await initWasm(data.wasm); + elk = new ELK(); + currentPort.postMessage({ type: "ready" }); + } catch (err) { + currentPort.postMessage({ type: "error", error: err.message }); + } + break; + + case "compile": + try { + if (data.options.layout === "elk" || data.options.layout == null) { + const elkGraph = await d2.getELKGraph(JSON.stringify(data)); + const response = JSON.parse(elkGraph); + if (response.error) throw new Error(response.error.message); + const elkGraph2 = response.data; + const layout = await elk.layout(elkGraph2); + globalThis.elkResult = layout; + } + const result = await d2.compile(JSON.stringify(data)); + const response = JSON.parse(result); + if (response.error) throw new Error(response.error.message); + currentPort.postMessage({ type: "result", data: response.data }); + } catch (err) { + currentPort.postMessage({ type: "error", error: err.message }); + } + break; + + case "render": + try { + const result = await d2.render(JSON.stringify(data)); + const response = JSON.parse(result); + if (response.error) throw new Error(response.error.message); + const decoded = new TextDecoder().decode( + Uint8Array.from(atob(response.data), (c) => c.charCodeAt(0)) + ); + currentPort.postMessage({ type: "result", data: decoded }); + } catch (err) { + currentPort.postMessage({ type: "error", error: err.message }); + } + break; + } + }; + + if (isNode) { + port.on("message", handleMessage); + } else { + port.onmessage = (e) => handleMessage(e.data); + } +} + +async function initWasmNode(wasmBinary) { + const go = new Go(); + const result = await WebAssembly.instantiate(wasmBinary, go.importObject); + go.run(result.instance); + return global.d2; +} + +setupMessageHandler(true, parentPort, initWasmNode); diff --git a/d2js/js/test/integration/cjs.test.js b/d2js/js/test/integration/cjs.test.js new file mode 100644 index 000000000..bb83d0f0f --- /dev/null +++ b/d2js/js/test/integration/cjs.test.js @@ -0,0 +1,11 @@ +import { expect, test, describe } from "bun:test"; + +describe("D2 CJS Integration", () => { + test("can require and use CJS build", async () => { + const { D2 } = require("../../dist/node-cjs/index.js"); + const d2 = new D2(); + const result = await d2.compile("x -> y"); + expect(result.diagram).toBeDefined(); + await d2.worker.terminate(); + }, 20000); +}); diff --git a/d2js/js/test/integration/esm.test.js b/d2js/js/test/integration/esm.test.js new file mode 100644 index 000000000..bd1987a24 --- /dev/null +++ b/d2js/js/test/integration/esm.test.js @@ -0,0 +1,11 @@ +import { expect, test, describe } from "bun:test"; +import { D2 } from "../../dist/node-esm/index.js"; + +describe("D2 ESM Integration", () => { + test("can import and use ESM build", async () => { + const d2 = new D2(); + const result = await d2.compile("x -> y"); + expect(result.diagram).toBeDefined(); + await d2.worker.terminate(); + }, 20000); +}); diff --git a/d2js/js/test/unit/basic.test.js b/d2js/js/test/unit/basic.test.js new file mode 100644 index 000000000..fe72c1455 --- /dev/null +++ b/d2js/js/test/unit/basic.test.js @@ -0,0 +1,234 @@ +import { expect, test, describe } from "bun:test"; +import { D2 } from "../../dist/node-esm/index.js"; + +describe("D2 Unit Tests", () => { + test("basic compilation works", async () => { + const d2 = new D2(); + const result = await d2.compile("x -> y"); + expect(result.diagram).toBeDefined(); + await d2.worker.terminate(); + }, 20000); + + test("elk layout works", async () => { + const d2 = new D2(); + const result = await d2.compile("x -> y", { layout: "elk" }); + expect(result.diagram).toBeDefined(); + await d2.worker.terminate(); + }, 20000); + + test("import works", async () => { + const d2 = new D2(); + const fs = { + index: "a: @import", + "import.d2": "x: {shape: circle}", + }; + const result = await d2.compile({ fs }); + expect(result.diagram).toBeDefined(); + await d2.worker.terminate(); + }, 20000); + + test("relative import works", async () => { + const d2 = new D2(); + const fs = { + "folder/index.d2": "a: @../import", + "import.d2": "x: {shape: circle}", + }; + const inputPath = "folder/index.d2"; + const result = await d2.compile({ fs, inputPath }); + expect(result.diagram).toBeDefined(); + await d2.worker.terminate(); + }, 20000); + + test("render works", async () => { + const d2 = new D2(); + const result = await d2.compile("x -> y"); + const svg = await d2.render(result.diagram); + expect(svg).toContain(""); + await d2.worker.terminate(); + }, 20000); + + test("d2-config read correctly", async () => { + const d2 = new D2(); + const result = await d2.compile( + ` +vars: { + d2-config: { + theme-id: 4 + dark-theme-id: 200 + pad: 10 + center: true + sketch: true + layout-engine: elk + } +} +x -> y +` + ); + expect(result.renderOptions.sketch).toBe(true); + expect(result.renderOptions.themeID).toBe(4); + expect(result.renderOptions.darkThemeID).toBe(200); + expect(result.renderOptions.center).toBe(true); + expect(result.renderOptions.pad).toBe(10); + await d2.worker.terminate(); + }, 20000); + + test("render options take priority", async () => { + const d2 = new D2(); + const result = await d2.compile( + ` +vars: { + d2-config: { + theme-id: 4 + dark-theme-id: 200 + pad: 10 + center: true + sketch: true + layout-engine: elk + } +} +x -> y +`, + { + sketch: false, + themeID: 100, + darkThemeID: 300, + center: false, + pad: 0, + layout: "dagre", + } + ); + expect(result.renderOptions.sketch).toBe(false); + expect(result.renderOptions.themeID).toBe(100); + expect(result.renderOptions.darkThemeID).toBe(300); + expect(result.renderOptions.center).toBe(false); + expect(result.renderOptions.pad).toBe(0); + await d2.worker.terminate(); + }, 20000); + + test("sketch render works", async () => { + const d2 = new D2(); + const result = await d2.compile("x -> y", { sketch: true }); + const svg = await d2.render(result.diagram, { sketch: true }); + expect(svg).toContain(""); + expect(svg).toContain("sketch-overlay"); + await d2.worker.terminate(); + }, 20000); + + test("center render works", async () => { + const d2 = new D2(); + const result = await d2.compile("x -> y", { center: true }); + const svg = await d2.render(result.diagram, { center: true }); + expect(svg).toContain(""); + expect(svg).toContain("xMidYMid meet"); + await d2.worker.terminate(); + }, 20000); + + test("no XML tag works", async () => { + const d2 = new D2(); + const result = await d2.compile("x -> y"); + const svg = await d2.render(result.diagram, { noXMLTag: true }); + expect(svg).not.toContain(' { + const d2 = new D2(); + const result = await d2.compile("x: {tooltip: x appendix}", { forceAppendix: true }); + const svg = await d2.render(result.diagram, { forceAppendix: true }); + expect(svg).toContain(""); + expect(svg).toContain('class="appendix"'); + await d2.worker.terminate(); + }, 20000); + + test("animated multi-board works", async () => { + const d2 = new D2(); + const source = ` +x -> y +layers: { + numbers: { + 1 -> 2 + } +} +`; + const options = { target: "*", animateInterval: 1000 }; + const result = await d2.compile(source, options); + const svg = await d2.render(result.diagram, result.renderOptions); + expect(svg).toContain(""); + await d2.worker.terminate(); + }, 20000); + + test("latex works", async () => { + const d2 = new D2(); + const result = await d2.compile("x: |latex \\frac{f(x+h)-f(x)}{h} |"); + const svg = await d2.render(result.diagram); + expect(svg).toContain(""); + await d2.worker.terminate(); + }, 20000); + + test("unicode characters work", async () => { + const d2 = new D2(); + const result = await d2.compile("こんにちは -> ♒️"); + const svg = await d2.render(result.diagram); + expect(svg).toContain(""); + expect(svg).toContain("こんにちは"); + expect(svg).toContain("♒️"); + await d2.worker.terminate(); + }, 20000); + + test("handles syntax errors correctly", async () => { + const d2 = new D2(); + try { + await d2.compile("invalid -> -> syntax"); + throw new Error("Should have thrown syntax error"); + } catch (err) { + expect(err).toBeDefined(); + expect(err.message).not.toContain("Should have thrown syntax error"); + } + await d2.worker.terminate(); + }, 20000); + + test("handles unanimated multi-board error correctly", async () => { + const d2 = new D2(); + const source = ` +x -> y +layers: { + numbers: { + 1 -> 2 + } +} +`; + const result = await d2.compile(source); + try { + await d2.render(result.diagram, { target: "*" }); + throw new Error("Should have thrown compile error"); + } catch (err) { + expect(err).toBeDefined(); + expect(err.message).not.toContain("Should have thrown compile error"); + } + await d2.worker.terminate(); + }, 20000); + + test("handles invalid imports correctly", async () => { + const d2 = new D2(); + const fs = { + "folder/index.d2": "a: @../invalid", + "import.d2": "x: {shape: circle}", + }; + const inputPath = "folder/index.d2"; + try { + await d2.compile({ fs, inputPath }); + throw new Error("Should have thrown compile error"); + } catch (err) { + expect(err).toBeDefined(); + expect(err.message).not.toContain("Should have thrown compile error"); + } + await d2.worker.terminate(); + }, 20000); +}); diff --git a/d2js/js/wasm/wasm_exec.js b/d2js/js/wasm/wasm_exec.js new file mode 100644 index 000000000..22adf20b0 --- /dev/null +++ b/d2js/js/wasm/wasm_exec.js @@ -0,0 +1,477 @@ +"use strict"; +(() => { + const o = () => { + const h = new Error("not implemented"); + return (h.code = "ENOSYS"), h; + }; + if (!globalThis.fs) { + let h = ""; + globalThis.fs = { + constants: { + O_WRONLY: -1, + O_RDWR: -1, + O_CREAT: -1, + O_TRUNC: -1, + O_APPEND: -1, + O_EXCL: -1, + }, + writeSync(n, s) { + h += y.decode(s); + const i = h.lastIndexOf(` +`); + return ( + i != -1 && (console.log(h.substring(0, i)), (h = h.substring(i + 1))), s.length + ); + }, + write(n, s, i, r, f, u) { + if (i !== 0 || r !== s.length || f !== null) { + u(o()); + return; + } + const d = this.writeSync(n, s); + u(null, d); + }, + chmod(n, s, i) { + i(o()); + }, + chown(n, s, i, r) { + r(o()); + }, + close(n, s) { + s(o()); + }, + fchmod(n, s, i) { + i(o()); + }, + fchown(n, s, i, r) { + r(o()); + }, + fstat(n, s) { + s(o()); + }, + fsync(n, s) { + s(null); + }, + ftruncate(n, s, i) { + i(o()); + }, + lchown(n, s, i, r) { + r(o()); + }, + link(n, s, i) { + i(o()); + }, + lstat(n, s) { + s(o()); + }, + mkdir(n, s, i) { + i(o()); + }, + open(n, s, i, r) { + r(o()); + }, + read(n, s, i, r, f, u) { + u(o()); + }, + readdir(n, s) { + s(o()); + }, + readlink(n, s) { + s(o()); + }, + rename(n, s, i) { + i(o()); + }, + rmdir(n, s) { + s(o()); + }, + stat(n, s) { + s(o()); + }, + symlink(n, s, i) { + i(o()); + }, + truncate(n, s, i) { + i(o()); + }, + unlink(n, s) { + s(o()); + }, + utimes(n, s, i, r) { + r(o()); + }, + }; + } + if ( + (globalThis.process || + (globalThis.process = { + getuid() { + return -1; + }, + getgid() { + return -1; + }, + geteuid() { + return -1; + }, + getegid() { + return -1; + }, + getgroups() { + throw o(); + }, + pid: -1, + ppid: -1, + umask() { + throw o(); + }, + cwd() { + throw o(); + }, + chdir() { + throw o(); + }, + }), + !globalThis.crypto) + ) + throw new Error( + "globalThis.crypto is not available, polyfill required (crypto.getRandomValues only)" + ); + if (!globalThis.performance) + throw new Error( + "globalThis.performance is not available, polyfill required (performance.now only)" + ); + if (!globalThis.TextEncoder) + throw new Error("globalThis.TextEncoder is not available, polyfill required"); + if (!globalThis.TextDecoder) + throw new Error("globalThis.TextDecoder is not available, polyfill required"); + const g = new TextEncoder("utf-8"), + y = new TextDecoder("utf-8"); + globalThis.Go = class { + constructor() { + (this.argv = ["js"]), + (this.env = {}), + (this.exit = (t) => { + t !== 0 && console.warn("exit code:", t); + }), + (this._exitPromise = new Promise((t) => { + this._resolveExitPromise = t; + })), + (this._pendingEvent = null), + (this._scheduledTimeouts = new Map()), + (this._nextCallbackTimeoutID = 1); + const h = (t, e) => { + this.mem.setUint32(t + 0, e, !0), + this.mem.setUint32(t + 4, Math.floor(e / 4294967296), !0); + }, + n = (t, e) => { + this.mem.setUint32(t + 0, e, !0); + }, + s = (t) => { + const e = this.mem.getUint32(t + 0, !0), + l = this.mem.getInt32(t + 4, !0); + return e + l * 4294967296; + }, + i = (t) => { + const e = this.mem.getFloat64(t, !0); + if (e === 0) return; + if (!isNaN(e)) return e; + const l = this.mem.getUint32(t, !0); + return this._values[l]; + }, + r = (t, e) => { + if (typeof e == "number" && e !== 0) { + if (isNaN(e)) { + this.mem.setUint32(t + 4, 2146959360, !0), this.mem.setUint32(t, 0, !0); + return; + } + this.mem.setFloat64(t, e, !0); + return; + } + if (e === void 0) { + this.mem.setFloat64(t, 0, !0); + return; + } + let a = this._ids.get(e); + a === void 0 && + ((a = this._idPool.pop()), + a === void 0 && (a = this._values.length), + (this._values[a] = e), + (this._goRefCounts[a] = 0), + this._ids.set(e, a)), + this._goRefCounts[a]++; + let c = 0; + switch (typeof e) { + case "object": + e !== null && (c = 1); + break; + case "string": + c = 2; + break; + case "symbol": + c = 3; + break; + case "function": + c = 4; + break; + } + this.mem.setUint32(t + 4, 2146959360 | c, !0), this.mem.setUint32(t, a, !0); + }, + f = (t) => { + const e = s(t + 0), + l = s(t + 8); + return new Uint8Array(this._inst.exports.mem.buffer, e, l); + }, + u = (t) => { + const e = s(t + 0), + l = s(t + 8), + a = new Array(l); + for (let c = 0; c < l; c++) a[c] = i(e + c * 8); + return a; + }, + d = (t) => { + const e = s(t + 0), + l = s(t + 8); + return y.decode(new DataView(this._inst.exports.mem.buffer, e, l)); + }, + m = Date.now() - performance.now(); + this.importObject = { + _gotest: { add: (t, e) => t + e }, + gojs: { + "runtime.wasmExit": (t) => { + t >>>= 0; + const e = this.mem.getInt32(t + 8, !0); + (this.exited = !0), + delete this._inst, + delete this._values, + delete this._goRefCounts, + delete this._ids, + delete this._idPool, + this.exit(e); + }, + "runtime.wasmWrite": (t) => { + t >>>= 0; + const e = s(t + 8), + l = s(t + 16), + a = this.mem.getInt32(t + 24, !0); + fs.writeSync(e, new Uint8Array(this._inst.exports.mem.buffer, l, a)); + }, + "runtime.resetMemoryDataView": (t) => { + (t >>>= 0), (this.mem = new DataView(this._inst.exports.mem.buffer)); + }, + "runtime.nanotime1": (t) => { + (t >>>= 0), h(t + 8, (m + performance.now()) * 1e6); + }, + "runtime.walltime": (t) => { + t >>>= 0; + const e = new Date().getTime(); + h(t + 8, e / 1e3), this.mem.setInt32(t + 16, (e % 1e3) * 1e6, !0); + }, + "runtime.scheduleTimeoutEvent": (t) => { + t >>>= 0; + const e = this._nextCallbackTimeoutID; + this._nextCallbackTimeoutID++, + this._scheduledTimeouts.set( + e, + setTimeout(() => { + for (this._resume(); this._scheduledTimeouts.has(e); ) + console.warn("scheduleTimeoutEvent: missed timeout event"), + this._resume(); + }, s(t + 8)) + ), + this.mem.setInt32(t + 16, e, !0); + }, + "runtime.clearTimeoutEvent": (t) => { + t >>>= 0; + const e = this.mem.getInt32(t + 8, !0); + clearTimeout(this._scheduledTimeouts.get(e)), + this._scheduledTimeouts.delete(e); + }, + "runtime.getRandomData": (t) => { + (t >>>= 0), crypto.getRandomValues(f(t + 8)); + }, + "syscall/js.finalizeRef": (t) => { + t >>>= 0; + const e = this.mem.getUint32(t + 8, !0); + if ((this._goRefCounts[e]--, this._goRefCounts[e] === 0)) { + const l = this._values[e]; + (this._values[e] = null), this._ids.delete(l), this._idPool.push(e); + } + }, + "syscall/js.stringVal": (t) => { + (t >>>= 0), r(t + 24, d(t + 8)); + }, + "syscall/js.valueGet": (t) => { + t >>>= 0; + const e = Reflect.get(i(t + 8), d(t + 16)); + (t = this._inst.exports.getsp() >>> 0), r(t + 32, e); + }, + "syscall/js.valueSet": (t) => { + (t >>>= 0), Reflect.set(i(t + 8), d(t + 16), i(t + 32)); + }, + "syscall/js.valueDelete": (t) => { + (t >>>= 0), Reflect.deleteProperty(i(t + 8), d(t + 16)); + }, + "syscall/js.valueIndex": (t) => { + (t >>>= 0), r(t + 24, Reflect.get(i(t + 8), s(t + 16))); + }, + "syscall/js.valueSetIndex": (t) => { + (t >>>= 0), Reflect.set(i(t + 8), s(t + 16), i(t + 24)); + }, + "syscall/js.valueCall": (t) => { + t >>>= 0; + try { + const e = i(t + 8), + l = Reflect.get(e, d(t + 16)), + a = u(t + 32), + c = Reflect.apply(l, e, a); + (t = this._inst.exports.getsp() >>> 0), + r(t + 56, c), + this.mem.setUint8(t + 64, 1); + } catch (e) { + (t = this._inst.exports.getsp() >>> 0), + r(t + 56, e), + this.mem.setUint8(t + 64, 0); + } + }, + "syscall/js.valueInvoke": (t) => { + t >>>= 0; + try { + const e = i(t + 8), + l = u(t + 16), + a = Reflect.apply(e, void 0, l); + (t = this._inst.exports.getsp() >>> 0), + r(t + 40, a), + this.mem.setUint8(t + 48, 1); + } catch (e) { + (t = this._inst.exports.getsp() >>> 0), + r(t + 40, e), + this.mem.setUint8(t + 48, 0); + } + }, + "syscall/js.valueNew": (t) => { + t >>>= 0; + try { + const e = i(t + 8), + l = u(t + 16), + a = Reflect.construct(e, l); + (t = this._inst.exports.getsp() >>> 0), + r(t + 40, a), + this.mem.setUint8(t + 48, 1); + } catch (e) { + (t = this._inst.exports.getsp() >>> 0), + r(t + 40, e), + this.mem.setUint8(t + 48, 0); + } + }, + "syscall/js.valueLength": (t) => { + (t >>>= 0), h(t + 16, parseInt(i(t + 8).length)); + }, + "syscall/js.valuePrepareString": (t) => { + t >>>= 0; + const e = g.encode(String(i(t + 8))); + r(t + 16, e), h(t + 24, e.length); + }, + "syscall/js.valueLoadString": (t) => { + t >>>= 0; + const e = i(t + 8); + f(t + 16).set(e); + }, + "syscall/js.valueInstanceOf": (t) => { + (t >>>= 0), this.mem.setUint8(t + 24, i(t + 8) instanceof i(t + 16) ? 1 : 0); + }, + "syscall/js.copyBytesToGo": (t) => { + t >>>= 0; + const e = f(t + 8), + l = i(t + 32); + if (!(l instanceof Uint8Array || l instanceof Uint8ClampedArray)) { + this.mem.setUint8(t + 48, 0); + return; + } + const a = l.subarray(0, e.length); + e.set(a), h(t + 40, a.length), this.mem.setUint8(t + 48, 1); + }, + "syscall/js.copyBytesToJS": (t) => { + t >>>= 0; + const e = i(t + 8), + l = f(t + 16); + if (!(e instanceof Uint8Array || e instanceof Uint8ClampedArray)) { + this.mem.setUint8(t + 48, 0); + return; + } + const a = l.subarray(0, e.length); + e.set(a), h(t + 40, a.length), this.mem.setUint8(t + 48, 1); + }, + debug: (t) => { + console.log(t); + }, + }, + }; + } + async run(h) { + if (!(h instanceof WebAssembly.Instance)) + throw new Error("Go.run: WebAssembly.Instance expected"); + (this._inst = h), + (this.mem = new DataView(this._inst.exports.mem.buffer)), + (this._values = [NaN, 0, null, !0, !1, globalThis, this]), + (this._goRefCounts = new Array(this._values.length).fill(1 / 0)), + (this._ids = new Map([ + [0, 1], + [null, 2], + [!0, 3], + [!1, 4], + [globalThis, 5], + [this, 6], + ])), + (this._idPool = []), + (this.exited = !1); + let n = 4096; + const s = (m) => { + const t = n, + e = g.encode(m + "\0"); + return ( + new Uint8Array(this.mem.buffer, n, e.length).set(e), + (n += e.length), + n % 8 !== 0 && (n += 8 - (n % 8)), + t + ); + }, + i = this.argv.length, + r = []; + this.argv.forEach((m) => { + r.push(s(m)); + }), + r.push(0), + Object.keys(this.env) + .sort() + .forEach((m) => { + r.push(s(`${m}=${this.env[m]}`)); + }), + r.push(0); + const u = n; + if ( + (r.forEach((m) => { + this.mem.setUint32(n, m, !0), this.mem.setUint32(n + 4, 0, !0), (n += 8); + }), + n >= 12288) + ) + throw new Error( + "total length of command line and environment variables exceeds limit" + ); + this._inst.exports.run(i, u), + this.exited && this._resolveExitPromise(), + await this._exitPromise; + } + _resume() { + if (this.exited) throw new Error("Go program has already exited"); + this._inst.exports.resume(), this.exited && this._resolveExitPromise(); + } + _makeFuncWrapper(h) { + const n = this; + return function () { + const s = { id: h, this: this, args: arguments }; + return (n._pendingEvent = s), n._resume(), s.result; + }; + } + }; +})(); diff --git a/d2layouts/d2dagrelayout/layout.go b/d2layouts/d2dagrelayout/layout.go index d91d354d4..5ea318514 100644 --- a/d2layouts/d2dagrelayout/layout.go +++ b/d2layouts/d2dagrelayout/layout.go @@ -11,8 +11,6 @@ import ( "log/slog" - "github.com/dop251/goja" - "oss.terrastruct.com/util-go/xdefer" "oss.terrastruct.com/util-go/go2" @@ -20,6 +18,7 @@ import ( "oss.terrastruct.com/d2/d2graph" "oss.terrastruct.com/d2/d2target" "oss.terrastruct.com/d2/lib/geo" + "oss.terrastruct.com/d2/lib/jsrunner" "oss.terrastruct.com/d2/lib/label" "oss.terrastruct.com/d2/lib/log" "oss.terrastruct.com/d2/lib/shape" @@ -80,11 +79,11 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err defer xdefer.Errorf(&err, "failed to dagre layout") debugJS := false - vm := goja.New() - if _, err := vm.RunString(dagreJS); err != nil { + runner := jsrunner.NewJSRunner() + if _, err := runner.RunString(dagreJS); err != nil { return err } - if _, err := vm.RunString(setupJS); err != nil { + if _, err := runner.RunString(setupJS); err != nil { return err } @@ -136,7 +135,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err } configJS := setGraphAttrs(rootAttrs) - if _, err := vm.RunString(configJS); err != nil { + if _, err := runner.RunString(configJS); err != nil { return err } @@ -183,11 +182,11 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err log.Debug(ctx, "script", slog.Any("all", setupJS+configJS+loadScript)) } - if _, err := vm.RunString(loadScript); err != nil { + if _, err := runner.RunString(loadScript); err != nil { return err } - if _, err := vm.RunString(`dagre.layout(g)`); err != nil { + if _, err := runner.RunString(`dagre.layout(g)`); err != nil { if debugJS { log.Warn(ctx, "layout error", slog.Any("err", err)) } @@ -195,7 +194,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err } for i := range g.Objects { - val, err := vm.RunString(fmt.Sprintf("JSON.stringify(g.node(g.nodes()[%d]))", i)) + val, err := runner.RunString(fmt.Sprintf("JSON.stringify(g.node(g.nodes()[%d]))", i)) if err != nil { return err } @@ -216,7 +215,7 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err } for i, edge := range g.Edges { - val, err := vm.RunString(fmt.Sprintf("JSON.stringify(g.edge(g.edges()[%d]))", i)) + val, err := runner.RunString(fmt.Sprintf("JSON.stringify(g.edge(g.edges()[%d]))", i)) if err != nil { return err } diff --git a/d2layouts/d2elklayout/elk.go b/d2layouts/d2elklayout/elk.go new file mode 100644 index 000000000..dd10c71c8 --- /dev/null +++ b/d2layouts/d2elklayout/elk.go @@ -0,0 +1,10 @@ +//go:build !js && !wasm + +package d2elklayout + +import ( + _ "embed" +) + +//go:embed elk.js +var elkJS string diff --git a/d2layouts/d2elklayout/elk.js b/d2layouts/d2elklayout/elk.js index 54690611d..9128b0517 100644 --- a/d2layouts/d2elklayout/elk.js +++ b/d2layouts/d2elklayout/elk.js @@ -5,15 +5,7 @@ define([], f); } else { var g; - if (typeof window !== "undefined") { - g = window; - } else if (typeof global !== "undefined") { - g = global; - } else if (typeof self !== "undefined") { - g = self; - } else { - g = this; - } + g = this; g.ELK = f(); } })(function () { @@ -337,9 +329,6 @@ // -------------- FAKE ELEMENTS GWT ASSUMES EXIST -------------- var $wnd = { Error: {} }; - if (typeof window !== "undefined") $wnd = window; - else if (typeof global !== "undefined") $wnd = global; // nodejs - else if (typeof self !== "undefined") $wnd = self; // web worker var $moduleName, $moduleBase; @@ -59795,13 +59784,8 @@ }, 0); }; } - if (typeof document === uke && typeof self !== uke) { - var i = new h(self); - self.onmessage = i.saveDispatch; - } else if (typeof module !== uke && module.exports) { - Object.defineProperty(exports, "__esModule", { value: true }); - module.exports = { default: j, Worker: j }; - } + Object.defineProperty(exports, "__esModule", { value: true }); + module.exports = { default: j, Worker: j }; } function aae(a) { if (a.N) return; @@ -105682,16 +105666,7 @@ // -------------- RUN GWT INITIALIZATION CODE -------------- gwtOnLoad(null, "elk", null); }.call(this)); - }.call( - this, - typeof global !== "undefined" - ? global - : typeof self !== "undefined" - ? self - : typeof window !== "undefined" - ? window - : {} - )); + }.call(this, {})); }, {}, ], diff --git a/d2layouts/d2elklayout/elk_js.go b/d2layouts/d2elklayout/elk_js.go new file mode 100644 index 000000000..9f6fd2d34 --- /dev/null +++ b/d2layouts/d2elklayout/elk_js.go @@ -0,0 +1,6 @@ +//go:build js && wasm + +package d2elklayout + +// No embed, since this is already bundled in the js worker +var elkJS string diff --git a/d2layouts/d2elklayout/layout.go b/d2layouts/d2elklayout/layout.go index 6d4c335f1..2994c3a46 100644 --- a/d2layouts/d2elklayout/layout.go +++ b/d2layouts/d2elklayout/layout.go @@ -8,15 +8,12 @@ import ( "context" _ "embed" "encoding/json" - "errors" "fmt" "math" "regexp" "strconv" "strings" - "github.com/dop251/goja" - "oss.terrastruct.com/util-go/xdefer" "oss.terrastruct.com/util-go/go2" @@ -24,13 +21,11 @@ import ( "oss.terrastruct.com/d2/d2graph" "oss.terrastruct.com/d2/d2target" "oss.terrastruct.com/d2/lib/geo" + "oss.terrastruct.com/d2/lib/jsrunner" "oss.terrastruct.com/d2/lib/label" "oss.terrastruct.com/d2/lib/shape" ) -//go:embed elk.js -var elkJS string - //go:embed setup.js var setupJS string @@ -162,18 +157,20 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err } defer xdefer.Errorf(&err, "failed to ELK layout") - vm := goja.New() + runner := jsrunner.NewJSRunner() - console := vm.NewObject() - if err := vm.Set("console", console); err != nil { - return err - } + if runner.Engine() == jsrunner.Goja { + console := runner.NewObject() + if err := runner.Set("console", console); err != nil { + return err + } - if _, err := vm.RunString(elkJS); err != nil { - return err - } - if _, err := vm.RunString(setupJS); err != nil { - return err + if _, err := runner.RunString(elkJS); err != nil { + return err + } + if _, err := runner.RunString(setupJS); err != nil { + return err + } } elkGraph := &ELKGraph{ @@ -443,41 +440,30 @@ func Layout(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (err return err } - loadScript := fmt.Sprintf(`var graph = %s`, raw) + var val jsrunner.JSValue + if runner.Engine() == jsrunner.Goja { + loadScript := fmt.Sprintf(`var graph = %s`, raw) - if _, err := vm.RunString(loadScript); err != nil { - return err - } + if _, err := runner.RunString(loadScript); err != nil { + return err + } - val, err := vm.RunString(`elk.layout(graph) + val, err = runner.RunString(`elk.layout(graph) .then(s => s) .catch(err => err.message) `) - + } else { + val, err = runner.MustGet("elkResult") + } if err != nil { return err } - p := val.Export() + result, err := runner.WaitPromise(ctx, val) if err != nil { - return err + return fmt.Errorf("ELK layout error: %v", err) } - promise := p.(*goja.Promise) - - for promise.State() == goja.PromiseStatePending { - if err := ctx.Err(); err != nil { - return err - } - continue - } - - if promise.State() == goja.PromiseStateRejected { - return errors.New("ELK: something went wrong") - } - - result := promise.Result().Export() - var jsonOut map[string]interface{} switch out := result.(type) { case string: diff --git a/d2layouts/d2elklayout/wasm.go b/d2layouts/d2elklayout/wasm.go new file mode 100644 index 000000000..4a27102b4 --- /dev/null +++ b/d2layouts/d2elklayout/wasm.go @@ -0,0 +1,286 @@ +//go:build js && wasm + +package d2elklayout + +import ( + "context" + "fmt" + "math" + + "oss.terrastruct.com/d2/d2graph" + "oss.terrastruct.com/d2/lib/geo" + "oss.terrastruct.com/d2/lib/label" + "oss.terrastruct.com/util-go/go2" + "oss.terrastruct.com/util-go/xdefer" +) + +// This is mostly copy paste from Layout until elk.layout step +func ConvertGraph(ctx context.Context, g *d2graph.Graph, opts *ConfigurableOpts) (_ *ELKGraph, err error) { + if opts == nil { + opts = &DefaultOpts + } + defer xdefer.Errorf(&err, "failed to ELK layout") + + elkGraph := &ELKGraph{ + ID: "", + LayoutOptions: &elkOpts{ + Thoroughness: 8, + EdgeEdgeBetweenLayersSpacing: 50, + EdgeNode: edge_node_spacing, + HierarchyHandling: "INCLUDE_CHILDREN", + FixedAlignment: "BALANCED", + ConsiderModelOrder: "NODES_AND_EDGES", + CycleBreakingStrategy: "GREEDY_MODEL_ORDER", + NodeSizeConstraints: "MINIMUM_SIZE", + ContentAlignment: "H_CENTER V_CENTER", + ConfigurableOpts: ConfigurableOpts{ + Algorithm: opts.Algorithm, + NodeSpacing: opts.NodeSpacing, + EdgeNodeSpacing: opts.EdgeNodeSpacing, + SelfLoopSpacing: opts.SelfLoopSpacing, + }, + }, + } + if elkGraph.LayoutOptions.ConfigurableOpts.SelfLoopSpacing == DefaultOpts.SelfLoopSpacing { + // +5 for a tiny bit of padding + elkGraph.LayoutOptions.ConfigurableOpts.SelfLoopSpacing = go2.Max(elkGraph.LayoutOptions.ConfigurableOpts.SelfLoopSpacing, childrenMaxSelfLoop(g.Root, g.Root.Direction.Value == "down" || g.Root.Direction.Value == "" || g.Root.Direction.Value == "up")/2+5) + } + switch g.Root.Direction.Value { + case "down": + elkGraph.LayoutOptions.Direction = Down + case "up": + elkGraph.LayoutOptions.Direction = Up + case "right": + elkGraph.LayoutOptions.Direction = Right + case "left": + elkGraph.LayoutOptions.Direction = Left + default: + elkGraph.LayoutOptions.Direction = Down + } + + // set label and icon positions for ELK + for _, obj := range g.Objects { + positionLabelsIcons(obj) + } + + adjustments := make(map[*d2graph.Object]geo.Spacing) + elkNodes := make(map[*d2graph.Object]*ELKNode) + elkEdges := make(map[*d2graph.Edge]*ELKEdge) + + // BFS + var walk func(*d2graph.Object, *d2graph.Object, func(*d2graph.Object, *d2graph.Object)) + walk = func(obj, parent *d2graph.Object, fn func(*d2graph.Object, *d2graph.Object)) { + if obj.Parent != nil { + fn(obj, parent) + } + for _, ch := range obj.ChildrenArray { + walk(ch, obj, fn) + } + } + + walk(g.Root, nil, func(obj, parent *d2graph.Object) { + incoming := 0. + outgoing := 0. + for _, e := range g.Edges { + if e.Src == obj { + outgoing++ + } + if e.Dst == obj { + incoming++ + } + } + if incoming >= 2 || outgoing >= 2 { + switch g.Root.Direction.Value { + case "right", "left": + if obj.Attributes.HeightAttr == nil { + obj.Height = math.Max(obj.Height, math.Max(incoming, outgoing)*port_spacing) + } + default: + if obj.Attributes.WidthAttr == nil { + obj.Width = math.Max(obj.Width, math.Max(incoming, outgoing)*port_spacing) + } + } + } + + if obj.HasLabel() && obj.HasIcon() { + // this gives shapes extra height for their label if they also have an icon + obj.Height += float64(obj.LabelDimensions.Height + label.PADDING) + } + + margin, _ := obj.SpacingOpt(label.PADDING, label.PADDING, false) + width := margin.Left + obj.Width + margin.Right + height := margin.Top + obj.Height + margin.Bottom + adjustments[obj] = margin + + n := &ELKNode{ + ID: obj.AbsID(), + Width: width, + Height: height, + } + + if len(obj.ChildrenArray) > 0 { + n.LayoutOptions = &elkOpts{ + ForceNodeModelOrder: true, + Thoroughness: 8, + EdgeEdgeBetweenLayersSpacing: 50, + HierarchyHandling: "INCLUDE_CHILDREN", + FixedAlignment: "BALANCED", + EdgeNode: edge_node_spacing, + ConsiderModelOrder: "NODES_AND_EDGES", + CycleBreakingStrategy: "GREEDY_MODEL_ORDER", + NodeSizeConstraints: "MINIMUM_SIZE", + ContentAlignment: "H_CENTER V_CENTER", + ConfigurableOpts: ConfigurableOpts{ + NodeSpacing: opts.NodeSpacing, + EdgeNodeSpacing: opts.EdgeNodeSpacing, + SelfLoopSpacing: opts.SelfLoopSpacing, + Padding: opts.Padding, + }, + } + if n.LayoutOptions.ConfigurableOpts.SelfLoopSpacing == DefaultOpts.SelfLoopSpacing { + n.LayoutOptions.ConfigurableOpts.SelfLoopSpacing = go2.Max(n.LayoutOptions.ConfigurableOpts.SelfLoopSpacing, childrenMaxSelfLoop(obj, g.Root.Direction.Value == "down" || g.Root.Direction.Value == "" || g.Root.Direction.Value == "up")/2+5) + } + + switch elkGraph.LayoutOptions.Direction { + case Down, Up: + n.LayoutOptions.NodeSizeMinimum = fmt.Sprintf("(%d, %d)", int(math.Ceil(height)), int(math.Ceil(width))) + case Right, Left: + n.LayoutOptions.NodeSizeMinimum = fmt.Sprintf("(%d, %d)", int(math.Ceil(width)), int(math.Ceil(height))) + } + } else { + n.LayoutOptions = &elkOpts{ + SelfLoopDistribution: "EQUALLY", + } + } + + if obj.IsContainer() { + padding := parsePadding(opts.Padding) + padding = adjustPadding(obj, width, height, padding) + n.LayoutOptions.Padding = padding.String() + } + + if obj.HasLabel() { + n.Labels = append(n.Labels, &ELKLabel{ + Text: obj.Label.Value, + Width: float64(obj.LabelDimensions.Width), + Height: float64(obj.LabelDimensions.Height), + }) + } + + if parent == g.Root { + elkGraph.Children = append(elkGraph.Children, n) + } else { + elkNodes[parent].Children = append(elkNodes[parent].Children, n) + } + + if obj.SQLTable != nil { + n.LayoutOptions.PortConstraints = "FIXED_POS" + columns := obj.SQLTable.Columns + colHeight := n.Height / float64(len(columns)+1) + n.Ports = make([]*ELKPort, 0, len(columns)*2) + var srcSide, dstSide PortSide + switch elkGraph.LayoutOptions.Direction { + case Left: + srcSide, dstSide = West, East + default: + srcSide, dstSide = East, West + } + for i, col := range columns { + n.Ports = append(n.Ports, &ELKPort{ + ID: srcPortID(obj, col.Name.Label), + Y: float64(i+1)*colHeight + colHeight/2, + LayoutOptions: &elkOpts{PortSide: srcSide}, + }) + n.Ports = append(n.Ports, &ELKPort{ + ID: dstPortID(obj, col.Name.Label), + Y: float64(i+1)*colHeight + colHeight/2, + LayoutOptions: &elkOpts{PortSide: dstSide}, + }) + } + } + + elkNodes[obj] = n + }) + + var srcSide, dstSide PortSide + switch elkGraph.LayoutOptions.Direction { + case Up: + srcSide, dstSide = North, South + default: + srcSide, dstSide = South, North + } + + ports := map[struct { + obj *d2graph.Object + side PortSide + }][]*ELKPort{} + + for ei, edge := range g.Edges { + var src, dst string + + switch { + case edge.SrcTableColumnIndex != nil: + src = srcPortID(edge.Src, edge.Src.SQLTable.Columns[*edge.SrcTableColumnIndex].Name.Label) + case edge.Src.SQLTable != nil: + p := &ELKPort{ + ID: fmt.Sprintf("%s.%d", srcPortID(edge.Src, "__root__"), ei), + LayoutOptions: &elkOpts{PortSide: srcSide}, + } + src = p.ID + elkNodes[edge.Src].Ports = append(elkNodes[edge.Src].Ports, p) + k := struct { + obj *d2graph.Object + side PortSide + }{edge.Src, srcSide} + ports[k] = append(ports[k], p) + default: + src = edge.Src.AbsID() + } + + switch { + case edge.DstTableColumnIndex != nil: + dst = dstPortID(edge.Dst, edge.Dst.SQLTable.Columns[*edge.DstTableColumnIndex].Name.Label) + case edge.Dst.SQLTable != nil: + p := &ELKPort{ + ID: fmt.Sprintf("%s.%d", dstPortID(edge.Dst, "__root__"), ei), + LayoutOptions: &elkOpts{PortSide: dstSide}, + } + dst = p.ID + elkNodes[edge.Dst].Ports = append(elkNodes[edge.Dst].Ports, p) + k := struct { + obj *d2graph.Object + side PortSide + }{edge.Dst, dstSide} + ports[k] = append(ports[k], p) + default: + dst = edge.Dst.AbsID() + } + + e := &ELKEdge{ + ID: edge.AbsID(), + Sources: []string{src}, + Targets: []string{dst}, + } + if edge.Label.Value != "" { + e.Labels = append(e.Labels, &ELKLabel{ + Text: edge.Label.Value, + Width: float64(edge.LabelDimensions.Width), + Height: float64(edge.LabelDimensions.Height), + LayoutOptions: &elkOpts{ + InlineEdgeLabels: true, + }, + }) + } + elkGraph.Edges = append(elkGraph.Edges, e) + elkEdges[edge] = e + } + + for k, ports := range ports { + width := elkNodes[k.obj].Width + spacing := width / float64(len(ports)+1) + for i, p := range ports { + p.X = float64(i+1) * spacing + } + } + return elkGraph, nil +} diff --git a/d2layouts/d2near/layout.go b/d2layouts/d2near/layout.go index cfe568d05..a08b43ff3 100644 --- a/d2layouts/d2near/layout.go +++ b/d2layouts/d2near/layout.go @@ -190,6 +190,20 @@ func boundingBox(g *d2graph.Graph) (tl, br *geo.Point) { } } + for _, edge := range g.Edges { + if edge.Src.OuterNearContainer() != nil || edge.Dst.OuterNearContainer() != nil { + continue + } + if edge.Route != nil { + for _, point := range edge.Route { + x1 = math.Min(x1, point.X) + y1 = math.Min(y1, point.Y) + x2 = math.Max(x2, point.X) + y2 = math.Max(y2, point.Y) + } + } + } + if math.IsInf(x1, 1) && math.IsInf(x2, -1) { x1 = 0 x2 = 0 diff --git a/d2layouts/d2sequence/layout_test.go b/d2layouts/d2sequence/layout_test.go index 37c62a017..08d8c6e5f 100644 --- a/d2layouts/d2sequence/layout_test.go +++ b/d2layouts/d2sequence/layout_test.go @@ -7,6 +7,7 @@ import ( "github.com/stretchr/testify/assert" + "oss.terrastruct.com/d2/d2ast" "oss.terrastruct.com/d2/d2compiler" "oss.terrastruct.com/d2/d2graph" "oss.terrastruct.com/d2/d2layouts/d2sequence" @@ -321,7 +322,7 @@ container -> c: edge 1 assert.True(t, has) b_t1.Box = geo.NewBox(nil, 100, 100) - c := g.Root.EnsureChild([]string{"c"}) + c := g.Root.EnsureChild([]d2ast.String{d2ast.FlatUnquotedString("c")}) c.Box = geo.NewBox(nil, 100, 100) c.Shape = d2graph.Scalar{Value: d2target.ShapeSquare} @@ -379,7 +380,7 @@ container -> c: edge 1 func TestSelfEdges(t *testing.T) { g := d2graph.NewGraph() g.Root.Shape = d2graph.Scalar{Value: d2target.ShapeSequenceDiagram} - n1 := g.Root.EnsureChild([]string{"n1"}) + n1 := g.Root.EnsureChild([]d2ast.String{d2ast.FlatUnquotedString("n1")}) n1.Box = geo.NewBox(nil, 100, 100) g.Edges = []*d2graph.Edge{ @@ -415,12 +416,12 @@ func TestSelfEdges(t *testing.T) { func TestSequenceToDescendant(t *testing.T) { g := d2graph.NewGraph() g.Root.Shape = d2graph.Scalar{Value: d2target.ShapeSequenceDiagram} - a := g.Root.EnsureChild([]string{"a"}) + a := g.Root.EnsureChild([]d2ast.String{d2ast.FlatUnquotedString("a")}) a.Box = geo.NewBox(nil, 100, 100) a.Attributes = d2graph.Attributes{ Shape: d2graph.Scalar{Value: shape.PERSON_TYPE}, } - a_t1 := a.EnsureChild([]string{"t1"}) + a_t1 := a.EnsureChild([]d2ast.String{d2ast.FlatUnquotedString("t1")}) a_t1.Box = geo.NewBox(nil, 16, 80) g.Edges = []*d2graph.Edge{ diff --git a/d2layouts/d2sequence/sequence_diagram.go b/d2layouts/d2sequence/sequence_diagram.go index 69eb19985..8943bfce6 100644 --- a/d2layouts/d2sequence/sequence_diagram.go +++ b/d2layouts/d2sequence/sequence_diagram.go @@ -466,7 +466,12 @@ func (sd *sequenceDiagram) placeNotes() { for _, msg := range sd.messages { if sd.verticalIndices[msg.AbsID()] < verticalIndex { - y += sd.yStep + float64(msg.LabelDimensions.Height) + if msg.Src == msg.Dst { + // For self-messages, account for the full vertical space they occupy + y += sd.yStep + math.Max(float64(msg.LabelDimensions.Height), MIN_MESSAGE_DISTANCE)*1.5 + } else { + y += sd.yStep + float64(msg.LabelDimensions.Height) + } } } for _, otherNote := range sd.notes { diff --git a/d2lib/d2.go b/d2lib/d2.go index a50e1a226..39613caec 100644 --- a/d2lib/d2.go +++ b/d2lib/d2.go @@ -77,6 +77,15 @@ func Compile(ctx context.Context, input string, compileOpts *CompileOptions, ren d, err := compile(ctx, g, compileOpts, renderOpts) if d != nil { + if config == nil { + config = &d2target.Config{} + } + // These are fields that affect a diagram's appearance, so feed them back + // into diagram.Config to ensure the hash computed for CSS styling purposes + // is unique to its appearance + config.ThemeID = renderOpts.ThemeID + config.DarkThemeID = renderOpts.DarkThemeID + config.Sketch = renderOpts.Sketch d.Config = config } return d, g, err diff --git a/d2lsp/completion.go b/d2lsp/completion.go new file mode 100644 index 000000000..86e683ce7 --- /dev/null +++ b/d2lsp/completion.go @@ -0,0 +1,506 @@ +// Completion implements lsp autocomplete features +// Currently handles: +// - Complete dot and inside maps for reserved keyword holders (style, labels, etc) +// - Complete discrete values for keywords like shape +// - Complete suggestions for formats for keywords like opacity +package d2lsp + +import ( + "strings" + "unicode" + + "oss.terrastruct.com/d2/d2ast" + "oss.terrastruct.com/d2/d2parser" + "oss.terrastruct.com/d2/d2target" +) + +type CompletionKind int + +const ( + KeywordCompletion CompletionKind = iota + StyleCompletion + ShapeCompletion +) + +type CompletionItem struct { + Label string + Kind CompletionKind + Detail string + InsertText string +} + +func GetCompletionItems(text string, line, column int) ([]CompletionItem, error) { + ast, err := d2parser.Parse("", strings.NewReader(text), nil) + if err != nil { + ast, _ = d2parser.Parse("", strings.NewReader(getTextUntilPosition(text, line, column)), nil) + } + + keyword := getKeywordContext(text, ast, line, column) + switch keyword { + case "style", "style.": + return getStyleCompletions(), nil + case "shape", "shape:": + return getShapeCompletions(), nil + case "shadow", "3d", "multiple", "animated", "bold", "italic", "underline", "filled", "double-border", + "shadow:", "3d:", "multiple:", "animated:", "bold:", "italic:", "underline:", "filled:", "double-border:", + "style.shadow:", "style.3d:", "style.multiple:", "style.animated:", "style.bold:", "style.italic:", "style.underline:", "style.filled:", "style.double-border:": + return getBooleanCompletions(), nil + case "fill-pattern", "fill-pattern:", "style.fill-pattern:": + return getFillPatternCompletions(), nil + case "text-transform", "text-transform:", "style.text-transform:": + return getTextTransformCompletions(), nil + case "opacity", "stroke-width", "stroke-dash", "border-radius", "font-size", + "stroke", "fill", "font-color": + return getValueCompletions(keyword), nil + case "opacity:", "stroke-width:", "stroke-dash:", "border-radius:", "font-size:", + "stroke:", "fill:", "font-color:", + "style.opacity:", "style.stroke-width:", "style.stroke-dash:", "style.border-radius:", "style.font-size:", + "style.stroke:", "style.fill:", "style.font-color:": + return getValueCompletions(strings.TrimSuffix(strings.TrimPrefix(keyword, "style."), ":")), nil + case "width", "height", "top", "left": + return getValueCompletions(keyword), nil + case "width:", "height:", "top:", "left:": + return getValueCompletions(keyword[:len(keyword)-1]), nil + case "source-arrowhead", "target-arrowhead": + return getArrowheadCompletions(), nil + case "source-arrowhead.shape:", "target-arrowhead.shape:": + return getArrowheadShapeCompletions(), nil + case "label", "label.": + return getLabelCompletions(), nil + case "icon", "icon:": + return getIconCompletions(), nil + case "icon.": + return getLabelCompletions(), nil + case "near", "near:": + return getNearCompletions(), nil + case "tooltip:", "tooltip": + return getTooltipCompletions(), nil + case "direction:", "direction": + return getDirectionCompletions(), nil + default: + return nil, nil + } +} + +func getTextUntilPosition(text string, line, column int) string { + lines := strings.Split(text, "\n") + if line >= len(lines) { + return text + } + + result := strings.Join(lines[:line], "\n") + if len(result) > 0 { + result += "\n" + } + if column > len(lines[line]) { + result += lines[line] + } else { + result += lines[line][:column] + } + return result +} + +func getKeywordContext(text string, m *d2ast.Map, line, column int) string { + if m == nil { + return "" + } + lines := strings.Split(text, "\n") + + for _, n := range m.Nodes { + if n.MapKey == nil { + continue + } + + var firstPart, lastPart string + var key *d2ast.KeyPath + if len(n.MapKey.Edges) > 0 { + key = n.MapKey.EdgeKey + } else { + key = n.MapKey.Key + } + if key != nil && len(key.Path) > 0 { + firstKey := key.Path[0].Unbox() + if !firstKey.IsUnquoted() { + continue + } + firstPart = firstKey.ScalarString() + + pathLen := len(key.Path) + if pathLen > 1 { + lastKey := key.Path[pathLen-1].Unbox() + if lastKey.IsUnquoted() { + lastPart = lastKey.ScalarString() + _, isHolderLast := d2ast.ReservedKeywordHolders[lastPart] + if !isHolderLast { + _, isHolderLast = d2ast.CompositeReservedKeywords[lastPart] + } + keyRange := n.MapKey.Range + lineText := lines[keyRange.End.Line] + if isHolderLast && isAfterDot(lineText, column) { + return lastPart + "." + } + } + } + } + if _, isBoard := d2ast.BoardKeywords[firstPart]; isBoard { + firstPart = "" + } + if firstPart == "classes" { + firstPart = "" + } + + _, isHolder := d2ast.ReservedKeywordHolders[firstPart] + if !isHolder { + _, isHolder = d2ast.CompositeReservedKeywords[firstPart] + } + + // Check nested map + if n.MapKey.Value.Map != nil && isPositionInMap(line, column, n.MapKey.Value.Map) { + if nested := getKeywordContext(text, n.MapKey.Value.Map, line, column); nested != "" { + if isHolder { + // If we got a direct key completion from inside a holder's map, + // prefix it with the holder's name + if strings.HasSuffix(nested, ":") && !strings.Contains(nested, ".") { + return firstPart + "." + strings.TrimSuffix(nested, ":") + ":" + } + } + return nested + } + return firstPart + } + + keyRange := n.MapKey.Range + if line != keyRange.End.Line { + continue + } + + // 1) Skip if cursor is well above/below this key + if line < keyRange.Start.Line || line > keyRange.End.Line { + continue + } + + // 2) If on the start line, skip if before the key + if line == keyRange.Start.Line && column < keyRange.Start.Column { + continue + } + + // 3) If on the end line, allow up to keyRange.End.Column + 1 + if line == keyRange.End.Line && column > keyRange.End.Column+1 { + continue + } + + lineText := lines[keyRange.End.Line] + + if isAfterColon(lineText, column) { + if key != nil && len(key.Path) > 1 { + if isHolder && (firstPart == "source-arrowhead" || firstPart == "target-arrowhead") { + return firstPart + "." + lastPart + ":" + } + + _, isHolder := d2ast.ReservedKeywordHolders[lastPart] + if !isHolder { + return lastPart + } + } + return firstPart + ":" + } + + if isAfterDot(lineText, column) && isHolder { + return firstPart + } + } + + return "" +} + +func isAfterDot(text string, pos int) bool { + return pos > 0 && pos <= len(text) && text[pos-1] == '.' +} + +func isAfterColon(text string, pos int) bool { + if pos < 1 || pos > len(text) { + return false + } + i := pos - 1 + for i >= 0 && unicode.IsSpace(rune(text[i])) { + i-- + } + return i >= 0 && text[i] == ':' +} + +func isPositionInMap(line, column int, m *d2ast.Map) bool { + if m == nil { + return false + } + + mapRange := m.Range + if line < mapRange.Start.Line || line > mapRange.End.Line { + return false + } + + if line == mapRange.Start.Line && column < mapRange.Start.Column { + return false + } + if line == mapRange.End.Line && column > mapRange.End.Column { + return false + } + return true +} + +func getShapeCompletions() []CompletionItem { + items := make([]CompletionItem, 0, len(d2target.Shapes)) + for _, shape := range d2target.Shapes { + item := CompletionItem{ + Label: shape, + Kind: ShapeCompletion, + Detail: "shape", + InsertText: shape, + } + items = append(items, item) + } + return items +} + +func getValueCompletions(property string) []CompletionItem { + switch property { + case "opacity": + return []CompletionItem{{ + Label: "(number between 0.0 and 1.0)", + Kind: KeywordCompletion, + Detail: "e.g. 0.4", + InsertText: "", + }} + case "stroke-width": + return []CompletionItem{{ + Label: "(number between 0 and 15)", + Kind: KeywordCompletion, + Detail: "e.g. 2", + InsertText: "", + }} + case "font-size": + return []CompletionItem{{ + Label: "(number between 8 and 100)", + Kind: KeywordCompletion, + Detail: "e.g. 14", + InsertText: "", + }} + case "stroke-dash": + return []CompletionItem{{ + Label: "(number between 0 and 10)", + Kind: KeywordCompletion, + Detail: "e.g. 5", + InsertText: "", + }} + case "border-radius": + return []CompletionItem{{ + Label: "(number greater than or equal to 0)", + Kind: KeywordCompletion, + Detail: "e.g. 4", + InsertText: "", + }} + case "font-color", "stroke", "fill": + return []CompletionItem{{ + Label: "(color name or hex code)", + Kind: KeywordCompletion, + Detail: "e.g. blue, #ff0000", + InsertText: "", + }} + case "width", "height", "top", "left": + return []CompletionItem{{ + Label: "(pixels)", + Kind: KeywordCompletion, + Detail: "e.g. 400", + InsertText: "", + }} + } + return nil +} + +func getStyleCompletions() []CompletionItem { + items := make([]CompletionItem, 0, len(d2ast.StyleKeywords)) + for keyword := range d2ast.StyleKeywords { + item := CompletionItem{ + Label: keyword, + Kind: StyleCompletion, + Detail: "style property", + InsertText: keyword + ": ", + } + items = append(items, item) + } + return items +} + +func getBooleanCompletions() []CompletionItem { + return []CompletionItem{ + { + Label: "true", + Kind: KeywordCompletion, + Detail: "boolean", + InsertText: "true", + }, + { + Label: "false", + Kind: KeywordCompletion, + Detail: "boolean", + InsertText: "false", + }, + } +} + +func getFillPatternCompletions() []CompletionItem { + items := make([]CompletionItem, 0, len(d2ast.FillPatterns)) + for _, pattern := range d2ast.FillPatterns { + item := CompletionItem{ + Label: pattern, + Kind: KeywordCompletion, + Detail: "fill pattern", + InsertText: pattern, + } + items = append(items, item) + } + return items +} + +func getTextTransformCompletions() []CompletionItem { + items := make([]CompletionItem, 0, len(d2ast.TextTransforms)) + for _, transform := range d2ast.TextTransforms { + item := CompletionItem{ + Label: transform, + Kind: KeywordCompletion, + Detail: "text transform", + InsertText: transform, + } + items = append(items, item) + } + return items +} + +func isOnEmptyLine(text string, line int) bool { + lines := strings.Split(text, "\n") + if line >= len(lines) { + return true + } + + return strings.TrimSpace(lines[line]) == "" +} + +func getLabelCompletions() []CompletionItem { + return []CompletionItem{{ + Label: "near", + Kind: StyleCompletion, + Detail: "label position", + InsertText: "near: ", + }} +} + +func getNearCompletions() []CompletionItem { + items := make([]CompletionItem, 0, len(d2ast.LabelPositionsArray)+1) + + items = append(items, CompletionItem{ + Label: "(object ID)", + Kind: KeywordCompletion, + Detail: "e.g. container.inner_shape", + InsertText: "", + }) + + for _, pos := range d2ast.LabelPositionsArray { + item := CompletionItem{ + Label: pos, + Kind: KeywordCompletion, + Detail: "label position", + InsertText: pos, + } + items = append(items, item) + } + return items +} + +func getTooltipCompletions() []CompletionItem { + return []CompletionItem{ + { + Label: "(markdown)", + Kind: KeywordCompletion, + Detail: "markdown formatted text", + InsertText: "|md\n # Tooltip\n Hello world\n|", + }, + } +} + +func getIconCompletions() []CompletionItem { + return []CompletionItem{ + { + Label: "(URL, e.g. https://icons.terrastruct.com/xyz.svg)", + Kind: KeywordCompletion, + Detail: "icon URL", + InsertText: "https://icons.terrastruct.com/essentials%2F073-add.svg", + }, + } +} + +func getDirectionCompletions() []CompletionItem { + directions := []string{"up", "down", "right", "left"} + items := make([]CompletionItem, len(directions)) + for i, dir := range directions { + items[i] = CompletionItem{ + Label: dir, + Kind: KeywordCompletion, + Detail: "direction", + InsertText: dir, + } + } + return items +} + +func getArrowheadShapeCompletions() []CompletionItem { + arrowheads := []string{ + "triangle", + "arrow", + "diamond", + "circle", + "cf-one", "cf-one-required", + "cf-many", "cf-many-required", + } + + items := make([]CompletionItem, len(arrowheads)) + details := map[string]string{ + "triangle": "default", + "arrow": "like triangle but pointier", + "cf-one": "crows foot one", + "cf-one-required": "crows foot one (required)", + "cf-many": "crows foot many", + "cf-many-required": "crows foot many (required)", + } + + for i, shape := range arrowheads { + detail := details[shape] + if detail == "" { + detail = "arrowhead shape" + } + items[i] = CompletionItem{ + Label: shape, + Kind: ShapeCompletion, + Detail: detail, + InsertText: shape, + } + } + return items +} + +func getArrowheadCompletions() []CompletionItem { + completions := []string{ + "shape", + "label", + "style.filled", + } + + items := make([]CompletionItem, len(completions)) + + for i, shape := range completions { + items[i] = CompletionItem{ + Label: shape, + Kind: ShapeCompletion, + InsertText: shape, + } + } + return items +} diff --git a/d2lsp/completion_test.go b/d2lsp/completion_test.go new file mode 100644 index 000000000..8a8ee901e --- /dev/null +++ b/d2lsp/completion_test.go @@ -0,0 +1,454 @@ +package d2lsp + +import ( + "testing" +) + +func TestGetCompletionItems(t *testing.T) { + tests := []struct { + name string + text string + line int + column int + want []CompletionItem + wantErr bool + }{ + { + name: "style dot suggestions", + text: "a.style.", + line: 0, + column: 8, + want: getStyleCompletions(), + }, + { + name: "style map suggestions", + text: `a: { + style. +} +`, + line: 1, + column: 8, + want: getStyleCompletions(), + }, + { + name: "classes shapes", + text: `classes: { + goal: { + shape: + } +} +`, + line: 2, + column: 10, + want: getShapeCompletions(), + }, + { + name: "nested style map suggestions", + text: `a: { + style: { + 3d: + } +} +`, + line: 2, + column: 7, + want: getBooleanCompletions(), + }, + { + name: "3d style map suggestions", + text: `a.style: { + 3d: +} +`, + line: 1, + column: 5, + want: getBooleanCompletions(), + }, + { + name: "fill pattern style map suggestions", + text: `a.style: { + fill-pattern: +} +`, + line: 1, + column: 15, + want: getFillPatternCompletions(), + }, + { + name: "opacity style map suggestions", + text: `a.style: { + opacity: +} +`, + line: 1, + column: 10, + want: getValueCompletions("opacity"), + }, + { + name: "width dot", + text: `a.width:`, + line: 0, + column: 8, + want: getValueCompletions("width"), + }, + { + name: "layer shape", + text: `a + +layers: { + hey: { + go: { + shape: + } + } +} +`, + line: 5, + column: 12, + want: getShapeCompletions(), + }, + { + name: "stroke width value", + text: `a.style.stroke-width: 1`, + line: 0, + column: 23, + want: nil, + }, + { + name: "no style suggestions", + text: `a.style: +`, + line: 0, + column: 8, + want: nil, + }, + { + name: "style property suggestions", + text: "a -> b: { style. }", + line: 0, + column: 16, + want: getStyleCompletions(), + }, + { + name: "style.opacity value hint", + text: "a -> b: { style.opacity: }", + line: 0, + column: 24, + want: getValueCompletions("opacity"), + }, + { + name: "fill pattern completions", + text: "a -> b: { style.fill-pattern: }", + line: 0, + column: 29, + want: getFillPatternCompletions(), + }, + { + name: "text transform completions", + text: "a -> b: { style.text-transform: }", + line: 0, + column: 31, + want: getTextTransformCompletions(), + }, + { + name: "boolean property completions", + text: "a -> b: { style.shadow: }", + line: 0, + column: 23, + want: getBooleanCompletions(), + }, + { + name: "near position completions", + text: "a -> b: { label.near: }", + line: 0, + column: 21, + want: getNearCompletions(), + }, + { + name: "direction completions", + text: "a -> b: { direction: }", + line: 0, + column: 20, + want: getDirectionCompletions(), + }, + { + name: "icon url completions", + text: "a -> b: { icon: }", + line: 0, + column: 15, + want: getIconCompletions(), + }, + { + name: "icon dot url completions", + text: "a.icon:", + line: 0, + column: 7, + want: getIconCompletions(), + }, + { + name: "icon near completions", + text: "a -> b: { icon.near: }", + line: 0, + column: 20, + want: getNearCompletions(), + }, + { + name: "icon map", + text: `a.icon: { + # here +}`, + line: 1, + column: 2, + want: nil, + }, + { + name: "icon flat dot", + text: `a.icon.`, + line: 0, + column: 7, + want: getLabelCompletions(), + }, + { + name: "label flat dot", + text: `a.label.`, + line: 0, + column: 8, + want: getLabelCompletions(), + }, + { + name: "arrowhead completions - dot syntax", + text: "a -> b: { source-arrowhead. }", + line: 0, + column: 27, + want: getArrowheadCompletions(), + }, + { + name: "arrowhead completions - colon syntax", + text: "a -> b: { source-arrowhead: }", + line: 0, + column: 27, + want: nil, + }, + { + name: "arrowhead completions - map syntax", + text: `a -> b: { + source-arrowhead: { + # here + } +}`, + line: 2, + column: 4, + want: getArrowheadCompletions(), + }, + { + name: "arrowhead shape completions - flat dot syntax", + text: "(a -> b)[0].source-arrowhead.shape:", + line: 0, + column: 35, + want: getArrowheadShapeCompletions(), + }, + { + name: "arrowhead shape completions - dot syntax", + text: "a -> b: { source-arrowhead.shape: }", + line: 0, + column: 33, + want: getArrowheadShapeCompletions(), + }, + { + name: "arrowhead shape completions - map syntax", + text: "a -> b: { source-arrowhead: { shape: } }", + line: 0, + column: 36, + want: getArrowheadShapeCompletions(), + }, + { + name: "width value hint", + text: "a -> b: { width: }", + line: 0, + column: 16, + want: getValueCompletions("width"), + }, + { + name: "height value hint", + text: "a -> b: { height: }", + line: 0, + column: 17, + want: getValueCompletions("height"), + }, + { + name: "tooltip markdown template", + text: "a -> b: { tooltip: }", + line: 0, + column: 18, + want: getTooltipCompletions(), + }, + { + name: "tooltip dot markdown template", + text: "a.tooltip:", + line: 0, + column: 10, + want: getTooltipCompletions(), + }, + { + name: "shape dot suggestions", + text: "a.shape:", + line: 0, + column: 8, + want: getShapeCompletions(), + }, + { + name: "shape suggestions", + text: "a -> b: { shape: }", + line: 0, + column: 16, + want: getShapeCompletions(), + }, + { + name: "shape 2 suggestions", + text: `a: { + shape: +}`, + line: 1, + column: 8, + want: getShapeCompletions(), + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + got, err := GetCompletionItems(tt.text, tt.line, tt.column) + if (err != nil) != tt.wantErr { + t.Errorf("GetCompletionItems() error = %v, wantErr %v", err, tt.wantErr) + return + } + + if len(got) != len(tt.want) { + t.Errorf("GetCompletionItems() got %d completions, want %d", len(got), len(tt.want)) + return + } + + // Create maps for easy comparison + gotMap := make(map[string]CompletionItem) + wantMap := make(map[string]CompletionItem) + for _, item := range got { + gotMap[item.Label] = item + } + for _, item := range tt.want { + wantMap[item.Label] = item + } + + // Check that each completion exists and has correct properties + for label, wantItem := range wantMap { + gotItem, exists := gotMap[label] + if !exists { + t.Errorf("missing completion for %q", label) + continue + } + if gotItem.Kind != wantItem.Kind { + t.Errorf("completion %q Kind = %v, want %v", label, gotItem.Kind, wantItem.Kind) + } + if gotItem.Detail != wantItem.Detail { + t.Errorf("completion %q Detail = %v, want %v", label, gotItem.Detail, wantItem.Detail) + } + if gotItem.InsertText != wantItem.InsertText { + t.Errorf("completion %q InsertText = %v, want %v", label, gotItem.InsertText, wantItem.InsertText) + } + } + }) + } +} + +// Helper function to compare CompletionItem slices +func equalCompletions(a, b []CompletionItem) bool { + if len(a) != len(b) { + return false + } + for i := range a { + if a[i].Label != b[i].Label || + a[i].Kind != b[i].Kind || + a[i].Detail != b[i].Detail || + a[i].InsertText != b[i].InsertText { + return false + } + } + return true +} + +func TestGetArrowheadShapeCompletions(t *testing.T) { + got := getArrowheadShapeCompletions() + + expectedLabels := []string{ + "triangle", "arrow", "diamond", "circle", + "cf-one", "cf-one-required", + "cf-many", "cf-many-required", + } + + if len(got) != len(expectedLabels) { + t.Errorf("getArrowheadShapeCompletions() returned %d items, want %d", len(got), len(expectedLabels)) + return + } + + for i, label := range expectedLabels { + if got[i].Label != label { + t.Errorf("completion[%d].Label = %v, want %v", i, got[i].Label, label) + } + if got[i].Kind != ShapeCompletion { + t.Errorf("completion[%d].Kind = %v, want ShapeCompletion", i, got[i].Kind) + } + if got[i].InsertText != label { + t.Errorf("completion[%d].InsertText = %v, want %v", i, got[i].InsertText, label) + } + } +} + +func TestGetValueCompletions(t *testing.T) { + tests := []struct { + property string + wantLabel string + wantDetail string + }{ + { + property: "opacity", + wantLabel: "(number between 0.0 and 1.0)", + wantDetail: "e.g. 0.4", + }, + { + property: "stroke-width", + wantLabel: "(number between 0 and 15)", + wantDetail: "e.g. 2", + }, + { + property: "font-size", + wantLabel: "(number between 8 and 100)", + wantDetail: "e.g. 14", + }, + { + property: "width", + wantLabel: "(pixels)", + wantDetail: "e.g. 400", + }, + { + property: "stroke", + wantLabel: "(color name or hex code)", + wantDetail: "e.g. blue, #ff0000", + }, + } + + for _, tt := range tests { + t.Run(tt.property, func(t *testing.T) { + got := getValueCompletions(tt.property) + if len(got) != 1 { + t.Fatalf("getValueCompletions(%s) returned %d items, want 1", tt.property, len(got)) + } + if got[0].Label != tt.wantLabel { + t.Errorf("completion.Label = %v, want %v", got[0].Label, tt.wantLabel) + } + if got[0].Detail != tt.wantDetail { + t.Errorf("completion.Detail = %v, want %v", got[0].Detail, tt.wantDetail) + } + if got[0].InsertText != "" { + t.Errorf("completion.InsertText = %v, want empty string", got[0].InsertText) + } + }) + } +} diff --git a/d2lsp/d2lsp.go b/d2lsp/d2lsp.go index 21106ea74..eedcd6550 100644 --- a/d2lsp/d2lsp.go +++ b/d2lsp/d2lsp.go @@ -28,7 +28,7 @@ func GetRefRanges(path string, fs map[string]string, boardPath []string, key str var f *d2ir.Field if mk.Key != nil { for _, p := range mk.Key.Path { - f = m.GetField(p.Unbox().ScalarString()) + f = m.GetField(p.Unbox()) if f == nil { return nil, nil, nil } @@ -92,3 +92,66 @@ func getBoardMap(path string, fs map[string]string, boardPath []string) (*d2ir.M } return m, nil } + +func GetBoardAtPosition(text string, pos d2ast.Position) ([]string, error) { + r := strings.NewReader(text) + ast, err := d2parser.Parse("", r, nil) + if err != nil { + return nil, err + } + pos.Byte = -1 + return getBoardPathAtPosition(*ast, nil, pos), nil +} + +func getBoardPathAtPosition(m d2ast.Map, currPath []string, pos d2ast.Position) []string { + inRange := func(r d2ast.Range) bool { + return !pos.Before(r.Start) && pos.Before(r.End) + } + + if !inRange(m.Range) { + return nil + } + + for _, n := range m.Nodes { + if n.MapKey == nil { + continue + } + mk := n.MapKey + + if mk.Key == nil || len(mk.Key.Path) == 0 { + continue + } + + if mk.Value.Map == nil { + continue + } + + keyName := mk.Key.Path[0].Unbox().ScalarString() + + if len(currPath)%2 == 0 { + isBoardType := keyName == "layers" || keyName == "scenarios" || keyName == "steps" + if !isBoardType { + continue + } + } + + if inRange(mk.Value.Map.Range) { + newPath := append(currPath, keyName) + + // Check deeper + if deeperPath := getBoardPathAtPosition(*mk.Value.Map, newPath, pos); deeperPath != nil { + return deeperPath + } + + // We're in between boards, e.g. layers.x.scenarios + // Which means, there's no board at this position + if len(newPath)%2 == 1 { + return nil + } + // Nothing deeper matched but we're in this map's range, return current path + return newPath + } + } + + return nil +} diff --git a/d2lsp/d2lsp_test.go b/d2lsp/d2lsp_test.go index 63c6b8654..65c78e4be 100644 --- a/d2lsp/d2lsp_test.go +++ b/d2lsp/d2lsp_test.go @@ -1,8 +1,10 @@ package d2lsp_test import ( + "slices" "testing" + "oss.terrastruct.com/d2/d2ast" "oss.terrastruct.com/d2/d2lsp" "oss.terrastruct.com/util-go/assert" ) @@ -117,6 +119,12 @@ hi layers: { x: { hello + + layers: { + y: { + qwer + } + } } } `, @@ -130,6 +138,184 @@ layers: { assert.Success(t, err) assert.Equal(t, 0, len(ranges)) + ranges, _, err = d2lsp.GetRefRanges("index.d2", fs, []string{"x", "y"}, "qwer") + assert.Success(t, err) + assert.Equal(t, 1, len(ranges)) + _, _, err = d2lsp.GetRefRanges("index.d2", fs, []string{"y"}, "hello") assert.Equal(t, `board "[y]" not found`, err.Error()) } + +func TestGetBoardAtPosition(t *testing.T) { + tests := []struct { + name string + fs map[string]string + path string + position d2ast.Position + want []string + }{ + { + name: "cursor in layer", + fs: map[string]string{ + "index.d2": `x +layers: { + basic: { + x -> y + } +}`, + }, + path: "index.d2", + position: d2ast.Position{Line: 3, Column: 4}, + want: []string{"layers", "basic"}, + }, + { + name: "cursor in nested layer", + fs: map[string]string{ + "index.d2": ` +layers: { + outer: { + layers: { + inner: { + x -> y + } + } + } +}`, + }, + path: "index.d2", + position: d2ast.Position{Line: 5, Column: 4}, + want: []string{"layers", "outer", "layers", "inner"}, + }, + { + name: "cursor in second sibling nested layer", + fs: map[string]string{ + "index.d2": ` +layers: { + outer: { + layers: { + first: { + a -> b + } + second: { + x -> y + } + } + } +}`, + }, + path: "index.d2", + position: d2ast.Position{Line: 8, Column: 4}, + want: []string{"layers", "outer", "layers", "second"}, + }, + { + name: "cursor in root container", + fs: map[string]string{ + "index.d2": ` +wumbo: { + car +}`, + }, + path: "index.d2", + position: d2ast.Position{Line: 2, Column: 4}, + want: nil, + }, + { + name: "cursor in layer container", + fs: map[string]string{ + "index.d2": ` +layers: { + x: { + wumbo: { + car + } + } +}`, + }, + path: "index.d2", + position: d2ast.Position{Line: 4, Column: 4}, + want: []string{"layers", "x"}, + }, + { + name: "cursor in scenario", + fs: map[string]string{ + "index.d2": ` + scenarios: { + happy: { + x -> y + } + }`, + }, + path: "index.d2", + position: d2ast.Position{Line: 3, Column: 4}, + want: []string{"scenarios", "happy"}, + }, + { + name: "cursor in step", + fs: map[string]string{ + "index.d2": ` + steps: { + first: { + x -> y + } + }`, + }, + path: "index.d2", + position: d2ast.Position{Line: 3, Column: 4}, + want: []string{"steps", "first"}, + }, + { + name: "cursor outside any board", + fs: map[string]string{ + "index.d2": ` + x -> y + layers: { + basic: { + a -> b + } + }`, + }, + path: "index.d2", + position: d2ast.Position{Line: 1, Column: 1}, + want: nil, + }, + { + name: "cursor in empty board", + fs: map[string]string{ + "index.d2": ` + layers: { + basic: { + } + }`, + }, + path: "index.d2", + position: d2ast.Position{Line: 3, Column: 2}, + want: []string{"layers", "basic"}, + }, + { + name: "cursor in between", + fs: map[string]string{ + "index.d2": ` + layers: { + basic: { + } + }`, + }, + path: "index.d2", + position: d2ast.Position{Line: 2, Column: 2}, + want: nil, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + got, err := d2lsp.GetBoardAtPosition(tt.fs[tt.path], tt.position) + assert.Success(t, err) + if tt.want == nil { + assert.Equal(t, true, got == nil) + } else { + assert.Equal(t, len(tt.want), len(got)) + assert.True(t, slices.Equal(tt.want, got)) + } + }) + } +} diff --git a/d2oracle/edit.go b/d2oracle/edit.go index 41660b174..bdb548548 100644 --- a/d2oracle/edit.go +++ b/d2oracle/edit.go @@ -42,6 +42,9 @@ func Create(g *d2graph.Graph, boardPath []string, key string) (_ *d2graph.Graph, } // TODO beter name baseAST = boardG.BaseAST + if baseAST == nil { + return nil, "", fmt.Errorf("board %v cannot be modified through this file", boardPath) + } } newKey, edge, err := generateUniqueKey(boardG, key, nil, nil) @@ -98,6 +101,9 @@ func Set(g *d2graph.Graph, boardPath []string, key string, tag, value *string) ( } // TODO beter name baseAST = boardG.BaseAST + if baseAST == nil { + return nil, fmt.Errorf("board %v cannot be modified through this file", boardPath) + } } err = _set(boardG, baseAST, key, tag, value) @@ -142,6 +148,9 @@ func ReconnectEdge(g *d2graph.Graph, boardPath []string, edgeKey string, srcKey, } // TODO beter name baseAST = boardG.BaseAST + if baseAST == nil { + return nil, fmt.Errorf("board %v cannot be modified through this file", boardPath) + } } obj := boardG.Root @@ -389,7 +398,7 @@ func _set(g *d2graph.Graph, baseAST *d2ast.Map, key string, tag, value *string) if baseAST != g.AST || imported { writeableRefs := GetWriteableRefs(obj, baseAST) for _, ref := range writeableRefs { - if ref.MapKey != nil && ref.MapKey.Value.Map != nil { + if ref.MapKey != nil && ref.MapKey.Value.Map != nil && ref.MapKey.Key == mk.Key { maybeNewScope = ref.MapKey.Value.Map } } @@ -491,7 +500,12 @@ func _set(g *d2graph.Graph, baseAST *d2ast.Map, key string, tag, value *string) m = obj.Map } - if (obj.Label.MapKey != nil && writeableLabelMK) && m == nil && (!found || reserved || len(mk.Edges) > 0) { + if (obj.Label.MapKey != nil && writeableLabelMK) && m == nil && (!found || reserved || len(mk.Edges) > 0) && + // Label is not set like `hey.label: mylabel` + // This should only work when label is set like `hey: mylabel` + (obj.Label.MapKey.Key == nil || + len(obj.Label.MapKey.Key.Path) == 0 || + obj.Label.MapKey.Key.Path[len(obj.Label.MapKey.Key.Path)-1].Unbox().ScalarString() != "label") { m2 := &d2ast.Map{ Range: d2ast.MakeRange(",1:0:0-1:0:0"), } @@ -941,6 +955,9 @@ func Delete(g *d2graph.Graph, boardPath []string, key string) (_ *d2graph.Graph, } // TODO beter name baseAST = boardG.BaseAST + if baseAST == nil { + return nil, fmt.Errorf("board %v cannot be modified through this file", boardPath) + } } g2, err := deleteReserved(g, boardPath, baseAST, mk) @@ -1756,6 +1773,9 @@ func move(g *d2graph.Graph, boardPath []string, key, newKey string, includeDesce } // TODO beter name baseAST = boardG.BaseAST + if baseAST == nil { + return nil, fmt.Errorf("board %v cannot be modified through this file", boardPath) + } } newKey, _, err := generateUniqueKey(boardG, newKey, nil, nil) @@ -3304,3 +3324,135 @@ func filterReservedPath(path []*d2ast.StringBox) (filtered []*d2ast.StringBox) { } return } + +func UpdateImport(dsl, path string, newPath *string) (_ string, err error) { + if newPath == nil { + defer xdefer.Errorf(&err, "failed to remove import %#v", path) + } else { + defer xdefer.Errorf(&err, "failed to update import from %#v to %#v", path, *newPath) + } + + ast, err := d2parser.Parse("", strings.NewReader(dsl), nil) + if err != nil { + return "", err + } + + _updateImport(ast, path, newPath) + + return d2format.Format(ast), nil +} + +func _updateImport(m *d2ast.Map, oldPath string, newPath *string) { + for i := 0; i < len(m.Nodes); i++ { + node := m.Nodes[i] + + if node.Import != nil { + importPath := node.Import.PathWithPre() + if matchesImportPath(importPath, oldPath) { + if newPath == nil { + if node.Import.Spread { + m.Nodes = append(m.Nodes[:i], m.Nodes[i+1:]...) + i-- + } else { + node.Import = nil + } + } else { + updateImportPath(node.Import, getNewImportPath(importPath, oldPath, *newPath)) + } + continue + } + } + + if node.MapKey != nil { + if node.MapKey.Value.Import != nil { + importPath := node.MapKey.Value.Import.PathWithPre() + if matchesImportPath(importPath, oldPath) { + if newPath == nil { + if node.MapKey.Value.Import.Spread && node.MapKey.Value.Map == nil { + m.Nodes = append(m.Nodes[:i], m.Nodes[i+1:]...) + i-- + } else { + node.MapKey.Value.Import = nil + } + } else { + updateImportPath(node.MapKey.Value.Import, getNewImportPath(importPath, oldPath, *newPath)) + } + } + } + + primaryImport := node.MapKey.Primary.Unbox() + if primaryImport != nil { + value, ok := primaryImport.(d2ast.Value) + if ok { + importBox := d2ast.MakeValueBox(value) + if importBox.Import != nil { + importPath := importBox.Import.PathWithPre() + if matchesImportPath(importPath, oldPath) { + if newPath == nil { + node.MapKey.Primary = d2ast.ScalarBox{} + } else { + updateImportPath(importBox.Import, getNewImportPath(importPath, oldPath, *newPath)) + } + } + } + } + } + + if node.MapKey.Value.Map != nil { + _updateImport(node.MapKey.Value.Map, oldPath, newPath) + } + } + } +} + +func updateImportPath(imp *d2ast.Import, newPath string) { + var pre string + pathPart := newPath + + for i, r := range newPath { + if r != '.' && r != '/' { + pre = newPath[:i] + pathPart = newPath[i:] + break + } + } + + if pre == "" && len(newPath) > 0 && (newPath[0] == '.' || newPath[0] == '/') { + pre = newPath + pathPart = "" + } + + imp.Pre = pre + + if pathPart != "" { + if len(imp.Path) > 0 { + imp.Path[0] = d2ast.MakeValueBox(d2ast.RawString(pathPart, true)).StringBox() + } else { + imp.Path = []*d2ast.StringBox{ + d2ast.MakeValueBox(d2ast.RawString(pathPart, true)).StringBox(), + } + } + } else if len(imp.Path) == 0 { + imp.Path = []*d2ast.StringBox{ + d2ast.MakeValueBox(d2ast.RawString("", true)).StringBox(), + } + } +} + +func matchesImportPath(importPath, oldPath string) bool { + isDir := strings.HasSuffix(oldPath, "/") + if isDir { + return strings.HasPrefix(importPath, oldPath) + } + return importPath == oldPath +} + +func getNewImportPath(importPath, oldPath, newPath string) string { + isOldDir := strings.HasSuffix(oldPath, "/") + isNewDir := strings.HasSuffix(newPath, "/") + if isOldDir && isNewDir { + relPath := importPath[len(oldPath):] + return newPath + relPath + } + return newPath +} diff --git a/d2oracle/edit_test.go b/d2oracle/edit_test.go index 7eaf57dc2..c7e8db0ec 100644 --- a/d2oracle/edit_test.go +++ b/d2oracle/edit_test.go @@ -30,6 +30,7 @@ func TestCreate(t *testing.T) { boardPath []string name string text string + fsTexts map[string]string key string expKey string @@ -559,6 +560,37 @@ layers: { expKey: `d`, exp: `b +layers: { + c: { + d + } +} +`, + }, + { + name: "add_layer/5", + text: `classes: { + a: { + style.stroke: red + } +} +b + +layers: { + c +} +`, + key: `d`, + + boardPath: []string{"c"}, + expKey: `d`, + exp: `classes: { + a: { + style.stroke: red + } +} +b + layers: { c: { d @@ -774,6 +806,35 @@ steps: { d 2 } } +`, + }, + { + name: "image-edge", + + text: `...@k +a.b: { + icon: https://icons.terrastruct.com/essentials/004-picture.svg + shape: image +} +`, + fsTexts: map[string]string{ + "k.d2": ` +a: { + b + c +} +`, + }, + key: `a.b -> a.c`, + boardPath: []string{}, + + expKey: `a.(b -> c)[0]`, + exp: `...@k +a.b: { + icon: https://icons.terrastruct.com/essentials/004-picture.svg + shape: image +} +a.(b -> c) `, }, } @@ -785,7 +846,8 @@ steps: { var newKey string et := editTest{ - text: tc.text, + text: tc.text, + fsTexts: tc.fsTexts, testFunc: func(g *d2graph.Graph) (*d2graph.Graph, error) { var err error g, newKey, err = d2oracle.Create(g, tc.boardPath, tc.key) @@ -1023,6 +1085,16 @@ square.style.opacity: 0.2 key: `square.top`, value: go2.Pointer(`200`), exp: `square: {top: 200} +`, + }, + { + name: "labeled_set_position", + text: `hey.label: what +`, + key: `hey.top`, + value: go2.Pointer(`200`), + exp: `hey.label: what +hey.top: 200 `, }, { @@ -2426,6 +2498,28 @@ layers: { (a -> b)[0].style.stroke: red `, }, + { + name: "import/10", + + text: `heyn + +layers: { + man: {...@meow} +} +`, + fsTexts: map[string]string{ + "meow.d2": `layers: { + 1: { + asdf + } +} +`, + }, + boardPath: []string{"man", "1"}, + key: `asdf.link`, + value: go2.Pointer(`_._`), + expErr: `failed to set "asdf.link" to "\"_._\"": board [man 1] cannot be modified through this file`, + }, { name: "label-near/1", @@ -2656,6 +2750,65 @@ scenarios: { } } } +`, + }, + { + name: "step-connection", + + text: `steps: { + 1: { + Modules -- Metricbeat: { + style.stroke-width: 1 + } + } +} + + `, + key: `Metricbeat.style.stroke`, + value: go2.Pointer(`red`), + boardPath: []string{"1"}, + exp: `steps: { + 1: { + Modules -- Metricbeat: { + style.stroke-width: 1 + } + Metricbeat.style.stroke: red + } +} +`, + }, + { + name: "set-style-in-layer", + text: `hey + +layers: { + k: { + b: {style.stroke: "#969db4"} + } +} + +layers: { + x: { + y + } +} +`, + boardPath: []string{"x"}, + key: `y.style.fill`, + value: go2.Pointer(`#ff0000`), + exp: `hey + +layers: { + k: { + b: {style.stroke: "#969db4"} + } +} + +layers: { + x: { + y: {style.fill: "#ff0000"} + } +} `, }, } @@ -6027,6 +6180,28 @@ y exp: `y a -> b c -> d +`, + }, + { + name: "underscore_linked", + text: `k + +layers: { + x: { + a + b: {link: _} + } +} +`, + key: `b`, + boardPath: []string{"x"}, + exp: `k + +layers: { + x: { + a + } +} `, }, { @@ -7989,6 +8164,32 @@ y y (* -> *)[*].style.opacity: 0.8 +`, + }, + { + name: "layer-delete-complex-object", + + text: `k + +layers: { + x: { + a: "b" { + top: 184 + left: 180 + } + j + } +} +`, + key: `a`, + boardPath: []string{"x"}, + exp: `k + +layers: { + x: { + j + } +} `, }, } @@ -9396,3 +9597,288 @@ scenarios: { }) } } + +func TestUpdateImport(t *testing.T) { + t.Parallel() + + testCases := []struct { + name string + boardPath []string + text string + fsTexts map[string]string + path string + newPath *string + + expErr string + exp string + assertions func(t *testing.T, g *d2graph.Graph) + }{ + { + name: "remove_import", + text: `x: @meow +y +`, + path: "meow", + newPath: nil, + exp: `x +y +`, + }, + { + name: "remove_spread_import", + text: `x +...@meow +y`, + path: "meow", + newPath: nil, + exp: `x + +y +`, + }, + { + name: "update_import", + text: `x: @meow +y +`, + path: "meow", + newPath: go2.Pointer("woof"), + exp: `x: @woof +y +`, + }, + { + name: "update_import_with_dir", + text: `x: @foo/meow +y +`, + path: "foo/meow", + newPath: go2.Pointer("bar/woof"), + exp: `x: @bar/woof +y +`, + }, + { + name: "update_spread_import", + text: `x +...@meow +y +`, + path: "meow", + newPath: go2.Pointer("woof"), + exp: `x +...@woof +y +`, + }, + { + name: "no_matching_import", + text: `x: @cat +y +`, + path: "meow", + newPath: go2.Pointer("woof"), + exp: `x: @cat +y +`, + }, + { + name: "nested_import", + text: `container: { + x: @meow + y +} +`, + path: "meow", + newPath: go2.Pointer("woof"), + exp: `container: { + x: @woof + y +} +`, + }, + { + name: "remove_nested_import", + text: `container: { + x: @meow + y +} +`, + path: "meow", + newPath: nil, + exp: `container: { + x + y +} +`, + }, + { + name: "multiple_imports", + text: `x: @meow +y: @meow +z +`, + path: "meow", + newPath: go2.Pointer("woof"), + exp: `x: @woof +y: @woof +z +`, + }, + { + name: "mixed_imports", + text: `x: @meow +y +...@meow +z +`, + path: "meow", + newPath: go2.Pointer("woof"), + exp: `x: @woof +y +...@woof +z +`, + }, + { + name: "in_layer", + text: `x + +layers: { + y: { + z: @meow + } +} +`, + path: "meow", + newPath: go2.Pointer("woof"), + exp: `x + +layers: { + y: { + z: @woof + } +} +`, + }, + { + name: "layer_import", + text: `x + +layers: { + y: { + ...@meow + } +} +`, + path: "meow", + newPath: go2.Pointer("woof"), + exp: `x + +layers: { + y: { + ...@woof + } +} +`, + }, + { + name: "update_directory_import", + text: `x: @foo/bar +y: @foo/baz +z +`, + path: "foo/", + newPath: go2.Pointer("woof/"), + exp: `x: @woof/bar +y: @woof/baz +z +`, + }, + { + name: "remove_directory_import", + text: `x: @foo/bar +y: @foo/baz +z +`, + path: "foo/", + newPath: nil, + exp: `x +y +z +`, + }, + { + name: "update_deep_directory_paths", + text: `x: @foo/bar/baz +y: @foo/qux/quux +z +`, + path: "foo/", + newPath: go2.Pointer("woof/"), + exp: `x: @woof/bar/baz +y: @woof/qux/quux +z +`, + }, + { + name: "update_relative_import-1", + text: `x: @../meow +y +`, + path: "../meow", + newPath: go2.Pointer("../woof"), + exp: `x: @../woof +y +`, + }, + { + name: "update_relative_import-2", + text: `x: @../meow +y +`, + path: "../meow", + newPath: go2.Pointer("woof"), + exp: `x: @woof +y +`, + }, + { + name: "update_relative_import-3", + text: `x: @../meow +y +`, + path: "../meow", + newPath: go2.Pointer("../meow/woof"), + exp: `x: @../meow/woof +y +`, + }, + { + name: "update_relative_import-4", + text: `x: @../meow +y +`, + path: "../meow", + newPath: go2.Pointer("../g/woof"), + exp: `x: @../g/woof +y +`, + }, + } + + for _, tc := range testCases { + tc := tc + t.Run(tc.name, func(t *testing.T) { + t.Parallel() + + got, err := d2oracle.UpdateImport(tc.text, tc.path, tc.newPath) + if err != nil { + t.Fatal(err) + } + if got != tc.exp { + t.Fatalf("tc.exp != newText:\n%s", got) + } + }) + } +} diff --git a/d2oracle/get.go b/d2oracle/get.go index 3d3daf957..15df0767a 100644 --- a/d2oracle/get.go +++ b/d2oracle/get.go @@ -48,51 +48,35 @@ func ReplaceBoardNode(ast, ast2 *d2ast.Map, boardPath []string) bool { return false } - findMap := func(root *d2ast.Map, name string) *d2ast.Map { - for _, n := range root.Nodes { - if n.MapKey != nil && n.MapKey.Key != nil && n.MapKey.Key.Path[0].Unbox().ScalarString() == name { - return n.MapKey.Value.Map - } - } - return nil - } + return replaceBoardNodeInMap(ast, ast2, boardPath, "layers") || + replaceBoardNodeInMap(ast, ast2, boardPath, "scenarios") || + replaceBoardNodeInMap(ast, ast2, boardPath, "steps") +} - layersMap := findMap(ast, "layers") - scenariosMap := findMap(ast, "scenarios") - stepsMap := findMap(ast, "steps") +func replaceBoardNodeInMap(ast, ast2 *d2ast.Map, boardPath []string, boardType string) bool { + var matches []*d2ast.Map - if layersMap != nil { - m := findMap(layersMap, boardPath[0]) - if m != nil { - if len(boardPath) > 1 { - return ReplaceBoardNode(m, ast2, boardPath[1:]) - } else { - m.Nodes = ast2.Nodes - return true - } + for _, n := range ast.Nodes { + if n.MapKey != nil && n.MapKey.Key != nil && + n.MapKey.Key.Path[0].Unbox().ScalarString() == boardType && + n.MapKey.Value.Map != nil { + matches = append(matches, n.MapKey.Value.Map) } } - if scenariosMap != nil { - m := findMap(scenariosMap, boardPath[0]) - if m != nil { - if len(boardPath) > 1 { - return ReplaceBoardNode(m, ast2, boardPath[1:]) - } else { - m.Nodes = ast2.Nodes - return true - } - } - } - - if stepsMap != nil { - m := findMap(stepsMap, boardPath[0]) - if m != nil { - if len(boardPath) > 1 { - return ReplaceBoardNode(m, ast2, boardPath[1:]) - } else { - m.Nodes = ast2.Nodes - return true + for _, boardMap := range matches { + for _, n := range boardMap.Nodes { + if n.MapKey != nil && n.MapKey.Key != nil && + n.MapKey.Key.Path[0].Unbox().ScalarString() == boardPath[0] && + n.MapKey.Value.Map != nil { + if len(boardPath) > 1 { + if ReplaceBoardNode(n.MapKey.Value.Map, ast2, boardPath[1:]) { + return true + } + } else { + n.MapKey.Value.Map.Nodes = ast2.Nodes + return true + } } } } @@ -249,7 +233,7 @@ func GetID(key string) string { func GetWriteableRefs(obj *d2graph.Object, writeableAST *d2ast.Map) (out []d2graph.Reference) { for i, ref := range obj.References { - if ref.ScopeAST == writeableAST && ref.Key.Range.Path == writeableAST.Range.Path { + if ref.ScopeAST == writeableAST && ref.Key.Range.Path == writeableAST.Range.Path && len(ref.MapKey.Edges) == 0 { out = append(out, obj.References[i]) } } diff --git a/d2parser/parse.go b/d2parser/parse.go index 3eb500484..af58fc415 100644 --- a/d2parser/parse.go +++ b/d2parser/parse.go @@ -984,6 +984,14 @@ func (p *parser) parseKey() (k *d2ast.KeyPath) { k = nil } else { k.Range.End = k.Path[len(k.Path)-1].Unbox().GetRange().End + for _, part := range k.Path { + if part.Unbox() != nil { + if len(part.Unbox().ScalarString()) > 518 { + p.errorf(k.Range.Start, k.Range.End, "key length %d exceeds maximum allowed length of 518", len(part.Unbox().ScalarString())) + break + } + } + } } }() @@ -1668,6 +1676,20 @@ func (p *parser) parseValue() d2ast.ValueBox { } return box } + if strings.EqualFold(s.ScalarString(), "suspend") { + box.Suspension = &d2ast.Suspension{ + Range: s.Range, + Value: true, + } + return box + } + if strings.EqualFold(s.ScalarString(), "unsuspend") { + box.Suspension = &d2ast.Suspension{ + Range: s.Range, + Value: false, + } + return box + } if strings.EqualFold(s.ScalarString(), "true") { box.Boolean = &d2ast.Boolean{ diff --git a/d2parser/parse_test.go b/d2parser/parse_test.go index f4be7de0f..fc7d1b729 100644 --- a/d2parser/parse_test.go +++ b/d2parser/parse_test.go @@ -500,6 +500,15 @@ func testImport(t *testing.T) { assert.ErrorString(t, err, "d2/testdata/d2parser/TestParse/import/#09.d2:1:7: unquoted strings cannot begin with ...@ as that's import spread syntax") }, }, + { + text: `gcloud: { + icon: data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMwAAADACAMAAAB/Pny7AAAAjVBMVEVChfT///89fOM3gPTk7P0+g/R0oPaKr+0rc+E0d+I5euNYjObt9P1lmiVBORw0KGgoAAAANSUhEUgAAAiVBORw0KGgoAAAANSUhEUgAAAiVBORw0KGgoAAAANSUhEUgAAABORw0KGgoAAAANSUhEUgAAAMwAAADACAMAAAB/Pny7AAAAjVBMVEVChfT///89fOM3gPTk7P0+g/R0oPaKr+0rc+E0d+I5euNYjObt9P1lmiVBORw0KGgoAAAANSUhEUgAAAiVBORw0KGgoAAAANSUhEUgAAAiVBORw0KGgoAAAANSUhEUgAAABORw0KGgoAAAANSUhEUgAAAMwAAADACAMAAAB/Pny7AAAAjVBMVEVChfT///89fOM3gPTk7P0+g/R0oPaKr+0rc+E0d+I5euNYjObt9P1lmiVBORw0KGgoAAAANSUhEUgAAAiVBORw0KGgoAAAANSUhEUgAAAiVBORw0KGgoAAAANSUhEUgAAA +} +`, + assert: func(t testing.TB, ast *d2ast.Map, err error) { + assert.ErrorString(t, err, "d2/testdata/d2parser/TestParse/import/#10.d2:2:24: key length 555 exceeds maximum allowed length of 518") + }, + }, } runa(t, tca) diff --git a/d2plugin/plugin.go b/d2plugin/plugin.go index 6708e5e03..fdf2ec25f 100644 --- a/d2plugin/plugin.go +++ b/d2plugin/plugin.go @@ -9,6 +9,7 @@ import ( "context" "encoding/json" "os/exec" + "strings" "oss.terrastruct.com/util-go/xexec" "oss.terrastruct.com/util-go/xmain" @@ -170,7 +171,7 @@ func FindPlugin(ctx context.Context, ps []Plugin, name string) (Plugin, error) { if err != nil { return nil, err } - if info.Name == name { + if strings.EqualFold(info.Name, name) { return p, nil } } diff --git a/d2renderers/d2animate/d2animate.go b/d2renderers/d2animate/d2animate.go index ac25928aa..22f922484 100644 --- a/d2renderers/d2animate/d2animate.go +++ b/d2renderers/d2animate/d2animate.go @@ -68,7 +68,7 @@ func Wrap(rootDiagram *d2target.Diagram, svgs [][]byte, renderOpts d2svg.RenderO ) fmt.Fprint(buf, fitToScreenWrapperOpening) - innerOpening := fmt.Sprintf(``, + innerOpening := fmt.Sprintf(``, width, height, left, top, width, height) fmt.Fprint(buf, innerOpening) @@ -77,7 +77,7 @@ func Wrap(rootDiagram *d2target.Diagram, svgs [][]byte, renderOpts d2svg.RenderO svgsStr += string(svg) + " " } - diagramHash, err := rootDiagram.HashID() + diagramHash, err := rootDiagram.HashID(renderOpts.Salt) if err != nil { return nil, err } @@ -102,7 +102,7 @@ func Wrap(rootDiagram *d2target.Diagram, svgs [][]byte, renderOpts d2svg.RenderO } if renderOpts.Sketch != nil && *renderOpts.Sketch { - d2sketch.DefineFillPatterns(buf) + d2sketch.DefineFillPatterns(buf, diagramHash) } fmt.Fprint(buf, ` + .d2-43052185 .fill-N1{fill:#0A0F25;} + .d2-43052185 .fill-N2{fill:#676C7E;} + .d2-43052185 .fill-N3{fill:#9499AB;} + .d2-43052185 .fill-N4{fill:#CFD2DD;} + .d2-43052185 .fill-N5{fill:#DEE1EB;} + .d2-43052185 .fill-N6{fill:#EEF1F8;} + .d2-43052185 .fill-N7{fill:#FFFFFF;} + .d2-43052185 .fill-B1{fill:#0D32B2;} + .d2-43052185 .fill-B2{fill:#0D32B2;} + .d2-43052185 .fill-B3{fill:#E3E9FD;} + .d2-43052185 .fill-B4{fill:#E3E9FD;} + .d2-43052185 .fill-B5{fill:#EDF0FD;} + .d2-43052185 .fill-B6{fill:#F7F8FE;} + .d2-43052185 .fill-AA2{fill:#4A6FF3;} + .d2-43052185 .fill-AA4{fill:#EDF0FD;} + .d2-43052185 .fill-AA5{fill:#F7F8FE;} + .d2-43052185 .fill-AB4{fill:#EDF0FD;} + .d2-43052185 .fill-AB5{fill:#F7F8FE;} + .d2-43052185 .stroke-N1{stroke:#0A0F25;} + .d2-43052185 .stroke-N2{stroke:#676C7E;} + .d2-43052185 .stroke-N3{stroke:#9499AB;} + .d2-43052185 .stroke-N4{stroke:#CFD2DD;} + .d2-43052185 .stroke-N5{stroke:#DEE1EB;} + .d2-43052185 .stroke-N6{stroke:#EEF1F8;} + .d2-43052185 .stroke-N7{stroke:#FFFFFF;} + .d2-43052185 .stroke-B1{stroke:#0D32B2;} + .d2-43052185 .stroke-B2{stroke:#0D32B2;} + .d2-43052185 .stroke-B3{stroke:#E3E9FD;} + .d2-43052185 .stroke-B4{stroke:#E3E9FD;} + .d2-43052185 .stroke-B5{stroke:#EDF0FD;} + .d2-43052185 .stroke-B6{stroke:#F7F8FE;} + .d2-43052185 .stroke-AA2{stroke:#4A6FF3;} + .d2-43052185 .stroke-AA4{stroke:#EDF0FD;} + .d2-43052185 .stroke-AA5{stroke:#F7F8FE;} + .d2-43052185 .stroke-AB4{stroke:#EDF0FD;} + .d2-43052185 .stroke-AB5{stroke:#F7F8FE;} + .d2-43052185 .background-color-N1{background-color:#0A0F25;} + .d2-43052185 .background-color-N2{background-color:#676C7E;} + .d2-43052185 .background-color-N3{background-color:#9499AB;} + .d2-43052185 .background-color-N4{background-color:#CFD2DD;} + .d2-43052185 .background-color-N5{background-color:#DEE1EB;} + .d2-43052185 .background-color-N6{background-color:#EEF1F8;} + .d2-43052185 .background-color-N7{background-color:#FFFFFF;} + .d2-43052185 .background-color-B1{background-color:#0D32B2;} + .d2-43052185 .background-color-B2{background-color:#0D32B2;} + .d2-43052185 .background-color-B3{background-color:#E3E9FD;} + .d2-43052185 .background-color-B4{background-color:#E3E9FD;} + .d2-43052185 .background-color-B5{background-color:#EDF0FD;} + .d2-43052185 .background-color-B6{background-color:#F7F8FE;} + .d2-43052185 .background-color-AA2{background-color:#4A6FF3;} + .d2-43052185 .background-color-AA4{background-color:#EDF0FD;} + .d2-43052185 .background-color-AA5{background-color:#F7F8FE;} + .d2-43052185 .background-color-AB4{background-color:#EDF0FD;} + .d2-43052185 .background-color-AB5{background-color:#F7F8FE;} + .d2-43052185 .color-N1{color:#0A0F25;} + .d2-43052185 .color-N2{color:#676C7E;} + .d2-43052185 .color-N3{color:#9499AB;} + .d2-43052185 .color-N4{color:#CFD2DD;} + .d2-43052185 .color-N5{color:#DEE1EB;} + .d2-43052185 .color-N6{color:#EEF1F8;} + .d2-43052185 .color-N7{color:#FFFFFF;} + .d2-43052185 .color-B1{color:#0D32B2;} + .d2-43052185 .color-B2{color:#0D32B2;} + .d2-43052185 .color-B3{color:#E3E9FD;} + .d2-43052185 .color-B4{color:#E3E9FD;} + .d2-43052185 .color-B5{color:#EDF0FD;} + .d2-43052185 .color-B6{color:#F7F8FE;} + .d2-43052185 .color-AA2{color:#4A6FF3;} + .d2-43052185 .color-AA4{color:#EDF0FD;} + .d2-43052185 .color-AA5{color:#F7F8FE;} + .d2-43052185 .color-AB4{color:#EDF0FD;} + .d2-43052185 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-43052185);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-43052185);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-43052185);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-43052185);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-43052185);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-43052185);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-43052185);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-43052185);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-43052185);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-43052185);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-43052185);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-43052185);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-43052185);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-43052185);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-43052185);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-43052185);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-43052185);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-43052185);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> - + + - + + - + + -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud + +rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/all_shapes_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/all_shapes_dark/sketch.exp.svg index 7c671bb60..0434f8ce4 100644 --- a/d2renderers/d2sketch/testdata/all_shapes_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/all_shapes_dark/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-2182051727 .fill-N1{fill:#CDD6F4;} + .d2-2182051727 .fill-N2{fill:#BAC2DE;} + .d2-2182051727 .fill-N3{fill:#A6ADC8;} + .d2-2182051727 .fill-N4{fill:#585B70;} + .d2-2182051727 .fill-N5{fill:#45475A;} + .d2-2182051727 .fill-N6{fill:#313244;} + .d2-2182051727 .fill-N7{fill:#1E1E2E;} + .d2-2182051727 .fill-B1{fill:#CBA6f7;} + .d2-2182051727 .fill-B2{fill:#CBA6f7;} + .d2-2182051727 .fill-B3{fill:#6C7086;} + .d2-2182051727 .fill-B4{fill:#585B70;} + .d2-2182051727 .fill-B5{fill:#45475A;} + .d2-2182051727 .fill-B6{fill:#313244;} + .d2-2182051727 .fill-AA2{fill:#f38BA8;} + .d2-2182051727 .fill-AA4{fill:#45475A;} + .d2-2182051727 .fill-AA5{fill:#313244;} + .d2-2182051727 .fill-AB4{fill:#45475A;} + .d2-2182051727 .fill-AB5{fill:#313244;} + .d2-2182051727 .stroke-N1{stroke:#CDD6F4;} + .d2-2182051727 .stroke-N2{stroke:#BAC2DE;} + .d2-2182051727 .stroke-N3{stroke:#A6ADC8;} + .d2-2182051727 .stroke-N4{stroke:#585B70;} + .d2-2182051727 .stroke-N5{stroke:#45475A;} + .d2-2182051727 .stroke-N6{stroke:#313244;} + .d2-2182051727 .stroke-N7{stroke:#1E1E2E;} + .d2-2182051727 .stroke-B1{stroke:#CBA6f7;} + .d2-2182051727 .stroke-B2{stroke:#CBA6f7;} + .d2-2182051727 .stroke-B3{stroke:#6C7086;} + .d2-2182051727 .stroke-B4{stroke:#585B70;} + .d2-2182051727 .stroke-B5{stroke:#45475A;} + .d2-2182051727 .stroke-B6{stroke:#313244;} + .d2-2182051727 .stroke-AA2{stroke:#f38BA8;} + .d2-2182051727 .stroke-AA4{stroke:#45475A;} + .d2-2182051727 .stroke-AA5{stroke:#313244;} + .d2-2182051727 .stroke-AB4{stroke:#45475A;} + .d2-2182051727 .stroke-AB5{stroke:#313244;} + .d2-2182051727 .background-color-N1{background-color:#CDD6F4;} + .d2-2182051727 .background-color-N2{background-color:#BAC2DE;} + .d2-2182051727 .background-color-N3{background-color:#A6ADC8;} + .d2-2182051727 .background-color-N4{background-color:#585B70;} + .d2-2182051727 .background-color-N5{background-color:#45475A;} + .d2-2182051727 .background-color-N6{background-color:#313244;} + .d2-2182051727 .background-color-N7{background-color:#1E1E2E;} + .d2-2182051727 .background-color-B1{background-color:#CBA6f7;} + .d2-2182051727 .background-color-B2{background-color:#CBA6f7;} + .d2-2182051727 .background-color-B3{background-color:#6C7086;} + .d2-2182051727 .background-color-B4{background-color:#585B70;} + .d2-2182051727 .background-color-B5{background-color:#45475A;} + .d2-2182051727 .background-color-B6{background-color:#313244;} + .d2-2182051727 .background-color-AA2{background-color:#f38BA8;} + .d2-2182051727 .background-color-AA4{background-color:#45475A;} + .d2-2182051727 .background-color-AA5{background-color:#313244;} + .d2-2182051727 .background-color-AB4{background-color:#45475A;} + .d2-2182051727 .background-color-AB5{background-color:#313244;} + .d2-2182051727 .color-N1{color:#CDD6F4;} + .d2-2182051727 .color-N2{color:#BAC2DE;} + .d2-2182051727 .color-N3{color:#A6ADC8;} + .d2-2182051727 .color-N4{color:#585B70;} + .d2-2182051727 .color-N5{color:#45475A;} + .d2-2182051727 .color-N6{color:#313244;} + .d2-2182051727 .color-N7{color:#1E1E2E;} + .d2-2182051727 .color-B1{color:#CBA6f7;} + .d2-2182051727 .color-B2{color:#CBA6f7;} + .d2-2182051727 .color-B3{color:#6C7086;} + .d2-2182051727 .color-B4{color:#585B70;} + .d2-2182051727 .color-B5{color:#45475A;} + .d2-2182051727 .color-B6{color:#313244;} + .d2-2182051727 .color-AA2{color:#f38BA8;} + .d2-2182051727 .color-AA4{color:#45475A;} + .d2-2182051727 .color-AA5{color:#313244;} + .d2-2182051727 .color-AB4{color:#45475A;} + .d2-2182051727 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal-d2-2182051727);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal-d2-2182051727);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark-d2-2182051727);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark-d2-2182051727);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker-d2-2182051727);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker-d2-2182051727);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal-d2-2182051727);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker-d2-2182051727);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker-d2-2182051727);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker-d2-2182051727);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker-d2-2182051727);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal-d2-2182051727);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal-d2-2182051727);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2182051727);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark-d2-2182051727);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker-d2-2182051727);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker-d2-2182051727);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker-d2-2182051727);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]> - + + - + + -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud + +rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/animated/sketch.exp.svg b/d2renderers/d2sketch/testdata/animated/sketch.exp.svg index 1107222c1..6245dcf2e 100644 --- a/d2renderers/d2sketch/testdata/animated/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/animated/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-1719270827 .fill-N1{fill:#0A0F25;} + .d2-1719270827 .fill-N2{fill:#676C7E;} + .d2-1719270827 .fill-N3{fill:#9499AB;} + .d2-1719270827 .fill-N4{fill:#CFD2DD;} + .d2-1719270827 .fill-N5{fill:#DEE1EB;} + .d2-1719270827 .fill-N6{fill:#EEF1F8;} + .d2-1719270827 .fill-N7{fill:#FFFFFF;} + .d2-1719270827 .fill-B1{fill:#0D32B2;} + .d2-1719270827 .fill-B2{fill:#0D32B2;} + .d2-1719270827 .fill-B3{fill:#E3E9FD;} + .d2-1719270827 .fill-B4{fill:#E3E9FD;} + .d2-1719270827 .fill-B5{fill:#EDF0FD;} + .d2-1719270827 .fill-B6{fill:#F7F8FE;} + .d2-1719270827 .fill-AA2{fill:#4A6FF3;} + .d2-1719270827 .fill-AA4{fill:#EDF0FD;} + .d2-1719270827 .fill-AA5{fill:#F7F8FE;} + .d2-1719270827 .fill-AB4{fill:#EDF0FD;} + .d2-1719270827 .fill-AB5{fill:#F7F8FE;} + .d2-1719270827 .stroke-N1{stroke:#0A0F25;} + .d2-1719270827 .stroke-N2{stroke:#676C7E;} + .d2-1719270827 .stroke-N3{stroke:#9499AB;} + .d2-1719270827 .stroke-N4{stroke:#CFD2DD;} + .d2-1719270827 .stroke-N5{stroke:#DEE1EB;} + .d2-1719270827 .stroke-N6{stroke:#EEF1F8;} + .d2-1719270827 .stroke-N7{stroke:#FFFFFF;} + .d2-1719270827 .stroke-B1{stroke:#0D32B2;} + .d2-1719270827 .stroke-B2{stroke:#0D32B2;} + .d2-1719270827 .stroke-B3{stroke:#E3E9FD;} + .d2-1719270827 .stroke-B4{stroke:#E3E9FD;} + .d2-1719270827 .stroke-B5{stroke:#EDF0FD;} + .d2-1719270827 .stroke-B6{stroke:#F7F8FE;} + .d2-1719270827 .stroke-AA2{stroke:#4A6FF3;} + .d2-1719270827 .stroke-AA4{stroke:#EDF0FD;} + .d2-1719270827 .stroke-AA5{stroke:#F7F8FE;} + .d2-1719270827 .stroke-AB4{stroke:#EDF0FD;} + .d2-1719270827 .stroke-AB5{stroke:#F7F8FE;} + .d2-1719270827 .background-color-N1{background-color:#0A0F25;} + .d2-1719270827 .background-color-N2{background-color:#676C7E;} + .d2-1719270827 .background-color-N3{background-color:#9499AB;} + .d2-1719270827 .background-color-N4{background-color:#CFD2DD;} + .d2-1719270827 .background-color-N5{background-color:#DEE1EB;} + .d2-1719270827 .background-color-N6{background-color:#EEF1F8;} + .d2-1719270827 .background-color-N7{background-color:#FFFFFF;} + .d2-1719270827 .background-color-B1{background-color:#0D32B2;} + .d2-1719270827 .background-color-B2{background-color:#0D32B2;} + .d2-1719270827 .background-color-B3{background-color:#E3E9FD;} + .d2-1719270827 .background-color-B4{background-color:#E3E9FD;} + .d2-1719270827 .background-color-B5{background-color:#EDF0FD;} + .d2-1719270827 .background-color-B6{background-color:#F7F8FE;} + .d2-1719270827 .background-color-AA2{background-color:#4A6FF3;} + .d2-1719270827 .background-color-AA4{background-color:#EDF0FD;} + .d2-1719270827 .background-color-AA5{background-color:#F7F8FE;} + .d2-1719270827 .background-color-AB4{background-color:#EDF0FD;} + .d2-1719270827 .background-color-AB5{background-color:#F7F8FE;} + .d2-1719270827 .color-N1{color:#0A0F25;} + .d2-1719270827 .color-N2{color:#676C7E;} + .d2-1719270827 .color-N3{color:#9499AB;} + .d2-1719270827 .color-N4{color:#CFD2DD;} + .d2-1719270827 .color-N5{color:#DEE1EB;} + .d2-1719270827 .color-N6{color:#EEF1F8;} + .d2-1719270827 .color-N7{color:#FFFFFF;} + .d2-1719270827 .color-B1{color:#0D32B2;} + .d2-1719270827 .color-B2{color:#0D32B2;} + .d2-1719270827 .color-B3{color:#E3E9FD;} + .d2-1719270827 .color-B4{color:#E3E9FD;} + .d2-1719270827 .color-B5{color:#EDF0FD;} + .d2-1719270827 .color-B6{color:#F7F8FE;} + .d2-1719270827 .color-AA2{color:#4A6FF3;} + .d2-1719270827 .color-AA4{color:#EDF0FD;} + .d2-1719270827 .color-AA5{color:#F7F8FE;} + .d2-1719270827 .color-AB4{color:#EDF0FD;} + .d2-1719270827 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1719270827);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1719270827);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1719270827);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1719270827);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1719270827);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1719270827);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1719270827);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1719270827);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1719270827);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1719270827);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1719270827);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1719270827);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1719270827);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1719270827);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1719270827);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1719270827);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1719270827);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1719270827);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> - + + - + + - + + -wintersummertreessnowsun + +wintersummertreessnowsun - - - - - + + + + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/animated_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/animated_dark/sketch.exp.svg index 5edc53228..37436f574 100644 --- a/d2renderers/d2sketch/testdata/animated_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/animated_dark/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-1408075173 .fill-N1{fill:#CDD6F4;} + .d2-1408075173 .fill-N2{fill:#BAC2DE;} + .d2-1408075173 .fill-N3{fill:#A6ADC8;} + .d2-1408075173 .fill-N4{fill:#585B70;} + .d2-1408075173 .fill-N5{fill:#45475A;} + .d2-1408075173 .fill-N6{fill:#313244;} + .d2-1408075173 .fill-N7{fill:#1E1E2E;} + .d2-1408075173 .fill-B1{fill:#CBA6f7;} + .d2-1408075173 .fill-B2{fill:#CBA6f7;} + .d2-1408075173 .fill-B3{fill:#6C7086;} + .d2-1408075173 .fill-B4{fill:#585B70;} + .d2-1408075173 .fill-B5{fill:#45475A;} + .d2-1408075173 .fill-B6{fill:#313244;} + .d2-1408075173 .fill-AA2{fill:#f38BA8;} + .d2-1408075173 .fill-AA4{fill:#45475A;} + .d2-1408075173 .fill-AA5{fill:#313244;} + .d2-1408075173 .fill-AB4{fill:#45475A;} + .d2-1408075173 .fill-AB5{fill:#313244;} + .d2-1408075173 .stroke-N1{stroke:#CDD6F4;} + .d2-1408075173 .stroke-N2{stroke:#BAC2DE;} + .d2-1408075173 .stroke-N3{stroke:#A6ADC8;} + .d2-1408075173 .stroke-N4{stroke:#585B70;} + .d2-1408075173 .stroke-N5{stroke:#45475A;} + .d2-1408075173 .stroke-N6{stroke:#313244;} + .d2-1408075173 .stroke-N7{stroke:#1E1E2E;} + .d2-1408075173 .stroke-B1{stroke:#CBA6f7;} + .d2-1408075173 .stroke-B2{stroke:#CBA6f7;} + .d2-1408075173 .stroke-B3{stroke:#6C7086;} + .d2-1408075173 .stroke-B4{stroke:#585B70;} + .d2-1408075173 .stroke-B5{stroke:#45475A;} + .d2-1408075173 .stroke-B6{stroke:#313244;} + .d2-1408075173 .stroke-AA2{stroke:#f38BA8;} + .d2-1408075173 .stroke-AA4{stroke:#45475A;} + .d2-1408075173 .stroke-AA5{stroke:#313244;} + .d2-1408075173 .stroke-AB4{stroke:#45475A;} + .d2-1408075173 .stroke-AB5{stroke:#313244;} + .d2-1408075173 .background-color-N1{background-color:#CDD6F4;} + .d2-1408075173 .background-color-N2{background-color:#BAC2DE;} + .d2-1408075173 .background-color-N3{background-color:#A6ADC8;} + .d2-1408075173 .background-color-N4{background-color:#585B70;} + .d2-1408075173 .background-color-N5{background-color:#45475A;} + .d2-1408075173 .background-color-N6{background-color:#313244;} + .d2-1408075173 .background-color-N7{background-color:#1E1E2E;} + .d2-1408075173 .background-color-B1{background-color:#CBA6f7;} + .d2-1408075173 .background-color-B2{background-color:#CBA6f7;} + .d2-1408075173 .background-color-B3{background-color:#6C7086;} + .d2-1408075173 .background-color-B4{background-color:#585B70;} + .d2-1408075173 .background-color-B5{background-color:#45475A;} + .d2-1408075173 .background-color-B6{background-color:#313244;} + .d2-1408075173 .background-color-AA2{background-color:#f38BA8;} + .d2-1408075173 .background-color-AA4{background-color:#45475A;} + .d2-1408075173 .background-color-AA5{background-color:#313244;} + .d2-1408075173 .background-color-AB4{background-color:#45475A;} + .d2-1408075173 .background-color-AB5{background-color:#313244;} + .d2-1408075173 .color-N1{color:#CDD6F4;} + .d2-1408075173 .color-N2{color:#BAC2DE;} + .d2-1408075173 .color-N3{color:#A6ADC8;} + .d2-1408075173 .color-N4{color:#585B70;} + .d2-1408075173 .color-N5{color:#45475A;} + .d2-1408075173 .color-N6{color:#313244;} + .d2-1408075173 .color-N7{color:#1E1E2E;} + .d2-1408075173 .color-B1{color:#CBA6f7;} + .d2-1408075173 .color-B2{color:#CBA6f7;} + .d2-1408075173 .color-B3{color:#6C7086;} + .d2-1408075173 .color-B4{color:#585B70;} + .d2-1408075173 .color-B5{color:#45475A;} + .d2-1408075173 .color-B6{color:#313244;} + .d2-1408075173 .color-AA2{color:#f38BA8;} + .d2-1408075173 .color-AA4{color:#45475A;} + .d2-1408075173 .color-AA5{color:#313244;} + .d2-1408075173 .color-AB4{color:#45475A;} + .d2-1408075173 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal-d2-1408075173);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal-d2-1408075173);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark-d2-1408075173);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark-d2-1408075173);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker-d2-1408075173);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker-d2-1408075173);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal-d2-1408075173);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker-d2-1408075173);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker-d2-1408075173);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker-d2-1408075173);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker-d2-1408075173);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal-d2-1408075173);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal-d2-1408075173);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1408075173);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark-d2-1408075173);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker-d2-1408075173);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker-d2-1408075173);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker-d2-1408075173);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]> - + + - + + -wintersummertreessnowsun + +wintersummertreessnowsun - - - - - + + + + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/arrowheads/sketch.exp.svg b/d2renderers/d2sketch/testdata/arrowheads/sketch.exp.svg index b5091571d..370a428b5 100644 --- a/d2renderers/d2sketch/testdata/arrowheads/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/arrowheads/sketch.exp.svg @@ -1,17 +1,17 @@ - + .d2-1563508897 .fill-N1{fill:#0A0F25;} + .d2-1563508897 .fill-N2{fill:#676C7E;} + .d2-1563508897 .fill-N3{fill:#9499AB;} + .d2-1563508897 .fill-N4{fill:#CFD2DD;} + .d2-1563508897 .fill-N5{fill:#DEE1EB;} + .d2-1563508897 .fill-N6{fill:#EEF1F8;} + .d2-1563508897 .fill-N7{fill:#FFFFFF;} + .d2-1563508897 .fill-B1{fill:#0D32B2;} + .d2-1563508897 .fill-B2{fill:#0D32B2;} + .d2-1563508897 .fill-B3{fill:#E3E9FD;} + .d2-1563508897 .fill-B4{fill:#E3E9FD;} + .d2-1563508897 .fill-B5{fill:#EDF0FD;} + .d2-1563508897 .fill-B6{fill:#F7F8FE;} + .d2-1563508897 .fill-AA2{fill:#4A6FF3;} + .d2-1563508897 .fill-AA4{fill:#EDF0FD;} + .d2-1563508897 .fill-AA5{fill:#F7F8FE;} + .d2-1563508897 .fill-AB4{fill:#EDF0FD;} + .d2-1563508897 .fill-AB5{fill:#F7F8FE;} + .d2-1563508897 .stroke-N1{stroke:#0A0F25;} + .d2-1563508897 .stroke-N2{stroke:#676C7E;} + .d2-1563508897 .stroke-N3{stroke:#9499AB;} + .d2-1563508897 .stroke-N4{stroke:#CFD2DD;} + .d2-1563508897 .stroke-N5{stroke:#DEE1EB;} + .d2-1563508897 .stroke-N6{stroke:#EEF1F8;} + .d2-1563508897 .stroke-N7{stroke:#FFFFFF;} + .d2-1563508897 .stroke-B1{stroke:#0D32B2;} + .d2-1563508897 .stroke-B2{stroke:#0D32B2;} + .d2-1563508897 .stroke-B3{stroke:#E3E9FD;} + .d2-1563508897 .stroke-B4{stroke:#E3E9FD;} + .d2-1563508897 .stroke-B5{stroke:#EDF0FD;} + .d2-1563508897 .stroke-B6{stroke:#F7F8FE;} + .d2-1563508897 .stroke-AA2{stroke:#4A6FF3;} + .d2-1563508897 .stroke-AA4{stroke:#EDF0FD;} + .d2-1563508897 .stroke-AA5{stroke:#F7F8FE;} + .d2-1563508897 .stroke-AB4{stroke:#EDF0FD;} + .d2-1563508897 .stroke-AB5{stroke:#F7F8FE;} + .d2-1563508897 .background-color-N1{background-color:#0A0F25;} + .d2-1563508897 .background-color-N2{background-color:#676C7E;} + .d2-1563508897 .background-color-N3{background-color:#9499AB;} + .d2-1563508897 .background-color-N4{background-color:#CFD2DD;} + .d2-1563508897 .background-color-N5{background-color:#DEE1EB;} + .d2-1563508897 .background-color-N6{background-color:#EEF1F8;} + .d2-1563508897 .background-color-N7{background-color:#FFFFFF;} + .d2-1563508897 .background-color-B1{background-color:#0D32B2;} + .d2-1563508897 .background-color-B2{background-color:#0D32B2;} + .d2-1563508897 .background-color-B3{background-color:#E3E9FD;} + .d2-1563508897 .background-color-B4{background-color:#E3E9FD;} + .d2-1563508897 .background-color-B5{background-color:#EDF0FD;} + .d2-1563508897 .background-color-B6{background-color:#F7F8FE;} + .d2-1563508897 .background-color-AA2{background-color:#4A6FF3;} + .d2-1563508897 .background-color-AA4{background-color:#EDF0FD;} + .d2-1563508897 .background-color-AA5{background-color:#F7F8FE;} + .d2-1563508897 .background-color-AB4{background-color:#EDF0FD;} + .d2-1563508897 .background-color-AB5{background-color:#F7F8FE;} + .d2-1563508897 .color-N1{color:#0A0F25;} + .d2-1563508897 .color-N2{color:#676C7E;} + .d2-1563508897 .color-N3{color:#9499AB;} + .d2-1563508897 .color-N4{color:#CFD2DD;} + .d2-1563508897 .color-N5{color:#DEE1EB;} + .d2-1563508897 .color-N6{color:#EEF1F8;} + .d2-1563508897 .color-N7{color:#FFFFFF;} + .d2-1563508897 .color-B1{color:#0D32B2;} + .d2-1563508897 .color-B2{color:#0D32B2;} + .d2-1563508897 .color-B3{color:#E3E9FD;} + .d2-1563508897 .color-B4{color:#E3E9FD;} + .d2-1563508897 .color-B5{color:#EDF0FD;} + .d2-1563508897 .color-B6{color:#F7F8FE;} + .d2-1563508897 .color-AA2{color:#4A6FF3;} + .d2-1563508897 .color-AA4{color:#EDF0FD;} + .d2-1563508897 .color-AA5{color:#F7F8FE;} + .d2-1563508897 .color-AB4{color:#EDF0FD;} + .d2-1563508897 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1563508897);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1563508897);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1563508897);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1563508897);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1563508897);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1563508897);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1563508897);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1563508897);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1563508897);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1563508897);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1563508897);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1563508897);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1563508897);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1563508897);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1563508897);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1563508897);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1563508897);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1563508897);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> - + + - + + - + + -112233445566778899none arrow triangle diamond diamond filled cf-many cf-many-required cf-one cf-one-required - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +11223344556677889910101111none arrow triangle diamond diamond filled cf-many cf-many-required cf-one cf-one-required box box-filled + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/arrowheads_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/arrowheads_dark/sketch.exp.svg index 5c1bda717..a21604d14 100644 --- a/d2renderers/d2sketch/testdata/arrowheads_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/arrowheads_dark/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-1148517319 .fill-N1{fill:#CDD6F4;} + .d2-1148517319 .fill-N2{fill:#BAC2DE;} + .d2-1148517319 .fill-N3{fill:#A6ADC8;} + .d2-1148517319 .fill-N4{fill:#585B70;} + .d2-1148517319 .fill-N5{fill:#45475A;} + .d2-1148517319 .fill-N6{fill:#313244;} + .d2-1148517319 .fill-N7{fill:#1E1E2E;} + .d2-1148517319 .fill-B1{fill:#CBA6f7;} + .d2-1148517319 .fill-B2{fill:#CBA6f7;} + .d2-1148517319 .fill-B3{fill:#6C7086;} + .d2-1148517319 .fill-B4{fill:#585B70;} + .d2-1148517319 .fill-B5{fill:#45475A;} + .d2-1148517319 .fill-B6{fill:#313244;} + .d2-1148517319 .fill-AA2{fill:#f38BA8;} + .d2-1148517319 .fill-AA4{fill:#45475A;} + .d2-1148517319 .fill-AA5{fill:#313244;} + .d2-1148517319 .fill-AB4{fill:#45475A;} + .d2-1148517319 .fill-AB5{fill:#313244;} + .d2-1148517319 .stroke-N1{stroke:#CDD6F4;} + .d2-1148517319 .stroke-N2{stroke:#BAC2DE;} + .d2-1148517319 .stroke-N3{stroke:#A6ADC8;} + .d2-1148517319 .stroke-N4{stroke:#585B70;} + .d2-1148517319 .stroke-N5{stroke:#45475A;} + .d2-1148517319 .stroke-N6{stroke:#313244;} + .d2-1148517319 .stroke-N7{stroke:#1E1E2E;} + .d2-1148517319 .stroke-B1{stroke:#CBA6f7;} + .d2-1148517319 .stroke-B2{stroke:#CBA6f7;} + .d2-1148517319 .stroke-B3{stroke:#6C7086;} + .d2-1148517319 .stroke-B4{stroke:#585B70;} + .d2-1148517319 .stroke-B5{stroke:#45475A;} + .d2-1148517319 .stroke-B6{stroke:#313244;} + .d2-1148517319 .stroke-AA2{stroke:#f38BA8;} + .d2-1148517319 .stroke-AA4{stroke:#45475A;} + .d2-1148517319 .stroke-AA5{stroke:#313244;} + .d2-1148517319 .stroke-AB4{stroke:#45475A;} + .d2-1148517319 .stroke-AB5{stroke:#313244;} + .d2-1148517319 .background-color-N1{background-color:#CDD6F4;} + .d2-1148517319 .background-color-N2{background-color:#BAC2DE;} + .d2-1148517319 .background-color-N3{background-color:#A6ADC8;} + .d2-1148517319 .background-color-N4{background-color:#585B70;} + .d2-1148517319 .background-color-N5{background-color:#45475A;} + .d2-1148517319 .background-color-N6{background-color:#313244;} + .d2-1148517319 .background-color-N7{background-color:#1E1E2E;} + .d2-1148517319 .background-color-B1{background-color:#CBA6f7;} + .d2-1148517319 .background-color-B2{background-color:#CBA6f7;} + .d2-1148517319 .background-color-B3{background-color:#6C7086;} + .d2-1148517319 .background-color-B4{background-color:#585B70;} + .d2-1148517319 .background-color-B5{background-color:#45475A;} + .d2-1148517319 .background-color-B6{background-color:#313244;} + .d2-1148517319 .background-color-AA2{background-color:#f38BA8;} + .d2-1148517319 .background-color-AA4{background-color:#45475A;} + .d2-1148517319 .background-color-AA5{background-color:#313244;} + .d2-1148517319 .background-color-AB4{background-color:#45475A;} + .d2-1148517319 .background-color-AB5{background-color:#313244;} + .d2-1148517319 .color-N1{color:#CDD6F4;} + .d2-1148517319 .color-N2{color:#BAC2DE;} + .d2-1148517319 .color-N3{color:#A6ADC8;} + .d2-1148517319 .color-N4{color:#585B70;} + .d2-1148517319 .color-N5{color:#45475A;} + .d2-1148517319 .color-N6{color:#313244;} + .d2-1148517319 .color-N7{color:#1E1E2E;} + .d2-1148517319 .color-B1{color:#CBA6f7;} + .d2-1148517319 .color-B2{color:#CBA6f7;} + .d2-1148517319 .color-B3{color:#6C7086;} + .d2-1148517319 .color-B4{color:#585B70;} + .d2-1148517319 .color-B5{color:#45475A;} + .d2-1148517319 .color-B6{color:#313244;} + .d2-1148517319 .color-AA2{color:#f38BA8;} + .d2-1148517319 .color-AA4{color:#45475A;} + .d2-1148517319 .color-AA5{color:#313244;} + .d2-1148517319 .color-AB4{color:#45475A;} + .d2-1148517319 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal-d2-1148517319);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal-d2-1148517319);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark-d2-1148517319);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark-d2-1148517319);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker-d2-1148517319);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker-d2-1148517319);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal-d2-1148517319);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker-d2-1148517319);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker-d2-1148517319);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker-d2-1148517319);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker-d2-1148517319);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal-d2-1148517319);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal-d2-1148517319);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1148517319);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark-d2-1148517319);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker-d2-1148517319);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker-d2-1148517319);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker-d2-1148517319);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]> - + + - + + -112233445566778899none arrow triangle diamond diamond filled cf-many cf-many-required cf-one cf-one-required + +112233445566778899none arrow triangle diamond diamond filled cf-many cf-many-required cf-one cf-one-required - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/basic/sketch.exp.svg b/d2renderers/d2sketch/testdata/basic/sketch.exp.svg index 4c1fae365..eae1451bc 100644 --- a/d2renderers/d2sketch/testdata/basic/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/basic/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-578270105 .fill-N1{fill:#0A0F25;} + .d2-578270105 .fill-N2{fill:#676C7E;} + .d2-578270105 .fill-N3{fill:#9499AB;} + .d2-578270105 .fill-N4{fill:#CFD2DD;} + .d2-578270105 .fill-N5{fill:#DEE1EB;} + .d2-578270105 .fill-N6{fill:#EEF1F8;} + .d2-578270105 .fill-N7{fill:#FFFFFF;} + .d2-578270105 .fill-B1{fill:#0D32B2;} + .d2-578270105 .fill-B2{fill:#0D32B2;} + .d2-578270105 .fill-B3{fill:#E3E9FD;} + .d2-578270105 .fill-B4{fill:#E3E9FD;} + .d2-578270105 .fill-B5{fill:#EDF0FD;} + .d2-578270105 .fill-B6{fill:#F7F8FE;} + .d2-578270105 .fill-AA2{fill:#4A6FF3;} + .d2-578270105 .fill-AA4{fill:#EDF0FD;} + .d2-578270105 .fill-AA5{fill:#F7F8FE;} + .d2-578270105 .fill-AB4{fill:#EDF0FD;} + .d2-578270105 .fill-AB5{fill:#F7F8FE;} + .d2-578270105 .stroke-N1{stroke:#0A0F25;} + .d2-578270105 .stroke-N2{stroke:#676C7E;} + .d2-578270105 .stroke-N3{stroke:#9499AB;} + .d2-578270105 .stroke-N4{stroke:#CFD2DD;} + .d2-578270105 .stroke-N5{stroke:#DEE1EB;} + .d2-578270105 .stroke-N6{stroke:#EEF1F8;} + .d2-578270105 .stroke-N7{stroke:#FFFFFF;} + .d2-578270105 .stroke-B1{stroke:#0D32B2;} + .d2-578270105 .stroke-B2{stroke:#0D32B2;} + .d2-578270105 .stroke-B3{stroke:#E3E9FD;} + .d2-578270105 .stroke-B4{stroke:#E3E9FD;} + .d2-578270105 .stroke-B5{stroke:#EDF0FD;} + .d2-578270105 .stroke-B6{stroke:#F7F8FE;} + .d2-578270105 .stroke-AA2{stroke:#4A6FF3;} + .d2-578270105 .stroke-AA4{stroke:#EDF0FD;} + .d2-578270105 .stroke-AA5{stroke:#F7F8FE;} + .d2-578270105 .stroke-AB4{stroke:#EDF0FD;} + .d2-578270105 .stroke-AB5{stroke:#F7F8FE;} + .d2-578270105 .background-color-N1{background-color:#0A0F25;} + .d2-578270105 .background-color-N2{background-color:#676C7E;} + .d2-578270105 .background-color-N3{background-color:#9499AB;} + .d2-578270105 .background-color-N4{background-color:#CFD2DD;} + .d2-578270105 .background-color-N5{background-color:#DEE1EB;} + .d2-578270105 .background-color-N6{background-color:#EEF1F8;} + .d2-578270105 .background-color-N7{background-color:#FFFFFF;} + .d2-578270105 .background-color-B1{background-color:#0D32B2;} + .d2-578270105 .background-color-B2{background-color:#0D32B2;} + .d2-578270105 .background-color-B3{background-color:#E3E9FD;} + .d2-578270105 .background-color-B4{background-color:#E3E9FD;} + .d2-578270105 .background-color-B5{background-color:#EDF0FD;} + .d2-578270105 .background-color-B6{background-color:#F7F8FE;} + .d2-578270105 .background-color-AA2{background-color:#4A6FF3;} + .d2-578270105 .background-color-AA4{background-color:#EDF0FD;} + .d2-578270105 .background-color-AA5{background-color:#F7F8FE;} + .d2-578270105 .background-color-AB4{background-color:#EDF0FD;} + .d2-578270105 .background-color-AB5{background-color:#F7F8FE;} + .d2-578270105 .color-N1{color:#0A0F25;} + .d2-578270105 .color-N2{color:#676C7E;} + .d2-578270105 .color-N3{color:#9499AB;} + .d2-578270105 .color-N4{color:#CFD2DD;} + .d2-578270105 .color-N5{color:#DEE1EB;} + .d2-578270105 .color-N6{color:#EEF1F8;} + .d2-578270105 .color-N7{color:#FFFFFF;} + .d2-578270105 .color-B1{color:#0D32B2;} + .d2-578270105 .color-B2{color:#0D32B2;} + .d2-578270105 .color-B3{color:#E3E9FD;} + .d2-578270105 .color-B4{color:#E3E9FD;} + .d2-578270105 .color-B5{color:#EDF0FD;} + .d2-578270105 .color-B6{color:#F7F8FE;} + .d2-578270105 .color-AA2{color:#4A6FF3;} + .d2-578270105 .color-AA4{color:#EDF0FD;} + .d2-578270105 .color-AA5{color:#F7F8FE;} + .d2-578270105 .color-AB4{color:#EDF0FD;} + .d2-578270105 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-578270105);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-578270105);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-578270105);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-578270105);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-578270105);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-578270105);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-578270105);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-578270105);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-578270105);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-578270105);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-578270105);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-578270105);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-578270105);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-578270105);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-578270105);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-578270105);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-578270105);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-578270105);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> - + + - + + - + + -ab + +ab - - + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/basic_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/basic_dark/sketch.exp.svg index be7987f62..d6bac8b0b 100644 --- a/d2renderers/d2sketch/testdata/basic_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/basic_dark/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-546117263 .fill-N1{fill:#CDD6F4;} + .d2-546117263 .fill-N2{fill:#BAC2DE;} + .d2-546117263 .fill-N3{fill:#A6ADC8;} + .d2-546117263 .fill-N4{fill:#585B70;} + .d2-546117263 .fill-N5{fill:#45475A;} + .d2-546117263 .fill-N6{fill:#313244;} + .d2-546117263 .fill-N7{fill:#1E1E2E;} + .d2-546117263 .fill-B1{fill:#CBA6f7;} + .d2-546117263 .fill-B2{fill:#CBA6f7;} + .d2-546117263 .fill-B3{fill:#6C7086;} + .d2-546117263 .fill-B4{fill:#585B70;} + .d2-546117263 .fill-B5{fill:#45475A;} + .d2-546117263 .fill-B6{fill:#313244;} + .d2-546117263 .fill-AA2{fill:#f38BA8;} + .d2-546117263 .fill-AA4{fill:#45475A;} + .d2-546117263 .fill-AA5{fill:#313244;} + .d2-546117263 .fill-AB4{fill:#45475A;} + .d2-546117263 .fill-AB5{fill:#313244;} + .d2-546117263 .stroke-N1{stroke:#CDD6F4;} + .d2-546117263 .stroke-N2{stroke:#BAC2DE;} + .d2-546117263 .stroke-N3{stroke:#A6ADC8;} + .d2-546117263 .stroke-N4{stroke:#585B70;} + .d2-546117263 .stroke-N5{stroke:#45475A;} + .d2-546117263 .stroke-N6{stroke:#313244;} + .d2-546117263 .stroke-N7{stroke:#1E1E2E;} + .d2-546117263 .stroke-B1{stroke:#CBA6f7;} + .d2-546117263 .stroke-B2{stroke:#CBA6f7;} + .d2-546117263 .stroke-B3{stroke:#6C7086;} + .d2-546117263 .stroke-B4{stroke:#585B70;} + .d2-546117263 .stroke-B5{stroke:#45475A;} + .d2-546117263 .stroke-B6{stroke:#313244;} + .d2-546117263 .stroke-AA2{stroke:#f38BA8;} + .d2-546117263 .stroke-AA4{stroke:#45475A;} + .d2-546117263 .stroke-AA5{stroke:#313244;} + .d2-546117263 .stroke-AB4{stroke:#45475A;} + .d2-546117263 .stroke-AB5{stroke:#313244;} + .d2-546117263 .background-color-N1{background-color:#CDD6F4;} + .d2-546117263 .background-color-N2{background-color:#BAC2DE;} + .d2-546117263 .background-color-N3{background-color:#A6ADC8;} + .d2-546117263 .background-color-N4{background-color:#585B70;} + .d2-546117263 .background-color-N5{background-color:#45475A;} + .d2-546117263 .background-color-N6{background-color:#313244;} + .d2-546117263 .background-color-N7{background-color:#1E1E2E;} + .d2-546117263 .background-color-B1{background-color:#CBA6f7;} + .d2-546117263 .background-color-B2{background-color:#CBA6f7;} + .d2-546117263 .background-color-B3{background-color:#6C7086;} + .d2-546117263 .background-color-B4{background-color:#585B70;} + .d2-546117263 .background-color-B5{background-color:#45475A;} + .d2-546117263 .background-color-B6{background-color:#313244;} + .d2-546117263 .background-color-AA2{background-color:#f38BA8;} + .d2-546117263 .background-color-AA4{background-color:#45475A;} + .d2-546117263 .background-color-AA5{background-color:#313244;} + .d2-546117263 .background-color-AB4{background-color:#45475A;} + .d2-546117263 .background-color-AB5{background-color:#313244;} + .d2-546117263 .color-N1{color:#CDD6F4;} + .d2-546117263 .color-N2{color:#BAC2DE;} + .d2-546117263 .color-N3{color:#A6ADC8;} + .d2-546117263 .color-N4{color:#585B70;} + .d2-546117263 .color-N5{color:#45475A;} + .d2-546117263 .color-N6{color:#313244;} + .d2-546117263 .color-N7{color:#1E1E2E;} + .d2-546117263 .color-B1{color:#CBA6f7;} + .d2-546117263 .color-B2{color:#CBA6f7;} + .d2-546117263 .color-B3{color:#6C7086;} + .d2-546117263 .color-B4{color:#585B70;} + .d2-546117263 .color-B5{color:#45475A;} + .d2-546117263 .color-B6{color:#313244;} + .d2-546117263 .color-AA2{color:#f38BA8;} + .d2-546117263 .color-AA4{color:#45475A;} + .d2-546117263 .color-AA5{color:#313244;} + .d2-546117263 .color-AB4{color:#45475A;} + .d2-546117263 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal-d2-546117263);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal-d2-546117263);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark-d2-546117263);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark-d2-546117263);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker-d2-546117263);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker-d2-546117263);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal-d2-546117263);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker-d2-546117263);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker-d2-546117263);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker-d2-546117263);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker-d2-546117263);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal-d2-546117263);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal-d2-546117263);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal-d2-546117263);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark-d2-546117263);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker-d2-546117263);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker-d2-546117263);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker-d2-546117263);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]> - + + - + + -ab + +ab - - + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/child_to_child/sketch.exp.svg b/d2renderers/d2sketch/testdata/child_to_child/sketch.exp.svg index e66c53d48..2860c4acc 100644 --- a/d2renderers/d2sketch/testdata/child_to_child/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/child_to_child/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-4109964153 .fill-N1{fill:#0A0F25;} + .d2-4109964153 .fill-N2{fill:#676C7E;} + .d2-4109964153 .fill-N3{fill:#9499AB;} + .d2-4109964153 .fill-N4{fill:#CFD2DD;} + .d2-4109964153 .fill-N5{fill:#DEE1EB;} + .d2-4109964153 .fill-N6{fill:#EEF1F8;} + .d2-4109964153 .fill-N7{fill:#FFFFFF;} + .d2-4109964153 .fill-B1{fill:#0D32B2;} + .d2-4109964153 .fill-B2{fill:#0D32B2;} + .d2-4109964153 .fill-B3{fill:#E3E9FD;} + .d2-4109964153 .fill-B4{fill:#E3E9FD;} + .d2-4109964153 .fill-B5{fill:#EDF0FD;} + .d2-4109964153 .fill-B6{fill:#F7F8FE;} + .d2-4109964153 .fill-AA2{fill:#4A6FF3;} + .d2-4109964153 .fill-AA4{fill:#EDF0FD;} + .d2-4109964153 .fill-AA5{fill:#F7F8FE;} + .d2-4109964153 .fill-AB4{fill:#EDF0FD;} + .d2-4109964153 .fill-AB5{fill:#F7F8FE;} + .d2-4109964153 .stroke-N1{stroke:#0A0F25;} + .d2-4109964153 .stroke-N2{stroke:#676C7E;} + .d2-4109964153 .stroke-N3{stroke:#9499AB;} + .d2-4109964153 .stroke-N4{stroke:#CFD2DD;} + .d2-4109964153 .stroke-N5{stroke:#DEE1EB;} + .d2-4109964153 .stroke-N6{stroke:#EEF1F8;} + .d2-4109964153 .stroke-N7{stroke:#FFFFFF;} + .d2-4109964153 .stroke-B1{stroke:#0D32B2;} + .d2-4109964153 .stroke-B2{stroke:#0D32B2;} + .d2-4109964153 .stroke-B3{stroke:#E3E9FD;} + .d2-4109964153 .stroke-B4{stroke:#E3E9FD;} + .d2-4109964153 .stroke-B5{stroke:#EDF0FD;} + .d2-4109964153 .stroke-B6{stroke:#F7F8FE;} + .d2-4109964153 .stroke-AA2{stroke:#4A6FF3;} + .d2-4109964153 .stroke-AA4{stroke:#EDF0FD;} + .d2-4109964153 .stroke-AA5{stroke:#F7F8FE;} + .d2-4109964153 .stroke-AB4{stroke:#EDF0FD;} + .d2-4109964153 .stroke-AB5{stroke:#F7F8FE;} + .d2-4109964153 .background-color-N1{background-color:#0A0F25;} + .d2-4109964153 .background-color-N2{background-color:#676C7E;} + .d2-4109964153 .background-color-N3{background-color:#9499AB;} + .d2-4109964153 .background-color-N4{background-color:#CFD2DD;} + .d2-4109964153 .background-color-N5{background-color:#DEE1EB;} + .d2-4109964153 .background-color-N6{background-color:#EEF1F8;} + .d2-4109964153 .background-color-N7{background-color:#FFFFFF;} + .d2-4109964153 .background-color-B1{background-color:#0D32B2;} + .d2-4109964153 .background-color-B2{background-color:#0D32B2;} + .d2-4109964153 .background-color-B3{background-color:#E3E9FD;} + .d2-4109964153 .background-color-B4{background-color:#E3E9FD;} + .d2-4109964153 .background-color-B5{background-color:#EDF0FD;} + .d2-4109964153 .background-color-B6{background-color:#F7F8FE;} + .d2-4109964153 .background-color-AA2{background-color:#4A6FF3;} + .d2-4109964153 .background-color-AA4{background-color:#EDF0FD;} + .d2-4109964153 .background-color-AA5{background-color:#F7F8FE;} + .d2-4109964153 .background-color-AB4{background-color:#EDF0FD;} + .d2-4109964153 .background-color-AB5{background-color:#F7F8FE;} + .d2-4109964153 .color-N1{color:#0A0F25;} + .d2-4109964153 .color-N2{color:#676C7E;} + .d2-4109964153 .color-N3{color:#9499AB;} + .d2-4109964153 .color-N4{color:#CFD2DD;} + .d2-4109964153 .color-N5{color:#DEE1EB;} + .d2-4109964153 .color-N6{color:#EEF1F8;} + .d2-4109964153 .color-N7{color:#FFFFFF;} + .d2-4109964153 .color-B1{color:#0D32B2;} + .d2-4109964153 .color-B2{color:#0D32B2;} + .d2-4109964153 .color-B3{color:#E3E9FD;} + .d2-4109964153 .color-B4{color:#E3E9FD;} + .d2-4109964153 .color-B5{color:#EDF0FD;} + .d2-4109964153 .color-B6{color:#F7F8FE;} + .d2-4109964153 .color-AA2{color:#4A6FF3;} + .d2-4109964153 .color-AA4{color:#EDF0FD;} + .d2-4109964153 .color-AA5{color:#F7F8FE;} + .d2-4109964153 .color-AB4{color:#EDF0FD;} + .d2-4109964153 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4109964153);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4109964153);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4109964153);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4109964153);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4109964153);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4109964153);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4109964153);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4109964153);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4109964153);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4109964153);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4109964153);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4109964153);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4109964153);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4109964153);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4109964153);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4109964153);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4109964153);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4109964153);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> - + + - + + - + + -wintersummersnowsun + +wintersummersnowsun - - - - + + + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/child_to_child_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/child_to_child_dark/sketch.exp.svg index f68939400..4503fb193 100644 --- a/d2renderers/d2sketch/testdata/child_to_child_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/child_to_child_dark/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-2098852591 .fill-N1{fill:#CDD6F4;} + .d2-2098852591 .fill-N2{fill:#BAC2DE;} + .d2-2098852591 .fill-N3{fill:#A6ADC8;} + .d2-2098852591 .fill-N4{fill:#585B70;} + .d2-2098852591 .fill-N5{fill:#45475A;} + .d2-2098852591 .fill-N6{fill:#313244;} + .d2-2098852591 .fill-N7{fill:#1E1E2E;} + .d2-2098852591 .fill-B1{fill:#CBA6f7;} + .d2-2098852591 .fill-B2{fill:#CBA6f7;} + .d2-2098852591 .fill-B3{fill:#6C7086;} + .d2-2098852591 .fill-B4{fill:#585B70;} + .d2-2098852591 .fill-B5{fill:#45475A;} + .d2-2098852591 .fill-B6{fill:#313244;} + .d2-2098852591 .fill-AA2{fill:#f38BA8;} + .d2-2098852591 .fill-AA4{fill:#45475A;} + .d2-2098852591 .fill-AA5{fill:#313244;} + .d2-2098852591 .fill-AB4{fill:#45475A;} + .d2-2098852591 .fill-AB5{fill:#313244;} + .d2-2098852591 .stroke-N1{stroke:#CDD6F4;} + .d2-2098852591 .stroke-N2{stroke:#BAC2DE;} + .d2-2098852591 .stroke-N3{stroke:#A6ADC8;} + .d2-2098852591 .stroke-N4{stroke:#585B70;} + .d2-2098852591 .stroke-N5{stroke:#45475A;} + .d2-2098852591 .stroke-N6{stroke:#313244;} + .d2-2098852591 .stroke-N7{stroke:#1E1E2E;} + .d2-2098852591 .stroke-B1{stroke:#CBA6f7;} + .d2-2098852591 .stroke-B2{stroke:#CBA6f7;} + .d2-2098852591 .stroke-B3{stroke:#6C7086;} + .d2-2098852591 .stroke-B4{stroke:#585B70;} + .d2-2098852591 .stroke-B5{stroke:#45475A;} + .d2-2098852591 .stroke-B6{stroke:#313244;} + .d2-2098852591 .stroke-AA2{stroke:#f38BA8;} + .d2-2098852591 .stroke-AA4{stroke:#45475A;} + .d2-2098852591 .stroke-AA5{stroke:#313244;} + .d2-2098852591 .stroke-AB4{stroke:#45475A;} + .d2-2098852591 .stroke-AB5{stroke:#313244;} + .d2-2098852591 .background-color-N1{background-color:#CDD6F4;} + .d2-2098852591 .background-color-N2{background-color:#BAC2DE;} + .d2-2098852591 .background-color-N3{background-color:#A6ADC8;} + .d2-2098852591 .background-color-N4{background-color:#585B70;} + .d2-2098852591 .background-color-N5{background-color:#45475A;} + .d2-2098852591 .background-color-N6{background-color:#313244;} + .d2-2098852591 .background-color-N7{background-color:#1E1E2E;} + .d2-2098852591 .background-color-B1{background-color:#CBA6f7;} + .d2-2098852591 .background-color-B2{background-color:#CBA6f7;} + .d2-2098852591 .background-color-B3{background-color:#6C7086;} + .d2-2098852591 .background-color-B4{background-color:#585B70;} + .d2-2098852591 .background-color-B5{background-color:#45475A;} + .d2-2098852591 .background-color-B6{background-color:#313244;} + .d2-2098852591 .background-color-AA2{background-color:#f38BA8;} + .d2-2098852591 .background-color-AA4{background-color:#45475A;} + .d2-2098852591 .background-color-AA5{background-color:#313244;} + .d2-2098852591 .background-color-AB4{background-color:#45475A;} + .d2-2098852591 .background-color-AB5{background-color:#313244;} + .d2-2098852591 .color-N1{color:#CDD6F4;} + .d2-2098852591 .color-N2{color:#BAC2DE;} + .d2-2098852591 .color-N3{color:#A6ADC8;} + .d2-2098852591 .color-N4{color:#585B70;} + .d2-2098852591 .color-N5{color:#45475A;} + .d2-2098852591 .color-N6{color:#313244;} + .d2-2098852591 .color-N7{color:#1E1E2E;} + .d2-2098852591 .color-B1{color:#CBA6f7;} + .d2-2098852591 .color-B2{color:#CBA6f7;} + .d2-2098852591 .color-B3{color:#6C7086;} + .d2-2098852591 .color-B4{color:#585B70;} + .d2-2098852591 .color-B5{color:#45475A;} + .d2-2098852591 .color-B6{color:#313244;} + .d2-2098852591 .color-AA2{color:#f38BA8;} + .d2-2098852591 .color-AA4{color:#45475A;} + .d2-2098852591 .color-AA5{color:#313244;} + .d2-2098852591 .color-AB4{color:#45475A;} + .d2-2098852591 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal-d2-2098852591);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal-d2-2098852591);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark-d2-2098852591);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark-d2-2098852591);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker-d2-2098852591);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker-d2-2098852591);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal-d2-2098852591);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker-d2-2098852591);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker-d2-2098852591);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker-d2-2098852591);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker-d2-2098852591);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal-d2-2098852591);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal-d2-2098852591);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2098852591);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark-d2-2098852591);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker-d2-2098852591);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker-d2-2098852591);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker-d2-2098852591);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]> - + + - + + -wintersummersnowsun + +wintersummersnowsun - - - - + + + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/class/sketch.exp.svg b/d2renderers/d2sketch/testdata/class/sketch.exp.svg index 1a799c232..f02f55aba 100644 --- a/d2renderers/d2sketch/testdata/class/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/class/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-2003138905 .fill-N1{fill:#0A0F25;} + .d2-2003138905 .fill-N2{fill:#676C7E;} + .d2-2003138905 .fill-N3{fill:#9499AB;} + .d2-2003138905 .fill-N4{fill:#CFD2DD;} + .d2-2003138905 .fill-N5{fill:#DEE1EB;} + .d2-2003138905 .fill-N6{fill:#EEF1F8;} + .d2-2003138905 .fill-N7{fill:#FFFFFF;} + .d2-2003138905 .fill-B1{fill:#0D32B2;} + .d2-2003138905 .fill-B2{fill:#0D32B2;} + .d2-2003138905 .fill-B3{fill:#E3E9FD;} + .d2-2003138905 .fill-B4{fill:#E3E9FD;} + .d2-2003138905 .fill-B5{fill:#EDF0FD;} + .d2-2003138905 .fill-B6{fill:#F7F8FE;} + .d2-2003138905 .fill-AA2{fill:#4A6FF3;} + .d2-2003138905 .fill-AA4{fill:#EDF0FD;} + .d2-2003138905 .fill-AA5{fill:#F7F8FE;} + .d2-2003138905 .fill-AB4{fill:#EDF0FD;} + .d2-2003138905 .fill-AB5{fill:#F7F8FE;} + .d2-2003138905 .stroke-N1{stroke:#0A0F25;} + .d2-2003138905 .stroke-N2{stroke:#676C7E;} + .d2-2003138905 .stroke-N3{stroke:#9499AB;} + .d2-2003138905 .stroke-N4{stroke:#CFD2DD;} + .d2-2003138905 .stroke-N5{stroke:#DEE1EB;} + .d2-2003138905 .stroke-N6{stroke:#EEF1F8;} + .d2-2003138905 .stroke-N7{stroke:#FFFFFF;} + .d2-2003138905 .stroke-B1{stroke:#0D32B2;} + .d2-2003138905 .stroke-B2{stroke:#0D32B2;} + .d2-2003138905 .stroke-B3{stroke:#E3E9FD;} + .d2-2003138905 .stroke-B4{stroke:#E3E9FD;} + .d2-2003138905 .stroke-B5{stroke:#EDF0FD;} + .d2-2003138905 .stroke-B6{stroke:#F7F8FE;} + .d2-2003138905 .stroke-AA2{stroke:#4A6FF3;} + .d2-2003138905 .stroke-AA4{stroke:#EDF0FD;} + .d2-2003138905 .stroke-AA5{stroke:#F7F8FE;} + .d2-2003138905 .stroke-AB4{stroke:#EDF0FD;} + .d2-2003138905 .stroke-AB5{stroke:#F7F8FE;} + .d2-2003138905 .background-color-N1{background-color:#0A0F25;} + .d2-2003138905 .background-color-N2{background-color:#676C7E;} + .d2-2003138905 .background-color-N3{background-color:#9499AB;} + .d2-2003138905 .background-color-N4{background-color:#CFD2DD;} + .d2-2003138905 .background-color-N5{background-color:#DEE1EB;} + .d2-2003138905 .background-color-N6{background-color:#EEF1F8;} + .d2-2003138905 .background-color-N7{background-color:#FFFFFF;} + .d2-2003138905 .background-color-B1{background-color:#0D32B2;} + .d2-2003138905 .background-color-B2{background-color:#0D32B2;} + .d2-2003138905 .background-color-B3{background-color:#E3E9FD;} + .d2-2003138905 .background-color-B4{background-color:#E3E9FD;} + .d2-2003138905 .background-color-B5{background-color:#EDF0FD;} + .d2-2003138905 .background-color-B6{background-color:#F7F8FE;} + .d2-2003138905 .background-color-AA2{background-color:#4A6FF3;} + .d2-2003138905 .background-color-AA4{background-color:#EDF0FD;} + .d2-2003138905 .background-color-AA5{background-color:#F7F8FE;} + .d2-2003138905 .background-color-AB4{background-color:#EDF0FD;} + .d2-2003138905 .background-color-AB5{background-color:#F7F8FE;} + .d2-2003138905 .color-N1{color:#0A0F25;} + .d2-2003138905 .color-N2{color:#676C7E;} + .d2-2003138905 .color-N3{color:#9499AB;} + .d2-2003138905 .color-N4{color:#CFD2DD;} + .d2-2003138905 .color-N5{color:#DEE1EB;} + .d2-2003138905 .color-N6{color:#EEF1F8;} + .d2-2003138905 .color-N7{color:#FFFFFF;} + .d2-2003138905 .color-B1{color:#0D32B2;} + .d2-2003138905 .color-B2{color:#0D32B2;} + .d2-2003138905 .color-B3{color:#E3E9FD;} + .d2-2003138905 .color-B4{color:#E3E9FD;} + .d2-2003138905 .color-B5{color:#EDF0FD;} + .d2-2003138905 .color-B6{color:#F7F8FE;} + .d2-2003138905 .color-AA2{color:#4A6FF3;} + .d2-2003138905 .color-AA4{color:#EDF0FD;} + .d2-2003138905 .color-AA5{color:#F7F8FE;} + .d2-2003138905 .color-AB4{color:#EDF0FD;} + .d2-2003138905 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2003138905);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2003138905);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2003138905);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2003138905);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2003138905);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2003138905);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2003138905);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2003138905);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2003138905);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2003138905);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2003138905);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2003138905);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2003138905);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2003138905);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2003138905);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2003138905);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2003138905);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2003138905);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> - + + - + + - + + -BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void + +BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/class_and_sqlTable_border_radius/sketch.exp.svg b/d2renderers/d2sketch/testdata/class_and_sqlTable_border_radius/sketch.exp.svg index 4a9454847..7d53dc52d 100644 --- a/d2renderers/d2sketch/testdata/class_and_sqlTable_border_radius/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/class_and_sqlTable_border_radius/sketch.exp.svg @@ -1,24 +1,24 @@ - + .d2-3943750205 .fill-N1{fill:#0A0F25;} + .d2-3943750205 .fill-N2{fill:#676C7E;} + .d2-3943750205 .fill-N3{fill:#9499AB;} + .d2-3943750205 .fill-N4{fill:#CFD2DD;} + .d2-3943750205 .fill-N5{fill:#DEE1EB;} + .d2-3943750205 .fill-N6{fill:#EEF1F8;} + .d2-3943750205 .fill-N7{fill:#FFFFFF;} + .d2-3943750205 .fill-B1{fill:#0D32B2;} + .d2-3943750205 .fill-B2{fill:#0D32B2;} + .d2-3943750205 .fill-B3{fill:#E3E9FD;} + .d2-3943750205 .fill-B4{fill:#E3E9FD;} + .d2-3943750205 .fill-B5{fill:#EDF0FD;} + .d2-3943750205 .fill-B6{fill:#F7F8FE;} + .d2-3943750205 .fill-AA2{fill:#4A6FF3;} + .d2-3943750205 .fill-AA4{fill:#EDF0FD;} + .d2-3943750205 .fill-AA5{fill:#F7F8FE;} + .d2-3943750205 .fill-AB4{fill:#EDF0FD;} + .d2-3943750205 .fill-AB5{fill:#F7F8FE;} + .d2-3943750205 .stroke-N1{stroke:#0A0F25;} + .d2-3943750205 .stroke-N2{stroke:#676C7E;} + .d2-3943750205 .stroke-N3{stroke:#9499AB;} + .d2-3943750205 .stroke-N4{stroke:#CFD2DD;} + .d2-3943750205 .stroke-N5{stroke:#DEE1EB;} + .d2-3943750205 .stroke-N6{stroke:#EEF1F8;} + .d2-3943750205 .stroke-N7{stroke:#FFFFFF;} + .d2-3943750205 .stroke-B1{stroke:#0D32B2;} + .d2-3943750205 .stroke-B2{stroke:#0D32B2;} + .d2-3943750205 .stroke-B3{stroke:#E3E9FD;} + .d2-3943750205 .stroke-B4{stroke:#E3E9FD;} + .d2-3943750205 .stroke-B5{stroke:#EDF0FD;} + .d2-3943750205 .stroke-B6{stroke:#F7F8FE;} + .d2-3943750205 .stroke-AA2{stroke:#4A6FF3;} + .d2-3943750205 .stroke-AA4{stroke:#EDF0FD;} + .d2-3943750205 .stroke-AA5{stroke:#F7F8FE;} + .d2-3943750205 .stroke-AB4{stroke:#EDF0FD;} + .d2-3943750205 .stroke-AB5{stroke:#F7F8FE;} + .d2-3943750205 .background-color-N1{background-color:#0A0F25;} + .d2-3943750205 .background-color-N2{background-color:#676C7E;} + .d2-3943750205 .background-color-N3{background-color:#9499AB;} + .d2-3943750205 .background-color-N4{background-color:#CFD2DD;} + .d2-3943750205 .background-color-N5{background-color:#DEE1EB;} + .d2-3943750205 .background-color-N6{background-color:#EEF1F8;} + .d2-3943750205 .background-color-N7{background-color:#FFFFFF;} + .d2-3943750205 .background-color-B1{background-color:#0D32B2;} + .d2-3943750205 .background-color-B2{background-color:#0D32B2;} + .d2-3943750205 .background-color-B3{background-color:#E3E9FD;} + .d2-3943750205 .background-color-B4{background-color:#E3E9FD;} + .d2-3943750205 .background-color-B5{background-color:#EDF0FD;} + .d2-3943750205 .background-color-B6{background-color:#F7F8FE;} + .d2-3943750205 .background-color-AA2{background-color:#4A6FF3;} + .d2-3943750205 .background-color-AA4{background-color:#EDF0FD;} + .d2-3943750205 .background-color-AA5{background-color:#F7F8FE;} + .d2-3943750205 .background-color-AB4{background-color:#EDF0FD;} + .d2-3943750205 .background-color-AB5{background-color:#F7F8FE;} + .d2-3943750205 .color-N1{color:#0A0F25;} + .d2-3943750205 .color-N2{color:#676C7E;} + .d2-3943750205 .color-N3{color:#9499AB;} + .d2-3943750205 .color-N4{color:#CFD2DD;} + .d2-3943750205 .color-N5{color:#DEE1EB;} + .d2-3943750205 .color-N6{color:#EEF1F8;} + .d2-3943750205 .color-N7{color:#FFFFFF;} + .d2-3943750205 .color-B1{color:#0D32B2;} + .d2-3943750205 .color-B2{color:#0D32B2;} + .d2-3943750205 .color-B3{color:#E3E9FD;} + .d2-3943750205 .color-B4{color:#E3E9FD;} + .d2-3943750205 .color-B5{color:#EDF0FD;} + .d2-3943750205 .color-B6{color:#F7F8FE;} + .d2-3943750205 .color-AA2{color:#4A6FF3;} + .d2-3943750205 .color-AA4{color:#EDF0FD;} + .d2-3943750205 .color-AA5{color:#F7F8FE;} + .d2-3943750205 .color-AB4{color:#EDF0FD;} + .d2-3943750205 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3943750205);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3943750205);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3943750205);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3943750205);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3943750205);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3943750205);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3943750205);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3943750205);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3943750205);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3943750205);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3943750205);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3943750205);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3943750205);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3943750205);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3943750205);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3943750205);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3943750205);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3943750205);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> - + + - + + - + + -aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zoneb+field[]string+method(a uint64)(x, y int)cd + +aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zoneb+field[]string+method(a uint64)(x, y int)cd \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/class_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/class_dark/sketch.exp.svg index f9d68d2e6..330bc3d6f 100644 --- a/d2renderers/d2sketch/testdata/class_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/class_dark/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-690164047 .fill-N1{fill:#CDD6F4;} + .d2-690164047 .fill-N2{fill:#BAC2DE;} + .d2-690164047 .fill-N3{fill:#A6ADC8;} + .d2-690164047 .fill-N4{fill:#585B70;} + .d2-690164047 .fill-N5{fill:#45475A;} + .d2-690164047 .fill-N6{fill:#313244;} + .d2-690164047 .fill-N7{fill:#1E1E2E;} + .d2-690164047 .fill-B1{fill:#CBA6f7;} + .d2-690164047 .fill-B2{fill:#CBA6f7;} + .d2-690164047 .fill-B3{fill:#6C7086;} + .d2-690164047 .fill-B4{fill:#585B70;} + .d2-690164047 .fill-B5{fill:#45475A;} + .d2-690164047 .fill-B6{fill:#313244;} + .d2-690164047 .fill-AA2{fill:#f38BA8;} + .d2-690164047 .fill-AA4{fill:#45475A;} + .d2-690164047 .fill-AA5{fill:#313244;} + .d2-690164047 .fill-AB4{fill:#45475A;} + .d2-690164047 .fill-AB5{fill:#313244;} + .d2-690164047 .stroke-N1{stroke:#CDD6F4;} + .d2-690164047 .stroke-N2{stroke:#BAC2DE;} + .d2-690164047 .stroke-N3{stroke:#A6ADC8;} + .d2-690164047 .stroke-N4{stroke:#585B70;} + .d2-690164047 .stroke-N5{stroke:#45475A;} + .d2-690164047 .stroke-N6{stroke:#313244;} + .d2-690164047 .stroke-N7{stroke:#1E1E2E;} + .d2-690164047 .stroke-B1{stroke:#CBA6f7;} + .d2-690164047 .stroke-B2{stroke:#CBA6f7;} + .d2-690164047 .stroke-B3{stroke:#6C7086;} + .d2-690164047 .stroke-B4{stroke:#585B70;} + .d2-690164047 .stroke-B5{stroke:#45475A;} + .d2-690164047 .stroke-B6{stroke:#313244;} + .d2-690164047 .stroke-AA2{stroke:#f38BA8;} + .d2-690164047 .stroke-AA4{stroke:#45475A;} + .d2-690164047 .stroke-AA5{stroke:#313244;} + .d2-690164047 .stroke-AB4{stroke:#45475A;} + .d2-690164047 .stroke-AB5{stroke:#313244;} + .d2-690164047 .background-color-N1{background-color:#CDD6F4;} + .d2-690164047 .background-color-N2{background-color:#BAC2DE;} + .d2-690164047 .background-color-N3{background-color:#A6ADC8;} + .d2-690164047 .background-color-N4{background-color:#585B70;} + .d2-690164047 .background-color-N5{background-color:#45475A;} + .d2-690164047 .background-color-N6{background-color:#313244;} + .d2-690164047 .background-color-N7{background-color:#1E1E2E;} + .d2-690164047 .background-color-B1{background-color:#CBA6f7;} + .d2-690164047 .background-color-B2{background-color:#CBA6f7;} + .d2-690164047 .background-color-B3{background-color:#6C7086;} + .d2-690164047 .background-color-B4{background-color:#585B70;} + .d2-690164047 .background-color-B5{background-color:#45475A;} + .d2-690164047 .background-color-B6{background-color:#313244;} + .d2-690164047 .background-color-AA2{background-color:#f38BA8;} + .d2-690164047 .background-color-AA4{background-color:#45475A;} + .d2-690164047 .background-color-AA5{background-color:#313244;} + .d2-690164047 .background-color-AB4{background-color:#45475A;} + .d2-690164047 .background-color-AB5{background-color:#313244;} + .d2-690164047 .color-N1{color:#CDD6F4;} + .d2-690164047 .color-N2{color:#BAC2DE;} + .d2-690164047 .color-N3{color:#A6ADC8;} + .d2-690164047 .color-N4{color:#585B70;} + .d2-690164047 .color-N5{color:#45475A;} + .d2-690164047 .color-N6{color:#313244;} + .d2-690164047 .color-N7{color:#1E1E2E;} + .d2-690164047 .color-B1{color:#CBA6f7;} + .d2-690164047 .color-B2{color:#CBA6f7;} + .d2-690164047 .color-B3{color:#6C7086;} + .d2-690164047 .color-B4{color:#585B70;} + .d2-690164047 .color-B5{color:#45475A;} + .d2-690164047 .color-B6{color:#313244;} + .d2-690164047 .color-AA2{color:#f38BA8;} + .d2-690164047 .color-AA4{color:#45475A;} + .d2-690164047 .color-AA5{color:#313244;} + .d2-690164047 .color-AB4{color:#45475A;} + .d2-690164047 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal-d2-690164047);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal-d2-690164047);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark-d2-690164047);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark-d2-690164047);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker-d2-690164047);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker-d2-690164047);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal-d2-690164047);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker-d2-690164047);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker-d2-690164047);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker-d2-690164047);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker-d2-690164047);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal-d2-690164047);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal-d2-690164047);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal-d2-690164047);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark-d2-690164047);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker-d2-690164047);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker-d2-690164047);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker-d2-690164047);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]> - + + - + + -BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void + +BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/connection-style-fill/sketch.exp.svg b/d2renderers/d2sketch/testdata/connection-style-fill/sketch.exp.svg index 943a4a524..39fb47cf6 100644 --- a/d2renderers/d2sketch/testdata/connection-style-fill/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/connection-style-fill/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-197027048 .fill-N1{fill:#0A0F25;} + .d2-197027048 .fill-N2{fill:#676C7E;} + .d2-197027048 .fill-N3{fill:#9499AB;} + .d2-197027048 .fill-N4{fill:#CFD2DD;} + .d2-197027048 .fill-N5{fill:#DEE1EB;} + .d2-197027048 .fill-N6{fill:#EEF1F8;} + .d2-197027048 .fill-N7{fill:#FFFFFF;} + .d2-197027048 .fill-B1{fill:#0D32B2;} + .d2-197027048 .fill-B2{fill:#0D32B2;} + .d2-197027048 .fill-B3{fill:#E3E9FD;} + .d2-197027048 .fill-B4{fill:#E3E9FD;} + .d2-197027048 .fill-B5{fill:#EDF0FD;} + .d2-197027048 .fill-B6{fill:#F7F8FE;} + .d2-197027048 .fill-AA2{fill:#4A6FF3;} + .d2-197027048 .fill-AA4{fill:#EDF0FD;} + .d2-197027048 .fill-AA5{fill:#F7F8FE;} + .d2-197027048 .fill-AB4{fill:#EDF0FD;} + .d2-197027048 .fill-AB5{fill:#F7F8FE;} + .d2-197027048 .stroke-N1{stroke:#0A0F25;} + .d2-197027048 .stroke-N2{stroke:#676C7E;} + .d2-197027048 .stroke-N3{stroke:#9499AB;} + .d2-197027048 .stroke-N4{stroke:#CFD2DD;} + .d2-197027048 .stroke-N5{stroke:#DEE1EB;} + .d2-197027048 .stroke-N6{stroke:#EEF1F8;} + .d2-197027048 .stroke-N7{stroke:#FFFFFF;} + .d2-197027048 .stroke-B1{stroke:#0D32B2;} + .d2-197027048 .stroke-B2{stroke:#0D32B2;} + .d2-197027048 .stroke-B3{stroke:#E3E9FD;} + .d2-197027048 .stroke-B4{stroke:#E3E9FD;} + .d2-197027048 .stroke-B5{stroke:#EDF0FD;} + .d2-197027048 .stroke-B6{stroke:#F7F8FE;} + .d2-197027048 .stroke-AA2{stroke:#4A6FF3;} + .d2-197027048 .stroke-AA4{stroke:#EDF0FD;} + .d2-197027048 .stroke-AA5{stroke:#F7F8FE;} + .d2-197027048 .stroke-AB4{stroke:#EDF0FD;} + .d2-197027048 .stroke-AB5{stroke:#F7F8FE;} + .d2-197027048 .background-color-N1{background-color:#0A0F25;} + .d2-197027048 .background-color-N2{background-color:#676C7E;} + .d2-197027048 .background-color-N3{background-color:#9499AB;} + .d2-197027048 .background-color-N4{background-color:#CFD2DD;} + .d2-197027048 .background-color-N5{background-color:#DEE1EB;} + .d2-197027048 .background-color-N6{background-color:#EEF1F8;} + .d2-197027048 .background-color-N7{background-color:#FFFFFF;} + .d2-197027048 .background-color-B1{background-color:#0D32B2;} + .d2-197027048 .background-color-B2{background-color:#0D32B2;} + .d2-197027048 .background-color-B3{background-color:#E3E9FD;} + .d2-197027048 .background-color-B4{background-color:#E3E9FD;} + .d2-197027048 .background-color-B5{background-color:#EDF0FD;} + .d2-197027048 .background-color-B6{background-color:#F7F8FE;} + .d2-197027048 .background-color-AA2{background-color:#4A6FF3;} + .d2-197027048 .background-color-AA4{background-color:#EDF0FD;} + .d2-197027048 .background-color-AA5{background-color:#F7F8FE;} + .d2-197027048 .background-color-AB4{background-color:#EDF0FD;} + .d2-197027048 .background-color-AB5{background-color:#F7F8FE;} + .d2-197027048 .color-N1{color:#0A0F25;} + .d2-197027048 .color-N2{color:#676C7E;} + .d2-197027048 .color-N3{color:#9499AB;} + .d2-197027048 .color-N4{color:#CFD2DD;} + .d2-197027048 .color-N5{color:#DEE1EB;} + .d2-197027048 .color-N6{color:#EEF1F8;} + .d2-197027048 .color-N7{color:#FFFFFF;} + .d2-197027048 .color-B1{color:#0D32B2;} + .d2-197027048 .color-B2{color:#0D32B2;} + .d2-197027048 .color-B3{color:#E3E9FD;} + .d2-197027048 .color-B4{color:#E3E9FD;} + .d2-197027048 .color-B5{color:#EDF0FD;} + .d2-197027048 .color-B6{color:#F7F8FE;} + .d2-197027048 .color-AA2{color:#4A6FF3;} + .d2-197027048 .color-AA4{color:#EDF0FD;} + .d2-197027048 .color-AA5{color:#F7F8FE;} + .d2-197027048 .color-AB4{color:#EDF0FD;} + .d2-197027048 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-197027048);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-197027048);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-197027048);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-197027048);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-197027048);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-197027048);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-197027048);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-197027048);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-197027048);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-197027048);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-197027048);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-197027048);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-197027048);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-197027048);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-197027048);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-197027048);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-197027048);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-197027048);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> - + + - + + - + + -customeremployeerentalitem rent(this, i, p) new(this, i, p) isValid() isRentable(c) is(Adult) true + +customeremployeerentalitem rent(this, i, p) new(this, i, p) isValid() isRentable(c) is(Adult) true - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/connection_label/sketch.exp.svg b/d2renderers/d2sketch/testdata/connection_label/sketch.exp.svg index b97c81b74..3f623058c 100644 --- a/d2renderers/d2sketch/testdata/connection_label/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/connection_label/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-3513614925 .fill-N1{fill:#0A0F25;} + .d2-3513614925 .fill-N2{fill:#676C7E;} + .d2-3513614925 .fill-N3{fill:#9499AB;} + .d2-3513614925 .fill-N4{fill:#CFD2DD;} + .d2-3513614925 .fill-N5{fill:#DEE1EB;} + .d2-3513614925 .fill-N6{fill:#EEF1F8;} + .d2-3513614925 .fill-N7{fill:#FFFFFF;} + .d2-3513614925 .fill-B1{fill:#0D32B2;} + .d2-3513614925 .fill-B2{fill:#0D32B2;} + .d2-3513614925 .fill-B3{fill:#E3E9FD;} + .d2-3513614925 .fill-B4{fill:#E3E9FD;} + .d2-3513614925 .fill-B5{fill:#EDF0FD;} + .d2-3513614925 .fill-B6{fill:#F7F8FE;} + .d2-3513614925 .fill-AA2{fill:#4A6FF3;} + .d2-3513614925 .fill-AA4{fill:#EDF0FD;} + .d2-3513614925 .fill-AA5{fill:#F7F8FE;} + .d2-3513614925 .fill-AB4{fill:#EDF0FD;} + .d2-3513614925 .fill-AB5{fill:#F7F8FE;} + .d2-3513614925 .stroke-N1{stroke:#0A0F25;} + .d2-3513614925 .stroke-N2{stroke:#676C7E;} + .d2-3513614925 .stroke-N3{stroke:#9499AB;} + .d2-3513614925 .stroke-N4{stroke:#CFD2DD;} + .d2-3513614925 .stroke-N5{stroke:#DEE1EB;} + .d2-3513614925 .stroke-N6{stroke:#EEF1F8;} + .d2-3513614925 .stroke-N7{stroke:#FFFFFF;} + .d2-3513614925 .stroke-B1{stroke:#0D32B2;} + .d2-3513614925 .stroke-B2{stroke:#0D32B2;} + .d2-3513614925 .stroke-B3{stroke:#E3E9FD;} + .d2-3513614925 .stroke-B4{stroke:#E3E9FD;} + .d2-3513614925 .stroke-B5{stroke:#EDF0FD;} + .d2-3513614925 .stroke-B6{stroke:#F7F8FE;} + .d2-3513614925 .stroke-AA2{stroke:#4A6FF3;} + .d2-3513614925 .stroke-AA4{stroke:#EDF0FD;} + .d2-3513614925 .stroke-AA5{stroke:#F7F8FE;} + .d2-3513614925 .stroke-AB4{stroke:#EDF0FD;} + .d2-3513614925 .stroke-AB5{stroke:#F7F8FE;} + .d2-3513614925 .background-color-N1{background-color:#0A0F25;} + .d2-3513614925 .background-color-N2{background-color:#676C7E;} + .d2-3513614925 .background-color-N3{background-color:#9499AB;} + .d2-3513614925 .background-color-N4{background-color:#CFD2DD;} + .d2-3513614925 .background-color-N5{background-color:#DEE1EB;} + .d2-3513614925 .background-color-N6{background-color:#EEF1F8;} + .d2-3513614925 .background-color-N7{background-color:#FFFFFF;} + .d2-3513614925 .background-color-B1{background-color:#0D32B2;} + .d2-3513614925 .background-color-B2{background-color:#0D32B2;} + .d2-3513614925 .background-color-B3{background-color:#E3E9FD;} + .d2-3513614925 .background-color-B4{background-color:#E3E9FD;} + .d2-3513614925 .background-color-B5{background-color:#EDF0FD;} + .d2-3513614925 .background-color-B6{background-color:#F7F8FE;} + .d2-3513614925 .background-color-AA2{background-color:#4A6FF3;} + .d2-3513614925 .background-color-AA4{background-color:#EDF0FD;} + .d2-3513614925 .background-color-AA5{background-color:#F7F8FE;} + .d2-3513614925 .background-color-AB4{background-color:#EDF0FD;} + .d2-3513614925 .background-color-AB5{background-color:#F7F8FE;} + .d2-3513614925 .color-N1{color:#0A0F25;} + .d2-3513614925 .color-N2{color:#676C7E;} + .d2-3513614925 .color-N3{color:#9499AB;} + .d2-3513614925 .color-N4{color:#CFD2DD;} + .d2-3513614925 .color-N5{color:#DEE1EB;} + .d2-3513614925 .color-N6{color:#EEF1F8;} + .d2-3513614925 .color-N7{color:#FFFFFF;} + .d2-3513614925 .color-B1{color:#0D32B2;} + .d2-3513614925 .color-B2{color:#0D32B2;} + .d2-3513614925 .color-B3{color:#E3E9FD;} + .d2-3513614925 .color-B4{color:#E3E9FD;} + .d2-3513614925 .color-B5{color:#EDF0FD;} + .d2-3513614925 .color-B6{color:#F7F8FE;} + .d2-3513614925 .color-AA2{color:#4A6FF3;} + .d2-3513614925 .color-AA4{color:#EDF0FD;} + .d2-3513614925 .color-AA5{color:#F7F8FE;} + .d2-3513614925 .color-AB4{color:#EDF0FD;} + .d2-3513614925 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3513614925);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3513614925);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3513614925);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3513614925);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3513614925);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3513614925);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3513614925);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3513614925);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3513614925);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3513614925);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3513614925);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3513614925);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3513614925);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3513614925);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3513614925);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3513614925);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3513614925);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3513614925);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> - + + - + + - + + -ab hello + +ab hello - - - + + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/connection_label_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/connection_label_dark/sketch.exp.svg index 909c233ee..43276206b 100644 --- a/d2renderers/d2sketch/testdata/connection_label_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/connection_label_dark/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-836702883 .fill-N1{fill:#CDD6F4;} + .d2-836702883 .fill-N2{fill:#BAC2DE;} + .d2-836702883 .fill-N3{fill:#A6ADC8;} + .d2-836702883 .fill-N4{fill:#585B70;} + .d2-836702883 .fill-N5{fill:#45475A;} + .d2-836702883 .fill-N6{fill:#313244;} + .d2-836702883 .fill-N7{fill:#1E1E2E;} + .d2-836702883 .fill-B1{fill:#CBA6f7;} + .d2-836702883 .fill-B2{fill:#CBA6f7;} + .d2-836702883 .fill-B3{fill:#6C7086;} + .d2-836702883 .fill-B4{fill:#585B70;} + .d2-836702883 .fill-B5{fill:#45475A;} + .d2-836702883 .fill-B6{fill:#313244;} + .d2-836702883 .fill-AA2{fill:#f38BA8;} + .d2-836702883 .fill-AA4{fill:#45475A;} + .d2-836702883 .fill-AA5{fill:#313244;} + .d2-836702883 .fill-AB4{fill:#45475A;} + .d2-836702883 .fill-AB5{fill:#313244;} + .d2-836702883 .stroke-N1{stroke:#CDD6F4;} + .d2-836702883 .stroke-N2{stroke:#BAC2DE;} + .d2-836702883 .stroke-N3{stroke:#A6ADC8;} + .d2-836702883 .stroke-N4{stroke:#585B70;} + .d2-836702883 .stroke-N5{stroke:#45475A;} + .d2-836702883 .stroke-N6{stroke:#313244;} + .d2-836702883 .stroke-N7{stroke:#1E1E2E;} + .d2-836702883 .stroke-B1{stroke:#CBA6f7;} + .d2-836702883 .stroke-B2{stroke:#CBA6f7;} + .d2-836702883 .stroke-B3{stroke:#6C7086;} + .d2-836702883 .stroke-B4{stroke:#585B70;} + .d2-836702883 .stroke-B5{stroke:#45475A;} + .d2-836702883 .stroke-B6{stroke:#313244;} + .d2-836702883 .stroke-AA2{stroke:#f38BA8;} + .d2-836702883 .stroke-AA4{stroke:#45475A;} + .d2-836702883 .stroke-AA5{stroke:#313244;} + .d2-836702883 .stroke-AB4{stroke:#45475A;} + .d2-836702883 .stroke-AB5{stroke:#313244;} + .d2-836702883 .background-color-N1{background-color:#CDD6F4;} + .d2-836702883 .background-color-N2{background-color:#BAC2DE;} + .d2-836702883 .background-color-N3{background-color:#A6ADC8;} + .d2-836702883 .background-color-N4{background-color:#585B70;} + .d2-836702883 .background-color-N5{background-color:#45475A;} + .d2-836702883 .background-color-N6{background-color:#313244;} + .d2-836702883 .background-color-N7{background-color:#1E1E2E;} + .d2-836702883 .background-color-B1{background-color:#CBA6f7;} + .d2-836702883 .background-color-B2{background-color:#CBA6f7;} + .d2-836702883 .background-color-B3{background-color:#6C7086;} + .d2-836702883 .background-color-B4{background-color:#585B70;} + .d2-836702883 .background-color-B5{background-color:#45475A;} + .d2-836702883 .background-color-B6{background-color:#313244;} + .d2-836702883 .background-color-AA2{background-color:#f38BA8;} + .d2-836702883 .background-color-AA4{background-color:#45475A;} + .d2-836702883 .background-color-AA5{background-color:#313244;} + .d2-836702883 .background-color-AB4{background-color:#45475A;} + .d2-836702883 .background-color-AB5{background-color:#313244;} + .d2-836702883 .color-N1{color:#CDD6F4;} + .d2-836702883 .color-N2{color:#BAC2DE;} + .d2-836702883 .color-N3{color:#A6ADC8;} + .d2-836702883 .color-N4{color:#585B70;} + .d2-836702883 .color-N5{color:#45475A;} + .d2-836702883 .color-N6{color:#313244;} + .d2-836702883 .color-N7{color:#1E1E2E;} + .d2-836702883 .color-B1{color:#CBA6f7;} + .d2-836702883 .color-B2{color:#CBA6f7;} + .d2-836702883 .color-B3{color:#6C7086;} + .d2-836702883 .color-B4{color:#585B70;} + .d2-836702883 .color-B5{color:#45475A;} + .d2-836702883 .color-B6{color:#313244;} + .d2-836702883 .color-AA2{color:#f38BA8;} + .d2-836702883 .color-AA4{color:#45475A;} + .d2-836702883 .color-AA5{color:#313244;} + .d2-836702883 .color-AB4{color:#45475A;} + .d2-836702883 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal-d2-836702883);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal-d2-836702883);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark-d2-836702883);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark-d2-836702883);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker-d2-836702883);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker-d2-836702883);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal-d2-836702883);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker-d2-836702883);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker-d2-836702883);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker-d2-836702883);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker-d2-836702883);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal-d2-836702883);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal-d2-836702883);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal-d2-836702883);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark-d2-836702883);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker-d2-836702883);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker-d2-836702883);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker-d2-836702883);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]> - + + - + + -ab hello + +ab hello - - - + + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/crows_feet/sketch.exp.svg b/d2renderers/d2sketch/testdata/crows_feet/sketch.exp.svg index 326afa86e..790e851f0 100644 --- a/d2renderers/d2sketch/testdata/crows_feet/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/crows_feet/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-3442793506 .fill-N1{fill:#0A0F25;} + .d2-3442793506 .fill-N2{fill:#676C7E;} + .d2-3442793506 .fill-N3{fill:#9499AB;} + .d2-3442793506 .fill-N4{fill:#CFD2DD;} + .d2-3442793506 .fill-N5{fill:#DEE1EB;} + .d2-3442793506 .fill-N6{fill:#EEF1F8;} + .d2-3442793506 .fill-N7{fill:#FFFFFF;} + .d2-3442793506 .fill-B1{fill:#0D32B2;} + .d2-3442793506 .fill-B2{fill:#0D32B2;} + .d2-3442793506 .fill-B3{fill:#E3E9FD;} + .d2-3442793506 .fill-B4{fill:#E3E9FD;} + .d2-3442793506 .fill-B5{fill:#EDF0FD;} + .d2-3442793506 .fill-B6{fill:#F7F8FE;} + .d2-3442793506 .fill-AA2{fill:#4A6FF3;} + .d2-3442793506 .fill-AA4{fill:#EDF0FD;} + .d2-3442793506 .fill-AA5{fill:#F7F8FE;} + .d2-3442793506 .fill-AB4{fill:#EDF0FD;} + .d2-3442793506 .fill-AB5{fill:#F7F8FE;} + .d2-3442793506 .stroke-N1{stroke:#0A0F25;} + .d2-3442793506 .stroke-N2{stroke:#676C7E;} + .d2-3442793506 .stroke-N3{stroke:#9499AB;} + .d2-3442793506 .stroke-N4{stroke:#CFD2DD;} + .d2-3442793506 .stroke-N5{stroke:#DEE1EB;} + .d2-3442793506 .stroke-N6{stroke:#EEF1F8;} + .d2-3442793506 .stroke-N7{stroke:#FFFFFF;} + .d2-3442793506 .stroke-B1{stroke:#0D32B2;} + .d2-3442793506 .stroke-B2{stroke:#0D32B2;} + .d2-3442793506 .stroke-B3{stroke:#E3E9FD;} + .d2-3442793506 .stroke-B4{stroke:#E3E9FD;} + .d2-3442793506 .stroke-B5{stroke:#EDF0FD;} + .d2-3442793506 .stroke-B6{stroke:#F7F8FE;} + .d2-3442793506 .stroke-AA2{stroke:#4A6FF3;} + .d2-3442793506 .stroke-AA4{stroke:#EDF0FD;} + .d2-3442793506 .stroke-AA5{stroke:#F7F8FE;} + .d2-3442793506 .stroke-AB4{stroke:#EDF0FD;} + .d2-3442793506 .stroke-AB5{stroke:#F7F8FE;} + .d2-3442793506 .background-color-N1{background-color:#0A0F25;} + .d2-3442793506 .background-color-N2{background-color:#676C7E;} + .d2-3442793506 .background-color-N3{background-color:#9499AB;} + .d2-3442793506 .background-color-N4{background-color:#CFD2DD;} + .d2-3442793506 .background-color-N5{background-color:#DEE1EB;} + .d2-3442793506 .background-color-N6{background-color:#EEF1F8;} + .d2-3442793506 .background-color-N7{background-color:#FFFFFF;} + .d2-3442793506 .background-color-B1{background-color:#0D32B2;} + .d2-3442793506 .background-color-B2{background-color:#0D32B2;} + .d2-3442793506 .background-color-B3{background-color:#E3E9FD;} + .d2-3442793506 .background-color-B4{background-color:#E3E9FD;} + .d2-3442793506 .background-color-B5{background-color:#EDF0FD;} + .d2-3442793506 .background-color-B6{background-color:#F7F8FE;} + .d2-3442793506 .background-color-AA2{background-color:#4A6FF3;} + .d2-3442793506 .background-color-AA4{background-color:#EDF0FD;} + .d2-3442793506 .background-color-AA5{background-color:#F7F8FE;} + .d2-3442793506 .background-color-AB4{background-color:#EDF0FD;} + .d2-3442793506 .background-color-AB5{background-color:#F7F8FE;} + .d2-3442793506 .color-N1{color:#0A0F25;} + .d2-3442793506 .color-N2{color:#676C7E;} + .d2-3442793506 .color-N3{color:#9499AB;} + .d2-3442793506 .color-N4{color:#CFD2DD;} + .d2-3442793506 .color-N5{color:#DEE1EB;} + .d2-3442793506 .color-N6{color:#EEF1F8;} + .d2-3442793506 .color-N7{color:#FFFFFF;} + .d2-3442793506 .color-B1{color:#0D32B2;} + .d2-3442793506 .color-B2{color:#0D32B2;} + .d2-3442793506 .color-B3{color:#E3E9FD;} + .d2-3442793506 .color-B4{color:#E3E9FD;} + .d2-3442793506 .color-B5{color:#EDF0FD;} + .d2-3442793506 .color-B6{color:#F7F8FE;} + .d2-3442793506 .color-AA2{color:#4A6FF3;} + .d2-3442793506 .color-AA4{color:#EDF0FD;} + .d2-3442793506 .color-AA5{color:#F7F8FE;} + .d2-3442793506 .color-AB4{color:#EDF0FD;} + .d2-3442793506 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3442793506);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3442793506);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3442793506);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3442793506);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3442793506);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3442793506);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3442793506);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3442793506);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3442793506);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3442793506);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3442793506);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3442793506);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3442793506);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3442793506);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3442793506);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3442793506);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3442793506);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3442793506);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> - + + - + + - + + -a1b1a2b2a3b3c1d1c2d2c3d3e1f1e2f2e3f3g1h1g2h2g3h3cdf + +a1b1a2b2a3b3c1d1c2d2c3d3e1f1e2f2e3f3g1h1g2h2g3h3cdf - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/crows_feet_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/crows_feet_dark/sketch.exp.svg index 77edd6aeb..447c59b5b 100644 --- a/d2renderers/d2sketch/testdata/crows_feet_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/crows_feet_dark/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-2132559612 .fill-N1{fill:#CDD6F4;} + .d2-2132559612 .fill-N2{fill:#BAC2DE;} + .d2-2132559612 .fill-N3{fill:#A6ADC8;} + .d2-2132559612 .fill-N4{fill:#585B70;} + .d2-2132559612 .fill-N5{fill:#45475A;} + .d2-2132559612 .fill-N6{fill:#313244;} + .d2-2132559612 .fill-N7{fill:#1E1E2E;} + .d2-2132559612 .fill-B1{fill:#CBA6f7;} + .d2-2132559612 .fill-B2{fill:#CBA6f7;} + .d2-2132559612 .fill-B3{fill:#6C7086;} + .d2-2132559612 .fill-B4{fill:#585B70;} + .d2-2132559612 .fill-B5{fill:#45475A;} + .d2-2132559612 .fill-B6{fill:#313244;} + .d2-2132559612 .fill-AA2{fill:#f38BA8;} + .d2-2132559612 .fill-AA4{fill:#45475A;} + .d2-2132559612 .fill-AA5{fill:#313244;} + .d2-2132559612 .fill-AB4{fill:#45475A;} + .d2-2132559612 .fill-AB5{fill:#313244;} + .d2-2132559612 .stroke-N1{stroke:#CDD6F4;} + .d2-2132559612 .stroke-N2{stroke:#BAC2DE;} + .d2-2132559612 .stroke-N3{stroke:#A6ADC8;} + .d2-2132559612 .stroke-N4{stroke:#585B70;} + .d2-2132559612 .stroke-N5{stroke:#45475A;} + .d2-2132559612 .stroke-N6{stroke:#313244;} + .d2-2132559612 .stroke-N7{stroke:#1E1E2E;} + .d2-2132559612 .stroke-B1{stroke:#CBA6f7;} + .d2-2132559612 .stroke-B2{stroke:#CBA6f7;} + .d2-2132559612 .stroke-B3{stroke:#6C7086;} + .d2-2132559612 .stroke-B4{stroke:#585B70;} + .d2-2132559612 .stroke-B5{stroke:#45475A;} + .d2-2132559612 .stroke-B6{stroke:#313244;} + .d2-2132559612 .stroke-AA2{stroke:#f38BA8;} + .d2-2132559612 .stroke-AA4{stroke:#45475A;} + .d2-2132559612 .stroke-AA5{stroke:#313244;} + .d2-2132559612 .stroke-AB4{stroke:#45475A;} + .d2-2132559612 .stroke-AB5{stroke:#313244;} + .d2-2132559612 .background-color-N1{background-color:#CDD6F4;} + .d2-2132559612 .background-color-N2{background-color:#BAC2DE;} + .d2-2132559612 .background-color-N3{background-color:#A6ADC8;} + .d2-2132559612 .background-color-N4{background-color:#585B70;} + .d2-2132559612 .background-color-N5{background-color:#45475A;} + .d2-2132559612 .background-color-N6{background-color:#313244;} + .d2-2132559612 .background-color-N7{background-color:#1E1E2E;} + .d2-2132559612 .background-color-B1{background-color:#CBA6f7;} + .d2-2132559612 .background-color-B2{background-color:#CBA6f7;} + .d2-2132559612 .background-color-B3{background-color:#6C7086;} + .d2-2132559612 .background-color-B4{background-color:#585B70;} + .d2-2132559612 .background-color-B5{background-color:#45475A;} + .d2-2132559612 .background-color-B6{background-color:#313244;} + .d2-2132559612 .background-color-AA2{background-color:#f38BA8;} + .d2-2132559612 .background-color-AA4{background-color:#45475A;} + .d2-2132559612 .background-color-AA5{background-color:#313244;} + .d2-2132559612 .background-color-AB4{background-color:#45475A;} + .d2-2132559612 .background-color-AB5{background-color:#313244;} + .d2-2132559612 .color-N1{color:#CDD6F4;} + .d2-2132559612 .color-N2{color:#BAC2DE;} + .d2-2132559612 .color-N3{color:#A6ADC8;} + .d2-2132559612 .color-N4{color:#585B70;} + .d2-2132559612 .color-N5{color:#45475A;} + .d2-2132559612 .color-N6{color:#313244;} + .d2-2132559612 .color-N7{color:#1E1E2E;} + .d2-2132559612 .color-B1{color:#CBA6f7;} + .d2-2132559612 .color-B2{color:#CBA6f7;} + .d2-2132559612 .color-B3{color:#6C7086;} + .d2-2132559612 .color-B4{color:#585B70;} + .d2-2132559612 .color-B5{color:#45475A;} + .d2-2132559612 .color-B6{color:#313244;} + .d2-2132559612 .color-AA2{color:#f38BA8;} + .d2-2132559612 .color-AA4{color:#45475A;} + .d2-2132559612 .color-AA5{color:#313244;} + .d2-2132559612 .color-AB4{color:#45475A;} + .d2-2132559612 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal-d2-2132559612);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal-d2-2132559612);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark-d2-2132559612);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark-d2-2132559612);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker-d2-2132559612);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker-d2-2132559612);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal-d2-2132559612);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker-d2-2132559612);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker-d2-2132559612);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker-d2-2132559612);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker-d2-2132559612);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal-d2-2132559612);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal-d2-2132559612);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2132559612);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark-d2-2132559612);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker-d2-2132559612);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker-d2-2132559612);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker-d2-2132559612);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]> - + + - + + -a1b1a2b2a3b3c1d1c2d2c3d3e1f1e2f2e3f3g1h1g2h2g3h3cdf + +a1b1a2b2a3b3c1d1c2d2c3d3e1f1e2f2e3f3g1h1g2h2g3h3cdf - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/dots-3d/sketch.exp.svg b/d2renderers/d2sketch/testdata/dots-3d/sketch.exp.svg index fe3a36a33..756f0657e 100644 --- a/d2renderers/d2sketch/testdata/dots-3d/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/dots-3d/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-408372067 .fill-N1{fill:#0A0F25;} + .d2-408372067 .fill-N2{fill:#676C7E;} + .d2-408372067 .fill-N3{fill:#9499AB;} + .d2-408372067 .fill-N4{fill:#CFD2DD;} + .d2-408372067 .fill-N5{fill:#DEE1EB;} + .d2-408372067 .fill-N6{fill:#EEF1F8;} + .d2-408372067 .fill-N7{fill:#FFFFFF;} + .d2-408372067 .fill-B1{fill:#0D32B2;} + .d2-408372067 .fill-B2{fill:#0D32B2;} + .d2-408372067 .fill-B3{fill:#E3E9FD;} + .d2-408372067 .fill-B4{fill:#E3E9FD;} + .d2-408372067 .fill-B5{fill:#EDF0FD;} + .d2-408372067 .fill-B6{fill:#F7F8FE;} + .d2-408372067 .fill-AA2{fill:#4A6FF3;} + .d2-408372067 .fill-AA4{fill:#EDF0FD;} + .d2-408372067 .fill-AA5{fill:#F7F8FE;} + .d2-408372067 .fill-AB4{fill:#EDF0FD;} + .d2-408372067 .fill-AB5{fill:#F7F8FE;} + .d2-408372067 .stroke-N1{stroke:#0A0F25;} + .d2-408372067 .stroke-N2{stroke:#676C7E;} + .d2-408372067 .stroke-N3{stroke:#9499AB;} + .d2-408372067 .stroke-N4{stroke:#CFD2DD;} + .d2-408372067 .stroke-N5{stroke:#DEE1EB;} + .d2-408372067 .stroke-N6{stroke:#EEF1F8;} + .d2-408372067 .stroke-N7{stroke:#FFFFFF;} + .d2-408372067 .stroke-B1{stroke:#0D32B2;} + .d2-408372067 .stroke-B2{stroke:#0D32B2;} + .d2-408372067 .stroke-B3{stroke:#E3E9FD;} + .d2-408372067 .stroke-B4{stroke:#E3E9FD;} + .d2-408372067 .stroke-B5{stroke:#EDF0FD;} + .d2-408372067 .stroke-B6{stroke:#F7F8FE;} + .d2-408372067 .stroke-AA2{stroke:#4A6FF3;} + .d2-408372067 .stroke-AA4{stroke:#EDF0FD;} + .d2-408372067 .stroke-AA5{stroke:#F7F8FE;} + .d2-408372067 .stroke-AB4{stroke:#EDF0FD;} + .d2-408372067 .stroke-AB5{stroke:#F7F8FE;} + .d2-408372067 .background-color-N1{background-color:#0A0F25;} + .d2-408372067 .background-color-N2{background-color:#676C7E;} + .d2-408372067 .background-color-N3{background-color:#9499AB;} + .d2-408372067 .background-color-N4{background-color:#CFD2DD;} + .d2-408372067 .background-color-N5{background-color:#DEE1EB;} + .d2-408372067 .background-color-N6{background-color:#EEF1F8;} + .d2-408372067 .background-color-N7{background-color:#FFFFFF;} + .d2-408372067 .background-color-B1{background-color:#0D32B2;} + .d2-408372067 .background-color-B2{background-color:#0D32B2;} + .d2-408372067 .background-color-B3{background-color:#E3E9FD;} + .d2-408372067 .background-color-B4{background-color:#E3E9FD;} + .d2-408372067 .background-color-B5{background-color:#EDF0FD;} + .d2-408372067 .background-color-B6{background-color:#F7F8FE;} + .d2-408372067 .background-color-AA2{background-color:#4A6FF3;} + .d2-408372067 .background-color-AA4{background-color:#EDF0FD;} + .d2-408372067 .background-color-AA5{background-color:#F7F8FE;} + .d2-408372067 .background-color-AB4{background-color:#EDF0FD;} + .d2-408372067 .background-color-AB5{background-color:#F7F8FE;} + .d2-408372067 .color-N1{color:#0A0F25;} + .d2-408372067 .color-N2{color:#676C7E;} + .d2-408372067 .color-N3{color:#9499AB;} + .d2-408372067 .color-N4{color:#CFD2DD;} + .d2-408372067 .color-N5{color:#DEE1EB;} + .d2-408372067 .color-N6{color:#EEF1F8;} + .d2-408372067 .color-N7{color:#FFFFFF;} + .d2-408372067 .color-B1{color:#0D32B2;} + .d2-408372067 .color-B2{color:#0D32B2;} + .d2-408372067 .color-B3{color:#E3E9FD;} + .d2-408372067 .color-B4{color:#E3E9FD;} + .d2-408372067 .color-B5{color:#EDF0FD;} + .d2-408372067 .color-B6{color:#F7F8FE;} + .d2-408372067 .color-AA2{color:#4A6FF3;} + .d2-408372067 .color-AA4{color:#EDF0FD;} + .d2-408372067 .color-AA5{color:#F7F8FE;} + .d2-408372067 .color-AB4{color:#EDF0FD;} + .d2-408372067 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-408372067);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-408372067);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-408372067);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-408372067);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-408372067);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-408372067);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-408372067);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-408372067);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-408372067);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-408372067);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-408372067);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-408372067);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-408372067);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-408372067);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-408372067);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-408372067);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-408372067);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-408372067);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> - + + - + + - + + - +}]]> @@ -130,12 +134,12 @@ - + -x +x -y +y - - + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/dots-all/sketch.exp.svg b/d2renderers/d2sketch/testdata/dots-all/sketch.exp.svg index f71ce835d..66bede291 100644 --- a/d2renderers/d2sketch/testdata/dots-all/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/dots-all/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-49487516 .fill-N1{fill:#0A0F25;} + .d2-49487516 .fill-N2{fill:#676C7E;} + .d2-49487516 .fill-N3{fill:#9499AB;} + .d2-49487516 .fill-N4{fill:#CFD2DD;} + .d2-49487516 .fill-N5{fill:#DEE1EB;} + .d2-49487516 .fill-N6{fill:#EEF1F8;} + .d2-49487516 .fill-N7{fill:#FFFFFF;} + .d2-49487516 .fill-B1{fill:#0D32B2;} + .d2-49487516 .fill-B2{fill:#0D32B2;} + .d2-49487516 .fill-B3{fill:#E3E9FD;} + .d2-49487516 .fill-B4{fill:#E3E9FD;} + .d2-49487516 .fill-B5{fill:#EDF0FD;} + .d2-49487516 .fill-B6{fill:#F7F8FE;} + .d2-49487516 .fill-AA2{fill:#4A6FF3;} + .d2-49487516 .fill-AA4{fill:#EDF0FD;} + .d2-49487516 .fill-AA5{fill:#F7F8FE;} + .d2-49487516 .fill-AB4{fill:#EDF0FD;} + .d2-49487516 .fill-AB5{fill:#F7F8FE;} + .d2-49487516 .stroke-N1{stroke:#0A0F25;} + .d2-49487516 .stroke-N2{stroke:#676C7E;} + .d2-49487516 .stroke-N3{stroke:#9499AB;} + .d2-49487516 .stroke-N4{stroke:#CFD2DD;} + .d2-49487516 .stroke-N5{stroke:#DEE1EB;} + .d2-49487516 .stroke-N6{stroke:#EEF1F8;} + .d2-49487516 .stroke-N7{stroke:#FFFFFF;} + .d2-49487516 .stroke-B1{stroke:#0D32B2;} + .d2-49487516 .stroke-B2{stroke:#0D32B2;} + .d2-49487516 .stroke-B3{stroke:#E3E9FD;} + .d2-49487516 .stroke-B4{stroke:#E3E9FD;} + .d2-49487516 .stroke-B5{stroke:#EDF0FD;} + .d2-49487516 .stroke-B6{stroke:#F7F8FE;} + .d2-49487516 .stroke-AA2{stroke:#4A6FF3;} + .d2-49487516 .stroke-AA4{stroke:#EDF0FD;} + .d2-49487516 .stroke-AA5{stroke:#F7F8FE;} + .d2-49487516 .stroke-AB4{stroke:#EDF0FD;} + .d2-49487516 .stroke-AB5{stroke:#F7F8FE;} + .d2-49487516 .background-color-N1{background-color:#0A0F25;} + .d2-49487516 .background-color-N2{background-color:#676C7E;} + .d2-49487516 .background-color-N3{background-color:#9499AB;} + .d2-49487516 .background-color-N4{background-color:#CFD2DD;} + .d2-49487516 .background-color-N5{background-color:#DEE1EB;} + .d2-49487516 .background-color-N6{background-color:#EEF1F8;} + .d2-49487516 .background-color-N7{background-color:#FFFFFF;} + .d2-49487516 .background-color-B1{background-color:#0D32B2;} + .d2-49487516 .background-color-B2{background-color:#0D32B2;} + .d2-49487516 .background-color-B3{background-color:#E3E9FD;} + .d2-49487516 .background-color-B4{background-color:#E3E9FD;} + .d2-49487516 .background-color-B5{background-color:#EDF0FD;} + .d2-49487516 .background-color-B6{background-color:#F7F8FE;} + .d2-49487516 .background-color-AA2{background-color:#4A6FF3;} + .d2-49487516 .background-color-AA4{background-color:#EDF0FD;} + .d2-49487516 .background-color-AA5{background-color:#F7F8FE;} + .d2-49487516 .background-color-AB4{background-color:#EDF0FD;} + .d2-49487516 .background-color-AB5{background-color:#F7F8FE;} + .d2-49487516 .color-N1{color:#0A0F25;} + .d2-49487516 .color-N2{color:#676C7E;} + .d2-49487516 .color-N3{color:#9499AB;} + .d2-49487516 .color-N4{color:#CFD2DD;} + .d2-49487516 .color-N5{color:#DEE1EB;} + .d2-49487516 .color-N6{color:#EEF1F8;} + .d2-49487516 .color-N7{color:#FFFFFF;} + .d2-49487516 .color-B1{color:#0D32B2;} + .d2-49487516 .color-B2{color:#0D32B2;} + .d2-49487516 .color-B3{color:#E3E9FD;} + .d2-49487516 .color-B4{color:#E3E9FD;} + .d2-49487516 .color-B5{color:#EDF0FD;} + .d2-49487516 .color-B6{color:#F7F8FE;} + .d2-49487516 .color-AA2{color:#4A6FF3;} + .d2-49487516 .color-AA4{color:#EDF0FD;} + .d2-49487516 .color-AA5{color:#F7F8FE;} + .d2-49487516 .color-AB4{color:#EDF0FD;} + .d2-49487516 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-49487516);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-49487516);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-49487516);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-49487516);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-49487516);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-49487516);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-49487516);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-49487516);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-49487516);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-49487516);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-49487516);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-49487516);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-49487516);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-49487516);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-49487516);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-49487516);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-49487516);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-49487516);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> - + + - + + - + + - +}]]> @@ -130,23 +134,23 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud +rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/dots-multiple/sketch.exp.svg b/d2renderers/d2sketch/testdata/dots-multiple/sketch.exp.svg index 366fb0250..53b9d18c1 100644 --- a/d2renderers/d2sketch/testdata/dots-multiple/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/dots-multiple/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-2212260421 .fill-N1{fill:#0A0F25;} + .d2-2212260421 .fill-N2{fill:#676C7E;} + .d2-2212260421 .fill-N3{fill:#9499AB;} + .d2-2212260421 .fill-N4{fill:#CFD2DD;} + .d2-2212260421 .fill-N5{fill:#DEE1EB;} + .d2-2212260421 .fill-N6{fill:#EEF1F8;} + .d2-2212260421 .fill-N7{fill:#FFFFFF;} + .d2-2212260421 .fill-B1{fill:#0D32B2;} + .d2-2212260421 .fill-B2{fill:#0D32B2;} + .d2-2212260421 .fill-B3{fill:#E3E9FD;} + .d2-2212260421 .fill-B4{fill:#E3E9FD;} + .d2-2212260421 .fill-B5{fill:#EDF0FD;} + .d2-2212260421 .fill-B6{fill:#F7F8FE;} + .d2-2212260421 .fill-AA2{fill:#4A6FF3;} + .d2-2212260421 .fill-AA4{fill:#EDF0FD;} + .d2-2212260421 .fill-AA5{fill:#F7F8FE;} + .d2-2212260421 .fill-AB4{fill:#EDF0FD;} + .d2-2212260421 .fill-AB5{fill:#F7F8FE;} + .d2-2212260421 .stroke-N1{stroke:#0A0F25;} + .d2-2212260421 .stroke-N2{stroke:#676C7E;} + .d2-2212260421 .stroke-N3{stroke:#9499AB;} + .d2-2212260421 .stroke-N4{stroke:#CFD2DD;} + .d2-2212260421 .stroke-N5{stroke:#DEE1EB;} + .d2-2212260421 .stroke-N6{stroke:#EEF1F8;} + .d2-2212260421 .stroke-N7{stroke:#FFFFFF;} + .d2-2212260421 .stroke-B1{stroke:#0D32B2;} + .d2-2212260421 .stroke-B2{stroke:#0D32B2;} + .d2-2212260421 .stroke-B3{stroke:#E3E9FD;} + .d2-2212260421 .stroke-B4{stroke:#E3E9FD;} + .d2-2212260421 .stroke-B5{stroke:#EDF0FD;} + .d2-2212260421 .stroke-B6{stroke:#F7F8FE;} + .d2-2212260421 .stroke-AA2{stroke:#4A6FF3;} + .d2-2212260421 .stroke-AA4{stroke:#EDF0FD;} + .d2-2212260421 .stroke-AA5{stroke:#F7F8FE;} + .d2-2212260421 .stroke-AB4{stroke:#EDF0FD;} + .d2-2212260421 .stroke-AB5{stroke:#F7F8FE;} + .d2-2212260421 .background-color-N1{background-color:#0A0F25;} + .d2-2212260421 .background-color-N2{background-color:#676C7E;} + .d2-2212260421 .background-color-N3{background-color:#9499AB;} + .d2-2212260421 .background-color-N4{background-color:#CFD2DD;} + .d2-2212260421 .background-color-N5{background-color:#DEE1EB;} + .d2-2212260421 .background-color-N6{background-color:#EEF1F8;} + .d2-2212260421 .background-color-N7{background-color:#FFFFFF;} + .d2-2212260421 .background-color-B1{background-color:#0D32B2;} + .d2-2212260421 .background-color-B2{background-color:#0D32B2;} + .d2-2212260421 .background-color-B3{background-color:#E3E9FD;} + .d2-2212260421 .background-color-B4{background-color:#E3E9FD;} + .d2-2212260421 .background-color-B5{background-color:#EDF0FD;} + .d2-2212260421 .background-color-B6{background-color:#F7F8FE;} + .d2-2212260421 .background-color-AA2{background-color:#4A6FF3;} + .d2-2212260421 .background-color-AA4{background-color:#EDF0FD;} + .d2-2212260421 .background-color-AA5{background-color:#F7F8FE;} + .d2-2212260421 .background-color-AB4{background-color:#EDF0FD;} + .d2-2212260421 .background-color-AB5{background-color:#F7F8FE;} + .d2-2212260421 .color-N1{color:#0A0F25;} + .d2-2212260421 .color-N2{color:#676C7E;} + .d2-2212260421 .color-N3{color:#9499AB;} + .d2-2212260421 .color-N4{color:#CFD2DD;} + .d2-2212260421 .color-N5{color:#DEE1EB;} + .d2-2212260421 .color-N6{color:#EEF1F8;} + .d2-2212260421 .color-N7{color:#FFFFFF;} + .d2-2212260421 .color-B1{color:#0D32B2;} + .d2-2212260421 .color-B2{color:#0D32B2;} + .d2-2212260421 .color-B3{color:#E3E9FD;} + .d2-2212260421 .color-B4{color:#E3E9FD;} + .d2-2212260421 .color-B5{color:#EDF0FD;} + .d2-2212260421 .color-B6{color:#F7F8FE;} + .d2-2212260421 .color-AA2{color:#4A6FF3;} + .d2-2212260421 .color-AA4{color:#EDF0FD;} + .d2-2212260421 .color-AA5{color:#F7F8FE;} + .d2-2212260421 .color-AB4{color:#EDF0FD;} + .d2-2212260421 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2212260421);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2212260421);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2212260421);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2212260421);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2212260421);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2212260421);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2212260421);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2212260421);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2212260421);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2212260421);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2212260421);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2212260421);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2212260421);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2212260421);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2212260421);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2212260421);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2212260421);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2212260421);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> - + + - + + - + + - +}]]> @@ -130,23 +134,23 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud +rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/dots-real/sketch.exp.svg b/d2renderers/d2sketch/testdata/dots-real/sketch.exp.svg index 629cf825d..861ac762a 100644 --- a/d2renderers/d2sketch/testdata/dots-real/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/dots-real/sketch.exp.svg @@ -1,27 +1,27 @@ - + .d2-1448024413 .fill-N1{fill:#0A0F25;} + .d2-1448024413 .fill-N2{fill:#676C7E;} + .d2-1448024413 .fill-N3{fill:#9499AB;} + .d2-1448024413 .fill-N4{fill:#CFD2DD;} + .d2-1448024413 .fill-N5{fill:#DEE1EB;} + .d2-1448024413 .fill-N6{fill:#EEF1F8;} + .d2-1448024413 .fill-N7{fill:#FFFFFF;} + .d2-1448024413 .fill-B1{fill:#0D32B2;} + .d2-1448024413 .fill-B2{fill:#0D32B2;} + .d2-1448024413 .fill-B3{fill:#E3E9FD;} + .d2-1448024413 .fill-B4{fill:#E3E9FD;} + .d2-1448024413 .fill-B5{fill:#EDF0FD;} + .d2-1448024413 .fill-B6{fill:#F7F8FE;} + .d2-1448024413 .fill-AA2{fill:#4A6FF3;} + .d2-1448024413 .fill-AA4{fill:#EDF0FD;} + .d2-1448024413 .fill-AA5{fill:#F7F8FE;} + .d2-1448024413 .fill-AB4{fill:#EDF0FD;} + .d2-1448024413 .fill-AB5{fill:#F7F8FE;} + .d2-1448024413 .stroke-N1{stroke:#0A0F25;} + .d2-1448024413 .stroke-N2{stroke:#676C7E;} + .d2-1448024413 .stroke-N3{stroke:#9499AB;} + .d2-1448024413 .stroke-N4{stroke:#CFD2DD;} + .d2-1448024413 .stroke-N5{stroke:#DEE1EB;} + .d2-1448024413 .stroke-N6{stroke:#EEF1F8;} + .d2-1448024413 .stroke-N7{stroke:#FFFFFF;} + .d2-1448024413 .stroke-B1{stroke:#0D32B2;} + .d2-1448024413 .stroke-B2{stroke:#0D32B2;} + .d2-1448024413 .stroke-B3{stroke:#E3E9FD;} + .d2-1448024413 .stroke-B4{stroke:#E3E9FD;} + .d2-1448024413 .stroke-B5{stroke:#EDF0FD;} + .d2-1448024413 .stroke-B6{stroke:#F7F8FE;} + .d2-1448024413 .stroke-AA2{stroke:#4A6FF3;} + .d2-1448024413 .stroke-AA4{stroke:#EDF0FD;} + .d2-1448024413 .stroke-AA5{stroke:#F7F8FE;} + .d2-1448024413 .stroke-AB4{stroke:#EDF0FD;} + .d2-1448024413 .stroke-AB5{stroke:#F7F8FE;} + .d2-1448024413 .background-color-N1{background-color:#0A0F25;} + .d2-1448024413 .background-color-N2{background-color:#676C7E;} + .d2-1448024413 .background-color-N3{background-color:#9499AB;} + .d2-1448024413 .background-color-N4{background-color:#CFD2DD;} + .d2-1448024413 .background-color-N5{background-color:#DEE1EB;} + .d2-1448024413 .background-color-N6{background-color:#EEF1F8;} + .d2-1448024413 .background-color-N7{background-color:#FFFFFF;} + .d2-1448024413 .background-color-B1{background-color:#0D32B2;} + .d2-1448024413 .background-color-B2{background-color:#0D32B2;} + .d2-1448024413 .background-color-B3{background-color:#E3E9FD;} + .d2-1448024413 .background-color-B4{background-color:#E3E9FD;} + .d2-1448024413 .background-color-B5{background-color:#EDF0FD;} + .d2-1448024413 .background-color-B6{background-color:#F7F8FE;} + .d2-1448024413 .background-color-AA2{background-color:#4A6FF3;} + .d2-1448024413 .background-color-AA4{background-color:#EDF0FD;} + .d2-1448024413 .background-color-AA5{background-color:#F7F8FE;} + .d2-1448024413 .background-color-AB4{background-color:#EDF0FD;} + .d2-1448024413 .background-color-AB5{background-color:#F7F8FE;} + .d2-1448024413 .color-N1{color:#0A0F25;} + .d2-1448024413 .color-N2{color:#676C7E;} + .d2-1448024413 .color-N3{color:#9499AB;} + .d2-1448024413 .color-N4{color:#CFD2DD;} + .d2-1448024413 .color-N5{color:#DEE1EB;} + .d2-1448024413 .color-N6{color:#EEF1F8;} + .d2-1448024413 .color-N7{color:#FFFFFF;} + .d2-1448024413 .color-B1{color:#0D32B2;} + .d2-1448024413 .color-B2{color:#0D32B2;} + .d2-1448024413 .color-B3{color:#E3E9FD;} + .d2-1448024413 .color-B4{color:#E3E9FD;} + .d2-1448024413 .color-B5{color:#EDF0FD;} + .d2-1448024413 .color-B6{color:#F7F8FE;} + .d2-1448024413 .color-AA2{color:#4A6FF3;} + .d2-1448024413 .color-AA4{color:#EDF0FD;} + .d2-1448024413 .color-AA5{color:#F7F8FE;} + .d2-1448024413 .color-AB4{color:#EDF0FD;} + .d2-1448024413 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1448024413);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1448024413);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1448024413);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1448024413);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1448024413);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1448024413);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1448024413);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1448024413);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1448024413);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1448024413);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1448024413);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1448024413);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1448024413);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1448024413);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1448024413);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1448024413);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1448024413);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1448024413);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> - + + - + + - + + - +}]]> @@ -152,27 +156,27 @@ - - - + + + - - + + - + - + -NETWORKD2 Parser+readerio.RuneReader+readerPosd2ast.Position-lookahead[]rune#peekn(n int)(s string, eof bool)+peek()(r rune, eof bool)+rewind()void+commit()voidCELL TOWERSATELLITESTRANSMITTER SEND SEND SEND +NETWORKD2 Parser+readerio.RuneReader+readerPosd2ast.Position-lookahead[]rune#peekn(n int)(s string, eof bool)+peek()(r rune, eof bool)+rewind()void+commit()voidCELL TOWERSATELLITESTRANSMITTER SEND SEND SEND - - - - - - - + + + + + + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/double-border/sketch.exp.svg b/d2renderers/d2sketch/testdata/double-border/sketch.exp.svg index 272e613ba..65624a339 100644 --- a/d2renderers/d2sketch/testdata/double-border/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/double-border/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-1732006272 .fill-N1{fill:#0A0F25;} + .d2-1732006272 .fill-N2{fill:#676C7E;} + .d2-1732006272 .fill-N3{fill:#9499AB;} + .d2-1732006272 .fill-N4{fill:#CFD2DD;} + .d2-1732006272 .fill-N5{fill:#DEE1EB;} + .d2-1732006272 .fill-N6{fill:#EEF1F8;} + .d2-1732006272 .fill-N7{fill:#FFFFFF;} + .d2-1732006272 .fill-B1{fill:#0D32B2;} + .d2-1732006272 .fill-B2{fill:#0D32B2;} + .d2-1732006272 .fill-B3{fill:#E3E9FD;} + .d2-1732006272 .fill-B4{fill:#E3E9FD;} + .d2-1732006272 .fill-B5{fill:#EDF0FD;} + .d2-1732006272 .fill-B6{fill:#F7F8FE;} + .d2-1732006272 .fill-AA2{fill:#4A6FF3;} + .d2-1732006272 .fill-AA4{fill:#EDF0FD;} + .d2-1732006272 .fill-AA5{fill:#F7F8FE;} + .d2-1732006272 .fill-AB4{fill:#EDF0FD;} + .d2-1732006272 .fill-AB5{fill:#F7F8FE;} + .d2-1732006272 .stroke-N1{stroke:#0A0F25;} + .d2-1732006272 .stroke-N2{stroke:#676C7E;} + .d2-1732006272 .stroke-N3{stroke:#9499AB;} + .d2-1732006272 .stroke-N4{stroke:#CFD2DD;} + .d2-1732006272 .stroke-N5{stroke:#DEE1EB;} + .d2-1732006272 .stroke-N6{stroke:#EEF1F8;} + .d2-1732006272 .stroke-N7{stroke:#FFFFFF;} + .d2-1732006272 .stroke-B1{stroke:#0D32B2;} + .d2-1732006272 .stroke-B2{stroke:#0D32B2;} + .d2-1732006272 .stroke-B3{stroke:#E3E9FD;} + .d2-1732006272 .stroke-B4{stroke:#E3E9FD;} + .d2-1732006272 .stroke-B5{stroke:#EDF0FD;} + .d2-1732006272 .stroke-B6{stroke:#F7F8FE;} + .d2-1732006272 .stroke-AA2{stroke:#4A6FF3;} + .d2-1732006272 .stroke-AA4{stroke:#EDF0FD;} + .d2-1732006272 .stroke-AA5{stroke:#F7F8FE;} + .d2-1732006272 .stroke-AB4{stroke:#EDF0FD;} + .d2-1732006272 .stroke-AB5{stroke:#F7F8FE;} + .d2-1732006272 .background-color-N1{background-color:#0A0F25;} + .d2-1732006272 .background-color-N2{background-color:#676C7E;} + .d2-1732006272 .background-color-N3{background-color:#9499AB;} + .d2-1732006272 .background-color-N4{background-color:#CFD2DD;} + .d2-1732006272 .background-color-N5{background-color:#DEE1EB;} + .d2-1732006272 .background-color-N6{background-color:#EEF1F8;} + .d2-1732006272 .background-color-N7{background-color:#FFFFFF;} + .d2-1732006272 .background-color-B1{background-color:#0D32B2;} + .d2-1732006272 .background-color-B2{background-color:#0D32B2;} + .d2-1732006272 .background-color-B3{background-color:#E3E9FD;} + .d2-1732006272 .background-color-B4{background-color:#E3E9FD;} + .d2-1732006272 .background-color-B5{background-color:#EDF0FD;} + .d2-1732006272 .background-color-B6{background-color:#F7F8FE;} + .d2-1732006272 .background-color-AA2{background-color:#4A6FF3;} + .d2-1732006272 .background-color-AA4{background-color:#EDF0FD;} + .d2-1732006272 .background-color-AA5{background-color:#F7F8FE;} + .d2-1732006272 .background-color-AB4{background-color:#EDF0FD;} + .d2-1732006272 .background-color-AB5{background-color:#F7F8FE;} + .d2-1732006272 .color-N1{color:#0A0F25;} + .d2-1732006272 .color-N2{color:#676C7E;} + .d2-1732006272 .color-N3{color:#9499AB;} + .d2-1732006272 .color-N4{color:#CFD2DD;} + .d2-1732006272 .color-N5{color:#DEE1EB;} + .d2-1732006272 .color-N6{color:#EEF1F8;} + .d2-1732006272 .color-N7{color:#FFFFFF;} + .d2-1732006272 .color-B1{color:#0D32B2;} + .d2-1732006272 .color-B2{color:#0D32B2;} + .d2-1732006272 .color-B3{color:#E3E9FD;} + .d2-1732006272 .color-B4{color:#E3E9FD;} + .d2-1732006272 .color-B5{color:#EDF0FD;} + .d2-1732006272 .color-B6{color:#F7F8FE;} + .d2-1732006272 .color-AA2{color:#4A6FF3;} + .d2-1732006272 .color-AA4{color:#EDF0FD;} + .d2-1732006272 .color-AA5{color:#F7F8FE;} + .d2-1732006272 .color-AB4{color:#EDF0FD;} + .d2-1732006272 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1732006272);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1732006272);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1732006272);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1732006272);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1732006272);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1732006272);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1732006272);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1732006272);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1732006272);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1732006272);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1732006272);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1732006272);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1732006272);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1732006272);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1732006272);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1732006272);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1732006272);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1732006272);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> - + + - + + - + + -acnormalsomethingbdnested normal + +acnormalsomethingbdnested normal - - - - - - - + + + + + + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/elk_corners/sketch.exp.svg b/d2renderers/d2sketch/testdata/elk_corners/sketch.exp.svg index efa852755..192efbc93 100644 --- a/d2renderers/d2sketch/testdata/elk_corners/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/elk_corners/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-202867832 .fill-N1{fill:#0A0F25;} + .d2-202867832 .fill-N2{fill:#676C7E;} + .d2-202867832 .fill-N3{fill:#9499AB;} + .d2-202867832 .fill-N4{fill:#CFD2DD;} + .d2-202867832 .fill-N5{fill:#DEE1EB;} + .d2-202867832 .fill-N6{fill:#EEF1F8;} + .d2-202867832 .fill-N7{fill:#FFFFFF;} + .d2-202867832 .fill-B1{fill:#0D32B2;} + .d2-202867832 .fill-B2{fill:#0D32B2;} + .d2-202867832 .fill-B3{fill:#E3E9FD;} + .d2-202867832 .fill-B4{fill:#E3E9FD;} + .d2-202867832 .fill-B5{fill:#EDF0FD;} + .d2-202867832 .fill-B6{fill:#F7F8FE;} + .d2-202867832 .fill-AA2{fill:#4A6FF3;} + .d2-202867832 .fill-AA4{fill:#EDF0FD;} + .d2-202867832 .fill-AA5{fill:#F7F8FE;} + .d2-202867832 .fill-AB4{fill:#EDF0FD;} + .d2-202867832 .fill-AB5{fill:#F7F8FE;} + .d2-202867832 .stroke-N1{stroke:#0A0F25;} + .d2-202867832 .stroke-N2{stroke:#676C7E;} + .d2-202867832 .stroke-N3{stroke:#9499AB;} + .d2-202867832 .stroke-N4{stroke:#CFD2DD;} + .d2-202867832 .stroke-N5{stroke:#DEE1EB;} + .d2-202867832 .stroke-N6{stroke:#EEF1F8;} + .d2-202867832 .stroke-N7{stroke:#FFFFFF;} + .d2-202867832 .stroke-B1{stroke:#0D32B2;} + .d2-202867832 .stroke-B2{stroke:#0D32B2;} + .d2-202867832 .stroke-B3{stroke:#E3E9FD;} + .d2-202867832 .stroke-B4{stroke:#E3E9FD;} + .d2-202867832 .stroke-B5{stroke:#EDF0FD;} + .d2-202867832 .stroke-B6{stroke:#F7F8FE;} + .d2-202867832 .stroke-AA2{stroke:#4A6FF3;} + .d2-202867832 .stroke-AA4{stroke:#EDF0FD;} + .d2-202867832 .stroke-AA5{stroke:#F7F8FE;} + .d2-202867832 .stroke-AB4{stroke:#EDF0FD;} + .d2-202867832 .stroke-AB5{stroke:#F7F8FE;} + .d2-202867832 .background-color-N1{background-color:#0A0F25;} + .d2-202867832 .background-color-N2{background-color:#676C7E;} + .d2-202867832 .background-color-N3{background-color:#9499AB;} + .d2-202867832 .background-color-N4{background-color:#CFD2DD;} + .d2-202867832 .background-color-N5{background-color:#DEE1EB;} + .d2-202867832 .background-color-N6{background-color:#EEF1F8;} + .d2-202867832 .background-color-N7{background-color:#FFFFFF;} + .d2-202867832 .background-color-B1{background-color:#0D32B2;} + .d2-202867832 .background-color-B2{background-color:#0D32B2;} + .d2-202867832 .background-color-B3{background-color:#E3E9FD;} + .d2-202867832 .background-color-B4{background-color:#E3E9FD;} + .d2-202867832 .background-color-B5{background-color:#EDF0FD;} + .d2-202867832 .background-color-B6{background-color:#F7F8FE;} + .d2-202867832 .background-color-AA2{background-color:#4A6FF3;} + .d2-202867832 .background-color-AA4{background-color:#EDF0FD;} + .d2-202867832 .background-color-AA5{background-color:#F7F8FE;} + .d2-202867832 .background-color-AB4{background-color:#EDF0FD;} + .d2-202867832 .background-color-AB5{background-color:#F7F8FE;} + .d2-202867832 .color-N1{color:#0A0F25;} + .d2-202867832 .color-N2{color:#676C7E;} + .d2-202867832 .color-N3{color:#9499AB;} + .d2-202867832 .color-N4{color:#CFD2DD;} + .d2-202867832 .color-N5{color:#DEE1EB;} + .d2-202867832 .color-N6{color:#EEF1F8;} + .d2-202867832 .color-N7{color:#FFFFFF;} + .d2-202867832 .color-B1{color:#0D32B2;} + .d2-202867832 .color-B2{color:#0D32B2;} + .d2-202867832 .color-B3{color:#E3E9FD;} + .d2-202867832 .color-B4{color:#E3E9FD;} + .d2-202867832 .color-B5{color:#EDF0FD;} + .d2-202867832 .color-B6{color:#F7F8FE;} + .d2-202867832 .color-AA2{color:#4A6FF3;} + .d2-202867832 .color-AA4{color:#EDF0FD;} + .d2-202867832 .color-AA5{color:#F7F8FE;} + .d2-202867832 .color-AB4{color:#EDF0FD;} + .d2-202867832 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-202867832);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-202867832);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-202867832);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-202867832);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-202867832);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-202867832);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-202867832);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-202867832);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-202867832);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-202867832);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-202867832);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-202867832);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-202867832);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-202867832);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-202867832);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-202867832);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-202867832);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-202867832);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> - + + - + + - + + -abc + +abc - - - + + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/long_arrowhead_label/sketch.exp.svg b/d2renderers/d2sketch/testdata/long_arrowhead_label/sketch.exp.svg index 7cc37b44c..8e869143c 100644 --- a/d2renderers/d2sketch/testdata/long_arrowhead_label/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/long_arrowhead_label/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-4131608892 .fill-N1{fill:#0A0F25;} + .d2-4131608892 .fill-N2{fill:#676C7E;} + .d2-4131608892 .fill-N3{fill:#9499AB;} + .d2-4131608892 .fill-N4{fill:#CFD2DD;} + .d2-4131608892 .fill-N5{fill:#DEE1EB;} + .d2-4131608892 .fill-N6{fill:#EEF1F8;} + .d2-4131608892 .fill-N7{fill:#FFFFFF;} + .d2-4131608892 .fill-B1{fill:#0D32B2;} + .d2-4131608892 .fill-B2{fill:#0D32B2;} + .d2-4131608892 .fill-B3{fill:#E3E9FD;} + .d2-4131608892 .fill-B4{fill:#E3E9FD;} + .d2-4131608892 .fill-B5{fill:#EDF0FD;} + .d2-4131608892 .fill-B6{fill:#F7F8FE;} + .d2-4131608892 .fill-AA2{fill:#4A6FF3;} + .d2-4131608892 .fill-AA4{fill:#EDF0FD;} + .d2-4131608892 .fill-AA5{fill:#F7F8FE;} + .d2-4131608892 .fill-AB4{fill:#EDF0FD;} + .d2-4131608892 .fill-AB5{fill:#F7F8FE;} + .d2-4131608892 .stroke-N1{stroke:#0A0F25;} + .d2-4131608892 .stroke-N2{stroke:#676C7E;} + .d2-4131608892 .stroke-N3{stroke:#9499AB;} + .d2-4131608892 .stroke-N4{stroke:#CFD2DD;} + .d2-4131608892 .stroke-N5{stroke:#DEE1EB;} + .d2-4131608892 .stroke-N6{stroke:#EEF1F8;} + .d2-4131608892 .stroke-N7{stroke:#FFFFFF;} + .d2-4131608892 .stroke-B1{stroke:#0D32B2;} + .d2-4131608892 .stroke-B2{stroke:#0D32B2;} + .d2-4131608892 .stroke-B3{stroke:#E3E9FD;} + .d2-4131608892 .stroke-B4{stroke:#E3E9FD;} + .d2-4131608892 .stroke-B5{stroke:#EDF0FD;} + .d2-4131608892 .stroke-B6{stroke:#F7F8FE;} + .d2-4131608892 .stroke-AA2{stroke:#4A6FF3;} + .d2-4131608892 .stroke-AA4{stroke:#EDF0FD;} + .d2-4131608892 .stroke-AA5{stroke:#F7F8FE;} + .d2-4131608892 .stroke-AB4{stroke:#EDF0FD;} + .d2-4131608892 .stroke-AB5{stroke:#F7F8FE;} + .d2-4131608892 .background-color-N1{background-color:#0A0F25;} + .d2-4131608892 .background-color-N2{background-color:#676C7E;} + .d2-4131608892 .background-color-N3{background-color:#9499AB;} + .d2-4131608892 .background-color-N4{background-color:#CFD2DD;} + .d2-4131608892 .background-color-N5{background-color:#DEE1EB;} + .d2-4131608892 .background-color-N6{background-color:#EEF1F8;} + .d2-4131608892 .background-color-N7{background-color:#FFFFFF;} + .d2-4131608892 .background-color-B1{background-color:#0D32B2;} + .d2-4131608892 .background-color-B2{background-color:#0D32B2;} + .d2-4131608892 .background-color-B3{background-color:#E3E9FD;} + .d2-4131608892 .background-color-B4{background-color:#E3E9FD;} + .d2-4131608892 .background-color-B5{background-color:#EDF0FD;} + .d2-4131608892 .background-color-B6{background-color:#F7F8FE;} + .d2-4131608892 .background-color-AA2{background-color:#4A6FF3;} + .d2-4131608892 .background-color-AA4{background-color:#EDF0FD;} + .d2-4131608892 .background-color-AA5{background-color:#F7F8FE;} + .d2-4131608892 .background-color-AB4{background-color:#EDF0FD;} + .d2-4131608892 .background-color-AB5{background-color:#F7F8FE;} + .d2-4131608892 .color-N1{color:#0A0F25;} + .d2-4131608892 .color-N2{color:#676C7E;} + .d2-4131608892 .color-N3{color:#9499AB;} + .d2-4131608892 .color-N4{color:#CFD2DD;} + .d2-4131608892 .color-N5{color:#DEE1EB;} + .d2-4131608892 .color-N6{color:#EEF1F8;} + .d2-4131608892 .color-N7{color:#FFFFFF;} + .d2-4131608892 .color-B1{color:#0D32B2;} + .d2-4131608892 .color-B2{color:#0D32B2;} + .d2-4131608892 .color-B3{color:#E3E9FD;} + .d2-4131608892 .color-B4{color:#E3E9FD;} + .d2-4131608892 .color-B5{color:#EDF0FD;} + .d2-4131608892 .color-B6{color:#F7F8FE;} + .d2-4131608892 .color-AA2{color:#4A6FF3;} + .d2-4131608892 .color-AA4{color:#EDF0FD;} + .d2-4131608892 .color-AA5{color:#F7F8FE;} + .d2-4131608892 .color-AB4{color:#EDF0FD;} + .d2-4131608892 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4131608892);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4131608892);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4131608892);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4131608892);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4131608892);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4131608892);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4131608892);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4131608892);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4131608892);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4131608892);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4131608892);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4131608892);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4131608892);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4131608892);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4131608892);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4131608892);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4131608892);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4131608892);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> - + + - + + - + + -ab a to b with unexpectedly long target arrowhead label + +ab a to b with unexpectedly long target arrowhead label - - + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/opacity/sketch.exp.svg b/d2renderers/d2sketch/testdata/opacity/sketch.exp.svg index 1cd51f6ca..9db51919b 100644 --- a/d2renderers/d2sketch/testdata/opacity/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/opacity/sketch.exp.svg @@ -1,27 +1,27 @@ - + - + + - + + - + + -x

    linux: because a PC is a terrible thing to waste

    -
    auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. +     +    x

    linux: because a PC is a terrible thing to waste

    +
    auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. - - - - + + + +     \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/opacity_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/opacity_dark/sketch.exp.svg index 800da1e01..bbf55013c 100644 --- a/d2renderers/d2sketch/testdata/opacity_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/opacity_dark/sketch.exp.svg @@ -1,27 +1,27 @@ - + - + + - + + -x

    linux: because a PC is a terrible thing to waste

    -
    auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. +     +    x

    linux: because a PC is a terrible thing to waste

    +
    auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. - - - - + + + +     \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/overlay/sketch.exp.svg b/d2renderers/d2sketch/testdata/overlay/sketch.exp.svg index b82819dfd..e72a51d88 100644 --- a/d2renderers/d2sketch/testdata/overlay/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/overlay/sketch.exp.svg @@ -1,25 +1,25 @@ - + .d2-1329310414 .fill-N1{fill:#0A0F25;} + .d2-1329310414 .fill-N2{fill:#676C7E;} + .d2-1329310414 .fill-N3{fill:#9499AB;} + .d2-1329310414 .fill-N4{fill:#CFD2DD;} + .d2-1329310414 .fill-N5{fill:#DEE1EB;} + .d2-1329310414 .fill-N6{fill:#EEF1F8;} + .d2-1329310414 .fill-N7{fill:#FFFFFF;} + .d2-1329310414 .fill-B1{fill:#0D32B2;} + .d2-1329310414 .fill-B2{fill:#0D32B2;} + .d2-1329310414 .fill-B3{fill:#E3E9FD;} + .d2-1329310414 .fill-B4{fill:#E3E9FD;} + .d2-1329310414 .fill-B5{fill:#EDF0FD;} + .d2-1329310414 .fill-B6{fill:#F7F8FE;} + .d2-1329310414 .fill-AA2{fill:#4A6FF3;} + .d2-1329310414 .fill-AA4{fill:#EDF0FD;} + .d2-1329310414 .fill-AA5{fill:#F7F8FE;} + .d2-1329310414 .fill-AB4{fill:#EDF0FD;} + .d2-1329310414 .fill-AB5{fill:#F7F8FE;} + .d2-1329310414 .stroke-N1{stroke:#0A0F25;} + .d2-1329310414 .stroke-N2{stroke:#676C7E;} + .d2-1329310414 .stroke-N3{stroke:#9499AB;} + .d2-1329310414 .stroke-N4{stroke:#CFD2DD;} + .d2-1329310414 .stroke-N5{stroke:#DEE1EB;} + .d2-1329310414 .stroke-N6{stroke:#EEF1F8;} + .d2-1329310414 .stroke-N7{stroke:#FFFFFF;} + .d2-1329310414 .stroke-B1{stroke:#0D32B2;} + .d2-1329310414 .stroke-B2{stroke:#0D32B2;} + .d2-1329310414 .stroke-B3{stroke:#E3E9FD;} + .d2-1329310414 .stroke-B4{stroke:#E3E9FD;} + .d2-1329310414 .stroke-B5{stroke:#EDF0FD;} + .d2-1329310414 .stroke-B6{stroke:#F7F8FE;} + .d2-1329310414 .stroke-AA2{stroke:#4A6FF3;} + .d2-1329310414 .stroke-AA4{stroke:#EDF0FD;} + .d2-1329310414 .stroke-AA5{stroke:#F7F8FE;} + .d2-1329310414 .stroke-AB4{stroke:#EDF0FD;} + .d2-1329310414 .stroke-AB5{stroke:#F7F8FE;} + .d2-1329310414 .background-color-N1{background-color:#0A0F25;} + .d2-1329310414 .background-color-N2{background-color:#676C7E;} + .d2-1329310414 .background-color-N3{background-color:#9499AB;} + .d2-1329310414 .background-color-N4{background-color:#CFD2DD;} + .d2-1329310414 .background-color-N5{background-color:#DEE1EB;} + .d2-1329310414 .background-color-N6{background-color:#EEF1F8;} + .d2-1329310414 .background-color-N7{background-color:#FFFFFF;} + .d2-1329310414 .background-color-B1{background-color:#0D32B2;} + .d2-1329310414 .background-color-B2{background-color:#0D32B2;} + .d2-1329310414 .background-color-B3{background-color:#E3E9FD;} + .d2-1329310414 .background-color-B4{background-color:#E3E9FD;} + .d2-1329310414 .background-color-B5{background-color:#EDF0FD;} + .d2-1329310414 .background-color-B6{background-color:#F7F8FE;} + .d2-1329310414 .background-color-AA2{background-color:#4A6FF3;} + .d2-1329310414 .background-color-AA4{background-color:#EDF0FD;} + .d2-1329310414 .background-color-AA5{background-color:#F7F8FE;} + .d2-1329310414 .background-color-AB4{background-color:#EDF0FD;} + .d2-1329310414 .background-color-AB5{background-color:#F7F8FE;} + .d2-1329310414 .color-N1{color:#0A0F25;} + .d2-1329310414 .color-N2{color:#676C7E;} + .d2-1329310414 .color-N3{color:#9499AB;} + .d2-1329310414 .color-N4{color:#CFD2DD;} + .d2-1329310414 .color-N5{color:#DEE1EB;} + .d2-1329310414 .color-N6{color:#EEF1F8;} + .d2-1329310414 .color-N7{color:#FFFFFF;} + .d2-1329310414 .color-B1{color:#0D32B2;} + .d2-1329310414 .color-B2{color:#0D32B2;} + .d2-1329310414 .color-B3{color:#E3E9FD;} + .d2-1329310414 .color-B4{color:#E3E9FD;} + .d2-1329310414 .color-B5{color:#EDF0FD;} + .d2-1329310414 .color-B6{color:#F7F8FE;} + .d2-1329310414 .color-AA2{color:#4A6FF3;} + .d2-1329310414 .color-AA4{color:#EDF0FD;} + .d2-1329310414 .color-AA5{color:#F7F8FE;} + .d2-1329310414 .color-AB4{color:#EDF0FD;} + .d2-1329310414 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1329310414);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1329310414);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1329310414);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1329310414);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1329310414);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1329310414);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1329310414);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1329310414);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1329310414);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1329310414);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1329310414);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1329310414);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1329310414);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1329310414);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1329310414);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1329310414);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1329310414);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1329310414);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> - + + - + + - + + -brightnormaldarkdarker + +brightnormaldarkdarker - - - - + + + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/paper-real/sketch.exp.svg b/d2renderers/d2sketch/testdata/paper-real/sketch.exp.svg index caec98ed2..250acb653 100644 --- a/d2renderers/d2sketch/testdata/paper-real/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/paper-real/sketch.exp.svg @@ -1,27 +1,27 @@ - + .d2-1098288612 .fill-N1{fill:#0A0F25;} + .d2-1098288612 .fill-N2{fill:#676C7E;} + .d2-1098288612 .fill-N3{fill:#9499AB;} + .d2-1098288612 .fill-N4{fill:#CFD2DD;} + .d2-1098288612 .fill-N5{fill:#DEE1EB;} + .d2-1098288612 .fill-N6{fill:#EEF1F8;} + .d2-1098288612 .fill-N7{fill:#FFFFFF;} + .d2-1098288612 .fill-B1{fill:#0D32B2;} + .d2-1098288612 .fill-B2{fill:#0D32B2;} + .d2-1098288612 .fill-B3{fill:#E3E9FD;} + .d2-1098288612 .fill-B4{fill:#E3E9FD;} + .d2-1098288612 .fill-B5{fill:#EDF0FD;} + .d2-1098288612 .fill-B6{fill:#F7F8FE;} + .d2-1098288612 .fill-AA2{fill:#4A6FF3;} + .d2-1098288612 .fill-AA4{fill:#EDF0FD;} + .d2-1098288612 .fill-AA5{fill:#F7F8FE;} + .d2-1098288612 .fill-AB4{fill:#EDF0FD;} + .d2-1098288612 .fill-AB5{fill:#F7F8FE;} + .d2-1098288612 .stroke-N1{stroke:#0A0F25;} + .d2-1098288612 .stroke-N2{stroke:#676C7E;} + .d2-1098288612 .stroke-N3{stroke:#9499AB;} + .d2-1098288612 .stroke-N4{stroke:#CFD2DD;} + .d2-1098288612 .stroke-N5{stroke:#DEE1EB;} + .d2-1098288612 .stroke-N6{stroke:#EEF1F8;} + .d2-1098288612 .stroke-N7{stroke:#FFFFFF;} + .d2-1098288612 .stroke-B1{stroke:#0D32B2;} + .d2-1098288612 .stroke-B2{stroke:#0D32B2;} + .d2-1098288612 .stroke-B3{stroke:#E3E9FD;} + .d2-1098288612 .stroke-B4{stroke:#E3E9FD;} + .d2-1098288612 .stroke-B5{stroke:#EDF0FD;} + .d2-1098288612 .stroke-B6{stroke:#F7F8FE;} + .d2-1098288612 .stroke-AA2{stroke:#4A6FF3;} + .d2-1098288612 .stroke-AA4{stroke:#EDF0FD;} + .d2-1098288612 .stroke-AA5{stroke:#F7F8FE;} + .d2-1098288612 .stroke-AB4{stroke:#EDF0FD;} + .d2-1098288612 .stroke-AB5{stroke:#F7F8FE;} + .d2-1098288612 .background-color-N1{background-color:#0A0F25;} + .d2-1098288612 .background-color-N2{background-color:#676C7E;} + .d2-1098288612 .background-color-N3{background-color:#9499AB;} + .d2-1098288612 .background-color-N4{background-color:#CFD2DD;} + .d2-1098288612 .background-color-N5{background-color:#DEE1EB;} + .d2-1098288612 .background-color-N6{background-color:#EEF1F8;} + .d2-1098288612 .background-color-N7{background-color:#FFFFFF;} + .d2-1098288612 .background-color-B1{background-color:#0D32B2;} + .d2-1098288612 .background-color-B2{background-color:#0D32B2;} + .d2-1098288612 .background-color-B3{background-color:#E3E9FD;} + .d2-1098288612 .background-color-B4{background-color:#E3E9FD;} + .d2-1098288612 .background-color-B5{background-color:#EDF0FD;} + .d2-1098288612 .background-color-B6{background-color:#F7F8FE;} + .d2-1098288612 .background-color-AA2{background-color:#4A6FF3;} + .d2-1098288612 .background-color-AA4{background-color:#EDF0FD;} + .d2-1098288612 .background-color-AA5{background-color:#F7F8FE;} + .d2-1098288612 .background-color-AB4{background-color:#EDF0FD;} + .d2-1098288612 .background-color-AB5{background-color:#F7F8FE;} + .d2-1098288612 .color-N1{color:#0A0F25;} + .d2-1098288612 .color-N2{color:#676C7E;} + .d2-1098288612 .color-N3{color:#9499AB;} + .d2-1098288612 .color-N4{color:#CFD2DD;} + .d2-1098288612 .color-N5{color:#DEE1EB;} + .d2-1098288612 .color-N6{color:#EEF1F8;} + .d2-1098288612 .color-N7{color:#FFFFFF;} + .d2-1098288612 .color-B1{color:#0D32B2;} + .d2-1098288612 .color-B2{color:#0D32B2;} + .d2-1098288612 .color-B3{color:#E3E9FD;} + .d2-1098288612 .color-B4{color:#E3E9FD;} + .d2-1098288612 .color-B5{color:#EDF0FD;} + .d2-1098288612 .color-B6{color:#F7F8FE;} + .d2-1098288612 .color-AA2{color:#4A6FF3;} + .d2-1098288612 .color-AA4{color:#EDF0FD;} + .d2-1098288612 .color-AA5{color:#F7F8FE;} + .d2-1098288612 .color-AB4{color:#EDF0FD;} + .d2-1098288612 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1098288612);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1098288612);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1098288612);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1098288612);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1098288612);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1098288612);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1098288612);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1098288612);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1098288612);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1098288612);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1098288612);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1098288612);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1098288612);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1098288612);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1098288612);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1098288612);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1098288612);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1098288612);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> - + + - + + - + + - +}]]> @@ -152,14 +156,14 @@ - + - - + + - + @@ -1205,20 +1209,20 @@ - + -NETWORKCELL TOWERSATELLITESTRANSMITTER SEND SEND SEND +NETWORKCELL TOWERSATELLITESTRANSMITTER SEND SEND SEND - - - - - - - + + + + + + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/root-fill/sketch.exp.svg b/d2renderers/d2sketch/testdata/root-fill/sketch.exp.svg index 83ec80bb8..5cfda53db 100644 --- a/d2renderers/d2sketch/testdata/root-fill/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/root-fill/sketch.exp.svg @@ -1,20 +1,20 @@ - + - + + - + + - + + -Flow-I (Warehousing, Installation)OEM FactoryOEM WarehouseDistributor Warehousecompany WarehouseMasterRegional-1Regional-2Regional-N

    company Warehouse

    + +Flow-I (Warehousing, Installation)OEM FactoryOEM WarehouseDistributor Warehousecompany WarehouseMasterRegional-1Regional-2Regional-N

    company Warehouse

    • Asset Tagging
    • Inventory
    • Staging
    • Dispatch to Site
    -
     +
     - - - - - - - - - - + + + + + + + + + +     \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/sql_tables/sketch.exp.svg b/d2renderers/d2sketch/testdata/sql_tables/sketch.exp.svg index 574da66ad..507c94fb4 100644 --- a/d2renderers/d2sketch/testdata/sql_tables/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/sql_tables/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-969420030 .fill-N1{fill:#0A0F25;} + .d2-969420030 .fill-N2{fill:#676C7E;} + .d2-969420030 .fill-N3{fill:#9499AB;} + .d2-969420030 .fill-N4{fill:#CFD2DD;} + .d2-969420030 .fill-N5{fill:#DEE1EB;} + .d2-969420030 .fill-N6{fill:#EEF1F8;} + .d2-969420030 .fill-N7{fill:#FFFFFF;} + .d2-969420030 .fill-B1{fill:#0D32B2;} + .d2-969420030 .fill-B2{fill:#0D32B2;} + .d2-969420030 .fill-B3{fill:#E3E9FD;} + .d2-969420030 .fill-B4{fill:#E3E9FD;} + .d2-969420030 .fill-B5{fill:#EDF0FD;} + .d2-969420030 .fill-B6{fill:#F7F8FE;} + .d2-969420030 .fill-AA2{fill:#4A6FF3;} + .d2-969420030 .fill-AA4{fill:#EDF0FD;} + .d2-969420030 .fill-AA5{fill:#F7F8FE;} + .d2-969420030 .fill-AB4{fill:#EDF0FD;} + .d2-969420030 .fill-AB5{fill:#F7F8FE;} + .d2-969420030 .stroke-N1{stroke:#0A0F25;} + .d2-969420030 .stroke-N2{stroke:#676C7E;} + .d2-969420030 .stroke-N3{stroke:#9499AB;} + .d2-969420030 .stroke-N4{stroke:#CFD2DD;} + .d2-969420030 .stroke-N5{stroke:#DEE1EB;} + .d2-969420030 .stroke-N6{stroke:#EEF1F8;} + .d2-969420030 .stroke-N7{stroke:#FFFFFF;} + .d2-969420030 .stroke-B1{stroke:#0D32B2;} + .d2-969420030 .stroke-B2{stroke:#0D32B2;} + .d2-969420030 .stroke-B3{stroke:#E3E9FD;} + .d2-969420030 .stroke-B4{stroke:#E3E9FD;} + .d2-969420030 .stroke-B5{stroke:#EDF0FD;} + .d2-969420030 .stroke-B6{stroke:#F7F8FE;} + .d2-969420030 .stroke-AA2{stroke:#4A6FF3;} + .d2-969420030 .stroke-AA4{stroke:#EDF0FD;} + .d2-969420030 .stroke-AA5{stroke:#F7F8FE;} + .d2-969420030 .stroke-AB4{stroke:#EDF0FD;} + .d2-969420030 .stroke-AB5{stroke:#F7F8FE;} + .d2-969420030 .background-color-N1{background-color:#0A0F25;} + .d2-969420030 .background-color-N2{background-color:#676C7E;} + .d2-969420030 .background-color-N3{background-color:#9499AB;} + .d2-969420030 .background-color-N4{background-color:#CFD2DD;} + .d2-969420030 .background-color-N5{background-color:#DEE1EB;} + .d2-969420030 .background-color-N6{background-color:#EEF1F8;} + .d2-969420030 .background-color-N7{background-color:#FFFFFF;} + .d2-969420030 .background-color-B1{background-color:#0D32B2;} + .d2-969420030 .background-color-B2{background-color:#0D32B2;} + .d2-969420030 .background-color-B3{background-color:#E3E9FD;} + .d2-969420030 .background-color-B4{background-color:#E3E9FD;} + .d2-969420030 .background-color-B5{background-color:#EDF0FD;} + .d2-969420030 .background-color-B6{background-color:#F7F8FE;} + .d2-969420030 .background-color-AA2{background-color:#4A6FF3;} + .d2-969420030 .background-color-AA4{background-color:#EDF0FD;} + .d2-969420030 .background-color-AA5{background-color:#F7F8FE;} + .d2-969420030 .background-color-AB4{background-color:#EDF0FD;} + .d2-969420030 .background-color-AB5{background-color:#F7F8FE;} + .d2-969420030 .color-N1{color:#0A0F25;} + .d2-969420030 .color-N2{color:#676C7E;} + .d2-969420030 .color-N3{color:#9499AB;} + .d2-969420030 .color-N4{color:#CFD2DD;} + .d2-969420030 .color-N5{color:#DEE1EB;} + .d2-969420030 .color-N6{color:#EEF1F8;} + .d2-969420030 .color-N7{color:#FFFFFF;} + .d2-969420030 .color-B1{color:#0D32B2;} + .d2-969420030 .color-B2{color:#0D32B2;} + .d2-969420030 .color-B3{color:#E3E9FD;} + .d2-969420030 .color-B4{color:#E3E9FD;} + .d2-969420030 .color-B5{color:#EDF0FD;} + .d2-969420030 .color-B6{color:#F7F8FE;} + .d2-969420030 .color-AA2{color:#4A6FF3;} + .d2-969420030 .color-AA4{color:#EDF0FD;} + .d2-969420030 .color-AA5{color:#F7F8FE;} + .d2-969420030 .color-AB4{color:#EDF0FD;} + .d2-969420030 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-969420030);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-969420030);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-969420030);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-969420030);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-969420030);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-969420030);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-969420030);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-969420030);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-969420030);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-969420030);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-969420030);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-969420030);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-969420030);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-969420030);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-969420030);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-969420030);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-969420030);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-969420030);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> - + + - + + - + + -usersidintnamestringemailstringpasswordstringlast_logindatetimeproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringPKstatusstring + +usersidintnamestringemailstringpasswordstringlast_logindatetimeproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringPKstatusstring \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/sql_tables_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/sql_tables_dark/sketch.exp.svg index 451f4f9e4..a6ce5cd30 100644 --- a/d2renderers/d2sketch/testdata/sql_tables_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/sql_tables_dark/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-461855320 .fill-N1{fill:#CDD6F4;} + .d2-461855320 .fill-N2{fill:#BAC2DE;} + .d2-461855320 .fill-N3{fill:#A6ADC8;} + .d2-461855320 .fill-N4{fill:#585B70;} + .d2-461855320 .fill-N5{fill:#45475A;} + .d2-461855320 .fill-N6{fill:#313244;} + .d2-461855320 .fill-N7{fill:#1E1E2E;} + .d2-461855320 .fill-B1{fill:#CBA6f7;} + .d2-461855320 .fill-B2{fill:#CBA6f7;} + .d2-461855320 .fill-B3{fill:#6C7086;} + .d2-461855320 .fill-B4{fill:#585B70;} + .d2-461855320 .fill-B5{fill:#45475A;} + .d2-461855320 .fill-B6{fill:#313244;} + .d2-461855320 .fill-AA2{fill:#f38BA8;} + .d2-461855320 .fill-AA4{fill:#45475A;} + .d2-461855320 .fill-AA5{fill:#313244;} + .d2-461855320 .fill-AB4{fill:#45475A;} + .d2-461855320 .fill-AB5{fill:#313244;} + .d2-461855320 .stroke-N1{stroke:#CDD6F4;} + .d2-461855320 .stroke-N2{stroke:#BAC2DE;} + .d2-461855320 .stroke-N3{stroke:#A6ADC8;} + .d2-461855320 .stroke-N4{stroke:#585B70;} + .d2-461855320 .stroke-N5{stroke:#45475A;} + .d2-461855320 .stroke-N6{stroke:#313244;} + .d2-461855320 .stroke-N7{stroke:#1E1E2E;} + .d2-461855320 .stroke-B1{stroke:#CBA6f7;} + .d2-461855320 .stroke-B2{stroke:#CBA6f7;} + .d2-461855320 .stroke-B3{stroke:#6C7086;} + .d2-461855320 .stroke-B4{stroke:#585B70;} + .d2-461855320 .stroke-B5{stroke:#45475A;} + .d2-461855320 .stroke-B6{stroke:#313244;} + .d2-461855320 .stroke-AA2{stroke:#f38BA8;} + .d2-461855320 .stroke-AA4{stroke:#45475A;} + .d2-461855320 .stroke-AA5{stroke:#313244;} + .d2-461855320 .stroke-AB4{stroke:#45475A;} + .d2-461855320 .stroke-AB5{stroke:#313244;} + .d2-461855320 .background-color-N1{background-color:#CDD6F4;} + .d2-461855320 .background-color-N2{background-color:#BAC2DE;} + .d2-461855320 .background-color-N3{background-color:#A6ADC8;} + .d2-461855320 .background-color-N4{background-color:#585B70;} + .d2-461855320 .background-color-N5{background-color:#45475A;} + .d2-461855320 .background-color-N6{background-color:#313244;} + .d2-461855320 .background-color-N7{background-color:#1E1E2E;} + .d2-461855320 .background-color-B1{background-color:#CBA6f7;} + .d2-461855320 .background-color-B2{background-color:#CBA6f7;} + .d2-461855320 .background-color-B3{background-color:#6C7086;} + .d2-461855320 .background-color-B4{background-color:#585B70;} + .d2-461855320 .background-color-B5{background-color:#45475A;} + .d2-461855320 .background-color-B6{background-color:#313244;} + .d2-461855320 .background-color-AA2{background-color:#f38BA8;} + .d2-461855320 .background-color-AA4{background-color:#45475A;} + .d2-461855320 .background-color-AA5{background-color:#313244;} + .d2-461855320 .background-color-AB4{background-color:#45475A;} + .d2-461855320 .background-color-AB5{background-color:#313244;} + .d2-461855320 .color-N1{color:#CDD6F4;} + .d2-461855320 .color-N2{color:#BAC2DE;} + .d2-461855320 .color-N3{color:#A6ADC8;} + .d2-461855320 .color-N4{color:#585B70;} + .d2-461855320 .color-N5{color:#45475A;} + .d2-461855320 .color-N6{color:#313244;} + .d2-461855320 .color-N7{color:#1E1E2E;} + .d2-461855320 .color-B1{color:#CBA6f7;} + .d2-461855320 .color-B2{color:#CBA6f7;} + .d2-461855320 .color-B3{color:#6C7086;} + .d2-461855320 .color-B4{color:#585B70;} + .d2-461855320 .color-B5{color:#45475A;} + .d2-461855320 .color-B6{color:#313244;} + .d2-461855320 .color-AA2{color:#f38BA8;} + .d2-461855320 .color-AA4{color:#45475A;} + .d2-461855320 .color-AA5{color:#313244;} + .d2-461855320 .color-AB4{color:#45475A;} + .d2-461855320 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal-d2-461855320);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal-d2-461855320);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark-d2-461855320);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark-d2-461855320);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker-d2-461855320);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker-d2-461855320);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal-d2-461855320);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker-d2-461855320);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker-d2-461855320);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker-d2-461855320);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker-d2-461855320);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal-d2-461855320);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal-d2-461855320);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal-d2-461855320);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark-d2-461855320);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker-d2-461855320);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker-d2-461855320);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker-d2-461855320);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]> - + + - + + -usersidintnamestringemailstringpasswordstringlast_logindatetimeproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringPKstatusstring + +usersidintnamestringemailstringpasswordstringlast_logindatetimeproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringPKstatusstring \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/terminal/sketch.exp.svg b/d2renderers/d2sketch/testdata/terminal/sketch.exp.svg index d6a186312..ad191f562 100644 --- a/d2renderers/d2sketch/testdata/terminal/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/terminal/sketch.exp.svg @@ -1,23 +1,23 @@ - + .d2-1686735354 .fill-N1{fill:#000410;} + .d2-1686735354 .fill-N2{fill:#0000B8;} + .d2-1686735354 .fill-N3{fill:#9499AB;} + .d2-1686735354 .fill-N4{fill:#CFD2DD;} + .d2-1686735354 .fill-N5{fill:#C3DEF3;} + .d2-1686735354 .fill-N6{fill:#EEF1F8;} + .d2-1686735354 .fill-N7{fill:#FFFFFF;} + .d2-1686735354 .fill-B1{fill:#000410;} + .d2-1686735354 .fill-B2{fill:#0000E4;} + .d2-1686735354 .fill-B3{fill:#5AA4DC;} + .d2-1686735354 .fill-B4{fill:#E7E9EE;} + .d2-1686735354 .fill-B5{fill:#F5F6F9;} + .d2-1686735354 .fill-B6{fill:#FFFFFF;} + .d2-1686735354 .fill-AA2{fill:#008566;} + .d2-1686735354 .fill-AA4{fill:#45BBA5;} + .d2-1686735354 .fill-AA5{fill:#7ACCBD;} + .d2-1686735354 .fill-AB4{fill:#F1C759;} + .d2-1686735354 .fill-AB5{fill:#F9E088;} + .d2-1686735354 .stroke-N1{stroke:#000410;} + .d2-1686735354 .stroke-N2{stroke:#0000B8;} + .d2-1686735354 .stroke-N3{stroke:#9499AB;} + .d2-1686735354 .stroke-N4{stroke:#CFD2DD;} + .d2-1686735354 .stroke-N5{stroke:#C3DEF3;} + .d2-1686735354 .stroke-N6{stroke:#EEF1F8;} + .d2-1686735354 .stroke-N7{stroke:#FFFFFF;} + .d2-1686735354 .stroke-B1{stroke:#000410;} + .d2-1686735354 .stroke-B2{stroke:#0000E4;} + .d2-1686735354 .stroke-B3{stroke:#5AA4DC;} + .d2-1686735354 .stroke-B4{stroke:#E7E9EE;} + .d2-1686735354 .stroke-B5{stroke:#F5F6F9;} + .d2-1686735354 .stroke-B6{stroke:#FFFFFF;} + .d2-1686735354 .stroke-AA2{stroke:#008566;} + .d2-1686735354 .stroke-AA4{stroke:#45BBA5;} + .d2-1686735354 .stroke-AA5{stroke:#7ACCBD;} + .d2-1686735354 .stroke-AB4{stroke:#F1C759;} + .d2-1686735354 .stroke-AB5{stroke:#F9E088;} + .d2-1686735354 .background-color-N1{background-color:#000410;} + .d2-1686735354 .background-color-N2{background-color:#0000B8;} + .d2-1686735354 .background-color-N3{background-color:#9499AB;} + .d2-1686735354 .background-color-N4{background-color:#CFD2DD;} + .d2-1686735354 .background-color-N5{background-color:#C3DEF3;} + .d2-1686735354 .background-color-N6{background-color:#EEF1F8;} + .d2-1686735354 .background-color-N7{background-color:#FFFFFF;} + .d2-1686735354 .background-color-B1{background-color:#000410;} + .d2-1686735354 .background-color-B2{background-color:#0000E4;} + .d2-1686735354 .background-color-B3{background-color:#5AA4DC;} + .d2-1686735354 .background-color-B4{background-color:#E7E9EE;} + .d2-1686735354 .background-color-B5{background-color:#F5F6F9;} + .d2-1686735354 .background-color-B6{background-color:#FFFFFF;} + .d2-1686735354 .background-color-AA2{background-color:#008566;} + .d2-1686735354 .background-color-AA4{background-color:#45BBA5;} + .d2-1686735354 .background-color-AA5{background-color:#7ACCBD;} + .d2-1686735354 .background-color-AB4{background-color:#F1C759;} + .d2-1686735354 .background-color-AB5{background-color:#F9E088;} + .d2-1686735354 .color-N1{color:#000410;} + .d2-1686735354 .color-N2{color:#0000B8;} + .d2-1686735354 .color-N3{color:#9499AB;} + .d2-1686735354 .color-N4{color:#CFD2DD;} + .d2-1686735354 .color-N5{color:#C3DEF3;} + .d2-1686735354 .color-N6{color:#EEF1F8;} + .d2-1686735354 .color-N7{color:#FFFFFF;} + .d2-1686735354 .color-B1{color:#000410;} + .d2-1686735354 .color-B2{color:#0000E4;} + .d2-1686735354 .color-B3{color:#5AA4DC;} + .d2-1686735354 .color-B4{color:#E7E9EE;} + .d2-1686735354 .color-B5{color:#F5F6F9;} + .d2-1686735354 .color-B6{color:#FFFFFF;} + .d2-1686735354 .color-AA2{color:#008566;} + .d2-1686735354 .color-AA4{color:#45BBA5;} + .d2-1686735354 .color-AA5{color:#7ACCBD;} + .d2-1686735354 .color-AB4{color:#F1C759;} + .d2-1686735354 .color-AB5{color:#F9E088;}.appendix text.text{fill:#000410}.md{--color-fg-default:#000410;--color-fg-muted:#0000B8;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#000410;--color-border-muted:#0000E4;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0000E4;--color-accent-emphasis:#0000E4;--color-attention-subtle:#0000B8;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1686735354);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1686735354);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-normal-d2-1686735354);mix-blend-mode:color-burn}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1686735354);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1686735354);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1686735354);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1686735354);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-normal-d2-1686735354);mix-blend-mode:color-burn}.sketch-overlay-AA5{fill:url(#streaks-normal-d2-1686735354);mix-blend-mode:color-burn}.sketch-overlay-AB4{fill:url(#streaks-normal-d2-1686735354);mix-blend-mode:color-burn}.sketch-overlay-AB5{fill:url(#streaks-normal-d2-1686735354);mix-blend-mode:color-burn}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1686735354);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-darker-d2-1686735354);mix-blend-mode:lighten}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1686735354);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1686735354);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-normal-d2-1686735354);mix-blend-mode:color-burn}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1686735354);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1686735354);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> - + + - + + - + + - +}]]> @@ -144,25 +148,25 @@ -NETWORKUSERAPI SERVERLOGSCELL TOWERONLINE PORTALDATA PROCESSORSATELLITESTRANSMITTERUISTORAGE SEND SEND SEND PHONE LOGS MAKE CALL ACCESS DISPLAY PERSIST +NETWORKUSERAPI SERVERLOGSCELL TOWERONLINE PORTALDATA PROCESSORSATELLITESTRANSMITTERUISTORAGE SEND SEND SEND PHONE LOGS MAKE CALL ACCESS DISPLAY PERSIST - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/test-gradient-fill-values-in-sketch-mode/sketch.exp.svg b/d2renderers/d2sketch/testdata/test-gradient-fill-values-in-sketch-mode/sketch.exp.svg new file mode 100644 index 000000000..daee7d9d2 --- /dev/null +++ b/d2renderers/d2sketch/testdata/test-gradient-fill-values-in-sketch-mode/sketch.exp.svg @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + +xy + + + + \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/twitter/sketch.exp.svg b/d2renderers/d2sketch/testdata/twitter/sketch.exp.svg index 3080e4676..b39a90d5d 100644 --- a/d2renderers/d2sketch/testdata/twitter/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/twitter/sketch.exp.svg @@ -1,35 +1,35 @@ - + - + + - + + - + + -People discovery serviceAd mixerOnboarding serviceTwitter Frontend WebIphoneAndroidTimelineScorerHome RankerTimeline ServiceHome mixerManhattanGizmoduckSocial graphTweety PiePrediction ServiceHome ScorerManhattanMemcacheFetchFeatureScoringPrediction Service...etc

    Timeline mixer

    + +People discovery serviceAd mixerOnboarding serviceTwitter Frontend WebIphoneAndroidTimelineScorerHome RankerTimeline ServiceHome mixerManhattanGizmoduckSocial graphTweety PiePrediction ServiceHome ScorerManhattanMemcacheFetchFeatureScoringPrediction Service...etc

    Timeline mixer

    • Inject ads, who-to-follow, onboarding
    • Conversation module
      • @@ -867,46 +870,46 @@
    • Tweat deduplication
    • Served data logging
    -
    GraphQLFederated Strato Column

    Tweet/user content hydration, visibility filtering

    -
    TLS-API (being deprecated)CrMixerEarlyBirdUtagSpaceCommunities iPhone web HTTP Android Thrift RPC Candidate Fetch Feature Hydration Candidate sources +
    GraphQLFederated Strato Column

    Tweet/user content hydration, visibility filtering

    +
    TLS-API (being deprecated)CrMixerEarlyBirdUtagSpaceCommunities iPhone web HTTP Android Thrift RPC Candidate Fetch Feature Hydration Candidate sources - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +     \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/twitter_dark/sketch.exp.svg b/d2renderers/d2sketch/testdata/twitter_dark/sketch.exp.svg index 8844589db..f89cb16ce 100644 --- a/d2renderers/d2sketch/testdata/twitter_dark/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/twitter_dark/sketch.exp.svg @@ -1,35 +1,35 @@ - + - + + - + + - + + -People discovery serviceAd mixerOnboarding serviceTwitter Frontend WebIphoneAndroidTimelineScorerHome RankerTimeline ServiceHome mixerManhattanGizmoduckSocial graphTweety PiePrediction ServiceHome ScorerManhattanMemcacheFetchFeatureScoringPrediction Service...etc

    Timeline mixer

    + +People discovery serviceAd mixerOnboarding serviceTwitter Frontend WebIphoneAndroidTimelineScorerHome RankerTimeline ServiceHome mixerManhattanGizmoduckSocial graphTweety PiePrediction ServiceHome ScorerManhattanMemcacheFetchFeatureScoringPrediction Service...etc

    Timeline mixer

    • Inject ads, who-to-follow, onboarding
    • Conversation module
      • @@ -867,46 +870,46 @@
    • Tweat deduplication
    • Served data logging
    -
    GraphQLFederated Strato Column

    Tweet/user content hydration, visibility filtering

    -
    TLS-API (being deprecated)CrMixerEarlyBirdUtagSpaceCommunities iPhone web HTTP Android Thrift RPC Candidate Fetch Feature Hydration Candidate sources +
    GraphQLFederated Strato Column

    Tweet/user content hydration, visibility filtering

    +
    TLS-API (being deprecated)CrMixerEarlyBirdUtagSpaceCommunities iPhone web HTTP Android Thrift RPC Candidate Fetch Feature Hydration Candidate sources - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +     \ No newline at end of file diff --git a/d2renderers/d2sketch/testdata/unfilled_triangle/sketch.exp.svg b/d2renderers/d2sketch/testdata/unfilled_triangle/sketch.exp.svg index 5c6b30285..7eac4f3d0 100644 --- a/d2renderers/d2sketch/testdata/unfilled_triangle/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/unfilled_triangle/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-2558762960 .fill-N1{fill:#0A0F25;} + .d2-2558762960 .fill-N2{fill:#676C7E;} + .d2-2558762960 .fill-N3{fill:#9499AB;} + .d2-2558762960 .fill-N4{fill:#CFD2DD;} + .d2-2558762960 .fill-N5{fill:#DEE1EB;} + .d2-2558762960 .fill-N6{fill:#EEF1F8;} + .d2-2558762960 .fill-N7{fill:#FFFFFF;} + .d2-2558762960 .fill-B1{fill:#0D32B2;} + .d2-2558762960 .fill-B2{fill:#0D32B2;} + .d2-2558762960 .fill-B3{fill:#E3E9FD;} + .d2-2558762960 .fill-B4{fill:#E3E9FD;} + .d2-2558762960 .fill-B5{fill:#EDF0FD;} + .d2-2558762960 .fill-B6{fill:#F7F8FE;} + .d2-2558762960 .fill-AA2{fill:#4A6FF3;} + .d2-2558762960 .fill-AA4{fill:#EDF0FD;} + .d2-2558762960 .fill-AA5{fill:#F7F8FE;} + .d2-2558762960 .fill-AB4{fill:#EDF0FD;} + .d2-2558762960 .fill-AB5{fill:#F7F8FE;} + .d2-2558762960 .stroke-N1{stroke:#0A0F25;} + .d2-2558762960 .stroke-N2{stroke:#676C7E;} + .d2-2558762960 .stroke-N3{stroke:#9499AB;} + .d2-2558762960 .stroke-N4{stroke:#CFD2DD;} + .d2-2558762960 .stroke-N5{stroke:#DEE1EB;} + .d2-2558762960 .stroke-N6{stroke:#EEF1F8;} + .d2-2558762960 .stroke-N7{stroke:#FFFFFF;} + .d2-2558762960 .stroke-B1{stroke:#0D32B2;} + .d2-2558762960 .stroke-B2{stroke:#0D32B2;} + .d2-2558762960 .stroke-B3{stroke:#E3E9FD;} + .d2-2558762960 .stroke-B4{stroke:#E3E9FD;} + .d2-2558762960 .stroke-B5{stroke:#EDF0FD;} + .d2-2558762960 .stroke-B6{stroke:#F7F8FE;} + .d2-2558762960 .stroke-AA2{stroke:#4A6FF3;} + .d2-2558762960 .stroke-AA4{stroke:#EDF0FD;} + .d2-2558762960 .stroke-AA5{stroke:#F7F8FE;} + .d2-2558762960 .stroke-AB4{stroke:#EDF0FD;} + .d2-2558762960 .stroke-AB5{stroke:#F7F8FE;} + .d2-2558762960 .background-color-N1{background-color:#0A0F25;} + .d2-2558762960 .background-color-N2{background-color:#676C7E;} + .d2-2558762960 .background-color-N3{background-color:#9499AB;} + .d2-2558762960 .background-color-N4{background-color:#CFD2DD;} + .d2-2558762960 .background-color-N5{background-color:#DEE1EB;} + .d2-2558762960 .background-color-N6{background-color:#EEF1F8;} + .d2-2558762960 .background-color-N7{background-color:#FFFFFF;} + .d2-2558762960 .background-color-B1{background-color:#0D32B2;} + .d2-2558762960 .background-color-B2{background-color:#0D32B2;} + .d2-2558762960 .background-color-B3{background-color:#E3E9FD;} + .d2-2558762960 .background-color-B4{background-color:#E3E9FD;} + .d2-2558762960 .background-color-B5{background-color:#EDF0FD;} + .d2-2558762960 .background-color-B6{background-color:#F7F8FE;} + .d2-2558762960 .background-color-AA2{background-color:#4A6FF3;} + .d2-2558762960 .background-color-AA4{background-color:#EDF0FD;} + .d2-2558762960 .background-color-AA5{background-color:#F7F8FE;} + .d2-2558762960 .background-color-AB4{background-color:#EDF0FD;} + .d2-2558762960 .background-color-AB5{background-color:#F7F8FE;} + .d2-2558762960 .color-N1{color:#0A0F25;} + .d2-2558762960 .color-N2{color:#676C7E;} + .d2-2558762960 .color-N3{color:#9499AB;} + .d2-2558762960 .color-N4{color:#CFD2DD;} + .d2-2558762960 .color-N5{color:#DEE1EB;} + .d2-2558762960 .color-N6{color:#EEF1F8;} + .d2-2558762960 .color-N7{color:#FFFFFF;} + .d2-2558762960 .color-B1{color:#0D32B2;} + .d2-2558762960 .color-B2{color:#0D32B2;} + .d2-2558762960 .color-B3{color:#E3E9FD;} + .d2-2558762960 .color-B4{color:#E3E9FD;} + .d2-2558762960 .color-B5{color:#EDF0FD;} + .d2-2558762960 .color-B6{color:#F7F8FE;} + .d2-2558762960 .color-AA2{color:#4A6FF3;} + .d2-2558762960 .color-AA4{color:#EDF0FD;} + .d2-2558762960 .color-AA5{color:#F7F8FE;} + .d2-2558762960 .color-AB4{color:#EDF0FD;} + .d2-2558762960 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2558762960);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2558762960);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2558762960);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2558762960);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2558762960);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2558762960);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2558762960);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2558762960);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2558762960);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2558762960);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2558762960);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2558762960);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2558762960);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2558762960);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2558762960);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2558762960);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2558762960);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2558762960);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> - + + - + + - + + -ABCD default triangle + +ABCD default triangle - - - - - - + + + + + + \ No newline at end of file diff --git a/d2renderers/d2svg/appendix/appendix.go b/d2renderers/d2svg/appendix/appendix.go index 990739bc3..28b416284 100644 --- a/d2renderers/d2svg/appendix/appendix.go +++ b/d2renderers/d2svg/appendix/appendix.go @@ -17,6 +17,7 @@ import ( "oss.terrastruct.com/d2/d2target" "oss.terrastruct.com/d2/d2themes" "oss.terrastruct.com/d2/lib/color" + svglib "oss.terrastruct.com/d2/lib/svg" "oss.terrastruct.com/d2/lib/textmeasure" "oss.terrastruct.com/util-go/go2" ) @@ -62,7 +63,7 @@ func FindViewboxSlice(svg []byte) []string { return strings.Split(viewboxRaw, " ") } -func Append(diagram *d2target.Diagram, ruler *textmeasure.Ruler, in []byte) []byte { +func Append(diagram *d2target.Diagram, renderOpts *d2svg.RenderOpts, ruler *textmeasure.Ruler, in []byte) []byte { svg := string(in) appendix, w, h := generateAppendix(diagram, ruler, svg) @@ -176,15 +177,23 @@ func Append(diagram *d2target.Diagram, ruler *textmeasure.Ruler, in []byte) []by return renderOrder[i].shape.Level < renderOrder[j].shape.Level }) + var salt *string + if renderOpts != nil { + salt = renderOpts.Salt + } + diagramHash, err := diagram.HashID(salt) + if err != nil { + return nil + } // replace each rendered svg icon for _, icon := range renderOrder { // The clip-path has a unique ID, so this won't replace any user icons // In the existing SVG, the transform places it top-left, so we adjust var iconStr string if icon.isTooltip { - iconStr = d2svg.TooltipIcon + iconStr = fmt.Sprintf(d2svg.TooltipIcon, diagramHash, svglib.SVGID(icon.shape.ID)) } else { - iconStr = d2svg.LinkIcon + iconStr = fmt.Sprintf(d2svg.LinkIcon, diagramHash, svglib.SVGID(icon.shape.ID)) } svg = strings.Replace(svg, iconStr, generateNumberedIcon(icon.number, 0, ICON_RADIUS), 1) } diff --git a/d2renderers/d2svg/appendix/appendix_test.go b/d2renderers/d2svg/appendix/appendix_test.go index 7752e2d2f..9b0bbd1ba 100644 --- a/d2renderers/d2svg/appendix/appendix_test.go +++ b/d2renderers/d2svg/appendix/appendix_test.go @@ -3,7 +3,6 @@ package appendix_test import ( "context" "encoding/xml" - "io/ioutil" "log/slog" "os" "path/filepath" @@ -172,11 +171,11 @@ func run(t *testing.T, tc testCase) { svgBytes, err := d2svg.Render(diagram, renderOpts) assert.Success(t, err) - svgBytes = appendix.Append(diagram, ruler, svgBytes) + svgBytes = appendix.Append(diagram, nil, ruler, svgBytes) err = os.MkdirAll(dataPath, 0755) assert.Success(t, err) - err = ioutil.WriteFile(pathGotSVG, svgBytes, 0600) + err = os.WriteFile(pathGotSVG, svgBytes, 0600) assert.Success(t, err) defer os.Remove(pathGotSVG) diff --git a/d2renderers/d2svg/appendix/testdata/diagram_wider_than_tooltip/sketch.exp.svg b/d2renderers/d2svg/appendix/testdata/diagram_wider_than_tooltip/sketch.exp.svg index 6af36fa6e..a5210c778 100644 --- a/d2renderers/d2svg/appendix/testdata/diagram_wider_than_tooltip/sketch.exp.svg +++ b/d2renderers/d2svg/appendix/testdata/diagram_wider_than_tooltip/sketch.exp.svg @@ -1,19 +1,19 @@ -customerissuerstoreLike starbucks or somethingacquirerI'm not sure what this isnetworkcustomer bankstore bankinitial transactionpayment processor behind the scenessimplified 1 banana please$10 dollarsthinking: wow, inflationchecks bank accountSavings: $11I can do that, here's my cardRun this cardProcess to card issuerProcess this payment$10 debit$10 creditAn error in judgement is about to occurLike starbucks or something1I'm not sure what this is2 - - - - - - - - - - - - - - - - - - - - - - - -1Like starbucks or something + .d2-3396834249 .fill-N1{fill:#0A0F25;} + .d2-3396834249 .fill-N2{fill:#676C7E;} + .d2-3396834249 .fill-N3{fill:#9499AB;} + .d2-3396834249 .fill-N4{fill:#CFD2DD;} + .d2-3396834249 .fill-N5{fill:#DEE1EB;} + .d2-3396834249 .fill-N6{fill:#EEF1F8;} + .d2-3396834249 .fill-N7{fill:#FFFFFF;} + .d2-3396834249 .fill-B1{fill:#0D32B2;} + .d2-3396834249 .fill-B2{fill:#0D32B2;} + .d2-3396834249 .fill-B3{fill:#E3E9FD;} + .d2-3396834249 .fill-B4{fill:#E3E9FD;} + .d2-3396834249 .fill-B5{fill:#EDF0FD;} + .d2-3396834249 .fill-B6{fill:#F7F8FE;} + .d2-3396834249 .fill-AA2{fill:#4A6FF3;} + .d2-3396834249 .fill-AA4{fill:#EDF0FD;} + .d2-3396834249 .fill-AA5{fill:#F7F8FE;} + .d2-3396834249 .fill-AB4{fill:#EDF0FD;} + .d2-3396834249 .fill-AB5{fill:#F7F8FE;} + .d2-3396834249 .stroke-N1{stroke:#0A0F25;} + .d2-3396834249 .stroke-N2{stroke:#676C7E;} + .d2-3396834249 .stroke-N3{stroke:#9499AB;} + .d2-3396834249 .stroke-N4{stroke:#CFD2DD;} + .d2-3396834249 .stroke-N5{stroke:#DEE1EB;} + .d2-3396834249 .stroke-N6{stroke:#EEF1F8;} + .d2-3396834249 .stroke-N7{stroke:#FFFFFF;} + .d2-3396834249 .stroke-B1{stroke:#0D32B2;} + .d2-3396834249 .stroke-B2{stroke:#0D32B2;} + .d2-3396834249 .stroke-B3{stroke:#E3E9FD;} + .d2-3396834249 .stroke-B4{stroke:#E3E9FD;} + .d2-3396834249 .stroke-B5{stroke:#EDF0FD;} + .d2-3396834249 .stroke-B6{stroke:#F7F8FE;} + .d2-3396834249 .stroke-AA2{stroke:#4A6FF3;} + .d2-3396834249 .stroke-AA4{stroke:#EDF0FD;} + .d2-3396834249 .stroke-AA5{stroke:#F7F8FE;} + .d2-3396834249 .stroke-AB4{stroke:#EDF0FD;} + .d2-3396834249 .stroke-AB5{stroke:#F7F8FE;} + .d2-3396834249 .background-color-N1{background-color:#0A0F25;} + .d2-3396834249 .background-color-N2{background-color:#676C7E;} + .d2-3396834249 .background-color-N3{background-color:#9499AB;} + .d2-3396834249 .background-color-N4{background-color:#CFD2DD;} + .d2-3396834249 .background-color-N5{background-color:#DEE1EB;} + .d2-3396834249 .background-color-N6{background-color:#EEF1F8;} + .d2-3396834249 .background-color-N7{background-color:#FFFFFF;} + .d2-3396834249 .background-color-B1{background-color:#0D32B2;} + .d2-3396834249 .background-color-B2{background-color:#0D32B2;} + .d2-3396834249 .background-color-B3{background-color:#E3E9FD;} + .d2-3396834249 .background-color-B4{background-color:#E3E9FD;} + .d2-3396834249 .background-color-B5{background-color:#EDF0FD;} + .d2-3396834249 .background-color-B6{background-color:#F7F8FE;} + .d2-3396834249 .background-color-AA2{background-color:#4A6FF3;} + .d2-3396834249 .background-color-AA4{background-color:#EDF0FD;} + .d2-3396834249 .background-color-AA5{background-color:#F7F8FE;} + .d2-3396834249 .background-color-AB4{background-color:#EDF0FD;} + .d2-3396834249 .background-color-AB5{background-color:#F7F8FE;} + .d2-3396834249 .color-N1{color:#0A0F25;} + .d2-3396834249 .color-N2{color:#676C7E;} + .d2-3396834249 .color-N3{color:#9499AB;} + .d2-3396834249 .color-N4{color:#CFD2DD;} + .d2-3396834249 .color-N5{color:#DEE1EB;} + .d2-3396834249 .color-N6{color:#EEF1F8;} + .d2-3396834249 .color-N7{color:#FFFFFF;} + .d2-3396834249 .color-B1{color:#0D32B2;} + .d2-3396834249 .color-B2{color:#0D32B2;} + .d2-3396834249 .color-B3{color:#E3E9FD;} + .d2-3396834249 .color-B4{color:#E3E9FD;} + .d2-3396834249 .color-B5{color:#EDF0FD;} + .d2-3396834249 .color-B6{color:#F7F8FE;} + .d2-3396834249 .color-AA2{color:#4A6FF3;} + .d2-3396834249 .color-AA4{color:#EDF0FD;} + .d2-3396834249 .color-AA5{color:#F7F8FE;} + .d2-3396834249 .color-AB4{color:#EDF0FD;} + .d2-3396834249 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3396834249);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3396834249);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3396834249);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3396834249);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3396834249);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3396834249);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3396834249);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3396834249);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3396834249);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3396834249);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3396834249);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3396834249);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3396834249);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3396834249);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3396834249);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3396834249);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3396834249);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3396834249);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>customerissuerstoreLike starbucks or somethingacquirerI'm not sure what this isnetworkcustomer bankstore bankinitial transactionpayment processor behind the scenessimplified 1 banana please$10 dollarsthinking: wow, inflationchecks bank accountSavings: $11I can do that, here's my cardRun this cardProcess to card issuerProcess this payment$10 debit$10 creditAn error in judgement is about to occurLike starbucks or something1I'm not sure what this is2 + + + + + + + + + + + + + + + + + + + + + + + +1Like starbucks or something 2I'm not sure what this is x1 - - -1x + .d2-1308436021 .fill-N1{fill:#0A0F25;} + .d2-1308436021 .fill-N2{fill:#676C7E;} + .d2-1308436021 .fill-N3{fill:#9499AB;} + .d2-1308436021 .fill-N4{fill:#CFD2DD;} + .d2-1308436021 .fill-N5{fill:#DEE1EB;} + .d2-1308436021 .fill-N6{fill:#EEF1F8;} + .d2-1308436021 .fill-N7{fill:#FFFFFF;} + .d2-1308436021 .fill-B1{fill:#0D32B2;} + .d2-1308436021 .fill-B2{fill:#0D32B2;} + .d2-1308436021 .fill-B3{fill:#E3E9FD;} + .d2-1308436021 .fill-B4{fill:#E3E9FD;} + .d2-1308436021 .fill-B5{fill:#EDF0FD;} + .d2-1308436021 .fill-B6{fill:#F7F8FE;} + .d2-1308436021 .fill-AA2{fill:#4A6FF3;} + .d2-1308436021 .fill-AA4{fill:#EDF0FD;} + .d2-1308436021 .fill-AA5{fill:#F7F8FE;} + .d2-1308436021 .fill-AB4{fill:#EDF0FD;} + .d2-1308436021 .fill-AB5{fill:#F7F8FE;} + .d2-1308436021 .stroke-N1{stroke:#0A0F25;} + .d2-1308436021 .stroke-N2{stroke:#676C7E;} + .d2-1308436021 .stroke-N3{stroke:#9499AB;} + .d2-1308436021 .stroke-N4{stroke:#CFD2DD;} + .d2-1308436021 .stroke-N5{stroke:#DEE1EB;} + .d2-1308436021 .stroke-N6{stroke:#EEF1F8;} + .d2-1308436021 .stroke-N7{stroke:#FFFFFF;} + .d2-1308436021 .stroke-B1{stroke:#0D32B2;} + .d2-1308436021 .stroke-B2{stroke:#0D32B2;} + .d2-1308436021 .stroke-B3{stroke:#E3E9FD;} + .d2-1308436021 .stroke-B4{stroke:#E3E9FD;} + .d2-1308436021 .stroke-B5{stroke:#EDF0FD;} + .d2-1308436021 .stroke-B6{stroke:#F7F8FE;} + .d2-1308436021 .stroke-AA2{stroke:#4A6FF3;} + .d2-1308436021 .stroke-AA4{stroke:#EDF0FD;} + .d2-1308436021 .stroke-AA5{stroke:#F7F8FE;} + .d2-1308436021 .stroke-AB4{stroke:#EDF0FD;} + .d2-1308436021 .stroke-AB5{stroke:#F7F8FE;} + .d2-1308436021 .background-color-N1{background-color:#0A0F25;} + .d2-1308436021 .background-color-N2{background-color:#676C7E;} + .d2-1308436021 .background-color-N3{background-color:#9499AB;} + .d2-1308436021 .background-color-N4{background-color:#CFD2DD;} + .d2-1308436021 .background-color-N5{background-color:#DEE1EB;} + .d2-1308436021 .background-color-N6{background-color:#EEF1F8;} + .d2-1308436021 .background-color-N7{background-color:#FFFFFF;} + .d2-1308436021 .background-color-B1{background-color:#0D32B2;} + .d2-1308436021 .background-color-B2{background-color:#0D32B2;} + .d2-1308436021 .background-color-B3{background-color:#E3E9FD;} + .d2-1308436021 .background-color-B4{background-color:#E3E9FD;} + .d2-1308436021 .background-color-B5{background-color:#EDF0FD;} + .d2-1308436021 .background-color-B6{background-color:#F7F8FE;} + .d2-1308436021 .background-color-AA2{background-color:#4A6FF3;} + .d2-1308436021 .background-color-AA4{background-color:#EDF0FD;} + .d2-1308436021 .background-color-AA5{background-color:#F7F8FE;} + .d2-1308436021 .background-color-AB4{background-color:#EDF0FD;} + .d2-1308436021 .background-color-AB5{background-color:#F7F8FE;} + .d2-1308436021 .color-N1{color:#0A0F25;} + .d2-1308436021 .color-N2{color:#676C7E;} + .d2-1308436021 .color-N3{color:#9499AB;} + .d2-1308436021 .color-N4{color:#CFD2DD;} + .d2-1308436021 .color-N5{color:#DEE1EB;} + .d2-1308436021 .color-N6{color:#EEF1F8;} + .d2-1308436021 .color-N7{color:#FFFFFF;} + .d2-1308436021 .color-B1{color:#0D32B2;} + .d2-1308436021 .color-B2{color:#0D32B2;} + .d2-1308436021 .color-B3{color:#E3E9FD;} + .d2-1308436021 .color-B4{color:#E3E9FD;} + .d2-1308436021 .color-B5{color:#EDF0FD;} + .d2-1308436021 .color-B6{color:#F7F8FE;} + .d2-1308436021 .color-AA2{color:#4A6FF3;} + .d2-1308436021 .color-AA4{color:#EDF0FD;} + .d2-1308436021 .color-AA5{color:#F7F8FE;} + .d2-1308436021 .color-AB4{color:#EDF0FD;} + .d2-1308436021 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1308436021);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1308436021);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1308436021);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1308436021);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1308436021);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1308436021);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1308436021);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1308436021);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1308436021);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1308436021);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1308436021);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1308436021);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1308436021);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1308436021);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1308436021);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1308436021);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1308436021);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1308436021);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>x1 + + +1x xyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! 1Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS!23 + .d2-4260260088 .fill-N1{fill:#0A0F25;} + .d2-4260260088 .fill-N2{fill:#676C7E;} + .d2-4260260088 .fill-N3{fill:#9499AB;} + .d2-4260260088 .fill-N4{fill:#CFD2DD;} + .d2-4260260088 .fill-N5{fill:#DEE1EB;} + .d2-4260260088 .fill-N6{fill:#EEF1F8;} + .d2-4260260088 .fill-N7{fill:#FFFFFF;} + .d2-4260260088 .fill-B1{fill:#0D32B2;} + .d2-4260260088 .fill-B2{fill:#0D32B2;} + .d2-4260260088 .fill-B3{fill:#E3E9FD;} + .d2-4260260088 .fill-B4{fill:#E3E9FD;} + .d2-4260260088 .fill-B5{fill:#EDF0FD;} + .d2-4260260088 .fill-B6{fill:#F7F8FE;} + .d2-4260260088 .fill-AA2{fill:#4A6FF3;} + .d2-4260260088 .fill-AA4{fill:#EDF0FD;} + .d2-4260260088 .fill-AA5{fill:#F7F8FE;} + .d2-4260260088 .fill-AB4{fill:#EDF0FD;} + .d2-4260260088 .fill-AB5{fill:#F7F8FE;} + .d2-4260260088 .stroke-N1{stroke:#0A0F25;} + .d2-4260260088 .stroke-N2{stroke:#676C7E;} + .d2-4260260088 .stroke-N3{stroke:#9499AB;} + .d2-4260260088 .stroke-N4{stroke:#CFD2DD;} + .d2-4260260088 .stroke-N5{stroke:#DEE1EB;} + .d2-4260260088 .stroke-N6{stroke:#EEF1F8;} + .d2-4260260088 .stroke-N7{stroke:#FFFFFF;} + .d2-4260260088 .stroke-B1{stroke:#0D32B2;} + .d2-4260260088 .stroke-B2{stroke:#0D32B2;} + .d2-4260260088 .stroke-B3{stroke:#E3E9FD;} + .d2-4260260088 .stroke-B4{stroke:#E3E9FD;} + .d2-4260260088 .stroke-B5{stroke:#EDF0FD;} + .d2-4260260088 .stroke-B6{stroke:#F7F8FE;} + .d2-4260260088 .stroke-AA2{stroke:#4A6FF3;} + .d2-4260260088 .stroke-AA4{stroke:#EDF0FD;} + .d2-4260260088 .stroke-AA5{stroke:#F7F8FE;} + .d2-4260260088 .stroke-AB4{stroke:#EDF0FD;} + .d2-4260260088 .stroke-AB5{stroke:#F7F8FE;} + .d2-4260260088 .background-color-N1{background-color:#0A0F25;} + .d2-4260260088 .background-color-N2{background-color:#676C7E;} + .d2-4260260088 .background-color-N3{background-color:#9499AB;} + .d2-4260260088 .background-color-N4{background-color:#CFD2DD;} + .d2-4260260088 .background-color-N5{background-color:#DEE1EB;} + .d2-4260260088 .background-color-N6{background-color:#EEF1F8;} + .d2-4260260088 .background-color-N7{background-color:#FFFFFF;} + .d2-4260260088 .background-color-B1{background-color:#0D32B2;} + .d2-4260260088 .background-color-B2{background-color:#0D32B2;} + .d2-4260260088 .background-color-B3{background-color:#E3E9FD;} + .d2-4260260088 .background-color-B4{background-color:#E3E9FD;} + .d2-4260260088 .background-color-B5{background-color:#EDF0FD;} + .d2-4260260088 .background-color-B6{background-color:#F7F8FE;} + .d2-4260260088 .background-color-AA2{background-color:#4A6FF3;} + .d2-4260260088 .background-color-AA4{background-color:#EDF0FD;} + .d2-4260260088 .background-color-AA5{background-color:#F7F8FE;} + .d2-4260260088 .background-color-AB4{background-color:#EDF0FD;} + .d2-4260260088 .background-color-AB5{background-color:#F7F8FE;} + .d2-4260260088 .color-N1{color:#0A0F25;} + .d2-4260260088 .color-N2{color:#676C7E;} + .d2-4260260088 .color-N3{color:#9499AB;} + .d2-4260260088 .color-N4{color:#CFD2DD;} + .d2-4260260088 .color-N5{color:#DEE1EB;} + .d2-4260260088 .color-N6{color:#EEF1F8;} + .d2-4260260088 .color-N7{color:#FFFFFF;} + .d2-4260260088 .color-B1{color:#0D32B2;} + .d2-4260260088 .color-B2{color:#0D32B2;} + .d2-4260260088 .color-B3{color:#E3E9FD;} + .d2-4260260088 .color-B4{color:#E3E9FD;} + .d2-4260260088 .color-B5{color:#EDF0FD;} + .d2-4260260088 .color-B6{color:#F7F8FE;} + .d2-4260260088 .color-AA2{color:#4A6FF3;} + .d2-4260260088 .color-AA4{color:#EDF0FD;} + .d2-4260260088 .color-AA5{color:#F7F8FE;} + .d2-4260260088 .color-AB4{color:#EDF0FD;} + .d2-4260260088 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4260260088);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4260260088);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4260260088);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4260260088);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4260260088);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4260260088);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4260260088);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4260260088);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4260260088);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4260260088);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4260260088);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4260260088);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4260260088);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4260260088);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4260260088);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4260260088);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4260260088);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4260260088);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! 1Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS!23 - - + + 1https://d2lang.com 2Gee, I feel kind of LIGHT in the head now,knowing I can't make my satellite dish PAYMENTS! 3https://terrastruct.com diff --git a/d2renderers/d2svg/appendix/testdata/links_dark/sketch.exp.svg b/d2renderers/d2svg/appendix/testdata/links_dark/sketch.exp.svg index a1aca8062..b521fe4a3 100644 --- a/d2renderers/d2svg/appendix/testdata/links_dark/sketch.exp.svg +++ b/d2renderers/d2svg/appendix/testdata/links_dark/sketch.exp.svg @@ -1,12 +1,12 @@ -xyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! 1Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS!23 + .d2-1542907692 .fill-N1{fill:#CDD6F4;} + .d2-1542907692 .fill-N2{fill:#BAC2DE;} + .d2-1542907692 .fill-N3{fill:#A6ADC8;} + .d2-1542907692 .fill-N4{fill:#585B70;} + .d2-1542907692 .fill-N5{fill:#45475A;} + .d2-1542907692 .fill-N6{fill:#313244;} + .d2-1542907692 .fill-N7{fill:#1E1E2E;} + .d2-1542907692 .fill-B1{fill:#CBA6f7;} + .d2-1542907692 .fill-B2{fill:#CBA6f7;} + .d2-1542907692 .fill-B3{fill:#6C7086;} + .d2-1542907692 .fill-B4{fill:#585B70;} + .d2-1542907692 .fill-B5{fill:#45475A;} + .d2-1542907692 .fill-B6{fill:#313244;} + .d2-1542907692 .fill-AA2{fill:#f38BA8;} + .d2-1542907692 .fill-AA4{fill:#45475A;} + .d2-1542907692 .fill-AA5{fill:#313244;} + .d2-1542907692 .fill-AB4{fill:#45475A;} + .d2-1542907692 .fill-AB5{fill:#313244;} + .d2-1542907692 .stroke-N1{stroke:#CDD6F4;} + .d2-1542907692 .stroke-N2{stroke:#BAC2DE;} + .d2-1542907692 .stroke-N3{stroke:#A6ADC8;} + .d2-1542907692 .stroke-N4{stroke:#585B70;} + .d2-1542907692 .stroke-N5{stroke:#45475A;} + .d2-1542907692 .stroke-N6{stroke:#313244;} + .d2-1542907692 .stroke-N7{stroke:#1E1E2E;} + .d2-1542907692 .stroke-B1{stroke:#CBA6f7;} + .d2-1542907692 .stroke-B2{stroke:#CBA6f7;} + .d2-1542907692 .stroke-B3{stroke:#6C7086;} + .d2-1542907692 .stroke-B4{stroke:#585B70;} + .d2-1542907692 .stroke-B5{stroke:#45475A;} + .d2-1542907692 .stroke-B6{stroke:#313244;} + .d2-1542907692 .stroke-AA2{stroke:#f38BA8;} + .d2-1542907692 .stroke-AA4{stroke:#45475A;} + .d2-1542907692 .stroke-AA5{stroke:#313244;} + .d2-1542907692 .stroke-AB4{stroke:#45475A;} + .d2-1542907692 .stroke-AB5{stroke:#313244;} + .d2-1542907692 .background-color-N1{background-color:#CDD6F4;} + .d2-1542907692 .background-color-N2{background-color:#BAC2DE;} + .d2-1542907692 .background-color-N3{background-color:#A6ADC8;} + .d2-1542907692 .background-color-N4{background-color:#585B70;} + .d2-1542907692 .background-color-N5{background-color:#45475A;} + .d2-1542907692 .background-color-N6{background-color:#313244;} + .d2-1542907692 .background-color-N7{background-color:#1E1E2E;} + .d2-1542907692 .background-color-B1{background-color:#CBA6f7;} + .d2-1542907692 .background-color-B2{background-color:#CBA6f7;} + .d2-1542907692 .background-color-B3{background-color:#6C7086;} + .d2-1542907692 .background-color-B4{background-color:#585B70;} + .d2-1542907692 .background-color-B5{background-color:#45475A;} + .d2-1542907692 .background-color-B6{background-color:#313244;} + .d2-1542907692 .background-color-AA2{background-color:#f38BA8;} + .d2-1542907692 .background-color-AA4{background-color:#45475A;} + .d2-1542907692 .background-color-AA5{background-color:#313244;} + .d2-1542907692 .background-color-AB4{background-color:#45475A;} + .d2-1542907692 .background-color-AB5{background-color:#313244;} + .d2-1542907692 .color-N1{color:#CDD6F4;} + .d2-1542907692 .color-N2{color:#BAC2DE;} + .d2-1542907692 .color-N3{color:#A6ADC8;} + .d2-1542907692 .color-N4{color:#585B70;} + .d2-1542907692 .color-N5{color:#45475A;} + .d2-1542907692 .color-N6{color:#313244;} + .d2-1542907692 .color-N7{color:#1E1E2E;} + .d2-1542907692 .color-B1{color:#CBA6f7;} + .d2-1542907692 .color-B2{color:#CBA6f7;} + .d2-1542907692 .color-B3{color:#6C7086;} + .d2-1542907692 .color-B4{color:#585B70;} + .d2-1542907692 .color-B5{color:#45475A;} + .d2-1542907692 .color-B6{color:#313244;} + .d2-1542907692 .color-AA2{color:#f38BA8;} + .d2-1542907692 .color-AA4{color:#45475A;} + .d2-1542907692 .color-AA5{color:#313244;} + .d2-1542907692 .color-AB4{color:#45475A;} + .d2-1542907692 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal-d2-1542907692);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal-d2-1542907692);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark-d2-1542907692);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark-d2-1542907692);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker-d2-1542907692);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker-d2-1542907692);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal-d2-1542907692);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker-d2-1542907692);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker-d2-1542907692);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker-d2-1542907692);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker-d2-1542907692);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal-d2-1542907692);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal-d2-1542907692);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1542907692);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark-d2-1542907692);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker-d2-1542907692);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker-d2-1542907692);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker-d2-1542907692);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>xyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! 1Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS!23 - - + + 1https://d2lang.com 2Gee, I feel kind of LIGHT in the head now,knowing I can't make my satellite dish PAYMENTS! 3https://fosny.eu diff --git a/d2renderers/d2svg/appendix/testdata/tooltip_fill/sketch.exp.svg b/d2renderers/d2svg/appendix/testdata/tooltip_fill/sketch.exp.svg index 23dd44ec2..a1b6cd8f3 100644 --- a/d2renderers/d2svg/appendix/testdata/tooltip_fill/sketch.exp.svg +++ b/d2renderers/d2svg/appendix/testdata/tooltip_fill/sketch.exp.svg @@ -1,12 +1,12 @@ -xTotal abstinence is easier than perfect moderationyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! Total abstinence is easier than perfect moderation1Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS!2 - - - -1Total abstinence is easier than perfect moderation + .d2-324525658 .fill-N1{fill:#0A0F25;} + .d2-324525658 .fill-N2{fill:#676C7E;} + .d2-324525658 .fill-N3{fill:#9499AB;} + .d2-324525658 .fill-N4{fill:#CFD2DD;} + .d2-324525658 .fill-N5{fill:#DEE1EB;} + .d2-324525658 .fill-N6{fill:#EEF1F8;} + .d2-324525658 .fill-N7{fill:#FFFFFF;} + .d2-324525658 .fill-B1{fill:#0D32B2;} + .d2-324525658 .fill-B2{fill:#0D32B2;} + .d2-324525658 .fill-B3{fill:#E3E9FD;} + .d2-324525658 .fill-B4{fill:#E3E9FD;} + .d2-324525658 .fill-B5{fill:#EDF0FD;} + .d2-324525658 .fill-B6{fill:#F7F8FE;} + .d2-324525658 .fill-AA2{fill:#4A6FF3;} + .d2-324525658 .fill-AA4{fill:#EDF0FD;} + .d2-324525658 .fill-AA5{fill:#F7F8FE;} + .d2-324525658 .fill-AB4{fill:#EDF0FD;} + .d2-324525658 .fill-AB5{fill:#F7F8FE;} + .d2-324525658 .stroke-N1{stroke:#0A0F25;} + .d2-324525658 .stroke-N2{stroke:#676C7E;} + .d2-324525658 .stroke-N3{stroke:#9499AB;} + .d2-324525658 .stroke-N4{stroke:#CFD2DD;} + .d2-324525658 .stroke-N5{stroke:#DEE1EB;} + .d2-324525658 .stroke-N6{stroke:#EEF1F8;} + .d2-324525658 .stroke-N7{stroke:#FFFFFF;} + .d2-324525658 .stroke-B1{stroke:#0D32B2;} + .d2-324525658 .stroke-B2{stroke:#0D32B2;} + .d2-324525658 .stroke-B3{stroke:#E3E9FD;} + .d2-324525658 .stroke-B4{stroke:#E3E9FD;} + .d2-324525658 .stroke-B5{stroke:#EDF0FD;} + .d2-324525658 .stroke-B6{stroke:#F7F8FE;} + .d2-324525658 .stroke-AA2{stroke:#4A6FF3;} + .d2-324525658 .stroke-AA4{stroke:#EDF0FD;} + .d2-324525658 .stroke-AA5{stroke:#F7F8FE;} + .d2-324525658 .stroke-AB4{stroke:#EDF0FD;} + .d2-324525658 .stroke-AB5{stroke:#F7F8FE;} + .d2-324525658 .background-color-N1{background-color:#0A0F25;} + .d2-324525658 .background-color-N2{background-color:#676C7E;} + .d2-324525658 .background-color-N3{background-color:#9499AB;} + .d2-324525658 .background-color-N4{background-color:#CFD2DD;} + .d2-324525658 .background-color-N5{background-color:#DEE1EB;} + .d2-324525658 .background-color-N6{background-color:#EEF1F8;} + .d2-324525658 .background-color-N7{background-color:#FFFFFF;} + .d2-324525658 .background-color-B1{background-color:#0D32B2;} + .d2-324525658 .background-color-B2{background-color:#0D32B2;} + .d2-324525658 .background-color-B3{background-color:#E3E9FD;} + .d2-324525658 .background-color-B4{background-color:#E3E9FD;} + .d2-324525658 .background-color-B5{background-color:#EDF0FD;} + .d2-324525658 .background-color-B6{background-color:#F7F8FE;} + .d2-324525658 .background-color-AA2{background-color:#4A6FF3;} + .d2-324525658 .background-color-AA4{background-color:#EDF0FD;} + .d2-324525658 .background-color-AA5{background-color:#F7F8FE;} + .d2-324525658 .background-color-AB4{background-color:#EDF0FD;} + .d2-324525658 .background-color-AB5{background-color:#F7F8FE;} + .d2-324525658 .color-N1{color:#0A0F25;} + .d2-324525658 .color-N2{color:#676C7E;} + .d2-324525658 .color-N3{color:#9499AB;} + .d2-324525658 .color-N4{color:#CFD2DD;} + .d2-324525658 .color-N5{color:#DEE1EB;} + .d2-324525658 .color-N6{color:#EEF1F8;} + .d2-324525658 .color-N7{color:#FFFFFF;} + .d2-324525658 .color-B1{color:#0D32B2;} + .d2-324525658 .color-B2{color:#0D32B2;} + .d2-324525658 .color-B3{color:#E3E9FD;} + .d2-324525658 .color-B4{color:#E3E9FD;} + .d2-324525658 .color-B5{color:#EDF0FD;} + .d2-324525658 .color-B6{color:#F7F8FE;} + .d2-324525658 .color-AA2{color:#4A6FF3;} + .d2-324525658 .color-AA4{color:#EDF0FD;} + .d2-324525658 .color-AA5{color:#F7F8FE;} + .d2-324525658 .color-AB4{color:#EDF0FD;} + .d2-324525658 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-324525658);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-324525658);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-324525658);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-324525658);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-324525658);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-324525658);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-324525658);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-324525658);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-324525658);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-324525658);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-324525658);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-324525658);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-324525658);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-324525658);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-324525658);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-324525658);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-324525658);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-324525658);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xTotal abstinence is easier than perfect moderationyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! Total abstinence is easier than perfect moderation1Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS!2 + + + +1Total abstinence is easier than perfect moderation 2Gee, I feel kind of LIGHT in the head now,knowing I can't make my satellite dish PAYMENTS! xTotal abstinence is easier than perfect moderationyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! Total abstinence is easier than perfect moderation1Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS!2 - - - -1Total abstinence is easier than perfect moderation + .d2-823506279 .fill-N1{fill:#0A0F25;} + .d2-823506279 .fill-N2{fill:#676C7E;} + .d2-823506279 .fill-N3{fill:#9499AB;} + .d2-823506279 .fill-N4{fill:#CFD2DD;} + .d2-823506279 .fill-N5{fill:#DEE1EB;} + .d2-823506279 .fill-N6{fill:#EEF1F8;} + .d2-823506279 .fill-N7{fill:#FFFFFF;} + .d2-823506279 .fill-B1{fill:#0D32B2;} + .d2-823506279 .fill-B2{fill:#0D32B2;} + .d2-823506279 .fill-B3{fill:#E3E9FD;} + .d2-823506279 .fill-B4{fill:#E3E9FD;} + .d2-823506279 .fill-B5{fill:#EDF0FD;} + .d2-823506279 .fill-B6{fill:#F7F8FE;} + .d2-823506279 .fill-AA2{fill:#4A6FF3;} + .d2-823506279 .fill-AA4{fill:#EDF0FD;} + .d2-823506279 .fill-AA5{fill:#F7F8FE;} + .d2-823506279 .fill-AB4{fill:#EDF0FD;} + .d2-823506279 .fill-AB5{fill:#F7F8FE;} + .d2-823506279 .stroke-N1{stroke:#0A0F25;} + .d2-823506279 .stroke-N2{stroke:#676C7E;} + .d2-823506279 .stroke-N3{stroke:#9499AB;} + .d2-823506279 .stroke-N4{stroke:#CFD2DD;} + .d2-823506279 .stroke-N5{stroke:#DEE1EB;} + .d2-823506279 .stroke-N6{stroke:#EEF1F8;} + .d2-823506279 .stroke-N7{stroke:#FFFFFF;} + .d2-823506279 .stroke-B1{stroke:#0D32B2;} + .d2-823506279 .stroke-B2{stroke:#0D32B2;} + .d2-823506279 .stroke-B3{stroke:#E3E9FD;} + .d2-823506279 .stroke-B4{stroke:#E3E9FD;} + .d2-823506279 .stroke-B5{stroke:#EDF0FD;} + .d2-823506279 .stroke-B6{stroke:#F7F8FE;} + .d2-823506279 .stroke-AA2{stroke:#4A6FF3;} + .d2-823506279 .stroke-AA4{stroke:#EDF0FD;} + .d2-823506279 .stroke-AA5{stroke:#F7F8FE;} + .d2-823506279 .stroke-AB4{stroke:#EDF0FD;} + .d2-823506279 .stroke-AB5{stroke:#F7F8FE;} + .d2-823506279 .background-color-N1{background-color:#0A0F25;} + .d2-823506279 .background-color-N2{background-color:#676C7E;} + .d2-823506279 .background-color-N3{background-color:#9499AB;} + .d2-823506279 .background-color-N4{background-color:#CFD2DD;} + .d2-823506279 .background-color-N5{background-color:#DEE1EB;} + .d2-823506279 .background-color-N6{background-color:#EEF1F8;} + .d2-823506279 .background-color-N7{background-color:#FFFFFF;} + .d2-823506279 .background-color-B1{background-color:#0D32B2;} + .d2-823506279 .background-color-B2{background-color:#0D32B2;} + .d2-823506279 .background-color-B3{background-color:#E3E9FD;} + .d2-823506279 .background-color-B4{background-color:#E3E9FD;} + .d2-823506279 .background-color-B5{background-color:#EDF0FD;} + .d2-823506279 .background-color-B6{background-color:#F7F8FE;} + .d2-823506279 .background-color-AA2{background-color:#4A6FF3;} + .d2-823506279 .background-color-AA4{background-color:#EDF0FD;} + .d2-823506279 .background-color-AA5{background-color:#F7F8FE;} + .d2-823506279 .background-color-AB4{background-color:#EDF0FD;} + .d2-823506279 .background-color-AB5{background-color:#F7F8FE;} + .d2-823506279 .color-N1{color:#0A0F25;} + .d2-823506279 .color-N2{color:#676C7E;} + .d2-823506279 .color-N3{color:#9499AB;} + .d2-823506279 .color-N4{color:#CFD2DD;} + .d2-823506279 .color-N5{color:#DEE1EB;} + .d2-823506279 .color-N6{color:#EEF1F8;} + .d2-823506279 .color-N7{color:#FFFFFF;} + .d2-823506279 .color-B1{color:#0D32B2;} + .d2-823506279 .color-B2{color:#0D32B2;} + .d2-823506279 .color-B3{color:#E3E9FD;} + .d2-823506279 .color-B4{color:#E3E9FD;} + .d2-823506279 .color-B5{color:#EDF0FD;} + .d2-823506279 .color-B6{color:#F7F8FE;} + .d2-823506279 .color-AA2{color:#4A6FF3;} + .d2-823506279 .color-AA4{color:#EDF0FD;} + .d2-823506279 .color-AA5{color:#F7F8FE;} + .d2-823506279 .color-AB4{color:#EDF0FD;} + .d2-823506279 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-823506279);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-823506279);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-823506279);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-823506279);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-823506279);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-823506279);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-823506279);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-823506279);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-823506279);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-823506279);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-823506279);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-823506279);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-823506279);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-823506279);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-823506279);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-823506279);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-823506279);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-823506279);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xTotal abstinence is easier than perfect moderationyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! Total abstinence is easier than perfect moderation1Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS!2 + + + +1Total abstinence is easier than perfect moderation 2Gee, I feel kind of LIGHT in the head now,knowing I can't make my satellite dish PAYMENTS! `) @@ -1842,7 +2331,7 @@ func appendOnTrigger(buf *bytes.Buffer, source string, triggers []string, newCon var DEFAULT_DARK_THEME *int64 = nil // no theme selected func Render(diagram *d2target.Diagram, opts *RenderOpts) ([]byte, error) { - var sketchRunner *d2sketch.Runner + var jsRunner jsrunner.JSRunner pad := DEFAULT_PADDING themeID := d2themescatalog.NeutralDefault.ID darkThemeID := DEFAULT_DARK_THEME @@ -1852,8 +2341,8 @@ func Render(diagram *d2target.Diagram, opts *RenderOpts) ([]byte, error) { pad = int(*opts.Pad) } if opts.Sketch != nil && *opts.Sketch { - var err error - sketchRunner, err = d2sketch.InitSketchVM() + jsRunner = jsrunner.NewJSRunner() + err := d2sketch.LoadJS(jsRunner) if err != nil { return nil, err } @@ -1863,6 +2352,8 @@ func Render(diagram *d2target.Diagram, opts *RenderOpts) ([]byte, error) { } darkThemeID = opts.DarkThemeID scale = opts.Scale + } else { + opts = &RenderOpts{} } buf := &bytes.Buffer{} @@ -1896,10 +2387,13 @@ func Render(diagram *d2target.Diagram, opts *RenderOpts) ([]byte, error) { if color.IsGradient(c.Stroke) { defineGradients(buf, c.Stroke) } + if color.IsGradient(c.Fill) { + defineGradients(buf, c.Fill) + } } // Apply hash on IDs for targeting, to be specific for this diagram - diagramHash, err := diagram.HashID() + diagramHash, err := diagram.HashID(opts.Salt) if err != nil { return nil, err } @@ -1935,7 +2429,7 @@ func Render(diagram *d2target.Diagram, opts *RenderOpts) ([]byte, error) { } for _, obj := range allObjects { if c, is := obj.(d2target.Connection); is { - labelMask, err := drawConnection(buf, isolatedDiagramHash, c, markers, idToShape, sketchRunner, inlineTheme) + labelMask, err := drawConnection(buf, isolatedDiagramHash, c, markers, idToShape, jsRunner, inlineTheme) if err != nil { return nil, err } @@ -1943,7 +2437,7 @@ func Render(diagram *d2target.Diagram, opts *RenderOpts) ([]byte, error) { labelMasks = append(labelMasks, labelMask) } } else if s, is := obj.(d2target.Shape); is { - labelMask, err := drawShape(buf, appendixItemBuf, diagramHash, s, sketchRunner, inlineTheme) + labelMask, err := drawShape(buf, appendixItemBuf, diagramHash, s, jsRunner, inlineTheme) if err != nil { return nil, err } else if labelMask != "" { @@ -1956,8 +2450,85 @@ func Render(diagram *d2target.Diagram, opts *RenderOpts) ([]byte, error) { // add all appendix items afterwards so they are always on top fmt.Fprint(buf, appendixItemBuf) + if diagram.Legend != nil && (len(diagram.Legend.Shapes) > 0 || len(diagram.Legend.Connections) > 0) { + legendBuf := &bytes.Buffer{} + err := renderLegend(legendBuf, diagram, diagramHash, inlineTheme) + if err != nil { + return nil, err + } + fmt.Fprint(buf, legendBuf) + } + // Note: we always want this since we reference it on connections even if there end up being no masked labels left, top, w, h := dimensions(diagram, pad) + + if diagram.Legend != nil && (len(diagram.Legend.Shapes) > 0 || len(diagram.Legend.Connections) > 0) { + tl, br := diagram.BoundingBox() + totalHeight := LEGEND_PADDING + LEGEND_FONT_SIZE + LEGEND_ITEM_SPACING + maxLabelWidth := 0 + itemCount := 0 + ruler, _ := textmeasure.NewRuler() + if ruler != nil { + for _, s := range diagram.Legend.Shapes { + if s.Label == "" { + continue + } + mtext := &d2target.MText{ + Text: s.Label, + FontSize: LEGEND_FONT_SIZE, + } + dims := d2graph.GetTextDimensions(nil, ruler, mtext, nil) + maxLabelWidth = go2.IntMax(maxLabelWidth, dims.Width) + totalHeight += go2.IntMax(dims.Height, LEGEND_ICON_SIZE) + LEGEND_ITEM_SPACING + itemCount++ + } + + for _, c := range diagram.Legend.Connections { + if c.Label == "" { + continue + } + mtext := &d2target.MText{ + Text: c.Label, + FontSize: LEGEND_FONT_SIZE, + } + dims := d2graph.GetTextDimensions(nil, ruler, mtext, nil) + maxLabelWidth = go2.IntMax(maxLabelWidth, dims.Width) + totalHeight += go2.IntMax(dims.Height, LEGEND_ICON_SIZE) + LEGEND_ITEM_SPACING + itemCount++ + } + + if itemCount > 0 { + totalHeight -= LEGEND_ITEM_SPACING / 2 + } + + totalHeight += LEGEND_PADDING + + if totalHeight > 0 && maxLabelWidth > 0 { + legendWidth := LEGEND_PADDING*2 + LEGEND_ICON_SIZE + LEGEND_PADDING + maxLabelWidth + + legendY := br.Y - totalHeight + if legendY < tl.Y { + legendY = tl.Y + } + + legendRight := br.X + LEGEND_CORNER_PADDING + legendWidth + if left+w < legendRight { + w = legendRight - left + pad/2 + } + + if legendY < top { + diffY := top - legendY + top -= diffY + h += diffY + } + + legendBottom := legendY + totalHeight + if top+h < legendBottom { + h = legendBottom - top + pad/2 + } + } + } + } fmt.Fprint(buf, strings.Join([]string{ fmt.Sprintf(``, isolatedDiagramHash, left, top, w, h, @@ -1981,7 +2552,7 @@ func Render(diagram *d2target.Diagram, opts *RenderOpts) ([]byte, error) { hasMarkdown := false for _, s := range diagram.Shapes { - if s.Label != "" && s.Type == d2target.ShapeText { + if s.Language == "markdown" { hasMarkdown = true break } @@ -1997,8 +2568,8 @@ func Render(diagram *d2target.Diagram, opts *RenderOpts) ([]byte, error) { fmt.Fprintf(upperBuf, ``, css) } - if sketchRunner != nil { - d2sketch.DefineFillPatterns(upperBuf) + if jsRunner != nil { + d2sketch.DefineFillPatterns(upperBuf, diagramHash) } } @@ -2063,19 +2634,19 @@ func Render(diagram *d2target.Diagram, opts *RenderOpts) ([]byte, error) { } switch pattern { case "dots": - patternDefs += dots + patternDefs += fmt.Sprintf(dots, diagramHash) case "lines": - patternDefs += lines + patternDefs += fmt.Sprintf(lines, diagramHash) case "grain": - patternDefs += grain + patternDefs += fmt.Sprintf(grain, diagramHash) case "paper": - patternDefs += paper + patternDefs += fmt.Sprintf(paper, diagramHash) } fmt.Fprintf(upperBuf, ` .%s-overlay { - fill: url(#%s); + fill: url(#%s-%s); mix-blend-mode: multiply; -}`, pattern, pattern) +}`, pattern, pattern, diagramHash) } } if patternDefs != "" { @@ -2104,25 +2675,30 @@ func Render(diagram *d2target.Diagram, opts *RenderOpts) ([]byte, error) { tag := "g" // Many things change when this is rendering for animation if opts.MasterID == "" { - fitToScreenWrapperOpening = fmt.Sprintf(``, - version.Version, + dataD2Version := "" + if opts.OmitVersion == nil || !*opts.OmitVersion { + dataD2Version = fmt.Sprintf(`data-d2-version="%s"`, version.Version) + } + fitToScreenWrapperOpening = fmt.Sprintf(``, + dataD2Version, alignment, w, h, dimensions, ) - xmlTag = `` + if opts.NoXMLTag == nil || !*opts.NoXMLTag { + xmlTag = `` + } fitToScreenWrapperClosing = "" - idAttr = `id="d2-svg"` + idAttr = `d2-svg` tag = "svg" } // TODO minify - docRendered := fmt.Sprintf(`%s%s<%s %s class="%s" width="%d" height="%d" viewBox="%d %d %d %d">%s%s%s%s%s`, + docRendered := fmt.Sprintf(`%s%s<%s class="%s" width="%d" height="%d" viewBox="%d %d %d %d">%s%s%s%s%s`, xmlTag, fitToScreenWrapperOpening, tag, - idAttr, - diagramHash, + strings.Join([]string{diagramHash, idAttr}, " "), w, h, left, top, w, h, doubleBorderElStr, backgroundEl.Render(), @@ -2240,98 +2816,98 @@ func singleThemeRulesets(diagramHash string, themeID int64, overrides *d2target. if err != nil { return "", err } - out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s);mix-blend-mode:%s}", color.B1, lc, blendMode(lc)) + out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s-%s);mix-blend-mode:%s}", color.B1, lc, diagramHash, blendMode(lc)) lc, err = color.LuminanceCategory(theme.Colors.B2) if err != nil { return "", err } - out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s);mix-blend-mode:%s}", color.B2, lc, blendMode(lc)) + out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s-%s);mix-blend-mode:%s}", color.B2, lc, diagramHash, blendMode(lc)) lc, err = color.LuminanceCategory(theme.Colors.B3) if err != nil { return "", err } - out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s);mix-blend-mode:%s}", color.B3, lc, blendMode(lc)) + out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s-%s);mix-blend-mode:%s}", color.B3, lc, diagramHash, blendMode(lc)) lc, err = color.LuminanceCategory(theme.Colors.B4) if err != nil { return "", err } - out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s);mix-blend-mode:%s}", color.B4, lc, blendMode(lc)) + out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s-%s);mix-blend-mode:%s}", color.B4, lc, diagramHash, blendMode(lc)) lc, err = color.LuminanceCategory(theme.Colors.B5) if err != nil { return "", err } - out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s);mix-blend-mode:%s}", color.B5, lc, blendMode(lc)) + out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s-%s);mix-blend-mode:%s}", color.B5, lc, diagramHash, blendMode(lc)) lc, err = color.LuminanceCategory(theme.Colors.B6) if err != nil { return "", err } - out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s);mix-blend-mode:%s}", color.B6, lc, blendMode(lc)) + out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s-%s);mix-blend-mode:%s}", color.B6, lc, diagramHash, blendMode(lc)) // AA lc, err = color.LuminanceCategory(theme.Colors.AA2) if err != nil { return "", err } - out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s);mix-blend-mode:%s}", color.AA2, lc, blendMode(lc)) + out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s-%s);mix-blend-mode:%s}", color.AA2, lc, diagramHash, blendMode(lc)) lc, err = color.LuminanceCategory(theme.Colors.AA4) if err != nil { return "", err } - out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s);mix-blend-mode:%s}", color.AA4, lc, blendMode(lc)) + out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s-%s);mix-blend-mode:%s}", color.AA4, lc, diagramHash, blendMode(lc)) lc, err = color.LuminanceCategory(theme.Colors.AA5) if err != nil { return "", err } - out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s);mix-blend-mode:%s}", color.AA5, lc, blendMode(lc)) + out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s-%s);mix-blend-mode:%s}", color.AA5, lc, diagramHash, blendMode(lc)) // AB lc, err = color.LuminanceCategory(theme.Colors.AB4) if err != nil { return "", err } - out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s);mix-blend-mode:%s}", color.AB4, lc, blendMode(lc)) + out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s-%s);mix-blend-mode:%s}", color.AB4, lc, diagramHash, blendMode(lc)) lc, err = color.LuminanceCategory(theme.Colors.AB5) if err != nil { return "", err } - out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s);mix-blend-mode:%s}", color.AB5, lc, blendMode(lc)) + out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s-%s);mix-blend-mode:%s}", color.AB5, lc, diagramHash, blendMode(lc)) // Neutrals lc, err = color.LuminanceCategory(theme.Colors.Neutrals.N1) if err != nil { return "", err } - out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s);mix-blend-mode:%s}", color.N1, lc, blendMode(lc)) + out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s-%s);mix-blend-mode:%s}", color.N1, lc, diagramHash, blendMode(lc)) lc, err = color.LuminanceCategory(theme.Colors.Neutrals.N2) if err != nil { return "", err } - out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s);mix-blend-mode:%s}", color.N2, lc, blendMode(lc)) + out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s-%s);mix-blend-mode:%s}", color.N2, lc, diagramHash, blendMode(lc)) lc, err = color.LuminanceCategory(theme.Colors.Neutrals.N3) if err != nil { return "", err } - out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s);mix-blend-mode:%s}", color.N3, lc, blendMode(lc)) + out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s-%s);mix-blend-mode:%s}", color.N3, lc, diagramHash, blendMode(lc)) lc, err = color.LuminanceCategory(theme.Colors.Neutrals.N4) if err != nil { return "", err } - out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s);mix-blend-mode:%s}", color.N4, lc, blendMode(lc)) + out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s-%s);mix-blend-mode:%s}", color.N4, lc, diagramHash, blendMode(lc)) lc, err = color.LuminanceCategory(theme.Colors.Neutrals.N5) if err != nil { return "", err } - out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s);mix-blend-mode:%s}", color.N5, lc, blendMode(lc)) + out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s-%s);mix-blend-mode:%s}", color.N5, lc, diagramHash, blendMode(lc)) lc, err = color.LuminanceCategory(theme.Colors.Neutrals.N6) if err != nil { return "", err } - out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s);mix-blend-mode:%s}", color.N6, lc, blendMode(lc)) + out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s-%s);mix-blend-mode:%s}", color.N6, lc, diagramHash, blendMode(lc)) lc, err = color.LuminanceCategory(theme.Colors.Neutrals.N7) if err != nil { return "", err } - out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s);mix-blend-mode:%s}", color.N7, lc, blendMode(lc)) + out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s-%s);mix-blend-mode:%s}", color.N7, lc, diagramHash, blendMode(lc)) if theme.IsDark() { out += ".light-code{display: none}" diff --git a/d2renderers/d2svg/d2svg.go-e b/d2renderers/d2svg/d2svg.go-e new file mode 100644 index 000000000..e71eb3f92 --- /dev/null +++ b/d2renderers/d2svg/d2svg.go-e @@ -0,0 +1,2992 @@ +// d2svg implements an SVG renderer for d2 diagrams. +// The input is d2exporter's output +package d2svg + +import ( + "bytes" + _ "embed" + "encoding/base64" + "errors" + "fmt" + "hash/fnv" + "html" + "io" + "sort" + "strings" + + "math" + + "github.com/alecthomas/chroma/v2" + "github.com/alecthomas/chroma/v2/formatters" + "github.com/alecthomas/chroma/v2/lexers" + "github.com/alecthomas/chroma/v2/styles" + + "oss.terrastruct.com/d2/d2ast" + "oss.terrastruct.com/d2/d2graph" + "oss.terrastruct.com/d2/d2renderers/d2fonts" + "oss.terrastruct.com/d2/d2renderers/d2latex" + "oss.terrastruct.com/d2/d2renderers/d2sketch" + "oss.terrastruct.com/d2/d2target" + "oss.terrastruct.com/d2/d2themes" + "oss.terrastruct.com/d2/d2themes/d2themescatalog" + "oss.terrastruct.com/d2/lib/color" + "oss.terrastruct.com/d2/lib/geo" + "oss.terrastruct.com/d2/lib/jsrunner" + "oss.terrastruct.com/d2/lib/label" + "oss.terrastruct.com/d2/lib/shape" + "oss.terrastruct.com/d2/lib/svg" + "oss.terrastruct.com/d2/lib/textmeasure" + "oss.terrastruct.com/d2/lib/version" + "oss.terrastruct.com/util-go/go2" +) + +const ( + DEFAULT_PADDING = 100 + + appendixIconRadius = 16 + + // Legend constants + LEGEND_PADDING = 20 + LEGEND_ITEM_SPACING = 15 + LEGEND_ICON_SIZE = 24 + LEGEND_FONT_SIZE = 14 + LEGEND_CORNER_PADDING = 10 +) + +var multipleOffset = geo.NewVector(d2target.MULTIPLE_OFFSET, -d2target.MULTIPLE_OFFSET) + +//go:embed tooltip.svg +var TooltipIcon string + +//go:embed link.svg +var LinkIcon string + +//go:embed style.css +var BaseStylesheet string + +//go:embed github-markdown.css +var MarkdownCSS string + +//go:embed dots.txt +var dots string + +//go:embed lines.txt +var lines string + +//go:embed grain.txt +var grain string + +//go:embed paper.txt +var paper string + +type RenderOpts struct { + Pad *int64 + Sketch *bool + Center *bool + ThemeID *int64 + DarkThemeID *int64 + ThemeOverrides *d2target.ThemeOverrides + DarkThemeOverrides *d2target.ThemeOverrides + Font string + // the svg will be scaled by this factor, if unset the svg will fit to screen + Scale *float64 + + // MasterID is passed when the diagram should use something other than its own hash for unique targeting + // Currently, that's when multi-boards are collapsed + MasterID string + NoXMLTag *bool + Salt *string +} + +func dimensions(diagram *d2target.Diagram, pad int) (left, top, width, height int) { + tl, br := diagram.BoundingBox() + left = tl.X - pad + top = tl.Y - pad + width = br.X - tl.X + pad*2 + height = br.Y - tl.Y + pad*2 + + return left, top, width, height +} + +// renderLegend renders the legend box in the bottom right of the diagram +func renderLegend(buf *bytes.Buffer, diagram *d2target.Diagram, diagramHash string, theme *d2themes.Theme) error { + if diagram.Legend == nil || (len(diagram.Legend.Shapes) == 0 && len(diagram.Legend.Connections) == 0) { + return nil + } + + _, br := diagram.BoundingBox() + + // Create a ruler to measure text + ruler, err := textmeasure.NewRuler() + if err != nil { + return err + } + + // Calculate total height of legend items + // Start with top padding and title height + totalHeight := LEGEND_PADDING + LEGEND_FONT_SIZE + LEGEND_ITEM_SPACING + maxLabelWidth := 0 + + // Track number of items for precise height calculation + itemCount := 0 + + // Measure text for each legend item to determine dimensions + for _, s := range diagram.Legend.Shapes { + if s.Label == "" { + continue + } + + mtext := &d2target.MText{ + Text: s.Label, + FontSize: LEGEND_FONT_SIZE, + } + + dims := d2graph.GetTextDimensions(nil, ruler, mtext, nil) + maxLabelWidth = go2.IntMax(maxLabelWidth, dims.Width) + totalHeight += go2.IntMax(dims.Height, LEGEND_ICON_SIZE) + LEGEND_ITEM_SPACING + itemCount++ + } + + for _, c := range diagram.Legend.Connections { + if c.Label == "" { + continue + } + + mtext := &d2target.MText{ + Text: c.Label, + FontSize: LEGEND_FONT_SIZE, + } + + dims := d2graph.GetTextDimensions(nil, ruler, mtext, nil) + maxLabelWidth = go2.IntMax(maxLabelWidth, dims.Width) + totalHeight += go2.IntMax(dims.Height, LEGEND_ICON_SIZE) + LEGEND_ITEM_SPACING + itemCount++ + } + + // If we have items, remove the extra spacing from the last item and add bottom padding + if itemCount > 0 { + totalHeight -= LEGEND_ITEM_SPACING / 2 // Remove some of the last spacing + } + + // Add bottom padding + totalHeight += LEGEND_PADDING + + // Calculate legend dimensions + legendWidth := LEGEND_PADDING*2 + LEGEND_ICON_SIZE + LEGEND_PADDING + maxLabelWidth + + // Position legend to the right of the diagram with padding + // Add extra padding to ensure it doesn't overlap with diagram elements + legendX := br.X + LEGEND_CORNER_PADDING + // Center vertically using the bounding box, but ensure it's not too close to the top + tl, _ := diagram.BoundingBox() + legendY := tl.Y + (br.Y-tl.Y-totalHeight)/2 + if legendY < tl.Y { + legendY = tl.Y + } + + // Draw legend background with subtle shadow for better visual separation + // Add shadow/outline effect first + shadowEl := d2themes.NewThemableElement("rect", theme) + shadowEl.Fill = "#F7F7FA" + shadowEl.Stroke = "#DEE1EB" + shadowEl.Style = "stroke-width: 1px; filter: drop-shadow(0px 2px 3px rgba(0, 0, 0, 0.1))" + shadowEl.X = float64(legendX) + shadowEl.Y = float64(legendY) + shadowEl.Width = float64(legendWidth) + shadowEl.Height = float64(totalHeight) + shadowEl.Rx = 4 + fmt.Fprint(buf, shadowEl.Render()) + + // Draw legend background + legendEl := d2themes.NewThemableElement("rect", theme) + legendEl.Fill = "#ffffff" + legendEl.Stroke = "#DEE1EB" + legendEl.Style = "stroke-width: 1px" + legendEl.X = float64(legendX) + legendEl.Y = float64(legendY) + legendEl.Width = float64(legendWidth) + legendEl.Height = float64(totalHeight) + legendEl.Rx = 4 + fmt.Fprint(buf, legendEl.Render()) + + // Draw legend title + fmt.Fprintf(buf, `Legend`, + legendX+LEGEND_PADDING, legendY+LEGEND_PADDING+LEGEND_FONT_SIZE, LEGEND_FONT_SIZE+2) + + // Current Y position for drawing items + currentY := legendY + LEGEND_PADDING*2 + LEGEND_FONT_SIZE + + // Draw legend shapes + for _, s := range diagram.Legend.Shapes { + if s.Label == "" { + continue + } + + iconX := legendX + LEGEND_PADDING + iconY := currentY + + // Draw shape as icon + shapeIcon, err := renderLegendShapeIcon(s, iconX, iconY, diagramHash, theme) + if err != nil { + return err + } + fmt.Fprint(buf, shapeIcon) + + // Draw label + mtext := &d2target.MText{ + Text: s.Label, + FontSize: LEGEND_FONT_SIZE, + } + + dims := d2graph.GetTextDimensions(nil, ruler, mtext, nil) + textY := currentY + dims.Height/2 + + fmt.Fprintf(buf, `%s`, + iconX+LEGEND_ICON_SIZE+LEGEND_PADDING, textY, LEGEND_FONT_SIZE, + html.EscapeString(s.Label)) + + currentY += go2.IntMax(dims.Height, LEGEND_ICON_SIZE) + LEGEND_ITEM_SPACING + } + + // Draw legend connections + for _, c := range diagram.Legend.Connections { + if c.Label == "" { + continue + } + + iconX := legendX + LEGEND_PADDING + iconY := currentY + LEGEND_ICON_SIZE/2 + + // Draw connection as line + connIcon, err := renderLegendConnectionIcon(c, iconX, iconY, theme) + if err != nil { + return err + } + fmt.Fprint(buf, connIcon) + + // Draw label + mtext := &d2target.MText{ + Text: c.Label, + FontSize: LEGEND_FONT_SIZE, + } + + dims := d2graph.GetTextDimensions(nil, ruler, mtext, nil) + textY := currentY + dims.Height/2 + + fmt.Fprintf(buf, `%s`, + iconX+LEGEND_ICON_SIZE+LEGEND_PADDING, textY, LEGEND_FONT_SIZE, + html.EscapeString(c.Label)) + + currentY += go2.IntMax(dims.Height, LEGEND_ICON_SIZE) + LEGEND_ITEM_SPACING + } + + return nil +} + +// renderLegendShapeIcon creates a small representation of a shape for the legend +// This reuses the existing shape drawing code +func renderLegendShapeIcon(s d2target.Shape, x, y int, diagramHash string, theme *d2themes.Theme) (string, error) { + // Create a miniature version of the shape + iconShape := s + + // Set the position and size for the legend icon + iconShape.X = x + iconShape.Y = y + iconShape.Width = LEGEND_ICON_SIZE + iconShape.Height = LEGEND_ICON_SIZE + + // Remove the label since we don't want it in the icon + iconShape.Label = "" + + // Create wrappers to capture the rendered SVG + buf := &bytes.Buffer{} + appendixBuf := &bytes.Buffer{} + + // Use the existing drawShape function to render the shape with its proper appearance + _, err := drawShape(buf, appendixBuf, diagramHash, iconShape, nil, theme) + if err != nil { + return "", err + } + + return buf.String(), nil +} + +// renderLegendConnectionIcon creates a small representation of a connection for the legend +func renderLegendConnectionIcon(c d2target.Connection, x, y int, theme *d2themes.Theme) (string, error) { + buf := &bytes.Buffer{} + + // Default stroke width and color + strokeWidth := 2.0 + + // Default color + strokeColor := "#000000" + if c.Stroke != "" { + strokeColor = c.Stroke + } else if theme != nil { + strokeColor = theme.Colors.B4 // Use a theme color for connections + } + + // Draw simple line to represent connection + startX := float64(x) + endX := float64(x + LEGEND_ICON_SIZE) + midY := float64(y) + + fmt.Fprintf(buf, ``, + startX, midY, endX, midY, strokeColor, strokeWidth) + + // Add arrowhead if needed - check if either has an arrowhead that's not "none" + if c.SrcArrow != "none" || c.DstArrow != "none" { + // Draw destination arrowhead (right side) + fmt.Fprintf(buf, ``, + endX-6, midY-3, endX, midY, endX-6, midY+3, strokeColor) + } + + return buf.String(), nil +} + +// renderSimplifiedShape creates a simplified version of a shape for the legend +func renderSimplifiedShape(buf *bytes.Buffer, s d2target.Shape, theme *d2themes.Theme) error { + // Get fill and stroke colors + fillColor := "#E8EAF1" // Default fill color + strokeColor := "#CED3E5" // Default stroke color + + if s.Fill != "" { + fillColor = s.Fill + } else if theme != nil { + fillColor = theme.Colors.B5 // Use a theme color for fills + } + + if s.Stroke != "" { + strokeColor = s.Stroke + } else if theme != nil { + strokeColor = theme.Colors.B4 // Use a theme color for strokes + } + + // Create a simplified shape representation based on shape type + switch s.Type { + case d2target.ShapeCircle: + // Circle + circleEl := d2themes.NewThemableElement("circle", theme) + circleEl.Fill = fillColor + circleEl.Stroke = strokeColor + circleEl.Style = "stroke-width: 1px" + circleEl.Cx = float64(LEGEND_ICON_SIZE) / 2 + circleEl.Cy = float64(LEGEND_ICON_SIZE) / 2 + circleEl.R = float64(LEGEND_ICON_SIZE)/2 - 2 + fmt.Fprint(buf, circleEl.Render()) + + case d2target.ShapeDiamond: + // Diamond shape using a simple polygon + size := float64(LEGEND_ICON_SIZE) + halfSize := size / 2 + + diamondEl := d2themes.NewThemableElement("polygon", theme) + diamondEl.Fill = fillColor + diamondEl.Stroke = strokeColor + diamondEl.Style = "stroke-width: 1px" + diamondEl.Points = fmt.Sprintf("%.1f,%.1f %.1f,%.1f %.1f,%.1f %.1f,%.1f", + halfSize, 2.0, // top + size-2.0, halfSize, // right + halfSize, size-2.0, // bottom + 2.0, halfSize) // left + fmt.Fprint(buf, diamondEl.Render()) + + case d2target.ShapeCylinder: + // Simplified cylinder + fmt.Fprintf(buf, ``) + + // Main rectangle part (body of cylinder) + rectEl := d2themes.NewThemableElement("rect", theme) + rectEl.Fill = fillColor + rectEl.Stroke = strokeColor + rectEl.Style = "stroke-width: 1px" + rectEl.X = 2 + rectEl.Y = 6 + rectEl.Width = float64(LEGEND_ICON_SIZE - 4) + rectEl.Height = float64(LEGEND_ICON_SIZE - 10) + fmt.Fprint(buf, rectEl.Render()) + + // Top ellipse + ellipseEl := d2themes.NewThemableElement("ellipse", theme) + ellipseEl.Fill = fillColor + ellipseEl.Stroke = strokeColor + ellipseEl.Style = "stroke-width: 1px" + ellipseEl.Cx = float64(LEGEND_ICON_SIZE) / 2 + ellipseEl.Cy = 6 + ellipseEl.Rx = float64(LEGEND_ICON_SIZE-4) / 2 + ellipseEl.Ry = 3 + fmt.Fprint(buf, ellipseEl.Render()) + + fmt.Fprintf(buf, ``) + + default: + // Default rectangle for all other shapes + rectEl := d2themes.NewThemableElement("rect", theme) + rectEl.Fill = fillColor + rectEl.Stroke = strokeColor + rectEl.Style = "stroke-width: 1px" + rectEl.X = 2 + rectEl.Y = 2 + rectEl.Width = float64(LEGEND_ICON_SIZE - 4) + rectEl.Height = float64(LEGEND_ICON_SIZE - 4) + + // Apply borderRadius appropriately + if s.Type != d2target.ShapeSquare && s.Type != d2target.ShapeRectangle { + rectEl.Rx = 4 + } + + fmt.Fprint(buf, rectEl.Render()) + } + + return nil +} + +func arrowheadMarkerID(diagramHash string, isTarget bool, connection d2target.Connection) string { + var arrowhead d2target.Arrowhead + if isTarget { + arrowhead = connection.DstArrow + } else { + arrowhead = connection.SrcArrow + } + + return fmt.Sprintf("mk-%s-%s", diagramHash, hash(fmt.Sprintf("%s,%t,%d,%s", + arrowhead, isTarget, connection.StrokeWidth, connection.Stroke, + ))) +} + +func arrowheadMarker(isTarget bool, id string, connection d2target.Connection, inlineTheme *d2themes.Theme) string { + arrowhead := connection.DstArrow + if !isTarget { + arrowhead = connection.SrcArrow + } + strokeWidth := float64(connection.StrokeWidth) + width, height := arrowhead.Dimensions(strokeWidth) + + var path string + switch arrowhead { + case d2target.ArrowArrowhead: + polygonEl := d2themes.NewThemableElement("polygon", inlineTheme) + polygonEl.Fill = connection.Stroke + polygonEl.ClassName = "connection" + polygonEl.Attributes = fmt.Sprintf(`stroke-width="%d"`, connection.StrokeWidth) + + if isTarget { + polygonEl.Points = fmt.Sprintf("%f,%f %f,%f %f,%f %f,%f", + 0., 0., + width, height/2, + 0., height, + width/4, height/2, + ) + } else { + polygonEl.Points = fmt.Sprintf("%f,%f %f,%f %f,%f %f,%f", + 0., height/2, + width, 0., + width*3/4, height/2, + width, height, + ) + } + path = polygonEl.Render() + case d2target.UnfilledTriangleArrowhead: + polygonEl := d2themes.NewThemableElement("polygon", inlineTheme) + polygonEl.Fill = d2target.BG_COLOR + polygonEl.Stroke = connection.Stroke + polygonEl.ClassName = "connection" + polygonEl.Attributes = fmt.Sprintf(`stroke-width="%d"`, connection.StrokeWidth) + + inset := strokeWidth / 2 + if isTarget { + polygonEl.Points = fmt.Sprintf("%f,%f %f,%f %f,%f", + inset, inset, + width-inset, height/2.0, + inset, height-inset, + ) + } else { + polygonEl.Points = fmt.Sprintf("%f,%f %f,%f %f,%f", + width-inset, inset, + inset, height/2.0, + width-inset, height-inset, + ) + } + path = polygonEl.Render() + + case d2target.TriangleArrowhead: + polygonEl := d2themes.NewThemableElement("polygon", inlineTheme) + polygonEl.Fill = connection.Stroke + polygonEl.ClassName = "connection" + polygonEl.Attributes = fmt.Sprintf(`stroke-width="%d"`, connection.StrokeWidth) + + if isTarget { + polygonEl.Points = fmt.Sprintf("%f,%f %f,%f %f,%f", + 0., 0., + width, height/2.0, + 0., height, + ) + } else { + polygonEl.Points = fmt.Sprintf("%f,%f %f,%f %f,%f", + width, 0., + 0., height/2.0, + width, height, + ) + } + path = polygonEl.Render() + case d2target.LineArrowhead: + polylineEl := d2themes.NewThemableElement("polyline", inlineTheme) + polylineEl.Fill = color.None + polylineEl.ClassName = "connection" + polylineEl.Stroke = connection.Stroke + polylineEl.Attributes = fmt.Sprintf(`stroke-width="%d"`, connection.StrokeWidth) + + if isTarget { + polylineEl.Points = fmt.Sprintf("%f,%f %f,%f %f,%f", + strokeWidth/2, strokeWidth/2, + width-strokeWidth/2, height/2, + strokeWidth/2, height-strokeWidth/2, + ) + } else { + polylineEl.Points = fmt.Sprintf("%f,%f %f,%f %f,%f", + width-strokeWidth/2, strokeWidth/2, + strokeWidth/2, height/2, + width-strokeWidth/2, height-strokeWidth/2, + ) + } + path = polylineEl.Render() + case d2target.FilledDiamondArrowhead: + polygonEl := d2themes.NewThemableElement("polygon", inlineTheme) + polygonEl.ClassName = "connection" + polygonEl.Fill = connection.Stroke + polygonEl.Attributes = fmt.Sprintf(`stroke-width="%d"`, connection.StrokeWidth) + + if isTarget { + polygonEl.Points = fmt.Sprintf("%f,%f %f,%f %f,%f %f,%f", + 0., height/2.0, + width/2.0, 0., + width, height/2.0, + width/2.0, height, + ) + } else { + polygonEl.Points = fmt.Sprintf("%f,%f %f,%f %f,%f %f,%f", + 0., height/2.0, + width/2.0, 0., + width, height/2.0, + width/2.0, height, + ) + } + path = polygonEl.Render() + case d2target.DiamondArrowhead: + polygonEl := d2themes.NewThemableElement("polygon", inlineTheme) + polygonEl.ClassName = "connection" + polygonEl.Fill = d2target.BG_COLOR + polygonEl.Stroke = connection.Stroke + polygonEl.Attributes = fmt.Sprintf(`stroke-width="%d"`, connection.StrokeWidth) + + if isTarget { + polygonEl.Points = fmt.Sprintf("%f,%f %f,%f %f,%f %f,%f", + 0., height/2.0, + width/2, height/8, + width, height/2.0, + width/2.0, height*0.9, + ) + } else { + polygonEl.Points = fmt.Sprintf("%f,%f %f,%f %f,%f %f,%f", + width/8, height/2.0, + width*0.6, height/8, + width*1.1, height/2.0, + width*0.6, height*7/8, + ) + } + path = polygonEl.Render() + case d2target.FilledCircleArrowhead: + radius := width / 2 + + circleEl := d2themes.NewThemableElement("circle", inlineTheme) + circleEl.Cy = radius + circleEl.R = radius - strokeWidth/2 + circleEl.Fill = connection.Stroke + circleEl.ClassName = "connection" + circleEl.Attributes = fmt.Sprintf(`stroke-width="%d"`, connection.StrokeWidth) + + if isTarget { + circleEl.Cx = radius + strokeWidth/2 + } else { + circleEl.Cx = radius - strokeWidth/2 + } + + path = circleEl.Render() + case d2target.CircleArrowhead: + radius := width / 2 + + circleEl := d2themes.NewThemableElement("circle", inlineTheme) + circleEl.Cy = radius + circleEl.R = radius - strokeWidth + circleEl.Fill = d2target.BG_COLOR + circleEl.Stroke = connection.Stroke + circleEl.Attributes = fmt.Sprintf(`stroke-width="%d"`, connection.StrokeWidth) + + if isTarget { + circleEl.Cx = radius + strokeWidth/2 + } else { + circleEl.Cx = radius - strokeWidth/2 + } + + path = circleEl.Render() + case d2target.FilledBoxArrowhead: + polygonEl := d2themes.NewThemableElement("polygon", inlineTheme) + polygonEl.ClassName = "connection" + polygonEl.Fill = connection.Stroke + polygonEl.Attributes = fmt.Sprintf(`stroke-width="%d"`, connection.StrokeWidth) + + if isTarget { + polygonEl.Points = fmt.Sprintf("%f,%f %f,%f %f,%f %f,%f", + 0., 0., + 0., height, + width, height, + width, 0., + ) + } else { + polygonEl.Points = fmt.Sprintf("%f,%f %f,%f %f,%f %f,%f", + 0., 0., + 0., height, + width, height, + width, 0., + ) + } + + path = polygonEl.Render() + case d2target.BoxArrowhead: + polygonEl := d2themes.NewThemableElement("polygon", inlineTheme) + polygonEl.ClassName = "connection" + polygonEl.Fill = d2target.BG_COLOR + polygonEl.Stroke = connection.Stroke + polygonEl.Attributes = fmt.Sprintf(`stroke-width="%d"`, connection.StrokeWidth) + polygonEl.Style = fmt.Sprintf("%sstroke-linejoin:miter;", polygonEl.Style) + + inset := strokeWidth / 2 + if isTarget { + polygonEl.Points = fmt.Sprintf("%f,%f %f,%f %f,%f %f,%f", + inset, inset, + inset, height-inset, + width-inset, height-inset, + width-inset, inset, + ) + } else { + polygonEl.Points = fmt.Sprintf("%f,%f %f,%f %f,%f %f,%f", + inset, inset, + inset, height-inset, + width-inset, height-inset, + width-inset, inset, + ) + } + path = polygonEl.Render() + case d2target.CfOne, d2target.CfMany, d2target.CfOneRequired, d2target.CfManyRequired: + offset := 3.0 + float64(connection.StrokeWidth)*1.8 + + var modifierEl *d2themes.ThemableElement + if arrowhead == d2target.CfOneRequired || arrowhead == d2target.CfManyRequired { + modifierEl = d2themes.NewThemableElement("path", inlineTheme) + modifierEl.D = fmt.Sprintf("M%f,%f %f,%f", + offset, 0., + offset, height, + ) + modifierEl.Fill = d2target.BG_COLOR + modifierEl.Stroke = connection.Stroke + modifierEl.ClassName = "connection" + modifierEl.Attributes = fmt.Sprintf(`stroke-width="%d"`, connection.StrokeWidth) + } else { + modifierEl = d2themes.NewThemableElement("circle", inlineTheme) + modifierEl.Cx = offset/2.0 + 2.0 + modifierEl.Cy = height / 2.0 + modifierEl.R = offset / 2.0 + modifierEl.Fill = d2target.BG_COLOR + modifierEl.Stroke = connection.Stroke + modifierEl.ClassName = "connection" + modifierEl.Attributes = fmt.Sprintf(`stroke-width="%d"`, connection.StrokeWidth) + } + + childPathEl := d2themes.NewThemableElement("path", inlineTheme) + if arrowhead == d2target.CfMany || arrowhead == d2target.CfManyRequired { + childPathEl.D = fmt.Sprintf("M%f,%f %f,%f M%f,%f %f,%f M%f,%f %f,%f", + width-3.0, height/2.0, + width+offset, height/2.0, + offset+3.0, height/2.0, + width+offset, 0., + offset+3.0, height/2.0, + width+offset, height, + ) + } else { + childPathEl.D = fmt.Sprintf("M%f,%f %f,%f M%f,%f %f,%f", + width-3.0, height/2.0, + width+offset, height/2.0, + offset*2.0, 0., + offset*2.0, height, + ) + } + + gEl := d2themes.NewThemableElement("g", inlineTheme) + if !isTarget { + gEl.Transform = fmt.Sprintf("scale(-1) translate(-%f, -%f)", width, height) + } + gEl.Fill = d2target.BG_COLOR + gEl.Stroke = connection.Stroke + gEl.ClassName = "connection" + gEl.Attributes = fmt.Sprintf(`stroke-width="%d"`, connection.StrokeWidth) + gEl.Content = fmt.Sprintf("%s%s", + modifierEl.Render(), childPathEl.Render(), + ) + path = gEl.Render() + default: + return "" + } + + var refX float64 + refY := height / 2 + switch arrowhead { + case d2target.DiamondArrowhead: + if isTarget { + refX = width - 0.6*strokeWidth + } else { + refX = width/8 + 0.6*strokeWidth + } + width *= 1.1 + default: + if isTarget { + refX = width - 1.5*strokeWidth + } else { + refX = 1.5 * strokeWidth + } + } + + return strings.Join([]string{ + fmt.Sprintf(``, + path, + "", + }, " ") +} + +// compute the (dx, dy) adjustment to apply to get the arrowhead-adjusted end point +func arrowheadAdjustment(start, end *geo.Point, arrowhead d2target.Arrowhead, edgeStrokeWidth, shapeStrokeWidth int) *geo.Point { + distance := (float64(edgeStrokeWidth) + float64(shapeStrokeWidth)) / 2.0 + if arrowhead != d2target.NoArrowhead { + distance += float64(edgeStrokeWidth) + } + + v := geo.NewVector(end.X-start.X, end.Y-start.Y) + return v.Unit().Multiply(-distance).ToPoint() +} + +func getArrowheadAdjustments(connection d2target.Connection, idToShape map[string]d2target.Shape) (srcAdj, dstAdj *geo.Point) { + route := connection.Route + srcShape := idToShape[connection.Src] + dstShape := idToShape[connection.Dst] + + sourceAdjustment := arrowheadAdjustment(route[1], route[0], connection.SrcArrow, connection.StrokeWidth, srcShape.StrokeWidth) + + targetAdjustment := arrowheadAdjustment(route[len(route)-2], route[len(route)-1], connection.DstArrow, connection.StrokeWidth, dstShape.StrokeWidth) + return sourceAdjustment, targetAdjustment +} + +// returns the path's d attribute for the given connection +func pathData(connection d2target.Connection, srcAdj, dstAdj *geo.Point) string { + var path []string + route := connection.Route + + path = append(path, fmt.Sprintf("M %f %f", + route[0].X+srcAdj.X, + route[0].Y+srcAdj.Y, + )) + + if connection.IsCurve { + i := 1 + for ; i < len(route)-3; i += 3 { + path = append(path, fmt.Sprintf("C %f %f %f %f %f %f", + route[i].X, route[i].Y, + route[i+1].X, route[i+1].Y, + route[i+2].X, route[i+2].Y, + )) + } + // final curve target adjustment + path = append(path, fmt.Sprintf("C %f %f %f %f %f %f", + route[i].X, route[i].Y, + route[i+1].X, route[i+1].Y, + route[i+2].X+dstAdj.X, + route[i+2].Y+dstAdj.Y, + )) + } else { + for i := 1; i < len(route)-1; i++ { + prevSource := route[i-1] + prevTarget := route[i] + currTarget := route[i+1] + prevVector := prevSource.VectorTo(prevTarget) + currVector := prevTarget.VectorTo(currTarget) + + dist := geo.EuclideanDistance(prevTarget.X, prevTarget.Y, currTarget.X, currTarget.Y) + + connectionBorderRadius := connection.BorderRadius + units := math.Min(connectionBorderRadius, dist/2) + + prevTranslations := prevVector.Unit().Multiply(units).ToPoint() + currTranslations := currVector.Unit().Multiply(units).ToPoint() + + path = append(path, fmt.Sprintf("L %f %f", + prevTarget.X-prevTranslations.X, + prevTarget.Y-prevTranslations.Y, + )) + + // If the segment length is too small, instead of drawing 2 arcs, just skip this segment and bezier curve to the next one + if units < connectionBorderRadius && i < len(route)-2 { + nextTarget := route[i+2] + nextVector := geo.NewVector(nextTarget.X-currTarget.X, nextTarget.Y-currTarget.Y) + i++ + nextTranslations := nextVector.Unit().Multiply(units).ToPoint() + + // These 2 bezier control points aren't just at the corner -- they are reflected at the corner, which causes the curve to be ~tangent to the corner, + // which matches how the two arcs look + path = append(path, fmt.Sprintf("C %f %f %f %f %f %f", + // Control point + prevTarget.X+prevTranslations.X, + prevTarget.Y+prevTranslations.Y, + // Control point + currTarget.X-nextTranslations.X, + currTarget.Y-nextTranslations.Y, + // Where curve ends + currTarget.X+nextTranslations.X, + currTarget.Y+nextTranslations.Y, + )) + } else { + path = append(path, fmt.Sprintf("S %f %f %f %f", + prevTarget.X, + prevTarget.Y, + prevTarget.X+currTranslations.X, + prevTarget.Y+currTranslations.Y, + )) + } + } + + lastPoint := route[len(route)-1] + path = append(path, fmt.Sprintf("L %f %f", + lastPoint.X+dstAdj.X, + lastPoint.Y+dstAdj.Y, + )) + } + + return strings.Join(path, " ") +} + +func makeLabelMask(labelTL *geo.Point, width, height int, opacity float64) string { + fill := "black" + if opacity != 1 { + fill = fmt.Sprintf("rgba(0,0,0,%.2f)", opacity) + } + return fmt.Sprintf(``, + labelTL.X, labelTL.Y, + width, + height, + fill, + ) +} + +func drawConnection(writer io.Writer, diagramHash string, connection d2target.Connection, markers map[string]struct{}, idToShape map[string]d2target.Shape, jsRunner jsrunner.JSRunner, inlineTheme *d2themes.Theme) (labelMask string, _ error) { + opacityStyle := "" + if connection.Opacity != 1.0 { + opacityStyle = fmt.Sprintf(" style='opacity:%f'", connection.Opacity) + } + + classes := []string{base64.URLEncoding.EncodeToString([]byte(svg.EscapeText(connection.ID)))} + classes = append(classes, connection.Classes...) + classStr := fmt.Sprintf(` class="%s"`, strings.Join(classes, " ")) + + fmt.Fprintf(writer, ``, classStr, opacityStyle) + var markerStart string + if connection.SrcArrow != d2target.NoArrowhead { + id := arrowheadMarkerID(diagramHash, false, connection) + if _, in := markers[id]; !in { + marker := arrowheadMarker(false, id, connection, inlineTheme) + if marker == "" { + panic(fmt.Sprintf("received empty arrow head marker for: %#v", connection)) + } + fmt.Fprint(writer, marker) + markers[id] = struct{}{} + } + markerStart = fmt.Sprintf(`marker-start="url(#%s)" `, id) + } + + var markerEnd string + if connection.DstArrow != d2target.NoArrowhead { + id := arrowheadMarkerID(diagramHash, true, connection) + if _, in := markers[id]; !in { + marker := arrowheadMarker(true, id, connection, inlineTheme) + if marker == "" { + panic(fmt.Sprintf("received empty arrow head marker for: %#v", connection)) + } + fmt.Fprint(writer, marker) + markers[id] = struct{}{} + } + markerEnd = fmt.Sprintf(`marker-end="url(#%s)" `, id) + } + + if connection.Icon != nil { + iconPos := connection.GetIconPosition() + if iconPos != nil { + fmt.Fprintf(writer, ``, + html.EscapeString(connection.Icon.String()), + iconPos.X, + iconPos.Y, + d2target.DEFAULT_ICON_SIZE, + d2target.DEFAULT_ICON_SIZE, + ) + } + } + + var labelTL *geo.Point + if connection.Label != "" { + labelTL = connection.GetLabelTopLeft() + labelTL.X = math.Round(labelTL.X) + labelTL.Y = math.Round(labelTL.Y) + + maskTL := labelTL.Copy() + width := connection.LabelWidth + height := connection.LabelHeight + + if connection.Icon != nil { + width += d2target.CONNECTION_ICON_LABEL_GAP + d2target.DEFAULT_ICON_SIZE + maskTL.X -= float64(d2target.CONNECTION_ICON_LABEL_GAP + d2target.DEFAULT_ICON_SIZE) + } + + if label.FromString(connection.LabelPosition).IsOnEdge() { + labelMask = makeLabelMask(maskTL, width, height, 1) + } else { + labelMask = makeLabelMask(maskTL, width, height, 0.75) + } + } else if connection.Icon != nil { + iconPos := connection.GetIconPosition() + if iconPos != nil { + maskTL := &geo.Point{ + X: iconPos.X, + Y: iconPos.Y, + } + if label.FromString(connection.IconPosition).IsOnEdge() { + labelMask = makeLabelMask(maskTL, d2target.DEFAULT_ICON_SIZE, d2target.DEFAULT_ICON_SIZE, 1) + } else { + labelMask = makeLabelMask(maskTL, d2target.DEFAULT_ICON_SIZE, d2target.DEFAULT_ICON_SIZE, 0.75) + } + } + } + + srcAdj, dstAdj := getArrowheadAdjustments(connection, idToShape) + path := pathData(connection, srcAdj, dstAdj) + mask := fmt.Sprintf(`mask="url(#%s)"`, diagramHash) + + if jsRunner != nil { + out, err := d2sketch.Connection(jsRunner, connection, path, mask) + if err != nil { + return "", err + } + fmt.Fprint(writer, out) + + // render sketch arrowheads separately + arrowPaths, err := d2sketch.Arrowheads(jsRunner, connection, srcAdj, dstAdj) + if err != nil { + return "", err + } + fmt.Fprint(writer, arrowPaths) + } else { + animatedClass := "" + if connection.Animated { + animatedClass = " animated-connection" + } + + // If connection is animated and bidirectional + if connection.Animated && ((connection.DstArrow == d2target.NoArrowhead && connection.SrcArrow == d2target.NoArrowhead) || (connection.DstArrow != d2target.NoArrowhead && connection.SrcArrow != d2target.NoArrowhead)) { + // There is no pure CSS way to animate bidirectional connections in two directions, so we split it up + path1, path2, err := svg.SplitPath(path, 0.5) + + if err != nil { + return "", err + } + + pathEl1 := d2themes.NewThemableElement("path", inlineTheme) + pathEl1.D = path1 + pathEl1.Fill = color.None + pathEl1.Stroke = connection.Stroke + pathEl1.ClassName = fmt.Sprintf("connection%s", animatedClass) + pathEl1.Style = connection.CSSStyle() + pathEl1.Style += "animation-direction: reverse;" + pathEl1.Attributes = fmt.Sprintf("%s%s", markerStart, mask) + fmt.Fprint(writer, pathEl1.Render()) + + pathEl2 := d2themes.NewThemableElement("path", inlineTheme) + pathEl2.D = path2 + pathEl2.Fill = color.None + pathEl2.Stroke = connection.Stroke + pathEl2.ClassName = fmt.Sprintf("connection%s", animatedClass) + pathEl2.Style = connection.CSSStyle() + pathEl2.Attributes = fmt.Sprintf("%s%s", markerEnd, mask) + fmt.Fprint(writer, pathEl2.Render()) + } else { + pathEl := d2themes.NewThemableElement("path", inlineTheme) + pathEl.D = path + pathEl.Fill = color.None + pathEl.Stroke = connection.Stroke + pathEl.ClassName = fmt.Sprintf("connection%s", animatedClass) + pathEl.Style = connection.CSSStyle() + pathEl.Attributes = fmt.Sprintf("%s%s%s", markerStart, markerEnd, mask) + fmt.Fprint(writer, pathEl.Render()) + } + } + + if connection.Label != "" { + fontClass := "text" + if connection.FontFamily == "mono" { + fontClass = "text-mono" + } + if connection.Bold { + fontClass += "-bold" + } else if connection.Italic { + fontClass += "-italic" + } + if connection.Underline { + fontClass += " text-underline" + } + if connection.Fill != color.Empty { + rectEl := d2themes.NewThemableElement("rect", inlineTheme) + rectEl.Rx = 10 + rectEl.X, rectEl.Y = labelTL.X-4, labelTL.Y-3 + rectEl.Width, rectEl.Height = float64(connection.LabelWidth)+8, float64(connection.LabelHeight)+6 + rectEl.Fill = connection.Fill + fmt.Fprint(writer, rectEl.Render()) + } + + textEl := d2themes.NewThemableElement("text", inlineTheme) + textEl.X = labelTL.X + float64(connection.LabelWidth)/2 + textEl.Y = labelTL.Y + float64(connection.FontSize) + textEl.ClassName = fontClass + textEl.Style = fmt.Sprintf("text-anchor:%s;font-size:%vpx", "middle", connection.FontSize) + textEl.Content = RenderText(connection.Label, textEl.X, float64(connection.LabelHeight)) + + if connection.Link != "" { + textEl.ClassName += " text-underline text-link" + + fmt.Fprintf(writer, ``, svg.EscapeText(connection.Link)) + } else { + textEl.Fill = connection.GetFontColor() + } + + fmt.Fprint(writer, textEl.Render()) + + if connection.Link != "" { + fmt.Fprintf(writer, "") + } + } + + if connection.SrcLabel != nil && connection.SrcLabel.Label != "" { + fmt.Fprint(writer, renderArrowheadLabel(connection, connection.SrcLabel.Label, false, inlineTheme)) + } + if connection.DstLabel != nil && connection.DstLabel.Label != "" { + fmt.Fprint(writer, renderArrowheadLabel(connection, connection.DstLabel.Label, true, inlineTheme)) + } + fmt.Fprintf(writer, ``) + return +} + +func renderArrowheadLabel(connection d2target.Connection, text string, isDst bool, inlineTheme *d2themes.Theme) string { + var width, height float64 + if isDst { + width = float64(connection.DstLabel.LabelWidth) + height = float64(connection.DstLabel.LabelHeight) + } else { + width = float64(connection.SrcLabel.LabelWidth) + height = float64(connection.SrcLabel.LabelHeight) + } + + labelTL := connection.GetArrowheadLabelPosition(isDst) + + // svg text is positioned with the center of its baseline + baselineCenter := geo.Point{ + X: labelTL.X + width/2., + Y: labelTL.Y + float64(connection.FontSize), + } + + textEl := d2themes.NewThemableElement("text", inlineTheme) + textEl.X = baselineCenter.X + textEl.Y = baselineCenter.Y + textEl.Fill = d2target.FG_COLOR + if isDst { + if connection.DstLabel.Color != "" { + textEl.Fill = connection.DstLabel.Color + } + } else { + if connection.SrcLabel.Color != "" { + textEl.Fill = connection.SrcLabel.Color + } + } + textEl.ClassName = "text-italic" + textEl.Style = fmt.Sprintf("text-anchor:middle;font-size:%vpx", connection.FontSize) + textEl.Content = RenderText(text, textEl.X, height) + return textEl.Render() +} + +func renderOval(tl *geo.Point, width, height float64, fill, fillPattern, stroke, style string, inlineTheme *d2themes.Theme) string { + el := d2themes.NewThemableElement("ellipse", inlineTheme) + el.Rx = width / 2 + el.Ry = height / 2 + el.Cx = tl.X + el.Rx + el.Cy = tl.Y + el.Ry + el.Fill, el.Stroke = fill, stroke + el.FillPattern = fillPattern + el.ClassName = "shape" + el.Style = style + return el.Render() +} + +func renderDoubleOval(tl *geo.Point, width, height float64, fill, fillStroke, stroke, style string, inlineTheme *d2themes.Theme) string { + var innerTL *geo.Point = tl.AddVector(geo.NewVector(d2target.INNER_BORDER_OFFSET, d2target.INNER_BORDER_OFFSET)) + return renderOval(tl, width, height, fill, fillStroke, stroke, style, inlineTheme) + renderOval(innerTL, width-10, height-10, fill, "", stroke, style, inlineTheme) +} + +func defineGradients(writer io.Writer, cssGradient string) { + gradient, _ := color.ParseGradient(cssGradient) + fmt.Fprint(writer, fmt.Sprintf(`%s`, color.GradientToSVG(gradient))) +} + +func defineShadowFilter(writer io.Writer) { + fmt.Fprint(writer, ` + + + + + + + +`) +} + +func render3DRect(diagramHash string, targetShape d2target.Shape, inlineTheme *d2themes.Theme) string { + moveTo := func(p d2target.Point) string { + return fmt.Sprintf("M%d,%d", p.X+targetShape.Pos.X, p.Y+targetShape.Pos.Y) + } + lineTo := func(p d2target.Point) string { + return fmt.Sprintf("L%d,%d", p.X+targetShape.Pos.X, p.Y+targetShape.Pos.Y) + } + + // draw border all in one path to prevent overlapping sections + var borderSegments []string + borderSegments = append(borderSegments, + moveTo(d2target.Point{X: 0, Y: 0}), + ) + for _, v := range []d2target.Point{ + {X: d2target.THREE_DEE_OFFSET, Y: -d2target.THREE_DEE_OFFSET}, + {X: targetShape.Width + d2target.THREE_DEE_OFFSET, Y: -d2target.THREE_DEE_OFFSET}, + {X: targetShape.Width + d2target.THREE_DEE_OFFSET, Y: targetShape.Height - d2target.THREE_DEE_OFFSET}, + {X: targetShape.Width, Y: targetShape.Height}, + {X: 0, Y: targetShape.Height}, + {X: 0, Y: 0}, + {X: targetShape.Width, Y: 0}, + {X: targetShape.Width, Y: targetShape.Height}, + } { + borderSegments = append(borderSegments, lineTo(v)) + } + // move to top right to draw last segment without overlapping + borderSegments = append(borderSegments, + moveTo(d2target.Point{X: targetShape.Width, Y: 0}), + ) + borderSegments = append(borderSegments, + lineTo(d2target.Point{X: targetShape.Width + d2target.THREE_DEE_OFFSET, Y: -d2target.THREE_DEE_OFFSET}), + ) + border := d2themes.NewThemableElement("path", inlineTheme) + border.D = strings.Join(borderSegments, " ") + border.Fill = color.None + _, borderStroke := d2themes.ShapeTheme(targetShape) + border.Stroke = borderStroke + borderStyle := targetShape.CSSStyle() + border.Style = borderStyle + renderedBorder := border.Render() + + // create mask from border stroke, to cut away from the shape fills + maskID := fmt.Sprintf("border-mask-%v-%v", diagramHash, svg.EscapeText(targetShape.ID)) + borderMask := strings.Join([]string{ + fmt.Sprintf(``, + maskID, targetShape.Pos.X, targetShape.Pos.Y-d2target.THREE_DEE_OFFSET, targetShape.Width+d2target.THREE_DEE_OFFSET, targetShape.Height+d2target.THREE_DEE_OFFSET, + ), + fmt.Sprintf(``, + targetShape.Pos.X, targetShape.Pos.Y-d2target.THREE_DEE_OFFSET, targetShape.Width+d2target.THREE_DEE_OFFSET, targetShape.Height+d2target.THREE_DEE_OFFSET, + ), + fmt.Sprintf(``, + strings.Join(borderSegments, ""), borderStyle), + }, "\n") + + // render the main rectangle without stroke and the border mask + mainShape := d2themes.NewThemableElement("rect", inlineTheme) + mainShape.X = float64(targetShape.Pos.X) + mainShape.Y = float64(targetShape.Pos.Y) + mainShape.Width = float64(targetShape.Width) + mainShape.Height = float64(targetShape.Height) + mainShape.SetMaskUrl(maskID) + mainShapeFill, _ := d2themes.ShapeTheme(targetShape) + mainShape.Fill = mainShapeFill + mainShape.FillPattern = targetShape.FillPattern + mainShape.Stroke = color.None + mainShape.Style = targetShape.CSSStyle() + mainShapeRendered := mainShape.Render() + + // render the side shapes in the darkened color without stroke and the border mask + var sidePoints []string + for _, v := range []d2target.Point{ + {X: 0, Y: 0}, + {X: d2target.THREE_DEE_OFFSET, Y: -d2target.THREE_DEE_OFFSET}, + {X: targetShape.Width + d2target.THREE_DEE_OFFSET, Y: -d2target.THREE_DEE_OFFSET}, + {X: targetShape.Width + d2target.THREE_DEE_OFFSET, Y: targetShape.Height - d2target.THREE_DEE_OFFSET}, + {X: targetShape.Width, Y: targetShape.Height}, + {X: targetShape.Width, Y: 0}, + } { + sidePoints = append(sidePoints, + fmt.Sprintf("%d,%d", v.X+targetShape.Pos.X, v.Y+targetShape.Pos.Y), + ) + } + darkerColor, err := color.Darken(targetShape.Fill) + if err != nil { + darkerColor = targetShape.Fill + } + sideShape := d2themes.NewThemableElement("polygon", inlineTheme) + sideShape.Fill = darkerColor + sideShape.Points = strings.Join(sidePoints, " ") + sideShape.SetMaskUrl(maskID) + sideShape.Style = targetShape.CSSStyle() + renderedSides := sideShape.Render() + + return borderMask + mainShapeRendered + renderedSides + renderedBorder +} + +func render3DHexagon(diagramHash string, targetShape d2target.Shape, inlineTheme *d2themes.Theme) string { + moveTo := func(p d2target.Point) string { + return fmt.Sprintf("M%d,%d", p.X+targetShape.Pos.X, p.Y+targetShape.Pos.Y) + } + lineTo := func(p d2target.Point) string { + return fmt.Sprintf("L%d,%d", p.X+targetShape.Pos.X, p.Y+targetShape.Pos.Y) + } + scale := func(n int, f float64) int { + return int(float64(n) * f) + } + halfYFactor := 43.6 / 87.3 + + // draw border all in one path to prevent overlapping sections + var borderSegments []string + // start from the top-left + borderSegments = append(borderSegments, + moveTo(d2target.Point{X: scale(targetShape.Width, 0.25), Y: 0}), + ) + Y_OFFSET := d2target.THREE_DEE_OFFSET / 2 + // The following iterates through the sidepoints in clockwise order from top-left, then the main points in clockwise order from bottom-right + for _, v := range []d2target.Point{ + {X: scale(targetShape.Width, 0.25) + d2target.THREE_DEE_OFFSET, Y: -Y_OFFSET}, + {X: scale(targetShape.Width, 0.75) + d2target.THREE_DEE_OFFSET, Y: -Y_OFFSET}, + {X: targetShape.Width + d2target.THREE_DEE_OFFSET, Y: scale(targetShape.Height, halfYFactor) - Y_OFFSET}, + {X: scale(targetShape.Width, 0.75) + d2target.THREE_DEE_OFFSET, Y: targetShape.Height - Y_OFFSET}, + {X: scale(targetShape.Width, 0.75), Y: targetShape.Height}, + {X: scale(targetShape.Width, 0.25), Y: targetShape.Height}, + {X: 0, Y: scale(targetShape.Height, halfYFactor)}, + {X: scale(targetShape.Width, 0.25), Y: 0}, + {X: scale(targetShape.Width, 0.75), Y: 0}, + {X: targetShape.Width, Y: scale(targetShape.Height, halfYFactor)}, + {X: scale(targetShape.Width, 0.75), Y: targetShape.Height}, + } { + borderSegments = append(borderSegments, lineTo(v)) + } + for _, v := range []d2target.Point{ + {X: scale(targetShape.Width, 0.75), Y: 0}, + {X: targetShape.Width, Y: scale(targetShape.Height, halfYFactor)}, + {X: scale(targetShape.Width, 0.75), Y: targetShape.Height}, + } { + borderSegments = append(borderSegments, moveTo(v)) + borderSegments = append(borderSegments, lineTo( + d2target.Point{X: v.X + d2target.THREE_DEE_OFFSET, Y: v.Y - Y_OFFSET}, + )) + } + border := d2themes.NewThemableElement("path", inlineTheme) + border.D = strings.Join(borderSegments, " ") + border.Fill = color.None + _, borderStroke := d2themes.ShapeTheme(targetShape) + border.Stroke = borderStroke + borderStyle := targetShape.CSSStyle() + border.Style = borderStyle + renderedBorder := border.Render() + + var mainPoints []string + for _, v := range []d2target.Point{ + {X: scale(targetShape.Width, 0.25), Y: 0}, + {X: scale(targetShape.Width, 0.75), Y: 0}, + {X: targetShape.Width, Y: scale(targetShape.Height, halfYFactor)}, + {X: scale(targetShape.Width, 0.75), Y: targetShape.Height}, + {X: scale(targetShape.Width, 0.25), Y: targetShape.Height}, + {X: 0, Y: scale(targetShape.Height, halfYFactor)}, + } { + mainPoints = append(mainPoints, + fmt.Sprintf("%d,%d", v.X+targetShape.Pos.X, v.Y+targetShape.Pos.Y), + ) + } + + mainPointsPoly := strings.Join(mainPoints, " ") + // create mask from border stroke, to cut away from the shape fills + maskID := fmt.Sprintf("border-mask-%v-%v", diagramHash, svg.EscapeText(targetShape.ID)) + borderMask := strings.Join([]string{ + fmt.Sprintf(``, + maskID, targetShape.Pos.X, targetShape.Pos.Y-d2target.THREE_DEE_OFFSET, targetShape.Width+d2target.THREE_DEE_OFFSET, targetShape.Height+d2target.THREE_DEE_OFFSET, + ), + fmt.Sprintf(``, + targetShape.Pos.X, targetShape.Pos.Y-d2target.THREE_DEE_OFFSET, targetShape.Width+d2target.THREE_DEE_OFFSET, targetShape.Height+d2target.THREE_DEE_OFFSET, + ), + fmt.Sprintf(``, + strings.Join(borderSegments, ""), borderStyle), + }, "\n") + // render the main hexagon without stroke and the border mask + mainShape := d2themes.NewThemableElement("polygon", inlineTheme) + mainShape.X = float64(targetShape.Pos.X) + mainShape.Y = float64(targetShape.Pos.Y) + mainShape.Points = mainPointsPoly + mainShape.SetMaskUrl(maskID) + mainShapeFill, _ := d2themes.ShapeTheme(targetShape) + mainShape.FillPattern = targetShape.FillPattern + mainShape.Fill = mainShapeFill + mainShape.Stroke = color.None + mainShape.Style = targetShape.CSSStyle() + mainShapeRendered := mainShape.Render() + + // render the side shapes in the darkened color without stroke and the border mask + var sidePoints []string + for _, v := range []d2target.Point{ + {X: scale(targetShape.Width, 0.25) + d2target.THREE_DEE_OFFSET, Y: -Y_OFFSET}, + {X: scale(targetShape.Width, 0.75) + d2target.THREE_DEE_OFFSET, Y: -Y_OFFSET}, + {X: targetShape.Width + d2target.THREE_DEE_OFFSET, Y: scale(targetShape.Height, halfYFactor) - Y_OFFSET}, + {X: scale(targetShape.Width, 0.75) + d2target.THREE_DEE_OFFSET, Y: targetShape.Height - Y_OFFSET}, + {X: scale(targetShape.Width, 0.75), Y: targetShape.Height}, + {X: targetShape.Width, Y: scale(targetShape.Height, halfYFactor)}, + {X: scale(targetShape.Width, 0.75), Y: 0}, + {X: scale(targetShape.Width, 0.25), Y: 0}, + } { + sidePoints = append(sidePoints, + fmt.Sprintf("%d,%d", v.X+targetShape.Pos.X, v.Y+targetShape.Pos.Y), + ) + } + // TODO make darker color part of the theme? or just keep this bypass + darkerColor, err := color.Darken(targetShape.Fill) + if err != nil { + darkerColor = targetShape.Fill + } + sideShape := d2themes.NewThemableElement("polygon", inlineTheme) + sideShape.Fill = darkerColor + sideShape.Points = strings.Join(sidePoints, " ") + sideShape.SetMaskUrl(maskID) + sideShape.Style = targetShape.CSSStyle() + renderedSides := sideShape.Render() + + return borderMask + mainShapeRendered + renderedSides + renderedBorder +} + +func drawShape(writer, appendixWriter io.Writer, diagramHash string, targetShape d2target.Shape, jsRunner jsrunner.JSRunner, inlineTheme *d2themes.Theme) (labelMask string, err error) { + closingTag := "" + if targetShape.Link != "" { + + fmt.Fprintf(writer, ``, svg.EscapeText(targetShape.Link)) + closingTag += "" + } + // Opacity is a unique style, it applies to everything for a shape + opacityStyle := "" + if targetShape.Opacity != 1.0 { + opacityStyle = fmt.Sprintf(" style='opacity:%f'", targetShape.Opacity) + } + + // this clipPath must be defined outside `g` element + if targetShape.BorderRadius != 0 && (targetShape.Type == d2target.ShapeClass || targetShape.Type == d2target.ShapeSQLTable) { + fmt.Fprint(writer, clipPathForBorderRadius(diagramHash, targetShape)) + } + classes := []string{base64.URLEncoding.EncodeToString([]byte(svg.EscapeText(targetShape.ID)))} + if targetShape.Animated { + classes = append(classes, "animated-shape") + } + classes = append(classes, targetShape.Classes...) + classStr := fmt.Sprintf(` class="%s"`, strings.Join(classes, " ")) + fmt.Fprintf(writer, ``, classStr, opacityStyle) + tl := geo.NewPoint(float64(targetShape.Pos.X), float64(targetShape.Pos.Y)) + width := float64(targetShape.Width) + height := float64(targetShape.Height) + fill, stroke := d2themes.ShapeTheme(targetShape) + style := targetShape.CSSStyle() + shapeType := d2target.DSL_SHAPE_TO_SHAPE_TYPE[targetShape.Type] + + s := shape.NewShape(shapeType, geo.NewBox(tl, width, height)) + if shapeType == shape.CLOUD_TYPE && targetShape.ContentAspectRatio != nil { + s.SetInnerBoxAspectRatio(*targetShape.ContentAspectRatio) + } + + var shadowAttr string + if targetShape.Shadow { + switch targetShape.Type { + case d2target.ShapeText, + d2target.ShapeCode, + d2target.ShapeClass, + d2target.ShapeSQLTable: + default: + shadowAttr = `filter="url(#shadow-filter)" ` + } + } + + var blendModeClass string + if targetShape.Blend { + blendModeClass = " blend" + } + + fmt.Fprintf(writer, ``, blendModeClass, shadowAttr) + + var multipleTL *geo.Point + if targetShape.Multiple { + multipleTL = tl.AddVector(multipleOffset) + } + + switch targetShape.Type { + case d2target.ShapeClass: + if jsRunner != nil { + out, err := d2sketch.Class(jsRunner, targetShape) + if err != nil { + return "", err + } + fmt.Fprint(writer, out) + } else { + drawClass(writer, diagramHash, targetShape, inlineTheme) + } + addAppendixItems(appendixWriter, diagramHash, targetShape, s) + fmt.Fprint(writer, ``) + fmt.Fprint(writer, closingTag) + return labelMask, nil + case d2target.ShapeSQLTable: + if jsRunner != nil { + out, err := d2sketch.Table(jsRunner, targetShape) + if err != nil { + return "", err + } + fmt.Fprint(writer, out) + } else { + drawTable(writer, diagramHash, targetShape, inlineTheme) + } + addAppendixItems(appendixWriter, diagramHash, targetShape, s) + fmt.Fprint(writer, ``) + fmt.Fprint(writer, closingTag) + return labelMask, nil + case d2target.ShapeOval: + if targetShape.DoubleBorder { + if targetShape.Multiple { + fmt.Fprint(writer, renderDoubleOval(multipleTL, width, height, fill, "", stroke, style, inlineTheme)) + } + if jsRunner != nil { + out, err := d2sketch.DoubleOval(jsRunner, targetShape) + if err != nil { + return "", err + } + fmt.Fprint(writer, out) + } else { + fmt.Fprint(writer, renderDoubleOval(tl, width, height, fill, targetShape.FillPattern, stroke, style, inlineTheme)) + } + } else { + if targetShape.Multiple { + fmt.Fprint(writer, renderOval(multipleTL, width, height, fill, "", stroke, style, inlineTheme)) + } + if jsRunner != nil { + out, err := d2sketch.Oval(jsRunner, targetShape) + if err != nil { + return "", err + } + fmt.Fprint(writer, out) + } else { + fmt.Fprint(writer, renderOval(tl, width, height, fill, targetShape.FillPattern, stroke, style, inlineTheme)) + } + } + + case d2target.ShapeImage: + el := d2themes.NewThemableElement("image", inlineTheme) + el.X = float64(targetShape.Pos.X) + el.Y = float64(targetShape.Pos.Y) + el.Width = float64(targetShape.Width) + el.Height = float64(targetShape.Height) + el.Href = html.EscapeString(targetShape.Icon.String()) + el.Fill = fill + el.Stroke = stroke + el.Style = style + fmt.Fprint(writer, el.Render()) + + // TODO should standardize "" to rectangle + case d2target.ShapeRectangle, d2target.ShapeSequenceDiagram, d2target.ShapeHierarchy, "": + borderRadius := math.MaxFloat64 + if targetShape.BorderRadius != 0 { + borderRadius = float64(targetShape.BorderRadius) + } + if targetShape.ThreeDee { + fmt.Fprint(writer, render3DRect(diagramHash, targetShape, inlineTheme)) + } else { + if !targetShape.DoubleBorder { + if targetShape.Multiple { + el := d2themes.NewThemableElement("rect", inlineTheme) + el.X = float64(targetShape.Pos.X + 10) + el.Y = float64(targetShape.Pos.Y - 10) + el.Width = float64(targetShape.Width) + el.Height = float64(targetShape.Height) + el.Fill = fill + el.Stroke = stroke + el.Style = style + el.Rx = borderRadius + fmt.Fprint(writer, el.Render()) + } + if jsRunner != nil { + out, err := d2sketch.Rect(jsRunner, targetShape) + if err != nil { + return "", err + } + fmt.Fprint(writer, out) + } else { + el := d2themes.NewThemableElement("rect", inlineTheme) + el.X = float64(targetShape.Pos.X) + el.Y = float64(targetShape.Pos.Y) + el.Width = float64(targetShape.Width) + el.Height = float64(targetShape.Height) + el.Fill = fill + el.FillPattern = targetShape.FillPattern + el.Stroke = stroke + el.Style = style + el.Rx = borderRadius + fmt.Fprint(writer, el.Render()) + } + } else { + if targetShape.Multiple { + el := d2themes.NewThemableElement("rect", inlineTheme) + el.X = float64(targetShape.Pos.X + 10) + el.Y = float64(targetShape.Pos.Y - 10) + el.Width = float64(targetShape.Width) + el.Height = float64(targetShape.Height) + el.Fill = fill + el.FillPattern = targetShape.FillPattern + el.Stroke = stroke + el.Style = style + el.Rx = borderRadius + fmt.Fprint(writer, el.Render()) + + el = d2themes.NewThemableElement("rect", inlineTheme) + el.X = float64(targetShape.Pos.X + 10 + d2target.INNER_BORDER_OFFSET) + el.Y = float64(targetShape.Pos.Y - 10 + d2target.INNER_BORDER_OFFSET) + el.Width = float64(targetShape.Width - 2*d2target.INNER_BORDER_OFFSET) + el.Height = float64(targetShape.Height - 2*d2target.INNER_BORDER_OFFSET) + el.Fill = fill + el.Stroke = stroke + el.Style = style + el.Rx = borderRadius + fmt.Fprint(writer, el.Render()) + } + if jsRunner != nil { + out, err := d2sketch.DoubleRect(jsRunner, targetShape) + if err != nil { + return "", err + } + fmt.Fprint(writer, out) + } else { + el := d2themes.NewThemableElement("rect", inlineTheme) + el.X = float64(targetShape.Pos.X) + el.Y = float64(targetShape.Pos.Y) + el.Width = float64(targetShape.Width) + el.Height = float64(targetShape.Height) + el.Fill = fill + el.FillPattern = targetShape.FillPattern + el.Stroke = stroke + el.Style = style + el.Rx = borderRadius + fmt.Fprint(writer, el.Render()) + + el = d2themes.NewThemableElement("rect", inlineTheme) + el.X = float64(targetShape.Pos.X + d2target.INNER_BORDER_OFFSET) + el.Y = float64(targetShape.Pos.Y + d2target.INNER_BORDER_OFFSET) + el.Width = float64(targetShape.Width - 2*d2target.INNER_BORDER_OFFSET) + el.Height = float64(targetShape.Height - 2*d2target.INNER_BORDER_OFFSET) + el.Fill = "transparent" + el.Stroke = stroke + el.Style = style + el.Rx = borderRadius + fmt.Fprint(writer, el.Render()) + } + } + } + case d2target.ShapeHexagon: + if targetShape.ThreeDee { + fmt.Fprint(writer, render3DHexagon(diagramHash, targetShape, inlineTheme)) + } else { + if targetShape.Multiple { + multiplePathData := shape.NewShape(shapeType, geo.NewBox(multipleTL, width, height)).GetSVGPathData() + el := d2themes.NewThemableElement("path", inlineTheme) + el.Fill = fill + el.Stroke = stroke + el.Style = style + for _, pathData := range multiplePathData { + el.D = pathData + fmt.Fprint(writer, el.Render()) + } + } + + if jsRunner != nil { + out, err := d2sketch.Paths(jsRunner, targetShape, s.GetSVGPathData()) + if err != nil { + return "", err + } + fmt.Fprint(writer, out) + } else { + el := d2themes.NewThemableElement("path", inlineTheme) + el.Fill = fill + el.FillPattern = targetShape.FillPattern + el.Stroke = stroke + el.Style = style + for _, pathData := range s.GetSVGPathData() { + el.D = pathData + fmt.Fprint(writer, el.Render()) + } + } + } + case d2target.ShapeText, d2target.ShapeCode: + default: + if targetShape.Multiple { + multiplePathData := shape.NewShape(shapeType, geo.NewBox(multipleTL, width, height)).GetSVGPathData() + el := d2themes.NewThemableElement("path", inlineTheme) + el.Fill = fill + el.Stroke = stroke + el.Style = style + for _, pathData := range multiplePathData { + el.D = pathData + fmt.Fprint(writer, el.Render()) + } + } + + if jsRunner != nil { + out, err := d2sketch.Paths(jsRunner, targetShape, s.GetSVGPathData()) + if err != nil { + return "", err + } + fmt.Fprint(writer, out) + } else { + el := d2themes.NewThemableElement("path", inlineTheme) + el.Fill = fill + el.FillPattern = targetShape.FillPattern + el.Stroke = stroke + el.Style = style + for _, pathData := range s.GetSVGPathData() { + el.D = pathData + fmt.Fprint(writer, el.Render()) + } + } + } + + // // to examine shape's innerBox + // innerBox := s.GetInnerBox() + // el := d2themes.NewThemableElement("rect", inlineTheme) + // el.X = float64(innerBox.TopLeft.X) + // el.Y = float64(innerBox.TopLeft.Y) + // el.Width = float64(innerBox.Width) + // el.Height = float64(innerBox.Height) + // el.Style = "fill:rgba(255,0,0,0.5);" + // fmt.Fprint(writer, el.Render()) + + // Closes the class=shape + fmt.Fprint(writer, ``) + + if targetShape.Icon != nil && targetShape.Type != d2target.ShapeImage && targetShape.Opacity != 0 { + iconPosition := label.FromString(targetShape.IconPosition) + var box *geo.Box + if iconPosition.IsOutside() { + box = s.GetBox() + } else { + box = s.GetInnerBox() + } + iconSize := d2target.GetIconSize(box, targetShape.IconPosition) + + tl := iconPosition.GetPointOnBox(box, label.PADDING, float64(iconSize), float64(iconSize)) + + fmt.Fprintf(writer, ``, + html.EscapeString(targetShape.Icon.String()), + tl.X, + tl.Y, + iconSize, + iconSize, + ) + } + + if targetShape.Label != "" && targetShape.Opacity != 0 { + labelPosition := label.FromString(targetShape.LabelPosition) + var box *geo.Box + if labelPosition.IsOutside() { + box = s.GetBox().Copy() + // if it is 3d/multiple, place label using box around those + if targetShape.ThreeDee { + offsetY := d2target.THREE_DEE_OFFSET + if targetShape.Type == d2target.ShapeHexagon { + offsetY /= 2 + } + box.TopLeft.Y -= float64(offsetY) + box.Height += float64(offsetY) + box.Width += d2target.THREE_DEE_OFFSET + } else if targetShape.Multiple { + box.TopLeft.Y -= d2target.MULTIPLE_OFFSET + box.Height += d2target.MULTIPLE_OFFSET + box.Width += d2target.MULTIPLE_OFFSET + } + } else { + box = s.GetInnerBox() + } + labelTL := labelPosition.GetPointOnBox(box, label.PADDING, + float64(targetShape.LabelWidth), + float64(targetShape.LabelHeight), + ) + labelMask = makeLabelMask(labelTL, targetShape.LabelWidth, targetShape.LabelHeight, 0.75) + + fontClass := "text" + if targetShape.FontFamily == "mono" { + fontClass = "text-mono" + } + if targetShape.Bold { + fontClass += "-bold" + } else if targetShape.Italic { + fontClass += "-italic" + } + if targetShape.Underline { + fontClass += " text-underline" + } + + if targetShape.Language == "latex" { + render, err := d2latex.Render(targetShape.Label) + if err != nil { + return labelMask, err + } + gEl := d2themes.NewThemableElement("g", inlineTheme) + + labelPosition := label.FromString(targetShape.LabelPosition) + if labelPosition == label.Unset { + labelPosition = label.InsideMiddleCenter + } + var box *geo.Box + if labelPosition.IsOutside() { + box = s.GetBox() + } else { + box = s.GetInnerBox() + } + labelTL := labelPosition.GetPointOnBox(box, label.PADDING, + float64(targetShape.LabelWidth), + float64(targetShape.LabelHeight), + ) + gEl.SetTranslate(labelTL.X, labelTL.Y) + + gEl.Color = targetShape.Stroke + gEl.Content = render + fmt.Fprint(writer, gEl.Render()) + } else if targetShape.Language == "markdown" { + render, err := textmeasure.RenderMarkdown(targetShape.Label) + if err != nil { + return labelMask, err + } + + labelPosition := label.FromString(targetShape.LabelPosition) + if labelPosition == label.Unset { + labelPosition = label.InsideMiddleCenter + } + var box *geo.Box + if labelPosition.IsOutside() { + box = s.GetBox() + } else { + box = s.GetInnerBox() + } + labelTL := labelPosition.GetPointOnBox(box, label.PADDING, + float64(targetShape.LabelWidth), + float64(targetShape.LabelHeight), + ) + + fmt.Fprintf(writer, ``, + labelTL.X, labelTL.Y, targetShape.LabelWidth, targetShape.LabelHeight, + ) + + // we need the self closing form in this svg/xhtml context + render = strings.ReplaceAll(render, "
    ", "
    ") + + mdEl := d2themes.NewThemableElement("div", inlineTheme) + mdEl.ClassName = "md" + mdEl.Content = render + + // We have to set with styles since within foreignObject, we're in html + // land and not SVG attributes + var styles []string + if targetShape.FontSize != textmeasure.MarkdownFontSize { + styles = append(styles, fmt.Sprintf("font-size:%vpx", targetShape.FontSize)) + } + if targetShape.Fill != "" && targetShape.Fill != "transparent" { + styles = append(styles, fmt.Sprintf(`background-color:%s`, targetShape.Fill)) + } + if !color.IsThemeColor(targetShape.Color) { + styles = append(styles, fmt.Sprintf(`color:%s`, targetShape.Color)) + } else { + styles = append(styles, fmt.Sprintf(`color:%s`, d2themes.ResolveThemeColor(*inlineTheme, targetShape.Color))) + } + + mdEl.Style = strings.Join(styles, ";") + + fmt.Fprint(writer, mdEl.Render()) + fmt.Fprint(writer, `    `) + } else if targetShape.Language != "" { + lexer := lexers.Get(targetShape.Language) + if lexer == nil { + lexer = lexers.Fallback + } + for _, isLight := range []bool{true, false} { + theme := "github" + if !isLight { + theme = "catppuccin-mocha" + } + style := styles.Get(theme) + if style == nil { + return labelMask, errors.New(`code snippet style "github" not found`) + } + formatter := formatters.Get("svg") + if formatter == nil { + return labelMask, errors.New(`code snippet formatter "svg" not found`) + } + iterator, err := lexer.Tokenise(nil, targetShape.Label) + if err != nil { + return labelMask, err + } + + svgStyles := styleToSVG(style) + class := "light-code" + if !isLight { + class = "dark-code" + } + var fontSize string + if targetShape.FontSize != d2fonts.FONT_SIZE_M { + fontSize = fmt.Sprintf(` style="font-size:%v"`, targetShape.FontSize) + } + fmt.Fprintf(writer, ``, + box.TopLeft.X, box.TopLeft.Y, class, fontSize, + ) + rectEl := d2themes.NewThemableElement("rect", inlineTheme) + rectEl.Width = float64(targetShape.Width) + rectEl.Height = float64(targetShape.Height) + rectEl.Stroke = targetShape.Stroke + rectEl.ClassName = "shape" + rectEl.Style = fmt.Sprintf(`fill:%s;stroke-width:%d;`, + style.Get(chroma.Background).Background.String(), + targetShape.StrokeWidth, + ) + fmt.Fprint(writer, rectEl.Render()) + // Padding = 0.5em + padding := float64(targetShape.FontSize) / 2. + fmt.Fprintf(writer, ``, padding, padding) + + lineHeight := textmeasure.CODE_LINE_HEIGHT + for index, tokens := range chroma.SplitTokensIntoLines(iterator.Tokens()) { + fmt.Fprintf(writer, "", 1+float64(index)*lineHeight) + for _, token := range tokens { + text := svgEscaper.Replace(token.String()) + attr := styleAttr(svgStyles, token.Type) + if attr != "" { + text = fmt.Sprintf("%s", attr, text) + } + fmt.Fprint(writer, text) + } + fmt.Fprint(writer, "") + } + fmt.Fprint(writer, "") + } + } else { + if targetShape.LabelFill != "" { + rectEl := d2themes.NewThemableElement("rect", inlineTheme) + rectEl.X = labelTL.X + rectEl.Y = labelTL.Y + rectEl.Width = float64(targetShape.LabelWidth) + rectEl.Height = float64(targetShape.LabelHeight) + rectEl.Fill = targetShape.LabelFill + fmt.Fprint(writer, rectEl.Render()) + } + textEl := d2themes.NewThemableElement("text", inlineTheme) + textEl.X = labelTL.X + float64(targetShape.LabelWidth)/2 + // text is vertically positioned at its baseline which is at labelTL+FontSize + textEl.Y = labelTL.Y + float64(targetShape.FontSize) + textEl.Fill = targetShape.GetFontColor() + textEl.ClassName = fontClass + textEl.Style = fmt.Sprintf("text-anchor:%s;font-size:%vpx", "middle", targetShape.FontSize) + textEl.Content = RenderText(targetShape.Label, textEl.X, float64(targetShape.LabelHeight)) + fmt.Fprint(writer, textEl.Render()) + if targetShape.Blend { + labelMask = makeLabelMask(labelTL, targetShape.LabelWidth, targetShape.LabelHeight-d2graph.INNER_LABEL_PADDING, 1) + } + } + } + if targetShape.Tooltip != "" { + fmt.Fprintf(writer, `%s`, + svg.EscapeText(targetShape.Tooltip), + ) + } + addAppendixItems(appendixWriter, diagramHash, targetShape, s) + + fmt.Fprint(writer, closingTag) + return labelMask, nil +} + +func addAppendixItems(writer io.Writer, diagramHash string, targetShape d2target.Shape, s shape.Shape) { + var p1, p2 *geo.Point + if targetShape.Tooltip != "" || targetShape.Link != "" { + bothIcons := targetShape.Tooltip != "" && targetShape.Link != "" + corner := geo.NewPoint(float64(targetShape.Pos.X+targetShape.Width), float64(targetShape.Pos.Y)) + center := geo.NewPoint( + float64(targetShape.Pos.X)+float64(targetShape.Width)/2., + float64(targetShape.Pos.Y)+float64(targetShape.Height)/2., + ) + offset := geo.Vector{-2 * appendixIconRadius, 0} + var leftOnShape bool + switch s.GetType() { + case shape.STEP_TYPE, shape.HEXAGON_TYPE, shape.QUEUE_TYPE, shape.PAGE_TYPE: + // trace straight left for these + center.Y = float64(targetShape.Pos.Y) + case shape.PACKAGE_TYPE: + // trace straight down + center.X = float64(targetShape.Pos.X + targetShape.Width) + case shape.CIRCLE_TYPE, shape.OVAL_TYPE, shape.DIAMOND_TYPE, + shape.PERSON_TYPE, shape.CLOUD_TYPE, shape.CYLINDER_TYPE: + if bothIcons { + leftOnShape = true + corner = corner.AddVector(offset) + } + } + v1 := center.VectorTo(corner) + p1 = shape.TraceToShapeBorder(s, corner, corner.AddVector(v1)) + if bothIcons { + if leftOnShape { + // these shapes should have p1 on shape border + p2 = p1.AddVector(offset.Reverse()) + p1, p2 = p2, p1 + } else { + p2 = p1.AddVector(offset) + } + } + } + + if targetShape.Tooltip != "" { + x := int(math.Ceil(p1.X)) + y := int(math.Ceil(p1.Y)) + + fmt.Fprintf(writer, `%s%s`, + x-appendixIconRadius, + y-appendixIconRadius, + svg.EscapeText(targetShape.Tooltip), + fmt.Sprintf(TooltipIcon, diagramHash, svg.SVGID(targetShape.ID)), + ) + } + if targetShape.Link != "" { + if p2 == nil { + p2 = p1 + } + x := int(math.Ceil(p2.X)) + y := int(math.Ceil(p2.Y)) + fmt.Fprintf(writer, `%s`, + x-appendixIconRadius, + y-appendixIconRadius, + fmt.Sprintf(LinkIcon, diagramHash, svg.SVGID(targetShape.ID)), + ) + } +} + +func RenderText(text string, x, height float64) string { + if !strings.Contains(text, "\n") { + return svg.EscapeText(text) + } + rendered := []string{} + lines := strings.Split(text, "\n") + for i, line := range lines { + dy := height / float64(len(lines)) + if i == 0 { + dy = 0 + } + escaped := svg.EscapeText(line) + if escaped == "" { + // if there are multiple newlines in a row we still need text for the tspan to render + escaped = " " + } + rendered = append(rendered, fmt.Sprintf(`%s`, x, dy, escaped)) + } + return strings.Join(rendered, "") +} + +func EmbedFonts(buf *bytes.Buffer, diagramHash, source string, fontFamily *d2fonts.FontFamily, corpus string) { + fmt.Fprint(buf, ``) +} + +func appendOnTrigger(buf *bytes.Buffer, source string, triggers []string, newContent string) { + for _, trigger := range triggers { + if strings.Contains(source, trigger) { + fmt.Fprint(buf, newContent) + break + } + } +} + +var DEFAULT_DARK_THEME *int64 = nil // no theme selected + +func Render(diagram *d2target.Diagram, opts *RenderOpts) ([]byte, error) { + var jsRunner jsrunner.JSRunner + pad := DEFAULT_PADDING + themeID := d2themescatalog.NeutralDefault.ID + darkThemeID := DEFAULT_DARK_THEME + var scale *float64 + if opts != nil { + if opts.Pad != nil { + pad = int(*opts.Pad) + } + if opts.Sketch != nil && *opts.Sketch { + jsRunner = jsrunner.NewJSRunner() + err := d2sketch.LoadJS(jsRunner) + if err != nil { + return nil, err + } + } + if opts.ThemeID != nil { + themeID = *opts.ThemeID + } + darkThemeID = opts.DarkThemeID + scale = opts.Scale + } else { + opts = &RenderOpts{} + } + + buf := &bytes.Buffer{} + + // only define shadow filter if a shape uses it + for _, s := range diagram.Shapes { + if s.Shadow { + defineShadowFilter(buf) + break + } + } + + if color.IsGradient(diagram.Root.Fill) { + defineGradients(buf, diagram.Root.Fill) + } + if color.IsGradient(diagram.Root.Stroke) { + defineGradients(buf, diagram.Root.Stroke) + } + for _, s := range diagram.Shapes { + if color.IsGradient(s.Fill) { + defineGradients(buf, s.Fill) + } + if color.IsGradient(s.Stroke) { + defineGradients(buf, s.Stroke) + } + if color.IsGradient(s.Color) { + defineGradients(buf, s.Color) + } + } + for _, c := range diagram.Connections { + if color.IsGradient(c.Stroke) { + defineGradients(buf, c.Stroke) + } + if color.IsGradient(c.Fill) { + defineGradients(buf, c.Fill) + } + } + + // Apply hash on IDs for targeting, to be specific for this diagram + diagramHash, err := diagram.HashID(opts.Salt) + if err != nil { + return nil, err + } + // Some targeting is still per-board, like masks for connections + isolatedDiagramHash := diagramHash + if opts != nil && opts.MasterID != "" { + diagramHash = opts.MasterID + } + + // SVG has no notion of z-index. The z-index is effectively the order it's drawn. + // So draw from the least nested to most nested + idToShape := make(map[string]d2target.Shape) + allObjects := make([]DiagramObject, 0, len(diagram.Shapes)+len(diagram.Connections)) + for _, s := range diagram.Shapes { + idToShape[s.ID] = s + allObjects = append(allObjects, s) + } + for _, c := range diagram.Connections { + allObjects = append(allObjects, c) + } + + sortObjects(allObjects) + + appendixItemBuf := &bytes.Buffer{} + + var labelMasks []string + markers := map[string]struct{}{} + var inlineTheme *d2themes.Theme + // We only want to inline when no dark theme is specified, otherwise the inline style will override the CSS + if darkThemeID == nil { + inlineTheme = go2.Pointer(d2themescatalog.Find(themeID)) + inlineTheme.ApplyOverrides(opts.ThemeOverrides) + } + for _, obj := range allObjects { + if c, is := obj.(d2target.Connection); is { + labelMask, err := drawConnection(buf, isolatedDiagramHash, c, markers, idToShape, jsRunner, inlineTheme) + if err != nil { + return nil, err + } + if labelMask != "" { + labelMasks = append(labelMasks, labelMask) + } + } else if s, is := obj.(d2target.Shape); is { + labelMask, err := drawShape(buf, appendixItemBuf, diagramHash, s, jsRunner, inlineTheme) + if err != nil { + return nil, err + } else if labelMask != "" { + labelMasks = append(labelMasks, labelMask) + } + } else { + return nil, fmt.Errorf("unknown object of type %T", obj) + } + } + // add all appendix items afterwards so they are always on top + fmt.Fprint(buf, appendixItemBuf) + + // Render legend if present + if diagram.Legend != nil && (len(diagram.Legend.Shapes) > 0 || len(diagram.Legend.Connections) > 0) { + legendBuf := &bytes.Buffer{} + err := renderLegend(legendBuf, diagram, diagramHash, inlineTheme) + if err != nil { + return nil, err + } + fmt.Fprint(buf, legendBuf) + } + + // Note: we always want this since we reference it on connections even if there end up being no masked labels + left, top, w, h := dimensions(diagram, pad) + + // Adjust the width and height if the legend is present to ensure it's fully visible + if diagram.Legend != nil && (len(diagram.Legend.Shapes) > 0 || len(diagram.Legend.Connections) > 0) { + // Calculate dimensions needed for legend + tl, br := diagram.BoundingBox() + // Start with top padding and title height + totalHeight := LEGEND_PADDING + LEGEND_FONT_SIZE + LEGEND_ITEM_SPACING + maxLabelWidth := 0 + itemCount := 0 + ruler, _ := textmeasure.NewRuler() + if ruler != nil { + // Calculate height and width of legend + for _, s := range diagram.Legend.Shapes { + if s.Label == "" { + continue + } + mtext := &d2target.MText{ + Text: s.Label, + FontSize: LEGEND_FONT_SIZE, + } + dims := d2graph.GetTextDimensions(nil, ruler, mtext, nil) + maxLabelWidth = go2.IntMax(maxLabelWidth, dims.Width) + totalHeight += go2.IntMax(dims.Height, LEGEND_ICON_SIZE) + LEGEND_ITEM_SPACING + itemCount++ + } + + for _, c := range diagram.Legend.Connections { + if c.Label == "" { + continue + } + mtext := &d2target.MText{ + Text: c.Label, + FontSize: LEGEND_FONT_SIZE, + } + dims := d2graph.GetTextDimensions(nil, ruler, mtext, nil) + maxLabelWidth = go2.IntMax(maxLabelWidth, dims.Width) + totalHeight += go2.IntMax(dims.Height, LEGEND_ICON_SIZE) + LEGEND_ITEM_SPACING + itemCount++ + } + + // If we have items, remove the extra spacing from the last item and add bottom padding + if itemCount > 0 { + totalHeight -= LEGEND_ITEM_SPACING / 2 // Remove some of the last spacing + } + + // Add bottom padding + totalHeight += LEGEND_PADDING + + if totalHeight > 0 && maxLabelWidth > 0 { + legendWidth := LEGEND_PADDING*2 + LEGEND_ICON_SIZE + LEGEND_PADDING + maxLabelWidth + + // Calculate legend vertical position (centered) + legendY := tl.Y + (br.Y-tl.Y-totalHeight)/2 + if legendY < tl.Y { + legendY = tl.Y + } + + // Expand width to include legend to the right + legendRight := br.X + LEGEND_CORNER_PADDING + legendWidth + if left+w < legendRight { + w = legendRight - left + pad/2 + } + + // Make sure the top of the legend is visible + if legendY < top { + diffY := top - legendY + top -= diffY + h += diffY + } + + // Make sure the bottom of the legend is visible + legendBottom := legendY + totalHeight + if top+h < legendBottom { + h = legendBottom - top + pad/2 + } + } + } + } + fmt.Fprint(buf, strings.Join([]string{ + fmt.Sprintf(``, + isolatedDiagramHash, left, top, w, h, + ), + fmt.Sprintf(``, + left, top, w, h, + ), + strings.Join(labelMasks, "\n"), + ``, + }, "\n")) + + // generate style elements that will be appended to the SVG tag + upperBuf := &bytes.Buffer{} + if opts.MasterID == "" { + EmbedFonts(upperBuf, diagramHash, buf.String(), diagram.FontFamily, diagram.GetCorpus()) // EmbedFonts *must* run before `d2sketch.DefineFillPatterns`, but after all elements are appended to `buf` + themeStylesheet, err := ThemeCSS(diagramHash, &themeID, darkThemeID, opts.ThemeOverrides, opts.DarkThemeOverrides) + if err != nil { + return nil, err + } + fmt.Fprintf(upperBuf, ``, BaseStylesheet, themeStylesheet) + + hasMarkdown := false + for _, s := range diagram.Shapes { + if s.Language == "markdown" { + hasMarkdown = true + break + } + } + if hasMarkdown { + css := MarkdownCSS + css = strings.ReplaceAll(css, ".md", fmt.Sprintf(".%s .md", diagramHash)) + css = strings.ReplaceAll(css, "font-italic", fmt.Sprintf("%s-font-italic", diagramHash)) + css = strings.ReplaceAll(css, "font-bold", fmt.Sprintf("%s-font-bold", diagramHash)) + css = strings.ReplaceAll(css, "font-mono", fmt.Sprintf("%s-font-mono", diagramHash)) + css = strings.ReplaceAll(css, "font-regular", fmt.Sprintf("%s-font-regular", diagramHash)) + css = strings.ReplaceAll(css, "font-semibold", fmt.Sprintf("%s-font-semibold", diagramHash)) + fmt.Fprintf(upperBuf, ``, css) + } + + if jsRunner != nil { + d2sketch.DefineFillPatterns(upperBuf, diagramHash) + } + } + + // This shift is for background el to envelop the diagram + left -= int(math.Ceil(float64(diagram.Root.StrokeWidth) / 2.)) + top -= int(math.Ceil(float64(diagram.Root.StrokeWidth) / 2.)) + w += int(math.Ceil(float64(diagram.Root.StrokeWidth)/2.) * 2.) + h += int(math.Ceil(float64(diagram.Root.StrokeWidth)/2.) * 2.) + backgroundEl := d2themes.NewThemableElement("rect", inlineTheme) + // We don't want to change the document viewbox, only the background el + backgroundEl.X = float64(left) + backgroundEl.Y = float64(top) + backgroundEl.Width = float64(w) + backgroundEl.Height = float64(h) + backgroundEl.Fill = diagram.Root.Fill + backgroundEl.Stroke = diagram.Root.Stroke + backgroundEl.FillPattern = diagram.Root.FillPattern + backgroundEl.Rx = float64(diagram.Root.BorderRadius) + if diagram.Root.StrokeDash != 0 { + dashSize, gapSize := svg.GetStrokeDashAttributes(float64(diagram.Root.StrokeWidth), diagram.Root.StrokeDash) + backgroundEl.StrokeDashArray = fmt.Sprintf("%f, %f", dashSize, gapSize) + } + backgroundEl.Attributes = fmt.Sprintf(`stroke-width="%d"`, diagram.Root.StrokeWidth) + + // This shift is for viewbox to envelop the background el + left -= int(math.Ceil(float64(diagram.Root.StrokeWidth) / 2.)) + top -= int(math.Ceil(float64(diagram.Root.StrokeWidth) / 2.)) + w += int(math.Ceil(float64(diagram.Root.StrokeWidth)/2.) * 2.) + h += int(math.Ceil(float64(diagram.Root.StrokeWidth)/2.) * 2.) + + doubleBorderElStr := "" + if diagram.Root.DoubleBorder { + offset := d2target.INNER_BORDER_OFFSET + + left -= int(math.Ceil(float64(diagram.Root.StrokeWidth)/2.)) + offset + top -= int(math.Ceil(float64(diagram.Root.StrokeWidth)/2.)) + offset + w += int(math.Ceil(float64(diagram.Root.StrokeWidth)/2.)*2.) + 2*offset + h += int(math.Ceil(float64(diagram.Root.StrokeWidth)/2.)*2.) + 2*offset + + backgroundEl2 := backgroundEl.Copy() + // No need to double-paint + backgroundEl.Fill = "transparent" + + backgroundEl2.X = float64(left) + backgroundEl2.Y = float64(top) + backgroundEl2.Width = float64(w) + backgroundEl2.Height = float64(h) + doubleBorderElStr = backgroundEl2.Render() + + left -= int(math.Ceil(float64(diagram.Root.StrokeWidth) / 2.)) + top -= int(math.Ceil(float64(diagram.Root.StrokeWidth) / 2.)) + w += int(math.Ceil(float64(diagram.Root.StrokeWidth)/2.) * 2.) + h += int(math.Ceil(float64(diagram.Root.StrokeWidth)/2.) * 2.) + } + + bufStr := buf.String() + patternDefs := "" + for _, pattern := range d2ast.FillPatterns { + if strings.Contains(bufStr, fmt.Sprintf("%s-overlay", pattern)) || diagram.Root.FillPattern == pattern { + if patternDefs == "" { + fmt.Fprint(upperBuf, ``) + fmt.Fprint(upperBuf, "") + fmt.Fprint(upperBuf, patternDefs) + fmt.Fprint(upperBuf, "") + } + + var dimensions string + if scale != nil { + dimensions = fmt.Sprintf(` width="%d" height="%d"`, + int(math.Ceil((*scale)*float64(w))), + int(math.Ceil((*scale)*float64(h))), + ) + } + + alignment := "xMinYMin" + if opts.Center != nil && *opts.Center { + alignment = "xMidYMid" + } + fitToScreenWrapperOpening := "" + xmlTag := "" + fitToScreenWrapperClosing := "" + idAttr := "" + tag := "g" + // Many things change when this is rendering for animation + if opts.MasterID == "" { + fitToScreenWrapperOpening = fmt.Sprintf(``, + version.Version, + alignment, + w, h, + dimensions, + ) + if opts.NoXMLTag == nil || !*opts.NoXMLTag { + xmlTag = `` + } + fitToScreenWrapperClosing = "" + idAttr = `d2-svg` + tag = "svg" + } + + // TODO minify + docRendered := fmt.Sprintf(`%s%s<%s class="%s" width="%d" height="%d" viewBox="%d %d %d %d">%s%s%s%s%s`, + xmlTag, + fitToScreenWrapperOpening, + tag, + strings.Join([]string{diagramHash, idAttr}, " "), + w, h, left, top, w, h, + doubleBorderElStr, + backgroundEl.Render(), + upperBuf.String(), + buf.String(), + tag, + fitToScreenWrapperClosing, + ) + return []byte(docRendered), nil +} + +// TODO include only colors that are being used to reduce size +func ThemeCSS(diagramHash string, themeID *int64, darkThemeID *int64, overrides, darkOverrides *d2target.ThemeOverrides) (stylesheet string, err error) { + if themeID == nil { + themeID = &d2themescatalog.NeutralDefault.ID + } + out, err := singleThemeRulesets(diagramHash, *themeID, overrides) + if err != nil { + return "", err + } + + if darkThemeID != nil { + darkOut, err := singleThemeRulesets(diagramHash, *darkThemeID, darkOverrides) + if err != nil { + return "", err + } + out += fmt.Sprintf("@media screen and (prefers-color-scheme:dark){%s}", darkOut) + } + + return out, nil +} + +func singleThemeRulesets(diagramHash string, themeID int64, overrides *d2target.ThemeOverrides) (rulesets string, err error) { + out := "" + theme := d2themescatalog.Find(themeID) + theme.ApplyOverrides(overrides) + + // Global theme colors + for _, property := range []string{"fill", "stroke", "background-color", "color"} { + out += fmt.Sprintf(` + .%s .%s-N1{%s:%s;} + .%s .%s-N2{%s:%s;} + .%s .%s-N3{%s:%s;} + .%s .%s-N4{%s:%s;} + .%s .%s-N5{%s:%s;} + .%s .%s-N6{%s:%s;} + .%s .%s-N7{%s:%s;} + .%s .%s-B1{%s:%s;} + .%s .%s-B2{%s:%s;} + .%s .%s-B3{%s:%s;} + .%s .%s-B4{%s:%s;} + .%s .%s-B5{%s:%s;} + .%s .%s-B6{%s:%s;} + .%s .%s-AA2{%s:%s;} + .%s .%s-AA4{%s:%s;} + .%s .%s-AA5{%s:%s;} + .%s .%s-AB4{%s:%s;} + .%s .%s-AB5{%s:%s;}`, + diagramHash, + property, property, theme.Colors.Neutrals.N1, + diagramHash, + property, property, theme.Colors.Neutrals.N2, + diagramHash, + property, property, theme.Colors.Neutrals.N3, + diagramHash, + property, property, theme.Colors.Neutrals.N4, + diagramHash, + property, property, theme.Colors.Neutrals.N5, + diagramHash, + property, property, theme.Colors.Neutrals.N6, + diagramHash, + property, property, theme.Colors.Neutrals.N7, + diagramHash, + property, property, theme.Colors.B1, + diagramHash, + property, property, theme.Colors.B2, + diagramHash, + property, property, theme.Colors.B3, + diagramHash, + property, property, theme.Colors.B4, + diagramHash, + property, property, theme.Colors.B5, + diagramHash, + property, property, theme.Colors.B6, + diagramHash, + property, property, theme.Colors.AA2, + diagramHash, + property, property, theme.Colors.AA4, + diagramHash, + property, property, theme.Colors.AA5, + diagramHash, + property, property, theme.Colors.AB4, + diagramHash, + property, property, theme.Colors.AB5, + ) + } + + // Appendix + out += fmt.Sprintf(".appendix text.text{fill:%s}", theme.Colors.Neutrals.N1) + + // Markdown specific rulesets + out += fmt.Sprintf(".md{--color-fg-default:%s;--color-fg-muted:%s;--color-fg-subtle:%s;--color-canvas-default:%s;--color-canvas-subtle:%s;--color-border-default:%s;--color-border-muted:%s;--color-neutral-muted:%s;--color-accent-fg:%s;--color-accent-emphasis:%s;--color-attention-subtle:%s;--color-danger-fg:%s;}", + theme.Colors.Neutrals.N1, theme.Colors.Neutrals.N2, theme.Colors.Neutrals.N3, + theme.Colors.Neutrals.N7, theme.Colors.Neutrals.N6, + theme.Colors.B1, theme.Colors.B2, + theme.Colors.Neutrals.N6, + theme.Colors.B2, theme.Colors.B2, + theme.Colors.Neutrals.N2, // TODO or N3 --color-attention-subtle + "red", + ) + + // Sketch style specific rulesets + // B + lc, err := color.LuminanceCategory(theme.Colors.B1) + if err != nil { + return "", err + } + out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s-%s);mix-blend-mode:%s}", color.B1, lc, diagramHash, blendMode(lc)) + lc, err = color.LuminanceCategory(theme.Colors.B2) + if err != nil { + return "", err + } + out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s-%s);mix-blend-mode:%s}", color.B2, lc, diagramHash, blendMode(lc)) + lc, err = color.LuminanceCategory(theme.Colors.B3) + if err != nil { + return "", err + } + out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s-%s);mix-blend-mode:%s}", color.B3, lc, diagramHash, blendMode(lc)) + lc, err = color.LuminanceCategory(theme.Colors.B4) + if err != nil { + return "", err + } + out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s-%s);mix-blend-mode:%s}", color.B4, lc, diagramHash, blendMode(lc)) + lc, err = color.LuminanceCategory(theme.Colors.B5) + if err != nil { + return "", err + } + out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s-%s);mix-blend-mode:%s}", color.B5, lc, diagramHash, blendMode(lc)) + lc, err = color.LuminanceCategory(theme.Colors.B6) + if err != nil { + return "", err + } + out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s-%s);mix-blend-mode:%s}", color.B6, lc, diagramHash, blendMode(lc)) + + // AA + lc, err = color.LuminanceCategory(theme.Colors.AA2) + if err != nil { + return "", err + } + out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s-%s);mix-blend-mode:%s}", color.AA2, lc, diagramHash, blendMode(lc)) + lc, err = color.LuminanceCategory(theme.Colors.AA4) + if err != nil { + return "", err + } + out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s-%s);mix-blend-mode:%s}", color.AA4, lc, diagramHash, blendMode(lc)) + lc, err = color.LuminanceCategory(theme.Colors.AA5) + if err != nil { + return "", err + } + out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s-%s);mix-blend-mode:%s}", color.AA5, lc, diagramHash, blendMode(lc)) + + // AB + lc, err = color.LuminanceCategory(theme.Colors.AB4) + if err != nil { + return "", err + } + out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s-%s);mix-blend-mode:%s}", color.AB4, lc, diagramHash, blendMode(lc)) + lc, err = color.LuminanceCategory(theme.Colors.AB5) + if err != nil { + return "", err + } + out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s-%s);mix-blend-mode:%s}", color.AB5, lc, diagramHash, blendMode(lc)) + + // Neutrals + lc, err = color.LuminanceCategory(theme.Colors.Neutrals.N1) + if err != nil { + return "", err + } + out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s-%s);mix-blend-mode:%s}", color.N1, lc, diagramHash, blendMode(lc)) + lc, err = color.LuminanceCategory(theme.Colors.Neutrals.N2) + if err != nil { + return "", err + } + out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s-%s);mix-blend-mode:%s}", color.N2, lc, diagramHash, blendMode(lc)) + lc, err = color.LuminanceCategory(theme.Colors.Neutrals.N3) + if err != nil { + return "", err + } + out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s-%s);mix-blend-mode:%s}", color.N3, lc, diagramHash, blendMode(lc)) + lc, err = color.LuminanceCategory(theme.Colors.Neutrals.N4) + if err != nil { + return "", err + } + out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s-%s);mix-blend-mode:%s}", color.N4, lc, diagramHash, blendMode(lc)) + lc, err = color.LuminanceCategory(theme.Colors.Neutrals.N5) + if err != nil { + return "", err + } + out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s-%s);mix-blend-mode:%s}", color.N5, lc, diagramHash, blendMode(lc)) + lc, err = color.LuminanceCategory(theme.Colors.Neutrals.N6) + if err != nil { + return "", err + } + out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s-%s);mix-blend-mode:%s}", color.N6, lc, diagramHash, blendMode(lc)) + lc, err = color.LuminanceCategory(theme.Colors.Neutrals.N7) + if err != nil { + return "", err + } + out += fmt.Sprintf(".sketch-overlay-%s{fill:url(#streaks-%s-%s);mix-blend-mode:%s}", color.N7, lc, diagramHash, blendMode(lc)) + + if theme.IsDark() { + out += ".light-code{display: none}" + out += ".dark-code{display: block}" + } else { + out += ".light-code{display: block}" + out += ".dark-code{display: none}" + } + + return out, nil +} + +func blendMode(lc string) string { + switch lc { + case "bright": + return "darken" + case "normal": + return "color-burn" + case "dark": + return "overlay" + case "darker": + return "lighten" + } + panic("invalid luminance category") +} + +type DiagramObject interface { + GetID() string + GetZIndex() int +} + +// sortObjects sorts all diagrams objects (shapes and connections) in the desired drawing order +// the sorting criteria is: +// 1. zIndex, lower comes first +// 2. two shapes with the same zIndex are sorted by their level (container nesting), containers come first +// 3. two shapes with the same zIndex and same level, are sorted in the order they were exported +// 4. shape and edge, shapes come first +func sortObjects(allObjects []DiagramObject) { + sort.SliceStable(allObjects, func(i, j int) bool { + // first sort by zIndex + iZIndex := allObjects[i].GetZIndex() + jZIndex := allObjects[j].GetZIndex() + if iZIndex != jZIndex { + return iZIndex < jZIndex + } + + // then, if both are shapes, parents come before their children + iShape, iIsShape := allObjects[i].(d2target.Shape) + jShape, jIsShape := allObjects[j].(d2target.Shape) + if iIsShape && jIsShape { + return iShape.Level < jShape.Level + } + + // then, shapes come before connections + _, jIsConnection := allObjects[j].(d2target.Connection) + return iIsShape && jIsConnection + }) +} + +func hash(s string) string { + const secret = "lalalas" + h := fnv.New32a() + h.Write([]byte(fmt.Sprintf("%s%s", s, secret))) + return fmt.Sprint(h.Sum32()) +} + +func RenderMultiboard(diagram *d2target.Diagram, opts *RenderOpts) ([][]byte, error) { + var boards [][]byte + for _, dl := range diagram.Layers { + childrenBoards, err := RenderMultiboard(dl, opts) + if err != nil { + return nil, err + } + boards = append(boards, childrenBoards...) + } + for _, dl := range diagram.Scenarios { + childrenBoards, err := RenderMultiboard(dl, opts) + if err != nil { + return nil, err + } + boards = append(boards, childrenBoards...) + } + for _, dl := range diagram.Steps { + childrenBoards, err := RenderMultiboard(dl, opts) + if err != nil { + return nil, err + } + boards = append(boards, childrenBoards...) + } + + if !diagram.IsFolderOnly { + out, err := Render(diagram, opts) + if err != nil { + return boards, err + } + boards = append([][]byte{out}, boards...) + return boards, nil + } + return boards, nil +} diff --git a/d2renderers/d2svg/dark_theme/dark_theme_test.go b/d2renderers/d2svg/dark_theme/dark_theme_test.go index c7d40a1e9..d1c4182b9 100644 --- a/d2renderers/d2svg/dark_theme/dark_theme_test.go +++ b/d2renderers/d2svg/dark_theme/dark_theme_test.go @@ -3,7 +3,6 @@ package dark_theme_test import ( "context" "encoding/xml" - "io/ioutil" "log/slog" "os" "path/filepath" @@ -449,7 +448,7 @@ func run(t *testing.T, tc testCase) { assert.Success(t, err) err = os.MkdirAll(dataPath, 0755) assert.Success(t, err) - err = ioutil.WriteFile(pathGotSVG, svgBytes, 0600) + err = os.WriteFile(pathGotSVG, svgBytes, 0600) assert.Success(t, err) defer os.Remove(pathGotSVG) diff --git a/d2renderers/d2svg/dark_theme/testdata/all_shapes/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/all_shapes/dark_theme.exp.svg index 99dc24060..af881e218 100644 --- a/d2renderers/d2svg/dark_theme/testdata/all_shapes/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/all_shapes/dark_theme.exp.svg @@ -1,9 +1,9 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud + .d2-954983138 .fill-N1{fill:#CDD6F4;} + .d2-954983138 .fill-N2{fill:#BAC2DE;} + .d2-954983138 .fill-N3{fill:#A6ADC8;} + .d2-954983138 .fill-N4{fill:#585B70;} + .d2-954983138 .fill-N5{fill:#45475A;} + .d2-954983138 .fill-N6{fill:#313244;} + .d2-954983138 .fill-N7{fill:#1E1E2E;} + .d2-954983138 .fill-B1{fill:#CBA6f7;} + .d2-954983138 .fill-B2{fill:#CBA6f7;} + .d2-954983138 .fill-B3{fill:#6C7086;} + .d2-954983138 .fill-B4{fill:#585B70;} + .d2-954983138 .fill-B5{fill:#45475A;} + .d2-954983138 .fill-B6{fill:#313244;} + .d2-954983138 .fill-AA2{fill:#f38BA8;} + .d2-954983138 .fill-AA4{fill:#45475A;} + .d2-954983138 .fill-AA5{fill:#313244;} + .d2-954983138 .fill-AB4{fill:#45475A;} + .d2-954983138 .fill-AB5{fill:#313244;} + .d2-954983138 .stroke-N1{stroke:#CDD6F4;} + .d2-954983138 .stroke-N2{stroke:#BAC2DE;} + .d2-954983138 .stroke-N3{stroke:#A6ADC8;} + .d2-954983138 .stroke-N4{stroke:#585B70;} + .d2-954983138 .stroke-N5{stroke:#45475A;} + .d2-954983138 .stroke-N6{stroke:#313244;} + .d2-954983138 .stroke-N7{stroke:#1E1E2E;} + .d2-954983138 .stroke-B1{stroke:#CBA6f7;} + .d2-954983138 .stroke-B2{stroke:#CBA6f7;} + .d2-954983138 .stroke-B3{stroke:#6C7086;} + .d2-954983138 .stroke-B4{stroke:#585B70;} + .d2-954983138 .stroke-B5{stroke:#45475A;} + .d2-954983138 .stroke-B6{stroke:#313244;} + .d2-954983138 .stroke-AA2{stroke:#f38BA8;} + .d2-954983138 .stroke-AA4{stroke:#45475A;} + .d2-954983138 .stroke-AA5{stroke:#313244;} + .d2-954983138 .stroke-AB4{stroke:#45475A;} + .d2-954983138 .stroke-AB5{stroke:#313244;} + .d2-954983138 .background-color-N1{background-color:#CDD6F4;} + .d2-954983138 .background-color-N2{background-color:#BAC2DE;} + .d2-954983138 .background-color-N3{background-color:#A6ADC8;} + .d2-954983138 .background-color-N4{background-color:#585B70;} + .d2-954983138 .background-color-N5{background-color:#45475A;} + .d2-954983138 .background-color-N6{background-color:#313244;} + .d2-954983138 .background-color-N7{background-color:#1E1E2E;} + .d2-954983138 .background-color-B1{background-color:#CBA6f7;} + .d2-954983138 .background-color-B2{background-color:#CBA6f7;} + .d2-954983138 .background-color-B3{background-color:#6C7086;} + .d2-954983138 .background-color-B4{background-color:#585B70;} + .d2-954983138 .background-color-B5{background-color:#45475A;} + .d2-954983138 .background-color-B6{background-color:#313244;} + .d2-954983138 .background-color-AA2{background-color:#f38BA8;} + .d2-954983138 .background-color-AA4{background-color:#45475A;} + .d2-954983138 .background-color-AA5{background-color:#313244;} + .d2-954983138 .background-color-AB4{background-color:#45475A;} + .d2-954983138 .background-color-AB5{background-color:#313244;} + .d2-954983138 .color-N1{color:#CDD6F4;} + .d2-954983138 .color-N2{color:#BAC2DE;} + .d2-954983138 .color-N3{color:#A6ADC8;} + .d2-954983138 .color-N4{color:#585B70;} + .d2-954983138 .color-N5{color:#45475A;} + .d2-954983138 .color-N6{color:#313244;} + .d2-954983138 .color-N7{color:#1E1E2E;} + .d2-954983138 .color-B1{color:#CBA6f7;} + .d2-954983138 .color-B2{color:#CBA6f7;} + .d2-954983138 .color-B3{color:#6C7086;} + .d2-954983138 .color-B4{color:#585B70;} + .d2-954983138 .color-B5{color:#45475A;} + .d2-954983138 .color-B6{color:#313244;} + .d2-954983138 .color-AA2{color:#f38BA8;} + .d2-954983138 .color-AA4{color:#45475A;} + .d2-954983138 .color-AA5{color:#313244;} + .d2-954983138 .color-AB4{color:#45475A;} + .d2-954983138 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal-d2-954983138);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal-d2-954983138);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark-d2-954983138);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark-d2-954983138);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker-d2-954983138);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker-d2-954983138);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal-d2-954983138);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker-d2-954983138);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker-d2-954983138);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker-d2-954983138);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker-d2-954983138);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal-d2-954983138);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal-d2-954983138);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal-d2-954983138);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark-d2-954983138);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker-d2-954983138);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker-d2-954983138);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker-d2-954983138);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/d2renderers/d2svg/dark_theme/testdata/animated/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/animated/dark_theme.exp.svg index 4d185aae1..02e6066db 100644 --- a/d2renderers/d2svg/dark_theme/testdata/animated/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/animated/dark_theme.exp.svg @@ -1,9 +1,9 @@ -wintersummertreessnowsun + .d2-4155204744 .fill-N1{fill:#CDD6F4;} + .d2-4155204744 .fill-N2{fill:#BAC2DE;} + .d2-4155204744 .fill-N3{fill:#A6ADC8;} + .d2-4155204744 .fill-N4{fill:#585B70;} + .d2-4155204744 .fill-N5{fill:#45475A;} + .d2-4155204744 .fill-N6{fill:#313244;} + .d2-4155204744 .fill-N7{fill:#1E1E2E;} + .d2-4155204744 .fill-B1{fill:#CBA6f7;} + .d2-4155204744 .fill-B2{fill:#CBA6f7;} + .d2-4155204744 .fill-B3{fill:#6C7086;} + .d2-4155204744 .fill-B4{fill:#585B70;} + .d2-4155204744 .fill-B5{fill:#45475A;} + .d2-4155204744 .fill-B6{fill:#313244;} + .d2-4155204744 .fill-AA2{fill:#f38BA8;} + .d2-4155204744 .fill-AA4{fill:#45475A;} + .d2-4155204744 .fill-AA5{fill:#313244;} + .d2-4155204744 .fill-AB4{fill:#45475A;} + .d2-4155204744 .fill-AB5{fill:#313244;} + .d2-4155204744 .stroke-N1{stroke:#CDD6F4;} + .d2-4155204744 .stroke-N2{stroke:#BAC2DE;} + .d2-4155204744 .stroke-N3{stroke:#A6ADC8;} + .d2-4155204744 .stroke-N4{stroke:#585B70;} + .d2-4155204744 .stroke-N5{stroke:#45475A;} + .d2-4155204744 .stroke-N6{stroke:#313244;} + .d2-4155204744 .stroke-N7{stroke:#1E1E2E;} + .d2-4155204744 .stroke-B1{stroke:#CBA6f7;} + .d2-4155204744 .stroke-B2{stroke:#CBA6f7;} + .d2-4155204744 .stroke-B3{stroke:#6C7086;} + .d2-4155204744 .stroke-B4{stroke:#585B70;} + .d2-4155204744 .stroke-B5{stroke:#45475A;} + .d2-4155204744 .stroke-B6{stroke:#313244;} + .d2-4155204744 .stroke-AA2{stroke:#f38BA8;} + .d2-4155204744 .stroke-AA4{stroke:#45475A;} + .d2-4155204744 .stroke-AA5{stroke:#313244;} + .d2-4155204744 .stroke-AB4{stroke:#45475A;} + .d2-4155204744 .stroke-AB5{stroke:#313244;} + .d2-4155204744 .background-color-N1{background-color:#CDD6F4;} + .d2-4155204744 .background-color-N2{background-color:#BAC2DE;} + .d2-4155204744 .background-color-N3{background-color:#A6ADC8;} + .d2-4155204744 .background-color-N4{background-color:#585B70;} + .d2-4155204744 .background-color-N5{background-color:#45475A;} + .d2-4155204744 .background-color-N6{background-color:#313244;} + .d2-4155204744 .background-color-N7{background-color:#1E1E2E;} + .d2-4155204744 .background-color-B1{background-color:#CBA6f7;} + .d2-4155204744 .background-color-B2{background-color:#CBA6f7;} + .d2-4155204744 .background-color-B3{background-color:#6C7086;} + .d2-4155204744 .background-color-B4{background-color:#585B70;} + .d2-4155204744 .background-color-B5{background-color:#45475A;} + .d2-4155204744 .background-color-B6{background-color:#313244;} + .d2-4155204744 .background-color-AA2{background-color:#f38BA8;} + .d2-4155204744 .background-color-AA4{background-color:#45475A;} + .d2-4155204744 .background-color-AA5{background-color:#313244;} + .d2-4155204744 .background-color-AB4{background-color:#45475A;} + .d2-4155204744 .background-color-AB5{background-color:#313244;} + .d2-4155204744 .color-N1{color:#CDD6F4;} + .d2-4155204744 .color-N2{color:#BAC2DE;} + .d2-4155204744 .color-N3{color:#A6ADC8;} + .d2-4155204744 .color-N4{color:#585B70;} + .d2-4155204744 .color-N5{color:#45475A;} + .d2-4155204744 .color-N6{color:#313244;} + .d2-4155204744 .color-N7{color:#1E1E2E;} + .d2-4155204744 .color-B1{color:#CBA6f7;} + .d2-4155204744 .color-B2{color:#CBA6f7;} + .d2-4155204744 .color-B3{color:#6C7086;} + .d2-4155204744 .color-B4{color:#585B70;} + .d2-4155204744 .color-B5{color:#45475A;} + .d2-4155204744 .color-B6{color:#313244;} + .d2-4155204744 .color-AA2{color:#f38BA8;} + .d2-4155204744 .color-AA4{color:#45475A;} + .d2-4155204744 .color-AA5{color:#313244;} + .d2-4155204744 .color-AB4{color:#45475A;} + .d2-4155204744 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal-d2-4155204744);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal-d2-4155204744);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark-d2-4155204744);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark-d2-4155204744);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker-d2-4155204744);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker-d2-4155204744);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal-d2-4155204744);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker-d2-4155204744);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker-d2-4155204744);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker-d2-4155204744);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker-d2-4155204744);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal-d2-4155204744);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal-d2-4155204744);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4155204744);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark-d2-4155204744);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker-d2-4155204744);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker-d2-4155204744);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker-d2-4155204744);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>wintersummertreessnowsun - - - - - + + + + + \ No newline at end of file diff --git a/d2renderers/d2svg/dark_theme/testdata/arrowheads/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/arrowheads/dark_theme.exp.svg index f2b9b4b60..584776f41 100644 --- a/d2renderers/d2svg/dark_theme/testdata/arrowheads/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/arrowheads/dark_theme.exp.svg @@ -1,16 +1,16 @@ -112233445566778899none arrow triangle diamond diamond filled cf-many cf-many-required cf-one cf-one-required + .d2-1090005370 .fill-N1{fill:#CDD6F4;} + .d2-1090005370 .fill-N2{fill:#BAC2DE;} + .d2-1090005370 .fill-N3{fill:#A6ADC8;} + .d2-1090005370 .fill-N4{fill:#585B70;} + .d2-1090005370 .fill-N5{fill:#45475A;} + .d2-1090005370 .fill-N6{fill:#313244;} + .d2-1090005370 .fill-N7{fill:#1E1E2E;} + .d2-1090005370 .fill-B1{fill:#CBA6f7;} + .d2-1090005370 .fill-B2{fill:#CBA6f7;} + .d2-1090005370 .fill-B3{fill:#6C7086;} + .d2-1090005370 .fill-B4{fill:#585B70;} + .d2-1090005370 .fill-B5{fill:#45475A;} + .d2-1090005370 .fill-B6{fill:#313244;} + .d2-1090005370 .fill-AA2{fill:#f38BA8;} + .d2-1090005370 .fill-AA4{fill:#45475A;} + .d2-1090005370 .fill-AA5{fill:#313244;} + .d2-1090005370 .fill-AB4{fill:#45475A;} + .d2-1090005370 .fill-AB5{fill:#313244;} + .d2-1090005370 .stroke-N1{stroke:#CDD6F4;} + .d2-1090005370 .stroke-N2{stroke:#BAC2DE;} + .d2-1090005370 .stroke-N3{stroke:#A6ADC8;} + .d2-1090005370 .stroke-N4{stroke:#585B70;} + .d2-1090005370 .stroke-N5{stroke:#45475A;} + .d2-1090005370 .stroke-N6{stroke:#313244;} + .d2-1090005370 .stroke-N7{stroke:#1E1E2E;} + .d2-1090005370 .stroke-B1{stroke:#CBA6f7;} + .d2-1090005370 .stroke-B2{stroke:#CBA6f7;} + .d2-1090005370 .stroke-B3{stroke:#6C7086;} + .d2-1090005370 .stroke-B4{stroke:#585B70;} + .d2-1090005370 .stroke-B5{stroke:#45475A;} + .d2-1090005370 .stroke-B6{stroke:#313244;} + .d2-1090005370 .stroke-AA2{stroke:#f38BA8;} + .d2-1090005370 .stroke-AA4{stroke:#45475A;} + .d2-1090005370 .stroke-AA5{stroke:#313244;} + .d2-1090005370 .stroke-AB4{stroke:#45475A;} + .d2-1090005370 .stroke-AB5{stroke:#313244;} + .d2-1090005370 .background-color-N1{background-color:#CDD6F4;} + .d2-1090005370 .background-color-N2{background-color:#BAC2DE;} + .d2-1090005370 .background-color-N3{background-color:#A6ADC8;} + .d2-1090005370 .background-color-N4{background-color:#585B70;} + .d2-1090005370 .background-color-N5{background-color:#45475A;} + .d2-1090005370 .background-color-N6{background-color:#313244;} + .d2-1090005370 .background-color-N7{background-color:#1E1E2E;} + .d2-1090005370 .background-color-B1{background-color:#CBA6f7;} + .d2-1090005370 .background-color-B2{background-color:#CBA6f7;} + .d2-1090005370 .background-color-B3{background-color:#6C7086;} + .d2-1090005370 .background-color-B4{background-color:#585B70;} + .d2-1090005370 .background-color-B5{background-color:#45475A;} + .d2-1090005370 .background-color-B6{background-color:#313244;} + .d2-1090005370 .background-color-AA2{background-color:#f38BA8;} + .d2-1090005370 .background-color-AA4{background-color:#45475A;} + .d2-1090005370 .background-color-AA5{background-color:#313244;} + .d2-1090005370 .background-color-AB4{background-color:#45475A;} + .d2-1090005370 .background-color-AB5{background-color:#313244;} + .d2-1090005370 .color-N1{color:#CDD6F4;} + .d2-1090005370 .color-N2{color:#BAC2DE;} + .d2-1090005370 .color-N3{color:#A6ADC8;} + .d2-1090005370 .color-N4{color:#585B70;} + .d2-1090005370 .color-N5{color:#45475A;} + .d2-1090005370 .color-N6{color:#313244;} + .d2-1090005370 .color-N7{color:#1E1E2E;} + .d2-1090005370 .color-B1{color:#CBA6f7;} + .d2-1090005370 .color-B2{color:#CBA6f7;} + .d2-1090005370 .color-B3{color:#6C7086;} + .d2-1090005370 .color-B4{color:#585B70;} + .d2-1090005370 .color-B5{color:#45475A;} + .d2-1090005370 .color-B6{color:#313244;} + .d2-1090005370 .color-AA2{color:#f38BA8;} + .d2-1090005370 .color-AA4{color:#45475A;} + .d2-1090005370 .color-AA5{color:#313244;} + .d2-1090005370 .color-AB4{color:#45475A;} + .d2-1090005370 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal-d2-1090005370);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal-d2-1090005370);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark-d2-1090005370);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark-d2-1090005370);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker-d2-1090005370);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker-d2-1090005370);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal-d2-1090005370);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker-d2-1090005370);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker-d2-1090005370);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker-d2-1090005370);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker-d2-1090005370);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal-d2-1090005370);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal-d2-1090005370);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1090005370);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark-d2-1090005370);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker-d2-1090005370);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker-d2-1090005370);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker-d2-1090005370);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>112233445566778899none arrow triangle diamond diamond filled cf-many cf-many-required cf-one cf-one-required - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/d2renderers/d2svg/dark_theme/testdata/basic/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/basic/dark_theme.exp.svg index 20fc38ed8..73ca5a0bf 100644 --- a/d2renderers/d2svg/dark_theme/testdata/basic/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/basic/dark_theme.exp.svg @@ -1,9 +1,9 @@ -ab + .d2-3098357730 .fill-N1{fill:#CDD6F4;} + .d2-3098357730 .fill-N2{fill:#BAC2DE;} + .d2-3098357730 .fill-N3{fill:#A6ADC8;} + .d2-3098357730 .fill-N4{fill:#585B70;} + .d2-3098357730 .fill-N5{fill:#45475A;} + .d2-3098357730 .fill-N6{fill:#313244;} + .d2-3098357730 .fill-N7{fill:#1E1E2E;} + .d2-3098357730 .fill-B1{fill:#CBA6f7;} + .d2-3098357730 .fill-B2{fill:#CBA6f7;} + .d2-3098357730 .fill-B3{fill:#6C7086;} + .d2-3098357730 .fill-B4{fill:#585B70;} + .d2-3098357730 .fill-B5{fill:#45475A;} + .d2-3098357730 .fill-B6{fill:#313244;} + .d2-3098357730 .fill-AA2{fill:#f38BA8;} + .d2-3098357730 .fill-AA4{fill:#45475A;} + .d2-3098357730 .fill-AA5{fill:#313244;} + .d2-3098357730 .fill-AB4{fill:#45475A;} + .d2-3098357730 .fill-AB5{fill:#313244;} + .d2-3098357730 .stroke-N1{stroke:#CDD6F4;} + .d2-3098357730 .stroke-N2{stroke:#BAC2DE;} + .d2-3098357730 .stroke-N3{stroke:#A6ADC8;} + .d2-3098357730 .stroke-N4{stroke:#585B70;} + .d2-3098357730 .stroke-N5{stroke:#45475A;} + .d2-3098357730 .stroke-N6{stroke:#313244;} + .d2-3098357730 .stroke-N7{stroke:#1E1E2E;} + .d2-3098357730 .stroke-B1{stroke:#CBA6f7;} + .d2-3098357730 .stroke-B2{stroke:#CBA6f7;} + .d2-3098357730 .stroke-B3{stroke:#6C7086;} + .d2-3098357730 .stroke-B4{stroke:#585B70;} + .d2-3098357730 .stroke-B5{stroke:#45475A;} + .d2-3098357730 .stroke-B6{stroke:#313244;} + .d2-3098357730 .stroke-AA2{stroke:#f38BA8;} + .d2-3098357730 .stroke-AA4{stroke:#45475A;} + .d2-3098357730 .stroke-AA5{stroke:#313244;} + .d2-3098357730 .stroke-AB4{stroke:#45475A;} + .d2-3098357730 .stroke-AB5{stroke:#313244;} + .d2-3098357730 .background-color-N1{background-color:#CDD6F4;} + .d2-3098357730 .background-color-N2{background-color:#BAC2DE;} + .d2-3098357730 .background-color-N3{background-color:#A6ADC8;} + .d2-3098357730 .background-color-N4{background-color:#585B70;} + .d2-3098357730 .background-color-N5{background-color:#45475A;} + .d2-3098357730 .background-color-N6{background-color:#313244;} + .d2-3098357730 .background-color-N7{background-color:#1E1E2E;} + .d2-3098357730 .background-color-B1{background-color:#CBA6f7;} + .d2-3098357730 .background-color-B2{background-color:#CBA6f7;} + .d2-3098357730 .background-color-B3{background-color:#6C7086;} + .d2-3098357730 .background-color-B4{background-color:#585B70;} + .d2-3098357730 .background-color-B5{background-color:#45475A;} + .d2-3098357730 .background-color-B6{background-color:#313244;} + .d2-3098357730 .background-color-AA2{background-color:#f38BA8;} + .d2-3098357730 .background-color-AA4{background-color:#45475A;} + .d2-3098357730 .background-color-AA5{background-color:#313244;} + .d2-3098357730 .background-color-AB4{background-color:#45475A;} + .d2-3098357730 .background-color-AB5{background-color:#313244;} + .d2-3098357730 .color-N1{color:#CDD6F4;} + .d2-3098357730 .color-N2{color:#BAC2DE;} + .d2-3098357730 .color-N3{color:#A6ADC8;} + .d2-3098357730 .color-N4{color:#585B70;} + .d2-3098357730 .color-N5{color:#45475A;} + .d2-3098357730 .color-N6{color:#313244;} + .d2-3098357730 .color-N7{color:#1E1E2E;} + .d2-3098357730 .color-B1{color:#CBA6f7;} + .d2-3098357730 .color-B2{color:#CBA6f7;} + .d2-3098357730 .color-B3{color:#6C7086;} + .d2-3098357730 .color-B4{color:#585B70;} + .d2-3098357730 .color-B5{color:#45475A;} + .d2-3098357730 .color-B6{color:#313244;} + .d2-3098357730 .color-AA2{color:#f38BA8;} + .d2-3098357730 .color-AA4{color:#45475A;} + .d2-3098357730 .color-AA5{color:#313244;} + .d2-3098357730 .color-AB4{color:#45475A;} + .d2-3098357730 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal-d2-3098357730);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal-d2-3098357730);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark-d2-3098357730);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark-d2-3098357730);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker-d2-3098357730);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker-d2-3098357730);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal-d2-3098357730);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker-d2-3098357730);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker-d2-3098357730);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker-d2-3098357730);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker-d2-3098357730);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal-d2-3098357730);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal-d2-3098357730);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3098357730);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark-d2-3098357730);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker-d2-3098357730);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker-d2-3098357730);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker-d2-3098357730);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>ab - - + + \ No newline at end of file diff --git a/d2renderers/d2svg/dark_theme/testdata/child_to_child/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/child_to_child/dark_theme.exp.svg index 9e0f72c25..8d322b80d 100644 --- a/d2renderers/d2svg/dark_theme/testdata/child_to_child/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/child_to_child/dark_theme.exp.svg @@ -1,16 +1,16 @@ -wintersummersnowsun + .d2-3232990914 .fill-N1{fill:#CDD6F4;} + .d2-3232990914 .fill-N2{fill:#BAC2DE;} + .d2-3232990914 .fill-N3{fill:#A6ADC8;} + .d2-3232990914 .fill-N4{fill:#585B70;} + .d2-3232990914 .fill-N5{fill:#45475A;} + .d2-3232990914 .fill-N6{fill:#313244;} + .d2-3232990914 .fill-N7{fill:#1E1E2E;} + .d2-3232990914 .fill-B1{fill:#CBA6f7;} + .d2-3232990914 .fill-B2{fill:#CBA6f7;} + .d2-3232990914 .fill-B3{fill:#6C7086;} + .d2-3232990914 .fill-B4{fill:#585B70;} + .d2-3232990914 .fill-B5{fill:#45475A;} + .d2-3232990914 .fill-B6{fill:#313244;} + .d2-3232990914 .fill-AA2{fill:#f38BA8;} + .d2-3232990914 .fill-AA4{fill:#45475A;} + .d2-3232990914 .fill-AA5{fill:#313244;} + .d2-3232990914 .fill-AB4{fill:#45475A;} + .d2-3232990914 .fill-AB5{fill:#313244;} + .d2-3232990914 .stroke-N1{stroke:#CDD6F4;} + .d2-3232990914 .stroke-N2{stroke:#BAC2DE;} + .d2-3232990914 .stroke-N3{stroke:#A6ADC8;} + .d2-3232990914 .stroke-N4{stroke:#585B70;} + .d2-3232990914 .stroke-N5{stroke:#45475A;} + .d2-3232990914 .stroke-N6{stroke:#313244;} + .d2-3232990914 .stroke-N7{stroke:#1E1E2E;} + .d2-3232990914 .stroke-B1{stroke:#CBA6f7;} + .d2-3232990914 .stroke-B2{stroke:#CBA6f7;} + .d2-3232990914 .stroke-B3{stroke:#6C7086;} + .d2-3232990914 .stroke-B4{stroke:#585B70;} + .d2-3232990914 .stroke-B5{stroke:#45475A;} + .d2-3232990914 .stroke-B6{stroke:#313244;} + .d2-3232990914 .stroke-AA2{stroke:#f38BA8;} + .d2-3232990914 .stroke-AA4{stroke:#45475A;} + .d2-3232990914 .stroke-AA5{stroke:#313244;} + .d2-3232990914 .stroke-AB4{stroke:#45475A;} + .d2-3232990914 .stroke-AB5{stroke:#313244;} + .d2-3232990914 .background-color-N1{background-color:#CDD6F4;} + .d2-3232990914 .background-color-N2{background-color:#BAC2DE;} + .d2-3232990914 .background-color-N3{background-color:#A6ADC8;} + .d2-3232990914 .background-color-N4{background-color:#585B70;} + .d2-3232990914 .background-color-N5{background-color:#45475A;} + .d2-3232990914 .background-color-N6{background-color:#313244;} + .d2-3232990914 .background-color-N7{background-color:#1E1E2E;} + .d2-3232990914 .background-color-B1{background-color:#CBA6f7;} + .d2-3232990914 .background-color-B2{background-color:#CBA6f7;} + .d2-3232990914 .background-color-B3{background-color:#6C7086;} + .d2-3232990914 .background-color-B4{background-color:#585B70;} + .d2-3232990914 .background-color-B5{background-color:#45475A;} + .d2-3232990914 .background-color-B6{background-color:#313244;} + .d2-3232990914 .background-color-AA2{background-color:#f38BA8;} + .d2-3232990914 .background-color-AA4{background-color:#45475A;} + .d2-3232990914 .background-color-AA5{background-color:#313244;} + .d2-3232990914 .background-color-AB4{background-color:#45475A;} + .d2-3232990914 .background-color-AB5{background-color:#313244;} + .d2-3232990914 .color-N1{color:#CDD6F4;} + .d2-3232990914 .color-N2{color:#BAC2DE;} + .d2-3232990914 .color-N3{color:#A6ADC8;} + .d2-3232990914 .color-N4{color:#585B70;} + .d2-3232990914 .color-N5{color:#45475A;} + .d2-3232990914 .color-N6{color:#313244;} + .d2-3232990914 .color-N7{color:#1E1E2E;} + .d2-3232990914 .color-B1{color:#CBA6f7;} + .d2-3232990914 .color-B2{color:#CBA6f7;} + .d2-3232990914 .color-B3{color:#6C7086;} + .d2-3232990914 .color-B4{color:#585B70;} + .d2-3232990914 .color-B5{color:#45475A;} + .d2-3232990914 .color-B6{color:#313244;} + .d2-3232990914 .color-AA2{color:#f38BA8;} + .d2-3232990914 .color-AA4{color:#45475A;} + .d2-3232990914 .color-AA5{color:#313244;} + .d2-3232990914 .color-AB4{color:#45475A;} + .d2-3232990914 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal-d2-3232990914);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal-d2-3232990914);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark-d2-3232990914);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark-d2-3232990914);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker-d2-3232990914);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker-d2-3232990914);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal-d2-3232990914);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker-d2-3232990914);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker-d2-3232990914);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker-d2-3232990914);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker-d2-3232990914);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal-d2-3232990914);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal-d2-3232990914);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3232990914);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark-d2-3232990914);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker-d2-3232990914);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker-d2-3232990914);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker-d2-3232990914);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>wintersummersnowsun - - - - + + + + \ No newline at end of file diff --git a/d2renderers/d2svg/dark_theme/testdata/class/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/class/dark_theme.exp.svg index 9dda5bf15..a25bc65e6 100644 --- a/d2renderers/d2svg/dark_theme/testdata/class/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/class/dark_theme.exp.svg @@ -1,9 +1,9 @@ -BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void + .d2-1451519138 .fill-N1{fill:#CDD6F4;} + .d2-1451519138 .fill-N2{fill:#BAC2DE;} + .d2-1451519138 .fill-N3{fill:#A6ADC8;} + .d2-1451519138 .fill-N4{fill:#585B70;} + .d2-1451519138 .fill-N5{fill:#45475A;} + .d2-1451519138 .fill-N6{fill:#313244;} + .d2-1451519138 .fill-N7{fill:#1E1E2E;} + .d2-1451519138 .fill-B1{fill:#CBA6f7;} + .d2-1451519138 .fill-B2{fill:#CBA6f7;} + .d2-1451519138 .fill-B3{fill:#6C7086;} + .d2-1451519138 .fill-B4{fill:#585B70;} + .d2-1451519138 .fill-B5{fill:#45475A;} + .d2-1451519138 .fill-B6{fill:#313244;} + .d2-1451519138 .fill-AA2{fill:#f38BA8;} + .d2-1451519138 .fill-AA4{fill:#45475A;} + .d2-1451519138 .fill-AA5{fill:#313244;} + .d2-1451519138 .fill-AB4{fill:#45475A;} + .d2-1451519138 .fill-AB5{fill:#313244;} + .d2-1451519138 .stroke-N1{stroke:#CDD6F4;} + .d2-1451519138 .stroke-N2{stroke:#BAC2DE;} + .d2-1451519138 .stroke-N3{stroke:#A6ADC8;} + .d2-1451519138 .stroke-N4{stroke:#585B70;} + .d2-1451519138 .stroke-N5{stroke:#45475A;} + .d2-1451519138 .stroke-N6{stroke:#313244;} + .d2-1451519138 .stroke-N7{stroke:#1E1E2E;} + .d2-1451519138 .stroke-B1{stroke:#CBA6f7;} + .d2-1451519138 .stroke-B2{stroke:#CBA6f7;} + .d2-1451519138 .stroke-B3{stroke:#6C7086;} + .d2-1451519138 .stroke-B4{stroke:#585B70;} + .d2-1451519138 .stroke-B5{stroke:#45475A;} + .d2-1451519138 .stroke-B6{stroke:#313244;} + .d2-1451519138 .stroke-AA2{stroke:#f38BA8;} + .d2-1451519138 .stroke-AA4{stroke:#45475A;} + .d2-1451519138 .stroke-AA5{stroke:#313244;} + .d2-1451519138 .stroke-AB4{stroke:#45475A;} + .d2-1451519138 .stroke-AB5{stroke:#313244;} + .d2-1451519138 .background-color-N1{background-color:#CDD6F4;} + .d2-1451519138 .background-color-N2{background-color:#BAC2DE;} + .d2-1451519138 .background-color-N3{background-color:#A6ADC8;} + .d2-1451519138 .background-color-N4{background-color:#585B70;} + .d2-1451519138 .background-color-N5{background-color:#45475A;} + .d2-1451519138 .background-color-N6{background-color:#313244;} + .d2-1451519138 .background-color-N7{background-color:#1E1E2E;} + .d2-1451519138 .background-color-B1{background-color:#CBA6f7;} + .d2-1451519138 .background-color-B2{background-color:#CBA6f7;} + .d2-1451519138 .background-color-B3{background-color:#6C7086;} + .d2-1451519138 .background-color-B4{background-color:#585B70;} + .d2-1451519138 .background-color-B5{background-color:#45475A;} + .d2-1451519138 .background-color-B6{background-color:#313244;} + .d2-1451519138 .background-color-AA2{background-color:#f38BA8;} + .d2-1451519138 .background-color-AA4{background-color:#45475A;} + .d2-1451519138 .background-color-AA5{background-color:#313244;} + .d2-1451519138 .background-color-AB4{background-color:#45475A;} + .d2-1451519138 .background-color-AB5{background-color:#313244;} + .d2-1451519138 .color-N1{color:#CDD6F4;} + .d2-1451519138 .color-N2{color:#BAC2DE;} + .d2-1451519138 .color-N3{color:#A6ADC8;} + .d2-1451519138 .color-N4{color:#585B70;} + .d2-1451519138 .color-N5{color:#45475A;} + .d2-1451519138 .color-N6{color:#313244;} + .d2-1451519138 .color-N7{color:#1E1E2E;} + .d2-1451519138 .color-B1{color:#CBA6f7;} + .d2-1451519138 .color-B2{color:#CBA6f7;} + .d2-1451519138 .color-B3{color:#6C7086;} + .d2-1451519138 .color-B4{color:#585B70;} + .d2-1451519138 .color-B5{color:#45475A;} + .d2-1451519138 .color-B6{color:#313244;} + .d2-1451519138 .color-AA2{color:#f38BA8;} + .d2-1451519138 .color-AA4{color:#45475A;} + .d2-1451519138 .color-AA5{color:#313244;} + .d2-1451519138 .color-AB4{color:#45475A;} + .d2-1451519138 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal-d2-1451519138);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal-d2-1451519138);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark-d2-1451519138);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark-d2-1451519138);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker-d2-1451519138);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker-d2-1451519138);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal-d2-1451519138);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker-d2-1451519138);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker-d2-1451519138);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker-d2-1451519138);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker-d2-1451519138);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal-d2-1451519138);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal-d2-1451519138);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1451519138);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark-d2-1451519138);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker-d2-1451519138);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker-d2-1451519138);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker-d2-1451519138);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void \ No newline at end of file diff --git a/d2renderers/d2svg/dark_theme/testdata/code/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/code/dark_theme.exp.svg index e12bfa87b..554ba771d 100644 --- a/d2renderers/d2svg/dark_theme/testdata/code/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/code/dark_theme.exp.svg @@ -1,27 +1,27 @@ -func main() { +func main() {   panic("TODO") }func main() {   panic("TODO") -}

    Five is a sufficiently close approximation to infinity.

    -
    Don't hit me!!  I'm in the Twilight Zone!!!Don't hit me!!  I'm in the Twilight Zone!!! +    }

    Five is a sufficiently close approximation to infinity.

    +
    Don't hit me!!  I'm in the Twilight Zone!!!Don't hit me!!  I'm in the Twilight Zone!!! - - - + + +     \ No newline at end of file diff --git a/d2renderers/d2svg/dark_theme/testdata/connection_label/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/connection_label/dark_theme.exp.svg index d165c3f49..239ab6882 100644 --- a/d2renderers/d2svg/dark_theme/testdata/connection_label/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/connection_label/dark_theme.exp.svg @@ -1,16 +1,16 @@ -ab hello + .d2-2403116894 .fill-N1{fill:#CDD6F4;} + .d2-2403116894 .fill-N2{fill:#BAC2DE;} + .d2-2403116894 .fill-N3{fill:#A6ADC8;} + .d2-2403116894 .fill-N4{fill:#585B70;} + .d2-2403116894 .fill-N5{fill:#45475A;} + .d2-2403116894 .fill-N6{fill:#313244;} + .d2-2403116894 .fill-N7{fill:#1E1E2E;} + .d2-2403116894 .fill-B1{fill:#CBA6f7;} + .d2-2403116894 .fill-B2{fill:#CBA6f7;} + .d2-2403116894 .fill-B3{fill:#6C7086;} + .d2-2403116894 .fill-B4{fill:#585B70;} + .d2-2403116894 .fill-B5{fill:#45475A;} + .d2-2403116894 .fill-B6{fill:#313244;} + .d2-2403116894 .fill-AA2{fill:#f38BA8;} + .d2-2403116894 .fill-AA4{fill:#45475A;} + .d2-2403116894 .fill-AA5{fill:#313244;} + .d2-2403116894 .fill-AB4{fill:#45475A;} + .d2-2403116894 .fill-AB5{fill:#313244;} + .d2-2403116894 .stroke-N1{stroke:#CDD6F4;} + .d2-2403116894 .stroke-N2{stroke:#BAC2DE;} + .d2-2403116894 .stroke-N3{stroke:#A6ADC8;} + .d2-2403116894 .stroke-N4{stroke:#585B70;} + .d2-2403116894 .stroke-N5{stroke:#45475A;} + .d2-2403116894 .stroke-N6{stroke:#313244;} + .d2-2403116894 .stroke-N7{stroke:#1E1E2E;} + .d2-2403116894 .stroke-B1{stroke:#CBA6f7;} + .d2-2403116894 .stroke-B2{stroke:#CBA6f7;} + .d2-2403116894 .stroke-B3{stroke:#6C7086;} + .d2-2403116894 .stroke-B4{stroke:#585B70;} + .d2-2403116894 .stroke-B5{stroke:#45475A;} + .d2-2403116894 .stroke-B6{stroke:#313244;} + .d2-2403116894 .stroke-AA2{stroke:#f38BA8;} + .d2-2403116894 .stroke-AA4{stroke:#45475A;} + .d2-2403116894 .stroke-AA5{stroke:#313244;} + .d2-2403116894 .stroke-AB4{stroke:#45475A;} + .d2-2403116894 .stroke-AB5{stroke:#313244;} + .d2-2403116894 .background-color-N1{background-color:#CDD6F4;} + .d2-2403116894 .background-color-N2{background-color:#BAC2DE;} + .d2-2403116894 .background-color-N3{background-color:#A6ADC8;} + .d2-2403116894 .background-color-N4{background-color:#585B70;} + .d2-2403116894 .background-color-N5{background-color:#45475A;} + .d2-2403116894 .background-color-N6{background-color:#313244;} + .d2-2403116894 .background-color-N7{background-color:#1E1E2E;} + .d2-2403116894 .background-color-B1{background-color:#CBA6f7;} + .d2-2403116894 .background-color-B2{background-color:#CBA6f7;} + .d2-2403116894 .background-color-B3{background-color:#6C7086;} + .d2-2403116894 .background-color-B4{background-color:#585B70;} + .d2-2403116894 .background-color-B5{background-color:#45475A;} + .d2-2403116894 .background-color-B6{background-color:#313244;} + .d2-2403116894 .background-color-AA2{background-color:#f38BA8;} + .d2-2403116894 .background-color-AA4{background-color:#45475A;} + .d2-2403116894 .background-color-AA5{background-color:#313244;} + .d2-2403116894 .background-color-AB4{background-color:#45475A;} + .d2-2403116894 .background-color-AB5{background-color:#313244;} + .d2-2403116894 .color-N1{color:#CDD6F4;} + .d2-2403116894 .color-N2{color:#BAC2DE;} + .d2-2403116894 .color-N3{color:#A6ADC8;} + .d2-2403116894 .color-N4{color:#585B70;} + .d2-2403116894 .color-N5{color:#45475A;} + .d2-2403116894 .color-N6{color:#313244;} + .d2-2403116894 .color-N7{color:#1E1E2E;} + .d2-2403116894 .color-B1{color:#CBA6f7;} + .d2-2403116894 .color-B2{color:#CBA6f7;} + .d2-2403116894 .color-B3{color:#6C7086;} + .d2-2403116894 .color-B4{color:#585B70;} + .d2-2403116894 .color-B5{color:#45475A;} + .d2-2403116894 .color-B6{color:#313244;} + .d2-2403116894 .color-AA2{color:#f38BA8;} + .d2-2403116894 .color-AA4{color:#45475A;} + .d2-2403116894 .color-AA5{color:#313244;} + .d2-2403116894 .color-AB4{color:#45475A;} + .d2-2403116894 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal-d2-2403116894);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal-d2-2403116894);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark-d2-2403116894);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark-d2-2403116894);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker-d2-2403116894);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker-d2-2403116894);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal-d2-2403116894);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker-d2-2403116894);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker-d2-2403116894);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker-d2-2403116894);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker-d2-2403116894);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal-d2-2403116894);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal-d2-2403116894);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2403116894);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark-d2-2403116894);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker-d2-2403116894);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker-d2-2403116894);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker-d2-2403116894);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>ab hello - - - + + + \ No newline at end of file diff --git a/d2renderers/d2svg/dark_theme/testdata/opacity/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/opacity/dark_theme.exp.svg index 159c6147e..599199491 100644 --- a/d2renderers/d2svg/dark_theme/testdata/opacity/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/opacity/dark_theme.exp.svg @@ -1,27 +1,27 @@ -x

    linux: because a PC is a terrible thing to waste

    -
    auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. +x

    linux: because a PC is a terrible thing to waste

    +
    auserslast_logindatetime You don't have to know how the computer works,just how to work the computer. - - - - + + + +     \ No newline at end of file diff --git a/d2renderers/d2svg/dark_theme/testdata/overlay/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/overlay/dark_theme.exp.svg index ecfe526da..bfcb6b70b 100644 --- a/d2renderers/d2svg/dark_theme/testdata/overlay/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/overlay/dark_theme.exp.svg @@ -1,9 +1,9 @@ -brightnormaldarkdarker + .d2-4013249291 .fill-N1{fill:#CDD6F4;} + .d2-4013249291 .fill-N2{fill:#BAC2DE;} + .d2-4013249291 .fill-N3{fill:#A6ADC8;} + .d2-4013249291 .fill-N4{fill:#585B70;} + .d2-4013249291 .fill-N5{fill:#45475A;} + .d2-4013249291 .fill-N6{fill:#313244;} + .d2-4013249291 .fill-N7{fill:#1E1E2E;} + .d2-4013249291 .fill-B1{fill:#CBA6f7;} + .d2-4013249291 .fill-B2{fill:#CBA6f7;} + .d2-4013249291 .fill-B3{fill:#6C7086;} + .d2-4013249291 .fill-B4{fill:#585B70;} + .d2-4013249291 .fill-B5{fill:#45475A;} + .d2-4013249291 .fill-B6{fill:#313244;} + .d2-4013249291 .fill-AA2{fill:#f38BA8;} + .d2-4013249291 .fill-AA4{fill:#45475A;} + .d2-4013249291 .fill-AA5{fill:#313244;} + .d2-4013249291 .fill-AB4{fill:#45475A;} + .d2-4013249291 .fill-AB5{fill:#313244;} + .d2-4013249291 .stroke-N1{stroke:#CDD6F4;} + .d2-4013249291 .stroke-N2{stroke:#BAC2DE;} + .d2-4013249291 .stroke-N3{stroke:#A6ADC8;} + .d2-4013249291 .stroke-N4{stroke:#585B70;} + .d2-4013249291 .stroke-N5{stroke:#45475A;} + .d2-4013249291 .stroke-N6{stroke:#313244;} + .d2-4013249291 .stroke-N7{stroke:#1E1E2E;} + .d2-4013249291 .stroke-B1{stroke:#CBA6f7;} + .d2-4013249291 .stroke-B2{stroke:#CBA6f7;} + .d2-4013249291 .stroke-B3{stroke:#6C7086;} + .d2-4013249291 .stroke-B4{stroke:#585B70;} + .d2-4013249291 .stroke-B5{stroke:#45475A;} + .d2-4013249291 .stroke-B6{stroke:#313244;} + .d2-4013249291 .stroke-AA2{stroke:#f38BA8;} + .d2-4013249291 .stroke-AA4{stroke:#45475A;} + .d2-4013249291 .stroke-AA5{stroke:#313244;} + .d2-4013249291 .stroke-AB4{stroke:#45475A;} + .d2-4013249291 .stroke-AB5{stroke:#313244;} + .d2-4013249291 .background-color-N1{background-color:#CDD6F4;} + .d2-4013249291 .background-color-N2{background-color:#BAC2DE;} + .d2-4013249291 .background-color-N3{background-color:#A6ADC8;} + .d2-4013249291 .background-color-N4{background-color:#585B70;} + .d2-4013249291 .background-color-N5{background-color:#45475A;} + .d2-4013249291 .background-color-N6{background-color:#313244;} + .d2-4013249291 .background-color-N7{background-color:#1E1E2E;} + .d2-4013249291 .background-color-B1{background-color:#CBA6f7;} + .d2-4013249291 .background-color-B2{background-color:#CBA6f7;} + .d2-4013249291 .background-color-B3{background-color:#6C7086;} + .d2-4013249291 .background-color-B4{background-color:#585B70;} + .d2-4013249291 .background-color-B5{background-color:#45475A;} + .d2-4013249291 .background-color-B6{background-color:#313244;} + .d2-4013249291 .background-color-AA2{background-color:#f38BA8;} + .d2-4013249291 .background-color-AA4{background-color:#45475A;} + .d2-4013249291 .background-color-AA5{background-color:#313244;} + .d2-4013249291 .background-color-AB4{background-color:#45475A;} + .d2-4013249291 .background-color-AB5{background-color:#313244;} + .d2-4013249291 .color-N1{color:#CDD6F4;} + .d2-4013249291 .color-N2{color:#BAC2DE;} + .d2-4013249291 .color-N3{color:#A6ADC8;} + .d2-4013249291 .color-N4{color:#585B70;} + .d2-4013249291 .color-N5{color:#45475A;} + .d2-4013249291 .color-N6{color:#313244;} + .d2-4013249291 .color-N7{color:#1E1E2E;} + .d2-4013249291 .color-B1{color:#CBA6f7;} + .d2-4013249291 .color-B2{color:#CBA6f7;} + .d2-4013249291 .color-B3{color:#6C7086;} + .d2-4013249291 .color-B4{color:#585B70;} + .d2-4013249291 .color-B5{color:#45475A;} + .d2-4013249291 .color-B6{color:#313244;} + .d2-4013249291 .color-AA2{color:#f38BA8;} + .d2-4013249291 .color-AA4{color:#45475A;} + .d2-4013249291 .color-AA5{color:#313244;} + .d2-4013249291 .color-AB4{color:#45475A;} + .d2-4013249291 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal-d2-4013249291);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal-d2-4013249291);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark-d2-4013249291);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark-d2-4013249291);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker-d2-4013249291);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker-d2-4013249291);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal-d2-4013249291);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker-d2-4013249291);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker-d2-4013249291);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker-d2-4013249291);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker-d2-4013249291);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal-d2-4013249291);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal-d2-4013249291);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4013249291);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark-d2-4013249291);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker-d2-4013249291);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker-d2-4013249291);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker-d2-4013249291);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>brightnormaldarkdarker - - - - + + + + \ No newline at end of file diff --git a/d2renderers/d2svg/dark_theme/testdata/sql_tables/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/sql_tables/dark_theme.exp.svg index 785a09b54..943d1af37 100644 --- a/d2renderers/d2svg/dark_theme/testdata/sql_tables/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/sql_tables/dark_theme.exp.svg @@ -1,9 +1,9 @@ -usersidintnamestringemailstringpasswordstringlast_logindatetimeproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringPKstatusstring + .d2-3887381467 .fill-N1{fill:#CDD6F4;} + .d2-3887381467 .fill-N2{fill:#BAC2DE;} + .d2-3887381467 .fill-N3{fill:#A6ADC8;} + .d2-3887381467 .fill-N4{fill:#585B70;} + .d2-3887381467 .fill-N5{fill:#45475A;} + .d2-3887381467 .fill-N6{fill:#313244;} + .d2-3887381467 .fill-N7{fill:#1E1E2E;} + .d2-3887381467 .fill-B1{fill:#CBA6f7;} + .d2-3887381467 .fill-B2{fill:#CBA6f7;} + .d2-3887381467 .fill-B3{fill:#6C7086;} + .d2-3887381467 .fill-B4{fill:#585B70;} + .d2-3887381467 .fill-B5{fill:#45475A;} + .d2-3887381467 .fill-B6{fill:#313244;} + .d2-3887381467 .fill-AA2{fill:#f38BA8;} + .d2-3887381467 .fill-AA4{fill:#45475A;} + .d2-3887381467 .fill-AA5{fill:#313244;} + .d2-3887381467 .fill-AB4{fill:#45475A;} + .d2-3887381467 .fill-AB5{fill:#313244;} + .d2-3887381467 .stroke-N1{stroke:#CDD6F4;} + .d2-3887381467 .stroke-N2{stroke:#BAC2DE;} + .d2-3887381467 .stroke-N3{stroke:#A6ADC8;} + .d2-3887381467 .stroke-N4{stroke:#585B70;} + .d2-3887381467 .stroke-N5{stroke:#45475A;} + .d2-3887381467 .stroke-N6{stroke:#313244;} + .d2-3887381467 .stroke-N7{stroke:#1E1E2E;} + .d2-3887381467 .stroke-B1{stroke:#CBA6f7;} + .d2-3887381467 .stroke-B2{stroke:#CBA6f7;} + .d2-3887381467 .stroke-B3{stroke:#6C7086;} + .d2-3887381467 .stroke-B4{stroke:#585B70;} + .d2-3887381467 .stroke-B5{stroke:#45475A;} + .d2-3887381467 .stroke-B6{stroke:#313244;} + .d2-3887381467 .stroke-AA2{stroke:#f38BA8;} + .d2-3887381467 .stroke-AA4{stroke:#45475A;} + .d2-3887381467 .stroke-AA5{stroke:#313244;} + .d2-3887381467 .stroke-AB4{stroke:#45475A;} + .d2-3887381467 .stroke-AB5{stroke:#313244;} + .d2-3887381467 .background-color-N1{background-color:#CDD6F4;} + .d2-3887381467 .background-color-N2{background-color:#BAC2DE;} + .d2-3887381467 .background-color-N3{background-color:#A6ADC8;} + .d2-3887381467 .background-color-N4{background-color:#585B70;} + .d2-3887381467 .background-color-N5{background-color:#45475A;} + .d2-3887381467 .background-color-N6{background-color:#313244;} + .d2-3887381467 .background-color-N7{background-color:#1E1E2E;} + .d2-3887381467 .background-color-B1{background-color:#CBA6f7;} + .d2-3887381467 .background-color-B2{background-color:#CBA6f7;} + .d2-3887381467 .background-color-B3{background-color:#6C7086;} + .d2-3887381467 .background-color-B4{background-color:#585B70;} + .d2-3887381467 .background-color-B5{background-color:#45475A;} + .d2-3887381467 .background-color-B6{background-color:#313244;} + .d2-3887381467 .background-color-AA2{background-color:#f38BA8;} + .d2-3887381467 .background-color-AA4{background-color:#45475A;} + .d2-3887381467 .background-color-AA5{background-color:#313244;} + .d2-3887381467 .background-color-AB4{background-color:#45475A;} + .d2-3887381467 .background-color-AB5{background-color:#313244;} + .d2-3887381467 .color-N1{color:#CDD6F4;} + .d2-3887381467 .color-N2{color:#BAC2DE;} + .d2-3887381467 .color-N3{color:#A6ADC8;} + .d2-3887381467 .color-N4{color:#585B70;} + .d2-3887381467 .color-N5{color:#45475A;} + .d2-3887381467 .color-N6{color:#313244;} + .d2-3887381467 .color-N7{color:#1E1E2E;} + .d2-3887381467 .color-B1{color:#CBA6f7;} + .d2-3887381467 .color-B2{color:#CBA6f7;} + .d2-3887381467 .color-B3{color:#6C7086;} + .d2-3887381467 .color-B4{color:#585B70;} + .d2-3887381467 .color-B5{color:#45475A;} + .d2-3887381467 .color-B6{color:#313244;} + .d2-3887381467 .color-AA2{color:#f38BA8;} + .d2-3887381467 .color-AA4{color:#45475A;} + .d2-3887381467 .color-AA5{color:#313244;} + .d2-3887381467 .color-AB4{color:#45475A;} + .d2-3887381467 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal-d2-3887381467);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal-d2-3887381467);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark-d2-3887381467);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark-d2-3887381467);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker-d2-3887381467);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker-d2-3887381467);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal-d2-3887381467);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker-d2-3887381467);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker-d2-3887381467);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker-d2-3887381467);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker-d2-3887381467);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal-d2-3887381467);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal-d2-3887381467);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3887381467);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark-d2-3887381467);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker-d2-3887381467);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker-d2-3887381467);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker-d2-3887381467);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>usersidintnamestringemailstringpasswordstringlast_logindatetimeproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringPKstatusstring \ No newline at end of file diff --git a/d2renderers/d2svg/dark_theme/testdata/twitter/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/twitter/dark_theme.exp.svg index d8f36ccb5..904003c5e 100644 --- a/d2renderers/d2svg/dark_theme/testdata/twitter/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/twitter/dark_theme.exp.svg @@ -1,27 +1,27 @@ -People discovery serviceAd mixerOnboarding serviceTwitter Frontend WebIphoneAndroidTimelineScorerHome RankerTimeline ServiceHome mixerManhattanGizmoduckSocial graphTweety PiePrediction ServiceHome ScorerManhattanMemcacheFetchFeatureScoringPrediction Service...etc

    Timeline mixer

    +People discovery serviceAd mixerOnboarding serviceTwitter Frontend WebIphoneAndroidTimelineScorerHome RankerTimeline ServiceHome mixerManhattanGizmoduckSocial graphTweety PiePrediction ServiceHome ScorerManhattanMemcacheFetchFeatureScoringPrediction Service...etc

    Timeline mixer

    • Inject ads, who-to-follow, onboarding
    • Conversation module
      • @@ -851,46 +850,46 @@
    • Tweat deduplication
    • Served data logging
    -
    GraphQLFederated Strato Column

    Tweet/user content hydration, visibility filtering

    -
    TLS-API (being deprecated)CrMixerEarlyBirdUtagSpaceCommunities iPhone webHTTP AndroidThrift RPC Candidate FetchFeature HydrationCandidate sources +
    GraphQLFederated Strato Column

    Tweet/user content hydration, visibility filtering

    +
    TLS-API (being deprecated)CrMixerEarlyBirdUtagSpaceCommunities iPhone webHTTP AndroidThrift RPC Candidate FetchFeature HydrationCandidate sources - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +     \ No newline at end of file diff --git a/d2renderers/d2svg/dots.txt b/d2renderers/d2svg/dots.txt index 62d13736f..c7d07a52f 100644 --- a/d2renderers/d2svg/dots.txt +++ b/d2renderers/d2svg/dots.txt @@ -1,4 +1,4 @@ - + diff --git a/d2renderers/d2svg/github-markdown.css b/d2renderers/d2svg/github-markdown.css index c271b67d7..53a7e2102 100644 --- a/d2renderers/d2svg/github-markdown.css +++ b/d2renderers/d2svg/github-markdown.css @@ -26,7 +26,6 @@ -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%; margin: 0; - color: var(--color-fg-default); background-color: transparent; /* we don't want to define the background color */ font-family: "font-regular"; font-size: 16px; diff --git a/d2renderers/d2svg/grain.txt b/d2renderers/d2svg/grain.txt index b03186ba5..4b6f76363 100644 --- a/d2renderers/d2svg/grain.txt +++ b/d2renderers/d2svg/grain.txt @@ -1,14 +1,14 @@ - - - + + + - - + + - + - + diff --git a/d2renderers/d2svg/lines.txt b/d2renderers/d2svg/lines.txt index eab4fad8d..0e48ef14b 100644 --- a/d2renderers/d2svg/lines.txt +++ b/d2renderers/d2svg/lines.txt @@ -1,4 +1,4 @@ - + diff --git a/d2renderers/d2svg/link.svg b/d2renderers/d2svg/link.svg index ff5bc3fb1..543917a63 100644 --- a/d2renderers/d2svg/link.svg +++ b/d2renderers/d2svg/link.svg @@ -1,11 +1,11 @@ - + - + diff --git a/d2renderers/d2svg/paper.txt b/d2renderers/d2svg/paper.txt index 06da94950..46987bb5c 100644 --- a/d2renderers/d2svg/paper.txt +++ b/d2renderers/d2svg/paper.txt @@ -1,11 +1,11 @@ - + - - + + - + @@ -1051,7 +1051,7 @@ - + diff --git a/d2renderers/d2svg/table.go b/d2renderers/d2svg/table.go index f7b2782db..86f5438e4 100644 --- a/d2renderers/d2svg/table.go +++ b/d2renderers/d2svg/table.go @@ -22,7 +22,7 @@ func clipPathForBorderRadius(diagramHash string, shape d2target.Shape) string { ) topX, topY := box.TopLeft.X+box.Width, box.TopLeft.Y - out := fmt.Sprintf(``, diagramHash, shape.ID) + out := fmt.Sprintf(``, diagramHash, svg.SVGID(shape.ID)) out += fmt.Sprintf(` - + - + diff --git a/d2target/d2target.go b/d2target/d2target.go index 299df25a7..8157cce74 100644 --- a/d2target/d2target.go +++ b/d2target/d2target.go @@ -34,6 +34,8 @@ const ( MIN_ARROWHEAD_STROKE_WIDTH = 2 ARROWHEAD_PADDING = 2. + + CONNECTION_ICON_LABEL_GAP = 8 ) var BorderOffset = geo.NewVector(5, 5) @@ -84,7 +86,8 @@ type Diagram struct { Shapes []Shape `json:"shapes"` Connections []Connection `json:"connections"` - Root Shape `json:"root"` + Root Shape `json:"root"` + Legend *Legend `json:"legend,omitempty"` // Maybe Icon can be used as a watermark in the root shape Layers []*Diagram `json:"layers,omitempty"` @@ -92,6 +95,11 @@ type Diagram struct { Steps []*Diagram `json:"steps,omitempty"` } +type Legend struct { + Shapes []Shape `json:"shapes,omitempty"` + Connections []Connection `json:"connections,omitempty"` +} + func (d *Diagram) GetBoard(boardPath []string) *Diagram { if len(boardPath) == 0 { return d @@ -223,13 +231,16 @@ func (diagram Diagram) HasShape(condition func(Shape) bool) bool { return false } -func (diagram Diagram) HashID() (string, error) { +func (diagram Diagram) HashID(salt *string) (string, error) { bytes, err := diagram.Bytes() if err != nil { return "", err } h := fnv.New32a() h.Write(bytes) + if salt != nil { + h.Write([]byte(*salt)) + } // CSS names can't start with numbers, so prepend a little something return fmt.Sprintf("d2-%d", h.Sum32()), nil } @@ -275,6 +286,13 @@ func (diagram Diagram) BoundingBox() (topLeft, bottomRight Point) { x2 = go2.Max(x2, targetShape.Pos.X+targetShape.Width+int(math.Ceil(float64(targetShape.StrokeWidth)/2.))) y2 = go2.Max(y2, targetShape.Pos.Y+targetShape.Height+int(math.Ceil(float64(targetShape.StrokeWidth)/2.))) + if targetShape.Type == ShapeC4Person { + headRadius := int(float64(targetShape.Width) * 0.22) + headCenterY := int(float64(targetShape.Height) * 0.18) + headTop := targetShape.Pos.Y + headCenterY - headRadius + y1 = go2.Min(y1, headTop-targetShape.StrokeWidth) + } + if targetShape.Tooltip != "" || targetShape.Link != "" { // 16 is the icon radius y1 = go2.Min(y1, targetShape.Pos.Y-targetShape.StrokeWidth-16) @@ -438,6 +456,16 @@ func (diagram Diagram) GetCorpus() string { } } + if diagram.Legend != nil { + corpus += "Legend" + for _, s := range diagram.Legend.Shapes { + corpus += s.Label + } + for _, c := range diagram.Legend.Connections { + corpus += c.Label + } + } + return corpus } @@ -469,16 +497,18 @@ type Shape struct { FillPattern string `json:"fillPattern,omitempty"` Stroke string `json:"stroke"` + Animated bool `json:"animated"` Shadow bool `json:"shadow"` ThreeDee bool `json:"3d"` Multiple bool `json:"multiple"` DoubleBorder bool `json:"double-border"` - Tooltip string `json:"tooltip"` - Link string `json:"link"` - PrettyLink string `json:"prettyLink,omitempty"` - Icon *url.URL `json:"icon"` - IconPosition string `json:"iconPosition"` + Tooltip string `json:"tooltip"` + Link string `json:"link"` + PrettyLink string `json:"prettyLink,omitempty"` + Icon *url.URL `json:"icon"` + IconBorderRadius int `json:"iconBorderRadius,omitempty"` + IconPosition string `json:"iconPosition"` // Whether the shape should allow shapes behind it to bleed through // Currently just used for sequence diagram groups @@ -599,16 +629,47 @@ type Connection struct { LabelPosition string `json:"labelPosition"` LabelPercentage float64 `json:"labelPercentage"` + Link string `json:"link"` + PrettyLink string `json:"prettyLink,omitempty"` + Route []*geo.Point `json:"route"` IsCurve bool `json:"isCurve,omitempty"` - Animated bool `json:"animated"` - Tooltip string `json:"tooltip"` - Icon *url.URL `json:"icon"` + Animated bool `json:"animated"` + Tooltip string `json:"tooltip"` + Icon *url.URL `json:"icon"` + IconPosition string `json:"iconPosition,omitempty"` + IconBorderRadius float64 `json:"iconBorderRadius,omitempty"` ZIndex int `json:"zIndex"` } +func (c *Connection) GetIconPosition() *geo.Point { + if c.Icon == nil { + return nil + } + + if c.Label != "" { + labelTL := c.GetLabelTopLeft() + if labelTL != nil { + // Position icon to the left of the label with a small gap + return &geo.Point{ + X: labelTL.X - CONNECTION_ICON_LABEL_GAP - DEFAULT_ICON_SIZE, + Y: labelTL.Y + float64(c.LabelHeight)/2 - DEFAULT_ICON_SIZE/2, + } + } + } + + point, _ := label.FromString(c.IconPosition).GetPointOnRoute( + c.Route, + float64(c.StrokeWidth), + -1, + float64(DEFAULT_ICON_SIZE), + float64(DEFAULT_ICON_SIZE), + ) + return point +} + func BaseConnection() *Connection { return &Connection{ SrcArrow: NoArrowhead, @@ -749,6 +810,8 @@ const ( CircleArrowhead Arrowhead = "circle" FilledCircleArrowhead Arrowhead = "filled-circle" CrossArrowhead Arrowhead = "cross" + BoxArrowhead Arrowhead = "box" + FilledBoxArrowhead Arrowhead = "filled-box" // For fat arrows LineArrowhead Arrowhead = "line" @@ -769,6 +832,7 @@ var Arrowheads = map[string]struct{}{ string(TriangleArrowhead): {}, string(DiamondArrowhead): {}, string(CircleArrowhead): {}, + string(BoxArrowhead): {}, string(CfOne): {}, string(CfMany): {}, string(CfOneRequired): {}, @@ -799,6 +863,11 @@ func ToArrowhead(arrowheadType string, filled *bool) Arrowhead { return TriangleArrowhead case string(CrossArrowhead): return CrossArrowhead + case string(BoxArrowhead): + if filled != nil && *filled { + return FilledBoxArrowhead + } + return BoxArrowhead case string(CfOne): return CfOne case string(CfMany): @@ -858,6 +927,11 @@ func (arrowhead Arrowhead) Dimensions(strokeWidth float64) (width, height float6 baseHeight = 8 widthMultiplier = 5 heightMultiplier = 5 + case FilledBoxArrowhead, BoxArrowhead: + baseWidth = 6 + baseHeight = 6 + widthMultiplier = 5 + heightMultiplier = 5 case CfOne, CfMany, CfOneRequired, CfManyRequired: baseWidth = 9 baseHeight = 9 @@ -891,6 +965,7 @@ const ( ShapeCallout = "callout" ShapeStoredData = "stored_data" ShapePerson = "person" + ShapeC4Person = "c4-person" ShapeDiamond = "diamond" ShapeOval = "oval" ShapeCircle = "circle" @@ -918,6 +993,7 @@ var Shapes = []string{ ShapeCallout, ShapeStoredData, ShapePerson, + ShapeC4Person, ShapeDiamond, ShapeOval, ShapeCircle, @@ -986,6 +1062,7 @@ var DSL_SHAPE_TO_SHAPE_TYPE = map[string]string{ ShapeCallout: shape.CALLOUT_TYPE, ShapeStoredData: shape.STORED_DATA_TYPE, ShapePerson: shape.PERSON_TYPE, + ShapeC4Person: shape.C4_PERSON_TYPE, ShapeDiamond: shape.DIAMOND_TYPE, ShapeOval: shape.OVAL_TYPE, ShapeCircle: shape.CIRCLE_TYPE, diff --git a/d2themes/d2themes.go b/d2themes/d2themes.go index 48313e3ff..8cfbf92ac 100644 --- a/d2themes/d2themes.go +++ b/d2themes/d2themes.go @@ -21,6 +21,7 @@ type SpecialRules struct { OuterContainerDoubleBorder bool `json:"outerContainerDoubleBorder"` ContainerDots bool `json:"containerDots"` CapsLock bool `json:"capsLock"` + C4 bool `json:"c4"` AllPaper bool `json:"allPaper"` } diff --git a/d2themes/d2themescatalog/buttered_toast.go b/d2themes/d2themescatalog/buttered_toast.go index 2dce552b0..9aa787872 100644 --- a/d2themes/d2themescatalog/buttered_toast.go +++ b/d2themes/d2themescatalog/buttered_toast.go @@ -4,7 +4,7 @@ import "oss.terrastruct.com/d2/d2themes" var ButteredToast = d2themes.Theme{ ID: 105, - Name: "Buttered toast", + Name: "Buttered Toast", Colors: d2themes.ColorPalette{ Neutrals: d2themes.WarmNeutral, diff --git a/d2themes/d2themescatalog/c4.go b/d2themes/d2themescatalog/c4.go new file mode 100644 index 000000000..fb6a3b0ba --- /dev/null +++ b/d2themes/d2themescatalog/c4.go @@ -0,0 +1,38 @@ +package d2themescatalog + +import "oss.terrastruct.com/d2/d2themes" + +var C4 = d2themes.Theme{ + ID: 303, + Name: "C4", + Colors: d2themes.ColorPalette{ + Neutrals: d2themes.Neutral{ + N1: "#0f5eaa", // Container font color + N2: "#707070", // Connection font color + N3: "#FFFFFF", + N4: "#073b6f", // Person stroke + N5: "#999999", // Root level objects + N6: "#FFFFFF", + N7: "#FFFFFF", + }, + + // Primary colors + B1: "#073b6f", // Person stroke + B2: "#08427b", // Person fill + B3: "#3c7fc0", // Inner objects stroke + B4: "#438dd5", // Inner objects fill + B5: "#8a8a8a", // Root level objects stroke + B6: "#999999", // Root level objects fill + + // Accent colors + AA2: "#0f5eaa", // Container stroke + AA4: "#707070", // Connection stroke + AA5: "#f5f5f5", // Light background + + AB4: "#e1e1e1", + AB5: "#f0f0f0", + }, + SpecialRules: d2themes.SpecialRules{ + C4: true, + }, +} diff --git a/d2themes/d2themescatalog/catalog.go b/d2themes/d2themescatalog/catalog.go index 72cf8d10f..6341399dd 100644 --- a/d2themes/d2themescatalog/catalog.go +++ b/d2themes/d2themescatalog/catalog.go @@ -25,6 +25,7 @@ var LightCatalog = []d2themes.Theme{ Terminal, TerminalGrayscale, Origami, + C4, } var DarkCatalog = []d2themes.Theme{ diff --git a/d2themes/d2themescatalog/colorblind_clear.go b/d2themes/d2themescatalog/colorblind_clear.go index 398f8b9c6..9a7d68175 100644 --- a/d2themes/d2themescatalog/colorblind_clear.go +++ b/d2themes/d2themescatalog/colorblind_clear.go @@ -4,7 +4,7 @@ import "oss.terrastruct.com/d2/d2themes" var ColorblindClear = d2themes.Theme{ ID: 8, - Name: "Colorblind clear", + Name: "Colorblind Clear", Colors: d2themes.ColorPalette{ Neutrals: d2themes.CoolNeutral, diff --git a/d2themes/d2themescatalog/cool_classics.go b/d2themes/d2themescatalog/cool_classics.go index d8eb58a52..60c0c301e 100644 --- a/d2themes/d2themescatalog/cool_classics.go +++ b/d2themes/d2themescatalog/cool_classics.go @@ -4,7 +4,7 @@ import "oss.terrastruct.com/d2/d2themes" var CoolClassics = d2themes.Theme{ ID: 4, - Name: "Cool classics", + Name: "Cool Classics", Colors: d2themes.ColorPalette{ Neutrals: d2themes.CoolNeutral, diff --git a/d2themes/d2themescatalog/default.go b/d2themes/d2themescatalog/default.go index 6fd3fb878..637d9e653 100644 --- a/d2themes/d2themescatalog/default.go +++ b/d2themes/d2themescatalog/default.go @@ -4,7 +4,7 @@ import "oss.terrastruct.com/d2/d2themes" var NeutralDefault = d2themes.Theme{ ID: 0, - Name: "Neutral default", + Name: "Neutral Default", Colors: d2themes.ColorPalette{ Neutrals: d2themes.CoolNeutral, diff --git a/d2themes/d2themescatalog/earth_tones.go b/d2themes/d2themescatalog/earth_tones.go index fe39e4fa9..f8d7b79f3 100644 --- a/d2themes/d2themescatalog/earth_tones.go +++ b/d2themes/d2themescatalog/earth_tones.go @@ -4,7 +4,7 @@ import "oss.terrastruct.com/d2/d2themes" var EarthTones = d2themes.Theme{ ID: 103, - Name: "Earth tones", + Name: "Earth Tones", Colors: d2themes.ColorPalette{ Neutrals: d2themes.WarmNeutral, diff --git a/d2themes/d2themescatalog/everglade_green.go b/d2themes/d2themescatalog/everglade_green.go index 7df055fba..4fce80fe4 100644 --- a/d2themes/d2themescatalog/everglade_green.go +++ b/d2themes/d2themescatalog/everglade_green.go @@ -4,7 +4,7 @@ import "oss.terrastruct.com/d2/d2themes" var EvergladeGreen = d2themes.Theme{ ID: 104, - Name: "Everglade green", + Name: "Everglade Green", Colors: d2themes.ColorPalette{ Neutrals: d2themes.WarmNeutral, diff --git a/d2themes/d2themescatalog/grape_soda.go b/d2themes/d2themescatalog/grape_soda.go index ef29b5fdf..3267a0491 100644 --- a/d2themes/d2themescatalog/grape_soda.go +++ b/d2themes/d2themescatalog/grape_soda.go @@ -4,7 +4,7 @@ import "oss.terrastruct.com/d2/d2themes" var GrapeSoda = d2themes.Theme{ ID: 6, - Name: "Grape soda", + Name: "Grape Soda", Colors: d2themes.ColorPalette{ Neutrals: d2themes.CoolNeutral, diff --git a/d2themes/d2themescatalog/mixed_berry_blue.go b/d2themes/d2themescatalog/mixed_berry_blue.go index b5f8cc004..fb3f65774 100644 --- a/d2themes/d2themescatalog/mixed_berry_blue.go +++ b/d2themes/d2themescatalog/mixed_berry_blue.go @@ -4,7 +4,7 @@ import "oss.terrastruct.com/d2/d2themes" var MixedBerryBlue = d2themes.Theme{ ID: 5, - Name: "Mixed berry blue", + Name: "Mixed Berry Blue", Colors: d2themes.ColorPalette{ Neutrals: d2themes.CoolNeutral, diff --git a/d2themes/d2themescatalog/orange_creamsicle.go b/d2themes/d2themescatalog/orange_creamsicle.go index 207ffa766..39e425f0e 100644 --- a/d2themes/d2themescatalog/orange_creamsicle.go +++ b/d2themes/d2themescatalog/orange_creamsicle.go @@ -4,7 +4,7 @@ import "oss.terrastruct.com/d2/d2themes" var OrangeCreamsicle = d2themes.Theme{ ID: 101, - Name: "Orange creamsicle", + Name: "Orange Creamsicle", Colors: d2themes.ColorPalette{ Neutrals: d2themes.WarmNeutral, diff --git a/d2themes/d2themescatalog/shirley_temple.go b/d2themes/d2themescatalog/shirley_temple.go index 28d31b6bd..656f5cd3c 100644 --- a/d2themes/d2themescatalog/shirley_temple.go +++ b/d2themes/d2themescatalog/shirley_temple.go @@ -4,7 +4,7 @@ import "oss.terrastruct.com/d2/d2themes" var ShirleyTemple = d2themes.Theme{ ID: 102, - Name: "Shirley temple", + Name: "Shirley Temple", Colors: d2themes.ColorPalette{ Neutrals: d2themes.WarmNeutral, diff --git a/d2themes/d2themescatalog/vanilla_nitro_cola.go b/d2themes/d2themescatalog/vanilla_nitro_cola.go index 246c0dc10..c85ed8d23 100644 --- a/d2themes/d2themescatalog/vanilla_nitro_cola.go +++ b/d2themes/d2themescatalog/vanilla_nitro_cola.go @@ -4,7 +4,7 @@ import "oss.terrastruct.com/d2/d2themes" var VanillaNitroCola = d2themes.Theme{ ID: 100, - Name: "Vanilla nitro cola", + Name: "Vanilla Nitro Cola", Colors: d2themes.ColorPalette{ Neutrals: d2themes.WarmNeutral, diff --git a/docs/INSTALL.md b/docs/INSTALL.md index 45aa3e6af..cadaee346 100644 --- a/docs/INSTALL.md +++ b/docs/INSTALL.md @@ -16,6 +16,7 @@ You may install `d2` through any of the following methods. - [Windows](#windows) - [Release archives](#release-archives) - [WSL](#wsl) + - [Native Package managers](#native-package-managers) - [Docker](#docker) - [Coming soon](#coming-soon) @@ -209,6 +210,23 @@ under plain Windows. aka Windows Subsystem for Linux if that's what you prefer. Installation is just like any other Linux system. +### Native Package managers + +The following are community-managed Windows releases of d2 on popular package managers + +#### Scoop + +[![scoop/d2 badge](https://img.shields.io/scoop/v/d2)](https://scoop.sh/#/apps?q=d2&id=06d1259ce6446dd25dafa1a6c57285159ec927b0) +```sh +scoop install main/d2 +``` + +#### Chocolatey +[![chocolatey/d2_badge](https://img.shields.io/chocolatey/v/d2)]([https://chocolatey.org/](https://community.chocolatey.org/packages/d2/0.6.6)) +```sh +choco install d2 +``` + ## Docker https://hub.docker.com/repository/docker/terrastruct/d2 diff --git a/docs/assets/playground_button.png b/docs/assets/playground_button.png index b08fe380d..a0cd9a212 100644 Binary files a/docs/assets/playground_button.png and b/docs/assets/playground_button.png differ diff --git a/docs/assets/studio_button.png b/docs/assets/studio_button.png new file mode 100644 index 000000000..12e65821a Binary files /dev/null and b/docs/assets/studio_button.png differ diff --git a/docs/examples/lib/1-d2lib/d2lib.go b/docs/examples/lib/1-d2lib/d2lib.go index 58f2ddc40..d75eedc32 100644 --- a/docs/examples/lib/1-d2lib/d2lib.go +++ b/docs/examples/lib/1-d2lib/d2lib.go @@ -2,7 +2,7 @@ package main import ( "context" - "io/ioutil" + "os" "path/filepath" "oss.terrastruct.com/d2/d2graph" @@ -10,6 +10,7 @@ import ( "oss.terrastruct.com/d2/d2lib" "oss.terrastruct.com/d2/d2renderers/d2svg" "oss.terrastruct.com/d2/d2themes/d2themescatalog" + "oss.terrastruct.com/d2/lib/log" "oss.terrastruct.com/d2/lib/textmeasure" "oss.terrastruct.com/util-go/go2" ) @@ -28,7 +29,8 @@ func main() { LayoutResolver: layoutResolver, Ruler: ruler, } - diagram, _, _ := d2lib.Compile(context.Background(), "x -> y", compileOpts, renderOpts) + ctx := log.WithDefault(context.Background()) + diagram, _, _ := d2lib.Compile(ctx, "x -> y", compileOpts, renderOpts) out, _ := d2svg.Render(diagram, renderOpts) - _ = ioutil.WriteFile(filepath.Join("out.svg"), out, 0600) + _ = os.WriteFile(filepath.Join("out.svg"), out, 0600) } diff --git a/docs/examples/lib/1-d2lib/d2lib_test.go b/docs/examples/lib/1-d2lib/d2lib_test.go index 53b3d5bcc..391ae5a1a 100644 --- a/docs/examples/lib/1-d2lib/d2lib_test.go +++ b/docs/examples/lib/1-d2lib/d2lib_test.go @@ -1,9 +1,110 @@ package main import ( + "context" "testing" + + "oss.terrastruct.com/d2/d2graph" + "oss.terrastruct.com/d2/d2layouts/d2dagrelayout" + "oss.terrastruct.com/d2/d2lib" + "oss.terrastruct.com/d2/d2renderers/d2svg" + "oss.terrastruct.com/d2/d2themes/d2themescatalog" + "oss.terrastruct.com/d2/lib/log" + "oss.terrastruct.com/d2/lib/textmeasure" + "oss.terrastruct.com/util-go/assert" + "oss.terrastruct.com/util-go/go2" ) func TestMain_(t *testing.T) { main() } + +func TestConfigHash(t *testing.T) { + var hash1, hash2 string + var err error + + { + ruler, _ := textmeasure.NewRuler() + layoutResolver := func(engine string) (d2graph.LayoutGraph, error) { + return d2dagrelayout.DefaultLayout, nil + } + renderOpts := &d2svg.RenderOpts{ + Pad: go2.Pointer(int64(5)), + ThemeID: &d2themescatalog.GrapeSoda.ID, + } + compileOpts := &d2lib.CompileOptions{ + LayoutResolver: layoutResolver, + Ruler: ruler, + } + ctx := log.WithDefault(context.Background()) + diagram, _, _ := d2lib.Compile(ctx, "x -> y", compileOpts, renderOpts) + hash1, err = diagram.HashID(nil) + assert.Success(t, err) + } + + { + ruler, _ := textmeasure.NewRuler() + layoutResolver := func(engine string) (d2graph.LayoutGraph, error) { + return d2dagrelayout.DefaultLayout, nil + } + renderOpts := &d2svg.RenderOpts{ + Pad: go2.Pointer(int64(5)), + ThemeID: &d2themescatalog.NeutralGrey.ID, + } + compileOpts := &d2lib.CompileOptions{ + LayoutResolver: layoutResolver, + Ruler: ruler, + } + ctx := log.WithDefault(context.Background()) + diagram, _, _ := d2lib.Compile(ctx, "x -> y", compileOpts, renderOpts) + hash2, err = diagram.HashID(nil) + assert.Success(t, err) + } + + assert.NotEqual(t, hash1, hash2) +} + +func TestHashSalt(t *testing.T) { + var hash1, hash2 string + var err error + + { + ruler, _ := textmeasure.NewRuler() + layoutResolver := func(engine string) (d2graph.LayoutGraph, error) { + return d2dagrelayout.DefaultLayout, nil + } + renderOpts := &d2svg.RenderOpts{ + Pad: go2.Pointer(int64(5)), + ThemeID: &d2themescatalog.GrapeSoda.ID, + } + compileOpts := &d2lib.CompileOptions{ + LayoutResolver: layoutResolver, + Ruler: ruler, + } + ctx := log.WithDefault(context.Background()) + diagram, _, _ := d2lib.Compile(ctx, "x -> y", compileOpts, renderOpts) + hash1, err = diagram.HashID(nil) + assert.Success(t, err) + } + + { + ruler, _ := textmeasure.NewRuler() + layoutResolver := func(engine string) (d2graph.LayoutGraph, error) { + return d2dagrelayout.DefaultLayout, nil + } + renderOpts := &d2svg.RenderOpts{ + Pad: go2.Pointer(int64(5)), + ThemeID: &d2themescatalog.GrapeSoda.ID, + } + compileOpts := &d2lib.CompileOptions{ + LayoutResolver: layoutResolver, + Ruler: ruler, + } + ctx := log.WithDefault(context.Background()) + diagram, _, _ := d2lib.Compile(ctx, "x -> y", compileOpts, renderOpts) + hash2, err = diagram.HashID(go2.Pointer("asdf")) + assert.Success(t, err) + } + + assert.NotEqual(t, hash1, hash2) +} diff --git a/docs/examples/lib/2-d2oracle/d2oracle.go b/docs/examples/lib/2-d2oracle/d2oracle.go index b59dca1fe..067b5b4b5 100644 --- a/docs/examples/lib/2-d2oracle/d2oracle.go +++ b/docs/examples/lib/2-d2oracle/d2oracle.go @@ -9,6 +9,7 @@ import ( "oss.terrastruct.com/d2/d2layouts/d2dagrelayout" "oss.terrastruct.com/d2/d2lib" "oss.terrastruct.com/d2/d2oracle" + "oss.terrastruct.com/d2/lib/log" "oss.terrastruct.com/d2/lib/textmeasure" ) @@ -23,7 +24,8 @@ func main() { LayoutResolver: layoutResolver, Ruler: ruler, } - _, graph, _ := d2lib.Compile(context.Background(), "x -> y", compileOpts, nil) + ctx := log.WithDefault(context.Background()) + _, graph, _ := d2lib.Compile(ctx, "x -> y", compileOpts, nil) // Create a shape with the ID, "meow" graph, _, _ = d2oracle.Create(graph, nil, "meow") diff --git a/docs/examples/lib/3-lowlevel/lowlevel.go b/docs/examples/lib/3-lowlevel/lowlevel.go index 53f0468e7..89b10d13d 100644 --- a/docs/examples/lib/3-lowlevel/lowlevel.go +++ b/docs/examples/lib/3-lowlevel/lowlevel.go @@ -2,7 +2,7 @@ package main import ( "context" - "io/ioutil" + "os" "path/filepath" "strings" @@ -11,6 +11,7 @@ import ( "oss.terrastruct.com/d2/d2layouts/d2dagrelayout" "oss.terrastruct.com/d2/d2renderers/d2svg" "oss.terrastruct.com/d2/d2themes/d2themescatalog" + "oss.terrastruct.com/d2/lib/log" "oss.terrastruct.com/d2/lib/textmeasure" ) @@ -20,11 +21,12 @@ func main() { graph.ApplyTheme(d2themescatalog.NeutralDefault.ID) ruler, _ := textmeasure.NewRuler() _ = graph.SetDimensions(nil, ruler, nil) - _ = d2dagrelayout.Layout(context.Background(), graph, nil) - diagram, _ := d2exporter.Export(context.Background(), graph, nil) + ctx := log.WithDefault(context.Background()) + _ = d2dagrelayout.Layout(ctx, graph, nil) + diagram, _ := d2exporter.Export(ctx, graph, nil) diagram.Config = config out, _ := d2svg.Render(diagram, &d2svg.RenderOpts{ ThemeID: &d2themescatalog.NeutralDefault.ID, }) - _ = ioutil.WriteFile(filepath.Join("out.svg"), out, 0600) + _ = os.WriteFile(filepath.Join("out.svg"), out, 0600) } diff --git a/docs/examples/wcc/wcc.d2 b/docs/examples/wcc/wcc.d2 index f47593792..689f18b5b 100644 --- a/docs/examples/wcc/wcc.d2 +++ b/docs/examples/wcc/wcc.d2 @@ -34,7 +34,7 @@ layers: { link: steps.1 style.font-size: 24 } - + steps: { 1: { titled: Earn pre-requisite titles (IM) @@ -150,7 +150,7 @@ layers: { best of 14 games -> tiebreaks: if needed tiebreaks.link: layers.tiebreaks - + layers: { tiebreaks: { description: |md diff --git a/e2etests-cli/main_test.go b/e2etests-cli/main_test.go index 471ae6b52..6b06b63c5 100644 --- a/e2etests-cli/main_test.go +++ b/e2etests-cli/main_test.go @@ -13,7 +13,7 @@ import ( "testing" "time" - "nhooyr.io/websocket" + "github.com/coder/websocket" "oss.terrastruct.com/util-go/assert" "oss.terrastruct.com/util-go/diff" @@ -821,6 +821,33 @@ a.b.c.d assert.Testdata(t, ".svg", svg) }, }, + { + name: "chain_icon_import", + run: func(t *testing.T, ctx context.Context, dir string, env *xos.Env) { + writeFile(t, dir, "hello-world.d2", `...@y +hello.class: Ecs`) + writeFile(t, dir, "y.d2", ` +...@x +classes: { + Ecs: { + shape: "circle" + icon: ${icons.ecs} + } +} +`) + writeFile(t, dir, "x.d2", ` +vars: { + icons: { + ecs: "https://icons.terrastruct.com/aws%2FCompute%2FAmazon-Elastic-Container-Service.svg" + } +} +`) + err := runTestMain(t, ctx, dir, env, filepath.Join(dir, "hello-world.d2")) + assert.Success(t, err) + svg := readFile(t, dir, "hello-world.svg") + assert.Testdata(t, ".svg", svg) + }, + }, { name: "board_import", run: func(t *testing.T, ctx context.Context, dir string, env *xos.Env) { @@ -955,6 +982,29 @@ layers: { testdataIgnoreDiff(t, ".pptx", file) }, }, + { + name: "no_xml_tag", + run: func(t *testing.T, ctx context.Context, dir string, env *xos.Env) { + writeFile(t, dir, "test.d2", `x -> y`) + err := runTestMain(t, ctx, dir, env, "--no-xml-tag", "test.d2", "no-xml.svg") + assert.Success(t, err) + noXMLSvg := readFile(t, dir, "no-xml.svg") + assert.False(t, strings.Contains(string(noXMLSvg), " y`) + err = runTestMain(t, ctx, dir, env, "test.d2", "with-xml.svg") + assert.Success(t, err) + withXMLSvg := readFile(t, dir, "with-xml.svg") + assert.True(t, strings.Contains(string(withXMLSvg), " y`) + err = runTestMain(t, ctx, dir, env, "test.d2", "no-xml-env.svg") + assert.Success(t, err) + noXMLEnvSvg := readFile(t, dir, "no-xml-env.svg") + assert.False(t, strings.Contains(string(noXMLEnvSvg), " y\n", string(gotBar)) }, }, + { + name: "fmt-check-unformatted", + run: func(t *testing.T, ctx context.Context, dir string, env *xos.Env) { + writeFile(t, dir, "foo.d2", `a ---> b`) + writeFile(t, dir, "bar.d2", `x ---> y`) + writeFile(t, dir, "baz.d2", "a -> z\n") + err := runTestMainPersist(t, ctx, dir, env, "fmt", "--check", "foo.d2", "bar.d2", "baz.d2") + assert.ErrorString(t, err, "failed to wait xmain test: e2etests-cli/d2: failed to fmt: exiting with code 1: found 2 unformatted files. Run d2 fmt to fix.") + gotFoo := readFile(t, dir, "foo.d2") + gotBar := readFile(t, dir, "bar.d2") + assert.Equal(t, "a ---> b", string(gotFoo)) + assert.Equal(t, "x ---> y", string(gotBar)) + }, + }, + { + name: "fmt-check-formatted", + run: func(t *testing.T, ctx context.Context, dir string, env *xos.Env) { + writeFile(t, dir, "foo.d2", "a -> b\n") + writeFile(t, dir, "bar.d2", "x -> y\n") + err := runTestMainPersist(t, ctx, dir, env, "fmt", "--check", "foo.d2", "bar.d2") + assert.Success(t, err) + }, + }, { name: "watch-regular", serial: true, @@ -1273,6 +1346,45 @@ c assert.Success(t, err) }, }, + { + name: "validate-against-correct-d2", + run: func(t *testing.T, ctx context.Context, dir string, env *xos.Env) { + writeFile(t, dir, "correct.d2", `x -> y`) + err := runTestMainPersist(t, ctx, dir, env, "validate", "correct.d2") + assert.Success(t, err) + }, + }, + { + name: "validate-against-incorrect-d2", + run: func(t *testing.T, ctx context.Context, dir string, env *xos.Env) { + writeFile(t, dir, "incorrect.d2", `x > y`) + err := runTestMainPersist(t, ctx, dir, env, "validate", "incorrect.d2") + assert.Error(t, err) + }, + }, + { + name: "omit-version", + run: func(t *testing.T, ctx context.Context, dir string, env *xos.Env) { + writeFile(t, dir, "test.d2", `x -> y`) + err := runTestMain(t, ctx, dir, env, "--omit-version", "test.d2", "no-version.svg") + assert.Success(t, err) + noVersionSvg := readFile(t, dir, "no-version.svg") + assert.False(t, strings.Contains(string(noVersionSvg), "data-d2-version=")) + + writeFile(t, dir, "test.d2", `x -> y`) + err = runTestMain(t, ctx, dir, env, "test.d2", "with-version.svg") + assert.Success(t, err) + withVersionSvg := readFile(t, dir, "with-version.svg") + assert.True(t, strings.Contains(string(withVersionSvg), "data-d2-version=")) + + env.Setenv("OMIT_VERSION", "1") + writeFile(t, dir, "test.d2", `x -> y`) + err = runTestMain(t, ctx, dir, env, "test.d2", "no-version-env.svg") + assert.Success(t, err) + noVersionEnvSvg := readFile(t, dir, "no-version-env.svg") + assert.False(t, strings.Contains(string(noVersionEnvSvg), "data-d2-version=")) + }, + }, } ctx := context.Background() @@ -1369,7 +1481,9 @@ func testdataIgnoreDiff(tb testing.TB, ext string, got []byte) { // getNumBoards gets the number of boards in an SVG file through a non-robust pattern search // If the renderer changes, this must change func getNumBoards(svg string) int { - return strings.Count(svg, `class="d2`) + re := regexp.MustCompile(`class="d2-\d+`) + matches := re.FindAllString(svg, -1) + return len(matches) } var errRE = regexp.MustCompile(`err:`) diff --git a/e2etests-cli/testdata/TestCLI_E2E/abspath.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/abspath.exp.svg index 66c5e6ee9..96aa85811 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/abspath.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/abspath.exp.svg @@ -1,9 +1,9 @@ -xy + .d2-3671284423 .fill-N1{fill:#0A0F25;} + .d2-3671284423 .fill-N2{fill:#676C7E;} + .d2-3671284423 .fill-N3{fill:#9499AB;} + .d2-3671284423 .fill-N4{fill:#CFD2DD;} + .d2-3671284423 .fill-N5{fill:#DEE1EB;} + .d2-3671284423 .fill-N6{fill:#EEF1F8;} + .d2-3671284423 .fill-N7{fill:#FFFFFF;} + .d2-3671284423 .fill-B1{fill:#0D32B2;} + .d2-3671284423 .fill-B2{fill:#0D32B2;} + .d2-3671284423 .fill-B3{fill:#E3E9FD;} + .d2-3671284423 .fill-B4{fill:#E3E9FD;} + .d2-3671284423 .fill-B5{fill:#EDF0FD;} + .d2-3671284423 .fill-B6{fill:#F7F8FE;} + .d2-3671284423 .fill-AA2{fill:#4A6FF3;} + .d2-3671284423 .fill-AA4{fill:#EDF0FD;} + .d2-3671284423 .fill-AA5{fill:#F7F8FE;} + .d2-3671284423 .fill-AB4{fill:#EDF0FD;} + .d2-3671284423 .fill-AB5{fill:#F7F8FE;} + .d2-3671284423 .stroke-N1{stroke:#0A0F25;} + .d2-3671284423 .stroke-N2{stroke:#676C7E;} + .d2-3671284423 .stroke-N3{stroke:#9499AB;} + .d2-3671284423 .stroke-N4{stroke:#CFD2DD;} + .d2-3671284423 .stroke-N5{stroke:#DEE1EB;} + .d2-3671284423 .stroke-N6{stroke:#EEF1F8;} + .d2-3671284423 .stroke-N7{stroke:#FFFFFF;} + .d2-3671284423 .stroke-B1{stroke:#0D32B2;} + .d2-3671284423 .stroke-B2{stroke:#0D32B2;} + .d2-3671284423 .stroke-B3{stroke:#E3E9FD;} + .d2-3671284423 .stroke-B4{stroke:#E3E9FD;} + .d2-3671284423 .stroke-B5{stroke:#EDF0FD;} + .d2-3671284423 .stroke-B6{stroke:#F7F8FE;} + .d2-3671284423 .stroke-AA2{stroke:#4A6FF3;} + .d2-3671284423 .stroke-AA4{stroke:#EDF0FD;} + .d2-3671284423 .stroke-AA5{stroke:#F7F8FE;} + .d2-3671284423 .stroke-AB4{stroke:#EDF0FD;} + .d2-3671284423 .stroke-AB5{stroke:#F7F8FE;} + .d2-3671284423 .background-color-N1{background-color:#0A0F25;} + .d2-3671284423 .background-color-N2{background-color:#676C7E;} + .d2-3671284423 .background-color-N3{background-color:#9499AB;} + .d2-3671284423 .background-color-N4{background-color:#CFD2DD;} + .d2-3671284423 .background-color-N5{background-color:#DEE1EB;} + .d2-3671284423 .background-color-N6{background-color:#EEF1F8;} + .d2-3671284423 .background-color-N7{background-color:#FFFFFF;} + .d2-3671284423 .background-color-B1{background-color:#0D32B2;} + .d2-3671284423 .background-color-B2{background-color:#0D32B2;} + .d2-3671284423 .background-color-B3{background-color:#E3E9FD;} + .d2-3671284423 .background-color-B4{background-color:#E3E9FD;} + .d2-3671284423 .background-color-B5{background-color:#EDF0FD;} + .d2-3671284423 .background-color-B6{background-color:#F7F8FE;} + .d2-3671284423 .background-color-AA2{background-color:#4A6FF3;} + .d2-3671284423 .background-color-AA4{background-color:#EDF0FD;} + .d2-3671284423 .background-color-AA5{background-color:#F7F8FE;} + .d2-3671284423 .background-color-AB4{background-color:#EDF0FD;} + .d2-3671284423 .background-color-AB5{background-color:#F7F8FE;} + .d2-3671284423 .color-N1{color:#0A0F25;} + .d2-3671284423 .color-N2{color:#676C7E;} + .d2-3671284423 .color-N3{color:#9499AB;} + .d2-3671284423 .color-N4{color:#CFD2DD;} + .d2-3671284423 .color-N5{color:#DEE1EB;} + .d2-3671284423 .color-N6{color:#EEF1F8;} + .d2-3671284423 .color-N7{color:#FFFFFF;} + .d2-3671284423 .color-B1{color:#0D32B2;} + .d2-3671284423 .color-B2{color:#0D32B2;} + .d2-3671284423 .color-B3{color:#E3E9FD;} + .d2-3671284423 .color-B4{color:#E3E9FD;} + .d2-3671284423 .color-B5{color:#EDF0FD;} + .d2-3671284423 .color-B6{color:#F7F8FE;} + .d2-3671284423 .color-AA2{color:#4A6FF3;} + .d2-3671284423 .color-AA4{color:#EDF0FD;} + .d2-3671284423 .color-AA5{color:#F7F8FE;} + .d2-3671284423 .color-AB4{color:#EDF0FD;} + .d2-3671284423 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3671284423);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3671284423);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3671284423);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3671284423);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3671284423);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3671284423);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3671284423);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3671284423);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3671284423);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3671284423);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3671284423);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3671284423);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3671284423);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3671284423);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3671284423);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3671284423);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3671284423);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3671284423);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xy - - + + diff --git a/e2etests-cli/testdata/TestCLI_E2E/animation.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/animation.exp.svg index 91ede9d39..4386c82ea 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/animation.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/animation.exp.svg @@ -1,16 +1,16 @@ -Chicken's plan +}]]>Chicken's plan - -Chicken's planApproach road + +Chicken's planApproach road - - -Chicken's planApproach roadCross road + + +Chicken's planApproach roadCross road - - - -Chicken's planApproach roadCross roadMake you wonder why + + + +Chicken's planApproach roadCross roadMake you wonder why - - - - + + + + \ No newline at end of file diff --git a/e2etests-cli/testdata/TestCLI_E2E/board_import/hello-world-x-y.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/board_import/hello-world-x-y.exp.svg index 78f8b165f..5a9dd6188 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/board_import/hello-world-x-y.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/board_import/hello-world-x-y.exp.svg @@ -1,9 +1,9 @@ -meow + .d2-190729158 .fill-N1{fill:#0A0F25;} + .d2-190729158 .fill-N2{fill:#676C7E;} + .d2-190729158 .fill-N3{fill:#9499AB;} + .d2-190729158 .fill-N4{fill:#CFD2DD;} + .d2-190729158 .fill-N5{fill:#DEE1EB;} + .d2-190729158 .fill-N6{fill:#EEF1F8;} + .d2-190729158 .fill-N7{fill:#FFFFFF;} + .d2-190729158 .fill-B1{fill:#0D32B2;} + .d2-190729158 .fill-B2{fill:#0D32B2;} + .d2-190729158 .fill-B3{fill:#E3E9FD;} + .d2-190729158 .fill-B4{fill:#E3E9FD;} + .d2-190729158 .fill-B5{fill:#EDF0FD;} + .d2-190729158 .fill-B6{fill:#F7F8FE;} + .d2-190729158 .fill-AA2{fill:#4A6FF3;} + .d2-190729158 .fill-AA4{fill:#EDF0FD;} + .d2-190729158 .fill-AA5{fill:#F7F8FE;} + .d2-190729158 .fill-AB4{fill:#EDF0FD;} + .d2-190729158 .fill-AB5{fill:#F7F8FE;} + .d2-190729158 .stroke-N1{stroke:#0A0F25;} + .d2-190729158 .stroke-N2{stroke:#676C7E;} + .d2-190729158 .stroke-N3{stroke:#9499AB;} + .d2-190729158 .stroke-N4{stroke:#CFD2DD;} + .d2-190729158 .stroke-N5{stroke:#DEE1EB;} + .d2-190729158 .stroke-N6{stroke:#EEF1F8;} + .d2-190729158 .stroke-N7{stroke:#FFFFFF;} + .d2-190729158 .stroke-B1{stroke:#0D32B2;} + .d2-190729158 .stroke-B2{stroke:#0D32B2;} + .d2-190729158 .stroke-B3{stroke:#E3E9FD;} + .d2-190729158 .stroke-B4{stroke:#E3E9FD;} + .d2-190729158 .stroke-B5{stroke:#EDF0FD;} + .d2-190729158 .stroke-B6{stroke:#F7F8FE;} + .d2-190729158 .stroke-AA2{stroke:#4A6FF3;} + .d2-190729158 .stroke-AA4{stroke:#EDF0FD;} + .d2-190729158 .stroke-AA5{stroke:#F7F8FE;} + .d2-190729158 .stroke-AB4{stroke:#EDF0FD;} + .d2-190729158 .stroke-AB5{stroke:#F7F8FE;} + .d2-190729158 .background-color-N1{background-color:#0A0F25;} + .d2-190729158 .background-color-N2{background-color:#676C7E;} + .d2-190729158 .background-color-N3{background-color:#9499AB;} + .d2-190729158 .background-color-N4{background-color:#CFD2DD;} + .d2-190729158 .background-color-N5{background-color:#DEE1EB;} + .d2-190729158 .background-color-N6{background-color:#EEF1F8;} + .d2-190729158 .background-color-N7{background-color:#FFFFFF;} + .d2-190729158 .background-color-B1{background-color:#0D32B2;} + .d2-190729158 .background-color-B2{background-color:#0D32B2;} + .d2-190729158 .background-color-B3{background-color:#E3E9FD;} + .d2-190729158 .background-color-B4{background-color:#E3E9FD;} + .d2-190729158 .background-color-B5{background-color:#EDF0FD;} + .d2-190729158 .background-color-B6{background-color:#F7F8FE;} + .d2-190729158 .background-color-AA2{background-color:#4A6FF3;} + .d2-190729158 .background-color-AA4{background-color:#EDF0FD;} + .d2-190729158 .background-color-AA5{background-color:#F7F8FE;} + .d2-190729158 .background-color-AB4{background-color:#EDF0FD;} + .d2-190729158 .background-color-AB5{background-color:#F7F8FE;} + .d2-190729158 .color-N1{color:#0A0F25;} + .d2-190729158 .color-N2{color:#676C7E;} + .d2-190729158 .color-N3{color:#9499AB;} + .d2-190729158 .color-N4{color:#CFD2DD;} + .d2-190729158 .color-N5{color:#DEE1EB;} + .d2-190729158 .color-N6{color:#EEF1F8;} + .d2-190729158 .color-N7{color:#FFFFFF;} + .d2-190729158 .color-B1{color:#0D32B2;} + .d2-190729158 .color-B2{color:#0D32B2;} + .d2-190729158 .color-B3{color:#E3E9FD;} + .d2-190729158 .color-B4{color:#E3E9FD;} + .d2-190729158 .color-B5{color:#EDF0FD;} + .d2-190729158 .color-B6{color:#F7F8FE;} + .d2-190729158 .color-AA2{color:#4A6FF3;} + .d2-190729158 .color-AA4{color:#EDF0FD;} + .d2-190729158 .color-AA5{color:#F7F8FE;} + .d2-190729158 .color-AB4{color:#EDF0FD;} + .d2-190729158 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-190729158);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-190729158);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-190729158);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-190729158);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-190729158);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-190729158);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-190729158);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-190729158);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-190729158);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-190729158);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-190729158);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-190729158);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-190729158);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-190729158);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-190729158);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-190729158);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-190729158);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-190729158);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>meow - + diff --git a/e2etests-cli/testdata/TestCLI_E2E/board_import/hello-world-x.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/board_import/hello-world-x.exp.svg index e6196bc2c..cfe053e70 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/board_import/hello-world-x.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/board_import/hello-world-x.exp.svg @@ -1,12 +1,12 @@ -y - + .d2-3768389989 .fill-N1{fill:#0A0F25;} + .d2-3768389989 .fill-N2{fill:#676C7E;} + .d2-3768389989 .fill-N3{fill:#9499AB;} + .d2-3768389989 .fill-N4{fill:#CFD2DD;} + .d2-3768389989 .fill-N5{fill:#DEE1EB;} + .d2-3768389989 .fill-N6{fill:#EEF1F8;} + .d2-3768389989 .fill-N7{fill:#FFFFFF;} + .d2-3768389989 .fill-B1{fill:#0D32B2;} + .d2-3768389989 .fill-B2{fill:#0D32B2;} + .d2-3768389989 .fill-B3{fill:#E3E9FD;} + .d2-3768389989 .fill-B4{fill:#E3E9FD;} + .d2-3768389989 .fill-B5{fill:#EDF0FD;} + .d2-3768389989 .fill-B6{fill:#F7F8FE;} + .d2-3768389989 .fill-AA2{fill:#4A6FF3;} + .d2-3768389989 .fill-AA4{fill:#EDF0FD;} + .d2-3768389989 .fill-AA5{fill:#F7F8FE;} + .d2-3768389989 .fill-AB4{fill:#EDF0FD;} + .d2-3768389989 .fill-AB5{fill:#F7F8FE;} + .d2-3768389989 .stroke-N1{stroke:#0A0F25;} + .d2-3768389989 .stroke-N2{stroke:#676C7E;} + .d2-3768389989 .stroke-N3{stroke:#9499AB;} + .d2-3768389989 .stroke-N4{stroke:#CFD2DD;} + .d2-3768389989 .stroke-N5{stroke:#DEE1EB;} + .d2-3768389989 .stroke-N6{stroke:#EEF1F8;} + .d2-3768389989 .stroke-N7{stroke:#FFFFFF;} + .d2-3768389989 .stroke-B1{stroke:#0D32B2;} + .d2-3768389989 .stroke-B2{stroke:#0D32B2;} + .d2-3768389989 .stroke-B3{stroke:#E3E9FD;} + .d2-3768389989 .stroke-B4{stroke:#E3E9FD;} + .d2-3768389989 .stroke-B5{stroke:#EDF0FD;} + .d2-3768389989 .stroke-B6{stroke:#F7F8FE;} + .d2-3768389989 .stroke-AA2{stroke:#4A6FF3;} + .d2-3768389989 .stroke-AA4{stroke:#EDF0FD;} + .d2-3768389989 .stroke-AA5{stroke:#F7F8FE;} + .d2-3768389989 .stroke-AB4{stroke:#EDF0FD;} + .d2-3768389989 .stroke-AB5{stroke:#F7F8FE;} + .d2-3768389989 .background-color-N1{background-color:#0A0F25;} + .d2-3768389989 .background-color-N2{background-color:#676C7E;} + .d2-3768389989 .background-color-N3{background-color:#9499AB;} + .d2-3768389989 .background-color-N4{background-color:#CFD2DD;} + .d2-3768389989 .background-color-N5{background-color:#DEE1EB;} + .d2-3768389989 .background-color-N6{background-color:#EEF1F8;} + .d2-3768389989 .background-color-N7{background-color:#FFFFFF;} + .d2-3768389989 .background-color-B1{background-color:#0D32B2;} + .d2-3768389989 .background-color-B2{background-color:#0D32B2;} + .d2-3768389989 .background-color-B3{background-color:#E3E9FD;} + .d2-3768389989 .background-color-B4{background-color:#E3E9FD;} + .d2-3768389989 .background-color-B5{background-color:#EDF0FD;} + .d2-3768389989 .background-color-B6{background-color:#F7F8FE;} + .d2-3768389989 .background-color-AA2{background-color:#4A6FF3;} + .d2-3768389989 .background-color-AA4{background-color:#EDF0FD;} + .d2-3768389989 .background-color-AA5{background-color:#F7F8FE;} + .d2-3768389989 .background-color-AB4{background-color:#EDF0FD;} + .d2-3768389989 .background-color-AB5{background-color:#F7F8FE;} + .d2-3768389989 .color-N1{color:#0A0F25;} + .d2-3768389989 .color-N2{color:#676C7E;} + .d2-3768389989 .color-N3{color:#9499AB;} + .d2-3768389989 .color-N4{color:#CFD2DD;} + .d2-3768389989 .color-N5{color:#DEE1EB;} + .d2-3768389989 .color-N6{color:#EEF1F8;} + .d2-3768389989 .color-N7{color:#FFFFFF;} + .d2-3768389989 .color-B1{color:#0D32B2;} + .d2-3768389989 .color-B2{color:#0D32B2;} + .d2-3768389989 .color-B3{color:#E3E9FD;} + .d2-3768389989 .color-B4{color:#E3E9FD;} + .d2-3768389989 .color-B5{color:#EDF0FD;} + .d2-3768389989 .color-B6{color:#F7F8FE;} + .d2-3768389989 .color-AA2{color:#4A6FF3;} + .d2-3768389989 .color-AA4{color:#EDF0FD;} + .d2-3768389989 .color-AA5{color:#F7F8FE;} + .d2-3768389989 .color-AB4{color:#EDF0FD;} + .d2-3768389989 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3768389989);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3768389989);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3768389989);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3768389989);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3768389989);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3768389989);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3768389989);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3768389989);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3768389989);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3768389989);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3768389989);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3768389989);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3768389989);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3768389989);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3768389989);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3768389989);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3768389989);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3768389989);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>y + - + - - - + + + diff --git a/e2etests-cli/testdata/TestCLI_E2E/board_import/hello-world.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/board_import/hello-world.exp.svg index 37a1ff5f4..910546326 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/board_import/hello-world.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/board_import/hello-world.exp.svg @@ -1,12 +1,12 @@ -x - + .d2-1527978698 .fill-N1{fill:#0A0F25;} + .d2-1527978698 .fill-N2{fill:#676C7E;} + .d2-1527978698 .fill-N3{fill:#9499AB;} + .d2-1527978698 .fill-N4{fill:#CFD2DD;} + .d2-1527978698 .fill-N5{fill:#DEE1EB;} + .d2-1527978698 .fill-N6{fill:#EEF1F8;} + .d2-1527978698 .fill-N7{fill:#FFFFFF;} + .d2-1527978698 .fill-B1{fill:#0D32B2;} + .d2-1527978698 .fill-B2{fill:#0D32B2;} + .d2-1527978698 .fill-B3{fill:#E3E9FD;} + .d2-1527978698 .fill-B4{fill:#E3E9FD;} + .d2-1527978698 .fill-B5{fill:#EDF0FD;} + .d2-1527978698 .fill-B6{fill:#F7F8FE;} + .d2-1527978698 .fill-AA2{fill:#4A6FF3;} + .d2-1527978698 .fill-AA4{fill:#EDF0FD;} + .d2-1527978698 .fill-AA5{fill:#F7F8FE;} + .d2-1527978698 .fill-AB4{fill:#EDF0FD;} + .d2-1527978698 .fill-AB5{fill:#F7F8FE;} + .d2-1527978698 .stroke-N1{stroke:#0A0F25;} + .d2-1527978698 .stroke-N2{stroke:#676C7E;} + .d2-1527978698 .stroke-N3{stroke:#9499AB;} + .d2-1527978698 .stroke-N4{stroke:#CFD2DD;} + .d2-1527978698 .stroke-N5{stroke:#DEE1EB;} + .d2-1527978698 .stroke-N6{stroke:#EEF1F8;} + .d2-1527978698 .stroke-N7{stroke:#FFFFFF;} + .d2-1527978698 .stroke-B1{stroke:#0D32B2;} + .d2-1527978698 .stroke-B2{stroke:#0D32B2;} + .d2-1527978698 .stroke-B3{stroke:#E3E9FD;} + .d2-1527978698 .stroke-B4{stroke:#E3E9FD;} + .d2-1527978698 .stroke-B5{stroke:#EDF0FD;} + .d2-1527978698 .stroke-B6{stroke:#F7F8FE;} + .d2-1527978698 .stroke-AA2{stroke:#4A6FF3;} + .d2-1527978698 .stroke-AA4{stroke:#EDF0FD;} + .d2-1527978698 .stroke-AA5{stroke:#F7F8FE;} + .d2-1527978698 .stroke-AB4{stroke:#EDF0FD;} + .d2-1527978698 .stroke-AB5{stroke:#F7F8FE;} + .d2-1527978698 .background-color-N1{background-color:#0A0F25;} + .d2-1527978698 .background-color-N2{background-color:#676C7E;} + .d2-1527978698 .background-color-N3{background-color:#9499AB;} + .d2-1527978698 .background-color-N4{background-color:#CFD2DD;} + .d2-1527978698 .background-color-N5{background-color:#DEE1EB;} + .d2-1527978698 .background-color-N6{background-color:#EEF1F8;} + .d2-1527978698 .background-color-N7{background-color:#FFFFFF;} + .d2-1527978698 .background-color-B1{background-color:#0D32B2;} + .d2-1527978698 .background-color-B2{background-color:#0D32B2;} + .d2-1527978698 .background-color-B3{background-color:#E3E9FD;} + .d2-1527978698 .background-color-B4{background-color:#E3E9FD;} + .d2-1527978698 .background-color-B5{background-color:#EDF0FD;} + .d2-1527978698 .background-color-B6{background-color:#F7F8FE;} + .d2-1527978698 .background-color-AA2{background-color:#4A6FF3;} + .d2-1527978698 .background-color-AA4{background-color:#EDF0FD;} + .d2-1527978698 .background-color-AA5{background-color:#F7F8FE;} + .d2-1527978698 .background-color-AB4{background-color:#EDF0FD;} + .d2-1527978698 .background-color-AB5{background-color:#F7F8FE;} + .d2-1527978698 .color-N1{color:#0A0F25;} + .d2-1527978698 .color-N2{color:#676C7E;} + .d2-1527978698 .color-N3{color:#9499AB;} + .d2-1527978698 .color-N4{color:#CFD2DD;} + .d2-1527978698 .color-N5{color:#DEE1EB;} + .d2-1527978698 .color-N6{color:#EEF1F8;} + .d2-1527978698 .color-N7{color:#FFFFFF;} + .d2-1527978698 .color-B1{color:#0D32B2;} + .d2-1527978698 .color-B2{color:#0D32B2;} + .d2-1527978698 .color-B3{color:#E3E9FD;} + .d2-1527978698 .color-B4{color:#E3E9FD;} + .d2-1527978698 .color-B5{color:#EDF0FD;} + .d2-1527978698 .color-B6{color:#F7F8FE;} + .d2-1527978698 .color-AA2{color:#4A6FF3;} + .d2-1527978698 .color-AA4{color:#EDF0FD;} + .d2-1527978698 .color-AA5{color:#F7F8FE;} + .d2-1527978698 .color-AB4{color:#EDF0FD;} + .d2-1527978698 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1527978698);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1527978698);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1527978698);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1527978698);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1527978698);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1527978698);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1527978698);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1527978698);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1527978698);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1527978698);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1527978698);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1527978698);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1527978698);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1527978698);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1527978698);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1527978698);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1527978698);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1527978698);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>x + - + - - - + + + diff --git a/e2etests-cli/testdata/TestCLI_E2E/center.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/center.exp.svg index 1de5a3182..5150c4133 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/center.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/center.exp.svg @@ -1,9 +1,9 @@ -xy + .d2-3671284423 .fill-N1{fill:#0A0F25;} + .d2-3671284423 .fill-N2{fill:#676C7E;} + .d2-3671284423 .fill-N3{fill:#9499AB;} + .d2-3671284423 .fill-N4{fill:#CFD2DD;} + .d2-3671284423 .fill-N5{fill:#DEE1EB;} + .d2-3671284423 .fill-N6{fill:#EEF1F8;} + .d2-3671284423 .fill-N7{fill:#FFFFFF;} + .d2-3671284423 .fill-B1{fill:#0D32B2;} + .d2-3671284423 .fill-B2{fill:#0D32B2;} + .d2-3671284423 .fill-B3{fill:#E3E9FD;} + .d2-3671284423 .fill-B4{fill:#E3E9FD;} + .d2-3671284423 .fill-B5{fill:#EDF0FD;} + .d2-3671284423 .fill-B6{fill:#F7F8FE;} + .d2-3671284423 .fill-AA2{fill:#4A6FF3;} + .d2-3671284423 .fill-AA4{fill:#EDF0FD;} + .d2-3671284423 .fill-AA5{fill:#F7F8FE;} + .d2-3671284423 .fill-AB4{fill:#EDF0FD;} + .d2-3671284423 .fill-AB5{fill:#F7F8FE;} + .d2-3671284423 .stroke-N1{stroke:#0A0F25;} + .d2-3671284423 .stroke-N2{stroke:#676C7E;} + .d2-3671284423 .stroke-N3{stroke:#9499AB;} + .d2-3671284423 .stroke-N4{stroke:#CFD2DD;} + .d2-3671284423 .stroke-N5{stroke:#DEE1EB;} + .d2-3671284423 .stroke-N6{stroke:#EEF1F8;} + .d2-3671284423 .stroke-N7{stroke:#FFFFFF;} + .d2-3671284423 .stroke-B1{stroke:#0D32B2;} + .d2-3671284423 .stroke-B2{stroke:#0D32B2;} + .d2-3671284423 .stroke-B3{stroke:#E3E9FD;} + .d2-3671284423 .stroke-B4{stroke:#E3E9FD;} + .d2-3671284423 .stroke-B5{stroke:#EDF0FD;} + .d2-3671284423 .stroke-B6{stroke:#F7F8FE;} + .d2-3671284423 .stroke-AA2{stroke:#4A6FF3;} + .d2-3671284423 .stroke-AA4{stroke:#EDF0FD;} + .d2-3671284423 .stroke-AA5{stroke:#F7F8FE;} + .d2-3671284423 .stroke-AB4{stroke:#EDF0FD;} + .d2-3671284423 .stroke-AB5{stroke:#F7F8FE;} + .d2-3671284423 .background-color-N1{background-color:#0A0F25;} + .d2-3671284423 .background-color-N2{background-color:#676C7E;} + .d2-3671284423 .background-color-N3{background-color:#9499AB;} + .d2-3671284423 .background-color-N4{background-color:#CFD2DD;} + .d2-3671284423 .background-color-N5{background-color:#DEE1EB;} + .d2-3671284423 .background-color-N6{background-color:#EEF1F8;} + .d2-3671284423 .background-color-N7{background-color:#FFFFFF;} + .d2-3671284423 .background-color-B1{background-color:#0D32B2;} + .d2-3671284423 .background-color-B2{background-color:#0D32B2;} + .d2-3671284423 .background-color-B3{background-color:#E3E9FD;} + .d2-3671284423 .background-color-B4{background-color:#E3E9FD;} + .d2-3671284423 .background-color-B5{background-color:#EDF0FD;} + .d2-3671284423 .background-color-B6{background-color:#F7F8FE;} + .d2-3671284423 .background-color-AA2{background-color:#4A6FF3;} + .d2-3671284423 .background-color-AA4{background-color:#EDF0FD;} + .d2-3671284423 .background-color-AA5{background-color:#F7F8FE;} + .d2-3671284423 .background-color-AB4{background-color:#EDF0FD;} + .d2-3671284423 .background-color-AB5{background-color:#F7F8FE;} + .d2-3671284423 .color-N1{color:#0A0F25;} + .d2-3671284423 .color-N2{color:#676C7E;} + .d2-3671284423 .color-N3{color:#9499AB;} + .d2-3671284423 .color-N4{color:#CFD2DD;} + .d2-3671284423 .color-N5{color:#DEE1EB;} + .d2-3671284423 .color-N6{color:#EEF1F8;} + .d2-3671284423 .color-N7{color:#FFFFFF;} + .d2-3671284423 .color-B1{color:#0D32B2;} + .d2-3671284423 .color-B2{color:#0D32B2;} + .d2-3671284423 .color-B3{color:#E3E9FD;} + .d2-3671284423 .color-B4{color:#E3E9FD;} + .d2-3671284423 .color-B5{color:#EDF0FD;} + .d2-3671284423 .color-B6{color:#F7F8FE;} + .d2-3671284423 .color-AA2{color:#4A6FF3;} + .d2-3671284423 .color-AA4{color:#EDF0FD;} + .d2-3671284423 .color-AA5{color:#F7F8FE;} + .d2-3671284423 .color-AB4{color:#EDF0FD;} + .d2-3671284423 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3671284423);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3671284423);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3671284423);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3671284423);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3671284423);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3671284423);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3671284423);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3671284423);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3671284423);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3671284423);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3671284423);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3671284423);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3671284423);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3671284423);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3671284423);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3671284423);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3671284423);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3671284423);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xy - - + + diff --git a/e2etests-cli/testdata/TestCLI_E2E/chain_icon_import.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/chain_icon_import.exp.svg new file mode 100644 index 000000000..165b1d615 --- /dev/null +++ b/e2etests-cli/testdata/TestCLI_E2E/chain_icon_import.exp.svg @@ -0,0 +1,95 @@ +hello + + + diff --git a/e2etests-cli/testdata/TestCLI_E2E/chain_import.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/chain_import.exp.svg index 5b36f387c..f3c53b499 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/chain_import.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/chain_import.exp.svg @@ -1,9 +1,9 @@ -meow + .d2-4185473760 .fill-N1{fill:#0A0F25;} + .d2-4185473760 .fill-N2{fill:#676C7E;} + .d2-4185473760 .fill-N3{fill:#9499AB;} + .d2-4185473760 .fill-N4{fill:#CFD2DD;} + .d2-4185473760 .fill-N5{fill:#DEE1EB;} + .d2-4185473760 .fill-N6{fill:#EEF1F8;} + .d2-4185473760 .fill-N7{fill:#FFFFFF;} + .d2-4185473760 .fill-B1{fill:#0D32B2;} + .d2-4185473760 .fill-B2{fill:#0D32B2;} + .d2-4185473760 .fill-B3{fill:#E3E9FD;} + .d2-4185473760 .fill-B4{fill:#E3E9FD;} + .d2-4185473760 .fill-B5{fill:#EDF0FD;} + .d2-4185473760 .fill-B6{fill:#F7F8FE;} + .d2-4185473760 .fill-AA2{fill:#4A6FF3;} + .d2-4185473760 .fill-AA4{fill:#EDF0FD;} + .d2-4185473760 .fill-AA5{fill:#F7F8FE;} + .d2-4185473760 .fill-AB4{fill:#EDF0FD;} + .d2-4185473760 .fill-AB5{fill:#F7F8FE;} + .d2-4185473760 .stroke-N1{stroke:#0A0F25;} + .d2-4185473760 .stroke-N2{stroke:#676C7E;} + .d2-4185473760 .stroke-N3{stroke:#9499AB;} + .d2-4185473760 .stroke-N4{stroke:#CFD2DD;} + .d2-4185473760 .stroke-N5{stroke:#DEE1EB;} + .d2-4185473760 .stroke-N6{stroke:#EEF1F8;} + .d2-4185473760 .stroke-N7{stroke:#FFFFFF;} + .d2-4185473760 .stroke-B1{stroke:#0D32B2;} + .d2-4185473760 .stroke-B2{stroke:#0D32B2;} + .d2-4185473760 .stroke-B3{stroke:#E3E9FD;} + .d2-4185473760 .stroke-B4{stroke:#E3E9FD;} + .d2-4185473760 .stroke-B5{stroke:#EDF0FD;} + .d2-4185473760 .stroke-B6{stroke:#F7F8FE;} + .d2-4185473760 .stroke-AA2{stroke:#4A6FF3;} + .d2-4185473760 .stroke-AA4{stroke:#EDF0FD;} + .d2-4185473760 .stroke-AA5{stroke:#F7F8FE;} + .d2-4185473760 .stroke-AB4{stroke:#EDF0FD;} + .d2-4185473760 .stroke-AB5{stroke:#F7F8FE;} + .d2-4185473760 .background-color-N1{background-color:#0A0F25;} + .d2-4185473760 .background-color-N2{background-color:#676C7E;} + .d2-4185473760 .background-color-N3{background-color:#9499AB;} + .d2-4185473760 .background-color-N4{background-color:#CFD2DD;} + .d2-4185473760 .background-color-N5{background-color:#DEE1EB;} + .d2-4185473760 .background-color-N6{background-color:#EEF1F8;} + .d2-4185473760 .background-color-N7{background-color:#FFFFFF;} + .d2-4185473760 .background-color-B1{background-color:#0D32B2;} + .d2-4185473760 .background-color-B2{background-color:#0D32B2;} + .d2-4185473760 .background-color-B3{background-color:#E3E9FD;} + .d2-4185473760 .background-color-B4{background-color:#E3E9FD;} + .d2-4185473760 .background-color-B5{background-color:#EDF0FD;} + .d2-4185473760 .background-color-B6{background-color:#F7F8FE;} + .d2-4185473760 .background-color-AA2{background-color:#4A6FF3;} + .d2-4185473760 .background-color-AA4{background-color:#EDF0FD;} + .d2-4185473760 .background-color-AA5{background-color:#F7F8FE;} + .d2-4185473760 .background-color-AB4{background-color:#EDF0FD;} + .d2-4185473760 .background-color-AB5{background-color:#F7F8FE;} + .d2-4185473760 .color-N1{color:#0A0F25;} + .d2-4185473760 .color-N2{color:#676C7E;} + .d2-4185473760 .color-N3{color:#9499AB;} + .d2-4185473760 .color-N4{color:#CFD2DD;} + .d2-4185473760 .color-N5{color:#DEE1EB;} + .d2-4185473760 .color-N6{color:#EEF1F8;} + .d2-4185473760 .color-N7{color:#FFFFFF;} + .d2-4185473760 .color-B1{color:#0D32B2;} + .d2-4185473760 .color-B2{color:#0D32B2;} + .d2-4185473760 .color-B3{color:#E3E9FD;} + .d2-4185473760 .color-B4{color:#E3E9FD;} + .d2-4185473760 .color-B5{color:#EDF0FD;} + .d2-4185473760 .color-B6{color:#F7F8FE;} + .d2-4185473760 .color-AA2{color:#4A6FF3;} + .d2-4185473760 .color-AA4{color:#EDF0FD;} + .d2-4185473760 .color-AA5{color:#F7F8FE;} + .d2-4185473760 .color-AB4{color:#EDF0FD;} + .d2-4185473760 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4185473760);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4185473760);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4185473760);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4185473760);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4185473760);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4185473760);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4185473760);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4185473760);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4185473760);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4185473760);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4185473760);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4185473760);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4185473760);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4185473760);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4185473760);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4185473760);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4185473760);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4185473760);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>meow - + diff --git a/e2etests-cli/testdata/TestCLI_E2E/empty-base.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/empty-base.exp.svg index 98888195b..ff9ee3967 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/empty-base.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/empty-base.exp.svg @@ -1,9 +1,9 @@ -ab +}]]>ab - - -abdc + + +abdc - - - - -abdce + + + + +abdce - - - - - + + + + + \ No newline at end of file diff --git a/e2etests-cli/testdata/TestCLI_E2E/hello_world_png.exp.png b/e2etests-cli/testdata/TestCLI_E2E/hello_world_png.exp.png index cf6aa48ac..855259826 100644 Binary files a/e2etests-cli/testdata/TestCLI_E2E/hello_world_png.exp.png and b/e2etests-cli/testdata/TestCLI_E2E/hello_world_png.exp.png differ diff --git a/e2etests-cli/testdata/TestCLI_E2E/hello_world_png_pad.exp.png b/e2etests-cli/testdata/TestCLI_E2E/hello_world_png_pad.exp.png index 74acdc88d..3c8e1da2b 100644 Binary files a/e2etests-cli/testdata/TestCLI_E2E/hello_world_png_pad.exp.png and b/e2etests-cli/testdata/TestCLI_E2E/hello_world_png_pad.exp.png differ diff --git a/e2etests-cli/testdata/TestCLI_E2E/hello_world_png_sketch.exp.png b/e2etests-cli/testdata/TestCLI_E2E/hello_world_png_sketch.exp.png index 36275858e..1fe448a36 100644 Binary files a/e2etests-cli/testdata/TestCLI_E2E/hello_world_png_sketch.exp.png and b/e2etests-cli/testdata/TestCLI_E2E/hello_world_png_sketch.exp.png differ diff --git a/e2etests-cli/testdata/TestCLI_E2E/import.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/import.exp.svg index 032f0def4..cf8106404 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/import.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/import.exp.svg @@ -1,9 +1,9 @@ -xy + .d2-373309350 .fill-N1{fill:#0A0F25;} + .d2-373309350 .fill-N2{fill:#676C7E;} + .d2-373309350 .fill-N3{fill:#9499AB;} + .d2-373309350 .fill-N4{fill:#CFD2DD;} + .d2-373309350 .fill-N5{fill:#DEE1EB;} + .d2-373309350 .fill-N6{fill:#EEF1F8;} + .d2-373309350 .fill-N7{fill:#FFFFFF;} + .d2-373309350 .fill-B1{fill:#0D32B2;} + .d2-373309350 .fill-B2{fill:#0D32B2;} + .d2-373309350 .fill-B3{fill:#E3E9FD;} + .d2-373309350 .fill-B4{fill:#E3E9FD;} + .d2-373309350 .fill-B5{fill:#EDF0FD;} + .d2-373309350 .fill-B6{fill:#F7F8FE;} + .d2-373309350 .fill-AA2{fill:#4A6FF3;} + .d2-373309350 .fill-AA4{fill:#EDF0FD;} + .d2-373309350 .fill-AA5{fill:#F7F8FE;} + .d2-373309350 .fill-AB4{fill:#EDF0FD;} + .d2-373309350 .fill-AB5{fill:#F7F8FE;} + .d2-373309350 .stroke-N1{stroke:#0A0F25;} + .d2-373309350 .stroke-N2{stroke:#676C7E;} + .d2-373309350 .stroke-N3{stroke:#9499AB;} + .d2-373309350 .stroke-N4{stroke:#CFD2DD;} + .d2-373309350 .stroke-N5{stroke:#DEE1EB;} + .d2-373309350 .stroke-N6{stroke:#EEF1F8;} + .d2-373309350 .stroke-N7{stroke:#FFFFFF;} + .d2-373309350 .stroke-B1{stroke:#0D32B2;} + .d2-373309350 .stroke-B2{stroke:#0D32B2;} + .d2-373309350 .stroke-B3{stroke:#E3E9FD;} + .d2-373309350 .stroke-B4{stroke:#E3E9FD;} + .d2-373309350 .stroke-B5{stroke:#EDF0FD;} + .d2-373309350 .stroke-B6{stroke:#F7F8FE;} + .d2-373309350 .stroke-AA2{stroke:#4A6FF3;} + .d2-373309350 .stroke-AA4{stroke:#EDF0FD;} + .d2-373309350 .stroke-AA5{stroke:#F7F8FE;} + .d2-373309350 .stroke-AB4{stroke:#EDF0FD;} + .d2-373309350 .stroke-AB5{stroke:#F7F8FE;} + .d2-373309350 .background-color-N1{background-color:#0A0F25;} + .d2-373309350 .background-color-N2{background-color:#676C7E;} + .d2-373309350 .background-color-N3{background-color:#9499AB;} + .d2-373309350 .background-color-N4{background-color:#CFD2DD;} + .d2-373309350 .background-color-N5{background-color:#DEE1EB;} + .d2-373309350 .background-color-N6{background-color:#EEF1F8;} + .d2-373309350 .background-color-N7{background-color:#FFFFFF;} + .d2-373309350 .background-color-B1{background-color:#0D32B2;} + .d2-373309350 .background-color-B2{background-color:#0D32B2;} + .d2-373309350 .background-color-B3{background-color:#E3E9FD;} + .d2-373309350 .background-color-B4{background-color:#E3E9FD;} + .d2-373309350 .background-color-B5{background-color:#EDF0FD;} + .d2-373309350 .background-color-B6{background-color:#F7F8FE;} + .d2-373309350 .background-color-AA2{background-color:#4A6FF3;} + .d2-373309350 .background-color-AA4{background-color:#EDF0FD;} + .d2-373309350 .background-color-AA5{background-color:#F7F8FE;} + .d2-373309350 .background-color-AB4{background-color:#EDF0FD;} + .d2-373309350 .background-color-AB5{background-color:#F7F8FE;} + .d2-373309350 .color-N1{color:#0A0F25;} + .d2-373309350 .color-N2{color:#676C7E;} + .d2-373309350 .color-N3{color:#9499AB;} + .d2-373309350 .color-N4{color:#CFD2DD;} + .d2-373309350 .color-N5{color:#DEE1EB;} + .d2-373309350 .color-N6{color:#EEF1F8;} + .d2-373309350 .color-N7{color:#FFFFFF;} + .d2-373309350 .color-B1{color:#0D32B2;} + .d2-373309350 .color-B2{color:#0D32B2;} + .d2-373309350 .color-B3{color:#E3E9FD;} + .d2-373309350 .color-B4{color:#E3E9FD;} + .d2-373309350 .color-B5{color:#EDF0FD;} + .d2-373309350 .color-B6{color:#F7F8FE;} + .d2-373309350 .color-AA2{color:#4A6FF3;} + .d2-373309350 .color-AA4{color:#EDF0FD;} + .d2-373309350 .color-AA5{color:#F7F8FE;} + .d2-373309350 .color-AB4{color:#EDF0FD;} + .d2-373309350 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-373309350);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-373309350);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-373309350);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-373309350);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-373309350);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-373309350);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-373309350);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-373309350);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-373309350);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-373309350);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-373309350);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-373309350);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-373309350);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-373309350);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-373309350);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-373309350);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-373309350);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-373309350);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xy - - + + diff --git a/e2etests-cli/testdata/TestCLI_E2E/import_icon_relative.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/import_icon_relative.exp.svg index 02ddd22cc..c7b8fbfcd 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/import_icon_relative.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/import_icon_relative.exp.svg @@ -1,9 +1,9 @@ -yz + .d2-3626184764 .fill-N1{fill:#0A0F25;} + .d2-3626184764 .fill-N2{fill:#676C7E;} + .d2-3626184764 .fill-N3{fill:#9499AB;} + .d2-3626184764 .fill-N4{fill:#CFD2DD;} + .d2-3626184764 .fill-N5{fill:#DEE1EB;} + .d2-3626184764 .fill-N6{fill:#EEF1F8;} + .d2-3626184764 .fill-N7{fill:#FFFFFF;} + .d2-3626184764 .fill-B1{fill:#0D32B2;} + .d2-3626184764 .fill-B2{fill:#0D32B2;} + .d2-3626184764 .fill-B3{fill:#E3E9FD;} + .d2-3626184764 .fill-B4{fill:#E3E9FD;} + .d2-3626184764 .fill-B5{fill:#EDF0FD;} + .d2-3626184764 .fill-B6{fill:#F7F8FE;} + .d2-3626184764 .fill-AA2{fill:#4A6FF3;} + .d2-3626184764 .fill-AA4{fill:#EDF0FD;} + .d2-3626184764 .fill-AA5{fill:#F7F8FE;} + .d2-3626184764 .fill-AB4{fill:#EDF0FD;} + .d2-3626184764 .fill-AB5{fill:#F7F8FE;} + .d2-3626184764 .stroke-N1{stroke:#0A0F25;} + .d2-3626184764 .stroke-N2{stroke:#676C7E;} + .d2-3626184764 .stroke-N3{stroke:#9499AB;} + .d2-3626184764 .stroke-N4{stroke:#CFD2DD;} + .d2-3626184764 .stroke-N5{stroke:#DEE1EB;} + .d2-3626184764 .stroke-N6{stroke:#EEF1F8;} + .d2-3626184764 .stroke-N7{stroke:#FFFFFF;} + .d2-3626184764 .stroke-B1{stroke:#0D32B2;} + .d2-3626184764 .stroke-B2{stroke:#0D32B2;} + .d2-3626184764 .stroke-B3{stroke:#E3E9FD;} + .d2-3626184764 .stroke-B4{stroke:#E3E9FD;} + .d2-3626184764 .stroke-B5{stroke:#EDF0FD;} + .d2-3626184764 .stroke-B6{stroke:#F7F8FE;} + .d2-3626184764 .stroke-AA2{stroke:#4A6FF3;} + .d2-3626184764 .stroke-AA4{stroke:#EDF0FD;} + .d2-3626184764 .stroke-AA5{stroke:#F7F8FE;} + .d2-3626184764 .stroke-AB4{stroke:#EDF0FD;} + .d2-3626184764 .stroke-AB5{stroke:#F7F8FE;} + .d2-3626184764 .background-color-N1{background-color:#0A0F25;} + .d2-3626184764 .background-color-N2{background-color:#676C7E;} + .d2-3626184764 .background-color-N3{background-color:#9499AB;} + .d2-3626184764 .background-color-N4{background-color:#CFD2DD;} + .d2-3626184764 .background-color-N5{background-color:#DEE1EB;} + .d2-3626184764 .background-color-N6{background-color:#EEF1F8;} + .d2-3626184764 .background-color-N7{background-color:#FFFFFF;} + .d2-3626184764 .background-color-B1{background-color:#0D32B2;} + .d2-3626184764 .background-color-B2{background-color:#0D32B2;} + .d2-3626184764 .background-color-B3{background-color:#E3E9FD;} + .d2-3626184764 .background-color-B4{background-color:#E3E9FD;} + .d2-3626184764 .background-color-B5{background-color:#EDF0FD;} + .d2-3626184764 .background-color-B6{background-color:#F7F8FE;} + .d2-3626184764 .background-color-AA2{background-color:#4A6FF3;} + .d2-3626184764 .background-color-AA4{background-color:#EDF0FD;} + .d2-3626184764 .background-color-AA5{background-color:#F7F8FE;} + .d2-3626184764 .background-color-AB4{background-color:#EDF0FD;} + .d2-3626184764 .background-color-AB5{background-color:#F7F8FE;} + .d2-3626184764 .color-N1{color:#0A0F25;} + .d2-3626184764 .color-N2{color:#676C7E;} + .d2-3626184764 .color-N3{color:#9499AB;} + .d2-3626184764 .color-N4{color:#CFD2DD;} + .d2-3626184764 .color-N5{color:#DEE1EB;} + .d2-3626184764 .color-N6{color:#EEF1F8;} + .d2-3626184764 .color-N7{color:#FFFFFF;} + .d2-3626184764 .color-B1{color:#0D32B2;} + .d2-3626184764 .color-B2{color:#0D32B2;} + .d2-3626184764 .color-B3{color:#E3E9FD;} + .d2-3626184764 .color-B4{color:#E3E9FD;} + .d2-3626184764 .color-B5{color:#EDF0FD;} + .d2-3626184764 .color-B6{color:#F7F8FE;} + .d2-3626184764 .color-AA2{color:#4A6FF3;} + .d2-3626184764 .color-AA4{color:#EDF0FD;} + .d2-3626184764 .color-AA5{color:#F7F8FE;} + .d2-3626184764 .color-AB4{color:#EDF0FD;} + .d2-3626184764 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3626184764);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3626184764);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3626184764);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3626184764);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3626184764);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3626184764);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3626184764);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3626184764);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3626184764);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3626184764);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3626184764);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3626184764);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3626184764);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3626184764);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3626184764);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3626184764);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3626184764);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3626184764);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>yz - - + + diff --git a/e2etests-cli/testdata/TestCLI_E2E/import_spread_nested.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/import_spread_nested.exp.svg index 3fa9509ea..cdf472159 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/import_spread_nested.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/import_spread_nested.exp.svg @@ -1,9 +1,9 @@ -jonjan + .d2-1429612146 .fill-N1{fill:#0A0F25;} + .d2-1429612146 .fill-N2{fill:#676C7E;} + .d2-1429612146 .fill-N3{fill:#9499AB;} + .d2-1429612146 .fill-N4{fill:#CFD2DD;} + .d2-1429612146 .fill-N5{fill:#DEE1EB;} + .d2-1429612146 .fill-N6{fill:#EEF1F8;} + .d2-1429612146 .fill-N7{fill:#FFFFFF;} + .d2-1429612146 .fill-B1{fill:#0D32B2;} + .d2-1429612146 .fill-B2{fill:#0D32B2;} + .d2-1429612146 .fill-B3{fill:#E3E9FD;} + .d2-1429612146 .fill-B4{fill:#E3E9FD;} + .d2-1429612146 .fill-B5{fill:#EDF0FD;} + .d2-1429612146 .fill-B6{fill:#F7F8FE;} + .d2-1429612146 .fill-AA2{fill:#4A6FF3;} + .d2-1429612146 .fill-AA4{fill:#EDF0FD;} + .d2-1429612146 .fill-AA5{fill:#F7F8FE;} + .d2-1429612146 .fill-AB4{fill:#EDF0FD;} + .d2-1429612146 .fill-AB5{fill:#F7F8FE;} + .d2-1429612146 .stroke-N1{stroke:#0A0F25;} + .d2-1429612146 .stroke-N2{stroke:#676C7E;} + .d2-1429612146 .stroke-N3{stroke:#9499AB;} + .d2-1429612146 .stroke-N4{stroke:#CFD2DD;} + .d2-1429612146 .stroke-N5{stroke:#DEE1EB;} + .d2-1429612146 .stroke-N6{stroke:#EEF1F8;} + .d2-1429612146 .stroke-N7{stroke:#FFFFFF;} + .d2-1429612146 .stroke-B1{stroke:#0D32B2;} + .d2-1429612146 .stroke-B2{stroke:#0D32B2;} + .d2-1429612146 .stroke-B3{stroke:#E3E9FD;} + .d2-1429612146 .stroke-B4{stroke:#E3E9FD;} + .d2-1429612146 .stroke-B5{stroke:#EDF0FD;} + .d2-1429612146 .stroke-B6{stroke:#F7F8FE;} + .d2-1429612146 .stroke-AA2{stroke:#4A6FF3;} + .d2-1429612146 .stroke-AA4{stroke:#EDF0FD;} + .d2-1429612146 .stroke-AA5{stroke:#F7F8FE;} + .d2-1429612146 .stroke-AB4{stroke:#EDF0FD;} + .d2-1429612146 .stroke-AB5{stroke:#F7F8FE;} + .d2-1429612146 .background-color-N1{background-color:#0A0F25;} + .d2-1429612146 .background-color-N2{background-color:#676C7E;} + .d2-1429612146 .background-color-N3{background-color:#9499AB;} + .d2-1429612146 .background-color-N4{background-color:#CFD2DD;} + .d2-1429612146 .background-color-N5{background-color:#DEE1EB;} + .d2-1429612146 .background-color-N6{background-color:#EEF1F8;} + .d2-1429612146 .background-color-N7{background-color:#FFFFFF;} + .d2-1429612146 .background-color-B1{background-color:#0D32B2;} + .d2-1429612146 .background-color-B2{background-color:#0D32B2;} + .d2-1429612146 .background-color-B3{background-color:#E3E9FD;} + .d2-1429612146 .background-color-B4{background-color:#E3E9FD;} + .d2-1429612146 .background-color-B5{background-color:#EDF0FD;} + .d2-1429612146 .background-color-B6{background-color:#F7F8FE;} + .d2-1429612146 .background-color-AA2{background-color:#4A6FF3;} + .d2-1429612146 .background-color-AA4{background-color:#EDF0FD;} + .d2-1429612146 .background-color-AA5{background-color:#F7F8FE;} + .d2-1429612146 .background-color-AB4{background-color:#EDF0FD;} + .d2-1429612146 .background-color-AB5{background-color:#F7F8FE;} + .d2-1429612146 .color-N1{color:#0A0F25;} + .d2-1429612146 .color-N2{color:#676C7E;} + .d2-1429612146 .color-N3{color:#9499AB;} + .d2-1429612146 .color-N4{color:#CFD2DD;} + .d2-1429612146 .color-N5{color:#DEE1EB;} + .d2-1429612146 .color-N6{color:#EEF1F8;} + .d2-1429612146 .color-N7{color:#FFFFFF;} + .d2-1429612146 .color-B1{color:#0D32B2;} + .d2-1429612146 .color-B2{color:#0D32B2;} + .d2-1429612146 .color-B3{color:#E3E9FD;} + .d2-1429612146 .color-B4{color:#E3E9FD;} + .d2-1429612146 .color-B5{color:#EDF0FD;} + .d2-1429612146 .color-B6{color:#F7F8FE;} + .d2-1429612146 .color-AA2{color:#4A6FF3;} + .d2-1429612146 .color-AA4{color:#EDF0FD;} + .d2-1429612146 .color-AA5{color:#F7F8FE;} + .d2-1429612146 .color-AB4{color:#EDF0FD;} + .d2-1429612146 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1429612146);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1429612146);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1429612146);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1429612146);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1429612146);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1429612146);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1429612146);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1429612146);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1429612146);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1429612146);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1429612146);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1429612146);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1429612146);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1429612146);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1429612146);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1429612146);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1429612146);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1429612146);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>jonjan - - + + diff --git a/e2etests-cli/testdata/TestCLI_E2E/import_vars.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/import_vars.exp.svg index 67c7bd76e..a765d027d 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/import_vars.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/import_vars.exp.svg @@ -1,9 +1,9 @@ -xy + .d2-781847169 .fill-N1{fill:#CDD6F4;} + .d2-781847169 .fill-N2{fill:#BAC2DE;} + .d2-781847169 .fill-N3{fill:#A6ADC8;} + .d2-781847169 .fill-N4{fill:#585B70;} + .d2-781847169 .fill-N5{fill:#45475A;} + .d2-781847169 .fill-N6{fill:#313244;} + .d2-781847169 .fill-N7{fill:#1E1E2E;} + .d2-781847169 .fill-B1{fill:#CBA6f7;} + .d2-781847169 .fill-B2{fill:#CBA6f7;} + .d2-781847169 .fill-B3{fill:#6C7086;} + .d2-781847169 .fill-B4{fill:#585B70;} + .d2-781847169 .fill-B5{fill:#45475A;} + .d2-781847169 .fill-B6{fill:#313244;} + .d2-781847169 .fill-AA2{fill:#f38BA8;} + .d2-781847169 .fill-AA4{fill:#45475A;} + .d2-781847169 .fill-AA5{fill:#313244;} + .d2-781847169 .fill-AB4{fill:#45475A;} + .d2-781847169 .fill-AB5{fill:#313244;} + .d2-781847169 .stroke-N1{stroke:#CDD6F4;} + .d2-781847169 .stroke-N2{stroke:#BAC2DE;} + .d2-781847169 .stroke-N3{stroke:#A6ADC8;} + .d2-781847169 .stroke-N4{stroke:#585B70;} + .d2-781847169 .stroke-N5{stroke:#45475A;} + .d2-781847169 .stroke-N6{stroke:#313244;} + .d2-781847169 .stroke-N7{stroke:#1E1E2E;} + .d2-781847169 .stroke-B1{stroke:#CBA6f7;} + .d2-781847169 .stroke-B2{stroke:#CBA6f7;} + .d2-781847169 .stroke-B3{stroke:#6C7086;} + .d2-781847169 .stroke-B4{stroke:#585B70;} + .d2-781847169 .stroke-B5{stroke:#45475A;} + .d2-781847169 .stroke-B6{stroke:#313244;} + .d2-781847169 .stroke-AA2{stroke:#f38BA8;} + .d2-781847169 .stroke-AA4{stroke:#45475A;} + .d2-781847169 .stroke-AA5{stroke:#313244;} + .d2-781847169 .stroke-AB4{stroke:#45475A;} + .d2-781847169 .stroke-AB5{stroke:#313244;} + .d2-781847169 .background-color-N1{background-color:#CDD6F4;} + .d2-781847169 .background-color-N2{background-color:#BAC2DE;} + .d2-781847169 .background-color-N3{background-color:#A6ADC8;} + .d2-781847169 .background-color-N4{background-color:#585B70;} + .d2-781847169 .background-color-N5{background-color:#45475A;} + .d2-781847169 .background-color-N6{background-color:#313244;} + .d2-781847169 .background-color-N7{background-color:#1E1E2E;} + .d2-781847169 .background-color-B1{background-color:#CBA6f7;} + .d2-781847169 .background-color-B2{background-color:#CBA6f7;} + .d2-781847169 .background-color-B3{background-color:#6C7086;} + .d2-781847169 .background-color-B4{background-color:#585B70;} + .d2-781847169 .background-color-B5{background-color:#45475A;} + .d2-781847169 .background-color-B6{background-color:#313244;} + .d2-781847169 .background-color-AA2{background-color:#f38BA8;} + .d2-781847169 .background-color-AA4{background-color:#45475A;} + .d2-781847169 .background-color-AA5{background-color:#313244;} + .d2-781847169 .background-color-AB4{background-color:#45475A;} + .d2-781847169 .background-color-AB5{background-color:#313244;} + .d2-781847169 .color-N1{color:#CDD6F4;} + .d2-781847169 .color-N2{color:#BAC2DE;} + .d2-781847169 .color-N3{color:#A6ADC8;} + .d2-781847169 .color-N4{color:#585B70;} + .d2-781847169 .color-N5{color:#45475A;} + .d2-781847169 .color-N6{color:#313244;} + .d2-781847169 .color-N7{color:#1E1E2E;} + .d2-781847169 .color-B1{color:#CBA6f7;} + .d2-781847169 .color-B2{color:#CBA6f7;} + .d2-781847169 .color-B3{color:#6C7086;} + .d2-781847169 .color-B4{color:#585B70;} + .d2-781847169 .color-B5{color:#45475A;} + .d2-781847169 .color-B6{color:#313244;} + .d2-781847169 .color-AA2{color:#f38BA8;} + .d2-781847169 .color-AA4{color:#45475A;} + .d2-781847169 .color-AA5{color:#313244;} + .d2-781847169 .color-AB4{color:#45475A;} + .d2-781847169 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal-d2-781847169);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal-d2-781847169);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark-d2-781847169);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark-d2-781847169);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker-d2-781847169);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker-d2-781847169);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal-d2-781847169);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker-d2-781847169);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker-d2-781847169);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker-d2-781847169);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker-d2-781847169);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal-d2-781847169);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal-d2-781847169);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal-d2-781847169);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark-d2-781847169);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker-d2-781847169);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker-d2-781847169);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker-d2-781847169);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>xy - - + + diff --git a/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf b/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf index 7c1a8847d..deb3744f2 100644 Binary files a/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf and b/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf differ diff --git a/e2etests-cli/testdata/TestCLI_E2E/layer-link/index.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/layer-link/index.exp.svg index f35290bfd..5bf62e1ee 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/layer-link/index.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/layer-link/index.exp.svg @@ -1,12 +1,12 @@ -doh - + .d2-4207926312 .fill-N1{fill:#0A0F25;} + .d2-4207926312 .fill-N2{fill:#676C7E;} + .d2-4207926312 .fill-N3{fill:#9499AB;} + .d2-4207926312 .fill-N4{fill:#CFD2DD;} + .d2-4207926312 .fill-N5{fill:#DEE1EB;} + .d2-4207926312 .fill-N6{fill:#EEF1F8;} + .d2-4207926312 .fill-N7{fill:#FFFFFF;} + .d2-4207926312 .fill-B1{fill:#0D32B2;} + .d2-4207926312 .fill-B2{fill:#0D32B2;} + .d2-4207926312 .fill-B3{fill:#E3E9FD;} + .d2-4207926312 .fill-B4{fill:#E3E9FD;} + .d2-4207926312 .fill-B5{fill:#EDF0FD;} + .d2-4207926312 .fill-B6{fill:#F7F8FE;} + .d2-4207926312 .fill-AA2{fill:#4A6FF3;} + .d2-4207926312 .fill-AA4{fill:#EDF0FD;} + .d2-4207926312 .fill-AA5{fill:#F7F8FE;} + .d2-4207926312 .fill-AB4{fill:#EDF0FD;} + .d2-4207926312 .fill-AB5{fill:#F7F8FE;} + .d2-4207926312 .stroke-N1{stroke:#0A0F25;} + .d2-4207926312 .stroke-N2{stroke:#676C7E;} + .d2-4207926312 .stroke-N3{stroke:#9499AB;} + .d2-4207926312 .stroke-N4{stroke:#CFD2DD;} + .d2-4207926312 .stroke-N5{stroke:#DEE1EB;} + .d2-4207926312 .stroke-N6{stroke:#EEF1F8;} + .d2-4207926312 .stroke-N7{stroke:#FFFFFF;} + .d2-4207926312 .stroke-B1{stroke:#0D32B2;} + .d2-4207926312 .stroke-B2{stroke:#0D32B2;} + .d2-4207926312 .stroke-B3{stroke:#E3E9FD;} + .d2-4207926312 .stroke-B4{stroke:#E3E9FD;} + .d2-4207926312 .stroke-B5{stroke:#EDF0FD;} + .d2-4207926312 .stroke-B6{stroke:#F7F8FE;} + .d2-4207926312 .stroke-AA2{stroke:#4A6FF3;} + .d2-4207926312 .stroke-AA4{stroke:#EDF0FD;} + .d2-4207926312 .stroke-AA5{stroke:#F7F8FE;} + .d2-4207926312 .stroke-AB4{stroke:#EDF0FD;} + .d2-4207926312 .stroke-AB5{stroke:#F7F8FE;} + .d2-4207926312 .background-color-N1{background-color:#0A0F25;} + .d2-4207926312 .background-color-N2{background-color:#676C7E;} + .d2-4207926312 .background-color-N3{background-color:#9499AB;} + .d2-4207926312 .background-color-N4{background-color:#CFD2DD;} + .d2-4207926312 .background-color-N5{background-color:#DEE1EB;} + .d2-4207926312 .background-color-N6{background-color:#EEF1F8;} + .d2-4207926312 .background-color-N7{background-color:#FFFFFF;} + .d2-4207926312 .background-color-B1{background-color:#0D32B2;} + .d2-4207926312 .background-color-B2{background-color:#0D32B2;} + .d2-4207926312 .background-color-B3{background-color:#E3E9FD;} + .d2-4207926312 .background-color-B4{background-color:#E3E9FD;} + .d2-4207926312 .background-color-B5{background-color:#EDF0FD;} + .d2-4207926312 .background-color-B6{background-color:#F7F8FE;} + .d2-4207926312 .background-color-AA2{background-color:#4A6FF3;} + .d2-4207926312 .background-color-AA4{background-color:#EDF0FD;} + .d2-4207926312 .background-color-AA5{background-color:#F7F8FE;} + .d2-4207926312 .background-color-AB4{background-color:#EDF0FD;} + .d2-4207926312 .background-color-AB5{background-color:#F7F8FE;} + .d2-4207926312 .color-N1{color:#0A0F25;} + .d2-4207926312 .color-N2{color:#676C7E;} + .d2-4207926312 .color-N3{color:#9499AB;} + .d2-4207926312 .color-N4{color:#CFD2DD;} + .d2-4207926312 .color-N5{color:#DEE1EB;} + .d2-4207926312 .color-N6{color:#EEF1F8;} + .d2-4207926312 .color-N7{color:#FFFFFF;} + .d2-4207926312 .color-B1{color:#0D32B2;} + .d2-4207926312 .color-B2{color:#0D32B2;} + .d2-4207926312 .color-B3{color:#E3E9FD;} + .d2-4207926312 .color-B4{color:#E3E9FD;} + .d2-4207926312 .color-B5{color:#EDF0FD;} + .d2-4207926312 .color-B6{color:#F7F8FE;} + .d2-4207926312 .color-AA2{color:#4A6FF3;} + .d2-4207926312 .color-AA4{color:#EDF0FD;} + .d2-4207926312 .color-AA5{color:#F7F8FE;} + .d2-4207926312 .color-AB4{color:#EDF0FD;} + .d2-4207926312 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4207926312);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4207926312);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4207926312);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4207926312);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4207926312);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4207926312);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4207926312);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4207926312);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4207926312);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4207926312);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4207926312);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4207926312);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4207926312);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4207926312);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4207926312);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4207926312);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4207926312);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4207926312);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>doh + - + - - - + + + diff --git a/e2etests-cli/testdata/TestCLI_E2E/layer-link/test2.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/layer-link/test2.exp.svg index c23b66b7f..30fbedd9c 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/layer-link/test2.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/layer-link/test2.exp.svg @@ -1,12 +1,12 @@ -I'm a Mac - + .d2-2624935134 .fill-N1{fill:#0A0F25;} + .d2-2624935134 .fill-N2{fill:#676C7E;} + .d2-2624935134 .fill-N3{fill:#9499AB;} + .d2-2624935134 .fill-N4{fill:#CFD2DD;} + .d2-2624935134 .fill-N5{fill:#DEE1EB;} + .d2-2624935134 .fill-N6{fill:#EEF1F8;} + .d2-2624935134 .fill-N7{fill:#FFFFFF;} + .d2-2624935134 .fill-B1{fill:#0D32B2;} + .d2-2624935134 .fill-B2{fill:#0D32B2;} + .d2-2624935134 .fill-B3{fill:#E3E9FD;} + .d2-2624935134 .fill-B4{fill:#E3E9FD;} + .d2-2624935134 .fill-B5{fill:#EDF0FD;} + .d2-2624935134 .fill-B6{fill:#F7F8FE;} + .d2-2624935134 .fill-AA2{fill:#4A6FF3;} + .d2-2624935134 .fill-AA4{fill:#EDF0FD;} + .d2-2624935134 .fill-AA5{fill:#F7F8FE;} + .d2-2624935134 .fill-AB4{fill:#EDF0FD;} + .d2-2624935134 .fill-AB5{fill:#F7F8FE;} + .d2-2624935134 .stroke-N1{stroke:#0A0F25;} + .d2-2624935134 .stroke-N2{stroke:#676C7E;} + .d2-2624935134 .stroke-N3{stroke:#9499AB;} + .d2-2624935134 .stroke-N4{stroke:#CFD2DD;} + .d2-2624935134 .stroke-N5{stroke:#DEE1EB;} + .d2-2624935134 .stroke-N6{stroke:#EEF1F8;} + .d2-2624935134 .stroke-N7{stroke:#FFFFFF;} + .d2-2624935134 .stroke-B1{stroke:#0D32B2;} + .d2-2624935134 .stroke-B2{stroke:#0D32B2;} + .d2-2624935134 .stroke-B3{stroke:#E3E9FD;} + .d2-2624935134 .stroke-B4{stroke:#E3E9FD;} + .d2-2624935134 .stroke-B5{stroke:#EDF0FD;} + .d2-2624935134 .stroke-B6{stroke:#F7F8FE;} + .d2-2624935134 .stroke-AA2{stroke:#4A6FF3;} + .d2-2624935134 .stroke-AA4{stroke:#EDF0FD;} + .d2-2624935134 .stroke-AA5{stroke:#F7F8FE;} + .d2-2624935134 .stroke-AB4{stroke:#EDF0FD;} + .d2-2624935134 .stroke-AB5{stroke:#F7F8FE;} + .d2-2624935134 .background-color-N1{background-color:#0A0F25;} + .d2-2624935134 .background-color-N2{background-color:#676C7E;} + .d2-2624935134 .background-color-N3{background-color:#9499AB;} + .d2-2624935134 .background-color-N4{background-color:#CFD2DD;} + .d2-2624935134 .background-color-N5{background-color:#DEE1EB;} + .d2-2624935134 .background-color-N6{background-color:#EEF1F8;} + .d2-2624935134 .background-color-N7{background-color:#FFFFFF;} + .d2-2624935134 .background-color-B1{background-color:#0D32B2;} + .d2-2624935134 .background-color-B2{background-color:#0D32B2;} + .d2-2624935134 .background-color-B3{background-color:#E3E9FD;} + .d2-2624935134 .background-color-B4{background-color:#E3E9FD;} + .d2-2624935134 .background-color-B5{background-color:#EDF0FD;} + .d2-2624935134 .background-color-B6{background-color:#F7F8FE;} + .d2-2624935134 .background-color-AA2{background-color:#4A6FF3;} + .d2-2624935134 .background-color-AA4{background-color:#EDF0FD;} + .d2-2624935134 .background-color-AA5{background-color:#F7F8FE;} + .d2-2624935134 .background-color-AB4{background-color:#EDF0FD;} + .d2-2624935134 .background-color-AB5{background-color:#F7F8FE;} + .d2-2624935134 .color-N1{color:#0A0F25;} + .d2-2624935134 .color-N2{color:#676C7E;} + .d2-2624935134 .color-N3{color:#9499AB;} + .d2-2624935134 .color-N4{color:#CFD2DD;} + .d2-2624935134 .color-N5{color:#DEE1EB;} + .d2-2624935134 .color-N6{color:#EEF1F8;} + .d2-2624935134 .color-N7{color:#FFFFFF;} + .d2-2624935134 .color-B1{color:#0D32B2;} + .d2-2624935134 .color-B2{color:#0D32B2;} + .d2-2624935134 .color-B3{color:#E3E9FD;} + .d2-2624935134 .color-B4{color:#E3E9FD;} + .d2-2624935134 .color-B5{color:#EDF0FD;} + .d2-2624935134 .color-B6{color:#F7F8FE;} + .d2-2624935134 .color-AA2{color:#4A6FF3;} + .d2-2624935134 .color-AA4{color:#EDF0FD;} + .d2-2624935134 .color-AA5{color:#F7F8FE;} + .d2-2624935134 .color-AB4{color:#EDF0FD;} + .d2-2624935134 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2624935134);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2624935134);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2624935134);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2624935134);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2624935134);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2624935134);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2624935134);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2624935134);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2624935134);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2624935134);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2624935134);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2624935134);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2624935134);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2624935134);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2624935134);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2624935134);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2624935134);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2624935134);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>I'm a Mac + - + - - - + + + diff --git a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/index.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/index.exp.svg index 3528d5f90..6430985da 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/index.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/index.exp.svg @@ -1,9 +1,9 @@ -xy + .d2-1272689853 .fill-N1{fill:#0A0F25;} + .d2-1272689853 .fill-N2{fill:#676C7E;} + .d2-1272689853 .fill-N3{fill:#9499AB;} + .d2-1272689853 .fill-N4{fill:#CFD2DD;} + .d2-1272689853 .fill-N5{fill:#DEE1EB;} + .d2-1272689853 .fill-N6{fill:#EEF1F8;} + .d2-1272689853 .fill-N7{fill:#FFFFFF;} + .d2-1272689853 .fill-B1{fill:#0D32B2;} + .d2-1272689853 .fill-B2{fill:#0D32B2;} + .d2-1272689853 .fill-B3{fill:#E3E9FD;} + .d2-1272689853 .fill-B4{fill:#E3E9FD;} + .d2-1272689853 .fill-B5{fill:#EDF0FD;} + .d2-1272689853 .fill-B6{fill:#F7F8FE;} + .d2-1272689853 .fill-AA2{fill:#4A6FF3;} + .d2-1272689853 .fill-AA4{fill:#EDF0FD;} + .d2-1272689853 .fill-AA5{fill:#F7F8FE;} + .d2-1272689853 .fill-AB4{fill:#EDF0FD;} + .d2-1272689853 .fill-AB5{fill:#F7F8FE;} + .d2-1272689853 .stroke-N1{stroke:#0A0F25;} + .d2-1272689853 .stroke-N2{stroke:#676C7E;} + .d2-1272689853 .stroke-N3{stroke:#9499AB;} + .d2-1272689853 .stroke-N4{stroke:#CFD2DD;} + .d2-1272689853 .stroke-N5{stroke:#DEE1EB;} + .d2-1272689853 .stroke-N6{stroke:#EEF1F8;} + .d2-1272689853 .stroke-N7{stroke:#FFFFFF;} + .d2-1272689853 .stroke-B1{stroke:#0D32B2;} + .d2-1272689853 .stroke-B2{stroke:#0D32B2;} + .d2-1272689853 .stroke-B3{stroke:#E3E9FD;} + .d2-1272689853 .stroke-B4{stroke:#E3E9FD;} + .d2-1272689853 .stroke-B5{stroke:#EDF0FD;} + .d2-1272689853 .stroke-B6{stroke:#F7F8FE;} + .d2-1272689853 .stroke-AA2{stroke:#4A6FF3;} + .d2-1272689853 .stroke-AA4{stroke:#EDF0FD;} + .d2-1272689853 .stroke-AA5{stroke:#F7F8FE;} + .d2-1272689853 .stroke-AB4{stroke:#EDF0FD;} + .d2-1272689853 .stroke-AB5{stroke:#F7F8FE;} + .d2-1272689853 .background-color-N1{background-color:#0A0F25;} + .d2-1272689853 .background-color-N2{background-color:#676C7E;} + .d2-1272689853 .background-color-N3{background-color:#9499AB;} + .d2-1272689853 .background-color-N4{background-color:#CFD2DD;} + .d2-1272689853 .background-color-N5{background-color:#DEE1EB;} + .d2-1272689853 .background-color-N6{background-color:#EEF1F8;} + .d2-1272689853 .background-color-N7{background-color:#FFFFFF;} + .d2-1272689853 .background-color-B1{background-color:#0D32B2;} + .d2-1272689853 .background-color-B2{background-color:#0D32B2;} + .d2-1272689853 .background-color-B3{background-color:#E3E9FD;} + .d2-1272689853 .background-color-B4{background-color:#E3E9FD;} + .d2-1272689853 .background-color-B5{background-color:#EDF0FD;} + .d2-1272689853 .background-color-B6{background-color:#F7F8FE;} + .d2-1272689853 .background-color-AA2{background-color:#4A6FF3;} + .d2-1272689853 .background-color-AA4{background-color:#EDF0FD;} + .d2-1272689853 .background-color-AA5{background-color:#F7F8FE;} + .d2-1272689853 .background-color-AB4{background-color:#EDF0FD;} + .d2-1272689853 .background-color-AB5{background-color:#F7F8FE;} + .d2-1272689853 .color-N1{color:#0A0F25;} + .d2-1272689853 .color-N2{color:#676C7E;} + .d2-1272689853 .color-N3{color:#9499AB;} + .d2-1272689853 .color-N4{color:#CFD2DD;} + .d2-1272689853 .color-N5{color:#DEE1EB;} + .d2-1272689853 .color-N6{color:#EEF1F8;} + .d2-1272689853 .color-N7{color:#FFFFFF;} + .d2-1272689853 .color-B1{color:#0D32B2;} + .d2-1272689853 .color-B2{color:#0D32B2;} + .d2-1272689853 .color-B3{color:#E3E9FD;} + .d2-1272689853 .color-B4{color:#E3E9FD;} + .d2-1272689853 .color-B5{color:#EDF0FD;} + .d2-1272689853 .color-B6{color:#F7F8FE;} + .d2-1272689853 .color-AA2{color:#4A6FF3;} + .d2-1272689853 .color-AA4{color:#EDF0FD;} + .d2-1272689853 .color-AA5{color:#F7F8FE;} + .d2-1272689853 .color-AB4{color:#EDF0FD;} + .d2-1272689853 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1272689853);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1272689853);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1272689853);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1272689853);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1272689853);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1272689853);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1272689853);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1272689853);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1272689853);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1272689853);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1272689853);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1272689853);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1272689853);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1272689853);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1272689853);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1272689853);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1272689853);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1272689853);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xy - - + + diff --git a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/layers/broker.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/layers/broker.exp.svg index 728b8edd2..8d9667675 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/layers/broker.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/layers/broker.exp.svg @@ -1,9 +1,9 @@ -mortgagerealtor + .d2-1616388686 .fill-N1{fill:#0A0F25;} + .d2-1616388686 .fill-N2{fill:#676C7E;} + .d2-1616388686 .fill-N3{fill:#9499AB;} + .d2-1616388686 .fill-N4{fill:#CFD2DD;} + .d2-1616388686 .fill-N5{fill:#DEE1EB;} + .d2-1616388686 .fill-N6{fill:#EEF1F8;} + .d2-1616388686 .fill-N7{fill:#FFFFFF;} + .d2-1616388686 .fill-B1{fill:#0D32B2;} + .d2-1616388686 .fill-B2{fill:#0D32B2;} + .d2-1616388686 .fill-B3{fill:#E3E9FD;} + .d2-1616388686 .fill-B4{fill:#E3E9FD;} + .d2-1616388686 .fill-B5{fill:#EDF0FD;} + .d2-1616388686 .fill-B6{fill:#F7F8FE;} + .d2-1616388686 .fill-AA2{fill:#4A6FF3;} + .d2-1616388686 .fill-AA4{fill:#EDF0FD;} + .d2-1616388686 .fill-AA5{fill:#F7F8FE;} + .d2-1616388686 .fill-AB4{fill:#EDF0FD;} + .d2-1616388686 .fill-AB5{fill:#F7F8FE;} + .d2-1616388686 .stroke-N1{stroke:#0A0F25;} + .d2-1616388686 .stroke-N2{stroke:#676C7E;} + .d2-1616388686 .stroke-N3{stroke:#9499AB;} + .d2-1616388686 .stroke-N4{stroke:#CFD2DD;} + .d2-1616388686 .stroke-N5{stroke:#DEE1EB;} + .d2-1616388686 .stroke-N6{stroke:#EEF1F8;} + .d2-1616388686 .stroke-N7{stroke:#FFFFFF;} + .d2-1616388686 .stroke-B1{stroke:#0D32B2;} + .d2-1616388686 .stroke-B2{stroke:#0D32B2;} + .d2-1616388686 .stroke-B3{stroke:#E3E9FD;} + .d2-1616388686 .stroke-B4{stroke:#E3E9FD;} + .d2-1616388686 .stroke-B5{stroke:#EDF0FD;} + .d2-1616388686 .stroke-B6{stroke:#F7F8FE;} + .d2-1616388686 .stroke-AA2{stroke:#4A6FF3;} + .d2-1616388686 .stroke-AA4{stroke:#EDF0FD;} + .d2-1616388686 .stroke-AA5{stroke:#F7F8FE;} + .d2-1616388686 .stroke-AB4{stroke:#EDF0FD;} + .d2-1616388686 .stroke-AB5{stroke:#F7F8FE;} + .d2-1616388686 .background-color-N1{background-color:#0A0F25;} + .d2-1616388686 .background-color-N2{background-color:#676C7E;} + .d2-1616388686 .background-color-N3{background-color:#9499AB;} + .d2-1616388686 .background-color-N4{background-color:#CFD2DD;} + .d2-1616388686 .background-color-N5{background-color:#DEE1EB;} + .d2-1616388686 .background-color-N6{background-color:#EEF1F8;} + .d2-1616388686 .background-color-N7{background-color:#FFFFFF;} + .d2-1616388686 .background-color-B1{background-color:#0D32B2;} + .d2-1616388686 .background-color-B2{background-color:#0D32B2;} + .d2-1616388686 .background-color-B3{background-color:#E3E9FD;} + .d2-1616388686 .background-color-B4{background-color:#E3E9FD;} + .d2-1616388686 .background-color-B5{background-color:#EDF0FD;} + .d2-1616388686 .background-color-B6{background-color:#F7F8FE;} + .d2-1616388686 .background-color-AA2{background-color:#4A6FF3;} + .d2-1616388686 .background-color-AA4{background-color:#EDF0FD;} + .d2-1616388686 .background-color-AA5{background-color:#F7F8FE;} + .d2-1616388686 .background-color-AB4{background-color:#EDF0FD;} + .d2-1616388686 .background-color-AB5{background-color:#F7F8FE;} + .d2-1616388686 .color-N1{color:#0A0F25;} + .d2-1616388686 .color-N2{color:#676C7E;} + .d2-1616388686 .color-N3{color:#9499AB;} + .d2-1616388686 .color-N4{color:#CFD2DD;} + .d2-1616388686 .color-N5{color:#DEE1EB;} + .d2-1616388686 .color-N6{color:#EEF1F8;} + .d2-1616388686 .color-N7{color:#FFFFFF;} + .d2-1616388686 .color-B1{color:#0D32B2;} + .d2-1616388686 .color-B2{color:#0D32B2;} + .d2-1616388686 .color-B3{color:#E3E9FD;} + .d2-1616388686 .color-B4{color:#E3E9FD;} + .d2-1616388686 .color-B5{color:#EDF0FD;} + .d2-1616388686 .color-B6{color:#F7F8FE;} + .d2-1616388686 .color-AA2{color:#4A6FF3;} + .d2-1616388686 .color-AA4{color:#EDF0FD;} + .d2-1616388686 .color-AA5{color:#F7F8FE;} + .d2-1616388686 .color-AB4{color:#EDF0FD;} + .d2-1616388686 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1616388686);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1616388686);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1616388686);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1616388686);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1616388686);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1616388686);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1616388686);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1616388686);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1616388686);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1616388686);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1616388686);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1616388686);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1616388686);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1616388686);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1616388686);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1616388686);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1616388686);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1616388686);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>mortgagerealtor - - + + diff --git a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/layers/core.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/layers/core.exp.svg index 59ffd5ef1..39d233ba5 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/layers/core.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/layers/core.exp.svg @@ -1,9 +1,9 @@ -belieffooddiet + .d2-1610246682 .fill-N1{fill:#0A0F25;} + .d2-1610246682 .fill-N2{fill:#676C7E;} + .d2-1610246682 .fill-N3{fill:#9499AB;} + .d2-1610246682 .fill-N4{fill:#CFD2DD;} + .d2-1610246682 .fill-N5{fill:#DEE1EB;} + .d2-1610246682 .fill-N6{fill:#EEF1F8;} + .d2-1610246682 .fill-N7{fill:#FFFFFF;} + .d2-1610246682 .fill-B1{fill:#0D32B2;} + .d2-1610246682 .fill-B2{fill:#0D32B2;} + .d2-1610246682 .fill-B3{fill:#E3E9FD;} + .d2-1610246682 .fill-B4{fill:#E3E9FD;} + .d2-1610246682 .fill-B5{fill:#EDF0FD;} + .d2-1610246682 .fill-B6{fill:#F7F8FE;} + .d2-1610246682 .fill-AA2{fill:#4A6FF3;} + .d2-1610246682 .fill-AA4{fill:#EDF0FD;} + .d2-1610246682 .fill-AA5{fill:#F7F8FE;} + .d2-1610246682 .fill-AB4{fill:#EDF0FD;} + .d2-1610246682 .fill-AB5{fill:#F7F8FE;} + .d2-1610246682 .stroke-N1{stroke:#0A0F25;} + .d2-1610246682 .stroke-N2{stroke:#676C7E;} + .d2-1610246682 .stroke-N3{stroke:#9499AB;} + .d2-1610246682 .stroke-N4{stroke:#CFD2DD;} + .d2-1610246682 .stroke-N5{stroke:#DEE1EB;} + .d2-1610246682 .stroke-N6{stroke:#EEF1F8;} + .d2-1610246682 .stroke-N7{stroke:#FFFFFF;} + .d2-1610246682 .stroke-B1{stroke:#0D32B2;} + .d2-1610246682 .stroke-B2{stroke:#0D32B2;} + .d2-1610246682 .stroke-B3{stroke:#E3E9FD;} + .d2-1610246682 .stroke-B4{stroke:#E3E9FD;} + .d2-1610246682 .stroke-B5{stroke:#EDF0FD;} + .d2-1610246682 .stroke-B6{stroke:#F7F8FE;} + .d2-1610246682 .stroke-AA2{stroke:#4A6FF3;} + .d2-1610246682 .stroke-AA4{stroke:#EDF0FD;} + .d2-1610246682 .stroke-AA5{stroke:#F7F8FE;} + .d2-1610246682 .stroke-AB4{stroke:#EDF0FD;} + .d2-1610246682 .stroke-AB5{stroke:#F7F8FE;} + .d2-1610246682 .background-color-N1{background-color:#0A0F25;} + .d2-1610246682 .background-color-N2{background-color:#676C7E;} + .d2-1610246682 .background-color-N3{background-color:#9499AB;} + .d2-1610246682 .background-color-N4{background-color:#CFD2DD;} + .d2-1610246682 .background-color-N5{background-color:#DEE1EB;} + .d2-1610246682 .background-color-N6{background-color:#EEF1F8;} + .d2-1610246682 .background-color-N7{background-color:#FFFFFF;} + .d2-1610246682 .background-color-B1{background-color:#0D32B2;} + .d2-1610246682 .background-color-B2{background-color:#0D32B2;} + .d2-1610246682 .background-color-B3{background-color:#E3E9FD;} + .d2-1610246682 .background-color-B4{background-color:#E3E9FD;} + .d2-1610246682 .background-color-B5{background-color:#EDF0FD;} + .d2-1610246682 .background-color-B6{background-color:#F7F8FE;} + .d2-1610246682 .background-color-AA2{background-color:#4A6FF3;} + .d2-1610246682 .background-color-AA4{background-color:#EDF0FD;} + .d2-1610246682 .background-color-AA5{background-color:#F7F8FE;} + .d2-1610246682 .background-color-AB4{background-color:#EDF0FD;} + .d2-1610246682 .background-color-AB5{background-color:#F7F8FE;} + .d2-1610246682 .color-N1{color:#0A0F25;} + .d2-1610246682 .color-N2{color:#676C7E;} + .d2-1610246682 .color-N3{color:#9499AB;} + .d2-1610246682 .color-N4{color:#CFD2DD;} + .d2-1610246682 .color-N5{color:#DEE1EB;} + .d2-1610246682 .color-N6{color:#EEF1F8;} + .d2-1610246682 .color-N7{color:#FFFFFF;} + .d2-1610246682 .color-B1{color:#0D32B2;} + .d2-1610246682 .color-B2{color:#0D32B2;} + .d2-1610246682 .color-B3{color:#E3E9FD;} + .d2-1610246682 .color-B4{color:#E3E9FD;} + .d2-1610246682 .color-B5{color:#EDF0FD;} + .d2-1610246682 .color-B6{color:#F7F8FE;} + .d2-1610246682 .color-AA2{color:#4A6FF3;} + .d2-1610246682 .color-AA4{color:#EDF0FD;} + .d2-1610246682 .color-AA5{color:#F7F8FE;} + .d2-1610246682 .color-AB4{color:#EDF0FD;} + .d2-1610246682 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1610246682);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1610246682);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1610246682);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1610246682);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1610246682);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1610246682);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1610246682);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1610246682);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1610246682);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1610246682);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1610246682);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1610246682);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1610246682);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1610246682);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1610246682);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1610246682);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1610246682);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1610246682);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>belieffooddiet - - - + + + diff --git a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/layers/stocks.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/layers/stocks.exp.svg index 2899556a0..e4a707b49 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/layers/stocks.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/layers/stocks.exp.svg @@ -1,9 +1,9 @@ -TSXNYSENASDAQ + .d2-1921642409 .fill-N1{fill:#0A0F25;} + .d2-1921642409 .fill-N2{fill:#676C7E;} + .d2-1921642409 .fill-N3{fill:#9499AB;} + .d2-1921642409 .fill-N4{fill:#CFD2DD;} + .d2-1921642409 .fill-N5{fill:#DEE1EB;} + .d2-1921642409 .fill-N6{fill:#EEF1F8;} + .d2-1921642409 .fill-N7{fill:#FFFFFF;} + .d2-1921642409 .fill-B1{fill:#0D32B2;} + .d2-1921642409 .fill-B2{fill:#0D32B2;} + .d2-1921642409 .fill-B3{fill:#E3E9FD;} + .d2-1921642409 .fill-B4{fill:#E3E9FD;} + .d2-1921642409 .fill-B5{fill:#EDF0FD;} + .d2-1921642409 .fill-B6{fill:#F7F8FE;} + .d2-1921642409 .fill-AA2{fill:#4A6FF3;} + .d2-1921642409 .fill-AA4{fill:#EDF0FD;} + .d2-1921642409 .fill-AA5{fill:#F7F8FE;} + .d2-1921642409 .fill-AB4{fill:#EDF0FD;} + .d2-1921642409 .fill-AB5{fill:#F7F8FE;} + .d2-1921642409 .stroke-N1{stroke:#0A0F25;} + .d2-1921642409 .stroke-N2{stroke:#676C7E;} + .d2-1921642409 .stroke-N3{stroke:#9499AB;} + .d2-1921642409 .stroke-N4{stroke:#CFD2DD;} + .d2-1921642409 .stroke-N5{stroke:#DEE1EB;} + .d2-1921642409 .stroke-N6{stroke:#EEF1F8;} + .d2-1921642409 .stroke-N7{stroke:#FFFFFF;} + .d2-1921642409 .stroke-B1{stroke:#0D32B2;} + .d2-1921642409 .stroke-B2{stroke:#0D32B2;} + .d2-1921642409 .stroke-B3{stroke:#E3E9FD;} + .d2-1921642409 .stroke-B4{stroke:#E3E9FD;} + .d2-1921642409 .stroke-B5{stroke:#EDF0FD;} + .d2-1921642409 .stroke-B6{stroke:#F7F8FE;} + .d2-1921642409 .stroke-AA2{stroke:#4A6FF3;} + .d2-1921642409 .stroke-AA4{stroke:#EDF0FD;} + .d2-1921642409 .stroke-AA5{stroke:#F7F8FE;} + .d2-1921642409 .stroke-AB4{stroke:#EDF0FD;} + .d2-1921642409 .stroke-AB5{stroke:#F7F8FE;} + .d2-1921642409 .background-color-N1{background-color:#0A0F25;} + .d2-1921642409 .background-color-N2{background-color:#676C7E;} + .d2-1921642409 .background-color-N3{background-color:#9499AB;} + .d2-1921642409 .background-color-N4{background-color:#CFD2DD;} + .d2-1921642409 .background-color-N5{background-color:#DEE1EB;} + .d2-1921642409 .background-color-N6{background-color:#EEF1F8;} + .d2-1921642409 .background-color-N7{background-color:#FFFFFF;} + .d2-1921642409 .background-color-B1{background-color:#0D32B2;} + .d2-1921642409 .background-color-B2{background-color:#0D32B2;} + .d2-1921642409 .background-color-B3{background-color:#E3E9FD;} + .d2-1921642409 .background-color-B4{background-color:#E3E9FD;} + .d2-1921642409 .background-color-B5{background-color:#EDF0FD;} + .d2-1921642409 .background-color-B6{background-color:#F7F8FE;} + .d2-1921642409 .background-color-AA2{background-color:#4A6FF3;} + .d2-1921642409 .background-color-AA4{background-color:#EDF0FD;} + .d2-1921642409 .background-color-AA5{background-color:#F7F8FE;} + .d2-1921642409 .background-color-AB4{background-color:#EDF0FD;} + .d2-1921642409 .background-color-AB5{background-color:#F7F8FE;} + .d2-1921642409 .color-N1{color:#0A0F25;} + .d2-1921642409 .color-N2{color:#676C7E;} + .d2-1921642409 .color-N3{color:#9499AB;} + .d2-1921642409 .color-N4{color:#CFD2DD;} + .d2-1921642409 .color-N5{color:#DEE1EB;} + .d2-1921642409 .color-N6{color:#EEF1F8;} + .d2-1921642409 .color-N7{color:#FFFFFF;} + .d2-1921642409 .color-B1{color:#0D32B2;} + .d2-1921642409 .color-B2{color:#0D32B2;} + .d2-1921642409 .color-B3{color:#E3E9FD;} + .d2-1921642409 .color-B4{color:#E3E9FD;} + .d2-1921642409 .color-B5{color:#EDF0FD;} + .d2-1921642409 .color-B6{color:#F7F8FE;} + .d2-1921642409 .color-AA2{color:#4A6FF3;} + .d2-1921642409 .color-AA4{color:#EDF0FD;} + .d2-1921642409 .color-AA5{color:#F7F8FE;} + .d2-1921642409 .color-AB4{color:#EDF0FD;} + .d2-1921642409 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1921642409);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1921642409);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1921642409);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1921642409);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1921642409);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1921642409);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1921642409);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1921642409);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1921642409);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1921642409);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1921642409);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1921642409);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1921642409);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1921642409);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1921642409);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1921642409);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1921642409);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1921642409);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>TSXNYSENASDAQ - - - + + + diff --git a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/scenarios/why.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/scenarios/why.exp.svg index 39fa16164..03bc974db 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/scenarios/why.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/scenarios/why.exp.svg @@ -1,9 +1,9 @@ -xy + .d2-355699599 .fill-N1{fill:#0A0F25;} + .d2-355699599 .fill-N2{fill:#676C7E;} + .d2-355699599 .fill-N3{fill:#9499AB;} + .d2-355699599 .fill-N4{fill:#CFD2DD;} + .d2-355699599 .fill-N5{fill:#DEE1EB;} + .d2-355699599 .fill-N6{fill:#EEF1F8;} + .d2-355699599 .fill-N7{fill:#FFFFFF;} + .d2-355699599 .fill-B1{fill:#0D32B2;} + .d2-355699599 .fill-B2{fill:#0D32B2;} + .d2-355699599 .fill-B3{fill:#E3E9FD;} + .d2-355699599 .fill-B4{fill:#E3E9FD;} + .d2-355699599 .fill-B5{fill:#EDF0FD;} + .d2-355699599 .fill-B6{fill:#F7F8FE;} + .d2-355699599 .fill-AA2{fill:#4A6FF3;} + .d2-355699599 .fill-AA4{fill:#EDF0FD;} + .d2-355699599 .fill-AA5{fill:#F7F8FE;} + .d2-355699599 .fill-AB4{fill:#EDF0FD;} + .d2-355699599 .fill-AB5{fill:#F7F8FE;} + .d2-355699599 .stroke-N1{stroke:#0A0F25;} + .d2-355699599 .stroke-N2{stroke:#676C7E;} + .d2-355699599 .stroke-N3{stroke:#9499AB;} + .d2-355699599 .stroke-N4{stroke:#CFD2DD;} + .d2-355699599 .stroke-N5{stroke:#DEE1EB;} + .d2-355699599 .stroke-N6{stroke:#EEF1F8;} + .d2-355699599 .stroke-N7{stroke:#FFFFFF;} + .d2-355699599 .stroke-B1{stroke:#0D32B2;} + .d2-355699599 .stroke-B2{stroke:#0D32B2;} + .d2-355699599 .stroke-B3{stroke:#E3E9FD;} + .d2-355699599 .stroke-B4{stroke:#E3E9FD;} + .d2-355699599 .stroke-B5{stroke:#EDF0FD;} + .d2-355699599 .stroke-B6{stroke:#F7F8FE;} + .d2-355699599 .stroke-AA2{stroke:#4A6FF3;} + .d2-355699599 .stroke-AA4{stroke:#EDF0FD;} + .d2-355699599 .stroke-AA5{stroke:#F7F8FE;} + .d2-355699599 .stroke-AB4{stroke:#EDF0FD;} + .d2-355699599 .stroke-AB5{stroke:#F7F8FE;} + .d2-355699599 .background-color-N1{background-color:#0A0F25;} + .d2-355699599 .background-color-N2{background-color:#676C7E;} + .d2-355699599 .background-color-N3{background-color:#9499AB;} + .d2-355699599 .background-color-N4{background-color:#CFD2DD;} + .d2-355699599 .background-color-N5{background-color:#DEE1EB;} + .d2-355699599 .background-color-N6{background-color:#EEF1F8;} + .d2-355699599 .background-color-N7{background-color:#FFFFFF;} + .d2-355699599 .background-color-B1{background-color:#0D32B2;} + .d2-355699599 .background-color-B2{background-color:#0D32B2;} + .d2-355699599 .background-color-B3{background-color:#E3E9FD;} + .d2-355699599 .background-color-B4{background-color:#E3E9FD;} + .d2-355699599 .background-color-B5{background-color:#EDF0FD;} + .d2-355699599 .background-color-B6{background-color:#F7F8FE;} + .d2-355699599 .background-color-AA2{background-color:#4A6FF3;} + .d2-355699599 .background-color-AA4{background-color:#EDF0FD;} + .d2-355699599 .background-color-AA5{background-color:#F7F8FE;} + .d2-355699599 .background-color-AB4{background-color:#EDF0FD;} + .d2-355699599 .background-color-AB5{background-color:#F7F8FE;} + .d2-355699599 .color-N1{color:#0A0F25;} + .d2-355699599 .color-N2{color:#676C7E;} + .d2-355699599 .color-N3{color:#9499AB;} + .d2-355699599 .color-N4{color:#CFD2DD;} + .d2-355699599 .color-N5{color:#DEE1EB;} + .d2-355699599 .color-N6{color:#EEF1F8;} + .d2-355699599 .color-N7{color:#FFFFFF;} + .d2-355699599 .color-B1{color:#0D32B2;} + .d2-355699599 .color-B2{color:#0D32B2;} + .d2-355699599 .color-B3{color:#E3E9FD;} + .d2-355699599 .color-B4{color:#E3E9FD;} + .d2-355699599 .color-B5{color:#EDF0FD;} + .d2-355699599 .color-B6{color:#F7F8FE;} + .d2-355699599 .color-AA2{color:#4A6FF3;} + .d2-355699599 .color-AA4{color:#EDF0FD;} + .d2-355699599 .color-AA5{color:#F7F8FE;} + .d2-355699599 .color-AB4{color:#EDF0FD;} + .d2-355699599 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-355699599);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-355699599);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-355699599);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-355699599);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-355699599);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-355699599);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-355699599);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-355699599);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-355699599);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-355699599);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-355699599);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-355699599);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-355699599);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-355699599);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-355699599);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-355699599);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-355699599);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-355699599);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xy - - + + diff --git a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/index.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/index.exp.svg index 3528d5f90..6430985da 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/index.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/index.exp.svg @@ -1,9 +1,9 @@ -xy + .d2-1272689853 .fill-N1{fill:#0A0F25;} + .d2-1272689853 .fill-N2{fill:#676C7E;} + .d2-1272689853 .fill-N3{fill:#9499AB;} + .d2-1272689853 .fill-N4{fill:#CFD2DD;} + .d2-1272689853 .fill-N5{fill:#DEE1EB;} + .d2-1272689853 .fill-N6{fill:#EEF1F8;} + .d2-1272689853 .fill-N7{fill:#FFFFFF;} + .d2-1272689853 .fill-B1{fill:#0D32B2;} + .d2-1272689853 .fill-B2{fill:#0D32B2;} + .d2-1272689853 .fill-B3{fill:#E3E9FD;} + .d2-1272689853 .fill-B4{fill:#E3E9FD;} + .d2-1272689853 .fill-B5{fill:#EDF0FD;} + .d2-1272689853 .fill-B6{fill:#F7F8FE;} + .d2-1272689853 .fill-AA2{fill:#4A6FF3;} + .d2-1272689853 .fill-AA4{fill:#EDF0FD;} + .d2-1272689853 .fill-AA5{fill:#F7F8FE;} + .d2-1272689853 .fill-AB4{fill:#EDF0FD;} + .d2-1272689853 .fill-AB5{fill:#F7F8FE;} + .d2-1272689853 .stroke-N1{stroke:#0A0F25;} + .d2-1272689853 .stroke-N2{stroke:#676C7E;} + .d2-1272689853 .stroke-N3{stroke:#9499AB;} + .d2-1272689853 .stroke-N4{stroke:#CFD2DD;} + .d2-1272689853 .stroke-N5{stroke:#DEE1EB;} + .d2-1272689853 .stroke-N6{stroke:#EEF1F8;} + .d2-1272689853 .stroke-N7{stroke:#FFFFFF;} + .d2-1272689853 .stroke-B1{stroke:#0D32B2;} + .d2-1272689853 .stroke-B2{stroke:#0D32B2;} + .d2-1272689853 .stroke-B3{stroke:#E3E9FD;} + .d2-1272689853 .stroke-B4{stroke:#E3E9FD;} + .d2-1272689853 .stroke-B5{stroke:#EDF0FD;} + .d2-1272689853 .stroke-B6{stroke:#F7F8FE;} + .d2-1272689853 .stroke-AA2{stroke:#4A6FF3;} + .d2-1272689853 .stroke-AA4{stroke:#EDF0FD;} + .d2-1272689853 .stroke-AA5{stroke:#F7F8FE;} + .d2-1272689853 .stroke-AB4{stroke:#EDF0FD;} + .d2-1272689853 .stroke-AB5{stroke:#F7F8FE;} + .d2-1272689853 .background-color-N1{background-color:#0A0F25;} + .d2-1272689853 .background-color-N2{background-color:#676C7E;} + .d2-1272689853 .background-color-N3{background-color:#9499AB;} + .d2-1272689853 .background-color-N4{background-color:#CFD2DD;} + .d2-1272689853 .background-color-N5{background-color:#DEE1EB;} + .d2-1272689853 .background-color-N6{background-color:#EEF1F8;} + .d2-1272689853 .background-color-N7{background-color:#FFFFFF;} + .d2-1272689853 .background-color-B1{background-color:#0D32B2;} + .d2-1272689853 .background-color-B2{background-color:#0D32B2;} + .d2-1272689853 .background-color-B3{background-color:#E3E9FD;} + .d2-1272689853 .background-color-B4{background-color:#E3E9FD;} + .d2-1272689853 .background-color-B5{background-color:#EDF0FD;} + .d2-1272689853 .background-color-B6{background-color:#F7F8FE;} + .d2-1272689853 .background-color-AA2{background-color:#4A6FF3;} + .d2-1272689853 .background-color-AA4{background-color:#EDF0FD;} + .d2-1272689853 .background-color-AA5{background-color:#F7F8FE;} + .d2-1272689853 .background-color-AB4{background-color:#EDF0FD;} + .d2-1272689853 .background-color-AB5{background-color:#F7F8FE;} + .d2-1272689853 .color-N1{color:#0A0F25;} + .d2-1272689853 .color-N2{color:#676C7E;} + .d2-1272689853 .color-N3{color:#9499AB;} + .d2-1272689853 .color-N4{color:#CFD2DD;} + .d2-1272689853 .color-N5{color:#DEE1EB;} + .d2-1272689853 .color-N6{color:#EEF1F8;} + .d2-1272689853 .color-N7{color:#FFFFFF;} + .d2-1272689853 .color-B1{color:#0D32B2;} + .d2-1272689853 .color-B2{color:#0D32B2;} + .d2-1272689853 .color-B3{color:#E3E9FD;} + .d2-1272689853 .color-B4{color:#E3E9FD;} + .d2-1272689853 .color-B5{color:#EDF0FD;} + .d2-1272689853 .color-B6{color:#F7F8FE;} + .d2-1272689853 .color-AA2{color:#4A6FF3;} + .d2-1272689853 .color-AA4{color:#EDF0FD;} + .d2-1272689853 .color-AA5{color:#F7F8FE;} + .d2-1272689853 .color-AB4{color:#EDF0FD;} + .d2-1272689853 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1272689853);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1272689853);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1272689853);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1272689853);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1272689853);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1272689853);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1272689853);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1272689853);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1272689853);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1272689853);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1272689853);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1272689853);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1272689853);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1272689853);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1272689853);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1272689853);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1272689853);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1272689853);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xy - - + + diff --git a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/layers/broker.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/layers/broker.exp.svg index 728b8edd2..8d9667675 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/layers/broker.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/layers/broker.exp.svg @@ -1,9 +1,9 @@ -mortgagerealtor + .d2-1616388686 .fill-N1{fill:#0A0F25;} + .d2-1616388686 .fill-N2{fill:#676C7E;} + .d2-1616388686 .fill-N3{fill:#9499AB;} + .d2-1616388686 .fill-N4{fill:#CFD2DD;} + .d2-1616388686 .fill-N5{fill:#DEE1EB;} + .d2-1616388686 .fill-N6{fill:#EEF1F8;} + .d2-1616388686 .fill-N7{fill:#FFFFFF;} + .d2-1616388686 .fill-B1{fill:#0D32B2;} + .d2-1616388686 .fill-B2{fill:#0D32B2;} + .d2-1616388686 .fill-B3{fill:#E3E9FD;} + .d2-1616388686 .fill-B4{fill:#E3E9FD;} + .d2-1616388686 .fill-B5{fill:#EDF0FD;} + .d2-1616388686 .fill-B6{fill:#F7F8FE;} + .d2-1616388686 .fill-AA2{fill:#4A6FF3;} + .d2-1616388686 .fill-AA4{fill:#EDF0FD;} + .d2-1616388686 .fill-AA5{fill:#F7F8FE;} + .d2-1616388686 .fill-AB4{fill:#EDF0FD;} + .d2-1616388686 .fill-AB5{fill:#F7F8FE;} + .d2-1616388686 .stroke-N1{stroke:#0A0F25;} + .d2-1616388686 .stroke-N2{stroke:#676C7E;} + .d2-1616388686 .stroke-N3{stroke:#9499AB;} + .d2-1616388686 .stroke-N4{stroke:#CFD2DD;} + .d2-1616388686 .stroke-N5{stroke:#DEE1EB;} + .d2-1616388686 .stroke-N6{stroke:#EEF1F8;} + .d2-1616388686 .stroke-N7{stroke:#FFFFFF;} + .d2-1616388686 .stroke-B1{stroke:#0D32B2;} + .d2-1616388686 .stroke-B2{stroke:#0D32B2;} + .d2-1616388686 .stroke-B3{stroke:#E3E9FD;} + .d2-1616388686 .stroke-B4{stroke:#E3E9FD;} + .d2-1616388686 .stroke-B5{stroke:#EDF0FD;} + .d2-1616388686 .stroke-B6{stroke:#F7F8FE;} + .d2-1616388686 .stroke-AA2{stroke:#4A6FF3;} + .d2-1616388686 .stroke-AA4{stroke:#EDF0FD;} + .d2-1616388686 .stroke-AA5{stroke:#F7F8FE;} + .d2-1616388686 .stroke-AB4{stroke:#EDF0FD;} + .d2-1616388686 .stroke-AB5{stroke:#F7F8FE;} + .d2-1616388686 .background-color-N1{background-color:#0A0F25;} + .d2-1616388686 .background-color-N2{background-color:#676C7E;} + .d2-1616388686 .background-color-N3{background-color:#9499AB;} + .d2-1616388686 .background-color-N4{background-color:#CFD2DD;} + .d2-1616388686 .background-color-N5{background-color:#DEE1EB;} + .d2-1616388686 .background-color-N6{background-color:#EEF1F8;} + .d2-1616388686 .background-color-N7{background-color:#FFFFFF;} + .d2-1616388686 .background-color-B1{background-color:#0D32B2;} + .d2-1616388686 .background-color-B2{background-color:#0D32B2;} + .d2-1616388686 .background-color-B3{background-color:#E3E9FD;} + .d2-1616388686 .background-color-B4{background-color:#E3E9FD;} + .d2-1616388686 .background-color-B5{background-color:#EDF0FD;} + .d2-1616388686 .background-color-B6{background-color:#F7F8FE;} + .d2-1616388686 .background-color-AA2{background-color:#4A6FF3;} + .d2-1616388686 .background-color-AA4{background-color:#EDF0FD;} + .d2-1616388686 .background-color-AA5{background-color:#F7F8FE;} + .d2-1616388686 .background-color-AB4{background-color:#EDF0FD;} + .d2-1616388686 .background-color-AB5{background-color:#F7F8FE;} + .d2-1616388686 .color-N1{color:#0A0F25;} + .d2-1616388686 .color-N2{color:#676C7E;} + .d2-1616388686 .color-N3{color:#9499AB;} + .d2-1616388686 .color-N4{color:#CFD2DD;} + .d2-1616388686 .color-N5{color:#DEE1EB;} + .d2-1616388686 .color-N6{color:#EEF1F8;} + .d2-1616388686 .color-N7{color:#FFFFFF;} + .d2-1616388686 .color-B1{color:#0D32B2;} + .d2-1616388686 .color-B2{color:#0D32B2;} + .d2-1616388686 .color-B3{color:#E3E9FD;} + .d2-1616388686 .color-B4{color:#E3E9FD;} + .d2-1616388686 .color-B5{color:#EDF0FD;} + .d2-1616388686 .color-B6{color:#F7F8FE;} + .d2-1616388686 .color-AA2{color:#4A6FF3;} + .d2-1616388686 .color-AA4{color:#EDF0FD;} + .d2-1616388686 .color-AA5{color:#F7F8FE;} + .d2-1616388686 .color-AB4{color:#EDF0FD;} + .d2-1616388686 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1616388686);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1616388686);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1616388686);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1616388686);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1616388686);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1616388686);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1616388686);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1616388686);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1616388686);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1616388686);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1616388686);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1616388686);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1616388686);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1616388686);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1616388686);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1616388686);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1616388686);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1616388686);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>mortgagerealtor - - + + diff --git a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/layers/core.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/layers/core.exp.svg index 59ffd5ef1..39d233ba5 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/layers/core.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/layers/core.exp.svg @@ -1,9 +1,9 @@ -belieffooddiet + .d2-1610246682 .fill-N1{fill:#0A0F25;} + .d2-1610246682 .fill-N2{fill:#676C7E;} + .d2-1610246682 .fill-N3{fill:#9499AB;} + .d2-1610246682 .fill-N4{fill:#CFD2DD;} + .d2-1610246682 .fill-N5{fill:#DEE1EB;} + .d2-1610246682 .fill-N6{fill:#EEF1F8;} + .d2-1610246682 .fill-N7{fill:#FFFFFF;} + .d2-1610246682 .fill-B1{fill:#0D32B2;} + .d2-1610246682 .fill-B2{fill:#0D32B2;} + .d2-1610246682 .fill-B3{fill:#E3E9FD;} + .d2-1610246682 .fill-B4{fill:#E3E9FD;} + .d2-1610246682 .fill-B5{fill:#EDF0FD;} + .d2-1610246682 .fill-B6{fill:#F7F8FE;} + .d2-1610246682 .fill-AA2{fill:#4A6FF3;} + .d2-1610246682 .fill-AA4{fill:#EDF0FD;} + .d2-1610246682 .fill-AA5{fill:#F7F8FE;} + .d2-1610246682 .fill-AB4{fill:#EDF0FD;} + .d2-1610246682 .fill-AB5{fill:#F7F8FE;} + .d2-1610246682 .stroke-N1{stroke:#0A0F25;} + .d2-1610246682 .stroke-N2{stroke:#676C7E;} + .d2-1610246682 .stroke-N3{stroke:#9499AB;} + .d2-1610246682 .stroke-N4{stroke:#CFD2DD;} + .d2-1610246682 .stroke-N5{stroke:#DEE1EB;} + .d2-1610246682 .stroke-N6{stroke:#EEF1F8;} + .d2-1610246682 .stroke-N7{stroke:#FFFFFF;} + .d2-1610246682 .stroke-B1{stroke:#0D32B2;} + .d2-1610246682 .stroke-B2{stroke:#0D32B2;} + .d2-1610246682 .stroke-B3{stroke:#E3E9FD;} + .d2-1610246682 .stroke-B4{stroke:#E3E9FD;} + .d2-1610246682 .stroke-B5{stroke:#EDF0FD;} + .d2-1610246682 .stroke-B6{stroke:#F7F8FE;} + .d2-1610246682 .stroke-AA2{stroke:#4A6FF3;} + .d2-1610246682 .stroke-AA4{stroke:#EDF0FD;} + .d2-1610246682 .stroke-AA5{stroke:#F7F8FE;} + .d2-1610246682 .stroke-AB4{stroke:#EDF0FD;} + .d2-1610246682 .stroke-AB5{stroke:#F7F8FE;} + .d2-1610246682 .background-color-N1{background-color:#0A0F25;} + .d2-1610246682 .background-color-N2{background-color:#676C7E;} + .d2-1610246682 .background-color-N3{background-color:#9499AB;} + .d2-1610246682 .background-color-N4{background-color:#CFD2DD;} + .d2-1610246682 .background-color-N5{background-color:#DEE1EB;} + .d2-1610246682 .background-color-N6{background-color:#EEF1F8;} + .d2-1610246682 .background-color-N7{background-color:#FFFFFF;} + .d2-1610246682 .background-color-B1{background-color:#0D32B2;} + .d2-1610246682 .background-color-B2{background-color:#0D32B2;} + .d2-1610246682 .background-color-B3{background-color:#E3E9FD;} + .d2-1610246682 .background-color-B4{background-color:#E3E9FD;} + .d2-1610246682 .background-color-B5{background-color:#EDF0FD;} + .d2-1610246682 .background-color-B6{background-color:#F7F8FE;} + .d2-1610246682 .background-color-AA2{background-color:#4A6FF3;} + .d2-1610246682 .background-color-AA4{background-color:#EDF0FD;} + .d2-1610246682 .background-color-AA5{background-color:#F7F8FE;} + .d2-1610246682 .background-color-AB4{background-color:#EDF0FD;} + .d2-1610246682 .background-color-AB5{background-color:#F7F8FE;} + .d2-1610246682 .color-N1{color:#0A0F25;} + .d2-1610246682 .color-N2{color:#676C7E;} + .d2-1610246682 .color-N3{color:#9499AB;} + .d2-1610246682 .color-N4{color:#CFD2DD;} + .d2-1610246682 .color-N5{color:#DEE1EB;} + .d2-1610246682 .color-N6{color:#EEF1F8;} + .d2-1610246682 .color-N7{color:#FFFFFF;} + .d2-1610246682 .color-B1{color:#0D32B2;} + .d2-1610246682 .color-B2{color:#0D32B2;} + .d2-1610246682 .color-B3{color:#E3E9FD;} + .d2-1610246682 .color-B4{color:#E3E9FD;} + .d2-1610246682 .color-B5{color:#EDF0FD;} + .d2-1610246682 .color-B6{color:#F7F8FE;} + .d2-1610246682 .color-AA2{color:#4A6FF3;} + .d2-1610246682 .color-AA4{color:#EDF0FD;} + .d2-1610246682 .color-AA5{color:#F7F8FE;} + .d2-1610246682 .color-AB4{color:#EDF0FD;} + .d2-1610246682 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1610246682);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1610246682);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1610246682);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1610246682);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1610246682);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1610246682);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1610246682);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1610246682);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1610246682);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1610246682);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1610246682);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1610246682);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1610246682);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1610246682);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1610246682);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1610246682);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1610246682);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1610246682);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>belieffooddiet - - - + + + diff --git a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/layers/stocks.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/layers/stocks.exp.svg index 2899556a0..e4a707b49 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/layers/stocks.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/layers/stocks.exp.svg @@ -1,9 +1,9 @@ -TSXNYSENASDAQ + .d2-1921642409 .fill-N1{fill:#0A0F25;} + .d2-1921642409 .fill-N2{fill:#676C7E;} + .d2-1921642409 .fill-N3{fill:#9499AB;} + .d2-1921642409 .fill-N4{fill:#CFD2DD;} + .d2-1921642409 .fill-N5{fill:#DEE1EB;} + .d2-1921642409 .fill-N6{fill:#EEF1F8;} + .d2-1921642409 .fill-N7{fill:#FFFFFF;} + .d2-1921642409 .fill-B1{fill:#0D32B2;} + .d2-1921642409 .fill-B2{fill:#0D32B2;} + .d2-1921642409 .fill-B3{fill:#E3E9FD;} + .d2-1921642409 .fill-B4{fill:#E3E9FD;} + .d2-1921642409 .fill-B5{fill:#EDF0FD;} + .d2-1921642409 .fill-B6{fill:#F7F8FE;} + .d2-1921642409 .fill-AA2{fill:#4A6FF3;} + .d2-1921642409 .fill-AA4{fill:#EDF0FD;} + .d2-1921642409 .fill-AA5{fill:#F7F8FE;} + .d2-1921642409 .fill-AB4{fill:#EDF0FD;} + .d2-1921642409 .fill-AB5{fill:#F7F8FE;} + .d2-1921642409 .stroke-N1{stroke:#0A0F25;} + .d2-1921642409 .stroke-N2{stroke:#676C7E;} + .d2-1921642409 .stroke-N3{stroke:#9499AB;} + .d2-1921642409 .stroke-N4{stroke:#CFD2DD;} + .d2-1921642409 .stroke-N5{stroke:#DEE1EB;} + .d2-1921642409 .stroke-N6{stroke:#EEF1F8;} + .d2-1921642409 .stroke-N7{stroke:#FFFFFF;} + .d2-1921642409 .stroke-B1{stroke:#0D32B2;} + .d2-1921642409 .stroke-B2{stroke:#0D32B2;} + .d2-1921642409 .stroke-B3{stroke:#E3E9FD;} + .d2-1921642409 .stroke-B4{stroke:#E3E9FD;} + .d2-1921642409 .stroke-B5{stroke:#EDF0FD;} + .d2-1921642409 .stroke-B6{stroke:#F7F8FE;} + .d2-1921642409 .stroke-AA2{stroke:#4A6FF3;} + .d2-1921642409 .stroke-AA4{stroke:#EDF0FD;} + .d2-1921642409 .stroke-AA5{stroke:#F7F8FE;} + .d2-1921642409 .stroke-AB4{stroke:#EDF0FD;} + .d2-1921642409 .stroke-AB5{stroke:#F7F8FE;} + .d2-1921642409 .background-color-N1{background-color:#0A0F25;} + .d2-1921642409 .background-color-N2{background-color:#676C7E;} + .d2-1921642409 .background-color-N3{background-color:#9499AB;} + .d2-1921642409 .background-color-N4{background-color:#CFD2DD;} + .d2-1921642409 .background-color-N5{background-color:#DEE1EB;} + .d2-1921642409 .background-color-N6{background-color:#EEF1F8;} + .d2-1921642409 .background-color-N7{background-color:#FFFFFF;} + .d2-1921642409 .background-color-B1{background-color:#0D32B2;} + .d2-1921642409 .background-color-B2{background-color:#0D32B2;} + .d2-1921642409 .background-color-B3{background-color:#E3E9FD;} + .d2-1921642409 .background-color-B4{background-color:#E3E9FD;} + .d2-1921642409 .background-color-B5{background-color:#EDF0FD;} + .d2-1921642409 .background-color-B6{background-color:#F7F8FE;} + .d2-1921642409 .background-color-AA2{background-color:#4A6FF3;} + .d2-1921642409 .background-color-AA4{background-color:#EDF0FD;} + .d2-1921642409 .background-color-AA5{background-color:#F7F8FE;} + .d2-1921642409 .background-color-AB4{background-color:#EDF0FD;} + .d2-1921642409 .background-color-AB5{background-color:#F7F8FE;} + .d2-1921642409 .color-N1{color:#0A0F25;} + .d2-1921642409 .color-N2{color:#676C7E;} + .d2-1921642409 .color-N3{color:#9499AB;} + .d2-1921642409 .color-N4{color:#CFD2DD;} + .d2-1921642409 .color-N5{color:#DEE1EB;} + .d2-1921642409 .color-N6{color:#EEF1F8;} + .d2-1921642409 .color-N7{color:#FFFFFF;} + .d2-1921642409 .color-B1{color:#0D32B2;} + .d2-1921642409 .color-B2{color:#0D32B2;} + .d2-1921642409 .color-B3{color:#E3E9FD;} + .d2-1921642409 .color-B4{color:#E3E9FD;} + .d2-1921642409 .color-B5{color:#EDF0FD;} + .d2-1921642409 .color-B6{color:#F7F8FE;} + .d2-1921642409 .color-AA2{color:#4A6FF3;} + .d2-1921642409 .color-AA4{color:#EDF0FD;} + .d2-1921642409 .color-AA5{color:#F7F8FE;} + .d2-1921642409 .color-AB4{color:#EDF0FD;} + .d2-1921642409 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1921642409);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1921642409);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1921642409);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1921642409);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1921642409);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1921642409);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1921642409);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1921642409);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1921642409);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1921642409);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1921642409);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1921642409);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1921642409);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1921642409);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1921642409);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1921642409);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1921642409);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1921642409);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>TSXNYSENASDAQ - - - + + + diff --git a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/scenarios/why.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/scenarios/why.exp.svg index 39fa16164..03bc974db 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/scenarios/why.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/scenarios/why.exp.svg @@ -1,9 +1,9 @@ -xy + .d2-355699599 .fill-N1{fill:#0A0F25;} + .d2-355699599 .fill-N2{fill:#676C7E;} + .d2-355699599 .fill-N3{fill:#9499AB;} + .d2-355699599 .fill-N4{fill:#CFD2DD;} + .d2-355699599 .fill-N5{fill:#DEE1EB;} + .d2-355699599 .fill-N6{fill:#EEF1F8;} + .d2-355699599 .fill-N7{fill:#FFFFFF;} + .d2-355699599 .fill-B1{fill:#0D32B2;} + .d2-355699599 .fill-B2{fill:#0D32B2;} + .d2-355699599 .fill-B3{fill:#E3E9FD;} + .d2-355699599 .fill-B4{fill:#E3E9FD;} + .d2-355699599 .fill-B5{fill:#EDF0FD;} + .d2-355699599 .fill-B6{fill:#F7F8FE;} + .d2-355699599 .fill-AA2{fill:#4A6FF3;} + .d2-355699599 .fill-AA4{fill:#EDF0FD;} + .d2-355699599 .fill-AA5{fill:#F7F8FE;} + .d2-355699599 .fill-AB4{fill:#EDF0FD;} + .d2-355699599 .fill-AB5{fill:#F7F8FE;} + .d2-355699599 .stroke-N1{stroke:#0A0F25;} + .d2-355699599 .stroke-N2{stroke:#676C7E;} + .d2-355699599 .stroke-N3{stroke:#9499AB;} + .d2-355699599 .stroke-N4{stroke:#CFD2DD;} + .d2-355699599 .stroke-N5{stroke:#DEE1EB;} + .d2-355699599 .stroke-N6{stroke:#EEF1F8;} + .d2-355699599 .stroke-N7{stroke:#FFFFFF;} + .d2-355699599 .stroke-B1{stroke:#0D32B2;} + .d2-355699599 .stroke-B2{stroke:#0D32B2;} + .d2-355699599 .stroke-B3{stroke:#E3E9FD;} + .d2-355699599 .stroke-B4{stroke:#E3E9FD;} + .d2-355699599 .stroke-B5{stroke:#EDF0FD;} + .d2-355699599 .stroke-B6{stroke:#F7F8FE;} + .d2-355699599 .stroke-AA2{stroke:#4A6FF3;} + .d2-355699599 .stroke-AA4{stroke:#EDF0FD;} + .d2-355699599 .stroke-AA5{stroke:#F7F8FE;} + .d2-355699599 .stroke-AB4{stroke:#EDF0FD;} + .d2-355699599 .stroke-AB5{stroke:#F7F8FE;} + .d2-355699599 .background-color-N1{background-color:#0A0F25;} + .d2-355699599 .background-color-N2{background-color:#676C7E;} + .d2-355699599 .background-color-N3{background-color:#9499AB;} + .d2-355699599 .background-color-N4{background-color:#CFD2DD;} + .d2-355699599 .background-color-N5{background-color:#DEE1EB;} + .d2-355699599 .background-color-N6{background-color:#EEF1F8;} + .d2-355699599 .background-color-N7{background-color:#FFFFFF;} + .d2-355699599 .background-color-B1{background-color:#0D32B2;} + .d2-355699599 .background-color-B2{background-color:#0D32B2;} + .d2-355699599 .background-color-B3{background-color:#E3E9FD;} + .d2-355699599 .background-color-B4{background-color:#E3E9FD;} + .d2-355699599 .background-color-B5{background-color:#EDF0FD;} + .d2-355699599 .background-color-B6{background-color:#F7F8FE;} + .d2-355699599 .background-color-AA2{background-color:#4A6FF3;} + .d2-355699599 .background-color-AA4{background-color:#EDF0FD;} + .d2-355699599 .background-color-AA5{background-color:#F7F8FE;} + .d2-355699599 .background-color-AB4{background-color:#EDF0FD;} + .d2-355699599 .background-color-AB5{background-color:#F7F8FE;} + .d2-355699599 .color-N1{color:#0A0F25;} + .d2-355699599 .color-N2{color:#676C7E;} + .d2-355699599 .color-N3{color:#9499AB;} + .d2-355699599 .color-N4{color:#CFD2DD;} + .d2-355699599 .color-N5{color:#DEE1EB;} + .d2-355699599 .color-N6{color:#EEF1F8;} + .d2-355699599 .color-N7{color:#FFFFFF;} + .d2-355699599 .color-B1{color:#0D32B2;} + .d2-355699599 .color-B2{color:#0D32B2;} + .d2-355699599 .color-B3{color:#E3E9FD;} + .d2-355699599 .color-B4{color:#E3E9FD;} + .d2-355699599 .color-B5{color:#EDF0FD;} + .d2-355699599 .color-B6{color:#F7F8FE;} + .d2-355699599 .color-AA2{color:#4A6FF3;} + .d2-355699599 .color-AA4{color:#EDF0FD;} + .d2-355699599 .color-AA5{color:#F7F8FE;} + .d2-355699599 .color-AB4{color:#EDF0FD;} + .d2-355699599 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-355699599);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-355699599);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-355699599);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-355699599);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-355699599);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-355699599);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-355699599);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-355699599);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-355699599);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-355699599);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-355699599);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-355699599);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-355699599);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-355699599);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-355699599);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-355699599);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-355699599);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-355699599);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xy - - + + diff --git a/e2etests-cli/testdata/TestCLI_E2E/no-nav-pdf.exp.pdf b/e2etests-cli/testdata/TestCLI_E2E/no-nav-pdf.exp.pdf index 73d6e3754..75f717b6b 100644 Binary files a/e2etests-cli/testdata/TestCLI_E2E/no-nav-pdf.exp.pdf and b/e2etests-cli/testdata/TestCLI_E2E/no-nav-pdf.exp.pdf differ diff --git a/e2etests-cli/testdata/TestCLI_E2E/no-nav-pptx.exp.pptx b/e2etests-cli/testdata/TestCLI_E2E/no-nav-pptx.exp.pptx index cf1579ac5..0590d887f 100644 Binary files a/e2etests-cli/testdata/TestCLI_E2E/no-nav-pptx.exp.pptx and b/e2etests-cli/testdata/TestCLI_E2E/no-nav-pptx.exp.pptx differ diff --git a/e2etests-cli/testdata/TestCLI_E2E/pptx-theme-overrides.exp.pptx b/e2etests-cli/testdata/TestCLI_E2E/pptx-theme-overrides.exp.pptx index c84134004..89b123f56 100644 Binary files a/e2etests-cli/testdata/TestCLI_E2E/pptx-theme-overrides.exp.pptx and b/e2etests-cli/testdata/TestCLI_E2E/pptx-theme-overrides.exp.pptx differ diff --git a/e2etests-cli/testdata/TestCLI_E2E/renamed-board.exp.pdf b/e2etests-cli/testdata/TestCLI_E2E/renamed-board.exp.pdf index 581e72d2a..c4a82ab99 100644 Binary files a/e2etests-cli/testdata/TestCLI_E2E/renamed-board.exp.pdf and b/e2etests-cli/testdata/TestCLI_E2E/renamed-board.exp.pdf differ diff --git a/e2etests-cli/testdata/TestCLI_E2E/sequence-layer/index.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/sequence-layer/index.exp.svg index 19307f5c7..3fe452192 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/sequence-layer/index.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/sequence-layer/index.exp.svg @@ -1,9 +1,9 @@ -k + .d2-4030577362 .fill-N1{fill:#0A0F25;} + .d2-4030577362 .fill-N2{fill:#676C7E;} + .d2-4030577362 .fill-N3{fill:#9499AB;} + .d2-4030577362 .fill-N4{fill:#CFD2DD;} + .d2-4030577362 .fill-N5{fill:#DEE1EB;} + .d2-4030577362 .fill-N6{fill:#EEF1F8;} + .d2-4030577362 .fill-N7{fill:#FFFFFF;} + .d2-4030577362 .fill-B1{fill:#0D32B2;} + .d2-4030577362 .fill-B2{fill:#0D32B2;} + .d2-4030577362 .fill-B3{fill:#E3E9FD;} + .d2-4030577362 .fill-B4{fill:#E3E9FD;} + .d2-4030577362 .fill-B5{fill:#EDF0FD;} + .d2-4030577362 .fill-B6{fill:#F7F8FE;} + .d2-4030577362 .fill-AA2{fill:#4A6FF3;} + .d2-4030577362 .fill-AA4{fill:#EDF0FD;} + .d2-4030577362 .fill-AA5{fill:#F7F8FE;} + .d2-4030577362 .fill-AB4{fill:#EDF0FD;} + .d2-4030577362 .fill-AB5{fill:#F7F8FE;} + .d2-4030577362 .stroke-N1{stroke:#0A0F25;} + .d2-4030577362 .stroke-N2{stroke:#676C7E;} + .d2-4030577362 .stroke-N3{stroke:#9499AB;} + .d2-4030577362 .stroke-N4{stroke:#CFD2DD;} + .d2-4030577362 .stroke-N5{stroke:#DEE1EB;} + .d2-4030577362 .stroke-N6{stroke:#EEF1F8;} + .d2-4030577362 .stroke-N7{stroke:#FFFFFF;} + .d2-4030577362 .stroke-B1{stroke:#0D32B2;} + .d2-4030577362 .stroke-B2{stroke:#0D32B2;} + .d2-4030577362 .stroke-B3{stroke:#E3E9FD;} + .d2-4030577362 .stroke-B4{stroke:#E3E9FD;} + .d2-4030577362 .stroke-B5{stroke:#EDF0FD;} + .d2-4030577362 .stroke-B6{stroke:#F7F8FE;} + .d2-4030577362 .stroke-AA2{stroke:#4A6FF3;} + .d2-4030577362 .stroke-AA4{stroke:#EDF0FD;} + .d2-4030577362 .stroke-AA5{stroke:#F7F8FE;} + .d2-4030577362 .stroke-AB4{stroke:#EDF0FD;} + .d2-4030577362 .stroke-AB5{stroke:#F7F8FE;} + .d2-4030577362 .background-color-N1{background-color:#0A0F25;} + .d2-4030577362 .background-color-N2{background-color:#676C7E;} + .d2-4030577362 .background-color-N3{background-color:#9499AB;} + .d2-4030577362 .background-color-N4{background-color:#CFD2DD;} + .d2-4030577362 .background-color-N5{background-color:#DEE1EB;} + .d2-4030577362 .background-color-N6{background-color:#EEF1F8;} + .d2-4030577362 .background-color-N7{background-color:#FFFFFF;} + .d2-4030577362 .background-color-B1{background-color:#0D32B2;} + .d2-4030577362 .background-color-B2{background-color:#0D32B2;} + .d2-4030577362 .background-color-B3{background-color:#E3E9FD;} + .d2-4030577362 .background-color-B4{background-color:#E3E9FD;} + .d2-4030577362 .background-color-B5{background-color:#EDF0FD;} + .d2-4030577362 .background-color-B6{background-color:#F7F8FE;} + .d2-4030577362 .background-color-AA2{background-color:#4A6FF3;} + .d2-4030577362 .background-color-AA4{background-color:#EDF0FD;} + .d2-4030577362 .background-color-AA5{background-color:#F7F8FE;} + .d2-4030577362 .background-color-AB4{background-color:#EDF0FD;} + .d2-4030577362 .background-color-AB5{background-color:#F7F8FE;} + .d2-4030577362 .color-N1{color:#0A0F25;} + .d2-4030577362 .color-N2{color:#676C7E;} + .d2-4030577362 .color-N3{color:#9499AB;} + .d2-4030577362 .color-N4{color:#CFD2DD;} + .d2-4030577362 .color-N5{color:#DEE1EB;} + .d2-4030577362 .color-N6{color:#EEF1F8;} + .d2-4030577362 .color-N7{color:#FFFFFF;} + .d2-4030577362 .color-B1{color:#0D32B2;} + .d2-4030577362 .color-B2{color:#0D32B2;} + .d2-4030577362 .color-B3{color:#E3E9FD;} + .d2-4030577362 .color-B4{color:#E3E9FD;} + .d2-4030577362 .color-B5{color:#EDF0FD;} + .d2-4030577362 .color-B6{color:#F7F8FE;} + .d2-4030577362 .color-AA2{color:#4A6FF3;} + .d2-4030577362 .color-AA4{color:#EDF0FD;} + .d2-4030577362 .color-AA5{color:#F7F8FE;} + .d2-4030577362 .color-AB4{color:#EDF0FD;} + .d2-4030577362 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4030577362);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4030577362);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4030577362);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4030577362);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4030577362);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4030577362);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4030577362);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4030577362);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4030577362);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4030577362);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4030577362);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4030577362);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4030577362);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4030577362);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4030577362);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4030577362);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4030577362);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4030577362);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>k - + diff --git a/e2etests-cli/testdata/TestCLI_E2E/sequence-layer/seq.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/sequence-layer/seq.exp.svg index b60043bac..363704877 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/sequence-layer/seq.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/sequence-layer/seq.exp.svg @@ -1,16 +1,16 @@ -megithub.com/terrastruct/d2if i'm rightif i'm wrong fixnah, intended issue about a bugsome note about the bug + .d2-887788274 .fill-N1{fill:#0A0F25;} + .d2-887788274 .fill-N2{fill:#676C7E;} + .d2-887788274 .fill-N3{fill:#9499AB;} + .d2-887788274 .fill-N4{fill:#CFD2DD;} + .d2-887788274 .fill-N5{fill:#DEE1EB;} + .d2-887788274 .fill-N6{fill:#EEF1F8;} + .d2-887788274 .fill-N7{fill:#FFFFFF;} + .d2-887788274 .fill-B1{fill:#0D32B2;} + .d2-887788274 .fill-B2{fill:#0D32B2;} + .d2-887788274 .fill-B3{fill:#E3E9FD;} + .d2-887788274 .fill-B4{fill:#E3E9FD;} + .d2-887788274 .fill-B5{fill:#EDF0FD;} + .d2-887788274 .fill-B6{fill:#F7F8FE;} + .d2-887788274 .fill-AA2{fill:#4A6FF3;} + .d2-887788274 .fill-AA4{fill:#EDF0FD;} + .d2-887788274 .fill-AA5{fill:#F7F8FE;} + .d2-887788274 .fill-AB4{fill:#EDF0FD;} + .d2-887788274 .fill-AB5{fill:#F7F8FE;} + .d2-887788274 .stroke-N1{stroke:#0A0F25;} + .d2-887788274 .stroke-N2{stroke:#676C7E;} + .d2-887788274 .stroke-N3{stroke:#9499AB;} + .d2-887788274 .stroke-N4{stroke:#CFD2DD;} + .d2-887788274 .stroke-N5{stroke:#DEE1EB;} + .d2-887788274 .stroke-N6{stroke:#EEF1F8;} + .d2-887788274 .stroke-N7{stroke:#FFFFFF;} + .d2-887788274 .stroke-B1{stroke:#0D32B2;} + .d2-887788274 .stroke-B2{stroke:#0D32B2;} + .d2-887788274 .stroke-B3{stroke:#E3E9FD;} + .d2-887788274 .stroke-B4{stroke:#E3E9FD;} + .d2-887788274 .stroke-B5{stroke:#EDF0FD;} + .d2-887788274 .stroke-B6{stroke:#F7F8FE;} + .d2-887788274 .stroke-AA2{stroke:#4A6FF3;} + .d2-887788274 .stroke-AA4{stroke:#EDF0FD;} + .d2-887788274 .stroke-AA5{stroke:#F7F8FE;} + .d2-887788274 .stroke-AB4{stroke:#EDF0FD;} + .d2-887788274 .stroke-AB5{stroke:#F7F8FE;} + .d2-887788274 .background-color-N1{background-color:#0A0F25;} + .d2-887788274 .background-color-N2{background-color:#676C7E;} + .d2-887788274 .background-color-N3{background-color:#9499AB;} + .d2-887788274 .background-color-N4{background-color:#CFD2DD;} + .d2-887788274 .background-color-N5{background-color:#DEE1EB;} + .d2-887788274 .background-color-N6{background-color:#EEF1F8;} + .d2-887788274 .background-color-N7{background-color:#FFFFFF;} + .d2-887788274 .background-color-B1{background-color:#0D32B2;} + .d2-887788274 .background-color-B2{background-color:#0D32B2;} + .d2-887788274 .background-color-B3{background-color:#E3E9FD;} + .d2-887788274 .background-color-B4{background-color:#E3E9FD;} + .d2-887788274 .background-color-B5{background-color:#EDF0FD;} + .d2-887788274 .background-color-B6{background-color:#F7F8FE;} + .d2-887788274 .background-color-AA2{background-color:#4A6FF3;} + .d2-887788274 .background-color-AA4{background-color:#EDF0FD;} + .d2-887788274 .background-color-AA5{background-color:#F7F8FE;} + .d2-887788274 .background-color-AB4{background-color:#EDF0FD;} + .d2-887788274 .background-color-AB5{background-color:#F7F8FE;} + .d2-887788274 .color-N1{color:#0A0F25;} + .d2-887788274 .color-N2{color:#676C7E;} + .d2-887788274 .color-N3{color:#9499AB;} + .d2-887788274 .color-N4{color:#CFD2DD;} + .d2-887788274 .color-N5{color:#DEE1EB;} + .d2-887788274 .color-N6{color:#EEF1F8;} + .d2-887788274 .color-N7{color:#FFFFFF;} + .d2-887788274 .color-B1{color:#0D32B2;} + .d2-887788274 .color-B2{color:#0D32B2;} + .d2-887788274 .color-B3{color:#E3E9FD;} + .d2-887788274 .color-B4{color:#E3E9FD;} + .d2-887788274 .color-B5{color:#EDF0FD;} + .d2-887788274 .color-B6{color:#F7F8FE;} + .d2-887788274 .color-AA2{color:#4A6FF3;} + .d2-887788274 .color-AA4{color:#EDF0FD;} + .d2-887788274 .color-AA5{color:#F7F8FE;} + .d2-887788274 .color-AB4{color:#EDF0FD;} + .d2-887788274 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-887788274);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-887788274);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-887788274);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-887788274);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-887788274);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-887788274);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-887788274);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-887788274);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-887788274);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-887788274);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-887788274);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-887788274);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-887788274);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-887788274);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-887788274);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-887788274);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-887788274);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-887788274);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>megithub.com/terrastruct/d2if i'm rightif i'm wrong fixnah, intended issue about a bugsome note about the bug - - - - - - - - + + + + + + + + diff --git a/e2etests-cli/testdata/TestCLI_E2E/sequence-spread-layer/index.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/sequence-spread-layer/index.exp.svg index 19307f5c7..3fe452192 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/sequence-spread-layer/index.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/sequence-spread-layer/index.exp.svg @@ -1,9 +1,9 @@ -k + .d2-4030577362 .fill-N1{fill:#0A0F25;} + .d2-4030577362 .fill-N2{fill:#676C7E;} + .d2-4030577362 .fill-N3{fill:#9499AB;} + .d2-4030577362 .fill-N4{fill:#CFD2DD;} + .d2-4030577362 .fill-N5{fill:#DEE1EB;} + .d2-4030577362 .fill-N6{fill:#EEF1F8;} + .d2-4030577362 .fill-N7{fill:#FFFFFF;} + .d2-4030577362 .fill-B1{fill:#0D32B2;} + .d2-4030577362 .fill-B2{fill:#0D32B2;} + .d2-4030577362 .fill-B3{fill:#E3E9FD;} + .d2-4030577362 .fill-B4{fill:#E3E9FD;} + .d2-4030577362 .fill-B5{fill:#EDF0FD;} + .d2-4030577362 .fill-B6{fill:#F7F8FE;} + .d2-4030577362 .fill-AA2{fill:#4A6FF3;} + .d2-4030577362 .fill-AA4{fill:#EDF0FD;} + .d2-4030577362 .fill-AA5{fill:#F7F8FE;} + .d2-4030577362 .fill-AB4{fill:#EDF0FD;} + .d2-4030577362 .fill-AB5{fill:#F7F8FE;} + .d2-4030577362 .stroke-N1{stroke:#0A0F25;} + .d2-4030577362 .stroke-N2{stroke:#676C7E;} + .d2-4030577362 .stroke-N3{stroke:#9499AB;} + .d2-4030577362 .stroke-N4{stroke:#CFD2DD;} + .d2-4030577362 .stroke-N5{stroke:#DEE1EB;} + .d2-4030577362 .stroke-N6{stroke:#EEF1F8;} + .d2-4030577362 .stroke-N7{stroke:#FFFFFF;} + .d2-4030577362 .stroke-B1{stroke:#0D32B2;} + .d2-4030577362 .stroke-B2{stroke:#0D32B2;} + .d2-4030577362 .stroke-B3{stroke:#E3E9FD;} + .d2-4030577362 .stroke-B4{stroke:#E3E9FD;} + .d2-4030577362 .stroke-B5{stroke:#EDF0FD;} + .d2-4030577362 .stroke-B6{stroke:#F7F8FE;} + .d2-4030577362 .stroke-AA2{stroke:#4A6FF3;} + .d2-4030577362 .stroke-AA4{stroke:#EDF0FD;} + .d2-4030577362 .stroke-AA5{stroke:#F7F8FE;} + .d2-4030577362 .stroke-AB4{stroke:#EDF0FD;} + .d2-4030577362 .stroke-AB5{stroke:#F7F8FE;} + .d2-4030577362 .background-color-N1{background-color:#0A0F25;} + .d2-4030577362 .background-color-N2{background-color:#676C7E;} + .d2-4030577362 .background-color-N3{background-color:#9499AB;} + .d2-4030577362 .background-color-N4{background-color:#CFD2DD;} + .d2-4030577362 .background-color-N5{background-color:#DEE1EB;} + .d2-4030577362 .background-color-N6{background-color:#EEF1F8;} + .d2-4030577362 .background-color-N7{background-color:#FFFFFF;} + .d2-4030577362 .background-color-B1{background-color:#0D32B2;} + .d2-4030577362 .background-color-B2{background-color:#0D32B2;} + .d2-4030577362 .background-color-B3{background-color:#E3E9FD;} + .d2-4030577362 .background-color-B4{background-color:#E3E9FD;} + .d2-4030577362 .background-color-B5{background-color:#EDF0FD;} + .d2-4030577362 .background-color-B6{background-color:#F7F8FE;} + .d2-4030577362 .background-color-AA2{background-color:#4A6FF3;} + .d2-4030577362 .background-color-AA4{background-color:#EDF0FD;} + .d2-4030577362 .background-color-AA5{background-color:#F7F8FE;} + .d2-4030577362 .background-color-AB4{background-color:#EDF0FD;} + .d2-4030577362 .background-color-AB5{background-color:#F7F8FE;} + .d2-4030577362 .color-N1{color:#0A0F25;} + .d2-4030577362 .color-N2{color:#676C7E;} + .d2-4030577362 .color-N3{color:#9499AB;} + .d2-4030577362 .color-N4{color:#CFD2DD;} + .d2-4030577362 .color-N5{color:#DEE1EB;} + .d2-4030577362 .color-N6{color:#EEF1F8;} + .d2-4030577362 .color-N7{color:#FFFFFF;} + .d2-4030577362 .color-B1{color:#0D32B2;} + .d2-4030577362 .color-B2{color:#0D32B2;} + .d2-4030577362 .color-B3{color:#E3E9FD;} + .d2-4030577362 .color-B4{color:#E3E9FD;} + .d2-4030577362 .color-B5{color:#EDF0FD;} + .d2-4030577362 .color-B6{color:#F7F8FE;} + .d2-4030577362 .color-AA2{color:#4A6FF3;} + .d2-4030577362 .color-AA4{color:#EDF0FD;} + .d2-4030577362 .color-AA5{color:#F7F8FE;} + .d2-4030577362 .color-AB4{color:#EDF0FD;} + .d2-4030577362 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4030577362);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4030577362);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4030577362);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4030577362);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4030577362);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4030577362);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4030577362);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4030577362);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4030577362);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4030577362);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4030577362);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4030577362);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4030577362);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4030577362);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4030577362);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4030577362);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4030577362);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4030577362);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>k - + diff --git a/e2etests-cli/testdata/TestCLI_E2E/sequence-spread-layer/seq.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/sequence-spread-layer/seq.exp.svg index b60043bac..363704877 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/sequence-spread-layer/seq.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/sequence-spread-layer/seq.exp.svg @@ -1,16 +1,16 @@ -megithub.com/terrastruct/d2if i'm rightif i'm wrong fixnah, intended issue about a bugsome note about the bug + .d2-887788274 .fill-N1{fill:#0A0F25;} + .d2-887788274 .fill-N2{fill:#676C7E;} + .d2-887788274 .fill-N3{fill:#9499AB;} + .d2-887788274 .fill-N4{fill:#CFD2DD;} + .d2-887788274 .fill-N5{fill:#DEE1EB;} + .d2-887788274 .fill-N6{fill:#EEF1F8;} + .d2-887788274 .fill-N7{fill:#FFFFFF;} + .d2-887788274 .fill-B1{fill:#0D32B2;} + .d2-887788274 .fill-B2{fill:#0D32B2;} + .d2-887788274 .fill-B3{fill:#E3E9FD;} + .d2-887788274 .fill-B4{fill:#E3E9FD;} + .d2-887788274 .fill-B5{fill:#EDF0FD;} + .d2-887788274 .fill-B6{fill:#F7F8FE;} + .d2-887788274 .fill-AA2{fill:#4A6FF3;} + .d2-887788274 .fill-AA4{fill:#EDF0FD;} + .d2-887788274 .fill-AA5{fill:#F7F8FE;} + .d2-887788274 .fill-AB4{fill:#EDF0FD;} + .d2-887788274 .fill-AB5{fill:#F7F8FE;} + .d2-887788274 .stroke-N1{stroke:#0A0F25;} + .d2-887788274 .stroke-N2{stroke:#676C7E;} + .d2-887788274 .stroke-N3{stroke:#9499AB;} + .d2-887788274 .stroke-N4{stroke:#CFD2DD;} + .d2-887788274 .stroke-N5{stroke:#DEE1EB;} + .d2-887788274 .stroke-N6{stroke:#EEF1F8;} + .d2-887788274 .stroke-N7{stroke:#FFFFFF;} + .d2-887788274 .stroke-B1{stroke:#0D32B2;} + .d2-887788274 .stroke-B2{stroke:#0D32B2;} + .d2-887788274 .stroke-B3{stroke:#E3E9FD;} + .d2-887788274 .stroke-B4{stroke:#E3E9FD;} + .d2-887788274 .stroke-B5{stroke:#EDF0FD;} + .d2-887788274 .stroke-B6{stroke:#F7F8FE;} + .d2-887788274 .stroke-AA2{stroke:#4A6FF3;} + .d2-887788274 .stroke-AA4{stroke:#EDF0FD;} + .d2-887788274 .stroke-AA5{stroke:#F7F8FE;} + .d2-887788274 .stroke-AB4{stroke:#EDF0FD;} + .d2-887788274 .stroke-AB5{stroke:#F7F8FE;} + .d2-887788274 .background-color-N1{background-color:#0A0F25;} + .d2-887788274 .background-color-N2{background-color:#676C7E;} + .d2-887788274 .background-color-N3{background-color:#9499AB;} + .d2-887788274 .background-color-N4{background-color:#CFD2DD;} + .d2-887788274 .background-color-N5{background-color:#DEE1EB;} + .d2-887788274 .background-color-N6{background-color:#EEF1F8;} + .d2-887788274 .background-color-N7{background-color:#FFFFFF;} + .d2-887788274 .background-color-B1{background-color:#0D32B2;} + .d2-887788274 .background-color-B2{background-color:#0D32B2;} + .d2-887788274 .background-color-B3{background-color:#E3E9FD;} + .d2-887788274 .background-color-B4{background-color:#E3E9FD;} + .d2-887788274 .background-color-B5{background-color:#EDF0FD;} + .d2-887788274 .background-color-B6{background-color:#F7F8FE;} + .d2-887788274 .background-color-AA2{background-color:#4A6FF3;} + .d2-887788274 .background-color-AA4{background-color:#EDF0FD;} + .d2-887788274 .background-color-AA5{background-color:#F7F8FE;} + .d2-887788274 .background-color-AB4{background-color:#EDF0FD;} + .d2-887788274 .background-color-AB5{background-color:#F7F8FE;} + .d2-887788274 .color-N1{color:#0A0F25;} + .d2-887788274 .color-N2{color:#676C7E;} + .d2-887788274 .color-N3{color:#9499AB;} + .d2-887788274 .color-N4{color:#CFD2DD;} + .d2-887788274 .color-N5{color:#DEE1EB;} + .d2-887788274 .color-N6{color:#EEF1F8;} + .d2-887788274 .color-N7{color:#FFFFFF;} + .d2-887788274 .color-B1{color:#0D32B2;} + .d2-887788274 .color-B2{color:#0D32B2;} + .d2-887788274 .color-B3{color:#E3E9FD;} + .d2-887788274 .color-B4{color:#E3E9FD;} + .d2-887788274 .color-B5{color:#EDF0FD;} + .d2-887788274 .color-B6{color:#F7F8FE;} + .d2-887788274 .color-AA2{color:#4A6FF3;} + .d2-887788274 .color-AA4{color:#EDF0FD;} + .d2-887788274 .color-AA5{color:#F7F8FE;} + .d2-887788274 .color-AB4{color:#EDF0FD;} + .d2-887788274 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-887788274);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-887788274);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-887788274);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-887788274);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-887788274);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-887788274);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-887788274);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-887788274);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-887788274);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-887788274);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-887788274);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-887788274);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-887788274);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-887788274);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-887788274);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-887788274);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-887788274);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-887788274);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>megithub.com/terrastruct/d2if i'm rightif i'm wrong fixnah, intended issue about a bugsome note about the bug - - - - - - - - + + + + + + + + diff --git a/e2etests-cli/testdata/TestCLI_E2E/stdin.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/stdin.exp.svg index 66c5e6ee9..96aa85811 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/stdin.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/stdin.exp.svg @@ -1,9 +1,9 @@ -xy + .d2-3671284423 .fill-N1{fill:#0A0F25;} + .d2-3671284423 .fill-N2{fill:#676C7E;} + .d2-3671284423 .fill-N3{fill:#9499AB;} + .d2-3671284423 .fill-N4{fill:#CFD2DD;} + .d2-3671284423 .fill-N5{fill:#DEE1EB;} + .d2-3671284423 .fill-N6{fill:#EEF1F8;} + .d2-3671284423 .fill-N7{fill:#FFFFFF;} + .d2-3671284423 .fill-B1{fill:#0D32B2;} + .d2-3671284423 .fill-B2{fill:#0D32B2;} + .d2-3671284423 .fill-B3{fill:#E3E9FD;} + .d2-3671284423 .fill-B4{fill:#E3E9FD;} + .d2-3671284423 .fill-B5{fill:#EDF0FD;} + .d2-3671284423 .fill-B6{fill:#F7F8FE;} + .d2-3671284423 .fill-AA2{fill:#4A6FF3;} + .d2-3671284423 .fill-AA4{fill:#EDF0FD;} + .d2-3671284423 .fill-AA5{fill:#F7F8FE;} + .d2-3671284423 .fill-AB4{fill:#EDF0FD;} + .d2-3671284423 .fill-AB5{fill:#F7F8FE;} + .d2-3671284423 .stroke-N1{stroke:#0A0F25;} + .d2-3671284423 .stroke-N2{stroke:#676C7E;} + .d2-3671284423 .stroke-N3{stroke:#9499AB;} + .d2-3671284423 .stroke-N4{stroke:#CFD2DD;} + .d2-3671284423 .stroke-N5{stroke:#DEE1EB;} + .d2-3671284423 .stroke-N6{stroke:#EEF1F8;} + .d2-3671284423 .stroke-N7{stroke:#FFFFFF;} + .d2-3671284423 .stroke-B1{stroke:#0D32B2;} + .d2-3671284423 .stroke-B2{stroke:#0D32B2;} + .d2-3671284423 .stroke-B3{stroke:#E3E9FD;} + .d2-3671284423 .stroke-B4{stroke:#E3E9FD;} + .d2-3671284423 .stroke-B5{stroke:#EDF0FD;} + .d2-3671284423 .stroke-B6{stroke:#F7F8FE;} + .d2-3671284423 .stroke-AA2{stroke:#4A6FF3;} + .d2-3671284423 .stroke-AA4{stroke:#EDF0FD;} + .d2-3671284423 .stroke-AA5{stroke:#F7F8FE;} + .d2-3671284423 .stroke-AB4{stroke:#EDF0FD;} + .d2-3671284423 .stroke-AB5{stroke:#F7F8FE;} + .d2-3671284423 .background-color-N1{background-color:#0A0F25;} + .d2-3671284423 .background-color-N2{background-color:#676C7E;} + .d2-3671284423 .background-color-N3{background-color:#9499AB;} + .d2-3671284423 .background-color-N4{background-color:#CFD2DD;} + .d2-3671284423 .background-color-N5{background-color:#DEE1EB;} + .d2-3671284423 .background-color-N6{background-color:#EEF1F8;} + .d2-3671284423 .background-color-N7{background-color:#FFFFFF;} + .d2-3671284423 .background-color-B1{background-color:#0D32B2;} + .d2-3671284423 .background-color-B2{background-color:#0D32B2;} + .d2-3671284423 .background-color-B3{background-color:#E3E9FD;} + .d2-3671284423 .background-color-B4{background-color:#E3E9FD;} + .d2-3671284423 .background-color-B5{background-color:#EDF0FD;} + .d2-3671284423 .background-color-B6{background-color:#F7F8FE;} + .d2-3671284423 .background-color-AA2{background-color:#4A6FF3;} + .d2-3671284423 .background-color-AA4{background-color:#EDF0FD;} + .d2-3671284423 .background-color-AA5{background-color:#F7F8FE;} + .d2-3671284423 .background-color-AB4{background-color:#EDF0FD;} + .d2-3671284423 .background-color-AB5{background-color:#F7F8FE;} + .d2-3671284423 .color-N1{color:#0A0F25;} + .d2-3671284423 .color-N2{color:#676C7E;} + .d2-3671284423 .color-N3{color:#9499AB;} + .d2-3671284423 .color-N4{color:#CFD2DD;} + .d2-3671284423 .color-N5{color:#DEE1EB;} + .d2-3671284423 .color-N6{color:#EEF1F8;} + .d2-3671284423 .color-N7{color:#FFFFFF;} + .d2-3671284423 .color-B1{color:#0D32B2;} + .d2-3671284423 .color-B2{color:#0D32B2;} + .d2-3671284423 .color-B3{color:#E3E9FD;} + .d2-3671284423 .color-B4{color:#E3E9FD;} + .d2-3671284423 .color-B5{color:#EDF0FD;} + .d2-3671284423 .color-B6{color:#F7F8FE;} + .d2-3671284423 .color-AA2{color:#4A6FF3;} + .d2-3671284423 .color-AA4{color:#EDF0FD;} + .d2-3671284423 .color-AA5{color:#F7F8FE;} + .d2-3671284423 .color-AB4{color:#EDF0FD;} + .d2-3671284423 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3671284423);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3671284423);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3671284423);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3671284423);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3671284423);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3671284423);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3671284423);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3671284423);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3671284423);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3671284423);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3671284423);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3671284423);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3671284423);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3671284423);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3671284423);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3671284423);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3671284423);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3671284423);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xy - - + + diff --git a/e2etests-cli/testdata/TestCLI_E2E/target-b.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/target-b.exp.svg index 208590e79..bf4c5f1b8 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/target-b.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/target-b.exp.svg @@ -1,9 +1,9 @@ -Backup Plan + .d2-2422484514 .fill-N1{fill:#0A0F25;} + .d2-2422484514 .fill-N2{fill:#676C7E;} + .d2-2422484514 .fill-N3{fill:#9499AB;} + .d2-2422484514 .fill-N4{fill:#CFD2DD;} + .d2-2422484514 .fill-N5{fill:#DEE1EB;} + .d2-2422484514 .fill-N6{fill:#EEF1F8;} + .d2-2422484514 .fill-N7{fill:#FFFFFF;} + .d2-2422484514 .fill-B1{fill:#0D32B2;} + .d2-2422484514 .fill-B2{fill:#0D32B2;} + .d2-2422484514 .fill-B3{fill:#E3E9FD;} + .d2-2422484514 .fill-B4{fill:#E3E9FD;} + .d2-2422484514 .fill-B5{fill:#EDF0FD;} + .d2-2422484514 .fill-B6{fill:#F7F8FE;} + .d2-2422484514 .fill-AA2{fill:#4A6FF3;} + .d2-2422484514 .fill-AA4{fill:#EDF0FD;} + .d2-2422484514 .fill-AA5{fill:#F7F8FE;} + .d2-2422484514 .fill-AB4{fill:#EDF0FD;} + .d2-2422484514 .fill-AB5{fill:#F7F8FE;} + .d2-2422484514 .stroke-N1{stroke:#0A0F25;} + .d2-2422484514 .stroke-N2{stroke:#676C7E;} + .d2-2422484514 .stroke-N3{stroke:#9499AB;} + .d2-2422484514 .stroke-N4{stroke:#CFD2DD;} + .d2-2422484514 .stroke-N5{stroke:#DEE1EB;} + .d2-2422484514 .stroke-N6{stroke:#EEF1F8;} + .d2-2422484514 .stroke-N7{stroke:#FFFFFF;} + .d2-2422484514 .stroke-B1{stroke:#0D32B2;} + .d2-2422484514 .stroke-B2{stroke:#0D32B2;} + .d2-2422484514 .stroke-B3{stroke:#E3E9FD;} + .d2-2422484514 .stroke-B4{stroke:#E3E9FD;} + .d2-2422484514 .stroke-B5{stroke:#EDF0FD;} + .d2-2422484514 .stroke-B6{stroke:#F7F8FE;} + .d2-2422484514 .stroke-AA2{stroke:#4A6FF3;} + .d2-2422484514 .stroke-AA4{stroke:#EDF0FD;} + .d2-2422484514 .stroke-AA5{stroke:#F7F8FE;} + .d2-2422484514 .stroke-AB4{stroke:#EDF0FD;} + .d2-2422484514 .stroke-AB5{stroke:#F7F8FE;} + .d2-2422484514 .background-color-N1{background-color:#0A0F25;} + .d2-2422484514 .background-color-N2{background-color:#676C7E;} + .d2-2422484514 .background-color-N3{background-color:#9499AB;} + .d2-2422484514 .background-color-N4{background-color:#CFD2DD;} + .d2-2422484514 .background-color-N5{background-color:#DEE1EB;} + .d2-2422484514 .background-color-N6{background-color:#EEF1F8;} + .d2-2422484514 .background-color-N7{background-color:#FFFFFF;} + .d2-2422484514 .background-color-B1{background-color:#0D32B2;} + .d2-2422484514 .background-color-B2{background-color:#0D32B2;} + .d2-2422484514 .background-color-B3{background-color:#E3E9FD;} + .d2-2422484514 .background-color-B4{background-color:#E3E9FD;} + .d2-2422484514 .background-color-B5{background-color:#EDF0FD;} + .d2-2422484514 .background-color-B6{background-color:#F7F8FE;} + .d2-2422484514 .background-color-AA2{background-color:#4A6FF3;} + .d2-2422484514 .background-color-AA4{background-color:#EDF0FD;} + .d2-2422484514 .background-color-AA5{background-color:#F7F8FE;} + .d2-2422484514 .background-color-AB4{background-color:#EDF0FD;} + .d2-2422484514 .background-color-AB5{background-color:#F7F8FE;} + .d2-2422484514 .color-N1{color:#0A0F25;} + .d2-2422484514 .color-N2{color:#676C7E;} + .d2-2422484514 .color-N3{color:#9499AB;} + .d2-2422484514 .color-N4{color:#CFD2DD;} + .d2-2422484514 .color-N5{color:#DEE1EB;} + .d2-2422484514 .color-N6{color:#EEF1F8;} + .d2-2422484514 .color-N7{color:#FFFFFF;} + .d2-2422484514 .color-B1{color:#0D32B2;} + .d2-2422484514 .color-B2{color:#0D32B2;} + .d2-2422484514 .color-B3{color:#E3E9FD;} + .d2-2422484514 .color-B4{color:#E3E9FD;} + .d2-2422484514 .color-B5{color:#EDF0FD;} + .d2-2422484514 .color-B6{color:#F7F8FE;} + .d2-2422484514 .color-AA2{color:#4A6FF3;} + .d2-2422484514 .color-AA4{color:#EDF0FD;} + .d2-2422484514 .color-AA5{color:#F7F8FE;} + .d2-2422484514 .color-AB4{color:#EDF0FD;} + .d2-2422484514 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2422484514);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2422484514);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2422484514);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2422484514);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2422484514);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2422484514);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2422484514);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2422484514);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2422484514);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2422484514);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2422484514);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2422484514);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2422484514);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2422484514);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2422484514);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2422484514);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2422484514);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2422484514);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>Backup Plan - + diff --git a/e2etests-cli/testdata/TestCLI_E2E/target-nested-index.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/target-nested-index.exp.svg index ddf364733..c4bdc982c 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/target-nested-index.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/target-nested-index.exp.svg @@ -1,9 +1,9 @@ -d + .d2-4175695741 .fill-N1{fill:#0A0F25;} + .d2-4175695741 .fill-N2{fill:#676C7E;} + .d2-4175695741 .fill-N3{fill:#9499AB;} + .d2-4175695741 .fill-N4{fill:#CFD2DD;} + .d2-4175695741 .fill-N5{fill:#DEE1EB;} + .d2-4175695741 .fill-N6{fill:#EEF1F8;} + .d2-4175695741 .fill-N7{fill:#FFFFFF;} + .d2-4175695741 .fill-B1{fill:#0D32B2;} + .d2-4175695741 .fill-B2{fill:#0D32B2;} + .d2-4175695741 .fill-B3{fill:#E3E9FD;} + .d2-4175695741 .fill-B4{fill:#E3E9FD;} + .d2-4175695741 .fill-B5{fill:#EDF0FD;} + .d2-4175695741 .fill-B6{fill:#F7F8FE;} + .d2-4175695741 .fill-AA2{fill:#4A6FF3;} + .d2-4175695741 .fill-AA4{fill:#EDF0FD;} + .d2-4175695741 .fill-AA5{fill:#F7F8FE;} + .d2-4175695741 .fill-AB4{fill:#EDF0FD;} + .d2-4175695741 .fill-AB5{fill:#F7F8FE;} + .d2-4175695741 .stroke-N1{stroke:#0A0F25;} + .d2-4175695741 .stroke-N2{stroke:#676C7E;} + .d2-4175695741 .stroke-N3{stroke:#9499AB;} + .d2-4175695741 .stroke-N4{stroke:#CFD2DD;} + .d2-4175695741 .stroke-N5{stroke:#DEE1EB;} + .d2-4175695741 .stroke-N6{stroke:#EEF1F8;} + .d2-4175695741 .stroke-N7{stroke:#FFFFFF;} + .d2-4175695741 .stroke-B1{stroke:#0D32B2;} + .d2-4175695741 .stroke-B2{stroke:#0D32B2;} + .d2-4175695741 .stroke-B3{stroke:#E3E9FD;} + .d2-4175695741 .stroke-B4{stroke:#E3E9FD;} + .d2-4175695741 .stroke-B5{stroke:#EDF0FD;} + .d2-4175695741 .stroke-B6{stroke:#F7F8FE;} + .d2-4175695741 .stroke-AA2{stroke:#4A6FF3;} + .d2-4175695741 .stroke-AA4{stroke:#EDF0FD;} + .d2-4175695741 .stroke-AA5{stroke:#F7F8FE;} + .d2-4175695741 .stroke-AB4{stroke:#EDF0FD;} + .d2-4175695741 .stroke-AB5{stroke:#F7F8FE;} + .d2-4175695741 .background-color-N1{background-color:#0A0F25;} + .d2-4175695741 .background-color-N2{background-color:#676C7E;} + .d2-4175695741 .background-color-N3{background-color:#9499AB;} + .d2-4175695741 .background-color-N4{background-color:#CFD2DD;} + .d2-4175695741 .background-color-N5{background-color:#DEE1EB;} + .d2-4175695741 .background-color-N6{background-color:#EEF1F8;} + .d2-4175695741 .background-color-N7{background-color:#FFFFFF;} + .d2-4175695741 .background-color-B1{background-color:#0D32B2;} + .d2-4175695741 .background-color-B2{background-color:#0D32B2;} + .d2-4175695741 .background-color-B3{background-color:#E3E9FD;} + .d2-4175695741 .background-color-B4{background-color:#E3E9FD;} + .d2-4175695741 .background-color-B5{background-color:#EDF0FD;} + .d2-4175695741 .background-color-B6{background-color:#F7F8FE;} + .d2-4175695741 .background-color-AA2{background-color:#4A6FF3;} + .d2-4175695741 .background-color-AA4{background-color:#EDF0FD;} + .d2-4175695741 .background-color-AA5{background-color:#F7F8FE;} + .d2-4175695741 .background-color-AB4{background-color:#EDF0FD;} + .d2-4175695741 .background-color-AB5{background-color:#F7F8FE;} + .d2-4175695741 .color-N1{color:#0A0F25;} + .d2-4175695741 .color-N2{color:#676C7E;} + .d2-4175695741 .color-N3{color:#9499AB;} + .d2-4175695741 .color-N4{color:#CFD2DD;} + .d2-4175695741 .color-N5{color:#DEE1EB;} + .d2-4175695741 .color-N6{color:#EEF1F8;} + .d2-4175695741 .color-N7{color:#FFFFFF;} + .d2-4175695741 .color-B1{color:#0D32B2;} + .d2-4175695741 .color-B2{color:#0D32B2;} + .d2-4175695741 .color-B3{color:#E3E9FD;} + .d2-4175695741 .color-B4{color:#E3E9FD;} + .d2-4175695741 .color-B5{color:#EDF0FD;} + .d2-4175695741 .color-B6{color:#F7F8FE;} + .d2-4175695741 .color-AA2{color:#4A6FF3;} + .d2-4175695741 .color-AA4{color:#EDF0FD;} + .d2-4175695741 .color-AA5{color:#F7F8FE;} + .d2-4175695741 .color-AB4{color:#EDF0FD;} + .d2-4175695741 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4175695741);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4175695741);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4175695741);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4175695741);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4175695741);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4175695741);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4175695741);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4175695741);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4175695741);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4175695741);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4175695741);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4175695741);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4175695741);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4175695741);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4175695741);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4175695741);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4175695741);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4175695741);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>d - + diff --git a/e2etests-cli/testdata/TestCLI_E2E/target-nested-index2.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/target-nested-index2.exp.svg index b26aed46c..4a27aecf4 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/target-nested-index2.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/target-nested-index2.exp.svg @@ -1,9 +1,9 @@ -cd + .d2-1286117810 .fill-N1{fill:#0A0F25;} + .d2-1286117810 .fill-N2{fill:#676C7E;} + .d2-1286117810 .fill-N3{fill:#9499AB;} + .d2-1286117810 .fill-N4{fill:#CFD2DD;} + .d2-1286117810 .fill-N5{fill:#DEE1EB;} + .d2-1286117810 .fill-N6{fill:#EEF1F8;} + .d2-1286117810 .fill-N7{fill:#FFFFFF;} + .d2-1286117810 .fill-B1{fill:#0D32B2;} + .d2-1286117810 .fill-B2{fill:#0D32B2;} + .d2-1286117810 .fill-B3{fill:#E3E9FD;} + .d2-1286117810 .fill-B4{fill:#E3E9FD;} + .d2-1286117810 .fill-B5{fill:#EDF0FD;} + .d2-1286117810 .fill-B6{fill:#F7F8FE;} + .d2-1286117810 .fill-AA2{fill:#4A6FF3;} + .d2-1286117810 .fill-AA4{fill:#EDF0FD;} + .d2-1286117810 .fill-AA5{fill:#F7F8FE;} + .d2-1286117810 .fill-AB4{fill:#EDF0FD;} + .d2-1286117810 .fill-AB5{fill:#F7F8FE;} + .d2-1286117810 .stroke-N1{stroke:#0A0F25;} + .d2-1286117810 .stroke-N2{stroke:#676C7E;} + .d2-1286117810 .stroke-N3{stroke:#9499AB;} + .d2-1286117810 .stroke-N4{stroke:#CFD2DD;} + .d2-1286117810 .stroke-N5{stroke:#DEE1EB;} + .d2-1286117810 .stroke-N6{stroke:#EEF1F8;} + .d2-1286117810 .stroke-N7{stroke:#FFFFFF;} + .d2-1286117810 .stroke-B1{stroke:#0D32B2;} + .d2-1286117810 .stroke-B2{stroke:#0D32B2;} + .d2-1286117810 .stroke-B3{stroke:#E3E9FD;} + .d2-1286117810 .stroke-B4{stroke:#E3E9FD;} + .d2-1286117810 .stroke-B5{stroke:#EDF0FD;} + .d2-1286117810 .stroke-B6{stroke:#F7F8FE;} + .d2-1286117810 .stroke-AA2{stroke:#4A6FF3;} + .d2-1286117810 .stroke-AA4{stroke:#EDF0FD;} + .d2-1286117810 .stroke-AA5{stroke:#F7F8FE;} + .d2-1286117810 .stroke-AB4{stroke:#EDF0FD;} + .d2-1286117810 .stroke-AB5{stroke:#F7F8FE;} + .d2-1286117810 .background-color-N1{background-color:#0A0F25;} + .d2-1286117810 .background-color-N2{background-color:#676C7E;} + .d2-1286117810 .background-color-N3{background-color:#9499AB;} + .d2-1286117810 .background-color-N4{background-color:#CFD2DD;} + .d2-1286117810 .background-color-N5{background-color:#DEE1EB;} + .d2-1286117810 .background-color-N6{background-color:#EEF1F8;} + .d2-1286117810 .background-color-N7{background-color:#FFFFFF;} + .d2-1286117810 .background-color-B1{background-color:#0D32B2;} + .d2-1286117810 .background-color-B2{background-color:#0D32B2;} + .d2-1286117810 .background-color-B3{background-color:#E3E9FD;} + .d2-1286117810 .background-color-B4{background-color:#E3E9FD;} + .d2-1286117810 .background-color-B5{background-color:#EDF0FD;} + .d2-1286117810 .background-color-B6{background-color:#F7F8FE;} + .d2-1286117810 .background-color-AA2{background-color:#4A6FF3;} + .d2-1286117810 .background-color-AA4{background-color:#EDF0FD;} + .d2-1286117810 .background-color-AA5{background-color:#F7F8FE;} + .d2-1286117810 .background-color-AB4{background-color:#EDF0FD;} + .d2-1286117810 .background-color-AB5{background-color:#F7F8FE;} + .d2-1286117810 .color-N1{color:#0A0F25;} + .d2-1286117810 .color-N2{color:#676C7E;} + .d2-1286117810 .color-N3{color:#9499AB;} + .d2-1286117810 .color-N4{color:#CFD2DD;} + .d2-1286117810 .color-N5{color:#DEE1EB;} + .d2-1286117810 .color-N6{color:#EEF1F8;} + .d2-1286117810 .color-N7{color:#FFFFFF;} + .d2-1286117810 .color-B1{color:#0D32B2;} + .d2-1286117810 .color-B2{color:#0D32B2;} + .d2-1286117810 .color-B3{color:#E3E9FD;} + .d2-1286117810 .color-B4{color:#E3E9FD;} + .d2-1286117810 .color-B5{color:#EDF0FD;} + .d2-1286117810 .color-B6{color:#F7F8FE;} + .d2-1286117810 .color-AA2{color:#4A6FF3;} + .d2-1286117810 .color-AA4{color:#EDF0FD;} + .d2-1286117810 .color-AA5{color:#F7F8FE;} + .d2-1286117810 .color-AB4{color:#EDF0FD;} + .d2-1286117810 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1286117810);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1286117810);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1286117810);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1286117810);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1286117810);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1286117810);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1286117810);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1286117810);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1286117810);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1286117810);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1286117810);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1286117810);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1286117810);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1286117810);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1286117810);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1286117810);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1286117810);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1286117810);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>cd - - + + diff --git a/e2etests-cli/testdata/TestCLI_E2E/target-nested-with-special-chars.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/target-nested-with-special-chars.exp.svg index 63fb1c670..004199bd0 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/target-nested-with-special-chars.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/target-nested-with-special-chars.exp.svg @@ -1,9 +1,9 @@ -mad + .d2-1807797871 .fill-N1{fill:#0A0F25;} + .d2-1807797871 .fill-N2{fill:#676C7E;} + .d2-1807797871 .fill-N3{fill:#9499AB;} + .d2-1807797871 .fill-N4{fill:#CFD2DD;} + .d2-1807797871 .fill-N5{fill:#DEE1EB;} + .d2-1807797871 .fill-N6{fill:#EEF1F8;} + .d2-1807797871 .fill-N7{fill:#FFFFFF;} + .d2-1807797871 .fill-B1{fill:#0D32B2;} + .d2-1807797871 .fill-B2{fill:#0D32B2;} + .d2-1807797871 .fill-B3{fill:#E3E9FD;} + .d2-1807797871 .fill-B4{fill:#E3E9FD;} + .d2-1807797871 .fill-B5{fill:#EDF0FD;} + .d2-1807797871 .fill-B6{fill:#F7F8FE;} + .d2-1807797871 .fill-AA2{fill:#4A6FF3;} + .d2-1807797871 .fill-AA4{fill:#EDF0FD;} + .d2-1807797871 .fill-AA5{fill:#F7F8FE;} + .d2-1807797871 .fill-AB4{fill:#EDF0FD;} + .d2-1807797871 .fill-AB5{fill:#F7F8FE;} + .d2-1807797871 .stroke-N1{stroke:#0A0F25;} + .d2-1807797871 .stroke-N2{stroke:#676C7E;} + .d2-1807797871 .stroke-N3{stroke:#9499AB;} + .d2-1807797871 .stroke-N4{stroke:#CFD2DD;} + .d2-1807797871 .stroke-N5{stroke:#DEE1EB;} + .d2-1807797871 .stroke-N6{stroke:#EEF1F8;} + .d2-1807797871 .stroke-N7{stroke:#FFFFFF;} + .d2-1807797871 .stroke-B1{stroke:#0D32B2;} + .d2-1807797871 .stroke-B2{stroke:#0D32B2;} + .d2-1807797871 .stroke-B3{stroke:#E3E9FD;} + .d2-1807797871 .stroke-B4{stroke:#E3E9FD;} + .d2-1807797871 .stroke-B5{stroke:#EDF0FD;} + .d2-1807797871 .stroke-B6{stroke:#F7F8FE;} + .d2-1807797871 .stroke-AA2{stroke:#4A6FF3;} + .d2-1807797871 .stroke-AA4{stroke:#EDF0FD;} + .d2-1807797871 .stroke-AA5{stroke:#F7F8FE;} + .d2-1807797871 .stroke-AB4{stroke:#EDF0FD;} + .d2-1807797871 .stroke-AB5{stroke:#F7F8FE;} + .d2-1807797871 .background-color-N1{background-color:#0A0F25;} + .d2-1807797871 .background-color-N2{background-color:#676C7E;} + .d2-1807797871 .background-color-N3{background-color:#9499AB;} + .d2-1807797871 .background-color-N4{background-color:#CFD2DD;} + .d2-1807797871 .background-color-N5{background-color:#DEE1EB;} + .d2-1807797871 .background-color-N6{background-color:#EEF1F8;} + .d2-1807797871 .background-color-N7{background-color:#FFFFFF;} + .d2-1807797871 .background-color-B1{background-color:#0D32B2;} + .d2-1807797871 .background-color-B2{background-color:#0D32B2;} + .d2-1807797871 .background-color-B3{background-color:#E3E9FD;} + .d2-1807797871 .background-color-B4{background-color:#E3E9FD;} + .d2-1807797871 .background-color-B5{background-color:#EDF0FD;} + .d2-1807797871 .background-color-B6{background-color:#F7F8FE;} + .d2-1807797871 .background-color-AA2{background-color:#4A6FF3;} + .d2-1807797871 .background-color-AA4{background-color:#EDF0FD;} + .d2-1807797871 .background-color-AA5{background-color:#F7F8FE;} + .d2-1807797871 .background-color-AB4{background-color:#EDF0FD;} + .d2-1807797871 .background-color-AB5{background-color:#F7F8FE;} + .d2-1807797871 .color-N1{color:#0A0F25;} + .d2-1807797871 .color-N2{color:#676C7E;} + .d2-1807797871 .color-N3{color:#9499AB;} + .d2-1807797871 .color-N4{color:#CFD2DD;} + .d2-1807797871 .color-N5{color:#DEE1EB;} + .d2-1807797871 .color-N6{color:#EEF1F8;} + .d2-1807797871 .color-N7{color:#FFFFFF;} + .d2-1807797871 .color-B1{color:#0D32B2;} + .d2-1807797871 .color-B2{color:#0D32B2;} + .d2-1807797871 .color-B3{color:#E3E9FD;} + .d2-1807797871 .color-B4{color:#E3E9FD;} + .d2-1807797871 .color-B5{color:#EDF0FD;} + .d2-1807797871 .color-B6{color:#F7F8FE;} + .d2-1807797871 .color-AA2{color:#4A6FF3;} + .d2-1807797871 .color-AA4{color:#EDF0FD;} + .d2-1807797871 .color-AA5{color:#F7F8FE;} + .d2-1807797871 .color-AB4{color:#EDF0FD;} + .d2-1807797871 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1807797871);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1807797871);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1807797871);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1807797871);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1807797871);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1807797871);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1807797871);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1807797871);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1807797871);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1807797871);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1807797871);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1807797871);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1807797871);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1807797871);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1807797871);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1807797871);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1807797871);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1807797871);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>mad - + diff --git a/e2etests-cli/testdata/TestCLI_E2E/target-root.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/target-root.exp.svg index 4d3bc8eb0..b8feb8164 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/target-root.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/target-root.exp.svg @@ -1,9 +1,9 @@ -Main Plan + .d2-1725210778 .fill-N1{fill:#0A0F25;} + .d2-1725210778 .fill-N2{fill:#676C7E;} + .d2-1725210778 .fill-N3{fill:#9499AB;} + .d2-1725210778 .fill-N4{fill:#CFD2DD;} + .d2-1725210778 .fill-N5{fill:#DEE1EB;} + .d2-1725210778 .fill-N6{fill:#EEF1F8;} + .d2-1725210778 .fill-N7{fill:#FFFFFF;} + .d2-1725210778 .fill-B1{fill:#0D32B2;} + .d2-1725210778 .fill-B2{fill:#0D32B2;} + .d2-1725210778 .fill-B3{fill:#E3E9FD;} + .d2-1725210778 .fill-B4{fill:#E3E9FD;} + .d2-1725210778 .fill-B5{fill:#EDF0FD;} + .d2-1725210778 .fill-B6{fill:#F7F8FE;} + .d2-1725210778 .fill-AA2{fill:#4A6FF3;} + .d2-1725210778 .fill-AA4{fill:#EDF0FD;} + .d2-1725210778 .fill-AA5{fill:#F7F8FE;} + .d2-1725210778 .fill-AB4{fill:#EDF0FD;} + .d2-1725210778 .fill-AB5{fill:#F7F8FE;} + .d2-1725210778 .stroke-N1{stroke:#0A0F25;} + .d2-1725210778 .stroke-N2{stroke:#676C7E;} + .d2-1725210778 .stroke-N3{stroke:#9499AB;} + .d2-1725210778 .stroke-N4{stroke:#CFD2DD;} + .d2-1725210778 .stroke-N5{stroke:#DEE1EB;} + .d2-1725210778 .stroke-N6{stroke:#EEF1F8;} + .d2-1725210778 .stroke-N7{stroke:#FFFFFF;} + .d2-1725210778 .stroke-B1{stroke:#0D32B2;} + .d2-1725210778 .stroke-B2{stroke:#0D32B2;} + .d2-1725210778 .stroke-B3{stroke:#E3E9FD;} + .d2-1725210778 .stroke-B4{stroke:#E3E9FD;} + .d2-1725210778 .stroke-B5{stroke:#EDF0FD;} + .d2-1725210778 .stroke-B6{stroke:#F7F8FE;} + .d2-1725210778 .stroke-AA2{stroke:#4A6FF3;} + .d2-1725210778 .stroke-AA4{stroke:#EDF0FD;} + .d2-1725210778 .stroke-AA5{stroke:#F7F8FE;} + .d2-1725210778 .stroke-AB4{stroke:#EDF0FD;} + .d2-1725210778 .stroke-AB5{stroke:#F7F8FE;} + .d2-1725210778 .background-color-N1{background-color:#0A0F25;} + .d2-1725210778 .background-color-N2{background-color:#676C7E;} + .d2-1725210778 .background-color-N3{background-color:#9499AB;} + .d2-1725210778 .background-color-N4{background-color:#CFD2DD;} + .d2-1725210778 .background-color-N5{background-color:#DEE1EB;} + .d2-1725210778 .background-color-N6{background-color:#EEF1F8;} + .d2-1725210778 .background-color-N7{background-color:#FFFFFF;} + .d2-1725210778 .background-color-B1{background-color:#0D32B2;} + .d2-1725210778 .background-color-B2{background-color:#0D32B2;} + .d2-1725210778 .background-color-B3{background-color:#E3E9FD;} + .d2-1725210778 .background-color-B4{background-color:#E3E9FD;} + .d2-1725210778 .background-color-B5{background-color:#EDF0FD;} + .d2-1725210778 .background-color-B6{background-color:#F7F8FE;} + .d2-1725210778 .background-color-AA2{background-color:#4A6FF3;} + .d2-1725210778 .background-color-AA4{background-color:#EDF0FD;} + .d2-1725210778 .background-color-AA5{background-color:#F7F8FE;} + .d2-1725210778 .background-color-AB4{background-color:#EDF0FD;} + .d2-1725210778 .background-color-AB5{background-color:#F7F8FE;} + .d2-1725210778 .color-N1{color:#0A0F25;} + .d2-1725210778 .color-N2{color:#676C7E;} + .d2-1725210778 .color-N3{color:#9499AB;} + .d2-1725210778 .color-N4{color:#CFD2DD;} + .d2-1725210778 .color-N5{color:#DEE1EB;} + .d2-1725210778 .color-N6{color:#EEF1F8;} + .d2-1725210778 .color-N7{color:#FFFFFF;} + .d2-1725210778 .color-B1{color:#0D32B2;} + .d2-1725210778 .color-B2{color:#0D32B2;} + .d2-1725210778 .color-B3{color:#E3E9FD;} + .d2-1725210778 .color-B4{color:#E3E9FD;} + .d2-1725210778 .color-B5{color:#EDF0FD;} + .d2-1725210778 .color-B6{color:#F7F8FE;} + .d2-1725210778 .color-AA2{color:#4A6FF3;} + .d2-1725210778 .color-AA4{color:#EDF0FD;} + .d2-1725210778 .color-AA5{color:#F7F8FE;} + .d2-1725210778 .color-AB4{color:#EDF0FD;} + .d2-1725210778 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1725210778);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1725210778);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1725210778);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1725210778);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1725210778);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1725210778);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1725210778);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1725210778);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1725210778);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1725210778);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1725210778);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1725210778);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1725210778);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1725210778);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1725210778);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1725210778);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1725210778);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1725210778);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>Main Plan - + diff --git a/e2etests-cli/testdata/TestCLI_E2E/theme-override.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/theme-override.exp.svg index 1daac7ed5..fe07dce21 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/theme-override.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/theme-override.exp.svg @@ -1,23 +1,23 @@ -logsUserNetworkAPI ServercostumesidintPKsillinessintmonsterintlast_updatedtimestampmonstersidintPKmoviestringweightintlast_updatedtimestampCell TowerData ProcessorOnline PortalsatellitestransmitterStorageUI phone logsMake callpersistdisplay access + .d2-586632521 .fill-N1{fill:#2E2E2E;} + .d2-586632521 .fill-N2{fill:#2E2E2E;} + .d2-586632521 .fill-N3{fill:#595959;} + .d2-586632521 .fill-N4{fill:#858585;} + .d2-586632521 .fill-N5{fill:#B1B1B1;} + .d2-586632521 .fill-N6{fill:#DCDCDC;} + .d2-586632521 .fill-N7{fill:#DCDCDC;} + .d2-586632521 .fill-B1{fill:#2E7D32;} + .d2-586632521 .fill-B2{fill:#66BB6A;} + .d2-586632521 .fill-B3{fill:#A5D6A7;} + .d2-586632521 .fill-B4{fill:#C5E1A5;} + .d2-586632521 .fill-B5{fill:#E6EE9C;} + .d2-586632521 .fill-B6{fill:#FFF59D;} + .d2-586632521 .fill-AA2{fill:#0D47A1;} + .d2-586632521 .fill-AA4{fill:#42A5F5;} + .d2-586632521 .fill-AA5{fill:#90CAF9;} + .d2-586632521 .fill-AB4{fill:#F44336;} + .d2-586632521 .fill-AB5{fill:#FFCDD2;} + .d2-586632521 .stroke-N1{stroke:#2E2E2E;} + .d2-586632521 .stroke-N2{stroke:#2E2E2E;} + .d2-586632521 .stroke-N3{stroke:#595959;} + .d2-586632521 .stroke-N4{stroke:#858585;} + .d2-586632521 .stroke-N5{stroke:#B1B1B1;} + .d2-586632521 .stroke-N6{stroke:#DCDCDC;} + .d2-586632521 .stroke-N7{stroke:#DCDCDC;} + .d2-586632521 .stroke-B1{stroke:#2E7D32;} + .d2-586632521 .stroke-B2{stroke:#66BB6A;} + .d2-586632521 .stroke-B3{stroke:#A5D6A7;} + .d2-586632521 .stroke-B4{stroke:#C5E1A5;} + .d2-586632521 .stroke-B5{stroke:#E6EE9C;} + .d2-586632521 .stroke-B6{stroke:#FFF59D;} + .d2-586632521 .stroke-AA2{stroke:#0D47A1;} + .d2-586632521 .stroke-AA4{stroke:#42A5F5;} + .d2-586632521 .stroke-AA5{stroke:#90CAF9;} + .d2-586632521 .stroke-AB4{stroke:#F44336;} + .d2-586632521 .stroke-AB5{stroke:#FFCDD2;} + .d2-586632521 .background-color-N1{background-color:#2E2E2E;} + .d2-586632521 .background-color-N2{background-color:#2E2E2E;} + .d2-586632521 .background-color-N3{background-color:#595959;} + .d2-586632521 .background-color-N4{background-color:#858585;} + .d2-586632521 .background-color-N5{background-color:#B1B1B1;} + .d2-586632521 .background-color-N6{background-color:#DCDCDC;} + .d2-586632521 .background-color-N7{background-color:#DCDCDC;} + .d2-586632521 .background-color-B1{background-color:#2E7D32;} + .d2-586632521 .background-color-B2{background-color:#66BB6A;} + .d2-586632521 .background-color-B3{background-color:#A5D6A7;} + .d2-586632521 .background-color-B4{background-color:#C5E1A5;} + .d2-586632521 .background-color-B5{background-color:#E6EE9C;} + .d2-586632521 .background-color-B6{background-color:#FFF59D;} + .d2-586632521 .background-color-AA2{background-color:#0D47A1;} + .d2-586632521 .background-color-AA4{background-color:#42A5F5;} + .d2-586632521 .background-color-AA5{background-color:#90CAF9;} + .d2-586632521 .background-color-AB4{background-color:#F44336;} + .d2-586632521 .background-color-AB5{background-color:#FFCDD2;} + .d2-586632521 .color-N1{color:#2E2E2E;} + .d2-586632521 .color-N2{color:#2E2E2E;} + .d2-586632521 .color-N3{color:#595959;} + .d2-586632521 .color-N4{color:#858585;} + .d2-586632521 .color-N5{color:#B1B1B1;} + .d2-586632521 .color-N6{color:#DCDCDC;} + .d2-586632521 .color-N7{color:#DCDCDC;} + .d2-586632521 .color-B1{color:#2E7D32;} + .d2-586632521 .color-B2{color:#66BB6A;} + .d2-586632521 .color-B3{color:#A5D6A7;} + .d2-586632521 .color-B4{color:#C5E1A5;} + .d2-586632521 .color-B5{color:#E6EE9C;} + .d2-586632521 .color-B6{color:#FFF59D;} + .d2-586632521 .color-AA2{color:#0D47A1;} + .d2-586632521 .color-AA4{color:#42A5F5;} + .d2-586632521 .color-AA5{color:#90CAF9;} + .d2-586632521 .color-AB4{color:#F44336;} + .d2-586632521 .color-AB5{color:#FFCDD2;}.appendix text.text{fill:#2E2E2E}.md{--color-fg-default:#2E2E2E;--color-fg-muted:#2E2E2E;--color-fg-subtle:#595959;--color-canvas-default:#DCDCDC;--color-canvas-subtle:#DCDCDC;--color-border-default:#2E7D32;--color-border-muted:#66BB6A;--color-neutral-muted:#DCDCDC;--color-accent-fg:#66BB6A;--color-accent-emphasis:#66BB6A;--color-attention-subtle:#2E2E2E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-dark-d2-586632521);mix-blend-mode:overlay}.sketch-overlay-B2{fill:url(#streaks-normal-d2-586632521);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-normal-d2-586632521);mix-blend-mode:color-burn}.sketch-overlay-B4{fill:url(#streaks-normal-d2-586632521);mix-blend-mode:color-burn}.sketch-overlay-B5{fill:url(#streaks-bright-d2-586632521);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-586632521);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-darker-d2-586632521);mix-blend-mode:lighten}.sketch-overlay-AA4{fill:url(#streaks-normal-d2-586632521);mix-blend-mode:color-burn}.sketch-overlay-AA5{fill:url(#streaks-normal-d2-586632521);mix-blend-mode:color-burn}.sketch-overlay-AB4{fill:url(#streaks-dark-d2-586632521);mix-blend-mode:overlay}.sketch-overlay-AB5{fill:url(#streaks-normal-d2-586632521);mix-blend-mode:color-burn}.sketch-overlay-N1{fill:url(#streaks-darker-d2-586632521);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-darker-d2-586632521);mix-blend-mode:lighten}.sketch-overlay-N3{fill:url(#streaks-dark-d2-586632521);mix-blend-mode:overlay}.sketch-overlay-N4{fill:url(#streaks-dark-d2-586632521);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-normal-d2-586632521);mix-blend-mode:color-burn}.sketch-overlay-N6{fill:url(#streaks-normal-d2-586632521);mix-blend-mode:color-burn}.sketch-overlay-N7{fill:url(#streaks-normal-d2-586632521);mix-blend-mode:color-burn}.light-code{display: block}.dark-code{display: none}]]>logsUserNetworkAPI ServercostumesidintPKsillinessintmonsterintlast_updatedtimestampmonstersidintPKmoviestringweightintlast_updatedtimestampCell TowerData ProcessorOnline PortalsatellitestransmitterStorageUI phone logsMake callpersistdisplay access - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/e2etests-cli/testdata/TestCLI_E2E/theme-pdf.exp.pdf b/e2etests-cli/testdata/TestCLI_E2E/theme-pdf.exp.pdf index 01c7166e1..c6437033f 100644 Binary files a/e2etests-cli/testdata/TestCLI_E2E/theme-pdf.exp.pdf and b/e2etests-cli/testdata/TestCLI_E2E/theme-pdf.exp.pdf differ diff --git a/e2etests-cli/testdata/TestCLI_E2E/vars-animation.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/vars-animation.exp.svg index 22055d04c..1c80b0de5 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/vars-animation.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/vars-animation.exp.svg @@ -1,16 +1,16 @@ -CHICKEN'S PLAN +}]]>CHICKEN'S PLAN - -CHICKEN'S PLANAPPROACH ROAD + +CHICKEN'S PLANAPPROACH ROAD - - -CHICKEN'S PLANAPPROACH ROADCROSS ROAD + + +CHICKEN'S PLANAPPROACH ROADCROSS ROAD - - - -CHICKEN'S PLANAPPROACH ROADCROSS ROADMAKE YOU WONDER WHY + + + +CHICKEN'S PLANAPPROACH ROADCROSS ROADMAKE YOU WONDER WHY - - - - + + + + \ No newline at end of file diff --git a/e2etests-cli/testdata/TestCLI_E2E/vars-config.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/vars-config.exp.svg index 4ccd9e42a..a563b83fc 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/vars-config.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/vars-config.exp.svg @@ -1,16 +1,16 @@ - + .d2-1738840542 .fill-N1{fill:#0A0F25;} + .d2-1738840542 .fill-N2{fill:#676C7E;} + .d2-1738840542 .fill-N3{fill:#9499AB;} + .d2-1738840542 .fill-N4{fill:#CFD2DD;} + .d2-1738840542 .fill-N5{fill:#DEE1EB;} + .d2-1738840542 .fill-N6{fill:#EEF1F8;} + .d2-1738840542 .fill-N7{fill:#FFFFFF;} + .d2-1738840542 .fill-B1{fill:#0A0F25;} + .d2-1738840542 .fill-B2{fill:#676C7E;} + .d2-1738840542 .fill-B3{fill:#9499AB;} + .d2-1738840542 .fill-B4{fill:#CFD2DD;} + .d2-1738840542 .fill-B5{fill:#DEE1EB;} + .d2-1738840542 .fill-B6{fill:#EEF1F8;} + .d2-1738840542 .fill-AA2{fill:#676C7E;} + .d2-1738840542 .fill-AA4{fill:#CFD2DD;} + .d2-1738840542 .fill-AA5{fill:#DEE1EB;} + .d2-1738840542 .fill-AB4{fill:#CFD2DD;} + .d2-1738840542 .fill-AB5{fill:#DEE1EB;} + .d2-1738840542 .stroke-N1{stroke:#0A0F25;} + .d2-1738840542 .stroke-N2{stroke:#676C7E;} + .d2-1738840542 .stroke-N3{stroke:#9499AB;} + .d2-1738840542 .stroke-N4{stroke:#CFD2DD;} + .d2-1738840542 .stroke-N5{stroke:#DEE1EB;} + .d2-1738840542 .stroke-N6{stroke:#EEF1F8;} + .d2-1738840542 .stroke-N7{stroke:#FFFFFF;} + .d2-1738840542 .stroke-B1{stroke:#0A0F25;} + .d2-1738840542 .stroke-B2{stroke:#676C7E;} + .d2-1738840542 .stroke-B3{stroke:#9499AB;} + .d2-1738840542 .stroke-B4{stroke:#CFD2DD;} + .d2-1738840542 .stroke-B5{stroke:#DEE1EB;} + .d2-1738840542 .stroke-B6{stroke:#EEF1F8;} + .d2-1738840542 .stroke-AA2{stroke:#676C7E;} + .d2-1738840542 .stroke-AA4{stroke:#CFD2DD;} + .d2-1738840542 .stroke-AA5{stroke:#DEE1EB;} + .d2-1738840542 .stroke-AB4{stroke:#CFD2DD;} + .d2-1738840542 .stroke-AB5{stroke:#DEE1EB;} + .d2-1738840542 .background-color-N1{background-color:#0A0F25;} + .d2-1738840542 .background-color-N2{background-color:#676C7E;} + .d2-1738840542 .background-color-N3{background-color:#9499AB;} + .d2-1738840542 .background-color-N4{background-color:#CFD2DD;} + .d2-1738840542 .background-color-N5{background-color:#DEE1EB;} + .d2-1738840542 .background-color-N6{background-color:#EEF1F8;} + .d2-1738840542 .background-color-N7{background-color:#FFFFFF;} + .d2-1738840542 .background-color-B1{background-color:#0A0F25;} + .d2-1738840542 .background-color-B2{background-color:#676C7E;} + .d2-1738840542 .background-color-B3{background-color:#9499AB;} + .d2-1738840542 .background-color-B4{background-color:#CFD2DD;} + .d2-1738840542 .background-color-B5{background-color:#DEE1EB;} + .d2-1738840542 .background-color-B6{background-color:#EEF1F8;} + .d2-1738840542 .background-color-AA2{background-color:#676C7E;} + .d2-1738840542 .background-color-AA4{background-color:#CFD2DD;} + .d2-1738840542 .background-color-AA5{background-color:#DEE1EB;} + .d2-1738840542 .background-color-AB4{background-color:#CFD2DD;} + .d2-1738840542 .background-color-AB5{background-color:#DEE1EB;} + .d2-1738840542 .color-N1{color:#0A0F25;} + .d2-1738840542 .color-N2{color:#676C7E;} + .d2-1738840542 .color-N3{color:#9499AB;} + .d2-1738840542 .color-N4{color:#CFD2DD;} + .d2-1738840542 .color-N5{color:#DEE1EB;} + .d2-1738840542 .color-N6{color:#EEF1F8;} + .d2-1738840542 .color-N7{color:#FFFFFF;} + .d2-1738840542 .color-B1{color:#0A0F25;} + .d2-1738840542 .color-B2{color:#676C7E;} + .d2-1738840542 .color-B3{color:#9499AB;} + .d2-1738840542 .color-B4{color:#CFD2DD;} + .d2-1738840542 .color-B5{color:#DEE1EB;} + .d2-1738840542 .color-B6{color:#EEF1F8;} + .d2-1738840542 .color-AA2{color:#676C7E;} + .d2-1738840542 .color-AA4{color:#CFD2DD;} + .d2-1738840542 .color-AA5{color:#DEE1EB;} + .d2-1738840542 .color-AB4{color:#CFD2DD;} + .d2-1738840542 .color-AB5{color:#DEE1EB;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0A0F25;--color-border-muted:#676C7E;--color-neutral-muted:#EEF1F8;--color-accent-fg:#676C7E;--color-accent-emphasis:#676C7E;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1738840542);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-dark-d2-1738840542);mix-blend-mode:overlay}.sketch-overlay-B3{fill:url(#streaks-normal-d2-1738840542);mix-blend-mode:color-burn}.sketch-overlay-B4{fill:url(#streaks-normal-d2-1738840542);mix-blend-mode:color-burn}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1738840542);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1738840542);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1738840542);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-normal-d2-1738840542);mix-blend-mode:color-burn}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1738840542);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-normal-d2-1738840542);mix-blend-mode:color-burn}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1738840542);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1738840542);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1738840542);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1738840542);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1738840542);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1738840542);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1738840542);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1738840542);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> - + + - + + - + + -xyaitwasalli used to readdream + +xyaitwasalli used to readdream - - - - - - - - + + + + + + + + diff --git a/e2etests-cli/testdata/TestCLI_E2E/with-font.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/with-font.exp.svg index 8e1dacd1f..4e7c362d5 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/with-font.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/with-font.exp.svg @@ -1,16 +1,16 @@ -Why do computers get sick often?Because their Windows are always open! italic font + .d2-3769314794 .fill-N1{fill:#0A0F25;} + .d2-3769314794 .fill-N2{fill:#676C7E;} + .d2-3769314794 .fill-N3{fill:#9499AB;} + .d2-3769314794 .fill-N4{fill:#CFD2DD;} + .d2-3769314794 .fill-N5{fill:#DEE1EB;} + .d2-3769314794 .fill-N6{fill:#EEF1F8;} + .d2-3769314794 .fill-N7{fill:#FFFFFF;} + .d2-3769314794 .fill-B1{fill:#0D32B2;} + .d2-3769314794 .fill-B2{fill:#0D32B2;} + .d2-3769314794 .fill-B3{fill:#E3E9FD;} + .d2-3769314794 .fill-B4{fill:#E3E9FD;} + .d2-3769314794 .fill-B5{fill:#EDF0FD;} + .d2-3769314794 .fill-B6{fill:#F7F8FE;} + .d2-3769314794 .fill-AA2{fill:#4A6FF3;} + .d2-3769314794 .fill-AA4{fill:#EDF0FD;} + .d2-3769314794 .fill-AA5{fill:#F7F8FE;} + .d2-3769314794 .fill-AB4{fill:#EDF0FD;} + .d2-3769314794 .fill-AB5{fill:#F7F8FE;} + .d2-3769314794 .stroke-N1{stroke:#0A0F25;} + .d2-3769314794 .stroke-N2{stroke:#676C7E;} + .d2-3769314794 .stroke-N3{stroke:#9499AB;} + .d2-3769314794 .stroke-N4{stroke:#CFD2DD;} + .d2-3769314794 .stroke-N5{stroke:#DEE1EB;} + .d2-3769314794 .stroke-N6{stroke:#EEF1F8;} + .d2-3769314794 .stroke-N7{stroke:#FFFFFF;} + .d2-3769314794 .stroke-B1{stroke:#0D32B2;} + .d2-3769314794 .stroke-B2{stroke:#0D32B2;} + .d2-3769314794 .stroke-B3{stroke:#E3E9FD;} + .d2-3769314794 .stroke-B4{stroke:#E3E9FD;} + .d2-3769314794 .stroke-B5{stroke:#EDF0FD;} + .d2-3769314794 .stroke-B6{stroke:#F7F8FE;} + .d2-3769314794 .stroke-AA2{stroke:#4A6FF3;} + .d2-3769314794 .stroke-AA4{stroke:#EDF0FD;} + .d2-3769314794 .stroke-AA5{stroke:#F7F8FE;} + .d2-3769314794 .stroke-AB4{stroke:#EDF0FD;} + .d2-3769314794 .stroke-AB5{stroke:#F7F8FE;} + .d2-3769314794 .background-color-N1{background-color:#0A0F25;} + .d2-3769314794 .background-color-N2{background-color:#676C7E;} + .d2-3769314794 .background-color-N3{background-color:#9499AB;} + .d2-3769314794 .background-color-N4{background-color:#CFD2DD;} + .d2-3769314794 .background-color-N5{background-color:#DEE1EB;} + .d2-3769314794 .background-color-N6{background-color:#EEF1F8;} + .d2-3769314794 .background-color-N7{background-color:#FFFFFF;} + .d2-3769314794 .background-color-B1{background-color:#0D32B2;} + .d2-3769314794 .background-color-B2{background-color:#0D32B2;} + .d2-3769314794 .background-color-B3{background-color:#E3E9FD;} + .d2-3769314794 .background-color-B4{background-color:#E3E9FD;} + .d2-3769314794 .background-color-B5{background-color:#EDF0FD;} + .d2-3769314794 .background-color-B6{background-color:#F7F8FE;} + .d2-3769314794 .background-color-AA2{background-color:#4A6FF3;} + .d2-3769314794 .background-color-AA4{background-color:#EDF0FD;} + .d2-3769314794 .background-color-AA5{background-color:#F7F8FE;} + .d2-3769314794 .background-color-AB4{background-color:#EDF0FD;} + .d2-3769314794 .background-color-AB5{background-color:#F7F8FE;} + .d2-3769314794 .color-N1{color:#0A0F25;} + .d2-3769314794 .color-N2{color:#676C7E;} + .d2-3769314794 .color-N3{color:#9499AB;} + .d2-3769314794 .color-N4{color:#CFD2DD;} + .d2-3769314794 .color-N5{color:#DEE1EB;} + .d2-3769314794 .color-N6{color:#EEF1F8;} + .d2-3769314794 .color-N7{color:#FFFFFF;} + .d2-3769314794 .color-B1{color:#0D32B2;} + .d2-3769314794 .color-B2{color:#0D32B2;} + .d2-3769314794 .color-B3{color:#E3E9FD;} + .d2-3769314794 .color-B4{color:#E3E9FD;} + .d2-3769314794 .color-B5{color:#EDF0FD;} + .d2-3769314794 .color-B6{color:#F7F8FE;} + .d2-3769314794 .color-AA2{color:#4A6FF3;} + .d2-3769314794 .color-AA4{color:#EDF0FD;} + .d2-3769314794 .color-AA5{color:#F7F8FE;} + .d2-3769314794 .color-AB4{color:#EDF0FD;} + .d2-3769314794 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3769314794);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3769314794);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3769314794);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3769314794);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3769314794);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3769314794);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3769314794);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3769314794);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3769314794);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3769314794);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3769314794);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3769314794);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3769314794);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3769314794);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3769314794);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3769314794);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3769314794);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3769314794);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>Why do computers get sick often?Because their Windows are always open! italic font - - - + + + diff --git a/e2etests/e2e_test.go b/e2etests/e2e_test.go index 6eda5d980..bfe1f230b 100644 --- a/e2etests/e2e_test.go +++ b/e2etests/e2e_test.go @@ -250,7 +250,7 @@ func run(t *testing.T, tc testCase) { pathGotSVG := filepath.Join(dataPath, "sketch.got.svg") if len(diagram.Layers) > 0 || len(diagram.Scenarios) > 0 || len(diagram.Steps) > 0 { - masterID, err := diagram.HashID() + masterID, err := diagram.HashID(nil) assert.Success(t, err) renderOpts.MasterID = masterID } diff --git a/e2etests/report/main.go b/e2etests/report/main.go index b731ca71b..3c2c9a49d 100644 --- a/e2etests/report/main.go +++ b/e2etests/report/main.go @@ -5,7 +5,6 @@ import ( _ "embed" "flag" "fmt" - "io/ioutil" stdlog "log" "os" "os/exec" @@ -104,7 +103,7 @@ func main() { return err } if info.IsDir() { - files, err := ioutil.ReadDir(path) + files, err := os.ReadDir(path) if err != nil { panic(err) } @@ -112,7 +111,7 @@ func main() { var testFile os.FileInfo for _, f := range files { if strings.HasSuffix(f.Name(), "exp.svg") { - testFile = f + testFile, _ = f.Info() break } } diff --git a/e2etests/stable_test.go b/e2etests/stable_test.go index 56e85e132..4b2f6adf9 100644 --- a/e2etests/stable_test.go +++ b/e2etests/stable_test.go @@ -1381,30 +1381,24 @@ c: |md { name: "latex", script: `a: |latex -\\Huge{\\frac{\\alpha g^2}{\\omega^5} e^{[ -0.74\\bigl\\{\\frac{\\omega U_\\omega 19.5}{g}\\bigr\\}^{\\!-4}\\,]}} +\Huge{\frac{\alpha g^2}{\omega^5} e^{[ -0.74\bigl\{\frac{\omega U_\omega 19.5}{g}\bigr\}^{\!-4}\,]}} | - b: |latex e = mc^2 | - z: |latex -gibberish\\; math:\\sum_{i=0}^\\infty i^2 +gibberish\; math:\sum_{i=0}^\infty i^2 | - z -> a z -> b - a -> c b -> c sugar -> c c: mixed together - c -> solution: we get - Linear program: { formula: |latex - \\min_{ \\mathclap{\\substack{ x \\in \\mathbb{R}^n \\ x \\geq 0 \\ Ax \\leq b }}} c^T x + \min_{ \mathclap{\substack{ x \in \mathbb{R}^n \ x \geq 0 \ Ax \leq b }}} c^T x | } `, @@ -2331,6 +2325,29 @@ c <-> d: filled-circle { shape: circle style.filled: true } +}`, + }, + { + name: "box_arrowhead", + script: ` +a <-> b: box { + source-arrowhead: { + shape: box + } + target-arrowhead: { + shape: box + } +} + +c <-> d: filled-box { + source-arrowhead: { + shape: box + style.filled: true + } + target-arrowhead: { + shape: box + style.filled: true + } }`, }, { diff --git a/e2etests/testdata/files/arrowhead_scaling.d2 b/e2etests/testdata/files/arrowhead_scaling.d2 index f835029dd..12131768d 100644 --- a/e2etests/testdata/files/arrowhead_scaling.d2 +++ b/e2etests/testdata/files/arrowhead_scaling.d2 @@ -215,6 +215,78 @@ filled circle: { } } +box: { + start: "" + end: "" + + start.1 <-> end.1: 1 { + style.stroke-width: 1 + source-arrowhead.shape: box + target-arrowhead.shape: box + } + start.2 <-> end.2: 2 { + style.stroke-width: 2 + source-arrowhead.shape: box + target-arrowhead.shape: box + } + start.4 <-> end.4: 4 { + style.stroke-width: 4 + source-arrowhead.shape: box + target-arrowhead.shape: box + } + start.8 <-> end.8: 8 { + style.stroke-width: 8 + source-arrowhead.shape: box + target-arrowhead.shape: box + } + start.15 <-> end.15: 15 { + style.stroke-width: 15 + source-arrowhead.shape: box + target-arrowhead.shape: box + } +} + +filled-box: { + start: "" + end: "" + + start.1 <-> end.1: 1 { + style.stroke-width: 1 + source-arrowhead.shape: box + target-arrowhead.shape: box + source-arrowhead.style.filled: true + target-arrowhead.style.filled: true + } + start.2 <-> end.2: 2 { + style.stroke-width: 2 + source-arrowhead.shape: box + target-arrowhead.shape: box + source-arrowhead.style.filled: true + target-arrowhead.style.filled: true + } + start.4 <-> end.4: 4 { + style.stroke-width: 4 + source-arrowhead.shape: box + target-arrowhead.shape: box + source-arrowhead.style.filled: true + target-arrowhead.style.filled: true + } + start.8 <-> end.8: 8 { + style.stroke-width: 8 + source-arrowhead.shape: box + target-arrowhead.shape: box + source-arrowhead.style.filled: true + target-arrowhead.style.filled: true + } + start.15 <-> end.15: 15 { + style.stroke-width: 15 + source-arrowhead.shape: box + target-arrowhead.shape: box + source-arrowhead.style.filled: true + target-arrowhead.style.filled: true + } +} + cf one: { start: "" end: "" diff --git a/e2etests/testdata/files/grid_outside_labels.d2 b/e2etests/testdata/files/grid_outside_labels.d2 index 9f54d9234..adce4a554 100644 --- a/e2etests/testdata/files/grid_outside_labels.d2 +++ b/e2etests/testdata/files/grid_outside_labels.d2 @@ -4,61 +4,55 @@ container: ___________________________________container_________________________ amscd plugin: { ex: |tex - \\begin{CD} B @>{\\text{very long label}}>> C S^{{\\mathcal{W}}_\\Lambda}\\otimes T @>j>> T\\\\ @VVV V \\end{CD} + \begin{CD} B @>{\text{very long label}}>> C S^{{\mathcal{W}}_\Lambda}\otimes T @>j>> T\\ @VVV V \end{CD} | } braket plugin: { style.3d: true ex: |tex - \\bra{a}\\ket{b} + \bra{a}\ket{b} | } cancel plugin: { ex: |tex - \\cancel{Culture + 5} + \cancel{Culture + 5} | } - color plugin: { icon: https://icons.terrastruct.com/essentials/profits.svg icon.near: outside-right-center ex: |tex - \\textcolor{red}{y} = \\textcolor{green}{\\sin} x + \textcolor{red}{y} = \textcolor{green}{\sin} x | } - gensymb plugin: { ex: |tex - \\lambda = 10.6\\,\\micro\\mathrm{m} + \lambda = 10.6\,\micro\mathrm{m} | } - mhchem plugin: { style.multiple: true ex: |tex \ce{SO4^2- + Ba^2+ -> BaSO4 v} | } - physics plugin: { ex: |tex - \\var{F[g(x)]} - \\dd(\\cos\\theta) + \var{F[g(x)]} + \dd(\cos\theta) | } - multilines: { ex: |tex - \\displaylines{x = a + b \\\\ y = b + c} - \\sum_{k=1}^{n} h_{k} \\int_{0}^{1} \\bigl(\\partial_{k} f(x_{k-1}+t h_{k} e_{k}) -\\partial_{k} f(a)\\bigr) \\,dt + \displaylines{x = a + b \\ y = b + c} + \sum_{k=1}^{n} h_{k} \int_{0}^{1} \bigl(\partial_{k} f(x_{k-1}+t h_{k} e_{k}) -\partial_{k} f(a)\bigr) \,dt | } - asm: { ex: |latex - \\min_{ \\mathclap{\\substack{ x \\in \\mathbb{R}^n \\ x \\geq 0 \\ Ax \\leq b }}} c^T x + \min_{ \mathclap{\substack{ x \in \mathbb{R}^n \ x \geq 0 \ Ax \leq b }}} c^T x | } } diff --git a/e2etests/testdata/files/grid_with_latex.d2 b/e2etests/testdata/files/grid_with_latex.d2 index 9cb7245ed..e1a0f0fe2 100644 --- a/e2etests/testdata/files/grid_with_latex.d2 +++ b/e2etests/testdata/files/grid_with_latex.d2 @@ -19,7 +19,7 @@ y: { z: { grid-columns: 2 lim: |latex - \\lim_{h \\rightarrow 0 } \\frac{f(x+h)-f(x)}{h} + \lim_{h \rightarrow 0 } \frac{f(x+h)-f(x)}{h} | add: |latex 1 + 1 diff --git a/e2etests/testdata/measured/empty-class/dagre/board.exp.json b/e2etests/testdata/measured/empty-class/dagre/board.exp.json index 67c4dd5ba..512f8091b 100644 --- a/e2etests/testdata/measured/empty-class/dagre/board.exp.json +++ b/e2etests/testdata/measured/empty-class/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -63,6 +72,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/measured/empty-class/dagre/sketch.exp.svg b/e2etests/testdata/measured/empty-class/dagre/sketch.exp.svg index b4d7120b2..ce102d381 100644 --- a/e2etests/testdata/measured/empty-class/dagre/sketch.exp.svg +++ b/e2etests/testdata/measured/empty-class/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ - + .d2-1010130206 .fill-N1{fill:#0A0F25;} + .d2-1010130206 .fill-N2{fill:#676C7E;} + .d2-1010130206 .fill-N3{fill:#9499AB;} + .d2-1010130206 .fill-N4{fill:#CFD2DD;} + .d2-1010130206 .fill-N5{fill:#DEE1EB;} + .d2-1010130206 .fill-N6{fill:#EEF1F8;} + .d2-1010130206 .fill-N7{fill:#FFFFFF;} + .d2-1010130206 .fill-B1{fill:#0D32B2;} + .d2-1010130206 .fill-B2{fill:#0D32B2;} + .d2-1010130206 .fill-B3{fill:#E3E9FD;} + .d2-1010130206 .fill-B4{fill:#E3E9FD;} + .d2-1010130206 .fill-B5{fill:#EDF0FD;} + .d2-1010130206 .fill-B6{fill:#F7F8FE;} + .d2-1010130206 .fill-AA2{fill:#4A6FF3;} + .d2-1010130206 .fill-AA4{fill:#EDF0FD;} + .d2-1010130206 .fill-AA5{fill:#F7F8FE;} + .d2-1010130206 .fill-AB4{fill:#EDF0FD;} + .d2-1010130206 .fill-AB5{fill:#F7F8FE;} + .d2-1010130206 .stroke-N1{stroke:#0A0F25;} + .d2-1010130206 .stroke-N2{stroke:#676C7E;} + .d2-1010130206 .stroke-N3{stroke:#9499AB;} + .d2-1010130206 .stroke-N4{stroke:#CFD2DD;} + .d2-1010130206 .stroke-N5{stroke:#DEE1EB;} + .d2-1010130206 .stroke-N6{stroke:#EEF1F8;} + .d2-1010130206 .stroke-N7{stroke:#FFFFFF;} + .d2-1010130206 .stroke-B1{stroke:#0D32B2;} + .d2-1010130206 .stroke-B2{stroke:#0D32B2;} + .d2-1010130206 .stroke-B3{stroke:#E3E9FD;} + .d2-1010130206 .stroke-B4{stroke:#E3E9FD;} + .d2-1010130206 .stroke-B5{stroke:#EDF0FD;} + .d2-1010130206 .stroke-B6{stroke:#F7F8FE;} + .d2-1010130206 .stroke-AA2{stroke:#4A6FF3;} + .d2-1010130206 .stroke-AA4{stroke:#EDF0FD;} + .d2-1010130206 .stroke-AA5{stroke:#F7F8FE;} + .d2-1010130206 .stroke-AB4{stroke:#EDF0FD;} + .d2-1010130206 .stroke-AB5{stroke:#F7F8FE;} + .d2-1010130206 .background-color-N1{background-color:#0A0F25;} + .d2-1010130206 .background-color-N2{background-color:#676C7E;} + .d2-1010130206 .background-color-N3{background-color:#9499AB;} + .d2-1010130206 .background-color-N4{background-color:#CFD2DD;} + .d2-1010130206 .background-color-N5{background-color:#DEE1EB;} + .d2-1010130206 .background-color-N6{background-color:#EEF1F8;} + .d2-1010130206 .background-color-N7{background-color:#FFFFFF;} + .d2-1010130206 .background-color-B1{background-color:#0D32B2;} + .d2-1010130206 .background-color-B2{background-color:#0D32B2;} + .d2-1010130206 .background-color-B3{background-color:#E3E9FD;} + .d2-1010130206 .background-color-B4{background-color:#E3E9FD;} + .d2-1010130206 .background-color-B5{background-color:#EDF0FD;} + .d2-1010130206 .background-color-B6{background-color:#F7F8FE;} + .d2-1010130206 .background-color-AA2{background-color:#4A6FF3;} + .d2-1010130206 .background-color-AA4{background-color:#EDF0FD;} + .d2-1010130206 .background-color-AA5{background-color:#F7F8FE;} + .d2-1010130206 .background-color-AB4{background-color:#EDF0FD;} + .d2-1010130206 .background-color-AB5{background-color:#F7F8FE;} + .d2-1010130206 .color-N1{color:#0A0F25;} + .d2-1010130206 .color-N2{color:#676C7E;} + .d2-1010130206 .color-N3{color:#9499AB;} + .d2-1010130206 .color-N4{color:#CFD2DD;} + .d2-1010130206 .color-N5{color:#DEE1EB;} + .d2-1010130206 .color-N6{color:#EEF1F8;} + .d2-1010130206 .color-N7{color:#FFFFFF;} + .d2-1010130206 .color-B1{color:#0D32B2;} + .d2-1010130206 .color-B2{color:#0D32B2;} + .d2-1010130206 .color-B3{color:#E3E9FD;} + .d2-1010130206 .color-B4{color:#E3E9FD;} + .d2-1010130206 .color-B5{color:#EDF0FD;} + .d2-1010130206 .color-B6{color:#F7F8FE;} + .d2-1010130206 .color-AA2{color:#4A6FF3;} + .d2-1010130206 .color-AA4{color:#EDF0FD;} + .d2-1010130206 .color-AA5{color:#F7F8FE;} + .d2-1010130206 .color-AB4{color:#EDF0FD;} + .d2-1010130206 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1010130206);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1010130206);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1010130206);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1010130206);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1010130206);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1010130206);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1010130206);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1010130206);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1010130206);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1010130206);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1010130206);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1010130206);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1010130206);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1010130206);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1010130206);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1010130206);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1010130206);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1010130206);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> \ No newline at end of file diff --git a/e2etests/testdata/measured/empty-shape/dagre/board.exp.json b/e2etests/testdata/measured/empty-shape/dagre/board.exp.json index 48e996553..53efa8954 100644 --- a/e2etests/testdata/measured/empty-shape/dagre/board.exp.json +++ b/e2etests/testdata/measured/empty-shape/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -60,6 +69,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/measured/empty-shape/dagre/sketch.exp.svg b/e2etests/testdata/measured/empty-shape/dagre/sketch.exp.svg index 41344827a..e54fa2aa9 100644 --- a/e2etests/testdata/measured/empty-shape/dagre/sketch.exp.svg +++ b/e2etests/testdata/measured/empty-shape/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ - + .d2-358067632 .fill-N1{fill:#0A0F25;} + .d2-358067632 .fill-N2{fill:#676C7E;} + .d2-358067632 .fill-N3{fill:#9499AB;} + .d2-358067632 .fill-N4{fill:#CFD2DD;} + .d2-358067632 .fill-N5{fill:#DEE1EB;} + .d2-358067632 .fill-N6{fill:#EEF1F8;} + .d2-358067632 .fill-N7{fill:#FFFFFF;} + .d2-358067632 .fill-B1{fill:#0D32B2;} + .d2-358067632 .fill-B2{fill:#0D32B2;} + .d2-358067632 .fill-B3{fill:#E3E9FD;} + .d2-358067632 .fill-B4{fill:#E3E9FD;} + .d2-358067632 .fill-B5{fill:#EDF0FD;} + .d2-358067632 .fill-B6{fill:#F7F8FE;} + .d2-358067632 .fill-AA2{fill:#4A6FF3;} + .d2-358067632 .fill-AA4{fill:#EDF0FD;} + .d2-358067632 .fill-AA5{fill:#F7F8FE;} + .d2-358067632 .fill-AB4{fill:#EDF0FD;} + .d2-358067632 .fill-AB5{fill:#F7F8FE;} + .d2-358067632 .stroke-N1{stroke:#0A0F25;} + .d2-358067632 .stroke-N2{stroke:#676C7E;} + .d2-358067632 .stroke-N3{stroke:#9499AB;} + .d2-358067632 .stroke-N4{stroke:#CFD2DD;} + .d2-358067632 .stroke-N5{stroke:#DEE1EB;} + .d2-358067632 .stroke-N6{stroke:#EEF1F8;} + .d2-358067632 .stroke-N7{stroke:#FFFFFF;} + .d2-358067632 .stroke-B1{stroke:#0D32B2;} + .d2-358067632 .stroke-B2{stroke:#0D32B2;} + .d2-358067632 .stroke-B3{stroke:#E3E9FD;} + .d2-358067632 .stroke-B4{stroke:#E3E9FD;} + .d2-358067632 .stroke-B5{stroke:#EDF0FD;} + .d2-358067632 .stroke-B6{stroke:#F7F8FE;} + .d2-358067632 .stroke-AA2{stroke:#4A6FF3;} + .d2-358067632 .stroke-AA4{stroke:#EDF0FD;} + .d2-358067632 .stroke-AA5{stroke:#F7F8FE;} + .d2-358067632 .stroke-AB4{stroke:#EDF0FD;} + .d2-358067632 .stroke-AB5{stroke:#F7F8FE;} + .d2-358067632 .background-color-N1{background-color:#0A0F25;} + .d2-358067632 .background-color-N2{background-color:#676C7E;} + .d2-358067632 .background-color-N3{background-color:#9499AB;} + .d2-358067632 .background-color-N4{background-color:#CFD2DD;} + .d2-358067632 .background-color-N5{background-color:#DEE1EB;} + .d2-358067632 .background-color-N6{background-color:#EEF1F8;} + .d2-358067632 .background-color-N7{background-color:#FFFFFF;} + .d2-358067632 .background-color-B1{background-color:#0D32B2;} + .d2-358067632 .background-color-B2{background-color:#0D32B2;} + .d2-358067632 .background-color-B3{background-color:#E3E9FD;} + .d2-358067632 .background-color-B4{background-color:#E3E9FD;} + .d2-358067632 .background-color-B5{background-color:#EDF0FD;} + .d2-358067632 .background-color-B6{background-color:#F7F8FE;} + .d2-358067632 .background-color-AA2{background-color:#4A6FF3;} + .d2-358067632 .background-color-AA4{background-color:#EDF0FD;} + .d2-358067632 .background-color-AA5{background-color:#F7F8FE;} + .d2-358067632 .background-color-AB4{background-color:#EDF0FD;} + .d2-358067632 .background-color-AB5{background-color:#F7F8FE;} + .d2-358067632 .color-N1{color:#0A0F25;} + .d2-358067632 .color-N2{color:#676C7E;} + .d2-358067632 .color-N3{color:#9499AB;} + .d2-358067632 .color-N4{color:#CFD2DD;} + .d2-358067632 .color-N5{color:#DEE1EB;} + .d2-358067632 .color-N6{color:#EEF1F8;} + .d2-358067632 .color-N7{color:#FFFFFF;} + .d2-358067632 .color-B1{color:#0D32B2;} + .d2-358067632 .color-B2{color:#0D32B2;} + .d2-358067632 .color-B3{color:#E3E9FD;} + .d2-358067632 .color-B4{color:#E3E9FD;} + .d2-358067632 .color-B5{color:#EDF0FD;} + .d2-358067632 .color-B6{color:#F7F8FE;} + .d2-358067632 .color-AA2{color:#4A6FF3;} + .d2-358067632 .color-AA4{color:#EDF0FD;} + .d2-358067632 .color-AA5{color:#F7F8FE;} + .d2-358067632 .color-AB4{color:#EDF0FD;} + .d2-358067632 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-358067632);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-358067632);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-358067632);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-358067632);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-358067632);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-358067632);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-358067632);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-358067632);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-358067632);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-358067632);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-358067632);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-358067632);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-358067632);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-358067632);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-358067632);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-358067632);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-358067632);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-358067632);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> \ No newline at end of file diff --git a/e2etests/testdata/measured/empty-sql_table/dagre/board.exp.json b/e2etests/testdata/measured/empty-sql_table/dagre/board.exp.json index 3256c8a67..b850e4f5e 100644 --- a/e2etests/testdata/measured/empty-sql_table/dagre/board.exp.json +++ b/e2etests/testdata/measured/empty-sql_table/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -63,6 +72,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/measured/empty-sql_table/dagre/sketch.exp.svg b/e2etests/testdata/measured/empty-sql_table/dagre/sketch.exp.svg index 9e4d18750..ebd6ec258 100644 --- a/e2etests/testdata/measured/empty-sql_table/dagre/sketch.exp.svg +++ b/e2etests/testdata/measured/empty-sql_table/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ - + .d2-1613624084 .fill-N1{fill:#0A0F25;} + .d2-1613624084 .fill-N2{fill:#676C7E;} + .d2-1613624084 .fill-N3{fill:#9499AB;} + .d2-1613624084 .fill-N4{fill:#CFD2DD;} + .d2-1613624084 .fill-N5{fill:#DEE1EB;} + .d2-1613624084 .fill-N6{fill:#EEF1F8;} + .d2-1613624084 .fill-N7{fill:#FFFFFF;} + .d2-1613624084 .fill-B1{fill:#0D32B2;} + .d2-1613624084 .fill-B2{fill:#0D32B2;} + .d2-1613624084 .fill-B3{fill:#E3E9FD;} + .d2-1613624084 .fill-B4{fill:#E3E9FD;} + .d2-1613624084 .fill-B5{fill:#EDF0FD;} + .d2-1613624084 .fill-B6{fill:#F7F8FE;} + .d2-1613624084 .fill-AA2{fill:#4A6FF3;} + .d2-1613624084 .fill-AA4{fill:#EDF0FD;} + .d2-1613624084 .fill-AA5{fill:#F7F8FE;} + .d2-1613624084 .fill-AB4{fill:#EDF0FD;} + .d2-1613624084 .fill-AB5{fill:#F7F8FE;} + .d2-1613624084 .stroke-N1{stroke:#0A0F25;} + .d2-1613624084 .stroke-N2{stroke:#676C7E;} + .d2-1613624084 .stroke-N3{stroke:#9499AB;} + .d2-1613624084 .stroke-N4{stroke:#CFD2DD;} + .d2-1613624084 .stroke-N5{stroke:#DEE1EB;} + .d2-1613624084 .stroke-N6{stroke:#EEF1F8;} + .d2-1613624084 .stroke-N7{stroke:#FFFFFF;} + .d2-1613624084 .stroke-B1{stroke:#0D32B2;} + .d2-1613624084 .stroke-B2{stroke:#0D32B2;} + .d2-1613624084 .stroke-B3{stroke:#E3E9FD;} + .d2-1613624084 .stroke-B4{stroke:#E3E9FD;} + .d2-1613624084 .stroke-B5{stroke:#EDF0FD;} + .d2-1613624084 .stroke-B6{stroke:#F7F8FE;} + .d2-1613624084 .stroke-AA2{stroke:#4A6FF3;} + .d2-1613624084 .stroke-AA4{stroke:#EDF0FD;} + .d2-1613624084 .stroke-AA5{stroke:#F7F8FE;} + .d2-1613624084 .stroke-AB4{stroke:#EDF0FD;} + .d2-1613624084 .stroke-AB5{stroke:#F7F8FE;} + .d2-1613624084 .background-color-N1{background-color:#0A0F25;} + .d2-1613624084 .background-color-N2{background-color:#676C7E;} + .d2-1613624084 .background-color-N3{background-color:#9499AB;} + .d2-1613624084 .background-color-N4{background-color:#CFD2DD;} + .d2-1613624084 .background-color-N5{background-color:#DEE1EB;} + .d2-1613624084 .background-color-N6{background-color:#EEF1F8;} + .d2-1613624084 .background-color-N7{background-color:#FFFFFF;} + .d2-1613624084 .background-color-B1{background-color:#0D32B2;} + .d2-1613624084 .background-color-B2{background-color:#0D32B2;} + .d2-1613624084 .background-color-B3{background-color:#E3E9FD;} + .d2-1613624084 .background-color-B4{background-color:#E3E9FD;} + .d2-1613624084 .background-color-B5{background-color:#EDF0FD;} + .d2-1613624084 .background-color-B6{background-color:#F7F8FE;} + .d2-1613624084 .background-color-AA2{background-color:#4A6FF3;} + .d2-1613624084 .background-color-AA4{background-color:#EDF0FD;} + .d2-1613624084 .background-color-AA5{background-color:#F7F8FE;} + .d2-1613624084 .background-color-AB4{background-color:#EDF0FD;} + .d2-1613624084 .background-color-AB5{background-color:#F7F8FE;} + .d2-1613624084 .color-N1{color:#0A0F25;} + .d2-1613624084 .color-N2{color:#676C7E;} + .d2-1613624084 .color-N3{color:#9499AB;} + .d2-1613624084 .color-N4{color:#CFD2DD;} + .d2-1613624084 .color-N5{color:#DEE1EB;} + .d2-1613624084 .color-N6{color:#EEF1F8;} + .d2-1613624084 .color-N7{color:#FFFFFF;} + .d2-1613624084 .color-B1{color:#0D32B2;} + .d2-1613624084 .color-B2{color:#0D32B2;} + .d2-1613624084 .color-B3{color:#E3E9FD;} + .d2-1613624084 .color-B4{color:#E3E9FD;} + .d2-1613624084 .color-B5{color:#EDF0FD;} + .d2-1613624084 .color-B6{color:#F7F8FE;} + .d2-1613624084 .color-AA2{color:#4A6FF3;} + .d2-1613624084 .color-AA4{color:#EDF0FD;} + .d2-1613624084 .color-AA5{color:#F7F8FE;} + .d2-1613624084 .color-AB4{color:#EDF0FD;} + .d2-1613624084 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1613624084);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1613624084);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1613624084);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1613624084);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1613624084);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1613624084);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1613624084);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1613624084);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1613624084);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1613624084);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1613624084);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1613624084);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1613624084);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1613624084);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1613624084);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1613624084);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1613624084);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1613624084);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> \ No newline at end of file diff --git a/e2etests/testdata/patterns/3d/dagre/board.exp.json b/e2etests/testdata/patterns/3d/dagre/board.exp.json index 7f4aaad05..f2a9a9ff7 100644 --- a/e2etests/testdata/patterns/3d/dagre/board.exp.json +++ b/e2etests/testdata/patterns/3d/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -19,6 +27,7 @@ "fill": "B6", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -61,6 +70,7 @@ "fill": "N5", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -104,6 +114,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/patterns/3d/dagre/sketch.exp.svg b/e2etests/testdata/patterns/3d/dagre/sketch.exp.svg index b69400505..6fe8cc73c 100644 --- a/e2etests/testdata/patterns/3d/dagre/sketch.exp.svg +++ b/e2etests/testdata/patterns/3d/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ - +}]]> @@ -122,12 +122,12 @@ - + -x +x -y +y - - + +     \ No newline at end of file diff --git a/e2etests/testdata/patterns/all_shapes/dagre/board.exp.json b/e2etests/testdata/patterns/all_shapes/dagre/board.exp.json index b5911c6dc..4f4cdfe01 100644 --- a/e2etests/testdata/patterns/all_shapes/dagre/board.exp.json +++ b/e2etests/testdata/patterns/all_shapes/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -19,6 +27,7 @@ "fill": "B6", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -61,6 +70,7 @@ "fill": "B6", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -103,6 +113,7 @@ "fill": "AB4", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -145,6 +156,7 @@ "fill": "N5", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -187,6 +199,7 @@ "fill": "AB4", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -229,6 +242,7 @@ "fill": "AA4", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -271,6 +285,7 @@ "fill": "N5", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -313,6 +328,7 @@ "fill": "AA4", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -355,6 +371,7 @@ "fill": "AB4", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -397,6 +414,7 @@ "fill": "N7", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -439,6 +457,7 @@ "fill": "AA4", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -481,6 +500,7 @@ "fill": "B3", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -523,6 +543,7 @@ "fill": "N4", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -565,6 +586,7 @@ "fill": "B6", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -607,6 +629,7 @@ "fill": "B6", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -649,6 +672,7 @@ "fill": "N5", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -691,6 +715,7 @@ "fill": "N7", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -743,6 +768,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 55.5, @@ -790,6 +816,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 55.5, @@ -837,6 +864,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 269, @@ -884,6 +912,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 269, @@ -931,6 +960,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 497, @@ -978,6 +1008,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 497, @@ -1025,6 +1056,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 685, @@ -1072,6 +1104,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 684, @@ -1119,6 +1152,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 870, @@ -1166,6 +1200,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 870, @@ -1213,6 +1248,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1072, @@ -1253,6 +1289,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/patterns/all_shapes/dagre/sketch.exp.svg b/e2etests/testdata/patterns/all_shapes/dagre/sketch.exp.svg index c643b8a21..8b18fc8d5 100644 --- a/e2etests/testdata/patterns/all_shapes/dagre/sketch.exp.svg +++ b/e2etests/testdata/patterns/all_shapes/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ - +}]]> @@ -122,23 +122,23 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud +rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/patterns/multiple/dagre/board.exp.json b/e2etests/testdata/patterns/multiple/dagre/board.exp.json index 90e450ae6..508c66237 100644 --- a/e2etests/testdata/patterns/multiple/dagre/board.exp.json +++ b/e2etests/testdata/patterns/multiple/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -19,6 +27,7 @@ "fill": "B6", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -61,6 +70,7 @@ "fill": "B6", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -103,6 +113,7 @@ "fill": "AB4", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -145,6 +156,7 @@ "fill": "N5", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -187,6 +199,7 @@ "fill": "AB4", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -229,6 +242,7 @@ "fill": "AA4", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -271,6 +285,7 @@ "fill": "N5", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -313,6 +328,7 @@ "fill": "AA4", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -355,6 +371,7 @@ "fill": "AB4", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -397,6 +414,7 @@ "fill": "N7", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -439,6 +457,7 @@ "fill": "AA4", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -481,6 +500,7 @@ "fill": "B3", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -523,6 +543,7 @@ "fill": "N4", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -565,6 +586,7 @@ "fill": "B6", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -607,6 +629,7 @@ "fill": "B6", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -649,6 +672,7 @@ "fill": "N5", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -691,6 +715,7 @@ "fill": "N7", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -743,6 +768,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 55.5, @@ -790,6 +816,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 55.5, @@ -837,6 +864,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 279, @@ -884,6 +912,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 279, @@ -931,6 +960,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 507, @@ -978,6 +1008,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 507, @@ -1025,6 +1056,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 705, @@ -1072,6 +1104,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 704, @@ -1119,6 +1152,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 890, @@ -1166,6 +1200,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 890, @@ -1213,6 +1248,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1102, @@ -1253,6 +1289,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/patterns/multiple/dagre/sketch.exp.svg b/e2etests/testdata/patterns/multiple/dagre/sketch.exp.svg index ed432b0fe..02ff92a14 100644 --- a/e2etests/testdata/patterns/multiple/dagre/sketch.exp.svg +++ b/e2etests/testdata/patterns/multiple/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ - +}]]> @@ -122,23 +122,23 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud +rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/patterns/paper/dagre/board.exp.json b/e2etests/testdata/patterns/paper/dagre/board.exp.json index 9c14c6fca..0ce49cc63 100644 --- a/e2etests/testdata/patterns/paper/dagre/board.exp.json +++ b/e2etests/testdata/patterns/paper/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -19,6 +27,7 @@ "fill": "#8F5A3C", "fillPattern": "paper", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -61,6 +70,7 @@ "fill": "#D0104C", "fillPattern": "paper", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -103,6 +113,7 @@ "fill": "AB4", "fillPattern": "paper", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -145,6 +156,7 @@ "fill": "N5", "fillPattern": "paper", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -187,6 +199,7 @@ "fill": "AB4", "fillPattern": "paper", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -229,6 +242,7 @@ "fill": "AA4", "fillPattern": "paper", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -271,6 +285,7 @@ "fill": "N5", "fillPattern": "paper", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -313,6 +328,7 @@ "fill": "AA4", "fillPattern": "paper", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -355,6 +371,7 @@ "fill": "AB4", "fillPattern": "paper", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -397,6 +414,7 @@ "fill": "N7", "fillPattern": "paper", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -439,6 +457,7 @@ "fill": "AA4", "fillPattern": "paper", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -481,6 +500,7 @@ "fill": "B3", "fillPattern": "paper", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -523,6 +543,7 @@ "fill": "N4", "fillPattern": "paper", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -565,6 +586,7 @@ "fill": "B6", "fillPattern": "paper", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -607,6 +629,7 @@ "fill": "B6", "fillPattern": "paper", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -649,6 +672,7 @@ "fill": "N5", "fillPattern": "paper", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -691,6 +715,7 @@ "fill": "N7", "fillPattern": "paper", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -743,6 +768,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 55.5, @@ -790,6 +816,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 55.5, @@ -837,6 +864,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 269, @@ -884,6 +912,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 269, @@ -931,6 +960,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 497, @@ -978,6 +1008,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 497, @@ -1025,6 +1056,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 685, @@ -1072,6 +1104,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 684, @@ -1119,6 +1152,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 870, @@ -1166,6 +1200,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 870, @@ -1213,6 +1248,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1072, @@ -1253,6 +1289,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/patterns/paper/dagre/sketch.exp.svg b/e2etests/testdata/patterns/paper/dagre/sketch.exp.svg index bfa9ed709..a6cb3ac1c 100644 --- a/e2etests/testdata/patterns/paper/dagre/sketch.exp.svg +++ b/e2etests/testdata/patterns/paper/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ - +}]]> - - + + - + @@ -1146,30 +1146,30 @@ - + -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud +rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/patterns/real-lines/dagre/board.exp.json b/e2etests/testdata/patterns/real-lines/dagre/board.exp.json index 2adadd4fd..0bfa9a90e 100644 --- a/e2etests/testdata/patterns/real-lines/dagre/board.exp.json +++ b/e2etests/testdata/patterns/real-lines/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -19,6 +27,7 @@ "fill": "#E7E9EE", "fillPattern": "lines", "stroke": "black", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -61,6 +70,7 @@ "fill": "#F5F6F9", "fillPattern": "lines", "stroke": "black", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -102,6 +112,7 @@ "borderRadius": 0, "fill": "white", "stroke": "black", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -143,6 +154,7 @@ "borderRadius": 0, "fill": "white", "stroke": "black", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -185,6 +197,7 @@ "fill": "N1", "fillPattern": "lines", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -344,6 +357,7 @@ "fill": "N1", "fillPattern": "grain", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -512,6 +526,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 163, @@ -559,6 +574,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 180, @@ -606,6 +622,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 198, @@ -653,6 +670,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 557.5, @@ -693,6 +711,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/patterns/real-lines/dagre/sketch.exp.svg b/e2etests/testdata/patterns/real-lines/dagre/sketch.exp.svg index 33a1db096..ec0529359 100644 --- a/e2etests/testdata/patterns/real-lines/dagre/sketch.exp.svg +++ b/e2etests/testdata/patterns/real-lines/dagre/sketch.exp.svg @@ -1,30 +1,30 @@ - +}]]> @@ -131,27 +131,27 @@ - - - + + + - - + + - + - + -NETWORKcostumesidintPKsillinessintmonsterintlast_updatedtimestampmonstersidintPKmoviestringweightintlast_updatedtimestampCELL TOWERSATELLITESTRANSMITTER SENDSENDSEND +NETWORKcostumesidintPKsillinessintmonsterintlast_updatedtimestampmonstersidintPKmoviestringweightintlast_updatedtimestampCELL TOWERSATELLITESTRANSMITTER SENDSENDSEND - - - - - - - + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/patterns/real/dagre/board.exp.json b/e2etests/testdata/patterns/real/dagre/board.exp.json index 57fd1e8e5..50155484d 100644 --- a/e2etests/testdata/patterns/real/dagre/board.exp.json +++ b/e2etests/testdata/patterns/real/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -19,6 +27,7 @@ "fill": "#E7E9EE", "fillPattern": "dots", "stroke": "black", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -61,6 +70,7 @@ "fill": "#F5F6F9", "fillPattern": "dots", "stroke": "black", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -102,6 +112,7 @@ "borderRadius": 0, "fill": "white", "stroke": "black", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -143,6 +154,7 @@ "borderRadius": 0, "fill": "white", "stroke": "black", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -194,6 +206,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 152, @@ -241,6 +254,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 180, @@ -288,6 +302,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 209, @@ -328,6 +343,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/patterns/real/dagre/sketch.exp.svg b/e2etests/testdata/patterns/real/dagre/sketch.exp.svg index 565a19698..6d4c7c003 100644 --- a/e2etests/testdata/patterns/real/dagre/sketch.exp.svg +++ b/e2etests/testdata/patterns/real/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ - +}]]> @@ -136,13 +136,13 @@ -NETWORKCELL TOWERSATELLITESTRANSMITTER SENDSENDSEND +NETWORKCELL TOWERSATELLITESTRANSMITTER SENDSENDSEND - - - - - - - + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/patterns/root-dots-with-fill/dagre/board.exp.json b/e2etests/testdata/patterns/root-dots-with-fill/dagre/board.exp.json index fa2e72a45..20325b3b5 100644 --- a/e2etests/testdata/patterns/root-dots-with-fill/dagre/board.exp.json +++ b/e2etests/testdata/patterns/root-dots-with-fill/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -233,6 +246,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 191, @@ -280,6 +294,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 27, @@ -327,6 +342,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 192, @@ -374,6 +390,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 243, @@ -421,6 +438,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 244, @@ -474,6 +492,7 @@ "fill": "honeydew", "fillPattern": "dots", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/patterns/root-dots-with-fill/dagre/sketch.exp.svg b/e2etests/testdata/patterns/root-dots-with-fill/dagre/sketch.exp.svg index f65a6a2f3..b48a4e3af 100644 --- a/e2etests/testdata/patterns/root-dots-with-fill/dagre/sketch.exp.svg +++ b/e2etests/testdata/patterns/root-dots-with-fill/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ - +}]]> @@ -122,11 +122,11 @@ -xyzabcdg +xyzabcdg - - - - - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/patterns/root-dots/dagre/board.exp.json b/e2etests/testdata/patterns/root-dots/dagre/board.exp.json index e70d89feb..ecab671bb 100644 --- a/e2etests/testdata/patterns/root-dots/dagre/board.exp.json +++ b/e2etests/testdata/patterns/root-dots/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -233,6 +246,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 191, @@ -280,6 +294,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 27, @@ -327,6 +342,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 192, @@ -374,6 +390,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 243, @@ -421,6 +438,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 244, @@ -474,6 +492,7 @@ "fill": "N7", "fillPattern": "dots", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/patterns/root-dots/dagre/sketch.exp.svg b/e2etests/testdata/patterns/root-dots/dagre/sketch.exp.svg index 75d063765..05fe63518 100644 --- a/e2etests/testdata/patterns/root-dots/dagre/sketch.exp.svg +++ b/e2etests/testdata/patterns/root-dots/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ - +}]]> @@ -122,11 +122,11 @@ -xyzabcdg +xyzabcdg - - - - - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/patterns/shape/dagre/board.exp.json b/e2etests/testdata/patterns/shape/dagre/board.exp.json index cabca31fb..0bf7053d0 100644 --- a/e2etests/testdata/patterns/shape/dagre/board.exp.json +++ b/e2etests/testdata/patterns/shape/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -19,6 +27,7 @@ "fill": "B6", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -60,6 +69,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -101,6 +111,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -143,6 +154,7 @@ "fill": "B6", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -184,6 +196,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -235,6 +248,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 191, @@ -282,6 +296,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 27, @@ -329,6 +344,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 192, @@ -376,6 +392,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 243, @@ -423,6 +440,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 244, @@ -475,6 +493,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/patterns/shape/dagre/sketch.exp.svg b/e2etests/testdata/patterns/shape/dagre/sketch.exp.svg index cb55bbe9d..e118dcdae 100644 --- a/e2etests/testdata/patterns/shape/dagre/sketch.exp.svg +++ b/e2etests/testdata/patterns/shape/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ - +}]]> @@ -122,11 +122,11 @@ -xyzabcdg +xyzabcdg - - - - - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/ampersand-escape/dagre/board.exp.json b/e2etests/testdata/regression/ampersand-escape/dagre/board.exp.json index f5f27d395..a6f2d717d 100644 --- a/e2etests/testdata/regression/ampersand-escape/dagre/board.exp.json +++ b/e2etests/testdata/regression/ampersand-escape/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -10,7 +18,7 @@ "x": 0, "y": 0 }, - "width": 98, + "width": 66, "height": 66, "opacity": 1, "strokeDash": 0, @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -61,6 +70,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/ampersand-escape/dagre/sketch.exp.svg b/e2etests/testdata/regression/ampersand-escape/dagre/sketch.exp.svg index d5b6cdfec..7f1e8215c 100644 --- a/e2etests/testdata/regression/ampersand-escape/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/ampersand-escape/dagre/sketch.exp.svg @@ -1,12 +1,12 @@ -&∈beans & ricebeans & rice - + .d2-4189705711 .fill-N1{fill:#0A0F25;} + .d2-4189705711 .fill-N2{fill:#676C7E;} + .d2-4189705711 .fill-N3{fill:#9499AB;} + .d2-4189705711 .fill-N4{fill:#CFD2DD;} + .d2-4189705711 .fill-N5{fill:#DEE1EB;} + .d2-4189705711 .fill-N6{fill:#EEF1F8;} + .d2-4189705711 .fill-N7{fill:#FFFFFF;} + .d2-4189705711 .fill-B1{fill:#0D32B2;} + .d2-4189705711 .fill-B2{fill:#0D32B2;} + .d2-4189705711 .fill-B3{fill:#E3E9FD;} + .d2-4189705711 .fill-B4{fill:#E3E9FD;} + .d2-4189705711 .fill-B5{fill:#EDF0FD;} + .d2-4189705711 .fill-B6{fill:#F7F8FE;} + .d2-4189705711 .fill-AA2{fill:#4A6FF3;} + .d2-4189705711 .fill-AA4{fill:#EDF0FD;} + .d2-4189705711 .fill-AA5{fill:#F7F8FE;} + .d2-4189705711 .fill-AB4{fill:#EDF0FD;} + .d2-4189705711 .fill-AB5{fill:#F7F8FE;} + .d2-4189705711 .stroke-N1{stroke:#0A0F25;} + .d2-4189705711 .stroke-N2{stroke:#676C7E;} + .d2-4189705711 .stroke-N3{stroke:#9499AB;} + .d2-4189705711 .stroke-N4{stroke:#CFD2DD;} + .d2-4189705711 .stroke-N5{stroke:#DEE1EB;} + .d2-4189705711 .stroke-N6{stroke:#EEF1F8;} + .d2-4189705711 .stroke-N7{stroke:#FFFFFF;} + .d2-4189705711 .stroke-B1{stroke:#0D32B2;} + .d2-4189705711 .stroke-B2{stroke:#0D32B2;} + .d2-4189705711 .stroke-B3{stroke:#E3E9FD;} + .d2-4189705711 .stroke-B4{stroke:#E3E9FD;} + .d2-4189705711 .stroke-B5{stroke:#EDF0FD;} + .d2-4189705711 .stroke-B6{stroke:#F7F8FE;} + .d2-4189705711 .stroke-AA2{stroke:#4A6FF3;} + .d2-4189705711 .stroke-AA4{stroke:#EDF0FD;} + .d2-4189705711 .stroke-AA5{stroke:#F7F8FE;} + .d2-4189705711 .stroke-AB4{stroke:#EDF0FD;} + .d2-4189705711 .stroke-AB5{stroke:#F7F8FE;} + .d2-4189705711 .background-color-N1{background-color:#0A0F25;} + .d2-4189705711 .background-color-N2{background-color:#676C7E;} + .d2-4189705711 .background-color-N3{background-color:#9499AB;} + .d2-4189705711 .background-color-N4{background-color:#CFD2DD;} + .d2-4189705711 .background-color-N5{background-color:#DEE1EB;} + .d2-4189705711 .background-color-N6{background-color:#EEF1F8;} + .d2-4189705711 .background-color-N7{background-color:#FFFFFF;} + .d2-4189705711 .background-color-B1{background-color:#0D32B2;} + .d2-4189705711 .background-color-B2{background-color:#0D32B2;} + .d2-4189705711 .background-color-B3{background-color:#E3E9FD;} + .d2-4189705711 .background-color-B4{background-color:#E3E9FD;} + .d2-4189705711 .background-color-B5{background-color:#EDF0FD;} + .d2-4189705711 .background-color-B6{background-color:#F7F8FE;} + .d2-4189705711 .background-color-AA2{background-color:#4A6FF3;} + .d2-4189705711 .background-color-AA4{background-color:#EDF0FD;} + .d2-4189705711 .background-color-AA5{background-color:#F7F8FE;} + .d2-4189705711 .background-color-AB4{background-color:#EDF0FD;} + .d2-4189705711 .background-color-AB5{background-color:#F7F8FE;} + .d2-4189705711 .color-N1{color:#0A0F25;} + .d2-4189705711 .color-N2{color:#676C7E;} + .d2-4189705711 .color-N3{color:#9499AB;} + .d2-4189705711 .color-N4{color:#CFD2DD;} + .d2-4189705711 .color-N5{color:#DEE1EB;} + .d2-4189705711 .color-N6{color:#EEF1F8;} + .d2-4189705711 .color-N7{color:#FFFFFF;} + .d2-4189705711 .color-B1{color:#0D32B2;} + .d2-4189705711 .color-B2{color:#0D32B2;} + .d2-4189705711 .color-B3{color:#E3E9FD;} + .d2-4189705711 .color-B4{color:#E3E9FD;} + .d2-4189705711 .color-B5{color:#EDF0FD;} + .d2-4189705711 .color-B6{color:#F7F8FE;} + .d2-4189705711 .color-AA2{color:#4A6FF3;} + .d2-4189705711 .color-AA4{color:#EDF0FD;} + .d2-4189705711 .color-AA5{color:#F7F8FE;} + .d2-4189705711 .color-AB4{color:#EDF0FD;} + .d2-4189705711 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4189705711);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4189705711);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4189705711);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4189705711);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4189705711);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4189705711);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4189705711);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4189705711);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4189705711);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4189705711);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4189705711);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4189705711);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4189705711);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4189705711);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4189705711);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4189705711);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4189705711);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4189705711);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>&∈beans & ricebeans & rice + - + - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/ampersand-escape/elk/board.exp.json b/e2etests/testdata/regression/ampersand-escape/elk/board.exp.json index c135331d8..8b7f5ed59 100644 --- a/e2etests/testdata/regression/ampersand-escape/elk/board.exp.json +++ b/e2etests/testdata/regression/ampersand-escape/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -10,7 +18,7 @@ "x": 12, "y": 12 }, - "width": 98, + "width": 66, "height": 66, "opacity": 1, "strokeDash": 0, @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -61,6 +70,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/ampersand-escape/elk/sketch.exp.svg b/e2etests/testdata/regression/ampersand-escape/elk/sketch.exp.svg index 3a37371a8..8bd543771 100644 --- a/e2etests/testdata/regression/ampersand-escape/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/ampersand-escape/elk/sketch.exp.svg @@ -1,12 +1,12 @@ -&∈beans & ricebeans & rice - + .d2-424418503 .fill-N1{fill:#0A0F25;} + .d2-424418503 .fill-N2{fill:#676C7E;} + .d2-424418503 .fill-N3{fill:#9499AB;} + .d2-424418503 .fill-N4{fill:#CFD2DD;} + .d2-424418503 .fill-N5{fill:#DEE1EB;} + .d2-424418503 .fill-N6{fill:#EEF1F8;} + .d2-424418503 .fill-N7{fill:#FFFFFF;} + .d2-424418503 .fill-B1{fill:#0D32B2;} + .d2-424418503 .fill-B2{fill:#0D32B2;} + .d2-424418503 .fill-B3{fill:#E3E9FD;} + .d2-424418503 .fill-B4{fill:#E3E9FD;} + .d2-424418503 .fill-B5{fill:#EDF0FD;} + .d2-424418503 .fill-B6{fill:#F7F8FE;} + .d2-424418503 .fill-AA2{fill:#4A6FF3;} + .d2-424418503 .fill-AA4{fill:#EDF0FD;} + .d2-424418503 .fill-AA5{fill:#F7F8FE;} + .d2-424418503 .fill-AB4{fill:#EDF0FD;} + .d2-424418503 .fill-AB5{fill:#F7F8FE;} + .d2-424418503 .stroke-N1{stroke:#0A0F25;} + .d2-424418503 .stroke-N2{stroke:#676C7E;} + .d2-424418503 .stroke-N3{stroke:#9499AB;} + .d2-424418503 .stroke-N4{stroke:#CFD2DD;} + .d2-424418503 .stroke-N5{stroke:#DEE1EB;} + .d2-424418503 .stroke-N6{stroke:#EEF1F8;} + .d2-424418503 .stroke-N7{stroke:#FFFFFF;} + .d2-424418503 .stroke-B1{stroke:#0D32B2;} + .d2-424418503 .stroke-B2{stroke:#0D32B2;} + .d2-424418503 .stroke-B3{stroke:#E3E9FD;} + .d2-424418503 .stroke-B4{stroke:#E3E9FD;} + .d2-424418503 .stroke-B5{stroke:#EDF0FD;} + .d2-424418503 .stroke-B6{stroke:#F7F8FE;} + .d2-424418503 .stroke-AA2{stroke:#4A6FF3;} + .d2-424418503 .stroke-AA4{stroke:#EDF0FD;} + .d2-424418503 .stroke-AA5{stroke:#F7F8FE;} + .d2-424418503 .stroke-AB4{stroke:#EDF0FD;} + .d2-424418503 .stroke-AB5{stroke:#F7F8FE;} + .d2-424418503 .background-color-N1{background-color:#0A0F25;} + .d2-424418503 .background-color-N2{background-color:#676C7E;} + .d2-424418503 .background-color-N3{background-color:#9499AB;} + .d2-424418503 .background-color-N4{background-color:#CFD2DD;} + .d2-424418503 .background-color-N5{background-color:#DEE1EB;} + .d2-424418503 .background-color-N6{background-color:#EEF1F8;} + .d2-424418503 .background-color-N7{background-color:#FFFFFF;} + .d2-424418503 .background-color-B1{background-color:#0D32B2;} + .d2-424418503 .background-color-B2{background-color:#0D32B2;} + .d2-424418503 .background-color-B3{background-color:#E3E9FD;} + .d2-424418503 .background-color-B4{background-color:#E3E9FD;} + .d2-424418503 .background-color-B5{background-color:#EDF0FD;} + .d2-424418503 .background-color-B6{background-color:#F7F8FE;} + .d2-424418503 .background-color-AA2{background-color:#4A6FF3;} + .d2-424418503 .background-color-AA4{background-color:#EDF0FD;} + .d2-424418503 .background-color-AA5{background-color:#F7F8FE;} + .d2-424418503 .background-color-AB4{background-color:#EDF0FD;} + .d2-424418503 .background-color-AB5{background-color:#F7F8FE;} + .d2-424418503 .color-N1{color:#0A0F25;} + .d2-424418503 .color-N2{color:#676C7E;} + .d2-424418503 .color-N3{color:#9499AB;} + .d2-424418503 .color-N4{color:#CFD2DD;} + .d2-424418503 .color-N5{color:#DEE1EB;} + .d2-424418503 .color-N6{color:#EEF1F8;} + .d2-424418503 .color-N7{color:#FFFFFF;} + .d2-424418503 .color-B1{color:#0D32B2;} + .d2-424418503 .color-B2{color:#0D32B2;} + .d2-424418503 .color-B3{color:#E3E9FD;} + .d2-424418503 .color-B4{color:#E3E9FD;} + .d2-424418503 .color-B5{color:#EDF0FD;} + .d2-424418503 .color-B6{color:#F7F8FE;} + .d2-424418503 .color-AA2{color:#4A6FF3;} + .d2-424418503 .color-AA4{color:#EDF0FD;} + .d2-424418503 .color-AA5{color:#F7F8FE;} + .d2-424418503 .color-AB4{color:#EDF0FD;} + .d2-424418503 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-424418503);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-424418503);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-424418503);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-424418503);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-424418503);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-424418503);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-424418503);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-424418503);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-424418503);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-424418503);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-424418503);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-424418503);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-424418503);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-424418503);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-424418503);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-424418503);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-424418503);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-424418503);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>&∈beans & ricebeans & rice + - + - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/arrowhead_font_color/dagre/board.exp.json b/e2etests/testdata/regression/arrowhead_font_color/dagre/board.exp.json index b5243d082..59a231f02 100644 --- a/e2etests/testdata/regression/arrowhead_font_color/dagre/board.exp.json +++ b/e2etests/testdata/regression/arrowhead_font_color/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -134,6 +144,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 53, @@ -174,6 +185,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/arrowhead_font_color/dagre/sketch.exp.svg b/e2etests/testdata/regression/arrowhead_font_color/dagre/sketch.exp.svg index d1b8d3e63..5ece2fc69 100644 --- a/e2etests/testdata/regression/arrowhead_font_color/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/arrowhead_font_color/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -xy eth1eth2 + .d2-1979752242 .fill-N1{fill:#0A0F25;} + .d2-1979752242 .fill-N2{fill:#676C7E;} + .d2-1979752242 .fill-N3{fill:#9499AB;} + .d2-1979752242 .fill-N4{fill:#CFD2DD;} + .d2-1979752242 .fill-N5{fill:#DEE1EB;} + .d2-1979752242 .fill-N6{fill:#EEF1F8;} + .d2-1979752242 .fill-N7{fill:#FFFFFF;} + .d2-1979752242 .fill-B1{fill:#0D32B2;} + .d2-1979752242 .fill-B2{fill:#0D32B2;} + .d2-1979752242 .fill-B3{fill:#E3E9FD;} + .d2-1979752242 .fill-B4{fill:#E3E9FD;} + .d2-1979752242 .fill-B5{fill:#EDF0FD;} + .d2-1979752242 .fill-B6{fill:#F7F8FE;} + .d2-1979752242 .fill-AA2{fill:#4A6FF3;} + .d2-1979752242 .fill-AA4{fill:#EDF0FD;} + .d2-1979752242 .fill-AA5{fill:#F7F8FE;} + .d2-1979752242 .fill-AB4{fill:#EDF0FD;} + .d2-1979752242 .fill-AB5{fill:#F7F8FE;} + .d2-1979752242 .stroke-N1{stroke:#0A0F25;} + .d2-1979752242 .stroke-N2{stroke:#676C7E;} + .d2-1979752242 .stroke-N3{stroke:#9499AB;} + .d2-1979752242 .stroke-N4{stroke:#CFD2DD;} + .d2-1979752242 .stroke-N5{stroke:#DEE1EB;} + .d2-1979752242 .stroke-N6{stroke:#EEF1F8;} + .d2-1979752242 .stroke-N7{stroke:#FFFFFF;} + .d2-1979752242 .stroke-B1{stroke:#0D32B2;} + .d2-1979752242 .stroke-B2{stroke:#0D32B2;} + .d2-1979752242 .stroke-B3{stroke:#E3E9FD;} + .d2-1979752242 .stroke-B4{stroke:#E3E9FD;} + .d2-1979752242 .stroke-B5{stroke:#EDF0FD;} + .d2-1979752242 .stroke-B6{stroke:#F7F8FE;} + .d2-1979752242 .stroke-AA2{stroke:#4A6FF3;} + .d2-1979752242 .stroke-AA4{stroke:#EDF0FD;} + .d2-1979752242 .stroke-AA5{stroke:#F7F8FE;} + .d2-1979752242 .stroke-AB4{stroke:#EDF0FD;} + .d2-1979752242 .stroke-AB5{stroke:#F7F8FE;} + .d2-1979752242 .background-color-N1{background-color:#0A0F25;} + .d2-1979752242 .background-color-N2{background-color:#676C7E;} + .d2-1979752242 .background-color-N3{background-color:#9499AB;} + .d2-1979752242 .background-color-N4{background-color:#CFD2DD;} + .d2-1979752242 .background-color-N5{background-color:#DEE1EB;} + .d2-1979752242 .background-color-N6{background-color:#EEF1F8;} + .d2-1979752242 .background-color-N7{background-color:#FFFFFF;} + .d2-1979752242 .background-color-B1{background-color:#0D32B2;} + .d2-1979752242 .background-color-B2{background-color:#0D32B2;} + .d2-1979752242 .background-color-B3{background-color:#E3E9FD;} + .d2-1979752242 .background-color-B4{background-color:#E3E9FD;} + .d2-1979752242 .background-color-B5{background-color:#EDF0FD;} + .d2-1979752242 .background-color-B6{background-color:#F7F8FE;} + .d2-1979752242 .background-color-AA2{background-color:#4A6FF3;} + .d2-1979752242 .background-color-AA4{background-color:#EDF0FD;} + .d2-1979752242 .background-color-AA5{background-color:#F7F8FE;} + .d2-1979752242 .background-color-AB4{background-color:#EDF0FD;} + .d2-1979752242 .background-color-AB5{background-color:#F7F8FE;} + .d2-1979752242 .color-N1{color:#0A0F25;} + .d2-1979752242 .color-N2{color:#676C7E;} + .d2-1979752242 .color-N3{color:#9499AB;} + .d2-1979752242 .color-N4{color:#CFD2DD;} + .d2-1979752242 .color-N5{color:#DEE1EB;} + .d2-1979752242 .color-N6{color:#EEF1F8;} + .d2-1979752242 .color-N7{color:#FFFFFF;} + .d2-1979752242 .color-B1{color:#0D32B2;} + .d2-1979752242 .color-B2{color:#0D32B2;} + .d2-1979752242 .color-B3{color:#E3E9FD;} + .d2-1979752242 .color-B4{color:#E3E9FD;} + .d2-1979752242 .color-B5{color:#EDF0FD;} + .d2-1979752242 .color-B6{color:#F7F8FE;} + .d2-1979752242 .color-AA2{color:#4A6FF3;} + .d2-1979752242 .color-AA4{color:#EDF0FD;} + .d2-1979752242 .color-AA5{color:#F7F8FE;} + .d2-1979752242 .color-AB4{color:#EDF0FD;} + .d2-1979752242 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1979752242);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1979752242);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1979752242);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1979752242);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1979752242);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1979752242);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1979752242);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1979752242);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1979752242);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1979752242);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1979752242);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1979752242);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1979752242);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1979752242);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1979752242);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1979752242);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1979752242);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1979752242);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xy eth1eth2 - - + + \ No newline at end of file diff --git a/e2etests/testdata/regression/arrowhead_font_color/elk/board.exp.json b/e2etests/testdata/regression/arrowhead_font_color/elk/board.exp.json index e080bbbcc..b692dc073 100644 --- a/e2etests/testdata/regression/arrowhead_font_color/elk/board.exp.json +++ b/e2etests/testdata/regression/arrowhead_font_color/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -134,6 +144,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 65, @@ -165,6 +176,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/arrowhead_font_color/elk/sketch.exp.svg b/e2etests/testdata/regression/arrowhead_font_color/elk/sketch.exp.svg index 6f5acb9ac..f9f50c4dc 100644 --- a/e2etests/testdata/regression/arrowhead_font_color/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/arrowhead_font_color/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -xy eth1eth2 + .d2-1965930566 .fill-N1{fill:#0A0F25;} + .d2-1965930566 .fill-N2{fill:#676C7E;} + .d2-1965930566 .fill-N3{fill:#9499AB;} + .d2-1965930566 .fill-N4{fill:#CFD2DD;} + .d2-1965930566 .fill-N5{fill:#DEE1EB;} + .d2-1965930566 .fill-N6{fill:#EEF1F8;} + .d2-1965930566 .fill-N7{fill:#FFFFFF;} + .d2-1965930566 .fill-B1{fill:#0D32B2;} + .d2-1965930566 .fill-B2{fill:#0D32B2;} + .d2-1965930566 .fill-B3{fill:#E3E9FD;} + .d2-1965930566 .fill-B4{fill:#E3E9FD;} + .d2-1965930566 .fill-B5{fill:#EDF0FD;} + .d2-1965930566 .fill-B6{fill:#F7F8FE;} + .d2-1965930566 .fill-AA2{fill:#4A6FF3;} + .d2-1965930566 .fill-AA4{fill:#EDF0FD;} + .d2-1965930566 .fill-AA5{fill:#F7F8FE;} + .d2-1965930566 .fill-AB4{fill:#EDF0FD;} + .d2-1965930566 .fill-AB5{fill:#F7F8FE;} + .d2-1965930566 .stroke-N1{stroke:#0A0F25;} + .d2-1965930566 .stroke-N2{stroke:#676C7E;} + .d2-1965930566 .stroke-N3{stroke:#9499AB;} + .d2-1965930566 .stroke-N4{stroke:#CFD2DD;} + .d2-1965930566 .stroke-N5{stroke:#DEE1EB;} + .d2-1965930566 .stroke-N6{stroke:#EEF1F8;} + .d2-1965930566 .stroke-N7{stroke:#FFFFFF;} + .d2-1965930566 .stroke-B1{stroke:#0D32B2;} + .d2-1965930566 .stroke-B2{stroke:#0D32B2;} + .d2-1965930566 .stroke-B3{stroke:#E3E9FD;} + .d2-1965930566 .stroke-B4{stroke:#E3E9FD;} + .d2-1965930566 .stroke-B5{stroke:#EDF0FD;} + .d2-1965930566 .stroke-B6{stroke:#F7F8FE;} + .d2-1965930566 .stroke-AA2{stroke:#4A6FF3;} + .d2-1965930566 .stroke-AA4{stroke:#EDF0FD;} + .d2-1965930566 .stroke-AA5{stroke:#F7F8FE;} + .d2-1965930566 .stroke-AB4{stroke:#EDF0FD;} + .d2-1965930566 .stroke-AB5{stroke:#F7F8FE;} + .d2-1965930566 .background-color-N1{background-color:#0A0F25;} + .d2-1965930566 .background-color-N2{background-color:#676C7E;} + .d2-1965930566 .background-color-N3{background-color:#9499AB;} + .d2-1965930566 .background-color-N4{background-color:#CFD2DD;} + .d2-1965930566 .background-color-N5{background-color:#DEE1EB;} + .d2-1965930566 .background-color-N6{background-color:#EEF1F8;} + .d2-1965930566 .background-color-N7{background-color:#FFFFFF;} + .d2-1965930566 .background-color-B1{background-color:#0D32B2;} + .d2-1965930566 .background-color-B2{background-color:#0D32B2;} + .d2-1965930566 .background-color-B3{background-color:#E3E9FD;} + .d2-1965930566 .background-color-B4{background-color:#E3E9FD;} + .d2-1965930566 .background-color-B5{background-color:#EDF0FD;} + .d2-1965930566 .background-color-B6{background-color:#F7F8FE;} + .d2-1965930566 .background-color-AA2{background-color:#4A6FF3;} + .d2-1965930566 .background-color-AA4{background-color:#EDF0FD;} + .d2-1965930566 .background-color-AA5{background-color:#F7F8FE;} + .d2-1965930566 .background-color-AB4{background-color:#EDF0FD;} + .d2-1965930566 .background-color-AB5{background-color:#F7F8FE;} + .d2-1965930566 .color-N1{color:#0A0F25;} + .d2-1965930566 .color-N2{color:#676C7E;} + .d2-1965930566 .color-N3{color:#9499AB;} + .d2-1965930566 .color-N4{color:#CFD2DD;} + .d2-1965930566 .color-N5{color:#DEE1EB;} + .d2-1965930566 .color-N6{color:#EEF1F8;} + .d2-1965930566 .color-N7{color:#FFFFFF;} + .d2-1965930566 .color-B1{color:#0D32B2;} + .d2-1965930566 .color-B2{color:#0D32B2;} + .d2-1965930566 .color-B3{color:#E3E9FD;} + .d2-1965930566 .color-B4{color:#E3E9FD;} + .d2-1965930566 .color-B5{color:#EDF0FD;} + .d2-1965930566 .color-B6{color:#F7F8FE;} + .d2-1965930566 .color-AA2{color:#4A6FF3;} + .d2-1965930566 .color-AA4{color:#EDF0FD;} + .d2-1965930566 .color-AA5{color:#F7F8FE;} + .d2-1965930566 .color-AB4{color:#EDF0FD;} + .d2-1965930566 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1965930566);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1965930566);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1965930566);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1965930566);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1965930566);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1965930566);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1965930566);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1965930566);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1965930566);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1965930566);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1965930566);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1965930566);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1965930566);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1965930566);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1965930566);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1965930566);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1965930566);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1965930566);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xy eth1eth2 - - + + \ No newline at end of file diff --git a/e2etests/testdata/regression/arrowhead_sizes_with_labels/dagre/board.exp.json b/e2etests/testdata/regression/arrowhead_sizes_with_labels/dagre/board.exp.json index db3d37b90..d71b07bc9 100644 --- a/e2etests/testdata/regression/arrowhead_sizes_with_labels/dagre/board.exp.json +++ b/e2etests/testdata/regression/arrowhead_sizes_with_labels/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -715,6 +740,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -756,6 +782,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -797,6 +824,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -838,6 +866,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -879,6 +908,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -920,6 +950,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -961,6 +992,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1002,6 +1034,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1043,6 +1076,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1084,6 +1118,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1125,6 +1160,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1166,6 +1202,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1207,6 +1244,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1248,6 +1286,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1289,6 +1328,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1330,6 +1370,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1371,6 +1412,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1412,6 +1454,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1453,6 +1496,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1494,6 +1538,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1535,6 +1580,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1576,6 +1622,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1617,6 +1664,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1658,6 +1706,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1699,6 +1748,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1740,6 +1790,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1781,6 +1832,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1822,6 +1874,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1863,6 +1916,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1904,6 +1958,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1945,6 +2000,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1986,6 +2042,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2027,6 +2084,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2068,6 +2126,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2109,6 +2168,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2150,6 +2210,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2191,6 +2252,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2232,6 +2294,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2307,6 +2370,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 66.5, @@ -2378,6 +2442,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 180, @@ -2449,6 +2514,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 333.5, @@ -2520,6 +2586,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 447, @@ -2591,6 +2658,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 600.5, @@ -2662,6 +2730,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 714, @@ -2733,6 +2802,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 867.5, @@ -2804,6 +2874,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 981, @@ -2875,6 +2946,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1134.5, @@ -2946,6 +3018,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1248, @@ -3017,6 +3090,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1401.5, @@ -3088,6 +3162,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1515, @@ -3159,6 +3234,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1668.5, @@ -3230,6 +3306,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1782, @@ -3301,6 +3378,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1935.5, @@ -3372,6 +3450,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2049, @@ -3443,6 +3522,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2202.5, @@ -3514,6 +3594,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2316, @@ -3585,6 +3666,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2469.5, @@ -3656,6 +3738,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2583, @@ -3727,6 +3810,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2736.5, @@ -3798,6 +3882,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2850, @@ -3838,6 +3923,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/arrowhead_sizes_with_labels/dagre/sketch.exp.svg b/e2etests/testdata/regression/arrowhead_sizes_with_labels/dagre/sketch.exp.svg index f59920705..f5c4f505c 100644 --- a/e2etests/testdata/regression/arrowhead_sizes_with_labels/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/arrowhead_sizes_with_labels/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -trianglenonearrowdiamondfilled diamondcirclefilled circlecf onecf one requiredcf manycf many requiredabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcd 11 111111 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 + .d2-3578170292 .fill-N1{fill:#0A0F25;} + .d2-3578170292 .fill-N2{fill:#676C7E;} + .d2-3578170292 .fill-N3{fill:#9499AB;} + .d2-3578170292 .fill-N4{fill:#CFD2DD;} + .d2-3578170292 .fill-N5{fill:#DEE1EB;} + .d2-3578170292 .fill-N6{fill:#EEF1F8;} + .d2-3578170292 .fill-N7{fill:#FFFFFF;} + .d2-3578170292 .fill-B1{fill:#0D32B2;} + .d2-3578170292 .fill-B2{fill:#0D32B2;} + .d2-3578170292 .fill-B3{fill:#E3E9FD;} + .d2-3578170292 .fill-B4{fill:#E3E9FD;} + .d2-3578170292 .fill-B5{fill:#EDF0FD;} + .d2-3578170292 .fill-B6{fill:#F7F8FE;} + .d2-3578170292 .fill-AA2{fill:#4A6FF3;} + .d2-3578170292 .fill-AA4{fill:#EDF0FD;} + .d2-3578170292 .fill-AA5{fill:#F7F8FE;} + .d2-3578170292 .fill-AB4{fill:#EDF0FD;} + .d2-3578170292 .fill-AB5{fill:#F7F8FE;} + .d2-3578170292 .stroke-N1{stroke:#0A0F25;} + .d2-3578170292 .stroke-N2{stroke:#676C7E;} + .d2-3578170292 .stroke-N3{stroke:#9499AB;} + .d2-3578170292 .stroke-N4{stroke:#CFD2DD;} + .d2-3578170292 .stroke-N5{stroke:#DEE1EB;} + .d2-3578170292 .stroke-N6{stroke:#EEF1F8;} + .d2-3578170292 .stroke-N7{stroke:#FFFFFF;} + .d2-3578170292 .stroke-B1{stroke:#0D32B2;} + .d2-3578170292 .stroke-B2{stroke:#0D32B2;} + .d2-3578170292 .stroke-B3{stroke:#E3E9FD;} + .d2-3578170292 .stroke-B4{stroke:#E3E9FD;} + .d2-3578170292 .stroke-B5{stroke:#EDF0FD;} + .d2-3578170292 .stroke-B6{stroke:#F7F8FE;} + .d2-3578170292 .stroke-AA2{stroke:#4A6FF3;} + .d2-3578170292 .stroke-AA4{stroke:#EDF0FD;} + .d2-3578170292 .stroke-AA5{stroke:#F7F8FE;} + .d2-3578170292 .stroke-AB4{stroke:#EDF0FD;} + .d2-3578170292 .stroke-AB5{stroke:#F7F8FE;} + .d2-3578170292 .background-color-N1{background-color:#0A0F25;} + .d2-3578170292 .background-color-N2{background-color:#676C7E;} + .d2-3578170292 .background-color-N3{background-color:#9499AB;} + .d2-3578170292 .background-color-N4{background-color:#CFD2DD;} + .d2-3578170292 .background-color-N5{background-color:#DEE1EB;} + .d2-3578170292 .background-color-N6{background-color:#EEF1F8;} + .d2-3578170292 .background-color-N7{background-color:#FFFFFF;} + .d2-3578170292 .background-color-B1{background-color:#0D32B2;} + .d2-3578170292 .background-color-B2{background-color:#0D32B2;} + .d2-3578170292 .background-color-B3{background-color:#E3E9FD;} + .d2-3578170292 .background-color-B4{background-color:#E3E9FD;} + .d2-3578170292 .background-color-B5{background-color:#EDF0FD;} + .d2-3578170292 .background-color-B6{background-color:#F7F8FE;} + .d2-3578170292 .background-color-AA2{background-color:#4A6FF3;} + .d2-3578170292 .background-color-AA4{background-color:#EDF0FD;} + .d2-3578170292 .background-color-AA5{background-color:#F7F8FE;} + .d2-3578170292 .background-color-AB4{background-color:#EDF0FD;} + .d2-3578170292 .background-color-AB5{background-color:#F7F8FE;} + .d2-3578170292 .color-N1{color:#0A0F25;} + .d2-3578170292 .color-N2{color:#676C7E;} + .d2-3578170292 .color-N3{color:#9499AB;} + .d2-3578170292 .color-N4{color:#CFD2DD;} + .d2-3578170292 .color-N5{color:#DEE1EB;} + .d2-3578170292 .color-N6{color:#EEF1F8;} + .d2-3578170292 .color-N7{color:#FFFFFF;} + .d2-3578170292 .color-B1{color:#0D32B2;} + .d2-3578170292 .color-B2{color:#0D32B2;} + .d2-3578170292 .color-B3{color:#E3E9FD;} + .d2-3578170292 .color-B4{color:#E3E9FD;} + .d2-3578170292 .color-B5{color:#EDF0FD;} + .d2-3578170292 .color-B6{color:#F7F8FE;} + .d2-3578170292 .color-AA2{color:#4A6FF3;} + .d2-3578170292 .color-AA4{color:#EDF0FD;} + .d2-3578170292 .color-AA5{color:#F7F8FE;} + .d2-3578170292 .color-AB4{color:#EDF0FD;} + .d2-3578170292 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3578170292);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3578170292);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3578170292);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3578170292);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3578170292);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3578170292);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3578170292);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3578170292);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3578170292);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3578170292);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3578170292);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3578170292);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3578170292);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3578170292);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3578170292);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3578170292);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3578170292);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3578170292);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>trianglenonearrowdiamondfilled diamondcirclefilled circlecf onecf one requiredcf manycf many requiredabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcd 11 111111 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/arrowhead_sizes_with_labels/elk/board.exp.json b/e2etests/testdata/regression/arrowhead_sizes_with_labels/elk/board.exp.json index dc82ea528..3cf031cf1 100644 --- a/e2etests/testdata/regression/arrowhead_sizes_with_labels/elk/board.exp.json +++ b/e2etests/testdata/regression/arrowhead_sizes_with_labels/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -715,6 +740,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -756,6 +782,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -797,6 +824,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -838,6 +866,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -879,6 +908,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -920,6 +950,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -961,6 +992,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1002,6 +1034,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1043,6 +1076,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1084,6 +1118,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1125,6 +1160,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1166,6 +1202,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1207,6 +1244,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1248,6 +1286,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1289,6 +1328,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1330,6 +1370,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1371,6 +1412,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1412,6 +1454,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1453,6 +1496,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1494,6 +1538,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1535,6 +1580,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1576,6 +1622,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1617,6 +1664,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1658,6 +1706,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1699,6 +1748,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1740,6 +1790,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1781,6 +1832,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1822,6 +1874,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1863,6 +1916,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1904,6 +1958,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1945,6 +2000,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1986,6 +2042,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2027,6 +2084,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2068,6 +2126,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2109,6 +2168,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2150,6 +2210,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2191,6 +2252,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2232,6 +2294,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2307,6 +2370,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 88.5, @@ -2369,6 +2433,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 162, @@ -2431,6 +2496,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 335.5, @@ -2493,6 +2559,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 409, @@ -2555,6 +2622,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 582.5, @@ -2617,6 +2685,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 656, @@ -2679,6 +2748,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 829.5, @@ -2741,6 +2811,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 903, @@ -2803,6 +2874,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1076.5, @@ -2865,6 +2937,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1150, @@ -2927,6 +3000,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1323.5, @@ -2989,6 +3063,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1397, @@ -3051,6 +3126,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1570.5, @@ -3113,6 +3189,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1644, @@ -3175,6 +3252,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1817.5, @@ -3237,6 +3315,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1891, @@ -3299,6 +3378,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2064.5, @@ -3361,6 +3441,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2138, @@ -3423,6 +3504,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2311.5, @@ -3485,6 +3567,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2385, @@ -3547,6 +3630,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2565.5, @@ -3609,6 +3693,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2639, @@ -3640,6 +3725,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/arrowhead_sizes_with_labels/elk/sketch.exp.svg b/e2etests/testdata/regression/arrowhead_sizes_with_labels/elk/sketch.exp.svg index ee58a03eb..ee0b9127d 100644 --- a/e2etests/testdata/regression/arrowhead_sizes_with_labels/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/arrowhead_sizes_with_labels/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -trianglenonearrowdiamondfilled diamondcirclefilled circlecf onecf one requiredcf manycf many requiredabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcd 11 111111 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 + .d2-3038164812 .fill-N1{fill:#0A0F25;} + .d2-3038164812 .fill-N2{fill:#676C7E;} + .d2-3038164812 .fill-N3{fill:#9499AB;} + .d2-3038164812 .fill-N4{fill:#CFD2DD;} + .d2-3038164812 .fill-N5{fill:#DEE1EB;} + .d2-3038164812 .fill-N6{fill:#EEF1F8;} + .d2-3038164812 .fill-N7{fill:#FFFFFF;} + .d2-3038164812 .fill-B1{fill:#0D32B2;} + .d2-3038164812 .fill-B2{fill:#0D32B2;} + .d2-3038164812 .fill-B3{fill:#E3E9FD;} + .d2-3038164812 .fill-B4{fill:#E3E9FD;} + .d2-3038164812 .fill-B5{fill:#EDF0FD;} + .d2-3038164812 .fill-B6{fill:#F7F8FE;} + .d2-3038164812 .fill-AA2{fill:#4A6FF3;} + .d2-3038164812 .fill-AA4{fill:#EDF0FD;} + .d2-3038164812 .fill-AA5{fill:#F7F8FE;} + .d2-3038164812 .fill-AB4{fill:#EDF0FD;} + .d2-3038164812 .fill-AB5{fill:#F7F8FE;} + .d2-3038164812 .stroke-N1{stroke:#0A0F25;} + .d2-3038164812 .stroke-N2{stroke:#676C7E;} + .d2-3038164812 .stroke-N3{stroke:#9499AB;} + .d2-3038164812 .stroke-N4{stroke:#CFD2DD;} + .d2-3038164812 .stroke-N5{stroke:#DEE1EB;} + .d2-3038164812 .stroke-N6{stroke:#EEF1F8;} + .d2-3038164812 .stroke-N7{stroke:#FFFFFF;} + .d2-3038164812 .stroke-B1{stroke:#0D32B2;} + .d2-3038164812 .stroke-B2{stroke:#0D32B2;} + .d2-3038164812 .stroke-B3{stroke:#E3E9FD;} + .d2-3038164812 .stroke-B4{stroke:#E3E9FD;} + .d2-3038164812 .stroke-B5{stroke:#EDF0FD;} + .d2-3038164812 .stroke-B6{stroke:#F7F8FE;} + .d2-3038164812 .stroke-AA2{stroke:#4A6FF3;} + .d2-3038164812 .stroke-AA4{stroke:#EDF0FD;} + .d2-3038164812 .stroke-AA5{stroke:#F7F8FE;} + .d2-3038164812 .stroke-AB4{stroke:#EDF0FD;} + .d2-3038164812 .stroke-AB5{stroke:#F7F8FE;} + .d2-3038164812 .background-color-N1{background-color:#0A0F25;} + .d2-3038164812 .background-color-N2{background-color:#676C7E;} + .d2-3038164812 .background-color-N3{background-color:#9499AB;} + .d2-3038164812 .background-color-N4{background-color:#CFD2DD;} + .d2-3038164812 .background-color-N5{background-color:#DEE1EB;} + .d2-3038164812 .background-color-N6{background-color:#EEF1F8;} + .d2-3038164812 .background-color-N7{background-color:#FFFFFF;} + .d2-3038164812 .background-color-B1{background-color:#0D32B2;} + .d2-3038164812 .background-color-B2{background-color:#0D32B2;} + .d2-3038164812 .background-color-B3{background-color:#E3E9FD;} + .d2-3038164812 .background-color-B4{background-color:#E3E9FD;} + .d2-3038164812 .background-color-B5{background-color:#EDF0FD;} + .d2-3038164812 .background-color-B6{background-color:#F7F8FE;} + .d2-3038164812 .background-color-AA2{background-color:#4A6FF3;} + .d2-3038164812 .background-color-AA4{background-color:#EDF0FD;} + .d2-3038164812 .background-color-AA5{background-color:#F7F8FE;} + .d2-3038164812 .background-color-AB4{background-color:#EDF0FD;} + .d2-3038164812 .background-color-AB5{background-color:#F7F8FE;} + .d2-3038164812 .color-N1{color:#0A0F25;} + .d2-3038164812 .color-N2{color:#676C7E;} + .d2-3038164812 .color-N3{color:#9499AB;} + .d2-3038164812 .color-N4{color:#CFD2DD;} + .d2-3038164812 .color-N5{color:#DEE1EB;} + .d2-3038164812 .color-N6{color:#EEF1F8;} + .d2-3038164812 .color-N7{color:#FFFFFF;} + .d2-3038164812 .color-B1{color:#0D32B2;} + .d2-3038164812 .color-B2{color:#0D32B2;} + .d2-3038164812 .color-B3{color:#E3E9FD;} + .d2-3038164812 .color-B4{color:#E3E9FD;} + .d2-3038164812 .color-B5{color:#EDF0FD;} + .d2-3038164812 .color-B6{color:#F7F8FE;} + .d2-3038164812 .color-AA2{color:#4A6FF3;} + .d2-3038164812 .color-AA4{color:#EDF0FD;} + .d2-3038164812 .color-AA5{color:#F7F8FE;} + .d2-3038164812 .color-AB4{color:#EDF0FD;} + .d2-3038164812 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3038164812);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3038164812);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3038164812);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3038164812);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3038164812);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3038164812);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3038164812);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3038164812);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3038164812);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3038164812);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3038164812);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3038164812);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3038164812);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3038164812);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3038164812);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3038164812);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3038164812);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3038164812);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>trianglenonearrowdiamondfilled diamondcirclefilled circlecf onecf one requiredcf manycf many requiredabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcd 11 111111 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/bold_edge_label/dagre/board.exp.json b/e2etests/testdata/regression/bold_edge_label/dagre/board.exp.json index 8d006d204..e86a2bd10 100644 --- a/e2etests/testdata/regression/bold_edge_label/dagre/board.exp.json +++ b/e2etests/testdata/regression/bold_edge_label/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -151,6 +162,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 52.5, @@ -198,6 +210,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 237.5, @@ -238,6 +251,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/bold_edge_label/dagre/sketch.exp.svg b/e2etests/testdata/regression/bold_edge_label/dagre/sketch.exp.svg index 3dd33b1f3..063aff27c 100644 --- a/e2etests/testdata/regression/bold_edge_label/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/bold_edge_label/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -xyz syncsync + .d2-2460087648 .fill-N1{fill:#0A0F25;} + .d2-2460087648 .fill-N2{fill:#676C7E;} + .d2-2460087648 .fill-N3{fill:#9499AB;} + .d2-2460087648 .fill-N4{fill:#CFD2DD;} + .d2-2460087648 .fill-N5{fill:#DEE1EB;} + .d2-2460087648 .fill-N6{fill:#EEF1F8;} + .d2-2460087648 .fill-N7{fill:#FFFFFF;} + .d2-2460087648 .fill-B1{fill:#0D32B2;} + .d2-2460087648 .fill-B2{fill:#0D32B2;} + .d2-2460087648 .fill-B3{fill:#E3E9FD;} + .d2-2460087648 .fill-B4{fill:#E3E9FD;} + .d2-2460087648 .fill-B5{fill:#EDF0FD;} + .d2-2460087648 .fill-B6{fill:#F7F8FE;} + .d2-2460087648 .fill-AA2{fill:#4A6FF3;} + .d2-2460087648 .fill-AA4{fill:#EDF0FD;} + .d2-2460087648 .fill-AA5{fill:#F7F8FE;} + .d2-2460087648 .fill-AB4{fill:#EDF0FD;} + .d2-2460087648 .fill-AB5{fill:#F7F8FE;} + .d2-2460087648 .stroke-N1{stroke:#0A0F25;} + .d2-2460087648 .stroke-N2{stroke:#676C7E;} + .d2-2460087648 .stroke-N3{stroke:#9499AB;} + .d2-2460087648 .stroke-N4{stroke:#CFD2DD;} + .d2-2460087648 .stroke-N5{stroke:#DEE1EB;} + .d2-2460087648 .stroke-N6{stroke:#EEF1F8;} + .d2-2460087648 .stroke-N7{stroke:#FFFFFF;} + .d2-2460087648 .stroke-B1{stroke:#0D32B2;} + .d2-2460087648 .stroke-B2{stroke:#0D32B2;} + .d2-2460087648 .stroke-B3{stroke:#E3E9FD;} + .d2-2460087648 .stroke-B4{stroke:#E3E9FD;} + .d2-2460087648 .stroke-B5{stroke:#EDF0FD;} + .d2-2460087648 .stroke-B6{stroke:#F7F8FE;} + .d2-2460087648 .stroke-AA2{stroke:#4A6FF3;} + .d2-2460087648 .stroke-AA4{stroke:#EDF0FD;} + .d2-2460087648 .stroke-AA5{stroke:#F7F8FE;} + .d2-2460087648 .stroke-AB4{stroke:#EDF0FD;} + .d2-2460087648 .stroke-AB5{stroke:#F7F8FE;} + .d2-2460087648 .background-color-N1{background-color:#0A0F25;} + .d2-2460087648 .background-color-N2{background-color:#676C7E;} + .d2-2460087648 .background-color-N3{background-color:#9499AB;} + .d2-2460087648 .background-color-N4{background-color:#CFD2DD;} + .d2-2460087648 .background-color-N5{background-color:#DEE1EB;} + .d2-2460087648 .background-color-N6{background-color:#EEF1F8;} + .d2-2460087648 .background-color-N7{background-color:#FFFFFF;} + .d2-2460087648 .background-color-B1{background-color:#0D32B2;} + .d2-2460087648 .background-color-B2{background-color:#0D32B2;} + .d2-2460087648 .background-color-B3{background-color:#E3E9FD;} + .d2-2460087648 .background-color-B4{background-color:#E3E9FD;} + .d2-2460087648 .background-color-B5{background-color:#EDF0FD;} + .d2-2460087648 .background-color-B6{background-color:#F7F8FE;} + .d2-2460087648 .background-color-AA2{background-color:#4A6FF3;} + .d2-2460087648 .background-color-AA4{background-color:#EDF0FD;} + .d2-2460087648 .background-color-AA5{background-color:#F7F8FE;} + .d2-2460087648 .background-color-AB4{background-color:#EDF0FD;} + .d2-2460087648 .background-color-AB5{background-color:#F7F8FE;} + .d2-2460087648 .color-N1{color:#0A0F25;} + .d2-2460087648 .color-N2{color:#676C7E;} + .d2-2460087648 .color-N3{color:#9499AB;} + .d2-2460087648 .color-N4{color:#CFD2DD;} + .d2-2460087648 .color-N5{color:#DEE1EB;} + .d2-2460087648 .color-N6{color:#EEF1F8;} + .d2-2460087648 .color-N7{color:#FFFFFF;} + .d2-2460087648 .color-B1{color:#0D32B2;} + .d2-2460087648 .color-B2{color:#0D32B2;} + .d2-2460087648 .color-B3{color:#E3E9FD;} + .d2-2460087648 .color-B4{color:#E3E9FD;} + .d2-2460087648 .color-B5{color:#EDF0FD;} + .d2-2460087648 .color-B6{color:#F7F8FE;} + .d2-2460087648 .color-AA2{color:#4A6FF3;} + .d2-2460087648 .color-AA4{color:#EDF0FD;} + .d2-2460087648 .color-AA5{color:#F7F8FE;} + .d2-2460087648 .color-AB4{color:#EDF0FD;} + .d2-2460087648 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2460087648);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2460087648);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2460087648);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2460087648);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2460087648);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2460087648);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2460087648);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2460087648);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2460087648);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2460087648);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2460087648);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2460087648);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2460087648);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2460087648);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2460087648);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2460087648);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2460087648);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2460087648);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xyz syncsync - - - - - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/bold_edge_label/elk/board.exp.json b/e2etests/testdata/regression/bold_edge_label/elk/board.exp.json index f6b081610..64f864b6c 100644 --- a/e2etests/testdata/regression/bold_edge_label/elk/board.exp.json +++ b/e2etests/testdata/regression/bold_edge_label/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -151,6 +162,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 65, @@ -189,6 +201,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 290, @@ -220,6 +233,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/bold_edge_label/elk/sketch.exp.svg b/e2etests/testdata/regression/bold_edge_label/elk/sketch.exp.svg index 47565a6f7..c8f009000 100644 --- a/e2etests/testdata/regression/bold_edge_label/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/bold_edge_label/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -xyz syncsync + .d2-410247826 .fill-N1{fill:#0A0F25;} + .d2-410247826 .fill-N2{fill:#676C7E;} + .d2-410247826 .fill-N3{fill:#9499AB;} + .d2-410247826 .fill-N4{fill:#CFD2DD;} + .d2-410247826 .fill-N5{fill:#DEE1EB;} + .d2-410247826 .fill-N6{fill:#EEF1F8;} + .d2-410247826 .fill-N7{fill:#FFFFFF;} + .d2-410247826 .fill-B1{fill:#0D32B2;} + .d2-410247826 .fill-B2{fill:#0D32B2;} + .d2-410247826 .fill-B3{fill:#E3E9FD;} + .d2-410247826 .fill-B4{fill:#E3E9FD;} + .d2-410247826 .fill-B5{fill:#EDF0FD;} + .d2-410247826 .fill-B6{fill:#F7F8FE;} + .d2-410247826 .fill-AA2{fill:#4A6FF3;} + .d2-410247826 .fill-AA4{fill:#EDF0FD;} + .d2-410247826 .fill-AA5{fill:#F7F8FE;} + .d2-410247826 .fill-AB4{fill:#EDF0FD;} + .d2-410247826 .fill-AB5{fill:#F7F8FE;} + .d2-410247826 .stroke-N1{stroke:#0A0F25;} + .d2-410247826 .stroke-N2{stroke:#676C7E;} + .d2-410247826 .stroke-N3{stroke:#9499AB;} + .d2-410247826 .stroke-N4{stroke:#CFD2DD;} + .d2-410247826 .stroke-N5{stroke:#DEE1EB;} + .d2-410247826 .stroke-N6{stroke:#EEF1F8;} + .d2-410247826 .stroke-N7{stroke:#FFFFFF;} + .d2-410247826 .stroke-B1{stroke:#0D32B2;} + .d2-410247826 .stroke-B2{stroke:#0D32B2;} + .d2-410247826 .stroke-B3{stroke:#E3E9FD;} + .d2-410247826 .stroke-B4{stroke:#E3E9FD;} + .d2-410247826 .stroke-B5{stroke:#EDF0FD;} + .d2-410247826 .stroke-B6{stroke:#F7F8FE;} + .d2-410247826 .stroke-AA2{stroke:#4A6FF3;} + .d2-410247826 .stroke-AA4{stroke:#EDF0FD;} + .d2-410247826 .stroke-AA5{stroke:#F7F8FE;} + .d2-410247826 .stroke-AB4{stroke:#EDF0FD;} + .d2-410247826 .stroke-AB5{stroke:#F7F8FE;} + .d2-410247826 .background-color-N1{background-color:#0A0F25;} + .d2-410247826 .background-color-N2{background-color:#676C7E;} + .d2-410247826 .background-color-N3{background-color:#9499AB;} + .d2-410247826 .background-color-N4{background-color:#CFD2DD;} + .d2-410247826 .background-color-N5{background-color:#DEE1EB;} + .d2-410247826 .background-color-N6{background-color:#EEF1F8;} + .d2-410247826 .background-color-N7{background-color:#FFFFFF;} + .d2-410247826 .background-color-B1{background-color:#0D32B2;} + .d2-410247826 .background-color-B2{background-color:#0D32B2;} + .d2-410247826 .background-color-B3{background-color:#E3E9FD;} + .d2-410247826 .background-color-B4{background-color:#E3E9FD;} + .d2-410247826 .background-color-B5{background-color:#EDF0FD;} + .d2-410247826 .background-color-B6{background-color:#F7F8FE;} + .d2-410247826 .background-color-AA2{background-color:#4A6FF3;} + .d2-410247826 .background-color-AA4{background-color:#EDF0FD;} + .d2-410247826 .background-color-AA5{background-color:#F7F8FE;} + .d2-410247826 .background-color-AB4{background-color:#EDF0FD;} + .d2-410247826 .background-color-AB5{background-color:#F7F8FE;} + .d2-410247826 .color-N1{color:#0A0F25;} + .d2-410247826 .color-N2{color:#676C7E;} + .d2-410247826 .color-N3{color:#9499AB;} + .d2-410247826 .color-N4{color:#CFD2DD;} + .d2-410247826 .color-N5{color:#DEE1EB;} + .d2-410247826 .color-N6{color:#EEF1F8;} + .d2-410247826 .color-N7{color:#FFFFFF;} + .d2-410247826 .color-B1{color:#0D32B2;} + .d2-410247826 .color-B2{color:#0D32B2;} + .d2-410247826 .color-B3{color:#E3E9FD;} + .d2-410247826 .color-B4{color:#E3E9FD;} + .d2-410247826 .color-B5{color:#EDF0FD;} + .d2-410247826 .color-B6{color:#F7F8FE;} + .d2-410247826 .color-AA2{color:#4A6FF3;} + .d2-410247826 .color-AA4{color:#EDF0FD;} + .d2-410247826 .color-AA5{color:#F7F8FE;} + .d2-410247826 .color-AB4{color:#EDF0FD;} + .d2-410247826 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-410247826);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-410247826);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-410247826);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-410247826);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-410247826);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-410247826);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-410247826);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-410247826);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-410247826);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-410247826);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-410247826);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-410247826);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-410247826);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-410247826);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-410247826);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-410247826);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-410247826);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-410247826);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xyz syncsync - - - - - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/class_font_style_sequence/dagre/board.exp.json b/e2etests/testdata/regression/class_font_style_sequence/dagre/board.exp.json index 0007f51d6..b782e6b5e 100644 --- a/e2etests/testdata/regression/class_font_style_sequence/dagre/board.exp.json +++ b/e2etests/testdata/regression/class_font_style_sequence/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -72,6 +81,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 70.5, @@ -103,6 +113,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/class_font_style_sequence/dagre/sketch.exp.svg b/e2etests/testdata/regression/class_font_style_sequence/dagre/sketch.exp.svg index 783f4b9e0..06f877d7d 100644 --- a/e2etests/testdata/regression/class_font_style_sequence/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/class_font_style_sequence/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -a + .d2-3190304309 .fill-N1{fill:#0A0F25;} + .d2-3190304309 .fill-N2{fill:#676C7E;} + .d2-3190304309 .fill-N3{fill:#9499AB;} + .d2-3190304309 .fill-N4{fill:#CFD2DD;} + .d2-3190304309 .fill-N5{fill:#DEE1EB;} + .d2-3190304309 .fill-N6{fill:#EEF1F8;} + .d2-3190304309 .fill-N7{fill:#FFFFFF;} + .d2-3190304309 .fill-B1{fill:#0D32B2;} + .d2-3190304309 .fill-B2{fill:#0D32B2;} + .d2-3190304309 .fill-B3{fill:#E3E9FD;} + .d2-3190304309 .fill-B4{fill:#E3E9FD;} + .d2-3190304309 .fill-B5{fill:#EDF0FD;} + .d2-3190304309 .fill-B6{fill:#F7F8FE;} + .d2-3190304309 .fill-AA2{fill:#4A6FF3;} + .d2-3190304309 .fill-AA4{fill:#EDF0FD;} + .d2-3190304309 .fill-AA5{fill:#F7F8FE;} + .d2-3190304309 .fill-AB4{fill:#EDF0FD;} + .d2-3190304309 .fill-AB5{fill:#F7F8FE;} + .d2-3190304309 .stroke-N1{stroke:#0A0F25;} + .d2-3190304309 .stroke-N2{stroke:#676C7E;} + .d2-3190304309 .stroke-N3{stroke:#9499AB;} + .d2-3190304309 .stroke-N4{stroke:#CFD2DD;} + .d2-3190304309 .stroke-N5{stroke:#DEE1EB;} + .d2-3190304309 .stroke-N6{stroke:#EEF1F8;} + .d2-3190304309 .stroke-N7{stroke:#FFFFFF;} + .d2-3190304309 .stroke-B1{stroke:#0D32B2;} + .d2-3190304309 .stroke-B2{stroke:#0D32B2;} + .d2-3190304309 .stroke-B3{stroke:#E3E9FD;} + .d2-3190304309 .stroke-B4{stroke:#E3E9FD;} + .d2-3190304309 .stroke-B5{stroke:#EDF0FD;} + .d2-3190304309 .stroke-B6{stroke:#F7F8FE;} + .d2-3190304309 .stroke-AA2{stroke:#4A6FF3;} + .d2-3190304309 .stroke-AA4{stroke:#EDF0FD;} + .d2-3190304309 .stroke-AA5{stroke:#F7F8FE;} + .d2-3190304309 .stroke-AB4{stroke:#EDF0FD;} + .d2-3190304309 .stroke-AB5{stroke:#F7F8FE;} + .d2-3190304309 .background-color-N1{background-color:#0A0F25;} + .d2-3190304309 .background-color-N2{background-color:#676C7E;} + .d2-3190304309 .background-color-N3{background-color:#9499AB;} + .d2-3190304309 .background-color-N4{background-color:#CFD2DD;} + .d2-3190304309 .background-color-N5{background-color:#DEE1EB;} + .d2-3190304309 .background-color-N6{background-color:#EEF1F8;} + .d2-3190304309 .background-color-N7{background-color:#FFFFFF;} + .d2-3190304309 .background-color-B1{background-color:#0D32B2;} + .d2-3190304309 .background-color-B2{background-color:#0D32B2;} + .d2-3190304309 .background-color-B3{background-color:#E3E9FD;} + .d2-3190304309 .background-color-B4{background-color:#E3E9FD;} + .d2-3190304309 .background-color-B5{background-color:#EDF0FD;} + .d2-3190304309 .background-color-B6{background-color:#F7F8FE;} + .d2-3190304309 .background-color-AA2{background-color:#4A6FF3;} + .d2-3190304309 .background-color-AA4{background-color:#EDF0FD;} + .d2-3190304309 .background-color-AA5{background-color:#F7F8FE;} + .d2-3190304309 .background-color-AB4{background-color:#EDF0FD;} + .d2-3190304309 .background-color-AB5{background-color:#F7F8FE;} + .d2-3190304309 .color-N1{color:#0A0F25;} + .d2-3190304309 .color-N2{color:#676C7E;} + .d2-3190304309 .color-N3{color:#9499AB;} + .d2-3190304309 .color-N4{color:#CFD2DD;} + .d2-3190304309 .color-N5{color:#DEE1EB;} + .d2-3190304309 .color-N6{color:#EEF1F8;} + .d2-3190304309 .color-N7{color:#FFFFFF;} + .d2-3190304309 .color-B1{color:#0D32B2;} + .d2-3190304309 .color-B2{color:#0D32B2;} + .d2-3190304309 .color-B3{color:#E3E9FD;} + .d2-3190304309 .color-B4{color:#E3E9FD;} + .d2-3190304309 .color-B5{color:#EDF0FD;} + .d2-3190304309 .color-B6{color:#F7F8FE;} + .d2-3190304309 .color-AA2{color:#4A6FF3;} + .d2-3190304309 .color-AA4{color:#EDF0FD;} + .d2-3190304309 .color-AA5{color:#F7F8FE;} + .d2-3190304309 .color-AB4{color:#EDF0FD;} + .d2-3190304309 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3190304309);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3190304309);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3190304309);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3190304309);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3190304309);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3190304309);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3190304309);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3190304309);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3190304309);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3190304309);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3190304309);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3190304309);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3190304309);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3190304309);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3190304309);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3190304309);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3190304309);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3190304309);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>a \ No newline at end of file diff --git a/e2etests/testdata/regression/class_font_style_sequence/elk/board.exp.json b/e2etests/testdata/regression/class_font_style_sequence/elk/board.exp.json index 0007f51d6..b782e6b5e 100644 --- a/e2etests/testdata/regression/class_font_style_sequence/elk/board.exp.json +++ b/e2etests/testdata/regression/class_font_style_sequence/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -72,6 +81,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 70.5, @@ -103,6 +113,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/class_font_style_sequence/elk/sketch.exp.svg b/e2etests/testdata/regression/class_font_style_sequence/elk/sketch.exp.svg index 783f4b9e0..06f877d7d 100644 --- a/e2etests/testdata/regression/class_font_style_sequence/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/class_font_style_sequence/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -a + .d2-3190304309 .fill-N1{fill:#0A0F25;} + .d2-3190304309 .fill-N2{fill:#676C7E;} + .d2-3190304309 .fill-N3{fill:#9499AB;} + .d2-3190304309 .fill-N4{fill:#CFD2DD;} + .d2-3190304309 .fill-N5{fill:#DEE1EB;} + .d2-3190304309 .fill-N6{fill:#EEF1F8;} + .d2-3190304309 .fill-N7{fill:#FFFFFF;} + .d2-3190304309 .fill-B1{fill:#0D32B2;} + .d2-3190304309 .fill-B2{fill:#0D32B2;} + .d2-3190304309 .fill-B3{fill:#E3E9FD;} + .d2-3190304309 .fill-B4{fill:#E3E9FD;} + .d2-3190304309 .fill-B5{fill:#EDF0FD;} + .d2-3190304309 .fill-B6{fill:#F7F8FE;} + .d2-3190304309 .fill-AA2{fill:#4A6FF3;} + .d2-3190304309 .fill-AA4{fill:#EDF0FD;} + .d2-3190304309 .fill-AA5{fill:#F7F8FE;} + .d2-3190304309 .fill-AB4{fill:#EDF0FD;} + .d2-3190304309 .fill-AB5{fill:#F7F8FE;} + .d2-3190304309 .stroke-N1{stroke:#0A0F25;} + .d2-3190304309 .stroke-N2{stroke:#676C7E;} + .d2-3190304309 .stroke-N3{stroke:#9499AB;} + .d2-3190304309 .stroke-N4{stroke:#CFD2DD;} + .d2-3190304309 .stroke-N5{stroke:#DEE1EB;} + .d2-3190304309 .stroke-N6{stroke:#EEF1F8;} + .d2-3190304309 .stroke-N7{stroke:#FFFFFF;} + .d2-3190304309 .stroke-B1{stroke:#0D32B2;} + .d2-3190304309 .stroke-B2{stroke:#0D32B2;} + .d2-3190304309 .stroke-B3{stroke:#E3E9FD;} + .d2-3190304309 .stroke-B4{stroke:#E3E9FD;} + .d2-3190304309 .stroke-B5{stroke:#EDF0FD;} + .d2-3190304309 .stroke-B6{stroke:#F7F8FE;} + .d2-3190304309 .stroke-AA2{stroke:#4A6FF3;} + .d2-3190304309 .stroke-AA4{stroke:#EDF0FD;} + .d2-3190304309 .stroke-AA5{stroke:#F7F8FE;} + .d2-3190304309 .stroke-AB4{stroke:#EDF0FD;} + .d2-3190304309 .stroke-AB5{stroke:#F7F8FE;} + .d2-3190304309 .background-color-N1{background-color:#0A0F25;} + .d2-3190304309 .background-color-N2{background-color:#676C7E;} + .d2-3190304309 .background-color-N3{background-color:#9499AB;} + .d2-3190304309 .background-color-N4{background-color:#CFD2DD;} + .d2-3190304309 .background-color-N5{background-color:#DEE1EB;} + .d2-3190304309 .background-color-N6{background-color:#EEF1F8;} + .d2-3190304309 .background-color-N7{background-color:#FFFFFF;} + .d2-3190304309 .background-color-B1{background-color:#0D32B2;} + .d2-3190304309 .background-color-B2{background-color:#0D32B2;} + .d2-3190304309 .background-color-B3{background-color:#E3E9FD;} + .d2-3190304309 .background-color-B4{background-color:#E3E9FD;} + .d2-3190304309 .background-color-B5{background-color:#EDF0FD;} + .d2-3190304309 .background-color-B6{background-color:#F7F8FE;} + .d2-3190304309 .background-color-AA2{background-color:#4A6FF3;} + .d2-3190304309 .background-color-AA4{background-color:#EDF0FD;} + .d2-3190304309 .background-color-AA5{background-color:#F7F8FE;} + .d2-3190304309 .background-color-AB4{background-color:#EDF0FD;} + .d2-3190304309 .background-color-AB5{background-color:#F7F8FE;} + .d2-3190304309 .color-N1{color:#0A0F25;} + .d2-3190304309 .color-N2{color:#676C7E;} + .d2-3190304309 .color-N3{color:#9499AB;} + .d2-3190304309 .color-N4{color:#CFD2DD;} + .d2-3190304309 .color-N5{color:#DEE1EB;} + .d2-3190304309 .color-N6{color:#EEF1F8;} + .d2-3190304309 .color-N7{color:#FFFFFF;} + .d2-3190304309 .color-B1{color:#0D32B2;} + .d2-3190304309 .color-B2{color:#0D32B2;} + .d2-3190304309 .color-B3{color:#E3E9FD;} + .d2-3190304309 .color-B4{color:#E3E9FD;} + .d2-3190304309 .color-B5{color:#EDF0FD;} + .d2-3190304309 .color-B6{color:#F7F8FE;} + .d2-3190304309 .color-AA2{color:#4A6FF3;} + .d2-3190304309 .color-AA4{color:#EDF0FD;} + .d2-3190304309 .color-AA5{color:#F7F8FE;} + .d2-3190304309 .color-AB4{color:#EDF0FD;} + .d2-3190304309 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3190304309);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3190304309);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3190304309);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3190304309);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3190304309);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3190304309);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3190304309);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3190304309);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3190304309);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3190304309);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3190304309);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3190304309);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3190304309);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3190304309);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3190304309);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3190304309);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3190304309);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3190304309);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>a \ No newline at end of file diff --git a/e2etests/testdata/regression/cloud_shaped_grid/dagre/board.exp.json b/e2etests/testdata/regression/cloud_shaped_grid/dagre/board.exp.json index 276514c47..c881ccc24 100644 --- a/e2etests/testdata/regression/cloud_shaped_grid/dagre/board.exp.json +++ b/e2etests/testdata/regression/cloud_shaped_grid/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -140,6 +151,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -181,6 +193,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -222,6 +235,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -262,6 +276,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -303,6 +318,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -344,6 +360,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -385,6 +402,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/cloud_shaped_grid/dagre/sketch.exp.svg b/e2etests/testdata/regression/cloud_shaped_grid/dagre/sketch.exp.svg index 66f31581b..5584bebd0 100644 --- a/e2etests/testdata/regression/cloud_shaped_grid/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/cloud_shaped_grid/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcd + .d2-748178419 .fill-N1{fill:#0A0F25;} + .d2-748178419 .fill-N2{fill:#676C7E;} + .d2-748178419 .fill-N3{fill:#9499AB;} + .d2-748178419 .fill-N4{fill:#CFD2DD;} + .d2-748178419 .fill-N5{fill:#DEE1EB;} + .d2-748178419 .fill-N6{fill:#EEF1F8;} + .d2-748178419 .fill-N7{fill:#FFFFFF;} + .d2-748178419 .fill-B1{fill:#0D32B2;} + .d2-748178419 .fill-B2{fill:#0D32B2;} + .d2-748178419 .fill-B3{fill:#E3E9FD;} + .d2-748178419 .fill-B4{fill:#E3E9FD;} + .d2-748178419 .fill-B5{fill:#EDF0FD;} + .d2-748178419 .fill-B6{fill:#F7F8FE;} + .d2-748178419 .fill-AA2{fill:#4A6FF3;} + .d2-748178419 .fill-AA4{fill:#EDF0FD;} + .d2-748178419 .fill-AA5{fill:#F7F8FE;} + .d2-748178419 .fill-AB4{fill:#EDF0FD;} + .d2-748178419 .fill-AB5{fill:#F7F8FE;} + .d2-748178419 .stroke-N1{stroke:#0A0F25;} + .d2-748178419 .stroke-N2{stroke:#676C7E;} + .d2-748178419 .stroke-N3{stroke:#9499AB;} + .d2-748178419 .stroke-N4{stroke:#CFD2DD;} + .d2-748178419 .stroke-N5{stroke:#DEE1EB;} + .d2-748178419 .stroke-N6{stroke:#EEF1F8;} + .d2-748178419 .stroke-N7{stroke:#FFFFFF;} + .d2-748178419 .stroke-B1{stroke:#0D32B2;} + .d2-748178419 .stroke-B2{stroke:#0D32B2;} + .d2-748178419 .stroke-B3{stroke:#E3E9FD;} + .d2-748178419 .stroke-B4{stroke:#E3E9FD;} + .d2-748178419 .stroke-B5{stroke:#EDF0FD;} + .d2-748178419 .stroke-B6{stroke:#F7F8FE;} + .d2-748178419 .stroke-AA2{stroke:#4A6FF3;} + .d2-748178419 .stroke-AA4{stroke:#EDF0FD;} + .d2-748178419 .stroke-AA5{stroke:#F7F8FE;} + .d2-748178419 .stroke-AB4{stroke:#EDF0FD;} + .d2-748178419 .stroke-AB5{stroke:#F7F8FE;} + .d2-748178419 .background-color-N1{background-color:#0A0F25;} + .d2-748178419 .background-color-N2{background-color:#676C7E;} + .d2-748178419 .background-color-N3{background-color:#9499AB;} + .d2-748178419 .background-color-N4{background-color:#CFD2DD;} + .d2-748178419 .background-color-N5{background-color:#DEE1EB;} + .d2-748178419 .background-color-N6{background-color:#EEF1F8;} + .d2-748178419 .background-color-N7{background-color:#FFFFFF;} + .d2-748178419 .background-color-B1{background-color:#0D32B2;} + .d2-748178419 .background-color-B2{background-color:#0D32B2;} + .d2-748178419 .background-color-B3{background-color:#E3E9FD;} + .d2-748178419 .background-color-B4{background-color:#E3E9FD;} + .d2-748178419 .background-color-B5{background-color:#EDF0FD;} + .d2-748178419 .background-color-B6{background-color:#F7F8FE;} + .d2-748178419 .background-color-AA2{background-color:#4A6FF3;} + .d2-748178419 .background-color-AA4{background-color:#EDF0FD;} + .d2-748178419 .background-color-AA5{background-color:#F7F8FE;} + .d2-748178419 .background-color-AB4{background-color:#EDF0FD;} + .d2-748178419 .background-color-AB5{background-color:#F7F8FE;} + .d2-748178419 .color-N1{color:#0A0F25;} + .d2-748178419 .color-N2{color:#676C7E;} + .d2-748178419 .color-N3{color:#9499AB;} + .d2-748178419 .color-N4{color:#CFD2DD;} + .d2-748178419 .color-N5{color:#DEE1EB;} + .d2-748178419 .color-N6{color:#EEF1F8;} + .d2-748178419 .color-N7{color:#FFFFFF;} + .d2-748178419 .color-B1{color:#0D32B2;} + .d2-748178419 .color-B2{color:#0D32B2;} + .d2-748178419 .color-B3{color:#E3E9FD;} + .d2-748178419 .color-B4{color:#E3E9FD;} + .d2-748178419 .color-B5{color:#EDF0FD;} + .d2-748178419 .color-B6{color:#F7F8FE;} + .d2-748178419 .color-AA2{color:#4A6FF3;} + .d2-748178419 .color-AA4{color:#EDF0FD;} + .d2-748178419 .color-AA5{color:#F7F8FE;} + .d2-748178419 .color-AB4{color:#EDF0FD;} + .d2-748178419 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-748178419);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-748178419);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-748178419);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-748178419);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-748178419);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-748178419);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-748178419);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-748178419);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-748178419);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-748178419);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-748178419);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-748178419);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-748178419);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-748178419);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-748178419);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-748178419);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-748178419);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-748178419);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcd - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/cloud_shaped_grid/elk/board.exp.json b/e2etests/testdata/regression/cloud_shaped_grid/elk/board.exp.json index 3e47de63f..6a2b560a7 100644 --- a/e2etests/testdata/regression/cloud_shaped_grid/elk/board.exp.json +++ b/e2etests/testdata/regression/cloud_shaped_grid/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -140,6 +151,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -181,6 +193,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -222,6 +235,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -262,6 +276,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -303,6 +318,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -344,6 +360,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -385,6 +402,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/cloud_shaped_grid/elk/sketch.exp.svg b/e2etests/testdata/regression/cloud_shaped_grid/elk/sketch.exp.svg index 85aaf5c1e..97b758676 100644 --- a/e2etests/testdata/regression/cloud_shaped_grid/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/cloud_shaped_grid/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdabcd + .d2-3364950120 .fill-N1{fill:#0A0F25;} + .d2-3364950120 .fill-N2{fill:#676C7E;} + .d2-3364950120 .fill-N3{fill:#9499AB;} + .d2-3364950120 .fill-N4{fill:#CFD2DD;} + .d2-3364950120 .fill-N5{fill:#DEE1EB;} + .d2-3364950120 .fill-N6{fill:#EEF1F8;} + .d2-3364950120 .fill-N7{fill:#FFFFFF;} + .d2-3364950120 .fill-B1{fill:#0D32B2;} + .d2-3364950120 .fill-B2{fill:#0D32B2;} + .d2-3364950120 .fill-B3{fill:#E3E9FD;} + .d2-3364950120 .fill-B4{fill:#E3E9FD;} + .d2-3364950120 .fill-B5{fill:#EDF0FD;} + .d2-3364950120 .fill-B6{fill:#F7F8FE;} + .d2-3364950120 .fill-AA2{fill:#4A6FF3;} + .d2-3364950120 .fill-AA4{fill:#EDF0FD;} + .d2-3364950120 .fill-AA5{fill:#F7F8FE;} + .d2-3364950120 .fill-AB4{fill:#EDF0FD;} + .d2-3364950120 .fill-AB5{fill:#F7F8FE;} + .d2-3364950120 .stroke-N1{stroke:#0A0F25;} + .d2-3364950120 .stroke-N2{stroke:#676C7E;} + .d2-3364950120 .stroke-N3{stroke:#9499AB;} + .d2-3364950120 .stroke-N4{stroke:#CFD2DD;} + .d2-3364950120 .stroke-N5{stroke:#DEE1EB;} + .d2-3364950120 .stroke-N6{stroke:#EEF1F8;} + .d2-3364950120 .stroke-N7{stroke:#FFFFFF;} + .d2-3364950120 .stroke-B1{stroke:#0D32B2;} + .d2-3364950120 .stroke-B2{stroke:#0D32B2;} + .d2-3364950120 .stroke-B3{stroke:#E3E9FD;} + .d2-3364950120 .stroke-B4{stroke:#E3E9FD;} + .d2-3364950120 .stroke-B5{stroke:#EDF0FD;} + .d2-3364950120 .stroke-B6{stroke:#F7F8FE;} + .d2-3364950120 .stroke-AA2{stroke:#4A6FF3;} + .d2-3364950120 .stroke-AA4{stroke:#EDF0FD;} + .d2-3364950120 .stroke-AA5{stroke:#F7F8FE;} + .d2-3364950120 .stroke-AB4{stroke:#EDF0FD;} + .d2-3364950120 .stroke-AB5{stroke:#F7F8FE;} + .d2-3364950120 .background-color-N1{background-color:#0A0F25;} + .d2-3364950120 .background-color-N2{background-color:#676C7E;} + .d2-3364950120 .background-color-N3{background-color:#9499AB;} + .d2-3364950120 .background-color-N4{background-color:#CFD2DD;} + .d2-3364950120 .background-color-N5{background-color:#DEE1EB;} + .d2-3364950120 .background-color-N6{background-color:#EEF1F8;} + .d2-3364950120 .background-color-N7{background-color:#FFFFFF;} + .d2-3364950120 .background-color-B1{background-color:#0D32B2;} + .d2-3364950120 .background-color-B2{background-color:#0D32B2;} + .d2-3364950120 .background-color-B3{background-color:#E3E9FD;} + .d2-3364950120 .background-color-B4{background-color:#E3E9FD;} + .d2-3364950120 .background-color-B5{background-color:#EDF0FD;} + .d2-3364950120 .background-color-B6{background-color:#F7F8FE;} + .d2-3364950120 .background-color-AA2{background-color:#4A6FF3;} + .d2-3364950120 .background-color-AA4{background-color:#EDF0FD;} + .d2-3364950120 .background-color-AA5{background-color:#F7F8FE;} + .d2-3364950120 .background-color-AB4{background-color:#EDF0FD;} + .d2-3364950120 .background-color-AB5{background-color:#F7F8FE;} + .d2-3364950120 .color-N1{color:#0A0F25;} + .d2-3364950120 .color-N2{color:#676C7E;} + .d2-3364950120 .color-N3{color:#9499AB;} + .d2-3364950120 .color-N4{color:#CFD2DD;} + .d2-3364950120 .color-N5{color:#DEE1EB;} + .d2-3364950120 .color-N6{color:#EEF1F8;} + .d2-3364950120 .color-N7{color:#FFFFFF;} + .d2-3364950120 .color-B1{color:#0D32B2;} + .d2-3364950120 .color-B2{color:#0D32B2;} + .d2-3364950120 .color-B3{color:#E3E9FD;} + .d2-3364950120 .color-B4{color:#E3E9FD;} + .d2-3364950120 .color-B5{color:#EDF0FD;} + .d2-3364950120 .color-B6{color:#F7F8FE;} + .d2-3364950120 .color-AA2{color:#4A6FF3;} + .d2-3364950120 .color-AA4{color:#EDF0FD;} + .d2-3364950120 .color-AA5{color:#F7F8FE;} + .d2-3364950120 .color-AB4{color:#EDF0FD;} + .d2-3364950120 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3364950120);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3364950120);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3364950120);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3364950120);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3364950120);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3364950120);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3364950120);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3364950120);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3364950120);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3364950120);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3364950120);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3364950120);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3364950120);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3364950120);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3364950120);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3364950120);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3364950120);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3364950120);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdabcd - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/code_font_size/dagre/board.exp.json b/e2etests/testdata/regression/code_font_size/dagre/board.exp.json index e05ad58d5..26d156483 100644 --- a/e2etests/testdata/regression/code_font_size/dagre/board.exp.json +++ b/e2etests/testdata/regression/code_font_size/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "#c8e9ad", "stroke": "#c8e9ad", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -191,6 +203,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 114, @@ -238,6 +251,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 114, @@ -278,6 +292,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/code_font_size/dagre/sketch.exp.svg b/e2etests/testdata/regression/code_font_size/dagre/sketch.exp.svg index 947380119..7ad744551 100644 --- a/e2etests/testdata/regression/code_font_size/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/code_font_size/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -DatayxTesting 001:        AAA + .d2-314146115 .fill-N1{fill:#0A0F25;} + .d2-314146115 .fill-N2{fill:#676C7E;} + .d2-314146115 .fill-N3{fill:#9499AB;} + .d2-314146115 .fill-N4{fill:#CFD2DD;} + .d2-314146115 .fill-N5{fill:#DEE1EB;} + .d2-314146115 .fill-N6{fill:#EEF1F8;} + .d2-314146115 .fill-N7{fill:#FFFFFF;} + .d2-314146115 .fill-B1{fill:#0D32B2;} + .d2-314146115 .fill-B2{fill:#0D32B2;} + .d2-314146115 .fill-B3{fill:#E3E9FD;} + .d2-314146115 .fill-B4{fill:#E3E9FD;} + .d2-314146115 .fill-B5{fill:#EDF0FD;} + .d2-314146115 .fill-B6{fill:#F7F8FE;} + .d2-314146115 .fill-AA2{fill:#4A6FF3;} + .d2-314146115 .fill-AA4{fill:#EDF0FD;} + .d2-314146115 .fill-AA5{fill:#F7F8FE;} + .d2-314146115 .fill-AB4{fill:#EDF0FD;} + .d2-314146115 .fill-AB5{fill:#F7F8FE;} + .d2-314146115 .stroke-N1{stroke:#0A0F25;} + .d2-314146115 .stroke-N2{stroke:#676C7E;} + .d2-314146115 .stroke-N3{stroke:#9499AB;} + .d2-314146115 .stroke-N4{stroke:#CFD2DD;} + .d2-314146115 .stroke-N5{stroke:#DEE1EB;} + .d2-314146115 .stroke-N6{stroke:#EEF1F8;} + .d2-314146115 .stroke-N7{stroke:#FFFFFF;} + .d2-314146115 .stroke-B1{stroke:#0D32B2;} + .d2-314146115 .stroke-B2{stroke:#0D32B2;} + .d2-314146115 .stroke-B3{stroke:#E3E9FD;} + .d2-314146115 .stroke-B4{stroke:#E3E9FD;} + .d2-314146115 .stroke-B5{stroke:#EDF0FD;} + .d2-314146115 .stroke-B6{stroke:#F7F8FE;} + .d2-314146115 .stroke-AA2{stroke:#4A6FF3;} + .d2-314146115 .stroke-AA4{stroke:#EDF0FD;} + .d2-314146115 .stroke-AA5{stroke:#F7F8FE;} + .d2-314146115 .stroke-AB4{stroke:#EDF0FD;} + .d2-314146115 .stroke-AB5{stroke:#F7F8FE;} + .d2-314146115 .background-color-N1{background-color:#0A0F25;} + .d2-314146115 .background-color-N2{background-color:#676C7E;} + .d2-314146115 .background-color-N3{background-color:#9499AB;} + .d2-314146115 .background-color-N4{background-color:#CFD2DD;} + .d2-314146115 .background-color-N5{background-color:#DEE1EB;} + .d2-314146115 .background-color-N6{background-color:#EEF1F8;} + .d2-314146115 .background-color-N7{background-color:#FFFFFF;} + .d2-314146115 .background-color-B1{background-color:#0D32B2;} + .d2-314146115 .background-color-B2{background-color:#0D32B2;} + .d2-314146115 .background-color-B3{background-color:#E3E9FD;} + .d2-314146115 .background-color-B4{background-color:#E3E9FD;} + .d2-314146115 .background-color-B5{background-color:#EDF0FD;} + .d2-314146115 .background-color-B6{background-color:#F7F8FE;} + .d2-314146115 .background-color-AA2{background-color:#4A6FF3;} + .d2-314146115 .background-color-AA4{background-color:#EDF0FD;} + .d2-314146115 .background-color-AA5{background-color:#F7F8FE;} + .d2-314146115 .background-color-AB4{background-color:#EDF0FD;} + .d2-314146115 .background-color-AB5{background-color:#F7F8FE;} + .d2-314146115 .color-N1{color:#0A0F25;} + .d2-314146115 .color-N2{color:#676C7E;} + .d2-314146115 .color-N3{color:#9499AB;} + .d2-314146115 .color-N4{color:#CFD2DD;} + .d2-314146115 .color-N5{color:#DEE1EB;} + .d2-314146115 .color-N6{color:#EEF1F8;} + .d2-314146115 .color-N7{color:#FFFFFF;} + .d2-314146115 .color-B1{color:#0D32B2;} + .d2-314146115 .color-B2{color:#0D32B2;} + .d2-314146115 .color-B3{color:#E3E9FD;} + .d2-314146115 .color-B4{color:#E3E9FD;} + .d2-314146115 .color-B5{color:#EDF0FD;} + .d2-314146115 .color-B6{color:#F7F8FE;} + .d2-314146115 .color-AA2{color:#4A6FF3;} + .d2-314146115 .color-AA4{color:#EDF0FD;} + .d2-314146115 .color-AA5{color:#F7F8FE;} + .d2-314146115 .color-AB4{color:#EDF0FD;} + .d2-314146115 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-314146115);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-314146115);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-314146115);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-314146115);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-314146115);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-314146115);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-314146115);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-314146115);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-314146115);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-314146115);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-314146115);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-314146115);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-314146115);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-314146115);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-314146115);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-314146115);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-314146115);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-314146115);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>DatayxTesting 001:        AAA Testing 002:        BBB Testing 003:        CCC Testing 004:        DDD @@ -131,10 +131,10 @@ Testing 012:        LLL Testing 013:        MMM Testing 014:        NNN -Testing 015:        OOO +Testing 015:        OOO - - - - + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/code_font_size/elk/board.exp.json b/e2etests/testdata/regression/code_font_size/elk/board.exp.json index d8c2567ae..dfd73e37e 100644 --- a/e2etests/testdata/regression/code_font_size/elk/board.exp.json +++ b/e2etests/testdata/regression/code_font_size/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "#c8e9ad", "stroke": "#c8e9ad", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -191,6 +203,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 136, @@ -229,6 +242,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 136, @@ -260,6 +274,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/code_font_size/elk/sketch.exp.svg b/e2etests/testdata/regression/code_font_size/elk/sketch.exp.svg index 84ab2be2c..ca02c536f 100644 --- a/e2etests/testdata/regression/code_font_size/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/code_font_size/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -DatayxTesting 001:        AAA + .d2-3020889715 .fill-N1{fill:#0A0F25;} + .d2-3020889715 .fill-N2{fill:#676C7E;} + .d2-3020889715 .fill-N3{fill:#9499AB;} + .d2-3020889715 .fill-N4{fill:#CFD2DD;} + .d2-3020889715 .fill-N5{fill:#DEE1EB;} + .d2-3020889715 .fill-N6{fill:#EEF1F8;} + .d2-3020889715 .fill-N7{fill:#FFFFFF;} + .d2-3020889715 .fill-B1{fill:#0D32B2;} + .d2-3020889715 .fill-B2{fill:#0D32B2;} + .d2-3020889715 .fill-B3{fill:#E3E9FD;} + .d2-3020889715 .fill-B4{fill:#E3E9FD;} + .d2-3020889715 .fill-B5{fill:#EDF0FD;} + .d2-3020889715 .fill-B6{fill:#F7F8FE;} + .d2-3020889715 .fill-AA2{fill:#4A6FF3;} + .d2-3020889715 .fill-AA4{fill:#EDF0FD;} + .d2-3020889715 .fill-AA5{fill:#F7F8FE;} + .d2-3020889715 .fill-AB4{fill:#EDF0FD;} + .d2-3020889715 .fill-AB5{fill:#F7F8FE;} + .d2-3020889715 .stroke-N1{stroke:#0A0F25;} + .d2-3020889715 .stroke-N2{stroke:#676C7E;} + .d2-3020889715 .stroke-N3{stroke:#9499AB;} + .d2-3020889715 .stroke-N4{stroke:#CFD2DD;} + .d2-3020889715 .stroke-N5{stroke:#DEE1EB;} + .d2-3020889715 .stroke-N6{stroke:#EEF1F8;} + .d2-3020889715 .stroke-N7{stroke:#FFFFFF;} + .d2-3020889715 .stroke-B1{stroke:#0D32B2;} + .d2-3020889715 .stroke-B2{stroke:#0D32B2;} + .d2-3020889715 .stroke-B3{stroke:#E3E9FD;} + .d2-3020889715 .stroke-B4{stroke:#E3E9FD;} + .d2-3020889715 .stroke-B5{stroke:#EDF0FD;} + .d2-3020889715 .stroke-B6{stroke:#F7F8FE;} + .d2-3020889715 .stroke-AA2{stroke:#4A6FF3;} + .d2-3020889715 .stroke-AA4{stroke:#EDF0FD;} + .d2-3020889715 .stroke-AA5{stroke:#F7F8FE;} + .d2-3020889715 .stroke-AB4{stroke:#EDF0FD;} + .d2-3020889715 .stroke-AB5{stroke:#F7F8FE;} + .d2-3020889715 .background-color-N1{background-color:#0A0F25;} + .d2-3020889715 .background-color-N2{background-color:#676C7E;} + .d2-3020889715 .background-color-N3{background-color:#9499AB;} + .d2-3020889715 .background-color-N4{background-color:#CFD2DD;} + .d2-3020889715 .background-color-N5{background-color:#DEE1EB;} + .d2-3020889715 .background-color-N6{background-color:#EEF1F8;} + .d2-3020889715 .background-color-N7{background-color:#FFFFFF;} + .d2-3020889715 .background-color-B1{background-color:#0D32B2;} + .d2-3020889715 .background-color-B2{background-color:#0D32B2;} + .d2-3020889715 .background-color-B3{background-color:#E3E9FD;} + .d2-3020889715 .background-color-B4{background-color:#E3E9FD;} + .d2-3020889715 .background-color-B5{background-color:#EDF0FD;} + .d2-3020889715 .background-color-B6{background-color:#F7F8FE;} + .d2-3020889715 .background-color-AA2{background-color:#4A6FF3;} + .d2-3020889715 .background-color-AA4{background-color:#EDF0FD;} + .d2-3020889715 .background-color-AA5{background-color:#F7F8FE;} + .d2-3020889715 .background-color-AB4{background-color:#EDF0FD;} + .d2-3020889715 .background-color-AB5{background-color:#F7F8FE;} + .d2-3020889715 .color-N1{color:#0A0F25;} + .d2-3020889715 .color-N2{color:#676C7E;} + .d2-3020889715 .color-N3{color:#9499AB;} + .d2-3020889715 .color-N4{color:#CFD2DD;} + .d2-3020889715 .color-N5{color:#DEE1EB;} + .d2-3020889715 .color-N6{color:#EEF1F8;} + .d2-3020889715 .color-N7{color:#FFFFFF;} + .d2-3020889715 .color-B1{color:#0D32B2;} + .d2-3020889715 .color-B2{color:#0D32B2;} + .d2-3020889715 .color-B3{color:#E3E9FD;} + .d2-3020889715 .color-B4{color:#E3E9FD;} + .d2-3020889715 .color-B5{color:#EDF0FD;} + .d2-3020889715 .color-B6{color:#F7F8FE;} + .d2-3020889715 .color-AA2{color:#4A6FF3;} + .d2-3020889715 .color-AA4{color:#EDF0FD;} + .d2-3020889715 .color-AA5{color:#F7F8FE;} + .d2-3020889715 .color-AB4{color:#EDF0FD;} + .d2-3020889715 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3020889715);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3020889715);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3020889715);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3020889715);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3020889715);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3020889715);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3020889715);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3020889715);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3020889715);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3020889715);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3020889715);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3020889715);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3020889715);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3020889715);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3020889715);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3020889715);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3020889715);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3020889715);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>DatayxTesting 001:        AAA Testing 002:        BBB Testing 003:        CCC Testing 004:        DDD @@ -131,10 +131,10 @@ Testing 012:        LLL Testing 013:        MMM Testing 014:        NNN -Testing 015:        OOO +Testing 015:        OOO - - - - + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/code_leading_newlines/dagre/board.exp.json b/e2etests/testdata/regression/code_leading_newlines/dagre/board.exp.json index f094c04af..3fa15c5ba 100644 --- a/e2etests/testdata/regression/code_leading_newlines/dagre/board.exp.json +++ b/e2etests/testdata/regression/code_leading_newlines/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -98,6 +108,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -138,6 +149,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -178,6 +190,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -218,6 +231,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -260,6 +274,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/code_leading_newlines/dagre/sketch.exp.svg b/e2etests/testdata/regression/code_leading_newlines/dagre/sketch.exp.svg index c366aeeca..9bdf2c097 100644 --- a/e2etests/testdata/regression/code_leading_newlines/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/code_leading_newlines/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ - + .d2-1249491272 .fill-N1{fill:#0A0F25;} + .d2-1249491272 .fill-N2{fill:#676C7E;} + .d2-1249491272 .fill-N3{fill:#9499AB;} + .d2-1249491272 .fill-N4{fill:#CFD2DD;} + .d2-1249491272 .fill-N5{fill:#DEE1EB;} + .d2-1249491272 .fill-N6{fill:#EEF1F8;} + .d2-1249491272 .fill-N7{fill:#FFFFFF;} + .d2-1249491272 .fill-B1{fill:#0D32B2;} + .d2-1249491272 .fill-B2{fill:#0D32B2;} + .d2-1249491272 .fill-B3{fill:#E3E9FD;} + .d2-1249491272 .fill-B4{fill:#E3E9FD;} + .d2-1249491272 .fill-B5{fill:#EDF0FD;} + .d2-1249491272 .fill-B6{fill:#F7F8FE;} + .d2-1249491272 .fill-AA2{fill:#4A6FF3;} + .d2-1249491272 .fill-AA4{fill:#EDF0FD;} + .d2-1249491272 .fill-AA5{fill:#F7F8FE;} + .d2-1249491272 .fill-AB4{fill:#EDF0FD;} + .d2-1249491272 .fill-AB5{fill:#F7F8FE;} + .d2-1249491272 .stroke-N1{stroke:#0A0F25;} + .d2-1249491272 .stroke-N2{stroke:#676C7E;} + .d2-1249491272 .stroke-N3{stroke:#9499AB;} + .d2-1249491272 .stroke-N4{stroke:#CFD2DD;} + .d2-1249491272 .stroke-N5{stroke:#DEE1EB;} + .d2-1249491272 .stroke-N6{stroke:#EEF1F8;} + .d2-1249491272 .stroke-N7{stroke:#FFFFFF;} + .d2-1249491272 .stroke-B1{stroke:#0D32B2;} + .d2-1249491272 .stroke-B2{stroke:#0D32B2;} + .d2-1249491272 .stroke-B3{stroke:#E3E9FD;} + .d2-1249491272 .stroke-B4{stroke:#E3E9FD;} + .d2-1249491272 .stroke-B5{stroke:#EDF0FD;} + .d2-1249491272 .stroke-B6{stroke:#F7F8FE;} + .d2-1249491272 .stroke-AA2{stroke:#4A6FF3;} + .d2-1249491272 .stroke-AA4{stroke:#EDF0FD;} + .d2-1249491272 .stroke-AA5{stroke:#F7F8FE;} + .d2-1249491272 .stroke-AB4{stroke:#EDF0FD;} + .d2-1249491272 .stroke-AB5{stroke:#F7F8FE;} + .d2-1249491272 .background-color-N1{background-color:#0A0F25;} + .d2-1249491272 .background-color-N2{background-color:#676C7E;} + .d2-1249491272 .background-color-N3{background-color:#9499AB;} + .d2-1249491272 .background-color-N4{background-color:#CFD2DD;} + .d2-1249491272 .background-color-N5{background-color:#DEE1EB;} + .d2-1249491272 .background-color-N6{background-color:#EEF1F8;} + .d2-1249491272 .background-color-N7{background-color:#FFFFFF;} + .d2-1249491272 .background-color-B1{background-color:#0D32B2;} + .d2-1249491272 .background-color-B2{background-color:#0D32B2;} + .d2-1249491272 .background-color-B3{background-color:#E3E9FD;} + .d2-1249491272 .background-color-B4{background-color:#E3E9FD;} + .d2-1249491272 .background-color-B5{background-color:#EDF0FD;} + .d2-1249491272 .background-color-B6{background-color:#F7F8FE;} + .d2-1249491272 .background-color-AA2{background-color:#4A6FF3;} + .d2-1249491272 .background-color-AA4{background-color:#EDF0FD;} + .d2-1249491272 .background-color-AA5{background-color:#F7F8FE;} + .d2-1249491272 .background-color-AB4{background-color:#EDF0FD;} + .d2-1249491272 .background-color-AB5{background-color:#F7F8FE;} + .d2-1249491272 .color-N1{color:#0A0F25;} + .d2-1249491272 .color-N2{color:#676C7E;} + .d2-1249491272 .color-N3{color:#9499AB;} + .d2-1249491272 .color-N4{color:#CFD2DD;} + .d2-1249491272 .color-N5{color:#DEE1EB;} + .d2-1249491272 .color-N6{color:#EEF1F8;} + .d2-1249491272 .color-N7{color:#FFFFFF;} + .d2-1249491272 .color-B1{color:#0D32B2;} + .d2-1249491272 .color-B2{color:#0D32B2;} + .d2-1249491272 .color-B3{color:#E3E9FD;} + .d2-1249491272 .color-B4{color:#E3E9FD;} + .d2-1249491272 .color-B5{color:#EDF0FD;} + .d2-1249491272 .color-B6{color:#F7F8FE;} + .d2-1249491272 .color-AA2{color:#4A6FF3;} + .d2-1249491272 .color-AA4{color:#EDF0FD;} + .d2-1249491272 .color-AA5{color:#F7F8FE;} + .d2-1249491272 .color-AB4{color:#EDF0FD;} + .d2-1249491272 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1249491272);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1249491272);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1249491272);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1249491272);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1249491272);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1249491272);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1249491272);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1249491272);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1249491272);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1249491272);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1249491272);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1249491272);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1249491272);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1249491272);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1249491272);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1249491272);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1249491272);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1249491272);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> @@ -117,7 +117,7 @@ def hello(): -  print "world"# 1 leading +  print "world"# 1 leading # 2 leading # 3 leading # 4 leading @@ -131,19 +131,19 @@ # 5 leading def hello(): -  print "world" +  print "world" def hello():   print "world" def hello(): -  print "world"# 1 leading +  print "world"# 1 leading def hello():   print "world"# 1 leading def hello(): -  print "world" +  print "world" def hello(): @@ -151,7 +151,7 @@ def hello(): -  print "world"# 1 leading +  print "world"# 1 leading # 2 leading def hello(): @@ -159,12 +159,12 @@ # 2 leading def hello(): -  print "world" +  print "world" - - - - - - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/code_leading_newlines/elk/board.exp.json b/e2etests/testdata/regression/code_leading_newlines/elk/board.exp.json index 833e2de59..529131297 100644 --- a/e2etests/testdata/regression/code_leading_newlines/elk/board.exp.json +++ b/e2etests/testdata/regression/code_leading_newlines/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -98,6 +108,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -138,6 +149,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -178,6 +190,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -218,6 +231,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -260,6 +274,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/code_leading_newlines/elk/sketch.exp.svg b/e2etests/testdata/regression/code_leading_newlines/elk/sketch.exp.svg index b95d04c40..fe464b1d6 100644 --- a/e2etests/testdata/regression/code_leading_newlines/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/code_leading_newlines/elk/sketch.exp.svg @@ -1,23 +1,23 @@ - + .d2-952356257 .fill-N1{fill:#0A0F25;} + .d2-952356257 .fill-N2{fill:#676C7E;} + .d2-952356257 .fill-N3{fill:#9499AB;} + .d2-952356257 .fill-N4{fill:#CFD2DD;} + .d2-952356257 .fill-N5{fill:#DEE1EB;} + .d2-952356257 .fill-N6{fill:#EEF1F8;} + .d2-952356257 .fill-N7{fill:#FFFFFF;} + .d2-952356257 .fill-B1{fill:#0D32B2;} + .d2-952356257 .fill-B2{fill:#0D32B2;} + .d2-952356257 .fill-B3{fill:#E3E9FD;} + .d2-952356257 .fill-B4{fill:#E3E9FD;} + .d2-952356257 .fill-B5{fill:#EDF0FD;} + .d2-952356257 .fill-B6{fill:#F7F8FE;} + .d2-952356257 .fill-AA2{fill:#4A6FF3;} + .d2-952356257 .fill-AA4{fill:#EDF0FD;} + .d2-952356257 .fill-AA5{fill:#F7F8FE;} + .d2-952356257 .fill-AB4{fill:#EDF0FD;} + .d2-952356257 .fill-AB5{fill:#F7F8FE;} + .d2-952356257 .stroke-N1{stroke:#0A0F25;} + .d2-952356257 .stroke-N2{stroke:#676C7E;} + .d2-952356257 .stroke-N3{stroke:#9499AB;} + .d2-952356257 .stroke-N4{stroke:#CFD2DD;} + .d2-952356257 .stroke-N5{stroke:#DEE1EB;} + .d2-952356257 .stroke-N6{stroke:#EEF1F8;} + .d2-952356257 .stroke-N7{stroke:#FFFFFF;} + .d2-952356257 .stroke-B1{stroke:#0D32B2;} + .d2-952356257 .stroke-B2{stroke:#0D32B2;} + .d2-952356257 .stroke-B3{stroke:#E3E9FD;} + .d2-952356257 .stroke-B4{stroke:#E3E9FD;} + .d2-952356257 .stroke-B5{stroke:#EDF0FD;} + .d2-952356257 .stroke-B6{stroke:#F7F8FE;} + .d2-952356257 .stroke-AA2{stroke:#4A6FF3;} + .d2-952356257 .stroke-AA4{stroke:#EDF0FD;} + .d2-952356257 .stroke-AA5{stroke:#F7F8FE;} + .d2-952356257 .stroke-AB4{stroke:#EDF0FD;} + .d2-952356257 .stroke-AB5{stroke:#F7F8FE;} + .d2-952356257 .background-color-N1{background-color:#0A0F25;} + .d2-952356257 .background-color-N2{background-color:#676C7E;} + .d2-952356257 .background-color-N3{background-color:#9499AB;} + .d2-952356257 .background-color-N4{background-color:#CFD2DD;} + .d2-952356257 .background-color-N5{background-color:#DEE1EB;} + .d2-952356257 .background-color-N6{background-color:#EEF1F8;} + .d2-952356257 .background-color-N7{background-color:#FFFFFF;} + .d2-952356257 .background-color-B1{background-color:#0D32B2;} + .d2-952356257 .background-color-B2{background-color:#0D32B2;} + .d2-952356257 .background-color-B3{background-color:#E3E9FD;} + .d2-952356257 .background-color-B4{background-color:#E3E9FD;} + .d2-952356257 .background-color-B5{background-color:#EDF0FD;} + .d2-952356257 .background-color-B6{background-color:#F7F8FE;} + .d2-952356257 .background-color-AA2{background-color:#4A6FF3;} + .d2-952356257 .background-color-AA4{background-color:#EDF0FD;} + .d2-952356257 .background-color-AA5{background-color:#F7F8FE;} + .d2-952356257 .background-color-AB4{background-color:#EDF0FD;} + .d2-952356257 .background-color-AB5{background-color:#F7F8FE;} + .d2-952356257 .color-N1{color:#0A0F25;} + .d2-952356257 .color-N2{color:#676C7E;} + .d2-952356257 .color-N3{color:#9499AB;} + .d2-952356257 .color-N4{color:#CFD2DD;} + .d2-952356257 .color-N5{color:#DEE1EB;} + .d2-952356257 .color-N6{color:#EEF1F8;} + .d2-952356257 .color-N7{color:#FFFFFF;} + .d2-952356257 .color-B1{color:#0D32B2;} + .d2-952356257 .color-B2{color:#0D32B2;} + .d2-952356257 .color-B3{color:#E3E9FD;} + .d2-952356257 .color-B4{color:#E3E9FD;} + .d2-952356257 .color-B5{color:#EDF0FD;} + .d2-952356257 .color-B6{color:#F7F8FE;} + .d2-952356257 .color-AA2{color:#4A6FF3;} + .d2-952356257 .color-AA4{color:#EDF0FD;} + .d2-952356257 .color-AA5{color:#F7F8FE;} + .d2-952356257 .color-AB4{color:#EDF0FD;} + .d2-952356257 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-952356257);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-952356257);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-952356257);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-952356257);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-952356257);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-952356257);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-952356257);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-952356257);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-952356257);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-952356257);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-952356257);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-952356257);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-952356257);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-952356257);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-952356257);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-952356257);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-952356257);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-952356257);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> @@ -117,7 +117,7 @@ def hello(): -  print "world"# 1 leading +  print "world"# 1 leading # 2 leading # 3 leading # 4 leading @@ -131,19 +131,19 @@ # 5 leading def hello(): -  print "world" +  print "world" def hello():   print "world" def hello(): -  print "world"# 1 leading +  print "world"# 1 leading def hello():   print "world"# 1 leading def hello(): -  print "world" +  print "world" def hello(): @@ -151,7 +151,7 @@ def hello(): -  print "world"# 1 leading +  print "world"# 1 leading # 2 leading def hello(): @@ -159,12 +159,12 @@ # 2 leading def hello(): -  print "world" +  print "world" - - - - - - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/code_leading_trailing_newlines/dagre/board.exp.json b/e2etests/testdata/regression/code_leading_trailing_newlines/dagre/board.exp.json index 8bf28c93d..06192da70 100644 --- a/e2etests/testdata/regression/code_leading_trailing_newlines/dagre/board.exp.json +++ b/e2etests/testdata/regression/code_leading_trailing_newlines/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -98,6 +108,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -140,6 +151,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/code_leading_trailing_newlines/dagre/sketch.exp.svg b/e2etests/testdata/regression/code_leading_trailing_newlines/dagre/sketch.exp.svg index dae2cf600..c4572a18e 100644 --- a/e2etests/testdata/regression/code_leading_trailing_newlines/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/code_leading_trailing_newlines/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ - + .d2-3140286622 .fill-N1{fill:#0A0F25;} + .d2-3140286622 .fill-N2{fill:#676C7E;} + .d2-3140286622 .fill-N3{fill:#9499AB;} + .d2-3140286622 .fill-N4{fill:#CFD2DD;} + .d2-3140286622 .fill-N5{fill:#DEE1EB;} + .d2-3140286622 .fill-N6{fill:#EEF1F8;} + .d2-3140286622 .fill-N7{fill:#FFFFFF;} + .d2-3140286622 .fill-B1{fill:#0D32B2;} + .d2-3140286622 .fill-B2{fill:#0D32B2;} + .d2-3140286622 .fill-B3{fill:#E3E9FD;} + .d2-3140286622 .fill-B4{fill:#E3E9FD;} + .d2-3140286622 .fill-B5{fill:#EDF0FD;} + .d2-3140286622 .fill-B6{fill:#F7F8FE;} + .d2-3140286622 .fill-AA2{fill:#4A6FF3;} + .d2-3140286622 .fill-AA4{fill:#EDF0FD;} + .d2-3140286622 .fill-AA5{fill:#F7F8FE;} + .d2-3140286622 .fill-AB4{fill:#EDF0FD;} + .d2-3140286622 .fill-AB5{fill:#F7F8FE;} + .d2-3140286622 .stroke-N1{stroke:#0A0F25;} + .d2-3140286622 .stroke-N2{stroke:#676C7E;} + .d2-3140286622 .stroke-N3{stroke:#9499AB;} + .d2-3140286622 .stroke-N4{stroke:#CFD2DD;} + .d2-3140286622 .stroke-N5{stroke:#DEE1EB;} + .d2-3140286622 .stroke-N6{stroke:#EEF1F8;} + .d2-3140286622 .stroke-N7{stroke:#FFFFFF;} + .d2-3140286622 .stroke-B1{stroke:#0D32B2;} + .d2-3140286622 .stroke-B2{stroke:#0D32B2;} + .d2-3140286622 .stroke-B3{stroke:#E3E9FD;} + .d2-3140286622 .stroke-B4{stroke:#E3E9FD;} + .d2-3140286622 .stroke-B5{stroke:#EDF0FD;} + .d2-3140286622 .stroke-B6{stroke:#F7F8FE;} + .d2-3140286622 .stroke-AA2{stroke:#4A6FF3;} + .d2-3140286622 .stroke-AA4{stroke:#EDF0FD;} + .d2-3140286622 .stroke-AA5{stroke:#F7F8FE;} + .d2-3140286622 .stroke-AB4{stroke:#EDF0FD;} + .d2-3140286622 .stroke-AB5{stroke:#F7F8FE;} + .d2-3140286622 .background-color-N1{background-color:#0A0F25;} + .d2-3140286622 .background-color-N2{background-color:#676C7E;} + .d2-3140286622 .background-color-N3{background-color:#9499AB;} + .d2-3140286622 .background-color-N4{background-color:#CFD2DD;} + .d2-3140286622 .background-color-N5{background-color:#DEE1EB;} + .d2-3140286622 .background-color-N6{background-color:#EEF1F8;} + .d2-3140286622 .background-color-N7{background-color:#FFFFFF;} + .d2-3140286622 .background-color-B1{background-color:#0D32B2;} + .d2-3140286622 .background-color-B2{background-color:#0D32B2;} + .d2-3140286622 .background-color-B3{background-color:#E3E9FD;} + .d2-3140286622 .background-color-B4{background-color:#E3E9FD;} + .d2-3140286622 .background-color-B5{background-color:#EDF0FD;} + .d2-3140286622 .background-color-B6{background-color:#F7F8FE;} + .d2-3140286622 .background-color-AA2{background-color:#4A6FF3;} + .d2-3140286622 .background-color-AA4{background-color:#EDF0FD;} + .d2-3140286622 .background-color-AA5{background-color:#F7F8FE;} + .d2-3140286622 .background-color-AB4{background-color:#EDF0FD;} + .d2-3140286622 .background-color-AB5{background-color:#F7F8FE;} + .d2-3140286622 .color-N1{color:#0A0F25;} + .d2-3140286622 .color-N2{color:#676C7E;} + .d2-3140286622 .color-N3{color:#9499AB;} + .d2-3140286622 .color-N4{color:#CFD2DD;} + .d2-3140286622 .color-N5{color:#DEE1EB;} + .d2-3140286622 .color-N6{color:#EEF1F8;} + .d2-3140286622 .color-N7{color:#FFFFFF;} + .d2-3140286622 .color-B1{color:#0D32B2;} + .d2-3140286622 .color-B2{color:#0D32B2;} + .d2-3140286622 .color-B3{color:#E3E9FD;} + .d2-3140286622 .color-B4{color:#E3E9FD;} + .d2-3140286622 .color-B5{color:#EDF0FD;} + .d2-3140286622 .color-B6{color:#F7F8FE;} + .d2-3140286622 .color-AA2{color:#4A6FF3;} + .d2-3140286622 .color-AA4{color:#EDF0FD;} + .d2-3140286622 .color-AA5{color:#F7F8FE;} + .d2-3140286622 .color-AB4{color:#EDF0FD;} + .d2-3140286622 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3140286622);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3140286622);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3140286622);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3140286622);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3140286622);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3140286622);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3140286622);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3140286622);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3140286622);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3140286622);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3140286622);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3140286622);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3140286622);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3140286622);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3140286622);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3140286622);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3140286622);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3140286622);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> # 2 leading, 2 trailing def hello(): @@ -117,7 +117,7 @@   print "world" - + # 2 leading def hello(): @@ -127,7 +127,7 @@ # 2 leading def hello(): -  print "world"# 2 trailing +  print "world"# 2 trailing def hello():   print "world" @@ -137,9 +137,9 @@   print "world" - + - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/code_leading_trailing_newlines/elk/board.exp.json b/e2etests/testdata/regression/code_leading_trailing_newlines/elk/board.exp.json index 239a9eeb0..538725ba1 100644 --- a/e2etests/testdata/regression/code_leading_trailing_newlines/elk/board.exp.json +++ b/e2etests/testdata/regression/code_leading_trailing_newlines/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -98,6 +108,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -140,6 +151,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/code_leading_trailing_newlines/elk/sketch.exp.svg b/e2etests/testdata/regression/code_leading_trailing_newlines/elk/sketch.exp.svg index 0aa5a132d..08ad3e38f 100644 --- a/e2etests/testdata/regression/code_leading_trailing_newlines/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/code_leading_trailing_newlines/elk/sketch.exp.svg @@ -1,23 +1,23 @@ - + .d2-3591292195 .fill-N1{fill:#0A0F25;} + .d2-3591292195 .fill-N2{fill:#676C7E;} + .d2-3591292195 .fill-N3{fill:#9499AB;} + .d2-3591292195 .fill-N4{fill:#CFD2DD;} + .d2-3591292195 .fill-N5{fill:#DEE1EB;} + .d2-3591292195 .fill-N6{fill:#EEF1F8;} + .d2-3591292195 .fill-N7{fill:#FFFFFF;} + .d2-3591292195 .fill-B1{fill:#0D32B2;} + .d2-3591292195 .fill-B2{fill:#0D32B2;} + .d2-3591292195 .fill-B3{fill:#E3E9FD;} + .d2-3591292195 .fill-B4{fill:#E3E9FD;} + .d2-3591292195 .fill-B5{fill:#EDF0FD;} + .d2-3591292195 .fill-B6{fill:#F7F8FE;} + .d2-3591292195 .fill-AA2{fill:#4A6FF3;} + .d2-3591292195 .fill-AA4{fill:#EDF0FD;} + .d2-3591292195 .fill-AA5{fill:#F7F8FE;} + .d2-3591292195 .fill-AB4{fill:#EDF0FD;} + .d2-3591292195 .fill-AB5{fill:#F7F8FE;} + .d2-3591292195 .stroke-N1{stroke:#0A0F25;} + .d2-3591292195 .stroke-N2{stroke:#676C7E;} + .d2-3591292195 .stroke-N3{stroke:#9499AB;} + .d2-3591292195 .stroke-N4{stroke:#CFD2DD;} + .d2-3591292195 .stroke-N5{stroke:#DEE1EB;} + .d2-3591292195 .stroke-N6{stroke:#EEF1F8;} + .d2-3591292195 .stroke-N7{stroke:#FFFFFF;} + .d2-3591292195 .stroke-B1{stroke:#0D32B2;} + .d2-3591292195 .stroke-B2{stroke:#0D32B2;} + .d2-3591292195 .stroke-B3{stroke:#E3E9FD;} + .d2-3591292195 .stroke-B4{stroke:#E3E9FD;} + .d2-3591292195 .stroke-B5{stroke:#EDF0FD;} + .d2-3591292195 .stroke-B6{stroke:#F7F8FE;} + .d2-3591292195 .stroke-AA2{stroke:#4A6FF3;} + .d2-3591292195 .stroke-AA4{stroke:#EDF0FD;} + .d2-3591292195 .stroke-AA5{stroke:#F7F8FE;} + .d2-3591292195 .stroke-AB4{stroke:#EDF0FD;} + .d2-3591292195 .stroke-AB5{stroke:#F7F8FE;} + .d2-3591292195 .background-color-N1{background-color:#0A0F25;} + .d2-3591292195 .background-color-N2{background-color:#676C7E;} + .d2-3591292195 .background-color-N3{background-color:#9499AB;} + .d2-3591292195 .background-color-N4{background-color:#CFD2DD;} + .d2-3591292195 .background-color-N5{background-color:#DEE1EB;} + .d2-3591292195 .background-color-N6{background-color:#EEF1F8;} + .d2-3591292195 .background-color-N7{background-color:#FFFFFF;} + .d2-3591292195 .background-color-B1{background-color:#0D32B2;} + .d2-3591292195 .background-color-B2{background-color:#0D32B2;} + .d2-3591292195 .background-color-B3{background-color:#E3E9FD;} + .d2-3591292195 .background-color-B4{background-color:#E3E9FD;} + .d2-3591292195 .background-color-B5{background-color:#EDF0FD;} + .d2-3591292195 .background-color-B6{background-color:#F7F8FE;} + .d2-3591292195 .background-color-AA2{background-color:#4A6FF3;} + .d2-3591292195 .background-color-AA4{background-color:#EDF0FD;} + .d2-3591292195 .background-color-AA5{background-color:#F7F8FE;} + .d2-3591292195 .background-color-AB4{background-color:#EDF0FD;} + .d2-3591292195 .background-color-AB5{background-color:#F7F8FE;} + .d2-3591292195 .color-N1{color:#0A0F25;} + .d2-3591292195 .color-N2{color:#676C7E;} + .d2-3591292195 .color-N3{color:#9499AB;} + .d2-3591292195 .color-N4{color:#CFD2DD;} + .d2-3591292195 .color-N5{color:#DEE1EB;} + .d2-3591292195 .color-N6{color:#EEF1F8;} + .d2-3591292195 .color-N7{color:#FFFFFF;} + .d2-3591292195 .color-B1{color:#0D32B2;} + .d2-3591292195 .color-B2{color:#0D32B2;} + .d2-3591292195 .color-B3{color:#E3E9FD;} + .d2-3591292195 .color-B4{color:#E3E9FD;} + .d2-3591292195 .color-B5{color:#EDF0FD;} + .d2-3591292195 .color-B6{color:#F7F8FE;} + .d2-3591292195 .color-AA2{color:#4A6FF3;} + .d2-3591292195 .color-AA4{color:#EDF0FD;} + .d2-3591292195 .color-AA5{color:#F7F8FE;} + .d2-3591292195 .color-AB4{color:#EDF0FD;} + .d2-3591292195 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3591292195);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3591292195);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3591292195);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3591292195);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3591292195);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3591292195);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3591292195);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3591292195);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3591292195);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3591292195);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3591292195);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3591292195);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3591292195);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3591292195);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3591292195);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3591292195);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3591292195);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3591292195);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> # 2 leading, 2 trailing def hello(): @@ -117,7 +117,7 @@   print "world" - + # 2 leading def hello(): @@ -127,7 +127,7 @@ # 2 leading def hello(): -  print "world"# 2 trailing +  print "world"# 2 trailing def hello():   print "world" @@ -137,9 +137,9 @@   print "world" - + - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/code_trailing_newlines/dagre/board.exp.json b/e2etests/testdata/regression/code_trailing_newlines/dagre/board.exp.json index 60bfb6f5a..252c62ebd 100644 --- a/e2etests/testdata/regression/code_trailing_newlines/dagre/board.exp.json +++ b/e2etests/testdata/regression/code_trailing_newlines/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -98,6 +108,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -138,6 +149,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -178,6 +190,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -218,6 +231,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -260,6 +274,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/code_trailing_newlines/dagre/sketch.exp.svg b/e2etests/testdata/regression/code_trailing_newlines/dagre/sketch.exp.svg index ed77bc015..6cae1ead7 100644 --- a/e2etests/testdata/regression/code_trailing_newlines/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/code_trailing_newlines/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -def hello(): + .d2-435926338 .fill-N1{fill:#0A0F25;} + .d2-435926338 .fill-N2{fill:#676C7E;} + .d2-435926338 .fill-N3{fill:#9499AB;} + .d2-435926338 .fill-N4{fill:#CFD2DD;} + .d2-435926338 .fill-N5{fill:#DEE1EB;} + .d2-435926338 .fill-N6{fill:#EEF1F8;} + .d2-435926338 .fill-N7{fill:#FFFFFF;} + .d2-435926338 .fill-B1{fill:#0D32B2;} + .d2-435926338 .fill-B2{fill:#0D32B2;} + .d2-435926338 .fill-B3{fill:#E3E9FD;} + .d2-435926338 .fill-B4{fill:#E3E9FD;} + .d2-435926338 .fill-B5{fill:#EDF0FD;} + .d2-435926338 .fill-B6{fill:#F7F8FE;} + .d2-435926338 .fill-AA2{fill:#4A6FF3;} + .d2-435926338 .fill-AA4{fill:#EDF0FD;} + .d2-435926338 .fill-AA5{fill:#F7F8FE;} + .d2-435926338 .fill-AB4{fill:#EDF0FD;} + .d2-435926338 .fill-AB5{fill:#F7F8FE;} + .d2-435926338 .stroke-N1{stroke:#0A0F25;} + .d2-435926338 .stroke-N2{stroke:#676C7E;} + .d2-435926338 .stroke-N3{stroke:#9499AB;} + .d2-435926338 .stroke-N4{stroke:#CFD2DD;} + .d2-435926338 .stroke-N5{stroke:#DEE1EB;} + .d2-435926338 .stroke-N6{stroke:#EEF1F8;} + .d2-435926338 .stroke-N7{stroke:#FFFFFF;} + .d2-435926338 .stroke-B1{stroke:#0D32B2;} + .d2-435926338 .stroke-B2{stroke:#0D32B2;} + .d2-435926338 .stroke-B3{stroke:#E3E9FD;} + .d2-435926338 .stroke-B4{stroke:#E3E9FD;} + .d2-435926338 .stroke-B5{stroke:#EDF0FD;} + .d2-435926338 .stroke-B6{stroke:#F7F8FE;} + .d2-435926338 .stroke-AA2{stroke:#4A6FF3;} + .d2-435926338 .stroke-AA4{stroke:#EDF0FD;} + .d2-435926338 .stroke-AA5{stroke:#F7F8FE;} + .d2-435926338 .stroke-AB4{stroke:#EDF0FD;} + .d2-435926338 .stroke-AB5{stroke:#F7F8FE;} + .d2-435926338 .background-color-N1{background-color:#0A0F25;} + .d2-435926338 .background-color-N2{background-color:#676C7E;} + .d2-435926338 .background-color-N3{background-color:#9499AB;} + .d2-435926338 .background-color-N4{background-color:#CFD2DD;} + .d2-435926338 .background-color-N5{background-color:#DEE1EB;} + .d2-435926338 .background-color-N6{background-color:#EEF1F8;} + .d2-435926338 .background-color-N7{background-color:#FFFFFF;} + .d2-435926338 .background-color-B1{background-color:#0D32B2;} + .d2-435926338 .background-color-B2{background-color:#0D32B2;} + .d2-435926338 .background-color-B3{background-color:#E3E9FD;} + .d2-435926338 .background-color-B4{background-color:#E3E9FD;} + .d2-435926338 .background-color-B5{background-color:#EDF0FD;} + .d2-435926338 .background-color-B6{background-color:#F7F8FE;} + .d2-435926338 .background-color-AA2{background-color:#4A6FF3;} + .d2-435926338 .background-color-AA4{background-color:#EDF0FD;} + .d2-435926338 .background-color-AA5{background-color:#F7F8FE;} + .d2-435926338 .background-color-AB4{background-color:#EDF0FD;} + .d2-435926338 .background-color-AB5{background-color:#F7F8FE;} + .d2-435926338 .color-N1{color:#0A0F25;} + .d2-435926338 .color-N2{color:#676C7E;} + .d2-435926338 .color-N3{color:#9499AB;} + .d2-435926338 .color-N4{color:#CFD2DD;} + .d2-435926338 .color-N5{color:#DEE1EB;} + .d2-435926338 .color-N6{color:#EEF1F8;} + .d2-435926338 .color-N7{color:#FFFFFF;} + .d2-435926338 .color-B1{color:#0D32B2;} + .d2-435926338 .color-B2{color:#0D32B2;} + .d2-435926338 .color-B3{color:#E3E9FD;} + .d2-435926338 .color-B4{color:#E3E9FD;} + .d2-435926338 .color-B5{color:#EDF0FD;} + .d2-435926338 .color-B6{color:#F7F8FE;} + .d2-435926338 .color-AA2{color:#4A6FF3;} + .d2-435926338 .color-AA4{color:#EDF0FD;} + .d2-435926338 .color-AA5{color:#F7F8FE;} + .d2-435926338 .color-AB4{color:#EDF0FD;} + .d2-435926338 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-435926338);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-435926338);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-435926338);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-435926338);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-435926338);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-435926338);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-435926338);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-435926338);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-435926338);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-435926338);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-435926338);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-435926338);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-435926338);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-435926338);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-435926338);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-435926338);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-435926338);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-435926338);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>def hello():   print "world" @@ -117,7 +117,7 @@ -def hello(): +def hello():   print "world" # 1 trailing @@ -131,19 +131,19 @@ # 2 trailing # 3 trailing # 4 trailing -# 5 trailingdef hello(): +# 5 trailingdef hello():   print "world" def hello():   print "world" -def hello(): +def hello():   print "world" # 1 trailingdef hello():   print "world" -# 1 trailingdef hello(): +# 1 trailingdef hello():   print "world" @@ -151,7 +151,7 @@   print "world" -def hello(): +def hello():   print "world" # 1 trailing @@ -159,12 +159,12 @@   print "world" # 1 trailing -# 2 trailing +# 2 trailing - - - - - - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/code_trailing_newlines/elk/board.exp.json b/e2etests/testdata/regression/code_trailing_newlines/elk/board.exp.json index 8595e7b37..415e4dad6 100644 --- a/e2etests/testdata/regression/code_trailing_newlines/elk/board.exp.json +++ b/e2etests/testdata/regression/code_trailing_newlines/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -98,6 +108,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -138,6 +149,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -178,6 +190,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -218,6 +231,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -260,6 +274,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/code_trailing_newlines/elk/sketch.exp.svg b/e2etests/testdata/regression/code_trailing_newlines/elk/sketch.exp.svg index a3daaf4d2..90a58eb28 100644 --- a/e2etests/testdata/regression/code_trailing_newlines/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/code_trailing_newlines/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -def hello(): + .d2-3912272919 .fill-N1{fill:#0A0F25;} + .d2-3912272919 .fill-N2{fill:#676C7E;} + .d2-3912272919 .fill-N3{fill:#9499AB;} + .d2-3912272919 .fill-N4{fill:#CFD2DD;} + .d2-3912272919 .fill-N5{fill:#DEE1EB;} + .d2-3912272919 .fill-N6{fill:#EEF1F8;} + .d2-3912272919 .fill-N7{fill:#FFFFFF;} + .d2-3912272919 .fill-B1{fill:#0D32B2;} + .d2-3912272919 .fill-B2{fill:#0D32B2;} + .d2-3912272919 .fill-B3{fill:#E3E9FD;} + .d2-3912272919 .fill-B4{fill:#E3E9FD;} + .d2-3912272919 .fill-B5{fill:#EDF0FD;} + .d2-3912272919 .fill-B6{fill:#F7F8FE;} + .d2-3912272919 .fill-AA2{fill:#4A6FF3;} + .d2-3912272919 .fill-AA4{fill:#EDF0FD;} + .d2-3912272919 .fill-AA5{fill:#F7F8FE;} + .d2-3912272919 .fill-AB4{fill:#EDF0FD;} + .d2-3912272919 .fill-AB5{fill:#F7F8FE;} + .d2-3912272919 .stroke-N1{stroke:#0A0F25;} + .d2-3912272919 .stroke-N2{stroke:#676C7E;} + .d2-3912272919 .stroke-N3{stroke:#9499AB;} + .d2-3912272919 .stroke-N4{stroke:#CFD2DD;} + .d2-3912272919 .stroke-N5{stroke:#DEE1EB;} + .d2-3912272919 .stroke-N6{stroke:#EEF1F8;} + .d2-3912272919 .stroke-N7{stroke:#FFFFFF;} + .d2-3912272919 .stroke-B1{stroke:#0D32B2;} + .d2-3912272919 .stroke-B2{stroke:#0D32B2;} + .d2-3912272919 .stroke-B3{stroke:#E3E9FD;} + .d2-3912272919 .stroke-B4{stroke:#E3E9FD;} + .d2-3912272919 .stroke-B5{stroke:#EDF0FD;} + .d2-3912272919 .stroke-B6{stroke:#F7F8FE;} + .d2-3912272919 .stroke-AA2{stroke:#4A6FF3;} + .d2-3912272919 .stroke-AA4{stroke:#EDF0FD;} + .d2-3912272919 .stroke-AA5{stroke:#F7F8FE;} + .d2-3912272919 .stroke-AB4{stroke:#EDF0FD;} + .d2-3912272919 .stroke-AB5{stroke:#F7F8FE;} + .d2-3912272919 .background-color-N1{background-color:#0A0F25;} + .d2-3912272919 .background-color-N2{background-color:#676C7E;} + .d2-3912272919 .background-color-N3{background-color:#9499AB;} + .d2-3912272919 .background-color-N4{background-color:#CFD2DD;} + .d2-3912272919 .background-color-N5{background-color:#DEE1EB;} + .d2-3912272919 .background-color-N6{background-color:#EEF1F8;} + .d2-3912272919 .background-color-N7{background-color:#FFFFFF;} + .d2-3912272919 .background-color-B1{background-color:#0D32B2;} + .d2-3912272919 .background-color-B2{background-color:#0D32B2;} + .d2-3912272919 .background-color-B3{background-color:#E3E9FD;} + .d2-3912272919 .background-color-B4{background-color:#E3E9FD;} + .d2-3912272919 .background-color-B5{background-color:#EDF0FD;} + .d2-3912272919 .background-color-B6{background-color:#F7F8FE;} + .d2-3912272919 .background-color-AA2{background-color:#4A6FF3;} + .d2-3912272919 .background-color-AA4{background-color:#EDF0FD;} + .d2-3912272919 .background-color-AA5{background-color:#F7F8FE;} + .d2-3912272919 .background-color-AB4{background-color:#EDF0FD;} + .d2-3912272919 .background-color-AB5{background-color:#F7F8FE;} + .d2-3912272919 .color-N1{color:#0A0F25;} + .d2-3912272919 .color-N2{color:#676C7E;} + .d2-3912272919 .color-N3{color:#9499AB;} + .d2-3912272919 .color-N4{color:#CFD2DD;} + .d2-3912272919 .color-N5{color:#DEE1EB;} + .d2-3912272919 .color-N6{color:#EEF1F8;} + .d2-3912272919 .color-N7{color:#FFFFFF;} + .d2-3912272919 .color-B1{color:#0D32B2;} + .d2-3912272919 .color-B2{color:#0D32B2;} + .d2-3912272919 .color-B3{color:#E3E9FD;} + .d2-3912272919 .color-B4{color:#E3E9FD;} + .d2-3912272919 .color-B5{color:#EDF0FD;} + .d2-3912272919 .color-B6{color:#F7F8FE;} + .d2-3912272919 .color-AA2{color:#4A6FF3;} + .d2-3912272919 .color-AA4{color:#EDF0FD;} + .d2-3912272919 .color-AA5{color:#F7F8FE;} + .d2-3912272919 .color-AB4{color:#EDF0FD;} + .d2-3912272919 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3912272919);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3912272919);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3912272919);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3912272919);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3912272919);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3912272919);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3912272919);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3912272919);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3912272919);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3912272919);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3912272919);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3912272919);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3912272919);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3912272919);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3912272919);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3912272919);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3912272919);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3912272919);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>def hello():   print "world" @@ -117,7 +117,7 @@ -def hello(): +def hello():   print "world" # 1 trailing @@ -131,19 +131,19 @@ # 2 trailing # 3 trailing # 4 trailing -# 5 trailingdef hello(): +# 5 trailingdef hello():   print "world" def hello():   print "world" -def hello(): +def hello():   print "world" # 1 trailingdef hello():   print "world" -# 1 trailingdef hello(): +# 1 trailingdef hello():   print "world" @@ -151,7 +151,7 @@   print "world" -def hello(): +def hello():   print "world" # 1 trailing @@ -159,12 +159,12 @@   print "world" # 1 trailing -# 2 trailing +# 2 trailing - - - - - - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/cylinder_grid_label/dagre/board.exp.json b/e2etests/testdata/regression/cylinder_grid_label/dagre/board.exp.json index d51e98a67..4418c27b4 100644 --- a/e2etests/testdata/regression/cylinder_grid_label/dagre/board.exp.json +++ b/e2etests/testdata/regression/cylinder_grid_label/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "AA4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -143,6 +154,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/cylinder_grid_label/dagre/sketch.exp.svg b/e2etests/testdata/regression/cylinder_grid_label/dagre/sketch.exp.svg index c0d61946d..d66dbba9f 100644 --- a/e2etests/testdata/regression/cylinder_grid_label/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/cylinder_grid_label/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -container title is hiddenfirstsecond + .d2-53670574 .fill-N1{fill:#0A0F25;} + .d2-53670574 .fill-N2{fill:#676C7E;} + .d2-53670574 .fill-N3{fill:#9499AB;} + .d2-53670574 .fill-N4{fill:#CFD2DD;} + .d2-53670574 .fill-N5{fill:#DEE1EB;} + .d2-53670574 .fill-N6{fill:#EEF1F8;} + .d2-53670574 .fill-N7{fill:#FFFFFF;} + .d2-53670574 .fill-B1{fill:#0D32B2;} + .d2-53670574 .fill-B2{fill:#0D32B2;} + .d2-53670574 .fill-B3{fill:#E3E9FD;} + .d2-53670574 .fill-B4{fill:#E3E9FD;} + .d2-53670574 .fill-B5{fill:#EDF0FD;} + .d2-53670574 .fill-B6{fill:#F7F8FE;} + .d2-53670574 .fill-AA2{fill:#4A6FF3;} + .d2-53670574 .fill-AA4{fill:#EDF0FD;} + .d2-53670574 .fill-AA5{fill:#F7F8FE;} + .d2-53670574 .fill-AB4{fill:#EDF0FD;} + .d2-53670574 .fill-AB5{fill:#F7F8FE;} + .d2-53670574 .stroke-N1{stroke:#0A0F25;} + .d2-53670574 .stroke-N2{stroke:#676C7E;} + .d2-53670574 .stroke-N3{stroke:#9499AB;} + .d2-53670574 .stroke-N4{stroke:#CFD2DD;} + .d2-53670574 .stroke-N5{stroke:#DEE1EB;} + .d2-53670574 .stroke-N6{stroke:#EEF1F8;} + .d2-53670574 .stroke-N7{stroke:#FFFFFF;} + .d2-53670574 .stroke-B1{stroke:#0D32B2;} + .d2-53670574 .stroke-B2{stroke:#0D32B2;} + .d2-53670574 .stroke-B3{stroke:#E3E9FD;} + .d2-53670574 .stroke-B4{stroke:#E3E9FD;} + .d2-53670574 .stroke-B5{stroke:#EDF0FD;} + .d2-53670574 .stroke-B6{stroke:#F7F8FE;} + .d2-53670574 .stroke-AA2{stroke:#4A6FF3;} + .d2-53670574 .stroke-AA4{stroke:#EDF0FD;} + .d2-53670574 .stroke-AA5{stroke:#F7F8FE;} + .d2-53670574 .stroke-AB4{stroke:#EDF0FD;} + .d2-53670574 .stroke-AB5{stroke:#F7F8FE;} + .d2-53670574 .background-color-N1{background-color:#0A0F25;} + .d2-53670574 .background-color-N2{background-color:#676C7E;} + .d2-53670574 .background-color-N3{background-color:#9499AB;} + .d2-53670574 .background-color-N4{background-color:#CFD2DD;} + .d2-53670574 .background-color-N5{background-color:#DEE1EB;} + .d2-53670574 .background-color-N6{background-color:#EEF1F8;} + .d2-53670574 .background-color-N7{background-color:#FFFFFF;} + .d2-53670574 .background-color-B1{background-color:#0D32B2;} + .d2-53670574 .background-color-B2{background-color:#0D32B2;} + .d2-53670574 .background-color-B3{background-color:#E3E9FD;} + .d2-53670574 .background-color-B4{background-color:#E3E9FD;} + .d2-53670574 .background-color-B5{background-color:#EDF0FD;} + .d2-53670574 .background-color-B6{background-color:#F7F8FE;} + .d2-53670574 .background-color-AA2{background-color:#4A6FF3;} + .d2-53670574 .background-color-AA4{background-color:#EDF0FD;} + .d2-53670574 .background-color-AA5{background-color:#F7F8FE;} + .d2-53670574 .background-color-AB4{background-color:#EDF0FD;} + .d2-53670574 .background-color-AB5{background-color:#F7F8FE;} + .d2-53670574 .color-N1{color:#0A0F25;} + .d2-53670574 .color-N2{color:#676C7E;} + .d2-53670574 .color-N3{color:#9499AB;} + .d2-53670574 .color-N4{color:#CFD2DD;} + .d2-53670574 .color-N5{color:#DEE1EB;} + .d2-53670574 .color-N6{color:#EEF1F8;} + .d2-53670574 .color-N7{color:#FFFFFF;} + .d2-53670574 .color-B1{color:#0D32B2;} + .d2-53670574 .color-B2{color:#0D32B2;} + .d2-53670574 .color-B3{color:#E3E9FD;} + .d2-53670574 .color-B4{color:#E3E9FD;} + .d2-53670574 .color-B5{color:#EDF0FD;} + .d2-53670574 .color-B6{color:#F7F8FE;} + .d2-53670574 .color-AA2{color:#4A6FF3;} + .d2-53670574 .color-AA4{color:#EDF0FD;} + .d2-53670574 .color-AA5{color:#F7F8FE;} + .d2-53670574 .color-AB4{color:#EDF0FD;} + .d2-53670574 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-53670574);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-53670574);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-53670574);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-53670574);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-53670574);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-53670574);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-53670574);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-53670574);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-53670574);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-53670574);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-53670574);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-53670574);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-53670574);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-53670574);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-53670574);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-53670574);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-53670574);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-53670574);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>container title is hiddenfirstsecond - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/cylinder_grid_label/elk/board.exp.json b/e2etests/testdata/regression/cylinder_grid_label/elk/board.exp.json index 7539ef058..6508815df 100644 --- a/e2etests/testdata/regression/cylinder_grid_label/elk/board.exp.json +++ b/e2etests/testdata/regression/cylinder_grid_label/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "AA4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -143,6 +154,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/cylinder_grid_label/elk/sketch.exp.svg b/e2etests/testdata/regression/cylinder_grid_label/elk/sketch.exp.svg index 76536cda0..c39cccaae 100644 --- a/e2etests/testdata/regression/cylinder_grid_label/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/cylinder_grid_label/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -container title is hiddenfirstsecond + .d2-960512389 .fill-N1{fill:#0A0F25;} + .d2-960512389 .fill-N2{fill:#676C7E;} + .d2-960512389 .fill-N3{fill:#9499AB;} + .d2-960512389 .fill-N4{fill:#CFD2DD;} + .d2-960512389 .fill-N5{fill:#DEE1EB;} + .d2-960512389 .fill-N6{fill:#EEF1F8;} + .d2-960512389 .fill-N7{fill:#FFFFFF;} + .d2-960512389 .fill-B1{fill:#0D32B2;} + .d2-960512389 .fill-B2{fill:#0D32B2;} + .d2-960512389 .fill-B3{fill:#E3E9FD;} + .d2-960512389 .fill-B4{fill:#E3E9FD;} + .d2-960512389 .fill-B5{fill:#EDF0FD;} + .d2-960512389 .fill-B6{fill:#F7F8FE;} + .d2-960512389 .fill-AA2{fill:#4A6FF3;} + .d2-960512389 .fill-AA4{fill:#EDF0FD;} + .d2-960512389 .fill-AA5{fill:#F7F8FE;} + .d2-960512389 .fill-AB4{fill:#EDF0FD;} + .d2-960512389 .fill-AB5{fill:#F7F8FE;} + .d2-960512389 .stroke-N1{stroke:#0A0F25;} + .d2-960512389 .stroke-N2{stroke:#676C7E;} + .d2-960512389 .stroke-N3{stroke:#9499AB;} + .d2-960512389 .stroke-N4{stroke:#CFD2DD;} + .d2-960512389 .stroke-N5{stroke:#DEE1EB;} + .d2-960512389 .stroke-N6{stroke:#EEF1F8;} + .d2-960512389 .stroke-N7{stroke:#FFFFFF;} + .d2-960512389 .stroke-B1{stroke:#0D32B2;} + .d2-960512389 .stroke-B2{stroke:#0D32B2;} + .d2-960512389 .stroke-B3{stroke:#E3E9FD;} + .d2-960512389 .stroke-B4{stroke:#E3E9FD;} + .d2-960512389 .stroke-B5{stroke:#EDF0FD;} + .d2-960512389 .stroke-B6{stroke:#F7F8FE;} + .d2-960512389 .stroke-AA2{stroke:#4A6FF3;} + .d2-960512389 .stroke-AA4{stroke:#EDF0FD;} + .d2-960512389 .stroke-AA5{stroke:#F7F8FE;} + .d2-960512389 .stroke-AB4{stroke:#EDF0FD;} + .d2-960512389 .stroke-AB5{stroke:#F7F8FE;} + .d2-960512389 .background-color-N1{background-color:#0A0F25;} + .d2-960512389 .background-color-N2{background-color:#676C7E;} + .d2-960512389 .background-color-N3{background-color:#9499AB;} + .d2-960512389 .background-color-N4{background-color:#CFD2DD;} + .d2-960512389 .background-color-N5{background-color:#DEE1EB;} + .d2-960512389 .background-color-N6{background-color:#EEF1F8;} + .d2-960512389 .background-color-N7{background-color:#FFFFFF;} + .d2-960512389 .background-color-B1{background-color:#0D32B2;} + .d2-960512389 .background-color-B2{background-color:#0D32B2;} + .d2-960512389 .background-color-B3{background-color:#E3E9FD;} + .d2-960512389 .background-color-B4{background-color:#E3E9FD;} + .d2-960512389 .background-color-B5{background-color:#EDF0FD;} + .d2-960512389 .background-color-B6{background-color:#F7F8FE;} + .d2-960512389 .background-color-AA2{background-color:#4A6FF3;} + .d2-960512389 .background-color-AA4{background-color:#EDF0FD;} + .d2-960512389 .background-color-AA5{background-color:#F7F8FE;} + .d2-960512389 .background-color-AB4{background-color:#EDF0FD;} + .d2-960512389 .background-color-AB5{background-color:#F7F8FE;} + .d2-960512389 .color-N1{color:#0A0F25;} + .d2-960512389 .color-N2{color:#676C7E;} + .d2-960512389 .color-N3{color:#9499AB;} + .d2-960512389 .color-N4{color:#CFD2DD;} + .d2-960512389 .color-N5{color:#DEE1EB;} + .d2-960512389 .color-N6{color:#EEF1F8;} + .d2-960512389 .color-N7{color:#FFFFFF;} + .d2-960512389 .color-B1{color:#0D32B2;} + .d2-960512389 .color-B2{color:#0D32B2;} + .d2-960512389 .color-B3{color:#E3E9FD;} + .d2-960512389 .color-B4{color:#E3E9FD;} + .d2-960512389 .color-B5{color:#EDF0FD;} + .d2-960512389 .color-B6{color:#F7F8FE;} + .d2-960512389 .color-AA2{color:#4A6FF3;} + .d2-960512389 .color-AA4{color:#EDF0FD;} + .d2-960512389 .color-AA5{color:#F7F8FE;} + .d2-960512389 .color-AB4{color:#EDF0FD;} + .d2-960512389 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-960512389);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-960512389);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-960512389);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-960512389);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-960512389);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-960512389);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-960512389);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-960512389);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-960512389);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-960512389);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-960512389);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-960512389);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-960512389);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-960512389);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-960512389);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-960512389);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-960512389);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-960512389);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>container title is hiddenfirstsecond - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/dagre-disconnect/dagre/board.exp.json b/e2etests/testdata/regression/dagre-disconnect/dagre/board.exp.json index ea2e876a1..c0802bc72 100644 --- a/e2etests/testdata/regression/dagre-disconnect/dagre/board.exp.json +++ b/e2etests/testdata/regression/dagre-disconnect/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "red", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -715,6 +740,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -756,6 +782,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -797,6 +824,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -838,6 +866,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -879,6 +908,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -920,6 +950,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -961,6 +992,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1002,6 +1034,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1043,6 +1076,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1094,6 +1128,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 85.5, @@ -1177,6 +1212,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 197, @@ -1260,6 +1296,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1173.5, @@ -1343,6 +1380,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 827.25, @@ -1426,6 +1464,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 309, @@ -1509,6 +1548,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1060, @@ -1592,6 +1632,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 650.5, @@ -1663,6 +1704,7 @@ "labelHeight": 69, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 479.5, @@ -1727,6 +1769,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/dagre-disconnect/dagre/sketch.exp.svg b/e2etests/testdata/regression/dagre-disconnect/dagre/sketch.exp.svg index 88075aca3..8b924e8a1 100644 --- a/e2etests/testdata/regression/dagre-disconnect/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre-disconnect/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -askuhykfnsomsczrgtigsjjcfi 1234 + .d2-2273765116 .fill-N1{fill:#0A0F25;} + .d2-2273765116 .fill-N2{fill:#676C7E;} + .d2-2273765116 .fill-N3{fill:#9499AB;} + .d2-2273765116 .fill-N4{fill:#CFD2DD;} + .d2-2273765116 .fill-N5{fill:#DEE1EB;} + .d2-2273765116 .fill-N6{fill:#EEF1F8;} + .d2-2273765116 .fill-N7{fill:#FFFFFF;} + .d2-2273765116 .fill-B1{fill:#0D32B2;} + .d2-2273765116 .fill-B2{fill:#0D32B2;} + .d2-2273765116 .fill-B3{fill:#E3E9FD;} + .d2-2273765116 .fill-B4{fill:#E3E9FD;} + .d2-2273765116 .fill-B5{fill:#EDF0FD;} + .d2-2273765116 .fill-B6{fill:#F7F8FE;} + .d2-2273765116 .fill-AA2{fill:#4A6FF3;} + .d2-2273765116 .fill-AA4{fill:#EDF0FD;} + .d2-2273765116 .fill-AA5{fill:#F7F8FE;} + .d2-2273765116 .fill-AB4{fill:#EDF0FD;} + .d2-2273765116 .fill-AB5{fill:#F7F8FE;} + .d2-2273765116 .stroke-N1{stroke:#0A0F25;} + .d2-2273765116 .stroke-N2{stroke:#676C7E;} + .d2-2273765116 .stroke-N3{stroke:#9499AB;} + .d2-2273765116 .stroke-N4{stroke:#CFD2DD;} + .d2-2273765116 .stroke-N5{stroke:#DEE1EB;} + .d2-2273765116 .stroke-N6{stroke:#EEF1F8;} + .d2-2273765116 .stroke-N7{stroke:#FFFFFF;} + .d2-2273765116 .stroke-B1{stroke:#0D32B2;} + .d2-2273765116 .stroke-B2{stroke:#0D32B2;} + .d2-2273765116 .stroke-B3{stroke:#E3E9FD;} + .d2-2273765116 .stroke-B4{stroke:#E3E9FD;} + .d2-2273765116 .stroke-B5{stroke:#EDF0FD;} + .d2-2273765116 .stroke-B6{stroke:#F7F8FE;} + .d2-2273765116 .stroke-AA2{stroke:#4A6FF3;} + .d2-2273765116 .stroke-AA4{stroke:#EDF0FD;} + .d2-2273765116 .stroke-AA5{stroke:#F7F8FE;} + .d2-2273765116 .stroke-AB4{stroke:#EDF0FD;} + .d2-2273765116 .stroke-AB5{stroke:#F7F8FE;} + .d2-2273765116 .background-color-N1{background-color:#0A0F25;} + .d2-2273765116 .background-color-N2{background-color:#676C7E;} + .d2-2273765116 .background-color-N3{background-color:#9499AB;} + .d2-2273765116 .background-color-N4{background-color:#CFD2DD;} + .d2-2273765116 .background-color-N5{background-color:#DEE1EB;} + .d2-2273765116 .background-color-N6{background-color:#EEF1F8;} + .d2-2273765116 .background-color-N7{background-color:#FFFFFF;} + .d2-2273765116 .background-color-B1{background-color:#0D32B2;} + .d2-2273765116 .background-color-B2{background-color:#0D32B2;} + .d2-2273765116 .background-color-B3{background-color:#E3E9FD;} + .d2-2273765116 .background-color-B4{background-color:#E3E9FD;} + .d2-2273765116 .background-color-B5{background-color:#EDF0FD;} + .d2-2273765116 .background-color-B6{background-color:#F7F8FE;} + .d2-2273765116 .background-color-AA2{background-color:#4A6FF3;} + .d2-2273765116 .background-color-AA4{background-color:#EDF0FD;} + .d2-2273765116 .background-color-AA5{background-color:#F7F8FE;} + .d2-2273765116 .background-color-AB4{background-color:#EDF0FD;} + .d2-2273765116 .background-color-AB5{background-color:#F7F8FE;} + .d2-2273765116 .color-N1{color:#0A0F25;} + .d2-2273765116 .color-N2{color:#676C7E;} + .d2-2273765116 .color-N3{color:#9499AB;} + .d2-2273765116 .color-N4{color:#CFD2DD;} + .d2-2273765116 .color-N5{color:#DEE1EB;} + .d2-2273765116 .color-N6{color:#EEF1F8;} + .d2-2273765116 .color-N7{color:#FFFFFF;} + .d2-2273765116 .color-B1{color:#0D32B2;} + .d2-2273765116 .color-B2{color:#0D32B2;} + .d2-2273765116 .color-B3{color:#E3E9FD;} + .d2-2273765116 .color-B4{color:#E3E9FD;} + .d2-2273765116 .color-B5{color:#EDF0FD;} + .d2-2273765116 .color-B6{color:#F7F8FE;} + .d2-2273765116 .color-AA2{color:#4A6FF3;} + .d2-2273765116 .color-AA4{color:#EDF0FD;} + .d2-2273765116 .color-AA5{color:#F7F8FE;} + .d2-2273765116 .color-AB4{color:#EDF0FD;} + .d2-2273765116 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2273765116);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2273765116);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2273765116);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2273765116);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2273765116);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2273765116);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2273765116);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2273765116);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2273765116);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2273765116);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2273765116);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2273765116);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2273765116);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2273765116);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2273765116);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2273765116);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2273765116);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2273765116);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>askuhykfnsomsczrgtigsjjcfi 1234 - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/dagre-disconnect/elk/board.exp.json b/e2etests/testdata/regression/dagre-disconnect/elk/board.exp.json index b5a1bf653..bf1f358f7 100644 --- a/e2etests/testdata/regression/dagre-disconnect/elk/board.exp.json +++ b/e2etests/testdata/regression/dagre-disconnect/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "red", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -715,6 +740,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -756,6 +782,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -797,6 +824,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -838,6 +866,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -879,6 +908,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -920,6 +950,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -961,6 +992,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1002,6 +1034,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1043,6 +1076,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1094,6 +1128,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 309.5, @@ -1140,6 +1175,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 403, @@ -1194,6 +1230,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 88, @@ -1240,6 +1277,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 425, @@ -1286,6 +1324,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 475, @@ -1324,6 +1363,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 596.5, @@ -1362,6 +1402,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 413.75, @@ -1400,6 +1441,7 @@ "labelHeight": 69, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 413.75, @@ -1447,6 +1489,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/dagre-disconnect/elk/sketch.exp.svg b/e2etests/testdata/regression/dagre-disconnect/elk/sketch.exp.svg index 2b6b85375..93928e8fe 100644 --- a/e2etests/testdata/regression/dagre-disconnect/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre-disconnect/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -askuhykfnsomsczrgtigsjjcfi 1234 + .d2-2575068939 .fill-N1{fill:#0A0F25;} + .d2-2575068939 .fill-N2{fill:#676C7E;} + .d2-2575068939 .fill-N3{fill:#9499AB;} + .d2-2575068939 .fill-N4{fill:#CFD2DD;} + .d2-2575068939 .fill-N5{fill:#DEE1EB;} + .d2-2575068939 .fill-N6{fill:#EEF1F8;} + .d2-2575068939 .fill-N7{fill:#FFFFFF;} + .d2-2575068939 .fill-B1{fill:#0D32B2;} + .d2-2575068939 .fill-B2{fill:#0D32B2;} + .d2-2575068939 .fill-B3{fill:#E3E9FD;} + .d2-2575068939 .fill-B4{fill:#E3E9FD;} + .d2-2575068939 .fill-B5{fill:#EDF0FD;} + .d2-2575068939 .fill-B6{fill:#F7F8FE;} + .d2-2575068939 .fill-AA2{fill:#4A6FF3;} + .d2-2575068939 .fill-AA4{fill:#EDF0FD;} + .d2-2575068939 .fill-AA5{fill:#F7F8FE;} + .d2-2575068939 .fill-AB4{fill:#EDF0FD;} + .d2-2575068939 .fill-AB5{fill:#F7F8FE;} + .d2-2575068939 .stroke-N1{stroke:#0A0F25;} + .d2-2575068939 .stroke-N2{stroke:#676C7E;} + .d2-2575068939 .stroke-N3{stroke:#9499AB;} + .d2-2575068939 .stroke-N4{stroke:#CFD2DD;} + .d2-2575068939 .stroke-N5{stroke:#DEE1EB;} + .d2-2575068939 .stroke-N6{stroke:#EEF1F8;} + .d2-2575068939 .stroke-N7{stroke:#FFFFFF;} + .d2-2575068939 .stroke-B1{stroke:#0D32B2;} + .d2-2575068939 .stroke-B2{stroke:#0D32B2;} + .d2-2575068939 .stroke-B3{stroke:#E3E9FD;} + .d2-2575068939 .stroke-B4{stroke:#E3E9FD;} + .d2-2575068939 .stroke-B5{stroke:#EDF0FD;} + .d2-2575068939 .stroke-B6{stroke:#F7F8FE;} + .d2-2575068939 .stroke-AA2{stroke:#4A6FF3;} + .d2-2575068939 .stroke-AA4{stroke:#EDF0FD;} + .d2-2575068939 .stroke-AA5{stroke:#F7F8FE;} + .d2-2575068939 .stroke-AB4{stroke:#EDF0FD;} + .d2-2575068939 .stroke-AB5{stroke:#F7F8FE;} + .d2-2575068939 .background-color-N1{background-color:#0A0F25;} + .d2-2575068939 .background-color-N2{background-color:#676C7E;} + .d2-2575068939 .background-color-N3{background-color:#9499AB;} + .d2-2575068939 .background-color-N4{background-color:#CFD2DD;} + .d2-2575068939 .background-color-N5{background-color:#DEE1EB;} + .d2-2575068939 .background-color-N6{background-color:#EEF1F8;} + .d2-2575068939 .background-color-N7{background-color:#FFFFFF;} + .d2-2575068939 .background-color-B1{background-color:#0D32B2;} + .d2-2575068939 .background-color-B2{background-color:#0D32B2;} + .d2-2575068939 .background-color-B3{background-color:#E3E9FD;} + .d2-2575068939 .background-color-B4{background-color:#E3E9FD;} + .d2-2575068939 .background-color-B5{background-color:#EDF0FD;} + .d2-2575068939 .background-color-B6{background-color:#F7F8FE;} + .d2-2575068939 .background-color-AA2{background-color:#4A6FF3;} + .d2-2575068939 .background-color-AA4{background-color:#EDF0FD;} + .d2-2575068939 .background-color-AA5{background-color:#F7F8FE;} + .d2-2575068939 .background-color-AB4{background-color:#EDF0FD;} + .d2-2575068939 .background-color-AB5{background-color:#F7F8FE;} + .d2-2575068939 .color-N1{color:#0A0F25;} + .d2-2575068939 .color-N2{color:#676C7E;} + .d2-2575068939 .color-N3{color:#9499AB;} + .d2-2575068939 .color-N4{color:#CFD2DD;} + .d2-2575068939 .color-N5{color:#DEE1EB;} + .d2-2575068939 .color-N6{color:#EEF1F8;} + .d2-2575068939 .color-N7{color:#FFFFFF;} + .d2-2575068939 .color-B1{color:#0D32B2;} + .d2-2575068939 .color-B2{color:#0D32B2;} + .d2-2575068939 .color-B3{color:#E3E9FD;} + .d2-2575068939 .color-B4{color:#E3E9FD;} + .d2-2575068939 .color-B5{color:#EDF0FD;} + .d2-2575068939 .color-B6{color:#F7F8FE;} + .d2-2575068939 .color-AA2{color:#4A6FF3;} + .d2-2575068939 .color-AA4{color:#EDF0FD;} + .d2-2575068939 .color-AA5{color:#F7F8FE;} + .d2-2575068939 .color-AB4{color:#EDF0FD;} + .d2-2575068939 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2575068939);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2575068939);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2575068939);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2575068939);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2575068939);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2575068939);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2575068939);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2575068939);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2575068939);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2575068939);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2575068939);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2575068939);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2575068939);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2575068939);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2575068939);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2575068939);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2575068939);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2575068939);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>askuhykfnsomsczrgtigsjjcfi 1234 - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/dagre_broken_arrowhead/dagre/board.exp.json b/e2etests/testdata/regression/dagre_broken_arrowhead/dagre/board.exp.json index 4b5bdb62f..ddfa023fc 100644 --- a/e2etests/testdata/regression/dagre_broken_arrowhead/dagre/board.exp.json +++ b/e2etests/testdata/regression/dagre_broken_arrowhead/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "white", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -274,6 +288,7 @@ "labelHeight": 69, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 66.5, @@ -321,6 +336,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 179, @@ -368,6 +384,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 291.5, @@ -408,6 +425,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/dagre_broken_arrowhead/dagre/sketch.exp.svg b/e2etests/testdata/regression/dagre_broken_arrowhead/dagre/sketch.exp.svg index 4a19ce782..b97084a55 100644 --- a/e2etests/testdata/regression/dagre_broken_arrowhead/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre_broken_arrowhead/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -abc12d line 1line 2line 3line 4 + .d2-4180049586 .fill-N1{fill:#0A0F25;} + .d2-4180049586 .fill-N2{fill:#676C7E;} + .d2-4180049586 .fill-N3{fill:#9499AB;} + .d2-4180049586 .fill-N4{fill:#CFD2DD;} + .d2-4180049586 .fill-N5{fill:#DEE1EB;} + .d2-4180049586 .fill-N6{fill:#EEF1F8;} + .d2-4180049586 .fill-N7{fill:#FFFFFF;} + .d2-4180049586 .fill-B1{fill:#0D32B2;} + .d2-4180049586 .fill-B2{fill:#0D32B2;} + .d2-4180049586 .fill-B3{fill:#E3E9FD;} + .d2-4180049586 .fill-B4{fill:#E3E9FD;} + .d2-4180049586 .fill-B5{fill:#EDF0FD;} + .d2-4180049586 .fill-B6{fill:#F7F8FE;} + .d2-4180049586 .fill-AA2{fill:#4A6FF3;} + .d2-4180049586 .fill-AA4{fill:#EDF0FD;} + .d2-4180049586 .fill-AA5{fill:#F7F8FE;} + .d2-4180049586 .fill-AB4{fill:#EDF0FD;} + .d2-4180049586 .fill-AB5{fill:#F7F8FE;} + .d2-4180049586 .stroke-N1{stroke:#0A0F25;} + .d2-4180049586 .stroke-N2{stroke:#676C7E;} + .d2-4180049586 .stroke-N3{stroke:#9499AB;} + .d2-4180049586 .stroke-N4{stroke:#CFD2DD;} + .d2-4180049586 .stroke-N5{stroke:#DEE1EB;} + .d2-4180049586 .stroke-N6{stroke:#EEF1F8;} + .d2-4180049586 .stroke-N7{stroke:#FFFFFF;} + .d2-4180049586 .stroke-B1{stroke:#0D32B2;} + .d2-4180049586 .stroke-B2{stroke:#0D32B2;} + .d2-4180049586 .stroke-B3{stroke:#E3E9FD;} + .d2-4180049586 .stroke-B4{stroke:#E3E9FD;} + .d2-4180049586 .stroke-B5{stroke:#EDF0FD;} + .d2-4180049586 .stroke-B6{stroke:#F7F8FE;} + .d2-4180049586 .stroke-AA2{stroke:#4A6FF3;} + .d2-4180049586 .stroke-AA4{stroke:#EDF0FD;} + .d2-4180049586 .stroke-AA5{stroke:#F7F8FE;} + .d2-4180049586 .stroke-AB4{stroke:#EDF0FD;} + .d2-4180049586 .stroke-AB5{stroke:#F7F8FE;} + .d2-4180049586 .background-color-N1{background-color:#0A0F25;} + .d2-4180049586 .background-color-N2{background-color:#676C7E;} + .d2-4180049586 .background-color-N3{background-color:#9499AB;} + .d2-4180049586 .background-color-N4{background-color:#CFD2DD;} + .d2-4180049586 .background-color-N5{background-color:#DEE1EB;} + .d2-4180049586 .background-color-N6{background-color:#EEF1F8;} + .d2-4180049586 .background-color-N7{background-color:#FFFFFF;} + .d2-4180049586 .background-color-B1{background-color:#0D32B2;} + .d2-4180049586 .background-color-B2{background-color:#0D32B2;} + .d2-4180049586 .background-color-B3{background-color:#E3E9FD;} + .d2-4180049586 .background-color-B4{background-color:#E3E9FD;} + .d2-4180049586 .background-color-B5{background-color:#EDF0FD;} + .d2-4180049586 .background-color-B6{background-color:#F7F8FE;} + .d2-4180049586 .background-color-AA2{background-color:#4A6FF3;} + .d2-4180049586 .background-color-AA4{background-color:#EDF0FD;} + .d2-4180049586 .background-color-AA5{background-color:#F7F8FE;} + .d2-4180049586 .background-color-AB4{background-color:#EDF0FD;} + .d2-4180049586 .background-color-AB5{background-color:#F7F8FE;} + .d2-4180049586 .color-N1{color:#0A0F25;} + .d2-4180049586 .color-N2{color:#676C7E;} + .d2-4180049586 .color-N3{color:#9499AB;} + .d2-4180049586 .color-N4{color:#CFD2DD;} + .d2-4180049586 .color-N5{color:#DEE1EB;} + .d2-4180049586 .color-N6{color:#EEF1F8;} + .d2-4180049586 .color-N7{color:#FFFFFF;} + .d2-4180049586 .color-B1{color:#0D32B2;} + .d2-4180049586 .color-B2{color:#0D32B2;} + .d2-4180049586 .color-B3{color:#E3E9FD;} + .d2-4180049586 .color-B4{color:#E3E9FD;} + .d2-4180049586 .color-B5{color:#EDF0FD;} + .d2-4180049586 .color-B6{color:#F7F8FE;} + .d2-4180049586 .color-AA2{color:#4A6FF3;} + .d2-4180049586 .color-AA4{color:#EDF0FD;} + .d2-4180049586 .color-AA5{color:#F7F8FE;} + .d2-4180049586 .color-AB4{color:#EDF0FD;} + .d2-4180049586 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4180049586);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4180049586);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4180049586);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4180049586);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4180049586);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4180049586);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4180049586);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4180049586);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4180049586);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4180049586);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4180049586);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4180049586);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4180049586);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4180049586);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4180049586);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4180049586);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4180049586);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4180049586);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abc12d line 1line 2line 3line 4 - - - - - - - + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/dagre_broken_arrowhead/elk/board.exp.json b/e2etests/testdata/regression/dagre_broken_arrowhead/elk/board.exp.json index f30d0fe43..0284cf820 100644 --- a/e2etests/testdata/regression/dagre_broken_arrowhead/elk/board.exp.json +++ b/e2etests/testdata/regression/dagre_broken_arrowhead/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "white", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -274,6 +288,7 @@ "labelHeight": 69, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 88.5, @@ -312,6 +327,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 153.5, @@ -350,6 +366,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 226, @@ -389,6 +406,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/dagre_broken_arrowhead/elk/sketch.exp.svg b/e2etests/testdata/regression/dagre_broken_arrowhead/elk/sketch.exp.svg index 30f28461b..ed5de68e8 100644 --- a/e2etests/testdata/regression/dagre_broken_arrowhead/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre_broken_arrowhead/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -abc12d line 1line 2line 3line 4 + .d2-2470093842 .fill-N1{fill:#0A0F25;} + .d2-2470093842 .fill-N2{fill:#676C7E;} + .d2-2470093842 .fill-N3{fill:#9499AB;} + .d2-2470093842 .fill-N4{fill:#CFD2DD;} + .d2-2470093842 .fill-N5{fill:#DEE1EB;} + .d2-2470093842 .fill-N6{fill:#EEF1F8;} + .d2-2470093842 .fill-N7{fill:#FFFFFF;} + .d2-2470093842 .fill-B1{fill:#0D32B2;} + .d2-2470093842 .fill-B2{fill:#0D32B2;} + .d2-2470093842 .fill-B3{fill:#E3E9FD;} + .d2-2470093842 .fill-B4{fill:#E3E9FD;} + .d2-2470093842 .fill-B5{fill:#EDF0FD;} + .d2-2470093842 .fill-B6{fill:#F7F8FE;} + .d2-2470093842 .fill-AA2{fill:#4A6FF3;} + .d2-2470093842 .fill-AA4{fill:#EDF0FD;} + .d2-2470093842 .fill-AA5{fill:#F7F8FE;} + .d2-2470093842 .fill-AB4{fill:#EDF0FD;} + .d2-2470093842 .fill-AB5{fill:#F7F8FE;} + .d2-2470093842 .stroke-N1{stroke:#0A0F25;} + .d2-2470093842 .stroke-N2{stroke:#676C7E;} + .d2-2470093842 .stroke-N3{stroke:#9499AB;} + .d2-2470093842 .stroke-N4{stroke:#CFD2DD;} + .d2-2470093842 .stroke-N5{stroke:#DEE1EB;} + .d2-2470093842 .stroke-N6{stroke:#EEF1F8;} + .d2-2470093842 .stroke-N7{stroke:#FFFFFF;} + .d2-2470093842 .stroke-B1{stroke:#0D32B2;} + .d2-2470093842 .stroke-B2{stroke:#0D32B2;} + .d2-2470093842 .stroke-B3{stroke:#E3E9FD;} + .d2-2470093842 .stroke-B4{stroke:#E3E9FD;} + .d2-2470093842 .stroke-B5{stroke:#EDF0FD;} + .d2-2470093842 .stroke-B6{stroke:#F7F8FE;} + .d2-2470093842 .stroke-AA2{stroke:#4A6FF3;} + .d2-2470093842 .stroke-AA4{stroke:#EDF0FD;} + .d2-2470093842 .stroke-AA5{stroke:#F7F8FE;} + .d2-2470093842 .stroke-AB4{stroke:#EDF0FD;} + .d2-2470093842 .stroke-AB5{stroke:#F7F8FE;} + .d2-2470093842 .background-color-N1{background-color:#0A0F25;} + .d2-2470093842 .background-color-N2{background-color:#676C7E;} + .d2-2470093842 .background-color-N3{background-color:#9499AB;} + .d2-2470093842 .background-color-N4{background-color:#CFD2DD;} + .d2-2470093842 .background-color-N5{background-color:#DEE1EB;} + .d2-2470093842 .background-color-N6{background-color:#EEF1F8;} + .d2-2470093842 .background-color-N7{background-color:#FFFFFF;} + .d2-2470093842 .background-color-B1{background-color:#0D32B2;} + .d2-2470093842 .background-color-B2{background-color:#0D32B2;} + .d2-2470093842 .background-color-B3{background-color:#E3E9FD;} + .d2-2470093842 .background-color-B4{background-color:#E3E9FD;} + .d2-2470093842 .background-color-B5{background-color:#EDF0FD;} + .d2-2470093842 .background-color-B6{background-color:#F7F8FE;} + .d2-2470093842 .background-color-AA2{background-color:#4A6FF3;} + .d2-2470093842 .background-color-AA4{background-color:#EDF0FD;} + .d2-2470093842 .background-color-AA5{background-color:#F7F8FE;} + .d2-2470093842 .background-color-AB4{background-color:#EDF0FD;} + .d2-2470093842 .background-color-AB5{background-color:#F7F8FE;} + .d2-2470093842 .color-N1{color:#0A0F25;} + .d2-2470093842 .color-N2{color:#676C7E;} + .d2-2470093842 .color-N3{color:#9499AB;} + .d2-2470093842 .color-N4{color:#CFD2DD;} + .d2-2470093842 .color-N5{color:#DEE1EB;} + .d2-2470093842 .color-N6{color:#EEF1F8;} + .d2-2470093842 .color-N7{color:#FFFFFF;} + .d2-2470093842 .color-B1{color:#0D32B2;} + .d2-2470093842 .color-B2{color:#0D32B2;} + .d2-2470093842 .color-B3{color:#E3E9FD;} + .d2-2470093842 .color-B4{color:#E3E9FD;} + .d2-2470093842 .color-B5{color:#EDF0FD;} + .d2-2470093842 .color-B6{color:#F7F8FE;} + .d2-2470093842 .color-AA2{color:#4A6FF3;} + .d2-2470093842 .color-AA4{color:#EDF0FD;} + .d2-2470093842 .color-AA5{color:#F7F8FE;} + .d2-2470093842 .color-AB4{color:#EDF0FD;} + .d2-2470093842 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2470093842);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2470093842);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2470093842);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2470093842);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2470093842);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2470093842);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2470093842);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2470093842);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2470093842);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2470093842);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2470093842);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2470093842);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2470093842);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2470093842);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2470093842);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2470093842);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2470093842);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2470093842);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abc12d line 1line 2line 3line 4 - - - - - - - + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/dagre_child_id_id/dagre/board.exp.json b/e2etests/testdata/regression/dagre_child_id_id/dagre/board.exp.json index 411315457..bcdc15e5e 100644 --- a/e2etests/testdata/regression/dagre_child_id_id/dagre/board.exp.json +++ b/e2etests/testdata/regression/dagre_child_id_id/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -274,6 +288,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 59, @@ -321,6 +336,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 268, @@ -385,6 +401,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/dagre_child_id_id/dagre/sketch.exp.svg b/e2etests/testdata/regression/dagre_child_id_id/dagre/sketch.exp.svg index 25d7c7872..16e4766c7 100644 --- a/e2etests/testdata/regression/dagre_child_id_id/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre_child_id_id/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -idxyidzid + .d2-1027039415 .fill-N1{fill:#0A0F25;} + .d2-1027039415 .fill-N2{fill:#676C7E;} + .d2-1027039415 .fill-N3{fill:#9499AB;} + .d2-1027039415 .fill-N4{fill:#CFD2DD;} + .d2-1027039415 .fill-N5{fill:#DEE1EB;} + .d2-1027039415 .fill-N6{fill:#EEF1F8;} + .d2-1027039415 .fill-N7{fill:#FFFFFF;} + .d2-1027039415 .fill-B1{fill:#0D32B2;} + .d2-1027039415 .fill-B2{fill:#0D32B2;} + .d2-1027039415 .fill-B3{fill:#E3E9FD;} + .d2-1027039415 .fill-B4{fill:#E3E9FD;} + .d2-1027039415 .fill-B5{fill:#EDF0FD;} + .d2-1027039415 .fill-B6{fill:#F7F8FE;} + .d2-1027039415 .fill-AA2{fill:#4A6FF3;} + .d2-1027039415 .fill-AA4{fill:#EDF0FD;} + .d2-1027039415 .fill-AA5{fill:#F7F8FE;} + .d2-1027039415 .fill-AB4{fill:#EDF0FD;} + .d2-1027039415 .fill-AB5{fill:#F7F8FE;} + .d2-1027039415 .stroke-N1{stroke:#0A0F25;} + .d2-1027039415 .stroke-N2{stroke:#676C7E;} + .d2-1027039415 .stroke-N3{stroke:#9499AB;} + .d2-1027039415 .stroke-N4{stroke:#CFD2DD;} + .d2-1027039415 .stroke-N5{stroke:#DEE1EB;} + .d2-1027039415 .stroke-N6{stroke:#EEF1F8;} + .d2-1027039415 .stroke-N7{stroke:#FFFFFF;} + .d2-1027039415 .stroke-B1{stroke:#0D32B2;} + .d2-1027039415 .stroke-B2{stroke:#0D32B2;} + .d2-1027039415 .stroke-B3{stroke:#E3E9FD;} + .d2-1027039415 .stroke-B4{stroke:#E3E9FD;} + .d2-1027039415 .stroke-B5{stroke:#EDF0FD;} + .d2-1027039415 .stroke-B6{stroke:#F7F8FE;} + .d2-1027039415 .stroke-AA2{stroke:#4A6FF3;} + .d2-1027039415 .stroke-AA4{stroke:#EDF0FD;} + .d2-1027039415 .stroke-AA5{stroke:#F7F8FE;} + .d2-1027039415 .stroke-AB4{stroke:#EDF0FD;} + .d2-1027039415 .stroke-AB5{stroke:#F7F8FE;} + .d2-1027039415 .background-color-N1{background-color:#0A0F25;} + .d2-1027039415 .background-color-N2{background-color:#676C7E;} + .d2-1027039415 .background-color-N3{background-color:#9499AB;} + .d2-1027039415 .background-color-N4{background-color:#CFD2DD;} + .d2-1027039415 .background-color-N5{background-color:#DEE1EB;} + .d2-1027039415 .background-color-N6{background-color:#EEF1F8;} + .d2-1027039415 .background-color-N7{background-color:#FFFFFF;} + .d2-1027039415 .background-color-B1{background-color:#0D32B2;} + .d2-1027039415 .background-color-B2{background-color:#0D32B2;} + .d2-1027039415 .background-color-B3{background-color:#E3E9FD;} + .d2-1027039415 .background-color-B4{background-color:#E3E9FD;} + .d2-1027039415 .background-color-B5{background-color:#EDF0FD;} + .d2-1027039415 .background-color-B6{background-color:#F7F8FE;} + .d2-1027039415 .background-color-AA2{background-color:#4A6FF3;} + .d2-1027039415 .background-color-AA4{background-color:#EDF0FD;} + .d2-1027039415 .background-color-AA5{background-color:#F7F8FE;} + .d2-1027039415 .background-color-AB4{background-color:#EDF0FD;} + .d2-1027039415 .background-color-AB5{background-color:#F7F8FE;} + .d2-1027039415 .color-N1{color:#0A0F25;} + .d2-1027039415 .color-N2{color:#676C7E;} + .d2-1027039415 .color-N3{color:#9499AB;} + .d2-1027039415 .color-N4{color:#CFD2DD;} + .d2-1027039415 .color-N5{color:#DEE1EB;} + .d2-1027039415 .color-N6{color:#EEF1F8;} + .d2-1027039415 .color-N7{color:#FFFFFF;} + .d2-1027039415 .color-B1{color:#0D32B2;} + .d2-1027039415 .color-B2{color:#0D32B2;} + .d2-1027039415 .color-B3{color:#E3E9FD;} + .d2-1027039415 .color-B4{color:#E3E9FD;} + .d2-1027039415 .color-B5{color:#EDF0FD;} + .d2-1027039415 .color-B6{color:#F7F8FE;} + .d2-1027039415 .color-AA2{color:#4A6FF3;} + .d2-1027039415 .color-AA4{color:#EDF0FD;} + .d2-1027039415 .color-AA5{color:#F7F8FE;} + .d2-1027039415 .color-AB4{color:#EDF0FD;} + .d2-1027039415 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1027039415);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1027039415);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1027039415);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1027039415);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1027039415);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1027039415);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1027039415);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1027039415);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1027039415);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1027039415);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1027039415);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1027039415);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1027039415);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1027039415);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1027039415);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1027039415);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1027039415);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1027039415);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>idxyidzid - - - - - - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/dagre_child_id_id/elk/board.exp.json b/e2etests/testdata/regression/dagre_child_id_id/elk/board.exp.json index c6cab2da2..495e6202e 100644 --- a/e2etests/testdata/regression/dagre_child_id_id/elk/board.exp.json +++ b/e2etests/testdata/regression/dagre_child_id_id/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -274,6 +288,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 71, @@ -312,6 +327,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 255, @@ -343,6 +359,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/dagre_child_id_id/elk/sketch.exp.svg b/e2etests/testdata/regression/dagre_child_id_id/elk/sketch.exp.svg index a0461b400..7d6ee0768 100644 --- a/e2etests/testdata/regression/dagre_child_id_id/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre_child_id_id/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -idxyidzid + .d2-384502976 .fill-N1{fill:#0A0F25;} + .d2-384502976 .fill-N2{fill:#676C7E;} + .d2-384502976 .fill-N3{fill:#9499AB;} + .d2-384502976 .fill-N4{fill:#CFD2DD;} + .d2-384502976 .fill-N5{fill:#DEE1EB;} + .d2-384502976 .fill-N6{fill:#EEF1F8;} + .d2-384502976 .fill-N7{fill:#FFFFFF;} + .d2-384502976 .fill-B1{fill:#0D32B2;} + .d2-384502976 .fill-B2{fill:#0D32B2;} + .d2-384502976 .fill-B3{fill:#E3E9FD;} + .d2-384502976 .fill-B4{fill:#E3E9FD;} + .d2-384502976 .fill-B5{fill:#EDF0FD;} + .d2-384502976 .fill-B6{fill:#F7F8FE;} + .d2-384502976 .fill-AA2{fill:#4A6FF3;} + .d2-384502976 .fill-AA4{fill:#EDF0FD;} + .d2-384502976 .fill-AA5{fill:#F7F8FE;} + .d2-384502976 .fill-AB4{fill:#EDF0FD;} + .d2-384502976 .fill-AB5{fill:#F7F8FE;} + .d2-384502976 .stroke-N1{stroke:#0A0F25;} + .d2-384502976 .stroke-N2{stroke:#676C7E;} + .d2-384502976 .stroke-N3{stroke:#9499AB;} + .d2-384502976 .stroke-N4{stroke:#CFD2DD;} + .d2-384502976 .stroke-N5{stroke:#DEE1EB;} + .d2-384502976 .stroke-N6{stroke:#EEF1F8;} + .d2-384502976 .stroke-N7{stroke:#FFFFFF;} + .d2-384502976 .stroke-B1{stroke:#0D32B2;} + .d2-384502976 .stroke-B2{stroke:#0D32B2;} + .d2-384502976 .stroke-B3{stroke:#E3E9FD;} + .d2-384502976 .stroke-B4{stroke:#E3E9FD;} + .d2-384502976 .stroke-B5{stroke:#EDF0FD;} + .d2-384502976 .stroke-B6{stroke:#F7F8FE;} + .d2-384502976 .stroke-AA2{stroke:#4A6FF3;} + .d2-384502976 .stroke-AA4{stroke:#EDF0FD;} + .d2-384502976 .stroke-AA5{stroke:#F7F8FE;} + .d2-384502976 .stroke-AB4{stroke:#EDF0FD;} + .d2-384502976 .stroke-AB5{stroke:#F7F8FE;} + .d2-384502976 .background-color-N1{background-color:#0A0F25;} + .d2-384502976 .background-color-N2{background-color:#676C7E;} + .d2-384502976 .background-color-N3{background-color:#9499AB;} + .d2-384502976 .background-color-N4{background-color:#CFD2DD;} + .d2-384502976 .background-color-N5{background-color:#DEE1EB;} + .d2-384502976 .background-color-N6{background-color:#EEF1F8;} + .d2-384502976 .background-color-N7{background-color:#FFFFFF;} + .d2-384502976 .background-color-B1{background-color:#0D32B2;} + .d2-384502976 .background-color-B2{background-color:#0D32B2;} + .d2-384502976 .background-color-B3{background-color:#E3E9FD;} + .d2-384502976 .background-color-B4{background-color:#E3E9FD;} + .d2-384502976 .background-color-B5{background-color:#EDF0FD;} + .d2-384502976 .background-color-B6{background-color:#F7F8FE;} + .d2-384502976 .background-color-AA2{background-color:#4A6FF3;} + .d2-384502976 .background-color-AA4{background-color:#EDF0FD;} + .d2-384502976 .background-color-AA5{background-color:#F7F8FE;} + .d2-384502976 .background-color-AB4{background-color:#EDF0FD;} + .d2-384502976 .background-color-AB5{background-color:#F7F8FE;} + .d2-384502976 .color-N1{color:#0A0F25;} + .d2-384502976 .color-N2{color:#676C7E;} + .d2-384502976 .color-N3{color:#9499AB;} + .d2-384502976 .color-N4{color:#CFD2DD;} + .d2-384502976 .color-N5{color:#DEE1EB;} + .d2-384502976 .color-N6{color:#EEF1F8;} + .d2-384502976 .color-N7{color:#FFFFFF;} + .d2-384502976 .color-B1{color:#0D32B2;} + .d2-384502976 .color-B2{color:#0D32B2;} + .d2-384502976 .color-B3{color:#E3E9FD;} + .d2-384502976 .color-B4{color:#E3E9FD;} + .d2-384502976 .color-B5{color:#EDF0FD;} + .d2-384502976 .color-B6{color:#F7F8FE;} + .d2-384502976 .color-AA2{color:#4A6FF3;} + .d2-384502976 .color-AA4{color:#EDF0FD;} + .d2-384502976 .color-AA5{color:#F7F8FE;} + .d2-384502976 .color-AB4{color:#EDF0FD;} + .d2-384502976 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-384502976);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-384502976);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-384502976);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-384502976);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-384502976);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-384502976);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-384502976);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-384502976);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-384502976);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-384502976);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-384502976);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-384502976);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-384502976);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-384502976);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-384502976);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-384502976);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-384502976);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-384502976);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>idxyidzid - - - - - - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/dagre_disconnected_edge/dagre/board.exp.json b/e2etests/testdata/regression/dagre_disconnected_edge/dagre/board.exp.json index f74f94ee7..52e538ebf 100644 --- a/e2etests/testdata/regression/dagre_disconnected_edge/dagre/board.exp.json +++ b/e2etests/testdata/regression/dagre_disconnected_edge/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -71,6 +80,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -134,6 +144,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 139.5, @@ -174,6 +185,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/dagre_disconnected_edge/dagre/sketch.exp.svg b/e2etests/testdata/regression/dagre_disconnected_edge/dagre/sketch.exp.svg index 2acce9012..2a27fb593 100644 --- a/e2etests/testdata/regression/dagre_disconnected_edge/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre_disconnected_edge/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -programprofits + .d2-3801862795 .fill-N1{fill:#0A0F25;} + .d2-3801862795 .fill-N2{fill:#676C7E;} + .d2-3801862795 .fill-N3{fill:#9499AB;} + .d2-3801862795 .fill-N4{fill:#CFD2DD;} + .d2-3801862795 .fill-N5{fill:#DEE1EB;} + .d2-3801862795 .fill-N6{fill:#EEF1F8;} + .d2-3801862795 .fill-N7{fill:#FFFFFF;} + .d2-3801862795 .fill-B1{fill:#0D32B2;} + .d2-3801862795 .fill-B2{fill:#0D32B2;} + .d2-3801862795 .fill-B3{fill:#E3E9FD;} + .d2-3801862795 .fill-B4{fill:#E3E9FD;} + .d2-3801862795 .fill-B5{fill:#EDF0FD;} + .d2-3801862795 .fill-B6{fill:#F7F8FE;} + .d2-3801862795 .fill-AA2{fill:#4A6FF3;} + .d2-3801862795 .fill-AA4{fill:#EDF0FD;} + .d2-3801862795 .fill-AA5{fill:#F7F8FE;} + .d2-3801862795 .fill-AB4{fill:#EDF0FD;} + .d2-3801862795 .fill-AB5{fill:#F7F8FE;} + .d2-3801862795 .stroke-N1{stroke:#0A0F25;} + .d2-3801862795 .stroke-N2{stroke:#676C7E;} + .d2-3801862795 .stroke-N3{stroke:#9499AB;} + .d2-3801862795 .stroke-N4{stroke:#CFD2DD;} + .d2-3801862795 .stroke-N5{stroke:#DEE1EB;} + .d2-3801862795 .stroke-N6{stroke:#EEF1F8;} + .d2-3801862795 .stroke-N7{stroke:#FFFFFF;} + .d2-3801862795 .stroke-B1{stroke:#0D32B2;} + .d2-3801862795 .stroke-B2{stroke:#0D32B2;} + .d2-3801862795 .stroke-B3{stroke:#E3E9FD;} + .d2-3801862795 .stroke-B4{stroke:#E3E9FD;} + .d2-3801862795 .stroke-B5{stroke:#EDF0FD;} + .d2-3801862795 .stroke-B6{stroke:#F7F8FE;} + .d2-3801862795 .stroke-AA2{stroke:#4A6FF3;} + .d2-3801862795 .stroke-AA4{stroke:#EDF0FD;} + .d2-3801862795 .stroke-AA5{stroke:#F7F8FE;} + .d2-3801862795 .stroke-AB4{stroke:#EDF0FD;} + .d2-3801862795 .stroke-AB5{stroke:#F7F8FE;} + .d2-3801862795 .background-color-N1{background-color:#0A0F25;} + .d2-3801862795 .background-color-N2{background-color:#676C7E;} + .d2-3801862795 .background-color-N3{background-color:#9499AB;} + .d2-3801862795 .background-color-N4{background-color:#CFD2DD;} + .d2-3801862795 .background-color-N5{background-color:#DEE1EB;} + .d2-3801862795 .background-color-N6{background-color:#EEF1F8;} + .d2-3801862795 .background-color-N7{background-color:#FFFFFF;} + .d2-3801862795 .background-color-B1{background-color:#0D32B2;} + .d2-3801862795 .background-color-B2{background-color:#0D32B2;} + .d2-3801862795 .background-color-B3{background-color:#E3E9FD;} + .d2-3801862795 .background-color-B4{background-color:#E3E9FD;} + .d2-3801862795 .background-color-B5{background-color:#EDF0FD;} + .d2-3801862795 .background-color-B6{background-color:#F7F8FE;} + .d2-3801862795 .background-color-AA2{background-color:#4A6FF3;} + .d2-3801862795 .background-color-AA4{background-color:#EDF0FD;} + .d2-3801862795 .background-color-AA5{background-color:#F7F8FE;} + .d2-3801862795 .background-color-AB4{background-color:#EDF0FD;} + .d2-3801862795 .background-color-AB5{background-color:#F7F8FE;} + .d2-3801862795 .color-N1{color:#0A0F25;} + .d2-3801862795 .color-N2{color:#676C7E;} + .d2-3801862795 .color-N3{color:#9499AB;} + .d2-3801862795 .color-N4{color:#CFD2DD;} + .d2-3801862795 .color-N5{color:#DEE1EB;} + .d2-3801862795 .color-N6{color:#EEF1F8;} + .d2-3801862795 .color-N7{color:#FFFFFF;} + .d2-3801862795 .color-B1{color:#0D32B2;} + .d2-3801862795 .color-B2{color:#0D32B2;} + .d2-3801862795 .color-B3{color:#E3E9FD;} + .d2-3801862795 .color-B4{color:#E3E9FD;} + .d2-3801862795 .color-B5{color:#EDF0FD;} + .d2-3801862795 .color-B6{color:#F7F8FE;} + .d2-3801862795 .color-AA2{color:#4A6FF3;} + .d2-3801862795 .color-AA4{color:#EDF0FD;} + .d2-3801862795 .color-AA5{color:#F7F8FE;} + .d2-3801862795 .color-AB4{color:#EDF0FD;} + .d2-3801862795 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3801862795);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3801862795);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3801862795);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3801862795);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3801862795);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3801862795);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3801862795);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3801862795);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3801862795);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3801862795);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3801862795);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3801862795);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3801862795);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3801862795);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3801862795);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3801862795);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3801862795);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3801862795);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>programprofits - - + + \ No newline at end of file diff --git a/e2etests/testdata/regression/dagre_disconnected_edge/elk/board.exp.json b/e2etests/testdata/regression/dagre_disconnected_edge/elk/board.exp.json index 0573103e7..5fcb9235a 100644 --- a/e2etests/testdata/regression/dagre_disconnected_edge/elk/board.exp.json +++ b/e2etests/testdata/regression/dagre_disconnected_edge/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -71,6 +80,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -134,6 +144,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 103, @@ -165,6 +176,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/dagre_disconnected_edge/elk/sketch.exp.svg b/e2etests/testdata/regression/dagre_disconnected_edge/elk/sketch.exp.svg index 0cb741440..4c93736bd 100644 --- a/e2etests/testdata/regression/dagre_disconnected_edge/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre_disconnected_edge/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -programprofits + .d2-3134052653 .fill-N1{fill:#0A0F25;} + .d2-3134052653 .fill-N2{fill:#676C7E;} + .d2-3134052653 .fill-N3{fill:#9499AB;} + .d2-3134052653 .fill-N4{fill:#CFD2DD;} + .d2-3134052653 .fill-N5{fill:#DEE1EB;} + .d2-3134052653 .fill-N6{fill:#EEF1F8;} + .d2-3134052653 .fill-N7{fill:#FFFFFF;} + .d2-3134052653 .fill-B1{fill:#0D32B2;} + .d2-3134052653 .fill-B2{fill:#0D32B2;} + .d2-3134052653 .fill-B3{fill:#E3E9FD;} + .d2-3134052653 .fill-B4{fill:#E3E9FD;} + .d2-3134052653 .fill-B5{fill:#EDF0FD;} + .d2-3134052653 .fill-B6{fill:#F7F8FE;} + .d2-3134052653 .fill-AA2{fill:#4A6FF3;} + .d2-3134052653 .fill-AA4{fill:#EDF0FD;} + .d2-3134052653 .fill-AA5{fill:#F7F8FE;} + .d2-3134052653 .fill-AB4{fill:#EDF0FD;} + .d2-3134052653 .fill-AB5{fill:#F7F8FE;} + .d2-3134052653 .stroke-N1{stroke:#0A0F25;} + .d2-3134052653 .stroke-N2{stroke:#676C7E;} + .d2-3134052653 .stroke-N3{stroke:#9499AB;} + .d2-3134052653 .stroke-N4{stroke:#CFD2DD;} + .d2-3134052653 .stroke-N5{stroke:#DEE1EB;} + .d2-3134052653 .stroke-N6{stroke:#EEF1F8;} + .d2-3134052653 .stroke-N7{stroke:#FFFFFF;} + .d2-3134052653 .stroke-B1{stroke:#0D32B2;} + .d2-3134052653 .stroke-B2{stroke:#0D32B2;} + .d2-3134052653 .stroke-B3{stroke:#E3E9FD;} + .d2-3134052653 .stroke-B4{stroke:#E3E9FD;} + .d2-3134052653 .stroke-B5{stroke:#EDF0FD;} + .d2-3134052653 .stroke-B6{stroke:#F7F8FE;} + .d2-3134052653 .stroke-AA2{stroke:#4A6FF3;} + .d2-3134052653 .stroke-AA4{stroke:#EDF0FD;} + .d2-3134052653 .stroke-AA5{stroke:#F7F8FE;} + .d2-3134052653 .stroke-AB4{stroke:#EDF0FD;} + .d2-3134052653 .stroke-AB5{stroke:#F7F8FE;} + .d2-3134052653 .background-color-N1{background-color:#0A0F25;} + .d2-3134052653 .background-color-N2{background-color:#676C7E;} + .d2-3134052653 .background-color-N3{background-color:#9499AB;} + .d2-3134052653 .background-color-N4{background-color:#CFD2DD;} + .d2-3134052653 .background-color-N5{background-color:#DEE1EB;} + .d2-3134052653 .background-color-N6{background-color:#EEF1F8;} + .d2-3134052653 .background-color-N7{background-color:#FFFFFF;} + .d2-3134052653 .background-color-B1{background-color:#0D32B2;} + .d2-3134052653 .background-color-B2{background-color:#0D32B2;} + .d2-3134052653 .background-color-B3{background-color:#E3E9FD;} + .d2-3134052653 .background-color-B4{background-color:#E3E9FD;} + .d2-3134052653 .background-color-B5{background-color:#EDF0FD;} + .d2-3134052653 .background-color-B6{background-color:#F7F8FE;} + .d2-3134052653 .background-color-AA2{background-color:#4A6FF3;} + .d2-3134052653 .background-color-AA4{background-color:#EDF0FD;} + .d2-3134052653 .background-color-AA5{background-color:#F7F8FE;} + .d2-3134052653 .background-color-AB4{background-color:#EDF0FD;} + .d2-3134052653 .background-color-AB5{background-color:#F7F8FE;} + .d2-3134052653 .color-N1{color:#0A0F25;} + .d2-3134052653 .color-N2{color:#676C7E;} + .d2-3134052653 .color-N3{color:#9499AB;} + .d2-3134052653 .color-N4{color:#CFD2DD;} + .d2-3134052653 .color-N5{color:#DEE1EB;} + .d2-3134052653 .color-N6{color:#EEF1F8;} + .d2-3134052653 .color-N7{color:#FFFFFF;} + .d2-3134052653 .color-B1{color:#0D32B2;} + .d2-3134052653 .color-B2{color:#0D32B2;} + .d2-3134052653 .color-B3{color:#E3E9FD;} + .d2-3134052653 .color-B4{color:#E3E9FD;} + .d2-3134052653 .color-B5{color:#EDF0FD;} + .d2-3134052653 .color-B6{color:#F7F8FE;} + .d2-3134052653 .color-AA2{color:#4A6FF3;} + .d2-3134052653 .color-AA4{color:#EDF0FD;} + .d2-3134052653 .color-AA5{color:#F7F8FE;} + .d2-3134052653 .color-AB4{color:#EDF0FD;} + .d2-3134052653 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3134052653);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3134052653);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3134052653);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3134052653);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3134052653);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3134052653);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3134052653);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3134052653);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3134052653);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3134052653);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3134052653);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3134052653);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3134052653);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3134052653);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3134052653);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3134052653);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3134052653);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3134052653);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>programprofits - - + + \ No newline at end of file diff --git a/e2etests/testdata/regression/dagre_edge_label_spacing/dagre/board.exp.json b/e2etests/testdata/regression/dagre_edge_label_spacing/dagre/board.exp.json index 31bf03db6..7e30a1203 100644 --- a/e2etests/testdata/regression/dagre_edge_label_spacing/dagre/board.exp.json +++ b/e2etests/testdata/regression/dagre_edge_label_spacing/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -274,6 +288,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 375.5, @@ -321,6 +336,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 847, @@ -368,6 +384,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1265.5, @@ -415,6 +432,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1751.5, @@ -455,6 +473,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/dagre_edge_label_spacing/dagre/sketch.exp.svg b/e2etests/testdata/regression/dagre_edge_label_spacing/dagre/sketch.exp.svg index ce34240d6..cbc207eba 100644 --- a/e2etests/testdata/regression/dagre_edge_label_spacing/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre_edge_label_spacing/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -lambda-build.yamlPush to main branchGitHub ActionsS3TerraformAWS TriggersBuilds zip & pushes it Pulls zip to deployChanges the live lambdas + .d2-2942585016 .fill-N1{fill:#0A0F25;} + .d2-2942585016 .fill-N2{fill:#676C7E;} + .d2-2942585016 .fill-N3{fill:#9499AB;} + .d2-2942585016 .fill-N4{fill:#CFD2DD;} + .d2-2942585016 .fill-N5{fill:#DEE1EB;} + .d2-2942585016 .fill-N6{fill:#EEF1F8;} + .d2-2942585016 .fill-N7{fill:#FFFFFF;} + .d2-2942585016 .fill-B1{fill:#0D32B2;} + .d2-2942585016 .fill-B2{fill:#0D32B2;} + .d2-2942585016 .fill-B3{fill:#E3E9FD;} + .d2-2942585016 .fill-B4{fill:#E3E9FD;} + .d2-2942585016 .fill-B5{fill:#EDF0FD;} + .d2-2942585016 .fill-B6{fill:#F7F8FE;} + .d2-2942585016 .fill-AA2{fill:#4A6FF3;} + .d2-2942585016 .fill-AA4{fill:#EDF0FD;} + .d2-2942585016 .fill-AA5{fill:#F7F8FE;} + .d2-2942585016 .fill-AB4{fill:#EDF0FD;} + .d2-2942585016 .fill-AB5{fill:#F7F8FE;} + .d2-2942585016 .stroke-N1{stroke:#0A0F25;} + .d2-2942585016 .stroke-N2{stroke:#676C7E;} + .d2-2942585016 .stroke-N3{stroke:#9499AB;} + .d2-2942585016 .stroke-N4{stroke:#CFD2DD;} + .d2-2942585016 .stroke-N5{stroke:#DEE1EB;} + .d2-2942585016 .stroke-N6{stroke:#EEF1F8;} + .d2-2942585016 .stroke-N7{stroke:#FFFFFF;} + .d2-2942585016 .stroke-B1{stroke:#0D32B2;} + .d2-2942585016 .stroke-B2{stroke:#0D32B2;} + .d2-2942585016 .stroke-B3{stroke:#E3E9FD;} + .d2-2942585016 .stroke-B4{stroke:#E3E9FD;} + .d2-2942585016 .stroke-B5{stroke:#EDF0FD;} + .d2-2942585016 .stroke-B6{stroke:#F7F8FE;} + .d2-2942585016 .stroke-AA2{stroke:#4A6FF3;} + .d2-2942585016 .stroke-AA4{stroke:#EDF0FD;} + .d2-2942585016 .stroke-AA5{stroke:#F7F8FE;} + .d2-2942585016 .stroke-AB4{stroke:#EDF0FD;} + .d2-2942585016 .stroke-AB5{stroke:#F7F8FE;} + .d2-2942585016 .background-color-N1{background-color:#0A0F25;} + .d2-2942585016 .background-color-N2{background-color:#676C7E;} + .d2-2942585016 .background-color-N3{background-color:#9499AB;} + .d2-2942585016 .background-color-N4{background-color:#CFD2DD;} + .d2-2942585016 .background-color-N5{background-color:#DEE1EB;} + .d2-2942585016 .background-color-N6{background-color:#EEF1F8;} + .d2-2942585016 .background-color-N7{background-color:#FFFFFF;} + .d2-2942585016 .background-color-B1{background-color:#0D32B2;} + .d2-2942585016 .background-color-B2{background-color:#0D32B2;} + .d2-2942585016 .background-color-B3{background-color:#E3E9FD;} + .d2-2942585016 .background-color-B4{background-color:#E3E9FD;} + .d2-2942585016 .background-color-B5{background-color:#EDF0FD;} + .d2-2942585016 .background-color-B6{background-color:#F7F8FE;} + .d2-2942585016 .background-color-AA2{background-color:#4A6FF3;} + .d2-2942585016 .background-color-AA4{background-color:#EDF0FD;} + .d2-2942585016 .background-color-AA5{background-color:#F7F8FE;} + .d2-2942585016 .background-color-AB4{background-color:#EDF0FD;} + .d2-2942585016 .background-color-AB5{background-color:#F7F8FE;} + .d2-2942585016 .color-N1{color:#0A0F25;} + .d2-2942585016 .color-N2{color:#676C7E;} + .d2-2942585016 .color-N3{color:#9499AB;} + .d2-2942585016 .color-N4{color:#CFD2DD;} + .d2-2942585016 .color-N5{color:#DEE1EB;} + .d2-2942585016 .color-N6{color:#EEF1F8;} + .d2-2942585016 .color-N7{color:#FFFFFF;} + .d2-2942585016 .color-B1{color:#0D32B2;} + .d2-2942585016 .color-B2{color:#0D32B2;} + .d2-2942585016 .color-B3{color:#E3E9FD;} + .d2-2942585016 .color-B4{color:#E3E9FD;} + .d2-2942585016 .color-B5{color:#EDF0FD;} + .d2-2942585016 .color-B6{color:#F7F8FE;} + .d2-2942585016 .color-AA2{color:#4A6FF3;} + .d2-2942585016 .color-AA4{color:#EDF0FD;} + .d2-2942585016 .color-AA5{color:#F7F8FE;} + .d2-2942585016 .color-AB4{color:#EDF0FD;} + .d2-2942585016 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2942585016);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2942585016);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2942585016);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2942585016);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2942585016);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2942585016);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2942585016);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2942585016);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2942585016);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2942585016);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2942585016);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2942585016);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2942585016);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2942585016);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2942585016);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2942585016);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2942585016);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2942585016);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>lambda-build.yamlPush to main branchGitHub ActionsS3TerraformAWS TriggersBuilds zip & pushes it Pulls zip to deployChanges the live lambdas - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/dagre_edge_label_spacing/elk/board.exp.json b/e2etests/testdata/regression/dagre_edge_label_spacing/elk/board.exp.json index b14ddea49..8424ada83 100644 --- a/e2etests/testdata/regression/dagre_edge_label_spacing/elk/board.exp.json +++ b/e2etests/testdata/regression/dagre_edge_label_spacing/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -274,6 +288,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 332, @@ -312,6 +327,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 735, @@ -350,6 +366,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1084, @@ -388,6 +405,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1501, @@ -419,6 +437,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/dagre_edge_label_spacing/elk/sketch.exp.svg b/e2etests/testdata/regression/dagre_edge_label_spacing/elk/sketch.exp.svg index 3bf707f79..e6299c017 100644 --- a/e2etests/testdata/regression/dagre_edge_label_spacing/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre_edge_label_spacing/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -lambda-build.yamlPush to main branchGitHub ActionsS3TerraformAWS TriggersBuilds zip & pushes it Pulls zip to deployChanges the live lambdas + .d2-368126104 .fill-N1{fill:#0A0F25;} + .d2-368126104 .fill-N2{fill:#676C7E;} + .d2-368126104 .fill-N3{fill:#9499AB;} + .d2-368126104 .fill-N4{fill:#CFD2DD;} + .d2-368126104 .fill-N5{fill:#DEE1EB;} + .d2-368126104 .fill-N6{fill:#EEF1F8;} + .d2-368126104 .fill-N7{fill:#FFFFFF;} + .d2-368126104 .fill-B1{fill:#0D32B2;} + .d2-368126104 .fill-B2{fill:#0D32B2;} + .d2-368126104 .fill-B3{fill:#E3E9FD;} + .d2-368126104 .fill-B4{fill:#E3E9FD;} + .d2-368126104 .fill-B5{fill:#EDF0FD;} + .d2-368126104 .fill-B6{fill:#F7F8FE;} + .d2-368126104 .fill-AA2{fill:#4A6FF3;} + .d2-368126104 .fill-AA4{fill:#EDF0FD;} + .d2-368126104 .fill-AA5{fill:#F7F8FE;} + .d2-368126104 .fill-AB4{fill:#EDF0FD;} + .d2-368126104 .fill-AB5{fill:#F7F8FE;} + .d2-368126104 .stroke-N1{stroke:#0A0F25;} + .d2-368126104 .stroke-N2{stroke:#676C7E;} + .d2-368126104 .stroke-N3{stroke:#9499AB;} + .d2-368126104 .stroke-N4{stroke:#CFD2DD;} + .d2-368126104 .stroke-N5{stroke:#DEE1EB;} + .d2-368126104 .stroke-N6{stroke:#EEF1F8;} + .d2-368126104 .stroke-N7{stroke:#FFFFFF;} + .d2-368126104 .stroke-B1{stroke:#0D32B2;} + .d2-368126104 .stroke-B2{stroke:#0D32B2;} + .d2-368126104 .stroke-B3{stroke:#E3E9FD;} + .d2-368126104 .stroke-B4{stroke:#E3E9FD;} + .d2-368126104 .stroke-B5{stroke:#EDF0FD;} + .d2-368126104 .stroke-B6{stroke:#F7F8FE;} + .d2-368126104 .stroke-AA2{stroke:#4A6FF3;} + .d2-368126104 .stroke-AA4{stroke:#EDF0FD;} + .d2-368126104 .stroke-AA5{stroke:#F7F8FE;} + .d2-368126104 .stroke-AB4{stroke:#EDF0FD;} + .d2-368126104 .stroke-AB5{stroke:#F7F8FE;} + .d2-368126104 .background-color-N1{background-color:#0A0F25;} + .d2-368126104 .background-color-N2{background-color:#676C7E;} + .d2-368126104 .background-color-N3{background-color:#9499AB;} + .d2-368126104 .background-color-N4{background-color:#CFD2DD;} + .d2-368126104 .background-color-N5{background-color:#DEE1EB;} + .d2-368126104 .background-color-N6{background-color:#EEF1F8;} + .d2-368126104 .background-color-N7{background-color:#FFFFFF;} + .d2-368126104 .background-color-B1{background-color:#0D32B2;} + .d2-368126104 .background-color-B2{background-color:#0D32B2;} + .d2-368126104 .background-color-B3{background-color:#E3E9FD;} + .d2-368126104 .background-color-B4{background-color:#E3E9FD;} + .d2-368126104 .background-color-B5{background-color:#EDF0FD;} + .d2-368126104 .background-color-B6{background-color:#F7F8FE;} + .d2-368126104 .background-color-AA2{background-color:#4A6FF3;} + .d2-368126104 .background-color-AA4{background-color:#EDF0FD;} + .d2-368126104 .background-color-AA5{background-color:#F7F8FE;} + .d2-368126104 .background-color-AB4{background-color:#EDF0FD;} + .d2-368126104 .background-color-AB5{background-color:#F7F8FE;} + .d2-368126104 .color-N1{color:#0A0F25;} + .d2-368126104 .color-N2{color:#676C7E;} + .d2-368126104 .color-N3{color:#9499AB;} + .d2-368126104 .color-N4{color:#CFD2DD;} + .d2-368126104 .color-N5{color:#DEE1EB;} + .d2-368126104 .color-N6{color:#EEF1F8;} + .d2-368126104 .color-N7{color:#FFFFFF;} + .d2-368126104 .color-B1{color:#0D32B2;} + .d2-368126104 .color-B2{color:#0D32B2;} + .d2-368126104 .color-B3{color:#E3E9FD;} + .d2-368126104 .color-B4{color:#E3E9FD;} + .d2-368126104 .color-B5{color:#EDF0FD;} + .d2-368126104 .color-B6{color:#F7F8FE;} + .d2-368126104 .color-AA2{color:#4A6FF3;} + .d2-368126104 .color-AA4{color:#EDF0FD;} + .d2-368126104 .color-AA5{color:#F7F8FE;} + .d2-368126104 .color-AB4{color:#EDF0FD;} + .d2-368126104 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-368126104);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-368126104);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-368126104);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-368126104);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-368126104);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-368126104);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-368126104);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-368126104);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-368126104);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-368126104);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-368126104);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-368126104);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-368126104);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-368126104);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-368126104);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-368126104);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-368126104);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-368126104);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>lambda-build.yamlPush to main branchGitHub ActionsS3TerraformAWS TriggersBuilds zip & pushes it Pulls zip to deployChanges the live lambdas - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/dagre_special_ids/dagre/board.exp.json b/e2etests/testdata/regression/dagre_special_ids/dagre/board.exp.json index 07cb0d89e..3d8bb50d7 100644 --- a/e2etests/testdata/regression/dagre_special_ids/dagre/board.exp.json +++ b/e2etests/testdata/regression/dagre_special_ids/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -315,6 +330,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 511, @@ -362,6 +378,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 665, @@ -409,6 +426,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 819.5, @@ -449,6 +467,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/dagre_special_ids/dagre/sketch.exp.svg b/e2etests/testdata/regression/dagre_special_ids/dagre/sketch.exp.svg index 8d5aa3edd..f36b36c87 100644 --- a/e2etests/testdata/regression/dagre_special_ids/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre_special_ids/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -ninetynineeighty eightseventy sevena\yodetherea\"odea\node + .d2-2224547022 .fill-N1{fill:#0A0F25;} + .d2-2224547022 .fill-N2{fill:#676C7E;} + .d2-2224547022 .fill-N3{fill:#9499AB;} + .d2-2224547022 .fill-N4{fill:#CFD2DD;} + .d2-2224547022 .fill-N5{fill:#DEE1EB;} + .d2-2224547022 .fill-N6{fill:#EEF1F8;} + .d2-2224547022 .fill-N7{fill:#FFFFFF;} + .d2-2224547022 .fill-B1{fill:#0D32B2;} + .d2-2224547022 .fill-B2{fill:#0D32B2;} + .d2-2224547022 .fill-B3{fill:#E3E9FD;} + .d2-2224547022 .fill-B4{fill:#E3E9FD;} + .d2-2224547022 .fill-B5{fill:#EDF0FD;} + .d2-2224547022 .fill-B6{fill:#F7F8FE;} + .d2-2224547022 .fill-AA2{fill:#4A6FF3;} + .d2-2224547022 .fill-AA4{fill:#EDF0FD;} + .d2-2224547022 .fill-AA5{fill:#F7F8FE;} + .d2-2224547022 .fill-AB4{fill:#EDF0FD;} + .d2-2224547022 .fill-AB5{fill:#F7F8FE;} + .d2-2224547022 .stroke-N1{stroke:#0A0F25;} + .d2-2224547022 .stroke-N2{stroke:#676C7E;} + .d2-2224547022 .stroke-N3{stroke:#9499AB;} + .d2-2224547022 .stroke-N4{stroke:#CFD2DD;} + .d2-2224547022 .stroke-N5{stroke:#DEE1EB;} + .d2-2224547022 .stroke-N6{stroke:#EEF1F8;} + .d2-2224547022 .stroke-N7{stroke:#FFFFFF;} + .d2-2224547022 .stroke-B1{stroke:#0D32B2;} + .d2-2224547022 .stroke-B2{stroke:#0D32B2;} + .d2-2224547022 .stroke-B3{stroke:#E3E9FD;} + .d2-2224547022 .stroke-B4{stroke:#E3E9FD;} + .d2-2224547022 .stroke-B5{stroke:#EDF0FD;} + .d2-2224547022 .stroke-B6{stroke:#F7F8FE;} + .d2-2224547022 .stroke-AA2{stroke:#4A6FF3;} + .d2-2224547022 .stroke-AA4{stroke:#EDF0FD;} + .d2-2224547022 .stroke-AA5{stroke:#F7F8FE;} + .d2-2224547022 .stroke-AB4{stroke:#EDF0FD;} + .d2-2224547022 .stroke-AB5{stroke:#F7F8FE;} + .d2-2224547022 .background-color-N1{background-color:#0A0F25;} + .d2-2224547022 .background-color-N2{background-color:#676C7E;} + .d2-2224547022 .background-color-N3{background-color:#9499AB;} + .d2-2224547022 .background-color-N4{background-color:#CFD2DD;} + .d2-2224547022 .background-color-N5{background-color:#DEE1EB;} + .d2-2224547022 .background-color-N6{background-color:#EEF1F8;} + .d2-2224547022 .background-color-N7{background-color:#FFFFFF;} + .d2-2224547022 .background-color-B1{background-color:#0D32B2;} + .d2-2224547022 .background-color-B2{background-color:#0D32B2;} + .d2-2224547022 .background-color-B3{background-color:#E3E9FD;} + .d2-2224547022 .background-color-B4{background-color:#E3E9FD;} + .d2-2224547022 .background-color-B5{background-color:#EDF0FD;} + .d2-2224547022 .background-color-B6{background-color:#F7F8FE;} + .d2-2224547022 .background-color-AA2{background-color:#4A6FF3;} + .d2-2224547022 .background-color-AA4{background-color:#EDF0FD;} + .d2-2224547022 .background-color-AA5{background-color:#F7F8FE;} + .d2-2224547022 .background-color-AB4{background-color:#EDF0FD;} + .d2-2224547022 .background-color-AB5{background-color:#F7F8FE;} + .d2-2224547022 .color-N1{color:#0A0F25;} + .d2-2224547022 .color-N2{color:#676C7E;} + .d2-2224547022 .color-N3{color:#9499AB;} + .d2-2224547022 .color-N4{color:#CFD2DD;} + .d2-2224547022 .color-N5{color:#DEE1EB;} + .d2-2224547022 .color-N6{color:#EEF1F8;} + .d2-2224547022 .color-N7{color:#FFFFFF;} + .d2-2224547022 .color-B1{color:#0D32B2;} + .d2-2224547022 .color-B2{color:#0D32B2;} + .d2-2224547022 .color-B3{color:#E3E9FD;} + .d2-2224547022 .color-B4{color:#E3E9FD;} + .d2-2224547022 .color-B5{color:#EDF0FD;} + .d2-2224547022 .color-B6{color:#F7F8FE;} + .d2-2224547022 .color-AA2{color:#4A6FF3;} + .d2-2224547022 .color-AA4{color:#EDF0FD;} + .d2-2224547022 .color-AA5{color:#F7F8FE;} + .d2-2224547022 .color-AB4{color:#EDF0FD;} + .d2-2224547022 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2224547022);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2224547022);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2224547022);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2224547022);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2224547022);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2224547022);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2224547022);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2224547022);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2224547022);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2224547022);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2224547022);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2224547022);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2224547022);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2224547022);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2224547022);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2224547022);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2224547022);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2224547022);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ninetynineeighty eightseventy sevena\yodetherea\"odea\node - - - - - - - + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/dagre_special_ids/elk/board.exp.json b/e2etests/testdata/regression/dagre_special_ids/elk/board.exp.json index 1d5b8048c..2e264cb1f 100644 --- a/e2etests/testdata/regression/dagre_special_ids/elk/board.exp.json +++ b/e2etests/testdata/regression/dagre_special_ids/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -315,6 +330,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 403, @@ -361,6 +377,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 517, @@ -399,6 +416,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 631.5, @@ -438,6 +456,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/dagre_special_ids/elk/sketch.exp.svg b/e2etests/testdata/regression/dagre_special_ids/elk/sketch.exp.svg index 42dbf7632..ad3b34d98 100644 --- a/e2etests/testdata/regression/dagre_special_ids/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre_special_ids/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -ninetynineeighty eightseventy sevena\yodetherea\"odea\node + .d2-2151294863 .fill-N1{fill:#0A0F25;} + .d2-2151294863 .fill-N2{fill:#676C7E;} + .d2-2151294863 .fill-N3{fill:#9499AB;} + .d2-2151294863 .fill-N4{fill:#CFD2DD;} + .d2-2151294863 .fill-N5{fill:#DEE1EB;} + .d2-2151294863 .fill-N6{fill:#EEF1F8;} + .d2-2151294863 .fill-N7{fill:#FFFFFF;} + .d2-2151294863 .fill-B1{fill:#0D32B2;} + .d2-2151294863 .fill-B2{fill:#0D32B2;} + .d2-2151294863 .fill-B3{fill:#E3E9FD;} + .d2-2151294863 .fill-B4{fill:#E3E9FD;} + .d2-2151294863 .fill-B5{fill:#EDF0FD;} + .d2-2151294863 .fill-B6{fill:#F7F8FE;} + .d2-2151294863 .fill-AA2{fill:#4A6FF3;} + .d2-2151294863 .fill-AA4{fill:#EDF0FD;} + .d2-2151294863 .fill-AA5{fill:#F7F8FE;} + .d2-2151294863 .fill-AB4{fill:#EDF0FD;} + .d2-2151294863 .fill-AB5{fill:#F7F8FE;} + .d2-2151294863 .stroke-N1{stroke:#0A0F25;} + .d2-2151294863 .stroke-N2{stroke:#676C7E;} + .d2-2151294863 .stroke-N3{stroke:#9499AB;} + .d2-2151294863 .stroke-N4{stroke:#CFD2DD;} + .d2-2151294863 .stroke-N5{stroke:#DEE1EB;} + .d2-2151294863 .stroke-N6{stroke:#EEF1F8;} + .d2-2151294863 .stroke-N7{stroke:#FFFFFF;} + .d2-2151294863 .stroke-B1{stroke:#0D32B2;} + .d2-2151294863 .stroke-B2{stroke:#0D32B2;} + .d2-2151294863 .stroke-B3{stroke:#E3E9FD;} + .d2-2151294863 .stroke-B4{stroke:#E3E9FD;} + .d2-2151294863 .stroke-B5{stroke:#EDF0FD;} + .d2-2151294863 .stroke-B6{stroke:#F7F8FE;} + .d2-2151294863 .stroke-AA2{stroke:#4A6FF3;} + .d2-2151294863 .stroke-AA4{stroke:#EDF0FD;} + .d2-2151294863 .stroke-AA5{stroke:#F7F8FE;} + .d2-2151294863 .stroke-AB4{stroke:#EDF0FD;} + .d2-2151294863 .stroke-AB5{stroke:#F7F8FE;} + .d2-2151294863 .background-color-N1{background-color:#0A0F25;} + .d2-2151294863 .background-color-N2{background-color:#676C7E;} + .d2-2151294863 .background-color-N3{background-color:#9499AB;} + .d2-2151294863 .background-color-N4{background-color:#CFD2DD;} + .d2-2151294863 .background-color-N5{background-color:#DEE1EB;} + .d2-2151294863 .background-color-N6{background-color:#EEF1F8;} + .d2-2151294863 .background-color-N7{background-color:#FFFFFF;} + .d2-2151294863 .background-color-B1{background-color:#0D32B2;} + .d2-2151294863 .background-color-B2{background-color:#0D32B2;} + .d2-2151294863 .background-color-B3{background-color:#E3E9FD;} + .d2-2151294863 .background-color-B4{background-color:#E3E9FD;} + .d2-2151294863 .background-color-B5{background-color:#EDF0FD;} + .d2-2151294863 .background-color-B6{background-color:#F7F8FE;} + .d2-2151294863 .background-color-AA2{background-color:#4A6FF3;} + .d2-2151294863 .background-color-AA4{background-color:#EDF0FD;} + .d2-2151294863 .background-color-AA5{background-color:#F7F8FE;} + .d2-2151294863 .background-color-AB4{background-color:#EDF0FD;} + .d2-2151294863 .background-color-AB5{background-color:#F7F8FE;} + .d2-2151294863 .color-N1{color:#0A0F25;} + .d2-2151294863 .color-N2{color:#676C7E;} + .d2-2151294863 .color-N3{color:#9499AB;} + .d2-2151294863 .color-N4{color:#CFD2DD;} + .d2-2151294863 .color-N5{color:#DEE1EB;} + .d2-2151294863 .color-N6{color:#EEF1F8;} + .d2-2151294863 .color-N7{color:#FFFFFF;} + .d2-2151294863 .color-B1{color:#0D32B2;} + .d2-2151294863 .color-B2{color:#0D32B2;} + .d2-2151294863 .color-B3{color:#E3E9FD;} + .d2-2151294863 .color-B4{color:#E3E9FD;} + .d2-2151294863 .color-B5{color:#EDF0FD;} + .d2-2151294863 .color-B6{color:#F7F8FE;} + .d2-2151294863 .color-AA2{color:#4A6FF3;} + .d2-2151294863 .color-AA4{color:#EDF0FD;} + .d2-2151294863 .color-AA5{color:#F7F8FE;} + .d2-2151294863 .color-AB4{color:#EDF0FD;} + .d2-2151294863 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2151294863);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2151294863);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2151294863);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2151294863);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2151294863);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2151294863);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2151294863);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2151294863);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2151294863);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2151294863);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2151294863);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2151294863);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2151294863);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2151294863);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2151294863);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2151294863);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2151294863);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2151294863);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ninetynineeighty eightseventy sevena\yodetherea\"odea\node - - - - - - - + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/disclaimer/dagre/board.exp.json b/e2etests/testdata/regression/disclaimer/dagre/board.exp.json index 440146fb7..a2a7c4902 100644 --- a/e2etests/testdata/regression/disclaimer/dagre/board.exp.json +++ b/e2etests/testdata/regression/disclaimer/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -94,6 +103,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -135,6 +145,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -178,6 +189,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/disclaimer/dagre/sketch.exp.svg b/e2etests/testdata/regression/disclaimer/dagre/sketch.exp.svg index f7234f21d..a5a749276 100644 --- a/e2etests/testdata/regression/disclaimer/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/disclaimer/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -dataaintPK, NOT NULL, UNQDRAFT DISCLAIMERI am not a lawyer + .d2-216321731 .fill-N1{fill:#0A0F25;} + .d2-216321731 .fill-N2{fill:#676C7E;} + .d2-216321731 .fill-N3{fill:#9499AB;} + .d2-216321731 .fill-N4{fill:#CFD2DD;} + .d2-216321731 .fill-N5{fill:#DEE1EB;} + .d2-216321731 .fill-N6{fill:#EEF1F8;} + .d2-216321731 .fill-N7{fill:#FFFFFF;} + .d2-216321731 .fill-B1{fill:#0D32B2;} + .d2-216321731 .fill-B2{fill:#0D32B2;} + .d2-216321731 .fill-B3{fill:#E3E9FD;} + .d2-216321731 .fill-B4{fill:#E3E9FD;} + .d2-216321731 .fill-B5{fill:#EDF0FD;} + .d2-216321731 .fill-B6{fill:#F7F8FE;} + .d2-216321731 .fill-AA2{fill:#4A6FF3;} + .d2-216321731 .fill-AA4{fill:#EDF0FD;} + .d2-216321731 .fill-AA5{fill:#F7F8FE;} + .d2-216321731 .fill-AB4{fill:#EDF0FD;} + .d2-216321731 .fill-AB5{fill:#F7F8FE;} + .d2-216321731 .stroke-N1{stroke:#0A0F25;} + .d2-216321731 .stroke-N2{stroke:#676C7E;} + .d2-216321731 .stroke-N3{stroke:#9499AB;} + .d2-216321731 .stroke-N4{stroke:#CFD2DD;} + .d2-216321731 .stroke-N5{stroke:#DEE1EB;} + .d2-216321731 .stroke-N6{stroke:#EEF1F8;} + .d2-216321731 .stroke-N7{stroke:#FFFFFF;} + .d2-216321731 .stroke-B1{stroke:#0D32B2;} + .d2-216321731 .stroke-B2{stroke:#0D32B2;} + .d2-216321731 .stroke-B3{stroke:#E3E9FD;} + .d2-216321731 .stroke-B4{stroke:#E3E9FD;} + .d2-216321731 .stroke-B5{stroke:#EDF0FD;} + .d2-216321731 .stroke-B6{stroke:#F7F8FE;} + .d2-216321731 .stroke-AA2{stroke:#4A6FF3;} + .d2-216321731 .stroke-AA4{stroke:#EDF0FD;} + .d2-216321731 .stroke-AA5{stroke:#F7F8FE;} + .d2-216321731 .stroke-AB4{stroke:#EDF0FD;} + .d2-216321731 .stroke-AB5{stroke:#F7F8FE;} + .d2-216321731 .background-color-N1{background-color:#0A0F25;} + .d2-216321731 .background-color-N2{background-color:#676C7E;} + .d2-216321731 .background-color-N3{background-color:#9499AB;} + .d2-216321731 .background-color-N4{background-color:#CFD2DD;} + .d2-216321731 .background-color-N5{background-color:#DEE1EB;} + .d2-216321731 .background-color-N6{background-color:#EEF1F8;} + .d2-216321731 .background-color-N7{background-color:#FFFFFF;} + .d2-216321731 .background-color-B1{background-color:#0D32B2;} + .d2-216321731 .background-color-B2{background-color:#0D32B2;} + .d2-216321731 .background-color-B3{background-color:#E3E9FD;} + .d2-216321731 .background-color-B4{background-color:#E3E9FD;} + .d2-216321731 .background-color-B5{background-color:#EDF0FD;} + .d2-216321731 .background-color-B6{background-color:#F7F8FE;} + .d2-216321731 .background-color-AA2{background-color:#4A6FF3;} + .d2-216321731 .background-color-AA4{background-color:#EDF0FD;} + .d2-216321731 .background-color-AA5{background-color:#F7F8FE;} + .d2-216321731 .background-color-AB4{background-color:#EDF0FD;} + .d2-216321731 .background-color-AB5{background-color:#F7F8FE;} + .d2-216321731 .color-N1{color:#0A0F25;} + .d2-216321731 .color-N2{color:#676C7E;} + .d2-216321731 .color-N3{color:#9499AB;} + .d2-216321731 .color-N4{color:#CFD2DD;} + .d2-216321731 .color-N5{color:#DEE1EB;} + .d2-216321731 .color-N6{color:#EEF1F8;} + .d2-216321731 .color-N7{color:#FFFFFF;} + .d2-216321731 .color-B1{color:#0D32B2;} + .d2-216321731 .color-B2{color:#0D32B2;} + .d2-216321731 .color-B3{color:#E3E9FD;} + .d2-216321731 .color-B4{color:#E3E9FD;} + .d2-216321731 .color-B5{color:#EDF0FD;} + .d2-216321731 .color-B6{color:#F7F8FE;} + .d2-216321731 .color-AA2{color:#4A6FF3;} + .d2-216321731 .color-AA4{color:#EDF0FD;} + .d2-216321731 .color-AA5{color:#F7F8FE;} + .d2-216321731 .color-AB4{color:#EDF0FD;} + .d2-216321731 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-216321731);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-216321731);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-216321731);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-216321731);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-216321731);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-216321731);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-216321731);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-216321731);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-216321731);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-216321731);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-216321731);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-216321731);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-216321731);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-216321731);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-216321731);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-216321731);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-216321731);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-216321731);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>dataaintPK, NOT NULL, UNQDRAFT DISCLAIMERI am not a lawyer - - + + \ No newline at end of file diff --git a/e2etests/testdata/regression/disclaimer/elk/board.exp.json b/e2etests/testdata/regression/disclaimer/elk/board.exp.json index a75d508e0..6f593ea3b 100644 --- a/e2etests/testdata/regression/disclaimer/elk/board.exp.json +++ b/e2etests/testdata/regression/disclaimer/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -94,6 +103,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -135,6 +145,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -178,6 +189,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/disclaimer/elk/sketch.exp.svg b/e2etests/testdata/regression/disclaimer/elk/sketch.exp.svg index 662005e60..a56053379 100644 --- a/e2etests/testdata/regression/disclaimer/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/disclaimer/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -dataaintPK, NOT NULL, UNQDRAFT DISCLAIMERI am not a lawyer + .d2-1681004247 .fill-N1{fill:#0A0F25;} + .d2-1681004247 .fill-N2{fill:#676C7E;} + .d2-1681004247 .fill-N3{fill:#9499AB;} + .d2-1681004247 .fill-N4{fill:#CFD2DD;} + .d2-1681004247 .fill-N5{fill:#DEE1EB;} + .d2-1681004247 .fill-N6{fill:#EEF1F8;} + .d2-1681004247 .fill-N7{fill:#FFFFFF;} + .d2-1681004247 .fill-B1{fill:#0D32B2;} + .d2-1681004247 .fill-B2{fill:#0D32B2;} + .d2-1681004247 .fill-B3{fill:#E3E9FD;} + .d2-1681004247 .fill-B4{fill:#E3E9FD;} + .d2-1681004247 .fill-B5{fill:#EDF0FD;} + .d2-1681004247 .fill-B6{fill:#F7F8FE;} + .d2-1681004247 .fill-AA2{fill:#4A6FF3;} + .d2-1681004247 .fill-AA4{fill:#EDF0FD;} + .d2-1681004247 .fill-AA5{fill:#F7F8FE;} + .d2-1681004247 .fill-AB4{fill:#EDF0FD;} + .d2-1681004247 .fill-AB5{fill:#F7F8FE;} + .d2-1681004247 .stroke-N1{stroke:#0A0F25;} + .d2-1681004247 .stroke-N2{stroke:#676C7E;} + .d2-1681004247 .stroke-N3{stroke:#9499AB;} + .d2-1681004247 .stroke-N4{stroke:#CFD2DD;} + .d2-1681004247 .stroke-N5{stroke:#DEE1EB;} + .d2-1681004247 .stroke-N6{stroke:#EEF1F8;} + .d2-1681004247 .stroke-N7{stroke:#FFFFFF;} + .d2-1681004247 .stroke-B1{stroke:#0D32B2;} + .d2-1681004247 .stroke-B2{stroke:#0D32B2;} + .d2-1681004247 .stroke-B3{stroke:#E3E9FD;} + .d2-1681004247 .stroke-B4{stroke:#E3E9FD;} + .d2-1681004247 .stroke-B5{stroke:#EDF0FD;} + .d2-1681004247 .stroke-B6{stroke:#F7F8FE;} + .d2-1681004247 .stroke-AA2{stroke:#4A6FF3;} + .d2-1681004247 .stroke-AA4{stroke:#EDF0FD;} + .d2-1681004247 .stroke-AA5{stroke:#F7F8FE;} + .d2-1681004247 .stroke-AB4{stroke:#EDF0FD;} + .d2-1681004247 .stroke-AB5{stroke:#F7F8FE;} + .d2-1681004247 .background-color-N1{background-color:#0A0F25;} + .d2-1681004247 .background-color-N2{background-color:#676C7E;} + .d2-1681004247 .background-color-N3{background-color:#9499AB;} + .d2-1681004247 .background-color-N4{background-color:#CFD2DD;} + .d2-1681004247 .background-color-N5{background-color:#DEE1EB;} + .d2-1681004247 .background-color-N6{background-color:#EEF1F8;} + .d2-1681004247 .background-color-N7{background-color:#FFFFFF;} + .d2-1681004247 .background-color-B1{background-color:#0D32B2;} + .d2-1681004247 .background-color-B2{background-color:#0D32B2;} + .d2-1681004247 .background-color-B3{background-color:#E3E9FD;} + .d2-1681004247 .background-color-B4{background-color:#E3E9FD;} + .d2-1681004247 .background-color-B5{background-color:#EDF0FD;} + .d2-1681004247 .background-color-B6{background-color:#F7F8FE;} + .d2-1681004247 .background-color-AA2{background-color:#4A6FF3;} + .d2-1681004247 .background-color-AA4{background-color:#EDF0FD;} + .d2-1681004247 .background-color-AA5{background-color:#F7F8FE;} + .d2-1681004247 .background-color-AB4{background-color:#EDF0FD;} + .d2-1681004247 .background-color-AB5{background-color:#F7F8FE;} + .d2-1681004247 .color-N1{color:#0A0F25;} + .d2-1681004247 .color-N2{color:#676C7E;} + .d2-1681004247 .color-N3{color:#9499AB;} + .d2-1681004247 .color-N4{color:#CFD2DD;} + .d2-1681004247 .color-N5{color:#DEE1EB;} + .d2-1681004247 .color-N6{color:#EEF1F8;} + .d2-1681004247 .color-N7{color:#FFFFFF;} + .d2-1681004247 .color-B1{color:#0D32B2;} + .d2-1681004247 .color-B2{color:#0D32B2;} + .d2-1681004247 .color-B3{color:#E3E9FD;} + .d2-1681004247 .color-B4{color:#E3E9FD;} + .d2-1681004247 .color-B5{color:#EDF0FD;} + .d2-1681004247 .color-B6{color:#F7F8FE;} + .d2-1681004247 .color-AA2{color:#4A6FF3;} + .d2-1681004247 .color-AA4{color:#EDF0FD;} + .d2-1681004247 .color-AA5{color:#F7F8FE;} + .d2-1681004247 .color-AB4{color:#EDF0FD;} + .d2-1681004247 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1681004247);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1681004247);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1681004247);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1681004247);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1681004247);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1681004247);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1681004247);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1681004247);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1681004247);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1681004247);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1681004247);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1681004247);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1681004247);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1681004247);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1681004247);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1681004247);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1681004247);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1681004247);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>dataaintPK, NOT NULL, UNQDRAFT DISCLAIMERI am not a lawyer - - + + \ No newline at end of file diff --git a/e2etests/testdata/regression/disconnect_direction_right/dagre/board.exp.json b/e2etests/testdata/regression/disconnect_direction_right/dagre/board.exp.json index 0702d7c9e..687e57ccb 100644 --- a/e2etests/testdata/regression/disconnect_direction_right/dagre/board.exp.json +++ b/e2etests/testdata/regression/disconnect_direction_right/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -274,6 +288,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 103, @@ -333,6 +348,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 103, @@ -385,6 +401,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/disconnect_direction_right/dagre/sketch.exp.svg b/e2etests/testdata/regression/disconnect_direction_right/dagre/sketch.exp.svg index 282c40752..869e349bc 100644 --- a/e2etests/testdata/regression/disconnect_direction_right/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/disconnect_direction_right/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -acebdf + .d2-3002647089 .fill-N1{fill:#0A0F25;} + .d2-3002647089 .fill-N2{fill:#676C7E;} + .d2-3002647089 .fill-N3{fill:#9499AB;} + .d2-3002647089 .fill-N4{fill:#CFD2DD;} + .d2-3002647089 .fill-N5{fill:#DEE1EB;} + .d2-3002647089 .fill-N6{fill:#EEF1F8;} + .d2-3002647089 .fill-N7{fill:#FFFFFF;} + .d2-3002647089 .fill-B1{fill:#0D32B2;} + .d2-3002647089 .fill-B2{fill:#0D32B2;} + .d2-3002647089 .fill-B3{fill:#E3E9FD;} + .d2-3002647089 .fill-B4{fill:#E3E9FD;} + .d2-3002647089 .fill-B5{fill:#EDF0FD;} + .d2-3002647089 .fill-B6{fill:#F7F8FE;} + .d2-3002647089 .fill-AA2{fill:#4A6FF3;} + .d2-3002647089 .fill-AA4{fill:#EDF0FD;} + .d2-3002647089 .fill-AA5{fill:#F7F8FE;} + .d2-3002647089 .fill-AB4{fill:#EDF0FD;} + .d2-3002647089 .fill-AB5{fill:#F7F8FE;} + .d2-3002647089 .stroke-N1{stroke:#0A0F25;} + .d2-3002647089 .stroke-N2{stroke:#676C7E;} + .d2-3002647089 .stroke-N3{stroke:#9499AB;} + .d2-3002647089 .stroke-N4{stroke:#CFD2DD;} + .d2-3002647089 .stroke-N5{stroke:#DEE1EB;} + .d2-3002647089 .stroke-N6{stroke:#EEF1F8;} + .d2-3002647089 .stroke-N7{stroke:#FFFFFF;} + .d2-3002647089 .stroke-B1{stroke:#0D32B2;} + .d2-3002647089 .stroke-B2{stroke:#0D32B2;} + .d2-3002647089 .stroke-B3{stroke:#E3E9FD;} + .d2-3002647089 .stroke-B4{stroke:#E3E9FD;} + .d2-3002647089 .stroke-B5{stroke:#EDF0FD;} + .d2-3002647089 .stroke-B6{stroke:#F7F8FE;} + .d2-3002647089 .stroke-AA2{stroke:#4A6FF3;} + .d2-3002647089 .stroke-AA4{stroke:#EDF0FD;} + .d2-3002647089 .stroke-AA5{stroke:#F7F8FE;} + .d2-3002647089 .stroke-AB4{stroke:#EDF0FD;} + .d2-3002647089 .stroke-AB5{stroke:#F7F8FE;} + .d2-3002647089 .background-color-N1{background-color:#0A0F25;} + .d2-3002647089 .background-color-N2{background-color:#676C7E;} + .d2-3002647089 .background-color-N3{background-color:#9499AB;} + .d2-3002647089 .background-color-N4{background-color:#CFD2DD;} + .d2-3002647089 .background-color-N5{background-color:#DEE1EB;} + .d2-3002647089 .background-color-N6{background-color:#EEF1F8;} + .d2-3002647089 .background-color-N7{background-color:#FFFFFF;} + .d2-3002647089 .background-color-B1{background-color:#0D32B2;} + .d2-3002647089 .background-color-B2{background-color:#0D32B2;} + .d2-3002647089 .background-color-B3{background-color:#E3E9FD;} + .d2-3002647089 .background-color-B4{background-color:#E3E9FD;} + .d2-3002647089 .background-color-B5{background-color:#EDF0FD;} + .d2-3002647089 .background-color-B6{background-color:#F7F8FE;} + .d2-3002647089 .background-color-AA2{background-color:#4A6FF3;} + .d2-3002647089 .background-color-AA4{background-color:#EDF0FD;} + .d2-3002647089 .background-color-AA5{background-color:#F7F8FE;} + .d2-3002647089 .background-color-AB4{background-color:#EDF0FD;} + .d2-3002647089 .background-color-AB5{background-color:#F7F8FE;} + .d2-3002647089 .color-N1{color:#0A0F25;} + .d2-3002647089 .color-N2{color:#676C7E;} + .d2-3002647089 .color-N3{color:#9499AB;} + .d2-3002647089 .color-N4{color:#CFD2DD;} + .d2-3002647089 .color-N5{color:#DEE1EB;} + .d2-3002647089 .color-N6{color:#EEF1F8;} + .d2-3002647089 .color-N7{color:#FFFFFF;} + .d2-3002647089 .color-B1{color:#0D32B2;} + .d2-3002647089 .color-B2{color:#0D32B2;} + .d2-3002647089 .color-B3{color:#E3E9FD;} + .d2-3002647089 .color-B4{color:#E3E9FD;} + .d2-3002647089 .color-B5{color:#EDF0FD;} + .d2-3002647089 .color-B6{color:#F7F8FE;} + .d2-3002647089 .color-AA2{color:#4A6FF3;} + .d2-3002647089 .color-AA4{color:#EDF0FD;} + .d2-3002647089 .color-AA5{color:#F7F8FE;} + .d2-3002647089 .color-AB4{color:#EDF0FD;} + .d2-3002647089 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3002647089);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3002647089);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3002647089);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3002647089);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3002647089);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3002647089);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3002647089);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3002647089);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3002647089);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3002647089);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3002647089);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3002647089);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3002647089);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3002647089);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3002647089);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3002647089);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3002647089);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3002647089);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>acebdf - - - - - - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/disconnect_direction_right/elk/board.exp.json b/e2etests/testdata/regression/disconnect_direction_right/elk/board.exp.json index 52dd59166..f573be426 100644 --- a/e2etests/testdata/regression/disconnect_direction_right/elk/board.exp.json +++ b/e2etests/testdata/regression/disconnect_direction_right/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -274,6 +288,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 115, @@ -320,6 +335,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 115, @@ -359,6 +375,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/disconnect_direction_right/elk/sketch.exp.svg b/e2etests/testdata/regression/disconnect_direction_right/elk/sketch.exp.svg index 504b6dbd6..26748bf31 100644 --- a/e2etests/testdata/regression/disconnect_direction_right/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/disconnect_direction_right/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -acebdf + .d2-1038803005 .fill-N1{fill:#0A0F25;} + .d2-1038803005 .fill-N2{fill:#676C7E;} + .d2-1038803005 .fill-N3{fill:#9499AB;} + .d2-1038803005 .fill-N4{fill:#CFD2DD;} + .d2-1038803005 .fill-N5{fill:#DEE1EB;} + .d2-1038803005 .fill-N6{fill:#EEF1F8;} + .d2-1038803005 .fill-N7{fill:#FFFFFF;} + .d2-1038803005 .fill-B1{fill:#0D32B2;} + .d2-1038803005 .fill-B2{fill:#0D32B2;} + .d2-1038803005 .fill-B3{fill:#E3E9FD;} + .d2-1038803005 .fill-B4{fill:#E3E9FD;} + .d2-1038803005 .fill-B5{fill:#EDF0FD;} + .d2-1038803005 .fill-B6{fill:#F7F8FE;} + .d2-1038803005 .fill-AA2{fill:#4A6FF3;} + .d2-1038803005 .fill-AA4{fill:#EDF0FD;} + .d2-1038803005 .fill-AA5{fill:#F7F8FE;} + .d2-1038803005 .fill-AB4{fill:#EDF0FD;} + .d2-1038803005 .fill-AB5{fill:#F7F8FE;} + .d2-1038803005 .stroke-N1{stroke:#0A0F25;} + .d2-1038803005 .stroke-N2{stroke:#676C7E;} + .d2-1038803005 .stroke-N3{stroke:#9499AB;} + .d2-1038803005 .stroke-N4{stroke:#CFD2DD;} + .d2-1038803005 .stroke-N5{stroke:#DEE1EB;} + .d2-1038803005 .stroke-N6{stroke:#EEF1F8;} + .d2-1038803005 .stroke-N7{stroke:#FFFFFF;} + .d2-1038803005 .stroke-B1{stroke:#0D32B2;} + .d2-1038803005 .stroke-B2{stroke:#0D32B2;} + .d2-1038803005 .stroke-B3{stroke:#E3E9FD;} + .d2-1038803005 .stroke-B4{stroke:#E3E9FD;} + .d2-1038803005 .stroke-B5{stroke:#EDF0FD;} + .d2-1038803005 .stroke-B6{stroke:#F7F8FE;} + .d2-1038803005 .stroke-AA2{stroke:#4A6FF3;} + .d2-1038803005 .stroke-AA4{stroke:#EDF0FD;} + .d2-1038803005 .stroke-AA5{stroke:#F7F8FE;} + .d2-1038803005 .stroke-AB4{stroke:#EDF0FD;} + .d2-1038803005 .stroke-AB5{stroke:#F7F8FE;} + .d2-1038803005 .background-color-N1{background-color:#0A0F25;} + .d2-1038803005 .background-color-N2{background-color:#676C7E;} + .d2-1038803005 .background-color-N3{background-color:#9499AB;} + .d2-1038803005 .background-color-N4{background-color:#CFD2DD;} + .d2-1038803005 .background-color-N5{background-color:#DEE1EB;} + .d2-1038803005 .background-color-N6{background-color:#EEF1F8;} + .d2-1038803005 .background-color-N7{background-color:#FFFFFF;} + .d2-1038803005 .background-color-B1{background-color:#0D32B2;} + .d2-1038803005 .background-color-B2{background-color:#0D32B2;} + .d2-1038803005 .background-color-B3{background-color:#E3E9FD;} + .d2-1038803005 .background-color-B4{background-color:#E3E9FD;} + .d2-1038803005 .background-color-B5{background-color:#EDF0FD;} + .d2-1038803005 .background-color-B6{background-color:#F7F8FE;} + .d2-1038803005 .background-color-AA2{background-color:#4A6FF3;} + .d2-1038803005 .background-color-AA4{background-color:#EDF0FD;} + .d2-1038803005 .background-color-AA5{background-color:#F7F8FE;} + .d2-1038803005 .background-color-AB4{background-color:#EDF0FD;} + .d2-1038803005 .background-color-AB5{background-color:#F7F8FE;} + .d2-1038803005 .color-N1{color:#0A0F25;} + .d2-1038803005 .color-N2{color:#676C7E;} + .d2-1038803005 .color-N3{color:#9499AB;} + .d2-1038803005 .color-N4{color:#CFD2DD;} + .d2-1038803005 .color-N5{color:#DEE1EB;} + .d2-1038803005 .color-N6{color:#EEF1F8;} + .d2-1038803005 .color-N7{color:#FFFFFF;} + .d2-1038803005 .color-B1{color:#0D32B2;} + .d2-1038803005 .color-B2{color:#0D32B2;} + .d2-1038803005 .color-B3{color:#E3E9FD;} + .d2-1038803005 .color-B4{color:#E3E9FD;} + .d2-1038803005 .color-B5{color:#EDF0FD;} + .d2-1038803005 .color-B6{color:#F7F8FE;} + .d2-1038803005 .color-AA2{color:#4A6FF3;} + .d2-1038803005 .color-AA4{color:#EDF0FD;} + .d2-1038803005 .color-AA5{color:#F7F8FE;} + .d2-1038803005 .color-AB4{color:#EDF0FD;} + .d2-1038803005 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1038803005);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1038803005);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1038803005);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1038803005);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1038803005);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1038803005);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1038803005);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1038803005);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1038803005);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1038803005);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1038803005);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1038803005);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1038803005);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1038803005);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1038803005);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1038803005);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1038803005);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1038803005);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>acebdf - - - - - - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/elk_alignment/dagre/board.exp.json b/e2etests/testdata/regression/elk_alignment/dagre/board.exp.json index 0bd9461d5..a628fc69d 100644 --- a/e2etests/testdata/regression/elk_alignment/dagre/board.exp.json +++ b/e2etests/testdata/regression/elk_alignment/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -602,6 +624,7 @@ "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 175, @@ -649,6 +672,7 @@ "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 175, @@ -696,6 +720,7 @@ "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 175, @@ -743,6 +768,7 @@ "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 175, @@ -790,6 +816,7 @@ "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 515.5, @@ -837,6 +864,7 @@ "labelHeight": 106, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 515.5, @@ -884,6 +912,7 @@ "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 967.5, @@ -931,6 +960,7 @@ "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 967.5, @@ -971,6 +1001,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/elk_alignment/dagre/sketch.exp.svg b/e2etests/testdata/regression/elk_alignment/dagre/sketch.exp.svg index 247e1e279..8659f55d4 100644 --- a/e2etests/testdata/regression/elk_alignment/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/elk_alignment/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -lambda-build.yamllambda-deploy.yamlapollo-deploy.yamlPush to main branchGitHub ActionsS3TerraformAWSManual TriggerGitHub ActionsAWSApollo RepoGitHub ActionsAWS TriggersBuilds zip and pushes it Pulls zip to deployChanges live lambdasLaunchesBuilds zippushes them to S3. Deploys lambdasusing TerraformTriggered manually/push to master test test test test test test testtest + .d2-1185394817 .fill-N1{fill:#0A0F25;} + .d2-1185394817 .fill-N2{fill:#676C7E;} + .d2-1185394817 .fill-N3{fill:#9499AB;} + .d2-1185394817 .fill-N4{fill:#CFD2DD;} + .d2-1185394817 .fill-N5{fill:#DEE1EB;} + .d2-1185394817 .fill-N6{fill:#EEF1F8;} + .d2-1185394817 .fill-N7{fill:#FFFFFF;} + .d2-1185394817 .fill-B1{fill:#0D32B2;} + .d2-1185394817 .fill-B2{fill:#0D32B2;} + .d2-1185394817 .fill-B3{fill:#E3E9FD;} + .d2-1185394817 .fill-B4{fill:#E3E9FD;} + .d2-1185394817 .fill-B5{fill:#EDF0FD;} + .d2-1185394817 .fill-B6{fill:#F7F8FE;} + .d2-1185394817 .fill-AA2{fill:#4A6FF3;} + .d2-1185394817 .fill-AA4{fill:#EDF0FD;} + .d2-1185394817 .fill-AA5{fill:#F7F8FE;} + .d2-1185394817 .fill-AB4{fill:#EDF0FD;} + .d2-1185394817 .fill-AB5{fill:#F7F8FE;} + .d2-1185394817 .stroke-N1{stroke:#0A0F25;} + .d2-1185394817 .stroke-N2{stroke:#676C7E;} + .d2-1185394817 .stroke-N3{stroke:#9499AB;} + .d2-1185394817 .stroke-N4{stroke:#CFD2DD;} + .d2-1185394817 .stroke-N5{stroke:#DEE1EB;} + .d2-1185394817 .stroke-N6{stroke:#EEF1F8;} + .d2-1185394817 .stroke-N7{stroke:#FFFFFF;} + .d2-1185394817 .stroke-B1{stroke:#0D32B2;} + .d2-1185394817 .stroke-B2{stroke:#0D32B2;} + .d2-1185394817 .stroke-B3{stroke:#E3E9FD;} + .d2-1185394817 .stroke-B4{stroke:#E3E9FD;} + .d2-1185394817 .stroke-B5{stroke:#EDF0FD;} + .d2-1185394817 .stroke-B6{stroke:#F7F8FE;} + .d2-1185394817 .stroke-AA2{stroke:#4A6FF3;} + .d2-1185394817 .stroke-AA4{stroke:#EDF0FD;} + .d2-1185394817 .stroke-AA5{stroke:#F7F8FE;} + .d2-1185394817 .stroke-AB4{stroke:#EDF0FD;} + .d2-1185394817 .stroke-AB5{stroke:#F7F8FE;} + .d2-1185394817 .background-color-N1{background-color:#0A0F25;} + .d2-1185394817 .background-color-N2{background-color:#676C7E;} + .d2-1185394817 .background-color-N3{background-color:#9499AB;} + .d2-1185394817 .background-color-N4{background-color:#CFD2DD;} + .d2-1185394817 .background-color-N5{background-color:#DEE1EB;} + .d2-1185394817 .background-color-N6{background-color:#EEF1F8;} + .d2-1185394817 .background-color-N7{background-color:#FFFFFF;} + .d2-1185394817 .background-color-B1{background-color:#0D32B2;} + .d2-1185394817 .background-color-B2{background-color:#0D32B2;} + .d2-1185394817 .background-color-B3{background-color:#E3E9FD;} + .d2-1185394817 .background-color-B4{background-color:#E3E9FD;} + .d2-1185394817 .background-color-B5{background-color:#EDF0FD;} + .d2-1185394817 .background-color-B6{background-color:#F7F8FE;} + .d2-1185394817 .background-color-AA2{background-color:#4A6FF3;} + .d2-1185394817 .background-color-AA4{background-color:#EDF0FD;} + .d2-1185394817 .background-color-AA5{background-color:#F7F8FE;} + .d2-1185394817 .background-color-AB4{background-color:#EDF0FD;} + .d2-1185394817 .background-color-AB5{background-color:#F7F8FE;} + .d2-1185394817 .color-N1{color:#0A0F25;} + .d2-1185394817 .color-N2{color:#676C7E;} + .d2-1185394817 .color-N3{color:#9499AB;} + .d2-1185394817 .color-N4{color:#CFD2DD;} + .d2-1185394817 .color-N5{color:#DEE1EB;} + .d2-1185394817 .color-N6{color:#EEF1F8;} + .d2-1185394817 .color-N7{color:#FFFFFF;} + .d2-1185394817 .color-B1{color:#0D32B2;} + .d2-1185394817 .color-B2{color:#0D32B2;} + .d2-1185394817 .color-B3{color:#E3E9FD;} + .d2-1185394817 .color-B4{color:#E3E9FD;} + .d2-1185394817 .color-B5{color:#EDF0FD;} + .d2-1185394817 .color-B6{color:#F7F8FE;} + .d2-1185394817 .color-AA2{color:#4A6FF3;} + .d2-1185394817 .color-AA4{color:#EDF0FD;} + .d2-1185394817 .color-AA5{color:#F7F8FE;} + .d2-1185394817 .color-AB4{color:#EDF0FD;} + .d2-1185394817 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1185394817);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1185394817);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1185394817);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1185394817);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1185394817);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1185394817);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1185394817);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1185394817);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1185394817);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1185394817);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1185394817);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1185394817);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1185394817);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1185394817);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1185394817);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1185394817);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1185394817);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1185394817);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>lambda-build.yamllambda-deploy.yamlapollo-deploy.yamlPush to main branchGitHub ActionsS3TerraformAWSManual TriggerGitHub ActionsAWSApollo RepoGitHub ActionsAWS TriggersBuilds zip and pushes it Pulls zip to deployChanges live lambdasLaunchesBuilds zippushes them to S3. Deploys lambdasusing TerraformTriggered manually/push to master test test test test test test testtest - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/elk_alignment/elk/board.exp.json b/e2etests/testdata/regression/elk_alignment/elk/board.exp.json index f3683eb17..b25f2760c 100644 --- a/e2etests/testdata/regression/elk_alignment/elk/board.exp.json +++ b/e2etests/testdata/regression/elk_alignment/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -602,6 +624,7 @@ "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 197, @@ -640,6 +663,7 @@ "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 197, @@ -678,6 +702,7 @@ "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 197, @@ -716,6 +741,7 @@ "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 197, @@ -754,6 +780,7 @@ "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 557.5, @@ -792,6 +819,7 @@ "labelHeight": 106, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 557.5, @@ -830,6 +858,7 @@ "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1049.5, @@ -868,6 +897,7 @@ "labelHeight": 26, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1049.5, @@ -899,6 +929,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/elk_alignment/elk/sketch.exp.svg b/e2etests/testdata/regression/elk_alignment/elk/sketch.exp.svg index 96b99a918..7114d22c9 100644 --- a/e2etests/testdata/regression/elk_alignment/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/elk_alignment/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -lambda-build.yamllambda-deploy.yamlapollo-deploy.yamlPush to main branchGitHub ActionsS3TerraformAWSManual TriggerGitHub ActionsAWSApollo RepoGitHub ActionsAWS TriggersBuilds zip and pushes it Pulls zip to deployChanges live lambdasLaunchesBuilds zippushes them to S3. Deploys lambdasusing TerraformTriggered manually/push to master test test test test test test testtest + .d2-1582817141 .fill-N1{fill:#0A0F25;} + .d2-1582817141 .fill-N2{fill:#676C7E;} + .d2-1582817141 .fill-N3{fill:#9499AB;} + .d2-1582817141 .fill-N4{fill:#CFD2DD;} + .d2-1582817141 .fill-N5{fill:#DEE1EB;} + .d2-1582817141 .fill-N6{fill:#EEF1F8;} + .d2-1582817141 .fill-N7{fill:#FFFFFF;} + .d2-1582817141 .fill-B1{fill:#0D32B2;} + .d2-1582817141 .fill-B2{fill:#0D32B2;} + .d2-1582817141 .fill-B3{fill:#E3E9FD;} + .d2-1582817141 .fill-B4{fill:#E3E9FD;} + .d2-1582817141 .fill-B5{fill:#EDF0FD;} + .d2-1582817141 .fill-B6{fill:#F7F8FE;} + .d2-1582817141 .fill-AA2{fill:#4A6FF3;} + .d2-1582817141 .fill-AA4{fill:#EDF0FD;} + .d2-1582817141 .fill-AA5{fill:#F7F8FE;} + .d2-1582817141 .fill-AB4{fill:#EDF0FD;} + .d2-1582817141 .fill-AB5{fill:#F7F8FE;} + .d2-1582817141 .stroke-N1{stroke:#0A0F25;} + .d2-1582817141 .stroke-N2{stroke:#676C7E;} + .d2-1582817141 .stroke-N3{stroke:#9499AB;} + .d2-1582817141 .stroke-N4{stroke:#CFD2DD;} + .d2-1582817141 .stroke-N5{stroke:#DEE1EB;} + .d2-1582817141 .stroke-N6{stroke:#EEF1F8;} + .d2-1582817141 .stroke-N7{stroke:#FFFFFF;} + .d2-1582817141 .stroke-B1{stroke:#0D32B2;} + .d2-1582817141 .stroke-B2{stroke:#0D32B2;} + .d2-1582817141 .stroke-B3{stroke:#E3E9FD;} + .d2-1582817141 .stroke-B4{stroke:#E3E9FD;} + .d2-1582817141 .stroke-B5{stroke:#EDF0FD;} + .d2-1582817141 .stroke-B6{stroke:#F7F8FE;} + .d2-1582817141 .stroke-AA2{stroke:#4A6FF3;} + .d2-1582817141 .stroke-AA4{stroke:#EDF0FD;} + .d2-1582817141 .stroke-AA5{stroke:#F7F8FE;} + .d2-1582817141 .stroke-AB4{stroke:#EDF0FD;} + .d2-1582817141 .stroke-AB5{stroke:#F7F8FE;} + .d2-1582817141 .background-color-N1{background-color:#0A0F25;} + .d2-1582817141 .background-color-N2{background-color:#676C7E;} + .d2-1582817141 .background-color-N3{background-color:#9499AB;} + .d2-1582817141 .background-color-N4{background-color:#CFD2DD;} + .d2-1582817141 .background-color-N5{background-color:#DEE1EB;} + .d2-1582817141 .background-color-N6{background-color:#EEF1F8;} + .d2-1582817141 .background-color-N7{background-color:#FFFFFF;} + .d2-1582817141 .background-color-B1{background-color:#0D32B2;} + .d2-1582817141 .background-color-B2{background-color:#0D32B2;} + .d2-1582817141 .background-color-B3{background-color:#E3E9FD;} + .d2-1582817141 .background-color-B4{background-color:#E3E9FD;} + .d2-1582817141 .background-color-B5{background-color:#EDF0FD;} + .d2-1582817141 .background-color-B6{background-color:#F7F8FE;} + .d2-1582817141 .background-color-AA2{background-color:#4A6FF3;} + .d2-1582817141 .background-color-AA4{background-color:#EDF0FD;} + .d2-1582817141 .background-color-AA5{background-color:#F7F8FE;} + .d2-1582817141 .background-color-AB4{background-color:#EDF0FD;} + .d2-1582817141 .background-color-AB5{background-color:#F7F8FE;} + .d2-1582817141 .color-N1{color:#0A0F25;} + .d2-1582817141 .color-N2{color:#676C7E;} + .d2-1582817141 .color-N3{color:#9499AB;} + .d2-1582817141 .color-N4{color:#CFD2DD;} + .d2-1582817141 .color-N5{color:#DEE1EB;} + .d2-1582817141 .color-N6{color:#EEF1F8;} + .d2-1582817141 .color-N7{color:#FFFFFF;} + .d2-1582817141 .color-B1{color:#0D32B2;} + .d2-1582817141 .color-B2{color:#0D32B2;} + .d2-1582817141 .color-B3{color:#E3E9FD;} + .d2-1582817141 .color-B4{color:#E3E9FD;} + .d2-1582817141 .color-B5{color:#EDF0FD;} + .d2-1582817141 .color-B6{color:#F7F8FE;} + .d2-1582817141 .color-AA2{color:#4A6FF3;} + .d2-1582817141 .color-AA4{color:#EDF0FD;} + .d2-1582817141 .color-AA5{color:#F7F8FE;} + .d2-1582817141 .color-AB4{color:#EDF0FD;} + .d2-1582817141 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1582817141);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1582817141);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1582817141);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1582817141);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1582817141);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1582817141);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1582817141);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1582817141);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1582817141);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1582817141);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1582817141);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1582817141);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1582817141);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1582817141);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1582817141);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1582817141);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1582817141);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1582817141);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>lambda-build.yamllambda-deploy.yamlapollo-deploy.yamlPush to main branchGitHub ActionsS3TerraformAWSManual TriggerGitHub ActionsAWSApollo RepoGitHub ActionsAWS TriggersBuilds zip and pushes it Pulls zip to deployChanges live lambdasLaunchesBuilds zippushes them to S3. Deploys lambdasusing TerraformTriggered manually/push to master test test test test test test testtest - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/elk_img_empty_label_panic/dagre/board.exp.json b/e2etests/testdata/regression/elk_img_empty_label_panic/dagre/board.exp.json index 3693e9479..98d08dec4 100644 --- a/e2etests/testdata/regression/elk_img_empty_label_panic/dagre/board.exp.json +++ b/e2etests/testdata/regression/elk_img_empty_label_panic/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -70,6 +79,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -124,6 +134,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/elk_img_empty_label_panic/dagre/sketch.exp.svg b/e2etests/testdata/regression/elk_img_empty_label_panic/dagre/sketch.exp.svg index 5ab0e29e0..ce1814509 100644 --- a/e2etests/testdata/regression/elk_img_empty_label_panic/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/elk_img_empty_label_panic/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ - + .d2-590849029 .fill-N1{fill:#0A0F25;} + .d2-590849029 .fill-N2{fill:#676C7E;} + .d2-590849029 .fill-N3{fill:#9499AB;} + .d2-590849029 .fill-N4{fill:#CFD2DD;} + .d2-590849029 .fill-N5{fill:#DEE1EB;} + .d2-590849029 .fill-N6{fill:#EEF1F8;} + .d2-590849029 .fill-N7{fill:#FFFFFF;} + .d2-590849029 .fill-B1{fill:#0D32B2;} + .d2-590849029 .fill-B2{fill:#0D32B2;} + .d2-590849029 .fill-B3{fill:#E3E9FD;} + .d2-590849029 .fill-B4{fill:#E3E9FD;} + .d2-590849029 .fill-B5{fill:#EDF0FD;} + .d2-590849029 .fill-B6{fill:#F7F8FE;} + .d2-590849029 .fill-AA2{fill:#4A6FF3;} + .d2-590849029 .fill-AA4{fill:#EDF0FD;} + .d2-590849029 .fill-AA5{fill:#F7F8FE;} + .d2-590849029 .fill-AB4{fill:#EDF0FD;} + .d2-590849029 .fill-AB5{fill:#F7F8FE;} + .d2-590849029 .stroke-N1{stroke:#0A0F25;} + .d2-590849029 .stroke-N2{stroke:#676C7E;} + .d2-590849029 .stroke-N3{stroke:#9499AB;} + .d2-590849029 .stroke-N4{stroke:#CFD2DD;} + .d2-590849029 .stroke-N5{stroke:#DEE1EB;} + .d2-590849029 .stroke-N6{stroke:#EEF1F8;} + .d2-590849029 .stroke-N7{stroke:#FFFFFF;} + .d2-590849029 .stroke-B1{stroke:#0D32B2;} + .d2-590849029 .stroke-B2{stroke:#0D32B2;} + .d2-590849029 .stroke-B3{stroke:#E3E9FD;} + .d2-590849029 .stroke-B4{stroke:#E3E9FD;} + .d2-590849029 .stroke-B5{stroke:#EDF0FD;} + .d2-590849029 .stroke-B6{stroke:#F7F8FE;} + .d2-590849029 .stroke-AA2{stroke:#4A6FF3;} + .d2-590849029 .stroke-AA4{stroke:#EDF0FD;} + .d2-590849029 .stroke-AA5{stroke:#F7F8FE;} + .d2-590849029 .stroke-AB4{stroke:#EDF0FD;} + .d2-590849029 .stroke-AB5{stroke:#F7F8FE;} + .d2-590849029 .background-color-N1{background-color:#0A0F25;} + .d2-590849029 .background-color-N2{background-color:#676C7E;} + .d2-590849029 .background-color-N3{background-color:#9499AB;} + .d2-590849029 .background-color-N4{background-color:#CFD2DD;} + .d2-590849029 .background-color-N5{background-color:#DEE1EB;} + .d2-590849029 .background-color-N6{background-color:#EEF1F8;} + .d2-590849029 .background-color-N7{background-color:#FFFFFF;} + .d2-590849029 .background-color-B1{background-color:#0D32B2;} + .d2-590849029 .background-color-B2{background-color:#0D32B2;} + .d2-590849029 .background-color-B3{background-color:#E3E9FD;} + .d2-590849029 .background-color-B4{background-color:#E3E9FD;} + .d2-590849029 .background-color-B5{background-color:#EDF0FD;} + .d2-590849029 .background-color-B6{background-color:#F7F8FE;} + .d2-590849029 .background-color-AA2{background-color:#4A6FF3;} + .d2-590849029 .background-color-AA4{background-color:#EDF0FD;} + .d2-590849029 .background-color-AA5{background-color:#F7F8FE;} + .d2-590849029 .background-color-AB4{background-color:#EDF0FD;} + .d2-590849029 .background-color-AB5{background-color:#F7F8FE;} + .d2-590849029 .color-N1{color:#0A0F25;} + .d2-590849029 .color-N2{color:#676C7E;} + .d2-590849029 .color-N3{color:#9499AB;} + .d2-590849029 .color-N4{color:#CFD2DD;} + .d2-590849029 .color-N5{color:#DEE1EB;} + .d2-590849029 .color-N6{color:#EEF1F8;} + .d2-590849029 .color-N7{color:#FFFFFF;} + .d2-590849029 .color-B1{color:#0D32B2;} + .d2-590849029 .color-B2{color:#0D32B2;} + .d2-590849029 .color-B3{color:#E3E9FD;} + .d2-590849029 .color-B4{color:#E3E9FD;} + .d2-590849029 .color-B5{color:#EDF0FD;} + .d2-590849029 .color-B6{color:#F7F8FE;} + .d2-590849029 .color-AA2{color:#4A6FF3;} + .d2-590849029 .color-AA4{color:#EDF0FD;} + .d2-590849029 .color-AA5{color:#F7F8FE;} + .d2-590849029 .color-AB4{color:#EDF0FD;} + .d2-590849029 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-590849029);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-590849029);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-590849029);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-590849029);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-590849029);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-590849029);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-590849029);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-590849029);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-590849029);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-590849029);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-590849029);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-590849029);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-590849029);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-590849029);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-590849029);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-590849029);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-590849029);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-590849029);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> \ No newline at end of file diff --git a/e2etests/testdata/regression/elk_img_empty_label_panic/elk/board.exp.json b/e2etests/testdata/regression/elk_img_empty_label_panic/elk/board.exp.json index 15b658c79..63a547de4 100644 --- a/e2etests/testdata/regression/elk_img_empty_label_panic/elk/board.exp.json +++ b/e2etests/testdata/regression/elk_img_empty_label_panic/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -70,6 +79,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -124,6 +134,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/elk_img_empty_label_panic/elk/sketch.exp.svg b/e2etests/testdata/regression/elk_img_empty_label_panic/elk/sketch.exp.svg index d8b1a1ec0..b4fc996b8 100644 --- a/e2etests/testdata/regression/elk_img_empty_label_panic/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/elk_img_empty_label_panic/elk/sketch.exp.svg @@ -1,4 +1,4 @@ - + .d2-316726530 .fill-N1{fill:#0A0F25;} + .d2-316726530 .fill-N2{fill:#676C7E;} + .d2-316726530 .fill-N3{fill:#9499AB;} + .d2-316726530 .fill-N4{fill:#CFD2DD;} + .d2-316726530 .fill-N5{fill:#DEE1EB;} + .d2-316726530 .fill-N6{fill:#EEF1F8;} + .d2-316726530 .fill-N7{fill:#FFFFFF;} + .d2-316726530 .fill-B1{fill:#0D32B2;} + .d2-316726530 .fill-B2{fill:#0D32B2;} + .d2-316726530 .fill-B3{fill:#E3E9FD;} + .d2-316726530 .fill-B4{fill:#E3E9FD;} + .d2-316726530 .fill-B5{fill:#EDF0FD;} + .d2-316726530 .fill-B6{fill:#F7F8FE;} + .d2-316726530 .fill-AA2{fill:#4A6FF3;} + .d2-316726530 .fill-AA4{fill:#EDF0FD;} + .d2-316726530 .fill-AA5{fill:#F7F8FE;} + .d2-316726530 .fill-AB4{fill:#EDF0FD;} + .d2-316726530 .fill-AB5{fill:#F7F8FE;} + .d2-316726530 .stroke-N1{stroke:#0A0F25;} + .d2-316726530 .stroke-N2{stroke:#676C7E;} + .d2-316726530 .stroke-N3{stroke:#9499AB;} + .d2-316726530 .stroke-N4{stroke:#CFD2DD;} + .d2-316726530 .stroke-N5{stroke:#DEE1EB;} + .d2-316726530 .stroke-N6{stroke:#EEF1F8;} + .d2-316726530 .stroke-N7{stroke:#FFFFFF;} + .d2-316726530 .stroke-B1{stroke:#0D32B2;} + .d2-316726530 .stroke-B2{stroke:#0D32B2;} + .d2-316726530 .stroke-B3{stroke:#E3E9FD;} + .d2-316726530 .stroke-B4{stroke:#E3E9FD;} + .d2-316726530 .stroke-B5{stroke:#EDF0FD;} + .d2-316726530 .stroke-B6{stroke:#F7F8FE;} + .d2-316726530 .stroke-AA2{stroke:#4A6FF3;} + .d2-316726530 .stroke-AA4{stroke:#EDF0FD;} + .d2-316726530 .stroke-AA5{stroke:#F7F8FE;} + .d2-316726530 .stroke-AB4{stroke:#EDF0FD;} + .d2-316726530 .stroke-AB5{stroke:#F7F8FE;} + .d2-316726530 .background-color-N1{background-color:#0A0F25;} + .d2-316726530 .background-color-N2{background-color:#676C7E;} + .d2-316726530 .background-color-N3{background-color:#9499AB;} + .d2-316726530 .background-color-N4{background-color:#CFD2DD;} + .d2-316726530 .background-color-N5{background-color:#DEE1EB;} + .d2-316726530 .background-color-N6{background-color:#EEF1F8;} + .d2-316726530 .background-color-N7{background-color:#FFFFFF;} + .d2-316726530 .background-color-B1{background-color:#0D32B2;} + .d2-316726530 .background-color-B2{background-color:#0D32B2;} + .d2-316726530 .background-color-B3{background-color:#E3E9FD;} + .d2-316726530 .background-color-B4{background-color:#E3E9FD;} + .d2-316726530 .background-color-B5{background-color:#EDF0FD;} + .d2-316726530 .background-color-B6{background-color:#F7F8FE;} + .d2-316726530 .background-color-AA2{background-color:#4A6FF3;} + .d2-316726530 .background-color-AA4{background-color:#EDF0FD;} + .d2-316726530 .background-color-AA5{background-color:#F7F8FE;} + .d2-316726530 .background-color-AB4{background-color:#EDF0FD;} + .d2-316726530 .background-color-AB5{background-color:#F7F8FE;} + .d2-316726530 .color-N1{color:#0A0F25;} + .d2-316726530 .color-N2{color:#676C7E;} + .d2-316726530 .color-N3{color:#9499AB;} + .d2-316726530 .color-N4{color:#CFD2DD;} + .d2-316726530 .color-N5{color:#DEE1EB;} + .d2-316726530 .color-N6{color:#EEF1F8;} + .d2-316726530 .color-N7{color:#FFFFFF;} + .d2-316726530 .color-B1{color:#0D32B2;} + .d2-316726530 .color-B2{color:#0D32B2;} + .d2-316726530 .color-B3{color:#E3E9FD;} + .d2-316726530 .color-B4{color:#E3E9FD;} + .d2-316726530 .color-B5{color:#EDF0FD;} + .d2-316726530 .color-B6{color:#F7F8FE;} + .d2-316726530 .color-AA2{color:#4A6FF3;} + .d2-316726530 .color-AA4{color:#EDF0FD;} + .d2-316726530 .color-AA5{color:#F7F8FE;} + .d2-316726530 .color-AB4{color:#EDF0FD;} + .d2-316726530 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-316726530);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-316726530);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-316726530);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-316726530);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-316726530);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-316726530);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-316726530);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-316726530);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-316726530);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-316726530);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-316726530);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-316726530);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-316726530);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-316726530);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-316726530);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-316726530);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-316726530);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-316726530);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> \ No newline at end of file diff --git a/e2etests/testdata/regression/elk_loop_panic/dagre/board.exp.json b/e2etests/testdata/regression/elk_loop_panic/dagre/board.exp.json index c31719ee2..24f1dede2 100644 --- a/e2etests/testdata/regression/elk_loop_panic/dagre/board.exp.json +++ b/e2etests/testdata/regression/elk_loop_panic/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -151,6 +162,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 92.66600036621094, @@ -227,6 +239,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/elk_loop_panic/dagre/sketch.exp.svg b/e2etests/testdata/regression/elk_loop_panic/dagre/sketch.exp.svg index 0e24b05d1..8c1413610 100644 --- a/e2etests/testdata/regression/elk_loop_panic/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/elk_loop_panic/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -xab + .d2-2485936719 .fill-N1{fill:#0A0F25;} + .d2-2485936719 .fill-N2{fill:#676C7E;} + .d2-2485936719 .fill-N3{fill:#9499AB;} + .d2-2485936719 .fill-N4{fill:#CFD2DD;} + .d2-2485936719 .fill-N5{fill:#DEE1EB;} + .d2-2485936719 .fill-N6{fill:#EEF1F8;} + .d2-2485936719 .fill-N7{fill:#FFFFFF;} + .d2-2485936719 .fill-B1{fill:#0D32B2;} + .d2-2485936719 .fill-B2{fill:#0D32B2;} + .d2-2485936719 .fill-B3{fill:#E3E9FD;} + .d2-2485936719 .fill-B4{fill:#E3E9FD;} + .d2-2485936719 .fill-B5{fill:#EDF0FD;} + .d2-2485936719 .fill-B6{fill:#F7F8FE;} + .d2-2485936719 .fill-AA2{fill:#4A6FF3;} + .d2-2485936719 .fill-AA4{fill:#EDF0FD;} + .d2-2485936719 .fill-AA5{fill:#F7F8FE;} + .d2-2485936719 .fill-AB4{fill:#EDF0FD;} + .d2-2485936719 .fill-AB5{fill:#F7F8FE;} + .d2-2485936719 .stroke-N1{stroke:#0A0F25;} + .d2-2485936719 .stroke-N2{stroke:#676C7E;} + .d2-2485936719 .stroke-N3{stroke:#9499AB;} + .d2-2485936719 .stroke-N4{stroke:#CFD2DD;} + .d2-2485936719 .stroke-N5{stroke:#DEE1EB;} + .d2-2485936719 .stroke-N6{stroke:#EEF1F8;} + .d2-2485936719 .stroke-N7{stroke:#FFFFFF;} + .d2-2485936719 .stroke-B1{stroke:#0D32B2;} + .d2-2485936719 .stroke-B2{stroke:#0D32B2;} + .d2-2485936719 .stroke-B3{stroke:#E3E9FD;} + .d2-2485936719 .stroke-B4{stroke:#E3E9FD;} + .d2-2485936719 .stroke-B5{stroke:#EDF0FD;} + .d2-2485936719 .stroke-B6{stroke:#F7F8FE;} + .d2-2485936719 .stroke-AA2{stroke:#4A6FF3;} + .d2-2485936719 .stroke-AA4{stroke:#EDF0FD;} + .d2-2485936719 .stroke-AA5{stroke:#F7F8FE;} + .d2-2485936719 .stroke-AB4{stroke:#EDF0FD;} + .d2-2485936719 .stroke-AB5{stroke:#F7F8FE;} + .d2-2485936719 .background-color-N1{background-color:#0A0F25;} + .d2-2485936719 .background-color-N2{background-color:#676C7E;} + .d2-2485936719 .background-color-N3{background-color:#9499AB;} + .d2-2485936719 .background-color-N4{background-color:#CFD2DD;} + .d2-2485936719 .background-color-N5{background-color:#DEE1EB;} + .d2-2485936719 .background-color-N6{background-color:#EEF1F8;} + .d2-2485936719 .background-color-N7{background-color:#FFFFFF;} + .d2-2485936719 .background-color-B1{background-color:#0D32B2;} + .d2-2485936719 .background-color-B2{background-color:#0D32B2;} + .d2-2485936719 .background-color-B3{background-color:#E3E9FD;} + .d2-2485936719 .background-color-B4{background-color:#E3E9FD;} + .d2-2485936719 .background-color-B5{background-color:#EDF0FD;} + .d2-2485936719 .background-color-B6{background-color:#F7F8FE;} + .d2-2485936719 .background-color-AA2{background-color:#4A6FF3;} + .d2-2485936719 .background-color-AA4{background-color:#EDF0FD;} + .d2-2485936719 .background-color-AA5{background-color:#F7F8FE;} + .d2-2485936719 .background-color-AB4{background-color:#EDF0FD;} + .d2-2485936719 .background-color-AB5{background-color:#F7F8FE;} + .d2-2485936719 .color-N1{color:#0A0F25;} + .d2-2485936719 .color-N2{color:#676C7E;} + .d2-2485936719 .color-N3{color:#9499AB;} + .d2-2485936719 .color-N4{color:#CFD2DD;} + .d2-2485936719 .color-N5{color:#DEE1EB;} + .d2-2485936719 .color-N6{color:#EEF1F8;} + .d2-2485936719 .color-N7{color:#FFFFFF;} + .d2-2485936719 .color-B1{color:#0D32B2;} + .d2-2485936719 .color-B2{color:#0D32B2;} + .d2-2485936719 .color-B3{color:#E3E9FD;} + .d2-2485936719 .color-B4{color:#E3E9FD;} + .d2-2485936719 .color-B5{color:#EDF0FD;} + .d2-2485936719 .color-B6{color:#F7F8FE;} + .d2-2485936719 .color-AA2{color:#4A6FF3;} + .d2-2485936719 .color-AA4{color:#EDF0FD;} + .d2-2485936719 .color-AA5{color:#F7F8FE;} + .d2-2485936719 .color-AB4{color:#EDF0FD;} + .d2-2485936719 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2485936719);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2485936719);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2485936719);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2485936719);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2485936719);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2485936719);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2485936719);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2485936719);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2485936719);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2485936719);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2485936719);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2485936719);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2485936719);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2485936719);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2485936719);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2485936719);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2485936719);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2485936719);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xab - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/elk_loop_panic/elk/board.exp.json b/e2etests/testdata/regression/elk_loop_panic/elk/board.exp.json index ee92f21ea..319ba69c0 100644 --- a/e2etests/testdata/regression/elk_loop_panic/elk/board.exp.json +++ b/e2etests/testdata/regression/elk_loop_panic/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -151,6 +162,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 112, @@ -190,6 +202,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/elk_loop_panic/elk/sketch.exp.svg b/e2etests/testdata/regression/elk_loop_panic/elk/sketch.exp.svg index 8aad7da51..d1def414b 100644 --- a/e2etests/testdata/regression/elk_loop_panic/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/elk_loop_panic/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -xab + .d2-1375204388 .fill-N1{fill:#0A0F25;} + .d2-1375204388 .fill-N2{fill:#676C7E;} + .d2-1375204388 .fill-N3{fill:#9499AB;} + .d2-1375204388 .fill-N4{fill:#CFD2DD;} + .d2-1375204388 .fill-N5{fill:#DEE1EB;} + .d2-1375204388 .fill-N6{fill:#EEF1F8;} + .d2-1375204388 .fill-N7{fill:#FFFFFF;} + .d2-1375204388 .fill-B1{fill:#0D32B2;} + .d2-1375204388 .fill-B2{fill:#0D32B2;} + .d2-1375204388 .fill-B3{fill:#E3E9FD;} + .d2-1375204388 .fill-B4{fill:#E3E9FD;} + .d2-1375204388 .fill-B5{fill:#EDF0FD;} + .d2-1375204388 .fill-B6{fill:#F7F8FE;} + .d2-1375204388 .fill-AA2{fill:#4A6FF3;} + .d2-1375204388 .fill-AA4{fill:#EDF0FD;} + .d2-1375204388 .fill-AA5{fill:#F7F8FE;} + .d2-1375204388 .fill-AB4{fill:#EDF0FD;} + .d2-1375204388 .fill-AB5{fill:#F7F8FE;} + .d2-1375204388 .stroke-N1{stroke:#0A0F25;} + .d2-1375204388 .stroke-N2{stroke:#676C7E;} + .d2-1375204388 .stroke-N3{stroke:#9499AB;} + .d2-1375204388 .stroke-N4{stroke:#CFD2DD;} + .d2-1375204388 .stroke-N5{stroke:#DEE1EB;} + .d2-1375204388 .stroke-N6{stroke:#EEF1F8;} + .d2-1375204388 .stroke-N7{stroke:#FFFFFF;} + .d2-1375204388 .stroke-B1{stroke:#0D32B2;} + .d2-1375204388 .stroke-B2{stroke:#0D32B2;} + .d2-1375204388 .stroke-B3{stroke:#E3E9FD;} + .d2-1375204388 .stroke-B4{stroke:#E3E9FD;} + .d2-1375204388 .stroke-B5{stroke:#EDF0FD;} + .d2-1375204388 .stroke-B6{stroke:#F7F8FE;} + .d2-1375204388 .stroke-AA2{stroke:#4A6FF3;} + .d2-1375204388 .stroke-AA4{stroke:#EDF0FD;} + .d2-1375204388 .stroke-AA5{stroke:#F7F8FE;} + .d2-1375204388 .stroke-AB4{stroke:#EDF0FD;} + .d2-1375204388 .stroke-AB5{stroke:#F7F8FE;} + .d2-1375204388 .background-color-N1{background-color:#0A0F25;} + .d2-1375204388 .background-color-N2{background-color:#676C7E;} + .d2-1375204388 .background-color-N3{background-color:#9499AB;} + .d2-1375204388 .background-color-N4{background-color:#CFD2DD;} + .d2-1375204388 .background-color-N5{background-color:#DEE1EB;} + .d2-1375204388 .background-color-N6{background-color:#EEF1F8;} + .d2-1375204388 .background-color-N7{background-color:#FFFFFF;} + .d2-1375204388 .background-color-B1{background-color:#0D32B2;} + .d2-1375204388 .background-color-B2{background-color:#0D32B2;} + .d2-1375204388 .background-color-B3{background-color:#E3E9FD;} + .d2-1375204388 .background-color-B4{background-color:#E3E9FD;} + .d2-1375204388 .background-color-B5{background-color:#EDF0FD;} + .d2-1375204388 .background-color-B6{background-color:#F7F8FE;} + .d2-1375204388 .background-color-AA2{background-color:#4A6FF3;} + .d2-1375204388 .background-color-AA4{background-color:#EDF0FD;} + .d2-1375204388 .background-color-AA5{background-color:#F7F8FE;} + .d2-1375204388 .background-color-AB4{background-color:#EDF0FD;} + .d2-1375204388 .background-color-AB5{background-color:#F7F8FE;} + .d2-1375204388 .color-N1{color:#0A0F25;} + .d2-1375204388 .color-N2{color:#676C7E;} + .d2-1375204388 .color-N3{color:#9499AB;} + .d2-1375204388 .color-N4{color:#CFD2DD;} + .d2-1375204388 .color-N5{color:#DEE1EB;} + .d2-1375204388 .color-N6{color:#EEF1F8;} + .d2-1375204388 .color-N7{color:#FFFFFF;} + .d2-1375204388 .color-B1{color:#0D32B2;} + .d2-1375204388 .color-B2{color:#0D32B2;} + .d2-1375204388 .color-B3{color:#E3E9FD;} + .d2-1375204388 .color-B4{color:#E3E9FD;} + .d2-1375204388 .color-B5{color:#EDF0FD;} + .d2-1375204388 .color-B6{color:#F7F8FE;} + .d2-1375204388 .color-AA2{color:#4A6FF3;} + .d2-1375204388 .color-AA4{color:#EDF0FD;} + .d2-1375204388 .color-AA5{color:#F7F8FE;} + .d2-1375204388 .color-AB4{color:#EDF0FD;} + .d2-1375204388 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1375204388);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1375204388);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1375204388);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1375204388);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1375204388);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1375204388);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1375204388);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1375204388);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1375204388);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1375204388);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1375204388);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1375204388);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1375204388);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1375204388);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1375204388);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1375204388);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1375204388);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1375204388);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xab - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/elk_order/dagre/board.exp.json b/e2etests/testdata/regression/elk_order/dagre/board.exp.json index 0acb8aca9..82632d669 100644 --- a/e2etests/testdata/regression/elk_order/dagre/board.exp.json +++ b/e2etests/testdata/regression/elk_order/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -140,6 +151,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -181,6 +193,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -222,6 +235,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -263,6 +277,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -304,6 +319,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -345,6 +361,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -385,6 +402,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -425,6 +443,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -465,6 +484,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -515,6 +535,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 72.5, @@ -562,6 +583,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 322.5, @@ -609,6 +631,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 698.5, @@ -656,6 +679,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 873.5, @@ -696,6 +720,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/elk_order/dagre/sketch.exp.svg b/e2etests/testdata/regression/elk_order/dagre/sketch.exp.svg index e96723cfc..9a0684c71 100644 --- a/e2etests/testdata/regression/elk_order/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/elk_order/dagre/sketch.exp.svg @@ -1,20 +1,20 @@ -

    Oldest message

    -

    Offset

    -

    Last message

    -

    Next message will be
    +

    Oldest message

    +

    Offset

    +

    Last message

    +

    Next message will be
    inserted here

    -
    M0M1M2M3M4M5M6 +
    M0M1M2M3M4M5M6 - - - - - - - - - - - + + + + + + + + + + +     \ No newline at end of file diff --git a/e2etests/testdata/regression/elk_order/elk/board.exp.json b/e2etests/testdata/regression/elk_order/elk/board.exp.json index d3302483b..d388b8064 100644 --- a/e2etests/testdata/regression/elk_order/elk/board.exp.json +++ b/e2etests/testdata/regression/elk_order/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -140,6 +151,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -181,6 +193,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -222,6 +235,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -263,6 +277,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -304,6 +319,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -345,6 +361,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -385,6 +402,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -425,6 +443,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -465,6 +484,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -515,6 +535,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 94.5, @@ -553,6 +574,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 264.5, @@ -591,6 +613,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 520.5, @@ -629,6 +652,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 605.5, @@ -660,6 +684,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/elk_order/elk/sketch.exp.svg b/e2etests/testdata/regression/elk_order/elk/sketch.exp.svg index c37cf4717..e32166e97 100644 --- a/e2etests/testdata/regression/elk_order/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/elk_order/elk/sketch.exp.svg @@ -1,20 +1,20 @@ -

    Oldest message

    -

    Offset

    -

    Last message

    -

    Next message will be
    +

    Oldest message

    +

    Offset

    +

    Last message

    +

    Next message will be
    inserted here

    -
    M0M1M2M3M4M5M6 +
    M0M1M2M3M4M5M6 - - - - - - - - - - - + + + + + + + + + + +     \ No newline at end of file diff --git a/e2etests/testdata/regression/empty_class_height/dagre/board.exp.json b/e2etests/testdata/regression/empty_class_height/dagre/board.exp.json index d04a989ef..102896f23 100644 --- a/e2etests/testdata/regression/empty_class_height/dagre/board.exp.json +++ b/e2etests/testdata/regression/empty_class_height/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -72,6 +81,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -117,6 +127,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/empty_class_height/dagre/sketch.exp.svg b/e2etests/testdata/regression/empty_class_height/dagre/sketch.exp.svg index fa8025661..102430244 100644 --- a/e2etests/testdata/regression/empty_class_height/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/empty_class_height/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -class with rows-numint-timeoutintclass without rows + .d2-4194575965 .fill-N1{fill:#0A0F25;} + .d2-4194575965 .fill-N2{fill:#676C7E;} + .d2-4194575965 .fill-N3{fill:#9499AB;} + .d2-4194575965 .fill-N4{fill:#CFD2DD;} + .d2-4194575965 .fill-N5{fill:#DEE1EB;} + .d2-4194575965 .fill-N6{fill:#EEF1F8;} + .d2-4194575965 .fill-N7{fill:#FFFFFF;} + .d2-4194575965 .fill-B1{fill:#0D32B2;} + .d2-4194575965 .fill-B2{fill:#0D32B2;} + .d2-4194575965 .fill-B3{fill:#E3E9FD;} + .d2-4194575965 .fill-B4{fill:#E3E9FD;} + .d2-4194575965 .fill-B5{fill:#EDF0FD;} + .d2-4194575965 .fill-B6{fill:#F7F8FE;} + .d2-4194575965 .fill-AA2{fill:#4A6FF3;} + .d2-4194575965 .fill-AA4{fill:#EDF0FD;} + .d2-4194575965 .fill-AA5{fill:#F7F8FE;} + .d2-4194575965 .fill-AB4{fill:#EDF0FD;} + .d2-4194575965 .fill-AB5{fill:#F7F8FE;} + .d2-4194575965 .stroke-N1{stroke:#0A0F25;} + .d2-4194575965 .stroke-N2{stroke:#676C7E;} + .d2-4194575965 .stroke-N3{stroke:#9499AB;} + .d2-4194575965 .stroke-N4{stroke:#CFD2DD;} + .d2-4194575965 .stroke-N5{stroke:#DEE1EB;} + .d2-4194575965 .stroke-N6{stroke:#EEF1F8;} + .d2-4194575965 .stroke-N7{stroke:#FFFFFF;} + .d2-4194575965 .stroke-B1{stroke:#0D32B2;} + .d2-4194575965 .stroke-B2{stroke:#0D32B2;} + .d2-4194575965 .stroke-B3{stroke:#E3E9FD;} + .d2-4194575965 .stroke-B4{stroke:#E3E9FD;} + .d2-4194575965 .stroke-B5{stroke:#EDF0FD;} + .d2-4194575965 .stroke-B6{stroke:#F7F8FE;} + .d2-4194575965 .stroke-AA2{stroke:#4A6FF3;} + .d2-4194575965 .stroke-AA4{stroke:#EDF0FD;} + .d2-4194575965 .stroke-AA5{stroke:#F7F8FE;} + .d2-4194575965 .stroke-AB4{stroke:#EDF0FD;} + .d2-4194575965 .stroke-AB5{stroke:#F7F8FE;} + .d2-4194575965 .background-color-N1{background-color:#0A0F25;} + .d2-4194575965 .background-color-N2{background-color:#676C7E;} + .d2-4194575965 .background-color-N3{background-color:#9499AB;} + .d2-4194575965 .background-color-N4{background-color:#CFD2DD;} + .d2-4194575965 .background-color-N5{background-color:#DEE1EB;} + .d2-4194575965 .background-color-N6{background-color:#EEF1F8;} + .d2-4194575965 .background-color-N7{background-color:#FFFFFF;} + .d2-4194575965 .background-color-B1{background-color:#0D32B2;} + .d2-4194575965 .background-color-B2{background-color:#0D32B2;} + .d2-4194575965 .background-color-B3{background-color:#E3E9FD;} + .d2-4194575965 .background-color-B4{background-color:#E3E9FD;} + .d2-4194575965 .background-color-B5{background-color:#EDF0FD;} + .d2-4194575965 .background-color-B6{background-color:#F7F8FE;} + .d2-4194575965 .background-color-AA2{background-color:#4A6FF3;} + .d2-4194575965 .background-color-AA4{background-color:#EDF0FD;} + .d2-4194575965 .background-color-AA5{background-color:#F7F8FE;} + .d2-4194575965 .background-color-AB4{background-color:#EDF0FD;} + .d2-4194575965 .background-color-AB5{background-color:#F7F8FE;} + .d2-4194575965 .color-N1{color:#0A0F25;} + .d2-4194575965 .color-N2{color:#676C7E;} + .d2-4194575965 .color-N3{color:#9499AB;} + .d2-4194575965 .color-N4{color:#CFD2DD;} + .d2-4194575965 .color-N5{color:#DEE1EB;} + .d2-4194575965 .color-N6{color:#EEF1F8;} + .d2-4194575965 .color-N7{color:#FFFFFF;} + .d2-4194575965 .color-B1{color:#0D32B2;} + .d2-4194575965 .color-B2{color:#0D32B2;} + .d2-4194575965 .color-B3{color:#E3E9FD;} + .d2-4194575965 .color-B4{color:#E3E9FD;} + .d2-4194575965 .color-B5{color:#EDF0FD;} + .d2-4194575965 .color-B6{color:#F7F8FE;} + .d2-4194575965 .color-AA2{color:#4A6FF3;} + .d2-4194575965 .color-AA4{color:#EDF0FD;} + .d2-4194575965 .color-AA5{color:#F7F8FE;} + .d2-4194575965 .color-AB4{color:#EDF0FD;} + .d2-4194575965 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4194575965);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4194575965);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4194575965);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4194575965);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4194575965);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4194575965);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4194575965);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4194575965);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4194575965);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4194575965);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4194575965);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4194575965);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4194575965);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4194575965);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4194575965);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4194575965);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4194575965);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4194575965);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>class with rows-numint-timeoutintclass without rows \ No newline at end of file diff --git a/e2etests/testdata/regression/empty_class_height/elk/board.exp.json b/e2etests/testdata/regression/empty_class_height/elk/board.exp.json index 5ada06396..56f602383 100644 --- a/e2etests/testdata/regression/empty_class_height/elk/board.exp.json +++ b/e2etests/testdata/regression/empty_class_height/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -72,6 +81,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -117,6 +127,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/empty_class_height/elk/sketch.exp.svg b/e2etests/testdata/regression/empty_class_height/elk/sketch.exp.svg index 306500cc4..a8063fc0c 100644 --- a/e2etests/testdata/regression/empty_class_height/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/empty_class_height/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -class with rows-numint-timeoutintclass without rows + .d2-2324088214 .fill-N1{fill:#0A0F25;} + .d2-2324088214 .fill-N2{fill:#676C7E;} + .d2-2324088214 .fill-N3{fill:#9499AB;} + .d2-2324088214 .fill-N4{fill:#CFD2DD;} + .d2-2324088214 .fill-N5{fill:#DEE1EB;} + .d2-2324088214 .fill-N6{fill:#EEF1F8;} + .d2-2324088214 .fill-N7{fill:#FFFFFF;} + .d2-2324088214 .fill-B1{fill:#0D32B2;} + .d2-2324088214 .fill-B2{fill:#0D32B2;} + .d2-2324088214 .fill-B3{fill:#E3E9FD;} + .d2-2324088214 .fill-B4{fill:#E3E9FD;} + .d2-2324088214 .fill-B5{fill:#EDF0FD;} + .d2-2324088214 .fill-B6{fill:#F7F8FE;} + .d2-2324088214 .fill-AA2{fill:#4A6FF3;} + .d2-2324088214 .fill-AA4{fill:#EDF0FD;} + .d2-2324088214 .fill-AA5{fill:#F7F8FE;} + .d2-2324088214 .fill-AB4{fill:#EDF0FD;} + .d2-2324088214 .fill-AB5{fill:#F7F8FE;} + .d2-2324088214 .stroke-N1{stroke:#0A0F25;} + .d2-2324088214 .stroke-N2{stroke:#676C7E;} + .d2-2324088214 .stroke-N3{stroke:#9499AB;} + .d2-2324088214 .stroke-N4{stroke:#CFD2DD;} + .d2-2324088214 .stroke-N5{stroke:#DEE1EB;} + .d2-2324088214 .stroke-N6{stroke:#EEF1F8;} + .d2-2324088214 .stroke-N7{stroke:#FFFFFF;} + .d2-2324088214 .stroke-B1{stroke:#0D32B2;} + .d2-2324088214 .stroke-B2{stroke:#0D32B2;} + .d2-2324088214 .stroke-B3{stroke:#E3E9FD;} + .d2-2324088214 .stroke-B4{stroke:#E3E9FD;} + .d2-2324088214 .stroke-B5{stroke:#EDF0FD;} + .d2-2324088214 .stroke-B6{stroke:#F7F8FE;} + .d2-2324088214 .stroke-AA2{stroke:#4A6FF3;} + .d2-2324088214 .stroke-AA4{stroke:#EDF0FD;} + .d2-2324088214 .stroke-AA5{stroke:#F7F8FE;} + .d2-2324088214 .stroke-AB4{stroke:#EDF0FD;} + .d2-2324088214 .stroke-AB5{stroke:#F7F8FE;} + .d2-2324088214 .background-color-N1{background-color:#0A0F25;} + .d2-2324088214 .background-color-N2{background-color:#676C7E;} + .d2-2324088214 .background-color-N3{background-color:#9499AB;} + .d2-2324088214 .background-color-N4{background-color:#CFD2DD;} + .d2-2324088214 .background-color-N5{background-color:#DEE1EB;} + .d2-2324088214 .background-color-N6{background-color:#EEF1F8;} + .d2-2324088214 .background-color-N7{background-color:#FFFFFF;} + .d2-2324088214 .background-color-B1{background-color:#0D32B2;} + .d2-2324088214 .background-color-B2{background-color:#0D32B2;} + .d2-2324088214 .background-color-B3{background-color:#E3E9FD;} + .d2-2324088214 .background-color-B4{background-color:#E3E9FD;} + .d2-2324088214 .background-color-B5{background-color:#EDF0FD;} + .d2-2324088214 .background-color-B6{background-color:#F7F8FE;} + .d2-2324088214 .background-color-AA2{background-color:#4A6FF3;} + .d2-2324088214 .background-color-AA4{background-color:#EDF0FD;} + .d2-2324088214 .background-color-AA5{background-color:#F7F8FE;} + .d2-2324088214 .background-color-AB4{background-color:#EDF0FD;} + .d2-2324088214 .background-color-AB5{background-color:#F7F8FE;} + .d2-2324088214 .color-N1{color:#0A0F25;} + .d2-2324088214 .color-N2{color:#676C7E;} + .d2-2324088214 .color-N3{color:#9499AB;} + .d2-2324088214 .color-N4{color:#CFD2DD;} + .d2-2324088214 .color-N5{color:#DEE1EB;} + .d2-2324088214 .color-N6{color:#EEF1F8;} + .d2-2324088214 .color-N7{color:#FFFFFF;} + .d2-2324088214 .color-B1{color:#0D32B2;} + .d2-2324088214 .color-B2{color:#0D32B2;} + .d2-2324088214 .color-B3{color:#E3E9FD;} + .d2-2324088214 .color-B4{color:#E3E9FD;} + .d2-2324088214 .color-B5{color:#EDF0FD;} + .d2-2324088214 .color-B6{color:#F7F8FE;} + .d2-2324088214 .color-AA2{color:#4A6FF3;} + .d2-2324088214 .color-AA4{color:#EDF0FD;} + .d2-2324088214 .color-AA5{color:#F7F8FE;} + .d2-2324088214 .color-AB4{color:#EDF0FD;} + .d2-2324088214 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2324088214);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2324088214);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2324088214);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2324088214);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2324088214);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2324088214);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2324088214);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2324088214);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2324088214);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2324088214);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2324088214);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2324088214);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2324088214);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2324088214);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2324088214);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2324088214);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2324088214);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2324088214);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>class with rows-numint-timeoutintclass without rows \ No newline at end of file diff --git a/e2etests/testdata/regression/empty_nested_grid/dagre/board.exp.json b/e2etests/testdata/regression/empty_nested_grid/dagre/board.exp.json index 3a0c7b711..0b6ab857f 100644 --- a/e2etests/testdata/regression/empty_nested_grid/dagre/board.exp.json +++ b/e2etests/testdata/regression/empty_nested_grid/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -102,6 +112,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/empty_nested_grid/dagre/sketch.exp.svg b/e2etests/testdata/regression/empty_nested_grid/dagre/sketch.exp.svg index 0f3e7dbd0..8217c014a 100644 --- a/e2etests/testdata/regression/empty_nested_grid/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/empty_nested_grid/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -outerinner + .d2-3275429307 .fill-N1{fill:#0A0F25;} + .d2-3275429307 .fill-N2{fill:#676C7E;} + .d2-3275429307 .fill-N3{fill:#9499AB;} + .d2-3275429307 .fill-N4{fill:#CFD2DD;} + .d2-3275429307 .fill-N5{fill:#DEE1EB;} + .d2-3275429307 .fill-N6{fill:#EEF1F8;} + .d2-3275429307 .fill-N7{fill:#FFFFFF;} + .d2-3275429307 .fill-B1{fill:#0D32B2;} + .d2-3275429307 .fill-B2{fill:#0D32B2;} + .d2-3275429307 .fill-B3{fill:#E3E9FD;} + .d2-3275429307 .fill-B4{fill:#E3E9FD;} + .d2-3275429307 .fill-B5{fill:#EDF0FD;} + .d2-3275429307 .fill-B6{fill:#F7F8FE;} + .d2-3275429307 .fill-AA2{fill:#4A6FF3;} + .d2-3275429307 .fill-AA4{fill:#EDF0FD;} + .d2-3275429307 .fill-AA5{fill:#F7F8FE;} + .d2-3275429307 .fill-AB4{fill:#EDF0FD;} + .d2-3275429307 .fill-AB5{fill:#F7F8FE;} + .d2-3275429307 .stroke-N1{stroke:#0A0F25;} + .d2-3275429307 .stroke-N2{stroke:#676C7E;} + .d2-3275429307 .stroke-N3{stroke:#9499AB;} + .d2-3275429307 .stroke-N4{stroke:#CFD2DD;} + .d2-3275429307 .stroke-N5{stroke:#DEE1EB;} + .d2-3275429307 .stroke-N6{stroke:#EEF1F8;} + .d2-3275429307 .stroke-N7{stroke:#FFFFFF;} + .d2-3275429307 .stroke-B1{stroke:#0D32B2;} + .d2-3275429307 .stroke-B2{stroke:#0D32B2;} + .d2-3275429307 .stroke-B3{stroke:#E3E9FD;} + .d2-3275429307 .stroke-B4{stroke:#E3E9FD;} + .d2-3275429307 .stroke-B5{stroke:#EDF0FD;} + .d2-3275429307 .stroke-B6{stroke:#F7F8FE;} + .d2-3275429307 .stroke-AA2{stroke:#4A6FF3;} + .d2-3275429307 .stroke-AA4{stroke:#EDF0FD;} + .d2-3275429307 .stroke-AA5{stroke:#F7F8FE;} + .d2-3275429307 .stroke-AB4{stroke:#EDF0FD;} + .d2-3275429307 .stroke-AB5{stroke:#F7F8FE;} + .d2-3275429307 .background-color-N1{background-color:#0A0F25;} + .d2-3275429307 .background-color-N2{background-color:#676C7E;} + .d2-3275429307 .background-color-N3{background-color:#9499AB;} + .d2-3275429307 .background-color-N4{background-color:#CFD2DD;} + .d2-3275429307 .background-color-N5{background-color:#DEE1EB;} + .d2-3275429307 .background-color-N6{background-color:#EEF1F8;} + .d2-3275429307 .background-color-N7{background-color:#FFFFFF;} + .d2-3275429307 .background-color-B1{background-color:#0D32B2;} + .d2-3275429307 .background-color-B2{background-color:#0D32B2;} + .d2-3275429307 .background-color-B3{background-color:#E3E9FD;} + .d2-3275429307 .background-color-B4{background-color:#E3E9FD;} + .d2-3275429307 .background-color-B5{background-color:#EDF0FD;} + .d2-3275429307 .background-color-B6{background-color:#F7F8FE;} + .d2-3275429307 .background-color-AA2{background-color:#4A6FF3;} + .d2-3275429307 .background-color-AA4{background-color:#EDF0FD;} + .d2-3275429307 .background-color-AA5{background-color:#F7F8FE;} + .d2-3275429307 .background-color-AB4{background-color:#EDF0FD;} + .d2-3275429307 .background-color-AB5{background-color:#F7F8FE;} + .d2-3275429307 .color-N1{color:#0A0F25;} + .d2-3275429307 .color-N2{color:#676C7E;} + .d2-3275429307 .color-N3{color:#9499AB;} + .d2-3275429307 .color-N4{color:#CFD2DD;} + .d2-3275429307 .color-N5{color:#DEE1EB;} + .d2-3275429307 .color-N6{color:#EEF1F8;} + .d2-3275429307 .color-N7{color:#FFFFFF;} + .d2-3275429307 .color-B1{color:#0D32B2;} + .d2-3275429307 .color-B2{color:#0D32B2;} + .d2-3275429307 .color-B3{color:#E3E9FD;} + .d2-3275429307 .color-B4{color:#E3E9FD;} + .d2-3275429307 .color-B5{color:#EDF0FD;} + .d2-3275429307 .color-B6{color:#F7F8FE;} + .d2-3275429307 .color-AA2{color:#4A6FF3;} + .d2-3275429307 .color-AA4{color:#EDF0FD;} + .d2-3275429307 .color-AA5{color:#F7F8FE;} + .d2-3275429307 .color-AB4{color:#EDF0FD;} + .d2-3275429307 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3275429307);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3275429307);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3275429307);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3275429307);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3275429307);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3275429307);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3275429307);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3275429307);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3275429307);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3275429307);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3275429307);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3275429307);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3275429307);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3275429307);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3275429307);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3275429307);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3275429307);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3275429307);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>outerinner - - + + \ No newline at end of file diff --git a/e2etests/testdata/regression/empty_nested_grid/elk/board.exp.json b/e2etests/testdata/regression/empty_nested_grid/elk/board.exp.json index 0489c2b35..c4ff98acf 100644 --- a/e2etests/testdata/regression/empty_nested_grid/elk/board.exp.json +++ b/e2etests/testdata/regression/empty_nested_grid/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -102,6 +112,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/empty_nested_grid/elk/sketch.exp.svg b/e2etests/testdata/regression/empty_nested_grid/elk/sketch.exp.svg index 54c0cad6f..ebe965765 100644 --- a/e2etests/testdata/regression/empty_nested_grid/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/empty_nested_grid/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -outerinner + .d2-3284967005 .fill-N1{fill:#0A0F25;} + .d2-3284967005 .fill-N2{fill:#676C7E;} + .d2-3284967005 .fill-N3{fill:#9499AB;} + .d2-3284967005 .fill-N4{fill:#CFD2DD;} + .d2-3284967005 .fill-N5{fill:#DEE1EB;} + .d2-3284967005 .fill-N6{fill:#EEF1F8;} + .d2-3284967005 .fill-N7{fill:#FFFFFF;} + .d2-3284967005 .fill-B1{fill:#0D32B2;} + .d2-3284967005 .fill-B2{fill:#0D32B2;} + .d2-3284967005 .fill-B3{fill:#E3E9FD;} + .d2-3284967005 .fill-B4{fill:#E3E9FD;} + .d2-3284967005 .fill-B5{fill:#EDF0FD;} + .d2-3284967005 .fill-B6{fill:#F7F8FE;} + .d2-3284967005 .fill-AA2{fill:#4A6FF3;} + .d2-3284967005 .fill-AA4{fill:#EDF0FD;} + .d2-3284967005 .fill-AA5{fill:#F7F8FE;} + .d2-3284967005 .fill-AB4{fill:#EDF0FD;} + .d2-3284967005 .fill-AB5{fill:#F7F8FE;} + .d2-3284967005 .stroke-N1{stroke:#0A0F25;} + .d2-3284967005 .stroke-N2{stroke:#676C7E;} + .d2-3284967005 .stroke-N3{stroke:#9499AB;} + .d2-3284967005 .stroke-N4{stroke:#CFD2DD;} + .d2-3284967005 .stroke-N5{stroke:#DEE1EB;} + .d2-3284967005 .stroke-N6{stroke:#EEF1F8;} + .d2-3284967005 .stroke-N7{stroke:#FFFFFF;} + .d2-3284967005 .stroke-B1{stroke:#0D32B2;} + .d2-3284967005 .stroke-B2{stroke:#0D32B2;} + .d2-3284967005 .stroke-B3{stroke:#E3E9FD;} + .d2-3284967005 .stroke-B4{stroke:#E3E9FD;} + .d2-3284967005 .stroke-B5{stroke:#EDF0FD;} + .d2-3284967005 .stroke-B6{stroke:#F7F8FE;} + .d2-3284967005 .stroke-AA2{stroke:#4A6FF3;} + .d2-3284967005 .stroke-AA4{stroke:#EDF0FD;} + .d2-3284967005 .stroke-AA5{stroke:#F7F8FE;} + .d2-3284967005 .stroke-AB4{stroke:#EDF0FD;} + .d2-3284967005 .stroke-AB5{stroke:#F7F8FE;} + .d2-3284967005 .background-color-N1{background-color:#0A0F25;} + .d2-3284967005 .background-color-N2{background-color:#676C7E;} + .d2-3284967005 .background-color-N3{background-color:#9499AB;} + .d2-3284967005 .background-color-N4{background-color:#CFD2DD;} + .d2-3284967005 .background-color-N5{background-color:#DEE1EB;} + .d2-3284967005 .background-color-N6{background-color:#EEF1F8;} + .d2-3284967005 .background-color-N7{background-color:#FFFFFF;} + .d2-3284967005 .background-color-B1{background-color:#0D32B2;} + .d2-3284967005 .background-color-B2{background-color:#0D32B2;} + .d2-3284967005 .background-color-B3{background-color:#E3E9FD;} + .d2-3284967005 .background-color-B4{background-color:#E3E9FD;} + .d2-3284967005 .background-color-B5{background-color:#EDF0FD;} + .d2-3284967005 .background-color-B6{background-color:#F7F8FE;} + .d2-3284967005 .background-color-AA2{background-color:#4A6FF3;} + .d2-3284967005 .background-color-AA4{background-color:#EDF0FD;} + .d2-3284967005 .background-color-AA5{background-color:#F7F8FE;} + .d2-3284967005 .background-color-AB4{background-color:#EDF0FD;} + .d2-3284967005 .background-color-AB5{background-color:#F7F8FE;} + .d2-3284967005 .color-N1{color:#0A0F25;} + .d2-3284967005 .color-N2{color:#676C7E;} + .d2-3284967005 .color-N3{color:#9499AB;} + .d2-3284967005 .color-N4{color:#CFD2DD;} + .d2-3284967005 .color-N5{color:#DEE1EB;} + .d2-3284967005 .color-N6{color:#EEF1F8;} + .d2-3284967005 .color-N7{color:#FFFFFF;} + .d2-3284967005 .color-B1{color:#0D32B2;} + .d2-3284967005 .color-B2{color:#0D32B2;} + .d2-3284967005 .color-B3{color:#E3E9FD;} + .d2-3284967005 .color-B4{color:#E3E9FD;} + .d2-3284967005 .color-B5{color:#EDF0FD;} + .d2-3284967005 .color-B6{color:#F7F8FE;} + .d2-3284967005 .color-AA2{color:#4A6FF3;} + .d2-3284967005 .color-AA4{color:#EDF0FD;} + .d2-3284967005 .color-AA5{color:#F7F8FE;} + .d2-3284967005 .color-AB4{color:#EDF0FD;} + .d2-3284967005 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3284967005);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3284967005);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3284967005);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3284967005);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3284967005);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3284967005);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3284967005);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3284967005);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3284967005);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3284967005);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3284967005);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3284967005);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3284967005);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3284967005);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3284967005);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3284967005);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3284967005);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3284967005);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>outerinner - - + + \ No newline at end of file diff --git a/e2etests/testdata/regression/empty_sequence/dagre/board.exp.json b/e2etests/testdata/regression/empty_sequence/dagre/board.exp.json index f532c14a2..e45407459 100644 --- a/e2etests/testdata/regression/empty_sequence/dagre/board.exp.json +++ b/e2etests/testdata/regression/empty_sequence/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -110,6 +120,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 53, @@ -150,6 +161,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/empty_sequence/dagre/sketch.exp.svg b/e2etests/testdata/regression/empty_sequence/dagre/sketch.exp.svg index eeb5e2280..cc578be72 100644 --- a/e2etests/testdata/regression/empty_sequence/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/empty_sequence/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -hellogoodbye + .d2-2471515894 .fill-N1{fill:#0A0F25;} + .d2-2471515894 .fill-N2{fill:#676C7E;} + .d2-2471515894 .fill-N3{fill:#9499AB;} + .d2-2471515894 .fill-N4{fill:#CFD2DD;} + .d2-2471515894 .fill-N5{fill:#DEE1EB;} + .d2-2471515894 .fill-N6{fill:#EEF1F8;} + .d2-2471515894 .fill-N7{fill:#FFFFFF;} + .d2-2471515894 .fill-B1{fill:#0D32B2;} + .d2-2471515894 .fill-B2{fill:#0D32B2;} + .d2-2471515894 .fill-B3{fill:#E3E9FD;} + .d2-2471515894 .fill-B4{fill:#E3E9FD;} + .d2-2471515894 .fill-B5{fill:#EDF0FD;} + .d2-2471515894 .fill-B6{fill:#F7F8FE;} + .d2-2471515894 .fill-AA2{fill:#4A6FF3;} + .d2-2471515894 .fill-AA4{fill:#EDF0FD;} + .d2-2471515894 .fill-AA5{fill:#F7F8FE;} + .d2-2471515894 .fill-AB4{fill:#EDF0FD;} + .d2-2471515894 .fill-AB5{fill:#F7F8FE;} + .d2-2471515894 .stroke-N1{stroke:#0A0F25;} + .d2-2471515894 .stroke-N2{stroke:#676C7E;} + .d2-2471515894 .stroke-N3{stroke:#9499AB;} + .d2-2471515894 .stroke-N4{stroke:#CFD2DD;} + .d2-2471515894 .stroke-N5{stroke:#DEE1EB;} + .d2-2471515894 .stroke-N6{stroke:#EEF1F8;} + .d2-2471515894 .stroke-N7{stroke:#FFFFFF;} + .d2-2471515894 .stroke-B1{stroke:#0D32B2;} + .d2-2471515894 .stroke-B2{stroke:#0D32B2;} + .d2-2471515894 .stroke-B3{stroke:#E3E9FD;} + .d2-2471515894 .stroke-B4{stroke:#E3E9FD;} + .d2-2471515894 .stroke-B5{stroke:#EDF0FD;} + .d2-2471515894 .stroke-B6{stroke:#F7F8FE;} + .d2-2471515894 .stroke-AA2{stroke:#4A6FF3;} + .d2-2471515894 .stroke-AA4{stroke:#EDF0FD;} + .d2-2471515894 .stroke-AA5{stroke:#F7F8FE;} + .d2-2471515894 .stroke-AB4{stroke:#EDF0FD;} + .d2-2471515894 .stroke-AB5{stroke:#F7F8FE;} + .d2-2471515894 .background-color-N1{background-color:#0A0F25;} + .d2-2471515894 .background-color-N2{background-color:#676C7E;} + .d2-2471515894 .background-color-N3{background-color:#9499AB;} + .d2-2471515894 .background-color-N4{background-color:#CFD2DD;} + .d2-2471515894 .background-color-N5{background-color:#DEE1EB;} + .d2-2471515894 .background-color-N6{background-color:#EEF1F8;} + .d2-2471515894 .background-color-N7{background-color:#FFFFFF;} + .d2-2471515894 .background-color-B1{background-color:#0D32B2;} + .d2-2471515894 .background-color-B2{background-color:#0D32B2;} + .d2-2471515894 .background-color-B3{background-color:#E3E9FD;} + .d2-2471515894 .background-color-B4{background-color:#E3E9FD;} + .d2-2471515894 .background-color-B5{background-color:#EDF0FD;} + .d2-2471515894 .background-color-B6{background-color:#F7F8FE;} + .d2-2471515894 .background-color-AA2{background-color:#4A6FF3;} + .d2-2471515894 .background-color-AA4{background-color:#EDF0FD;} + .d2-2471515894 .background-color-AA5{background-color:#F7F8FE;} + .d2-2471515894 .background-color-AB4{background-color:#EDF0FD;} + .d2-2471515894 .background-color-AB5{background-color:#F7F8FE;} + .d2-2471515894 .color-N1{color:#0A0F25;} + .d2-2471515894 .color-N2{color:#676C7E;} + .d2-2471515894 .color-N3{color:#9499AB;} + .d2-2471515894 .color-N4{color:#CFD2DD;} + .d2-2471515894 .color-N5{color:#DEE1EB;} + .d2-2471515894 .color-N6{color:#EEF1F8;} + .d2-2471515894 .color-N7{color:#FFFFFF;} + .d2-2471515894 .color-B1{color:#0D32B2;} + .d2-2471515894 .color-B2{color:#0D32B2;} + .d2-2471515894 .color-B3{color:#E3E9FD;} + .d2-2471515894 .color-B4{color:#E3E9FD;} + .d2-2471515894 .color-B5{color:#EDF0FD;} + .d2-2471515894 .color-B6{color:#F7F8FE;} + .d2-2471515894 .color-AA2{color:#4A6FF3;} + .d2-2471515894 .color-AA4{color:#EDF0FD;} + .d2-2471515894 .color-AA5{color:#F7F8FE;} + .d2-2471515894 .color-AB4{color:#EDF0FD;} + .d2-2471515894 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2471515894);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2471515894);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2471515894);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2471515894);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2471515894);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2471515894);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2471515894);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2471515894);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2471515894);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2471515894);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2471515894);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2471515894);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2471515894);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2471515894);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2471515894);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2471515894);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2471515894);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2471515894);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>hellogoodbye - - + + \ No newline at end of file diff --git a/e2etests/testdata/regression/empty_sequence/elk/board.exp.json b/e2etests/testdata/regression/empty_sequence/elk/board.exp.json index 8a6ec72b4..757623eb8 100644 --- a/e2etests/testdata/regression/empty_sequence/elk/board.exp.json +++ b/e2etests/testdata/regression/empty_sequence/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -110,6 +120,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 65, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/empty_sequence/elk/sketch.exp.svg b/e2etests/testdata/regression/empty_sequence/elk/sketch.exp.svg index b3b7a0f9d..37d3ee97d 100644 --- a/e2etests/testdata/regression/empty_sequence/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/empty_sequence/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -hellogoodbye + .d2-3413671631 .fill-N1{fill:#0A0F25;} + .d2-3413671631 .fill-N2{fill:#676C7E;} + .d2-3413671631 .fill-N3{fill:#9499AB;} + .d2-3413671631 .fill-N4{fill:#CFD2DD;} + .d2-3413671631 .fill-N5{fill:#DEE1EB;} + .d2-3413671631 .fill-N6{fill:#EEF1F8;} + .d2-3413671631 .fill-N7{fill:#FFFFFF;} + .d2-3413671631 .fill-B1{fill:#0D32B2;} + .d2-3413671631 .fill-B2{fill:#0D32B2;} + .d2-3413671631 .fill-B3{fill:#E3E9FD;} + .d2-3413671631 .fill-B4{fill:#E3E9FD;} + .d2-3413671631 .fill-B5{fill:#EDF0FD;} + .d2-3413671631 .fill-B6{fill:#F7F8FE;} + .d2-3413671631 .fill-AA2{fill:#4A6FF3;} + .d2-3413671631 .fill-AA4{fill:#EDF0FD;} + .d2-3413671631 .fill-AA5{fill:#F7F8FE;} + .d2-3413671631 .fill-AB4{fill:#EDF0FD;} + .d2-3413671631 .fill-AB5{fill:#F7F8FE;} + .d2-3413671631 .stroke-N1{stroke:#0A0F25;} + .d2-3413671631 .stroke-N2{stroke:#676C7E;} + .d2-3413671631 .stroke-N3{stroke:#9499AB;} + .d2-3413671631 .stroke-N4{stroke:#CFD2DD;} + .d2-3413671631 .stroke-N5{stroke:#DEE1EB;} + .d2-3413671631 .stroke-N6{stroke:#EEF1F8;} + .d2-3413671631 .stroke-N7{stroke:#FFFFFF;} + .d2-3413671631 .stroke-B1{stroke:#0D32B2;} + .d2-3413671631 .stroke-B2{stroke:#0D32B2;} + .d2-3413671631 .stroke-B3{stroke:#E3E9FD;} + .d2-3413671631 .stroke-B4{stroke:#E3E9FD;} + .d2-3413671631 .stroke-B5{stroke:#EDF0FD;} + .d2-3413671631 .stroke-B6{stroke:#F7F8FE;} + .d2-3413671631 .stroke-AA2{stroke:#4A6FF3;} + .d2-3413671631 .stroke-AA4{stroke:#EDF0FD;} + .d2-3413671631 .stroke-AA5{stroke:#F7F8FE;} + .d2-3413671631 .stroke-AB4{stroke:#EDF0FD;} + .d2-3413671631 .stroke-AB5{stroke:#F7F8FE;} + .d2-3413671631 .background-color-N1{background-color:#0A0F25;} + .d2-3413671631 .background-color-N2{background-color:#676C7E;} + .d2-3413671631 .background-color-N3{background-color:#9499AB;} + .d2-3413671631 .background-color-N4{background-color:#CFD2DD;} + .d2-3413671631 .background-color-N5{background-color:#DEE1EB;} + .d2-3413671631 .background-color-N6{background-color:#EEF1F8;} + .d2-3413671631 .background-color-N7{background-color:#FFFFFF;} + .d2-3413671631 .background-color-B1{background-color:#0D32B2;} + .d2-3413671631 .background-color-B2{background-color:#0D32B2;} + .d2-3413671631 .background-color-B3{background-color:#E3E9FD;} + .d2-3413671631 .background-color-B4{background-color:#E3E9FD;} + .d2-3413671631 .background-color-B5{background-color:#EDF0FD;} + .d2-3413671631 .background-color-B6{background-color:#F7F8FE;} + .d2-3413671631 .background-color-AA2{background-color:#4A6FF3;} + .d2-3413671631 .background-color-AA4{background-color:#EDF0FD;} + .d2-3413671631 .background-color-AA5{background-color:#F7F8FE;} + .d2-3413671631 .background-color-AB4{background-color:#EDF0FD;} + .d2-3413671631 .background-color-AB5{background-color:#F7F8FE;} + .d2-3413671631 .color-N1{color:#0A0F25;} + .d2-3413671631 .color-N2{color:#676C7E;} + .d2-3413671631 .color-N3{color:#9499AB;} + .d2-3413671631 .color-N4{color:#CFD2DD;} + .d2-3413671631 .color-N5{color:#DEE1EB;} + .d2-3413671631 .color-N6{color:#EEF1F8;} + .d2-3413671631 .color-N7{color:#FFFFFF;} + .d2-3413671631 .color-B1{color:#0D32B2;} + .d2-3413671631 .color-B2{color:#0D32B2;} + .d2-3413671631 .color-B3{color:#E3E9FD;} + .d2-3413671631 .color-B4{color:#E3E9FD;} + .d2-3413671631 .color-B5{color:#EDF0FD;} + .d2-3413671631 .color-B6{color:#F7F8FE;} + .d2-3413671631 .color-AA2{color:#4A6FF3;} + .d2-3413671631 .color-AA4{color:#EDF0FD;} + .d2-3413671631 .color-AA5{color:#F7F8FE;} + .d2-3413671631 .color-AB4{color:#EDF0FD;} + .d2-3413671631 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3413671631);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3413671631);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3413671631);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3413671631);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3413671631);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3413671631);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3413671631);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3413671631);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3413671631);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3413671631);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3413671631);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3413671631);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3413671631);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3413671631);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3413671631);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3413671631);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3413671631);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3413671631);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>hellogoodbye - - + + \ No newline at end of file diff --git a/e2etests/testdata/regression/glob_dimensions/dagre/board.exp.json b/e2etests/testdata/regression/glob_dimensions/dagre/board.exp.json index d16374a7f..09701fc2c 100644 --- a/e2etests/testdata/regression/glob_dimensions/dagre/board.exp.json +++ b/e2etests/testdata/regression/glob_dimensions/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 16, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 16, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 16, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 16, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 16, "fill": "N4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -222,6 +235,7 @@ "borderRadius": 16, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -263,6 +277,7 @@ "borderRadius": 16, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -304,6 +319,7 @@ "borderRadius": 16, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -345,6 +361,7 @@ "borderRadius": 16, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -396,6 +413,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 153, @@ -443,6 +461,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 153, @@ -490,6 +509,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 127.75, @@ -537,6 +557,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 158, @@ -584,6 +605,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 153, @@ -631,6 +653,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 212.75, @@ -678,6 +701,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 233.5, @@ -725,6 +749,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 67.75, @@ -808,6 +833,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 192, @@ -867,6 +893,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 271.5, @@ -907,6 +934,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/glob_dimensions/dagre/sketch.exp.svg b/e2etests/testdata/regression/glob_dimensions/dagre/sketch.exp.svg index 49ce6faef..58e395c3c 100644 --- a/e2etests/testdata/regression/glob_dimensions/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/glob_dimensions/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -⬤Check PINSearch NetworkReadyOff⬤Enter PIN⬤ /check PIN[pin invalid][pin OK][pin OK]network foundpower offpower offpower off + .d2-3874627584 .fill-N1{fill:#0A0F25;} + .d2-3874627584 .fill-N2{fill:#676C7E;} + .d2-3874627584 .fill-N3{fill:#9499AB;} + .d2-3874627584 .fill-N4{fill:#CFD2DD;} + .d2-3874627584 .fill-N5{fill:#DEE1EB;} + .d2-3874627584 .fill-N6{fill:#EEF1F8;} + .d2-3874627584 .fill-N7{fill:#FFFFFF;} + .d2-3874627584 .fill-B1{fill:#0D32B2;} + .d2-3874627584 .fill-B2{fill:#0D32B2;} + .d2-3874627584 .fill-B3{fill:#E3E9FD;} + .d2-3874627584 .fill-B4{fill:#E3E9FD;} + .d2-3874627584 .fill-B5{fill:#EDF0FD;} + .d2-3874627584 .fill-B6{fill:#F7F8FE;} + .d2-3874627584 .fill-AA2{fill:#4A6FF3;} + .d2-3874627584 .fill-AA4{fill:#EDF0FD;} + .d2-3874627584 .fill-AA5{fill:#F7F8FE;} + .d2-3874627584 .fill-AB4{fill:#EDF0FD;} + .d2-3874627584 .fill-AB5{fill:#F7F8FE;} + .d2-3874627584 .stroke-N1{stroke:#0A0F25;} + .d2-3874627584 .stroke-N2{stroke:#676C7E;} + .d2-3874627584 .stroke-N3{stroke:#9499AB;} + .d2-3874627584 .stroke-N4{stroke:#CFD2DD;} + .d2-3874627584 .stroke-N5{stroke:#DEE1EB;} + .d2-3874627584 .stroke-N6{stroke:#EEF1F8;} + .d2-3874627584 .stroke-N7{stroke:#FFFFFF;} + .d2-3874627584 .stroke-B1{stroke:#0D32B2;} + .d2-3874627584 .stroke-B2{stroke:#0D32B2;} + .d2-3874627584 .stroke-B3{stroke:#E3E9FD;} + .d2-3874627584 .stroke-B4{stroke:#E3E9FD;} + .d2-3874627584 .stroke-B5{stroke:#EDF0FD;} + .d2-3874627584 .stroke-B6{stroke:#F7F8FE;} + .d2-3874627584 .stroke-AA2{stroke:#4A6FF3;} + .d2-3874627584 .stroke-AA4{stroke:#EDF0FD;} + .d2-3874627584 .stroke-AA5{stroke:#F7F8FE;} + .d2-3874627584 .stroke-AB4{stroke:#EDF0FD;} + .d2-3874627584 .stroke-AB5{stroke:#F7F8FE;} + .d2-3874627584 .background-color-N1{background-color:#0A0F25;} + .d2-3874627584 .background-color-N2{background-color:#676C7E;} + .d2-3874627584 .background-color-N3{background-color:#9499AB;} + .d2-3874627584 .background-color-N4{background-color:#CFD2DD;} + .d2-3874627584 .background-color-N5{background-color:#DEE1EB;} + .d2-3874627584 .background-color-N6{background-color:#EEF1F8;} + .d2-3874627584 .background-color-N7{background-color:#FFFFFF;} + .d2-3874627584 .background-color-B1{background-color:#0D32B2;} + .d2-3874627584 .background-color-B2{background-color:#0D32B2;} + .d2-3874627584 .background-color-B3{background-color:#E3E9FD;} + .d2-3874627584 .background-color-B4{background-color:#E3E9FD;} + .d2-3874627584 .background-color-B5{background-color:#EDF0FD;} + .d2-3874627584 .background-color-B6{background-color:#F7F8FE;} + .d2-3874627584 .background-color-AA2{background-color:#4A6FF3;} + .d2-3874627584 .background-color-AA4{background-color:#EDF0FD;} + .d2-3874627584 .background-color-AA5{background-color:#F7F8FE;} + .d2-3874627584 .background-color-AB4{background-color:#EDF0FD;} + .d2-3874627584 .background-color-AB5{background-color:#F7F8FE;} + .d2-3874627584 .color-N1{color:#0A0F25;} + .d2-3874627584 .color-N2{color:#676C7E;} + .d2-3874627584 .color-N3{color:#9499AB;} + .d2-3874627584 .color-N4{color:#CFD2DD;} + .d2-3874627584 .color-N5{color:#DEE1EB;} + .d2-3874627584 .color-N6{color:#EEF1F8;} + .d2-3874627584 .color-N7{color:#FFFFFF;} + .d2-3874627584 .color-B1{color:#0D32B2;} + .d2-3874627584 .color-B2{color:#0D32B2;} + .d2-3874627584 .color-B3{color:#E3E9FD;} + .d2-3874627584 .color-B4{color:#E3E9FD;} + .d2-3874627584 .color-B5{color:#EDF0FD;} + .d2-3874627584 .color-B6{color:#F7F8FE;} + .d2-3874627584 .color-AA2{color:#4A6FF3;} + .d2-3874627584 .color-AA4{color:#EDF0FD;} + .d2-3874627584 .color-AA5{color:#F7F8FE;} + .d2-3874627584 .color-AB4{color:#EDF0FD;} + .d2-3874627584 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3874627584);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3874627584);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3874627584);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3874627584);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3874627584);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3874627584);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3874627584);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3874627584);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3874627584);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3874627584);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3874627584);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3874627584);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3874627584);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3874627584);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3874627584);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3874627584);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3874627584);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3874627584);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>⬤Check PINSearch NetworkReadyOff⬤Enter PIN⬤ /check PIN[pin invalid][pin OK][pin OK]network foundpower offpower offpower off - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/glob_dimensions/elk/board.exp.json b/e2etests/testdata/regression/glob_dimensions/elk/board.exp.json index d6f22abdc..8ae604821 100644 --- a/e2etests/testdata/regression/glob_dimensions/elk/board.exp.json +++ b/e2etests/testdata/regression/glob_dimensions/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 16, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 16, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 16, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 16, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 16, "fill": "N4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -222,6 +235,7 @@ "borderRadius": 16, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -263,6 +277,7 @@ "borderRadius": 16, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -304,6 +319,7 @@ "borderRadius": 16, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -345,6 +361,7 @@ "borderRadius": 16, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -396,6 +413,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 169, @@ -434,6 +452,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 167, @@ -472,6 +491,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 123.5, @@ -518,6 +538,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 170, @@ -564,6 +585,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 166, @@ -602,6 +624,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 108.75, @@ -640,6 +663,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 60, @@ -678,6 +702,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 240.99899291992188, @@ -724,6 +749,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 157.5, @@ -762,6 +788,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 60, @@ -801,6 +828,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/glob_dimensions/elk/sketch.exp.svg b/e2etests/testdata/regression/glob_dimensions/elk/sketch.exp.svg index 1235890ed..f4ce54eea 100644 --- a/e2etests/testdata/regression/glob_dimensions/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/glob_dimensions/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -⬤Check PINSearch NetworkReadyOff⬤Enter PIN⬤ /check PIN[pin invalid][pin OK][pin OK]network foundpower offpower offpower off + .d2-498307487 .fill-N1{fill:#0A0F25;} + .d2-498307487 .fill-N2{fill:#676C7E;} + .d2-498307487 .fill-N3{fill:#9499AB;} + .d2-498307487 .fill-N4{fill:#CFD2DD;} + .d2-498307487 .fill-N5{fill:#DEE1EB;} + .d2-498307487 .fill-N6{fill:#EEF1F8;} + .d2-498307487 .fill-N7{fill:#FFFFFF;} + .d2-498307487 .fill-B1{fill:#0D32B2;} + .d2-498307487 .fill-B2{fill:#0D32B2;} + .d2-498307487 .fill-B3{fill:#E3E9FD;} + .d2-498307487 .fill-B4{fill:#E3E9FD;} + .d2-498307487 .fill-B5{fill:#EDF0FD;} + .d2-498307487 .fill-B6{fill:#F7F8FE;} + .d2-498307487 .fill-AA2{fill:#4A6FF3;} + .d2-498307487 .fill-AA4{fill:#EDF0FD;} + .d2-498307487 .fill-AA5{fill:#F7F8FE;} + .d2-498307487 .fill-AB4{fill:#EDF0FD;} + .d2-498307487 .fill-AB5{fill:#F7F8FE;} + .d2-498307487 .stroke-N1{stroke:#0A0F25;} + .d2-498307487 .stroke-N2{stroke:#676C7E;} + .d2-498307487 .stroke-N3{stroke:#9499AB;} + .d2-498307487 .stroke-N4{stroke:#CFD2DD;} + .d2-498307487 .stroke-N5{stroke:#DEE1EB;} + .d2-498307487 .stroke-N6{stroke:#EEF1F8;} + .d2-498307487 .stroke-N7{stroke:#FFFFFF;} + .d2-498307487 .stroke-B1{stroke:#0D32B2;} + .d2-498307487 .stroke-B2{stroke:#0D32B2;} + .d2-498307487 .stroke-B3{stroke:#E3E9FD;} + .d2-498307487 .stroke-B4{stroke:#E3E9FD;} + .d2-498307487 .stroke-B5{stroke:#EDF0FD;} + .d2-498307487 .stroke-B6{stroke:#F7F8FE;} + .d2-498307487 .stroke-AA2{stroke:#4A6FF3;} + .d2-498307487 .stroke-AA4{stroke:#EDF0FD;} + .d2-498307487 .stroke-AA5{stroke:#F7F8FE;} + .d2-498307487 .stroke-AB4{stroke:#EDF0FD;} + .d2-498307487 .stroke-AB5{stroke:#F7F8FE;} + .d2-498307487 .background-color-N1{background-color:#0A0F25;} + .d2-498307487 .background-color-N2{background-color:#676C7E;} + .d2-498307487 .background-color-N3{background-color:#9499AB;} + .d2-498307487 .background-color-N4{background-color:#CFD2DD;} + .d2-498307487 .background-color-N5{background-color:#DEE1EB;} + .d2-498307487 .background-color-N6{background-color:#EEF1F8;} + .d2-498307487 .background-color-N7{background-color:#FFFFFF;} + .d2-498307487 .background-color-B1{background-color:#0D32B2;} + .d2-498307487 .background-color-B2{background-color:#0D32B2;} + .d2-498307487 .background-color-B3{background-color:#E3E9FD;} + .d2-498307487 .background-color-B4{background-color:#E3E9FD;} + .d2-498307487 .background-color-B5{background-color:#EDF0FD;} + .d2-498307487 .background-color-B6{background-color:#F7F8FE;} + .d2-498307487 .background-color-AA2{background-color:#4A6FF3;} + .d2-498307487 .background-color-AA4{background-color:#EDF0FD;} + .d2-498307487 .background-color-AA5{background-color:#F7F8FE;} + .d2-498307487 .background-color-AB4{background-color:#EDF0FD;} + .d2-498307487 .background-color-AB5{background-color:#F7F8FE;} + .d2-498307487 .color-N1{color:#0A0F25;} + .d2-498307487 .color-N2{color:#676C7E;} + .d2-498307487 .color-N3{color:#9499AB;} + .d2-498307487 .color-N4{color:#CFD2DD;} + .d2-498307487 .color-N5{color:#DEE1EB;} + .d2-498307487 .color-N6{color:#EEF1F8;} + .d2-498307487 .color-N7{color:#FFFFFF;} + .d2-498307487 .color-B1{color:#0D32B2;} + .d2-498307487 .color-B2{color:#0D32B2;} + .d2-498307487 .color-B3{color:#E3E9FD;} + .d2-498307487 .color-B4{color:#E3E9FD;} + .d2-498307487 .color-B5{color:#EDF0FD;} + .d2-498307487 .color-B6{color:#F7F8FE;} + .d2-498307487 .color-AA2{color:#4A6FF3;} + .d2-498307487 .color-AA4{color:#EDF0FD;} + .d2-498307487 .color-AA5{color:#F7F8FE;} + .d2-498307487 .color-AB4{color:#EDF0FD;} + .d2-498307487 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-498307487);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-498307487);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-498307487);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-498307487);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-498307487);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-498307487);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-498307487);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-498307487);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-498307487);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-498307487);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-498307487);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-498307487);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-498307487);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-498307487);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-498307487);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-498307487);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-498307487);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-498307487);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>⬤Check PINSearch NetworkReadyOff⬤Enter PIN⬤ /check PIN[pin invalid][pin OK][pin OK]network foundpower offpower offpower off - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/grid_image_label_position/dagre/board.exp.json b/e2etests/testdata/regression/grid_image_label_position/dagre/board.exp.json index c16fbfbde..971d671b3 100644 --- a/e2etests/testdata/regression/grid_image_label_position/dagre/board.exp.json +++ b/e2etests/testdata/regression/grid_image_label_position/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -112,6 +122,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -165,6 +176,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -218,6 +230,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -273,6 +286,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/grid_image_label_position/dagre/sketch.exp.svg b/e2etests/testdata/regression/grid_image_label_position/dagre/sketch.exp.svg index a3dd854ed..45b9b8a9b 100644 --- a/e2etests/testdata/regression/grid_image_label_position/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/grid_image_label_position/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -Processingstream processorstreaming database12345678910111213141516streaming database + .d2-167525458 .fill-N1{fill:#0A0F25;} + .d2-167525458 .fill-N2{fill:#676C7E;} + .d2-167525458 .fill-N3{fill:#9499AB;} + .d2-167525458 .fill-N4{fill:#CFD2DD;} + .d2-167525458 .fill-N5{fill:#DEE1EB;} + .d2-167525458 .fill-N6{fill:#EEF1F8;} + .d2-167525458 .fill-N7{fill:#FFFFFF;} + .d2-167525458 .fill-B1{fill:#0D32B2;} + .d2-167525458 .fill-B2{fill:#0D32B2;} + .d2-167525458 .fill-B3{fill:#E3E9FD;} + .d2-167525458 .fill-B4{fill:#E3E9FD;} + .d2-167525458 .fill-B5{fill:#EDF0FD;} + .d2-167525458 .fill-B6{fill:#F7F8FE;} + .d2-167525458 .fill-AA2{fill:#4A6FF3;} + .d2-167525458 .fill-AA4{fill:#EDF0FD;} + .d2-167525458 .fill-AA5{fill:#F7F8FE;} + .d2-167525458 .fill-AB4{fill:#EDF0FD;} + .d2-167525458 .fill-AB5{fill:#F7F8FE;} + .d2-167525458 .stroke-N1{stroke:#0A0F25;} + .d2-167525458 .stroke-N2{stroke:#676C7E;} + .d2-167525458 .stroke-N3{stroke:#9499AB;} + .d2-167525458 .stroke-N4{stroke:#CFD2DD;} + .d2-167525458 .stroke-N5{stroke:#DEE1EB;} + .d2-167525458 .stroke-N6{stroke:#EEF1F8;} + .d2-167525458 .stroke-N7{stroke:#FFFFFF;} + .d2-167525458 .stroke-B1{stroke:#0D32B2;} + .d2-167525458 .stroke-B2{stroke:#0D32B2;} + .d2-167525458 .stroke-B3{stroke:#E3E9FD;} + .d2-167525458 .stroke-B4{stroke:#E3E9FD;} + .d2-167525458 .stroke-B5{stroke:#EDF0FD;} + .d2-167525458 .stroke-B6{stroke:#F7F8FE;} + .d2-167525458 .stroke-AA2{stroke:#4A6FF3;} + .d2-167525458 .stroke-AA4{stroke:#EDF0FD;} + .d2-167525458 .stroke-AA5{stroke:#F7F8FE;} + .d2-167525458 .stroke-AB4{stroke:#EDF0FD;} + .d2-167525458 .stroke-AB5{stroke:#F7F8FE;} + .d2-167525458 .background-color-N1{background-color:#0A0F25;} + .d2-167525458 .background-color-N2{background-color:#676C7E;} + .d2-167525458 .background-color-N3{background-color:#9499AB;} + .d2-167525458 .background-color-N4{background-color:#CFD2DD;} + .d2-167525458 .background-color-N5{background-color:#DEE1EB;} + .d2-167525458 .background-color-N6{background-color:#EEF1F8;} + .d2-167525458 .background-color-N7{background-color:#FFFFFF;} + .d2-167525458 .background-color-B1{background-color:#0D32B2;} + .d2-167525458 .background-color-B2{background-color:#0D32B2;} + .d2-167525458 .background-color-B3{background-color:#E3E9FD;} + .d2-167525458 .background-color-B4{background-color:#E3E9FD;} + .d2-167525458 .background-color-B5{background-color:#EDF0FD;} + .d2-167525458 .background-color-B6{background-color:#F7F8FE;} + .d2-167525458 .background-color-AA2{background-color:#4A6FF3;} + .d2-167525458 .background-color-AA4{background-color:#EDF0FD;} + .d2-167525458 .background-color-AA5{background-color:#F7F8FE;} + .d2-167525458 .background-color-AB4{background-color:#EDF0FD;} + .d2-167525458 .background-color-AB5{background-color:#F7F8FE;} + .d2-167525458 .color-N1{color:#0A0F25;} + .d2-167525458 .color-N2{color:#676C7E;} + .d2-167525458 .color-N3{color:#9499AB;} + .d2-167525458 .color-N4{color:#CFD2DD;} + .d2-167525458 .color-N5{color:#DEE1EB;} + .d2-167525458 .color-N6{color:#EEF1F8;} + .d2-167525458 .color-N7{color:#FFFFFF;} + .d2-167525458 .color-B1{color:#0D32B2;} + .d2-167525458 .color-B2{color:#0D32B2;} + .d2-167525458 .color-B3{color:#E3E9FD;} + .d2-167525458 .color-B4{color:#E3E9FD;} + .d2-167525458 .color-B5{color:#EDF0FD;} + .d2-167525458 .color-B6{color:#F7F8FE;} + .d2-167525458 .color-AA2{color:#4A6FF3;} + .d2-167525458 .color-AA4{color:#EDF0FD;} + .d2-167525458 .color-AA5{color:#F7F8FE;} + .d2-167525458 .color-AB4{color:#EDF0FD;} + .d2-167525458 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-167525458);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-167525458);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-167525458);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-167525458);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-167525458);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-167525458);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-167525458);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-167525458);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-167525458);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-167525458);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-167525458);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-167525458);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-167525458);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-167525458);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-167525458);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-167525458);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-167525458);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-167525458);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>Processingstream processorstreaming database12345678910111213141516streaming database - - - - - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/grid_image_label_position/elk/board.exp.json b/e2etests/testdata/regression/grid_image_label_position/elk/board.exp.json index f280c910b..57ff6c18b 100644 --- a/e2etests/testdata/regression/grid_image_label_position/elk/board.exp.json +++ b/e2etests/testdata/regression/grid_image_label_position/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -112,6 +122,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -165,6 +176,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -218,6 +230,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -273,6 +286,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/grid_image_label_position/elk/sketch.exp.svg b/e2etests/testdata/regression/grid_image_label_position/elk/sketch.exp.svg index ec7553096..28fa5e103 100644 --- a/e2etests/testdata/regression/grid_image_label_position/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/grid_image_label_position/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -Processingstream processorstreaming database12345678910111213141516streaming database + .d2-3378487587 .fill-N1{fill:#0A0F25;} + .d2-3378487587 .fill-N2{fill:#676C7E;} + .d2-3378487587 .fill-N3{fill:#9499AB;} + .d2-3378487587 .fill-N4{fill:#CFD2DD;} + .d2-3378487587 .fill-N5{fill:#DEE1EB;} + .d2-3378487587 .fill-N6{fill:#EEF1F8;} + .d2-3378487587 .fill-N7{fill:#FFFFFF;} + .d2-3378487587 .fill-B1{fill:#0D32B2;} + .d2-3378487587 .fill-B2{fill:#0D32B2;} + .d2-3378487587 .fill-B3{fill:#E3E9FD;} + .d2-3378487587 .fill-B4{fill:#E3E9FD;} + .d2-3378487587 .fill-B5{fill:#EDF0FD;} + .d2-3378487587 .fill-B6{fill:#F7F8FE;} + .d2-3378487587 .fill-AA2{fill:#4A6FF3;} + .d2-3378487587 .fill-AA4{fill:#EDF0FD;} + .d2-3378487587 .fill-AA5{fill:#F7F8FE;} + .d2-3378487587 .fill-AB4{fill:#EDF0FD;} + .d2-3378487587 .fill-AB5{fill:#F7F8FE;} + .d2-3378487587 .stroke-N1{stroke:#0A0F25;} + .d2-3378487587 .stroke-N2{stroke:#676C7E;} + .d2-3378487587 .stroke-N3{stroke:#9499AB;} + .d2-3378487587 .stroke-N4{stroke:#CFD2DD;} + .d2-3378487587 .stroke-N5{stroke:#DEE1EB;} + .d2-3378487587 .stroke-N6{stroke:#EEF1F8;} + .d2-3378487587 .stroke-N7{stroke:#FFFFFF;} + .d2-3378487587 .stroke-B1{stroke:#0D32B2;} + .d2-3378487587 .stroke-B2{stroke:#0D32B2;} + .d2-3378487587 .stroke-B3{stroke:#E3E9FD;} + .d2-3378487587 .stroke-B4{stroke:#E3E9FD;} + .d2-3378487587 .stroke-B5{stroke:#EDF0FD;} + .d2-3378487587 .stroke-B6{stroke:#F7F8FE;} + .d2-3378487587 .stroke-AA2{stroke:#4A6FF3;} + .d2-3378487587 .stroke-AA4{stroke:#EDF0FD;} + .d2-3378487587 .stroke-AA5{stroke:#F7F8FE;} + .d2-3378487587 .stroke-AB4{stroke:#EDF0FD;} + .d2-3378487587 .stroke-AB5{stroke:#F7F8FE;} + .d2-3378487587 .background-color-N1{background-color:#0A0F25;} + .d2-3378487587 .background-color-N2{background-color:#676C7E;} + .d2-3378487587 .background-color-N3{background-color:#9499AB;} + .d2-3378487587 .background-color-N4{background-color:#CFD2DD;} + .d2-3378487587 .background-color-N5{background-color:#DEE1EB;} + .d2-3378487587 .background-color-N6{background-color:#EEF1F8;} + .d2-3378487587 .background-color-N7{background-color:#FFFFFF;} + .d2-3378487587 .background-color-B1{background-color:#0D32B2;} + .d2-3378487587 .background-color-B2{background-color:#0D32B2;} + .d2-3378487587 .background-color-B3{background-color:#E3E9FD;} + .d2-3378487587 .background-color-B4{background-color:#E3E9FD;} + .d2-3378487587 .background-color-B5{background-color:#EDF0FD;} + .d2-3378487587 .background-color-B6{background-color:#F7F8FE;} + .d2-3378487587 .background-color-AA2{background-color:#4A6FF3;} + .d2-3378487587 .background-color-AA4{background-color:#EDF0FD;} + .d2-3378487587 .background-color-AA5{background-color:#F7F8FE;} + .d2-3378487587 .background-color-AB4{background-color:#EDF0FD;} + .d2-3378487587 .background-color-AB5{background-color:#F7F8FE;} + .d2-3378487587 .color-N1{color:#0A0F25;} + .d2-3378487587 .color-N2{color:#676C7E;} + .d2-3378487587 .color-N3{color:#9499AB;} + .d2-3378487587 .color-N4{color:#CFD2DD;} + .d2-3378487587 .color-N5{color:#DEE1EB;} + .d2-3378487587 .color-N6{color:#EEF1F8;} + .d2-3378487587 .color-N7{color:#FFFFFF;} + .d2-3378487587 .color-B1{color:#0D32B2;} + .d2-3378487587 .color-B2{color:#0D32B2;} + .d2-3378487587 .color-B3{color:#E3E9FD;} + .d2-3378487587 .color-B4{color:#E3E9FD;} + .d2-3378487587 .color-B5{color:#EDF0FD;} + .d2-3378487587 .color-B6{color:#F7F8FE;} + .d2-3378487587 .color-AA2{color:#4A6FF3;} + .d2-3378487587 .color-AA4{color:#EDF0FD;} + .d2-3378487587 .color-AA5{color:#F7F8FE;} + .d2-3378487587 .color-AB4{color:#EDF0FD;} + .d2-3378487587 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3378487587);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3378487587);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3378487587);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3378487587);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3378487587);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3378487587);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3378487587);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3378487587);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3378487587);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3378487587);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3378487587);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3378487587);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3378487587);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3378487587);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3378487587);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3378487587);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3378487587);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3378487587);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>Processingstream processorstreaming database12345678910111213141516streaming database - - - - - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/grid_in_constant_near/dagre/board.exp.json b/e2etests/testdata/regression/grid_in_constant_near/dagre/board.exp.json index 898fb18cf..d7c2ae2ae 100644 --- a/e2etests/testdata/regression/grid_in_constant_near/dagre/board.exp.json +++ b/e2etests/testdata/regression/grid_in_constant_near/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -266,6 +280,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/grid_in_constant_near/dagre/sketch.exp.svg b/e2etests/testdata/regression/grid_in_constant_near/dagre/sketch.exp.svg index 8e2565686..563057858 100644 --- a/e2etests/testdata/regression/grid_in_constant_near/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/grid_in_constant_near/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -abcxyz + .d2-3782217059 .fill-N1{fill:#0A0F25;} + .d2-3782217059 .fill-N2{fill:#676C7E;} + .d2-3782217059 .fill-N3{fill:#9499AB;} + .d2-3782217059 .fill-N4{fill:#CFD2DD;} + .d2-3782217059 .fill-N5{fill:#DEE1EB;} + .d2-3782217059 .fill-N6{fill:#EEF1F8;} + .d2-3782217059 .fill-N7{fill:#FFFFFF;} + .d2-3782217059 .fill-B1{fill:#0D32B2;} + .d2-3782217059 .fill-B2{fill:#0D32B2;} + .d2-3782217059 .fill-B3{fill:#E3E9FD;} + .d2-3782217059 .fill-B4{fill:#E3E9FD;} + .d2-3782217059 .fill-B5{fill:#EDF0FD;} + .d2-3782217059 .fill-B6{fill:#F7F8FE;} + .d2-3782217059 .fill-AA2{fill:#4A6FF3;} + .d2-3782217059 .fill-AA4{fill:#EDF0FD;} + .d2-3782217059 .fill-AA5{fill:#F7F8FE;} + .d2-3782217059 .fill-AB4{fill:#EDF0FD;} + .d2-3782217059 .fill-AB5{fill:#F7F8FE;} + .d2-3782217059 .stroke-N1{stroke:#0A0F25;} + .d2-3782217059 .stroke-N2{stroke:#676C7E;} + .d2-3782217059 .stroke-N3{stroke:#9499AB;} + .d2-3782217059 .stroke-N4{stroke:#CFD2DD;} + .d2-3782217059 .stroke-N5{stroke:#DEE1EB;} + .d2-3782217059 .stroke-N6{stroke:#EEF1F8;} + .d2-3782217059 .stroke-N7{stroke:#FFFFFF;} + .d2-3782217059 .stroke-B1{stroke:#0D32B2;} + .d2-3782217059 .stroke-B2{stroke:#0D32B2;} + .d2-3782217059 .stroke-B3{stroke:#E3E9FD;} + .d2-3782217059 .stroke-B4{stroke:#E3E9FD;} + .d2-3782217059 .stroke-B5{stroke:#EDF0FD;} + .d2-3782217059 .stroke-B6{stroke:#F7F8FE;} + .d2-3782217059 .stroke-AA2{stroke:#4A6FF3;} + .d2-3782217059 .stroke-AA4{stroke:#EDF0FD;} + .d2-3782217059 .stroke-AA5{stroke:#F7F8FE;} + .d2-3782217059 .stroke-AB4{stroke:#EDF0FD;} + .d2-3782217059 .stroke-AB5{stroke:#F7F8FE;} + .d2-3782217059 .background-color-N1{background-color:#0A0F25;} + .d2-3782217059 .background-color-N2{background-color:#676C7E;} + .d2-3782217059 .background-color-N3{background-color:#9499AB;} + .d2-3782217059 .background-color-N4{background-color:#CFD2DD;} + .d2-3782217059 .background-color-N5{background-color:#DEE1EB;} + .d2-3782217059 .background-color-N6{background-color:#EEF1F8;} + .d2-3782217059 .background-color-N7{background-color:#FFFFFF;} + .d2-3782217059 .background-color-B1{background-color:#0D32B2;} + .d2-3782217059 .background-color-B2{background-color:#0D32B2;} + .d2-3782217059 .background-color-B3{background-color:#E3E9FD;} + .d2-3782217059 .background-color-B4{background-color:#E3E9FD;} + .d2-3782217059 .background-color-B5{background-color:#EDF0FD;} + .d2-3782217059 .background-color-B6{background-color:#F7F8FE;} + .d2-3782217059 .background-color-AA2{background-color:#4A6FF3;} + .d2-3782217059 .background-color-AA4{background-color:#EDF0FD;} + .d2-3782217059 .background-color-AA5{background-color:#F7F8FE;} + .d2-3782217059 .background-color-AB4{background-color:#EDF0FD;} + .d2-3782217059 .background-color-AB5{background-color:#F7F8FE;} + .d2-3782217059 .color-N1{color:#0A0F25;} + .d2-3782217059 .color-N2{color:#676C7E;} + .d2-3782217059 .color-N3{color:#9499AB;} + .d2-3782217059 .color-N4{color:#CFD2DD;} + .d2-3782217059 .color-N5{color:#DEE1EB;} + .d2-3782217059 .color-N6{color:#EEF1F8;} + .d2-3782217059 .color-N7{color:#FFFFFF;} + .d2-3782217059 .color-B1{color:#0D32B2;} + .d2-3782217059 .color-B2{color:#0D32B2;} + .d2-3782217059 .color-B3{color:#E3E9FD;} + .d2-3782217059 .color-B4{color:#E3E9FD;} + .d2-3782217059 .color-B5{color:#EDF0FD;} + .d2-3782217059 .color-B6{color:#F7F8FE;} + .d2-3782217059 .color-AA2{color:#4A6FF3;} + .d2-3782217059 .color-AA4{color:#EDF0FD;} + .d2-3782217059 .color-AA5{color:#F7F8FE;} + .d2-3782217059 .color-AB4{color:#EDF0FD;} + .d2-3782217059 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3782217059);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3782217059);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3782217059);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3782217059);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3782217059);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3782217059);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3782217059);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3782217059);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3782217059);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3782217059);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3782217059);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3782217059);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3782217059);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3782217059);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3782217059);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3782217059);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3782217059);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3782217059);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcxyz - - - - - - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/grid_in_constant_near/elk/board.exp.json b/e2etests/testdata/regression/grid_in_constant_near/elk/board.exp.json index 8e4a35f1c..d97f607d6 100644 --- a/e2etests/testdata/regression/grid_in_constant_near/elk/board.exp.json +++ b/e2etests/testdata/regression/grid_in_constant_near/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -266,6 +280,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/grid_in_constant_near/elk/sketch.exp.svg b/e2etests/testdata/regression/grid_in_constant_near/elk/sketch.exp.svg index 6c8bfc463..333f39699 100644 --- a/e2etests/testdata/regression/grid_in_constant_near/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/grid_in_constant_near/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -abcxyz + .d2-1156693052 .fill-N1{fill:#0A0F25;} + .d2-1156693052 .fill-N2{fill:#676C7E;} + .d2-1156693052 .fill-N3{fill:#9499AB;} + .d2-1156693052 .fill-N4{fill:#CFD2DD;} + .d2-1156693052 .fill-N5{fill:#DEE1EB;} + .d2-1156693052 .fill-N6{fill:#EEF1F8;} + .d2-1156693052 .fill-N7{fill:#FFFFFF;} + .d2-1156693052 .fill-B1{fill:#0D32B2;} + .d2-1156693052 .fill-B2{fill:#0D32B2;} + .d2-1156693052 .fill-B3{fill:#E3E9FD;} + .d2-1156693052 .fill-B4{fill:#E3E9FD;} + .d2-1156693052 .fill-B5{fill:#EDF0FD;} + .d2-1156693052 .fill-B6{fill:#F7F8FE;} + .d2-1156693052 .fill-AA2{fill:#4A6FF3;} + .d2-1156693052 .fill-AA4{fill:#EDF0FD;} + .d2-1156693052 .fill-AA5{fill:#F7F8FE;} + .d2-1156693052 .fill-AB4{fill:#EDF0FD;} + .d2-1156693052 .fill-AB5{fill:#F7F8FE;} + .d2-1156693052 .stroke-N1{stroke:#0A0F25;} + .d2-1156693052 .stroke-N2{stroke:#676C7E;} + .d2-1156693052 .stroke-N3{stroke:#9499AB;} + .d2-1156693052 .stroke-N4{stroke:#CFD2DD;} + .d2-1156693052 .stroke-N5{stroke:#DEE1EB;} + .d2-1156693052 .stroke-N6{stroke:#EEF1F8;} + .d2-1156693052 .stroke-N7{stroke:#FFFFFF;} + .d2-1156693052 .stroke-B1{stroke:#0D32B2;} + .d2-1156693052 .stroke-B2{stroke:#0D32B2;} + .d2-1156693052 .stroke-B3{stroke:#E3E9FD;} + .d2-1156693052 .stroke-B4{stroke:#E3E9FD;} + .d2-1156693052 .stroke-B5{stroke:#EDF0FD;} + .d2-1156693052 .stroke-B6{stroke:#F7F8FE;} + .d2-1156693052 .stroke-AA2{stroke:#4A6FF3;} + .d2-1156693052 .stroke-AA4{stroke:#EDF0FD;} + .d2-1156693052 .stroke-AA5{stroke:#F7F8FE;} + .d2-1156693052 .stroke-AB4{stroke:#EDF0FD;} + .d2-1156693052 .stroke-AB5{stroke:#F7F8FE;} + .d2-1156693052 .background-color-N1{background-color:#0A0F25;} + .d2-1156693052 .background-color-N2{background-color:#676C7E;} + .d2-1156693052 .background-color-N3{background-color:#9499AB;} + .d2-1156693052 .background-color-N4{background-color:#CFD2DD;} + .d2-1156693052 .background-color-N5{background-color:#DEE1EB;} + .d2-1156693052 .background-color-N6{background-color:#EEF1F8;} + .d2-1156693052 .background-color-N7{background-color:#FFFFFF;} + .d2-1156693052 .background-color-B1{background-color:#0D32B2;} + .d2-1156693052 .background-color-B2{background-color:#0D32B2;} + .d2-1156693052 .background-color-B3{background-color:#E3E9FD;} + .d2-1156693052 .background-color-B4{background-color:#E3E9FD;} + .d2-1156693052 .background-color-B5{background-color:#EDF0FD;} + .d2-1156693052 .background-color-B6{background-color:#F7F8FE;} + .d2-1156693052 .background-color-AA2{background-color:#4A6FF3;} + .d2-1156693052 .background-color-AA4{background-color:#EDF0FD;} + .d2-1156693052 .background-color-AA5{background-color:#F7F8FE;} + .d2-1156693052 .background-color-AB4{background-color:#EDF0FD;} + .d2-1156693052 .background-color-AB5{background-color:#F7F8FE;} + .d2-1156693052 .color-N1{color:#0A0F25;} + .d2-1156693052 .color-N2{color:#676C7E;} + .d2-1156693052 .color-N3{color:#9499AB;} + .d2-1156693052 .color-N4{color:#CFD2DD;} + .d2-1156693052 .color-N5{color:#DEE1EB;} + .d2-1156693052 .color-N6{color:#EEF1F8;} + .d2-1156693052 .color-N7{color:#FFFFFF;} + .d2-1156693052 .color-B1{color:#0D32B2;} + .d2-1156693052 .color-B2{color:#0D32B2;} + .d2-1156693052 .color-B3{color:#E3E9FD;} + .d2-1156693052 .color-B4{color:#E3E9FD;} + .d2-1156693052 .color-B5{color:#EDF0FD;} + .d2-1156693052 .color-B6{color:#F7F8FE;} + .d2-1156693052 .color-AA2{color:#4A6FF3;} + .d2-1156693052 .color-AA4{color:#EDF0FD;} + .d2-1156693052 .color-AA5{color:#F7F8FE;} + .d2-1156693052 .color-AB4{color:#EDF0FD;} + .d2-1156693052 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1156693052);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1156693052);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1156693052);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1156693052);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1156693052);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1156693052);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1156693052);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1156693052);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1156693052);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1156693052);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1156693052);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1156693052);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1156693052);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1156693052);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1156693052);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1156693052);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1156693052);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1156693052);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcxyz - - - - - - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/grid_oom/dagre/board.exp.json b/e2etests/testdata/regression/grid_oom/dagre/board.exp.json index 93a705ba6..5543cfe29 100644 --- a/e2etests/testdata/regression/grid_oom/dagre/board.exp.json +++ b/e2etests/testdata/regression/grid_oom/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -82,6 +91,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -136,6 +146,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -200,6 +211,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -249,6 +261,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -313,6 +326,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -377,6 +391,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -441,6 +456,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -520,6 +536,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -569,6 +586,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +651,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -712,6 +731,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -761,6 +781,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -825,6 +846,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -879,6 +901,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -933,6 +956,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -982,6 +1006,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1031,6 +1056,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1080,6 +1106,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1129,6 +1156,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1193,6 +1221,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1257,6 +1286,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1311,6 +1341,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1360,6 +1391,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1409,6 +1441,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1463,6 +1496,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1512,6 +1546,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1576,6 +1611,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1625,6 +1661,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1684,6 +1721,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1748,6 +1786,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1812,6 +1851,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1866,6 +1906,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1920,6 +1961,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1969,6 +2011,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2018,6 +2061,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2082,6 +2126,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2131,6 +2176,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2180,6 +2226,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2229,6 +2276,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2278,6 +2326,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2327,6 +2376,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2391,6 +2441,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2455,6 +2506,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2504,6 +2556,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2568,6 +2621,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2617,6 +2671,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2681,6 +2736,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2745,6 +2801,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2824,6 +2881,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2878,6 +2936,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2957,6 +3016,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3011,6 +3071,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3075,6 +3136,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3124,6 +3186,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3178,6 +3241,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3227,6 +3291,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3276,6 +3341,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3330,6 +3396,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3379,6 +3446,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3443,6 +3511,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3497,6 +3566,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3546,6 +3616,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3610,6 +3681,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3694,6 +3766,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3758,6 +3831,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3827,6 +3901,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3891,6 +3966,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3960,6 +4036,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4029,6 +4106,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4083,6 +4161,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4147,6 +4226,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4201,6 +4281,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4265,6 +4346,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4319,6 +4401,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4383,6 +4466,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4442,6 +4526,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4506,6 +4591,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4605,6 +4691,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4709,6 +4796,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4763,6 +4851,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4827,6 +4916,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4886,6 +4976,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4940,6 +5031,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5014,6 +5106,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5078,6 +5171,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5142,6 +5236,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5191,6 +5286,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5275,6 +5371,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5329,6 +5426,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5418,6 +5516,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5472,6 +5571,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5526,6 +5626,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5600,6 +5701,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5664,6 +5766,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5728,6 +5831,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5792,6 +5896,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5846,6 +5951,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5895,6 +6001,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5954,6 +6061,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6043,6 +6151,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6097,6 +6206,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6161,6 +6271,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6220,6 +6331,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6274,6 +6386,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6323,6 +6436,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6377,6 +6491,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6441,6 +6556,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6490,6 +6606,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6549,6 +6666,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6613,6 +6731,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6667,6 +6786,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6716,6 +6836,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6765,6 +6886,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6814,6 +6936,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6878,6 +7001,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6927,6 +7051,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6976,6 +7101,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7045,6 +7171,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7094,6 +7221,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7158,6 +7286,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7217,6 +7346,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7276,6 +7406,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7325,6 +7456,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7389,6 +7521,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7453,6 +7586,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7502,6 +7636,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7566,6 +7701,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7630,6 +7766,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7684,6 +7821,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7748,6 +7886,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8032,6 +8171,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8101,6 +8241,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8155,6 +8296,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8219,6 +8361,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8283,6 +8426,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8347,6 +8491,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8411,6 +8556,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8470,6 +8616,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8534,6 +8681,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8588,6 +8736,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8637,6 +8786,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8701,6 +8851,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8765,6 +8916,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8849,6 +9001,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9133,6 +9286,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9192,6 +9346,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9256,6 +9411,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9320,6 +9476,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9384,6 +9541,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9438,6 +9596,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9487,6 +9646,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9536,6 +9696,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9615,6 +9776,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9664,6 +9826,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9715,6 +9878,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/grid_oom/dagre/sketch.exp.svg b/e2etests/testdata/regression/grid_oom/dagre/sketch.exp.svg index 36111587a..34c5c463b 100644 --- a/e2etests/testdata/regression/grid_oom/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/grid_oom/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -1+1------------------+2-------------------------------+3------------------------------+4-------------------------2+1-----------------+2----------------------------3+1-----------------+2----------------------------+3------------------------------+4-------------------------4+1----------------------------5+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------6+1----------------------------------------+2------------------------+3------------------------+4--------------------------------------7+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------9+1----------------------+2-------------------------------------------+3-----------------------+4--------------------------+5-----------------------------+6-----------------------------+7--------------------------10+1-----------------11+1----------------+2---------------------------+3-----------------------------+4------------------------12+1----------------------+2-----------------------+3-------------+4-------------+5------------------------+6------------------------------------------------+7--------------------------13+1--------------------------------14+1----------------+2---------------------------+3-----------------------------+4------------------------15+1------------------------+2----------------------16+1----------------+2------------------------------17+1-----------------18+1----------------19+1-----------------20+1-----------------21+1----------------+2---------------------------+3-----------------------------+4------------------------22+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------23+1----------------+2------------------------------24+1-----------------25+1-----------------26+1----------------+2------------------------------27+1-----------------28+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------29+1--------------------------------30+1-------------------+2---------------------------------------------+3--------------------------------31+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------32+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------33+1------------------------+2----------------------34+1----------------+2------------------------------35+1----------------36+1-----------------37+1----------------+2---------------------------+3-----------------------------+4------------------------38+1-----------------39+1-----------------40+1-----------------41+1-----------------42+1-----------------43+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------44+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------45+1-----------------46+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------47+1-----------------48+1-------------------------------+2------------------------------+3--------------------------------------------+4--------------------------------------------------------------------49+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------50+1--------------+2-----------------------+3-------------+4------------------------+5------------------------+6-------------------------------+7--------------------------51+1----------------+2------------------------------52+1----------------------+2-----------------------+3-------------+4-------------+5------------------------+6------------------------------------------------+7--------------------------53+1----------------+2------------------------------54+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------55+1----------------------------------------------56+1----------------+2------------------------------57+1-----------------58+1-----------------59+1-----------+2--------------------------------------------60+1-----------------61+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------62+1------------------------+2----------------------63+1-----------------64+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------65+1-------------+2--------------------------+3-------------+4-------------+5--------------------------+6-----------------------+7---------------------------------+8----------------------------66+1----------------------------------------+2--------------------+3-----------------------+4-------------------------------------67+1----------------+2------------------------------+3-----------------------------+4-------------------------------+5---------------------------68+1----------------------------------------+2-----------------------+3-------------------------------------+4-----------------------69+1---------------------------+2------------------------------+3--------------------------------+4--------------------------------------------------------------------+5------------------------------70+1--------------------+2--------------------------+3---------------------+4-------------------------------+5-------------------------71+1------------------------------+2------------------------72+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------73+1----------------+2---------------------------74+1----------------+2------------------------+3--------------------------+4----------------------75+1----------------+2---------------------------76+1----------------+2---------------------------+3-----------------------------+4------------------------77+1----------------+2------------------------------+3--------------------------78+1----------------+2------------------------------+3-----------------------------+4------------------------79+1----------------------+2--------------------------------+3--------------------------------+4-------------------------------------------+5-------------------------+6----------------------------+7---------------------------+8----------------------------------------+9-----------------------------+10-----------------------------+11----------------------80+1--------------------------------+2----------------------------------+3------------------------+4-------------------------+5------------------------------+6------------------------------+7----------------------+8--------------------------+9----------------------+10-----------------------+11-------------------------+12----------------------------------81+1----------------+2------------------------------82+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------83+1--------------+2-----------------------+3------------------------84+1----------------+2------------------------------85+1-----------------------+2------------------------+3--------------------------------+4---------------------------------+5-----------------------------+6-----------------------------86+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------87+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------88+1--------------------------------89+1-------------+2--------------------------+3-------------+4-------------+5-----------------------------+6-----------------------+7---------------------------------+8----------------------------90+1----------------+2---------------------------91+1------------+2----------------------------+3-------------+4-----------------------------+5--------------------------+6-------------+7-------------+8--------------------------+9----------------------------92+1----------------+2------------------------------93+1------------------------------+2------------------------94+1----------------------+2-------------------------------------------+3-----------------------------+4-----------------------------+5-----------------------------+6--------------------------95+1----------------+2---------------------------+3-----------------------------+4------------------------96+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------97+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------98+1----------------+2---------------------------99+1-----------------100+1-------------------+2--------------+3-------------------------101+1------------+2-------------------------------------+3-------------+4-----------------------------+5--------------------------+6-------------+7-------------+8--------------------------+9----------------------------102+1----------------+2------------------------------103+1----------------+2------------------------------+3-----------------------+4---------------------------------104+1-------------------+2---------------------------------------------+3------------------------105+1----------------+2------------------------------106+1-----------------107+1----------------+2------------------------------108+1----------------+2------------------------------+3-----------------------------+4------------------------109+1-----------------110+1----------------+2------------------------------+3--------------------------111+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------112+1----------------+2------------------------------113+1-----------------114+1-----------------115+1----------------116+1----------------+2------------------------------+3-----------------------------+4------------------------117+1----------------118+1-----------------119+1--------------+2--------------------+3-------------------------+4----------------------+5-------------------------120+1-----------------121+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------122+1----------------+2------------------------------+3---------------------------------123+1-------------------+2--------------+3-------------------------124+1-----------------125+1----------------+2------------------------------+3----------------------+4--------------------------------126+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------127+1--------------------------------128+1----------------+2------------------------------+3-----------------------+4-------------------------129+1----------------+2---------------------------+3-----------------------------+4------------------------130+1----------------+2------------------------------131+1---------------------------------------+2-----------------------+3-----------------------+4-------------------------------------132+1-----------------------+2----------------+3------------------------------+4----------------------+5--------------------------+6-----------------------------+7---------------------------+8--------------------------+9----------------------+10---------------------------+11--------------------------------+12------------------------------+13-------------------------+14--------------------------+15---------------------------------+16-------------------------------+17--------------------------+18--------------------------------+19------------------------+20-----------------------------+21-----------------------------+22---------------------------------+23----------------------------+24-----------------------------+25-----------------------+26------------------------------+27-------------------------+28-------------------------+29---------------------------------+30--------------------------+31---------------------------+32---------------------------+33------------------------+34---------------------------+35----------------------+36--------------------------+37---------------------------+38----------------------------------+39--------------------------+40-----------------------+41----------------------------+42---------------------------+43--------------------------+44---------------------------+45----------------------------------+46--------------------------+47--------------------------+48--------------------------133+1--------------+2--------------------+3-------------------------+4----------------------+5-------------------------134+1--------------------+2---------------135+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------136+1----------------------------------------+2--------------------+3-----------------------+4-------------------------------------137+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------138+1---------------------------------------+2-----------------------+3-----------------------+4-------------------------------------139+1--------------+2-----------------------+3------------------------140+1--------------------+2--------------------+3-----------------------+4-------------------------------------141+1-------------------------+2------------------------142+1-----------------143+1----------------+2---------------------------+3-----------------------------+4------------------------144+1----------------------+2------------------------+3--------------------------------------+4----------------------------------145+1---------------------------+2------------------------------+3--------------------------------------------+4------------------------+5-------------------------------+6---------------------------------------------+7--------------------------------------------+8-------------------------------146+1--------------------------+2----------------+3------------------------------+4----------------------------+5-------------------------------+6----------------------------+7------------------------+8------------------------+9---------------------------+10------------------------+11----------------------------------+12-------------------------+13------------------------+14--------------------------+15-----------------------------+16----------------------------+17-----------------------------+18---------------------------------+19--------------------------+20---------------------+21-------------------------------+22-------------------------------+23------------------------------+24---------------------------+25--------------------------+26---------------------------------+27------------------------+28--------------------------+29--------------------------+30--------------------------+31--------------------------+32----------------------------+33----------------------+34--------------------------+35----------------------+36--------------------------+37---------------------------+38--------------------------+39----------------------+40-----------------------+41-----------------------------+42-----------------------------+43--------------------------+44-------------------------+45------------------------------+46---------------------------------+47--------------------------+48--------------------------147+1-----------------------------+2--------------------+3---------------148+1--------------------+2--------------------+3-----------------------+4-------------------------------------149+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------150+1---------------------------------------+2--------------------+3-------------------------------------+4-----------------------151+1------------------------------+2------------------------152+1--------------------------------153+1-----------------154+1----------------------+2-----------------------+3-------------------------------------------+4--------------------------+5-----------------------------+6-----------------------------+7--------------------------155+1------------------------156+1---------------- + .d2-3601822937 .fill-N1{fill:#0A0F25;} + .d2-3601822937 .fill-N2{fill:#676C7E;} + .d2-3601822937 .fill-N3{fill:#9499AB;} + .d2-3601822937 .fill-N4{fill:#CFD2DD;} + .d2-3601822937 .fill-N5{fill:#DEE1EB;} + .d2-3601822937 .fill-N6{fill:#EEF1F8;} + .d2-3601822937 .fill-N7{fill:#FFFFFF;} + .d2-3601822937 .fill-B1{fill:#0D32B2;} + .d2-3601822937 .fill-B2{fill:#0D32B2;} + .d2-3601822937 .fill-B3{fill:#E3E9FD;} + .d2-3601822937 .fill-B4{fill:#E3E9FD;} + .d2-3601822937 .fill-B5{fill:#EDF0FD;} + .d2-3601822937 .fill-B6{fill:#F7F8FE;} + .d2-3601822937 .fill-AA2{fill:#4A6FF3;} + .d2-3601822937 .fill-AA4{fill:#EDF0FD;} + .d2-3601822937 .fill-AA5{fill:#F7F8FE;} + .d2-3601822937 .fill-AB4{fill:#EDF0FD;} + .d2-3601822937 .fill-AB5{fill:#F7F8FE;} + .d2-3601822937 .stroke-N1{stroke:#0A0F25;} + .d2-3601822937 .stroke-N2{stroke:#676C7E;} + .d2-3601822937 .stroke-N3{stroke:#9499AB;} + .d2-3601822937 .stroke-N4{stroke:#CFD2DD;} + .d2-3601822937 .stroke-N5{stroke:#DEE1EB;} + .d2-3601822937 .stroke-N6{stroke:#EEF1F8;} + .d2-3601822937 .stroke-N7{stroke:#FFFFFF;} + .d2-3601822937 .stroke-B1{stroke:#0D32B2;} + .d2-3601822937 .stroke-B2{stroke:#0D32B2;} + .d2-3601822937 .stroke-B3{stroke:#E3E9FD;} + .d2-3601822937 .stroke-B4{stroke:#E3E9FD;} + .d2-3601822937 .stroke-B5{stroke:#EDF0FD;} + .d2-3601822937 .stroke-B6{stroke:#F7F8FE;} + .d2-3601822937 .stroke-AA2{stroke:#4A6FF3;} + .d2-3601822937 .stroke-AA4{stroke:#EDF0FD;} + .d2-3601822937 .stroke-AA5{stroke:#F7F8FE;} + .d2-3601822937 .stroke-AB4{stroke:#EDF0FD;} + .d2-3601822937 .stroke-AB5{stroke:#F7F8FE;} + .d2-3601822937 .background-color-N1{background-color:#0A0F25;} + .d2-3601822937 .background-color-N2{background-color:#676C7E;} + .d2-3601822937 .background-color-N3{background-color:#9499AB;} + .d2-3601822937 .background-color-N4{background-color:#CFD2DD;} + .d2-3601822937 .background-color-N5{background-color:#DEE1EB;} + .d2-3601822937 .background-color-N6{background-color:#EEF1F8;} + .d2-3601822937 .background-color-N7{background-color:#FFFFFF;} + .d2-3601822937 .background-color-B1{background-color:#0D32B2;} + .d2-3601822937 .background-color-B2{background-color:#0D32B2;} + .d2-3601822937 .background-color-B3{background-color:#E3E9FD;} + .d2-3601822937 .background-color-B4{background-color:#E3E9FD;} + .d2-3601822937 .background-color-B5{background-color:#EDF0FD;} + .d2-3601822937 .background-color-B6{background-color:#F7F8FE;} + .d2-3601822937 .background-color-AA2{background-color:#4A6FF3;} + .d2-3601822937 .background-color-AA4{background-color:#EDF0FD;} + .d2-3601822937 .background-color-AA5{background-color:#F7F8FE;} + .d2-3601822937 .background-color-AB4{background-color:#EDF0FD;} + .d2-3601822937 .background-color-AB5{background-color:#F7F8FE;} + .d2-3601822937 .color-N1{color:#0A0F25;} + .d2-3601822937 .color-N2{color:#676C7E;} + .d2-3601822937 .color-N3{color:#9499AB;} + .d2-3601822937 .color-N4{color:#CFD2DD;} + .d2-3601822937 .color-N5{color:#DEE1EB;} + .d2-3601822937 .color-N6{color:#EEF1F8;} + .d2-3601822937 .color-N7{color:#FFFFFF;} + .d2-3601822937 .color-B1{color:#0D32B2;} + .d2-3601822937 .color-B2{color:#0D32B2;} + .d2-3601822937 .color-B3{color:#E3E9FD;} + .d2-3601822937 .color-B4{color:#E3E9FD;} + .d2-3601822937 .color-B5{color:#EDF0FD;} + .d2-3601822937 .color-B6{color:#F7F8FE;} + .d2-3601822937 .color-AA2{color:#4A6FF3;} + .d2-3601822937 .color-AA4{color:#EDF0FD;} + .d2-3601822937 .color-AA5{color:#F7F8FE;} + .d2-3601822937 .color-AB4{color:#EDF0FD;} + .d2-3601822937 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3601822937);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3601822937);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3601822937);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3601822937);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3601822937);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3601822937);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3601822937);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3601822937);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3601822937);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3601822937);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3601822937);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3601822937);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3601822937);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3601822937);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3601822937);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3601822937);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3601822937);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3601822937);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>1+1------------------+2-------------------------------+3------------------------------+4-------------------------2+1-----------------+2----------------------------3+1-----------------+2----------------------------+3------------------------------+4-------------------------4+1----------------------------5+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------6+1----------------------------------------+2------------------------+3------------------------+4--------------------------------------7+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------9+1----------------------+2-------------------------------------------+3-----------------------+4--------------------------+5-----------------------------+6-----------------------------+7--------------------------10+1-----------------11+1----------------+2---------------------------+3-----------------------------+4------------------------12+1----------------------+2-----------------------+3-------------+4-------------+5------------------------+6------------------------------------------------+7--------------------------13+1--------------------------------14+1----------------+2---------------------------+3-----------------------------+4------------------------15+1------------------------+2----------------------16+1----------------+2------------------------------17+1-----------------18+1----------------19+1-----------------20+1-----------------21+1----------------+2---------------------------+3-----------------------------+4------------------------22+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------23+1----------------+2------------------------------24+1-----------------25+1-----------------26+1----------------+2------------------------------27+1-----------------28+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------29+1--------------------------------30+1-------------------+2---------------------------------------------+3--------------------------------31+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------32+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------33+1------------------------+2----------------------34+1----------------+2------------------------------35+1----------------36+1-----------------37+1----------------+2---------------------------+3-----------------------------+4------------------------38+1-----------------39+1-----------------40+1-----------------41+1-----------------42+1-----------------43+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------44+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------45+1-----------------46+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------47+1-----------------48+1-------------------------------+2------------------------------+3--------------------------------------------+4--------------------------------------------------------------------49+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------50+1--------------+2-----------------------+3-------------+4------------------------+5------------------------+6-------------------------------+7--------------------------51+1----------------+2------------------------------52+1----------------------+2-----------------------+3-------------+4-------------+5------------------------+6------------------------------------------------+7--------------------------53+1----------------+2------------------------------54+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------55+1----------------------------------------------56+1----------------+2------------------------------57+1-----------------58+1-----------------59+1-----------+2--------------------------------------------60+1-----------------61+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------62+1------------------------+2----------------------63+1-----------------64+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------65+1-------------+2--------------------------+3-------------+4-------------+5--------------------------+6-----------------------+7---------------------------------+8----------------------------66+1----------------------------------------+2--------------------+3-----------------------+4-------------------------------------67+1----------------+2------------------------------+3-----------------------------+4-------------------------------+5---------------------------68+1----------------------------------------+2-----------------------+3-------------------------------------+4-----------------------69+1---------------------------+2------------------------------+3--------------------------------+4--------------------------------------------------------------------+5------------------------------70+1--------------------+2--------------------------+3---------------------+4-------------------------------+5-------------------------71+1------------------------------+2------------------------72+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------73+1----------------+2---------------------------74+1----------------+2------------------------+3--------------------------+4----------------------75+1----------------+2---------------------------76+1----------------+2---------------------------+3-----------------------------+4------------------------77+1----------------+2------------------------------+3--------------------------78+1----------------+2------------------------------+3-----------------------------+4------------------------79+1----------------------+2--------------------------------+3--------------------------------+4-------------------------------------------+5-------------------------+6----------------------------+7---------------------------+8----------------------------------------+9-----------------------------+10-----------------------------+11----------------------80+1--------------------------------+2----------------------------------+3------------------------+4-------------------------+5------------------------------+6------------------------------+7----------------------+8--------------------------+9----------------------+10-----------------------+11-------------------------+12----------------------------------81+1----------------+2------------------------------82+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------83+1--------------+2-----------------------+3------------------------84+1----------------+2------------------------------85+1-----------------------+2------------------------+3--------------------------------+4---------------------------------+5-----------------------------+6-----------------------------86+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------87+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------88+1--------------------------------89+1-------------+2--------------------------+3-------------+4-------------+5-----------------------------+6-----------------------+7---------------------------------+8----------------------------90+1----------------+2---------------------------91+1------------+2----------------------------+3-------------+4-----------------------------+5--------------------------+6-------------+7-------------+8--------------------------+9----------------------------92+1----------------+2------------------------------93+1------------------------------+2------------------------94+1----------------------+2-------------------------------------------+3-----------------------------+4-----------------------------+5-----------------------------+6--------------------------95+1----------------+2---------------------------+3-----------------------------+4------------------------96+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------97+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------98+1----------------+2---------------------------99+1-----------------100+1-------------------+2--------------+3-------------------------101+1------------+2-------------------------------------+3-------------+4-----------------------------+5--------------------------+6-------------+7-------------+8--------------------------+9----------------------------102+1----------------+2------------------------------103+1----------------+2------------------------------+3-----------------------+4---------------------------------104+1-------------------+2---------------------------------------------+3------------------------105+1----------------+2------------------------------106+1-----------------107+1----------------+2------------------------------108+1----------------+2------------------------------+3-----------------------------+4------------------------109+1-----------------110+1----------------+2------------------------------+3--------------------------111+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------112+1----------------+2------------------------------113+1-----------------114+1-----------------115+1----------------116+1----------------+2------------------------------+3-----------------------------+4------------------------117+1----------------118+1-----------------119+1--------------+2--------------------+3-------------------------+4----------------------+5-------------------------120+1-----------------121+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------122+1----------------+2------------------------------+3---------------------------------123+1-------------------+2--------------+3-------------------------124+1-----------------125+1----------------+2------------------------------+3----------------------+4--------------------------------126+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------127+1--------------------------------128+1----------------+2------------------------------+3-----------------------+4-------------------------129+1----------------+2---------------------------+3-----------------------------+4------------------------130+1----------------+2------------------------------131+1---------------------------------------+2-----------------------+3-----------------------+4-------------------------------------132+1-----------------------+2----------------+3------------------------------+4----------------------+5--------------------------+6-----------------------------+7---------------------------+8--------------------------+9----------------------+10---------------------------+11--------------------------------+12------------------------------+13-------------------------+14--------------------------+15---------------------------------+16-------------------------------+17--------------------------+18--------------------------------+19------------------------+20-----------------------------+21-----------------------------+22---------------------------------+23----------------------------+24-----------------------------+25-----------------------+26------------------------------+27-------------------------+28-------------------------+29---------------------------------+30--------------------------+31---------------------------+32---------------------------+33------------------------+34---------------------------+35----------------------+36--------------------------+37---------------------------+38----------------------------------+39--------------------------+40-----------------------+41----------------------------+42---------------------------+43--------------------------+44---------------------------+45----------------------------------+46--------------------------+47--------------------------+48--------------------------133+1--------------+2--------------------+3-------------------------+4----------------------+5-------------------------134+1--------------------+2---------------135+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------136+1----------------------------------------+2--------------------+3-----------------------+4-------------------------------------137+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------138+1---------------------------------------+2-----------------------+3-----------------------+4-------------------------------------139+1--------------+2-----------------------+3------------------------140+1--------------------+2--------------------+3-----------------------+4-------------------------------------141+1-------------------------+2------------------------142+1-----------------143+1----------------+2---------------------------+3-----------------------------+4------------------------144+1----------------------+2------------------------+3--------------------------------------+4----------------------------------145+1---------------------------+2------------------------------+3--------------------------------------------+4------------------------+5-------------------------------+6---------------------------------------------+7--------------------------------------------+8-------------------------------146+1--------------------------+2----------------+3------------------------------+4----------------------------+5-------------------------------+6----------------------------+7------------------------+8------------------------+9---------------------------+10------------------------+11----------------------------------+12-------------------------+13------------------------+14--------------------------+15-----------------------------+16----------------------------+17-----------------------------+18---------------------------------+19--------------------------+20---------------------+21-------------------------------+22-------------------------------+23------------------------------+24---------------------------+25--------------------------+26---------------------------------+27------------------------+28--------------------------+29--------------------------+30--------------------------+31--------------------------+32----------------------------+33----------------------+34--------------------------+35----------------------+36--------------------------+37---------------------------+38--------------------------+39----------------------+40-----------------------+41-----------------------------+42-----------------------------+43--------------------------+44-------------------------+45------------------------------+46---------------------------------+47--------------------------+48--------------------------147+1-----------------------------+2--------------------+3---------------148+1--------------------+2--------------------+3-----------------------+4-------------------------------------149+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------150+1---------------------------------------+2--------------------+3-------------------------------------+4-----------------------151+1------------------------------+2------------------------152+1--------------------------------153+1-----------------154+1----------------------+2-----------------------+3-------------------------------------------+4--------------------------+5-----------------------------+6-----------------------------+7--------------------------155+1------------------------156+1---------------- \ No newline at end of file diff --git a/e2etests/testdata/regression/grid_oom/elk/board.exp.json b/e2etests/testdata/regression/grid_oom/elk/board.exp.json index 93a705ba6..5543cfe29 100644 --- a/e2etests/testdata/regression/grid_oom/elk/board.exp.json +++ b/e2etests/testdata/regression/grid_oom/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -82,6 +91,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -136,6 +146,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -200,6 +211,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -249,6 +261,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -313,6 +326,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -377,6 +391,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -441,6 +456,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -520,6 +536,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -569,6 +586,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +651,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -712,6 +731,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -761,6 +781,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -825,6 +846,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -879,6 +901,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -933,6 +956,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -982,6 +1006,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1031,6 +1056,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1080,6 +1106,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1129,6 +1156,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1193,6 +1221,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1257,6 +1286,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1311,6 +1341,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1360,6 +1391,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1409,6 +1441,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1463,6 +1496,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1512,6 +1546,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1576,6 +1611,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1625,6 +1661,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1684,6 +1721,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1748,6 +1786,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1812,6 +1851,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1866,6 +1906,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1920,6 +1961,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1969,6 +2011,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2018,6 +2061,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2082,6 +2126,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2131,6 +2176,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2180,6 +2226,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2229,6 +2276,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2278,6 +2326,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2327,6 +2376,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2391,6 +2441,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2455,6 +2506,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2504,6 +2556,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2568,6 +2621,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2617,6 +2671,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2681,6 +2736,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2745,6 +2801,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2824,6 +2881,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2878,6 +2936,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2957,6 +3016,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3011,6 +3071,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3075,6 +3136,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3124,6 +3186,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3178,6 +3241,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3227,6 +3291,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3276,6 +3341,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3330,6 +3396,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3379,6 +3446,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3443,6 +3511,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3497,6 +3566,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3546,6 +3616,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3610,6 +3681,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3694,6 +3766,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3758,6 +3831,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3827,6 +3901,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3891,6 +3966,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3960,6 +4036,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4029,6 +4106,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4083,6 +4161,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4147,6 +4226,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4201,6 +4281,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4265,6 +4346,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4319,6 +4401,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4383,6 +4466,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4442,6 +4526,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4506,6 +4591,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4605,6 +4691,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4709,6 +4796,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4763,6 +4851,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4827,6 +4916,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4886,6 +4976,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4940,6 +5031,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5014,6 +5106,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5078,6 +5171,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5142,6 +5236,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5191,6 +5286,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5275,6 +5371,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5329,6 +5426,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5418,6 +5516,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5472,6 +5571,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5526,6 +5626,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5600,6 +5701,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5664,6 +5766,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5728,6 +5831,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5792,6 +5896,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5846,6 +5951,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5895,6 +6001,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5954,6 +6061,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6043,6 +6151,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6097,6 +6206,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6161,6 +6271,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6220,6 +6331,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6274,6 +6386,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6323,6 +6436,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6377,6 +6491,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6441,6 +6556,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6490,6 +6606,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6549,6 +6666,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6613,6 +6731,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6667,6 +6786,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6716,6 +6836,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6765,6 +6886,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6814,6 +6936,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6878,6 +7001,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6927,6 +7051,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6976,6 +7101,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7045,6 +7171,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7094,6 +7221,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7158,6 +7286,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7217,6 +7346,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7276,6 +7406,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7325,6 +7456,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7389,6 +7521,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7453,6 +7586,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7502,6 +7636,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7566,6 +7701,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7630,6 +7766,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7684,6 +7821,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7748,6 +7886,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8032,6 +8171,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8101,6 +8241,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8155,6 +8296,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8219,6 +8361,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8283,6 +8426,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8347,6 +8491,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8411,6 +8556,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8470,6 +8616,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8534,6 +8681,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8588,6 +8736,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8637,6 +8786,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8701,6 +8851,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8765,6 +8916,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8849,6 +9001,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9133,6 +9286,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9192,6 +9346,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9256,6 +9411,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9320,6 +9476,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9384,6 +9541,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9438,6 +9596,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9487,6 +9646,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9536,6 +9696,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9615,6 +9776,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9664,6 +9826,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9715,6 +9878,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/grid_oom/elk/sketch.exp.svg b/e2etests/testdata/regression/grid_oom/elk/sketch.exp.svg index 36111587a..34c5c463b 100644 --- a/e2etests/testdata/regression/grid_oom/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/grid_oom/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -1+1------------------+2-------------------------------+3------------------------------+4-------------------------2+1-----------------+2----------------------------3+1-----------------+2----------------------------+3------------------------------+4-------------------------4+1----------------------------5+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------6+1----------------------------------------+2------------------------+3------------------------+4--------------------------------------7+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------9+1----------------------+2-------------------------------------------+3-----------------------+4--------------------------+5-----------------------------+6-----------------------------+7--------------------------10+1-----------------11+1----------------+2---------------------------+3-----------------------------+4------------------------12+1----------------------+2-----------------------+3-------------+4-------------+5------------------------+6------------------------------------------------+7--------------------------13+1--------------------------------14+1----------------+2---------------------------+3-----------------------------+4------------------------15+1------------------------+2----------------------16+1----------------+2------------------------------17+1-----------------18+1----------------19+1-----------------20+1-----------------21+1----------------+2---------------------------+3-----------------------------+4------------------------22+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------23+1----------------+2------------------------------24+1-----------------25+1-----------------26+1----------------+2------------------------------27+1-----------------28+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------29+1--------------------------------30+1-------------------+2---------------------------------------------+3--------------------------------31+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------32+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------33+1------------------------+2----------------------34+1----------------+2------------------------------35+1----------------36+1-----------------37+1----------------+2---------------------------+3-----------------------------+4------------------------38+1-----------------39+1-----------------40+1-----------------41+1-----------------42+1-----------------43+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------44+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------45+1-----------------46+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------47+1-----------------48+1-------------------------------+2------------------------------+3--------------------------------------------+4--------------------------------------------------------------------49+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------50+1--------------+2-----------------------+3-------------+4------------------------+5------------------------+6-------------------------------+7--------------------------51+1----------------+2------------------------------52+1----------------------+2-----------------------+3-------------+4-------------+5------------------------+6------------------------------------------------+7--------------------------53+1----------------+2------------------------------54+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------55+1----------------------------------------------56+1----------------+2------------------------------57+1-----------------58+1-----------------59+1-----------+2--------------------------------------------60+1-----------------61+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------62+1------------------------+2----------------------63+1-----------------64+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------65+1-------------+2--------------------------+3-------------+4-------------+5--------------------------+6-----------------------+7---------------------------------+8----------------------------66+1----------------------------------------+2--------------------+3-----------------------+4-------------------------------------67+1----------------+2------------------------------+3-----------------------------+4-------------------------------+5---------------------------68+1----------------------------------------+2-----------------------+3-------------------------------------+4-----------------------69+1---------------------------+2------------------------------+3--------------------------------+4--------------------------------------------------------------------+5------------------------------70+1--------------------+2--------------------------+3---------------------+4-------------------------------+5-------------------------71+1------------------------------+2------------------------72+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------73+1----------------+2---------------------------74+1----------------+2------------------------+3--------------------------+4----------------------75+1----------------+2---------------------------76+1----------------+2---------------------------+3-----------------------------+4------------------------77+1----------------+2------------------------------+3--------------------------78+1----------------+2------------------------------+3-----------------------------+4------------------------79+1----------------------+2--------------------------------+3--------------------------------+4-------------------------------------------+5-------------------------+6----------------------------+7---------------------------+8----------------------------------------+9-----------------------------+10-----------------------------+11----------------------80+1--------------------------------+2----------------------------------+3------------------------+4-------------------------+5------------------------------+6------------------------------+7----------------------+8--------------------------+9----------------------+10-----------------------+11-------------------------+12----------------------------------81+1----------------+2------------------------------82+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------83+1--------------+2-----------------------+3------------------------84+1----------------+2------------------------------85+1-----------------------+2------------------------+3--------------------------------+4---------------------------------+5-----------------------------+6-----------------------------86+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------87+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------88+1--------------------------------89+1-------------+2--------------------------+3-------------+4-------------+5-----------------------------+6-----------------------+7---------------------------------+8----------------------------90+1----------------+2---------------------------91+1------------+2----------------------------+3-------------+4-----------------------------+5--------------------------+6-------------+7-------------+8--------------------------+9----------------------------92+1----------------+2------------------------------93+1------------------------------+2------------------------94+1----------------------+2-------------------------------------------+3-----------------------------+4-----------------------------+5-----------------------------+6--------------------------95+1----------------+2---------------------------+3-----------------------------+4------------------------96+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------97+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------98+1----------------+2---------------------------99+1-----------------100+1-------------------+2--------------+3-------------------------101+1------------+2-------------------------------------+3-------------+4-----------------------------+5--------------------------+6-------------+7-------------+8--------------------------+9----------------------------102+1----------------+2------------------------------103+1----------------+2------------------------------+3-----------------------+4---------------------------------104+1-------------------+2---------------------------------------------+3------------------------105+1----------------+2------------------------------106+1-----------------107+1----------------+2------------------------------108+1----------------+2------------------------------+3-----------------------------+4------------------------109+1-----------------110+1----------------+2------------------------------+3--------------------------111+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------112+1----------------+2------------------------------113+1-----------------114+1-----------------115+1----------------116+1----------------+2------------------------------+3-----------------------------+4------------------------117+1----------------118+1-----------------119+1--------------+2--------------------+3-------------------------+4----------------------+5-------------------------120+1-----------------121+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------122+1----------------+2------------------------------+3---------------------------------123+1-------------------+2--------------+3-------------------------124+1-----------------125+1----------------+2------------------------------+3----------------------+4--------------------------------126+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------127+1--------------------------------128+1----------------+2------------------------------+3-----------------------+4-------------------------129+1----------------+2---------------------------+3-----------------------------+4------------------------130+1----------------+2------------------------------131+1---------------------------------------+2-----------------------+3-----------------------+4-------------------------------------132+1-----------------------+2----------------+3------------------------------+4----------------------+5--------------------------+6-----------------------------+7---------------------------+8--------------------------+9----------------------+10---------------------------+11--------------------------------+12------------------------------+13-------------------------+14--------------------------+15---------------------------------+16-------------------------------+17--------------------------+18--------------------------------+19------------------------+20-----------------------------+21-----------------------------+22---------------------------------+23----------------------------+24-----------------------------+25-----------------------+26------------------------------+27-------------------------+28-------------------------+29---------------------------------+30--------------------------+31---------------------------+32---------------------------+33------------------------+34---------------------------+35----------------------+36--------------------------+37---------------------------+38----------------------------------+39--------------------------+40-----------------------+41----------------------------+42---------------------------+43--------------------------+44---------------------------+45----------------------------------+46--------------------------+47--------------------------+48--------------------------133+1--------------+2--------------------+3-------------------------+4----------------------+5-------------------------134+1--------------------+2---------------135+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------136+1----------------------------------------+2--------------------+3-----------------------+4-------------------------------------137+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------138+1---------------------------------------+2-----------------------+3-----------------------+4-------------------------------------139+1--------------+2-----------------------+3------------------------140+1--------------------+2--------------------+3-----------------------+4-------------------------------------141+1-------------------------+2------------------------142+1-----------------143+1----------------+2---------------------------+3-----------------------------+4------------------------144+1----------------------+2------------------------+3--------------------------------------+4----------------------------------145+1---------------------------+2------------------------------+3--------------------------------------------+4------------------------+5-------------------------------+6---------------------------------------------+7--------------------------------------------+8-------------------------------146+1--------------------------+2----------------+3------------------------------+4----------------------------+5-------------------------------+6----------------------------+7------------------------+8------------------------+9---------------------------+10------------------------+11----------------------------------+12-------------------------+13------------------------+14--------------------------+15-----------------------------+16----------------------------+17-----------------------------+18---------------------------------+19--------------------------+20---------------------+21-------------------------------+22-------------------------------+23------------------------------+24---------------------------+25--------------------------+26---------------------------------+27------------------------+28--------------------------+29--------------------------+30--------------------------+31--------------------------+32----------------------------+33----------------------+34--------------------------+35----------------------+36--------------------------+37---------------------------+38--------------------------+39----------------------+40-----------------------+41-----------------------------+42-----------------------------+43--------------------------+44-------------------------+45------------------------------+46---------------------------------+47--------------------------+48--------------------------147+1-----------------------------+2--------------------+3---------------148+1--------------------+2--------------------+3-----------------------+4-------------------------------------149+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------150+1---------------------------------------+2--------------------+3-------------------------------------+4-----------------------151+1------------------------------+2------------------------152+1--------------------------------153+1-----------------154+1----------------------+2-----------------------+3-------------------------------------------+4--------------------------+5-----------------------------+6-----------------------------+7--------------------------155+1------------------------156+1---------------- + .d2-3601822937 .fill-N1{fill:#0A0F25;} + .d2-3601822937 .fill-N2{fill:#676C7E;} + .d2-3601822937 .fill-N3{fill:#9499AB;} + .d2-3601822937 .fill-N4{fill:#CFD2DD;} + .d2-3601822937 .fill-N5{fill:#DEE1EB;} + .d2-3601822937 .fill-N6{fill:#EEF1F8;} + .d2-3601822937 .fill-N7{fill:#FFFFFF;} + .d2-3601822937 .fill-B1{fill:#0D32B2;} + .d2-3601822937 .fill-B2{fill:#0D32B2;} + .d2-3601822937 .fill-B3{fill:#E3E9FD;} + .d2-3601822937 .fill-B4{fill:#E3E9FD;} + .d2-3601822937 .fill-B5{fill:#EDF0FD;} + .d2-3601822937 .fill-B6{fill:#F7F8FE;} + .d2-3601822937 .fill-AA2{fill:#4A6FF3;} + .d2-3601822937 .fill-AA4{fill:#EDF0FD;} + .d2-3601822937 .fill-AA5{fill:#F7F8FE;} + .d2-3601822937 .fill-AB4{fill:#EDF0FD;} + .d2-3601822937 .fill-AB5{fill:#F7F8FE;} + .d2-3601822937 .stroke-N1{stroke:#0A0F25;} + .d2-3601822937 .stroke-N2{stroke:#676C7E;} + .d2-3601822937 .stroke-N3{stroke:#9499AB;} + .d2-3601822937 .stroke-N4{stroke:#CFD2DD;} + .d2-3601822937 .stroke-N5{stroke:#DEE1EB;} + .d2-3601822937 .stroke-N6{stroke:#EEF1F8;} + .d2-3601822937 .stroke-N7{stroke:#FFFFFF;} + .d2-3601822937 .stroke-B1{stroke:#0D32B2;} + .d2-3601822937 .stroke-B2{stroke:#0D32B2;} + .d2-3601822937 .stroke-B3{stroke:#E3E9FD;} + .d2-3601822937 .stroke-B4{stroke:#E3E9FD;} + .d2-3601822937 .stroke-B5{stroke:#EDF0FD;} + .d2-3601822937 .stroke-B6{stroke:#F7F8FE;} + .d2-3601822937 .stroke-AA2{stroke:#4A6FF3;} + .d2-3601822937 .stroke-AA4{stroke:#EDF0FD;} + .d2-3601822937 .stroke-AA5{stroke:#F7F8FE;} + .d2-3601822937 .stroke-AB4{stroke:#EDF0FD;} + .d2-3601822937 .stroke-AB5{stroke:#F7F8FE;} + .d2-3601822937 .background-color-N1{background-color:#0A0F25;} + .d2-3601822937 .background-color-N2{background-color:#676C7E;} + .d2-3601822937 .background-color-N3{background-color:#9499AB;} + .d2-3601822937 .background-color-N4{background-color:#CFD2DD;} + .d2-3601822937 .background-color-N5{background-color:#DEE1EB;} + .d2-3601822937 .background-color-N6{background-color:#EEF1F8;} + .d2-3601822937 .background-color-N7{background-color:#FFFFFF;} + .d2-3601822937 .background-color-B1{background-color:#0D32B2;} + .d2-3601822937 .background-color-B2{background-color:#0D32B2;} + .d2-3601822937 .background-color-B3{background-color:#E3E9FD;} + .d2-3601822937 .background-color-B4{background-color:#E3E9FD;} + .d2-3601822937 .background-color-B5{background-color:#EDF0FD;} + .d2-3601822937 .background-color-B6{background-color:#F7F8FE;} + .d2-3601822937 .background-color-AA2{background-color:#4A6FF3;} + .d2-3601822937 .background-color-AA4{background-color:#EDF0FD;} + .d2-3601822937 .background-color-AA5{background-color:#F7F8FE;} + .d2-3601822937 .background-color-AB4{background-color:#EDF0FD;} + .d2-3601822937 .background-color-AB5{background-color:#F7F8FE;} + .d2-3601822937 .color-N1{color:#0A0F25;} + .d2-3601822937 .color-N2{color:#676C7E;} + .d2-3601822937 .color-N3{color:#9499AB;} + .d2-3601822937 .color-N4{color:#CFD2DD;} + .d2-3601822937 .color-N5{color:#DEE1EB;} + .d2-3601822937 .color-N6{color:#EEF1F8;} + .d2-3601822937 .color-N7{color:#FFFFFF;} + .d2-3601822937 .color-B1{color:#0D32B2;} + .d2-3601822937 .color-B2{color:#0D32B2;} + .d2-3601822937 .color-B3{color:#E3E9FD;} + .d2-3601822937 .color-B4{color:#E3E9FD;} + .d2-3601822937 .color-B5{color:#EDF0FD;} + .d2-3601822937 .color-B6{color:#F7F8FE;} + .d2-3601822937 .color-AA2{color:#4A6FF3;} + .d2-3601822937 .color-AA4{color:#EDF0FD;} + .d2-3601822937 .color-AA5{color:#F7F8FE;} + .d2-3601822937 .color-AB4{color:#EDF0FD;} + .d2-3601822937 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3601822937);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3601822937);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3601822937);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3601822937);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3601822937);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3601822937);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3601822937);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3601822937);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3601822937);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3601822937);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3601822937);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3601822937);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3601822937);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3601822937);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3601822937);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3601822937);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3601822937);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3601822937);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>1+1------------------+2-------------------------------+3------------------------------+4-------------------------2+1-----------------+2----------------------------3+1-----------------+2----------------------------+3------------------------------+4-------------------------4+1----------------------------5+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------6+1----------------------------------------+2------------------------+3------------------------+4--------------------------------------7+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------9+1----------------------+2-------------------------------------------+3-----------------------+4--------------------------+5-----------------------------+6-----------------------------+7--------------------------10+1-----------------11+1----------------+2---------------------------+3-----------------------------+4------------------------12+1----------------------+2-----------------------+3-------------+4-------------+5------------------------+6------------------------------------------------+7--------------------------13+1--------------------------------14+1----------------+2---------------------------+3-----------------------------+4------------------------15+1------------------------+2----------------------16+1----------------+2------------------------------17+1-----------------18+1----------------19+1-----------------20+1-----------------21+1----------------+2---------------------------+3-----------------------------+4------------------------22+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------23+1----------------+2------------------------------24+1-----------------25+1-----------------26+1----------------+2------------------------------27+1-----------------28+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------29+1--------------------------------30+1-------------------+2---------------------------------------------+3--------------------------------31+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------32+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------33+1------------------------+2----------------------34+1----------------+2------------------------------35+1----------------36+1-----------------37+1----------------+2---------------------------+3-----------------------------+4------------------------38+1-----------------39+1-----------------40+1-----------------41+1-----------------42+1-----------------43+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------44+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------45+1-----------------46+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------47+1-----------------48+1-------------------------------+2------------------------------+3--------------------------------------------+4--------------------------------------------------------------------49+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------50+1--------------+2-----------------------+3-------------+4------------------------+5------------------------+6-------------------------------+7--------------------------51+1----------------+2------------------------------52+1----------------------+2-----------------------+3-------------+4-------------+5------------------------+6------------------------------------------------+7--------------------------53+1----------------+2------------------------------54+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------55+1----------------------------------------------56+1----------------+2------------------------------57+1-----------------58+1-----------------59+1-----------+2--------------------------------------------60+1-----------------61+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------62+1------------------------+2----------------------63+1-----------------64+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------65+1-------------+2--------------------------+3-------------+4-------------+5--------------------------+6-----------------------+7---------------------------------+8----------------------------66+1----------------------------------------+2--------------------+3-----------------------+4-------------------------------------67+1----------------+2------------------------------+3-----------------------------+4-------------------------------+5---------------------------68+1----------------------------------------+2-----------------------+3-------------------------------------+4-----------------------69+1---------------------------+2------------------------------+3--------------------------------+4--------------------------------------------------------------------+5------------------------------70+1--------------------+2--------------------------+3---------------------+4-------------------------------+5-------------------------71+1------------------------------+2------------------------72+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------73+1----------------+2---------------------------74+1----------------+2------------------------+3--------------------------+4----------------------75+1----------------+2---------------------------76+1----------------+2---------------------------+3-----------------------------+4------------------------77+1----------------+2------------------------------+3--------------------------78+1----------------+2------------------------------+3-----------------------------+4------------------------79+1----------------------+2--------------------------------+3--------------------------------+4-------------------------------------------+5-------------------------+6----------------------------+7---------------------------+8----------------------------------------+9-----------------------------+10-----------------------------+11----------------------80+1--------------------------------+2----------------------------------+3------------------------+4-------------------------+5------------------------------+6------------------------------+7----------------------+8--------------------------+9----------------------+10-----------------------+11-------------------------+12----------------------------------81+1----------------+2------------------------------82+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------83+1--------------+2-----------------------+3------------------------84+1----------------+2------------------------------85+1-----------------------+2------------------------+3--------------------------------+4---------------------------------+5-----------------------------+6-----------------------------86+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------87+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------88+1--------------------------------89+1-------------+2--------------------------+3-------------+4-------------+5-----------------------------+6-----------------------+7---------------------------------+8----------------------------90+1----------------+2---------------------------91+1------------+2----------------------------+3-------------+4-----------------------------+5--------------------------+6-------------+7-------------+8--------------------------+9----------------------------92+1----------------+2------------------------------93+1------------------------------+2------------------------94+1----------------------+2-------------------------------------------+3-----------------------------+4-----------------------------+5-----------------------------+6--------------------------95+1----------------+2---------------------------+3-----------------------------+4------------------------96+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------97+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------98+1----------------+2---------------------------99+1-----------------100+1-------------------+2--------------+3-------------------------101+1------------+2-------------------------------------+3-------------+4-----------------------------+5--------------------------+6-------------+7-------------+8--------------------------+9----------------------------102+1----------------+2------------------------------103+1----------------+2------------------------------+3-----------------------+4---------------------------------104+1-------------------+2---------------------------------------------+3------------------------105+1----------------+2------------------------------106+1-----------------107+1----------------+2------------------------------108+1----------------+2------------------------------+3-----------------------------+4------------------------109+1-----------------110+1----------------+2------------------------------+3--------------------------111+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------112+1----------------+2------------------------------113+1-----------------114+1-----------------115+1----------------116+1----------------+2------------------------------+3-----------------------------+4------------------------117+1----------------118+1-----------------119+1--------------+2--------------------+3-------------------------+4----------------------+5-------------------------120+1-----------------121+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------122+1----------------+2------------------------------+3---------------------------------123+1-------------------+2--------------+3-------------------------124+1-----------------125+1----------------+2------------------------------+3----------------------+4--------------------------------126+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------127+1--------------------------------128+1----------------+2------------------------------+3-----------------------+4-------------------------129+1----------------+2---------------------------+3-----------------------------+4------------------------130+1----------------+2------------------------------131+1---------------------------------------+2-----------------------+3-----------------------+4-------------------------------------132+1-----------------------+2----------------+3------------------------------+4----------------------+5--------------------------+6-----------------------------+7---------------------------+8--------------------------+9----------------------+10---------------------------+11--------------------------------+12------------------------------+13-------------------------+14--------------------------+15---------------------------------+16-------------------------------+17--------------------------+18--------------------------------+19------------------------+20-----------------------------+21-----------------------------+22---------------------------------+23----------------------------+24-----------------------------+25-----------------------+26------------------------------+27-------------------------+28-------------------------+29---------------------------------+30--------------------------+31---------------------------+32---------------------------+33------------------------+34---------------------------+35----------------------+36--------------------------+37---------------------------+38----------------------------------+39--------------------------+40-----------------------+41----------------------------+42---------------------------+43--------------------------+44---------------------------+45----------------------------------+46--------------------------+47--------------------------+48--------------------------133+1--------------+2--------------------+3-------------------------+4----------------------+5-------------------------134+1--------------------+2---------------135+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------136+1----------------------------------------+2--------------------+3-----------------------+4-------------------------------------137+1---------------------------------------+2--------------------+3-----------------------+4-------------------------------------138+1---------------------------------------+2-----------------------+3-----------------------+4-------------------------------------139+1--------------+2-----------------------+3------------------------140+1--------------------+2--------------------+3-----------------------+4-------------------------------------141+1-------------------------+2------------------------142+1-----------------143+1----------------+2---------------------------+3-----------------------------+4------------------------144+1----------------------+2------------------------+3--------------------------------------+4----------------------------------145+1---------------------------+2------------------------------+3--------------------------------------------+4------------------------+5-------------------------------+6---------------------------------------------+7--------------------------------------------+8-------------------------------146+1--------------------------+2----------------+3------------------------------+4----------------------------+5-------------------------------+6----------------------------+7------------------------+8------------------------+9---------------------------+10------------------------+11----------------------------------+12-------------------------+13------------------------+14--------------------------+15-----------------------------+16----------------------------+17-----------------------------+18---------------------------------+19--------------------------+20---------------------+21-------------------------------+22-------------------------------+23------------------------------+24---------------------------+25--------------------------+26---------------------------------+27------------------------+28--------------------------+29--------------------------+30--------------------------+31--------------------------+32----------------------------+33----------------------+34--------------------------+35----------------------+36--------------------------+37---------------------------+38--------------------------+39----------------------+40-----------------------+41-----------------------------+42-----------------------------+43--------------------------+44-------------------------+45------------------------------+46---------------------------------+47--------------------------+48--------------------------147+1-----------------------------+2--------------------+3---------------148+1--------------------+2--------------------+3-----------------------+4-------------------------------------149+1----------------------------------------+2-----------------------+3-----------------------+4-------------------------------------150+1---------------------------------------+2--------------------+3-------------------------------------+4-----------------------151+1------------------------------+2------------------------152+1--------------------------------153+1-----------------154+1----------------------+2-----------------------+3-------------------------------------------+4--------------------------+5-----------------------------+6-----------------------------+7--------------------------155+1------------------------156+1---------------- \ No newline at end of file diff --git a/e2etests/testdata/regression/grid_panic/dagre/board.exp.json b/e2etests/testdata/regression/grid_panic/dagre/board.exp.json index 2feeb9666..0e03df597 100644 --- a/e2etests/testdata/regression/grid_panic/dagre/board.exp.json +++ b/e2etests/testdata/regression/grid_panic/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -348,6 +364,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/grid_panic/dagre/sketch.exp.svg b/e2etests/testdata/regression/grid_panic/dagre/sketch.exp.svg index 682bef761..0d3889b83 100644 --- a/e2etests/testdata/regression/grid_panic/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/grid_panic/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -2 rows 1 obj3 rows 2 obj4 columns 2 objoneonetwoonetwo + .d2-3064464950 .fill-N1{fill:#0A0F25;} + .d2-3064464950 .fill-N2{fill:#676C7E;} + .d2-3064464950 .fill-N3{fill:#9499AB;} + .d2-3064464950 .fill-N4{fill:#CFD2DD;} + .d2-3064464950 .fill-N5{fill:#DEE1EB;} + .d2-3064464950 .fill-N6{fill:#EEF1F8;} + .d2-3064464950 .fill-N7{fill:#FFFFFF;} + .d2-3064464950 .fill-B1{fill:#0D32B2;} + .d2-3064464950 .fill-B2{fill:#0D32B2;} + .d2-3064464950 .fill-B3{fill:#E3E9FD;} + .d2-3064464950 .fill-B4{fill:#E3E9FD;} + .d2-3064464950 .fill-B5{fill:#EDF0FD;} + .d2-3064464950 .fill-B6{fill:#F7F8FE;} + .d2-3064464950 .fill-AA2{fill:#4A6FF3;} + .d2-3064464950 .fill-AA4{fill:#EDF0FD;} + .d2-3064464950 .fill-AA5{fill:#F7F8FE;} + .d2-3064464950 .fill-AB4{fill:#EDF0FD;} + .d2-3064464950 .fill-AB5{fill:#F7F8FE;} + .d2-3064464950 .stroke-N1{stroke:#0A0F25;} + .d2-3064464950 .stroke-N2{stroke:#676C7E;} + .d2-3064464950 .stroke-N3{stroke:#9499AB;} + .d2-3064464950 .stroke-N4{stroke:#CFD2DD;} + .d2-3064464950 .stroke-N5{stroke:#DEE1EB;} + .d2-3064464950 .stroke-N6{stroke:#EEF1F8;} + .d2-3064464950 .stroke-N7{stroke:#FFFFFF;} + .d2-3064464950 .stroke-B1{stroke:#0D32B2;} + .d2-3064464950 .stroke-B2{stroke:#0D32B2;} + .d2-3064464950 .stroke-B3{stroke:#E3E9FD;} + .d2-3064464950 .stroke-B4{stroke:#E3E9FD;} + .d2-3064464950 .stroke-B5{stroke:#EDF0FD;} + .d2-3064464950 .stroke-B6{stroke:#F7F8FE;} + .d2-3064464950 .stroke-AA2{stroke:#4A6FF3;} + .d2-3064464950 .stroke-AA4{stroke:#EDF0FD;} + .d2-3064464950 .stroke-AA5{stroke:#F7F8FE;} + .d2-3064464950 .stroke-AB4{stroke:#EDF0FD;} + .d2-3064464950 .stroke-AB5{stroke:#F7F8FE;} + .d2-3064464950 .background-color-N1{background-color:#0A0F25;} + .d2-3064464950 .background-color-N2{background-color:#676C7E;} + .d2-3064464950 .background-color-N3{background-color:#9499AB;} + .d2-3064464950 .background-color-N4{background-color:#CFD2DD;} + .d2-3064464950 .background-color-N5{background-color:#DEE1EB;} + .d2-3064464950 .background-color-N6{background-color:#EEF1F8;} + .d2-3064464950 .background-color-N7{background-color:#FFFFFF;} + .d2-3064464950 .background-color-B1{background-color:#0D32B2;} + .d2-3064464950 .background-color-B2{background-color:#0D32B2;} + .d2-3064464950 .background-color-B3{background-color:#E3E9FD;} + .d2-3064464950 .background-color-B4{background-color:#E3E9FD;} + .d2-3064464950 .background-color-B5{background-color:#EDF0FD;} + .d2-3064464950 .background-color-B6{background-color:#F7F8FE;} + .d2-3064464950 .background-color-AA2{background-color:#4A6FF3;} + .d2-3064464950 .background-color-AA4{background-color:#EDF0FD;} + .d2-3064464950 .background-color-AA5{background-color:#F7F8FE;} + .d2-3064464950 .background-color-AB4{background-color:#EDF0FD;} + .d2-3064464950 .background-color-AB5{background-color:#F7F8FE;} + .d2-3064464950 .color-N1{color:#0A0F25;} + .d2-3064464950 .color-N2{color:#676C7E;} + .d2-3064464950 .color-N3{color:#9499AB;} + .d2-3064464950 .color-N4{color:#CFD2DD;} + .d2-3064464950 .color-N5{color:#DEE1EB;} + .d2-3064464950 .color-N6{color:#EEF1F8;} + .d2-3064464950 .color-N7{color:#FFFFFF;} + .d2-3064464950 .color-B1{color:#0D32B2;} + .d2-3064464950 .color-B2{color:#0D32B2;} + .d2-3064464950 .color-B3{color:#E3E9FD;} + .d2-3064464950 .color-B4{color:#E3E9FD;} + .d2-3064464950 .color-B5{color:#EDF0FD;} + .d2-3064464950 .color-B6{color:#F7F8FE;} + .d2-3064464950 .color-AA2{color:#4A6FF3;} + .d2-3064464950 .color-AA4{color:#EDF0FD;} + .d2-3064464950 .color-AA5{color:#F7F8FE;} + .d2-3064464950 .color-AB4{color:#EDF0FD;} + .d2-3064464950 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3064464950);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3064464950);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3064464950);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3064464950);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3064464950);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3064464950);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3064464950);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3064464950);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3064464950);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3064464950);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3064464950);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3064464950);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3064464950);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3064464950);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3064464950);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3064464950);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3064464950);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3064464950);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>2 rows 1 obj3 rows 2 obj4 columns 2 objoneonetwoonetwo - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/grid_panic/elk/board.exp.json b/e2etests/testdata/regression/grid_panic/elk/board.exp.json index a34501eec..af6d28823 100644 --- a/e2etests/testdata/regression/grid_panic/elk/board.exp.json +++ b/e2etests/testdata/regression/grid_panic/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -348,6 +364,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/grid_panic/elk/sketch.exp.svg b/e2etests/testdata/regression/grid_panic/elk/sketch.exp.svg index 17a572a28..7b83fc101 100644 --- a/e2etests/testdata/regression/grid_panic/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/grid_panic/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -2 rows 1 obj3 rows 2 obj4 columns 2 objoneonetwoonetwo + .d2-2347713780 .fill-N1{fill:#0A0F25;} + .d2-2347713780 .fill-N2{fill:#676C7E;} + .d2-2347713780 .fill-N3{fill:#9499AB;} + .d2-2347713780 .fill-N4{fill:#CFD2DD;} + .d2-2347713780 .fill-N5{fill:#DEE1EB;} + .d2-2347713780 .fill-N6{fill:#EEF1F8;} + .d2-2347713780 .fill-N7{fill:#FFFFFF;} + .d2-2347713780 .fill-B1{fill:#0D32B2;} + .d2-2347713780 .fill-B2{fill:#0D32B2;} + .d2-2347713780 .fill-B3{fill:#E3E9FD;} + .d2-2347713780 .fill-B4{fill:#E3E9FD;} + .d2-2347713780 .fill-B5{fill:#EDF0FD;} + .d2-2347713780 .fill-B6{fill:#F7F8FE;} + .d2-2347713780 .fill-AA2{fill:#4A6FF3;} + .d2-2347713780 .fill-AA4{fill:#EDF0FD;} + .d2-2347713780 .fill-AA5{fill:#F7F8FE;} + .d2-2347713780 .fill-AB4{fill:#EDF0FD;} + .d2-2347713780 .fill-AB5{fill:#F7F8FE;} + .d2-2347713780 .stroke-N1{stroke:#0A0F25;} + .d2-2347713780 .stroke-N2{stroke:#676C7E;} + .d2-2347713780 .stroke-N3{stroke:#9499AB;} + .d2-2347713780 .stroke-N4{stroke:#CFD2DD;} + .d2-2347713780 .stroke-N5{stroke:#DEE1EB;} + .d2-2347713780 .stroke-N6{stroke:#EEF1F8;} + .d2-2347713780 .stroke-N7{stroke:#FFFFFF;} + .d2-2347713780 .stroke-B1{stroke:#0D32B2;} + .d2-2347713780 .stroke-B2{stroke:#0D32B2;} + .d2-2347713780 .stroke-B3{stroke:#E3E9FD;} + .d2-2347713780 .stroke-B4{stroke:#E3E9FD;} + .d2-2347713780 .stroke-B5{stroke:#EDF0FD;} + .d2-2347713780 .stroke-B6{stroke:#F7F8FE;} + .d2-2347713780 .stroke-AA2{stroke:#4A6FF3;} + .d2-2347713780 .stroke-AA4{stroke:#EDF0FD;} + .d2-2347713780 .stroke-AA5{stroke:#F7F8FE;} + .d2-2347713780 .stroke-AB4{stroke:#EDF0FD;} + .d2-2347713780 .stroke-AB5{stroke:#F7F8FE;} + .d2-2347713780 .background-color-N1{background-color:#0A0F25;} + .d2-2347713780 .background-color-N2{background-color:#676C7E;} + .d2-2347713780 .background-color-N3{background-color:#9499AB;} + .d2-2347713780 .background-color-N4{background-color:#CFD2DD;} + .d2-2347713780 .background-color-N5{background-color:#DEE1EB;} + .d2-2347713780 .background-color-N6{background-color:#EEF1F8;} + .d2-2347713780 .background-color-N7{background-color:#FFFFFF;} + .d2-2347713780 .background-color-B1{background-color:#0D32B2;} + .d2-2347713780 .background-color-B2{background-color:#0D32B2;} + .d2-2347713780 .background-color-B3{background-color:#E3E9FD;} + .d2-2347713780 .background-color-B4{background-color:#E3E9FD;} + .d2-2347713780 .background-color-B5{background-color:#EDF0FD;} + .d2-2347713780 .background-color-B6{background-color:#F7F8FE;} + .d2-2347713780 .background-color-AA2{background-color:#4A6FF3;} + .d2-2347713780 .background-color-AA4{background-color:#EDF0FD;} + .d2-2347713780 .background-color-AA5{background-color:#F7F8FE;} + .d2-2347713780 .background-color-AB4{background-color:#EDF0FD;} + .d2-2347713780 .background-color-AB5{background-color:#F7F8FE;} + .d2-2347713780 .color-N1{color:#0A0F25;} + .d2-2347713780 .color-N2{color:#676C7E;} + .d2-2347713780 .color-N3{color:#9499AB;} + .d2-2347713780 .color-N4{color:#CFD2DD;} + .d2-2347713780 .color-N5{color:#DEE1EB;} + .d2-2347713780 .color-N6{color:#EEF1F8;} + .d2-2347713780 .color-N7{color:#FFFFFF;} + .d2-2347713780 .color-B1{color:#0D32B2;} + .d2-2347713780 .color-B2{color:#0D32B2;} + .d2-2347713780 .color-B3{color:#E3E9FD;} + .d2-2347713780 .color-B4{color:#E3E9FD;} + .d2-2347713780 .color-B5{color:#EDF0FD;} + .d2-2347713780 .color-B6{color:#F7F8FE;} + .d2-2347713780 .color-AA2{color:#4A6FF3;} + .d2-2347713780 .color-AA4{color:#EDF0FD;} + .d2-2347713780 .color-AA5{color:#F7F8FE;} + .d2-2347713780 .color-AB4{color:#EDF0FD;} + .d2-2347713780 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2347713780);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2347713780);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2347713780);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2347713780);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2347713780);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2347713780);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2347713780);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2347713780);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2347713780);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2347713780);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2347713780);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2347713780);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2347713780);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2347713780);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2347713780);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2347713780);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2347713780);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2347713780);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>2 rows 1 obj3 rows 2 obj4 columns 2 objoneonetwoonetwo - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/grid_rows_gap_bug/dagre/board.exp.json b/e2etests/testdata/regression/grid_rows_gap_bug/dagre/board.exp.json index 6e6451ebf..6122cbb05 100644 --- a/e2etests/testdata/regression/grid_rows_gap_bug/dagre/board.exp.json +++ b/e2etests/testdata/regression/grid_rows_gap_bug/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -140,6 +151,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -183,6 +195,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/grid_rows_gap_bug/dagre/sketch.exp.svg b/e2etests/testdata/regression/grid_rows_gap_bug/dagre/sketch.exp.svg index da51970e6..0af370a44 100644 --- a/e2etests/testdata/regression/grid_rows_gap_bug/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/grid_rows_gap_bug/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -firstsecondthird + .d2-4201361976 .fill-N1{fill:#0A0F25;} + .d2-4201361976 .fill-N2{fill:#676C7E;} + .d2-4201361976 .fill-N3{fill:#9499AB;} + .d2-4201361976 .fill-N4{fill:#CFD2DD;} + .d2-4201361976 .fill-N5{fill:#DEE1EB;} + .d2-4201361976 .fill-N6{fill:#EEF1F8;} + .d2-4201361976 .fill-N7{fill:#FFFFFF;} + .d2-4201361976 .fill-B1{fill:#0D32B2;} + .d2-4201361976 .fill-B2{fill:#0D32B2;} + .d2-4201361976 .fill-B3{fill:#E3E9FD;} + .d2-4201361976 .fill-B4{fill:#E3E9FD;} + .d2-4201361976 .fill-B5{fill:#EDF0FD;} + .d2-4201361976 .fill-B6{fill:#F7F8FE;} + .d2-4201361976 .fill-AA2{fill:#4A6FF3;} + .d2-4201361976 .fill-AA4{fill:#EDF0FD;} + .d2-4201361976 .fill-AA5{fill:#F7F8FE;} + .d2-4201361976 .fill-AB4{fill:#EDF0FD;} + .d2-4201361976 .fill-AB5{fill:#F7F8FE;} + .d2-4201361976 .stroke-N1{stroke:#0A0F25;} + .d2-4201361976 .stroke-N2{stroke:#676C7E;} + .d2-4201361976 .stroke-N3{stroke:#9499AB;} + .d2-4201361976 .stroke-N4{stroke:#CFD2DD;} + .d2-4201361976 .stroke-N5{stroke:#DEE1EB;} + .d2-4201361976 .stroke-N6{stroke:#EEF1F8;} + .d2-4201361976 .stroke-N7{stroke:#FFFFFF;} + .d2-4201361976 .stroke-B1{stroke:#0D32B2;} + .d2-4201361976 .stroke-B2{stroke:#0D32B2;} + .d2-4201361976 .stroke-B3{stroke:#E3E9FD;} + .d2-4201361976 .stroke-B4{stroke:#E3E9FD;} + .d2-4201361976 .stroke-B5{stroke:#EDF0FD;} + .d2-4201361976 .stroke-B6{stroke:#F7F8FE;} + .d2-4201361976 .stroke-AA2{stroke:#4A6FF3;} + .d2-4201361976 .stroke-AA4{stroke:#EDF0FD;} + .d2-4201361976 .stroke-AA5{stroke:#F7F8FE;} + .d2-4201361976 .stroke-AB4{stroke:#EDF0FD;} + .d2-4201361976 .stroke-AB5{stroke:#F7F8FE;} + .d2-4201361976 .background-color-N1{background-color:#0A0F25;} + .d2-4201361976 .background-color-N2{background-color:#676C7E;} + .d2-4201361976 .background-color-N3{background-color:#9499AB;} + .d2-4201361976 .background-color-N4{background-color:#CFD2DD;} + .d2-4201361976 .background-color-N5{background-color:#DEE1EB;} + .d2-4201361976 .background-color-N6{background-color:#EEF1F8;} + .d2-4201361976 .background-color-N7{background-color:#FFFFFF;} + .d2-4201361976 .background-color-B1{background-color:#0D32B2;} + .d2-4201361976 .background-color-B2{background-color:#0D32B2;} + .d2-4201361976 .background-color-B3{background-color:#E3E9FD;} + .d2-4201361976 .background-color-B4{background-color:#E3E9FD;} + .d2-4201361976 .background-color-B5{background-color:#EDF0FD;} + .d2-4201361976 .background-color-B6{background-color:#F7F8FE;} + .d2-4201361976 .background-color-AA2{background-color:#4A6FF3;} + .d2-4201361976 .background-color-AA4{background-color:#EDF0FD;} + .d2-4201361976 .background-color-AA5{background-color:#F7F8FE;} + .d2-4201361976 .background-color-AB4{background-color:#EDF0FD;} + .d2-4201361976 .background-color-AB5{background-color:#F7F8FE;} + .d2-4201361976 .color-N1{color:#0A0F25;} + .d2-4201361976 .color-N2{color:#676C7E;} + .d2-4201361976 .color-N3{color:#9499AB;} + .d2-4201361976 .color-N4{color:#CFD2DD;} + .d2-4201361976 .color-N5{color:#DEE1EB;} + .d2-4201361976 .color-N6{color:#EEF1F8;} + .d2-4201361976 .color-N7{color:#FFFFFF;} + .d2-4201361976 .color-B1{color:#0D32B2;} + .d2-4201361976 .color-B2{color:#0D32B2;} + .d2-4201361976 .color-B3{color:#E3E9FD;} + .d2-4201361976 .color-B4{color:#E3E9FD;} + .d2-4201361976 .color-B5{color:#EDF0FD;} + .d2-4201361976 .color-B6{color:#F7F8FE;} + .d2-4201361976 .color-AA2{color:#4A6FF3;} + .d2-4201361976 .color-AA4{color:#EDF0FD;} + .d2-4201361976 .color-AA5{color:#F7F8FE;} + .d2-4201361976 .color-AB4{color:#EDF0FD;} + .d2-4201361976 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4201361976);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4201361976);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4201361976);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4201361976);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4201361976);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4201361976);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4201361976);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4201361976);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4201361976);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4201361976);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4201361976);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4201361976);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4201361976);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4201361976);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4201361976);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4201361976);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4201361976);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4201361976);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>firstsecondthird - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/grid_rows_gap_bug/elk/board.exp.json b/e2etests/testdata/regression/grid_rows_gap_bug/elk/board.exp.json index e34f721f9..52f818e28 100644 --- a/e2etests/testdata/regression/grid_rows_gap_bug/elk/board.exp.json +++ b/e2etests/testdata/regression/grid_rows_gap_bug/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -140,6 +151,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -183,6 +195,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/grid_rows_gap_bug/elk/sketch.exp.svg b/e2etests/testdata/regression/grid_rows_gap_bug/elk/sketch.exp.svg index ae1346d07..c27381b7a 100644 --- a/e2etests/testdata/regression/grid_rows_gap_bug/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/grid_rows_gap_bug/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -firstsecondthird + .d2-2661291524 .fill-N1{fill:#0A0F25;} + .d2-2661291524 .fill-N2{fill:#676C7E;} + .d2-2661291524 .fill-N3{fill:#9499AB;} + .d2-2661291524 .fill-N4{fill:#CFD2DD;} + .d2-2661291524 .fill-N5{fill:#DEE1EB;} + .d2-2661291524 .fill-N6{fill:#EEF1F8;} + .d2-2661291524 .fill-N7{fill:#FFFFFF;} + .d2-2661291524 .fill-B1{fill:#0D32B2;} + .d2-2661291524 .fill-B2{fill:#0D32B2;} + .d2-2661291524 .fill-B3{fill:#E3E9FD;} + .d2-2661291524 .fill-B4{fill:#E3E9FD;} + .d2-2661291524 .fill-B5{fill:#EDF0FD;} + .d2-2661291524 .fill-B6{fill:#F7F8FE;} + .d2-2661291524 .fill-AA2{fill:#4A6FF3;} + .d2-2661291524 .fill-AA4{fill:#EDF0FD;} + .d2-2661291524 .fill-AA5{fill:#F7F8FE;} + .d2-2661291524 .fill-AB4{fill:#EDF0FD;} + .d2-2661291524 .fill-AB5{fill:#F7F8FE;} + .d2-2661291524 .stroke-N1{stroke:#0A0F25;} + .d2-2661291524 .stroke-N2{stroke:#676C7E;} + .d2-2661291524 .stroke-N3{stroke:#9499AB;} + .d2-2661291524 .stroke-N4{stroke:#CFD2DD;} + .d2-2661291524 .stroke-N5{stroke:#DEE1EB;} + .d2-2661291524 .stroke-N6{stroke:#EEF1F8;} + .d2-2661291524 .stroke-N7{stroke:#FFFFFF;} + .d2-2661291524 .stroke-B1{stroke:#0D32B2;} + .d2-2661291524 .stroke-B2{stroke:#0D32B2;} + .d2-2661291524 .stroke-B3{stroke:#E3E9FD;} + .d2-2661291524 .stroke-B4{stroke:#E3E9FD;} + .d2-2661291524 .stroke-B5{stroke:#EDF0FD;} + .d2-2661291524 .stroke-B6{stroke:#F7F8FE;} + .d2-2661291524 .stroke-AA2{stroke:#4A6FF3;} + .d2-2661291524 .stroke-AA4{stroke:#EDF0FD;} + .d2-2661291524 .stroke-AA5{stroke:#F7F8FE;} + .d2-2661291524 .stroke-AB4{stroke:#EDF0FD;} + .d2-2661291524 .stroke-AB5{stroke:#F7F8FE;} + .d2-2661291524 .background-color-N1{background-color:#0A0F25;} + .d2-2661291524 .background-color-N2{background-color:#676C7E;} + .d2-2661291524 .background-color-N3{background-color:#9499AB;} + .d2-2661291524 .background-color-N4{background-color:#CFD2DD;} + .d2-2661291524 .background-color-N5{background-color:#DEE1EB;} + .d2-2661291524 .background-color-N6{background-color:#EEF1F8;} + .d2-2661291524 .background-color-N7{background-color:#FFFFFF;} + .d2-2661291524 .background-color-B1{background-color:#0D32B2;} + .d2-2661291524 .background-color-B2{background-color:#0D32B2;} + .d2-2661291524 .background-color-B3{background-color:#E3E9FD;} + .d2-2661291524 .background-color-B4{background-color:#E3E9FD;} + .d2-2661291524 .background-color-B5{background-color:#EDF0FD;} + .d2-2661291524 .background-color-B6{background-color:#F7F8FE;} + .d2-2661291524 .background-color-AA2{background-color:#4A6FF3;} + .d2-2661291524 .background-color-AA4{background-color:#EDF0FD;} + .d2-2661291524 .background-color-AA5{background-color:#F7F8FE;} + .d2-2661291524 .background-color-AB4{background-color:#EDF0FD;} + .d2-2661291524 .background-color-AB5{background-color:#F7F8FE;} + .d2-2661291524 .color-N1{color:#0A0F25;} + .d2-2661291524 .color-N2{color:#676C7E;} + .d2-2661291524 .color-N3{color:#9499AB;} + .d2-2661291524 .color-N4{color:#CFD2DD;} + .d2-2661291524 .color-N5{color:#DEE1EB;} + .d2-2661291524 .color-N6{color:#EEF1F8;} + .d2-2661291524 .color-N7{color:#FFFFFF;} + .d2-2661291524 .color-B1{color:#0D32B2;} + .d2-2661291524 .color-B2{color:#0D32B2;} + .d2-2661291524 .color-B3{color:#E3E9FD;} + .d2-2661291524 .color-B4{color:#E3E9FD;} + .d2-2661291524 .color-B5{color:#EDF0FD;} + .d2-2661291524 .color-B6{color:#F7F8FE;} + .d2-2661291524 .color-AA2{color:#4A6FF3;} + .d2-2661291524 .color-AA4{color:#EDF0FD;} + .d2-2661291524 .color-AA5{color:#F7F8FE;} + .d2-2661291524 .color-AB4{color:#EDF0FD;} + .d2-2661291524 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2661291524);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2661291524);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2661291524);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2661291524);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2661291524);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2661291524);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2661291524);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2661291524);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2661291524);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2661291524);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2661291524);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2661291524);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2661291524);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2661291524);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2661291524);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2661291524);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2661291524);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2661291524);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>firstsecondthird - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/grid_with_latex/dagre/board.exp.json b/e2etests/testdata/regression/grid_with_latex/dagre/board.exp.json index c027b7e9d..331bc8b39 100644 --- a/e2etests/testdata/regression/grid_with_latex/dagre/board.exp.json +++ b/e2etests/testdata/regression/grid_with_latex/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -317,7 +333,7 @@ "fields": null, "methods": null, "columns": null, - "label": "\\\\lim_{h \\\\rightarrow 0 } \\\\frac{f(x+h)-f(x)}{h}", + "label": "\\lim_{h \\rightarrow 0 } \\frac{f(x+h)-f(x)}{h}", "fontSize": 16, "fontFamily": "DEFAULT", "language": "latex", @@ -345,6 +361,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/grid_with_latex/dagre/sketch.exp.svg b/e2etests/testdata/regression/grid_with_latex/dagre/sketch.exp.svg index 6bb8eb89e..a921bacdd 100644 --- a/e2etests/testdata/regression/grid_with_latex/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/grid_with_latex/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -xyzabab + .d2-4250858284 .fill-N1{fill:#0A0F25;} + .d2-4250858284 .fill-N2{fill:#676C7E;} + .d2-4250858284 .fill-N3{fill:#9499AB;} + .d2-4250858284 .fill-N4{fill:#CFD2DD;} + .d2-4250858284 .fill-N5{fill:#DEE1EB;} + .d2-4250858284 .fill-N6{fill:#EEF1F8;} + .d2-4250858284 .fill-N7{fill:#FFFFFF;} + .d2-4250858284 .fill-B1{fill:#0D32B2;} + .d2-4250858284 .fill-B2{fill:#0D32B2;} + .d2-4250858284 .fill-B3{fill:#E3E9FD;} + .d2-4250858284 .fill-B4{fill:#E3E9FD;} + .d2-4250858284 .fill-B5{fill:#EDF0FD;} + .d2-4250858284 .fill-B6{fill:#F7F8FE;} + .d2-4250858284 .fill-AA2{fill:#4A6FF3;} + .d2-4250858284 .fill-AA4{fill:#EDF0FD;} + .d2-4250858284 .fill-AA5{fill:#F7F8FE;} + .d2-4250858284 .fill-AB4{fill:#EDF0FD;} + .d2-4250858284 .fill-AB5{fill:#F7F8FE;} + .d2-4250858284 .stroke-N1{stroke:#0A0F25;} + .d2-4250858284 .stroke-N2{stroke:#676C7E;} + .d2-4250858284 .stroke-N3{stroke:#9499AB;} + .d2-4250858284 .stroke-N4{stroke:#CFD2DD;} + .d2-4250858284 .stroke-N5{stroke:#DEE1EB;} + .d2-4250858284 .stroke-N6{stroke:#EEF1F8;} + .d2-4250858284 .stroke-N7{stroke:#FFFFFF;} + .d2-4250858284 .stroke-B1{stroke:#0D32B2;} + .d2-4250858284 .stroke-B2{stroke:#0D32B2;} + .d2-4250858284 .stroke-B3{stroke:#E3E9FD;} + .d2-4250858284 .stroke-B4{stroke:#E3E9FD;} + .d2-4250858284 .stroke-B5{stroke:#EDF0FD;} + .d2-4250858284 .stroke-B6{stroke:#F7F8FE;} + .d2-4250858284 .stroke-AA2{stroke:#4A6FF3;} + .d2-4250858284 .stroke-AA4{stroke:#EDF0FD;} + .d2-4250858284 .stroke-AA5{stroke:#F7F8FE;} + .d2-4250858284 .stroke-AB4{stroke:#EDF0FD;} + .d2-4250858284 .stroke-AB5{stroke:#F7F8FE;} + .d2-4250858284 .background-color-N1{background-color:#0A0F25;} + .d2-4250858284 .background-color-N2{background-color:#676C7E;} + .d2-4250858284 .background-color-N3{background-color:#9499AB;} + .d2-4250858284 .background-color-N4{background-color:#CFD2DD;} + .d2-4250858284 .background-color-N5{background-color:#DEE1EB;} + .d2-4250858284 .background-color-N6{background-color:#EEF1F8;} + .d2-4250858284 .background-color-N7{background-color:#FFFFFF;} + .d2-4250858284 .background-color-B1{background-color:#0D32B2;} + .d2-4250858284 .background-color-B2{background-color:#0D32B2;} + .d2-4250858284 .background-color-B3{background-color:#E3E9FD;} + .d2-4250858284 .background-color-B4{background-color:#E3E9FD;} + .d2-4250858284 .background-color-B5{background-color:#EDF0FD;} + .d2-4250858284 .background-color-B6{background-color:#F7F8FE;} + .d2-4250858284 .background-color-AA2{background-color:#4A6FF3;} + .d2-4250858284 .background-color-AA4{background-color:#EDF0FD;} + .d2-4250858284 .background-color-AA5{background-color:#F7F8FE;} + .d2-4250858284 .background-color-AB4{background-color:#EDF0FD;} + .d2-4250858284 .background-color-AB5{background-color:#F7F8FE;} + .d2-4250858284 .color-N1{color:#0A0F25;} + .d2-4250858284 .color-N2{color:#676C7E;} + .d2-4250858284 .color-N3{color:#9499AB;} + .d2-4250858284 .color-N4{color:#CFD2DD;} + .d2-4250858284 .color-N5{color:#DEE1EB;} + .d2-4250858284 .color-N6{color:#EEF1F8;} + .d2-4250858284 .color-N7{color:#FFFFFF;} + .d2-4250858284 .color-B1{color:#0D32B2;} + .d2-4250858284 .color-B2{color:#0D32B2;} + .d2-4250858284 .color-B3{color:#E3E9FD;} + .d2-4250858284 .color-B4{color:#E3E9FD;} + .d2-4250858284 .color-B5{color:#EDF0FD;} + .d2-4250858284 .color-B6{color:#F7F8FE;} + .d2-4250858284 .color-AA2{color:#4A6FF3;} + .d2-4250858284 .color-AA4{color:#EDF0FD;} + .d2-4250858284 .color-AA5{color:#F7F8FE;} + .d2-4250858284 .color-AB4{color:#EDF0FD;} + .d2-4250858284 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4250858284);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4250858284);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4250858284);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4250858284);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4250858284);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4250858284);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4250858284);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4250858284);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4250858284);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4250858284);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4250858284);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4250858284);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4250858284);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4250858284);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4250858284);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4250858284);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4250858284);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4250858284);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xyzabab - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/grid_with_latex/elk/board.exp.json b/e2etests/testdata/regression/grid_with_latex/elk/board.exp.json index b05fd6f57..18df24845 100644 --- a/e2etests/testdata/regression/grid_with_latex/elk/board.exp.json +++ b/e2etests/testdata/regression/grid_with_latex/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -317,7 +333,7 @@ "fields": null, "methods": null, "columns": null, - "label": "\\\\lim_{h \\\\rightarrow 0 } \\\\frac{f(x+h)-f(x)}{h}", + "label": "\\lim_{h \\rightarrow 0 } \\frac{f(x+h)-f(x)}{h}", "fontSize": 16, "fontFamily": "DEFAULT", "language": "latex", @@ -345,6 +361,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/grid_with_latex/elk/sketch.exp.svg b/e2etests/testdata/regression/grid_with_latex/elk/sketch.exp.svg index e6a67fdfc..9f3c88b45 100644 --- a/e2etests/testdata/regression/grid_with_latex/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/grid_with_latex/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -xyzabab + .d2-1013566819 .fill-N1{fill:#0A0F25;} + .d2-1013566819 .fill-N2{fill:#676C7E;} + .d2-1013566819 .fill-N3{fill:#9499AB;} + .d2-1013566819 .fill-N4{fill:#CFD2DD;} + .d2-1013566819 .fill-N5{fill:#DEE1EB;} + .d2-1013566819 .fill-N6{fill:#EEF1F8;} + .d2-1013566819 .fill-N7{fill:#FFFFFF;} + .d2-1013566819 .fill-B1{fill:#0D32B2;} + .d2-1013566819 .fill-B2{fill:#0D32B2;} + .d2-1013566819 .fill-B3{fill:#E3E9FD;} + .d2-1013566819 .fill-B4{fill:#E3E9FD;} + .d2-1013566819 .fill-B5{fill:#EDF0FD;} + .d2-1013566819 .fill-B6{fill:#F7F8FE;} + .d2-1013566819 .fill-AA2{fill:#4A6FF3;} + .d2-1013566819 .fill-AA4{fill:#EDF0FD;} + .d2-1013566819 .fill-AA5{fill:#F7F8FE;} + .d2-1013566819 .fill-AB4{fill:#EDF0FD;} + .d2-1013566819 .fill-AB5{fill:#F7F8FE;} + .d2-1013566819 .stroke-N1{stroke:#0A0F25;} + .d2-1013566819 .stroke-N2{stroke:#676C7E;} + .d2-1013566819 .stroke-N3{stroke:#9499AB;} + .d2-1013566819 .stroke-N4{stroke:#CFD2DD;} + .d2-1013566819 .stroke-N5{stroke:#DEE1EB;} + .d2-1013566819 .stroke-N6{stroke:#EEF1F8;} + .d2-1013566819 .stroke-N7{stroke:#FFFFFF;} + .d2-1013566819 .stroke-B1{stroke:#0D32B2;} + .d2-1013566819 .stroke-B2{stroke:#0D32B2;} + .d2-1013566819 .stroke-B3{stroke:#E3E9FD;} + .d2-1013566819 .stroke-B4{stroke:#E3E9FD;} + .d2-1013566819 .stroke-B5{stroke:#EDF0FD;} + .d2-1013566819 .stroke-B6{stroke:#F7F8FE;} + .d2-1013566819 .stroke-AA2{stroke:#4A6FF3;} + .d2-1013566819 .stroke-AA4{stroke:#EDF0FD;} + .d2-1013566819 .stroke-AA5{stroke:#F7F8FE;} + .d2-1013566819 .stroke-AB4{stroke:#EDF0FD;} + .d2-1013566819 .stroke-AB5{stroke:#F7F8FE;} + .d2-1013566819 .background-color-N1{background-color:#0A0F25;} + .d2-1013566819 .background-color-N2{background-color:#676C7E;} + .d2-1013566819 .background-color-N3{background-color:#9499AB;} + .d2-1013566819 .background-color-N4{background-color:#CFD2DD;} + .d2-1013566819 .background-color-N5{background-color:#DEE1EB;} + .d2-1013566819 .background-color-N6{background-color:#EEF1F8;} + .d2-1013566819 .background-color-N7{background-color:#FFFFFF;} + .d2-1013566819 .background-color-B1{background-color:#0D32B2;} + .d2-1013566819 .background-color-B2{background-color:#0D32B2;} + .d2-1013566819 .background-color-B3{background-color:#E3E9FD;} + .d2-1013566819 .background-color-B4{background-color:#E3E9FD;} + .d2-1013566819 .background-color-B5{background-color:#EDF0FD;} + .d2-1013566819 .background-color-B6{background-color:#F7F8FE;} + .d2-1013566819 .background-color-AA2{background-color:#4A6FF3;} + .d2-1013566819 .background-color-AA4{background-color:#EDF0FD;} + .d2-1013566819 .background-color-AA5{background-color:#F7F8FE;} + .d2-1013566819 .background-color-AB4{background-color:#EDF0FD;} + .d2-1013566819 .background-color-AB5{background-color:#F7F8FE;} + .d2-1013566819 .color-N1{color:#0A0F25;} + .d2-1013566819 .color-N2{color:#676C7E;} + .d2-1013566819 .color-N3{color:#9499AB;} + .d2-1013566819 .color-N4{color:#CFD2DD;} + .d2-1013566819 .color-N5{color:#DEE1EB;} + .d2-1013566819 .color-N6{color:#EEF1F8;} + .d2-1013566819 .color-N7{color:#FFFFFF;} + .d2-1013566819 .color-B1{color:#0D32B2;} + .d2-1013566819 .color-B2{color:#0D32B2;} + .d2-1013566819 .color-B3{color:#E3E9FD;} + .d2-1013566819 .color-B4{color:#E3E9FD;} + .d2-1013566819 .color-B5{color:#EDF0FD;} + .d2-1013566819 .color-B6{color:#F7F8FE;} + .d2-1013566819 .color-AA2{color:#4A6FF3;} + .d2-1013566819 .color-AA4{color:#EDF0FD;} + .d2-1013566819 .color-AA5{color:#F7F8FE;} + .d2-1013566819 .color-AB4{color:#EDF0FD;} + .d2-1013566819 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1013566819);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1013566819);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1013566819);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1013566819);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1013566819);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1013566819);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1013566819);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1013566819);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1013566819);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1013566819);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1013566819);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1013566819);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1013566819);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1013566819);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1013566819);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1013566819);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1013566819);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1013566819);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xyzabab - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/hex-fill/dagre/board.exp.json b/e2etests/testdata/regression/hex-fill/dagre/board.exp.json index 1fe3a5425..f5fb4db26 100644 --- a/e2etests/testdata/regression/hex-fill/dagre/board.exp.json +++ b/e2etests/testdata/regression/hex-fill/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "#0D32B2", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -61,6 +70,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/hex-fill/dagre/sketch.exp.svg b/e2etests/testdata/regression/hex-fill/dagre/sketch.exp.svg index 299a32ff2..fd3c94c66 100644 --- a/e2etests/testdata/regression/hex-fill/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/hex-fill/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -x + .d2-3719053247 .fill-N1{fill:#0A0F25;} + .d2-3719053247 .fill-N2{fill:#676C7E;} + .d2-3719053247 .fill-N3{fill:#9499AB;} + .d2-3719053247 .fill-N4{fill:#CFD2DD;} + .d2-3719053247 .fill-N5{fill:#DEE1EB;} + .d2-3719053247 .fill-N6{fill:#EEF1F8;} + .d2-3719053247 .fill-N7{fill:#FFFFFF;} + .d2-3719053247 .fill-B1{fill:#0D32B2;} + .d2-3719053247 .fill-B2{fill:#0D32B2;} + .d2-3719053247 .fill-B3{fill:#E3E9FD;} + .d2-3719053247 .fill-B4{fill:#E3E9FD;} + .d2-3719053247 .fill-B5{fill:#EDF0FD;} + .d2-3719053247 .fill-B6{fill:#F7F8FE;} + .d2-3719053247 .fill-AA2{fill:#4A6FF3;} + .d2-3719053247 .fill-AA4{fill:#EDF0FD;} + .d2-3719053247 .fill-AA5{fill:#F7F8FE;} + .d2-3719053247 .fill-AB4{fill:#EDF0FD;} + .d2-3719053247 .fill-AB5{fill:#F7F8FE;} + .d2-3719053247 .stroke-N1{stroke:#0A0F25;} + .d2-3719053247 .stroke-N2{stroke:#676C7E;} + .d2-3719053247 .stroke-N3{stroke:#9499AB;} + .d2-3719053247 .stroke-N4{stroke:#CFD2DD;} + .d2-3719053247 .stroke-N5{stroke:#DEE1EB;} + .d2-3719053247 .stroke-N6{stroke:#EEF1F8;} + .d2-3719053247 .stroke-N7{stroke:#FFFFFF;} + .d2-3719053247 .stroke-B1{stroke:#0D32B2;} + .d2-3719053247 .stroke-B2{stroke:#0D32B2;} + .d2-3719053247 .stroke-B3{stroke:#E3E9FD;} + .d2-3719053247 .stroke-B4{stroke:#E3E9FD;} + .d2-3719053247 .stroke-B5{stroke:#EDF0FD;} + .d2-3719053247 .stroke-B6{stroke:#F7F8FE;} + .d2-3719053247 .stroke-AA2{stroke:#4A6FF3;} + .d2-3719053247 .stroke-AA4{stroke:#EDF0FD;} + .d2-3719053247 .stroke-AA5{stroke:#F7F8FE;} + .d2-3719053247 .stroke-AB4{stroke:#EDF0FD;} + .d2-3719053247 .stroke-AB5{stroke:#F7F8FE;} + .d2-3719053247 .background-color-N1{background-color:#0A0F25;} + .d2-3719053247 .background-color-N2{background-color:#676C7E;} + .d2-3719053247 .background-color-N3{background-color:#9499AB;} + .d2-3719053247 .background-color-N4{background-color:#CFD2DD;} + .d2-3719053247 .background-color-N5{background-color:#DEE1EB;} + .d2-3719053247 .background-color-N6{background-color:#EEF1F8;} + .d2-3719053247 .background-color-N7{background-color:#FFFFFF;} + .d2-3719053247 .background-color-B1{background-color:#0D32B2;} + .d2-3719053247 .background-color-B2{background-color:#0D32B2;} + .d2-3719053247 .background-color-B3{background-color:#E3E9FD;} + .d2-3719053247 .background-color-B4{background-color:#E3E9FD;} + .d2-3719053247 .background-color-B5{background-color:#EDF0FD;} + .d2-3719053247 .background-color-B6{background-color:#F7F8FE;} + .d2-3719053247 .background-color-AA2{background-color:#4A6FF3;} + .d2-3719053247 .background-color-AA4{background-color:#EDF0FD;} + .d2-3719053247 .background-color-AA5{background-color:#F7F8FE;} + .d2-3719053247 .background-color-AB4{background-color:#EDF0FD;} + .d2-3719053247 .background-color-AB5{background-color:#F7F8FE;} + .d2-3719053247 .color-N1{color:#0A0F25;} + .d2-3719053247 .color-N2{color:#676C7E;} + .d2-3719053247 .color-N3{color:#9499AB;} + .d2-3719053247 .color-N4{color:#CFD2DD;} + .d2-3719053247 .color-N5{color:#DEE1EB;} + .d2-3719053247 .color-N6{color:#EEF1F8;} + .d2-3719053247 .color-N7{color:#FFFFFF;} + .d2-3719053247 .color-B1{color:#0D32B2;} + .d2-3719053247 .color-B2{color:#0D32B2;} + .d2-3719053247 .color-B3{color:#E3E9FD;} + .d2-3719053247 .color-B4{color:#E3E9FD;} + .d2-3719053247 .color-B5{color:#EDF0FD;} + .d2-3719053247 .color-B6{color:#F7F8FE;} + .d2-3719053247 .color-AA2{color:#4A6FF3;} + .d2-3719053247 .color-AA4{color:#EDF0FD;} + .d2-3719053247 .color-AA5{color:#F7F8FE;} + .d2-3719053247 .color-AB4{color:#EDF0FD;} + .d2-3719053247 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3719053247);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3719053247);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3719053247);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3719053247);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3719053247);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3719053247);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3719053247);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3719053247);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3719053247);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3719053247);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3719053247);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3719053247);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3719053247);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3719053247);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3719053247);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3719053247);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3719053247);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3719053247);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>x - + \ No newline at end of file diff --git a/e2etests/testdata/regression/hex-fill/elk/board.exp.json b/e2etests/testdata/regression/hex-fill/elk/board.exp.json index a94ec7569..c298f764d 100644 --- a/e2etests/testdata/regression/hex-fill/elk/board.exp.json +++ b/e2etests/testdata/regression/hex-fill/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "#0D32B2", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -61,6 +70,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/hex-fill/elk/sketch.exp.svg b/e2etests/testdata/regression/hex-fill/elk/sketch.exp.svg index ddf2643b7..8596b8833 100644 --- a/e2etests/testdata/regression/hex-fill/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/hex-fill/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -x + .d2-1659476247 .fill-N1{fill:#0A0F25;} + .d2-1659476247 .fill-N2{fill:#676C7E;} + .d2-1659476247 .fill-N3{fill:#9499AB;} + .d2-1659476247 .fill-N4{fill:#CFD2DD;} + .d2-1659476247 .fill-N5{fill:#DEE1EB;} + .d2-1659476247 .fill-N6{fill:#EEF1F8;} + .d2-1659476247 .fill-N7{fill:#FFFFFF;} + .d2-1659476247 .fill-B1{fill:#0D32B2;} + .d2-1659476247 .fill-B2{fill:#0D32B2;} + .d2-1659476247 .fill-B3{fill:#E3E9FD;} + .d2-1659476247 .fill-B4{fill:#E3E9FD;} + .d2-1659476247 .fill-B5{fill:#EDF0FD;} + .d2-1659476247 .fill-B6{fill:#F7F8FE;} + .d2-1659476247 .fill-AA2{fill:#4A6FF3;} + .d2-1659476247 .fill-AA4{fill:#EDF0FD;} + .d2-1659476247 .fill-AA5{fill:#F7F8FE;} + .d2-1659476247 .fill-AB4{fill:#EDF0FD;} + .d2-1659476247 .fill-AB5{fill:#F7F8FE;} + .d2-1659476247 .stroke-N1{stroke:#0A0F25;} + .d2-1659476247 .stroke-N2{stroke:#676C7E;} + .d2-1659476247 .stroke-N3{stroke:#9499AB;} + .d2-1659476247 .stroke-N4{stroke:#CFD2DD;} + .d2-1659476247 .stroke-N5{stroke:#DEE1EB;} + .d2-1659476247 .stroke-N6{stroke:#EEF1F8;} + .d2-1659476247 .stroke-N7{stroke:#FFFFFF;} + .d2-1659476247 .stroke-B1{stroke:#0D32B2;} + .d2-1659476247 .stroke-B2{stroke:#0D32B2;} + .d2-1659476247 .stroke-B3{stroke:#E3E9FD;} + .d2-1659476247 .stroke-B4{stroke:#E3E9FD;} + .d2-1659476247 .stroke-B5{stroke:#EDF0FD;} + .d2-1659476247 .stroke-B6{stroke:#F7F8FE;} + .d2-1659476247 .stroke-AA2{stroke:#4A6FF3;} + .d2-1659476247 .stroke-AA4{stroke:#EDF0FD;} + .d2-1659476247 .stroke-AA5{stroke:#F7F8FE;} + .d2-1659476247 .stroke-AB4{stroke:#EDF0FD;} + .d2-1659476247 .stroke-AB5{stroke:#F7F8FE;} + .d2-1659476247 .background-color-N1{background-color:#0A0F25;} + .d2-1659476247 .background-color-N2{background-color:#676C7E;} + .d2-1659476247 .background-color-N3{background-color:#9499AB;} + .d2-1659476247 .background-color-N4{background-color:#CFD2DD;} + .d2-1659476247 .background-color-N5{background-color:#DEE1EB;} + .d2-1659476247 .background-color-N6{background-color:#EEF1F8;} + .d2-1659476247 .background-color-N7{background-color:#FFFFFF;} + .d2-1659476247 .background-color-B1{background-color:#0D32B2;} + .d2-1659476247 .background-color-B2{background-color:#0D32B2;} + .d2-1659476247 .background-color-B3{background-color:#E3E9FD;} + .d2-1659476247 .background-color-B4{background-color:#E3E9FD;} + .d2-1659476247 .background-color-B5{background-color:#EDF0FD;} + .d2-1659476247 .background-color-B6{background-color:#F7F8FE;} + .d2-1659476247 .background-color-AA2{background-color:#4A6FF3;} + .d2-1659476247 .background-color-AA4{background-color:#EDF0FD;} + .d2-1659476247 .background-color-AA5{background-color:#F7F8FE;} + .d2-1659476247 .background-color-AB4{background-color:#EDF0FD;} + .d2-1659476247 .background-color-AB5{background-color:#F7F8FE;} + .d2-1659476247 .color-N1{color:#0A0F25;} + .d2-1659476247 .color-N2{color:#676C7E;} + .d2-1659476247 .color-N3{color:#9499AB;} + .d2-1659476247 .color-N4{color:#CFD2DD;} + .d2-1659476247 .color-N5{color:#DEE1EB;} + .d2-1659476247 .color-N6{color:#EEF1F8;} + .d2-1659476247 .color-N7{color:#FFFFFF;} + .d2-1659476247 .color-B1{color:#0D32B2;} + .d2-1659476247 .color-B2{color:#0D32B2;} + .d2-1659476247 .color-B3{color:#E3E9FD;} + .d2-1659476247 .color-B4{color:#E3E9FD;} + .d2-1659476247 .color-B5{color:#EDF0FD;} + .d2-1659476247 .color-B6{color:#F7F8FE;} + .d2-1659476247 .color-AA2{color:#4A6FF3;} + .d2-1659476247 .color-AA4{color:#EDF0FD;} + .d2-1659476247 .color-AA5{color:#F7F8FE;} + .d2-1659476247 .color-AB4{color:#EDF0FD;} + .d2-1659476247 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1659476247);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1659476247);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1659476247);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1659476247);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1659476247);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1659476247);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1659476247);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1659476247);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1659476247);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1659476247);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1659476247);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1659476247);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1659476247);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1659476247);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1659476247);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1659476247);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1659476247);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1659476247);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>x - + \ No newline at end of file diff --git a/e2etests/testdata/regression/icons_on_top/dagre/board.exp.json b/e2etests/testdata/regression/icons_on_top/dagre/board.exp.json index 79b687ec6..3add5466f 100644 --- a/e2etests/testdata/regression/icons_on_top/dagre/board.exp.json +++ b/e2etests/testdata/regression/icons_on_top/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -13,7 +21,7 @@ "x": 0, "y": 0 }, - "width": 159, + "width": 127, "height": 66, "opacity": 1, "strokeDash": 0, @@ -21,6 +29,7 @@ "borderRadius": 0, "fill": "#d14d28", "stroke": "#d14d28", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -54,7 +63,7 @@ "YELLOW" ], "pos": { - "x": 159, + "x": 127, "y": 0 }, "width": 80, @@ -65,6 +74,7 @@ "borderRadius": 0, "fill": "#f5df65", "stroke": "#f5df65", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -101,7 +111,7 @@ "x": 0, "y": 66 }, - "width": 159, + "width": 127, "height": 66, "opacity": 1, "strokeDash": 0, @@ -109,6 +119,7 @@ "borderRadius": 0, "fill": "#59c8df", "stroke": "#59c8df", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -142,7 +153,7 @@ "GREEN" ], "pos": { - "x": 159, + "x": 127, "y": 66 }, "width": 80, @@ -153,6 +164,7 @@ "borderRadius": 0, "fill": "#2b9464", "stroke": "#2b9464", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -196,6 +208,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/icons_on_top/dagre/sketch.exp.svg b/e2etests/testdata/regression/icons_on_top/dagre/sketch.exp.svg index 9450e8d22..8f9dc5e5c 100644 --- a/e2etests/testdata/regression/icons_on_top/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/icons_on_top/dagre/sketch.exp.svg @@ -1,12 +1,12 @@ -linknonelink, tooltiptooltipnonetooltip - + .d2-4158366177 .fill-N1{fill:#0A0F25;} + .d2-4158366177 .fill-N2{fill:#676C7E;} + .d2-4158366177 .fill-N3{fill:#9499AB;} + .d2-4158366177 .fill-N4{fill:#CFD2DD;} + .d2-4158366177 .fill-N5{fill:#DEE1EB;} + .d2-4158366177 .fill-N6{fill:#EEF1F8;} + .d2-4158366177 .fill-N7{fill:#FFFFFF;} + .d2-4158366177 .fill-B1{fill:#0D32B2;} + .d2-4158366177 .fill-B2{fill:#0D32B2;} + .d2-4158366177 .fill-B3{fill:#E3E9FD;} + .d2-4158366177 .fill-B4{fill:#E3E9FD;} + .d2-4158366177 .fill-B5{fill:#EDF0FD;} + .d2-4158366177 .fill-B6{fill:#F7F8FE;} + .d2-4158366177 .fill-AA2{fill:#4A6FF3;} + .d2-4158366177 .fill-AA4{fill:#EDF0FD;} + .d2-4158366177 .fill-AA5{fill:#F7F8FE;} + .d2-4158366177 .fill-AB4{fill:#EDF0FD;} + .d2-4158366177 .fill-AB5{fill:#F7F8FE;} + .d2-4158366177 .stroke-N1{stroke:#0A0F25;} + .d2-4158366177 .stroke-N2{stroke:#676C7E;} + .d2-4158366177 .stroke-N3{stroke:#9499AB;} + .d2-4158366177 .stroke-N4{stroke:#CFD2DD;} + .d2-4158366177 .stroke-N5{stroke:#DEE1EB;} + .d2-4158366177 .stroke-N6{stroke:#EEF1F8;} + .d2-4158366177 .stroke-N7{stroke:#FFFFFF;} + .d2-4158366177 .stroke-B1{stroke:#0D32B2;} + .d2-4158366177 .stroke-B2{stroke:#0D32B2;} + .d2-4158366177 .stroke-B3{stroke:#E3E9FD;} + .d2-4158366177 .stroke-B4{stroke:#E3E9FD;} + .d2-4158366177 .stroke-B5{stroke:#EDF0FD;} + .d2-4158366177 .stroke-B6{stroke:#F7F8FE;} + .d2-4158366177 .stroke-AA2{stroke:#4A6FF3;} + .d2-4158366177 .stroke-AA4{stroke:#EDF0FD;} + .d2-4158366177 .stroke-AA5{stroke:#F7F8FE;} + .d2-4158366177 .stroke-AB4{stroke:#EDF0FD;} + .d2-4158366177 .stroke-AB5{stroke:#F7F8FE;} + .d2-4158366177 .background-color-N1{background-color:#0A0F25;} + .d2-4158366177 .background-color-N2{background-color:#676C7E;} + .d2-4158366177 .background-color-N3{background-color:#9499AB;} + .d2-4158366177 .background-color-N4{background-color:#CFD2DD;} + .d2-4158366177 .background-color-N5{background-color:#DEE1EB;} + .d2-4158366177 .background-color-N6{background-color:#EEF1F8;} + .d2-4158366177 .background-color-N7{background-color:#FFFFFF;} + .d2-4158366177 .background-color-B1{background-color:#0D32B2;} + .d2-4158366177 .background-color-B2{background-color:#0D32B2;} + .d2-4158366177 .background-color-B3{background-color:#E3E9FD;} + .d2-4158366177 .background-color-B4{background-color:#E3E9FD;} + .d2-4158366177 .background-color-B5{background-color:#EDF0FD;} + .d2-4158366177 .background-color-B6{background-color:#F7F8FE;} + .d2-4158366177 .background-color-AA2{background-color:#4A6FF3;} + .d2-4158366177 .background-color-AA4{background-color:#EDF0FD;} + .d2-4158366177 .background-color-AA5{background-color:#F7F8FE;} + .d2-4158366177 .background-color-AB4{background-color:#EDF0FD;} + .d2-4158366177 .background-color-AB5{background-color:#F7F8FE;} + .d2-4158366177 .color-N1{color:#0A0F25;} + .d2-4158366177 .color-N2{color:#676C7E;} + .d2-4158366177 .color-N3{color:#9499AB;} + .d2-4158366177 .color-N4{color:#CFD2DD;} + .d2-4158366177 .color-N5{color:#DEE1EB;} + .d2-4158366177 .color-N6{color:#EEF1F8;} + .d2-4158366177 .color-N7{color:#FFFFFF;} + .d2-4158366177 .color-B1{color:#0D32B2;} + .d2-4158366177 .color-B2{color:#0D32B2;} + .d2-4158366177 .color-B3{color:#E3E9FD;} + .d2-4158366177 .color-B4{color:#E3E9FD;} + .d2-4158366177 .color-B5{color:#EDF0FD;} + .d2-4158366177 .color-B6{color:#F7F8FE;} + .d2-4158366177 .color-AA2{color:#4A6FF3;} + .d2-4158366177 .color-AA4{color:#EDF0FD;} + .d2-4158366177 .color-AA5{color:#F7F8FE;} + .d2-4158366177 .color-AB4{color:#EDF0FD;} + .d2-4158366177 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4158366177);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4158366177);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4158366177);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4158366177);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4158366177);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4158366177);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4158366177);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4158366177);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4158366177);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4158366177);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4158366177);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4158366177);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4158366177);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4158366177);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4158366177);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4158366177);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4158366177);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4158366177);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>linknonelink, tooltiptooltipnonetooltip + - + - - - - - - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/icons_on_top/elk/board.exp.json b/e2etests/testdata/regression/icons_on_top/elk/board.exp.json index 79b687ec6..3add5466f 100644 --- a/e2etests/testdata/regression/icons_on_top/elk/board.exp.json +++ b/e2etests/testdata/regression/icons_on_top/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -13,7 +21,7 @@ "x": 0, "y": 0 }, - "width": 159, + "width": 127, "height": 66, "opacity": 1, "strokeDash": 0, @@ -21,6 +29,7 @@ "borderRadius": 0, "fill": "#d14d28", "stroke": "#d14d28", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -54,7 +63,7 @@ "YELLOW" ], "pos": { - "x": 159, + "x": 127, "y": 0 }, "width": 80, @@ -65,6 +74,7 @@ "borderRadius": 0, "fill": "#f5df65", "stroke": "#f5df65", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -101,7 +111,7 @@ "x": 0, "y": 66 }, - "width": 159, + "width": 127, "height": 66, "opacity": 1, "strokeDash": 0, @@ -109,6 +119,7 @@ "borderRadius": 0, "fill": "#59c8df", "stroke": "#59c8df", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -142,7 +153,7 @@ "GREEN" ], "pos": { - "x": 159, + "x": 127, "y": 66 }, "width": 80, @@ -153,6 +164,7 @@ "borderRadius": 0, "fill": "#2b9464", "stroke": "#2b9464", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -196,6 +208,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/icons_on_top/elk/sketch.exp.svg b/e2etests/testdata/regression/icons_on_top/elk/sketch.exp.svg index 9450e8d22..8f9dc5e5c 100644 --- a/e2etests/testdata/regression/icons_on_top/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/icons_on_top/elk/sketch.exp.svg @@ -1,12 +1,12 @@ -linknonelink, tooltiptooltipnonetooltip - + .d2-4158366177 .fill-N1{fill:#0A0F25;} + .d2-4158366177 .fill-N2{fill:#676C7E;} + .d2-4158366177 .fill-N3{fill:#9499AB;} + .d2-4158366177 .fill-N4{fill:#CFD2DD;} + .d2-4158366177 .fill-N5{fill:#DEE1EB;} + .d2-4158366177 .fill-N6{fill:#EEF1F8;} + .d2-4158366177 .fill-N7{fill:#FFFFFF;} + .d2-4158366177 .fill-B1{fill:#0D32B2;} + .d2-4158366177 .fill-B2{fill:#0D32B2;} + .d2-4158366177 .fill-B3{fill:#E3E9FD;} + .d2-4158366177 .fill-B4{fill:#E3E9FD;} + .d2-4158366177 .fill-B5{fill:#EDF0FD;} + .d2-4158366177 .fill-B6{fill:#F7F8FE;} + .d2-4158366177 .fill-AA2{fill:#4A6FF3;} + .d2-4158366177 .fill-AA4{fill:#EDF0FD;} + .d2-4158366177 .fill-AA5{fill:#F7F8FE;} + .d2-4158366177 .fill-AB4{fill:#EDF0FD;} + .d2-4158366177 .fill-AB5{fill:#F7F8FE;} + .d2-4158366177 .stroke-N1{stroke:#0A0F25;} + .d2-4158366177 .stroke-N2{stroke:#676C7E;} + .d2-4158366177 .stroke-N3{stroke:#9499AB;} + .d2-4158366177 .stroke-N4{stroke:#CFD2DD;} + .d2-4158366177 .stroke-N5{stroke:#DEE1EB;} + .d2-4158366177 .stroke-N6{stroke:#EEF1F8;} + .d2-4158366177 .stroke-N7{stroke:#FFFFFF;} + .d2-4158366177 .stroke-B1{stroke:#0D32B2;} + .d2-4158366177 .stroke-B2{stroke:#0D32B2;} + .d2-4158366177 .stroke-B3{stroke:#E3E9FD;} + .d2-4158366177 .stroke-B4{stroke:#E3E9FD;} + .d2-4158366177 .stroke-B5{stroke:#EDF0FD;} + .d2-4158366177 .stroke-B6{stroke:#F7F8FE;} + .d2-4158366177 .stroke-AA2{stroke:#4A6FF3;} + .d2-4158366177 .stroke-AA4{stroke:#EDF0FD;} + .d2-4158366177 .stroke-AA5{stroke:#F7F8FE;} + .d2-4158366177 .stroke-AB4{stroke:#EDF0FD;} + .d2-4158366177 .stroke-AB5{stroke:#F7F8FE;} + .d2-4158366177 .background-color-N1{background-color:#0A0F25;} + .d2-4158366177 .background-color-N2{background-color:#676C7E;} + .d2-4158366177 .background-color-N3{background-color:#9499AB;} + .d2-4158366177 .background-color-N4{background-color:#CFD2DD;} + .d2-4158366177 .background-color-N5{background-color:#DEE1EB;} + .d2-4158366177 .background-color-N6{background-color:#EEF1F8;} + .d2-4158366177 .background-color-N7{background-color:#FFFFFF;} + .d2-4158366177 .background-color-B1{background-color:#0D32B2;} + .d2-4158366177 .background-color-B2{background-color:#0D32B2;} + .d2-4158366177 .background-color-B3{background-color:#E3E9FD;} + .d2-4158366177 .background-color-B4{background-color:#E3E9FD;} + .d2-4158366177 .background-color-B5{background-color:#EDF0FD;} + .d2-4158366177 .background-color-B6{background-color:#F7F8FE;} + .d2-4158366177 .background-color-AA2{background-color:#4A6FF3;} + .d2-4158366177 .background-color-AA4{background-color:#EDF0FD;} + .d2-4158366177 .background-color-AA5{background-color:#F7F8FE;} + .d2-4158366177 .background-color-AB4{background-color:#EDF0FD;} + .d2-4158366177 .background-color-AB5{background-color:#F7F8FE;} + .d2-4158366177 .color-N1{color:#0A0F25;} + .d2-4158366177 .color-N2{color:#676C7E;} + .d2-4158366177 .color-N3{color:#9499AB;} + .d2-4158366177 .color-N4{color:#CFD2DD;} + .d2-4158366177 .color-N5{color:#DEE1EB;} + .d2-4158366177 .color-N6{color:#EEF1F8;} + .d2-4158366177 .color-N7{color:#FFFFFF;} + .d2-4158366177 .color-B1{color:#0D32B2;} + .d2-4158366177 .color-B2{color:#0D32B2;} + .d2-4158366177 .color-B3{color:#E3E9FD;} + .d2-4158366177 .color-B4{color:#E3E9FD;} + .d2-4158366177 .color-B5{color:#EDF0FD;} + .d2-4158366177 .color-B6{color:#F7F8FE;} + .d2-4158366177 .color-AA2{color:#4A6FF3;} + .d2-4158366177 .color-AA4{color:#EDF0FD;} + .d2-4158366177 .color-AA5{color:#F7F8FE;} + .d2-4158366177 .color-AB4{color:#EDF0FD;} + .d2-4158366177 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4158366177);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4158366177);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4158366177);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4158366177);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4158366177);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4158366177);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4158366177);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4158366177);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4158366177);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4158366177);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4158366177);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4158366177);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4158366177);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4158366177);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4158366177);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4158366177);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4158366177);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4158366177);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>linknonelink, tooltiptooltipnonetooltip + - + - - - - - - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/just-width/dagre/board.exp.json b/e2etests/testdata/regression/just-width/dagre/board.exp.json index d7d37e01c..40dadeed0 100644 --- a/e2etests/testdata/regression/just-width/dagre/board.exp.json +++ b/e2etests/testdata/regression/just-width/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -61,6 +70,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/just-width/dagre/sketch.exp.svg b/e2etests/testdata/regression/just-width/dagre/sketch.exp.svg index 8592fd394..a5bdfc4c3 100644 --- a/e2etests/testdata/regression/just-width/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/just-width/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -teamwork: having someone to blame + .d2-2620215761 .fill-N1{fill:#0A0F25;} + .d2-2620215761 .fill-N2{fill:#676C7E;} + .d2-2620215761 .fill-N3{fill:#9499AB;} + .d2-2620215761 .fill-N4{fill:#CFD2DD;} + .d2-2620215761 .fill-N5{fill:#DEE1EB;} + .d2-2620215761 .fill-N6{fill:#EEF1F8;} + .d2-2620215761 .fill-N7{fill:#FFFFFF;} + .d2-2620215761 .fill-B1{fill:#0D32B2;} + .d2-2620215761 .fill-B2{fill:#0D32B2;} + .d2-2620215761 .fill-B3{fill:#E3E9FD;} + .d2-2620215761 .fill-B4{fill:#E3E9FD;} + .d2-2620215761 .fill-B5{fill:#EDF0FD;} + .d2-2620215761 .fill-B6{fill:#F7F8FE;} + .d2-2620215761 .fill-AA2{fill:#4A6FF3;} + .d2-2620215761 .fill-AA4{fill:#EDF0FD;} + .d2-2620215761 .fill-AA5{fill:#F7F8FE;} + .d2-2620215761 .fill-AB4{fill:#EDF0FD;} + .d2-2620215761 .fill-AB5{fill:#F7F8FE;} + .d2-2620215761 .stroke-N1{stroke:#0A0F25;} + .d2-2620215761 .stroke-N2{stroke:#676C7E;} + .d2-2620215761 .stroke-N3{stroke:#9499AB;} + .d2-2620215761 .stroke-N4{stroke:#CFD2DD;} + .d2-2620215761 .stroke-N5{stroke:#DEE1EB;} + .d2-2620215761 .stroke-N6{stroke:#EEF1F8;} + .d2-2620215761 .stroke-N7{stroke:#FFFFFF;} + .d2-2620215761 .stroke-B1{stroke:#0D32B2;} + .d2-2620215761 .stroke-B2{stroke:#0D32B2;} + .d2-2620215761 .stroke-B3{stroke:#E3E9FD;} + .d2-2620215761 .stroke-B4{stroke:#E3E9FD;} + .d2-2620215761 .stroke-B5{stroke:#EDF0FD;} + .d2-2620215761 .stroke-B6{stroke:#F7F8FE;} + .d2-2620215761 .stroke-AA2{stroke:#4A6FF3;} + .d2-2620215761 .stroke-AA4{stroke:#EDF0FD;} + .d2-2620215761 .stroke-AA5{stroke:#F7F8FE;} + .d2-2620215761 .stroke-AB4{stroke:#EDF0FD;} + .d2-2620215761 .stroke-AB5{stroke:#F7F8FE;} + .d2-2620215761 .background-color-N1{background-color:#0A0F25;} + .d2-2620215761 .background-color-N2{background-color:#676C7E;} + .d2-2620215761 .background-color-N3{background-color:#9499AB;} + .d2-2620215761 .background-color-N4{background-color:#CFD2DD;} + .d2-2620215761 .background-color-N5{background-color:#DEE1EB;} + .d2-2620215761 .background-color-N6{background-color:#EEF1F8;} + .d2-2620215761 .background-color-N7{background-color:#FFFFFF;} + .d2-2620215761 .background-color-B1{background-color:#0D32B2;} + .d2-2620215761 .background-color-B2{background-color:#0D32B2;} + .d2-2620215761 .background-color-B3{background-color:#E3E9FD;} + .d2-2620215761 .background-color-B4{background-color:#E3E9FD;} + .d2-2620215761 .background-color-B5{background-color:#EDF0FD;} + .d2-2620215761 .background-color-B6{background-color:#F7F8FE;} + .d2-2620215761 .background-color-AA2{background-color:#4A6FF3;} + .d2-2620215761 .background-color-AA4{background-color:#EDF0FD;} + .d2-2620215761 .background-color-AA5{background-color:#F7F8FE;} + .d2-2620215761 .background-color-AB4{background-color:#EDF0FD;} + .d2-2620215761 .background-color-AB5{background-color:#F7F8FE;} + .d2-2620215761 .color-N1{color:#0A0F25;} + .d2-2620215761 .color-N2{color:#676C7E;} + .d2-2620215761 .color-N3{color:#9499AB;} + .d2-2620215761 .color-N4{color:#CFD2DD;} + .d2-2620215761 .color-N5{color:#DEE1EB;} + .d2-2620215761 .color-N6{color:#EEF1F8;} + .d2-2620215761 .color-N7{color:#FFFFFF;} + .d2-2620215761 .color-B1{color:#0D32B2;} + .d2-2620215761 .color-B2{color:#0D32B2;} + .d2-2620215761 .color-B3{color:#E3E9FD;} + .d2-2620215761 .color-B4{color:#E3E9FD;} + .d2-2620215761 .color-B5{color:#EDF0FD;} + .d2-2620215761 .color-B6{color:#F7F8FE;} + .d2-2620215761 .color-AA2{color:#4A6FF3;} + .d2-2620215761 .color-AA4{color:#EDF0FD;} + .d2-2620215761 .color-AA5{color:#F7F8FE;} + .d2-2620215761 .color-AB4{color:#EDF0FD;} + .d2-2620215761 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2620215761);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2620215761);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2620215761);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2620215761);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2620215761);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2620215761);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2620215761);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2620215761);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2620215761);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2620215761);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2620215761);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2620215761);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2620215761);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2620215761);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2620215761);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2620215761);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2620215761);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2620215761);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>teamwork: having someone to blame - + \ No newline at end of file diff --git a/e2etests/testdata/regression/just-width/elk/board.exp.json b/e2etests/testdata/regression/just-width/elk/board.exp.json index 90db64280..59a1e62c6 100644 --- a/e2etests/testdata/regression/just-width/elk/board.exp.json +++ b/e2etests/testdata/regression/just-width/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -61,6 +70,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/just-width/elk/sketch.exp.svg b/e2etests/testdata/regression/just-width/elk/sketch.exp.svg index d4d2bbe44..229a5f1f4 100644 --- a/e2etests/testdata/regression/just-width/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/just-width/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -teamwork: having someone to blame + .d2-1310558217 .fill-N1{fill:#0A0F25;} + .d2-1310558217 .fill-N2{fill:#676C7E;} + .d2-1310558217 .fill-N3{fill:#9499AB;} + .d2-1310558217 .fill-N4{fill:#CFD2DD;} + .d2-1310558217 .fill-N5{fill:#DEE1EB;} + .d2-1310558217 .fill-N6{fill:#EEF1F8;} + .d2-1310558217 .fill-N7{fill:#FFFFFF;} + .d2-1310558217 .fill-B1{fill:#0D32B2;} + .d2-1310558217 .fill-B2{fill:#0D32B2;} + .d2-1310558217 .fill-B3{fill:#E3E9FD;} + .d2-1310558217 .fill-B4{fill:#E3E9FD;} + .d2-1310558217 .fill-B5{fill:#EDF0FD;} + .d2-1310558217 .fill-B6{fill:#F7F8FE;} + .d2-1310558217 .fill-AA2{fill:#4A6FF3;} + .d2-1310558217 .fill-AA4{fill:#EDF0FD;} + .d2-1310558217 .fill-AA5{fill:#F7F8FE;} + .d2-1310558217 .fill-AB4{fill:#EDF0FD;} + .d2-1310558217 .fill-AB5{fill:#F7F8FE;} + .d2-1310558217 .stroke-N1{stroke:#0A0F25;} + .d2-1310558217 .stroke-N2{stroke:#676C7E;} + .d2-1310558217 .stroke-N3{stroke:#9499AB;} + .d2-1310558217 .stroke-N4{stroke:#CFD2DD;} + .d2-1310558217 .stroke-N5{stroke:#DEE1EB;} + .d2-1310558217 .stroke-N6{stroke:#EEF1F8;} + .d2-1310558217 .stroke-N7{stroke:#FFFFFF;} + .d2-1310558217 .stroke-B1{stroke:#0D32B2;} + .d2-1310558217 .stroke-B2{stroke:#0D32B2;} + .d2-1310558217 .stroke-B3{stroke:#E3E9FD;} + .d2-1310558217 .stroke-B4{stroke:#E3E9FD;} + .d2-1310558217 .stroke-B5{stroke:#EDF0FD;} + .d2-1310558217 .stroke-B6{stroke:#F7F8FE;} + .d2-1310558217 .stroke-AA2{stroke:#4A6FF3;} + .d2-1310558217 .stroke-AA4{stroke:#EDF0FD;} + .d2-1310558217 .stroke-AA5{stroke:#F7F8FE;} + .d2-1310558217 .stroke-AB4{stroke:#EDF0FD;} + .d2-1310558217 .stroke-AB5{stroke:#F7F8FE;} + .d2-1310558217 .background-color-N1{background-color:#0A0F25;} + .d2-1310558217 .background-color-N2{background-color:#676C7E;} + .d2-1310558217 .background-color-N3{background-color:#9499AB;} + .d2-1310558217 .background-color-N4{background-color:#CFD2DD;} + .d2-1310558217 .background-color-N5{background-color:#DEE1EB;} + .d2-1310558217 .background-color-N6{background-color:#EEF1F8;} + .d2-1310558217 .background-color-N7{background-color:#FFFFFF;} + .d2-1310558217 .background-color-B1{background-color:#0D32B2;} + .d2-1310558217 .background-color-B2{background-color:#0D32B2;} + .d2-1310558217 .background-color-B3{background-color:#E3E9FD;} + .d2-1310558217 .background-color-B4{background-color:#E3E9FD;} + .d2-1310558217 .background-color-B5{background-color:#EDF0FD;} + .d2-1310558217 .background-color-B6{background-color:#F7F8FE;} + .d2-1310558217 .background-color-AA2{background-color:#4A6FF3;} + .d2-1310558217 .background-color-AA4{background-color:#EDF0FD;} + .d2-1310558217 .background-color-AA5{background-color:#F7F8FE;} + .d2-1310558217 .background-color-AB4{background-color:#EDF0FD;} + .d2-1310558217 .background-color-AB5{background-color:#F7F8FE;} + .d2-1310558217 .color-N1{color:#0A0F25;} + .d2-1310558217 .color-N2{color:#676C7E;} + .d2-1310558217 .color-N3{color:#9499AB;} + .d2-1310558217 .color-N4{color:#CFD2DD;} + .d2-1310558217 .color-N5{color:#DEE1EB;} + .d2-1310558217 .color-N6{color:#EEF1F8;} + .d2-1310558217 .color-N7{color:#FFFFFF;} + .d2-1310558217 .color-B1{color:#0D32B2;} + .d2-1310558217 .color-B2{color:#0D32B2;} + .d2-1310558217 .color-B3{color:#E3E9FD;} + .d2-1310558217 .color-B4{color:#E3E9FD;} + .d2-1310558217 .color-B5{color:#EDF0FD;} + .d2-1310558217 .color-B6{color:#F7F8FE;} + .d2-1310558217 .color-AA2{color:#4A6FF3;} + .d2-1310558217 .color-AA4{color:#EDF0FD;} + .d2-1310558217 .color-AA5{color:#F7F8FE;} + .d2-1310558217 .color-AB4{color:#EDF0FD;} + .d2-1310558217 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1310558217);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1310558217);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1310558217);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1310558217);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1310558217);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1310558217);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1310558217);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1310558217);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1310558217);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1310558217);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1310558217);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1310558217);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1310558217);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1310558217);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1310558217);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1310558217);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1310558217);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1310558217);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>teamwork: having someone to blame - + \ No newline at end of file diff --git a/e2etests/testdata/regression/link_with_ampersand/dagre/board.exp.json b/e2etests/testdata/regression/link_with_ampersand/dagre/board.exp.json index 87468cfa8..7b90c7ece 100644 --- a/e2etests/testdata/regression/link_with_ampersand/dagre/board.exp.json +++ b/e2etests/testdata/regression/link_with_ampersand/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -10,7 +18,7 @@ "x": 0, "y": 0 }, - "width": 85, + "width": 53, "height": 66, "opacity": 1, "strokeDash": 0, @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -62,6 +71,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/link_with_ampersand/dagre/sketch.exp.svg b/e2etests/testdata/regression/link_with_ampersand/dagre/sketch.exp.svg index 3e8926a5e..e66b213d3 100644 --- a/e2etests/testdata/regression/link_with_ampersand/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/link_with_ampersand/dagre/sketch.exp.svg @@ -1,12 +1,12 @@ -a - + .d2-816666399 .fill-N1{fill:#0A0F25;} + .d2-816666399 .fill-N2{fill:#676C7E;} + .d2-816666399 .fill-N3{fill:#9499AB;} + .d2-816666399 .fill-N4{fill:#CFD2DD;} + .d2-816666399 .fill-N5{fill:#DEE1EB;} + .d2-816666399 .fill-N6{fill:#EEF1F8;} + .d2-816666399 .fill-N7{fill:#FFFFFF;} + .d2-816666399 .fill-B1{fill:#0D32B2;} + .d2-816666399 .fill-B2{fill:#0D32B2;} + .d2-816666399 .fill-B3{fill:#E3E9FD;} + .d2-816666399 .fill-B4{fill:#E3E9FD;} + .d2-816666399 .fill-B5{fill:#EDF0FD;} + .d2-816666399 .fill-B6{fill:#F7F8FE;} + .d2-816666399 .fill-AA2{fill:#4A6FF3;} + .d2-816666399 .fill-AA4{fill:#EDF0FD;} + .d2-816666399 .fill-AA5{fill:#F7F8FE;} + .d2-816666399 .fill-AB4{fill:#EDF0FD;} + .d2-816666399 .fill-AB5{fill:#F7F8FE;} + .d2-816666399 .stroke-N1{stroke:#0A0F25;} + .d2-816666399 .stroke-N2{stroke:#676C7E;} + .d2-816666399 .stroke-N3{stroke:#9499AB;} + .d2-816666399 .stroke-N4{stroke:#CFD2DD;} + .d2-816666399 .stroke-N5{stroke:#DEE1EB;} + .d2-816666399 .stroke-N6{stroke:#EEF1F8;} + .d2-816666399 .stroke-N7{stroke:#FFFFFF;} + .d2-816666399 .stroke-B1{stroke:#0D32B2;} + .d2-816666399 .stroke-B2{stroke:#0D32B2;} + .d2-816666399 .stroke-B3{stroke:#E3E9FD;} + .d2-816666399 .stroke-B4{stroke:#E3E9FD;} + .d2-816666399 .stroke-B5{stroke:#EDF0FD;} + .d2-816666399 .stroke-B6{stroke:#F7F8FE;} + .d2-816666399 .stroke-AA2{stroke:#4A6FF3;} + .d2-816666399 .stroke-AA4{stroke:#EDF0FD;} + .d2-816666399 .stroke-AA5{stroke:#F7F8FE;} + .d2-816666399 .stroke-AB4{stroke:#EDF0FD;} + .d2-816666399 .stroke-AB5{stroke:#F7F8FE;} + .d2-816666399 .background-color-N1{background-color:#0A0F25;} + .d2-816666399 .background-color-N2{background-color:#676C7E;} + .d2-816666399 .background-color-N3{background-color:#9499AB;} + .d2-816666399 .background-color-N4{background-color:#CFD2DD;} + .d2-816666399 .background-color-N5{background-color:#DEE1EB;} + .d2-816666399 .background-color-N6{background-color:#EEF1F8;} + .d2-816666399 .background-color-N7{background-color:#FFFFFF;} + .d2-816666399 .background-color-B1{background-color:#0D32B2;} + .d2-816666399 .background-color-B2{background-color:#0D32B2;} + .d2-816666399 .background-color-B3{background-color:#E3E9FD;} + .d2-816666399 .background-color-B4{background-color:#E3E9FD;} + .d2-816666399 .background-color-B5{background-color:#EDF0FD;} + .d2-816666399 .background-color-B6{background-color:#F7F8FE;} + .d2-816666399 .background-color-AA2{background-color:#4A6FF3;} + .d2-816666399 .background-color-AA4{background-color:#EDF0FD;} + .d2-816666399 .background-color-AA5{background-color:#F7F8FE;} + .d2-816666399 .background-color-AB4{background-color:#EDF0FD;} + .d2-816666399 .background-color-AB5{background-color:#F7F8FE;} + .d2-816666399 .color-N1{color:#0A0F25;} + .d2-816666399 .color-N2{color:#676C7E;} + .d2-816666399 .color-N3{color:#9499AB;} + .d2-816666399 .color-N4{color:#CFD2DD;} + .d2-816666399 .color-N5{color:#DEE1EB;} + .d2-816666399 .color-N6{color:#EEF1F8;} + .d2-816666399 .color-N7{color:#FFFFFF;} + .d2-816666399 .color-B1{color:#0D32B2;} + .d2-816666399 .color-B2{color:#0D32B2;} + .d2-816666399 .color-B3{color:#E3E9FD;} + .d2-816666399 .color-B4{color:#E3E9FD;} + .d2-816666399 .color-B5{color:#EDF0FD;} + .d2-816666399 .color-B6{color:#F7F8FE;} + .d2-816666399 .color-AA2{color:#4A6FF3;} + .d2-816666399 .color-AA4{color:#EDF0FD;} + .d2-816666399 .color-AA5{color:#F7F8FE;} + .d2-816666399 .color-AB4{color:#EDF0FD;} + .d2-816666399 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-816666399);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-816666399);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-816666399);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-816666399);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-816666399);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-816666399);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-816666399);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-816666399);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-816666399);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-816666399);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-816666399);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-816666399);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-816666399);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-816666399);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-816666399);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-816666399);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-816666399);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-816666399);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>a + - + - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/link_with_ampersand/elk/board.exp.json b/e2etests/testdata/regression/link_with_ampersand/elk/board.exp.json index 50b855fa6..804e82303 100644 --- a/e2etests/testdata/regression/link_with_ampersand/elk/board.exp.json +++ b/e2etests/testdata/regression/link_with_ampersand/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -10,7 +18,7 @@ "x": 12, "y": 12 }, - "width": 85, + "width": 53, "height": 66, "opacity": 1, "strokeDash": 0, @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -62,6 +71,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/link_with_ampersand/elk/sketch.exp.svg b/e2etests/testdata/regression/link_with_ampersand/elk/sketch.exp.svg index 1fb489df8..331c11fa1 100644 --- a/e2etests/testdata/regression/link_with_ampersand/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/link_with_ampersand/elk/sketch.exp.svg @@ -1,12 +1,12 @@ -a - + .d2-1836326295 .fill-N1{fill:#0A0F25;} + .d2-1836326295 .fill-N2{fill:#676C7E;} + .d2-1836326295 .fill-N3{fill:#9499AB;} + .d2-1836326295 .fill-N4{fill:#CFD2DD;} + .d2-1836326295 .fill-N5{fill:#DEE1EB;} + .d2-1836326295 .fill-N6{fill:#EEF1F8;} + .d2-1836326295 .fill-N7{fill:#FFFFFF;} + .d2-1836326295 .fill-B1{fill:#0D32B2;} + .d2-1836326295 .fill-B2{fill:#0D32B2;} + .d2-1836326295 .fill-B3{fill:#E3E9FD;} + .d2-1836326295 .fill-B4{fill:#E3E9FD;} + .d2-1836326295 .fill-B5{fill:#EDF0FD;} + .d2-1836326295 .fill-B6{fill:#F7F8FE;} + .d2-1836326295 .fill-AA2{fill:#4A6FF3;} + .d2-1836326295 .fill-AA4{fill:#EDF0FD;} + .d2-1836326295 .fill-AA5{fill:#F7F8FE;} + .d2-1836326295 .fill-AB4{fill:#EDF0FD;} + .d2-1836326295 .fill-AB5{fill:#F7F8FE;} + .d2-1836326295 .stroke-N1{stroke:#0A0F25;} + .d2-1836326295 .stroke-N2{stroke:#676C7E;} + .d2-1836326295 .stroke-N3{stroke:#9499AB;} + .d2-1836326295 .stroke-N4{stroke:#CFD2DD;} + .d2-1836326295 .stroke-N5{stroke:#DEE1EB;} + .d2-1836326295 .stroke-N6{stroke:#EEF1F8;} + .d2-1836326295 .stroke-N7{stroke:#FFFFFF;} + .d2-1836326295 .stroke-B1{stroke:#0D32B2;} + .d2-1836326295 .stroke-B2{stroke:#0D32B2;} + .d2-1836326295 .stroke-B3{stroke:#E3E9FD;} + .d2-1836326295 .stroke-B4{stroke:#E3E9FD;} + .d2-1836326295 .stroke-B5{stroke:#EDF0FD;} + .d2-1836326295 .stroke-B6{stroke:#F7F8FE;} + .d2-1836326295 .stroke-AA2{stroke:#4A6FF3;} + .d2-1836326295 .stroke-AA4{stroke:#EDF0FD;} + .d2-1836326295 .stroke-AA5{stroke:#F7F8FE;} + .d2-1836326295 .stroke-AB4{stroke:#EDF0FD;} + .d2-1836326295 .stroke-AB5{stroke:#F7F8FE;} + .d2-1836326295 .background-color-N1{background-color:#0A0F25;} + .d2-1836326295 .background-color-N2{background-color:#676C7E;} + .d2-1836326295 .background-color-N3{background-color:#9499AB;} + .d2-1836326295 .background-color-N4{background-color:#CFD2DD;} + .d2-1836326295 .background-color-N5{background-color:#DEE1EB;} + .d2-1836326295 .background-color-N6{background-color:#EEF1F8;} + .d2-1836326295 .background-color-N7{background-color:#FFFFFF;} + .d2-1836326295 .background-color-B1{background-color:#0D32B2;} + .d2-1836326295 .background-color-B2{background-color:#0D32B2;} + .d2-1836326295 .background-color-B3{background-color:#E3E9FD;} + .d2-1836326295 .background-color-B4{background-color:#E3E9FD;} + .d2-1836326295 .background-color-B5{background-color:#EDF0FD;} + .d2-1836326295 .background-color-B6{background-color:#F7F8FE;} + .d2-1836326295 .background-color-AA2{background-color:#4A6FF3;} + .d2-1836326295 .background-color-AA4{background-color:#EDF0FD;} + .d2-1836326295 .background-color-AA5{background-color:#F7F8FE;} + .d2-1836326295 .background-color-AB4{background-color:#EDF0FD;} + .d2-1836326295 .background-color-AB5{background-color:#F7F8FE;} + .d2-1836326295 .color-N1{color:#0A0F25;} + .d2-1836326295 .color-N2{color:#676C7E;} + .d2-1836326295 .color-N3{color:#9499AB;} + .d2-1836326295 .color-N4{color:#CFD2DD;} + .d2-1836326295 .color-N5{color:#DEE1EB;} + .d2-1836326295 .color-N6{color:#EEF1F8;} + .d2-1836326295 .color-N7{color:#FFFFFF;} + .d2-1836326295 .color-B1{color:#0D32B2;} + .d2-1836326295 .color-B2{color:#0D32B2;} + .d2-1836326295 .color-B3{color:#E3E9FD;} + .d2-1836326295 .color-B4{color:#E3E9FD;} + .d2-1836326295 .color-B5{color:#EDF0FD;} + .d2-1836326295 .color-B6{color:#F7F8FE;} + .d2-1836326295 .color-AA2{color:#4A6FF3;} + .d2-1836326295 .color-AA4{color:#EDF0FD;} + .d2-1836326295 .color-AA5{color:#F7F8FE;} + .d2-1836326295 .color-AB4{color:#EDF0FD;} + .d2-1836326295 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1836326295);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1836326295);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1836326295);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1836326295);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1836326295);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1836326295);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1836326295);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1836326295);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1836326295);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1836326295);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1836326295);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1836326295);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1836326295);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1836326295);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1836326295);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1836326295);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1836326295);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1836326295);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>a + - + - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/long_arrowhead_label/dagre/board.exp.json b/e2etests/testdata/regression/long_arrowhead_label/dagre/board.exp.json index cdbacb0fc..83cb463ab 100644 --- a/e2etests/testdata/regression/long_arrowhead_label/dagre/board.exp.json +++ b/e2etests/testdata/regression/long_arrowhead_label/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -122,6 +132,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 26.5, @@ -162,6 +173,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/long_arrowhead_label/dagre/sketch.exp.svg b/e2etests/testdata/regression/long_arrowhead_label/dagre/sketch.exp.svg index 71374b499..dd059f4cb 100644 --- a/e2etests/testdata/regression/long_arrowhead_label/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/long_arrowhead_label/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -ab a to b with unexpectedly long target arrowhead label + .d2-3519418514 .fill-N1{fill:#0A0F25;} + .d2-3519418514 .fill-N2{fill:#676C7E;} + .d2-3519418514 .fill-N3{fill:#9499AB;} + .d2-3519418514 .fill-N4{fill:#CFD2DD;} + .d2-3519418514 .fill-N5{fill:#DEE1EB;} + .d2-3519418514 .fill-N6{fill:#EEF1F8;} + .d2-3519418514 .fill-N7{fill:#FFFFFF;} + .d2-3519418514 .fill-B1{fill:#0D32B2;} + .d2-3519418514 .fill-B2{fill:#0D32B2;} + .d2-3519418514 .fill-B3{fill:#E3E9FD;} + .d2-3519418514 .fill-B4{fill:#E3E9FD;} + .d2-3519418514 .fill-B5{fill:#EDF0FD;} + .d2-3519418514 .fill-B6{fill:#F7F8FE;} + .d2-3519418514 .fill-AA2{fill:#4A6FF3;} + .d2-3519418514 .fill-AA4{fill:#EDF0FD;} + .d2-3519418514 .fill-AA5{fill:#F7F8FE;} + .d2-3519418514 .fill-AB4{fill:#EDF0FD;} + .d2-3519418514 .fill-AB5{fill:#F7F8FE;} + .d2-3519418514 .stroke-N1{stroke:#0A0F25;} + .d2-3519418514 .stroke-N2{stroke:#676C7E;} + .d2-3519418514 .stroke-N3{stroke:#9499AB;} + .d2-3519418514 .stroke-N4{stroke:#CFD2DD;} + .d2-3519418514 .stroke-N5{stroke:#DEE1EB;} + .d2-3519418514 .stroke-N6{stroke:#EEF1F8;} + .d2-3519418514 .stroke-N7{stroke:#FFFFFF;} + .d2-3519418514 .stroke-B1{stroke:#0D32B2;} + .d2-3519418514 .stroke-B2{stroke:#0D32B2;} + .d2-3519418514 .stroke-B3{stroke:#E3E9FD;} + .d2-3519418514 .stroke-B4{stroke:#E3E9FD;} + .d2-3519418514 .stroke-B5{stroke:#EDF0FD;} + .d2-3519418514 .stroke-B6{stroke:#F7F8FE;} + .d2-3519418514 .stroke-AA2{stroke:#4A6FF3;} + .d2-3519418514 .stroke-AA4{stroke:#EDF0FD;} + .d2-3519418514 .stroke-AA5{stroke:#F7F8FE;} + .d2-3519418514 .stroke-AB4{stroke:#EDF0FD;} + .d2-3519418514 .stroke-AB5{stroke:#F7F8FE;} + .d2-3519418514 .background-color-N1{background-color:#0A0F25;} + .d2-3519418514 .background-color-N2{background-color:#676C7E;} + .d2-3519418514 .background-color-N3{background-color:#9499AB;} + .d2-3519418514 .background-color-N4{background-color:#CFD2DD;} + .d2-3519418514 .background-color-N5{background-color:#DEE1EB;} + .d2-3519418514 .background-color-N6{background-color:#EEF1F8;} + .d2-3519418514 .background-color-N7{background-color:#FFFFFF;} + .d2-3519418514 .background-color-B1{background-color:#0D32B2;} + .d2-3519418514 .background-color-B2{background-color:#0D32B2;} + .d2-3519418514 .background-color-B3{background-color:#E3E9FD;} + .d2-3519418514 .background-color-B4{background-color:#E3E9FD;} + .d2-3519418514 .background-color-B5{background-color:#EDF0FD;} + .d2-3519418514 .background-color-B6{background-color:#F7F8FE;} + .d2-3519418514 .background-color-AA2{background-color:#4A6FF3;} + .d2-3519418514 .background-color-AA4{background-color:#EDF0FD;} + .d2-3519418514 .background-color-AA5{background-color:#F7F8FE;} + .d2-3519418514 .background-color-AB4{background-color:#EDF0FD;} + .d2-3519418514 .background-color-AB5{background-color:#F7F8FE;} + .d2-3519418514 .color-N1{color:#0A0F25;} + .d2-3519418514 .color-N2{color:#676C7E;} + .d2-3519418514 .color-N3{color:#9499AB;} + .d2-3519418514 .color-N4{color:#CFD2DD;} + .d2-3519418514 .color-N5{color:#DEE1EB;} + .d2-3519418514 .color-N6{color:#EEF1F8;} + .d2-3519418514 .color-N7{color:#FFFFFF;} + .d2-3519418514 .color-B1{color:#0D32B2;} + .d2-3519418514 .color-B2{color:#0D32B2;} + .d2-3519418514 .color-B3{color:#E3E9FD;} + .d2-3519418514 .color-B4{color:#E3E9FD;} + .d2-3519418514 .color-B5{color:#EDF0FD;} + .d2-3519418514 .color-B6{color:#F7F8FE;} + .d2-3519418514 .color-AA2{color:#4A6FF3;} + .d2-3519418514 .color-AA4{color:#EDF0FD;} + .d2-3519418514 .color-AA5{color:#F7F8FE;} + .d2-3519418514 .color-AB4{color:#EDF0FD;} + .d2-3519418514 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3519418514);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3519418514);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3519418514);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3519418514);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3519418514);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3519418514);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3519418514);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3519418514);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3519418514);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3519418514);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3519418514);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3519418514);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3519418514);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3519418514);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3519418514);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3519418514);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3519418514);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3519418514);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ab a to b with unexpectedly long target arrowhead label - - + + \ No newline at end of file diff --git a/e2etests/testdata/regression/long_arrowhead_label/elk/board.exp.json b/e2etests/testdata/regression/long_arrowhead_label/elk/board.exp.json index f2c06801c..cf2be79c9 100644 --- a/e2etests/testdata/regression/long_arrowhead_label/elk/board.exp.json +++ b/e2etests/testdata/regression/long_arrowhead_label/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -122,6 +132,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 38.5, @@ -153,6 +164,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/long_arrowhead_label/elk/sketch.exp.svg b/e2etests/testdata/regression/long_arrowhead_label/elk/sketch.exp.svg index 9da43f7a8..199c7e744 100644 --- a/e2etests/testdata/regression/long_arrowhead_label/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/long_arrowhead_label/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -ab a to b with unexpectedly long target arrowhead label + .d2-813035409 .fill-N1{fill:#0A0F25;} + .d2-813035409 .fill-N2{fill:#676C7E;} + .d2-813035409 .fill-N3{fill:#9499AB;} + .d2-813035409 .fill-N4{fill:#CFD2DD;} + .d2-813035409 .fill-N5{fill:#DEE1EB;} + .d2-813035409 .fill-N6{fill:#EEF1F8;} + .d2-813035409 .fill-N7{fill:#FFFFFF;} + .d2-813035409 .fill-B1{fill:#0D32B2;} + .d2-813035409 .fill-B2{fill:#0D32B2;} + .d2-813035409 .fill-B3{fill:#E3E9FD;} + .d2-813035409 .fill-B4{fill:#E3E9FD;} + .d2-813035409 .fill-B5{fill:#EDF0FD;} + .d2-813035409 .fill-B6{fill:#F7F8FE;} + .d2-813035409 .fill-AA2{fill:#4A6FF3;} + .d2-813035409 .fill-AA4{fill:#EDF0FD;} + .d2-813035409 .fill-AA5{fill:#F7F8FE;} + .d2-813035409 .fill-AB4{fill:#EDF0FD;} + .d2-813035409 .fill-AB5{fill:#F7F8FE;} + .d2-813035409 .stroke-N1{stroke:#0A0F25;} + .d2-813035409 .stroke-N2{stroke:#676C7E;} + .d2-813035409 .stroke-N3{stroke:#9499AB;} + .d2-813035409 .stroke-N4{stroke:#CFD2DD;} + .d2-813035409 .stroke-N5{stroke:#DEE1EB;} + .d2-813035409 .stroke-N6{stroke:#EEF1F8;} + .d2-813035409 .stroke-N7{stroke:#FFFFFF;} + .d2-813035409 .stroke-B1{stroke:#0D32B2;} + .d2-813035409 .stroke-B2{stroke:#0D32B2;} + .d2-813035409 .stroke-B3{stroke:#E3E9FD;} + .d2-813035409 .stroke-B4{stroke:#E3E9FD;} + .d2-813035409 .stroke-B5{stroke:#EDF0FD;} + .d2-813035409 .stroke-B6{stroke:#F7F8FE;} + .d2-813035409 .stroke-AA2{stroke:#4A6FF3;} + .d2-813035409 .stroke-AA4{stroke:#EDF0FD;} + .d2-813035409 .stroke-AA5{stroke:#F7F8FE;} + .d2-813035409 .stroke-AB4{stroke:#EDF0FD;} + .d2-813035409 .stroke-AB5{stroke:#F7F8FE;} + .d2-813035409 .background-color-N1{background-color:#0A0F25;} + .d2-813035409 .background-color-N2{background-color:#676C7E;} + .d2-813035409 .background-color-N3{background-color:#9499AB;} + .d2-813035409 .background-color-N4{background-color:#CFD2DD;} + .d2-813035409 .background-color-N5{background-color:#DEE1EB;} + .d2-813035409 .background-color-N6{background-color:#EEF1F8;} + .d2-813035409 .background-color-N7{background-color:#FFFFFF;} + .d2-813035409 .background-color-B1{background-color:#0D32B2;} + .d2-813035409 .background-color-B2{background-color:#0D32B2;} + .d2-813035409 .background-color-B3{background-color:#E3E9FD;} + .d2-813035409 .background-color-B4{background-color:#E3E9FD;} + .d2-813035409 .background-color-B5{background-color:#EDF0FD;} + .d2-813035409 .background-color-B6{background-color:#F7F8FE;} + .d2-813035409 .background-color-AA2{background-color:#4A6FF3;} + .d2-813035409 .background-color-AA4{background-color:#EDF0FD;} + .d2-813035409 .background-color-AA5{background-color:#F7F8FE;} + .d2-813035409 .background-color-AB4{background-color:#EDF0FD;} + .d2-813035409 .background-color-AB5{background-color:#F7F8FE;} + .d2-813035409 .color-N1{color:#0A0F25;} + .d2-813035409 .color-N2{color:#676C7E;} + .d2-813035409 .color-N3{color:#9499AB;} + .d2-813035409 .color-N4{color:#CFD2DD;} + .d2-813035409 .color-N5{color:#DEE1EB;} + .d2-813035409 .color-N6{color:#EEF1F8;} + .d2-813035409 .color-N7{color:#FFFFFF;} + .d2-813035409 .color-B1{color:#0D32B2;} + .d2-813035409 .color-B2{color:#0D32B2;} + .d2-813035409 .color-B3{color:#E3E9FD;} + .d2-813035409 .color-B4{color:#E3E9FD;} + .d2-813035409 .color-B5{color:#EDF0FD;} + .d2-813035409 .color-B6{color:#F7F8FE;} + .d2-813035409 .color-AA2{color:#4A6FF3;} + .d2-813035409 .color-AA4{color:#EDF0FD;} + .d2-813035409 .color-AA5{color:#F7F8FE;} + .d2-813035409 .color-AB4{color:#EDF0FD;} + .d2-813035409 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-813035409);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-813035409);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-813035409);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-813035409);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-813035409);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-813035409);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-813035409);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-813035409);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-813035409);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-813035409);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-813035409);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-813035409);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-813035409);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-813035409);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-813035409);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-813035409);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-813035409);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-813035409);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ab a to b with unexpectedly long target arrowhead label - - + + \ No newline at end of file diff --git a/e2etests/testdata/regression/md_font_weight/dagre/board.exp.json b/e2etests/testdata/regression/md_font_weight/dagre/board.exp.json index 55832ffab..1aa0c5aef 100644 --- a/e2etests/testdata/regression/md_font_weight/dagre/board.exp.json +++ b/e2etests/testdata/regression/md_font_weight/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -60,6 +69,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/md_font_weight/dagre/sketch.exp.svg b/e2etests/testdata/regression/md_font_weight/dagre/sketch.exp.svg index cc0b84cea..9c5b8f412 100644 --- a/e2etests/testdata/regression/md_font_weight/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/md_font_weight/dagre/sketch.exp.svg @@ -1,13 +1,13 @@ -

    I can do headers

    +

    I can do headers

    • lists
    • lists

    And other normal markdown stuff

    -
     +
     - +     \ No newline at end of file diff --git a/e2etests/testdata/regression/md_font_weight/elk/board.exp.json b/e2etests/testdata/regression/md_font_weight/elk/board.exp.json index 7af68cd85..215ba30f5 100644 --- a/e2etests/testdata/regression/md_font_weight/elk/board.exp.json +++ b/e2etests/testdata/regression/md_font_weight/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -60,6 +69,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/md_font_weight/elk/sketch.exp.svg b/e2etests/testdata/regression/md_font_weight/elk/sketch.exp.svg index 22185bf41..c2dfcee8b 100644 --- a/e2etests/testdata/regression/md_font_weight/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/md_font_weight/elk/sketch.exp.svg @@ -1,13 +1,13 @@ -

    I can do headers

    +

    I can do headers

    • lists
    • lists

    And other normal markdown stuff

    -
     +
     - +     \ No newline at end of file diff --git a/e2etests/testdata/regression/md_h1_li_li/dagre/board.exp.json b/e2etests/testdata/regression/md_h1_li_li/dagre/board.exp.json index 8dc09c03e..625491e75 100644 --- a/e2etests/testdata/regression/md_h1_li_li/dagre/board.exp.json +++ b/e2etests/testdata/regression/md_h1_li_li/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -150,6 +161,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 47.5, @@ -197,6 +209,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 47.5, @@ -237,6 +250,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/md_h1_li_li/dagre/sketch.exp.svg b/e2etests/testdata/regression/md_h1_li_li/dagre/sketch.exp.svg index 466b2ee90..926b727d4 100644 --- a/e2etests/testdata/regression/md_h1_li_li/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/md_h1_li_li/dagre/sketch.exp.svg @@ -1,20 +1,20 @@ -

    hey

    +

    hey

    • they
        @@ -844,9 +843,9 @@
    -
    ab +
    ab - - - + + +     \ No newline at end of file diff --git a/e2etests/testdata/regression/md_h1_li_li/elk/board.exp.json b/e2etests/testdata/regression/md_h1_li_li/elk/board.exp.json index b3c0a8672..796c552f6 100644 --- a/e2etests/testdata/regression/md_h1_li_li/elk/board.exp.json +++ b/e2etests/testdata/regression/md_h1_li_li/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -150,6 +161,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 59.5, @@ -188,6 +200,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 59.5, @@ -219,6 +232,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/md_h1_li_li/elk/sketch.exp.svg b/e2etests/testdata/regression/md_h1_li_li/elk/sketch.exp.svg index 8504cade0..013d58dfe 100644 --- a/e2etests/testdata/regression/md_h1_li_li/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/md_h1_li_li/elk/sketch.exp.svg @@ -1,20 +1,20 @@ -

    hey

    +

    hey

    • they
        @@ -844,9 +843,9 @@
    -
    ab +
    ab - - - + + +     \ No newline at end of file diff --git a/e2etests/testdata/regression/multiple_constant_nears/dagre/board.exp.json b/e2etests/testdata/regression/multiple_constant_nears/dagre/board.exp.json index d6231ed4b..bf3a0545d 100644 --- a/e2etests/testdata/regression/multiple_constant_nears/dagre/board.exp.json +++ b/e2etests/testdata/regression/multiple_constant_nears/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "red", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "green", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -356,6 +372,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 129.5, @@ -403,6 +420,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 129.5, @@ -450,6 +468,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 142.5, @@ -490,6 +509,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/multiple_constant_nears/dagre/sketch.exp.svg b/e2etests/testdata/regression/multiple_constant_nears/dagre/sketch.exp.svg index 77e4e37d9..1a8fd9579 100644 --- a/e2etests/testdata/regression/multiple_constant_nears/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/multiple_constant_nears/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -abc12311112222 + .d2-1307165739 .fill-N1{fill:#0A0F25;} + .d2-1307165739 .fill-N2{fill:#676C7E;} + .d2-1307165739 .fill-N3{fill:#9499AB;} + .d2-1307165739 .fill-N4{fill:#CFD2DD;} + .d2-1307165739 .fill-N5{fill:#DEE1EB;} + .d2-1307165739 .fill-N6{fill:#EEF1F8;} + .d2-1307165739 .fill-N7{fill:#FFFFFF;} + .d2-1307165739 .fill-B1{fill:#0D32B2;} + .d2-1307165739 .fill-B2{fill:#0D32B2;} + .d2-1307165739 .fill-B3{fill:#E3E9FD;} + .d2-1307165739 .fill-B4{fill:#E3E9FD;} + .d2-1307165739 .fill-B5{fill:#EDF0FD;} + .d2-1307165739 .fill-B6{fill:#F7F8FE;} + .d2-1307165739 .fill-AA2{fill:#4A6FF3;} + .d2-1307165739 .fill-AA4{fill:#EDF0FD;} + .d2-1307165739 .fill-AA5{fill:#F7F8FE;} + .d2-1307165739 .fill-AB4{fill:#EDF0FD;} + .d2-1307165739 .fill-AB5{fill:#F7F8FE;} + .d2-1307165739 .stroke-N1{stroke:#0A0F25;} + .d2-1307165739 .stroke-N2{stroke:#676C7E;} + .d2-1307165739 .stroke-N3{stroke:#9499AB;} + .d2-1307165739 .stroke-N4{stroke:#CFD2DD;} + .d2-1307165739 .stroke-N5{stroke:#DEE1EB;} + .d2-1307165739 .stroke-N6{stroke:#EEF1F8;} + .d2-1307165739 .stroke-N7{stroke:#FFFFFF;} + .d2-1307165739 .stroke-B1{stroke:#0D32B2;} + .d2-1307165739 .stroke-B2{stroke:#0D32B2;} + .d2-1307165739 .stroke-B3{stroke:#E3E9FD;} + .d2-1307165739 .stroke-B4{stroke:#E3E9FD;} + .d2-1307165739 .stroke-B5{stroke:#EDF0FD;} + .d2-1307165739 .stroke-B6{stroke:#F7F8FE;} + .d2-1307165739 .stroke-AA2{stroke:#4A6FF3;} + .d2-1307165739 .stroke-AA4{stroke:#EDF0FD;} + .d2-1307165739 .stroke-AA5{stroke:#F7F8FE;} + .d2-1307165739 .stroke-AB4{stroke:#EDF0FD;} + .d2-1307165739 .stroke-AB5{stroke:#F7F8FE;} + .d2-1307165739 .background-color-N1{background-color:#0A0F25;} + .d2-1307165739 .background-color-N2{background-color:#676C7E;} + .d2-1307165739 .background-color-N3{background-color:#9499AB;} + .d2-1307165739 .background-color-N4{background-color:#CFD2DD;} + .d2-1307165739 .background-color-N5{background-color:#DEE1EB;} + .d2-1307165739 .background-color-N6{background-color:#EEF1F8;} + .d2-1307165739 .background-color-N7{background-color:#FFFFFF;} + .d2-1307165739 .background-color-B1{background-color:#0D32B2;} + .d2-1307165739 .background-color-B2{background-color:#0D32B2;} + .d2-1307165739 .background-color-B3{background-color:#E3E9FD;} + .d2-1307165739 .background-color-B4{background-color:#E3E9FD;} + .d2-1307165739 .background-color-B5{background-color:#EDF0FD;} + .d2-1307165739 .background-color-B6{background-color:#F7F8FE;} + .d2-1307165739 .background-color-AA2{background-color:#4A6FF3;} + .d2-1307165739 .background-color-AA4{background-color:#EDF0FD;} + .d2-1307165739 .background-color-AA5{background-color:#F7F8FE;} + .d2-1307165739 .background-color-AB4{background-color:#EDF0FD;} + .d2-1307165739 .background-color-AB5{background-color:#F7F8FE;} + .d2-1307165739 .color-N1{color:#0A0F25;} + .d2-1307165739 .color-N2{color:#676C7E;} + .d2-1307165739 .color-N3{color:#9499AB;} + .d2-1307165739 .color-N4{color:#CFD2DD;} + .d2-1307165739 .color-N5{color:#DEE1EB;} + .d2-1307165739 .color-N6{color:#EEF1F8;} + .d2-1307165739 .color-N7{color:#FFFFFF;} + .d2-1307165739 .color-B1{color:#0D32B2;} + .d2-1307165739 .color-B2{color:#0D32B2;} + .d2-1307165739 .color-B3{color:#E3E9FD;} + .d2-1307165739 .color-B4{color:#E3E9FD;} + .d2-1307165739 .color-B5{color:#EDF0FD;} + .d2-1307165739 .color-B6{color:#F7F8FE;} + .d2-1307165739 .color-AA2{color:#4A6FF3;} + .d2-1307165739 .color-AA4{color:#EDF0FD;} + .d2-1307165739 .color-AA5{color:#F7F8FE;} + .d2-1307165739 .color-AB4{color:#EDF0FD;} + .d2-1307165739 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1307165739);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1307165739);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1307165739);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1307165739);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1307165739);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1307165739);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1307165739);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1307165739);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1307165739);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1307165739);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1307165739);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1307165739);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1307165739);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1307165739);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1307165739);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1307165739);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1307165739);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1307165739);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abc12311112222 - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/multiple_constant_nears/elk/board.exp.json b/e2etests/testdata/regression/multiple_constant_nears/elk/board.exp.json index 2ce891239..7259185ba 100644 --- a/e2etests/testdata/regression/multiple_constant_nears/elk/board.exp.json +++ b/e2etests/testdata/regression/multiple_constant_nears/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "red", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "green", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -356,6 +372,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 161.5, @@ -394,6 +411,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 161.5, @@ -432,6 +450,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 174.5, @@ -463,6 +482,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/multiple_constant_nears/elk/sketch.exp.svg b/e2etests/testdata/regression/multiple_constant_nears/elk/sketch.exp.svg index 5d9d5cc34..14ea9f89b 100644 --- a/e2etests/testdata/regression/multiple_constant_nears/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/multiple_constant_nears/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -abc12311112222 + .d2-3139110256 .fill-N1{fill:#0A0F25;} + .d2-3139110256 .fill-N2{fill:#676C7E;} + .d2-3139110256 .fill-N3{fill:#9499AB;} + .d2-3139110256 .fill-N4{fill:#CFD2DD;} + .d2-3139110256 .fill-N5{fill:#DEE1EB;} + .d2-3139110256 .fill-N6{fill:#EEF1F8;} + .d2-3139110256 .fill-N7{fill:#FFFFFF;} + .d2-3139110256 .fill-B1{fill:#0D32B2;} + .d2-3139110256 .fill-B2{fill:#0D32B2;} + .d2-3139110256 .fill-B3{fill:#E3E9FD;} + .d2-3139110256 .fill-B4{fill:#E3E9FD;} + .d2-3139110256 .fill-B5{fill:#EDF0FD;} + .d2-3139110256 .fill-B6{fill:#F7F8FE;} + .d2-3139110256 .fill-AA2{fill:#4A6FF3;} + .d2-3139110256 .fill-AA4{fill:#EDF0FD;} + .d2-3139110256 .fill-AA5{fill:#F7F8FE;} + .d2-3139110256 .fill-AB4{fill:#EDF0FD;} + .d2-3139110256 .fill-AB5{fill:#F7F8FE;} + .d2-3139110256 .stroke-N1{stroke:#0A0F25;} + .d2-3139110256 .stroke-N2{stroke:#676C7E;} + .d2-3139110256 .stroke-N3{stroke:#9499AB;} + .d2-3139110256 .stroke-N4{stroke:#CFD2DD;} + .d2-3139110256 .stroke-N5{stroke:#DEE1EB;} + .d2-3139110256 .stroke-N6{stroke:#EEF1F8;} + .d2-3139110256 .stroke-N7{stroke:#FFFFFF;} + .d2-3139110256 .stroke-B1{stroke:#0D32B2;} + .d2-3139110256 .stroke-B2{stroke:#0D32B2;} + .d2-3139110256 .stroke-B3{stroke:#E3E9FD;} + .d2-3139110256 .stroke-B4{stroke:#E3E9FD;} + .d2-3139110256 .stroke-B5{stroke:#EDF0FD;} + .d2-3139110256 .stroke-B6{stroke:#F7F8FE;} + .d2-3139110256 .stroke-AA2{stroke:#4A6FF3;} + .d2-3139110256 .stroke-AA4{stroke:#EDF0FD;} + .d2-3139110256 .stroke-AA5{stroke:#F7F8FE;} + .d2-3139110256 .stroke-AB4{stroke:#EDF0FD;} + .d2-3139110256 .stroke-AB5{stroke:#F7F8FE;} + .d2-3139110256 .background-color-N1{background-color:#0A0F25;} + .d2-3139110256 .background-color-N2{background-color:#676C7E;} + .d2-3139110256 .background-color-N3{background-color:#9499AB;} + .d2-3139110256 .background-color-N4{background-color:#CFD2DD;} + .d2-3139110256 .background-color-N5{background-color:#DEE1EB;} + .d2-3139110256 .background-color-N6{background-color:#EEF1F8;} + .d2-3139110256 .background-color-N7{background-color:#FFFFFF;} + .d2-3139110256 .background-color-B1{background-color:#0D32B2;} + .d2-3139110256 .background-color-B2{background-color:#0D32B2;} + .d2-3139110256 .background-color-B3{background-color:#E3E9FD;} + .d2-3139110256 .background-color-B4{background-color:#E3E9FD;} + .d2-3139110256 .background-color-B5{background-color:#EDF0FD;} + .d2-3139110256 .background-color-B6{background-color:#F7F8FE;} + .d2-3139110256 .background-color-AA2{background-color:#4A6FF3;} + .d2-3139110256 .background-color-AA4{background-color:#EDF0FD;} + .d2-3139110256 .background-color-AA5{background-color:#F7F8FE;} + .d2-3139110256 .background-color-AB4{background-color:#EDF0FD;} + .d2-3139110256 .background-color-AB5{background-color:#F7F8FE;} + .d2-3139110256 .color-N1{color:#0A0F25;} + .d2-3139110256 .color-N2{color:#676C7E;} + .d2-3139110256 .color-N3{color:#9499AB;} + .d2-3139110256 .color-N4{color:#CFD2DD;} + .d2-3139110256 .color-N5{color:#DEE1EB;} + .d2-3139110256 .color-N6{color:#EEF1F8;} + .d2-3139110256 .color-N7{color:#FFFFFF;} + .d2-3139110256 .color-B1{color:#0D32B2;} + .d2-3139110256 .color-B2{color:#0D32B2;} + .d2-3139110256 .color-B3{color:#E3E9FD;} + .d2-3139110256 .color-B4{color:#E3E9FD;} + .d2-3139110256 .color-B5{color:#EDF0FD;} + .d2-3139110256 .color-B6{color:#F7F8FE;} + .d2-3139110256 .color-AA2{color:#4A6FF3;} + .d2-3139110256 .color-AA4{color:#EDF0FD;} + .d2-3139110256 .color-AA5{color:#F7F8FE;} + .d2-3139110256 .color-AB4{color:#EDF0FD;} + .d2-3139110256 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3139110256);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3139110256);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3139110256);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3139110256);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3139110256);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3139110256);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3139110256);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3139110256);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3139110256);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3139110256);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3139110256);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3139110256);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3139110256);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3139110256);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3139110256);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3139110256);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3139110256);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3139110256);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abc12311112222 - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/nested_layout_bug/dagre/board.exp.json b/e2etests/testdata/regression/nested_layout_bug/dagre/board.exp.json index 8562bc26a..bfebfe716 100644 --- a/e2etests/testdata/regression/nested_layout_bug/dagre/board.exp.json +++ b/e2etests/testdata/regression/nested_layout_bug/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -192,6 +204,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 53, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/nested_layout_bug/dagre/sketch.exp.svg b/e2etests/testdata/regression/nested_layout_bug/dagre/sketch.exp.svg index ab82b69f9..5376bd5bc 100644 --- a/e2etests/testdata/regression/nested_layout_bug/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/nested_layout_bug/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -abAABB + .d2-3825674382 .fill-N1{fill:#0A0F25;} + .d2-3825674382 .fill-N2{fill:#676C7E;} + .d2-3825674382 .fill-N3{fill:#9499AB;} + .d2-3825674382 .fill-N4{fill:#CFD2DD;} + .d2-3825674382 .fill-N5{fill:#DEE1EB;} + .d2-3825674382 .fill-N6{fill:#EEF1F8;} + .d2-3825674382 .fill-N7{fill:#FFFFFF;} + .d2-3825674382 .fill-B1{fill:#0D32B2;} + .d2-3825674382 .fill-B2{fill:#0D32B2;} + .d2-3825674382 .fill-B3{fill:#E3E9FD;} + .d2-3825674382 .fill-B4{fill:#E3E9FD;} + .d2-3825674382 .fill-B5{fill:#EDF0FD;} + .d2-3825674382 .fill-B6{fill:#F7F8FE;} + .d2-3825674382 .fill-AA2{fill:#4A6FF3;} + .d2-3825674382 .fill-AA4{fill:#EDF0FD;} + .d2-3825674382 .fill-AA5{fill:#F7F8FE;} + .d2-3825674382 .fill-AB4{fill:#EDF0FD;} + .d2-3825674382 .fill-AB5{fill:#F7F8FE;} + .d2-3825674382 .stroke-N1{stroke:#0A0F25;} + .d2-3825674382 .stroke-N2{stroke:#676C7E;} + .d2-3825674382 .stroke-N3{stroke:#9499AB;} + .d2-3825674382 .stroke-N4{stroke:#CFD2DD;} + .d2-3825674382 .stroke-N5{stroke:#DEE1EB;} + .d2-3825674382 .stroke-N6{stroke:#EEF1F8;} + .d2-3825674382 .stroke-N7{stroke:#FFFFFF;} + .d2-3825674382 .stroke-B1{stroke:#0D32B2;} + .d2-3825674382 .stroke-B2{stroke:#0D32B2;} + .d2-3825674382 .stroke-B3{stroke:#E3E9FD;} + .d2-3825674382 .stroke-B4{stroke:#E3E9FD;} + .d2-3825674382 .stroke-B5{stroke:#EDF0FD;} + .d2-3825674382 .stroke-B6{stroke:#F7F8FE;} + .d2-3825674382 .stroke-AA2{stroke:#4A6FF3;} + .d2-3825674382 .stroke-AA4{stroke:#EDF0FD;} + .d2-3825674382 .stroke-AA5{stroke:#F7F8FE;} + .d2-3825674382 .stroke-AB4{stroke:#EDF0FD;} + .d2-3825674382 .stroke-AB5{stroke:#F7F8FE;} + .d2-3825674382 .background-color-N1{background-color:#0A0F25;} + .d2-3825674382 .background-color-N2{background-color:#676C7E;} + .d2-3825674382 .background-color-N3{background-color:#9499AB;} + .d2-3825674382 .background-color-N4{background-color:#CFD2DD;} + .d2-3825674382 .background-color-N5{background-color:#DEE1EB;} + .d2-3825674382 .background-color-N6{background-color:#EEF1F8;} + .d2-3825674382 .background-color-N7{background-color:#FFFFFF;} + .d2-3825674382 .background-color-B1{background-color:#0D32B2;} + .d2-3825674382 .background-color-B2{background-color:#0D32B2;} + .d2-3825674382 .background-color-B3{background-color:#E3E9FD;} + .d2-3825674382 .background-color-B4{background-color:#E3E9FD;} + .d2-3825674382 .background-color-B5{background-color:#EDF0FD;} + .d2-3825674382 .background-color-B6{background-color:#F7F8FE;} + .d2-3825674382 .background-color-AA2{background-color:#4A6FF3;} + .d2-3825674382 .background-color-AA4{background-color:#EDF0FD;} + .d2-3825674382 .background-color-AA5{background-color:#F7F8FE;} + .d2-3825674382 .background-color-AB4{background-color:#EDF0FD;} + .d2-3825674382 .background-color-AB5{background-color:#F7F8FE;} + .d2-3825674382 .color-N1{color:#0A0F25;} + .d2-3825674382 .color-N2{color:#676C7E;} + .d2-3825674382 .color-N3{color:#9499AB;} + .d2-3825674382 .color-N4{color:#CFD2DD;} + .d2-3825674382 .color-N5{color:#DEE1EB;} + .d2-3825674382 .color-N6{color:#EEF1F8;} + .d2-3825674382 .color-N7{color:#FFFFFF;} + .d2-3825674382 .color-B1{color:#0D32B2;} + .d2-3825674382 .color-B2{color:#0D32B2;} + .d2-3825674382 .color-B3{color:#E3E9FD;} + .d2-3825674382 .color-B4{color:#E3E9FD;} + .d2-3825674382 .color-B5{color:#EDF0FD;} + .d2-3825674382 .color-B6{color:#F7F8FE;} + .d2-3825674382 .color-AA2{color:#4A6FF3;} + .d2-3825674382 .color-AA4{color:#EDF0FD;} + .d2-3825674382 .color-AA5{color:#F7F8FE;} + .d2-3825674382 .color-AB4{color:#EDF0FD;} + .d2-3825674382 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3825674382);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3825674382);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3825674382);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3825674382);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3825674382);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3825674382);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3825674382);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3825674382);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3825674382);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3825674382);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3825674382);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3825674382);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3825674382);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3825674382);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3825674382);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3825674382);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3825674382);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3825674382);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abAABB - - - - + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/nested_layout_bug/elk/board.exp.json b/e2etests/testdata/regression/nested_layout_bug/elk/board.exp.json index d2fb5269e..533f443de 100644 --- a/e2etests/testdata/regression/nested_layout_bug/elk/board.exp.json +++ b/e2etests/testdata/regression/nested_layout_bug/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -192,6 +204,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 53, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/nested_layout_bug/elk/sketch.exp.svg b/e2etests/testdata/regression/nested_layout_bug/elk/sketch.exp.svg index 227e22259..b60a01139 100644 --- a/e2etests/testdata/regression/nested_layout_bug/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/nested_layout_bug/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -abAABB + .d2-4141667234 .fill-N1{fill:#0A0F25;} + .d2-4141667234 .fill-N2{fill:#676C7E;} + .d2-4141667234 .fill-N3{fill:#9499AB;} + .d2-4141667234 .fill-N4{fill:#CFD2DD;} + .d2-4141667234 .fill-N5{fill:#DEE1EB;} + .d2-4141667234 .fill-N6{fill:#EEF1F8;} + .d2-4141667234 .fill-N7{fill:#FFFFFF;} + .d2-4141667234 .fill-B1{fill:#0D32B2;} + .d2-4141667234 .fill-B2{fill:#0D32B2;} + .d2-4141667234 .fill-B3{fill:#E3E9FD;} + .d2-4141667234 .fill-B4{fill:#E3E9FD;} + .d2-4141667234 .fill-B5{fill:#EDF0FD;} + .d2-4141667234 .fill-B6{fill:#F7F8FE;} + .d2-4141667234 .fill-AA2{fill:#4A6FF3;} + .d2-4141667234 .fill-AA4{fill:#EDF0FD;} + .d2-4141667234 .fill-AA5{fill:#F7F8FE;} + .d2-4141667234 .fill-AB4{fill:#EDF0FD;} + .d2-4141667234 .fill-AB5{fill:#F7F8FE;} + .d2-4141667234 .stroke-N1{stroke:#0A0F25;} + .d2-4141667234 .stroke-N2{stroke:#676C7E;} + .d2-4141667234 .stroke-N3{stroke:#9499AB;} + .d2-4141667234 .stroke-N4{stroke:#CFD2DD;} + .d2-4141667234 .stroke-N5{stroke:#DEE1EB;} + .d2-4141667234 .stroke-N6{stroke:#EEF1F8;} + .d2-4141667234 .stroke-N7{stroke:#FFFFFF;} + .d2-4141667234 .stroke-B1{stroke:#0D32B2;} + .d2-4141667234 .stroke-B2{stroke:#0D32B2;} + .d2-4141667234 .stroke-B3{stroke:#E3E9FD;} + .d2-4141667234 .stroke-B4{stroke:#E3E9FD;} + .d2-4141667234 .stroke-B5{stroke:#EDF0FD;} + .d2-4141667234 .stroke-B6{stroke:#F7F8FE;} + .d2-4141667234 .stroke-AA2{stroke:#4A6FF3;} + .d2-4141667234 .stroke-AA4{stroke:#EDF0FD;} + .d2-4141667234 .stroke-AA5{stroke:#F7F8FE;} + .d2-4141667234 .stroke-AB4{stroke:#EDF0FD;} + .d2-4141667234 .stroke-AB5{stroke:#F7F8FE;} + .d2-4141667234 .background-color-N1{background-color:#0A0F25;} + .d2-4141667234 .background-color-N2{background-color:#676C7E;} + .d2-4141667234 .background-color-N3{background-color:#9499AB;} + .d2-4141667234 .background-color-N4{background-color:#CFD2DD;} + .d2-4141667234 .background-color-N5{background-color:#DEE1EB;} + .d2-4141667234 .background-color-N6{background-color:#EEF1F8;} + .d2-4141667234 .background-color-N7{background-color:#FFFFFF;} + .d2-4141667234 .background-color-B1{background-color:#0D32B2;} + .d2-4141667234 .background-color-B2{background-color:#0D32B2;} + .d2-4141667234 .background-color-B3{background-color:#E3E9FD;} + .d2-4141667234 .background-color-B4{background-color:#E3E9FD;} + .d2-4141667234 .background-color-B5{background-color:#EDF0FD;} + .d2-4141667234 .background-color-B6{background-color:#F7F8FE;} + .d2-4141667234 .background-color-AA2{background-color:#4A6FF3;} + .d2-4141667234 .background-color-AA4{background-color:#EDF0FD;} + .d2-4141667234 .background-color-AA5{background-color:#F7F8FE;} + .d2-4141667234 .background-color-AB4{background-color:#EDF0FD;} + .d2-4141667234 .background-color-AB5{background-color:#F7F8FE;} + .d2-4141667234 .color-N1{color:#0A0F25;} + .d2-4141667234 .color-N2{color:#676C7E;} + .d2-4141667234 .color-N3{color:#9499AB;} + .d2-4141667234 .color-N4{color:#CFD2DD;} + .d2-4141667234 .color-N5{color:#DEE1EB;} + .d2-4141667234 .color-N6{color:#EEF1F8;} + .d2-4141667234 .color-N7{color:#FFFFFF;} + .d2-4141667234 .color-B1{color:#0D32B2;} + .d2-4141667234 .color-B2{color:#0D32B2;} + .d2-4141667234 .color-B3{color:#E3E9FD;} + .d2-4141667234 .color-B4{color:#E3E9FD;} + .d2-4141667234 .color-B5{color:#EDF0FD;} + .d2-4141667234 .color-B6{color:#F7F8FE;} + .d2-4141667234 .color-AA2{color:#4A6FF3;} + .d2-4141667234 .color-AA4{color:#EDF0FD;} + .d2-4141667234 .color-AA5{color:#F7F8FE;} + .d2-4141667234 .color-AB4{color:#EDF0FD;} + .d2-4141667234 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4141667234);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4141667234);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4141667234);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4141667234);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4141667234);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4141667234);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4141667234);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4141667234);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4141667234);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4141667234);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4141667234);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4141667234);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4141667234);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4141667234);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4141667234);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4141667234);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4141667234);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4141667234);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abAABB - - - - + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/nested_steps/dagre/board.exp.json b/e2etests/testdata/regression/nested_steps/dagre/board.exp.json index a05bdd6e0..af332a807 100644 --- a/e2etests/testdata/regression/nested_steps/dagre/board.exp.json +++ b/e2etests/testdata/regression/nested_steps/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "AB5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "AB5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "AB4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "AB4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -233,6 +246,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 86, @@ -280,6 +294,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 260, @@ -320,6 +335,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/nested_steps/dagre/sketch.exp.svg b/e2etests/testdata/regression/nested_steps/dagre/sketch.exp.svg index 2b61b2a01..2f9a9074f 100644 --- a/e2etests/testdata/regression/nested_steps/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/nested_steps/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -acdab + .d2-1965329371 .fill-N1{fill:#0A0F25;} + .d2-1965329371 .fill-N2{fill:#676C7E;} + .d2-1965329371 .fill-N3{fill:#9499AB;} + .d2-1965329371 .fill-N4{fill:#CFD2DD;} + .d2-1965329371 .fill-N5{fill:#DEE1EB;} + .d2-1965329371 .fill-N6{fill:#EEF1F8;} + .d2-1965329371 .fill-N7{fill:#FFFFFF;} + .d2-1965329371 .fill-B1{fill:#0D32B2;} + .d2-1965329371 .fill-B2{fill:#0D32B2;} + .d2-1965329371 .fill-B3{fill:#E3E9FD;} + .d2-1965329371 .fill-B4{fill:#E3E9FD;} + .d2-1965329371 .fill-B5{fill:#EDF0FD;} + .d2-1965329371 .fill-B6{fill:#F7F8FE;} + .d2-1965329371 .fill-AA2{fill:#4A6FF3;} + .d2-1965329371 .fill-AA4{fill:#EDF0FD;} + .d2-1965329371 .fill-AA5{fill:#F7F8FE;} + .d2-1965329371 .fill-AB4{fill:#EDF0FD;} + .d2-1965329371 .fill-AB5{fill:#F7F8FE;} + .d2-1965329371 .stroke-N1{stroke:#0A0F25;} + .d2-1965329371 .stroke-N2{stroke:#676C7E;} + .d2-1965329371 .stroke-N3{stroke:#9499AB;} + .d2-1965329371 .stroke-N4{stroke:#CFD2DD;} + .d2-1965329371 .stroke-N5{stroke:#DEE1EB;} + .d2-1965329371 .stroke-N6{stroke:#EEF1F8;} + .d2-1965329371 .stroke-N7{stroke:#FFFFFF;} + .d2-1965329371 .stroke-B1{stroke:#0D32B2;} + .d2-1965329371 .stroke-B2{stroke:#0D32B2;} + .d2-1965329371 .stroke-B3{stroke:#E3E9FD;} + .d2-1965329371 .stroke-B4{stroke:#E3E9FD;} + .d2-1965329371 .stroke-B5{stroke:#EDF0FD;} + .d2-1965329371 .stroke-B6{stroke:#F7F8FE;} + .d2-1965329371 .stroke-AA2{stroke:#4A6FF3;} + .d2-1965329371 .stroke-AA4{stroke:#EDF0FD;} + .d2-1965329371 .stroke-AA5{stroke:#F7F8FE;} + .d2-1965329371 .stroke-AB4{stroke:#EDF0FD;} + .d2-1965329371 .stroke-AB5{stroke:#F7F8FE;} + .d2-1965329371 .background-color-N1{background-color:#0A0F25;} + .d2-1965329371 .background-color-N2{background-color:#676C7E;} + .d2-1965329371 .background-color-N3{background-color:#9499AB;} + .d2-1965329371 .background-color-N4{background-color:#CFD2DD;} + .d2-1965329371 .background-color-N5{background-color:#DEE1EB;} + .d2-1965329371 .background-color-N6{background-color:#EEF1F8;} + .d2-1965329371 .background-color-N7{background-color:#FFFFFF;} + .d2-1965329371 .background-color-B1{background-color:#0D32B2;} + .d2-1965329371 .background-color-B2{background-color:#0D32B2;} + .d2-1965329371 .background-color-B3{background-color:#E3E9FD;} + .d2-1965329371 .background-color-B4{background-color:#E3E9FD;} + .d2-1965329371 .background-color-B5{background-color:#EDF0FD;} + .d2-1965329371 .background-color-B6{background-color:#F7F8FE;} + .d2-1965329371 .background-color-AA2{background-color:#4A6FF3;} + .d2-1965329371 .background-color-AA4{background-color:#EDF0FD;} + .d2-1965329371 .background-color-AA5{background-color:#F7F8FE;} + .d2-1965329371 .background-color-AB4{background-color:#EDF0FD;} + .d2-1965329371 .background-color-AB5{background-color:#F7F8FE;} + .d2-1965329371 .color-N1{color:#0A0F25;} + .d2-1965329371 .color-N2{color:#676C7E;} + .d2-1965329371 .color-N3{color:#9499AB;} + .d2-1965329371 .color-N4{color:#CFD2DD;} + .d2-1965329371 .color-N5{color:#DEE1EB;} + .d2-1965329371 .color-N6{color:#EEF1F8;} + .d2-1965329371 .color-N7{color:#FFFFFF;} + .d2-1965329371 .color-B1{color:#0D32B2;} + .d2-1965329371 .color-B2{color:#0D32B2;} + .d2-1965329371 .color-B3{color:#E3E9FD;} + .d2-1965329371 .color-B4{color:#E3E9FD;} + .d2-1965329371 .color-B5{color:#EDF0FD;} + .d2-1965329371 .color-B6{color:#F7F8FE;} + .d2-1965329371 .color-AA2{color:#4A6FF3;} + .d2-1965329371 .color-AA4{color:#EDF0FD;} + .d2-1965329371 .color-AA5{color:#F7F8FE;} + .d2-1965329371 .color-AB4{color:#EDF0FD;} + .d2-1965329371 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1965329371);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1965329371);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1965329371);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1965329371);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1965329371);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1965329371);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1965329371);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1965329371);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1965329371);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1965329371);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1965329371);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1965329371);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1965329371);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1965329371);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1965329371);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1965329371);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1965329371);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1965329371);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>acdab - - - - - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/nested_steps/elk/board.exp.json b/e2etests/testdata/regression/nested_steps/elk/board.exp.json index 165657d4f..611c9143a 100644 --- a/e2etests/testdata/regression/nested_steps/elk/board.exp.json +++ b/e2etests/testdata/regression/nested_steps/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "AB5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "AB5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "AB4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "AB4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -233,6 +246,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 108, @@ -271,6 +285,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 271, @@ -302,6 +317,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/nested_steps/elk/sketch.exp.svg b/e2etests/testdata/regression/nested_steps/elk/sketch.exp.svg index 6058eca65..bddc0fa01 100644 --- a/e2etests/testdata/regression/nested_steps/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/nested_steps/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -acdab + .d2-2048100717 .fill-N1{fill:#0A0F25;} + .d2-2048100717 .fill-N2{fill:#676C7E;} + .d2-2048100717 .fill-N3{fill:#9499AB;} + .d2-2048100717 .fill-N4{fill:#CFD2DD;} + .d2-2048100717 .fill-N5{fill:#DEE1EB;} + .d2-2048100717 .fill-N6{fill:#EEF1F8;} + .d2-2048100717 .fill-N7{fill:#FFFFFF;} + .d2-2048100717 .fill-B1{fill:#0D32B2;} + .d2-2048100717 .fill-B2{fill:#0D32B2;} + .d2-2048100717 .fill-B3{fill:#E3E9FD;} + .d2-2048100717 .fill-B4{fill:#E3E9FD;} + .d2-2048100717 .fill-B5{fill:#EDF0FD;} + .d2-2048100717 .fill-B6{fill:#F7F8FE;} + .d2-2048100717 .fill-AA2{fill:#4A6FF3;} + .d2-2048100717 .fill-AA4{fill:#EDF0FD;} + .d2-2048100717 .fill-AA5{fill:#F7F8FE;} + .d2-2048100717 .fill-AB4{fill:#EDF0FD;} + .d2-2048100717 .fill-AB5{fill:#F7F8FE;} + .d2-2048100717 .stroke-N1{stroke:#0A0F25;} + .d2-2048100717 .stroke-N2{stroke:#676C7E;} + .d2-2048100717 .stroke-N3{stroke:#9499AB;} + .d2-2048100717 .stroke-N4{stroke:#CFD2DD;} + .d2-2048100717 .stroke-N5{stroke:#DEE1EB;} + .d2-2048100717 .stroke-N6{stroke:#EEF1F8;} + .d2-2048100717 .stroke-N7{stroke:#FFFFFF;} + .d2-2048100717 .stroke-B1{stroke:#0D32B2;} + .d2-2048100717 .stroke-B2{stroke:#0D32B2;} + .d2-2048100717 .stroke-B3{stroke:#E3E9FD;} + .d2-2048100717 .stroke-B4{stroke:#E3E9FD;} + .d2-2048100717 .stroke-B5{stroke:#EDF0FD;} + .d2-2048100717 .stroke-B6{stroke:#F7F8FE;} + .d2-2048100717 .stroke-AA2{stroke:#4A6FF3;} + .d2-2048100717 .stroke-AA4{stroke:#EDF0FD;} + .d2-2048100717 .stroke-AA5{stroke:#F7F8FE;} + .d2-2048100717 .stroke-AB4{stroke:#EDF0FD;} + .d2-2048100717 .stroke-AB5{stroke:#F7F8FE;} + .d2-2048100717 .background-color-N1{background-color:#0A0F25;} + .d2-2048100717 .background-color-N2{background-color:#676C7E;} + .d2-2048100717 .background-color-N3{background-color:#9499AB;} + .d2-2048100717 .background-color-N4{background-color:#CFD2DD;} + .d2-2048100717 .background-color-N5{background-color:#DEE1EB;} + .d2-2048100717 .background-color-N6{background-color:#EEF1F8;} + .d2-2048100717 .background-color-N7{background-color:#FFFFFF;} + .d2-2048100717 .background-color-B1{background-color:#0D32B2;} + .d2-2048100717 .background-color-B2{background-color:#0D32B2;} + .d2-2048100717 .background-color-B3{background-color:#E3E9FD;} + .d2-2048100717 .background-color-B4{background-color:#E3E9FD;} + .d2-2048100717 .background-color-B5{background-color:#EDF0FD;} + .d2-2048100717 .background-color-B6{background-color:#F7F8FE;} + .d2-2048100717 .background-color-AA2{background-color:#4A6FF3;} + .d2-2048100717 .background-color-AA4{background-color:#EDF0FD;} + .d2-2048100717 .background-color-AA5{background-color:#F7F8FE;} + .d2-2048100717 .background-color-AB4{background-color:#EDF0FD;} + .d2-2048100717 .background-color-AB5{background-color:#F7F8FE;} + .d2-2048100717 .color-N1{color:#0A0F25;} + .d2-2048100717 .color-N2{color:#676C7E;} + .d2-2048100717 .color-N3{color:#9499AB;} + .d2-2048100717 .color-N4{color:#CFD2DD;} + .d2-2048100717 .color-N5{color:#DEE1EB;} + .d2-2048100717 .color-N6{color:#EEF1F8;} + .d2-2048100717 .color-N7{color:#FFFFFF;} + .d2-2048100717 .color-B1{color:#0D32B2;} + .d2-2048100717 .color-B2{color:#0D32B2;} + .d2-2048100717 .color-B3{color:#E3E9FD;} + .d2-2048100717 .color-B4{color:#E3E9FD;} + .d2-2048100717 .color-B5{color:#EDF0FD;} + .d2-2048100717 .color-B6{color:#F7F8FE;} + .d2-2048100717 .color-AA2{color:#4A6FF3;} + .d2-2048100717 .color-AA4{color:#EDF0FD;} + .d2-2048100717 .color-AA5{color:#F7F8FE;} + .d2-2048100717 .color-AB4{color:#EDF0FD;} + .d2-2048100717 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2048100717);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2048100717);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2048100717);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2048100717);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2048100717);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2048100717);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2048100717);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2048100717);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2048100717);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2048100717);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2048100717);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2048100717);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2048100717);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2048100717);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2048100717);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2048100717);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2048100717);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2048100717);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>acdab - - - - - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/no-lexer/dagre/board.exp.json b/e2etests/testdata/regression/no-lexer/dagre/board.exp.json index 3cccc64e3..ad73cb6c5 100644 --- a/e2etests/testdata/regression/no-lexer/dagre/board.exp.json +++ b/e2etests/testdata/regression/no-lexer/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -60,6 +69,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/no-lexer/dagre/sketch.exp.svg b/e2etests/testdata/regression/no-lexer/dagre/sketch.exp.svg index 75fe72963..f041d4d11 100644 --- a/e2etests/testdata/regression/no-lexer/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/no-lexer/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -x -> yx -> y + .d2-3999897346 .fill-N1{fill:#0A0F25;} + .d2-3999897346 .fill-N2{fill:#676C7E;} + .d2-3999897346 .fill-N3{fill:#9499AB;} + .d2-3999897346 .fill-N4{fill:#CFD2DD;} + .d2-3999897346 .fill-N5{fill:#DEE1EB;} + .d2-3999897346 .fill-N6{fill:#EEF1F8;} + .d2-3999897346 .fill-N7{fill:#FFFFFF;} + .d2-3999897346 .fill-B1{fill:#0D32B2;} + .d2-3999897346 .fill-B2{fill:#0D32B2;} + .d2-3999897346 .fill-B3{fill:#E3E9FD;} + .d2-3999897346 .fill-B4{fill:#E3E9FD;} + .d2-3999897346 .fill-B5{fill:#EDF0FD;} + .d2-3999897346 .fill-B6{fill:#F7F8FE;} + .d2-3999897346 .fill-AA2{fill:#4A6FF3;} + .d2-3999897346 .fill-AA4{fill:#EDF0FD;} + .d2-3999897346 .fill-AA5{fill:#F7F8FE;} + .d2-3999897346 .fill-AB4{fill:#EDF0FD;} + .d2-3999897346 .fill-AB5{fill:#F7F8FE;} + .d2-3999897346 .stroke-N1{stroke:#0A0F25;} + .d2-3999897346 .stroke-N2{stroke:#676C7E;} + .d2-3999897346 .stroke-N3{stroke:#9499AB;} + .d2-3999897346 .stroke-N4{stroke:#CFD2DD;} + .d2-3999897346 .stroke-N5{stroke:#DEE1EB;} + .d2-3999897346 .stroke-N6{stroke:#EEF1F8;} + .d2-3999897346 .stroke-N7{stroke:#FFFFFF;} + .d2-3999897346 .stroke-B1{stroke:#0D32B2;} + .d2-3999897346 .stroke-B2{stroke:#0D32B2;} + .d2-3999897346 .stroke-B3{stroke:#E3E9FD;} + .d2-3999897346 .stroke-B4{stroke:#E3E9FD;} + .d2-3999897346 .stroke-B5{stroke:#EDF0FD;} + .d2-3999897346 .stroke-B6{stroke:#F7F8FE;} + .d2-3999897346 .stroke-AA2{stroke:#4A6FF3;} + .d2-3999897346 .stroke-AA4{stroke:#EDF0FD;} + .d2-3999897346 .stroke-AA5{stroke:#F7F8FE;} + .d2-3999897346 .stroke-AB4{stroke:#EDF0FD;} + .d2-3999897346 .stroke-AB5{stroke:#F7F8FE;} + .d2-3999897346 .background-color-N1{background-color:#0A0F25;} + .d2-3999897346 .background-color-N2{background-color:#676C7E;} + .d2-3999897346 .background-color-N3{background-color:#9499AB;} + .d2-3999897346 .background-color-N4{background-color:#CFD2DD;} + .d2-3999897346 .background-color-N5{background-color:#DEE1EB;} + .d2-3999897346 .background-color-N6{background-color:#EEF1F8;} + .d2-3999897346 .background-color-N7{background-color:#FFFFFF;} + .d2-3999897346 .background-color-B1{background-color:#0D32B2;} + .d2-3999897346 .background-color-B2{background-color:#0D32B2;} + .d2-3999897346 .background-color-B3{background-color:#E3E9FD;} + .d2-3999897346 .background-color-B4{background-color:#E3E9FD;} + .d2-3999897346 .background-color-B5{background-color:#EDF0FD;} + .d2-3999897346 .background-color-B6{background-color:#F7F8FE;} + .d2-3999897346 .background-color-AA2{background-color:#4A6FF3;} + .d2-3999897346 .background-color-AA4{background-color:#EDF0FD;} + .d2-3999897346 .background-color-AA5{background-color:#F7F8FE;} + .d2-3999897346 .background-color-AB4{background-color:#EDF0FD;} + .d2-3999897346 .background-color-AB5{background-color:#F7F8FE;} + .d2-3999897346 .color-N1{color:#0A0F25;} + .d2-3999897346 .color-N2{color:#676C7E;} + .d2-3999897346 .color-N3{color:#9499AB;} + .d2-3999897346 .color-N4{color:#CFD2DD;} + .d2-3999897346 .color-N5{color:#DEE1EB;} + .d2-3999897346 .color-N6{color:#EEF1F8;} + .d2-3999897346 .color-N7{color:#FFFFFF;} + .d2-3999897346 .color-B1{color:#0D32B2;} + .d2-3999897346 .color-B2{color:#0D32B2;} + .d2-3999897346 .color-B3{color:#E3E9FD;} + .d2-3999897346 .color-B4{color:#E3E9FD;} + .d2-3999897346 .color-B5{color:#EDF0FD;} + .d2-3999897346 .color-B6{color:#F7F8FE;} + .d2-3999897346 .color-AA2{color:#4A6FF3;} + .d2-3999897346 .color-AA4{color:#EDF0FD;} + .d2-3999897346 .color-AA5{color:#F7F8FE;} + .d2-3999897346 .color-AB4{color:#EDF0FD;} + .d2-3999897346 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3999897346);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3999897346);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3999897346);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3999897346);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3999897346);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3999897346);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3999897346);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3999897346);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3999897346);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3999897346);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3999897346);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3999897346);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3999897346);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3999897346);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3999897346);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3999897346);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3999897346);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3999897346);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>x -> yx -> y - + \ No newline at end of file diff --git a/e2etests/testdata/regression/no-lexer/elk/board.exp.json b/e2etests/testdata/regression/no-lexer/elk/board.exp.json index b542d23ef..f706d2cec 100644 --- a/e2etests/testdata/regression/no-lexer/elk/board.exp.json +++ b/e2etests/testdata/regression/no-lexer/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -60,6 +69,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/no-lexer/elk/sketch.exp.svg b/e2etests/testdata/regression/no-lexer/elk/sketch.exp.svg index 5e9669e05..4cfc04838 100644 --- a/e2etests/testdata/regression/no-lexer/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/no-lexer/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -x -> yx -> y + .d2-2794724170 .fill-N1{fill:#0A0F25;} + .d2-2794724170 .fill-N2{fill:#676C7E;} + .d2-2794724170 .fill-N3{fill:#9499AB;} + .d2-2794724170 .fill-N4{fill:#CFD2DD;} + .d2-2794724170 .fill-N5{fill:#DEE1EB;} + .d2-2794724170 .fill-N6{fill:#EEF1F8;} + .d2-2794724170 .fill-N7{fill:#FFFFFF;} + .d2-2794724170 .fill-B1{fill:#0D32B2;} + .d2-2794724170 .fill-B2{fill:#0D32B2;} + .d2-2794724170 .fill-B3{fill:#E3E9FD;} + .d2-2794724170 .fill-B4{fill:#E3E9FD;} + .d2-2794724170 .fill-B5{fill:#EDF0FD;} + .d2-2794724170 .fill-B6{fill:#F7F8FE;} + .d2-2794724170 .fill-AA2{fill:#4A6FF3;} + .d2-2794724170 .fill-AA4{fill:#EDF0FD;} + .d2-2794724170 .fill-AA5{fill:#F7F8FE;} + .d2-2794724170 .fill-AB4{fill:#EDF0FD;} + .d2-2794724170 .fill-AB5{fill:#F7F8FE;} + .d2-2794724170 .stroke-N1{stroke:#0A0F25;} + .d2-2794724170 .stroke-N2{stroke:#676C7E;} + .d2-2794724170 .stroke-N3{stroke:#9499AB;} + .d2-2794724170 .stroke-N4{stroke:#CFD2DD;} + .d2-2794724170 .stroke-N5{stroke:#DEE1EB;} + .d2-2794724170 .stroke-N6{stroke:#EEF1F8;} + .d2-2794724170 .stroke-N7{stroke:#FFFFFF;} + .d2-2794724170 .stroke-B1{stroke:#0D32B2;} + .d2-2794724170 .stroke-B2{stroke:#0D32B2;} + .d2-2794724170 .stroke-B3{stroke:#E3E9FD;} + .d2-2794724170 .stroke-B4{stroke:#E3E9FD;} + .d2-2794724170 .stroke-B5{stroke:#EDF0FD;} + .d2-2794724170 .stroke-B6{stroke:#F7F8FE;} + .d2-2794724170 .stroke-AA2{stroke:#4A6FF3;} + .d2-2794724170 .stroke-AA4{stroke:#EDF0FD;} + .d2-2794724170 .stroke-AA5{stroke:#F7F8FE;} + .d2-2794724170 .stroke-AB4{stroke:#EDF0FD;} + .d2-2794724170 .stroke-AB5{stroke:#F7F8FE;} + .d2-2794724170 .background-color-N1{background-color:#0A0F25;} + .d2-2794724170 .background-color-N2{background-color:#676C7E;} + .d2-2794724170 .background-color-N3{background-color:#9499AB;} + .d2-2794724170 .background-color-N4{background-color:#CFD2DD;} + .d2-2794724170 .background-color-N5{background-color:#DEE1EB;} + .d2-2794724170 .background-color-N6{background-color:#EEF1F8;} + .d2-2794724170 .background-color-N7{background-color:#FFFFFF;} + .d2-2794724170 .background-color-B1{background-color:#0D32B2;} + .d2-2794724170 .background-color-B2{background-color:#0D32B2;} + .d2-2794724170 .background-color-B3{background-color:#E3E9FD;} + .d2-2794724170 .background-color-B4{background-color:#E3E9FD;} + .d2-2794724170 .background-color-B5{background-color:#EDF0FD;} + .d2-2794724170 .background-color-B6{background-color:#F7F8FE;} + .d2-2794724170 .background-color-AA2{background-color:#4A6FF3;} + .d2-2794724170 .background-color-AA4{background-color:#EDF0FD;} + .d2-2794724170 .background-color-AA5{background-color:#F7F8FE;} + .d2-2794724170 .background-color-AB4{background-color:#EDF0FD;} + .d2-2794724170 .background-color-AB5{background-color:#F7F8FE;} + .d2-2794724170 .color-N1{color:#0A0F25;} + .d2-2794724170 .color-N2{color:#676C7E;} + .d2-2794724170 .color-N3{color:#9499AB;} + .d2-2794724170 .color-N4{color:#CFD2DD;} + .d2-2794724170 .color-N5{color:#DEE1EB;} + .d2-2794724170 .color-N6{color:#EEF1F8;} + .d2-2794724170 .color-N7{color:#FFFFFF;} + .d2-2794724170 .color-B1{color:#0D32B2;} + .d2-2794724170 .color-B2{color:#0D32B2;} + .d2-2794724170 .color-B3{color:#E3E9FD;} + .d2-2794724170 .color-B4{color:#E3E9FD;} + .d2-2794724170 .color-B5{color:#EDF0FD;} + .d2-2794724170 .color-B6{color:#F7F8FE;} + .d2-2794724170 .color-AA2{color:#4A6FF3;} + .d2-2794724170 .color-AA4{color:#EDF0FD;} + .d2-2794724170 .color-AA5{color:#F7F8FE;} + .d2-2794724170 .color-AB4{color:#EDF0FD;} + .d2-2794724170 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2794724170);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2794724170);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2794724170);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2794724170);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2794724170);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2794724170);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2794724170);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2794724170);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2794724170);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2794724170);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2794724170);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2794724170);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2794724170);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2794724170);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2794724170);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2794724170);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2794724170);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2794724170);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>x -> yx -> y - + \ No newline at end of file diff --git a/e2etests/testdata/regression/only_header_class_table/dagre/board.exp.json b/e2etests/testdata/regression/only_header_class_table/dagre/board.exp.json index 1421415d8..f520214fa 100644 --- a/e2etests/testdata/regression/only_header_class_table/dagre/board.exp.json +++ b/e2etests/testdata/regression/only_header_class_table/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -61,6 +70,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -104,6 +114,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -186,6 +197,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 541, @@ -233,6 +245,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 541, @@ -273,6 +286,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/only_header_class_table/dagre/sketch.exp.svg b/e2etests/testdata/regression/only_header_class_table/dagre/sketch.exp.svg index e7f4ab685..7d71561c6 100644 --- a/e2etests/testdata/regression/only_header_class_table/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/only_header_class_table/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -RefreshAuthorizationPolicyProtocolServerSideTranslatorProtocolBufferRefreshAuthorizationPolicyCacheRefreshAuthorizationPolicyCacheok + .d2-2999482881 .fill-N1{fill:#0A0F25;} + .d2-2999482881 .fill-N2{fill:#676C7E;} + .d2-2999482881 .fill-N3{fill:#9499AB;} + .d2-2999482881 .fill-N4{fill:#CFD2DD;} + .d2-2999482881 .fill-N5{fill:#DEE1EB;} + .d2-2999482881 .fill-N6{fill:#EEF1F8;} + .d2-2999482881 .fill-N7{fill:#FFFFFF;} + .d2-2999482881 .fill-B1{fill:#0D32B2;} + .d2-2999482881 .fill-B2{fill:#0D32B2;} + .d2-2999482881 .fill-B3{fill:#E3E9FD;} + .d2-2999482881 .fill-B4{fill:#E3E9FD;} + .d2-2999482881 .fill-B5{fill:#EDF0FD;} + .d2-2999482881 .fill-B6{fill:#F7F8FE;} + .d2-2999482881 .fill-AA2{fill:#4A6FF3;} + .d2-2999482881 .fill-AA4{fill:#EDF0FD;} + .d2-2999482881 .fill-AA5{fill:#F7F8FE;} + .d2-2999482881 .fill-AB4{fill:#EDF0FD;} + .d2-2999482881 .fill-AB5{fill:#F7F8FE;} + .d2-2999482881 .stroke-N1{stroke:#0A0F25;} + .d2-2999482881 .stroke-N2{stroke:#676C7E;} + .d2-2999482881 .stroke-N3{stroke:#9499AB;} + .d2-2999482881 .stroke-N4{stroke:#CFD2DD;} + .d2-2999482881 .stroke-N5{stroke:#DEE1EB;} + .d2-2999482881 .stroke-N6{stroke:#EEF1F8;} + .d2-2999482881 .stroke-N7{stroke:#FFFFFF;} + .d2-2999482881 .stroke-B1{stroke:#0D32B2;} + .d2-2999482881 .stroke-B2{stroke:#0D32B2;} + .d2-2999482881 .stroke-B3{stroke:#E3E9FD;} + .d2-2999482881 .stroke-B4{stroke:#E3E9FD;} + .d2-2999482881 .stroke-B5{stroke:#EDF0FD;} + .d2-2999482881 .stroke-B6{stroke:#F7F8FE;} + .d2-2999482881 .stroke-AA2{stroke:#4A6FF3;} + .d2-2999482881 .stroke-AA4{stroke:#EDF0FD;} + .d2-2999482881 .stroke-AA5{stroke:#F7F8FE;} + .d2-2999482881 .stroke-AB4{stroke:#EDF0FD;} + .d2-2999482881 .stroke-AB5{stroke:#F7F8FE;} + .d2-2999482881 .background-color-N1{background-color:#0A0F25;} + .d2-2999482881 .background-color-N2{background-color:#676C7E;} + .d2-2999482881 .background-color-N3{background-color:#9499AB;} + .d2-2999482881 .background-color-N4{background-color:#CFD2DD;} + .d2-2999482881 .background-color-N5{background-color:#DEE1EB;} + .d2-2999482881 .background-color-N6{background-color:#EEF1F8;} + .d2-2999482881 .background-color-N7{background-color:#FFFFFF;} + .d2-2999482881 .background-color-B1{background-color:#0D32B2;} + .d2-2999482881 .background-color-B2{background-color:#0D32B2;} + .d2-2999482881 .background-color-B3{background-color:#E3E9FD;} + .d2-2999482881 .background-color-B4{background-color:#E3E9FD;} + .d2-2999482881 .background-color-B5{background-color:#EDF0FD;} + .d2-2999482881 .background-color-B6{background-color:#F7F8FE;} + .d2-2999482881 .background-color-AA2{background-color:#4A6FF3;} + .d2-2999482881 .background-color-AA4{background-color:#EDF0FD;} + .d2-2999482881 .background-color-AA5{background-color:#F7F8FE;} + .d2-2999482881 .background-color-AB4{background-color:#EDF0FD;} + .d2-2999482881 .background-color-AB5{background-color:#F7F8FE;} + .d2-2999482881 .color-N1{color:#0A0F25;} + .d2-2999482881 .color-N2{color:#676C7E;} + .d2-2999482881 .color-N3{color:#9499AB;} + .d2-2999482881 .color-N4{color:#CFD2DD;} + .d2-2999482881 .color-N5{color:#DEE1EB;} + .d2-2999482881 .color-N6{color:#EEF1F8;} + .d2-2999482881 .color-N7{color:#FFFFFF;} + .d2-2999482881 .color-B1{color:#0D32B2;} + .d2-2999482881 .color-B2{color:#0D32B2;} + .d2-2999482881 .color-B3{color:#E3E9FD;} + .d2-2999482881 .color-B4{color:#E3E9FD;} + .d2-2999482881 .color-B5{color:#EDF0FD;} + .d2-2999482881 .color-B6{color:#F7F8FE;} + .d2-2999482881 .color-AA2{color:#4A6FF3;} + .d2-2999482881 .color-AA4{color:#EDF0FD;} + .d2-2999482881 .color-AA5{color:#F7F8FE;} + .d2-2999482881 .color-AB4{color:#EDF0FD;} + .d2-2999482881 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2999482881);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2999482881);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2999482881);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2999482881);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2999482881);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2999482881);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2999482881);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2999482881);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2999482881);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2999482881);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2999482881);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2999482881);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2999482881);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2999482881);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2999482881);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2999482881);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2999482881);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2999482881);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>RefreshAuthorizationPolicyProtocolServerSideTranslatorProtocolBufferRefreshAuthorizationPolicyCacheRefreshAuthorizationPolicyCacheok \ No newline at end of file diff --git a/e2etests/testdata/regression/only_header_class_table/elk/board.exp.json b/e2etests/testdata/regression/only_header_class_table/elk/board.exp.json index 978739f12..00ad41410 100644 --- a/e2etests/testdata/regression/only_header_class_table/elk/board.exp.json +++ b/e2etests/testdata/regression/only_header_class_table/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -61,6 +70,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -104,6 +114,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -186,6 +197,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 553, @@ -224,6 +236,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 553, @@ -255,6 +268,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/only_header_class_table/elk/sketch.exp.svg b/e2etests/testdata/regression/only_header_class_table/elk/sketch.exp.svg index e42c451a2..5df9233ed 100644 --- a/e2etests/testdata/regression/only_header_class_table/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/only_header_class_table/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -RefreshAuthorizationPolicyProtocolServerSideTranslatorProtocolBufferRefreshAuthorizationPolicyCacheRefreshAuthorizationPolicyCacheok + .d2-2394755986 .fill-N1{fill:#0A0F25;} + .d2-2394755986 .fill-N2{fill:#676C7E;} + .d2-2394755986 .fill-N3{fill:#9499AB;} + .d2-2394755986 .fill-N4{fill:#CFD2DD;} + .d2-2394755986 .fill-N5{fill:#DEE1EB;} + .d2-2394755986 .fill-N6{fill:#EEF1F8;} + .d2-2394755986 .fill-N7{fill:#FFFFFF;} + .d2-2394755986 .fill-B1{fill:#0D32B2;} + .d2-2394755986 .fill-B2{fill:#0D32B2;} + .d2-2394755986 .fill-B3{fill:#E3E9FD;} + .d2-2394755986 .fill-B4{fill:#E3E9FD;} + .d2-2394755986 .fill-B5{fill:#EDF0FD;} + .d2-2394755986 .fill-B6{fill:#F7F8FE;} + .d2-2394755986 .fill-AA2{fill:#4A6FF3;} + .d2-2394755986 .fill-AA4{fill:#EDF0FD;} + .d2-2394755986 .fill-AA5{fill:#F7F8FE;} + .d2-2394755986 .fill-AB4{fill:#EDF0FD;} + .d2-2394755986 .fill-AB5{fill:#F7F8FE;} + .d2-2394755986 .stroke-N1{stroke:#0A0F25;} + .d2-2394755986 .stroke-N2{stroke:#676C7E;} + .d2-2394755986 .stroke-N3{stroke:#9499AB;} + .d2-2394755986 .stroke-N4{stroke:#CFD2DD;} + .d2-2394755986 .stroke-N5{stroke:#DEE1EB;} + .d2-2394755986 .stroke-N6{stroke:#EEF1F8;} + .d2-2394755986 .stroke-N7{stroke:#FFFFFF;} + .d2-2394755986 .stroke-B1{stroke:#0D32B2;} + .d2-2394755986 .stroke-B2{stroke:#0D32B2;} + .d2-2394755986 .stroke-B3{stroke:#E3E9FD;} + .d2-2394755986 .stroke-B4{stroke:#E3E9FD;} + .d2-2394755986 .stroke-B5{stroke:#EDF0FD;} + .d2-2394755986 .stroke-B6{stroke:#F7F8FE;} + .d2-2394755986 .stroke-AA2{stroke:#4A6FF3;} + .d2-2394755986 .stroke-AA4{stroke:#EDF0FD;} + .d2-2394755986 .stroke-AA5{stroke:#F7F8FE;} + .d2-2394755986 .stroke-AB4{stroke:#EDF0FD;} + .d2-2394755986 .stroke-AB5{stroke:#F7F8FE;} + .d2-2394755986 .background-color-N1{background-color:#0A0F25;} + .d2-2394755986 .background-color-N2{background-color:#676C7E;} + .d2-2394755986 .background-color-N3{background-color:#9499AB;} + .d2-2394755986 .background-color-N4{background-color:#CFD2DD;} + .d2-2394755986 .background-color-N5{background-color:#DEE1EB;} + .d2-2394755986 .background-color-N6{background-color:#EEF1F8;} + .d2-2394755986 .background-color-N7{background-color:#FFFFFF;} + .d2-2394755986 .background-color-B1{background-color:#0D32B2;} + .d2-2394755986 .background-color-B2{background-color:#0D32B2;} + .d2-2394755986 .background-color-B3{background-color:#E3E9FD;} + .d2-2394755986 .background-color-B4{background-color:#E3E9FD;} + .d2-2394755986 .background-color-B5{background-color:#EDF0FD;} + .d2-2394755986 .background-color-B6{background-color:#F7F8FE;} + .d2-2394755986 .background-color-AA2{background-color:#4A6FF3;} + .d2-2394755986 .background-color-AA4{background-color:#EDF0FD;} + .d2-2394755986 .background-color-AA5{background-color:#F7F8FE;} + .d2-2394755986 .background-color-AB4{background-color:#EDF0FD;} + .d2-2394755986 .background-color-AB5{background-color:#F7F8FE;} + .d2-2394755986 .color-N1{color:#0A0F25;} + .d2-2394755986 .color-N2{color:#676C7E;} + .d2-2394755986 .color-N3{color:#9499AB;} + .d2-2394755986 .color-N4{color:#CFD2DD;} + .d2-2394755986 .color-N5{color:#DEE1EB;} + .d2-2394755986 .color-N6{color:#EEF1F8;} + .d2-2394755986 .color-N7{color:#FFFFFF;} + .d2-2394755986 .color-B1{color:#0D32B2;} + .d2-2394755986 .color-B2{color:#0D32B2;} + .d2-2394755986 .color-B3{color:#E3E9FD;} + .d2-2394755986 .color-B4{color:#E3E9FD;} + .d2-2394755986 .color-B5{color:#EDF0FD;} + .d2-2394755986 .color-B6{color:#F7F8FE;} + .d2-2394755986 .color-AA2{color:#4A6FF3;} + .d2-2394755986 .color-AA4{color:#EDF0FD;} + .d2-2394755986 .color-AA5{color:#F7F8FE;} + .d2-2394755986 .color-AB4{color:#EDF0FD;} + .d2-2394755986 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2394755986);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2394755986);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2394755986);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2394755986);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2394755986);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2394755986);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2394755986);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2394755986);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2394755986);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2394755986);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2394755986);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2394755986);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2394755986);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2394755986);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2394755986);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2394755986);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2394755986);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2394755986);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>RefreshAuthorizationPolicyProtocolServerSideTranslatorProtocolBufferRefreshAuthorizationPolicyCacheRefreshAuthorizationPolicyCacheok \ No newline at end of file diff --git a/e2etests/testdata/regression/opacity-on-label/dagre/board.exp.json b/e2etests/testdata/regression/opacity-on-label/dagre/board.exp.json index 4a2c0b80a..68dd74d24 100644 --- a/e2etests/testdata/regression/opacity-on-label/dagre/board.exp.json +++ b/e2etests/testdata/regression/opacity-on-label/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -150,6 +161,7 @@ "labelHeight": 37, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 161, @@ -190,6 +202,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/opacity-on-label/dagre/sketch.exp.svg b/e2etests/testdata/regression/opacity-on-label/dagre/sketch.exp.svg index 88b493da1..38cf4736b 100644 --- a/e2etests/testdata/regression/opacity-on-label/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/opacity-on-label/dagre/sketch.exp.svg @@ -1,27 +1,27 @@ -x

    linux: because a PC is a terrible thing to waste

    -
    a You don't have to know how the computer works,just how to work the computer. +x

    linux: because a PC is a terrible thing to waste

    +
    a You don't have to know how the computer works,just how to work the computer. - - - - + + + +     \ No newline at end of file diff --git a/e2etests/testdata/regression/opacity-on-label/elk/board.exp.json b/e2etests/testdata/regression/opacity-on-label/elk/board.exp.json index 09a5c754f..59829624e 100644 --- a/e2etests/testdata/regression/opacity-on-label/elk/board.exp.json +++ b/e2etests/testdata/regression/opacity-on-label/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -150,6 +161,7 @@ "labelHeight": 37, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 173, @@ -181,6 +193,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/opacity-on-label/elk/sketch.exp.svg b/e2etests/testdata/regression/opacity-on-label/elk/sketch.exp.svg index 05a449eab..7fe3bbc19 100644 --- a/e2etests/testdata/regression/opacity-on-label/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/opacity-on-label/elk/sketch.exp.svg @@ -1,27 +1,27 @@ -x

    linux: because a PC is a terrible thing to waste

    -
    a You don't have to know how the computer works,just how to work the computer. +x

    linux: because a PC is a terrible thing to waste

    +
    a You don't have to know how the computer works,just how to work the computer. - - - - + + + +     \ No newline at end of file diff --git a/e2etests/testdata/regression/outside_grid_label_position/dagre/board.exp.json b/e2etests/testdata/regression/outside_grid_label_position/dagre/board.exp.json index d59b3cdda..b43bcbdb3 100644 --- a/e2etests/testdata/regression/outside_grid_label_position/dagre/board.exp.json +++ b/e2etests/testdata/regression/outside_grid_label_position/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -348,6 +364,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/outside_grid_label_position/dagre/sketch.exp.svg b/e2etests/testdata/regression/outside_grid_label_position/dagre/sketch.exp.svg index 57261255f..7de099f18 100644 --- a/e2etests/testdata/regression/outside_grid_label_position/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/outside_grid_label_position/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -container1container2container3firstsecondthirdchildchild + .d2-3560478595 .fill-N1{fill:#0A0F25;} + .d2-3560478595 .fill-N2{fill:#676C7E;} + .d2-3560478595 .fill-N3{fill:#9499AB;} + .d2-3560478595 .fill-N4{fill:#CFD2DD;} + .d2-3560478595 .fill-N5{fill:#DEE1EB;} + .d2-3560478595 .fill-N6{fill:#EEF1F8;} + .d2-3560478595 .fill-N7{fill:#FFFFFF;} + .d2-3560478595 .fill-B1{fill:#0D32B2;} + .d2-3560478595 .fill-B2{fill:#0D32B2;} + .d2-3560478595 .fill-B3{fill:#E3E9FD;} + .d2-3560478595 .fill-B4{fill:#E3E9FD;} + .d2-3560478595 .fill-B5{fill:#EDF0FD;} + .d2-3560478595 .fill-B6{fill:#F7F8FE;} + .d2-3560478595 .fill-AA2{fill:#4A6FF3;} + .d2-3560478595 .fill-AA4{fill:#EDF0FD;} + .d2-3560478595 .fill-AA5{fill:#F7F8FE;} + .d2-3560478595 .fill-AB4{fill:#EDF0FD;} + .d2-3560478595 .fill-AB5{fill:#F7F8FE;} + .d2-3560478595 .stroke-N1{stroke:#0A0F25;} + .d2-3560478595 .stroke-N2{stroke:#676C7E;} + .d2-3560478595 .stroke-N3{stroke:#9499AB;} + .d2-3560478595 .stroke-N4{stroke:#CFD2DD;} + .d2-3560478595 .stroke-N5{stroke:#DEE1EB;} + .d2-3560478595 .stroke-N6{stroke:#EEF1F8;} + .d2-3560478595 .stroke-N7{stroke:#FFFFFF;} + .d2-3560478595 .stroke-B1{stroke:#0D32B2;} + .d2-3560478595 .stroke-B2{stroke:#0D32B2;} + .d2-3560478595 .stroke-B3{stroke:#E3E9FD;} + .d2-3560478595 .stroke-B4{stroke:#E3E9FD;} + .d2-3560478595 .stroke-B5{stroke:#EDF0FD;} + .d2-3560478595 .stroke-B6{stroke:#F7F8FE;} + .d2-3560478595 .stroke-AA2{stroke:#4A6FF3;} + .d2-3560478595 .stroke-AA4{stroke:#EDF0FD;} + .d2-3560478595 .stroke-AA5{stroke:#F7F8FE;} + .d2-3560478595 .stroke-AB4{stroke:#EDF0FD;} + .d2-3560478595 .stroke-AB5{stroke:#F7F8FE;} + .d2-3560478595 .background-color-N1{background-color:#0A0F25;} + .d2-3560478595 .background-color-N2{background-color:#676C7E;} + .d2-3560478595 .background-color-N3{background-color:#9499AB;} + .d2-3560478595 .background-color-N4{background-color:#CFD2DD;} + .d2-3560478595 .background-color-N5{background-color:#DEE1EB;} + .d2-3560478595 .background-color-N6{background-color:#EEF1F8;} + .d2-3560478595 .background-color-N7{background-color:#FFFFFF;} + .d2-3560478595 .background-color-B1{background-color:#0D32B2;} + .d2-3560478595 .background-color-B2{background-color:#0D32B2;} + .d2-3560478595 .background-color-B3{background-color:#E3E9FD;} + .d2-3560478595 .background-color-B4{background-color:#E3E9FD;} + .d2-3560478595 .background-color-B5{background-color:#EDF0FD;} + .d2-3560478595 .background-color-B6{background-color:#F7F8FE;} + .d2-3560478595 .background-color-AA2{background-color:#4A6FF3;} + .d2-3560478595 .background-color-AA4{background-color:#EDF0FD;} + .d2-3560478595 .background-color-AA5{background-color:#F7F8FE;} + .d2-3560478595 .background-color-AB4{background-color:#EDF0FD;} + .d2-3560478595 .background-color-AB5{background-color:#F7F8FE;} + .d2-3560478595 .color-N1{color:#0A0F25;} + .d2-3560478595 .color-N2{color:#676C7E;} + .d2-3560478595 .color-N3{color:#9499AB;} + .d2-3560478595 .color-N4{color:#CFD2DD;} + .d2-3560478595 .color-N5{color:#DEE1EB;} + .d2-3560478595 .color-N6{color:#EEF1F8;} + .d2-3560478595 .color-N7{color:#FFFFFF;} + .d2-3560478595 .color-B1{color:#0D32B2;} + .d2-3560478595 .color-B2{color:#0D32B2;} + .d2-3560478595 .color-B3{color:#E3E9FD;} + .d2-3560478595 .color-B4{color:#E3E9FD;} + .d2-3560478595 .color-B5{color:#EDF0FD;} + .d2-3560478595 .color-B6{color:#F7F8FE;} + .d2-3560478595 .color-AA2{color:#4A6FF3;} + .d2-3560478595 .color-AA4{color:#EDF0FD;} + .d2-3560478595 .color-AA5{color:#F7F8FE;} + .d2-3560478595 .color-AB4{color:#EDF0FD;} + .d2-3560478595 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3560478595);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3560478595);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3560478595);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3560478595);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3560478595);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3560478595);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3560478595);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3560478595);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3560478595);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3560478595);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3560478595);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3560478595);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3560478595);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3560478595);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3560478595);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3560478595);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3560478595);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3560478595);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>container1container2container3firstsecondthirdchildchild - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/outside_grid_label_position/elk/board.exp.json b/e2etests/testdata/regression/outside_grid_label_position/elk/board.exp.json index ad3c5a684..557f2bb7e 100644 --- a/e2etests/testdata/regression/outside_grid_label_position/elk/board.exp.json +++ b/e2etests/testdata/regression/outside_grid_label_position/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -348,6 +364,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/outside_grid_label_position/elk/sketch.exp.svg b/e2etests/testdata/regression/outside_grid_label_position/elk/sketch.exp.svg index 1f1b53324..4e72b4959 100644 --- a/e2etests/testdata/regression/outside_grid_label_position/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/outside_grid_label_position/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -container1container2container3firstsecondthirdchildchild + .d2-1910393790 .fill-N1{fill:#0A0F25;} + .d2-1910393790 .fill-N2{fill:#676C7E;} + .d2-1910393790 .fill-N3{fill:#9499AB;} + .d2-1910393790 .fill-N4{fill:#CFD2DD;} + .d2-1910393790 .fill-N5{fill:#DEE1EB;} + .d2-1910393790 .fill-N6{fill:#EEF1F8;} + .d2-1910393790 .fill-N7{fill:#FFFFFF;} + .d2-1910393790 .fill-B1{fill:#0D32B2;} + .d2-1910393790 .fill-B2{fill:#0D32B2;} + .d2-1910393790 .fill-B3{fill:#E3E9FD;} + .d2-1910393790 .fill-B4{fill:#E3E9FD;} + .d2-1910393790 .fill-B5{fill:#EDF0FD;} + .d2-1910393790 .fill-B6{fill:#F7F8FE;} + .d2-1910393790 .fill-AA2{fill:#4A6FF3;} + .d2-1910393790 .fill-AA4{fill:#EDF0FD;} + .d2-1910393790 .fill-AA5{fill:#F7F8FE;} + .d2-1910393790 .fill-AB4{fill:#EDF0FD;} + .d2-1910393790 .fill-AB5{fill:#F7F8FE;} + .d2-1910393790 .stroke-N1{stroke:#0A0F25;} + .d2-1910393790 .stroke-N2{stroke:#676C7E;} + .d2-1910393790 .stroke-N3{stroke:#9499AB;} + .d2-1910393790 .stroke-N4{stroke:#CFD2DD;} + .d2-1910393790 .stroke-N5{stroke:#DEE1EB;} + .d2-1910393790 .stroke-N6{stroke:#EEF1F8;} + .d2-1910393790 .stroke-N7{stroke:#FFFFFF;} + .d2-1910393790 .stroke-B1{stroke:#0D32B2;} + .d2-1910393790 .stroke-B2{stroke:#0D32B2;} + .d2-1910393790 .stroke-B3{stroke:#E3E9FD;} + .d2-1910393790 .stroke-B4{stroke:#E3E9FD;} + .d2-1910393790 .stroke-B5{stroke:#EDF0FD;} + .d2-1910393790 .stroke-B6{stroke:#F7F8FE;} + .d2-1910393790 .stroke-AA2{stroke:#4A6FF3;} + .d2-1910393790 .stroke-AA4{stroke:#EDF0FD;} + .d2-1910393790 .stroke-AA5{stroke:#F7F8FE;} + .d2-1910393790 .stroke-AB4{stroke:#EDF0FD;} + .d2-1910393790 .stroke-AB5{stroke:#F7F8FE;} + .d2-1910393790 .background-color-N1{background-color:#0A0F25;} + .d2-1910393790 .background-color-N2{background-color:#676C7E;} + .d2-1910393790 .background-color-N3{background-color:#9499AB;} + .d2-1910393790 .background-color-N4{background-color:#CFD2DD;} + .d2-1910393790 .background-color-N5{background-color:#DEE1EB;} + .d2-1910393790 .background-color-N6{background-color:#EEF1F8;} + .d2-1910393790 .background-color-N7{background-color:#FFFFFF;} + .d2-1910393790 .background-color-B1{background-color:#0D32B2;} + .d2-1910393790 .background-color-B2{background-color:#0D32B2;} + .d2-1910393790 .background-color-B3{background-color:#E3E9FD;} + .d2-1910393790 .background-color-B4{background-color:#E3E9FD;} + .d2-1910393790 .background-color-B5{background-color:#EDF0FD;} + .d2-1910393790 .background-color-B6{background-color:#F7F8FE;} + .d2-1910393790 .background-color-AA2{background-color:#4A6FF3;} + .d2-1910393790 .background-color-AA4{background-color:#EDF0FD;} + .d2-1910393790 .background-color-AA5{background-color:#F7F8FE;} + .d2-1910393790 .background-color-AB4{background-color:#EDF0FD;} + .d2-1910393790 .background-color-AB5{background-color:#F7F8FE;} + .d2-1910393790 .color-N1{color:#0A0F25;} + .d2-1910393790 .color-N2{color:#676C7E;} + .d2-1910393790 .color-N3{color:#9499AB;} + .d2-1910393790 .color-N4{color:#CFD2DD;} + .d2-1910393790 .color-N5{color:#DEE1EB;} + .d2-1910393790 .color-N6{color:#EEF1F8;} + .d2-1910393790 .color-N7{color:#FFFFFF;} + .d2-1910393790 .color-B1{color:#0D32B2;} + .d2-1910393790 .color-B2{color:#0D32B2;} + .d2-1910393790 .color-B3{color:#E3E9FD;} + .d2-1910393790 .color-B4{color:#E3E9FD;} + .d2-1910393790 .color-B5{color:#EDF0FD;} + .d2-1910393790 .color-B6{color:#F7F8FE;} + .d2-1910393790 .color-AA2{color:#4A6FF3;} + .d2-1910393790 .color-AA4{color:#EDF0FD;} + .d2-1910393790 .color-AA5{color:#F7F8FE;} + .d2-1910393790 .color-AB4{color:#EDF0FD;} + .d2-1910393790 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1910393790);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1910393790);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1910393790);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1910393790);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1910393790);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1910393790);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1910393790);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1910393790);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1910393790);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1910393790);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1910393790);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1910393790);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1910393790);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1910393790);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1910393790);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1910393790);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1910393790);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1910393790);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>container1container2container3firstsecondthirdchildchild - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/overlapping-edge-label/dagre/board.exp.json b/e2etests/testdata/regression/overlapping-edge-label/dagre/board.exp.json index d09ceeafe..d4755cbee 100644 --- a/e2etests/testdata/regression/overlapping-edge-label/dagre/board.exp.json +++ b/e2etests/testdata/regression/overlapping-edge-label/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -438,6 +456,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 532.5, @@ -485,6 +504,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 634.5, @@ -532,6 +552,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 730.5, @@ -579,6 +600,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 811.5, @@ -619,6 +641,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/overlapping-edge-label/dagre/sketch.exp.svg b/e2etests/testdata/regression/overlapping-edge-label/dagre/sketch.exp.svg index 4d8240cc9..96e231a5e 100644 --- a/e2etests/testdata/regression/overlapping-edge-label/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/overlapping-edge-label/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -Kubernetesopensvck8s-master1k8s-master2k8s-master3k8s-worker1k8s-worker2k8s-worker3VM1VM2 keycloakheptapodharborvault + .d2-3593530259 .fill-N1{fill:#0A0F25;} + .d2-3593530259 .fill-N2{fill:#676C7E;} + .d2-3593530259 .fill-N3{fill:#9499AB;} + .d2-3593530259 .fill-N4{fill:#CFD2DD;} + .d2-3593530259 .fill-N5{fill:#DEE1EB;} + .d2-3593530259 .fill-N6{fill:#EEF1F8;} + .d2-3593530259 .fill-N7{fill:#FFFFFF;} + .d2-3593530259 .fill-B1{fill:#0D32B2;} + .d2-3593530259 .fill-B2{fill:#0D32B2;} + .d2-3593530259 .fill-B3{fill:#E3E9FD;} + .d2-3593530259 .fill-B4{fill:#E3E9FD;} + .d2-3593530259 .fill-B5{fill:#EDF0FD;} + .d2-3593530259 .fill-B6{fill:#F7F8FE;} + .d2-3593530259 .fill-AA2{fill:#4A6FF3;} + .d2-3593530259 .fill-AA4{fill:#EDF0FD;} + .d2-3593530259 .fill-AA5{fill:#F7F8FE;} + .d2-3593530259 .fill-AB4{fill:#EDF0FD;} + .d2-3593530259 .fill-AB5{fill:#F7F8FE;} + .d2-3593530259 .stroke-N1{stroke:#0A0F25;} + .d2-3593530259 .stroke-N2{stroke:#676C7E;} + .d2-3593530259 .stroke-N3{stroke:#9499AB;} + .d2-3593530259 .stroke-N4{stroke:#CFD2DD;} + .d2-3593530259 .stroke-N5{stroke:#DEE1EB;} + .d2-3593530259 .stroke-N6{stroke:#EEF1F8;} + .d2-3593530259 .stroke-N7{stroke:#FFFFFF;} + .d2-3593530259 .stroke-B1{stroke:#0D32B2;} + .d2-3593530259 .stroke-B2{stroke:#0D32B2;} + .d2-3593530259 .stroke-B3{stroke:#E3E9FD;} + .d2-3593530259 .stroke-B4{stroke:#E3E9FD;} + .d2-3593530259 .stroke-B5{stroke:#EDF0FD;} + .d2-3593530259 .stroke-B6{stroke:#F7F8FE;} + .d2-3593530259 .stroke-AA2{stroke:#4A6FF3;} + .d2-3593530259 .stroke-AA4{stroke:#EDF0FD;} + .d2-3593530259 .stroke-AA5{stroke:#F7F8FE;} + .d2-3593530259 .stroke-AB4{stroke:#EDF0FD;} + .d2-3593530259 .stroke-AB5{stroke:#F7F8FE;} + .d2-3593530259 .background-color-N1{background-color:#0A0F25;} + .d2-3593530259 .background-color-N2{background-color:#676C7E;} + .d2-3593530259 .background-color-N3{background-color:#9499AB;} + .d2-3593530259 .background-color-N4{background-color:#CFD2DD;} + .d2-3593530259 .background-color-N5{background-color:#DEE1EB;} + .d2-3593530259 .background-color-N6{background-color:#EEF1F8;} + .d2-3593530259 .background-color-N7{background-color:#FFFFFF;} + .d2-3593530259 .background-color-B1{background-color:#0D32B2;} + .d2-3593530259 .background-color-B2{background-color:#0D32B2;} + .d2-3593530259 .background-color-B3{background-color:#E3E9FD;} + .d2-3593530259 .background-color-B4{background-color:#E3E9FD;} + .d2-3593530259 .background-color-B5{background-color:#EDF0FD;} + .d2-3593530259 .background-color-B6{background-color:#F7F8FE;} + .d2-3593530259 .background-color-AA2{background-color:#4A6FF3;} + .d2-3593530259 .background-color-AA4{background-color:#EDF0FD;} + .d2-3593530259 .background-color-AA5{background-color:#F7F8FE;} + .d2-3593530259 .background-color-AB4{background-color:#EDF0FD;} + .d2-3593530259 .background-color-AB5{background-color:#F7F8FE;} + .d2-3593530259 .color-N1{color:#0A0F25;} + .d2-3593530259 .color-N2{color:#676C7E;} + .d2-3593530259 .color-N3{color:#9499AB;} + .d2-3593530259 .color-N4{color:#CFD2DD;} + .d2-3593530259 .color-N5{color:#DEE1EB;} + .d2-3593530259 .color-N6{color:#EEF1F8;} + .d2-3593530259 .color-N7{color:#FFFFFF;} + .d2-3593530259 .color-B1{color:#0D32B2;} + .d2-3593530259 .color-B2{color:#0D32B2;} + .d2-3593530259 .color-B3{color:#E3E9FD;} + .d2-3593530259 .color-B4{color:#E3E9FD;} + .d2-3593530259 .color-B5{color:#EDF0FD;} + .d2-3593530259 .color-B6{color:#F7F8FE;} + .d2-3593530259 .color-AA2{color:#4A6FF3;} + .d2-3593530259 .color-AA4{color:#EDF0FD;} + .d2-3593530259 .color-AA5{color:#F7F8FE;} + .d2-3593530259 .color-AB4{color:#EDF0FD;} + .d2-3593530259 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3593530259);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3593530259);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3593530259);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3593530259);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3593530259);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3593530259);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3593530259);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3593530259);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3593530259);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3593530259);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3593530259);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3593530259);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3593530259);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3593530259);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3593530259);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3593530259);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3593530259);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3593530259);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>Kubernetesopensvck8s-master1k8s-master2k8s-master3k8s-worker1k8s-worker2k8s-worker3VM1VM2 keycloakheptapodharborvault - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/overlapping-edge-label/elk/board.exp.json b/e2etests/testdata/regression/overlapping-edge-label/elk/board.exp.json index a57d70a04..8f37358b9 100644 --- a/e2etests/testdata/regression/overlapping-edge-label/elk/board.exp.json +++ b/e2etests/testdata/regression/overlapping-edge-label/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -438,6 +456,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 274, @@ -484,6 +503,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 482.29998779296875, @@ -522,6 +542,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 536.7000122070312, @@ -560,6 +581,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 735.7000122070312, @@ -599,6 +621,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/overlapping-edge-label/elk/sketch.exp.svg b/e2etests/testdata/regression/overlapping-edge-label/elk/sketch.exp.svg index 208a3d01d..53a7fa730 100644 --- a/e2etests/testdata/regression/overlapping-edge-label/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/overlapping-edge-label/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -Kubernetesopensvck8s-master1k8s-master2k8s-master3k8s-worker1k8s-worker2k8s-worker3VM1VM2 keycloakheptapodharborvault + .d2-2503996048 .fill-N1{fill:#0A0F25;} + .d2-2503996048 .fill-N2{fill:#676C7E;} + .d2-2503996048 .fill-N3{fill:#9499AB;} + .d2-2503996048 .fill-N4{fill:#CFD2DD;} + .d2-2503996048 .fill-N5{fill:#DEE1EB;} + .d2-2503996048 .fill-N6{fill:#EEF1F8;} + .d2-2503996048 .fill-N7{fill:#FFFFFF;} + .d2-2503996048 .fill-B1{fill:#0D32B2;} + .d2-2503996048 .fill-B2{fill:#0D32B2;} + .d2-2503996048 .fill-B3{fill:#E3E9FD;} + .d2-2503996048 .fill-B4{fill:#E3E9FD;} + .d2-2503996048 .fill-B5{fill:#EDF0FD;} + .d2-2503996048 .fill-B6{fill:#F7F8FE;} + .d2-2503996048 .fill-AA2{fill:#4A6FF3;} + .d2-2503996048 .fill-AA4{fill:#EDF0FD;} + .d2-2503996048 .fill-AA5{fill:#F7F8FE;} + .d2-2503996048 .fill-AB4{fill:#EDF0FD;} + .d2-2503996048 .fill-AB5{fill:#F7F8FE;} + .d2-2503996048 .stroke-N1{stroke:#0A0F25;} + .d2-2503996048 .stroke-N2{stroke:#676C7E;} + .d2-2503996048 .stroke-N3{stroke:#9499AB;} + .d2-2503996048 .stroke-N4{stroke:#CFD2DD;} + .d2-2503996048 .stroke-N5{stroke:#DEE1EB;} + .d2-2503996048 .stroke-N6{stroke:#EEF1F8;} + .d2-2503996048 .stroke-N7{stroke:#FFFFFF;} + .d2-2503996048 .stroke-B1{stroke:#0D32B2;} + .d2-2503996048 .stroke-B2{stroke:#0D32B2;} + .d2-2503996048 .stroke-B3{stroke:#E3E9FD;} + .d2-2503996048 .stroke-B4{stroke:#E3E9FD;} + .d2-2503996048 .stroke-B5{stroke:#EDF0FD;} + .d2-2503996048 .stroke-B6{stroke:#F7F8FE;} + .d2-2503996048 .stroke-AA2{stroke:#4A6FF3;} + .d2-2503996048 .stroke-AA4{stroke:#EDF0FD;} + .d2-2503996048 .stroke-AA5{stroke:#F7F8FE;} + .d2-2503996048 .stroke-AB4{stroke:#EDF0FD;} + .d2-2503996048 .stroke-AB5{stroke:#F7F8FE;} + .d2-2503996048 .background-color-N1{background-color:#0A0F25;} + .d2-2503996048 .background-color-N2{background-color:#676C7E;} + .d2-2503996048 .background-color-N3{background-color:#9499AB;} + .d2-2503996048 .background-color-N4{background-color:#CFD2DD;} + .d2-2503996048 .background-color-N5{background-color:#DEE1EB;} + .d2-2503996048 .background-color-N6{background-color:#EEF1F8;} + .d2-2503996048 .background-color-N7{background-color:#FFFFFF;} + .d2-2503996048 .background-color-B1{background-color:#0D32B2;} + .d2-2503996048 .background-color-B2{background-color:#0D32B2;} + .d2-2503996048 .background-color-B3{background-color:#E3E9FD;} + .d2-2503996048 .background-color-B4{background-color:#E3E9FD;} + .d2-2503996048 .background-color-B5{background-color:#EDF0FD;} + .d2-2503996048 .background-color-B6{background-color:#F7F8FE;} + .d2-2503996048 .background-color-AA2{background-color:#4A6FF3;} + .d2-2503996048 .background-color-AA4{background-color:#EDF0FD;} + .d2-2503996048 .background-color-AA5{background-color:#F7F8FE;} + .d2-2503996048 .background-color-AB4{background-color:#EDF0FD;} + .d2-2503996048 .background-color-AB5{background-color:#F7F8FE;} + .d2-2503996048 .color-N1{color:#0A0F25;} + .d2-2503996048 .color-N2{color:#676C7E;} + .d2-2503996048 .color-N3{color:#9499AB;} + .d2-2503996048 .color-N4{color:#CFD2DD;} + .d2-2503996048 .color-N5{color:#DEE1EB;} + .d2-2503996048 .color-N6{color:#EEF1F8;} + .d2-2503996048 .color-N7{color:#FFFFFF;} + .d2-2503996048 .color-B1{color:#0D32B2;} + .d2-2503996048 .color-B2{color:#0D32B2;} + .d2-2503996048 .color-B3{color:#E3E9FD;} + .d2-2503996048 .color-B4{color:#E3E9FD;} + .d2-2503996048 .color-B5{color:#EDF0FD;} + .d2-2503996048 .color-B6{color:#F7F8FE;} + .d2-2503996048 .color-AA2{color:#4A6FF3;} + .d2-2503996048 .color-AA4{color:#EDF0FD;} + .d2-2503996048 .color-AA5{color:#F7F8FE;} + .d2-2503996048 .color-AB4{color:#EDF0FD;} + .d2-2503996048 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2503996048);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2503996048);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2503996048);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2503996048);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2503996048);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2503996048);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2503996048);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2503996048);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2503996048);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2503996048);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2503996048);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2503996048);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2503996048);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2503996048);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2503996048);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2503996048);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2503996048);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2503996048);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>Kubernetesopensvck8s-master1k8s-master2k8s-master3k8s-worker1k8s-worker2k8s-worker3VM1VM2 keycloakheptapodharborvault - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/query_param_escape/dagre/board.exp.json b/e2etests/testdata/regression/query_param_escape/dagre/board.exp.json index 56e80e247..4997c0517 100644 --- a/e2etests/testdata/regression/query_param_escape/dagre/board.exp.json +++ b/e2etests/testdata/regression/query_param_escape/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -73,6 +82,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/query_param_escape/dagre/sketch.exp.svg b/e2etests/testdata/regression/query_param_escape/dagre/sketch.exp.svg index 638844c96..3fa8a3064 100644 --- a/e2etests/testdata/regression/query_param_escape/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/query_param_escape/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -my network + .d2-229682999 .fill-N1{fill:#0A0F25;} + .d2-229682999 .fill-N2{fill:#676C7E;} + .d2-229682999 .fill-N3{fill:#9499AB;} + .d2-229682999 .fill-N4{fill:#CFD2DD;} + .d2-229682999 .fill-N5{fill:#DEE1EB;} + .d2-229682999 .fill-N6{fill:#EEF1F8;} + .d2-229682999 .fill-N7{fill:#FFFFFF;} + .d2-229682999 .fill-B1{fill:#0D32B2;} + .d2-229682999 .fill-B2{fill:#0D32B2;} + .d2-229682999 .fill-B3{fill:#E3E9FD;} + .d2-229682999 .fill-B4{fill:#E3E9FD;} + .d2-229682999 .fill-B5{fill:#EDF0FD;} + .d2-229682999 .fill-B6{fill:#F7F8FE;} + .d2-229682999 .fill-AA2{fill:#4A6FF3;} + .d2-229682999 .fill-AA4{fill:#EDF0FD;} + .d2-229682999 .fill-AA5{fill:#F7F8FE;} + .d2-229682999 .fill-AB4{fill:#EDF0FD;} + .d2-229682999 .fill-AB5{fill:#F7F8FE;} + .d2-229682999 .stroke-N1{stroke:#0A0F25;} + .d2-229682999 .stroke-N2{stroke:#676C7E;} + .d2-229682999 .stroke-N3{stroke:#9499AB;} + .d2-229682999 .stroke-N4{stroke:#CFD2DD;} + .d2-229682999 .stroke-N5{stroke:#DEE1EB;} + .d2-229682999 .stroke-N6{stroke:#EEF1F8;} + .d2-229682999 .stroke-N7{stroke:#FFFFFF;} + .d2-229682999 .stroke-B1{stroke:#0D32B2;} + .d2-229682999 .stroke-B2{stroke:#0D32B2;} + .d2-229682999 .stroke-B3{stroke:#E3E9FD;} + .d2-229682999 .stroke-B4{stroke:#E3E9FD;} + .d2-229682999 .stroke-B5{stroke:#EDF0FD;} + .d2-229682999 .stroke-B6{stroke:#F7F8FE;} + .d2-229682999 .stroke-AA2{stroke:#4A6FF3;} + .d2-229682999 .stroke-AA4{stroke:#EDF0FD;} + .d2-229682999 .stroke-AA5{stroke:#F7F8FE;} + .d2-229682999 .stroke-AB4{stroke:#EDF0FD;} + .d2-229682999 .stroke-AB5{stroke:#F7F8FE;} + .d2-229682999 .background-color-N1{background-color:#0A0F25;} + .d2-229682999 .background-color-N2{background-color:#676C7E;} + .d2-229682999 .background-color-N3{background-color:#9499AB;} + .d2-229682999 .background-color-N4{background-color:#CFD2DD;} + .d2-229682999 .background-color-N5{background-color:#DEE1EB;} + .d2-229682999 .background-color-N6{background-color:#EEF1F8;} + .d2-229682999 .background-color-N7{background-color:#FFFFFF;} + .d2-229682999 .background-color-B1{background-color:#0D32B2;} + .d2-229682999 .background-color-B2{background-color:#0D32B2;} + .d2-229682999 .background-color-B3{background-color:#E3E9FD;} + .d2-229682999 .background-color-B4{background-color:#E3E9FD;} + .d2-229682999 .background-color-B5{background-color:#EDF0FD;} + .d2-229682999 .background-color-B6{background-color:#F7F8FE;} + .d2-229682999 .background-color-AA2{background-color:#4A6FF3;} + .d2-229682999 .background-color-AA4{background-color:#EDF0FD;} + .d2-229682999 .background-color-AA5{background-color:#F7F8FE;} + .d2-229682999 .background-color-AB4{background-color:#EDF0FD;} + .d2-229682999 .background-color-AB5{background-color:#F7F8FE;} + .d2-229682999 .color-N1{color:#0A0F25;} + .d2-229682999 .color-N2{color:#676C7E;} + .d2-229682999 .color-N3{color:#9499AB;} + .d2-229682999 .color-N4{color:#CFD2DD;} + .d2-229682999 .color-N5{color:#DEE1EB;} + .d2-229682999 .color-N6{color:#EEF1F8;} + .d2-229682999 .color-N7{color:#FFFFFF;} + .d2-229682999 .color-B1{color:#0D32B2;} + .d2-229682999 .color-B2{color:#0D32B2;} + .d2-229682999 .color-B3{color:#E3E9FD;} + .d2-229682999 .color-B4{color:#E3E9FD;} + .d2-229682999 .color-B5{color:#EDF0FD;} + .d2-229682999 .color-B6{color:#F7F8FE;} + .d2-229682999 .color-AA2{color:#4A6FF3;} + .d2-229682999 .color-AA4{color:#EDF0FD;} + .d2-229682999 .color-AA5{color:#F7F8FE;} + .d2-229682999 .color-AB4{color:#EDF0FD;} + .d2-229682999 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-229682999);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-229682999);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-229682999);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-229682999);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-229682999);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-229682999);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-229682999);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-229682999);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-229682999);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-229682999);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-229682999);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-229682999);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-229682999);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-229682999);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-229682999);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-229682999);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-229682999);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-229682999);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>my network - + \ No newline at end of file diff --git a/e2etests/testdata/regression/query_param_escape/elk/board.exp.json b/e2etests/testdata/regression/query_param_escape/elk/board.exp.json index 44a223e8c..e6c0999ec 100644 --- a/e2etests/testdata/regression/query_param_escape/elk/board.exp.json +++ b/e2etests/testdata/regression/query_param_escape/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -73,6 +82,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/query_param_escape/elk/sketch.exp.svg b/e2etests/testdata/regression/query_param_escape/elk/sketch.exp.svg index 9add41ec4..da17f00e2 100644 --- a/e2etests/testdata/regression/query_param_escape/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/query_param_escape/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -my network + .d2-2311556588 .fill-N1{fill:#0A0F25;} + .d2-2311556588 .fill-N2{fill:#676C7E;} + .d2-2311556588 .fill-N3{fill:#9499AB;} + .d2-2311556588 .fill-N4{fill:#CFD2DD;} + .d2-2311556588 .fill-N5{fill:#DEE1EB;} + .d2-2311556588 .fill-N6{fill:#EEF1F8;} + .d2-2311556588 .fill-N7{fill:#FFFFFF;} + .d2-2311556588 .fill-B1{fill:#0D32B2;} + .d2-2311556588 .fill-B2{fill:#0D32B2;} + .d2-2311556588 .fill-B3{fill:#E3E9FD;} + .d2-2311556588 .fill-B4{fill:#E3E9FD;} + .d2-2311556588 .fill-B5{fill:#EDF0FD;} + .d2-2311556588 .fill-B6{fill:#F7F8FE;} + .d2-2311556588 .fill-AA2{fill:#4A6FF3;} + .d2-2311556588 .fill-AA4{fill:#EDF0FD;} + .d2-2311556588 .fill-AA5{fill:#F7F8FE;} + .d2-2311556588 .fill-AB4{fill:#EDF0FD;} + .d2-2311556588 .fill-AB5{fill:#F7F8FE;} + .d2-2311556588 .stroke-N1{stroke:#0A0F25;} + .d2-2311556588 .stroke-N2{stroke:#676C7E;} + .d2-2311556588 .stroke-N3{stroke:#9499AB;} + .d2-2311556588 .stroke-N4{stroke:#CFD2DD;} + .d2-2311556588 .stroke-N5{stroke:#DEE1EB;} + .d2-2311556588 .stroke-N6{stroke:#EEF1F8;} + .d2-2311556588 .stroke-N7{stroke:#FFFFFF;} + .d2-2311556588 .stroke-B1{stroke:#0D32B2;} + .d2-2311556588 .stroke-B2{stroke:#0D32B2;} + .d2-2311556588 .stroke-B3{stroke:#E3E9FD;} + .d2-2311556588 .stroke-B4{stroke:#E3E9FD;} + .d2-2311556588 .stroke-B5{stroke:#EDF0FD;} + .d2-2311556588 .stroke-B6{stroke:#F7F8FE;} + .d2-2311556588 .stroke-AA2{stroke:#4A6FF3;} + .d2-2311556588 .stroke-AA4{stroke:#EDF0FD;} + .d2-2311556588 .stroke-AA5{stroke:#F7F8FE;} + .d2-2311556588 .stroke-AB4{stroke:#EDF0FD;} + .d2-2311556588 .stroke-AB5{stroke:#F7F8FE;} + .d2-2311556588 .background-color-N1{background-color:#0A0F25;} + .d2-2311556588 .background-color-N2{background-color:#676C7E;} + .d2-2311556588 .background-color-N3{background-color:#9499AB;} + .d2-2311556588 .background-color-N4{background-color:#CFD2DD;} + .d2-2311556588 .background-color-N5{background-color:#DEE1EB;} + .d2-2311556588 .background-color-N6{background-color:#EEF1F8;} + .d2-2311556588 .background-color-N7{background-color:#FFFFFF;} + .d2-2311556588 .background-color-B1{background-color:#0D32B2;} + .d2-2311556588 .background-color-B2{background-color:#0D32B2;} + .d2-2311556588 .background-color-B3{background-color:#E3E9FD;} + .d2-2311556588 .background-color-B4{background-color:#E3E9FD;} + .d2-2311556588 .background-color-B5{background-color:#EDF0FD;} + .d2-2311556588 .background-color-B6{background-color:#F7F8FE;} + .d2-2311556588 .background-color-AA2{background-color:#4A6FF3;} + .d2-2311556588 .background-color-AA4{background-color:#EDF0FD;} + .d2-2311556588 .background-color-AA5{background-color:#F7F8FE;} + .d2-2311556588 .background-color-AB4{background-color:#EDF0FD;} + .d2-2311556588 .background-color-AB5{background-color:#F7F8FE;} + .d2-2311556588 .color-N1{color:#0A0F25;} + .d2-2311556588 .color-N2{color:#676C7E;} + .d2-2311556588 .color-N3{color:#9499AB;} + .d2-2311556588 .color-N4{color:#CFD2DD;} + .d2-2311556588 .color-N5{color:#DEE1EB;} + .d2-2311556588 .color-N6{color:#EEF1F8;} + .d2-2311556588 .color-N7{color:#FFFFFF;} + .d2-2311556588 .color-B1{color:#0D32B2;} + .d2-2311556588 .color-B2{color:#0D32B2;} + .d2-2311556588 .color-B3{color:#E3E9FD;} + .d2-2311556588 .color-B4{color:#E3E9FD;} + .d2-2311556588 .color-B5{color:#EDF0FD;} + .d2-2311556588 .color-B6{color:#F7F8FE;} + .d2-2311556588 .color-AA2{color:#4A6FF3;} + .d2-2311556588 .color-AA4{color:#EDF0FD;} + .d2-2311556588 .color-AA5{color:#F7F8FE;} + .d2-2311556588 .color-AB4{color:#EDF0FD;} + .d2-2311556588 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2311556588);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2311556588);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2311556588);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2311556588);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2311556588);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2311556588);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2311556588);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2311556588);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2311556588);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2311556588);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2311556588);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2311556588);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2311556588);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2311556588);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2311556588);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2311556588);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2311556588);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2311556588);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>my network - + \ No newline at end of file diff --git a/e2etests/testdata/regression/root-container/dagre/board.exp.json b/e2etests/testdata/regression/root-container/dagre/board.exp.json index 3110ea862..1d7ff194a 100644 --- a/e2etests/testdata/regression/root-container/dagre/board.exp.json +++ b/e2etests/testdata/regression/root-container/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -356,6 +372,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 66.75, @@ -403,6 +420,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 145.25, @@ -450,6 +468,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 332.5, @@ -497,6 +516,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 411, @@ -537,6 +557,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/root-container/dagre/sketch.exp.svg b/e2etests/testdata/regression/root-container/dagre/sketch.exp.svg index 7a4b28186..373755318 100644 --- a/e2etests/testdata/regression/root-container/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/root-container/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -mainrootxyzxyz + .d2-2272097701 .fill-N1{fill:#0A0F25;} + .d2-2272097701 .fill-N2{fill:#676C7E;} + .d2-2272097701 .fill-N3{fill:#9499AB;} + .d2-2272097701 .fill-N4{fill:#CFD2DD;} + .d2-2272097701 .fill-N5{fill:#DEE1EB;} + .d2-2272097701 .fill-N6{fill:#EEF1F8;} + .d2-2272097701 .fill-N7{fill:#FFFFFF;} + .d2-2272097701 .fill-B1{fill:#0D32B2;} + .d2-2272097701 .fill-B2{fill:#0D32B2;} + .d2-2272097701 .fill-B3{fill:#E3E9FD;} + .d2-2272097701 .fill-B4{fill:#E3E9FD;} + .d2-2272097701 .fill-B5{fill:#EDF0FD;} + .d2-2272097701 .fill-B6{fill:#F7F8FE;} + .d2-2272097701 .fill-AA2{fill:#4A6FF3;} + .d2-2272097701 .fill-AA4{fill:#EDF0FD;} + .d2-2272097701 .fill-AA5{fill:#F7F8FE;} + .d2-2272097701 .fill-AB4{fill:#EDF0FD;} + .d2-2272097701 .fill-AB5{fill:#F7F8FE;} + .d2-2272097701 .stroke-N1{stroke:#0A0F25;} + .d2-2272097701 .stroke-N2{stroke:#676C7E;} + .d2-2272097701 .stroke-N3{stroke:#9499AB;} + .d2-2272097701 .stroke-N4{stroke:#CFD2DD;} + .d2-2272097701 .stroke-N5{stroke:#DEE1EB;} + .d2-2272097701 .stroke-N6{stroke:#EEF1F8;} + .d2-2272097701 .stroke-N7{stroke:#FFFFFF;} + .d2-2272097701 .stroke-B1{stroke:#0D32B2;} + .d2-2272097701 .stroke-B2{stroke:#0D32B2;} + .d2-2272097701 .stroke-B3{stroke:#E3E9FD;} + .d2-2272097701 .stroke-B4{stroke:#E3E9FD;} + .d2-2272097701 .stroke-B5{stroke:#EDF0FD;} + .d2-2272097701 .stroke-B6{stroke:#F7F8FE;} + .d2-2272097701 .stroke-AA2{stroke:#4A6FF3;} + .d2-2272097701 .stroke-AA4{stroke:#EDF0FD;} + .d2-2272097701 .stroke-AA5{stroke:#F7F8FE;} + .d2-2272097701 .stroke-AB4{stroke:#EDF0FD;} + .d2-2272097701 .stroke-AB5{stroke:#F7F8FE;} + .d2-2272097701 .background-color-N1{background-color:#0A0F25;} + .d2-2272097701 .background-color-N2{background-color:#676C7E;} + .d2-2272097701 .background-color-N3{background-color:#9499AB;} + .d2-2272097701 .background-color-N4{background-color:#CFD2DD;} + .d2-2272097701 .background-color-N5{background-color:#DEE1EB;} + .d2-2272097701 .background-color-N6{background-color:#EEF1F8;} + .d2-2272097701 .background-color-N7{background-color:#FFFFFF;} + .d2-2272097701 .background-color-B1{background-color:#0D32B2;} + .d2-2272097701 .background-color-B2{background-color:#0D32B2;} + .d2-2272097701 .background-color-B3{background-color:#E3E9FD;} + .d2-2272097701 .background-color-B4{background-color:#E3E9FD;} + .d2-2272097701 .background-color-B5{background-color:#EDF0FD;} + .d2-2272097701 .background-color-B6{background-color:#F7F8FE;} + .d2-2272097701 .background-color-AA2{background-color:#4A6FF3;} + .d2-2272097701 .background-color-AA4{background-color:#EDF0FD;} + .d2-2272097701 .background-color-AA5{background-color:#F7F8FE;} + .d2-2272097701 .background-color-AB4{background-color:#EDF0FD;} + .d2-2272097701 .background-color-AB5{background-color:#F7F8FE;} + .d2-2272097701 .color-N1{color:#0A0F25;} + .d2-2272097701 .color-N2{color:#676C7E;} + .d2-2272097701 .color-N3{color:#9499AB;} + .d2-2272097701 .color-N4{color:#CFD2DD;} + .d2-2272097701 .color-N5{color:#DEE1EB;} + .d2-2272097701 .color-N6{color:#EEF1F8;} + .d2-2272097701 .color-N7{color:#FFFFFF;} + .d2-2272097701 .color-B1{color:#0D32B2;} + .d2-2272097701 .color-B2{color:#0D32B2;} + .d2-2272097701 .color-B3{color:#E3E9FD;} + .d2-2272097701 .color-B4{color:#E3E9FD;} + .d2-2272097701 .color-B5{color:#EDF0FD;} + .d2-2272097701 .color-B6{color:#F7F8FE;} + .d2-2272097701 .color-AA2{color:#4A6FF3;} + .d2-2272097701 .color-AA4{color:#EDF0FD;} + .d2-2272097701 .color-AA5{color:#F7F8FE;} + .d2-2272097701 .color-AB4{color:#EDF0FD;} + .d2-2272097701 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2272097701);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2272097701);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2272097701);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2272097701);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2272097701);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2272097701);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2272097701);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2272097701);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2272097701);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2272097701);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2272097701);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2272097701);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2272097701);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2272097701);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2272097701);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2272097701);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2272097701);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2272097701);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>mainrootxyzxyz - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/root-container/elk/board.exp.json b/e2etests/testdata/regression/root-container/elk/board.exp.json index 0e8f8e2c9..93f919a0e 100644 --- a/e2etests/testdata/regression/root-container/elk/board.exp.json +++ b/e2etests/testdata/regression/root-container/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -356,6 +372,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 89, @@ -394,6 +411,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 89, @@ -432,6 +450,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 263, @@ -470,6 +489,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 263, @@ -501,6 +521,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/root-container/elk/sketch.exp.svg b/e2etests/testdata/regression/root-container/elk/sketch.exp.svg index 08aa37725..3c1e99ae2 100644 --- a/e2etests/testdata/regression/root-container/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/root-container/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -mainrootxyzxyz + .d2-3938805023 .fill-N1{fill:#0A0F25;} + .d2-3938805023 .fill-N2{fill:#676C7E;} + .d2-3938805023 .fill-N3{fill:#9499AB;} + .d2-3938805023 .fill-N4{fill:#CFD2DD;} + .d2-3938805023 .fill-N5{fill:#DEE1EB;} + .d2-3938805023 .fill-N6{fill:#EEF1F8;} + .d2-3938805023 .fill-N7{fill:#FFFFFF;} + .d2-3938805023 .fill-B1{fill:#0D32B2;} + .d2-3938805023 .fill-B2{fill:#0D32B2;} + .d2-3938805023 .fill-B3{fill:#E3E9FD;} + .d2-3938805023 .fill-B4{fill:#E3E9FD;} + .d2-3938805023 .fill-B5{fill:#EDF0FD;} + .d2-3938805023 .fill-B6{fill:#F7F8FE;} + .d2-3938805023 .fill-AA2{fill:#4A6FF3;} + .d2-3938805023 .fill-AA4{fill:#EDF0FD;} + .d2-3938805023 .fill-AA5{fill:#F7F8FE;} + .d2-3938805023 .fill-AB4{fill:#EDF0FD;} + .d2-3938805023 .fill-AB5{fill:#F7F8FE;} + .d2-3938805023 .stroke-N1{stroke:#0A0F25;} + .d2-3938805023 .stroke-N2{stroke:#676C7E;} + .d2-3938805023 .stroke-N3{stroke:#9499AB;} + .d2-3938805023 .stroke-N4{stroke:#CFD2DD;} + .d2-3938805023 .stroke-N5{stroke:#DEE1EB;} + .d2-3938805023 .stroke-N6{stroke:#EEF1F8;} + .d2-3938805023 .stroke-N7{stroke:#FFFFFF;} + .d2-3938805023 .stroke-B1{stroke:#0D32B2;} + .d2-3938805023 .stroke-B2{stroke:#0D32B2;} + .d2-3938805023 .stroke-B3{stroke:#E3E9FD;} + .d2-3938805023 .stroke-B4{stroke:#E3E9FD;} + .d2-3938805023 .stroke-B5{stroke:#EDF0FD;} + .d2-3938805023 .stroke-B6{stroke:#F7F8FE;} + .d2-3938805023 .stroke-AA2{stroke:#4A6FF3;} + .d2-3938805023 .stroke-AA4{stroke:#EDF0FD;} + .d2-3938805023 .stroke-AA5{stroke:#F7F8FE;} + .d2-3938805023 .stroke-AB4{stroke:#EDF0FD;} + .d2-3938805023 .stroke-AB5{stroke:#F7F8FE;} + .d2-3938805023 .background-color-N1{background-color:#0A0F25;} + .d2-3938805023 .background-color-N2{background-color:#676C7E;} + .d2-3938805023 .background-color-N3{background-color:#9499AB;} + .d2-3938805023 .background-color-N4{background-color:#CFD2DD;} + .d2-3938805023 .background-color-N5{background-color:#DEE1EB;} + .d2-3938805023 .background-color-N6{background-color:#EEF1F8;} + .d2-3938805023 .background-color-N7{background-color:#FFFFFF;} + .d2-3938805023 .background-color-B1{background-color:#0D32B2;} + .d2-3938805023 .background-color-B2{background-color:#0D32B2;} + .d2-3938805023 .background-color-B3{background-color:#E3E9FD;} + .d2-3938805023 .background-color-B4{background-color:#E3E9FD;} + .d2-3938805023 .background-color-B5{background-color:#EDF0FD;} + .d2-3938805023 .background-color-B6{background-color:#F7F8FE;} + .d2-3938805023 .background-color-AA2{background-color:#4A6FF3;} + .d2-3938805023 .background-color-AA4{background-color:#EDF0FD;} + .d2-3938805023 .background-color-AA5{background-color:#F7F8FE;} + .d2-3938805023 .background-color-AB4{background-color:#EDF0FD;} + .d2-3938805023 .background-color-AB5{background-color:#F7F8FE;} + .d2-3938805023 .color-N1{color:#0A0F25;} + .d2-3938805023 .color-N2{color:#676C7E;} + .d2-3938805023 .color-N3{color:#9499AB;} + .d2-3938805023 .color-N4{color:#CFD2DD;} + .d2-3938805023 .color-N5{color:#DEE1EB;} + .d2-3938805023 .color-N6{color:#EEF1F8;} + .d2-3938805023 .color-N7{color:#FFFFFF;} + .d2-3938805023 .color-B1{color:#0D32B2;} + .d2-3938805023 .color-B2{color:#0D32B2;} + .d2-3938805023 .color-B3{color:#E3E9FD;} + .d2-3938805023 .color-B4{color:#E3E9FD;} + .d2-3938805023 .color-B5{color:#EDF0FD;} + .d2-3938805023 .color-B6{color:#F7F8FE;} + .d2-3938805023 .color-AA2{color:#4A6FF3;} + .d2-3938805023 .color-AA4{color:#EDF0FD;} + .d2-3938805023 .color-AA5{color:#F7F8FE;} + .d2-3938805023 .color-AB4{color:#EDF0FD;} + .d2-3938805023 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3938805023);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3938805023);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3938805023);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3938805023);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3938805023);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3938805023);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3938805023);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3938805023);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3938805023);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3938805023);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3938805023);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3938805023);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3938805023);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3938805023);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3938805023);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3938805023);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3938805023);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3938805023);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>mainrootxyzxyz - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/sequence-note-escape-group/dagre/board.exp.json b/e2etests/testdata/regression/sequence-note-escape-group/dagre/board.exp.json index cca6bc022..e9e991e9e 100644 --- a/e2etests/testdata/regression/sequence-note-escape-group/dagre/board.exp.json +++ b/e2etests/testdata/regression/sequence-note-escape-group/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -142,6 +153,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -184,6 +196,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -235,6 +248,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -273,6 +287,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -311,6 +326,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 247, @@ -342,6 +358,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/sequence-note-escape-group/dagre/sketch.exp.svg b/e2etests/testdata/regression/sequence-note-escape-group/dagre/sketch.exp.svg index c4d6a350a..abacdcd11 100644 --- a/e2etests/testdata/regression/sequence-note-escape-group/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/sequence-note-escape-group/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -ab04:20,11:20loop through each table start_time = datetime.datetime.now + .d2-1140000615 .fill-N1{fill:#0A0F25;} + .d2-1140000615 .fill-N2{fill:#676C7E;} + .d2-1140000615 .fill-N3{fill:#9499AB;} + .d2-1140000615 .fill-N4{fill:#CFD2DD;} + .d2-1140000615 .fill-N5{fill:#DEE1EB;} + .d2-1140000615 .fill-N6{fill:#EEF1F8;} + .d2-1140000615 .fill-N7{fill:#FFFFFF;} + .d2-1140000615 .fill-B1{fill:#0D32B2;} + .d2-1140000615 .fill-B2{fill:#0D32B2;} + .d2-1140000615 .fill-B3{fill:#E3E9FD;} + .d2-1140000615 .fill-B4{fill:#E3E9FD;} + .d2-1140000615 .fill-B5{fill:#EDF0FD;} + .d2-1140000615 .fill-B6{fill:#F7F8FE;} + .d2-1140000615 .fill-AA2{fill:#4A6FF3;} + .d2-1140000615 .fill-AA4{fill:#EDF0FD;} + .d2-1140000615 .fill-AA5{fill:#F7F8FE;} + .d2-1140000615 .fill-AB4{fill:#EDF0FD;} + .d2-1140000615 .fill-AB5{fill:#F7F8FE;} + .d2-1140000615 .stroke-N1{stroke:#0A0F25;} + .d2-1140000615 .stroke-N2{stroke:#676C7E;} + .d2-1140000615 .stroke-N3{stroke:#9499AB;} + .d2-1140000615 .stroke-N4{stroke:#CFD2DD;} + .d2-1140000615 .stroke-N5{stroke:#DEE1EB;} + .d2-1140000615 .stroke-N6{stroke:#EEF1F8;} + .d2-1140000615 .stroke-N7{stroke:#FFFFFF;} + .d2-1140000615 .stroke-B1{stroke:#0D32B2;} + .d2-1140000615 .stroke-B2{stroke:#0D32B2;} + .d2-1140000615 .stroke-B3{stroke:#E3E9FD;} + .d2-1140000615 .stroke-B4{stroke:#E3E9FD;} + .d2-1140000615 .stroke-B5{stroke:#EDF0FD;} + .d2-1140000615 .stroke-B6{stroke:#F7F8FE;} + .d2-1140000615 .stroke-AA2{stroke:#4A6FF3;} + .d2-1140000615 .stroke-AA4{stroke:#EDF0FD;} + .d2-1140000615 .stroke-AA5{stroke:#F7F8FE;} + .d2-1140000615 .stroke-AB4{stroke:#EDF0FD;} + .d2-1140000615 .stroke-AB5{stroke:#F7F8FE;} + .d2-1140000615 .background-color-N1{background-color:#0A0F25;} + .d2-1140000615 .background-color-N2{background-color:#676C7E;} + .d2-1140000615 .background-color-N3{background-color:#9499AB;} + .d2-1140000615 .background-color-N4{background-color:#CFD2DD;} + .d2-1140000615 .background-color-N5{background-color:#DEE1EB;} + .d2-1140000615 .background-color-N6{background-color:#EEF1F8;} + .d2-1140000615 .background-color-N7{background-color:#FFFFFF;} + .d2-1140000615 .background-color-B1{background-color:#0D32B2;} + .d2-1140000615 .background-color-B2{background-color:#0D32B2;} + .d2-1140000615 .background-color-B3{background-color:#E3E9FD;} + .d2-1140000615 .background-color-B4{background-color:#E3E9FD;} + .d2-1140000615 .background-color-B5{background-color:#EDF0FD;} + .d2-1140000615 .background-color-B6{background-color:#F7F8FE;} + .d2-1140000615 .background-color-AA2{background-color:#4A6FF3;} + .d2-1140000615 .background-color-AA4{background-color:#EDF0FD;} + .d2-1140000615 .background-color-AA5{background-color:#F7F8FE;} + .d2-1140000615 .background-color-AB4{background-color:#EDF0FD;} + .d2-1140000615 .background-color-AB5{background-color:#F7F8FE;} + .d2-1140000615 .color-N1{color:#0A0F25;} + .d2-1140000615 .color-N2{color:#676C7E;} + .d2-1140000615 .color-N3{color:#9499AB;} + .d2-1140000615 .color-N4{color:#CFD2DD;} + .d2-1140000615 .color-N5{color:#DEE1EB;} + .d2-1140000615 .color-N6{color:#EEF1F8;} + .d2-1140000615 .color-N7{color:#FFFFFF;} + .d2-1140000615 .color-B1{color:#0D32B2;} + .d2-1140000615 .color-B2{color:#0D32B2;} + .d2-1140000615 .color-B3{color:#E3E9FD;} + .d2-1140000615 .color-B4{color:#E3E9FD;} + .d2-1140000615 .color-B5{color:#EDF0FD;} + .d2-1140000615 .color-B6{color:#F7F8FE;} + .d2-1140000615 .color-AA2{color:#4A6FF3;} + .d2-1140000615 .color-AA4{color:#EDF0FD;} + .d2-1140000615 .color-AA5{color:#F7F8FE;} + .d2-1140000615 .color-AB4{color:#EDF0FD;} + .d2-1140000615 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1140000615);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1140000615);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1140000615);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1140000615);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1140000615);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1140000615);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1140000615);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1140000615);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1140000615);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1140000615);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1140000615);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1140000615);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1140000615);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1140000615);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1140000615);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1140000615);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1140000615);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1140000615);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ab04:20,11:20loop through each table start_time = datetime.datetime.now - - - - - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/sequence-note-escape-group/elk/board.exp.json b/e2etests/testdata/regression/sequence-note-escape-group/elk/board.exp.json index cca6bc022..e9e991e9e 100644 --- a/e2etests/testdata/regression/sequence-note-escape-group/elk/board.exp.json +++ b/e2etests/testdata/regression/sequence-note-escape-group/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -142,6 +153,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -184,6 +196,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -235,6 +248,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -273,6 +287,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -311,6 +326,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 247, @@ -342,6 +358,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/sequence-note-escape-group/elk/sketch.exp.svg b/e2etests/testdata/regression/sequence-note-escape-group/elk/sketch.exp.svg index c4d6a350a..abacdcd11 100644 --- a/e2etests/testdata/regression/sequence-note-escape-group/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/sequence-note-escape-group/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -ab04:20,11:20loop through each table start_time = datetime.datetime.now + .d2-1140000615 .fill-N1{fill:#0A0F25;} + .d2-1140000615 .fill-N2{fill:#676C7E;} + .d2-1140000615 .fill-N3{fill:#9499AB;} + .d2-1140000615 .fill-N4{fill:#CFD2DD;} + .d2-1140000615 .fill-N5{fill:#DEE1EB;} + .d2-1140000615 .fill-N6{fill:#EEF1F8;} + .d2-1140000615 .fill-N7{fill:#FFFFFF;} + .d2-1140000615 .fill-B1{fill:#0D32B2;} + .d2-1140000615 .fill-B2{fill:#0D32B2;} + .d2-1140000615 .fill-B3{fill:#E3E9FD;} + .d2-1140000615 .fill-B4{fill:#E3E9FD;} + .d2-1140000615 .fill-B5{fill:#EDF0FD;} + .d2-1140000615 .fill-B6{fill:#F7F8FE;} + .d2-1140000615 .fill-AA2{fill:#4A6FF3;} + .d2-1140000615 .fill-AA4{fill:#EDF0FD;} + .d2-1140000615 .fill-AA5{fill:#F7F8FE;} + .d2-1140000615 .fill-AB4{fill:#EDF0FD;} + .d2-1140000615 .fill-AB5{fill:#F7F8FE;} + .d2-1140000615 .stroke-N1{stroke:#0A0F25;} + .d2-1140000615 .stroke-N2{stroke:#676C7E;} + .d2-1140000615 .stroke-N3{stroke:#9499AB;} + .d2-1140000615 .stroke-N4{stroke:#CFD2DD;} + .d2-1140000615 .stroke-N5{stroke:#DEE1EB;} + .d2-1140000615 .stroke-N6{stroke:#EEF1F8;} + .d2-1140000615 .stroke-N7{stroke:#FFFFFF;} + .d2-1140000615 .stroke-B1{stroke:#0D32B2;} + .d2-1140000615 .stroke-B2{stroke:#0D32B2;} + .d2-1140000615 .stroke-B3{stroke:#E3E9FD;} + .d2-1140000615 .stroke-B4{stroke:#E3E9FD;} + .d2-1140000615 .stroke-B5{stroke:#EDF0FD;} + .d2-1140000615 .stroke-B6{stroke:#F7F8FE;} + .d2-1140000615 .stroke-AA2{stroke:#4A6FF3;} + .d2-1140000615 .stroke-AA4{stroke:#EDF0FD;} + .d2-1140000615 .stroke-AA5{stroke:#F7F8FE;} + .d2-1140000615 .stroke-AB4{stroke:#EDF0FD;} + .d2-1140000615 .stroke-AB5{stroke:#F7F8FE;} + .d2-1140000615 .background-color-N1{background-color:#0A0F25;} + .d2-1140000615 .background-color-N2{background-color:#676C7E;} + .d2-1140000615 .background-color-N3{background-color:#9499AB;} + .d2-1140000615 .background-color-N4{background-color:#CFD2DD;} + .d2-1140000615 .background-color-N5{background-color:#DEE1EB;} + .d2-1140000615 .background-color-N6{background-color:#EEF1F8;} + .d2-1140000615 .background-color-N7{background-color:#FFFFFF;} + .d2-1140000615 .background-color-B1{background-color:#0D32B2;} + .d2-1140000615 .background-color-B2{background-color:#0D32B2;} + .d2-1140000615 .background-color-B3{background-color:#E3E9FD;} + .d2-1140000615 .background-color-B4{background-color:#E3E9FD;} + .d2-1140000615 .background-color-B5{background-color:#EDF0FD;} + .d2-1140000615 .background-color-B6{background-color:#F7F8FE;} + .d2-1140000615 .background-color-AA2{background-color:#4A6FF3;} + .d2-1140000615 .background-color-AA4{background-color:#EDF0FD;} + .d2-1140000615 .background-color-AA5{background-color:#F7F8FE;} + .d2-1140000615 .background-color-AB4{background-color:#EDF0FD;} + .d2-1140000615 .background-color-AB5{background-color:#F7F8FE;} + .d2-1140000615 .color-N1{color:#0A0F25;} + .d2-1140000615 .color-N2{color:#676C7E;} + .d2-1140000615 .color-N3{color:#9499AB;} + .d2-1140000615 .color-N4{color:#CFD2DD;} + .d2-1140000615 .color-N5{color:#DEE1EB;} + .d2-1140000615 .color-N6{color:#EEF1F8;} + .d2-1140000615 .color-N7{color:#FFFFFF;} + .d2-1140000615 .color-B1{color:#0D32B2;} + .d2-1140000615 .color-B2{color:#0D32B2;} + .d2-1140000615 .color-B3{color:#E3E9FD;} + .d2-1140000615 .color-B4{color:#E3E9FD;} + .d2-1140000615 .color-B5{color:#EDF0FD;} + .d2-1140000615 .color-B6{color:#F7F8FE;} + .d2-1140000615 .color-AA2{color:#4A6FF3;} + .d2-1140000615 .color-AA4{color:#EDF0FD;} + .d2-1140000615 .color-AA5{color:#F7F8FE;} + .d2-1140000615 .color-AB4{color:#EDF0FD;} + .d2-1140000615 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1140000615);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1140000615);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1140000615);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1140000615);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1140000615);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1140000615);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1140000615);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1140000615);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1140000615);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1140000615);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1140000615);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1140000615);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1140000615);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1140000615);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1140000615);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1140000615);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1140000615);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1140000615);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ab04:20,11:20loop through each table start_time = datetime.datetime.now - - - - - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/sequence_diagram_name_crash/dagre/board.exp.json b/e2etests/testdata/regression/sequence_diagram_name_crash/dagre/board.exp.json index 10505fd6d..20dd809d9 100644 --- a/e2etests/testdata/regression/sequence_diagram_name_crash/dagre/board.exp.json +++ b/e2etests/testdata/regression/sequence_diagram_name_crash/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -274,6 +288,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -312,6 +327,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -350,6 +366,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 137, @@ -397,6 +414,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -435,6 +453,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -473,6 +492,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -511,6 +531,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -542,6 +563,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/sequence_diagram_name_crash/dagre/sketch.exp.svg b/e2etests/testdata/regression/sequence_diagram_name_crash/dagre/sketch.exp.svg index 494069b18..de386c904 100644 --- a/e2etests/testdata/regression/sequence_diagram_name_crash/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/sequence_diagram_name_crash/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -foofoobarabcd + .d2-2189751052 .fill-N1{fill:#0A0F25;} + .d2-2189751052 .fill-N2{fill:#676C7E;} + .d2-2189751052 .fill-N3{fill:#9499AB;} + .d2-2189751052 .fill-N4{fill:#CFD2DD;} + .d2-2189751052 .fill-N5{fill:#DEE1EB;} + .d2-2189751052 .fill-N6{fill:#EEF1F8;} + .d2-2189751052 .fill-N7{fill:#FFFFFF;} + .d2-2189751052 .fill-B1{fill:#0D32B2;} + .d2-2189751052 .fill-B2{fill:#0D32B2;} + .d2-2189751052 .fill-B3{fill:#E3E9FD;} + .d2-2189751052 .fill-B4{fill:#E3E9FD;} + .d2-2189751052 .fill-B5{fill:#EDF0FD;} + .d2-2189751052 .fill-B6{fill:#F7F8FE;} + .d2-2189751052 .fill-AA2{fill:#4A6FF3;} + .d2-2189751052 .fill-AA4{fill:#EDF0FD;} + .d2-2189751052 .fill-AA5{fill:#F7F8FE;} + .d2-2189751052 .fill-AB4{fill:#EDF0FD;} + .d2-2189751052 .fill-AB5{fill:#F7F8FE;} + .d2-2189751052 .stroke-N1{stroke:#0A0F25;} + .d2-2189751052 .stroke-N2{stroke:#676C7E;} + .d2-2189751052 .stroke-N3{stroke:#9499AB;} + .d2-2189751052 .stroke-N4{stroke:#CFD2DD;} + .d2-2189751052 .stroke-N5{stroke:#DEE1EB;} + .d2-2189751052 .stroke-N6{stroke:#EEF1F8;} + .d2-2189751052 .stroke-N7{stroke:#FFFFFF;} + .d2-2189751052 .stroke-B1{stroke:#0D32B2;} + .d2-2189751052 .stroke-B2{stroke:#0D32B2;} + .d2-2189751052 .stroke-B3{stroke:#E3E9FD;} + .d2-2189751052 .stroke-B4{stroke:#E3E9FD;} + .d2-2189751052 .stroke-B5{stroke:#EDF0FD;} + .d2-2189751052 .stroke-B6{stroke:#F7F8FE;} + .d2-2189751052 .stroke-AA2{stroke:#4A6FF3;} + .d2-2189751052 .stroke-AA4{stroke:#EDF0FD;} + .d2-2189751052 .stroke-AA5{stroke:#F7F8FE;} + .d2-2189751052 .stroke-AB4{stroke:#EDF0FD;} + .d2-2189751052 .stroke-AB5{stroke:#F7F8FE;} + .d2-2189751052 .background-color-N1{background-color:#0A0F25;} + .d2-2189751052 .background-color-N2{background-color:#676C7E;} + .d2-2189751052 .background-color-N3{background-color:#9499AB;} + .d2-2189751052 .background-color-N4{background-color:#CFD2DD;} + .d2-2189751052 .background-color-N5{background-color:#DEE1EB;} + .d2-2189751052 .background-color-N6{background-color:#EEF1F8;} + .d2-2189751052 .background-color-N7{background-color:#FFFFFF;} + .d2-2189751052 .background-color-B1{background-color:#0D32B2;} + .d2-2189751052 .background-color-B2{background-color:#0D32B2;} + .d2-2189751052 .background-color-B3{background-color:#E3E9FD;} + .d2-2189751052 .background-color-B4{background-color:#E3E9FD;} + .d2-2189751052 .background-color-B5{background-color:#EDF0FD;} + .d2-2189751052 .background-color-B6{background-color:#F7F8FE;} + .d2-2189751052 .background-color-AA2{background-color:#4A6FF3;} + .d2-2189751052 .background-color-AA4{background-color:#EDF0FD;} + .d2-2189751052 .background-color-AA5{background-color:#F7F8FE;} + .d2-2189751052 .background-color-AB4{background-color:#EDF0FD;} + .d2-2189751052 .background-color-AB5{background-color:#F7F8FE;} + .d2-2189751052 .color-N1{color:#0A0F25;} + .d2-2189751052 .color-N2{color:#676C7E;} + .d2-2189751052 .color-N3{color:#9499AB;} + .d2-2189751052 .color-N4{color:#CFD2DD;} + .d2-2189751052 .color-N5{color:#DEE1EB;} + .d2-2189751052 .color-N6{color:#EEF1F8;} + .d2-2189751052 .color-N7{color:#FFFFFF;} + .d2-2189751052 .color-B1{color:#0D32B2;} + .d2-2189751052 .color-B2{color:#0D32B2;} + .d2-2189751052 .color-B3{color:#E3E9FD;} + .d2-2189751052 .color-B4{color:#E3E9FD;} + .d2-2189751052 .color-B5{color:#EDF0FD;} + .d2-2189751052 .color-B6{color:#F7F8FE;} + .d2-2189751052 .color-AA2{color:#4A6FF3;} + .d2-2189751052 .color-AA4{color:#EDF0FD;} + .d2-2189751052 .color-AA5{color:#F7F8FE;} + .d2-2189751052 .color-AB4{color:#EDF0FD;} + .d2-2189751052 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2189751052);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2189751052);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2189751052);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2189751052);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2189751052);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2189751052);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2189751052);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2189751052);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2189751052);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2189751052);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2189751052);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2189751052);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2189751052);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2189751052);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2189751052);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2189751052);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2189751052);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2189751052);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>foofoobarabcd - - - - - - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/sequence_diagram_name_crash/elk/board.exp.json b/e2etests/testdata/regression/sequence_diagram_name_crash/elk/board.exp.json index 6ebbf66cb..0bf650a50 100644 --- a/e2etests/testdata/regression/sequence_diagram_name_crash/elk/board.exp.json +++ b/e2etests/testdata/regression/sequence_diagram_name_crash/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -274,6 +288,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 74, @@ -312,6 +327,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 74, @@ -350,6 +366,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 149, @@ -388,6 +405,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 74, @@ -426,6 +444,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 224, @@ -464,6 +483,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 74, @@ -502,6 +522,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 224, @@ -533,6 +554,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/sequence_diagram_name_crash/elk/sketch.exp.svg b/e2etests/testdata/regression/sequence_diagram_name_crash/elk/sketch.exp.svg index 81871c086..349a50b2a 100644 --- a/e2etests/testdata/regression/sequence_diagram_name_crash/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/sequence_diagram_name_crash/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -foofoobarabcd + .d2-3149695399 .fill-N1{fill:#0A0F25;} + .d2-3149695399 .fill-N2{fill:#676C7E;} + .d2-3149695399 .fill-N3{fill:#9499AB;} + .d2-3149695399 .fill-N4{fill:#CFD2DD;} + .d2-3149695399 .fill-N5{fill:#DEE1EB;} + .d2-3149695399 .fill-N6{fill:#EEF1F8;} + .d2-3149695399 .fill-N7{fill:#FFFFFF;} + .d2-3149695399 .fill-B1{fill:#0D32B2;} + .d2-3149695399 .fill-B2{fill:#0D32B2;} + .d2-3149695399 .fill-B3{fill:#E3E9FD;} + .d2-3149695399 .fill-B4{fill:#E3E9FD;} + .d2-3149695399 .fill-B5{fill:#EDF0FD;} + .d2-3149695399 .fill-B6{fill:#F7F8FE;} + .d2-3149695399 .fill-AA2{fill:#4A6FF3;} + .d2-3149695399 .fill-AA4{fill:#EDF0FD;} + .d2-3149695399 .fill-AA5{fill:#F7F8FE;} + .d2-3149695399 .fill-AB4{fill:#EDF0FD;} + .d2-3149695399 .fill-AB5{fill:#F7F8FE;} + .d2-3149695399 .stroke-N1{stroke:#0A0F25;} + .d2-3149695399 .stroke-N2{stroke:#676C7E;} + .d2-3149695399 .stroke-N3{stroke:#9499AB;} + .d2-3149695399 .stroke-N4{stroke:#CFD2DD;} + .d2-3149695399 .stroke-N5{stroke:#DEE1EB;} + .d2-3149695399 .stroke-N6{stroke:#EEF1F8;} + .d2-3149695399 .stroke-N7{stroke:#FFFFFF;} + .d2-3149695399 .stroke-B1{stroke:#0D32B2;} + .d2-3149695399 .stroke-B2{stroke:#0D32B2;} + .d2-3149695399 .stroke-B3{stroke:#E3E9FD;} + .d2-3149695399 .stroke-B4{stroke:#E3E9FD;} + .d2-3149695399 .stroke-B5{stroke:#EDF0FD;} + .d2-3149695399 .stroke-B6{stroke:#F7F8FE;} + .d2-3149695399 .stroke-AA2{stroke:#4A6FF3;} + .d2-3149695399 .stroke-AA4{stroke:#EDF0FD;} + .d2-3149695399 .stroke-AA5{stroke:#F7F8FE;} + .d2-3149695399 .stroke-AB4{stroke:#EDF0FD;} + .d2-3149695399 .stroke-AB5{stroke:#F7F8FE;} + .d2-3149695399 .background-color-N1{background-color:#0A0F25;} + .d2-3149695399 .background-color-N2{background-color:#676C7E;} + .d2-3149695399 .background-color-N3{background-color:#9499AB;} + .d2-3149695399 .background-color-N4{background-color:#CFD2DD;} + .d2-3149695399 .background-color-N5{background-color:#DEE1EB;} + .d2-3149695399 .background-color-N6{background-color:#EEF1F8;} + .d2-3149695399 .background-color-N7{background-color:#FFFFFF;} + .d2-3149695399 .background-color-B1{background-color:#0D32B2;} + .d2-3149695399 .background-color-B2{background-color:#0D32B2;} + .d2-3149695399 .background-color-B3{background-color:#E3E9FD;} + .d2-3149695399 .background-color-B4{background-color:#E3E9FD;} + .d2-3149695399 .background-color-B5{background-color:#EDF0FD;} + .d2-3149695399 .background-color-B6{background-color:#F7F8FE;} + .d2-3149695399 .background-color-AA2{background-color:#4A6FF3;} + .d2-3149695399 .background-color-AA4{background-color:#EDF0FD;} + .d2-3149695399 .background-color-AA5{background-color:#F7F8FE;} + .d2-3149695399 .background-color-AB4{background-color:#EDF0FD;} + .d2-3149695399 .background-color-AB5{background-color:#F7F8FE;} + .d2-3149695399 .color-N1{color:#0A0F25;} + .d2-3149695399 .color-N2{color:#676C7E;} + .d2-3149695399 .color-N3{color:#9499AB;} + .d2-3149695399 .color-N4{color:#CFD2DD;} + .d2-3149695399 .color-N5{color:#DEE1EB;} + .d2-3149695399 .color-N6{color:#EEF1F8;} + .d2-3149695399 .color-N7{color:#FFFFFF;} + .d2-3149695399 .color-B1{color:#0D32B2;} + .d2-3149695399 .color-B2{color:#0D32B2;} + .d2-3149695399 .color-B3{color:#E3E9FD;} + .d2-3149695399 .color-B4{color:#E3E9FD;} + .d2-3149695399 .color-B5{color:#EDF0FD;} + .d2-3149695399 .color-B6{color:#F7F8FE;} + .d2-3149695399 .color-AA2{color:#4A6FF3;} + .d2-3149695399 .color-AA4{color:#EDF0FD;} + .d2-3149695399 .color-AA5{color:#F7F8FE;} + .d2-3149695399 .color-AB4{color:#EDF0FD;} + .d2-3149695399 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3149695399);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3149695399);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3149695399);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3149695399);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3149695399);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3149695399);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3149695399);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3149695399);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3149695399);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3149695399);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3149695399);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3149695399);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3149695399);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3149695399);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3149695399);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3149695399);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3149695399);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3149695399);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>foofoobarabcd - - - - - - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/sequence_diagram_no_message/dagre/board.exp.json b/e2etests/testdata/regression/sequence_diagram_no_message/dagre/board.exp.json index 5e45e7529..907933628 100644 --- a/e2etests/testdata/regression/sequence_diagram_no_message/dagre/board.exp.json +++ b/e2etests/testdata/regression/sequence_diagram_no_message/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -110,6 +120,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -148,6 +159,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -179,6 +191,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/sequence_diagram_no_message/dagre/sketch.exp.svg b/e2etests/testdata/regression/sequence_diagram_no_message/dagre/sketch.exp.svg index ce6fb0e19..da7c380b8 100644 --- a/e2etests/testdata/regression/sequence_diagram_no_message/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/sequence_diagram_no_message/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -AB + .d2-1620952517 .fill-N1{fill:#0A0F25;} + .d2-1620952517 .fill-N2{fill:#676C7E;} + .d2-1620952517 .fill-N3{fill:#9499AB;} + .d2-1620952517 .fill-N4{fill:#CFD2DD;} + .d2-1620952517 .fill-N5{fill:#DEE1EB;} + .d2-1620952517 .fill-N6{fill:#EEF1F8;} + .d2-1620952517 .fill-N7{fill:#FFFFFF;} + .d2-1620952517 .fill-B1{fill:#0D32B2;} + .d2-1620952517 .fill-B2{fill:#0D32B2;} + .d2-1620952517 .fill-B3{fill:#E3E9FD;} + .d2-1620952517 .fill-B4{fill:#E3E9FD;} + .d2-1620952517 .fill-B5{fill:#EDF0FD;} + .d2-1620952517 .fill-B6{fill:#F7F8FE;} + .d2-1620952517 .fill-AA2{fill:#4A6FF3;} + .d2-1620952517 .fill-AA4{fill:#EDF0FD;} + .d2-1620952517 .fill-AA5{fill:#F7F8FE;} + .d2-1620952517 .fill-AB4{fill:#EDF0FD;} + .d2-1620952517 .fill-AB5{fill:#F7F8FE;} + .d2-1620952517 .stroke-N1{stroke:#0A0F25;} + .d2-1620952517 .stroke-N2{stroke:#676C7E;} + .d2-1620952517 .stroke-N3{stroke:#9499AB;} + .d2-1620952517 .stroke-N4{stroke:#CFD2DD;} + .d2-1620952517 .stroke-N5{stroke:#DEE1EB;} + .d2-1620952517 .stroke-N6{stroke:#EEF1F8;} + .d2-1620952517 .stroke-N7{stroke:#FFFFFF;} + .d2-1620952517 .stroke-B1{stroke:#0D32B2;} + .d2-1620952517 .stroke-B2{stroke:#0D32B2;} + .d2-1620952517 .stroke-B3{stroke:#E3E9FD;} + .d2-1620952517 .stroke-B4{stroke:#E3E9FD;} + .d2-1620952517 .stroke-B5{stroke:#EDF0FD;} + .d2-1620952517 .stroke-B6{stroke:#F7F8FE;} + .d2-1620952517 .stroke-AA2{stroke:#4A6FF3;} + .d2-1620952517 .stroke-AA4{stroke:#EDF0FD;} + .d2-1620952517 .stroke-AA5{stroke:#F7F8FE;} + .d2-1620952517 .stroke-AB4{stroke:#EDF0FD;} + .d2-1620952517 .stroke-AB5{stroke:#F7F8FE;} + .d2-1620952517 .background-color-N1{background-color:#0A0F25;} + .d2-1620952517 .background-color-N2{background-color:#676C7E;} + .d2-1620952517 .background-color-N3{background-color:#9499AB;} + .d2-1620952517 .background-color-N4{background-color:#CFD2DD;} + .d2-1620952517 .background-color-N5{background-color:#DEE1EB;} + .d2-1620952517 .background-color-N6{background-color:#EEF1F8;} + .d2-1620952517 .background-color-N7{background-color:#FFFFFF;} + .d2-1620952517 .background-color-B1{background-color:#0D32B2;} + .d2-1620952517 .background-color-B2{background-color:#0D32B2;} + .d2-1620952517 .background-color-B3{background-color:#E3E9FD;} + .d2-1620952517 .background-color-B4{background-color:#E3E9FD;} + .d2-1620952517 .background-color-B5{background-color:#EDF0FD;} + .d2-1620952517 .background-color-B6{background-color:#F7F8FE;} + .d2-1620952517 .background-color-AA2{background-color:#4A6FF3;} + .d2-1620952517 .background-color-AA4{background-color:#EDF0FD;} + .d2-1620952517 .background-color-AA5{background-color:#F7F8FE;} + .d2-1620952517 .background-color-AB4{background-color:#EDF0FD;} + .d2-1620952517 .background-color-AB5{background-color:#F7F8FE;} + .d2-1620952517 .color-N1{color:#0A0F25;} + .d2-1620952517 .color-N2{color:#676C7E;} + .d2-1620952517 .color-N3{color:#9499AB;} + .d2-1620952517 .color-N4{color:#CFD2DD;} + .d2-1620952517 .color-N5{color:#DEE1EB;} + .d2-1620952517 .color-N6{color:#EEF1F8;} + .d2-1620952517 .color-N7{color:#FFFFFF;} + .d2-1620952517 .color-B1{color:#0D32B2;} + .d2-1620952517 .color-B2{color:#0D32B2;} + .d2-1620952517 .color-B3{color:#E3E9FD;} + .d2-1620952517 .color-B4{color:#E3E9FD;} + .d2-1620952517 .color-B5{color:#EDF0FD;} + .d2-1620952517 .color-B6{color:#F7F8FE;} + .d2-1620952517 .color-AA2{color:#4A6FF3;} + .d2-1620952517 .color-AA4{color:#EDF0FD;} + .d2-1620952517 .color-AA5{color:#F7F8FE;} + .d2-1620952517 .color-AB4{color:#EDF0FD;} + .d2-1620952517 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1620952517);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1620952517);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1620952517);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1620952517);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1620952517);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1620952517);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1620952517);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1620952517);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1620952517);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1620952517);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1620952517);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1620952517);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1620952517);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1620952517);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1620952517);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1620952517);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1620952517);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1620952517);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>AB - - + + \ No newline at end of file diff --git a/e2etests/testdata/regression/sequence_diagram_no_message/elk/board.exp.json b/e2etests/testdata/regression/sequence_diagram_no_message/elk/board.exp.json index 5e45e7529..907933628 100644 --- a/e2etests/testdata/regression/sequence_diagram_no_message/elk/board.exp.json +++ b/e2etests/testdata/regression/sequence_diagram_no_message/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -110,6 +120,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -148,6 +159,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -179,6 +191,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/sequence_diagram_no_message/elk/sketch.exp.svg b/e2etests/testdata/regression/sequence_diagram_no_message/elk/sketch.exp.svg index ce6fb0e19..da7c380b8 100644 --- a/e2etests/testdata/regression/sequence_diagram_no_message/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/sequence_diagram_no_message/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -AB + .d2-1620952517 .fill-N1{fill:#0A0F25;} + .d2-1620952517 .fill-N2{fill:#676C7E;} + .d2-1620952517 .fill-N3{fill:#9499AB;} + .d2-1620952517 .fill-N4{fill:#CFD2DD;} + .d2-1620952517 .fill-N5{fill:#DEE1EB;} + .d2-1620952517 .fill-N6{fill:#EEF1F8;} + .d2-1620952517 .fill-N7{fill:#FFFFFF;} + .d2-1620952517 .fill-B1{fill:#0D32B2;} + .d2-1620952517 .fill-B2{fill:#0D32B2;} + .d2-1620952517 .fill-B3{fill:#E3E9FD;} + .d2-1620952517 .fill-B4{fill:#E3E9FD;} + .d2-1620952517 .fill-B5{fill:#EDF0FD;} + .d2-1620952517 .fill-B6{fill:#F7F8FE;} + .d2-1620952517 .fill-AA2{fill:#4A6FF3;} + .d2-1620952517 .fill-AA4{fill:#EDF0FD;} + .d2-1620952517 .fill-AA5{fill:#F7F8FE;} + .d2-1620952517 .fill-AB4{fill:#EDF0FD;} + .d2-1620952517 .fill-AB5{fill:#F7F8FE;} + .d2-1620952517 .stroke-N1{stroke:#0A0F25;} + .d2-1620952517 .stroke-N2{stroke:#676C7E;} + .d2-1620952517 .stroke-N3{stroke:#9499AB;} + .d2-1620952517 .stroke-N4{stroke:#CFD2DD;} + .d2-1620952517 .stroke-N5{stroke:#DEE1EB;} + .d2-1620952517 .stroke-N6{stroke:#EEF1F8;} + .d2-1620952517 .stroke-N7{stroke:#FFFFFF;} + .d2-1620952517 .stroke-B1{stroke:#0D32B2;} + .d2-1620952517 .stroke-B2{stroke:#0D32B2;} + .d2-1620952517 .stroke-B3{stroke:#E3E9FD;} + .d2-1620952517 .stroke-B4{stroke:#E3E9FD;} + .d2-1620952517 .stroke-B5{stroke:#EDF0FD;} + .d2-1620952517 .stroke-B6{stroke:#F7F8FE;} + .d2-1620952517 .stroke-AA2{stroke:#4A6FF3;} + .d2-1620952517 .stroke-AA4{stroke:#EDF0FD;} + .d2-1620952517 .stroke-AA5{stroke:#F7F8FE;} + .d2-1620952517 .stroke-AB4{stroke:#EDF0FD;} + .d2-1620952517 .stroke-AB5{stroke:#F7F8FE;} + .d2-1620952517 .background-color-N1{background-color:#0A0F25;} + .d2-1620952517 .background-color-N2{background-color:#676C7E;} + .d2-1620952517 .background-color-N3{background-color:#9499AB;} + .d2-1620952517 .background-color-N4{background-color:#CFD2DD;} + .d2-1620952517 .background-color-N5{background-color:#DEE1EB;} + .d2-1620952517 .background-color-N6{background-color:#EEF1F8;} + .d2-1620952517 .background-color-N7{background-color:#FFFFFF;} + .d2-1620952517 .background-color-B1{background-color:#0D32B2;} + .d2-1620952517 .background-color-B2{background-color:#0D32B2;} + .d2-1620952517 .background-color-B3{background-color:#E3E9FD;} + .d2-1620952517 .background-color-B4{background-color:#E3E9FD;} + .d2-1620952517 .background-color-B5{background-color:#EDF0FD;} + .d2-1620952517 .background-color-B6{background-color:#F7F8FE;} + .d2-1620952517 .background-color-AA2{background-color:#4A6FF3;} + .d2-1620952517 .background-color-AA4{background-color:#EDF0FD;} + .d2-1620952517 .background-color-AA5{background-color:#F7F8FE;} + .d2-1620952517 .background-color-AB4{background-color:#EDF0FD;} + .d2-1620952517 .background-color-AB5{background-color:#F7F8FE;} + .d2-1620952517 .color-N1{color:#0A0F25;} + .d2-1620952517 .color-N2{color:#676C7E;} + .d2-1620952517 .color-N3{color:#9499AB;} + .d2-1620952517 .color-N4{color:#CFD2DD;} + .d2-1620952517 .color-N5{color:#DEE1EB;} + .d2-1620952517 .color-N6{color:#EEF1F8;} + .d2-1620952517 .color-N7{color:#FFFFFF;} + .d2-1620952517 .color-B1{color:#0D32B2;} + .d2-1620952517 .color-B2{color:#0D32B2;} + .d2-1620952517 .color-B3{color:#E3E9FD;} + .d2-1620952517 .color-B4{color:#E3E9FD;} + .d2-1620952517 .color-B5{color:#EDF0FD;} + .d2-1620952517 .color-B6{color:#F7F8FE;} + .d2-1620952517 .color-AA2{color:#4A6FF3;} + .d2-1620952517 .color-AA4{color:#EDF0FD;} + .d2-1620952517 .color-AA5{color:#F7F8FE;} + .d2-1620952517 .color-AB4{color:#EDF0FD;} + .d2-1620952517 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1620952517);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1620952517);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1620952517);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1620952517);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1620952517);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1620952517);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1620952517);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1620952517);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1620952517);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1620952517);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1620952517);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1620952517);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1620952517);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1620952517);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1620952517);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1620952517);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1620952517);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1620952517);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>AB - - + + \ No newline at end of file diff --git a/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/dagre/board.exp.json b/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/dagre/board.exp.json index e14feb56f..4ebca3c00 100644 --- a/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/dagre/board.exp.json +++ b/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -183,6 +195,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -225,6 +238,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -267,6 +281,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -307,6 +322,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -349,6 +365,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -391,6 +408,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -433,6 +451,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -475,6 +494,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -517,6 +537,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -559,6 +580,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -601,6 +623,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -653,6 +676,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -699,6 +723,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -737,6 +762,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -783,6 +809,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -821,6 +848,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -867,6 +895,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -913,6 +942,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -951,6 +981,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -997,6 +1028,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -1043,6 +1075,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -1089,6 +1122,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -1135,6 +1169,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -1181,6 +1216,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -1219,6 +1255,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 362, @@ -1265,6 +1302,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -1303,6 +1341,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 362, @@ -1349,6 +1388,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -1387,6 +1427,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -1425,6 +1466,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -1463,6 +1505,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 362, @@ -1494,6 +1537,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/dagre/sketch.exp.svg b/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/dagre/sketch.exp.svg index 9018a333b..8d4c52d52 100644 --- a/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -ABCgroup 1group 2group 3group 4group 5group 6group 7group 8group 9group 10group 11 + .d2-2964612649 .fill-N1{fill:#0A0F25;} + .d2-2964612649 .fill-N2{fill:#676C7E;} + .d2-2964612649 .fill-N3{fill:#9499AB;} + .d2-2964612649 .fill-N4{fill:#CFD2DD;} + .d2-2964612649 .fill-N5{fill:#DEE1EB;} + .d2-2964612649 .fill-N6{fill:#EEF1F8;} + .d2-2964612649 .fill-N7{fill:#FFFFFF;} + .d2-2964612649 .fill-B1{fill:#0D32B2;} + .d2-2964612649 .fill-B2{fill:#0D32B2;} + .d2-2964612649 .fill-B3{fill:#E3E9FD;} + .d2-2964612649 .fill-B4{fill:#E3E9FD;} + .d2-2964612649 .fill-B5{fill:#EDF0FD;} + .d2-2964612649 .fill-B6{fill:#F7F8FE;} + .d2-2964612649 .fill-AA2{fill:#4A6FF3;} + .d2-2964612649 .fill-AA4{fill:#EDF0FD;} + .d2-2964612649 .fill-AA5{fill:#F7F8FE;} + .d2-2964612649 .fill-AB4{fill:#EDF0FD;} + .d2-2964612649 .fill-AB5{fill:#F7F8FE;} + .d2-2964612649 .stroke-N1{stroke:#0A0F25;} + .d2-2964612649 .stroke-N2{stroke:#676C7E;} + .d2-2964612649 .stroke-N3{stroke:#9499AB;} + .d2-2964612649 .stroke-N4{stroke:#CFD2DD;} + .d2-2964612649 .stroke-N5{stroke:#DEE1EB;} + .d2-2964612649 .stroke-N6{stroke:#EEF1F8;} + .d2-2964612649 .stroke-N7{stroke:#FFFFFF;} + .d2-2964612649 .stroke-B1{stroke:#0D32B2;} + .d2-2964612649 .stroke-B2{stroke:#0D32B2;} + .d2-2964612649 .stroke-B3{stroke:#E3E9FD;} + .d2-2964612649 .stroke-B4{stroke:#E3E9FD;} + .d2-2964612649 .stroke-B5{stroke:#EDF0FD;} + .d2-2964612649 .stroke-B6{stroke:#F7F8FE;} + .d2-2964612649 .stroke-AA2{stroke:#4A6FF3;} + .d2-2964612649 .stroke-AA4{stroke:#EDF0FD;} + .d2-2964612649 .stroke-AA5{stroke:#F7F8FE;} + .d2-2964612649 .stroke-AB4{stroke:#EDF0FD;} + .d2-2964612649 .stroke-AB5{stroke:#F7F8FE;} + .d2-2964612649 .background-color-N1{background-color:#0A0F25;} + .d2-2964612649 .background-color-N2{background-color:#676C7E;} + .d2-2964612649 .background-color-N3{background-color:#9499AB;} + .d2-2964612649 .background-color-N4{background-color:#CFD2DD;} + .d2-2964612649 .background-color-N5{background-color:#DEE1EB;} + .d2-2964612649 .background-color-N6{background-color:#EEF1F8;} + .d2-2964612649 .background-color-N7{background-color:#FFFFFF;} + .d2-2964612649 .background-color-B1{background-color:#0D32B2;} + .d2-2964612649 .background-color-B2{background-color:#0D32B2;} + .d2-2964612649 .background-color-B3{background-color:#E3E9FD;} + .d2-2964612649 .background-color-B4{background-color:#E3E9FD;} + .d2-2964612649 .background-color-B5{background-color:#EDF0FD;} + .d2-2964612649 .background-color-B6{background-color:#F7F8FE;} + .d2-2964612649 .background-color-AA2{background-color:#4A6FF3;} + .d2-2964612649 .background-color-AA4{background-color:#EDF0FD;} + .d2-2964612649 .background-color-AA5{background-color:#F7F8FE;} + .d2-2964612649 .background-color-AB4{background-color:#EDF0FD;} + .d2-2964612649 .background-color-AB5{background-color:#F7F8FE;} + .d2-2964612649 .color-N1{color:#0A0F25;} + .d2-2964612649 .color-N2{color:#676C7E;} + .d2-2964612649 .color-N3{color:#9499AB;} + .d2-2964612649 .color-N4{color:#CFD2DD;} + .d2-2964612649 .color-N5{color:#DEE1EB;} + .d2-2964612649 .color-N6{color:#EEF1F8;} + .d2-2964612649 .color-N7{color:#FFFFFF;} + .d2-2964612649 .color-B1{color:#0D32B2;} + .d2-2964612649 .color-B2{color:#0D32B2;} + .d2-2964612649 .color-B3{color:#E3E9FD;} + .d2-2964612649 .color-B4{color:#E3E9FD;} + .d2-2964612649 .color-B5{color:#EDF0FD;} + .d2-2964612649 .color-B6{color:#F7F8FE;} + .d2-2964612649 .color-AA2{color:#4A6FF3;} + .d2-2964612649 .color-AA4{color:#EDF0FD;} + .d2-2964612649 .color-AA5{color:#F7F8FE;} + .d2-2964612649 .color-AB4{color:#EDF0FD;} + .d2-2964612649 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2964612649);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2964612649);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2964612649);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2964612649);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2964612649);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2964612649);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2964612649);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2964612649);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2964612649);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2964612649);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2964612649);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2964612649);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2964612649);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2964612649);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2964612649);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2964612649);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2964612649);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2964612649);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ABCgroup 1group 2group 3group 4group 5group 6group 7group 8group 9group 10group 11 - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/elk/board.exp.json b/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/elk/board.exp.json index e14feb56f..4ebca3c00 100644 --- a/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/elk/board.exp.json +++ b/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -183,6 +195,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -225,6 +238,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -267,6 +281,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -307,6 +322,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -349,6 +365,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -391,6 +408,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -433,6 +451,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -475,6 +494,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -517,6 +537,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -559,6 +580,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -601,6 +623,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -653,6 +676,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -699,6 +723,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -737,6 +762,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -783,6 +809,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -821,6 +848,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -867,6 +895,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -913,6 +942,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -951,6 +981,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -997,6 +1028,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -1043,6 +1075,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -1089,6 +1122,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -1135,6 +1169,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -1181,6 +1216,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -1219,6 +1255,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 362, @@ -1265,6 +1302,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -1303,6 +1341,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 362, @@ -1349,6 +1388,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -1387,6 +1427,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -1425,6 +1466,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -1463,6 +1505,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 362, @@ -1494,6 +1537,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/elk/sketch.exp.svg b/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/elk/sketch.exp.svg index 9018a333b..8d4c52d52 100644 --- a/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -ABCgroup 1group 2group 3group 4group 5group 6group 7group 8group 9group 10group 11 + .d2-2964612649 .fill-N1{fill:#0A0F25;} + .d2-2964612649 .fill-N2{fill:#676C7E;} + .d2-2964612649 .fill-N3{fill:#9499AB;} + .d2-2964612649 .fill-N4{fill:#CFD2DD;} + .d2-2964612649 .fill-N5{fill:#DEE1EB;} + .d2-2964612649 .fill-N6{fill:#EEF1F8;} + .d2-2964612649 .fill-N7{fill:#FFFFFF;} + .d2-2964612649 .fill-B1{fill:#0D32B2;} + .d2-2964612649 .fill-B2{fill:#0D32B2;} + .d2-2964612649 .fill-B3{fill:#E3E9FD;} + .d2-2964612649 .fill-B4{fill:#E3E9FD;} + .d2-2964612649 .fill-B5{fill:#EDF0FD;} + .d2-2964612649 .fill-B6{fill:#F7F8FE;} + .d2-2964612649 .fill-AA2{fill:#4A6FF3;} + .d2-2964612649 .fill-AA4{fill:#EDF0FD;} + .d2-2964612649 .fill-AA5{fill:#F7F8FE;} + .d2-2964612649 .fill-AB4{fill:#EDF0FD;} + .d2-2964612649 .fill-AB5{fill:#F7F8FE;} + .d2-2964612649 .stroke-N1{stroke:#0A0F25;} + .d2-2964612649 .stroke-N2{stroke:#676C7E;} + .d2-2964612649 .stroke-N3{stroke:#9499AB;} + .d2-2964612649 .stroke-N4{stroke:#CFD2DD;} + .d2-2964612649 .stroke-N5{stroke:#DEE1EB;} + .d2-2964612649 .stroke-N6{stroke:#EEF1F8;} + .d2-2964612649 .stroke-N7{stroke:#FFFFFF;} + .d2-2964612649 .stroke-B1{stroke:#0D32B2;} + .d2-2964612649 .stroke-B2{stroke:#0D32B2;} + .d2-2964612649 .stroke-B3{stroke:#E3E9FD;} + .d2-2964612649 .stroke-B4{stroke:#E3E9FD;} + .d2-2964612649 .stroke-B5{stroke:#EDF0FD;} + .d2-2964612649 .stroke-B6{stroke:#F7F8FE;} + .d2-2964612649 .stroke-AA2{stroke:#4A6FF3;} + .d2-2964612649 .stroke-AA4{stroke:#EDF0FD;} + .d2-2964612649 .stroke-AA5{stroke:#F7F8FE;} + .d2-2964612649 .stroke-AB4{stroke:#EDF0FD;} + .d2-2964612649 .stroke-AB5{stroke:#F7F8FE;} + .d2-2964612649 .background-color-N1{background-color:#0A0F25;} + .d2-2964612649 .background-color-N2{background-color:#676C7E;} + .d2-2964612649 .background-color-N3{background-color:#9499AB;} + .d2-2964612649 .background-color-N4{background-color:#CFD2DD;} + .d2-2964612649 .background-color-N5{background-color:#DEE1EB;} + .d2-2964612649 .background-color-N6{background-color:#EEF1F8;} + .d2-2964612649 .background-color-N7{background-color:#FFFFFF;} + .d2-2964612649 .background-color-B1{background-color:#0D32B2;} + .d2-2964612649 .background-color-B2{background-color:#0D32B2;} + .d2-2964612649 .background-color-B3{background-color:#E3E9FD;} + .d2-2964612649 .background-color-B4{background-color:#E3E9FD;} + .d2-2964612649 .background-color-B5{background-color:#EDF0FD;} + .d2-2964612649 .background-color-B6{background-color:#F7F8FE;} + .d2-2964612649 .background-color-AA2{background-color:#4A6FF3;} + .d2-2964612649 .background-color-AA4{background-color:#EDF0FD;} + .d2-2964612649 .background-color-AA5{background-color:#F7F8FE;} + .d2-2964612649 .background-color-AB4{background-color:#EDF0FD;} + .d2-2964612649 .background-color-AB5{background-color:#F7F8FE;} + .d2-2964612649 .color-N1{color:#0A0F25;} + .d2-2964612649 .color-N2{color:#676C7E;} + .d2-2964612649 .color-N3{color:#9499AB;} + .d2-2964612649 .color-N4{color:#CFD2DD;} + .d2-2964612649 .color-N5{color:#DEE1EB;} + .d2-2964612649 .color-N6{color:#EEF1F8;} + .d2-2964612649 .color-N7{color:#FFFFFF;} + .d2-2964612649 .color-B1{color:#0D32B2;} + .d2-2964612649 .color-B2{color:#0D32B2;} + .d2-2964612649 .color-B3{color:#E3E9FD;} + .d2-2964612649 .color-B4{color:#E3E9FD;} + .d2-2964612649 .color-B5{color:#EDF0FD;} + .d2-2964612649 .color-B6{color:#F7F8FE;} + .d2-2964612649 .color-AA2{color:#4A6FF3;} + .d2-2964612649 .color-AA4{color:#EDF0FD;} + .d2-2964612649 .color-AA5{color:#F7F8FE;} + .d2-2964612649 .color-AB4{color:#EDF0FD;} + .d2-2964612649 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2964612649);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2964612649);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2964612649);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2964612649);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2964612649);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2964612649);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2964612649);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2964612649);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2964612649);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2964612649);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2964612649);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2964612649);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2964612649);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2964612649);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2964612649);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2964612649);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2964612649);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2964612649);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ABCgroup 1group 2group 3group 4group 5group 6group 7group 8group 9group 10group 11 - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/sequence_diagram_span_cover/dagre/board.exp.json b/e2etests/testdata/regression/sequence_diagram_span_cover/dagre/board.exp.json index 8a164ee41..c607e1b7b 100644 --- a/e2etests/testdata/regression/sequence_diagram_span_cover/dagre/board.exp.json +++ b/e2etests/testdata/regression/sequence_diagram_span_cover/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -109,6 +119,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -155,6 +166,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -201,6 +213,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -232,6 +245,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/sequence_diagram_span_cover/dagre/sketch.exp.svg b/e2etests/testdata/regression/sequence_diagram_span_cover/dagre/sketch.exp.svg index 3163c0a1f..c482f363e 100644 --- a/e2etests/testdata/regression/sequence_diagram_span_cover/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/sequence_diagram_span_cover/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -b + .d2-2379520263 .fill-N1{fill:#0A0F25;} + .d2-2379520263 .fill-N2{fill:#676C7E;} + .d2-2379520263 .fill-N3{fill:#9499AB;} + .d2-2379520263 .fill-N4{fill:#CFD2DD;} + .d2-2379520263 .fill-N5{fill:#DEE1EB;} + .d2-2379520263 .fill-N6{fill:#EEF1F8;} + .d2-2379520263 .fill-N7{fill:#FFFFFF;} + .d2-2379520263 .fill-B1{fill:#0D32B2;} + .d2-2379520263 .fill-B2{fill:#0D32B2;} + .d2-2379520263 .fill-B3{fill:#E3E9FD;} + .d2-2379520263 .fill-B4{fill:#E3E9FD;} + .d2-2379520263 .fill-B5{fill:#EDF0FD;} + .d2-2379520263 .fill-B6{fill:#F7F8FE;} + .d2-2379520263 .fill-AA2{fill:#4A6FF3;} + .d2-2379520263 .fill-AA4{fill:#EDF0FD;} + .d2-2379520263 .fill-AA5{fill:#F7F8FE;} + .d2-2379520263 .fill-AB4{fill:#EDF0FD;} + .d2-2379520263 .fill-AB5{fill:#F7F8FE;} + .d2-2379520263 .stroke-N1{stroke:#0A0F25;} + .d2-2379520263 .stroke-N2{stroke:#676C7E;} + .d2-2379520263 .stroke-N3{stroke:#9499AB;} + .d2-2379520263 .stroke-N4{stroke:#CFD2DD;} + .d2-2379520263 .stroke-N5{stroke:#DEE1EB;} + .d2-2379520263 .stroke-N6{stroke:#EEF1F8;} + .d2-2379520263 .stroke-N7{stroke:#FFFFFF;} + .d2-2379520263 .stroke-B1{stroke:#0D32B2;} + .d2-2379520263 .stroke-B2{stroke:#0D32B2;} + .d2-2379520263 .stroke-B3{stroke:#E3E9FD;} + .d2-2379520263 .stroke-B4{stroke:#E3E9FD;} + .d2-2379520263 .stroke-B5{stroke:#EDF0FD;} + .d2-2379520263 .stroke-B6{stroke:#F7F8FE;} + .d2-2379520263 .stroke-AA2{stroke:#4A6FF3;} + .d2-2379520263 .stroke-AA4{stroke:#EDF0FD;} + .d2-2379520263 .stroke-AA5{stroke:#F7F8FE;} + .d2-2379520263 .stroke-AB4{stroke:#EDF0FD;} + .d2-2379520263 .stroke-AB5{stroke:#F7F8FE;} + .d2-2379520263 .background-color-N1{background-color:#0A0F25;} + .d2-2379520263 .background-color-N2{background-color:#676C7E;} + .d2-2379520263 .background-color-N3{background-color:#9499AB;} + .d2-2379520263 .background-color-N4{background-color:#CFD2DD;} + .d2-2379520263 .background-color-N5{background-color:#DEE1EB;} + .d2-2379520263 .background-color-N6{background-color:#EEF1F8;} + .d2-2379520263 .background-color-N7{background-color:#FFFFFF;} + .d2-2379520263 .background-color-B1{background-color:#0D32B2;} + .d2-2379520263 .background-color-B2{background-color:#0D32B2;} + .d2-2379520263 .background-color-B3{background-color:#E3E9FD;} + .d2-2379520263 .background-color-B4{background-color:#E3E9FD;} + .d2-2379520263 .background-color-B5{background-color:#EDF0FD;} + .d2-2379520263 .background-color-B6{background-color:#F7F8FE;} + .d2-2379520263 .background-color-AA2{background-color:#4A6FF3;} + .d2-2379520263 .background-color-AA4{background-color:#EDF0FD;} + .d2-2379520263 .background-color-AA5{background-color:#F7F8FE;} + .d2-2379520263 .background-color-AB4{background-color:#EDF0FD;} + .d2-2379520263 .background-color-AB5{background-color:#F7F8FE;} + .d2-2379520263 .color-N1{color:#0A0F25;} + .d2-2379520263 .color-N2{color:#676C7E;} + .d2-2379520263 .color-N3{color:#9499AB;} + .d2-2379520263 .color-N4{color:#CFD2DD;} + .d2-2379520263 .color-N5{color:#DEE1EB;} + .d2-2379520263 .color-N6{color:#EEF1F8;} + .d2-2379520263 .color-N7{color:#FFFFFF;} + .d2-2379520263 .color-B1{color:#0D32B2;} + .d2-2379520263 .color-B2{color:#0D32B2;} + .d2-2379520263 .color-B3{color:#E3E9FD;} + .d2-2379520263 .color-B4{color:#E3E9FD;} + .d2-2379520263 .color-B5{color:#EDF0FD;} + .d2-2379520263 .color-B6{color:#F7F8FE;} + .d2-2379520263 .color-AA2{color:#4A6FF3;} + .d2-2379520263 .color-AA4{color:#EDF0FD;} + .d2-2379520263 .color-AA5{color:#F7F8FE;} + .d2-2379520263 .color-AB4{color:#EDF0FD;} + .d2-2379520263 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2379520263);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2379520263);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2379520263);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2379520263);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2379520263);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2379520263);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2379520263);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2379520263);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2379520263);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2379520263);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2379520263);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2379520263);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2379520263);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2379520263);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2379520263);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2379520263);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2379520263);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2379520263);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>b - + \ No newline at end of file diff --git a/e2etests/testdata/regression/sequence_diagram_span_cover/elk/board.exp.json b/e2etests/testdata/regression/sequence_diagram_span_cover/elk/board.exp.json index 8a164ee41..c607e1b7b 100644 --- a/e2etests/testdata/regression/sequence_diagram_span_cover/elk/board.exp.json +++ b/e2etests/testdata/regression/sequence_diagram_span_cover/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -109,6 +119,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -155,6 +166,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -201,6 +213,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -232,6 +245,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/sequence_diagram_span_cover/elk/sketch.exp.svg b/e2etests/testdata/regression/sequence_diagram_span_cover/elk/sketch.exp.svg index 3163c0a1f..c482f363e 100644 --- a/e2etests/testdata/regression/sequence_diagram_span_cover/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/sequence_diagram_span_cover/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -b + .d2-2379520263 .fill-N1{fill:#0A0F25;} + .d2-2379520263 .fill-N2{fill:#676C7E;} + .d2-2379520263 .fill-N3{fill:#9499AB;} + .d2-2379520263 .fill-N4{fill:#CFD2DD;} + .d2-2379520263 .fill-N5{fill:#DEE1EB;} + .d2-2379520263 .fill-N6{fill:#EEF1F8;} + .d2-2379520263 .fill-N7{fill:#FFFFFF;} + .d2-2379520263 .fill-B1{fill:#0D32B2;} + .d2-2379520263 .fill-B2{fill:#0D32B2;} + .d2-2379520263 .fill-B3{fill:#E3E9FD;} + .d2-2379520263 .fill-B4{fill:#E3E9FD;} + .d2-2379520263 .fill-B5{fill:#EDF0FD;} + .d2-2379520263 .fill-B6{fill:#F7F8FE;} + .d2-2379520263 .fill-AA2{fill:#4A6FF3;} + .d2-2379520263 .fill-AA4{fill:#EDF0FD;} + .d2-2379520263 .fill-AA5{fill:#F7F8FE;} + .d2-2379520263 .fill-AB4{fill:#EDF0FD;} + .d2-2379520263 .fill-AB5{fill:#F7F8FE;} + .d2-2379520263 .stroke-N1{stroke:#0A0F25;} + .d2-2379520263 .stroke-N2{stroke:#676C7E;} + .d2-2379520263 .stroke-N3{stroke:#9499AB;} + .d2-2379520263 .stroke-N4{stroke:#CFD2DD;} + .d2-2379520263 .stroke-N5{stroke:#DEE1EB;} + .d2-2379520263 .stroke-N6{stroke:#EEF1F8;} + .d2-2379520263 .stroke-N7{stroke:#FFFFFF;} + .d2-2379520263 .stroke-B1{stroke:#0D32B2;} + .d2-2379520263 .stroke-B2{stroke:#0D32B2;} + .d2-2379520263 .stroke-B3{stroke:#E3E9FD;} + .d2-2379520263 .stroke-B4{stroke:#E3E9FD;} + .d2-2379520263 .stroke-B5{stroke:#EDF0FD;} + .d2-2379520263 .stroke-B6{stroke:#F7F8FE;} + .d2-2379520263 .stroke-AA2{stroke:#4A6FF3;} + .d2-2379520263 .stroke-AA4{stroke:#EDF0FD;} + .d2-2379520263 .stroke-AA5{stroke:#F7F8FE;} + .d2-2379520263 .stroke-AB4{stroke:#EDF0FD;} + .d2-2379520263 .stroke-AB5{stroke:#F7F8FE;} + .d2-2379520263 .background-color-N1{background-color:#0A0F25;} + .d2-2379520263 .background-color-N2{background-color:#676C7E;} + .d2-2379520263 .background-color-N3{background-color:#9499AB;} + .d2-2379520263 .background-color-N4{background-color:#CFD2DD;} + .d2-2379520263 .background-color-N5{background-color:#DEE1EB;} + .d2-2379520263 .background-color-N6{background-color:#EEF1F8;} + .d2-2379520263 .background-color-N7{background-color:#FFFFFF;} + .d2-2379520263 .background-color-B1{background-color:#0D32B2;} + .d2-2379520263 .background-color-B2{background-color:#0D32B2;} + .d2-2379520263 .background-color-B3{background-color:#E3E9FD;} + .d2-2379520263 .background-color-B4{background-color:#E3E9FD;} + .d2-2379520263 .background-color-B5{background-color:#EDF0FD;} + .d2-2379520263 .background-color-B6{background-color:#F7F8FE;} + .d2-2379520263 .background-color-AA2{background-color:#4A6FF3;} + .d2-2379520263 .background-color-AA4{background-color:#EDF0FD;} + .d2-2379520263 .background-color-AA5{background-color:#F7F8FE;} + .d2-2379520263 .background-color-AB4{background-color:#EDF0FD;} + .d2-2379520263 .background-color-AB5{background-color:#F7F8FE;} + .d2-2379520263 .color-N1{color:#0A0F25;} + .d2-2379520263 .color-N2{color:#676C7E;} + .d2-2379520263 .color-N3{color:#9499AB;} + .d2-2379520263 .color-N4{color:#CFD2DD;} + .d2-2379520263 .color-N5{color:#DEE1EB;} + .d2-2379520263 .color-N6{color:#EEF1F8;} + .d2-2379520263 .color-N7{color:#FFFFFF;} + .d2-2379520263 .color-B1{color:#0D32B2;} + .d2-2379520263 .color-B2{color:#0D32B2;} + .d2-2379520263 .color-B3{color:#E3E9FD;} + .d2-2379520263 .color-B4{color:#E3E9FD;} + .d2-2379520263 .color-B5{color:#EDF0FD;} + .d2-2379520263 .color-B6{color:#F7F8FE;} + .d2-2379520263 .color-AA2{color:#4A6FF3;} + .d2-2379520263 .color-AA4{color:#EDF0FD;} + .d2-2379520263 .color-AA5{color:#F7F8FE;} + .d2-2379520263 .color-AB4{color:#EDF0FD;} + .d2-2379520263 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2379520263);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2379520263);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2379520263);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2379520263);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2379520263);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2379520263);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2379520263);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2379520263);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2379520263);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2379520263);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2379520263);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2379520263);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2379520263);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2379520263);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2379520263);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2379520263);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2379520263);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2379520263);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>b - + \ No newline at end of file diff --git a/e2etests/testdata/regression/shaped_grid_positioning/dagre/board.exp.json b/e2etests/testdata/regression/shaped_grid_positioning/dagre/board.exp.json index 91e38cdb0..114c79738 100644 --- a/e2etests/testdata/regression/shaped_grid_positioning/dagre/board.exp.json +++ b/e2etests/testdata/regression/shaped_grid_positioning/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "N4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -715,6 +740,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -756,6 +782,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -797,6 +824,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -838,6 +866,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -879,6 +908,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -920,6 +950,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -961,6 +992,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1002,6 +1034,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1043,6 +1076,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1085,6 +1119,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1126,6 +1161,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1167,6 +1203,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1208,6 +1245,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1251,6 +1289,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/shaped_grid_positioning/dagre/sketch.exp.svg b/e2etests/testdata/regression/shaped_grid_positioning/dagre/sketch.exp.svg index 99053c4ed..63a70738e 100644 --- a/e2etests/testdata/regression/shaped_grid_positioning/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/shaped_grid_positioning/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -aaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaabcdabcdabcdabcdabcdabcd + .d2-2904884384 .fill-N1{fill:#0A0F25;} + .d2-2904884384 .fill-N2{fill:#676C7E;} + .d2-2904884384 .fill-N3{fill:#9499AB;} + .d2-2904884384 .fill-N4{fill:#CFD2DD;} + .d2-2904884384 .fill-N5{fill:#DEE1EB;} + .d2-2904884384 .fill-N6{fill:#EEF1F8;} + .d2-2904884384 .fill-N7{fill:#FFFFFF;} + .d2-2904884384 .fill-B1{fill:#0D32B2;} + .d2-2904884384 .fill-B2{fill:#0D32B2;} + .d2-2904884384 .fill-B3{fill:#E3E9FD;} + .d2-2904884384 .fill-B4{fill:#E3E9FD;} + .d2-2904884384 .fill-B5{fill:#EDF0FD;} + .d2-2904884384 .fill-B6{fill:#F7F8FE;} + .d2-2904884384 .fill-AA2{fill:#4A6FF3;} + .d2-2904884384 .fill-AA4{fill:#EDF0FD;} + .d2-2904884384 .fill-AA5{fill:#F7F8FE;} + .d2-2904884384 .fill-AB4{fill:#EDF0FD;} + .d2-2904884384 .fill-AB5{fill:#F7F8FE;} + .d2-2904884384 .stroke-N1{stroke:#0A0F25;} + .d2-2904884384 .stroke-N2{stroke:#676C7E;} + .d2-2904884384 .stroke-N3{stroke:#9499AB;} + .d2-2904884384 .stroke-N4{stroke:#CFD2DD;} + .d2-2904884384 .stroke-N5{stroke:#DEE1EB;} + .d2-2904884384 .stroke-N6{stroke:#EEF1F8;} + .d2-2904884384 .stroke-N7{stroke:#FFFFFF;} + .d2-2904884384 .stroke-B1{stroke:#0D32B2;} + .d2-2904884384 .stroke-B2{stroke:#0D32B2;} + .d2-2904884384 .stroke-B3{stroke:#E3E9FD;} + .d2-2904884384 .stroke-B4{stroke:#E3E9FD;} + .d2-2904884384 .stroke-B5{stroke:#EDF0FD;} + .d2-2904884384 .stroke-B6{stroke:#F7F8FE;} + .d2-2904884384 .stroke-AA2{stroke:#4A6FF3;} + .d2-2904884384 .stroke-AA4{stroke:#EDF0FD;} + .d2-2904884384 .stroke-AA5{stroke:#F7F8FE;} + .d2-2904884384 .stroke-AB4{stroke:#EDF0FD;} + .d2-2904884384 .stroke-AB5{stroke:#F7F8FE;} + .d2-2904884384 .background-color-N1{background-color:#0A0F25;} + .d2-2904884384 .background-color-N2{background-color:#676C7E;} + .d2-2904884384 .background-color-N3{background-color:#9499AB;} + .d2-2904884384 .background-color-N4{background-color:#CFD2DD;} + .d2-2904884384 .background-color-N5{background-color:#DEE1EB;} + .d2-2904884384 .background-color-N6{background-color:#EEF1F8;} + .d2-2904884384 .background-color-N7{background-color:#FFFFFF;} + .d2-2904884384 .background-color-B1{background-color:#0D32B2;} + .d2-2904884384 .background-color-B2{background-color:#0D32B2;} + .d2-2904884384 .background-color-B3{background-color:#E3E9FD;} + .d2-2904884384 .background-color-B4{background-color:#E3E9FD;} + .d2-2904884384 .background-color-B5{background-color:#EDF0FD;} + .d2-2904884384 .background-color-B6{background-color:#F7F8FE;} + .d2-2904884384 .background-color-AA2{background-color:#4A6FF3;} + .d2-2904884384 .background-color-AA4{background-color:#EDF0FD;} + .d2-2904884384 .background-color-AA5{background-color:#F7F8FE;} + .d2-2904884384 .background-color-AB4{background-color:#EDF0FD;} + .d2-2904884384 .background-color-AB5{background-color:#F7F8FE;} + .d2-2904884384 .color-N1{color:#0A0F25;} + .d2-2904884384 .color-N2{color:#676C7E;} + .d2-2904884384 .color-N3{color:#9499AB;} + .d2-2904884384 .color-N4{color:#CFD2DD;} + .d2-2904884384 .color-N5{color:#DEE1EB;} + .d2-2904884384 .color-N6{color:#EEF1F8;} + .d2-2904884384 .color-N7{color:#FFFFFF;} + .d2-2904884384 .color-B1{color:#0D32B2;} + .d2-2904884384 .color-B2{color:#0D32B2;} + .d2-2904884384 .color-B3{color:#E3E9FD;} + .d2-2904884384 .color-B4{color:#E3E9FD;} + .d2-2904884384 .color-B5{color:#EDF0FD;} + .d2-2904884384 .color-B6{color:#F7F8FE;} + .d2-2904884384 .color-AA2{color:#4A6FF3;} + .d2-2904884384 .color-AA4{color:#EDF0FD;} + .d2-2904884384 .color-AA5{color:#F7F8FE;} + .d2-2904884384 .color-AB4{color:#EDF0FD;} + .d2-2904884384 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2904884384);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2904884384);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2904884384);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2904884384);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2904884384);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2904884384);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2904884384);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2904884384);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2904884384);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2904884384);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2904884384);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2904884384);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2904884384);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2904884384);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2904884384);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2904884384);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2904884384);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2904884384);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>aaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaabcdabcdabcdabcdabcdabcd - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/shaped_grid_positioning/elk/board.exp.json b/e2etests/testdata/regression/shaped_grid_positioning/elk/board.exp.json index c8e57b562..a6da0a216 100644 --- a/e2etests/testdata/regression/shaped_grid_positioning/elk/board.exp.json +++ b/e2etests/testdata/regression/shaped_grid_positioning/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "N4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -715,6 +740,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -756,6 +782,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -797,6 +824,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -838,6 +866,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -879,6 +908,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -920,6 +950,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -961,6 +992,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1002,6 +1034,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1043,6 +1076,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1085,6 +1119,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1126,6 +1161,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1167,6 +1203,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1208,6 +1245,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1251,6 +1289,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/shaped_grid_positioning/elk/sketch.exp.svg b/e2etests/testdata/regression/shaped_grid_positioning/elk/sketch.exp.svg index 315ee4ac1..cbb450fb2 100644 --- a/e2etests/testdata/regression/shaped_grid_positioning/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/shaped_grid_positioning/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -aaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaabcdabcdabcdabcdabcdabcd + .d2-1186486349 .fill-N1{fill:#0A0F25;} + .d2-1186486349 .fill-N2{fill:#676C7E;} + .d2-1186486349 .fill-N3{fill:#9499AB;} + .d2-1186486349 .fill-N4{fill:#CFD2DD;} + .d2-1186486349 .fill-N5{fill:#DEE1EB;} + .d2-1186486349 .fill-N6{fill:#EEF1F8;} + .d2-1186486349 .fill-N7{fill:#FFFFFF;} + .d2-1186486349 .fill-B1{fill:#0D32B2;} + .d2-1186486349 .fill-B2{fill:#0D32B2;} + .d2-1186486349 .fill-B3{fill:#E3E9FD;} + .d2-1186486349 .fill-B4{fill:#E3E9FD;} + .d2-1186486349 .fill-B5{fill:#EDF0FD;} + .d2-1186486349 .fill-B6{fill:#F7F8FE;} + .d2-1186486349 .fill-AA2{fill:#4A6FF3;} + .d2-1186486349 .fill-AA4{fill:#EDF0FD;} + .d2-1186486349 .fill-AA5{fill:#F7F8FE;} + .d2-1186486349 .fill-AB4{fill:#EDF0FD;} + .d2-1186486349 .fill-AB5{fill:#F7F8FE;} + .d2-1186486349 .stroke-N1{stroke:#0A0F25;} + .d2-1186486349 .stroke-N2{stroke:#676C7E;} + .d2-1186486349 .stroke-N3{stroke:#9499AB;} + .d2-1186486349 .stroke-N4{stroke:#CFD2DD;} + .d2-1186486349 .stroke-N5{stroke:#DEE1EB;} + .d2-1186486349 .stroke-N6{stroke:#EEF1F8;} + .d2-1186486349 .stroke-N7{stroke:#FFFFFF;} + .d2-1186486349 .stroke-B1{stroke:#0D32B2;} + .d2-1186486349 .stroke-B2{stroke:#0D32B2;} + .d2-1186486349 .stroke-B3{stroke:#E3E9FD;} + .d2-1186486349 .stroke-B4{stroke:#E3E9FD;} + .d2-1186486349 .stroke-B5{stroke:#EDF0FD;} + .d2-1186486349 .stroke-B6{stroke:#F7F8FE;} + .d2-1186486349 .stroke-AA2{stroke:#4A6FF3;} + .d2-1186486349 .stroke-AA4{stroke:#EDF0FD;} + .d2-1186486349 .stroke-AA5{stroke:#F7F8FE;} + .d2-1186486349 .stroke-AB4{stroke:#EDF0FD;} + .d2-1186486349 .stroke-AB5{stroke:#F7F8FE;} + .d2-1186486349 .background-color-N1{background-color:#0A0F25;} + .d2-1186486349 .background-color-N2{background-color:#676C7E;} + .d2-1186486349 .background-color-N3{background-color:#9499AB;} + .d2-1186486349 .background-color-N4{background-color:#CFD2DD;} + .d2-1186486349 .background-color-N5{background-color:#DEE1EB;} + .d2-1186486349 .background-color-N6{background-color:#EEF1F8;} + .d2-1186486349 .background-color-N7{background-color:#FFFFFF;} + .d2-1186486349 .background-color-B1{background-color:#0D32B2;} + .d2-1186486349 .background-color-B2{background-color:#0D32B2;} + .d2-1186486349 .background-color-B3{background-color:#E3E9FD;} + .d2-1186486349 .background-color-B4{background-color:#E3E9FD;} + .d2-1186486349 .background-color-B5{background-color:#EDF0FD;} + .d2-1186486349 .background-color-B6{background-color:#F7F8FE;} + .d2-1186486349 .background-color-AA2{background-color:#4A6FF3;} + .d2-1186486349 .background-color-AA4{background-color:#EDF0FD;} + .d2-1186486349 .background-color-AA5{background-color:#F7F8FE;} + .d2-1186486349 .background-color-AB4{background-color:#EDF0FD;} + .d2-1186486349 .background-color-AB5{background-color:#F7F8FE;} + .d2-1186486349 .color-N1{color:#0A0F25;} + .d2-1186486349 .color-N2{color:#676C7E;} + .d2-1186486349 .color-N3{color:#9499AB;} + .d2-1186486349 .color-N4{color:#CFD2DD;} + .d2-1186486349 .color-N5{color:#DEE1EB;} + .d2-1186486349 .color-N6{color:#EEF1F8;} + .d2-1186486349 .color-N7{color:#FFFFFF;} + .d2-1186486349 .color-B1{color:#0D32B2;} + .d2-1186486349 .color-B2{color:#0D32B2;} + .d2-1186486349 .color-B3{color:#E3E9FD;} + .d2-1186486349 .color-B4{color:#E3E9FD;} + .d2-1186486349 .color-B5{color:#EDF0FD;} + .d2-1186486349 .color-B6{color:#F7F8FE;} + .d2-1186486349 .color-AA2{color:#4A6FF3;} + .d2-1186486349 .color-AA4{color:#EDF0FD;} + .d2-1186486349 .color-AA5{color:#F7F8FE;} + .d2-1186486349 .color-AB4{color:#EDF0FD;} + .d2-1186486349 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1186486349);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1186486349);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1186486349);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1186486349);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1186486349);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1186486349);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1186486349);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1186486349);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1186486349);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1186486349);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1186486349);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1186486349);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1186486349);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1186486349);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1186486349);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1186486349);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1186486349);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1186486349);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>aaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaabcdabcdabcdabcdabcdabcd - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/slow_grid/dagre/board.exp.json b/e2etests/testdata/regression/slow_grid/dagre/board.exp.json index 6a79ea704..b830cc667 100644 --- a/e2etests/testdata/regression/slow_grid/dagre/board.exp.json +++ b/e2etests/testdata/regression/slow_grid/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -82,6 +91,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -136,6 +146,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -200,6 +211,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -249,6 +261,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -313,6 +326,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -377,6 +391,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -441,6 +456,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -520,6 +536,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -569,6 +586,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +651,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -712,6 +731,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -761,6 +781,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -825,6 +846,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -879,6 +901,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -933,6 +956,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -982,6 +1006,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1031,6 +1056,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1080,6 +1106,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1129,6 +1156,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1193,6 +1221,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1257,6 +1286,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1311,6 +1341,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1360,6 +1391,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1411,6 +1443,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/slow_grid/dagre/sketch.exp.svg b/e2etests/testdata/regression/slow_grid/dagre/sketch.exp.svg index 469cb06cb..131630419 100644 --- a/e2etests/testdata/regression/slow_grid/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/slow_grid/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -1+1------------------+2-------------------------------+3------------------------------+4-------------------------2+1-----------------+2----------------------------3+1-----------------+2----------------------------+3------------------------------+4-------------------------4+1----------------------------5+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------6+1----------------------------------------+2------------------------+3------------------------+4--------------------------------------7+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------9+1----------------------+2-------------------------------------------+3-----------------------+4--------------------------+5-----------------------------+6-----------------------------+7--------------------------10+1-----------------11+1----------------+2---------------------------+3-----------------------------+4------------------------12+1----------------------+2-----------------------+3-------------+4-------------+5------------------------+6------------------------------------------------+7--------------------------13+1--------------------------------14+1----------------+2---------------------------+3-----------------------------+4------------------------15+1------------------------+2----------------------16+1----------------+2------------------------------17+1-----------------18+1----------------19+1-----------------20+1-----------------21+1----------------+2---------------------------+3-----------------------------+4------------------------22+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------23+1----------------+2------------------------------24+1-----------------25+1----------------- + .d2-969581448 .fill-N1{fill:#0A0F25;} + .d2-969581448 .fill-N2{fill:#676C7E;} + .d2-969581448 .fill-N3{fill:#9499AB;} + .d2-969581448 .fill-N4{fill:#CFD2DD;} + .d2-969581448 .fill-N5{fill:#DEE1EB;} + .d2-969581448 .fill-N6{fill:#EEF1F8;} + .d2-969581448 .fill-N7{fill:#FFFFFF;} + .d2-969581448 .fill-B1{fill:#0D32B2;} + .d2-969581448 .fill-B2{fill:#0D32B2;} + .d2-969581448 .fill-B3{fill:#E3E9FD;} + .d2-969581448 .fill-B4{fill:#E3E9FD;} + .d2-969581448 .fill-B5{fill:#EDF0FD;} + .d2-969581448 .fill-B6{fill:#F7F8FE;} + .d2-969581448 .fill-AA2{fill:#4A6FF3;} + .d2-969581448 .fill-AA4{fill:#EDF0FD;} + .d2-969581448 .fill-AA5{fill:#F7F8FE;} + .d2-969581448 .fill-AB4{fill:#EDF0FD;} + .d2-969581448 .fill-AB5{fill:#F7F8FE;} + .d2-969581448 .stroke-N1{stroke:#0A0F25;} + .d2-969581448 .stroke-N2{stroke:#676C7E;} + .d2-969581448 .stroke-N3{stroke:#9499AB;} + .d2-969581448 .stroke-N4{stroke:#CFD2DD;} + .d2-969581448 .stroke-N5{stroke:#DEE1EB;} + .d2-969581448 .stroke-N6{stroke:#EEF1F8;} + .d2-969581448 .stroke-N7{stroke:#FFFFFF;} + .d2-969581448 .stroke-B1{stroke:#0D32B2;} + .d2-969581448 .stroke-B2{stroke:#0D32B2;} + .d2-969581448 .stroke-B3{stroke:#E3E9FD;} + .d2-969581448 .stroke-B4{stroke:#E3E9FD;} + .d2-969581448 .stroke-B5{stroke:#EDF0FD;} + .d2-969581448 .stroke-B6{stroke:#F7F8FE;} + .d2-969581448 .stroke-AA2{stroke:#4A6FF3;} + .d2-969581448 .stroke-AA4{stroke:#EDF0FD;} + .d2-969581448 .stroke-AA5{stroke:#F7F8FE;} + .d2-969581448 .stroke-AB4{stroke:#EDF0FD;} + .d2-969581448 .stroke-AB5{stroke:#F7F8FE;} + .d2-969581448 .background-color-N1{background-color:#0A0F25;} + .d2-969581448 .background-color-N2{background-color:#676C7E;} + .d2-969581448 .background-color-N3{background-color:#9499AB;} + .d2-969581448 .background-color-N4{background-color:#CFD2DD;} + .d2-969581448 .background-color-N5{background-color:#DEE1EB;} + .d2-969581448 .background-color-N6{background-color:#EEF1F8;} + .d2-969581448 .background-color-N7{background-color:#FFFFFF;} + .d2-969581448 .background-color-B1{background-color:#0D32B2;} + .d2-969581448 .background-color-B2{background-color:#0D32B2;} + .d2-969581448 .background-color-B3{background-color:#E3E9FD;} + .d2-969581448 .background-color-B4{background-color:#E3E9FD;} + .d2-969581448 .background-color-B5{background-color:#EDF0FD;} + .d2-969581448 .background-color-B6{background-color:#F7F8FE;} + .d2-969581448 .background-color-AA2{background-color:#4A6FF3;} + .d2-969581448 .background-color-AA4{background-color:#EDF0FD;} + .d2-969581448 .background-color-AA5{background-color:#F7F8FE;} + .d2-969581448 .background-color-AB4{background-color:#EDF0FD;} + .d2-969581448 .background-color-AB5{background-color:#F7F8FE;} + .d2-969581448 .color-N1{color:#0A0F25;} + .d2-969581448 .color-N2{color:#676C7E;} + .d2-969581448 .color-N3{color:#9499AB;} + .d2-969581448 .color-N4{color:#CFD2DD;} + .d2-969581448 .color-N5{color:#DEE1EB;} + .d2-969581448 .color-N6{color:#EEF1F8;} + .d2-969581448 .color-N7{color:#FFFFFF;} + .d2-969581448 .color-B1{color:#0D32B2;} + .d2-969581448 .color-B2{color:#0D32B2;} + .d2-969581448 .color-B3{color:#E3E9FD;} + .d2-969581448 .color-B4{color:#E3E9FD;} + .d2-969581448 .color-B5{color:#EDF0FD;} + .d2-969581448 .color-B6{color:#F7F8FE;} + .d2-969581448 .color-AA2{color:#4A6FF3;} + .d2-969581448 .color-AA4{color:#EDF0FD;} + .d2-969581448 .color-AA5{color:#F7F8FE;} + .d2-969581448 .color-AB4{color:#EDF0FD;} + .d2-969581448 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-969581448);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-969581448);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-969581448);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-969581448);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-969581448);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-969581448);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-969581448);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-969581448);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-969581448);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-969581448);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-969581448);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-969581448);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-969581448);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-969581448);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-969581448);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-969581448);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-969581448);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-969581448);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>1+1------------------+2-------------------------------+3------------------------------+4-------------------------2+1-----------------+2----------------------------3+1-----------------+2----------------------------+3------------------------------+4-------------------------4+1----------------------------5+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------6+1----------------------------------------+2------------------------+3------------------------+4--------------------------------------7+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------9+1----------------------+2-------------------------------------------+3-----------------------+4--------------------------+5-----------------------------+6-----------------------------+7--------------------------10+1-----------------11+1----------------+2---------------------------+3-----------------------------+4------------------------12+1----------------------+2-----------------------+3-------------+4-------------+5------------------------+6------------------------------------------------+7--------------------------13+1--------------------------------14+1----------------+2---------------------------+3-----------------------------+4------------------------15+1------------------------+2----------------------16+1----------------+2------------------------------17+1-----------------18+1----------------19+1-----------------20+1-----------------21+1----------------+2---------------------------+3-----------------------------+4------------------------22+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------23+1----------------+2------------------------------24+1-----------------25+1----------------- \ No newline at end of file diff --git a/e2etests/testdata/regression/slow_grid/elk/board.exp.json b/e2etests/testdata/regression/slow_grid/elk/board.exp.json index 6a79ea704..b830cc667 100644 --- a/e2etests/testdata/regression/slow_grid/elk/board.exp.json +++ b/e2etests/testdata/regression/slow_grid/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -82,6 +91,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -136,6 +146,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -200,6 +211,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -249,6 +261,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -313,6 +326,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -377,6 +391,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -441,6 +456,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -520,6 +536,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -569,6 +586,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +651,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -712,6 +731,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -761,6 +781,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -825,6 +846,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -879,6 +901,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -933,6 +956,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -982,6 +1006,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1031,6 +1056,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1080,6 +1106,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1129,6 +1156,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1193,6 +1221,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1257,6 +1286,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1311,6 +1341,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1360,6 +1391,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1411,6 +1443,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/slow_grid/elk/sketch.exp.svg b/e2etests/testdata/regression/slow_grid/elk/sketch.exp.svg index 469cb06cb..131630419 100644 --- a/e2etests/testdata/regression/slow_grid/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/slow_grid/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -1+1------------------+2-------------------------------+3------------------------------+4-------------------------2+1-----------------+2----------------------------3+1-----------------+2----------------------------+3------------------------------+4-------------------------4+1----------------------------5+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------6+1----------------------------------------+2------------------------+3------------------------+4--------------------------------------7+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------9+1----------------------+2-------------------------------------------+3-----------------------+4--------------------------+5-----------------------------+6-----------------------------+7--------------------------10+1-----------------11+1----------------+2---------------------------+3-----------------------------+4------------------------12+1----------------------+2-----------------------+3-------------+4-------------+5------------------------+6------------------------------------------------+7--------------------------13+1--------------------------------14+1----------------+2---------------------------+3-----------------------------+4------------------------15+1------------------------+2----------------------16+1----------------+2------------------------------17+1-----------------18+1----------------19+1-----------------20+1-----------------21+1----------------+2---------------------------+3-----------------------------+4------------------------22+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------23+1----------------+2------------------------------24+1-----------------25+1----------------- + .d2-969581448 .fill-N1{fill:#0A0F25;} + .d2-969581448 .fill-N2{fill:#676C7E;} + .d2-969581448 .fill-N3{fill:#9499AB;} + .d2-969581448 .fill-N4{fill:#CFD2DD;} + .d2-969581448 .fill-N5{fill:#DEE1EB;} + .d2-969581448 .fill-N6{fill:#EEF1F8;} + .d2-969581448 .fill-N7{fill:#FFFFFF;} + .d2-969581448 .fill-B1{fill:#0D32B2;} + .d2-969581448 .fill-B2{fill:#0D32B2;} + .d2-969581448 .fill-B3{fill:#E3E9FD;} + .d2-969581448 .fill-B4{fill:#E3E9FD;} + .d2-969581448 .fill-B5{fill:#EDF0FD;} + .d2-969581448 .fill-B6{fill:#F7F8FE;} + .d2-969581448 .fill-AA2{fill:#4A6FF3;} + .d2-969581448 .fill-AA4{fill:#EDF0FD;} + .d2-969581448 .fill-AA5{fill:#F7F8FE;} + .d2-969581448 .fill-AB4{fill:#EDF0FD;} + .d2-969581448 .fill-AB5{fill:#F7F8FE;} + .d2-969581448 .stroke-N1{stroke:#0A0F25;} + .d2-969581448 .stroke-N2{stroke:#676C7E;} + .d2-969581448 .stroke-N3{stroke:#9499AB;} + .d2-969581448 .stroke-N4{stroke:#CFD2DD;} + .d2-969581448 .stroke-N5{stroke:#DEE1EB;} + .d2-969581448 .stroke-N6{stroke:#EEF1F8;} + .d2-969581448 .stroke-N7{stroke:#FFFFFF;} + .d2-969581448 .stroke-B1{stroke:#0D32B2;} + .d2-969581448 .stroke-B2{stroke:#0D32B2;} + .d2-969581448 .stroke-B3{stroke:#E3E9FD;} + .d2-969581448 .stroke-B4{stroke:#E3E9FD;} + .d2-969581448 .stroke-B5{stroke:#EDF0FD;} + .d2-969581448 .stroke-B6{stroke:#F7F8FE;} + .d2-969581448 .stroke-AA2{stroke:#4A6FF3;} + .d2-969581448 .stroke-AA4{stroke:#EDF0FD;} + .d2-969581448 .stroke-AA5{stroke:#F7F8FE;} + .d2-969581448 .stroke-AB4{stroke:#EDF0FD;} + .d2-969581448 .stroke-AB5{stroke:#F7F8FE;} + .d2-969581448 .background-color-N1{background-color:#0A0F25;} + .d2-969581448 .background-color-N2{background-color:#676C7E;} + .d2-969581448 .background-color-N3{background-color:#9499AB;} + .d2-969581448 .background-color-N4{background-color:#CFD2DD;} + .d2-969581448 .background-color-N5{background-color:#DEE1EB;} + .d2-969581448 .background-color-N6{background-color:#EEF1F8;} + .d2-969581448 .background-color-N7{background-color:#FFFFFF;} + .d2-969581448 .background-color-B1{background-color:#0D32B2;} + .d2-969581448 .background-color-B2{background-color:#0D32B2;} + .d2-969581448 .background-color-B3{background-color:#E3E9FD;} + .d2-969581448 .background-color-B4{background-color:#E3E9FD;} + .d2-969581448 .background-color-B5{background-color:#EDF0FD;} + .d2-969581448 .background-color-B6{background-color:#F7F8FE;} + .d2-969581448 .background-color-AA2{background-color:#4A6FF3;} + .d2-969581448 .background-color-AA4{background-color:#EDF0FD;} + .d2-969581448 .background-color-AA5{background-color:#F7F8FE;} + .d2-969581448 .background-color-AB4{background-color:#EDF0FD;} + .d2-969581448 .background-color-AB5{background-color:#F7F8FE;} + .d2-969581448 .color-N1{color:#0A0F25;} + .d2-969581448 .color-N2{color:#676C7E;} + .d2-969581448 .color-N3{color:#9499AB;} + .d2-969581448 .color-N4{color:#CFD2DD;} + .d2-969581448 .color-N5{color:#DEE1EB;} + .d2-969581448 .color-N6{color:#EEF1F8;} + .d2-969581448 .color-N7{color:#FFFFFF;} + .d2-969581448 .color-B1{color:#0D32B2;} + .d2-969581448 .color-B2{color:#0D32B2;} + .d2-969581448 .color-B3{color:#E3E9FD;} + .d2-969581448 .color-B4{color:#E3E9FD;} + .d2-969581448 .color-B5{color:#EDF0FD;} + .d2-969581448 .color-B6{color:#F7F8FE;} + .d2-969581448 .color-AA2{color:#4A6FF3;} + .d2-969581448 .color-AA4{color:#EDF0FD;} + .d2-969581448 .color-AA5{color:#F7F8FE;} + .d2-969581448 .color-AB4{color:#EDF0FD;} + .d2-969581448 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-969581448);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-969581448);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-969581448);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-969581448);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-969581448);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-969581448);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-969581448);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-969581448);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-969581448);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-969581448);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-969581448);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-969581448);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-969581448);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-969581448);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-969581448);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-969581448);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-969581448);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-969581448);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>1+1------------------+2-------------------------------+3------------------------------+4-------------------------2+1-----------------+2----------------------------3+1-----------------+2----------------------------+3------------------------------+4-------------------------4+1----------------------------5+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------6+1----------------------------------------+2------------------------+3------------------------+4--------------------------------------7+1----------------------------------------+2---------------------+3------------------------+4--------------------------------------9+1----------------------+2-------------------------------------------+3-----------------------+4--------------------------+5-----------------------------+6-----------------------------+7--------------------------10+1-----------------11+1----------------+2---------------------------+3-----------------------------+4------------------------12+1----------------------+2-----------------------+3-------------+4-------------+5------------------------+6------------------------------------------------+7--------------------------13+1--------------------------------14+1----------------+2---------------------------+3-----------------------------+4------------------------15+1------------------------+2----------------------16+1----------------+2------------------------------17+1-----------------18+1----------------19+1-----------------20+1-----------------21+1----------------+2---------------------------+3-----------------------------+4------------------------22+1---------------------------------------------+2--------------------+3-----------------------+4-------------------------------------23+1----------------+2------------------------------24+1-----------------25+1----------------- \ No newline at end of file diff --git a/e2etests/testdata/regression/sql_table_overflow/dagre/board.exp.json b/e2etests/testdata/regression/sql_table_overflow/dagre/board.exp.json index 3aa233bf9..decb3ac9d 100644 --- a/e2etests/testdata/regression/sql_table_overflow/dagre/board.exp.json +++ b/e2etests/testdata/regression/sql_table_overflow/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -118,6 +127,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -224,6 +234,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/sql_table_overflow/dagre/sketch.exp.svg b/e2etests/testdata/regression/sql_table_overflow/dagre/sketch.exp.svg index b75cc4d46..a941bb7a1 100644 --- a/e2etests/testdata/regression/sql_table_overflow/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/sql_table_overflow/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -sql_table_overflowshortloooooooooooooooooooongloooooooooooooooooooongshortsql_table_constrained_overflowshortloooooooooooooooooooongUNQloooooooooooooooooooongshortFK + .d2-3602423281 .fill-N1{fill:#0A0F25;} + .d2-3602423281 .fill-N2{fill:#676C7E;} + .d2-3602423281 .fill-N3{fill:#9499AB;} + .d2-3602423281 .fill-N4{fill:#CFD2DD;} + .d2-3602423281 .fill-N5{fill:#DEE1EB;} + .d2-3602423281 .fill-N6{fill:#EEF1F8;} + .d2-3602423281 .fill-N7{fill:#FFFFFF;} + .d2-3602423281 .fill-B1{fill:#0D32B2;} + .d2-3602423281 .fill-B2{fill:#0D32B2;} + .d2-3602423281 .fill-B3{fill:#E3E9FD;} + .d2-3602423281 .fill-B4{fill:#E3E9FD;} + .d2-3602423281 .fill-B5{fill:#EDF0FD;} + .d2-3602423281 .fill-B6{fill:#F7F8FE;} + .d2-3602423281 .fill-AA2{fill:#4A6FF3;} + .d2-3602423281 .fill-AA4{fill:#EDF0FD;} + .d2-3602423281 .fill-AA5{fill:#F7F8FE;} + .d2-3602423281 .fill-AB4{fill:#EDF0FD;} + .d2-3602423281 .fill-AB5{fill:#F7F8FE;} + .d2-3602423281 .stroke-N1{stroke:#0A0F25;} + .d2-3602423281 .stroke-N2{stroke:#676C7E;} + .d2-3602423281 .stroke-N3{stroke:#9499AB;} + .d2-3602423281 .stroke-N4{stroke:#CFD2DD;} + .d2-3602423281 .stroke-N5{stroke:#DEE1EB;} + .d2-3602423281 .stroke-N6{stroke:#EEF1F8;} + .d2-3602423281 .stroke-N7{stroke:#FFFFFF;} + .d2-3602423281 .stroke-B1{stroke:#0D32B2;} + .d2-3602423281 .stroke-B2{stroke:#0D32B2;} + .d2-3602423281 .stroke-B3{stroke:#E3E9FD;} + .d2-3602423281 .stroke-B4{stroke:#E3E9FD;} + .d2-3602423281 .stroke-B5{stroke:#EDF0FD;} + .d2-3602423281 .stroke-B6{stroke:#F7F8FE;} + .d2-3602423281 .stroke-AA2{stroke:#4A6FF3;} + .d2-3602423281 .stroke-AA4{stroke:#EDF0FD;} + .d2-3602423281 .stroke-AA5{stroke:#F7F8FE;} + .d2-3602423281 .stroke-AB4{stroke:#EDF0FD;} + .d2-3602423281 .stroke-AB5{stroke:#F7F8FE;} + .d2-3602423281 .background-color-N1{background-color:#0A0F25;} + .d2-3602423281 .background-color-N2{background-color:#676C7E;} + .d2-3602423281 .background-color-N3{background-color:#9499AB;} + .d2-3602423281 .background-color-N4{background-color:#CFD2DD;} + .d2-3602423281 .background-color-N5{background-color:#DEE1EB;} + .d2-3602423281 .background-color-N6{background-color:#EEF1F8;} + .d2-3602423281 .background-color-N7{background-color:#FFFFFF;} + .d2-3602423281 .background-color-B1{background-color:#0D32B2;} + .d2-3602423281 .background-color-B2{background-color:#0D32B2;} + .d2-3602423281 .background-color-B3{background-color:#E3E9FD;} + .d2-3602423281 .background-color-B4{background-color:#E3E9FD;} + .d2-3602423281 .background-color-B5{background-color:#EDF0FD;} + .d2-3602423281 .background-color-B6{background-color:#F7F8FE;} + .d2-3602423281 .background-color-AA2{background-color:#4A6FF3;} + .d2-3602423281 .background-color-AA4{background-color:#EDF0FD;} + .d2-3602423281 .background-color-AA5{background-color:#F7F8FE;} + .d2-3602423281 .background-color-AB4{background-color:#EDF0FD;} + .d2-3602423281 .background-color-AB5{background-color:#F7F8FE;} + .d2-3602423281 .color-N1{color:#0A0F25;} + .d2-3602423281 .color-N2{color:#676C7E;} + .d2-3602423281 .color-N3{color:#9499AB;} + .d2-3602423281 .color-N4{color:#CFD2DD;} + .d2-3602423281 .color-N5{color:#DEE1EB;} + .d2-3602423281 .color-N6{color:#EEF1F8;} + .d2-3602423281 .color-N7{color:#FFFFFF;} + .d2-3602423281 .color-B1{color:#0D32B2;} + .d2-3602423281 .color-B2{color:#0D32B2;} + .d2-3602423281 .color-B3{color:#E3E9FD;} + .d2-3602423281 .color-B4{color:#E3E9FD;} + .d2-3602423281 .color-B5{color:#EDF0FD;} + .d2-3602423281 .color-B6{color:#F7F8FE;} + .d2-3602423281 .color-AA2{color:#4A6FF3;} + .d2-3602423281 .color-AA4{color:#EDF0FD;} + .d2-3602423281 .color-AA5{color:#F7F8FE;} + .d2-3602423281 .color-AB4{color:#EDF0FD;} + .d2-3602423281 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3602423281);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3602423281);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3602423281);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3602423281);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3602423281);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3602423281);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3602423281);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3602423281);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3602423281);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3602423281);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3602423281);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3602423281);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3602423281);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3602423281);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3602423281);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3602423281);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3602423281);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3602423281);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>sql_table_overflowshortloooooooooooooooooooongloooooooooooooooooooongshortsql_table_constrained_overflowshortloooooooooooooooooooongUNQloooooooooooooooooooongshortFK \ No newline at end of file diff --git a/e2etests/testdata/regression/sql_table_overflow/elk/board.exp.json b/e2etests/testdata/regression/sql_table_overflow/elk/board.exp.json index 3c6ee9d9e..cfd43b662 100644 --- a/e2etests/testdata/regression/sql_table_overflow/elk/board.exp.json +++ b/e2etests/testdata/regression/sql_table_overflow/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -118,6 +127,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -224,6 +234,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/sql_table_overflow/elk/sketch.exp.svg b/e2etests/testdata/regression/sql_table_overflow/elk/sketch.exp.svg index 8e0029bb0..b0d727cd3 100644 --- a/e2etests/testdata/regression/sql_table_overflow/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/sql_table_overflow/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -sql_table_overflowshortloooooooooooooooooooongloooooooooooooooooooongshortsql_table_constrained_overflowshortloooooooooooooooooooongUNQloooooooooooooooooooongshortFK + .d2-1054612775 .fill-N1{fill:#0A0F25;} + .d2-1054612775 .fill-N2{fill:#676C7E;} + .d2-1054612775 .fill-N3{fill:#9499AB;} + .d2-1054612775 .fill-N4{fill:#CFD2DD;} + .d2-1054612775 .fill-N5{fill:#DEE1EB;} + .d2-1054612775 .fill-N6{fill:#EEF1F8;} + .d2-1054612775 .fill-N7{fill:#FFFFFF;} + .d2-1054612775 .fill-B1{fill:#0D32B2;} + .d2-1054612775 .fill-B2{fill:#0D32B2;} + .d2-1054612775 .fill-B3{fill:#E3E9FD;} + .d2-1054612775 .fill-B4{fill:#E3E9FD;} + .d2-1054612775 .fill-B5{fill:#EDF0FD;} + .d2-1054612775 .fill-B6{fill:#F7F8FE;} + .d2-1054612775 .fill-AA2{fill:#4A6FF3;} + .d2-1054612775 .fill-AA4{fill:#EDF0FD;} + .d2-1054612775 .fill-AA5{fill:#F7F8FE;} + .d2-1054612775 .fill-AB4{fill:#EDF0FD;} + .d2-1054612775 .fill-AB5{fill:#F7F8FE;} + .d2-1054612775 .stroke-N1{stroke:#0A0F25;} + .d2-1054612775 .stroke-N2{stroke:#676C7E;} + .d2-1054612775 .stroke-N3{stroke:#9499AB;} + .d2-1054612775 .stroke-N4{stroke:#CFD2DD;} + .d2-1054612775 .stroke-N5{stroke:#DEE1EB;} + .d2-1054612775 .stroke-N6{stroke:#EEF1F8;} + .d2-1054612775 .stroke-N7{stroke:#FFFFFF;} + .d2-1054612775 .stroke-B1{stroke:#0D32B2;} + .d2-1054612775 .stroke-B2{stroke:#0D32B2;} + .d2-1054612775 .stroke-B3{stroke:#E3E9FD;} + .d2-1054612775 .stroke-B4{stroke:#E3E9FD;} + .d2-1054612775 .stroke-B5{stroke:#EDF0FD;} + .d2-1054612775 .stroke-B6{stroke:#F7F8FE;} + .d2-1054612775 .stroke-AA2{stroke:#4A6FF3;} + .d2-1054612775 .stroke-AA4{stroke:#EDF0FD;} + .d2-1054612775 .stroke-AA5{stroke:#F7F8FE;} + .d2-1054612775 .stroke-AB4{stroke:#EDF0FD;} + .d2-1054612775 .stroke-AB5{stroke:#F7F8FE;} + .d2-1054612775 .background-color-N1{background-color:#0A0F25;} + .d2-1054612775 .background-color-N2{background-color:#676C7E;} + .d2-1054612775 .background-color-N3{background-color:#9499AB;} + .d2-1054612775 .background-color-N4{background-color:#CFD2DD;} + .d2-1054612775 .background-color-N5{background-color:#DEE1EB;} + .d2-1054612775 .background-color-N6{background-color:#EEF1F8;} + .d2-1054612775 .background-color-N7{background-color:#FFFFFF;} + .d2-1054612775 .background-color-B1{background-color:#0D32B2;} + .d2-1054612775 .background-color-B2{background-color:#0D32B2;} + .d2-1054612775 .background-color-B3{background-color:#E3E9FD;} + .d2-1054612775 .background-color-B4{background-color:#E3E9FD;} + .d2-1054612775 .background-color-B5{background-color:#EDF0FD;} + .d2-1054612775 .background-color-B6{background-color:#F7F8FE;} + .d2-1054612775 .background-color-AA2{background-color:#4A6FF3;} + .d2-1054612775 .background-color-AA4{background-color:#EDF0FD;} + .d2-1054612775 .background-color-AA5{background-color:#F7F8FE;} + .d2-1054612775 .background-color-AB4{background-color:#EDF0FD;} + .d2-1054612775 .background-color-AB5{background-color:#F7F8FE;} + .d2-1054612775 .color-N1{color:#0A0F25;} + .d2-1054612775 .color-N2{color:#676C7E;} + .d2-1054612775 .color-N3{color:#9499AB;} + .d2-1054612775 .color-N4{color:#CFD2DD;} + .d2-1054612775 .color-N5{color:#DEE1EB;} + .d2-1054612775 .color-N6{color:#EEF1F8;} + .d2-1054612775 .color-N7{color:#FFFFFF;} + .d2-1054612775 .color-B1{color:#0D32B2;} + .d2-1054612775 .color-B2{color:#0D32B2;} + .d2-1054612775 .color-B3{color:#E3E9FD;} + .d2-1054612775 .color-B4{color:#E3E9FD;} + .d2-1054612775 .color-B5{color:#EDF0FD;} + .d2-1054612775 .color-B6{color:#F7F8FE;} + .d2-1054612775 .color-AA2{color:#4A6FF3;} + .d2-1054612775 .color-AA4{color:#EDF0FD;} + .d2-1054612775 .color-AA5{color:#F7F8FE;} + .d2-1054612775 .color-AB4{color:#EDF0FD;} + .d2-1054612775 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1054612775);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1054612775);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1054612775);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1054612775);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1054612775);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1054612775);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1054612775);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1054612775);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1054612775);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1054612775);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1054612775);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1054612775);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1054612775);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1054612775);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1054612775);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1054612775);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1054612775);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1054612775);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>sql_table_overflowshortloooooooooooooooooooongloooooooooooooooooooongshortsql_table_constrained_overflowshortloooooooooooooooooooongUNQloooooooooooooooooooongshortFK \ No newline at end of file diff --git a/e2etests/testdata/regression/straight_hierarchy_container_direction_right/dagre/board.exp.json b/e2etests/testdata/regression/straight_hierarchy_container_direction_right/dagre/board.exp.json index f59d42506..c5f0dc2be 100644 --- a/e2etests/testdata/regression/straight_hierarchy_container_direction_right/dagre/board.exp.json +++ b/e2etests/testdata/regression/straight_hierarchy_container_direction_right/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -715,6 +740,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -756,6 +782,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -797,6 +824,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -838,6 +866,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -879,6 +908,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -920,6 +950,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -961,6 +992,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1002,6 +1034,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1053,6 +1086,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 53, @@ -1100,6 +1134,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 53, @@ -1147,6 +1182,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 53, @@ -1194,6 +1230,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 256, @@ -1253,6 +1290,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 256, @@ -1312,6 +1350,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 256, @@ -1371,6 +1410,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 509, @@ -1430,6 +1470,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 509, @@ -1489,6 +1530,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 509, @@ -1548,6 +1590,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 762, @@ -1619,6 +1662,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 762, @@ -1690,6 +1734,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 762, @@ -1754,6 +1799,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/straight_hierarchy_container_direction_right/dagre/sketch.exp.svg b/e2etests/testdata/regression/straight_hierarchy_container_direction_right/dagre/sketch.exp.svg index 234225ced..a773f3500 100644 --- a/e2etests/testdata/regression/straight_hierarchy_container_direction_right/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/straight_hierarchy_container_direction_right/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc + .d2-1375503141 .fill-N1{fill:#0A0F25;} + .d2-1375503141 .fill-N2{fill:#676C7E;} + .d2-1375503141 .fill-N3{fill:#9499AB;} + .d2-1375503141 .fill-N4{fill:#CFD2DD;} + .d2-1375503141 .fill-N5{fill:#DEE1EB;} + .d2-1375503141 .fill-N6{fill:#EEF1F8;} + .d2-1375503141 .fill-N7{fill:#FFFFFF;} + .d2-1375503141 .fill-B1{fill:#0D32B2;} + .d2-1375503141 .fill-B2{fill:#0D32B2;} + .d2-1375503141 .fill-B3{fill:#E3E9FD;} + .d2-1375503141 .fill-B4{fill:#E3E9FD;} + .d2-1375503141 .fill-B5{fill:#EDF0FD;} + .d2-1375503141 .fill-B6{fill:#F7F8FE;} + .d2-1375503141 .fill-AA2{fill:#4A6FF3;} + .d2-1375503141 .fill-AA4{fill:#EDF0FD;} + .d2-1375503141 .fill-AA5{fill:#F7F8FE;} + .d2-1375503141 .fill-AB4{fill:#EDF0FD;} + .d2-1375503141 .fill-AB5{fill:#F7F8FE;} + .d2-1375503141 .stroke-N1{stroke:#0A0F25;} + .d2-1375503141 .stroke-N2{stroke:#676C7E;} + .d2-1375503141 .stroke-N3{stroke:#9499AB;} + .d2-1375503141 .stroke-N4{stroke:#CFD2DD;} + .d2-1375503141 .stroke-N5{stroke:#DEE1EB;} + .d2-1375503141 .stroke-N6{stroke:#EEF1F8;} + .d2-1375503141 .stroke-N7{stroke:#FFFFFF;} + .d2-1375503141 .stroke-B1{stroke:#0D32B2;} + .d2-1375503141 .stroke-B2{stroke:#0D32B2;} + .d2-1375503141 .stroke-B3{stroke:#E3E9FD;} + .d2-1375503141 .stroke-B4{stroke:#E3E9FD;} + .d2-1375503141 .stroke-B5{stroke:#EDF0FD;} + .d2-1375503141 .stroke-B6{stroke:#F7F8FE;} + .d2-1375503141 .stroke-AA2{stroke:#4A6FF3;} + .d2-1375503141 .stroke-AA4{stroke:#EDF0FD;} + .d2-1375503141 .stroke-AA5{stroke:#F7F8FE;} + .d2-1375503141 .stroke-AB4{stroke:#EDF0FD;} + .d2-1375503141 .stroke-AB5{stroke:#F7F8FE;} + .d2-1375503141 .background-color-N1{background-color:#0A0F25;} + .d2-1375503141 .background-color-N2{background-color:#676C7E;} + .d2-1375503141 .background-color-N3{background-color:#9499AB;} + .d2-1375503141 .background-color-N4{background-color:#CFD2DD;} + .d2-1375503141 .background-color-N5{background-color:#DEE1EB;} + .d2-1375503141 .background-color-N6{background-color:#EEF1F8;} + .d2-1375503141 .background-color-N7{background-color:#FFFFFF;} + .d2-1375503141 .background-color-B1{background-color:#0D32B2;} + .d2-1375503141 .background-color-B2{background-color:#0D32B2;} + .d2-1375503141 .background-color-B3{background-color:#E3E9FD;} + .d2-1375503141 .background-color-B4{background-color:#E3E9FD;} + .d2-1375503141 .background-color-B5{background-color:#EDF0FD;} + .d2-1375503141 .background-color-B6{background-color:#F7F8FE;} + .d2-1375503141 .background-color-AA2{background-color:#4A6FF3;} + .d2-1375503141 .background-color-AA4{background-color:#EDF0FD;} + .d2-1375503141 .background-color-AA5{background-color:#F7F8FE;} + .d2-1375503141 .background-color-AB4{background-color:#EDF0FD;} + .d2-1375503141 .background-color-AB5{background-color:#F7F8FE;} + .d2-1375503141 .color-N1{color:#0A0F25;} + .d2-1375503141 .color-N2{color:#676C7E;} + .d2-1375503141 .color-N3{color:#9499AB;} + .d2-1375503141 .color-N4{color:#CFD2DD;} + .d2-1375503141 .color-N5{color:#DEE1EB;} + .d2-1375503141 .color-N6{color:#EEF1F8;} + .d2-1375503141 .color-N7{color:#FFFFFF;} + .d2-1375503141 .color-B1{color:#0D32B2;} + .d2-1375503141 .color-B2{color:#0D32B2;} + .d2-1375503141 .color-B3{color:#E3E9FD;} + .d2-1375503141 .color-B4{color:#E3E9FD;} + .d2-1375503141 .color-B5{color:#EDF0FD;} + .d2-1375503141 .color-B6{color:#F7F8FE;} + .d2-1375503141 .color-AA2{color:#4A6FF3;} + .d2-1375503141 .color-AA4{color:#EDF0FD;} + .d2-1375503141 .color-AA5{color:#F7F8FE;} + .d2-1375503141 .color-AB4{color:#EDF0FD;} + .d2-1375503141 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1375503141);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1375503141);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1375503141);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1375503141);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1375503141);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1375503141);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1375503141);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1375503141);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1375503141);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1375503141);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1375503141);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1375503141);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1375503141);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1375503141);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1375503141);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1375503141);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1375503141);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1375503141);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/straight_hierarchy_container_direction_right/elk/board.exp.json b/e2etests/testdata/regression/straight_hierarchy_container_direction_right/elk/board.exp.json index 3eabfc40c..fc1c86301 100644 --- a/e2etests/testdata/regression/straight_hierarchy_container_direction_right/elk/board.exp.json +++ b/e2etests/testdata/regression/straight_hierarchy_container_direction_right/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -715,6 +740,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -756,6 +782,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -797,6 +824,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -838,6 +866,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -879,6 +908,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -920,6 +950,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -961,6 +992,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1002,6 +1034,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1053,6 +1086,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 65, @@ -1091,6 +1125,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 65, @@ -1129,6 +1164,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 65, @@ -1167,6 +1203,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 243, @@ -1213,6 +1250,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 243, @@ -1259,6 +1297,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 243, @@ -1305,6 +1344,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 616, @@ -1351,6 +1391,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 616, @@ -1397,6 +1438,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 616, @@ -1435,6 +1477,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 859, @@ -1473,6 +1516,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 859, @@ -1519,6 +1563,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 859, @@ -1550,6 +1595,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/straight_hierarchy_container_direction_right/elk/sketch.exp.svg b/e2etests/testdata/regression/straight_hierarchy_container_direction_right/elk/sketch.exp.svg index d3f5db3a3..bb0d2e6ba 100644 --- a/e2etests/testdata/regression/straight_hierarchy_container_direction_right/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/straight_hierarchy_container_direction_right/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc + .d2-4172381348 .fill-N1{fill:#0A0F25;} + .d2-4172381348 .fill-N2{fill:#676C7E;} + .d2-4172381348 .fill-N3{fill:#9499AB;} + .d2-4172381348 .fill-N4{fill:#CFD2DD;} + .d2-4172381348 .fill-N5{fill:#DEE1EB;} + .d2-4172381348 .fill-N6{fill:#EEF1F8;} + .d2-4172381348 .fill-N7{fill:#FFFFFF;} + .d2-4172381348 .fill-B1{fill:#0D32B2;} + .d2-4172381348 .fill-B2{fill:#0D32B2;} + .d2-4172381348 .fill-B3{fill:#E3E9FD;} + .d2-4172381348 .fill-B4{fill:#E3E9FD;} + .d2-4172381348 .fill-B5{fill:#EDF0FD;} + .d2-4172381348 .fill-B6{fill:#F7F8FE;} + .d2-4172381348 .fill-AA2{fill:#4A6FF3;} + .d2-4172381348 .fill-AA4{fill:#EDF0FD;} + .d2-4172381348 .fill-AA5{fill:#F7F8FE;} + .d2-4172381348 .fill-AB4{fill:#EDF0FD;} + .d2-4172381348 .fill-AB5{fill:#F7F8FE;} + .d2-4172381348 .stroke-N1{stroke:#0A0F25;} + .d2-4172381348 .stroke-N2{stroke:#676C7E;} + .d2-4172381348 .stroke-N3{stroke:#9499AB;} + .d2-4172381348 .stroke-N4{stroke:#CFD2DD;} + .d2-4172381348 .stroke-N5{stroke:#DEE1EB;} + .d2-4172381348 .stroke-N6{stroke:#EEF1F8;} + .d2-4172381348 .stroke-N7{stroke:#FFFFFF;} + .d2-4172381348 .stroke-B1{stroke:#0D32B2;} + .d2-4172381348 .stroke-B2{stroke:#0D32B2;} + .d2-4172381348 .stroke-B3{stroke:#E3E9FD;} + .d2-4172381348 .stroke-B4{stroke:#E3E9FD;} + .d2-4172381348 .stroke-B5{stroke:#EDF0FD;} + .d2-4172381348 .stroke-B6{stroke:#F7F8FE;} + .d2-4172381348 .stroke-AA2{stroke:#4A6FF3;} + .d2-4172381348 .stroke-AA4{stroke:#EDF0FD;} + .d2-4172381348 .stroke-AA5{stroke:#F7F8FE;} + .d2-4172381348 .stroke-AB4{stroke:#EDF0FD;} + .d2-4172381348 .stroke-AB5{stroke:#F7F8FE;} + .d2-4172381348 .background-color-N1{background-color:#0A0F25;} + .d2-4172381348 .background-color-N2{background-color:#676C7E;} + .d2-4172381348 .background-color-N3{background-color:#9499AB;} + .d2-4172381348 .background-color-N4{background-color:#CFD2DD;} + .d2-4172381348 .background-color-N5{background-color:#DEE1EB;} + .d2-4172381348 .background-color-N6{background-color:#EEF1F8;} + .d2-4172381348 .background-color-N7{background-color:#FFFFFF;} + .d2-4172381348 .background-color-B1{background-color:#0D32B2;} + .d2-4172381348 .background-color-B2{background-color:#0D32B2;} + .d2-4172381348 .background-color-B3{background-color:#E3E9FD;} + .d2-4172381348 .background-color-B4{background-color:#E3E9FD;} + .d2-4172381348 .background-color-B5{background-color:#EDF0FD;} + .d2-4172381348 .background-color-B6{background-color:#F7F8FE;} + .d2-4172381348 .background-color-AA2{background-color:#4A6FF3;} + .d2-4172381348 .background-color-AA4{background-color:#EDF0FD;} + .d2-4172381348 .background-color-AA5{background-color:#F7F8FE;} + .d2-4172381348 .background-color-AB4{background-color:#EDF0FD;} + .d2-4172381348 .background-color-AB5{background-color:#F7F8FE;} + .d2-4172381348 .color-N1{color:#0A0F25;} + .d2-4172381348 .color-N2{color:#676C7E;} + .d2-4172381348 .color-N3{color:#9499AB;} + .d2-4172381348 .color-N4{color:#CFD2DD;} + .d2-4172381348 .color-N5{color:#DEE1EB;} + .d2-4172381348 .color-N6{color:#EEF1F8;} + .d2-4172381348 .color-N7{color:#FFFFFF;} + .d2-4172381348 .color-B1{color:#0D32B2;} + .d2-4172381348 .color-B2{color:#0D32B2;} + .d2-4172381348 .color-B3{color:#E3E9FD;} + .d2-4172381348 .color-B4{color:#E3E9FD;} + .d2-4172381348 .color-B5{color:#EDF0FD;} + .d2-4172381348 .color-B6{color:#F7F8FE;} + .d2-4172381348 .color-AA2{color:#4A6FF3;} + .d2-4172381348 .color-AA4{color:#EDF0FD;} + .d2-4172381348 .color-AA5{color:#F7F8FE;} + .d2-4172381348 .color-AB4{color:#EDF0FD;} + .d2-4172381348 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4172381348);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4172381348);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4172381348);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4172381348);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4172381348);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4172381348);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4172381348);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4172381348);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4172381348);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4172381348);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4172381348);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4172381348);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4172381348);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4172381348);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4172381348);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4172381348);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4172381348);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4172381348);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/unconnected/dagre/board.exp.json b/e2etests/testdata/regression/unconnected/dagre/board.exp.json index 1ab1067fa..f8032e78c 100644 --- a/e2etests/testdata/regression/unconnected/dagre/board.exp.json +++ b/e2etests/testdata/regression/unconnected/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -140,6 +151,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -181,6 +193,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -222,6 +235,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -263,6 +277,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -304,6 +319,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -345,6 +361,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -386,6 +403,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -426,6 +444,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -467,6 +486,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -508,6 +528,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -559,6 +580,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 185, @@ -606,6 +628,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 146, @@ -653,6 +676,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 179, @@ -724,6 +748,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 780.8489990234375, @@ -771,6 +796,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 779.2559814453125, @@ -830,6 +856,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 762.5640258789062, @@ -913,6 +940,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1003, @@ -960,6 +988,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1223, @@ -1007,6 +1036,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1367, @@ -1066,6 +1096,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 517.5, @@ -1113,6 +1144,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 539, @@ -1153,6 +1185,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/unconnected/dagre/sketch.exp.svg b/e2etests/testdata/regression/unconnected/dagre/sketch.exp.svg index 11aece21d..2819f4061 100644 --- a/e2etests/testdata/regression/unconnected/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/unconnected/dagre/sketch.exp.svg @@ -1,20 +1,20 @@ -Workflow-I (Warehousing, Installation)OEM FactoryOEM WarehouseDistributor WarehouseGos WarehouseCustomer SiteMasterRegional-1Regional-2Regional-N
      +Workflow-I (Warehousing, Installation)OEM FactoryOEM WarehouseDistributor WarehouseGos WarehouseCustomer SiteMasterRegional-1Regional-2Regional-N
      • Asset Tagging
      • Inventory
      • Staging
      • Dispatch to Site
      -
      InstallationSupport +
    InstallationSupport - - - - - - - - - - - - - + + + + + + + + + + + + +     \ No newline at end of file diff --git a/e2etests/testdata/regression/unconnected/elk/board.exp.json b/e2etests/testdata/regression/unconnected/elk/board.exp.json index d45f7a548..184034e85 100644 --- a/e2etests/testdata/regression/unconnected/elk/board.exp.json +++ b/e2etests/testdata/regression/unconnected/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -140,6 +151,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -181,6 +193,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -222,6 +235,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -263,6 +277,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -304,6 +319,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -345,6 +361,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -386,6 +403,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -426,6 +444,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -467,6 +486,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -508,6 +528,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -559,6 +580,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 238, @@ -605,6 +627,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 238, @@ -651,6 +674,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 238, @@ -697,6 +721,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 840, @@ -735,6 +760,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 840, @@ -781,6 +807,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 840, @@ -835,6 +862,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1090, @@ -881,6 +909,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1290, @@ -919,6 +948,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1420, @@ -965,6 +995,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 549, @@ -1003,6 +1034,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 572, @@ -1034,6 +1066,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/unconnected/elk/sketch.exp.svg b/e2etests/testdata/regression/unconnected/elk/sketch.exp.svg index c47a8ffdc..7db3dcdc9 100644 --- a/e2etests/testdata/regression/unconnected/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/unconnected/elk/sketch.exp.svg @@ -1,20 +1,20 @@ -Workflow-I (Warehousing, Installation)OEM FactoryOEM WarehouseDistributor WarehouseGos WarehouseCustomer SiteMasterRegional-1Regional-2Regional-N
      +Workflow-I (Warehousing, Installation)OEM FactoryOEM WarehouseDistributor WarehouseGos WarehouseCustomer SiteMasterRegional-1Regional-2Regional-N
      • Asset Tagging
      • Inventory
      • Staging
      • Dispatch to Site
      -
      InstallationSupport +
    InstallationSupport - - - - - - - - - - - - - + + + + + + + + + + + + +     \ No newline at end of file diff --git a/e2etests/testdata/regression/unnamed_class_table_code/dagre/board.exp.json b/e2etests/testdata/regression/unnamed_class_table_code/dagre/board.exp.json index 29430c79d..8707a748c 100644 --- a/e2etests/testdata/regression/unnamed_class_table_code/dagre/board.exp.json +++ b/e2etests/testdata/regression/unnamed_class_table_code/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -93,6 +102,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -277,6 +287,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -327,6 +338,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 211, @@ -374,6 +386,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 211, @@ -414,6 +427,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/unnamed_class_table_code/dagre/sketch.exp.svg b/e2etests/testdata/regression/unnamed_class_table_code/dagre/sketch.exp.svg index f3c76bf01..0384faea9 100644 --- a/e2etests/testdata/regression/unnamed_class_table_code/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/unnamed_class_table_code/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ --numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 + .d2-2671705472 .fill-N1{fill:#0A0F25;} + .d2-2671705472 .fill-N2{fill:#676C7E;} + .d2-2671705472 .fill-N3{fill:#9499AB;} + .d2-2671705472 .fill-N4{fill:#CFD2DD;} + .d2-2671705472 .fill-N5{fill:#DEE1EB;} + .d2-2671705472 .fill-N6{fill:#EEF1F8;} + .d2-2671705472 .fill-N7{fill:#FFFFFF;} + .d2-2671705472 .fill-B1{fill:#0D32B2;} + .d2-2671705472 .fill-B2{fill:#0D32B2;} + .d2-2671705472 .fill-B3{fill:#E3E9FD;} + .d2-2671705472 .fill-B4{fill:#E3E9FD;} + .d2-2671705472 .fill-B5{fill:#EDF0FD;} + .d2-2671705472 .fill-B6{fill:#F7F8FE;} + .d2-2671705472 .fill-AA2{fill:#4A6FF3;} + .d2-2671705472 .fill-AA4{fill:#EDF0FD;} + .d2-2671705472 .fill-AA5{fill:#F7F8FE;} + .d2-2671705472 .fill-AB4{fill:#EDF0FD;} + .d2-2671705472 .fill-AB5{fill:#F7F8FE;} + .d2-2671705472 .stroke-N1{stroke:#0A0F25;} + .d2-2671705472 .stroke-N2{stroke:#676C7E;} + .d2-2671705472 .stroke-N3{stroke:#9499AB;} + .d2-2671705472 .stroke-N4{stroke:#CFD2DD;} + .d2-2671705472 .stroke-N5{stroke:#DEE1EB;} + .d2-2671705472 .stroke-N6{stroke:#EEF1F8;} + .d2-2671705472 .stroke-N7{stroke:#FFFFFF;} + .d2-2671705472 .stroke-B1{stroke:#0D32B2;} + .d2-2671705472 .stroke-B2{stroke:#0D32B2;} + .d2-2671705472 .stroke-B3{stroke:#E3E9FD;} + .d2-2671705472 .stroke-B4{stroke:#E3E9FD;} + .d2-2671705472 .stroke-B5{stroke:#EDF0FD;} + .d2-2671705472 .stroke-B6{stroke:#F7F8FE;} + .d2-2671705472 .stroke-AA2{stroke:#4A6FF3;} + .d2-2671705472 .stroke-AA4{stroke:#EDF0FD;} + .d2-2671705472 .stroke-AA5{stroke:#F7F8FE;} + .d2-2671705472 .stroke-AB4{stroke:#EDF0FD;} + .d2-2671705472 .stroke-AB5{stroke:#F7F8FE;} + .d2-2671705472 .background-color-N1{background-color:#0A0F25;} + .d2-2671705472 .background-color-N2{background-color:#676C7E;} + .d2-2671705472 .background-color-N3{background-color:#9499AB;} + .d2-2671705472 .background-color-N4{background-color:#CFD2DD;} + .d2-2671705472 .background-color-N5{background-color:#DEE1EB;} + .d2-2671705472 .background-color-N6{background-color:#EEF1F8;} + .d2-2671705472 .background-color-N7{background-color:#FFFFFF;} + .d2-2671705472 .background-color-B1{background-color:#0D32B2;} + .d2-2671705472 .background-color-B2{background-color:#0D32B2;} + .d2-2671705472 .background-color-B3{background-color:#E3E9FD;} + .d2-2671705472 .background-color-B4{background-color:#E3E9FD;} + .d2-2671705472 .background-color-B5{background-color:#EDF0FD;} + .d2-2671705472 .background-color-B6{background-color:#F7F8FE;} + .d2-2671705472 .background-color-AA2{background-color:#4A6FF3;} + .d2-2671705472 .background-color-AA4{background-color:#EDF0FD;} + .d2-2671705472 .background-color-AA5{background-color:#F7F8FE;} + .d2-2671705472 .background-color-AB4{background-color:#EDF0FD;} + .d2-2671705472 .background-color-AB5{background-color:#F7F8FE;} + .d2-2671705472 .color-N1{color:#0A0F25;} + .d2-2671705472 .color-N2{color:#676C7E;} + .d2-2671705472 .color-N3{color:#9499AB;} + .d2-2671705472 .color-N4{color:#CFD2DD;} + .d2-2671705472 .color-N5{color:#DEE1EB;} + .d2-2671705472 .color-N6{color:#EEF1F8;} + .d2-2671705472 .color-N7{color:#FFFFFF;} + .d2-2671705472 .color-B1{color:#0D32B2;} + .d2-2671705472 .color-B2{color:#0D32B2;} + .d2-2671705472 .color-B3{color:#E3E9FD;} + .d2-2671705472 .color-B4{color:#E3E9FD;} + .d2-2671705472 .color-B5{color:#EDF0FD;} + .d2-2671705472 .color-B6{color:#F7F8FE;} + .d2-2671705472 .color-AA2{color:#4A6FF3;} + .d2-2671705472 .color-AA4{color:#EDF0FD;} + .d2-2671705472 .color-AA5{color:#F7F8FE;} + .d2-2671705472 .color-AB4{color:#EDF0FD;} + .d2-2671705472 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2671705472);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2671705472);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2671705472);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2671705472);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2671705472);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2671705472);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2671705472);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2671705472);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2671705472);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2671705472);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2671705472);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2671705472);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2671705472);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2671705472);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2671705472);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2671705472);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2671705472);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2671705472);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b) +fmt.Printf("%d", b) - + \ No newline at end of file diff --git a/e2etests/testdata/regression/unnamed_class_table_code/elk/board.exp.json b/e2etests/testdata/regression/unnamed_class_table_code/elk/board.exp.json index e98b6ca39..1f3c9e276 100644 --- a/e2etests/testdata/regression/unnamed_class_table_code/elk/board.exp.json +++ b/e2etests/testdata/regression/unnamed_class_table_code/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -93,6 +102,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -277,6 +287,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -327,6 +338,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 223, @@ -365,6 +377,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 223, @@ -396,6 +409,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/regression/unnamed_class_table_code/elk/sketch.exp.svg b/e2etests/testdata/regression/unnamed_class_table_code/elk/sketch.exp.svg index 61ccbfcf0..9753c0c73 100644 --- a/e2etests/testdata/regression/unnamed_class_table_code/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/unnamed_class_table_code/elk/sketch.exp.svg @@ -1,23 +1,23 @@ --numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 + .d2-3968756984 .fill-N1{fill:#0A0F25;} + .d2-3968756984 .fill-N2{fill:#676C7E;} + .d2-3968756984 .fill-N3{fill:#9499AB;} + .d2-3968756984 .fill-N4{fill:#CFD2DD;} + .d2-3968756984 .fill-N5{fill:#DEE1EB;} + .d2-3968756984 .fill-N6{fill:#EEF1F8;} + .d2-3968756984 .fill-N7{fill:#FFFFFF;} + .d2-3968756984 .fill-B1{fill:#0D32B2;} + .d2-3968756984 .fill-B2{fill:#0D32B2;} + .d2-3968756984 .fill-B3{fill:#E3E9FD;} + .d2-3968756984 .fill-B4{fill:#E3E9FD;} + .d2-3968756984 .fill-B5{fill:#EDF0FD;} + .d2-3968756984 .fill-B6{fill:#F7F8FE;} + .d2-3968756984 .fill-AA2{fill:#4A6FF3;} + .d2-3968756984 .fill-AA4{fill:#EDF0FD;} + .d2-3968756984 .fill-AA5{fill:#F7F8FE;} + .d2-3968756984 .fill-AB4{fill:#EDF0FD;} + .d2-3968756984 .fill-AB5{fill:#F7F8FE;} + .d2-3968756984 .stroke-N1{stroke:#0A0F25;} + .d2-3968756984 .stroke-N2{stroke:#676C7E;} + .d2-3968756984 .stroke-N3{stroke:#9499AB;} + .d2-3968756984 .stroke-N4{stroke:#CFD2DD;} + .d2-3968756984 .stroke-N5{stroke:#DEE1EB;} + .d2-3968756984 .stroke-N6{stroke:#EEF1F8;} + .d2-3968756984 .stroke-N7{stroke:#FFFFFF;} + .d2-3968756984 .stroke-B1{stroke:#0D32B2;} + .d2-3968756984 .stroke-B2{stroke:#0D32B2;} + .d2-3968756984 .stroke-B3{stroke:#E3E9FD;} + .d2-3968756984 .stroke-B4{stroke:#E3E9FD;} + .d2-3968756984 .stroke-B5{stroke:#EDF0FD;} + .d2-3968756984 .stroke-B6{stroke:#F7F8FE;} + .d2-3968756984 .stroke-AA2{stroke:#4A6FF3;} + .d2-3968756984 .stroke-AA4{stroke:#EDF0FD;} + .d2-3968756984 .stroke-AA5{stroke:#F7F8FE;} + .d2-3968756984 .stroke-AB4{stroke:#EDF0FD;} + .d2-3968756984 .stroke-AB5{stroke:#F7F8FE;} + .d2-3968756984 .background-color-N1{background-color:#0A0F25;} + .d2-3968756984 .background-color-N2{background-color:#676C7E;} + .d2-3968756984 .background-color-N3{background-color:#9499AB;} + .d2-3968756984 .background-color-N4{background-color:#CFD2DD;} + .d2-3968756984 .background-color-N5{background-color:#DEE1EB;} + .d2-3968756984 .background-color-N6{background-color:#EEF1F8;} + .d2-3968756984 .background-color-N7{background-color:#FFFFFF;} + .d2-3968756984 .background-color-B1{background-color:#0D32B2;} + .d2-3968756984 .background-color-B2{background-color:#0D32B2;} + .d2-3968756984 .background-color-B3{background-color:#E3E9FD;} + .d2-3968756984 .background-color-B4{background-color:#E3E9FD;} + .d2-3968756984 .background-color-B5{background-color:#EDF0FD;} + .d2-3968756984 .background-color-B6{background-color:#F7F8FE;} + .d2-3968756984 .background-color-AA2{background-color:#4A6FF3;} + .d2-3968756984 .background-color-AA4{background-color:#EDF0FD;} + .d2-3968756984 .background-color-AA5{background-color:#F7F8FE;} + .d2-3968756984 .background-color-AB4{background-color:#EDF0FD;} + .d2-3968756984 .background-color-AB5{background-color:#F7F8FE;} + .d2-3968756984 .color-N1{color:#0A0F25;} + .d2-3968756984 .color-N2{color:#676C7E;} + .d2-3968756984 .color-N3{color:#9499AB;} + .d2-3968756984 .color-N4{color:#CFD2DD;} + .d2-3968756984 .color-N5{color:#DEE1EB;} + .d2-3968756984 .color-N6{color:#EEF1F8;} + .d2-3968756984 .color-N7{color:#FFFFFF;} + .d2-3968756984 .color-B1{color:#0D32B2;} + .d2-3968756984 .color-B2{color:#0D32B2;} + .d2-3968756984 .color-B3{color:#E3E9FD;} + .d2-3968756984 .color-B4{color:#E3E9FD;} + .d2-3968756984 .color-B5{color:#EDF0FD;} + .d2-3968756984 .color-B6{color:#F7F8FE;} + .d2-3968756984 .color-AA2{color:#4A6FF3;} + .d2-3968756984 .color-AA4{color:#EDF0FD;} + .d2-3968756984 .color-AA5{color:#F7F8FE;} + .d2-3968756984 .color-AB4{color:#EDF0FD;} + .d2-3968756984 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3968756984);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3968756984);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3968756984);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3968756984);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3968756984);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3968756984);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3968756984);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3968756984);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3968756984);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3968756984);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3968756984);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3968756984);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3968756984);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3968756984);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3968756984);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3968756984);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3968756984);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3968756984);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b) +fmt.Printf("%d", b) - + \ No newline at end of file diff --git a/e2etests/testdata/root/border-radius/dagre/board.exp.json b/e2etests/testdata/root/border-radius/dagre/board.exp.json index 4bba6b7bc..ba5d7d989 100644 --- a/e2etests/testdata/root/border-radius/dagre/board.exp.json +++ b/e2etests/testdata/root/border-radius/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -143,6 +154,7 @@ "borderRadius": 10, "fill": "LightSteelBlue", "stroke": "#191970", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/root/border-radius/dagre/sketch.exp.svg b/e2etests/testdata/root/border-radius/dagre/sketch.exp.svg index f9c157541..856d47eab 100644 --- a/e2etests/testdata/root/border-radius/dagre/sketch.exp.svg +++ b/e2etests/testdata/root/border-radius/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -we all livein a LightSteelBluesubmarine + .d2-749445856 .fill-N1{fill:#0A0F25;} + .d2-749445856 .fill-N2{fill:#676C7E;} + .d2-749445856 .fill-N3{fill:#9499AB;} + .d2-749445856 .fill-N4{fill:#CFD2DD;} + .d2-749445856 .fill-N5{fill:#DEE1EB;} + .d2-749445856 .fill-N6{fill:#EEF1F8;} + .d2-749445856 .fill-N7{fill:#FFFFFF;} + .d2-749445856 .fill-B1{fill:#0D32B2;} + .d2-749445856 .fill-B2{fill:#0D32B2;} + .d2-749445856 .fill-B3{fill:#E3E9FD;} + .d2-749445856 .fill-B4{fill:#E3E9FD;} + .d2-749445856 .fill-B5{fill:#EDF0FD;} + .d2-749445856 .fill-B6{fill:#F7F8FE;} + .d2-749445856 .fill-AA2{fill:#4A6FF3;} + .d2-749445856 .fill-AA4{fill:#EDF0FD;} + .d2-749445856 .fill-AA5{fill:#F7F8FE;} + .d2-749445856 .fill-AB4{fill:#EDF0FD;} + .d2-749445856 .fill-AB5{fill:#F7F8FE;} + .d2-749445856 .stroke-N1{stroke:#0A0F25;} + .d2-749445856 .stroke-N2{stroke:#676C7E;} + .d2-749445856 .stroke-N3{stroke:#9499AB;} + .d2-749445856 .stroke-N4{stroke:#CFD2DD;} + .d2-749445856 .stroke-N5{stroke:#DEE1EB;} + .d2-749445856 .stroke-N6{stroke:#EEF1F8;} + .d2-749445856 .stroke-N7{stroke:#FFFFFF;} + .d2-749445856 .stroke-B1{stroke:#0D32B2;} + .d2-749445856 .stroke-B2{stroke:#0D32B2;} + .d2-749445856 .stroke-B3{stroke:#E3E9FD;} + .d2-749445856 .stroke-B4{stroke:#E3E9FD;} + .d2-749445856 .stroke-B5{stroke:#EDF0FD;} + .d2-749445856 .stroke-B6{stroke:#F7F8FE;} + .d2-749445856 .stroke-AA2{stroke:#4A6FF3;} + .d2-749445856 .stroke-AA4{stroke:#EDF0FD;} + .d2-749445856 .stroke-AA5{stroke:#F7F8FE;} + .d2-749445856 .stroke-AB4{stroke:#EDF0FD;} + .d2-749445856 .stroke-AB5{stroke:#F7F8FE;} + .d2-749445856 .background-color-N1{background-color:#0A0F25;} + .d2-749445856 .background-color-N2{background-color:#676C7E;} + .d2-749445856 .background-color-N3{background-color:#9499AB;} + .d2-749445856 .background-color-N4{background-color:#CFD2DD;} + .d2-749445856 .background-color-N5{background-color:#DEE1EB;} + .d2-749445856 .background-color-N6{background-color:#EEF1F8;} + .d2-749445856 .background-color-N7{background-color:#FFFFFF;} + .d2-749445856 .background-color-B1{background-color:#0D32B2;} + .d2-749445856 .background-color-B2{background-color:#0D32B2;} + .d2-749445856 .background-color-B3{background-color:#E3E9FD;} + .d2-749445856 .background-color-B4{background-color:#E3E9FD;} + .d2-749445856 .background-color-B5{background-color:#EDF0FD;} + .d2-749445856 .background-color-B6{background-color:#F7F8FE;} + .d2-749445856 .background-color-AA2{background-color:#4A6FF3;} + .d2-749445856 .background-color-AA4{background-color:#EDF0FD;} + .d2-749445856 .background-color-AA5{background-color:#F7F8FE;} + .d2-749445856 .background-color-AB4{background-color:#EDF0FD;} + .d2-749445856 .background-color-AB5{background-color:#F7F8FE;} + .d2-749445856 .color-N1{color:#0A0F25;} + .d2-749445856 .color-N2{color:#676C7E;} + .d2-749445856 .color-N3{color:#9499AB;} + .d2-749445856 .color-N4{color:#CFD2DD;} + .d2-749445856 .color-N5{color:#DEE1EB;} + .d2-749445856 .color-N6{color:#EEF1F8;} + .d2-749445856 .color-N7{color:#FFFFFF;} + .d2-749445856 .color-B1{color:#0D32B2;} + .d2-749445856 .color-B2{color:#0D32B2;} + .d2-749445856 .color-B3{color:#E3E9FD;} + .d2-749445856 .color-B4{color:#E3E9FD;} + .d2-749445856 .color-B5{color:#EDF0FD;} + .d2-749445856 .color-B6{color:#F7F8FE;} + .d2-749445856 .color-AA2{color:#4A6FF3;} + .d2-749445856 .color-AA4{color:#EDF0FD;} + .d2-749445856 .color-AA5{color:#F7F8FE;} + .d2-749445856 .color-AB4{color:#EDF0FD;} + .d2-749445856 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-749445856);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-749445856);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-749445856);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-749445856);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-749445856);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-749445856);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-749445856);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-749445856);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-749445856);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-749445856);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-749445856);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-749445856);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-749445856);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-749445856);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-749445856);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-749445856);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-749445856);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-749445856);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>we all livein a LightSteelBluesubmarine - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/root/border-radius/elk/board.exp.json b/e2etests/testdata/root/border-radius/elk/board.exp.json index 2a2fc1682..7f9520092 100644 --- a/e2etests/testdata/root/border-radius/elk/board.exp.json +++ b/e2etests/testdata/root/border-radius/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -143,6 +154,7 @@ "borderRadius": 10, "fill": "LightSteelBlue", "stroke": "#191970", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/root/border-radius/elk/sketch.exp.svg b/e2etests/testdata/root/border-radius/elk/sketch.exp.svg index f00b85020..77103cfaf 100644 --- a/e2etests/testdata/root/border-radius/elk/sketch.exp.svg +++ b/e2etests/testdata/root/border-radius/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -we all livein a LightSteelBluesubmarine + .d2-1259653457 .fill-N1{fill:#0A0F25;} + .d2-1259653457 .fill-N2{fill:#676C7E;} + .d2-1259653457 .fill-N3{fill:#9499AB;} + .d2-1259653457 .fill-N4{fill:#CFD2DD;} + .d2-1259653457 .fill-N5{fill:#DEE1EB;} + .d2-1259653457 .fill-N6{fill:#EEF1F8;} + .d2-1259653457 .fill-N7{fill:#FFFFFF;} + .d2-1259653457 .fill-B1{fill:#0D32B2;} + .d2-1259653457 .fill-B2{fill:#0D32B2;} + .d2-1259653457 .fill-B3{fill:#E3E9FD;} + .d2-1259653457 .fill-B4{fill:#E3E9FD;} + .d2-1259653457 .fill-B5{fill:#EDF0FD;} + .d2-1259653457 .fill-B6{fill:#F7F8FE;} + .d2-1259653457 .fill-AA2{fill:#4A6FF3;} + .d2-1259653457 .fill-AA4{fill:#EDF0FD;} + .d2-1259653457 .fill-AA5{fill:#F7F8FE;} + .d2-1259653457 .fill-AB4{fill:#EDF0FD;} + .d2-1259653457 .fill-AB5{fill:#F7F8FE;} + .d2-1259653457 .stroke-N1{stroke:#0A0F25;} + .d2-1259653457 .stroke-N2{stroke:#676C7E;} + .d2-1259653457 .stroke-N3{stroke:#9499AB;} + .d2-1259653457 .stroke-N4{stroke:#CFD2DD;} + .d2-1259653457 .stroke-N5{stroke:#DEE1EB;} + .d2-1259653457 .stroke-N6{stroke:#EEF1F8;} + .d2-1259653457 .stroke-N7{stroke:#FFFFFF;} + .d2-1259653457 .stroke-B1{stroke:#0D32B2;} + .d2-1259653457 .stroke-B2{stroke:#0D32B2;} + .d2-1259653457 .stroke-B3{stroke:#E3E9FD;} + .d2-1259653457 .stroke-B4{stroke:#E3E9FD;} + .d2-1259653457 .stroke-B5{stroke:#EDF0FD;} + .d2-1259653457 .stroke-B6{stroke:#F7F8FE;} + .d2-1259653457 .stroke-AA2{stroke:#4A6FF3;} + .d2-1259653457 .stroke-AA4{stroke:#EDF0FD;} + .d2-1259653457 .stroke-AA5{stroke:#F7F8FE;} + .d2-1259653457 .stroke-AB4{stroke:#EDF0FD;} + .d2-1259653457 .stroke-AB5{stroke:#F7F8FE;} + .d2-1259653457 .background-color-N1{background-color:#0A0F25;} + .d2-1259653457 .background-color-N2{background-color:#676C7E;} + .d2-1259653457 .background-color-N3{background-color:#9499AB;} + .d2-1259653457 .background-color-N4{background-color:#CFD2DD;} + .d2-1259653457 .background-color-N5{background-color:#DEE1EB;} + .d2-1259653457 .background-color-N6{background-color:#EEF1F8;} + .d2-1259653457 .background-color-N7{background-color:#FFFFFF;} + .d2-1259653457 .background-color-B1{background-color:#0D32B2;} + .d2-1259653457 .background-color-B2{background-color:#0D32B2;} + .d2-1259653457 .background-color-B3{background-color:#E3E9FD;} + .d2-1259653457 .background-color-B4{background-color:#E3E9FD;} + .d2-1259653457 .background-color-B5{background-color:#EDF0FD;} + .d2-1259653457 .background-color-B6{background-color:#F7F8FE;} + .d2-1259653457 .background-color-AA2{background-color:#4A6FF3;} + .d2-1259653457 .background-color-AA4{background-color:#EDF0FD;} + .d2-1259653457 .background-color-AA5{background-color:#F7F8FE;} + .d2-1259653457 .background-color-AB4{background-color:#EDF0FD;} + .d2-1259653457 .background-color-AB5{background-color:#F7F8FE;} + .d2-1259653457 .color-N1{color:#0A0F25;} + .d2-1259653457 .color-N2{color:#676C7E;} + .d2-1259653457 .color-N3{color:#9499AB;} + .d2-1259653457 .color-N4{color:#CFD2DD;} + .d2-1259653457 .color-N5{color:#DEE1EB;} + .d2-1259653457 .color-N6{color:#EEF1F8;} + .d2-1259653457 .color-N7{color:#FFFFFF;} + .d2-1259653457 .color-B1{color:#0D32B2;} + .d2-1259653457 .color-B2{color:#0D32B2;} + .d2-1259653457 .color-B3{color:#E3E9FD;} + .d2-1259653457 .color-B4{color:#E3E9FD;} + .d2-1259653457 .color-B5{color:#EDF0FD;} + .d2-1259653457 .color-B6{color:#F7F8FE;} + .d2-1259653457 .color-AA2{color:#4A6FF3;} + .d2-1259653457 .color-AA4{color:#EDF0FD;} + .d2-1259653457 .color-AA5{color:#F7F8FE;} + .d2-1259653457 .color-AB4{color:#EDF0FD;} + .d2-1259653457 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1259653457);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1259653457);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1259653457);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1259653457);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1259653457);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1259653457);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1259653457);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1259653457);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1259653457);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1259653457);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1259653457);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1259653457);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1259653457);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1259653457);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1259653457);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1259653457);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1259653457);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1259653457);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>we all livein a LightSteelBluesubmarine - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/root/double-border/dagre/board.exp.json b/e2etests/testdata/root/double-border/dagre/board.exp.json index 80804eadf..0f7321c04 100644 --- a/e2etests/testdata/root/double-border/dagre/board.exp.json +++ b/e2etests/testdata/root/double-border/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -143,6 +154,7 @@ "borderRadius": 0, "fill": "LightSteelBlue", "stroke": "#191970", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/root/double-border/dagre/sketch.exp.svg b/e2etests/testdata/root/double-border/dagre/sketch.exp.svg index 88dd6cd9e..b17d83be3 100644 --- a/e2etests/testdata/root/double-border/dagre/sketch.exp.svg +++ b/e2etests/testdata/root/double-border/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -we all livein a LightSteelBluesubmarine + .d2-1933074482 .fill-N1{fill:#0A0F25;} + .d2-1933074482 .fill-N2{fill:#676C7E;} + .d2-1933074482 .fill-N3{fill:#9499AB;} + .d2-1933074482 .fill-N4{fill:#CFD2DD;} + .d2-1933074482 .fill-N5{fill:#DEE1EB;} + .d2-1933074482 .fill-N6{fill:#EEF1F8;} + .d2-1933074482 .fill-N7{fill:#FFFFFF;} + .d2-1933074482 .fill-B1{fill:#0D32B2;} + .d2-1933074482 .fill-B2{fill:#0D32B2;} + .d2-1933074482 .fill-B3{fill:#E3E9FD;} + .d2-1933074482 .fill-B4{fill:#E3E9FD;} + .d2-1933074482 .fill-B5{fill:#EDF0FD;} + .d2-1933074482 .fill-B6{fill:#F7F8FE;} + .d2-1933074482 .fill-AA2{fill:#4A6FF3;} + .d2-1933074482 .fill-AA4{fill:#EDF0FD;} + .d2-1933074482 .fill-AA5{fill:#F7F8FE;} + .d2-1933074482 .fill-AB4{fill:#EDF0FD;} + .d2-1933074482 .fill-AB5{fill:#F7F8FE;} + .d2-1933074482 .stroke-N1{stroke:#0A0F25;} + .d2-1933074482 .stroke-N2{stroke:#676C7E;} + .d2-1933074482 .stroke-N3{stroke:#9499AB;} + .d2-1933074482 .stroke-N4{stroke:#CFD2DD;} + .d2-1933074482 .stroke-N5{stroke:#DEE1EB;} + .d2-1933074482 .stroke-N6{stroke:#EEF1F8;} + .d2-1933074482 .stroke-N7{stroke:#FFFFFF;} + .d2-1933074482 .stroke-B1{stroke:#0D32B2;} + .d2-1933074482 .stroke-B2{stroke:#0D32B2;} + .d2-1933074482 .stroke-B3{stroke:#E3E9FD;} + .d2-1933074482 .stroke-B4{stroke:#E3E9FD;} + .d2-1933074482 .stroke-B5{stroke:#EDF0FD;} + .d2-1933074482 .stroke-B6{stroke:#F7F8FE;} + .d2-1933074482 .stroke-AA2{stroke:#4A6FF3;} + .d2-1933074482 .stroke-AA4{stroke:#EDF0FD;} + .d2-1933074482 .stroke-AA5{stroke:#F7F8FE;} + .d2-1933074482 .stroke-AB4{stroke:#EDF0FD;} + .d2-1933074482 .stroke-AB5{stroke:#F7F8FE;} + .d2-1933074482 .background-color-N1{background-color:#0A0F25;} + .d2-1933074482 .background-color-N2{background-color:#676C7E;} + .d2-1933074482 .background-color-N3{background-color:#9499AB;} + .d2-1933074482 .background-color-N4{background-color:#CFD2DD;} + .d2-1933074482 .background-color-N5{background-color:#DEE1EB;} + .d2-1933074482 .background-color-N6{background-color:#EEF1F8;} + .d2-1933074482 .background-color-N7{background-color:#FFFFFF;} + .d2-1933074482 .background-color-B1{background-color:#0D32B2;} + .d2-1933074482 .background-color-B2{background-color:#0D32B2;} + .d2-1933074482 .background-color-B3{background-color:#E3E9FD;} + .d2-1933074482 .background-color-B4{background-color:#E3E9FD;} + .d2-1933074482 .background-color-B5{background-color:#EDF0FD;} + .d2-1933074482 .background-color-B6{background-color:#F7F8FE;} + .d2-1933074482 .background-color-AA2{background-color:#4A6FF3;} + .d2-1933074482 .background-color-AA4{background-color:#EDF0FD;} + .d2-1933074482 .background-color-AA5{background-color:#F7F8FE;} + .d2-1933074482 .background-color-AB4{background-color:#EDF0FD;} + .d2-1933074482 .background-color-AB5{background-color:#F7F8FE;} + .d2-1933074482 .color-N1{color:#0A0F25;} + .d2-1933074482 .color-N2{color:#676C7E;} + .d2-1933074482 .color-N3{color:#9499AB;} + .d2-1933074482 .color-N4{color:#CFD2DD;} + .d2-1933074482 .color-N5{color:#DEE1EB;} + .d2-1933074482 .color-N6{color:#EEF1F8;} + .d2-1933074482 .color-N7{color:#FFFFFF;} + .d2-1933074482 .color-B1{color:#0D32B2;} + .d2-1933074482 .color-B2{color:#0D32B2;} + .d2-1933074482 .color-B3{color:#E3E9FD;} + .d2-1933074482 .color-B4{color:#E3E9FD;} + .d2-1933074482 .color-B5{color:#EDF0FD;} + .d2-1933074482 .color-B6{color:#F7F8FE;} + .d2-1933074482 .color-AA2{color:#4A6FF3;} + .d2-1933074482 .color-AA4{color:#EDF0FD;} + .d2-1933074482 .color-AA5{color:#F7F8FE;} + .d2-1933074482 .color-AB4{color:#EDF0FD;} + .d2-1933074482 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1933074482);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1933074482);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1933074482);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1933074482);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1933074482);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1933074482);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1933074482);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1933074482);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1933074482);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1933074482);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1933074482);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1933074482);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1933074482);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1933074482);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1933074482);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1933074482);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1933074482);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1933074482);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>we all livein a LightSteelBluesubmarine - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/root/double-border/elk/board.exp.json b/e2etests/testdata/root/double-border/elk/board.exp.json index 08fa999af..777cd3b1f 100644 --- a/e2etests/testdata/root/double-border/elk/board.exp.json +++ b/e2etests/testdata/root/double-border/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -143,6 +154,7 @@ "borderRadius": 0, "fill": "LightSteelBlue", "stroke": "#191970", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/root/double-border/elk/sketch.exp.svg b/e2etests/testdata/root/double-border/elk/sketch.exp.svg index 6c40a30b9..f9c1c7012 100644 --- a/e2etests/testdata/root/double-border/elk/sketch.exp.svg +++ b/e2etests/testdata/root/double-border/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -we all livein a LightSteelBluesubmarine + .d2-3921775975 .fill-N1{fill:#0A0F25;} + .d2-3921775975 .fill-N2{fill:#676C7E;} + .d2-3921775975 .fill-N3{fill:#9499AB;} + .d2-3921775975 .fill-N4{fill:#CFD2DD;} + .d2-3921775975 .fill-N5{fill:#DEE1EB;} + .d2-3921775975 .fill-N6{fill:#EEF1F8;} + .d2-3921775975 .fill-N7{fill:#FFFFFF;} + .d2-3921775975 .fill-B1{fill:#0D32B2;} + .d2-3921775975 .fill-B2{fill:#0D32B2;} + .d2-3921775975 .fill-B3{fill:#E3E9FD;} + .d2-3921775975 .fill-B4{fill:#E3E9FD;} + .d2-3921775975 .fill-B5{fill:#EDF0FD;} + .d2-3921775975 .fill-B6{fill:#F7F8FE;} + .d2-3921775975 .fill-AA2{fill:#4A6FF3;} + .d2-3921775975 .fill-AA4{fill:#EDF0FD;} + .d2-3921775975 .fill-AA5{fill:#F7F8FE;} + .d2-3921775975 .fill-AB4{fill:#EDF0FD;} + .d2-3921775975 .fill-AB5{fill:#F7F8FE;} + .d2-3921775975 .stroke-N1{stroke:#0A0F25;} + .d2-3921775975 .stroke-N2{stroke:#676C7E;} + .d2-3921775975 .stroke-N3{stroke:#9499AB;} + .d2-3921775975 .stroke-N4{stroke:#CFD2DD;} + .d2-3921775975 .stroke-N5{stroke:#DEE1EB;} + .d2-3921775975 .stroke-N6{stroke:#EEF1F8;} + .d2-3921775975 .stroke-N7{stroke:#FFFFFF;} + .d2-3921775975 .stroke-B1{stroke:#0D32B2;} + .d2-3921775975 .stroke-B2{stroke:#0D32B2;} + .d2-3921775975 .stroke-B3{stroke:#E3E9FD;} + .d2-3921775975 .stroke-B4{stroke:#E3E9FD;} + .d2-3921775975 .stroke-B5{stroke:#EDF0FD;} + .d2-3921775975 .stroke-B6{stroke:#F7F8FE;} + .d2-3921775975 .stroke-AA2{stroke:#4A6FF3;} + .d2-3921775975 .stroke-AA4{stroke:#EDF0FD;} + .d2-3921775975 .stroke-AA5{stroke:#F7F8FE;} + .d2-3921775975 .stroke-AB4{stroke:#EDF0FD;} + .d2-3921775975 .stroke-AB5{stroke:#F7F8FE;} + .d2-3921775975 .background-color-N1{background-color:#0A0F25;} + .d2-3921775975 .background-color-N2{background-color:#676C7E;} + .d2-3921775975 .background-color-N3{background-color:#9499AB;} + .d2-3921775975 .background-color-N4{background-color:#CFD2DD;} + .d2-3921775975 .background-color-N5{background-color:#DEE1EB;} + .d2-3921775975 .background-color-N6{background-color:#EEF1F8;} + .d2-3921775975 .background-color-N7{background-color:#FFFFFF;} + .d2-3921775975 .background-color-B1{background-color:#0D32B2;} + .d2-3921775975 .background-color-B2{background-color:#0D32B2;} + .d2-3921775975 .background-color-B3{background-color:#E3E9FD;} + .d2-3921775975 .background-color-B4{background-color:#E3E9FD;} + .d2-3921775975 .background-color-B5{background-color:#EDF0FD;} + .d2-3921775975 .background-color-B6{background-color:#F7F8FE;} + .d2-3921775975 .background-color-AA2{background-color:#4A6FF3;} + .d2-3921775975 .background-color-AA4{background-color:#EDF0FD;} + .d2-3921775975 .background-color-AA5{background-color:#F7F8FE;} + .d2-3921775975 .background-color-AB4{background-color:#EDF0FD;} + .d2-3921775975 .background-color-AB5{background-color:#F7F8FE;} + .d2-3921775975 .color-N1{color:#0A0F25;} + .d2-3921775975 .color-N2{color:#676C7E;} + .d2-3921775975 .color-N3{color:#9499AB;} + .d2-3921775975 .color-N4{color:#CFD2DD;} + .d2-3921775975 .color-N5{color:#DEE1EB;} + .d2-3921775975 .color-N6{color:#EEF1F8;} + .d2-3921775975 .color-N7{color:#FFFFFF;} + .d2-3921775975 .color-B1{color:#0D32B2;} + .d2-3921775975 .color-B2{color:#0D32B2;} + .d2-3921775975 .color-B3{color:#E3E9FD;} + .d2-3921775975 .color-B4{color:#E3E9FD;} + .d2-3921775975 .color-B5{color:#EDF0FD;} + .d2-3921775975 .color-B6{color:#F7F8FE;} + .d2-3921775975 .color-AA2{color:#4A6FF3;} + .d2-3921775975 .color-AA4{color:#EDF0FD;} + .d2-3921775975 .color-AA5{color:#F7F8FE;} + .d2-3921775975 .color-AB4{color:#EDF0FD;} + .d2-3921775975 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3921775975);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3921775975);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3921775975);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3921775975);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3921775975);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3921775975);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3921775975);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3921775975);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3921775975);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3921775975);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3921775975);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3921775975);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3921775975);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3921775975);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3921775975);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3921775975);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3921775975);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3921775975);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>we all livein a LightSteelBluesubmarine - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/root/even-stroke-width/dagre/board.exp.json b/e2etests/testdata/root/even-stroke-width/dagre/board.exp.json index 7a7a01118..956fb171a 100644 --- a/e2etests/testdata/root/even-stroke-width/dagre/board.exp.json +++ b/e2etests/testdata/root/even-stroke-width/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -143,6 +154,7 @@ "borderRadius": 0, "fill": "LightSteelBlue", "stroke": "#191970", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/root/even-stroke-width/dagre/sketch.exp.svg b/e2etests/testdata/root/even-stroke-width/dagre/sketch.exp.svg index 0d2cdfc9e..8c95bc7fd 100644 --- a/e2etests/testdata/root/even-stroke-width/dagre/sketch.exp.svg +++ b/e2etests/testdata/root/even-stroke-width/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -we all livein a LightSteelBluesubmarine + .d2-2773685920 .fill-N1{fill:#0A0F25;} + .d2-2773685920 .fill-N2{fill:#676C7E;} + .d2-2773685920 .fill-N3{fill:#9499AB;} + .d2-2773685920 .fill-N4{fill:#CFD2DD;} + .d2-2773685920 .fill-N5{fill:#DEE1EB;} + .d2-2773685920 .fill-N6{fill:#EEF1F8;} + .d2-2773685920 .fill-N7{fill:#FFFFFF;} + .d2-2773685920 .fill-B1{fill:#0D32B2;} + .d2-2773685920 .fill-B2{fill:#0D32B2;} + .d2-2773685920 .fill-B3{fill:#E3E9FD;} + .d2-2773685920 .fill-B4{fill:#E3E9FD;} + .d2-2773685920 .fill-B5{fill:#EDF0FD;} + .d2-2773685920 .fill-B6{fill:#F7F8FE;} + .d2-2773685920 .fill-AA2{fill:#4A6FF3;} + .d2-2773685920 .fill-AA4{fill:#EDF0FD;} + .d2-2773685920 .fill-AA5{fill:#F7F8FE;} + .d2-2773685920 .fill-AB4{fill:#EDF0FD;} + .d2-2773685920 .fill-AB5{fill:#F7F8FE;} + .d2-2773685920 .stroke-N1{stroke:#0A0F25;} + .d2-2773685920 .stroke-N2{stroke:#676C7E;} + .d2-2773685920 .stroke-N3{stroke:#9499AB;} + .d2-2773685920 .stroke-N4{stroke:#CFD2DD;} + .d2-2773685920 .stroke-N5{stroke:#DEE1EB;} + .d2-2773685920 .stroke-N6{stroke:#EEF1F8;} + .d2-2773685920 .stroke-N7{stroke:#FFFFFF;} + .d2-2773685920 .stroke-B1{stroke:#0D32B2;} + .d2-2773685920 .stroke-B2{stroke:#0D32B2;} + .d2-2773685920 .stroke-B3{stroke:#E3E9FD;} + .d2-2773685920 .stroke-B4{stroke:#E3E9FD;} + .d2-2773685920 .stroke-B5{stroke:#EDF0FD;} + .d2-2773685920 .stroke-B6{stroke:#F7F8FE;} + .d2-2773685920 .stroke-AA2{stroke:#4A6FF3;} + .d2-2773685920 .stroke-AA4{stroke:#EDF0FD;} + .d2-2773685920 .stroke-AA5{stroke:#F7F8FE;} + .d2-2773685920 .stroke-AB4{stroke:#EDF0FD;} + .d2-2773685920 .stroke-AB5{stroke:#F7F8FE;} + .d2-2773685920 .background-color-N1{background-color:#0A0F25;} + .d2-2773685920 .background-color-N2{background-color:#676C7E;} + .d2-2773685920 .background-color-N3{background-color:#9499AB;} + .d2-2773685920 .background-color-N4{background-color:#CFD2DD;} + .d2-2773685920 .background-color-N5{background-color:#DEE1EB;} + .d2-2773685920 .background-color-N6{background-color:#EEF1F8;} + .d2-2773685920 .background-color-N7{background-color:#FFFFFF;} + .d2-2773685920 .background-color-B1{background-color:#0D32B2;} + .d2-2773685920 .background-color-B2{background-color:#0D32B2;} + .d2-2773685920 .background-color-B3{background-color:#E3E9FD;} + .d2-2773685920 .background-color-B4{background-color:#E3E9FD;} + .d2-2773685920 .background-color-B5{background-color:#EDF0FD;} + .d2-2773685920 .background-color-B6{background-color:#F7F8FE;} + .d2-2773685920 .background-color-AA2{background-color:#4A6FF3;} + .d2-2773685920 .background-color-AA4{background-color:#EDF0FD;} + .d2-2773685920 .background-color-AA5{background-color:#F7F8FE;} + .d2-2773685920 .background-color-AB4{background-color:#EDF0FD;} + .d2-2773685920 .background-color-AB5{background-color:#F7F8FE;} + .d2-2773685920 .color-N1{color:#0A0F25;} + .d2-2773685920 .color-N2{color:#676C7E;} + .d2-2773685920 .color-N3{color:#9499AB;} + .d2-2773685920 .color-N4{color:#CFD2DD;} + .d2-2773685920 .color-N5{color:#DEE1EB;} + .d2-2773685920 .color-N6{color:#EEF1F8;} + .d2-2773685920 .color-N7{color:#FFFFFF;} + .d2-2773685920 .color-B1{color:#0D32B2;} + .d2-2773685920 .color-B2{color:#0D32B2;} + .d2-2773685920 .color-B3{color:#E3E9FD;} + .d2-2773685920 .color-B4{color:#E3E9FD;} + .d2-2773685920 .color-B5{color:#EDF0FD;} + .d2-2773685920 .color-B6{color:#F7F8FE;} + .d2-2773685920 .color-AA2{color:#4A6FF3;} + .d2-2773685920 .color-AA4{color:#EDF0FD;} + .d2-2773685920 .color-AA5{color:#F7F8FE;} + .d2-2773685920 .color-AB4{color:#EDF0FD;} + .d2-2773685920 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2773685920);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2773685920);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2773685920);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2773685920);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2773685920);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2773685920);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2773685920);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2773685920);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2773685920);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2773685920);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2773685920);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2773685920);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2773685920);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2773685920);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2773685920);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2773685920);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2773685920);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2773685920);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>we all livein a LightSteelBluesubmarine - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/root/even-stroke-width/elk/board.exp.json b/e2etests/testdata/root/even-stroke-width/elk/board.exp.json index 583b74f73..5f215276a 100644 --- a/e2etests/testdata/root/even-stroke-width/elk/board.exp.json +++ b/e2etests/testdata/root/even-stroke-width/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -143,6 +154,7 @@ "borderRadius": 0, "fill": "LightSteelBlue", "stroke": "#191970", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/root/even-stroke-width/elk/sketch.exp.svg b/e2etests/testdata/root/even-stroke-width/elk/sketch.exp.svg index afacb47c3..2edc6643d 100644 --- a/e2etests/testdata/root/even-stroke-width/elk/sketch.exp.svg +++ b/e2etests/testdata/root/even-stroke-width/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -we all livein a LightSteelBluesubmarine + .d2-570392135 .fill-N1{fill:#0A0F25;} + .d2-570392135 .fill-N2{fill:#676C7E;} + .d2-570392135 .fill-N3{fill:#9499AB;} + .d2-570392135 .fill-N4{fill:#CFD2DD;} + .d2-570392135 .fill-N5{fill:#DEE1EB;} + .d2-570392135 .fill-N6{fill:#EEF1F8;} + .d2-570392135 .fill-N7{fill:#FFFFFF;} + .d2-570392135 .fill-B1{fill:#0D32B2;} + .d2-570392135 .fill-B2{fill:#0D32B2;} + .d2-570392135 .fill-B3{fill:#E3E9FD;} + .d2-570392135 .fill-B4{fill:#E3E9FD;} + .d2-570392135 .fill-B5{fill:#EDF0FD;} + .d2-570392135 .fill-B6{fill:#F7F8FE;} + .d2-570392135 .fill-AA2{fill:#4A6FF3;} + .d2-570392135 .fill-AA4{fill:#EDF0FD;} + .d2-570392135 .fill-AA5{fill:#F7F8FE;} + .d2-570392135 .fill-AB4{fill:#EDF0FD;} + .d2-570392135 .fill-AB5{fill:#F7F8FE;} + .d2-570392135 .stroke-N1{stroke:#0A0F25;} + .d2-570392135 .stroke-N2{stroke:#676C7E;} + .d2-570392135 .stroke-N3{stroke:#9499AB;} + .d2-570392135 .stroke-N4{stroke:#CFD2DD;} + .d2-570392135 .stroke-N5{stroke:#DEE1EB;} + .d2-570392135 .stroke-N6{stroke:#EEF1F8;} + .d2-570392135 .stroke-N7{stroke:#FFFFFF;} + .d2-570392135 .stroke-B1{stroke:#0D32B2;} + .d2-570392135 .stroke-B2{stroke:#0D32B2;} + .d2-570392135 .stroke-B3{stroke:#E3E9FD;} + .d2-570392135 .stroke-B4{stroke:#E3E9FD;} + .d2-570392135 .stroke-B5{stroke:#EDF0FD;} + .d2-570392135 .stroke-B6{stroke:#F7F8FE;} + .d2-570392135 .stroke-AA2{stroke:#4A6FF3;} + .d2-570392135 .stroke-AA4{stroke:#EDF0FD;} + .d2-570392135 .stroke-AA5{stroke:#F7F8FE;} + .d2-570392135 .stroke-AB4{stroke:#EDF0FD;} + .d2-570392135 .stroke-AB5{stroke:#F7F8FE;} + .d2-570392135 .background-color-N1{background-color:#0A0F25;} + .d2-570392135 .background-color-N2{background-color:#676C7E;} + .d2-570392135 .background-color-N3{background-color:#9499AB;} + .d2-570392135 .background-color-N4{background-color:#CFD2DD;} + .d2-570392135 .background-color-N5{background-color:#DEE1EB;} + .d2-570392135 .background-color-N6{background-color:#EEF1F8;} + .d2-570392135 .background-color-N7{background-color:#FFFFFF;} + .d2-570392135 .background-color-B1{background-color:#0D32B2;} + .d2-570392135 .background-color-B2{background-color:#0D32B2;} + .d2-570392135 .background-color-B3{background-color:#E3E9FD;} + .d2-570392135 .background-color-B4{background-color:#E3E9FD;} + .d2-570392135 .background-color-B5{background-color:#EDF0FD;} + .d2-570392135 .background-color-B6{background-color:#F7F8FE;} + .d2-570392135 .background-color-AA2{background-color:#4A6FF3;} + .d2-570392135 .background-color-AA4{background-color:#EDF0FD;} + .d2-570392135 .background-color-AA5{background-color:#F7F8FE;} + .d2-570392135 .background-color-AB4{background-color:#EDF0FD;} + .d2-570392135 .background-color-AB5{background-color:#F7F8FE;} + .d2-570392135 .color-N1{color:#0A0F25;} + .d2-570392135 .color-N2{color:#676C7E;} + .d2-570392135 .color-N3{color:#9499AB;} + .d2-570392135 .color-N4{color:#CFD2DD;} + .d2-570392135 .color-N5{color:#DEE1EB;} + .d2-570392135 .color-N6{color:#EEF1F8;} + .d2-570392135 .color-N7{color:#FFFFFF;} + .d2-570392135 .color-B1{color:#0D32B2;} + .d2-570392135 .color-B2{color:#0D32B2;} + .d2-570392135 .color-B3{color:#E3E9FD;} + .d2-570392135 .color-B4{color:#E3E9FD;} + .d2-570392135 .color-B5{color:#EDF0FD;} + .d2-570392135 .color-B6{color:#F7F8FE;} + .d2-570392135 .color-AA2{color:#4A6FF3;} + .d2-570392135 .color-AA4{color:#EDF0FD;} + .d2-570392135 .color-AA5{color:#F7F8FE;} + .d2-570392135 .color-AB4{color:#EDF0FD;} + .d2-570392135 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-570392135);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-570392135);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-570392135);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-570392135);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-570392135);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-570392135);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-570392135);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-570392135);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-570392135);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-570392135);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-570392135);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-570392135);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-570392135);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-570392135);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-570392135);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-570392135);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-570392135);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-570392135);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>we all livein a LightSteelBluesubmarine - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/root/fill/dagre/board.exp.json b/e2etests/testdata/root/fill/dagre/board.exp.json index 44cd107d1..0ad651e6b 100644 --- a/e2etests/testdata/root/fill/dagre/board.exp.json +++ b/e2etests/testdata/root/fill/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -143,6 +154,7 @@ "borderRadius": 0, "fill": "LightSteelBlue", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/root/fill/dagre/sketch.exp.svg b/e2etests/testdata/root/fill/dagre/sketch.exp.svg index 63c2f598c..36ca47c66 100644 --- a/e2etests/testdata/root/fill/dagre/sketch.exp.svg +++ b/e2etests/testdata/root/fill/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -we all livein a LightSteelBluesubmarine + .d2-1579741288 .fill-N1{fill:#0A0F25;} + .d2-1579741288 .fill-N2{fill:#676C7E;} + .d2-1579741288 .fill-N3{fill:#9499AB;} + .d2-1579741288 .fill-N4{fill:#CFD2DD;} + .d2-1579741288 .fill-N5{fill:#DEE1EB;} + .d2-1579741288 .fill-N6{fill:#EEF1F8;} + .d2-1579741288 .fill-N7{fill:#FFFFFF;} + .d2-1579741288 .fill-B1{fill:#0D32B2;} + .d2-1579741288 .fill-B2{fill:#0D32B2;} + .d2-1579741288 .fill-B3{fill:#E3E9FD;} + .d2-1579741288 .fill-B4{fill:#E3E9FD;} + .d2-1579741288 .fill-B5{fill:#EDF0FD;} + .d2-1579741288 .fill-B6{fill:#F7F8FE;} + .d2-1579741288 .fill-AA2{fill:#4A6FF3;} + .d2-1579741288 .fill-AA4{fill:#EDF0FD;} + .d2-1579741288 .fill-AA5{fill:#F7F8FE;} + .d2-1579741288 .fill-AB4{fill:#EDF0FD;} + .d2-1579741288 .fill-AB5{fill:#F7F8FE;} + .d2-1579741288 .stroke-N1{stroke:#0A0F25;} + .d2-1579741288 .stroke-N2{stroke:#676C7E;} + .d2-1579741288 .stroke-N3{stroke:#9499AB;} + .d2-1579741288 .stroke-N4{stroke:#CFD2DD;} + .d2-1579741288 .stroke-N5{stroke:#DEE1EB;} + .d2-1579741288 .stroke-N6{stroke:#EEF1F8;} + .d2-1579741288 .stroke-N7{stroke:#FFFFFF;} + .d2-1579741288 .stroke-B1{stroke:#0D32B2;} + .d2-1579741288 .stroke-B2{stroke:#0D32B2;} + .d2-1579741288 .stroke-B3{stroke:#E3E9FD;} + .d2-1579741288 .stroke-B4{stroke:#E3E9FD;} + .d2-1579741288 .stroke-B5{stroke:#EDF0FD;} + .d2-1579741288 .stroke-B6{stroke:#F7F8FE;} + .d2-1579741288 .stroke-AA2{stroke:#4A6FF3;} + .d2-1579741288 .stroke-AA4{stroke:#EDF0FD;} + .d2-1579741288 .stroke-AA5{stroke:#F7F8FE;} + .d2-1579741288 .stroke-AB4{stroke:#EDF0FD;} + .d2-1579741288 .stroke-AB5{stroke:#F7F8FE;} + .d2-1579741288 .background-color-N1{background-color:#0A0F25;} + .d2-1579741288 .background-color-N2{background-color:#676C7E;} + .d2-1579741288 .background-color-N3{background-color:#9499AB;} + .d2-1579741288 .background-color-N4{background-color:#CFD2DD;} + .d2-1579741288 .background-color-N5{background-color:#DEE1EB;} + .d2-1579741288 .background-color-N6{background-color:#EEF1F8;} + .d2-1579741288 .background-color-N7{background-color:#FFFFFF;} + .d2-1579741288 .background-color-B1{background-color:#0D32B2;} + .d2-1579741288 .background-color-B2{background-color:#0D32B2;} + .d2-1579741288 .background-color-B3{background-color:#E3E9FD;} + .d2-1579741288 .background-color-B4{background-color:#E3E9FD;} + .d2-1579741288 .background-color-B5{background-color:#EDF0FD;} + .d2-1579741288 .background-color-B6{background-color:#F7F8FE;} + .d2-1579741288 .background-color-AA2{background-color:#4A6FF3;} + .d2-1579741288 .background-color-AA4{background-color:#EDF0FD;} + .d2-1579741288 .background-color-AA5{background-color:#F7F8FE;} + .d2-1579741288 .background-color-AB4{background-color:#EDF0FD;} + .d2-1579741288 .background-color-AB5{background-color:#F7F8FE;} + .d2-1579741288 .color-N1{color:#0A0F25;} + .d2-1579741288 .color-N2{color:#676C7E;} + .d2-1579741288 .color-N3{color:#9499AB;} + .d2-1579741288 .color-N4{color:#CFD2DD;} + .d2-1579741288 .color-N5{color:#DEE1EB;} + .d2-1579741288 .color-N6{color:#EEF1F8;} + .d2-1579741288 .color-N7{color:#FFFFFF;} + .d2-1579741288 .color-B1{color:#0D32B2;} + .d2-1579741288 .color-B2{color:#0D32B2;} + .d2-1579741288 .color-B3{color:#E3E9FD;} + .d2-1579741288 .color-B4{color:#E3E9FD;} + .d2-1579741288 .color-B5{color:#EDF0FD;} + .d2-1579741288 .color-B6{color:#F7F8FE;} + .d2-1579741288 .color-AA2{color:#4A6FF3;} + .d2-1579741288 .color-AA4{color:#EDF0FD;} + .d2-1579741288 .color-AA5{color:#F7F8FE;} + .d2-1579741288 .color-AB4{color:#EDF0FD;} + .d2-1579741288 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1579741288);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1579741288);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1579741288);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1579741288);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1579741288);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1579741288);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1579741288);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1579741288);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1579741288);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1579741288);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1579741288);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1579741288);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1579741288);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1579741288);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1579741288);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1579741288);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1579741288);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1579741288);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>we all livein a LightSteelBluesubmarine - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/root/fill/elk/board.exp.json b/e2etests/testdata/root/fill/elk/board.exp.json index 48e3ae135..f6c1f9c6c 100644 --- a/e2etests/testdata/root/fill/elk/board.exp.json +++ b/e2etests/testdata/root/fill/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -143,6 +154,7 @@ "borderRadius": 0, "fill": "LightSteelBlue", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/root/fill/elk/sketch.exp.svg b/e2etests/testdata/root/fill/elk/sketch.exp.svg index 03b43cd0d..944e65c0b 100644 --- a/e2etests/testdata/root/fill/elk/sketch.exp.svg +++ b/e2etests/testdata/root/fill/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -we all livein a LightSteelBluesubmarine + .d2-3691090369 .fill-N1{fill:#0A0F25;} + .d2-3691090369 .fill-N2{fill:#676C7E;} + .d2-3691090369 .fill-N3{fill:#9499AB;} + .d2-3691090369 .fill-N4{fill:#CFD2DD;} + .d2-3691090369 .fill-N5{fill:#DEE1EB;} + .d2-3691090369 .fill-N6{fill:#EEF1F8;} + .d2-3691090369 .fill-N7{fill:#FFFFFF;} + .d2-3691090369 .fill-B1{fill:#0D32B2;} + .d2-3691090369 .fill-B2{fill:#0D32B2;} + .d2-3691090369 .fill-B3{fill:#E3E9FD;} + .d2-3691090369 .fill-B4{fill:#E3E9FD;} + .d2-3691090369 .fill-B5{fill:#EDF0FD;} + .d2-3691090369 .fill-B6{fill:#F7F8FE;} + .d2-3691090369 .fill-AA2{fill:#4A6FF3;} + .d2-3691090369 .fill-AA4{fill:#EDF0FD;} + .d2-3691090369 .fill-AA5{fill:#F7F8FE;} + .d2-3691090369 .fill-AB4{fill:#EDF0FD;} + .d2-3691090369 .fill-AB5{fill:#F7F8FE;} + .d2-3691090369 .stroke-N1{stroke:#0A0F25;} + .d2-3691090369 .stroke-N2{stroke:#676C7E;} + .d2-3691090369 .stroke-N3{stroke:#9499AB;} + .d2-3691090369 .stroke-N4{stroke:#CFD2DD;} + .d2-3691090369 .stroke-N5{stroke:#DEE1EB;} + .d2-3691090369 .stroke-N6{stroke:#EEF1F8;} + .d2-3691090369 .stroke-N7{stroke:#FFFFFF;} + .d2-3691090369 .stroke-B1{stroke:#0D32B2;} + .d2-3691090369 .stroke-B2{stroke:#0D32B2;} + .d2-3691090369 .stroke-B3{stroke:#E3E9FD;} + .d2-3691090369 .stroke-B4{stroke:#E3E9FD;} + .d2-3691090369 .stroke-B5{stroke:#EDF0FD;} + .d2-3691090369 .stroke-B6{stroke:#F7F8FE;} + .d2-3691090369 .stroke-AA2{stroke:#4A6FF3;} + .d2-3691090369 .stroke-AA4{stroke:#EDF0FD;} + .d2-3691090369 .stroke-AA5{stroke:#F7F8FE;} + .d2-3691090369 .stroke-AB4{stroke:#EDF0FD;} + .d2-3691090369 .stroke-AB5{stroke:#F7F8FE;} + .d2-3691090369 .background-color-N1{background-color:#0A0F25;} + .d2-3691090369 .background-color-N2{background-color:#676C7E;} + .d2-3691090369 .background-color-N3{background-color:#9499AB;} + .d2-3691090369 .background-color-N4{background-color:#CFD2DD;} + .d2-3691090369 .background-color-N5{background-color:#DEE1EB;} + .d2-3691090369 .background-color-N6{background-color:#EEF1F8;} + .d2-3691090369 .background-color-N7{background-color:#FFFFFF;} + .d2-3691090369 .background-color-B1{background-color:#0D32B2;} + .d2-3691090369 .background-color-B2{background-color:#0D32B2;} + .d2-3691090369 .background-color-B3{background-color:#E3E9FD;} + .d2-3691090369 .background-color-B4{background-color:#E3E9FD;} + .d2-3691090369 .background-color-B5{background-color:#EDF0FD;} + .d2-3691090369 .background-color-B6{background-color:#F7F8FE;} + .d2-3691090369 .background-color-AA2{background-color:#4A6FF3;} + .d2-3691090369 .background-color-AA4{background-color:#EDF0FD;} + .d2-3691090369 .background-color-AA5{background-color:#F7F8FE;} + .d2-3691090369 .background-color-AB4{background-color:#EDF0FD;} + .d2-3691090369 .background-color-AB5{background-color:#F7F8FE;} + .d2-3691090369 .color-N1{color:#0A0F25;} + .d2-3691090369 .color-N2{color:#676C7E;} + .d2-3691090369 .color-N3{color:#9499AB;} + .d2-3691090369 .color-N4{color:#CFD2DD;} + .d2-3691090369 .color-N5{color:#DEE1EB;} + .d2-3691090369 .color-N6{color:#EEF1F8;} + .d2-3691090369 .color-N7{color:#FFFFFF;} + .d2-3691090369 .color-B1{color:#0D32B2;} + .d2-3691090369 .color-B2{color:#0D32B2;} + .d2-3691090369 .color-B3{color:#E3E9FD;} + .d2-3691090369 .color-B4{color:#E3E9FD;} + .d2-3691090369 .color-B5{color:#EDF0FD;} + .d2-3691090369 .color-B6{color:#F7F8FE;} + .d2-3691090369 .color-AA2{color:#4A6FF3;} + .d2-3691090369 .color-AA4{color:#EDF0FD;} + .d2-3691090369 .color-AA5{color:#F7F8FE;} + .d2-3691090369 .color-AB4{color:#EDF0FD;} + .d2-3691090369 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3691090369);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3691090369);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3691090369);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3691090369);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3691090369);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3691090369);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3691090369);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3691090369);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3691090369);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3691090369);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3691090369);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3691090369);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3691090369);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3691090369);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3691090369);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3691090369);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3691090369);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3691090369);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>we all livein a LightSteelBluesubmarine - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/root/stroke-dash/dagre/board.exp.json b/e2etests/testdata/root/stroke-dash/dagre/board.exp.json index fd07f6936..bae5c1a38 100644 --- a/e2etests/testdata/root/stroke-dash/dagre/board.exp.json +++ b/e2etests/testdata/root/stroke-dash/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -143,6 +154,7 @@ "borderRadius": 0, "fill": "LightSteelBlue", "stroke": "#191970", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/root/stroke-dash/dagre/sketch.exp.svg b/e2etests/testdata/root/stroke-dash/dagre/sketch.exp.svg index 32100d2d9..7d39ee794 100644 --- a/e2etests/testdata/root/stroke-dash/dagre/sketch.exp.svg +++ b/e2etests/testdata/root/stroke-dash/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -we all livein a LightSteelBluesubmarine + .d2-1439793245 .fill-N1{fill:#0A0F25;} + .d2-1439793245 .fill-N2{fill:#676C7E;} + .d2-1439793245 .fill-N3{fill:#9499AB;} + .d2-1439793245 .fill-N4{fill:#CFD2DD;} + .d2-1439793245 .fill-N5{fill:#DEE1EB;} + .d2-1439793245 .fill-N6{fill:#EEF1F8;} + .d2-1439793245 .fill-N7{fill:#FFFFFF;} + .d2-1439793245 .fill-B1{fill:#0D32B2;} + .d2-1439793245 .fill-B2{fill:#0D32B2;} + .d2-1439793245 .fill-B3{fill:#E3E9FD;} + .d2-1439793245 .fill-B4{fill:#E3E9FD;} + .d2-1439793245 .fill-B5{fill:#EDF0FD;} + .d2-1439793245 .fill-B6{fill:#F7F8FE;} + .d2-1439793245 .fill-AA2{fill:#4A6FF3;} + .d2-1439793245 .fill-AA4{fill:#EDF0FD;} + .d2-1439793245 .fill-AA5{fill:#F7F8FE;} + .d2-1439793245 .fill-AB4{fill:#EDF0FD;} + .d2-1439793245 .fill-AB5{fill:#F7F8FE;} + .d2-1439793245 .stroke-N1{stroke:#0A0F25;} + .d2-1439793245 .stroke-N2{stroke:#676C7E;} + .d2-1439793245 .stroke-N3{stroke:#9499AB;} + .d2-1439793245 .stroke-N4{stroke:#CFD2DD;} + .d2-1439793245 .stroke-N5{stroke:#DEE1EB;} + .d2-1439793245 .stroke-N6{stroke:#EEF1F8;} + .d2-1439793245 .stroke-N7{stroke:#FFFFFF;} + .d2-1439793245 .stroke-B1{stroke:#0D32B2;} + .d2-1439793245 .stroke-B2{stroke:#0D32B2;} + .d2-1439793245 .stroke-B3{stroke:#E3E9FD;} + .d2-1439793245 .stroke-B4{stroke:#E3E9FD;} + .d2-1439793245 .stroke-B5{stroke:#EDF0FD;} + .d2-1439793245 .stroke-B6{stroke:#F7F8FE;} + .d2-1439793245 .stroke-AA2{stroke:#4A6FF3;} + .d2-1439793245 .stroke-AA4{stroke:#EDF0FD;} + .d2-1439793245 .stroke-AA5{stroke:#F7F8FE;} + .d2-1439793245 .stroke-AB4{stroke:#EDF0FD;} + .d2-1439793245 .stroke-AB5{stroke:#F7F8FE;} + .d2-1439793245 .background-color-N1{background-color:#0A0F25;} + .d2-1439793245 .background-color-N2{background-color:#676C7E;} + .d2-1439793245 .background-color-N3{background-color:#9499AB;} + .d2-1439793245 .background-color-N4{background-color:#CFD2DD;} + .d2-1439793245 .background-color-N5{background-color:#DEE1EB;} + .d2-1439793245 .background-color-N6{background-color:#EEF1F8;} + .d2-1439793245 .background-color-N7{background-color:#FFFFFF;} + .d2-1439793245 .background-color-B1{background-color:#0D32B2;} + .d2-1439793245 .background-color-B2{background-color:#0D32B2;} + .d2-1439793245 .background-color-B3{background-color:#E3E9FD;} + .d2-1439793245 .background-color-B4{background-color:#E3E9FD;} + .d2-1439793245 .background-color-B5{background-color:#EDF0FD;} + .d2-1439793245 .background-color-B6{background-color:#F7F8FE;} + .d2-1439793245 .background-color-AA2{background-color:#4A6FF3;} + .d2-1439793245 .background-color-AA4{background-color:#EDF0FD;} + .d2-1439793245 .background-color-AA5{background-color:#F7F8FE;} + .d2-1439793245 .background-color-AB4{background-color:#EDF0FD;} + .d2-1439793245 .background-color-AB5{background-color:#F7F8FE;} + .d2-1439793245 .color-N1{color:#0A0F25;} + .d2-1439793245 .color-N2{color:#676C7E;} + .d2-1439793245 .color-N3{color:#9499AB;} + .d2-1439793245 .color-N4{color:#CFD2DD;} + .d2-1439793245 .color-N5{color:#DEE1EB;} + .d2-1439793245 .color-N6{color:#EEF1F8;} + .d2-1439793245 .color-N7{color:#FFFFFF;} + .d2-1439793245 .color-B1{color:#0D32B2;} + .d2-1439793245 .color-B2{color:#0D32B2;} + .d2-1439793245 .color-B3{color:#E3E9FD;} + .d2-1439793245 .color-B4{color:#E3E9FD;} + .d2-1439793245 .color-B5{color:#EDF0FD;} + .d2-1439793245 .color-B6{color:#F7F8FE;} + .d2-1439793245 .color-AA2{color:#4A6FF3;} + .d2-1439793245 .color-AA4{color:#EDF0FD;} + .d2-1439793245 .color-AA5{color:#F7F8FE;} + .d2-1439793245 .color-AB4{color:#EDF0FD;} + .d2-1439793245 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1439793245);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1439793245);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1439793245);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1439793245);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1439793245);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1439793245);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1439793245);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1439793245);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1439793245);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1439793245);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1439793245);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1439793245);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1439793245);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1439793245);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1439793245);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1439793245);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1439793245);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1439793245);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>we all livein a LightSteelBluesubmarine - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/root/stroke-dash/elk/board.exp.json b/e2etests/testdata/root/stroke-dash/elk/board.exp.json index e6c052fe9..e68733d39 100644 --- a/e2etests/testdata/root/stroke-dash/elk/board.exp.json +++ b/e2etests/testdata/root/stroke-dash/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -143,6 +154,7 @@ "borderRadius": 0, "fill": "LightSteelBlue", "stroke": "#191970", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/root/stroke-dash/elk/sketch.exp.svg b/e2etests/testdata/root/stroke-dash/elk/sketch.exp.svg index a00a1576f..358d782f1 100644 --- a/e2etests/testdata/root/stroke-dash/elk/sketch.exp.svg +++ b/e2etests/testdata/root/stroke-dash/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -we all livein a LightSteelBluesubmarine + .d2-2804713770 .fill-N1{fill:#0A0F25;} + .d2-2804713770 .fill-N2{fill:#676C7E;} + .d2-2804713770 .fill-N3{fill:#9499AB;} + .d2-2804713770 .fill-N4{fill:#CFD2DD;} + .d2-2804713770 .fill-N5{fill:#DEE1EB;} + .d2-2804713770 .fill-N6{fill:#EEF1F8;} + .d2-2804713770 .fill-N7{fill:#FFFFFF;} + .d2-2804713770 .fill-B1{fill:#0D32B2;} + .d2-2804713770 .fill-B2{fill:#0D32B2;} + .d2-2804713770 .fill-B3{fill:#E3E9FD;} + .d2-2804713770 .fill-B4{fill:#E3E9FD;} + .d2-2804713770 .fill-B5{fill:#EDF0FD;} + .d2-2804713770 .fill-B6{fill:#F7F8FE;} + .d2-2804713770 .fill-AA2{fill:#4A6FF3;} + .d2-2804713770 .fill-AA4{fill:#EDF0FD;} + .d2-2804713770 .fill-AA5{fill:#F7F8FE;} + .d2-2804713770 .fill-AB4{fill:#EDF0FD;} + .d2-2804713770 .fill-AB5{fill:#F7F8FE;} + .d2-2804713770 .stroke-N1{stroke:#0A0F25;} + .d2-2804713770 .stroke-N2{stroke:#676C7E;} + .d2-2804713770 .stroke-N3{stroke:#9499AB;} + .d2-2804713770 .stroke-N4{stroke:#CFD2DD;} + .d2-2804713770 .stroke-N5{stroke:#DEE1EB;} + .d2-2804713770 .stroke-N6{stroke:#EEF1F8;} + .d2-2804713770 .stroke-N7{stroke:#FFFFFF;} + .d2-2804713770 .stroke-B1{stroke:#0D32B2;} + .d2-2804713770 .stroke-B2{stroke:#0D32B2;} + .d2-2804713770 .stroke-B3{stroke:#E3E9FD;} + .d2-2804713770 .stroke-B4{stroke:#E3E9FD;} + .d2-2804713770 .stroke-B5{stroke:#EDF0FD;} + .d2-2804713770 .stroke-B6{stroke:#F7F8FE;} + .d2-2804713770 .stroke-AA2{stroke:#4A6FF3;} + .d2-2804713770 .stroke-AA4{stroke:#EDF0FD;} + .d2-2804713770 .stroke-AA5{stroke:#F7F8FE;} + .d2-2804713770 .stroke-AB4{stroke:#EDF0FD;} + .d2-2804713770 .stroke-AB5{stroke:#F7F8FE;} + .d2-2804713770 .background-color-N1{background-color:#0A0F25;} + .d2-2804713770 .background-color-N2{background-color:#676C7E;} + .d2-2804713770 .background-color-N3{background-color:#9499AB;} + .d2-2804713770 .background-color-N4{background-color:#CFD2DD;} + .d2-2804713770 .background-color-N5{background-color:#DEE1EB;} + .d2-2804713770 .background-color-N6{background-color:#EEF1F8;} + .d2-2804713770 .background-color-N7{background-color:#FFFFFF;} + .d2-2804713770 .background-color-B1{background-color:#0D32B2;} + .d2-2804713770 .background-color-B2{background-color:#0D32B2;} + .d2-2804713770 .background-color-B3{background-color:#E3E9FD;} + .d2-2804713770 .background-color-B4{background-color:#E3E9FD;} + .d2-2804713770 .background-color-B5{background-color:#EDF0FD;} + .d2-2804713770 .background-color-B6{background-color:#F7F8FE;} + .d2-2804713770 .background-color-AA2{background-color:#4A6FF3;} + .d2-2804713770 .background-color-AA4{background-color:#EDF0FD;} + .d2-2804713770 .background-color-AA5{background-color:#F7F8FE;} + .d2-2804713770 .background-color-AB4{background-color:#EDF0FD;} + .d2-2804713770 .background-color-AB5{background-color:#F7F8FE;} + .d2-2804713770 .color-N1{color:#0A0F25;} + .d2-2804713770 .color-N2{color:#676C7E;} + .d2-2804713770 .color-N3{color:#9499AB;} + .d2-2804713770 .color-N4{color:#CFD2DD;} + .d2-2804713770 .color-N5{color:#DEE1EB;} + .d2-2804713770 .color-N6{color:#EEF1F8;} + .d2-2804713770 .color-N7{color:#FFFFFF;} + .d2-2804713770 .color-B1{color:#0D32B2;} + .d2-2804713770 .color-B2{color:#0D32B2;} + .d2-2804713770 .color-B3{color:#E3E9FD;} + .d2-2804713770 .color-B4{color:#E3E9FD;} + .d2-2804713770 .color-B5{color:#EDF0FD;} + .d2-2804713770 .color-B6{color:#F7F8FE;} + .d2-2804713770 .color-AA2{color:#4A6FF3;} + .d2-2804713770 .color-AA4{color:#EDF0FD;} + .d2-2804713770 .color-AA5{color:#F7F8FE;} + .d2-2804713770 .color-AB4{color:#EDF0FD;} + .d2-2804713770 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2804713770);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2804713770);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2804713770);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2804713770);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2804713770);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2804713770);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2804713770);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2804713770);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2804713770);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2804713770);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2804713770);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2804713770);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2804713770);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2804713770);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2804713770);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2804713770);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2804713770);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2804713770);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>we all livein a LightSteelBluesubmarine - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/root/stroke-no-width/dagre/board.exp.json b/e2etests/testdata/root/stroke-no-width/dagre/board.exp.json index 41f071142..8065e2e69 100644 --- a/e2etests/testdata/root/stroke-no-width/dagre/board.exp.json +++ b/e2etests/testdata/root/stroke-no-width/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -143,6 +154,7 @@ "borderRadius": 0, "fill": "LightSteelBlue", "stroke": "#191970", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/root/stroke-no-width/dagre/sketch.exp.svg b/e2etests/testdata/root/stroke-no-width/dagre/sketch.exp.svg index 70550c220..8dd377b07 100644 --- a/e2etests/testdata/root/stroke-no-width/dagre/sketch.exp.svg +++ b/e2etests/testdata/root/stroke-no-width/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -we all livein a LightSteelBluesubmarine + .d2-3556952194 .fill-N1{fill:#0A0F25;} + .d2-3556952194 .fill-N2{fill:#676C7E;} + .d2-3556952194 .fill-N3{fill:#9499AB;} + .d2-3556952194 .fill-N4{fill:#CFD2DD;} + .d2-3556952194 .fill-N5{fill:#DEE1EB;} + .d2-3556952194 .fill-N6{fill:#EEF1F8;} + .d2-3556952194 .fill-N7{fill:#FFFFFF;} + .d2-3556952194 .fill-B1{fill:#0D32B2;} + .d2-3556952194 .fill-B2{fill:#0D32B2;} + .d2-3556952194 .fill-B3{fill:#E3E9FD;} + .d2-3556952194 .fill-B4{fill:#E3E9FD;} + .d2-3556952194 .fill-B5{fill:#EDF0FD;} + .d2-3556952194 .fill-B6{fill:#F7F8FE;} + .d2-3556952194 .fill-AA2{fill:#4A6FF3;} + .d2-3556952194 .fill-AA4{fill:#EDF0FD;} + .d2-3556952194 .fill-AA5{fill:#F7F8FE;} + .d2-3556952194 .fill-AB4{fill:#EDF0FD;} + .d2-3556952194 .fill-AB5{fill:#F7F8FE;} + .d2-3556952194 .stroke-N1{stroke:#0A0F25;} + .d2-3556952194 .stroke-N2{stroke:#676C7E;} + .d2-3556952194 .stroke-N3{stroke:#9499AB;} + .d2-3556952194 .stroke-N4{stroke:#CFD2DD;} + .d2-3556952194 .stroke-N5{stroke:#DEE1EB;} + .d2-3556952194 .stroke-N6{stroke:#EEF1F8;} + .d2-3556952194 .stroke-N7{stroke:#FFFFFF;} + .d2-3556952194 .stroke-B1{stroke:#0D32B2;} + .d2-3556952194 .stroke-B2{stroke:#0D32B2;} + .d2-3556952194 .stroke-B3{stroke:#E3E9FD;} + .d2-3556952194 .stroke-B4{stroke:#E3E9FD;} + .d2-3556952194 .stroke-B5{stroke:#EDF0FD;} + .d2-3556952194 .stroke-B6{stroke:#F7F8FE;} + .d2-3556952194 .stroke-AA2{stroke:#4A6FF3;} + .d2-3556952194 .stroke-AA4{stroke:#EDF0FD;} + .d2-3556952194 .stroke-AA5{stroke:#F7F8FE;} + .d2-3556952194 .stroke-AB4{stroke:#EDF0FD;} + .d2-3556952194 .stroke-AB5{stroke:#F7F8FE;} + .d2-3556952194 .background-color-N1{background-color:#0A0F25;} + .d2-3556952194 .background-color-N2{background-color:#676C7E;} + .d2-3556952194 .background-color-N3{background-color:#9499AB;} + .d2-3556952194 .background-color-N4{background-color:#CFD2DD;} + .d2-3556952194 .background-color-N5{background-color:#DEE1EB;} + .d2-3556952194 .background-color-N6{background-color:#EEF1F8;} + .d2-3556952194 .background-color-N7{background-color:#FFFFFF;} + .d2-3556952194 .background-color-B1{background-color:#0D32B2;} + .d2-3556952194 .background-color-B2{background-color:#0D32B2;} + .d2-3556952194 .background-color-B3{background-color:#E3E9FD;} + .d2-3556952194 .background-color-B4{background-color:#E3E9FD;} + .d2-3556952194 .background-color-B5{background-color:#EDF0FD;} + .d2-3556952194 .background-color-B6{background-color:#F7F8FE;} + .d2-3556952194 .background-color-AA2{background-color:#4A6FF3;} + .d2-3556952194 .background-color-AA4{background-color:#EDF0FD;} + .d2-3556952194 .background-color-AA5{background-color:#F7F8FE;} + .d2-3556952194 .background-color-AB4{background-color:#EDF0FD;} + .d2-3556952194 .background-color-AB5{background-color:#F7F8FE;} + .d2-3556952194 .color-N1{color:#0A0F25;} + .d2-3556952194 .color-N2{color:#676C7E;} + .d2-3556952194 .color-N3{color:#9499AB;} + .d2-3556952194 .color-N4{color:#CFD2DD;} + .d2-3556952194 .color-N5{color:#DEE1EB;} + .d2-3556952194 .color-N6{color:#EEF1F8;} + .d2-3556952194 .color-N7{color:#FFFFFF;} + .d2-3556952194 .color-B1{color:#0D32B2;} + .d2-3556952194 .color-B2{color:#0D32B2;} + .d2-3556952194 .color-B3{color:#E3E9FD;} + .d2-3556952194 .color-B4{color:#E3E9FD;} + .d2-3556952194 .color-B5{color:#EDF0FD;} + .d2-3556952194 .color-B6{color:#F7F8FE;} + .d2-3556952194 .color-AA2{color:#4A6FF3;} + .d2-3556952194 .color-AA4{color:#EDF0FD;} + .d2-3556952194 .color-AA5{color:#F7F8FE;} + .d2-3556952194 .color-AB4{color:#EDF0FD;} + .d2-3556952194 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3556952194);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3556952194);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3556952194);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3556952194);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3556952194);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3556952194);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3556952194);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3556952194);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3556952194);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3556952194);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3556952194);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3556952194);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3556952194);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3556952194);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3556952194);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3556952194);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3556952194);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3556952194);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>we all livein a LightSteelBluesubmarine - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/root/stroke-no-width/elk/board.exp.json b/e2etests/testdata/root/stroke-no-width/elk/board.exp.json index 0c4a9976d..dddd440be 100644 --- a/e2etests/testdata/root/stroke-no-width/elk/board.exp.json +++ b/e2etests/testdata/root/stroke-no-width/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -143,6 +154,7 @@ "borderRadius": 0, "fill": "LightSteelBlue", "stroke": "#191970", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/root/stroke-no-width/elk/sketch.exp.svg b/e2etests/testdata/root/stroke-no-width/elk/sketch.exp.svg index d74a07c50..5fd541533 100644 --- a/e2etests/testdata/root/stroke-no-width/elk/sketch.exp.svg +++ b/e2etests/testdata/root/stroke-no-width/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -we all livein a LightSteelBluesubmarine + .d2-2650476797 .fill-N1{fill:#0A0F25;} + .d2-2650476797 .fill-N2{fill:#676C7E;} + .d2-2650476797 .fill-N3{fill:#9499AB;} + .d2-2650476797 .fill-N4{fill:#CFD2DD;} + .d2-2650476797 .fill-N5{fill:#DEE1EB;} + .d2-2650476797 .fill-N6{fill:#EEF1F8;} + .d2-2650476797 .fill-N7{fill:#FFFFFF;} + .d2-2650476797 .fill-B1{fill:#0D32B2;} + .d2-2650476797 .fill-B2{fill:#0D32B2;} + .d2-2650476797 .fill-B3{fill:#E3E9FD;} + .d2-2650476797 .fill-B4{fill:#E3E9FD;} + .d2-2650476797 .fill-B5{fill:#EDF0FD;} + .d2-2650476797 .fill-B6{fill:#F7F8FE;} + .d2-2650476797 .fill-AA2{fill:#4A6FF3;} + .d2-2650476797 .fill-AA4{fill:#EDF0FD;} + .d2-2650476797 .fill-AA5{fill:#F7F8FE;} + .d2-2650476797 .fill-AB4{fill:#EDF0FD;} + .d2-2650476797 .fill-AB5{fill:#F7F8FE;} + .d2-2650476797 .stroke-N1{stroke:#0A0F25;} + .d2-2650476797 .stroke-N2{stroke:#676C7E;} + .d2-2650476797 .stroke-N3{stroke:#9499AB;} + .d2-2650476797 .stroke-N4{stroke:#CFD2DD;} + .d2-2650476797 .stroke-N5{stroke:#DEE1EB;} + .d2-2650476797 .stroke-N6{stroke:#EEF1F8;} + .d2-2650476797 .stroke-N7{stroke:#FFFFFF;} + .d2-2650476797 .stroke-B1{stroke:#0D32B2;} + .d2-2650476797 .stroke-B2{stroke:#0D32B2;} + .d2-2650476797 .stroke-B3{stroke:#E3E9FD;} + .d2-2650476797 .stroke-B4{stroke:#E3E9FD;} + .d2-2650476797 .stroke-B5{stroke:#EDF0FD;} + .d2-2650476797 .stroke-B6{stroke:#F7F8FE;} + .d2-2650476797 .stroke-AA2{stroke:#4A6FF3;} + .d2-2650476797 .stroke-AA4{stroke:#EDF0FD;} + .d2-2650476797 .stroke-AA5{stroke:#F7F8FE;} + .d2-2650476797 .stroke-AB4{stroke:#EDF0FD;} + .d2-2650476797 .stroke-AB5{stroke:#F7F8FE;} + .d2-2650476797 .background-color-N1{background-color:#0A0F25;} + .d2-2650476797 .background-color-N2{background-color:#676C7E;} + .d2-2650476797 .background-color-N3{background-color:#9499AB;} + .d2-2650476797 .background-color-N4{background-color:#CFD2DD;} + .d2-2650476797 .background-color-N5{background-color:#DEE1EB;} + .d2-2650476797 .background-color-N6{background-color:#EEF1F8;} + .d2-2650476797 .background-color-N7{background-color:#FFFFFF;} + .d2-2650476797 .background-color-B1{background-color:#0D32B2;} + .d2-2650476797 .background-color-B2{background-color:#0D32B2;} + .d2-2650476797 .background-color-B3{background-color:#E3E9FD;} + .d2-2650476797 .background-color-B4{background-color:#E3E9FD;} + .d2-2650476797 .background-color-B5{background-color:#EDF0FD;} + .d2-2650476797 .background-color-B6{background-color:#F7F8FE;} + .d2-2650476797 .background-color-AA2{background-color:#4A6FF3;} + .d2-2650476797 .background-color-AA4{background-color:#EDF0FD;} + .d2-2650476797 .background-color-AA5{background-color:#F7F8FE;} + .d2-2650476797 .background-color-AB4{background-color:#EDF0FD;} + .d2-2650476797 .background-color-AB5{background-color:#F7F8FE;} + .d2-2650476797 .color-N1{color:#0A0F25;} + .d2-2650476797 .color-N2{color:#676C7E;} + .d2-2650476797 .color-N3{color:#9499AB;} + .d2-2650476797 .color-N4{color:#CFD2DD;} + .d2-2650476797 .color-N5{color:#DEE1EB;} + .d2-2650476797 .color-N6{color:#EEF1F8;} + .d2-2650476797 .color-N7{color:#FFFFFF;} + .d2-2650476797 .color-B1{color:#0D32B2;} + .d2-2650476797 .color-B2{color:#0D32B2;} + .d2-2650476797 .color-B3{color:#E3E9FD;} + .d2-2650476797 .color-B4{color:#E3E9FD;} + .d2-2650476797 .color-B5{color:#EDF0FD;} + .d2-2650476797 .color-B6{color:#F7F8FE;} + .d2-2650476797 .color-AA2{color:#4A6FF3;} + .d2-2650476797 .color-AA4{color:#EDF0FD;} + .d2-2650476797 .color-AA5{color:#F7F8FE;} + .d2-2650476797 .color-AB4{color:#EDF0FD;} + .d2-2650476797 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2650476797);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2650476797);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2650476797);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2650476797);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2650476797);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2650476797);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2650476797);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2650476797);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2650476797);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2650476797);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2650476797);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2650476797);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2650476797);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2650476797);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2650476797);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2650476797);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2650476797);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2650476797);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>we all livein a LightSteelBluesubmarine - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/root/stroke-width/dagre/board.exp.json b/e2etests/testdata/root/stroke-width/dagre/board.exp.json index b2c8eb28a..70f57fdd6 100644 --- a/e2etests/testdata/root/stroke-width/dagre/board.exp.json +++ b/e2etests/testdata/root/stroke-width/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -143,6 +154,7 @@ "borderRadius": 0, "fill": "LightSteelBlue", "stroke": "#191970", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/root/stroke-width/dagre/sketch.exp.svg b/e2etests/testdata/root/stroke-width/dagre/sketch.exp.svg index e597cfaa2..555cb291f 100644 --- a/e2etests/testdata/root/stroke-width/dagre/sketch.exp.svg +++ b/e2etests/testdata/root/stroke-width/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -we all livein a LightSteelBluesubmarine + .d2-2431597955 .fill-N1{fill:#0A0F25;} + .d2-2431597955 .fill-N2{fill:#676C7E;} + .d2-2431597955 .fill-N3{fill:#9499AB;} + .d2-2431597955 .fill-N4{fill:#CFD2DD;} + .d2-2431597955 .fill-N5{fill:#DEE1EB;} + .d2-2431597955 .fill-N6{fill:#EEF1F8;} + .d2-2431597955 .fill-N7{fill:#FFFFFF;} + .d2-2431597955 .fill-B1{fill:#0D32B2;} + .d2-2431597955 .fill-B2{fill:#0D32B2;} + .d2-2431597955 .fill-B3{fill:#E3E9FD;} + .d2-2431597955 .fill-B4{fill:#E3E9FD;} + .d2-2431597955 .fill-B5{fill:#EDF0FD;} + .d2-2431597955 .fill-B6{fill:#F7F8FE;} + .d2-2431597955 .fill-AA2{fill:#4A6FF3;} + .d2-2431597955 .fill-AA4{fill:#EDF0FD;} + .d2-2431597955 .fill-AA5{fill:#F7F8FE;} + .d2-2431597955 .fill-AB4{fill:#EDF0FD;} + .d2-2431597955 .fill-AB5{fill:#F7F8FE;} + .d2-2431597955 .stroke-N1{stroke:#0A0F25;} + .d2-2431597955 .stroke-N2{stroke:#676C7E;} + .d2-2431597955 .stroke-N3{stroke:#9499AB;} + .d2-2431597955 .stroke-N4{stroke:#CFD2DD;} + .d2-2431597955 .stroke-N5{stroke:#DEE1EB;} + .d2-2431597955 .stroke-N6{stroke:#EEF1F8;} + .d2-2431597955 .stroke-N7{stroke:#FFFFFF;} + .d2-2431597955 .stroke-B1{stroke:#0D32B2;} + .d2-2431597955 .stroke-B2{stroke:#0D32B2;} + .d2-2431597955 .stroke-B3{stroke:#E3E9FD;} + .d2-2431597955 .stroke-B4{stroke:#E3E9FD;} + .d2-2431597955 .stroke-B5{stroke:#EDF0FD;} + .d2-2431597955 .stroke-B6{stroke:#F7F8FE;} + .d2-2431597955 .stroke-AA2{stroke:#4A6FF3;} + .d2-2431597955 .stroke-AA4{stroke:#EDF0FD;} + .d2-2431597955 .stroke-AA5{stroke:#F7F8FE;} + .d2-2431597955 .stroke-AB4{stroke:#EDF0FD;} + .d2-2431597955 .stroke-AB5{stroke:#F7F8FE;} + .d2-2431597955 .background-color-N1{background-color:#0A0F25;} + .d2-2431597955 .background-color-N2{background-color:#676C7E;} + .d2-2431597955 .background-color-N3{background-color:#9499AB;} + .d2-2431597955 .background-color-N4{background-color:#CFD2DD;} + .d2-2431597955 .background-color-N5{background-color:#DEE1EB;} + .d2-2431597955 .background-color-N6{background-color:#EEF1F8;} + .d2-2431597955 .background-color-N7{background-color:#FFFFFF;} + .d2-2431597955 .background-color-B1{background-color:#0D32B2;} + .d2-2431597955 .background-color-B2{background-color:#0D32B2;} + .d2-2431597955 .background-color-B3{background-color:#E3E9FD;} + .d2-2431597955 .background-color-B4{background-color:#E3E9FD;} + .d2-2431597955 .background-color-B5{background-color:#EDF0FD;} + .d2-2431597955 .background-color-B6{background-color:#F7F8FE;} + .d2-2431597955 .background-color-AA2{background-color:#4A6FF3;} + .d2-2431597955 .background-color-AA4{background-color:#EDF0FD;} + .d2-2431597955 .background-color-AA5{background-color:#F7F8FE;} + .d2-2431597955 .background-color-AB4{background-color:#EDF0FD;} + .d2-2431597955 .background-color-AB5{background-color:#F7F8FE;} + .d2-2431597955 .color-N1{color:#0A0F25;} + .d2-2431597955 .color-N2{color:#676C7E;} + .d2-2431597955 .color-N3{color:#9499AB;} + .d2-2431597955 .color-N4{color:#CFD2DD;} + .d2-2431597955 .color-N5{color:#DEE1EB;} + .d2-2431597955 .color-N6{color:#EEF1F8;} + .d2-2431597955 .color-N7{color:#FFFFFF;} + .d2-2431597955 .color-B1{color:#0D32B2;} + .d2-2431597955 .color-B2{color:#0D32B2;} + .d2-2431597955 .color-B3{color:#E3E9FD;} + .d2-2431597955 .color-B4{color:#E3E9FD;} + .d2-2431597955 .color-B5{color:#EDF0FD;} + .d2-2431597955 .color-B6{color:#F7F8FE;} + .d2-2431597955 .color-AA2{color:#4A6FF3;} + .d2-2431597955 .color-AA4{color:#EDF0FD;} + .d2-2431597955 .color-AA5{color:#F7F8FE;} + .d2-2431597955 .color-AB4{color:#EDF0FD;} + .d2-2431597955 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2431597955);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2431597955);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2431597955);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2431597955);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2431597955);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2431597955);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2431597955);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2431597955);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2431597955);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2431597955);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2431597955);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2431597955);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2431597955);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2431597955);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2431597955);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2431597955);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2431597955);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2431597955);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>we all livein a LightSteelBluesubmarine - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/root/stroke-width/elk/board.exp.json b/e2etests/testdata/root/stroke-width/elk/board.exp.json index 38bddec05..1b0298ce8 100644 --- a/e2etests/testdata/root/stroke-width/elk/board.exp.json +++ b/e2etests/testdata/root/stroke-width/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -143,6 +154,7 @@ "borderRadius": 0, "fill": "LightSteelBlue", "stroke": "#191970", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/root/stroke-width/elk/sketch.exp.svg b/e2etests/testdata/root/stroke-width/elk/sketch.exp.svg index d52813a4f..5279cb5e8 100644 --- a/e2etests/testdata/root/stroke-width/elk/sketch.exp.svg +++ b/e2etests/testdata/root/stroke-width/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -we all livein a LightSteelBluesubmarine + .d2-4161778148 .fill-N1{fill:#0A0F25;} + .d2-4161778148 .fill-N2{fill:#676C7E;} + .d2-4161778148 .fill-N3{fill:#9499AB;} + .d2-4161778148 .fill-N4{fill:#CFD2DD;} + .d2-4161778148 .fill-N5{fill:#DEE1EB;} + .d2-4161778148 .fill-N6{fill:#EEF1F8;} + .d2-4161778148 .fill-N7{fill:#FFFFFF;} + .d2-4161778148 .fill-B1{fill:#0D32B2;} + .d2-4161778148 .fill-B2{fill:#0D32B2;} + .d2-4161778148 .fill-B3{fill:#E3E9FD;} + .d2-4161778148 .fill-B4{fill:#E3E9FD;} + .d2-4161778148 .fill-B5{fill:#EDF0FD;} + .d2-4161778148 .fill-B6{fill:#F7F8FE;} + .d2-4161778148 .fill-AA2{fill:#4A6FF3;} + .d2-4161778148 .fill-AA4{fill:#EDF0FD;} + .d2-4161778148 .fill-AA5{fill:#F7F8FE;} + .d2-4161778148 .fill-AB4{fill:#EDF0FD;} + .d2-4161778148 .fill-AB5{fill:#F7F8FE;} + .d2-4161778148 .stroke-N1{stroke:#0A0F25;} + .d2-4161778148 .stroke-N2{stroke:#676C7E;} + .d2-4161778148 .stroke-N3{stroke:#9499AB;} + .d2-4161778148 .stroke-N4{stroke:#CFD2DD;} + .d2-4161778148 .stroke-N5{stroke:#DEE1EB;} + .d2-4161778148 .stroke-N6{stroke:#EEF1F8;} + .d2-4161778148 .stroke-N7{stroke:#FFFFFF;} + .d2-4161778148 .stroke-B1{stroke:#0D32B2;} + .d2-4161778148 .stroke-B2{stroke:#0D32B2;} + .d2-4161778148 .stroke-B3{stroke:#E3E9FD;} + .d2-4161778148 .stroke-B4{stroke:#E3E9FD;} + .d2-4161778148 .stroke-B5{stroke:#EDF0FD;} + .d2-4161778148 .stroke-B6{stroke:#F7F8FE;} + .d2-4161778148 .stroke-AA2{stroke:#4A6FF3;} + .d2-4161778148 .stroke-AA4{stroke:#EDF0FD;} + .d2-4161778148 .stroke-AA5{stroke:#F7F8FE;} + .d2-4161778148 .stroke-AB4{stroke:#EDF0FD;} + .d2-4161778148 .stroke-AB5{stroke:#F7F8FE;} + .d2-4161778148 .background-color-N1{background-color:#0A0F25;} + .d2-4161778148 .background-color-N2{background-color:#676C7E;} + .d2-4161778148 .background-color-N3{background-color:#9499AB;} + .d2-4161778148 .background-color-N4{background-color:#CFD2DD;} + .d2-4161778148 .background-color-N5{background-color:#DEE1EB;} + .d2-4161778148 .background-color-N6{background-color:#EEF1F8;} + .d2-4161778148 .background-color-N7{background-color:#FFFFFF;} + .d2-4161778148 .background-color-B1{background-color:#0D32B2;} + .d2-4161778148 .background-color-B2{background-color:#0D32B2;} + .d2-4161778148 .background-color-B3{background-color:#E3E9FD;} + .d2-4161778148 .background-color-B4{background-color:#E3E9FD;} + .d2-4161778148 .background-color-B5{background-color:#EDF0FD;} + .d2-4161778148 .background-color-B6{background-color:#F7F8FE;} + .d2-4161778148 .background-color-AA2{background-color:#4A6FF3;} + .d2-4161778148 .background-color-AA4{background-color:#EDF0FD;} + .d2-4161778148 .background-color-AA5{background-color:#F7F8FE;} + .d2-4161778148 .background-color-AB4{background-color:#EDF0FD;} + .d2-4161778148 .background-color-AB5{background-color:#F7F8FE;} + .d2-4161778148 .color-N1{color:#0A0F25;} + .d2-4161778148 .color-N2{color:#676C7E;} + .d2-4161778148 .color-N3{color:#9499AB;} + .d2-4161778148 .color-N4{color:#CFD2DD;} + .d2-4161778148 .color-N5{color:#DEE1EB;} + .d2-4161778148 .color-N6{color:#EEF1F8;} + .d2-4161778148 .color-N7{color:#FFFFFF;} + .d2-4161778148 .color-B1{color:#0D32B2;} + .d2-4161778148 .color-B2{color:#0D32B2;} + .d2-4161778148 .color-B3{color:#E3E9FD;} + .d2-4161778148 .color-B4{color:#E3E9FD;} + .d2-4161778148 .color-B5{color:#EDF0FD;} + .d2-4161778148 .color-B6{color:#F7F8FE;} + .d2-4161778148 .color-AA2{color:#4A6FF3;} + .d2-4161778148 .color-AA4{color:#EDF0FD;} + .d2-4161778148 .color-AA5{color:#F7F8FE;} + .d2-4161778148 .color-AB4{color:#EDF0FD;} + .d2-4161778148 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4161778148);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4161778148);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4161778148);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4161778148);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4161778148);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4161778148);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4161778148);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4161778148);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4161778148);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4161778148);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4161778148);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4161778148);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4161778148);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4161778148);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4161778148);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4161778148);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4161778148);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4161778148);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>we all livein a LightSteelBluesubmarine - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/sanity/1_to_2/dagre/board.exp.json b/e2etests/testdata/sanity/1_to_2/dagre/board.exp.json index ea5199e2c..e25062c96 100644 --- a/e2etests/testdata/sanity/1_to_2/dagre/board.exp.json +++ b/e2etests/testdata/sanity/1_to_2/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -151,6 +162,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 60.5, @@ -198,6 +210,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 105.5, @@ -238,6 +251,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/sanity/1_to_2/dagre/sketch.exp.svg b/e2etests/testdata/sanity/1_to_2/dagre/sketch.exp.svg index e1a3d7cca..257576eae 100644 --- a/e2etests/testdata/sanity/1_to_2/dagre/sketch.exp.svg +++ b/e2etests/testdata/sanity/1_to_2/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abc + .d2-468902776 .fill-N1{fill:#0A0F25;} + .d2-468902776 .fill-N2{fill:#676C7E;} + .d2-468902776 .fill-N3{fill:#9499AB;} + .d2-468902776 .fill-N4{fill:#CFD2DD;} + .d2-468902776 .fill-N5{fill:#DEE1EB;} + .d2-468902776 .fill-N6{fill:#EEF1F8;} + .d2-468902776 .fill-N7{fill:#FFFFFF;} + .d2-468902776 .fill-B1{fill:#0D32B2;} + .d2-468902776 .fill-B2{fill:#0D32B2;} + .d2-468902776 .fill-B3{fill:#E3E9FD;} + .d2-468902776 .fill-B4{fill:#E3E9FD;} + .d2-468902776 .fill-B5{fill:#EDF0FD;} + .d2-468902776 .fill-B6{fill:#F7F8FE;} + .d2-468902776 .fill-AA2{fill:#4A6FF3;} + .d2-468902776 .fill-AA4{fill:#EDF0FD;} + .d2-468902776 .fill-AA5{fill:#F7F8FE;} + .d2-468902776 .fill-AB4{fill:#EDF0FD;} + .d2-468902776 .fill-AB5{fill:#F7F8FE;} + .d2-468902776 .stroke-N1{stroke:#0A0F25;} + .d2-468902776 .stroke-N2{stroke:#676C7E;} + .d2-468902776 .stroke-N3{stroke:#9499AB;} + .d2-468902776 .stroke-N4{stroke:#CFD2DD;} + .d2-468902776 .stroke-N5{stroke:#DEE1EB;} + .d2-468902776 .stroke-N6{stroke:#EEF1F8;} + .d2-468902776 .stroke-N7{stroke:#FFFFFF;} + .d2-468902776 .stroke-B1{stroke:#0D32B2;} + .d2-468902776 .stroke-B2{stroke:#0D32B2;} + .d2-468902776 .stroke-B3{stroke:#E3E9FD;} + .d2-468902776 .stroke-B4{stroke:#E3E9FD;} + .d2-468902776 .stroke-B5{stroke:#EDF0FD;} + .d2-468902776 .stroke-B6{stroke:#F7F8FE;} + .d2-468902776 .stroke-AA2{stroke:#4A6FF3;} + .d2-468902776 .stroke-AA4{stroke:#EDF0FD;} + .d2-468902776 .stroke-AA5{stroke:#F7F8FE;} + .d2-468902776 .stroke-AB4{stroke:#EDF0FD;} + .d2-468902776 .stroke-AB5{stroke:#F7F8FE;} + .d2-468902776 .background-color-N1{background-color:#0A0F25;} + .d2-468902776 .background-color-N2{background-color:#676C7E;} + .d2-468902776 .background-color-N3{background-color:#9499AB;} + .d2-468902776 .background-color-N4{background-color:#CFD2DD;} + .d2-468902776 .background-color-N5{background-color:#DEE1EB;} + .d2-468902776 .background-color-N6{background-color:#EEF1F8;} + .d2-468902776 .background-color-N7{background-color:#FFFFFF;} + .d2-468902776 .background-color-B1{background-color:#0D32B2;} + .d2-468902776 .background-color-B2{background-color:#0D32B2;} + .d2-468902776 .background-color-B3{background-color:#E3E9FD;} + .d2-468902776 .background-color-B4{background-color:#E3E9FD;} + .d2-468902776 .background-color-B5{background-color:#EDF0FD;} + .d2-468902776 .background-color-B6{background-color:#F7F8FE;} + .d2-468902776 .background-color-AA2{background-color:#4A6FF3;} + .d2-468902776 .background-color-AA4{background-color:#EDF0FD;} + .d2-468902776 .background-color-AA5{background-color:#F7F8FE;} + .d2-468902776 .background-color-AB4{background-color:#EDF0FD;} + .d2-468902776 .background-color-AB5{background-color:#F7F8FE;} + .d2-468902776 .color-N1{color:#0A0F25;} + .d2-468902776 .color-N2{color:#676C7E;} + .d2-468902776 .color-N3{color:#9499AB;} + .d2-468902776 .color-N4{color:#CFD2DD;} + .d2-468902776 .color-N5{color:#DEE1EB;} + .d2-468902776 .color-N6{color:#EEF1F8;} + .d2-468902776 .color-N7{color:#FFFFFF;} + .d2-468902776 .color-B1{color:#0D32B2;} + .d2-468902776 .color-B2{color:#0D32B2;} + .d2-468902776 .color-B3{color:#E3E9FD;} + .d2-468902776 .color-B4{color:#E3E9FD;} + .d2-468902776 .color-B5{color:#EDF0FD;} + .d2-468902776 .color-B6{color:#F7F8FE;} + .d2-468902776 .color-AA2{color:#4A6FF3;} + .d2-468902776 .color-AA4{color:#EDF0FD;} + .d2-468902776 .color-AA5{color:#F7F8FE;} + .d2-468902776 .color-AB4{color:#EDF0FD;} + .d2-468902776 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-468902776);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-468902776);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-468902776);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-468902776);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-468902776);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-468902776);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-468902776);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-468902776);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-468902776);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-468902776);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-468902776);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-468902776);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-468902776);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-468902776);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-468902776);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-468902776);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-468902776);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-468902776);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abc - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/sanity/1_to_2/elk/board.exp.json b/e2etests/testdata/sanity/1_to_2/elk/board.exp.json index 8c23c067b..1c6dc042d 100644 --- a/e2etests/testdata/sanity/1_to_2/elk/board.exp.json +++ b/e2etests/testdata/sanity/1_to_2/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -151,6 +162,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 61.66600036621094, @@ -197,6 +209,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 88.33300018310547, @@ -236,6 +249,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/sanity/1_to_2/elk/sketch.exp.svg b/e2etests/testdata/sanity/1_to_2/elk/sketch.exp.svg index 8ed5231b2..c85f009a1 100644 --- a/e2etests/testdata/sanity/1_to_2/elk/sketch.exp.svg +++ b/e2etests/testdata/sanity/1_to_2/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abc + .d2-148423586 .fill-N1{fill:#0A0F25;} + .d2-148423586 .fill-N2{fill:#676C7E;} + .d2-148423586 .fill-N3{fill:#9499AB;} + .d2-148423586 .fill-N4{fill:#CFD2DD;} + .d2-148423586 .fill-N5{fill:#DEE1EB;} + .d2-148423586 .fill-N6{fill:#EEF1F8;} + .d2-148423586 .fill-N7{fill:#FFFFFF;} + .d2-148423586 .fill-B1{fill:#0D32B2;} + .d2-148423586 .fill-B2{fill:#0D32B2;} + .d2-148423586 .fill-B3{fill:#E3E9FD;} + .d2-148423586 .fill-B4{fill:#E3E9FD;} + .d2-148423586 .fill-B5{fill:#EDF0FD;} + .d2-148423586 .fill-B6{fill:#F7F8FE;} + .d2-148423586 .fill-AA2{fill:#4A6FF3;} + .d2-148423586 .fill-AA4{fill:#EDF0FD;} + .d2-148423586 .fill-AA5{fill:#F7F8FE;} + .d2-148423586 .fill-AB4{fill:#EDF0FD;} + .d2-148423586 .fill-AB5{fill:#F7F8FE;} + .d2-148423586 .stroke-N1{stroke:#0A0F25;} + .d2-148423586 .stroke-N2{stroke:#676C7E;} + .d2-148423586 .stroke-N3{stroke:#9499AB;} + .d2-148423586 .stroke-N4{stroke:#CFD2DD;} + .d2-148423586 .stroke-N5{stroke:#DEE1EB;} + .d2-148423586 .stroke-N6{stroke:#EEF1F8;} + .d2-148423586 .stroke-N7{stroke:#FFFFFF;} + .d2-148423586 .stroke-B1{stroke:#0D32B2;} + .d2-148423586 .stroke-B2{stroke:#0D32B2;} + .d2-148423586 .stroke-B3{stroke:#E3E9FD;} + .d2-148423586 .stroke-B4{stroke:#E3E9FD;} + .d2-148423586 .stroke-B5{stroke:#EDF0FD;} + .d2-148423586 .stroke-B6{stroke:#F7F8FE;} + .d2-148423586 .stroke-AA2{stroke:#4A6FF3;} + .d2-148423586 .stroke-AA4{stroke:#EDF0FD;} + .d2-148423586 .stroke-AA5{stroke:#F7F8FE;} + .d2-148423586 .stroke-AB4{stroke:#EDF0FD;} + .d2-148423586 .stroke-AB5{stroke:#F7F8FE;} + .d2-148423586 .background-color-N1{background-color:#0A0F25;} + .d2-148423586 .background-color-N2{background-color:#676C7E;} + .d2-148423586 .background-color-N3{background-color:#9499AB;} + .d2-148423586 .background-color-N4{background-color:#CFD2DD;} + .d2-148423586 .background-color-N5{background-color:#DEE1EB;} + .d2-148423586 .background-color-N6{background-color:#EEF1F8;} + .d2-148423586 .background-color-N7{background-color:#FFFFFF;} + .d2-148423586 .background-color-B1{background-color:#0D32B2;} + .d2-148423586 .background-color-B2{background-color:#0D32B2;} + .d2-148423586 .background-color-B3{background-color:#E3E9FD;} + .d2-148423586 .background-color-B4{background-color:#E3E9FD;} + .d2-148423586 .background-color-B5{background-color:#EDF0FD;} + .d2-148423586 .background-color-B6{background-color:#F7F8FE;} + .d2-148423586 .background-color-AA2{background-color:#4A6FF3;} + .d2-148423586 .background-color-AA4{background-color:#EDF0FD;} + .d2-148423586 .background-color-AA5{background-color:#F7F8FE;} + .d2-148423586 .background-color-AB4{background-color:#EDF0FD;} + .d2-148423586 .background-color-AB5{background-color:#F7F8FE;} + .d2-148423586 .color-N1{color:#0A0F25;} + .d2-148423586 .color-N2{color:#676C7E;} + .d2-148423586 .color-N3{color:#9499AB;} + .d2-148423586 .color-N4{color:#CFD2DD;} + .d2-148423586 .color-N5{color:#DEE1EB;} + .d2-148423586 .color-N6{color:#EEF1F8;} + .d2-148423586 .color-N7{color:#FFFFFF;} + .d2-148423586 .color-B1{color:#0D32B2;} + .d2-148423586 .color-B2{color:#0D32B2;} + .d2-148423586 .color-B3{color:#E3E9FD;} + .d2-148423586 .color-B4{color:#E3E9FD;} + .d2-148423586 .color-B5{color:#EDF0FD;} + .d2-148423586 .color-B6{color:#F7F8FE;} + .d2-148423586 .color-AA2{color:#4A6FF3;} + .d2-148423586 .color-AA4{color:#EDF0FD;} + .d2-148423586 .color-AA5{color:#F7F8FE;} + .d2-148423586 .color-AB4{color:#EDF0FD;} + .d2-148423586 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-148423586);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-148423586);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-148423586);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-148423586);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-148423586);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-148423586);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-148423586);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-148423586);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-148423586);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-148423586);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-148423586);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-148423586);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-148423586);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-148423586);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-148423586);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-148423586);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-148423586);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-148423586);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abc - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/sanity/basic/dagre/board.exp.json b/e2etests/testdata/sanity/basic/dagre/board.exp.json index bed9c2453..0cd4240a2 100644 --- a/e2etests/testdata/sanity/basic/dagre/board.exp.json +++ b/e2etests/testdata/sanity/basic/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -110,6 +120,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 26.5, @@ -150,6 +161,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/sanity/basic/dagre/sketch.exp.svg b/e2etests/testdata/sanity/basic/dagre/sketch.exp.svg index 3af46be3c..9a021e8d7 100644 --- a/e2etests/testdata/sanity/basic/dagre/sketch.exp.svg +++ b/e2etests/testdata/sanity/basic/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -ab + .d2-2044524636 .fill-N1{fill:#0A0F25;} + .d2-2044524636 .fill-N2{fill:#676C7E;} + .d2-2044524636 .fill-N3{fill:#9499AB;} + .d2-2044524636 .fill-N4{fill:#CFD2DD;} + .d2-2044524636 .fill-N5{fill:#DEE1EB;} + .d2-2044524636 .fill-N6{fill:#EEF1F8;} + .d2-2044524636 .fill-N7{fill:#FFFFFF;} + .d2-2044524636 .fill-B1{fill:#0D32B2;} + .d2-2044524636 .fill-B2{fill:#0D32B2;} + .d2-2044524636 .fill-B3{fill:#E3E9FD;} + .d2-2044524636 .fill-B4{fill:#E3E9FD;} + .d2-2044524636 .fill-B5{fill:#EDF0FD;} + .d2-2044524636 .fill-B6{fill:#F7F8FE;} + .d2-2044524636 .fill-AA2{fill:#4A6FF3;} + .d2-2044524636 .fill-AA4{fill:#EDF0FD;} + .d2-2044524636 .fill-AA5{fill:#F7F8FE;} + .d2-2044524636 .fill-AB4{fill:#EDF0FD;} + .d2-2044524636 .fill-AB5{fill:#F7F8FE;} + .d2-2044524636 .stroke-N1{stroke:#0A0F25;} + .d2-2044524636 .stroke-N2{stroke:#676C7E;} + .d2-2044524636 .stroke-N3{stroke:#9499AB;} + .d2-2044524636 .stroke-N4{stroke:#CFD2DD;} + .d2-2044524636 .stroke-N5{stroke:#DEE1EB;} + .d2-2044524636 .stroke-N6{stroke:#EEF1F8;} + .d2-2044524636 .stroke-N7{stroke:#FFFFFF;} + .d2-2044524636 .stroke-B1{stroke:#0D32B2;} + .d2-2044524636 .stroke-B2{stroke:#0D32B2;} + .d2-2044524636 .stroke-B3{stroke:#E3E9FD;} + .d2-2044524636 .stroke-B4{stroke:#E3E9FD;} + .d2-2044524636 .stroke-B5{stroke:#EDF0FD;} + .d2-2044524636 .stroke-B6{stroke:#F7F8FE;} + .d2-2044524636 .stroke-AA2{stroke:#4A6FF3;} + .d2-2044524636 .stroke-AA4{stroke:#EDF0FD;} + .d2-2044524636 .stroke-AA5{stroke:#F7F8FE;} + .d2-2044524636 .stroke-AB4{stroke:#EDF0FD;} + .d2-2044524636 .stroke-AB5{stroke:#F7F8FE;} + .d2-2044524636 .background-color-N1{background-color:#0A0F25;} + .d2-2044524636 .background-color-N2{background-color:#676C7E;} + .d2-2044524636 .background-color-N3{background-color:#9499AB;} + .d2-2044524636 .background-color-N4{background-color:#CFD2DD;} + .d2-2044524636 .background-color-N5{background-color:#DEE1EB;} + .d2-2044524636 .background-color-N6{background-color:#EEF1F8;} + .d2-2044524636 .background-color-N7{background-color:#FFFFFF;} + .d2-2044524636 .background-color-B1{background-color:#0D32B2;} + .d2-2044524636 .background-color-B2{background-color:#0D32B2;} + .d2-2044524636 .background-color-B3{background-color:#E3E9FD;} + .d2-2044524636 .background-color-B4{background-color:#E3E9FD;} + .d2-2044524636 .background-color-B5{background-color:#EDF0FD;} + .d2-2044524636 .background-color-B6{background-color:#F7F8FE;} + .d2-2044524636 .background-color-AA2{background-color:#4A6FF3;} + .d2-2044524636 .background-color-AA4{background-color:#EDF0FD;} + .d2-2044524636 .background-color-AA5{background-color:#F7F8FE;} + .d2-2044524636 .background-color-AB4{background-color:#EDF0FD;} + .d2-2044524636 .background-color-AB5{background-color:#F7F8FE;} + .d2-2044524636 .color-N1{color:#0A0F25;} + .d2-2044524636 .color-N2{color:#676C7E;} + .d2-2044524636 .color-N3{color:#9499AB;} + .d2-2044524636 .color-N4{color:#CFD2DD;} + .d2-2044524636 .color-N5{color:#DEE1EB;} + .d2-2044524636 .color-N6{color:#EEF1F8;} + .d2-2044524636 .color-N7{color:#FFFFFF;} + .d2-2044524636 .color-B1{color:#0D32B2;} + .d2-2044524636 .color-B2{color:#0D32B2;} + .d2-2044524636 .color-B3{color:#E3E9FD;} + .d2-2044524636 .color-B4{color:#E3E9FD;} + .d2-2044524636 .color-B5{color:#EDF0FD;} + .d2-2044524636 .color-B6{color:#F7F8FE;} + .d2-2044524636 .color-AA2{color:#4A6FF3;} + .d2-2044524636 .color-AA4{color:#EDF0FD;} + .d2-2044524636 .color-AA5{color:#F7F8FE;} + .d2-2044524636 .color-AB4{color:#EDF0FD;} + .d2-2044524636 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2044524636);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2044524636);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2044524636);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2044524636);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2044524636);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2044524636);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2044524636);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2044524636);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2044524636);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2044524636);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2044524636);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2044524636);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2044524636);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2044524636);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2044524636);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2044524636);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2044524636);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2044524636);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ab - - + + \ No newline at end of file diff --git a/e2etests/testdata/sanity/basic/elk/board.exp.json b/e2etests/testdata/sanity/basic/elk/board.exp.json index 25d953d26..86fd8773d 100644 --- a/e2etests/testdata/sanity/basic/elk/board.exp.json +++ b/e2etests/testdata/sanity/basic/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -110,6 +120,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 38.5, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/sanity/basic/elk/sketch.exp.svg b/e2etests/testdata/sanity/basic/elk/sketch.exp.svg index 3aa9b7c28..8ef005503 100644 --- a/e2etests/testdata/sanity/basic/elk/sketch.exp.svg +++ b/e2etests/testdata/sanity/basic/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -ab + .d2-2657667471 .fill-N1{fill:#0A0F25;} + .d2-2657667471 .fill-N2{fill:#676C7E;} + .d2-2657667471 .fill-N3{fill:#9499AB;} + .d2-2657667471 .fill-N4{fill:#CFD2DD;} + .d2-2657667471 .fill-N5{fill:#DEE1EB;} + .d2-2657667471 .fill-N6{fill:#EEF1F8;} + .d2-2657667471 .fill-N7{fill:#FFFFFF;} + .d2-2657667471 .fill-B1{fill:#0D32B2;} + .d2-2657667471 .fill-B2{fill:#0D32B2;} + .d2-2657667471 .fill-B3{fill:#E3E9FD;} + .d2-2657667471 .fill-B4{fill:#E3E9FD;} + .d2-2657667471 .fill-B5{fill:#EDF0FD;} + .d2-2657667471 .fill-B6{fill:#F7F8FE;} + .d2-2657667471 .fill-AA2{fill:#4A6FF3;} + .d2-2657667471 .fill-AA4{fill:#EDF0FD;} + .d2-2657667471 .fill-AA5{fill:#F7F8FE;} + .d2-2657667471 .fill-AB4{fill:#EDF0FD;} + .d2-2657667471 .fill-AB5{fill:#F7F8FE;} + .d2-2657667471 .stroke-N1{stroke:#0A0F25;} + .d2-2657667471 .stroke-N2{stroke:#676C7E;} + .d2-2657667471 .stroke-N3{stroke:#9499AB;} + .d2-2657667471 .stroke-N4{stroke:#CFD2DD;} + .d2-2657667471 .stroke-N5{stroke:#DEE1EB;} + .d2-2657667471 .stroke-N6{stroke:#EEF1F8;} + .d2-2657667471 .stroke-N7{stroke:#FFFFFF;} + .d2-2657667471 .stroke-B1{stroke:#0D32B2;} + .d2-2657667471 .stroke-B2{stroke:#0D32B2;} + .d2-2657667471 .stroke-B3{stroke:#E3E9FD;} + .d2-2657667471 .stroke-B4{stroke:#E3E9FD;} + .d2-2657667471 .stroke-B5{stroke:#EDF0FD;} + .d2-2657667471 .stroke-B6{stroke:#F7F8FE;} + .d2-2657667471 .stroke-AA2{stroke:#4A6FF3;} + .d2-2657667471 .stroke-AA4{stroke:#EDF0FD;} + .d2-2657667471 .stroke-AA5{stroke:#F7F8FE;} + .d2-2657667471 .stroke-AB4{stroke:#EDF0FD;} + .d2-2657667471 .stroke-AB5{stroke:#F7F8FE;} + .d2-2657667471 .background-color-N1{background-color:#0A0F25;} + .d2-2657667471 .background-color-N2{background-color:#676C7E;} + .d2-2657667471 .background-color-N3{background-color:#9499AB;} + .d2-2657667471 .background-color-N4{background-color:#CFD2DD;} + .d2-2657667471 .background-color-N5{background-color:#DEE1EB;} + .d2-2657667471 .background-color-N6{background-color:#EEF1F8;} + .d2-2657667471 .background-color-N7{background-color:#FFFFFF;} + .d2-2657667471 .background-color-B1{background-color:#0D32B2;} + .d2-2657667471 .background-color-B2{background-color:#0D32B2;} + .d2-2657667471 .background-color-B3{background-color:#E3E9FD;} + .d2-2657667471 .background-color-B4{background-color:#E3E9FD;} + .d2-2657667471 .background-color-B5{background-color:#EDF0FD;} + .d2-2657667471 .background-color-B6{background-color:#F7F8FE;} + .d2-2657667471 .background-color-AA2{background-color:#4A6FF3;} + .d2-2657667471 .background-color-AA4{background-color:#EDF0FD;} + .d2-2657667471 .background-color-AA5{background-color:#F7F8FE;} + .d2-2657667471 .background-color-AB4{background-color:#EDF0FD;} + .d2-2657667471 .background-color-AB5{background-color:#F7F8FE;} + .d2-2657667471 .color-N1{color:#0A0F25;} + .d2-2657667471 .color-N2{color:#676C7E;} + .d2-2657667471 .color-N3{color:#9499AB;} + .d2-2657667471 .color-N4{color:#CFD2DD;} + .d2-2657667471 .color-N5{color:#DEE1EB;} + .d2-2657667471 .color-N6{color:#EEF1F8;} + .d2-2657667471 .color-N7{color:#FFFFFF;} + .d2-2657667471 .color-B1{color:#0D32B2;} + .d2-2657667471 .color-B2{color:#0D32B2;} + .d2-2657667471 .color-B3{color:#E3E9FD;} + .d2-2657667471 .color-B4{color:#E3E9FD;} + .d2-2657667471 .color-B5{color:#EDF0FD;} + .d2-2657667471 .color-B6{color:#F7F8FE;} + .d2-2657667471 .color-AA2{color:#4A6FF3;} + .d2-2657667471 .color-AA4{color:#EDF0FD;} + .d2-2657667471 .color-AA5{color:#F7F8FE;} + .d2-2657667471 .color-AB4{color:#EDF0FD;} + .d2-2657667471 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2657667471);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2657667471);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2657667471);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2657667471);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2657667471);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2657667471);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2657667471);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2657667471);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2657667471);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2657667471);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2657667471);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2657667471);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2657667471);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2657667471);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2657667471);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2657667471);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2657667471);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2657667471);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ab - - + + \ No newline at end of file diff --git a/e2etests/testdata/sanity/child_to_child/dagre/board.exp.json b/e2etests/testdata/sanity/child_to_child/dagre/board.exp.json index bbc33c06d..9c2044688 100644 --- a/e2etests/testdata/sanity/child_to_child/dagre/board.exp.json +++ b/e2etests/testdata/sanity/child_to_child/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -192,6 +204,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 67, @@ -244,6 +257,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/sanity/child_to_child/dagre/sketch.exp.svg b/e2etests/testdata/sanity/child_to_child/dagre/sketch.exp.svg index 0b0685361..a7182eb6f 100644 --- a/e2etests/testdata/sanity/child_to_child/dagre/sketch.exp.svg +++ b/e2etests/testdata/sanity/child_to_child/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -acbd + .d2-894126516 .fill-N1{fill:#0A0F25;} + .d2-894126516 .fill-N2{fill:#676C7E;} + .d2-894126516 .fill-N3{fill:#9499AB;} + .d2-894126516 .fill-N4{fill:#CFD2DD;} + .d2-894126516 .fill-N5{fill:#DEE1EB;} + .d2-894126516 .fill-N6{fill:#EEF1F8;} + .d2-894126516 .fill-N7{fill:#FFFFFF;} + .d2-894126516 .fill-B1{fill:#0D32B2;} + .d2-894126516 .fill-B2{fill:#0D32B2;} + .d2-894126516 .fill-B3{fill:#E3E9FD;} + .d2-894126516 .fill-B4{fill:#E3E9FD;} + .d2-894126516 .fill-B5{fill:#EDF0FD;} + .d2-894126516 .fill-B6{fill:#F7F8FE;} + .d2-894126516 .fill-AA2{fill:#4A6FF3;} + .d2-894126516 .fill-AA4{fill:#EDF0FD;} + .d2-894126516 .fill-AA5{fill:#F7F8FE;} + .d2-894126516 .fill-AB4{fill:#EDF0FD;} + .d2-894126516 .fill-AB5{fill:#F7F8FE;} + .d2-894126516 .stroke-N1{stroke:#0A0F25;} + .d2-894126516 .stroke-N2{stroke:#676C7E;} + .d2-894126516 .stroke-N3{stroke:#9499AB;} + .d2-894126516 .stroke-N4{stroke:#CFD2DD;} + .d2-894126516 .stroke-N5{stroke:#DEE1EB;} + .d2-894126516 .stroke-N6{stroke:#EEF1F8;} + .d2-894126516 .stroke-N7{stroke:#FFFFFF;} + .d2-894126516 .stroke-B1{stroke:#0D32B2;} + .d2-894126516 .stroke-B2{stroke:#0D32B2;} + .d2-894126516 .stroke-B3{stroke:#E3E9FD;} + .d2-894126516 .stroke-B4{stroke:#E3E9FD;} + .d2-894126516 .stroke-B5{stroke:#EDF0FD;} + .d2-894126516 .stroke-B6{stroke:#F7F8FE;} + .d2-894126516 .stroke-AA2{stroke:#4A6FF3;} + .d2-894126516 .stroke-AA4{stroke:#EDF0FD;} + .d2-894126516 .stroke-AA5{stroke:#F7F8FE;} + .d2-894126516 .stroke-AB4{stroke:#EDF0FD;} + .d2-894126516 .stroke-AB5{stroke:#F7F8FE;} + .d2-894126516 .background-color-N1{background-color:#0A0F25;} + .d2-894126516 .background-color-N2{background-color:#676C7E;} + .d2-894126516 .background-color-N3{background-color:#9499AB;} + .d2-894126516 .background-color-N4{background-color:#CFD2DD;} + .d2-894126516 .background-color-N5{background-color:#DEE1EB;} + .d2-894126516 .background-color-N6{background-color:#EEF1F8;} + .d2-894126516 .background-color-N7{background-color:#FFFFFF;} + .d2-894126516 .background-color-B1{background-color:#0D32B2;} + .d2-894126516 .background-color-B2{background-color:#0D32B2;} + .d2-894126516 .background-color-B3{background-color:#E3E9FD;} + .d2-894126516 .background-color-B4{background-color:#E3E9FD;} + .d2-894126516 .background-color-B5{background-color:#EDF0FD;} + .d2-894126516 .background-color-B6{background-color:#F7F8FE;} + .d2-894126516 .background-color-AA2{background-color:#4A6FF3;} + .d2-894126516 .background-color-AA4{background-color:#EDF0FD;} + .d2-894126516 .background-color-AA5{background-color:#F7F8FE;} + .d2-894126516 .background-color-AB4{background-color:#EDF0FD;} + .d2-894126516 .background-color-AB5{background-color:#F7F8FE;} + .d2-894126516 .color-N1{color:#0A0F25;} + .d2-894126516 .color-N2{color:#676C7E;} + .d2-894126516 .color-N3{color:#9499AB;} + .d2-894126516 .color-N4{color:#CFD2DD;} + .d2-894126516 .color-N5{color:#DEE1EB;} + .d2-894126516 .color-N6{color:#EEF1F8;} + .d2-894126516 .color-N7{color:#FFFFFF;} + .d2-894126516 .color-B1{color:#0D32B2;} + .d2-894126516 .color-B2{color:#0D32B2;} + .d2-894126516 .color-B3{color:#E3E9FD;} + .d2-894126516 .color-B4{color:#E3E9FD;} + .d2-894126516 .color-B5{color:#EDF0FD;} + .d2-894126516 .color-B6{color:#F7F8FE;} + .d2-894126516 .color-AA2{color:#4A6FF3;} + .d2-894126516 .color-AA4{color:#EDF0FD;} + .d2-894126516 .color-AA5{color:#F7F8FE;} + .d2-894126516 .color-AB4{color:#EDF0FD;} + .d2-894126516 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-894126516);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-894126516);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-894126516);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-894126516);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-894126516);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-894126516);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-894126516);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-894126516);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-894126516);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-894126516);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-894126516);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-894126516);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-894126516);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-894126516);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-894126516);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-894126516);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-894126516);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-894126516);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>acbd - - - - + + + + \ No newline at end of file diff --git a/e2etests/testdata/sanity/child_to_child/elk/board.exp.json b/e2etests/testdata/sanity/child_to_child/elk/board.exp.json index 30d201203..4a77fa5d5 100644 --- a/e2etests/testdata/sanity/child_to_child/elk/board.exp.json +++ b/e2etests/testdata/sanity/child_to_child/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -192,6 +204,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 89, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/sanity/child_to_child/elk/sketch.exp.svg b/e2etests/testdata/sanity/child_to_child/elk/sketch.exp.svg index d5b7f0755..350290263 100644 --- a/e2etests/testdata/sanity/child_to_child/elk/sketch.exp.svg +++ b/e2etests/testdata/sanity/child_to_child/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -acbd + .d2-2722396959 .fill-N1{fill:#0A0F25;} + .d2-2722396959 .fill-N2{fill:#676C7E;} + .d2-2722396959 .fill-N3{fill:#9499AB;} + .d2-2722396959 .fill-N4{fill:#CFD2DD;} + .d2-2722396959 .fill-N5{fill:#DEE1EB;} + .d2-2722396959 .fill-N6{fill:#EEF1F8;} + .d2-2722396959 .fill-N7{fill:#FFFFFF;} + .d2-2722396959 .fill-B1{fill:#0D32B2;} + .d2-2722396959 .fill-B2{fill:#0D32B2;} + .d2-2722396959 .fill-B3{fill:#E3E9FD;} + .d2-2722396959 .fill-B4{fill:#E3E9FD;} + .d2-2722396959 .fill-B5{fill:#EDF0FD;} + .d2-2722396959 .fill-B6{fill:#F7F8FE;} + .d2-2722396959 .fill-AA2{fill:#4A6FF3;} + .d2-2722396959 .fill-AA4{fill:#EDF0FD;} + .d2-2722396959 .fill-AA5{fill:#F7F8FE;} + .d2-2722396959 .fill-AB4{fill:#EDF0FD;} + .d2-2722396959 .fill-AB5{fill:#F7F8FE;} + .d2-2722396959 .stroke-N1{stroke:#0A0F25;} + .d2-2722396959 .stroke-N2{stroke:#676C7E;} + .d2-2722396959 .stroke-N3{stroke:#9499AB;} + .d2-2722396959 .stroke-N4{stroke:#CFD2DD;} + .d2-2722396959 .stroke-N5{stroke:#DEE1EB;} + .d2-2722396959 .stroke-N6{stroke:#EEF1F8;} + .d2-2722396959 .stroke-N7{stroke:#FFFFFF;} + .d2-2722396959 .stroke-B1{stroke:#0D32B2;} + .d2-2722396959 .stroke-B2{stroke:#0D32B2;} + .d2-2722396959 .stroke-B3{stroke:#E3E9FD;} + .d2-2722396959 .stroke-B4{stroke:#E3E9FD;} + .d2-2722396959 .stroke-B5{stroke:#EDF0FD;} + .d2-2722396959 .stroke-B6{stroke:#F7F8FE;} + .d2-2722396959 .stroke-AA2{stroke:#4A6FF3;} + .d2-2722396959 .stroke-AA4{stroke:#EDF0FD;} + .d2-2722396959 .stroke-AA5{stroke:#F7F8FE;} + .d2-2722396959 .stroke-AB4{stroke:#EDF0FD;} + .d2-2722396959 .stroke-AB5{stroke:#F7F8FE;} + .d2-2722396959 .background-color-N1{background-color:#0A0F25;} + .d2-2722396959 .background-color-N2{background-color:#676C7E;} + .d2-2722396959 .background-color-N3{background-color:#9499AB;} + .d2-2722396959 .background-color-N4{background-color:#CFD2DD;} + .d2-2722396959 .background-color-N5{background-color:#DEE1EB;} + .d2-2722396959 .background-color-N6{background-color:#EEF1F8;} + .d2-2722396959 .background-color-N7{background-color:#FFFFFF;} + .d2-2722396959 .background-color-B1{background-color:#0D32B2;} + .d2-2722396959 .background-color-B2{background-color:#0D32B2;} + .d2-2722396959 .background-color-B3{background-color:#E3E9FD;} + .d2-2722396959 .background-color-B4{background-color:#E3E9FD;} + .d2-2722396959 .background-color-B5{background-color:#EDF0FD;} + .d2-2722396959 .background-color-B6{background-color:#F7F8FE;} + .d2-2722396959 .background-color-AA2{background-color:#4A6FF3;} + .d2-2722396959 .background-color-AA4{background-color:#EDF0FD;} + .d2-2722396959 .background-color-AA5{background-color:#F7F8FE;} + .d2-2722396959 .background-color-AB4{background-color:#EDF0FD;} + .d2-2722396959 .background-color-AB5{background-color:#F7F8FE;} + .d2-2722396959 .color-N1{color:#0A0F25;} + .d2-2722396959 .color-N2{color:#676C7E;} + .d2-2722396959 .color-N3{color:#9499AB;} + .d2-2722396959 .color-N4{color:#CFD2DD;} + .d2-2722396959 .color-N5{color:#DEE1EB;} + .d2-2722396959 .color-N6{color:#EEF1F8;} + .d2-2722396959 .color-N7{color:#FFFFFF;} + .d2-2722396959 .color-B1{color:#0D32B2;} + .d2-2722396959 .color-B2{color:#0D32B2;} + .d2-2722396959 .color-B3{color:#E3E9FD;} + .d2-2722396959 .color-B4{color:#E3E9FD;} + .d2-2722396959 .color-B5{color:#EDF0FD;} + .d2-2722396959 .color-B6{color:#F7F8FE;} + .d2-2722396959 .color-AA2{color:#4A6FF3;} + .d2-2722396959 .color-AA4{color:#EDF0FD;} + .d2-2722396959 .color-AA5{color:#F7F8FE;} + .d2-2722396959 .color-AB4{color:#EDF0FD;} + .d2-2722396959 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2722396959);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2722396959);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2722396959);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2722396959);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2722396959);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2722396959);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2722396959);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2722396959);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2722396959);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2722396959);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2722396959);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2722396959);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2722396959);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2722396959);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2722396959);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2722396959);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2722396959);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2722396959);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>acbd - - - - + + + + \ No newline at end of file diff --git a/e2etests/testdata/sanity/connection_label/dagre/board.exp.json b/e2etests/testdata/sanity/connection_label/dagre/board.exp.json index 434db15e4..15fbb6e17 100644 --- a/e2etests/testdata/sanity/connection_label/dagre/board.exp.json +++ b/e2etests/testdata/sanity/connection_label/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -110,6 +120,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 26.5, @@ -150,6 +161,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/sanity/connection_label/dagre/sketch.exp.svg b/e2etests/testdata/sanity/connection_label/dagre/sketch.exp.svg index beee1475e..48e57be71 100644 --- a/e2etests/testdata/sanity/connection_label/dagre/sketch.exp.svg +++ b/e2etests/testdata/sanity/connection_label/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -ab hello + .d2-3052789383 .fill-N1{fill:#0A0F25;} + .d2-3052789383 .fill-N2{fill:#676C7E;} + .d2-3052789383 .fill-N3{fill:#9499AB;} + .d2-3052789383 .fill-N4{fill:#CFD2DD;} + .d2-3052789383 .fill-N5{fill:#DEE1EB;} + .d2-3052789383 .fill-N6{fill:#EEF1F8;} + .d2-3052789383 .fill-N7{fill:#FFFFFF;} + .d2-3052789383 .fill-B1{fill:#0D32B2;} + .d2-3052789383 .fill-B2{fill:#0D32B2;} + .d2-3052789383 .fill-B3{fill:#E3E9FD;} + .d2-3052789383 .fill-B4{fill:#E3E9FD;} + .d2-3052789383 .fill-B5{fill:#EDF0FD;} + .d2-3052789383 .fill-B6{fill:#F7F8FE;} + .d2-3052789383 .fill-AA2{fill:#4A6FF3;} + .d2-3052789383 .fill-AA4{fill:#EDF0FD;} + .d2-3052789383 .fill-AA5{fill:#F7F8FE;} + .d2-3052789383 .fill-AB4{fill:#EDF0FD;} + .d2-3052789383 .fill-AB5{fill:#F7F8FE;} + .d2-3052789383 .stroke-N1{stroke:#0A0F25;} + .d2-3052789383 .stroke-N2{stroke:#676C7E;} + .d2-3052789383 .stroke-N3{stroke:#9499AB;} + .d2-3052789383 .stroke-N4{stroke:#CFD2DD;} + .d2-3052789383 .stroke-N5{stroke:#DEE1EB;} + .d2-3052789383 .stroke-N6{stroke:#EEF1F8;} + .d2-3052789383 .stroke-N7{stroke:#FFFFFF;} + .d2-3052789383 .stroke-B1{stroke:#0D32B2;} + .d2-3052789383 .stroke-B2{stroke:#0D32B2;} + .d2-3052789383 .stroke-B3{stroke:#E3E9FD;} + .d2-3052789383 .stroke-B4{stroke:#E3E9FD;} + .d2-3052789383 .stroke-B5{stroke:#EDF0FD;} + .d2-3052789383 .stroke-B6{stroke:#F7F8FE;} + .d2-3052789383 .stroke-AA2{stroke:#4A6FF3;} + .d2-3052789383 .stroke-AA4{stroke:#EDF0FD;} + .d2-3052789383 .stroke-AA5{stroke:#F7F8FE;} + .d2-3052789383 .stroke-AB4{stroke:#EDF0FD;} + .d2-3052789383 .stroke-AB5{stroke:#F7F8FE;} + .d2-3052789383 .background-color-N1{background-color:#0A0F25;} + .d2-3052789383 .background-color-N2{background-color:#676C7E;} + .d2-3052789383 .background-color-N3{background-color:#9499AB;} + .d2-3052789383 .background-color-N4{background-color:#CFD2DD;} + .d2-3052789383 .background-color-N5{background-color:#DEE1EB;} + .d2-3052789383 .background-color-N6{background-color:#EEF1F8;} + .d2-3052789383 .background-color-N7{background-color:#FFFFFF;} + .d2-3052789383 .background-color-B1{background-color:#0D32B2;} + .d2-3052789383 .background-color-B2{background-color:#0D32B2;} + .d2-3052789383 .background-color-B3{background-color:#E3E9FD;} + .d2-3052789383 .background-color-B4{background-color:#E3E9FD;} + .d2-3052789383 .background-color-B5{background-color:#EDF0FD;} + .d2-3052789383 .background-color-B6{background-color:#F7F8FE;} + .d2-3052789383 .background-color-AA2{background-color:#4A6FF3;} + .d2-3052789383 .background-color-AA4{background-color:#EDF0FD;} + .d2-3052789383 .background-color-AA5{background-color:#F7F8FE;} + .d2-3052789383 .background-color-AB4{background-color:#EDF0FD;} + .d2-3052789383 .background-color-AB5{background-color:#F7F8FE;} + .d2-3052789383 .color-N1{color:#0A0F25;} + .d2-3052789383 .color-N2{color:#676C7E;} + .d2-3052789383 .color-N3{color:#9499AB;} + .d2-3052789383 .color-N4{color:#CFD2DD;} + .d2-3052789383 .color-N5{color:#DEE1EB;} + .d2-3052789383 .color-N6{color:#EEF1F8;} + .d2-3052789383 .color-N7{color:#FFFFFF;} + .d2-3052789383 .color-B1{color:#0D32B2;} + .d2-3052789383 .color-B2{color:#0D32B2;} + .d2-3052789383 .color-B3{color:#E3E9FD;} + .d2-3052789383 .color-B4{color:#E3E9FD;} + .d2-3052789383 .color-B5{color:#EDF0FD;} + .d2-3052789383 .color-B6{color:#F7F8FE;} + .d2-3052789383 .color-AA2{color:#4A6FF3;} + .d2-3052789383 .color-AA4{color:#EDF0FD;} + .d2-3052789383 .color-AA5{color:#F7F8FE;} + .d2-3052789383 .color-AB4{color:#EDF0FD;} + .d2-3052789383 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3052789383);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3052789383);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3052789383);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3052789383);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3052789383);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3052789383);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3052789383);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3052789383);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3052789383);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3052789383);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3052789383);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3052789383);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3052789383);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3052789383);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3052789383);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3052789383);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3052789383);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3052789383);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ab hello - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/sanity/connection_label/elk/board.exp.json b/e2etests/testdata/sanity/connection_label/elk/board.exp.json index bb0ef2bdf..c1d13e993 100644 --- a/e2etests/testdata/sanity/connection_label/elk/board.exp.json +++ b/e2etests/testdata/sanity/connection_label/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -110,6 +120,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 38.5, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/sanity/connection_label/elk/sketch.exp.svg b/e2etests/testdata/sanity/connection_label/elk/sketch.exp.svg index 2960cb69e..bc480b7e9 100644 --- a/e2etests/testdata/sanity/connection_label/elk/sketch.exp.svg +++ b/e2etests/testdata/sanity/connection_label/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -ab hello + .d2-4168143154 .fill-N1{fill:#0A0F25;} + .d2-4168143154 .fill-N2{fill:#676C7E;} + .d2-4168143154 .fill-N3{fill:#9499AB;} + .d2-4168143154 .fill-N4{fill:#CFD2DD;} + .d2-4168143154 .fill-N5{fill:#DEE1EB;} + .d2-4168143154 .fill-N6{fill:#EEF1F8;} + .d2-4168143154 .fill-N7{fill:#FFFFFF;} + .d2-4168143154 .fill-B1{fill:#0D32B2;} + .d2-4168143154 .fill-B2{fill:#0D32B2;} + .d2-4168143154 .fill-B3{fill:#E3E9FD;} + .d2-4168143154 .fill-B4{fill:#E3E9FD;} + .d2-4168143154 .fill-B5{fill:#EDF0FD;} + .d2-4168143154 .fill-B6{fill:#F7F8FE;} + .d2-4168143154 .fill-AA2{fill:#4A6FF3;} + .d2-4168143154 .fill-AA4{fill:#EDF0FD;} + .d2-4168143154 .fill-AA5{fill:#F7F8FE;} + .d2-4168143154 .fill-AB4{fill:#EDF0FD;} + .d2-4168143154 .fill-AB5{fill:#F7F8FE;} + .d2-4168143154 .stroke-N1{stroke:#0A0F25;} + .d2-4168143154 .stroke-N2{stroke:#676C7E;} + .d2-4168143154 .stroke-N3{stroke:#9499AB;} + .d2-4168143154 .stroke-N4{stroke:#CFD2DD;} + .d2-4168143154 .stroke-N5{stroke:#DEE1EB;} + .d2-4168143154 .stroke-N6{stroke:#EEF1F8;} + .d2-4168143154 .stroke-N7{stroke:#FFFFFF;} + .d2-4168143154 .stroke-B1{stroke:#0D32B2;} + .d2-4168143154 .stroke-B2{stroke:#0D32B2;} + .d2-4168143154 .stroke-B3{stroke:#E3E9FD;} + .d2-4168143154 .stroke-B4{stroke:#E3E9FD;} + .d2-4168143154 .stroke-B5{stroke:#EDF0FD;} + .d2-4168143154 .stroke-B6{stroke:#F7F8FE;} + .d2-4168143154 .stroke-AA2{stroke:#4A6FF3;} + .d2-4168143154 .stroke-AA4{stroke:#EDF0FD;} + .d2-4168143154 .stroke-AA5{stroke:#F7F8FE;} + .d2-4168143154 .stroke-AB4{stroke:#EDF0FD;} + .d2-4168143154 .stroke-AB5{stroke:#F7F8FE;} + .d2-4168143154 .background-color-N1{background-color:#0A0F25;} + .d2-4168143154 .background-color-N2{background-color:#676C7E;} + .d2-4168143154 .background-color-N3{background-color:#9499AB;} + .d2-4168143154 .background-color-N4{background-color:#CFD2DD;} + .d2-4168143154 .background-color-N5{background-color:#DEE1EB;} + .d2-4168143154 .background-color-N6{background-color:#EEF1F8;} + .d2-4168143154 .background-color-N7{background-color:#FFFFFF;} + .d2-4168143154 .background-color-B1{background-color:#0D32B2;} + .d2-4168143154 .background-color-B2{background-color:#0D32B2;} + .d2-4168143154 .background-color-B3{background-color:#E3E9FD;} + .d2-4168143154 .background-color-B4{background-color:#E3E9FD;} + .d2-4168143154 .background-color-B5{background-color:#EDF0FD;} + .d2-4168143154 .background-color-B6{background-color:#F7F8FE;} + .d2-4168143154 .background-color-AA2{background-color:#4A6FF3;} + .d2-4168143154 .background-color-AA4{background-color:#EDF0FD;} + .d2-4168143154 .background-color-AA5{background-color:#F7F8FE;} + .d2-4168143154 .background-color-AB4{background-color:#EDF0FD;} + .d2-4168143154 .background-color-AB5{background-color:#F7F8FE;} + .d2-4168143154 .color-N1{color:#0A0F25;} + .d2-4168143154 .color-N2{color:#676C7E;} + .d2-4168143154 .color-N3{color:#9499AB;} + .d2-4168143154 .color-N4{color:#CFD2DD;} + .d2-4168143154 .color-N5{color:#DEE1EB;} + .d2-4168143154 .color-N6{color:#EEF1F8;} + .d2-4168143154 .color-N7{color:#FFFFFF;} + .d2-4168143154 .color-B1{color:#0D32B2;} + .d2-4168143154 .color-B2{color:#0D32B2;} + .d2-4168143154 .color-B3{color:#E3E9FD;} + .d2-4168143154 .color-B4{color:#E3E9FD;} + .d2-4168143154 .color-B5{color:#EDF0FD;} + .d2-4168143154 .color-B6{color:#F7F8FE;} + .d2-4168143154 .color-AA2{color:#4A6FF3;} + .d2-4168143154 .color-AA4{color:#EDF0FD;} + .d2-4168143154 .color-AA5{color:#F7F8FE;} + .d2-4168143154 .color-AB4{color:#EDF0FD;} + .d2-4168143154 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4168143154);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4168143154);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4168143154);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4168143154);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4168143154);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4168143154);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4168143154);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4168143154);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4168143154);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4168143154);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4168143154);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4168143154);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4168143154);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4168143154);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4168143154);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4168143154);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4168143154);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4168143154);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ab hello - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/sanity/empty/dagre/board.exp.json b/e2etests/testdata/sanity/empty/dagre/board.exp.json index 8c31d7ff3..7fd786ea8 100644 --- a/e2etests/testdata/sanity/empty/dagre/board.exp.json +++ b/e2etests/testdata/sanity/empty/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": true, "fontFamily": "SourceSansPro", "shapes": [], @@ -19,6 +27,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/sanity/empty/dagre/sketch.exp.svg b/e2etests/testdata/sanity/empty/dagre/sketch.exp.svg index de18dd849..1e8c05ba8 100644 --- a/e2etests/testdata/sanity/empty/dagre/sketch.exp.svg +++ b/e2etests/testdata/sanity/empty/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ - \ No newline at end of file + .d2-3003375094 .fill-N1{fill:#0A0F25;} + .d2-3003375094 .fill-N2{fill:#676C7E;} + .d2-3003375094 .fill-N3{fill:#9499AB;} + .d2-3003375094 .fill-N4{fill:#CFD2DD;} + .d2-3003375094 .fill-N5{fill:#DEE1EB;} + .d2-3003375094 .fill-N6{fill:#EEF1F8;} + .d2-3003375094 .fill-N7{fill:#FFFFFF;} + .d2-3003375094 .fill-B1{fill:#0D32B2;} + .d2-3003375094 .fill-B2{fill:#0D32B2;} + .d2-3003375094 .fill-B3{fill:#E3E9FD;} + .d2-3003375094 .fill-B4{fill:#E3E9FD;} + .d2-3003375094 .fill-B5{fill:#EDF0FD;} + .d2-3003375094 .fill-B6{fill:#F7F8FE;} + .d2-3003375094 .fill-AA2{fill:#4A6FF3;} + .d2-3003375094 .fill-AA4{fill:#EDF0FD;} + .d2-3003375094 .fill-AA5{fill:#F7F8FE;} + .d2-3003375094 .fill-AB4{fill:#EDF0FD;} + .d2-3003375094 .fill-AB5{fill:#F7F8FE;} + .d2-3003375094 .stroke-N1{stroke:#0A0F25;} + .d2-3003375094 .stroke-N2{stroke:#676C7E;} + .d2-3003375094 .stroke-N3{stroke:#9499AB;} + .d2-3003375094 .stroke-N4{stroke:#CFD2DD;} + .d2-3003375094 .stroke-N5{stroke:#DEE1EB;} + .d2-3003375094 .stroke-N6{stroke:#EEF1F8;} + .d2-3003375094 .stroke-N7{stroke:#FFFFFF;} + .d2-3003375094 .stroke-B1{stroke:#0D32B2;} + .d2-3003375094 .stroke-B2{stroke:#0D32B2;} + .d2-3003375094 .stroke-B3{stroke:#E3E9FD;} + .d2-3003375094 .stroke-B4{stroke:#E3E9FD;} + .d2-3003375094 .stroke-B5{stroke:#EDF0FD;} + .d2-3003375094 .stroke-B6{stroke:#F7F8FE;} + .d2-3003375094 .stroke-AA2{stroke:#4A6FF3;} + .d2-3003375094 .stroke-AA4{stroke:#EDF0FD;} + .d2-3003375094 .stroke-AA5{stroke:#F7F8FE;} + .d2-3003375094 .stroke-AB4{stroke:#EDF0FD;} + .d2-3003375094 .stroke-AB5{stroke:#F7F8FE;} + .d2-3003375094 .background-color-N1{background-color:#0A0F25;} + .d2-3003375094 .background-color-N2{background-color:#676C7E;} + .d2-3003375094 .background-color-N3{background-color:#9499AB;} + .d2-3003375094 .background-color-N4{background-color:#CFD2DD;} + .d2-3003375094 .background-color-N5{background-color:#DEE1EB;} + .d2-3003375094 .background-color-N6{background-color:#EEF1F8;} + .d2-3003375094 .background-color-N7{background-color:#FFFFFF;} + .d2-3003375094 .background-color-B1{background-color:#0D32B2;} + .d2-3003375094 .background-color-B2{background-color:#0D32B2;} + .d2-3003375094 .background-color-B3{background-color:#E3E9FD;} + .d2-3003375094 .background-color-B4{background-color:#E3E9FD;} + .d2-3003375094 .background-color-B5{background-color:#EDF0FD;} + .d2-3003375094 .background-color-B6{background-color:#F7F8FE;} + .d2-3003375094 .background-color-AA2{background-color:#4A6FF3;} + .d2-3003375094 .background-color-AA4{background-color:#EDF0FD;} + .d2-3003375094 .background-color-AA5{background-color:#F7F8FE;} + .d2-3003375094 .background-color-AB4{background-color:#EDF0FD;} + .d2-3003375094 .background-color-AB5{background-color:#F7F8FE;} + .d2-3003375094 .color-N1{color:#0A0F25;} + .d2-3003375094 .color-N2{color:#676C7E;} + .d2-3003375094 .color-N3{color:#9499AB;} + .d2-3003375094 .color-N4{color:#CFD2DD;} + .d2-3003375094 .color-N5{color:#DEE1EB;} + .d2-3003375094 .color-N6{color:#EEF1F8;} + .d2-3003375094 .color-N7{color:#FFFFFF;} + .d2-3003375094 .color-B1{color:#0D32B2;} + .d2-3003375094 .color-B2{color:#0D32B2;} + .d2-3003375094 .color-B3{color:#E3E9FD;} + .d2-3003375094 .color-B4{color:#E3E9FD;} + .d2-3003375094 .color-B5{color:#EDF0FD;} + .d2-3003375094 .color-B6{color:#F7F8FE;} + .d2-3003375094 .color-AA2{color:#4A6FF3;} + .d2-3003375094 .color-AA4{color:#EDF0FD;} + .d2-3003375094 .color-AA5{color:#F7F8FE;} + .d2-3003375094 .color-AB4{color:#EDF0FD;} + .d2-3003375094 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3003375094);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3003375094);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3003375094);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3003375094);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3003375094);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3003375094);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3003375094);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3003375094);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3003375094);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3003375094);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3003375094);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3003375094);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3003375094);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3003375094);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3003375094);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3003375094);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3003375094);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3003375094);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>     \ No newline at end of file diff --git a/e2etests/testdata/sanity/empty/elk/board.exp.json b/e2etests/testdata/sanity/empty/elk/board.exp.json index 8c31d7ff3..7fd786ea8 100644 --- a/e2etests/testdata/sanity/empty/elk/board.exp.json +++ b/e2etests/testdata/sanity/empty/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": true, "fontFamily": "SourceSansPro", "shapes": [], @@ -19,6 +27,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/sanity/empty/elk/sketch.exp.svg b/e2etests/testdata/sanity/empty/elk/sketch.exp.svg index de18dd849..1e8c05ba8 100644 --- a/e2etests/testdata/sanity/empty/elk/sketch.exp.svg +++ b/e2etests/testdata/sanity/empty/elk/sketch.exp.svg @@ -1,4 +1,4 @@ - \ No newline at end of file + .d2-3003375094 .fill-N1{fill:#0A0F25;} + .d2-3003375094 .fill-N2{fill:#676C7E;} + .d2-3003375094 .fill-N3{fill:#9499AB;} + .d2-3003375094 .fill-N4{fill:#CFD2DD;} + .d2-3003375094 .fill-N5{fill:#DEE1EB;} + .d2-3003375094 .fill-N6{fill:#EEF1F8;} + .d2-3003375094 .fill-N7{fill:#FFFFFF;} + .d2-3003375094 .fill-B1{fill:#0D32B2;} + .d2-3003375094 .fill-B2{fill:#0D32B2;} + .d2-3003375094 .fill-B3{fill:#E3E9FD;} + .d2-3003375094 .fill-B4{fill:#E3E9FD;} + .d2-3003375094 .fill-B5{fill:#EDF0FD;} + .d2-3003375094 .fill-B6{fill:#F7F8FE;} + .d2-3003375094 .fill-AA2{fill:#4A6FF3;} + .d2-3003375094 .fill-AA4{fill:#EDF0FD;} + .d2-3003375094 .fill-AA5{fill:#F7F8FE;} + .d2-3003375094 .fill-AB4{fill:#EDF0FD;} + .d2-3003375094 .fill-AB5{fill:#F7F8FE;} + .d2-3003375094 .stroke-N1{stroke:#0A0F25;} + .d2-3003375094 .stroke-N2{stroke:#676C7E;} + .d2-3003375094 .stroke-N3{stroke:#9499AB;} + .d2-3003375094 .stroke-N4{stroke:#CFD2DD;} + .d2-3003375094 .stroke-N5{stroke:#DEE1EB;} + .d2-3003375094 .stroke-N6{stroke:#EEF1F8;} + .d2-3003375094 .stroke-N7{stroke:#FFFFFF;} + .d2-3003375094 .stroke-B1{stroke:#0D32B2;} + .d2-3003375094 .stroke-B2{stroke:#0D32B2;} + .d2-3003375094 .stroke-B3{stroke:#E3E9FD;} + .d2-3003375094 .stroke-B4{stroke:#E3E9FD;} + .d2-3003375094 .stroke-B5{stroke:#EDF0FD;} + .d2-3003375094 .stroke-B6{stroke:#F7F8FE;} + .d2-3003375094 .stroke-AA2{stroke:#4A6FF3;} + .d2-3003375094 .stroke-AA4{stroke:#EDF0FD;} + .d2-3003375094 .stroke-AA5{stroke:#F7F8FE;} + .d2-3003375094 .stroke-AB4{stroke:#EDF0FD;} + .d2-3003375094 .stroke-AB5{stroke:#F7F8FE;} + .d2-3003375094 .background-color-N1{background-color:#0A0F25;} + .d2-3003375094 .background-color-N2{background-color:#676C7E;} + .d2-3003375094 .background-color-N3{background-color:#9499AB;} + .d2-3003375094 .background-color-N4{background-color:#CFD2DD;} + .d2-3003375094 .background-color-N5{background-color:#DEE1EB;} + .d2-3003375094 .background-color-N6{background-color:#EEF1F8;} + .d2-3003375094 .background-color-N7{background-color:#FFFFFF;} + .d2-3003375094 .background-color-B1{background-color:#0D32B2;} + .d2-3003375094 .background-color-B2{background-color:#0D32B2;} + .d2-3003375094 .background-color-B3{background-color:#E3E9FD;} + .d2-3003375094 .background-color-B4{background-color:#E3E9FD;} + .d2-3003375094 .background-color-B5{background-color:#EDF0FD;} + .d2-3003375094 .background-color-B6{background-color:#F7F8FE;} + .d2-3003375094 .background-color-AA2{background-color:#4A6FF3;} + .d2-3003375094 .background-color-AA4{background-color:#EDF0FD;} + .d2-3003375094 .background-color-AA5{background-color:#F7F8FE;} + .d2-3003375094 .background-color-AB4{background-color:#EDF0FD;} + .d2-3003375094 .background-color-AB5{background-color:#F7F8FE;} + .d2-3003375094 .color-N1{color:#0A0F25;} + .d2-3003375094 .color-N2{color:#676C7E;} + .d2-3003375094 .color-N3{color:#9499AB;} + .d2-3003375094 .color-N4{color:#CFD2DD;} + .d2-3003375094 .color-N5{color:#DEE1EB;} + .d2-3003375094 .color-N6{color:#EEF1F8;} + .d2-3003375094 .color-N7{color:#FFFFFF;} + .d2-3003375094 .color-B1{color:#0D32B2;} + .d2-3003375094 .color-B2{color:#0D32B2;} + .d2-3003375094 .color-B3{color:#E3E9FD;} + .d2-3003375094 .color-B4{color:#E3E9FD;} + .d2-3003375094 .color-B5{color:#EDF0FD;} + .d2-3003375094 .color-B6{color:#F7F8FE;} + .d2-3003375094 .color-AA2{color:#4A6FF3;} + .d2-3003375094 .color-AA4{color:#EDF0FD;} + .d2-3003375094 .color-AA5{color:#F7F8FE;} + .d2-3003375094 .color-AB4{color:#EDF0FD;} + .d2-3003375094 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3003375094);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3003375094);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3003375094);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3003375094);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3003375094);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3003375094);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3003375094);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3003375094);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3003375094);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3003375094);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3003375094);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3003375094);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3003375094);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3003375094);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3003375094);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3003375094);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3003375094);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3003375094);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>     \ No newline at end of file diff --git a/e2etests/testdata/stable/3d_fill_and_stroke/dagre/board.exp.json b/e2etests/testdata/stable/3d_fill_and_stroke/dagre/board.exp.json index 34bc15428..b275a4b8d 100644 --- a/e2etests/testdata/stable/3d_fill_and_stroke/dagre/board.exp.json +++ b/e2etests/testdata/stable/3d_fill_and_stroke/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "honeydew", "stroke": "B1", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "honeydew", "stroke": "B1", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "honeydew", "stroke": "B1", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -151,6 +162,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 64, @@ -198,6 +210,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 64, @@ -238,6 +251,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/3d_fill_and_stroke/dagre/sketch.exp.svg b/e2etests/testdata/stable/3d_fill_and_stroke/dagre/sketch.exp.svg index d971073b2..8702bf34d 100644 --- a/e2etests/testdata/stable/3d_fill_and_stroke/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/3d_fill_and_stroke/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-2506310764 .fill-N1{fill:#0A0F25;} + .d2-2506310764 .fill-N2{fill:#676C7E;} + .d2-2506310764 .fill-N3{fill:#9499AB;} + .d2-2506310764 .fill-N4{fill:#CFD2DD;} + .d2-2506310764 .fill-N5{fill:#DEE1EB;} + .d2-2506310764 .fill-N6{fill:#EEF1F8;} + .d2-2506310764 .fill-N7{fill:#FFFFFF;} + .d2-2506310764 .fill-B1{fill:#0D32B2;} + .d2-2506310764 .fill-B2{fill:#0D32B2;} + .d2-2506310764 .fill-B3{fill:#E3E9FD;} + .d2-2506310764 .fill-B4{fill:#E3E9FD;} + .d2-2506310764 .fill-B5{fill:#EDF0FD;} + .d2-2506310764 .fill-B6{fill:#F7F8FE;} + .d2-2506310764 .fill-AA2{fill:#4A6FF3;} + .d2-2506310764 .fill-AA4{fill:#EDF0FD;} + .d2-2506310764 .fill-AA5{fill:#F7F8FE;} + .d2-2506310764 .fill-AB4{fill:#EDF0FD;} + .d2-2506310764 .fill-AB5{fill:#F7F8FE;} + .d2-2506310764 .stroke-N1{stroke:#0A0F25;} + .d2-2506310764 .stroke-N2{stroke:#676C7E;} + .d2-2506310764 .stroke-N3{stroke:#9499AB;} + .d2-2506310764 .stroke-N4{stroke:#CFD2DD;} + .d2-2506310764 .stroke-N5{stroke:#DEE1EB;} + .d2-2506310764 .stroke-N6{stroke:#EEF1F8;} + .d2-2506310764 .stroke-N7{stroke:#FFFFFF;} + .d2-2506310764 .stroke-B1{stroke:#0D32B2;} + .d2-2506310764 .stroke-B2{stroke:#0D32B2;} + .d2-2506310764 .stroke-B3{stroke:#E3E9FD;} + .d2-2506310764 .stroke-B4{stroke:#E3E9FD;} + .d2-2506310764 .stroke-B5{stroke:#EDF0FD;} + .d2-2506310764 .stroke-B6{stroke:#F7F8FE;} + .d2-2506310764 .stroke-AA2{stroke:#4A6FF3;} + .d2-2506310764 .stroke-AA4{stroke:#EDF0FD;} + .d2-2506310764 .stroke-AA5{stroke:#F7F8FE;} + .d2-2506310764 .stroke-AB4{stroke:#EDF0FD;} + .d2-2506310764 .stroke-AB5{stroke:#F7F8FE;} + .d2-2506310764 .background-color-N1{background-color:#0A0F25;} + .d2-2506310764 .background-color-N2{background-color:#676C7E;} + .d2-2506310764 .background-color-N3{background-color:#9499AB;} + .d2-2506310764 .background-color-N4{background-color:#CFD2DD;} + .d2-2506310764 .background-color-N5{background-color:#DEE1EB;} + .d2-2506310764 .background-color-N6{background-color:#EEF1F8;} + .d2-2506310764 .background-color-N7{background-color:#FFFFFF;} + .d2-2506310764 .background-color-B1{background-color:#0D32B2;} + .d2-2506310764 .background-color-B2{background-color:#0D32B2;} + .d2-2506310764 .background-color-B3{background-color:#E3E9FD;} + .d2-2506310764 .background-color-B4{background-color:#E3E9FD;} + .d2-2506310764 .background-color-B5{background-color:#EDF0FD;} + .d2-2506310764 .background-color-B6{background-color:#F7F8FE;} + .d2-2506310764 .background-color-AA2{background-color:#4A6FF3;} + .d2-2506310764 .background-color-AA4{background-color:#EDF0FD;} + .d2-2506310764 .background-color-AA5{background-color:#F7F8FE;} + .d2-2506310764 .background-color-AB4{background-color:#EDF0FD;} + .d2-2506310764 .background-color-AB5{background-color:#F7F8FE;} + .d2-2506310764 .color-N1{color:#0A0F25;} + .d2-2506310764 .color-N2{color:#676C7E;} + .d2-2506310764 .color-N3{color:#9499AB;} + .d2-2506310764 .color-N4{color:#CFD2DD;} + .d2-2506310764 .color-N5{color:#DEE1EB;} + .d2-2506310764 .color-N6{color:#EEF1F8;} + .d2-2506310764 .color-N7{color:#FFFFFF;} + .d2-2506310764 .color-B1{color:#0D32B2;} + .d2-2506310764 .color-B2{color:#0D32B2;} + .d2-2506310764 .color-B3{color:#E3E9FD;} + .d2-2506310764 .color-B4{color:#E3E9FD;} + .d2-2506310764 .color-B5{color:#EDF0FD;} + .d2-2506310764 .color-B6{color:#F7F8FE;} + .d2-2506310764 .color-AA2{color:#4A6FF3;} + .d2-2506310764 .color-AA4{color:#EDF0FD;} + .d2-2506310764 .color-AA5{color:#F7F8FE;} + .d2-2506310764 .color-AB4{color:#EDF0FD;} + .d2-2506310764 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2506310764);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2506310764);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2506310764);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2506310764);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2506310764);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2506310764);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2506310764);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2506310764);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2506310764);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2506310764);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2506310764);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2506310764);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2506310764);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2506310764);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2506310764);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2506310764);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2506310764);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2506310764);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> -hexagon +hexagon -rect +rect -square +square - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/3d_fill_and_stroke/elk/board.exp.json b/e2etests/testdata/stable/3d_fill_and_stroke/elk/board.exp.json index 23adad5c4..24d9a19dc 100644 --- a/e2etests/testdata/stable/3d_fill_and_stroke/elk/board.exp.json +++ b/e2etests/testdata/stable/3d_fill_and_stroke/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "honeydew", "stroke": "B1", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "honeydew", "stroke": "B1", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "honeydew", "stroke": "B1", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -151,6 +162,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 84, @@ -189,6 +201,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 83.5, @@ -220,6 +233,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/3d_fill_and_stroke/elk/sketch.exp.svg b/e2etests/testdata/stable/3d_fill_and_stroke/elk/sketch.exp.svg index 25523271a..ec2bd9cdf 100644 --- a/e2etests/testdata/stable/3d_fill_and_stroke/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/3d_fill_and_stroke/elk/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-1228154594 .fill-N1{fill:#0A0F25;} + .d2-1228154594 .fill-N2{fill:#676C7E;} + .d2-1228154594 .fill-N3{fill:#9499AB;} + .d2-1228154594 .fill-N4{fill:#CFD2DD;} + .d2-1228154594 .fill-N5{fill:#DEE1EB;} + .d2-1228154594 .fill-N6{fill:#EEF1F8;} + .d2-1228154594 .fill-N7{fill:#FFFFFF;} + .d2-1228154594 .fill-B1{fill:#0D32B2;} + .d2-1228154594 .fill-B2{fill:#0D32B2;} + .d2-1228154594 .fill-B3{fill:#E3E9FD;} + .d2-1228154594 .fill-B4{fill:#E3E9FD;} + .d2-1228154594 .fill-B5{fill:#EDF0FD;} + .d2-1228154594 .fill-B6{fill:#F7F8FE;} + .d2-1228154594 .fill-AA2{fill:#4A6FF3;} + .d2-1228154594 .fill-AA4{fill:#EDF0FD;} + .d2-1228154594 .fill-AA5{fill:#F7F8FE;} + .d2-1228154594 .fill-AB4{fill:#EDF0FD;} + .d2-1228154594 .fill-AB5{fill:#F7F8FE;} + .d2-1228154594 .stroke-N1{stroke:#0A0F25;} + .d2-1228154594 .stroke-N2{stroke:#676C7E;} + .d2-1228154594 .stroke-N3{stroke:#9499AB;} + .d2-1228154594 .stroke-N4{stroke:#CFD2DD;} + .d2-1228154594 .stroke-N5{stroke:#DEE1EB;} + .d2-1228154594 .stroke-N6{stroke:#EEF1F8;} + .d2-1228154594 .stroke-N7{stroke:#FFFFFF;} + .d2-1228154594 .stroke-B1{stroke:#0D32B2;} + .d2-1228154594 .stroke-B2{stroke:#0D32B2;} + .d2-1228154594 .stroke-B3{stroke:#E3E9FD;} + .d2-1228154594 .stroke-B4{stroke:#E3E9FD;} + .d2-1228154594 .stroke-B5{stroke:#EDF0FD;} + .d2-1228154594 .stroke-B6{stroke:#F7F8FE;} + .d2-1228154594 .stroke-AA2{stroke:#4A6FF3;} + .d2-1228154594 .stroke-AA4{stroke:#EDF0FD;} + .d2-1228154594 .stroke-AA5{stroke:#F7F8FE;} + .d2-1228154594 .stroke-AB4{stroke:#EDF0FD;} + .d2-1228154594 .stroke-AB5{stroke:#F7F8FE;} + .d2-1228154594 .background-color-N1{background-color:#0A0F25;} + .d2-1228154594 .background-color-N2{background-color:#676C7E;} + .d2-1228154594 .background-color-N3{background-color:#9499AB;} + .d2-1228154594 .background-color-N4{background-color:#CFD2DD;} + .d2-1228154594 .background-color-N5{background-color:#DEE1EB;} + .d2-1228154594 .background-color-N6{background-color:#EEF1F8;} + .d2-1228154594 .background-color-N7{background-color:#FFFFFF;} + .d2-1228154594 .background-color-B1{background-color:#0D32B2;} + .d2-1228154594 .background-color-B2{background-color:#0D32B2;} + .d2-1228154594 .background-color-B3{background-color:#E3E9FD;} + .d2-1228154594 .background-color-B4{background-color:#E3E9FD;} + .d2-1228154594 .background-color-B5{background-color:#EDF0FD;} + .d2-1228154594 .background-color-B6{background-color:#F7F8FE;} + .d2-1228154594 .background-color-AA2{background-color:#4A6FF3;} + .d2-1228154594 .background-color-AA4{background-color:#EDF0FD;} + .d2-1228154594 .background-color-AA5{background-color:#F7F8FE;} + .d2-1228154594 .background-color-AB4{background-color:#EDF0FD;} + .d2-1228154594 .background-color-AB5{background-color:#F7F8FE;} + .d2-1228154594 .color-N1{color:#0A0F25;} + .d2-1228154594 .color-N2{color:#676C7E;} + .d2-1228154594 .color-N3{color:#9499AB;} + .d2-1228154594 .color-N4{color:#CFD2DD;} + .d2-1228154594 .color-N5{color:#DEE1EB;} + .d2-1228154594 .color-N6{color:#EEF1F8;} + .d2-1228154594 .color-N7{color:#FFFFFF;} + .d2-1228154594 .color-B1{color:#0D32B2;} + .d2-1228154594 .color-B2{color:#0D32B2;} + .d2-1228154594 .color-B3{color:#E3E9FD;} + .d2-1228154594 .color-B4{color:#E3E9FD;} + .d2-1228154594 .color-B5{color:#EDF0FD;} + .d2-1228154594 .color-B6{color:#F7F8FE;} + .d2-1228154594 .color-AA2{color:#4A6FF3;} + .d2-1228154594 .color-AA4{color:#EDF0FD;} + .d2-1228154594 .color-AA5{color:#F7F8FE;} + .d2-1228154594 .color-AB4{color:#EDF0FD;} + .d2-1228154594 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1228154594);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1228154594);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1228154594);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1228154594);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1228154594);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1228154594);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1228154594);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1228154594);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1228154594);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1228154594);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1228154594);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1228154594);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1228154594);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1228154594);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1228154594);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1228154594);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1228154594);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1228154594);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> -hexagon +hexagon -rect +rect -square +square - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/all_shapes/dagre/board.exp.json b/e2etests/testdata/stable/all_shapes/dagre/board.exp.json index 27bd77abe..72b7adf02 100644 --- a/e2etests/testdata/stable/all_shapes/dagre/board.exp.json +++ b/e2etests/testdata/stable/all_shapes/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "AB4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "AB4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "AA4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "AA4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "AB4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "AA4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "N4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -726,6 +751,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 55.5, @@ -773,6 +799,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 55.5, @@ -820,6 +847,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 269, @@ -867,6 +895,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 269, @@ -914,6 +943,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 497, @@ -961,6 +991,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 497, @@ -1008,6 +1039,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 685, @@ -1055,6 +1087,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 684, @@ -1102,6 +1135,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 870, @@ -1149,6 +1183,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 870, @@ -1196,6 +1231,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1072, @@ -1236,6 +1272,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/all_shapes/dagre/sketch.exp.svg b/e2etests/testdata/stable/all_shapes/dagre/sketch.exp.svg index 1c081ec0a..a57ee6b72 100644 --- a/e2etests/testdata/stable/all_shapes/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud + .d2-3760251987 .fill-N1{fill:#0A0F25;} + .d2-3760251987 .fill-N2{fill:#676C7E;} + .d2-3760251987 .fill-N3{fill:#9499AB;} + .d2-3760251987 .fill-N4{fill:#CFD2DD;} + .d2-3760251987 .fill-N5{fill:#DEE1EB;} + .d2-3760251987 .fill-N6{fill:#EEF1F8;} + .d2-3760251987 .fill-N7{fill:#FFFFFF;} + .d2-3760251987 .fill-B1{fill:#0D32B2;} + .d2-3760251987 .fill-B2{fill:#0D32B2;} + .d2-3760251987 .fill-B3{fill:#E3E9FD;} + .d2-3760251987 .fill-B4{fill:#E3E9FD;} + .d2-3760251987 .fill-B5{fill:#EDF0FD;} + .d2-3760251987 .fill-B6{fill:#F7F8FE;} + .d2-3760251987 .fill-AA2{fill:#4A6FF3;} + .d2-3760251987 .fill-AA4{fill:#EDF0FD;} + .d2-3760251987 .fill-AA5{fill:#F7F8FE;} + .d2-3760251987 .fill-AB4{fill:#EDF0FD;} + .d2-3760251987 .fill-AB5{fill:#F7F8FE;} + .d2-3760251987 .stroke-N1{stroke:#0A0F25;} + .d2-3760251987 .stroke-N2{stroke:#676C7E;} + .d2-3760251987 .stroke-N3{stroke:#9499AB;} + .d2-3760251987 .stroke-N4{stroke:#CFD2DD;} + .d2-3760251987 .stroke-N5{stroke:#DEE1EB;} + .d2-3760251987 .stroke-N6{stroke:#EEF1F8;} + .d2-3760251987 .stroke-N7{stroke:#FFFFFF;} + .d2-3760251987 .stroke-B1{stroke:#0D32B2;} + .d2-3760251987 .stroke-B2{stroke:#0D32B2;} + .d2-3760251987 .stroke-B3{stroke:#E3E9FD;} + .d2-3760251987 .stroke-B4{stroke:#E3E9FD;} + .d2-3760251987 .stroke-B5{stroke:#EDF0FD;} + .d2-3760251987 .stroke-B6{stroke:#F7F8FE;} + .d2-3760251987 .stroke-AA2{stroke:#4A6FF3;} + .d2-3760251987 .stroke-AA4{stroke:#EDF0FD;} + .d2-3760251987 .stroke-AA5{stroke:#F7F8FE;} + .d2-3760251987 .stroke-AB4{stroke:#EDF0FD;} + .d2-3760251987 .stroke-AB5{stroke:#F7F8FE;} + .d2-3760251987 .background-color-N1{background-color:#0A0F25;} + .d2-3760251987 .background-color-N2{background-color:#676C7E;} + .d2-3760251987 .background-color-N3{background-color:#9499AB;} + .d2-3760251987 .background-color-N4{background-color:#CFD2DD;} + .d2-3760251987 .background-color-N5{background-color:#DEE1EB;} + .d2-3760251987 .background-color-N6{background-color:#EEF1F8;} + .d2-3760251987 .background-color-N7{background-color:#FFFFFF;} + .d2-3760251987 .background-color-B1{background-color:#0D32B2;} + .d2-3760251987 .background-color-B2{background-color:#0D32B2;} + .d2-3760251987 .background-color-B3{background-color:#E3E9FD;} + .d2-3760251987 .background-color-B4{background-color:#E3E9FD;} + .d2-3760251987 .background-color-B5{background-color:#EDF0FD;} + .d2-3760251987 .background-color-B6{background-color:#F7F8FE;} + .d2-3760251987 .background-color-AA2{background-color:#4A6FF3;} + .d2-3760251987 .background-color-AA4{background-color:#EDF0FD;} + .d2-3760251987 .background-color-AA5{background-color:#F7F8FE;} + .d2-3760251987 .background-color-AB4{background-color:#EDF0FD;} + .d2-3760251987 .background-color-AB5{background-color:#F7F8FE;} + .d2-3760251987 .color-N1{color:#0A0F25;} + .d2-3760251987 .color-N2{color:#676C7E;} + .d2-3760251987 .color-N3{color:#9499AB;} + .d2-3760251987 .color-N4{color:#CFD2DD;} + .d2-3760251987 .color-N5{color:#DEE1EB;} + .d2-3760251987 .color-N6{color:#EEF1F8;} + .d2-3760251987 .color-N7{color:#FFFFFF;} + .d2-3760251987 .color-B1{color:#0D32B2;} + .d2-3760251987 .color-B2{color:#0D32B2;} + .d2-3760251987 .color-B3{color:#E3E9FD;} + .d2-3760251987 .color-B4{color:#E3E9FD;} + .d2-3760251987 .color-B5{color:#EDF0FD;} + .d2-3760251987 .color-B6{color:#F7F8FE;} + .d2-3760251987 .color-AA2{color:#4A6FF3;} + .d2-3760251987 .color-AA4{color:#EDF0FD;} + .d2-3760251987 .color-AA5{color:#F7F8FE;} + .d2-3760251987 .color-AB4{color:#EDF0FD;} + .d2-3760251987 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3760251987);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3760251987);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3760251987);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3760251987);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3760251987);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3760251987);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3760251987);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3760251987);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3760251987);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3760251987);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3760251987);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3760251987);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3760251987);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3760251987);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3760251987);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3760251987);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3760251987);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3760251987);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/all_shapes/elk/board.exp.json b/e2etests/testdata/stable/all_shapes/elk/board.exp.json index 023fcf234..6071bc43d 100644 --- a/e2etests/testdata/stable/all_shapes/elk/board.exp.json +++ b/e2etests/testdata/stable/all_shapes/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "AB4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "AB4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "AA4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "AA4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "AB4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "AA4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "N4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -726,6 +751,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 67.5, @@ -764,6 +790,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 67.5, @@ -802,6 +829,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 241, @@ -840,6 +868,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 241, @@ -878,6 +907,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 429, @@ -916,6 +946,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 429, @@ -954,6 +985,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 577, @@ -992,6 +1024,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 576, @@ -1030,6 +1063,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 722, @@ -1068,6 +1102,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 722, @@ -1106,6 +1141,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 884, @@ -1137,6 +1173,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/all_shapes/elk/sketch.exp.svg b/e2etests/testdata/stable/all_shapes/elk/sketch.exp.svg index db7eb55c1..1a8806e61 100644 --- a/e2etests/testdata/stable/all_shapes/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud + .d2-435229007 .fill-N1{fill:#0A0F25;} + .d2-435229007 .fill-N2{fill:#676C7E;} + .d2-435229007 .fill-N3{fill:#9499AB;} + .d2-435229007 .fill-N4{fill:#CFD2DD;} + .d2-435229007 .fill-N5{fill:#DEE1EB;} + .d2-435229007 .fill-N6{fill:#EEF1F8;} + .d2-435229007 .fill-N7{fill:#FFFFFF;} + .d2-435229007 .fill-B1{fill:#0D32B2;} + .d2-435229007 .fill-B2{fill:#0D32B2;} + .d2-435229007 .fill-B3{fill:#E3E9FD;} + .d2-435229007 .fill-B4{fill:#E3E9FD;} + .d2-435229007 .fill-B5{fill:#EDF0FD;} + .d2-435229007 .fill-B6{fill:#F7F8FE;} + .d2-435229007 .fill-AA2{fill:#4A6FF3;} + .d2-435229007 .fill-AA4{fill:#EDF0FD;} + .d2-435229007 .fill-AA5{fill:#F7F8FE;} + .d2-435229007 .fill-AB4{fill:#EDF0FD;} + .d2-435229007 .fill-AB5{fill:#F7F8FE;} + .d2-435229007 .stroke-N1{stroke:#0A0F25;} + .d2-435229007 .stroke-N2{stroke:#676C7E;} + .d2-435229007 .stroke-N3{stroke:#9499AB;} + .d2-435229007 .stroke-N4{stroke:#CFD2DD;} + .d2-435229007 .stroke-N5{stroke:#DEE1EB;} + .d2-435229007 .stroke-N6{stroke:#EEF1F8;} + .d2-435229007 .stroke-N7{stroke:#FFFFFF;} + .d2-435229007 .stroke-B1{stroke:#0D32B2;} + .d2-435229007 .stroke-B2{stroke:#0D32B2;} + .d2-435229007 .stroke-B3{stroke:#E3E9FD;} + .d2-435229007 .stroke-B4{stroke:#E3E9FD;} + .d2-435229007 .stroke-B5{stroke:#EDF0FD;} + .d2-435229007 .stroke-B6{stroke:#F7F8FE;} + .d2-435229007 .stroke-AA2{stroke:#4A6FF3;} + .d2-435229007 .stroke-AA4{stroke:#EDF0FD;} + .d2-435229007 .stroke-AA5{stroke:#F7F8FE;} + .d2-435229007 .stroke-AB4{stroke:#EDF0FD;} + .d2-435229007 .stroke-AB5{stroke:#F7F8FE;} + .d2-435229007 .background-color-N1{background-color:#0A0F25;} + .d2-435229007 .background-color-N2{background-color:#676C7E;} + .d2-435229007 .background-color-N3{background-color:#9499AB;} + .d2-435229007 .background-color-N4{background-color:#CFD2DD;} + .d2-435229007 .background-color-N5{background-color:#DEE1EB;} + .d2-435229007 .background-color-N6{background-color:#EEF1F8;} + .d2-435229007 .background-color-N7{background-color:#FFFFFF;} + .d2-435229007 .background-color-B1{background-color:#0D32B2;} + .d2-435229007 .background-color-B2{background-color:#0D32B2;} + .d2-435229007 .background-color-B3{background-color:#E3E9FD;} + .d2-435229007 .background-color-B4{background-color:#E3E9FD;} + .d2-435229007 .background-color-B5{background-color:#EDF0FD;} + .d2-435229007 .background-color-B6{background-color:#F7F8FE;} + .d2-435229007 .background-color-AA2{background-color:#4A6FF3;} + .d2-435229007 .background-color-AA4{background-color:#EDF0FD;} + .d2-435229007 .background-color-AA5{background-color:#F7F8FE;} + .d2-435229007 .background-color-AB4{background-color:#EDF0FD;} + .d2-435229007 .background-color-AB5{background-color:#F7F8FE;} + .d2-435229007 .color-N1{color:#0A0F25;} + .d2-435229007 .color-N2{color:#676C7E;} + .d2-435229007 .color-N3{color:#9499AB;} + .d2-435229007 .color-N4{color:#CFD2DD;} + .d2-435229007 .color-N5{color:#DEE1EB;} + .d2-435229007 .color-N6{color:#EEF1F8;} + .d2-435229007 .color-N7{color:#FFFFFF;} + .d2-435229007 .color-B1{color:#0D32B2;} + .d2-435229007 .color-B2{color:#0D32B2;} + .d2-435229007 .color-B3{color:#E3E9FD;} + .d2-435229007 .color-B4{color:#E3E9FD;} + .d2-435229007 .color-B5{color:#EDF0FD;} + .d2-435229007 .color-B6{color:#F7F8FE;} + .d2-435229007 .color-AA2{color:#4A6FF3;} + .d2-435229007 .color-AA4{color:#EDF0FD;} + .d2-435229007 .color-AA5{color:#F7F8FE;} + .d2-435229007 .color-AB4{color:#EDF0FD;} + .d2-435229007 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-435229007);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-435229007);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-435229007);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-435229007);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-435229007);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-435229007);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-435229007);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-435229007);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-435229007);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-435229007);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-435229007);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-435229007);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-435229007);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-435229007);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-435229007);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-435229007);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-435229007);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-435229007);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/all_shapes_link/dagre/board.exp.json b/e2etests/testdata/stable/all_shapes_link/dagre/board.exp.json index b3343b544..c84eed0b7 100644 --- a/e2etests/testdata/stable/all_shapes_link/dagre/board.exp.json +++ b/e2etests/testdata/stable/all_shapes_link/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -7,7 +15,7 @@ "id": "linked", "type": "rectangle", "pos": { - "x": 90, + "x": 10, "y": 20 }, "width": 1167, @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -51,7 +60,7 @@ "linked" ], "pos": { - "x": 120, + "x": 40, "y": 63 }, "width": 111, @@ -62,6 +71,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -95,7 +105,7 @@ "linked" ], "pos": { - "x": 129, + "x": 49, "y": 242 }, "width": 94, @@ -106,6 +116,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -139,7 +150,7 @@ "linked" ], "pos": { - "x": 136, + "x": 56, "y": 452 }, "width": 79, @@ -150,6 +161,7 @@ "borderRadius": 0, "fill": "AB5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -183,7 +195,7 @@ "linked" ], "pos": { - "x": 291, + "x": 211, "y": 63 }, "width": 196, @@ -194,6 +206,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -227,7 +240,7 @@ "linked" ], "pos": { - "x": 331, + "x": 251, "y": 251 }, "width": 117, @@ -238,6 +251,7 @@ "borderRadius": 0, "fill": "AB5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -271,7 +285,7 @@ "linked" ], "pos": { - "x": 337, + "x": 257, "y": 436 }, "width": 104, @@ -282,6 +296,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -315,7 +330,7 @@ "linked" ], "pos": { - "x": 547, + "x": 467, "y": 63 }, "width": 141, @@ -326,6 +341,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -359,7 +375,7 @@ "linked" ], "pos": { - "x": 566, + "x": 486, "y": 253 }, "width": 103, @@ -370,6 +386,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -403,7 +420,7 @@ "linked" ], "pos": { - "x": 560, + "x": 480, "y": 445 }, "width": 116, @@ -414,6 +431,7 @@ "borderRadius": 0, "fill": "AB5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -447,7 +465,7 @@ "linked" ], "pos": { - "x": 757, + "x": 677, "y": 51 }, "width": 95, @@ -458,6 +476,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -491,7 +510,7 @@ "linked" ], "pos": { - "x": 729, + "x": 649, "y": 256 }, "width": 151, @@ -502,6 +521,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -535,7 +555,7 @@ "linked" ], "pos": { - "x": 773, + "x": 693, "y": 462 }, "width": 63, @@ -546,6 +566,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -579,7 +600,7 @@ "linked" ], "pos": { - "x": 912, + "x": 832, "y": 50 }, "width": 156, @@ -590,6 +611,7 @@ "borderRadius": 0, "fill": "N4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -623,7 +645,7 @@ "linked" ], "pos": { - "x": 942, + "x": 862, "y": 254 }, "width": 97, @@ -634,6 +656,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -667,7 +690,7 @@ "linked" ], "pos": { - "x": 939, + "x": 859, "y": 444 }, "width": 103, @@ -678,6 +701,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -711,7 +735,7 @@ "linked" ], "pos": { - "x": 1099, + "x": 1019, "y": 255 }, "width": 128, @@ -722,6 +746,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -755,7 +780,7 @@ "linked" ], "pos": { - "x": 1111, + "x": 1031, "y": 453 }, "width": 104, @@ -766,6 +791,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -800,14 +826,15 @@ "x": 10, "y": 724 }, - "width": 1393, - "height": 626, + "width": 1167, + "height": 564, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -844,7 +871,7 @@ "x": 40, "y": 767 }, - "width": 143, + "width": 111, "height": 66, "opacity": 1, "strokeDash": 0, @@ -852,6 +879,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -888,14 +916,15 @@ "x": 49, "y": 946 }, - "width": 126, - "height": 126, + "width": 94, + "height": 94, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -930,9 +959,9 @@ ], "pos": { "x": 56, - "y": 1203 + "y": 1156 }, - "width": 111, + "width": 79, "height": 87, "opacity": 1, "strokeDash": 0, @@ -940,6 +969,7 @@ "borderRadius": 0, "fill": "AB5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -973,10 +1003,10 @@ "tooltipped" ], "pos": { - "x": 243, + "x": 211, "y": 767 }, - "width": 228, + "width": 196, "height": 66, "opacity": 1, "strokeDash": 0, @@ -984,6 +1014,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1017,10 +1048,10 @@ "tooltipped" ], "pos": { - "x": 283, - "y": 971 + "x": 251, + "y": 955 }, - "width": 149, + "width": 117, "height": 76, "opacity": 1, "strokeDash": 0, @@ -1028,6 +1059,7 @@ "borderRadius": 0, "fill": "AB5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1061,10 +1093,10 @@ "tooltipped" ], "pos": { - "x": 289, - "y": 1187 + "x": 257, + "y": 1140 }, - "width": 136, + "width": 104, "height": 118, "opacity": 1, "strokeDash": 0, @@ -1072,6 +1104,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1105,10 +1138,10 @@ "tooltipped" ], "pos": { - "x": 531, + "x": 467, "y": 767 }, - "width": 173, + "width": 141, "height": 66, "opacity": 1, "strokeDash": 0, @@ -1116,6 +1149,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1149,10 +1183,10 @@ "tooltipped" ], "pos": { - "x": 550, - "y": 973 + "x": 486, + "y": 957 }, - "width": 135, + "width": 103, "height": 73, "opacity": 1, "strokeDash": 0, @@ -1160,6 +1194,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1193,10 +1228,10 @@ "tooltipped" ], "pos": { - "x": 544, - "y": 1196 + "x": 480, + "y": 1149 }, - "width": 148, + "width": 116, "height": 101, "opacity": 1, "strokeDash": 0, @@ -1204,6 +1239,7 @@ "borderRadius": 0, "fill": "AB5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1237,10 +1273,10 @@ "tooltipped" ], "pos": { - "x": 773, + "x": 677, "y": 755 }, - "width": 127, + "width": 95, "height": 91, "opacity": 1, "strokeDash": 0, @@ -1248,6 +1284,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1281,10 +1318,10 @@ "tooltipped" ], "pos": { - "x": 745, - "y": 976 + "x": 649, + "y": 960 }, - "width": 183, + "width": 151, "height": 66, "opacity": 1, "strokeDash": 0, @@ -1292,6 +1329,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1325,10 +1363,10 @@ "tooltipped" ], "pos": { - "x": 789, - "y": 1213 + "x": 693, + "y": 1166 }, - "width": 95, + "width": 63, "height": 66, "opacity": 1, "strokeDash": 0, @@ -1336,6 +1374,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1369,10 +1408,10 @@ "tooltipped" ], "pos": { - "x": 960, + "x": 832, "y": 754 }, - "width": 220, + "width": 156, "height": 92, "opacity": 1, "strokeDash": 0, @@ -1380,6 +1419,7 @@ "borderRadius": 0, "fill": "N4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1413,10 +1453,10 @@ "tooltipped" ], "pos": { - "x": 1003, - "y": 974 + "x": 862, + "y": 958 }, - "width": 134, + "width": 97, "height": 70, "opacity": 1, "strokeDash": 0, @@ -1424,6 +1464,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1457,17 +1498,18 @@ "tooltipped" ], "pos": { - "x": 996, - "y": 1172 + "x": 859, + "y": 1148 }, - "width": 148, - "height": 148, + "width": 103, + "height": 103, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1501,10 +1543,10 @@ "tooltipped" ], "pos": { - "x": 1197, - "y": 975 + "x": 1019, + "y": 959 }, - "width": 176, + "width": 128, "height": 69, "opacity": 1, "strokeDash": 0, @@ -1512,6 +1554,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1545,10 +1588,10 @@ "tooltipped" ], "pos": { - "x": 1214, - "y": 1204 + "x": 1031, + "y": 1157 }, - "width": 143, + "width": 104, "height": 84, "opacity": 1, "strokeDash": 0, @@ -1556,6 +1599,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1588,16 +1632,17 @@ "type": "rectangle", "pos": { "x": 10, - "y": 1490 + "y": 1428 }, - "width": 1393, - "height": 626, + "width": 1167, + "height": 564, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1633,9 +1678,9 @@ ], "pos": { "x": 40, - "y": 1533 + "y": 1471 }, - "width": 143, + "width": 111, "height": 66, "opacity": 1, "strokeDash": 0, @@ -1643,6 +1688,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1678,16 +1724,17 @@ ], "pos": { "x": 49, - "y": 1712 + "y": 1650 }, - "width": 126, - "height": 126, + "width": 94, + "height": 94, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1723,9 +1770,9 @@ ], "pos": { "x": 56, - "y": 1969 + "y": 1860 }, - "width": 111, + "width": 79, "height": 87, "opacity": 1, "strokeDash": 0, @@ -1733,6 +1780,7 @@ "borderRadius": 0, "fill": "AB5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1767,10 +1815,10 @@ "tooltipped" ], "pos": { - "x": 243, - "y": 1533 + "x": 211, + "y": 1471 }, - "width": 228, + "width": 196, "height": 66, "opacity": 1, "strokeDash": 0, @@ -1778,6 +1826,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1812,10 +1861,10 @@ "tooltipped" ], "pos": { - "x": 283, - "y": 1737 + "x": 251, + "y": 1659 }, - "width": 149, + "width": 117, "height": 76, "opacity": 1, "strokeDash": 0, @@ -1823,6 +1872,7 @@ "borderRadius": 0, "fill": "AB5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1857,10 +1907,10 @@ "tooltipped" ], "pos": { - "x": 289, - "y": 1953 + "x": 257, + "y": 1844 }, - "width": 136, + "width": 104, "height": 118, "opacity": 1, "strokeDash": 0, @@ -1868,6 +1918,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1902,10 +1953,10 @@ "tooltipped" ], "pos": { - "x": 531, - "y": 1533 + "x": 467, + "y": 1471 }, - "width": 173, + "width": 141, "height": 66, "opacity": 1, "strokeDash": 0, @@ -1913,6 +1964,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1947,10 +1999,10 @@ "tooltipped" ], "pos": { - "x": 550, - "y": 1739 + "x": 486, + "y": 1661 }, - "width": 135, + "width": 103, "height": 73, "opacity": 1, "strokeDash": 0, @@ -1958,6 +2010,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1992,10 +2045,10 @@ "tooltipped" ], "pos": { - "x": 544, - "y": 1962 + "x": 480, + "y": 1853 }, - "width": 148, + "width": 116, "height": 101, "opacity": 1, "strokeDash": 0, @@ -2003,6 +2056,7 @@ "borderRadius": 0, "fill": "AB5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2037,10 +2091,10 @@ "tooltipped" ], "pos": { - "x": 773, - "y": 1521 + "x": 677, + "y": 1459 }, - "width": 127, + "width": 95, "height": 91, "opacity": 1, "strokeDash": 0, @@ -2048,6 +2102,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2082,10 +2137,10 @@ "tooltipped" ], "pos": { - "x": 745, - "y": 1742 + "x": 649, + "y": 1664 }, - "width": 183, + "width": 151, "height": 66, "opacity": 1, "strokeDash": 0, @@ -2093,6 +2148,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2127,10 +2183,10 @@ "tooltipped" ], "pos": { - "x": 789, - "y": 1979 + "x": 693, + "y": 1870 }, - "width": 95, + "width": 63, "height": 66, "opacity": 1, "strokeDash": 0, @@ -2138,6 +2194,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2172,10 +2229,10 @@ "tooltipped" ], "pos": { - "x": 960, - "y": 1520 + "x": 832, + "y": 1458 }, - "width": 220, + "width": 156, "height": 92, "opacity": 1, "strokeDash": 0, @@ -2183,6 +2240,7 @@ "borderRadius": 0, "fill": "N4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2217,10 +2275,10 @@ "tooltipped" ], "pos": { - "x": 1003, - "y": 1740 + "x": 862, + "y": 1662 }, - "width": 134, + "width": 97, "height": 70, "opacity": 1, "strokeDash": 0, @@ -2228,6 +2286,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2262,17 +2321,18 @@ "tooltipped" ], "pos": { - "x": 996, - "y": 1938 + "x": 859, + "y": 1852 }, - "width": 148, - "height": 148, + "width": 103, + "height": 103, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2307,10 +2367,10 @@ "tooltipped" ], "pos": { - "x": 1197, - "y": 1741 + "x": 1019, + "y": 1663 }, - "width": 176, + "width": 128, "height": 69, "opacity": 1, "strokeDash": 0, @@ -2318,6 +2378,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2352,10 +2413,10 @@ "tooltipped" ], "pos": { - "x": 1214, - "y": 1970 + "x": 1031, + "y": 1861 }, - "width": 143, + "width": 104, "height": 84, "opacity": 1, "strokeDash": 0, @@ -2363,6 +2424,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2415,21 +2477,22 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 175.5, + "x": 95.5, "y": 129 }, { - "x": 175.5, + "x": 95.5, "y": 179.39999389648438 }, { - "x": 175.5, + "x": 95.5, "y": 202 }, { - "x": 175.5, + "x": 95.5, "y": 242 } ], @@ -2462,21 +2525,22 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 175.5, + "x": 95.5, "y": 336 }, { - "x": 175.5, + "x": 95.5, "y": 376 }, { - "x": 175.60000610351562, + "x": 95.5999984741211, "y": 399.20001220703125 }, { - "x": 176, + "x": 96, "y": 452 } ], @@ -2509,21 +2573,22 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 389, + "x": 309, "y": 129 }, { - "x": 389, + "x": 309, "y": 179.39999389648438 }, { - "x": 389, + "x": 309, "y": 203.8000030517578 }, { - "x": 389, + "x": 309, "y": 251 } ], @@ -2556,21 +2621,22 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 389, + "x": 309, "y": 317 }, { - "x": 389, + "x": 309, "y": 372.20001220703125 }, { - "x": 389, + "x": 309, "y": 396 }, { - "x": 389, + "x": 309, "y": 436 } ], @@ -2603,21 +2669,22 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 617, + "x": 537, "y": 129 }, { - "x": 617.4000244140625, + "x": 537.4000244140625, "y": 179.39999389648438 }, { - "x": 617.5999755859375, + "x": 537.5999755859375, "y": 204.1999969482422 }, { - "x": 618, + "x": 538, "y": 253 } ], @@ -2650,21 +2717,22 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 617, + "x": 537, "y": 326 }, { - "x": 617.4000244140625, + "x": 537.4000244140625, "y": 374 }, { - "x": 617.5999755859375, + "x": 537.5999755859375, "y": 397.79998779296875 }, { - "x": 618, + "x": 538, "y": 445 } ], @@ -2697,21 +2765,22 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 805, + "x": 725, "y": 97 }, { - "x": 804.5999755859375, + "x": 724.5999755859375, "y": 173 }, { - "x": 804.5999755859375, + "x": 724.5999755859375, "y": 204.8000030517578 }, { - "x": 805, + "x": 725, "y": 256 } ], @@ -2744,21 +2813,22 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 804, + "x": 724, "y": 322 }, { - "x": 804.4000244140625, + "x": 724.4000244140625, "y": 373.20001220703125 }, { - "x": 804.5999755859375, + "x": 724.5999755859375, "y": 401.20001220703125 }, { - "x": 805, + "x": 725, "y": 462 } ], @@ -2791,21 +2861,22 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 990, + "x": 910, "y": 142 }, { - "x": 990, + "x": 910, "y": 182 }, { - "x": 990, + "x": 910, "y": 204.39999389648438 }, { - "x": 990, + "x": 910, "y": 254 } ], @@ -2838,21 +2909,22 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 990, + "x": 910, "y": 324 }, { - "x": 990, + "x": 910, "y": 373.6000061035156 }, { - "x": 990, + "x": 910, "y": 397.6000061035156 }, { - "x": 990, + "x": 910, "y": 444 } ], @@ -2885,21 +2957,22 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 1163, + "x": 1083, "y": 324 }, { - "x": 1162.5999755859375, + "x": 1082.5999755859375, "y": 373.6000061035156 }, { - "x": 1162.5999755859375, + "x": 1082.5999755859375, "y": 399.79998779296875 }, { - "x": 1163, + "x": 1083, "y": 455 } ], @@ -2932,21 +3005,22 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 111.5, + "x": 95.5, "y": 833 }, { - "x": 111.5, + "x": 95.5, "y": 883.4000244140625 }, { - "x": 111.5, + "x": 95.5, "y": 906 }, { - "x": 111.5, + "x": 95.5, "y": 946 } ], @@ -2979,22 +3053,23 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 111.5, - "y": 1072 + "x": 95.5, + "y": 1040 }, { - "x": 111.5, - "y": 1112 + "x": 95.5, + "y": 1080 }, { - "x": 111.5999984741211, - "y": 1138.199951171875 + "x": 95.5999984741211, + "y": 1103.199951171875 }, { - "x": 112, - "y": 1203 + "x": 96, + "y": 1156 } ], "isCurve": true, @@ -3026,22 +3101,23 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 357, + "x": 309, "y": 833 }, { - "x": 357, + "x": 309, "y": 883.4000244140625 }, { - "x": 357, - "y": 911 + "x": 309, + "y": 907.7999877929688 }, { - "x": 357, - "y": 971 + "x": 309, + "y": 955 } ], "isCurve": true, @@ -3073,22 +3149,23 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 357, - "y": 1037 + "x": 309, + "y": 1021 }, { - "x": 357, - "y": 1105 + "x": 309, + "y": 1076.199951171875 }, { - "x": 357, - "y": 1135 + "x": 309, + "y": 1100 }, { - "x": 357, - "y": 1187 + "x": 309, + "y": 1140 } ], "isCurve": true, @@ -3120,22 +3197,23 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 617, + "x": 537, "y": 833 }, { - "x": 617.4000244140625, + "x": 537.4000244140625, "y": 883.4000244140625 }, { - "x": 617.5999755859375, - "y": 911.4000244140625 + "x": 537.5999755859375, + "y": 908.2000122070312 }, { - "x": 618, - "y": 973 + "x": 538, + "y": 957 } ], "isCurve": true, @@ -3167,22 +3245,23 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 617, - "y": 1046 + "x": 537, + "y": 1030 }, { - "x": 617.4000244140625, - "y": 1106.800048828125 + "x": 537.4000244140625, + "y": 1078 }, { - "x": 617.5999755859375, - "y": 1136.800048828125 + "x": 537.5999755859375, + "y": 1101.800048828125 }, { - "x": 618, - "y": 1196 + "x": 538, + "y": 1149 } ], "isCurve": true, @@ -3214,22 +3293,23 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 837, + "x": 725, "y": 801 }, { - "x": 836.5999755859375, + "x": 724.5999755859375, "y": 877 }, { - "x": 836.5999755859375, - "y": 912 + "x": 724.5999755859375, + "y": 908.7999877929688 }, { - "x": 837, - "y": 976 + "x": 725, + "y": 960 } ], "isCurve": true, @@ -3261,22 +3341,23 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 837, - "y": 1042 + "x": 724, + "y": 1026 }, { - "x": 836.5999755859375, - "y": 1106 + "x": 724.4000244140625, + "y": 1077.199951171875 }, { - "x": 836.5999755859375, - "y": 1140.199951171875 + "x": 724.5999755859375, + "y": 1105.199951171875 }, { - "x": 837, - "y": 1213 + "x": 725, + "y": 1166 } ], "isCurve": true, @@ -3308,22 +3389,23 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 1070, + "x": 910, "y": 846 }, { - "x": 1070, + "x": 910, "y": 886 }, { - "x": 1070, - "y": 911.5999755859375 + "x": 910, + "y": 908.4000244140625 }, { - "x": 1070, - "y": 974 + "x": 910, + "y": 958 } ], "isCurve": true, @@ -3355,22 +3437,23 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 1070, - "y": 1044 + "x": 910, + "y": 1028 }, { - "x": 1070, - "y": 1106.4000244140625 + "x": 910, + "y": 1077.5999755859375 }, { - "x": 1070, - "y": 1132 + "x": 910, + "y": 1101.5999755859375 }, { - "x": 1070, - "y": 1172 + "x": 910, + "y": 1148 } ], "isCurve": true, @@ -3402,22 +3485,23 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 1285, - "y": 1044 + "x": 1083, + "y": 1028 }, { - "x": 1285, - "y": 1106.4000244140625 + "x": 1082.5999755859375, + "y": 1077.5999755859375 }, { - "x": 1285, - "y": 1138.5999755859375 + "x": 1082.5999755859375, + "y": 1103.800048828125 }, { - "x": 1285, - "y": 1205 + "x": 1083, + "y": 1159 } ], "isCurve": true, @@ -3449,22 +3533,23 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 111.5, - "y": 1599 + "x": 95.5, + "y": 1537 }, { - "x": 111.5, - "y": 1649.4000244140625 + "x": 95.5, + "y": 1587.4000244140625 }, { - "x": 111.5, - "y": 1672 + "x": 95.5, + "y": 1610 }, { - "x": 111.5, - "y": 1712 + "x": 95.5, + "y": 1650 } ], "isCurve": true, @@ -3496,22 +3581,23 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 111.5, - "y": 1838 + "x": 95.5, + "y": 1744 }, { - "x": 111.5, - "y": 1878 + "x": 95.5, + "y": 1784 }, { - "x": 111.5999984741211, - "y": 1904.199951171875 + "x": 95.5999984741211, + "y": 1807.199951171875 }, { - "x": 112, - "y": 1969 + "x": 96, + "y": 1860 } ], "isCurve": true, @@ -3543,22 +3629,23 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 357, - "y": 1599 + "x": 309, + "y": 1537 }, { - "x": 357, - "y": 1649.4000244140625 + "x": 309, + "y": 1587.4000244140625 }, { - "x": 357, - "y": 1677 + "x": 309, + "y": 1611.800048828125 }, { - "x": 357, - "y": 1737 + "x": 309, + "y": 1659 } ], "isCurve": true, @@ -3590,22 +3677,23 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 357, - "y": 1803 + "x": 309, + "y": 1725 }, { - "x": 357, - "y": 1871 + "x": 309, + "y": 1780.199951171875 }, { - "x": 357, - "y": 1901 + "x": 309, + "y": 1804 }, { - "x": 357, - "y": 1953 + "x": 309, + "y": 1844 } ], "isCurve": true, @@ -3637,22 +3725,23 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 617, - "y": 1599 + "x": 537, + "y": 1537 }, { - "x": 617.4000244140625, - "y": 1649.4000244140625 + "x": 537.4000244140625, + "y": 1587.4000244140625 }, { - "x": 617.5999755859375, - "y": 1677.4000244140625 + "x": 537.5999755859375, + "y": 1612.199951171875 }, { - "x": 618, - "y": 1739 + "x": 538, + "y": 1661 } ], "isCurve": true, @@ -3684,22 +3773,23 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 617, - "y": 1812 + "x": 537, + "y": 1734 }, { - "x": 617.4000244140625, - "y": 1872.800048828125 + "x": 537.4000244140625, + "y": 1782 }, { - "x": 617.5999755859375, - "y": 1902.800048828125 + "x": 537.5999755859375, + "y": 1805.800048828125 }, { - "x": 618, - "y": 1962 + "x": 538, + "y": 1853 } ], "isCurve": true, @@ -3731,22 +3821,23 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 837, - "y": 1567 + "x": 725, + "y": 1505 }, { - "x": 836.5999755859375, - "y": 1643 + "x": 724.5999755859375, + "y": 1581 }, { - "x": 836.5999755859375, - "y": 1678 + "x": 724.5999755859375, + "y": 1612.800048828125 }, { - "x": 837, - "y": 1742 + "x": 725, + "y": 1664 } ], "isCurve": true, @@ -3778,22 +3869,23 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 837, - "y": 1808 + "x": 724, + "y": 1730 }, { - "x": 836.5999755859375, - "y": 1872 + "x": 724.4000244140625, + "y": 1781.199951171875 }, { - "x": 836.5999755859375, - "y": 1906.199951171875 + "x": 724.5999755859375, + "y": 1809.199951171875 }, { - "x": 837, - "y": 1979 + "x": 725, + "y": 1870 } ], "isCurve": true, @@ -3825,22 +3917,23 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 1070, - "y": 1612 + "x": 910, + "y": 1550 }, { - "x": 1070, - "y": 1652 + "x": 910, + "y": 1590 }, { - "x": 1070, - "y": 1677.5999755859375 + "x": 910, + "y": 1612.4000244140625 }, { - "x": 1070, - "y": 1740 + "x": 910, + "y": 1662 } ], "isCurve": true, @@ -3872,22 +3965,23 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 1070, - "y": 1810 + "x": 910, + "y": 1732 }, { - "x": 1070, - "y": 1872.4000244140625 + "x": 910, + "y": 1781.5999755859375 }, { - "x": 1070, - "y": 1898 + "x": 910, + "y": 1805.5999755859375 }, { - "x": 1070, - "y": 1938 + "x": 910, + "y": 1852 } ], "isCurve": true, @@ -3919,22 +4013,23 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 1285, - "y": 1810 + "x": 1083, + "y": 1732 }, { - "x": 1285, - "y": 1872.4000244140625 + "x": 1082.5999755859375, + "y": 1781.5999755859375 }, { - "x": 1285, - "y": 1904.5999755859375 + "x": 1082.5999755859375, + "y": 1807.800048828125 }, { - "x": 1285, - "y": 1971 + "x": 1083, + "y": 1863 } ], "isCurve": true, @@ -3966,22 +4061,23 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 617.5, + "x": 537.5, "y": 584 }, { - "x": 617.5, + "x": 537.5, "y": 640 }, { - "x": 617.5, - "y": 668 + "x": 537.5, + "y": 659.7999877929688 }, { - "x": 617.5, - "y": 724 + "x": 537.5, + "y": 683 } ], "isCurve": true, @@ -4013,22 +4109,23 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 617.5, - "y": 1350 + "x": 537.5, + "y": 1288 }, { - "x": 617.5, - "y": 1406 + "x": 537.5, + "y": 1344 }, { - "x": 617.5, - "y": 1434 + "x": 537.5, + "y": 1372 }, { - "x": 617.5, - "y": 1490 + "x": 537.5, + "y": 1428 } ], "isCurve": true, @@ -4053,6 +4150,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/all_shapes_link/dagre/sketch.exp.svg b/e2etests/testdata/stable/all_shapes_link/dagre/sketch.exp.svg index 62bfb08fd..0de421a42 100644 --- a/e2etests/testdata/stable/all_shapes_link/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes_link/dagre/sketch.exp.svg @@ -1,19 +1,19 @@ -linkedtooltippedbothrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexamplerectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexample example - + .d2-1366919476 .fill-N1{fill:#0A0F25;} + .d2-1366919476 .fill-N2{fill:#676C7E;} + .d2-1366919476 .fill-N3{fill:#9499AB;} + .d2-1366919476 .fill-N4{fill:#CFD2DD;} + .d2-1366919476 .fill-N5{fill:#DEE1EB;} + .d2-1366919476 .fill-N6{fill:#EEF1F8;} + .d2-1366919476 .fill-N7{fill:#FFFFFF;} + .d2-1366919476 .fill-B1{fill:#0D32B2;} + .d2-1366919476 .fill-B2{fill:#0D32B2;} + .d2-1366919476 .fill-B3{fill:#E3E9FD;} + .d2-1366919476 .fill-B4{fill:#E3E9FD;} + .d2-1366919476 .fill-B5{fill:#EDF0FD;} + .d2-1366919476 .fill-B6{fill:#F7F8FE;} + .d2-1366919476 .fill-AA2{fill:#4A6FF3;} + .d2-1366919476 .fill-AA4{fill:#EDF0FD;} + .d2-1366919476 .fill-AA5{fill:#F7F8FE;} + .d2-1366919476 .fill-AB4{fill:#EDF0FD;} + .d2-1366919476 .fill-AB5{fill:#F7F8FE;} + .d2-1366919476 .stroke-N1{stroke:#0A0F25;} + .d2-1366919476 .stroke-N2{stroke:#676C7E;} + .d2-1366919476 .stroke-N3{stroke:#9499AB;} + .d2-1366919476 .stroke-N4{stroke:#CFD2DD;} + .d2-1366919476 .stroke-N5{stroke:#DEE1EB;} + .d2-1366919476 .stroke-N6{stroke:#EEF1F8;} + .d2-1366919476 .stroke-N7{stroke:#FFFFFF;} + .d2-1366919476 .stroke-B1{stroke:#0D32B2;} + .d2-1366919476 .stroke-B2{stroke:#0D32B2;} + .d2-1366919476 .stroke-B3{stroke:#E3E9FD;} + .d2-1366919476 .stroke-B4{stroke:#E3E9FD;} + .d2-1366919476 .stroke-B5{stroke:#EDF0FD;} + .d2-1366919476 .stroke-B6{stroke:#F7F8FE;} + .d2-1366919476 .stroke-AA2{stroke:#4A6FF3;} + .d2-1366919476 .stroke-AA4{stroke:#EDF0FD;} + .d2-1366919476 .stroke-AA5{stroke:#F7F8FE;} + .d2-1366919476 .stroke-AB4{stroke:#EDF0FD;} + .d2-1366919476 .stroke-AB5{stroke:#F7F8FE;} + .d2-1366919476 .background-color-N1{background-color:#0A0F25;} + .d2-1366919476 .background-color-N2{background-color:#676C7E;} + .d2-1366919476 .background-color-N3{background-color:#9499AB;} + .d2-1366919476 .background-color-N4{background-color:#CFD2DD;} + .d2-1366919476 .background-color-N5{background-color:#DEE1EB;} + .d2-1366919476 .background-color-N6{background-color:#EEF1F8;} + .d2-1366919476 .background-color-N7{background-color:#FFFFFF;} + .d2-1366919476 .background-color-B1{background-color:#0D32B2;} + .d2-1366919476 .background-color-B2{background-color:#0D32B2;} + .d2-1366919476 .background-color-B3{background-color:#E3E9FD;} + .d2-1366919476 .background-color-B4{background-color:#E3E9FD;} + .d2-1366919476 .background-color-B5{background-color:#EDF0FD;} + .d2-1366919476 .background-color-B6{background-color:#F7F8FE;} + .d2-1366919476 .background-color-AA2{background-color:#4A6FF3;} + .d2-1366919476 .background-color-AA4{background-color:#EDF0FD;} + .d2-1366919476 .background-color-AA5{background-color:#F7F8FE;} + .d2-1366919476 .background-color-AB4{background-color:#EDF0FD;} + .d2-1366919476 .background-color-AB5{background-color:#F7F8FE;} + .d2-1366919476 .color-N1{color:#0A0F25;} + .d2-1366919476 .color-N2{color:#676C7E;} + .d2-1366919476 .color-N3{color:#9499AB;} + .d2-1366919476 .color-N4{color:#CFD2DD;} + .d2-1366919476 .color-N5{color:#DEE1EB;} + .d2-1366919476 .color-N6{color:#EEF1F8;} + .d2-1366919476 .color-N7{color:#FFFFFF;} + .d2-1366919476 .color-B1{color:#0D32B2;} + .d2-1366919476 .color-B2{color:#0D32B2;} + .d2-1366919476 .color-B3{color:#E3E9FD;} + .d2-1366919476 .color-B4{color:#E3E9FD;} + .d2-1366919476 .color-B5{color:#EDF0FD;} + .d2-1366919476 .color-B6{color:#F7F8FE;} + .d2-1366919476 .color-AA2{color:#4A6FF3;} + .d2-1366919476 .color-AA4{color:#EDF0FD;} + .d2-1366919476 .color-AA5{color:#F7F8FE;} + .d2-1366919476 .color-AB4{color:#EDF0FD;} + .d2-1366919476 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1366919476);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1366919476);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1366919476);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1366919476);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1366919476);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1366919476);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1366919476);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1366919476);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1366919476);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1366919476);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1366919476);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1366919476);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1366919476);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1366919476);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1366919476);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1366919476);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1366919476);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1366919476);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>linkedtooltippedbothrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexamplerectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexample example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/all_shapes_link/elk/board.exp.json b/e2etests/testdata/stable/all_shapes_link/elk/board.exp.json index 5ec402780..7a609d5b4 100644 --- a/e2etests/testdata/stable/all_shapes_link/elk/board.exp.json +++ b/e2etests/testdata/stable/all_shapes_link/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -7,7 +15,7 @@ "id": "linked", "type": "rectangle", "pos": { - "x": 132, + "x": 12, "y": 12 }, "width": 1036, @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -51,7 +60,7 @@ "linked" ], "pos": { - "x": 182, + "x": 62, "y": 88 }, "width": 111, @@ -62,6 +71,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -95,7 +105,7 @@ "linked" ], "pos": { - "x": 190, + "x": 70, "y": 224 }, "width": 94, @@ -106,6 +116,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -139,7 +150,7 @@ "linked" ], "pos": { - "x": 198, + "x": 78, "y": 388 }, "width": 79, @@ -150,6 +161,7 @@ "borderRadius": 0, "fill": "AB5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -183,7 +195,7 @@ "linked" ], "pos": { - "x": 313, + "x": 193, "y": 88 }, "width": 196, @@ -194,6 +206,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -227,7 +240,7 @@ "linked" ], "pos": { - "x": 352, + "x": 232, "y": 233 }, "width": 117, @@ -238,6 +251,7 @@ "borderRadius": 0, "fill": "AB5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -271,7 +285,7 @@ "linked" ], "pos": { - "x": 359, + "x": 239, "y": 388 }, "width": 104, @@ -282,6 +296,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -315,7 +330,7 @@ "linked" ], "pos": { - "x": 529, + "x": 409, "y": 88 }, "width": 141, @@ -326,6 +341,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -359,7 +375,7 @@ "linked" ], "pos": { - "x": 548, + "x": 428, "y": 234 }, "width": 103, @@ -370,6 +386,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -403,7 +420,7 @@ "linked" ], "pos": { - "x": 541, + "x": 421, "y": 388 }, "width": 116, @@ -414,6 +431,7 @@ "borderRadius": 0, "fill": "AB5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -447,7 +465,7 @@ "linked" ], "pos": { - "x": 699, + "x": 579, "y": 63 }, "width": 95, @@ -458,6 +476,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -491,7 +510,7 @@ "linked" ], "pos": { - "x": 671, + "x": 551, "y": 238 }, "width": 151, @@ -502,6 +521,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -535,7 +555,7 @@ "linked" ], "pos": { - "x": 715, + "x": 595, "y": 388 }, "width": 63, @@ -546,6 +566,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -579,7 +600,7 @@ "linked" ], "pos": { - "x": 814, + "x": 694, "y": 62 }, "width": 156, @@ -590,6 +611,7 @@ "borderRadius": 0, "fill": "N4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -623,7 +645,7 @@ "linked" ], "pos": { - "x": 843, + "x": 723, "y": 236 }, "width": 97, @@ -634,6 +656,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -667,7 +690,7 @@ "linked" ], "pos": { - "x": 840, + "x": 720, "y": 388 }, "width": 103, @@ -678,6 +701,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -711,7 +735,7 @@ "linked" ], "pos": { - "x": 990, + "x": 870, "y": 85 }, "width": 128, @@ -722,6 +746,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -755,7 +780,7 @@ "linked" ], "pos": { - "x": 1002, + "x": 882, "y": 224 }, "width": 104, @@ -766,6 +791,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -800,14 +826,15 @@ "x": 12, "y": 626 }, - "width": 1276, - "height": 606, + "width": 1036, + "height": 544, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -844,7 +871,7 @@ "x": 62, "y": 702 }, - "width": 143, + "width": 111, "height": 66, "opacity": 1, "strokeDash": 0, @@ -852,6 +879,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -888,14 +916,15 @@ "x": 70, "y": 838 }, - "width": 126, - "height": 126, + "width": 94, + "height": 94, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -930,9 +959,9 @@ ], "pos": { "x": 78, - "y": 1034 + "y": 1002 }, - "width": 111, + "width": 79, "height": 87, "opacity": 1, "strokeDash": 0, @@ -940,6 +969,7 @@ "borderRadius": 0, "fill": "AB5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -973,10 +1003,10 @@ "tooltipped" ], "pos": { - "x": 225, + "x": 193, "y": 702 }, - "width": 228, + "width": 196, "height": 66, "opacity": 1, "strokeDash": 0, @@ -984,6 +1014,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1017,10 +1048,10 @@ "tooltipped" ], "pos": { - "x": 264, - "y": 863 + "x": 232, + "y": 847 }, - "width": 149, + "width": 117, "height": 76, "opacity": 1, "strokeDash": 0, @@ -1028,6 +1059,7 @@ "borderRadius": 0, "fill": "AB5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1061,10 +1093,10 @@ "tooltipped" ], "pos": { - "x": 271, - "y": 1034 + "x": 239, + "y": 1002 }, - "width": 136, + "width": 104, "height": 118, "opacity": 1, "strokeDash": 0, @@ -1072,6 +1104,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1105,10 +1138,10 @@ "tooltipped" ], "pos": { - "x": 473, + "x": 409, "y": 702 }, - "width": 173, + "width": 141, "height": 66, "opacity": 1, "strokeDash": 0, @@ -1116,6 +1149,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1149,10 +1183,10 @@ "tooltipped" ], "pos": { - "x": 492, - "y": 864 + "x": 428, + "y": 848 }, - "width": 135, + "width": 103, "height": 73, "opacity": 1, "strokeDash": 0, @@ -1160,6 +1194,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1193,10 +1228,10 @@ "tooltipped" ], "pos": { - "x": 485, - "y": 1034 + "x": 421, + "y": 1002 }, - "width": 148, + "width": 116, "height": 101, "opacity": 1, "strokeDash": 0, @@ -1204,6 +1239,7 @@ "borderRadius": 0, "fill": "AB5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1237,10 +1273,10 @@ "tooltipped" ], "pos": { - "x": 675, + "x": 579, "y": 677 }, - "width": 127, + "width": 95, "height": 91, "opacity": 1, "strokeDash": 0, @@ -1248,6 +1284,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1281,10 +1318,10 @@ "tooltipped" ], "pos": { - "x": 647, - "y": 868 + "x": 551, + "y": 852 }, - "width": 183, + "width": 151, "height": 66, "opacity": 1, "strokeDash": 0, @@ -1292,6 +1329,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1325,10 +1363,10 @@ "tooltipped" ], "pos": { - "x": 691, - "y": 1034 + "x": 595, + "y": 1002 }, - "width": 95, + "width": 63, "height": 66, "opacity": 1, "strokeDash": 0, @@ -1336,6 +1374,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1369,10 +1408,10 @@ "tooltipped" ], "pos": { - "x": 822, + "x": 694, "y": 676 }, - "width": 220, + "width": 156, "height": 92, "opacity": 1, "strokeDash": 0, @@ -1380,6 +1419,7 @@ "borderRadius": 0, "fill": "N4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1413,10 +1453,10 @@ "tooltipped" ], "pos": { - "x": 865, - "y": 866 + "x": 723, + "y": 850 }, - "width": 134, + "width": 97, "height": 70, "opacity": 1, "strokeDash": 0, @@ -1424,6 +1464,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1457,17 +1498,18 @@ "tooltipped" ], "pos": { - "x": 858, - "y": 1034 + "x": 720, + "y": 1002 }, - "width": 148, - "height": 148, + "width": 103, + "height": 103, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1501,10 +1543,10 @@ "tooltipped" ], "pos": { - "x": 1062, + "x": 870, "y": 699 }, - "width": 176, + "width": 128, "height": 69, "opacity": 1, "strokeDash": 0, @@ -1512,6 +1554,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1545,10 +1588,10 @@ "tooltipped" ], "pos": { - "x": 1078, + "x": 882, "y": 838 }, - "width": 143, + "width": 104, "height": 84, "opacity": 1, "strokeDash": 0, @@ -1556,6 +1599,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1588,16 +1632,17 @@ "type": "rectangle", "pos": { "x": 12, - "y": 1302 + "y": 1240 }, - "width": 1276, - "height": 606, + "width": 1036, + "height": 544, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1633,9 +1678,9 @@ ], "pos": { "x": 62, - "y": 1378 + "y": 1316 }, - "width": 143, + "width": 111, "height": 66, "opacity": 1, "strokeDash": 0, @@ -1643,6 +1688,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1678,16 +1724,17 @@ ], "pos": { "x": 70, - "y": 1514 + "y": 1452 }, - "width": 126, - "height": 126, + "width": 94, + "height": 94, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1723,9 +1770,9 @@ ], "pos": { "x": 78, - "y": 1710 + "y": 1616 }, - "width": 111, + "width": 79, "height": 87, "opacity": 1, "strokeDash": 0, @@ -1733,6 +1780,7 @@ "borderRadius": 0, "fill": "AB5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1767,10 +1815,10 @@ "tooltipped" ], "pos": { - "x": 225, - "y": 1378 + "x": 193, + "y": 1316 }, - "width": 228, + "width": 196, "height": 66, "opacity": 1, "strokeDash": 0, @@ -1778,6 +1826,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1812,10 +1861,10 @@ "tooltipped" ], "pos": { - "x": 264, - "y": 1539 + "x": 232, + "y": 1461 }, - "width": 149, + "width": 117, "height": 76, "opacity": 1, "strokeDash": 0, @@ -1823,6 +1872,7 @@ "borderRadius": 0, "fill": "AB5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1857,10 +1907,10 @@ "tooltipped" ], "pos": { - "x": 271, - "y": 1710 + "x": 239, + "y": 1616 }, - "width": 136, + "width": 104, "height": 118, "opacity": 1, "strokeDash": 0, @@ -1868,6 +1918,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1902,10 +1953,10 @@ "tooltipped" ], "pos": { - "x": 473, - "y": 1378 + "x": 409, + "y": 1316 }, - "width": 173, + "width": 141, "height": 66, "opacity": 1, "strokeDash": 0, @@ -1913,6 +1964,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1947,10 +1999,10 @@ "tooltipped" ], "pos": { - "x": 492, - "y": 1540 + "x": 428, + "y": 1462 }, - "width": 135, + "width": 103, "height": 73, "opacity": 1, "strokeDash": 0, @@ -1958,6 +2010,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1992,10 +2045,10 @@ "tooltipped" ], "pos": { - "x": 485, - "y": 1710 + "x": 421, + "y": 1616 }, - "width": 148, + "width": 116, "height": 101, "opacity": 1, "strokeDash": 0, @@ -2003,6 +2056,7 @@ "borderRadius": 0, "fill": "AB5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2037,10 +2091,10 @@ "tooltipped" ], "pos": { - "x": 675, - "y": 1353 + "x": 579, + "y": 1291 }, - "width": 127, + "width": 95, "height": 91, "opacity": 1, "strokeDash": 0, @@ -2048,6 +2102,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2082,10 +2137,10 @@ "tooltipped" ], "pos": { - "x": 647, - "y": 1544 + "x": 551, + "y": 1466 }, - "width": 183, + "width": 151, "height": 66, "opacity": 1, "strokeDash": 0, @@ -2093,6 +2148,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2127,10 +2183,10 @@ "tooltipped" ], "pos": { - "x": 691, - "y": 1710 + "x": 595, + "y": 1616 }, - "width": 95, + "width": 63, "height": 66, "opacity": 1, "strokeDash": 0, @@ -2138,6 +2194,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2172,10 +2229,10 @@ "tooltipped" ], "pos": { - "x": 822, - "y": 1352 + "x": 694, + "y": 1290 }, - "width": 220, + "width": 156, "height": 92, "opacity": 1, "strokeDash": 0, @@ -2183,6 +2240,7 @@ "borderRadius": 0, "fill": "N4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2217,10 +2275,10 @@ "tooltipped" ], "pos": { - "x": 865, - "y": 1542 + "x": 723, + "y": 1464 }, - "width": 134, + "width": 97, "height": 70, "opacity": 1, "strokeDash": 0, @@ -2228,6 +2286,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2262,17 +2321,18 @@ "tooltipped" ], "pos": { - "x": 858, - "y": 1710 + "x": 720, + "y": 1616 }, - "width": 148, - "height": 148, + "width": 103, + "height": 103, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2307,10 +2367,10 @@ "tooltipped" ], "pos": { - "x": 1062, - "y": 1375 + "x": 870, + "y": 1313 }, - "width": 176, + "width": 128, "height": 69, "opacity": 1, "strokeDash": 0, @@ -2318,6 +2378,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2352,10 +2413,10 @@ "tooltipped" ], "pos": { - "x": 1078, - "y": 1514 + "x": 882, + "y": 1452 }, - "width": 143, + "width": 104, "height": 84, "opacity": 1, "strokeDash": 0, @@ -2363,6 +2424,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2415,13 +2477,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 237.5, + "x": 117.5, "y": 154 }, { - "x": 237.5, + "x": 117.5, "y": 224 } ], @@ -2453,13 +2516,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 237.5, + "x": 117.5, "y": 318 }, { - "x": 238, + "x": 118, "y": 388 } ], @@ -2491,13 +2555,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 411, + "x": 291, "y": 154 }, { - "x": 411, + "x": 291, "y": 233 } ], @@ -2529,13 +2594,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 411, + "x": 291, "y": 298 }, { - "x": 411, + "x": 291, "y": 388 } ], @@ -2567,14 +2633,15 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 599, + "x": 479, "y": 154 }, { - "x": 600, - "y": 249 + "x": 480, + "y": 235 } ], "animated": false, @@ -2605,13 +2672,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 599, + "x": 479, "y": 308 }, { - "x": 600, + "x": 480, "y": 388 } ], @@ -2643,13 +2711,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 747, + "x": 627, "y": 109 }, { - "x": 746, + "x": 626, "y": 238 } ], @@ -2681,13 +2750,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 746, + "x": 626, "y": 304 }, { - "x": 747, + "x": 627, "y": 388 } ], @@ -2719,13 +2789,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 892, + "x": 772, "y": 154 }, { - "x": 892, + "x": 772, "y": 236 } ], @@ -2757,13 +2828,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 892, + "x": 772, "y": 306 }, { - "x": 892, + "x": 772, "y": 388 } ], @@ -2795,13 +2867,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 1054, + "x": 934, "y": 154 }, { - "x": 1054, + "x": 934, "y": 225 } ], @@ -2833,13 +2906,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 133.5, + "x": 117.5, "y": 768 }, { - "x": 133.5, + "x": 117.5, "y": 838 } ], @@ -2871,14 +2945,15 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 133.5, - "y": 964 + "x": 117.5, + "y": 932 }, { - "x": 134, - "y": 1034 + "x": 118, + "y": 1002 } ], "animated": false, @@ -2909,14 +2984,15 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 339, + "x": 291, "y": 768 }, { - "x": 339, - "y": 863 + "x": 291, + "y": 847 } ], "animated": false, @@ -2947,14 +3023,15 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 339, - "y": 928 + "x": 291, + "y": 912 }, { - "x": 339, - "y": 1034 + "x": 291, + "y": 1002 } ], "animated": false, @@ -2985,14 +3062,15 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 559, + "x": 479, "y": 768 }, { - "x": 560, - "y": 879 + "x": 480, + "y": 849 } ], "animated": false, @@ -3023,14 +3101,15 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 559, - "y": 938 + "x": 479, + "y": 922 }, { - "x": 560, - "y": 1034 + "x": 480, + "y": 1002 } ], "animated": false, @@ -3061,14 +3140,15 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 739, + "x": 627, "y": 723 }, { - "x": 738, - "y": 868 + "x": 626, + "y": 852 } ], "animated": false, @@ -3099,14 +3179,15 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 739, - "y": 934 + "x": 626, + "y": 918 }, { - "x": 738, - "y": 1034 + "x": 627, + "y": 1002 } ], "animated": false, @@ -3137,14 +3218,15 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 932, + "x": 772, "y": 768 }, { - "x": 932, - "y": 866 + "x": 772, + "y": 850 } ], "animated": false, @@ -3175,14 +3257,15 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 932, - "y": 936 + "x": 772, + "y": 920 }, { - "x": 932, - "y": 1034 + "x": 772, + "y": 1002 } ], "animated": false, @@ -3213,13 +3296,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 1150, + "x": 934, "y": 768 }, { - "x": 1150, + "x": 934, "y": 839 } ], @@ -3251,14 +3335,15 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 133.5, - "y": 1444 + "x": 117.5, + "y": 1382 }, { - "x": 133.5, - "y": 1514 + "x": 117.5, + "y": 1452 } ], "animated": false, @@ -3289,14 +3374,15 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 133.5, - "y": 1640 + "x": 117.5, + "y": 1546 }, { - "x": 134, - "y": 1710 + "x": 118, + "y": 1616 } ], "animated": false, @@ -3327,14 +3413,15 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 339, - "y": 1444 + "x": 291, + "y": 1382 }, { - "x": 339, - "y": 1539 + "x": 291, + "y": 1461 } ], "animated": false, @@ -3365,14 +3452,15 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 339, - "y": 1604 + "x": 291, + "y": 1526 }, { - "x": 339, - "y": 1710 + "x": 291, + "y": 1616 } ], "animated": false, @@ -3403,14 +3491,15 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 559, - "y": 1444 + "x": 479, + "y": 1382 }, { - "x": 560, - "y": 1555 + "x": 480, + "y": 1463 } ], "animated": false, @@ -3441,14 +3530,15 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 559, - "y": 1614 + "x": 479, + "y": 1536 }, { - "x": 560, - "y": 1710 + "x": 480, + "y": 1616 } ], "animated": false, @@ -3479,14 +3569,15 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 739, - "y": 1399 + "x": 627, + "y": 1337 }, { - "x": 738, - "y": 1544 + "x": 626, + "y": 1466 } ], "animated": false, @@ -3517,14 +3608,15 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 739, - "y": 1610 + "x": 626, + "y": 1532 }, { - "x": 738, - "y": 1710 + "x": 627, + "y": 1616 } ], "animated": false, @@ -3555,14 +3647,15 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 932, - "y": 1444 + "x": 772, + "y": 1382 }, { - "x": 932, - "y": 1542 + "x": 772, + "y": 1464 } ], "animated": false, @@ -3593,14 +3686,15 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 932, - "y": 1612 + "x": 772, + "y": 1534 }, { - "x": 932, - "y": 1710 + "x": 772, + "y": 1616 } ], "animated": false, @@ -3631,14 +3725,15 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 1150, - "y": 1444 + "x": 934, + "y": 1382 }, { - "x": 1150, - "y": 1515 + "x": 934, + "y": 1453 } ], "animated": false, @@ -3669,13 +3764,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 650, + "x": 530, "y": 556 }, { - "x": 650, + "x": 530, "y": 626 } ], @@ -3707,14 +3803,15 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 650, - "y": 1232 + "x": 530, + "y": 1170 }, { - "x": 650, - "y": 1302 + "x": 530, + "y": 1240 } ], "animated": false, @@ -3738,6 +3835,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/all_shapes_link/elk/sketch.exp.svg b/e2etests/testdata/stable/all_shapes_link/elk/sketch.exp.svg index cd701f716..faabee0ad 100644 --- a/e2etests/testdata/stable/all_shapes_link/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes_link/elk/sketch.exp.svg @@ -1,19 +1,19 @@ -linkedtooltippedbothrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexamplerectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexample example - + .d2-4209827848 .fill-N1{fill:#0A0F25;} + .d2-4209827848 .fill-N2{fill:#676C7E;} + .d2-4209827848 .fill-N3{fill:#9499AB;} + .d2-4209827848 .fill-N4{fill:#CFD2DD;} + .d2-4209827848 .fill-N5{fill:#DEE1EB;} + .d2-4209827848 .fill-N6{fill:#EEF1F8;} + .d2-4209827848 .fill-N7{fill:#FFFFFF;} + .d2-4209827848 .fill-B1{fill:#0D32B2;} + .d2-4209827848 .fill-B2{fill:#0D32B2;} + .d2-4209827848 .fill-B3{fill:#E3E9FD;} + .d2-4209827848 .fill-B4{fill:#E3E9FD;} + .d2-4209827848 .fill-B5{fill:#EDF0FD;} + .d2-4209827848 .fill-B6{fill:#F7F8FE;} + .d2-4209827848 .fill-AA2{fill:#4A6FF3;} + .d2-4209827848 .fill-AA4{fill:#EDF0FD;} + .d2-4209827848 .fill-AA5{fill:#F7F8FE;} + .d2-4209827848 .fill-AB4{fill:#EDF0FD;} + .d2-4209827848 .fill-AB5{fill:#F7F8FE;} + .d2-4209827848 .stroke-N1{stroke:#0A0F25;} + .d2-4209827848 .stroke-N2{stroke:#676C7E;} + .d2-4209827848 .stroke-N3{stroke:#9499AB;} + .d2-4209827848 .stroke-N4{stroke:#CFD2DD;} + .d2-4209827848 .stroke-N5{stroke:#DEE1EB;} + .d2-4209827848 .stroke-N6{stroke:#EEF1F8;} + .d2-4209827848 .stroke-N7{stroke:#FFFFFF;} + .d2-4209827848 .stroke-B1{stroke:#0D32B2;} + .d2-4209827848 .stroke-B2{stroke:#0D32B2;} + .d2-4209827848 .stroke-B3{stroke:#E3E9FD;} + .d2-4209827848 .stroke-B4{stroke:#E3E9FD;} + .d2-4209827848 .stroke-B5{stroke:#EDF0FD;} + .d2-4209827848 .stroke-B6{stroke:#F7F8FE;} + .d2-4209827848 .stroke-AA2{stroke:#4A6FF3;} + .d2-4209827848 .stroke-AA4{stroke:#EDF0FD;} + .d2-4209827848 .stroke-AA5{stroke:#F7F8FE;} + .d2-4209827848 .stroke-AB4{stroke:#EDF0FD;} + .d2-4209827848 .stroke-AB5{stroke:#F7F8FE;} + .d2-4209827848 .background-color-N1{background-color:#0A0F25;} + .d2-4209827848 .background-color-N2{background-color:#676C7E;} + .d2-4209827848 .background-color-N3{background-color:#9499AB;} + .d2-4209827848 .background-color-N4{background-color:#CFD2DD;} + .d2-4209827848 .background-color-N5{background-color:#DEE1EB;} + .d2-4209827848 .background-color-N6{background-color:#EEF1F8;} + .d2-4209827848 .background-color-N7{background-color:#FFFFFF;} + .d2-4209827848 .background-color-B1{background-color:#0D32B2;} + .d2-4209827848 .background-color-B2{background-color:#0D32B2;} + .d2-4209827848 .background-color-B3{background-color:#E3E9FD;} + .d2-4209827848 .background-color-B4{background-color:#E3E9FD;} + .d2-4209827848 .background-color-B5{background-color:#EDF0FD;} + .d2-4209827848 .background-color-B6{background-color:#F7F8FE;} + .d2-4209827848 .background-color-AA2{background-color:#4A6FF3;} + .d2-4209827848 .background-color-AA4{background-color:#EDF0FD;} + .d2-4209827848 .background-color-AA5{background-color:#F7F8FE;} + .d2-4209827848 .background-color-AB4{background-color:#EDF0FD;} + .d2-4209827848 .background-color-AB5{background-color:#F7F8FE;} + .d2-4209827848 .color-N1{color:#0A0F25;} + .d2-4209827848 .color-N2{color:#676C7E;} + .d2-4209827848 .color-N3{color:#9499AB;} + .d2-4209827848 .color-N4{color:#CFD2DD;} + .d2-4209827848 .color-N5{color:#DEE1EB;} + .d2-4209827848 .color-N6{color:#EEF1F8;} + .d2-4209827848 .color-N7{color:#FFFFFF;} + .d2-4209827848 .color-B1{color:#0D32B2;} + .d2-4209827848 .color-B2{color:#0D32B2;} + .d2-4209827848 .color-B3{color:#E3E9FD;} + .d2-4209827848 .color-B4{color:#E3E9FD;} + .d2-4209827848 .color-B5{color:#EDF0FD;} + .d2-4209827848 .color-B6{color:#F7F8FE;} + .d2-4209827848 .color-AA2{color:#4A6FF3;} + .d2-4209827848 .color-AA4{color:#EDF0FD;} + .d2-4209827848 .color-AA5{color:#F7F8FE;} + .d2-4209827848 .color-AB4{color:#EDF0FD;} + .d2-4209827848 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4209827848);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4209827848);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4209827848);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4209827848);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4209827848);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4209827848);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4209827848);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4209827848);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4209827848);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4209827848);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4209827848);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4209827848);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4209827848);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4209827848);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4209827848);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4209827848);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4209827848);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4209827848);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>linkedtooltippedbothrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexamplerectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexample example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + -example - +example + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/all_shapes_multiple/dagre/board.exp.json b/e2etests/testdata/stable/all_shapes_multiple/dagre/board.exp.json index 4a2594f54..ec3d096a2 100644 --- a/e2etests/testdata/stable/all_shapes_multiple/dagre/board.exp.json +++ b/e2etests/testdata/stable/all_shapes_multiple/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "AB4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "AB4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "AA4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "AA4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "AB4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "AA4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "N4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -726,6 +751,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 55.5, @@ -773,6 +799,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 55.5, @@ -820,6 +847,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 279, @@ -867,6 +895,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 279, @@ -914,6 +943,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 507, @@ -961,6 +991,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 507, @@ -1008,6 +1039,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 705, @@ -1055,6 +1087,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 704, @@ -1102,6 +1135,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 890, @@ -1149,6 +1183,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 890, @@ -1196,6 +1231,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1102, @@ -1236,6 +1272,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/all_shapes_multiple/dagre/sketch.exp.svg b/e2etests/testdata/stable/all_shapes_multiple/dagre/sketch.exp.svg index 0e67a6dda..b2af63aa2 100644 --- a/e2etests/testdata/stable/all_shapes_multiple/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes_multiple/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud + .d2-2407724796 .fill-N1{fill:#0A0F25;} + .d2-2407724796 .fill-N2{fill:#676C7E;} + .d2-2407724796 .fill-N3{fill:#9499AB;} + .d2-2407724796 .fill-N4{fill:#CFD2DD;} + .d2-2407724796 .fill-N5{fill:#DEE1EB;} + .d2-2407724796 .fill-N6{fill:#EEF1F8;} + .d2-2407724796 .fill-N7{fill:#FFFFFF;} + .d2-2407724796 .fill-B1{fill:#0D32B2;} + .d2-2407724796 .fill-B2{fill:#0D32B2;} + .d2-2407724796 .fill-B3{fill:#E3E9FD;} + .d2-2407724796 .fill-B4{fill:#E3E9FD;} + .d2-2407724796 .fill-B5{fill:#EDF0FD;} + .d2-2407724796 .fill-B6{fill:#F7F8FE;} + .d2-2407724796 .fill-AA2{fill:#4A6FF3;} + .d2-2407724796 .fill-AA4{fill:#EDF0FD;} + .d2-2407724796 .fill-AA5{fill:#F7F8FE;} + .d2-2407724796 .fill-AB4{fill:#EDF0FD;} + .d2-2407724796 .fill-AB5{fill:#F7F8FE;} + .d2-2407724796 .stroke-N1{stroke:#0A0F25;} + .d2-2407724796 .stroke-N2{stroke:#676C7E;} + .d2-2407724796 .stroke-N3{stroke:#9499AB;} + .d2-2407724796 .stroke-N4{stroke:#CFD2DD;} + .d2-2407724796 .stroke-N5{stroke:#DEE1EB;} + .d2-2407724796 .stroke-N6{stroke:#EEF1F8;} + .d2-2407724796 .stroke-N7{stroke:#FFFFFF;} + .d2-2407724796 .stroke-B1{stroke:#0D32B2;} + .d2-2407724796 .stroke-B2{stroke:#0D32B2;} + .d2-2407724796 .stroke-B3{stroke:#E3E9FD;} + .d2-2407724796 .stroke-B4{stroke:#E3E9FD;} + .d2-2407724796 .stroke-B5{stroke:#EDF0FD;} + .d2-2407724796 .stroke-B6{stroke:#F7F8FE;} + .d2-2407724796 .stroke-AA2{stroke:#4A6FF3;} + .d2-2407724796 .stroke-AA4{stroke:#EDF0FD;} + .d2-2407724796 .stroke-AA5{stroke:#F7F8FE;} + .d2-2407724796 .stroke-AB4{stroke:#EDF0FD;} + .d2-2407724796 .stroke-AB5{stroke:#F7F8FE;} + .d2-2407724796 .background-color-N1{background-color:#0A0F25;} + .d2-2407724796 .background-color-N2{background-color:#676C7E;} + .d2-2407724796 .background-color-N3{background-color:#9499AB;} + .d2-2407724796 .background-color-N4{background-color:#CFD2DD;} + .d2-2407724796 .background-color-N5{background-color:#DEE1EB;} + .d2-2407724796 .background-color-N6{background-color:#EEF1F8;} + .d2-2407724796 .background-color-N7{background-color:#FFFFFF;} + .d2-2407724796 .background-color-B1{background-color:#0D32B2;} + .d2-2407724796 .background-color-B2{background-color:#0D32B2;} + .d2-2407724796 .background-color-B3{background-color:#E3E9FD;} + .d2-2407724796 .background-color-B4{background-color:#E3E9FD;} + .d2-2407724796 .background-color-B5{background-color:#EDF0FD;} + .d2-2407724796 .background-color-B6{background-color:#F7F8FE;} + .d2-2407724796 .background-color-AA2{background-color:#4A6FF3;} + .d2-2407724796 .background-color-AA4{background-color:#EDF0FD;} + .d2-2407724796 .background-color-AA5{background-color:#F7F8FE;} + .d2-2407724796 .background-color-AB4{background-color:#EDF0FD;} + .d2-2407724796 .background-color-AB5{background-color:#F7F8FE;} + .d2-2407724796 .color-N1{color:#0A0F25;} + .d2-2407724796 .color-N2{color:#676C7E;} + .d2-2407724796 .color-N3{color:#9499AB;} + .d2-2407724796 .color-N4{color:#CFD2DD;} + .d2-2407724796 .color-N5{color:#DEE1EB;} + .d2-2407724796 .color-N6{color:#EEF1F8;} + .d2-2407724796 .color-N7{color:#FFFFFF;} + .d2-2407724796 .color-B1{color:#0D32B2;} + .d2-2407724796 .color-B2{color:#0D32B2;} + .d2-2407724796 .color-B3{color:#E3E9FD;} + .d2-2407724796 .color-B4{color:#E3E9FD;} + .d2-2407724796 .color-B5{color:#EDF0FD;} + .d2-2407724796 .color-B6{color:#F7F8FE;} + .d2-2407724796 .color-AA2{color:#4A6FF3;} + .d2-2407724796 .color-AA4{color:#EDF0FD;} + .d2-2407724796 .color-AA5{color:#F7F8FE;} + .d2-2407724796 .color-AB4{color:#EDF0FD;} + .d2-2407724796 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2407724796);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2407724796);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2407724796);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2407724796);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2407724796);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2407724796);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2407724796);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2407724796);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2407724796);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2407724796);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2407724796);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2407724796);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2407724796);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2407724796);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2407724796);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2407724796);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2407724796);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2407724796);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/all_shapes_multiple/elk/board.exp.json b/e2etests/testdata/stable/all_shapes_multiple/elk/board.exp.json index a4e95e3a8..007ef6893 100644 --- a/e2etests/testdata/stable/all_shapes_multiple/elk/board.exp.json +++ b/e2etests/testdata/stable/all_shapes_multiple/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "AB4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "AB4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "AA4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "AA4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "AB4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "AA4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "N4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -726,6 +751,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 72.5, @@ -764,6 +790,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 72.5, @@ -802,6 +829,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 256, @@ -840,6 +868,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 256, @@ -878,6 +907,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 454, @@ -916,6 +946,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 454, @@ -954,6 +985,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 612, @@ -992,6 +1024,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 611, @@ -1030,6 +1063,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 767, @@ -1068,6 +1102,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 767, @@ -1106,6 +1141,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 939, @@ -1137,6 +1173,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/all_shapes_multiple/elk/sketch.exp.svg b/e2etests/testdata/stable/all_shapes_multiple/elk/sketch.exp.svg index 36c5704b6..11c713c2f 100644 --- a/e2etests/testdata/stable/all_shapes_multiple/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes_multiple/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud + .d2-637431275 .fill-N1{fill:#0A0F25;} + .d2-637431275 .fill-N2{fill:#676C7E;} + .d2-637431275 .fill-N3{fill:#9499AB;} + .d2-637431275 .fill-N4{fill:#CFD2DD;} + .d2-637431275 .fill-N5{fill:#DEE1EB;} + .d2-637431275 .fill-N6{fill:#EEF1F8;} + .d2-637431275 .fill-N7{fill:#FFFFFF;} + .d2-637431275 .fill-B1{fill:#0D32B2;} + .d2-637431275 .fill-B2{fill:#0D32B2;} + .d2-637431275 .fill-B3{fill:#E3E9FD;} + .d2-637431275 .fill-B4{fill:#E3E9FD;} + .d2-637431275 .fill-B5{fill:#EDF0FD;} + .d2-637431275 .fill-B6{fill:#F7F8FE;} + .d2-637431275 .fill-AA2{fill:#4A6FF3;} + .d2-637431275 .fill-AA4{fill:#EDF0FD;} + .d2-637431275 .fill-AA5{fill:#F7F8FE;} + .d2-637431275 .fill-AB4{fill:#EDF0FD;} + .d2-637431275 .fill-AB5{fill:#F7F8FE;} + .d2-637431275 .stroke-N1{stroke:#0A0F25;} + .d2-637431275 .stroke-N2{stroke:#676C7E;} + .d2-637431275 .stroke-N3{stroke:#9499AB;} + .d2-637431275 .stroke-N4{stroke:#CFD2DD;} + .d2-637431275 .stroke-N5{stroke:#DEE1EB;} + .d2-637431275 .stroke-N6{stroke:#EEF1F8;} + .d2-637431275 .stroke-N7{stroke:#FFFFFF;} + .d2-637431275 .stroke-B1{stroke:#0D32B2;} + .d2-637431275 .stroke-B2{stroke:#0D32B2;} + .d2-637431275 .stroke-B3{stroke:#E3E9FD;} + .d2-637431275 .stroke-B4{stroke:#E3E9FD;} + .d2-637431275 .stroke-B5{stroke:#EDF0FD;} + .d2-637431275 .stroke-B6{stroke:#F7F8FE;} + .d2-637431275 .stroke-AA2{stroke:#4A6FF3;} + .d2-637431275 .stroke-AA4{stroke:#EDF0FD;} + .d2-637431275 .stroke-AA5{stroke:#F7F8FE;} + .d2-637431275 .stroke-AB4{stroke:#EDF0FD;} + .d2-637431275 .stroke-AB5{stroke:#F7F8FE;} + .d2-637431275 .background-color-N1{background-color:#0A0F25;} + .d2-637431275 .background-color-N2{background-color:#676C7E;} + .d2-637431275 .background-color-N3{background-color:#9499AB;} + .d2-637431275 .background-color-N4{background-color:#CFD2DD;} + .d2-637431275 .background-color-N5{background-color:#DEE1EB;} + .d2-637431275 .background-color-N6{background-color:#EEF1F8;} + .d2-637431275 .background-color-N7{background-color:#FFFFFF;} + .d2-637431275 .background-color-B1{background-color:#0D32B2;} + .d2-637431275 .background-color-B2{background-color:#0D32B2;} + .d2-637431275 .background-color-B3{background-color:#E3E9FD;} + .d2-637431275 .background-color-B4{background-color:#E3E9FD;} + .d2-637431275 .background-color-B5{background-color:#EDF0FD;} + .d2-637431275 .background-color-B6{background-color:#F7F8FE;} + .d2-637431275 .background-color-AA2{background-color:#4A6FF3;} + .d2-637431275 .background-color-AA4{background-color:#EDF0FD;} + .d2-637431275 .background-color-AA5{background-color:#F7F8FE;} + .d2-637431275 .background-color-AB4{background-color:#EDF0FD;} + .d2-637431275 .background-color-AB5{background-color:#F7F8FE;} + .d2-637431275 .color-N1{color:#0A0F25;} + .d2-637431275 .color-N2{color:#676C7E;} + .d2-637431275 .color-N3{color:#9499AB;} + .d2-637431275 .color-N4{color:#CFD2DD;} + .d2-637431275 .color-N5{color:#DEE1EB;} + .d2-637431275 .color-N6{color:#EEF1F8;} + .d2-637431275 .color-N7{color:#FFFFFF;} + .d2-637431275 .color-B1{color:#0D32B2;} + .d2-637431275 .color-B2{color:#0D32B2;} + .d2-637431275 .color-B3{color:#E3E9FD;} + .d2-637431275 .color-B4{color:#E3E9FD;} + .d2-637431275 .color-B5{color:#EDF0FD;} + .d2-637431275 .color-B6{color:#F7F8FE;} + .d2-637431275 .color-AA2{color:#4A6FF3;} + .d2-637431275 .color-AA4{color:#EDF0FD;} + .d2-637431275 .color-AA5{color:#F7F8FE;} + .d2-637431275 .color-AB4{color:#EDF0FD;} + .d2-637431275 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-637431275);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-637431275);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-637431275);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-637431275);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-637431275);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-637431275);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-637431275);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-637431275);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-637431275);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-637431275);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-637431275);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-637431275);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-637431275);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-637431275);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-637431275);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-637431275);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-637431275);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-637431275);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/all_shapes_shadow/dagre/board.exp.json b/e2etests/testdata/stable/all_shapes_shadow/dagre/board.exp.json index bfd018b64..d08c07904 100644 --- a/e2etests/testdata/stable/all_shapes_shadow/dagre/board.exp.json +++ b/e2etests/testdata/stable/all_shapes_shadow/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": true, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": true, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "AB4", "stroke": "B1", + "animated": false, "shadow": true, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": true, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "AB4", "stroke": "B1", + "animated": false, "shadow": true, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "AA4", "stroke": "B1", + "animated": false, "shadow": true, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": true, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "AA4", "stroke": "B1", + "animated": false, "shadow": true, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "AB4", "stroke": "B1", + "animated": false, "shadow": true, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": true, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "AA4", "stroke": "B1", + "animated": false, "shadow": true, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": true, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "N4", "stroke": "B1", + "animated": false, "shadow": true, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": true, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": true, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": true, "3d": false, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": true, "3d": false, "multiple": false, @@ -726,6 +751,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 55.5, @@ -773,6 +799,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 55.5, @@ -820,6 +847,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 269, @@ -867,6 +895,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 269, @@ -914,6 +943,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 497, @@ -961,6 +991,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 497, @@ -1008,6 +1039,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 685, @@ -1055,6 +1087,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 684, @@ -1102,6 +1135,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 870, @@ -1149,6 +1183,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 870, @@ -1196,6 +1231,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1072, @@ -1236,6 +1272,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/all_shapes_shadow/dagre/sketch.exp.svg b/e2etests/testdata/stable/all_shapes_shadow/dagre/sketch.exp.svg index d750ca54c..36b863978 100644 --- a/e2etests/testdata/stable/all_shapes_shadow/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes_shadow/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-2266938456 .fill-N1{fill:#0A0F25;} + .d2-2266938456 .fill-N2{fill:#676C7E;} + .d2-2266938456 .fill-N3{fill:#9499AB;} + .d2-2266938456 .fill-N4{fill:#CFD2DD;} + .d2-2266938456 .fill-N5{fill:#DEE1EB;} + .d2-2266938456 .fill-N6{fill:#EEF1F8;} + .d2-2266938456 .fill-N7{fill:#FFFFFF;} + .d2-2266938456 .fill-B1{fill:#0D32B2;} + .d2-2266938456 .fill-B2{fill:#0D32B2;} + .d2-2266938456 .fill-B3{fill:#E3E9FD;} + .d2-2266938456 .fill-B4{fill:#E3E9FD;} + .d2-2266938456 .fill-B5{fill:#EDF0FD;} + .d2-2266938456 .fill-B6{fill:#F7F8FE;} + .d2-2266938456 .fill-AA2{fill:#4A6FF3;} + .d2-2266938456 .fill-AA4{fill:#EDF0FD;} + .d2-2266938456 .fill-AA5{fill:#F7F8FE;} + .d2-2266938456 .fill-AB4{fill:#EDF0FD;} + .d2-2266938456 .fill-AB5{fill:#F7F8FE;} + .d2-2266938456 .stroke-N1{stroke:#0A0F25;} + .d2-2266938456 .stroke-N2{stroke:#676C7E;} + .d2-2266938456 .stroke-N3{stroke:#9499AB;} + .d2-2266938456 .stroke-N4{stroke:#CFD2DD;} + .d2-2266938456 .stroke-N5{stroke:#DEE1EB;} + .d2-2266938456 .stroke-N6{stroke:#EEF1F8;} + .d2-2266938456 .stroke-N7{stroke:#FFFFFF;} + .d2-2266938456 .stroke-B1{stroke:#0D32B2;} + .d2-2266938456 .stroke-B2{stroke:#0D32B2;} + .d2-2266938456 .stroke-B3{stroke:#E3E9FD;} + .d2-2266938456 .stroke-B4{stroke:#E3E9FD;} + .d2-2266938456 .stroke-B5{stroke:#EDF0FD;} + .d2-2266938456 .stroke-B6{stroke:#F7F8FE;} + .d2-2266938456 .stroke-AA2{stroke:#4A6FF3;} + .d2-2266938456 .stroke-AA4{stroke:#EDF0FD;} + .d2-2266938456 .stroke-AA5{stroke:#F7F8FE;} + .d2-2266938456 .stroke-AB4{stroke:#EDF0FD;} + .d2-2266938456 .stroke-AB5{stroke:#F7F8FE;} + .d2-2266938456 .background-color-N1{background-color:#0A0F25;} + .d2-2266938456 .background-color-N2{background-color:#676C7E;} + .d2-2266938456 .background-color-N3{background-color:#9499AB;} + .d2-2266938456 .background-color-N4{background-color:#CFD2DD;} + .d2-2266938456 .background-color-N5{background-color:#DEE1EB;} + .d2-2266938456 .background-color-N6{background-color:#EEF1F8;} + .d2-2266938456 .background-color-N7{background-color:#FFFFFF;} + .d2-2266938456 .background-color-B1{background-color:#0D32B2;} + .d2-2266938456 .background-color-B2{background-color:#0D32B2;} + .d2-2266938456 .background-color-B3{background-color:#E3E9FD;} + .d2-2266938456 .background-color-B4{background-color:#E3E9FD;} + .d2-2266938456 .background-color-B5{background-color:#EDF0FD;} + .d2-2266938456 .background-color-B6{background-color:#F7F8FE;} + .d2-2266938456 .background-color-AA2{background-color:#4A6FF3;} + .d2-2266938456 .background-color-AA4{background-color:#EDF0FD;} + .d2-2266938456 .background-color-AA5{background-color:#F7F8FE;} + .d2-2266938456 .background-color-AB4{background-color:#EDF0FD;} + .d2-2266938456 .background-color-AB5{background-color:#F7F8FE;} + .d2-2266938456 .color-N1{color:#0A0F25;} + .d2-2266938456 .color-N2{color:#676C7E;} + .d2-2266938456 .color-N3{color:#9499AB;} + .d2-2266938456 .color-N4{color:#CFD2DD;} + .d2-2266938456 .color-N5{color:#DEE1EB;} + .d2-2266938456 .color-N6{color:#EEF1F8;} + .d2-2266938456 .color-N7{color:#FFFFFF;} + .d2-2266938456 .color-B1{color:#0D32B2;} + .d2-2266938456 .color-B2{color:#0D32B2;} + .d2-2266938456 .color-B3{color:#E3E9FD;} + .d2-2266938456 .color-B4{color:#E3E9FD;} + .d2-2266938456 .color-B5{color:#EDF0FD;} + .d2-2266938456 .color-B6{color:#F7F8FE;} + .d2-2266938456 .color-AA2{color:#4A6FF3;} + .d2-2266938456 .color-AA4{color:#EDF0FD;} + .d2-2266938456 .color-AA5{color:#F7F8FE;} + .d2-2266938456 .color-AB4{color:#EDF0FD;} + .d2-2266938456 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2266938456);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2266938456);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2266938456);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2266938456);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2266938456);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2266938456);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2266938456);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2266938456);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2266938456);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2266938456);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2266938456);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2266938456);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2266938456);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2266938456);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2266938456);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2266938456);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2266938456);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2266938456);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> @@ -97,23 +97,23 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud +rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/all_shapes_shadow/elk/board.exp.json b/e2etests/testdata/stable/all_shapes_shadow/elk/board.exp.json index 16fc33bc8..b9f791681 100644 --- a/e2etests/testdata/stable/all_shapes_shadow/elk/board.exp.json +++ b/e2etests/testdata/stable/all_shapes_shadow/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": true, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": true, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "AB4", "stroke": "B1", + "animated": false, "shadow": true, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": true, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "AB4", "stroke": "B1", + "animated": false, "shadow": true, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "AA4", "stroke": "B1", + "animated": false, "shadow": true, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": true, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "AA4", "stroke": "B1", + "animated": false, "shadow": true, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "AB4", "stroke": "B1", + "animated": false, "shadow": true, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": true, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "AA4", "stroke": "B1", + "animated": false, "shadow": true, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": true, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "N4", "stroke": "B1", + "animated": false, "shadow": true, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": true, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": true, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": true, "3d": false, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": true, "3d": false, "multiple": false, @@ -726,6 +751,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 67.5, @@ -764,6 +790,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 67.5, @@ -802,6 +829,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 241, @@ -840,6 +868,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 241, @@ -878,6 +907,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 429, @@ -916,6 +946,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 429, @@ -954,6 +985,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 577, @@ -992,6 +1024,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 576, @@ -1030,6 +1063,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 722, @@ -1068,6 +1102,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 722, @@ -1106,6 +1141,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 884, @@ -1137,6 +1173,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/all_shapes_shadow/elk/sketch.exp.svg b/e2etests/testdata/stable/all_shapes_shadow/elk/sketch.exp.svg index 52b5cf5ea..3c822ac31 100644 --- a/e2etests/testdata/stable/all_shapes_shadow/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes_shadow/elk/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-3190299838 .fill-N1{fill:#0A0F25;} + .d2-3190299838 .fill-N2{fill:#676C7E;} + .d2-3190299838 .fill-N3{fill:#9499AB;} + .d2-3190299838 .fill-N4{fill:#CFD2DD;} + .d2-3190299838 .fill-N5{fill:#DEE1EB;} + .d2-3190299838 .fill-N6{fill:#EEF1F8;} + .d2-3190299838 .fill-N7{fill:#FFFFFF;} + .d2-3190299838 .fill-B1{fill:#0D32B2;} + .d2-3190299838 .fill-B2{fill:#0D32B2;} + .d2-3190299838 .fill-B3{fill:#E3E9FD;} + .d2-3190299838 .fill-B4{fill:#E3E9FD;} + .d2-3190299838 .fill-B5{fill:#EDF0FD;} + .d2-3190299838 .fill-B6{fill:#F7F8FE;} + .d2-3190299838 .fill-AA2{fill:#4A6FF3;} + .d2-3190299838 .fill-AA4{fill:#EDF0FD;} + .d2-3190299838 .fill-AA5{fill:#F7F8FE;} + .d2-3190299838 .fill-AB4{fill:#EDF0FD;} + .d2-3190299838 .fill-AB5{fill:#F7F8FE;} + .d2-3190299838 .stroke-N1{stroke:#0A0F25;} + .d2-3190299838 .stroke-N2{stroke:#676C7E;} + .d2-3190299838 .stroke-N3{stroke:#9499AB;} + .d2-3190299838 .stroke-N4{stroke:#CFD2DD;} + .d2-3190299838 .stroke-N5{stroke:#DEE1EB;} + .d2-3190299838 .stroke-N6{stroke:#EEF1F8;} + .d2-3190299838 .stroke-N7{stroke:#FFFFFF;} + .d2-3190299838 .stroke-B1{stroke:#0D32B2;} + .d2-3190299838 .stroke-B2{stroke:#0D32B2;} + .d2-3190299838 .stroke-B3{stroke:#E3E9FD;} + .d2-3190299838 .stroke-B4{stroke:#E3E9FD;} + .d2-3190299838 .stroke-B5{stroke:#EDF0FD;} + .d2-3190299838 .stroke-B6{stroke:#F7F8FE;} + .d2-3190299838 .stroke-AA2{stroke:#4A6FF3;} + .d2-3190299838 .stroke-AA4{stroke:#EDF0FD;} + .d2-3190299838 .stroke-AA5{stroke:#F7F8FE;} + .d2-3190299838 .stroke-AB4{stroke:#EDF0FD;} + .d2-3190299838 .stroke-AB5{stroke:#F7F8FE;} + .d2-3190299838 .background-color-N1{background-color:#0A0F25;} + .d2-3190299838 .background-color-N2{background-color:#676C7E;} + .d2-3190299838 .background-color-N3{background-color:#9499AB;} + .d2-3190299838 .background-color-N4{background-color:#CFD2DD;} + .d2-3190299838 .background-color-N5{background-color:#DEE1EB;} + .d2-3190299838 .background-color-N6{background-color:#EEF1F8;} + .d2-3190299838 .background-color-N7{background-color:#FFFFFF;} + .d2-3190299838 .background-color-B1{background-color:#0D32B2;} + .d2-3190299838 .background-color-B2{background-color:#0D32B2;} + .d2-3190299838 .background-color-B3{background-color:#E3E9FD;} + .d2-3190299838 .background-color-B4{background-color:#E3E9FD;} + .d2-3190299838 .background-color-B5{background-color:#EDF0FD;} + .d2-3190299838 .background-color-B6{background-color:#F7F8FE;} + .d2-3190299838 .background-color-AA2{background-color:#4A6FF3;} + .d2-3190299838 .background-color-AA4{background-color:#EDF0FD;} + .d2-3190299838 .background-color-AA5{background-color:#F7F8FE;} + .d2-3190299838 .background-color-AB4{background-color:#EDF0FD;} + .d2-3190299838 .background-color-AB5{background-color:#F7F8FE;} + .d2-3190299838 .color-N1{color:#0A0F25;} + .d2-3190299838 .color-N2{color:#676C7E;} + .d2-3190299838 .color-N3{color:#9499AB;} + .d2-3190299838 .color-N4{color:#CFD2DD;} + .d2-3190299838 .color-N5{color:#DEE1EB;} + .d2-3190299838 .color-N6{color:#EEF1F8;} + .d2-3190299838 .color-N7{color:#FFFFFF;} + .d2-3190299838 .color-B1{color:#0D32B2;} + .d2-3190299838 .color-B2{color:#0D32B2;} + .d2-3190299838 .color-B3{color:#E3E9FD;} + .d2-3190299838 .color-B4{color:#E3E9FD;} + .d2-3190299838 .color-B5{color:#EDF0FD;} + .d2-3190299838 .color-B6{color:#F7F8FE;} + .d2-3190299838 .color-AA2{color:#4A6FF3;} + .d2-3190299838 .color-AA4{color:#EDF0FD;} + .d2-3190299838 .color-AA5{color:#F7F8FE;} + .d2-3190299838 .color-AB4{color:#EDF0FD;} + .d2-3190299838 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3190299838);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3190299838);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3190299838);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3190299838);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3190299838);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3190299838);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3190299838);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3190299838);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3190299838);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3190299838);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3190299838);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3190299838);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3190299838);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3190299838);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3190299838);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3190299838);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3190299838);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3190299838);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> @@ -97,23 +97,23 @@ -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud +rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/animated/dagre/board.exp.json b/e2etests/testdata/stable/animated/dagre/board.exp.json index 7ef09c9b6..dfa40225b 100644 --- a/e2etests/testdata/stable/animated/dagre/board.exp.json +++ b/e2etests/testdata/stable/animated/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -561,6 +582,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 94.5, @@ -608,6 +630,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 154, @@ -655,6 +678,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 405.25, @@ -702,6 +726,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 575.75, @@ -749,6 +774,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 828.25, @@ -796,6 +822,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 879.75, @@ -843,6 +870,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 931.25, @@ -890,6 +918,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1175.5, @@ -930,6 +959,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/animated/dagre/sketch.exp.svg b/e2etests/testdata/stable/animated/dagre/sketch.exp.svg index 70cac1543..87ab29503 100644 --- a/e2etests/testdata/stable/animated/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/animated/dagre/sketch.exp.svg @@ -1,22 +1,22 @@ -your love life will behappyharmoniousboredomimmortalityFridayMondayInsomniaSleepWakeDreamListenTalk hear + .d2-2154070564 .fill-N1{fill:#0A0F25;} + .d2-2154070564 .fill-N2{fill:#676C7E;} + .d2-2154070564 .fill-N3{fill:#9499AB;} + .d2-2154070564 .fill-N4{fill:#CFD2DD;} + .d2-2154070564 .fill-N5{fill:#DEE1EB;} + .d2-2154070564 .fill-N6{fill:#EEF1F8;} + .d2-2154070564 .fill-N7{fill:#FFFFFF;} + .d2-2154070564 .fill-B1{fill:#0D32B2;} + .d2-2154070564 .fill-B2{fill:#0D32B2;} + .d2-2154070564 .fill-B3{fill:#E3E9FD;} + .d2-2154070564 .fill-B4{fill:#E3E9FD;} + .d2-2154070564 .fill-B5{fill:#EDF0FD;} + .d2-2154070564 .fill-B6{fill:#F7F8FE;} + .d2-2154070564 .fill-AA2{fill:#4A6FF3;} + .d2-2154070564 .fill-AA4{fill:#EDF0FD;} + .d2-2154070564 .fill-AA5{fill:#F7F8FE;} + .d2-2154070564 .fill-AB4{fill:#EDF0FD;} + .d2-2154070564 .fill-AB5{fill:#F7F8FE;} + .d2-2154070564 .stroke-N1{stroke:#0A0F25;} + .d2-2154070564 .stroke-N2{stroke:#676C7E;} + .d2-2154070564 .stroke-N3{stroke:#9499AB;} + .d2-2154070564 .stroke-N4{stroke:#CFD2DD;} + .d2-2154070564 .stroke-N5{stroke:#DEE1EB;} + .d2-2154070564 .stroke-N6{stroke:#EEF1F8;} + .d2-2154070564 .stroke-N7{stroke:#FFFFFF;} + .d2-2154070564 .stroke-B1{stroke:#0D32B2;} + .d2-2154070564 .stroke-B2{stroke:#0D32B2;} + .d2-2154070564 .stroke-B3{stroke:#E3E9FD;} + .d2-2154070564 .stroke-B4{stroke:#E3E9FD;} + .d2-2154070564 .stroke-B5{stroke:#EDF0FD;} + .d2-2154070564 .stroke-B6{stroke:#F7F8FE;} + .d2-2154070564 .stroke-AA2{stroke:#4A6FF3;} + .d2-2154070564 .stroke-AA4{stroke:#EDF0FD;} + .d2-2154070564 .stroke-AA5{stroke:#F7F8FE;} + .d2-2154070564 .stroke-AB4{stroke:#EDF0FD;} + .d2-2154070564 .stroke-AB5{stroke:#F7F8FE;} + .d2-2154070564 .background-color-N1{background-color:#0A0F25;} + .d2-2154070564 .background-color-N2{background-color:#676C7E;} + .d2-2154070564 .background-color-N3{background-color:#9499AB;} + .d2-2154070564 .background-color-N4{background-color:#CFD2DD;} + .d2-2154070564 .background-color-N5{background-color:#DEE1EB;} + .d2-2154070564 .background-color-N6{background-color:#EEF1F8;} + .d2-2154070564 .background-color-N7{background-color:#FFFFFF;} + .d2-2154070564 .background-color-B1{background-color:#0D32B2;} + .d2-2154070564 .background-color-B2{background-color:#0D32B2;} + .d2-2154070564 .background-color-B3{background-color:#E3E9FD;} + .d2-2154070564 .background-color-B4{background-color:#E3E9FD;} + .d2-2154070564 .background-color-B5{background-color:#EDF0FD;} + .d2-2154070564 .background-color-B6{background-color:#F7F8FE;} + .d2-2154070564 .background-color-AA2{background-color:#4A6FF3;} + .d2-2154070564 .background-color-AA4{background-color:#EDF0FD;} + .d2-2154070564 .background-color-AA5{background-color:#F7F8FE;} + .d2-2154070564 .background-color-AB4{background-color:#EDF0FD;} + .d2-2154070564 .background-color-AB5{background-color:#F7F8FE;} + .d2-2154070564 .color-N1{color:#0A0F25;} + .d2-2154070564 .color-N2{color:#676C7E;} + .d2-2154070564 .color-N3{color:#9499AB;} + .d2-2154070564 .color-N4{color:#CFD2DD;} + .d2-2154070564 .color-N5{color:#DEE1EB;} + .d2-2154070564 .color-N6{color:#EEF1F8;} + .d2-2154070564 .color-N7{color:#FFFFFF;} + .d2-2154070564 .color-B1{color:#0D32B2;} + .d2-2154070564 .color-B2{color:#0D32B2;} + .d2-2154070564 .color-B3{color:#E3E9FD;} + .d2-2154070564 .color-B4{color:#E3E9FD;} + .d2-2154070564 .color-B5{color:#EDF0FD;} + .d2-2154070564 .color-B6{color:#F7F8FE;} + .d2-2154070564 .color-AA2{color:#4A6FF3;} + .d2-2154070564 .color-AA4{color:#EDF0FD;} + .d2-2154070564 .color-AA5{color:#F7F8FE;} + .d2-2154070564 .color-AB4{color:#EDF0FD;} + .d2-2154070564 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2154070564);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2154070564);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2154070564);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2154070564);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2154070564);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2154070564);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2154070564);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2154070564);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2154070564);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2154070564);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2154070564);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2154070564);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2154070564);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2154070564);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2154070564);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2154070564);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2154070564);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2154070564);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>your love life will behappyharmoniousboredomimmortalityFridayMondayInsomniaSleepWakeDreamListenTalk hear - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/animated/elk/board.exp.json b/e2etests/testdata/stable/animated/elk/board.exp.json index 334982f6e..d3a6be971 100644 --- a/e2etests/testdata/stable/animated/elk/board.exp.json +++ b/e2etests/testdata/stable/animated/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -561,6 +582,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 56.5, @@ -599,6 +621,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 186, @@ -637,6 +660,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 336.5, @@ -675,6 +699,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 472.4989929199219, @@ -713,6 +738,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 660, @@ -759,6 +785,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 690, @@ -797,6 +824,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 720, @@ -843,6 +871,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 879, @@ -874,6 +903,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/animated/elk/sketch.exp.svg b/e2etests/testdata/stable/animated/elk/sketch.exp.svg index 86fd37fae..5c501a117 100644 --- a/e2etests/testdata/stable/animated/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/animated/elk/sketch.exp.svg @@ -1,22 +1,22 @@ -your love life will behappyharmoniousboredomimmortalityFridayMondayInsomniaSleepWakeDreamListenTalk hear + .d2-4012398488 .fill-N1{fill:#0A0F25;} + .d2-4012398488 .fill-N2{fill:#676C7E;} + .d2-4012398488 .fill-N3{fill:#9499AB;} + .d2-4012398488 .fill-N4{fill:#CFD2DD;} + .d2-4012398488 .fill-N5{fill:#DEE1EB;} + .d2-4012398488 .fill-N6{fill:#EEF1F8;} + .d2-4012398488 .fill-N7{fill:#FFFFFF;} + .d2-4012398488 .fill-B1{fill:#0D32B2;} + .d2-4012398488 .fill-B2{fill:#0D32B2;} + .d2-4012398488 .fill-B3{fill:#E3E9FD;} + .d2-4012398488 .fill-B4{fill:#E3E9FD;} + .d2-4012398488 .fill-B5{fill:#EDF0FD;} + .d2-4012398488 .fill-B6{fill:#F7F8FE;} + .d2-4012398488 .fill-AA2{fill:#4A6FF3;} + .d2-4012398488 .fill-AA4{fill:#EDF0FD;} + .d2-4012398488 .fill-AA5{fill:#F7F8FE;} + .d2-4012398488 .fill-AB4{fill:#EDF0FD;} + .d2-4012398488 .fill-AB5{fill:#F7F8FE;} + .d2-4012398488 .stroke-N1{stroke:#0A0F25;} + .d2-4012398488 .stroke-N2{stroke:#676C7E;} + .d2-4012398488 .stroke-N3{stroke:#9499AB;} + .d2-4012398488 .stroke-N4{stroke:#CFD2DD;} + .d2-4012398488 .stroke-N5{stroke:#DEE1EB;} + .d2-4012398488 .stroke-N6{stroke:#EEF1F8;} + .d2-4012398488 .stroke-N7{stroke:#FFFFFF;} + .d2-4012398488 .stroke-B1{stroke:#0D32B2;} + .d2-4012398488 .stroke-B2{stroke:#0D32B2;} + .d2-4012398488 .stroke-B3{stroke:#E3E9FD;} + .d2-4012398488 .stroke-B4{stroke:#E3E9FD;} + .d2-4012398488 .stroke-B5{stroke:#EDF0FD;} + .d2-4012398488 .stroke-B6{stroke:#F7F8FE;} + .d2-4012398488 .stroke-AA2{stroke:#4A6FF3;} + .d2-4012398488 .stroke-AA4{stroke:#EDF0FD;} + .d2-4012398488 .stroke-AA5{stroke:#F7F8FE;} + .d2-4012398488 .stroke-AB4{stroke:#EDF0FD;} + .d2-4012398488 .stroke-AB5{stroke:#F7F8FE;} + .d2-4012398488 .background-color-N1{background-color:#0A0F25;} + .d2-4012398488 .background-color-N2{background-color:#676C7E;} + .d2-4012398488 .background-color-N3{background-color:#9499AB;} + .d2-4012398488 .background-color-N4{background-color:#CFD2DD;} + .d2-4012398488 .background-color-N5{background-color:#DEE1EB;} + .d2-4012398488 .background-color-N6{background-color:#EEF1F8;} + .d2-4012398488 .background-color-N7{background-color:#FFFFFF;} + .d2-4012398488 .background-color-B1{background-color:#0D32B2;} + .d2-4012398488 .background-color-B2{background-color:#0D32B2;} + .d2-4012398488 .background-color-B3{background-color:#E3E9FD;} + .d2-4012398488 .background-color-B4{background-color:#E3E9FD;} + .d2-4012398488 .background-color-B5{background-color:#EDF0FD;} + .d2-4012398488 .background-color-B6{background-color:#F7F8FE;} + .d2-4012398488 .background-color-AA2{background-color:#4A6FF3;} + .d2-4012398488 .background-color-AA4{background-color:#EDF0FD;} + .d2-4012398488 .background-color-AA5{background-color:#F7F8FE;} + .d2-4012398488 .background-color-AB4{background-color:#EDF0FD;} + .d2-4012398488 .background-color-AB5{background-color:#F7F8FE;} + .d2-4012398488 .color-N1{color:#0A0F25;} + .d2-4012398488 .color-N2{color:#676C7E;} + .d2-4012398488 .color-N3{color:#9499AB;} + .d2-4012398488 .color-N4{color:#CFD2DD;} + .d2-4012398488 .color-N5{color:#DEE1EB;} + .d2-4012398488 .color-N6{color:#EEF1F8;} + .d2-4012398488 .color-N7{color:#FFFFFF;} + .d2-4012398488 .color-B1{color:#0D32B2;} + .d2-4012398488 .color-B2{color:#0D32B2;} + .d2-4012398488 .color-B3{color:#E3E9FD;} + .d2-4012398488 .color-B4{color:#E3E9FD;} + .d2-4012398488 .color-B5{color:#EDF0FD;} + .d2-4012398488 .color-B6{color:#F7F8FE;} + .d2-4012398488 .color-AA2{color:#4A6FF3;} + .d2-4012398488 .color-AA4{color:#EDF0FD;} + .d2-4012398488 .color-AA5{color:#F7F8FE;} + .d2-4012398488 .color-AB4{color:#EDF0FD;} + .d2-4012398488 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4012398488);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4012398488);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4012398488);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4012398488);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4012398488);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4012398488);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4012398488);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4012398488);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4012398488);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4012398488);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4012398488);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4012398488);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4012398488);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4012398488);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4012398488);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4012398488);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4012398488);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4012398488);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>your love life will behappyharmoniousboredomimmortalityFridayMondayInsomniaSleepWakeDreamListenTalk hear - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/array-classes/dagre/board.exp.json b/e2etests/testdata/stable/array-classes/dagre/board.exp.json index ffb9d427e..9d5d9d94a 100644 --- a/e2etests/testdata/stable/array-classes/dagre/board.exp.json +++ b/e2etests/testdata/stable/array-classes/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -22,6 +30,7 @@ "borderRadius": 999, "fill": "#90EE90", "stroke": "black", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -67,6 +76,7 @@ "borderRadius": 999, "fill": "#EA9999", "stroke": "black", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -110,6 +120,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/array-classes/dagre/sketch.exp.svg b/e2etests/testdata/stable/array-classes/dagre/sketch.exp.svg index f770e89bb..628da99e4 100644 --- a/e2etests/testdata/stable/array-classes/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/array-classes/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -SuccessfulFailure + .d2-2615494894 .fill-N1{fill:#0A0F25;} + .d2-2615494894 .fill-N2{fill:#676C7E;} + .d2-2615494894 .fill-N3{fill:#9499AB;} + .d2-2615494894 .fill-N4{fill:#CFD2DD;} + .d2-2615494894 .fill-N5{fill:#DEE1EB;} + .d2-2615494894 .fill-N6{fill:#EEF1F8;} + .d2-2615494894 .fill-N7{fill:#FFFFFF;} + .d2-2615494894 .fill-B1{fill:#0D32B2;} + .d2-2615494894 .fill-B2{fill:#0D32B2;} + .d2-2615494894 .fill-B3{fill:#E3E9FD;} + .d2-2615494894 .fill-B4{fill:#E3E9FD;} + .d2-2615494894 .fill-B5{fill:#EDF0FD;} + .d2-2615494894 .fill-B6{fill:#F7F8FE;} + .d2-2615494894 .fill-AA2{fill:#4A6FF3;} + .d2-2615494894 .fill-AA4{fill:#EDF0FD;} + .d2-2615494894 .fill-AA5{fill:#F7F8FE;} + .d2-2615494894 .fill-AB4{fill:#EDF0FD;} + .d2-2615494894 .fill-AB5{fill:#F7F8FE;} + .d2-2615494894 .stroke-N1{stroke:#0A0F25;} + .d2-2615494894 .stroke-N2{stroke:#676C7E;} + .d2-2615494894 .stroke-N3{stroke:#9499AB;} + .d2-2615494894 .stroke-N4{stroke:#CFD2DD;} + .d2-2615494894 .stroke-N5{stroke:#DEE1EB;} + .d2-2615494894 .stroke-N6{stroke:#EEF1F8;} + .d2-2615494894 .stroke-N7{stroke:#FFFFFF;} + .d2-2615494894 .stroke-B1{stroke:#0D32B2;} + .d2-2615494894 .stroke-B2{stroke:#0D32B2;} + .d2-2615494894 .stroke-B3{stroke:#E3E9FD;} + .d2-2615494894 .stroke-B4{stroke:#E3E9FD;} + .d2-2615494894 .stroke-B5{stroke:#EDF0FD;} + .d2-2615494894 .stroke-B6{stroke:#F7F8FE;} + .d2-2615494894 .stroke-AA2{stroke:#4A6FF3;} + .d2-2615494894 .stroke-AA4{stroke:#EDF0FD;} + .d2-2615494894 .stroke-AA5{stroke:#F7F8FE;} + .d2-2615494894 .stroke-AB4{stroke:#EDF0FD;} + .d2-2615494894 .stroke-AB5{stroke:#F7F8FE;} + .d2-2615494894 .background-color-N1{background-color:#0A0F25;} + .d2-2615494894 .background-color-N2{background-color:#676C7E;} + .d2-2615494894 .background-color-N3{background-color:#9499AB;} + .d2-2615494894 .background-color-N4{background-color:#CFD2DD;} + .d2-2615494894 .background-color-N5{background-color:#DEE1EB;} + .d2-2615494894 .background-color-N6{background-color:#EEF1F8;} + .d2-2615494894 .background-color-N7{background-color:#FFFFFF;} + .d2-2615494894 .background-color-B1{background-color:#0D32B2;} + .d2-2615494894 .background-color-B2{background-color:#0D32B2;} + .d2-2615494894 .background-color-B3{background-color:#E3E9FD;} + .d2-2615494894 .background-color-B4{background-color:#E3E9FD;} + .d2-2615494894 .background-color-B5{background-color:#EDF0FD;} + .d2-2615494894 .background-color-B6{background-color:#F7F8FE;} + .d2-2615494894 .background-color-AA2{background-color:#4A6FF3;} + .d2-2615494894 .background-color-AA4{background-color:#EDF0FD;} + .d2-2615494894 .background-color-AA5{background-color:#F7F8FE;} + .d2-2615494894 .background-color-AB4{background-color:#EDF0FD;} + .d2-2615494894 .background-color-AB5{background-color:#F7F8FE;} + .d2-2615494894 .color-N1{color:#0A0F25;} + .d2-2615494894 .color-N2{color:#676C7E;} + .d2-2615494894 .color-N3{color:#9499AB;} + .d2-2615494894 .color-N4{color:#CFD2DD;} + .d2-2615494894 .color-N5{color:#DEE1EB;} + .d2-2615494894 .color-N6{color:#EEF1F8;} + .d2-2615494894 .color-N7{color:#FFFFFF;} + .d2-2615494894 .color-B1{color:#0D32B2;} + .d2-2615494894 .color-B2{color:#0D32B2;} + .d2-2615494894 .color-B3{color:#E3E9FD;} + .d2-2615494894 .color-B4{color:#E3E9FD;} + .d2-2615494894 .color-B5{color:#EDF0FD;} + .d2-2615494894 .color-B6{color:#F7F8FE;} + .d2-2615494894 .color-AA2{color:#4A6FF3;} + .d2-2615494894 .color-AA4{color:#EDF0FD;} + .d2-2615494894 .color-AA5{color:#F7F8FE;} + .d2-2615494894 .color-AB4{color:#EDF0FD;} + .d2-2615494894 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2615494894);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2615494894);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2615494894);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2615494894);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2615494894);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2615494894);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2615494894);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2615494894);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2615494894);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2615494894);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2615494894);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2615494894);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2615494894);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2615494894);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2615494894);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2615494894);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2615494894);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2615494894);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>SuccessfulFailure - - + + \ No newline at end of file diff --git a/e2etests/testdata/stable/array-classes/elk/board.exp.json b/e2etests/testdata/stable/array-classes/elk/board.exp.json index 9d1326c7a..f18889185 100644 --- a/e2etests/testdata/stable/array-classes/elk/board.exp.json +++ b/e2etests/testdata/stable/array-classes/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -22,6 +30,7 @@ "borderRadius": 999, "fill": "#90EE90", "stroke": "black", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -67,6 +76,7 @@ "borderRadius": 999, "fill": "#EA9999", "stroke": "black", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -110,6 +120,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/array-classes/elk/sketch.exp.svg b/e2etests/testdata/stable/array-classes/elk/sketch.exp.svg index 96eea330d..8fee814d3 100644 --- a/e2etests/testdata/stable/array-classes/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/array-classes/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -SuccessfulFailure + .d2-1020811824 .fill-N1{fill:#0A0F25;} + .d2-1020811824 .fill-N2{fill:#676C7E;} + .d2-1020811824 .fill-N3{fill:#9499AB;} + .d2-1020811824 .fill-N4{fill:#CFD2DD;} + .d2-1020811824 .fill-N5{fill:#DEE1EB;} + .d2-1020811824 .fill-N6{fill:#EEF1F8;} + .d2-1020811824 .fill-N7{fill:#FFFFFF;} + .d2-1020811824 .fill-B1{fill:#0D32B2;} + .d2-1020811824 .fill-B2{fill:#0D32B2;} + .d2-1020811824 .fill-B3{fill:#E3E9FD;} + .d2-1020811824 .fill-B4{fill:#E3E9FD;} + .d2-1020811824 .fill-B5{fill:#EDF0FD;} + .d2-1020811824 .fill-B6{fill:#F7F8FE;} + .d2-1020811824 .fill-AA2{fill:#4A6FF3;} + .d2-1020811824 .fill-AA4{fill:#EDF0FD;} + .d2-1020811824 .fill-AA5{fill:#F7F8FE;} + .d2-1020811824 .fill-AB4{fill:#EDF0FD;} + .d2-1020811824 .fill-AB5{fill:#F7F8FE;} + .d2-1020811824 .stroke-N1{stroke:#0A0F25;} + .d2-1020811824 .stroke-N2{stroke:#676C7E;} + .d2-1020811824 .stroke-N3{stroke:#9499AB;} + .d2-1020811824 .stroke-N4{stroke:#CFD2DD;} + .d2-1020811824 .stroke-N5{stroke:#DEE1EB;} + .d2-1020811824 .stroke-N6{stroke:#EEF1F8;} + .d2-1020811824 .stroke-N7{stroke:#FFFFFF;} + .d2-1020811824 .stroke-B1{stroke:#0D32B2;} + .d2-1020811824 .stroke-B2{stroke:#0D32B2;} + .d2-1020811824 .stroke-B3{stroke:#E3E9FD;} + .d2-1020811824 .stroke-B4{stroke:#E3E9FD;} + .d2-1020811824 .stroke-B5{stroke:#EDF0FD;} + .d2-1020811824 .stroke-B6{stroke:#F7F8FE;} + .d2-1020811824 .stroke-AA2{stroke:#4A6FF3;} + .d2-1020811824 .stroke-AA4{stroke:#EDF0FD;} + .d2-1020811824 .stroke-AA5{stroke:#F7F8FE;} + .d2-1020811824 .stroke-AB4{stroke:#EDF0FD;} + .d2-1020811824 .stroke-AB5{stroke:#F7F8FE;} + .d2-1020811824 .background-color-N1{background-color:#0A0F25;} + .d2-1020811824 .background-color-N2{background-color:#676C7E;} + .d2-1020811824 .background-color-N3{background-color:#9499AB;} + .d2-1020811824 .background-color-N4{background-color:#CFD2DD;} + .d2-1020811824 .background-color-N5{background-color:#DEE1EB;} + .d2-1020811824 .background-color-N6{background-color:#EEF1F8;} + .d2-1020811824 .background-color-N7{background-color:#FFFFFF;} + .d2-1020811824 .background-color-B1{background-color:#0D32B2;} + .d2-1020811824 .background-color-B2{background-color:#0D32B2;} + .d2-1020811824 .background-color-B3{background-color:#E3E9FD;} + .d2-1020811824 .background-color-B4{background-color:#E3E9FD;} + .d2-1020811824 .background-color-B5{background-color:#EDF0FD;} + .d2-1020811824 .background-color-B6{background-color:#F7F8FE;} + .d2-1020811824 .background-color-AA2{background-color:#4A6FF3;} + .d2-1020811824 .background-color-AA4{background-color:#EDF0FD;} + .d2-1020811824 .background-color-AA5{background-color:#F7F8FE;} + .d2-1020811824 .background-color-AB4{background-color:#EDF0FD;} + .d2-1020811824 .background-color-AB5{background-color:#F7F8FE;} + .d2-1020811824 .color-N1{color:#0A0F25;} + .d2-1020811824 .color-N2{color:#676C7E;} + .d2-1020811824 .color-N3{color:#9499AB;} + .d2-1020811824 .color-N4{color:#CFD2DD;} + .d2-1020811824 .color-N5{color:#DEE1EB;} + .d2-1020811824 .color-N6{color:#EEF1F8;} + .d2-1020811824 .color-N7{color:#FFFFFF;} + .d2-1020811824 .color-B1{color:#0D32B2;} + .d2-1020811824 .color-B2{color:#0D32B2;} + .d2-1020811824 .color-B3{color:#E3E9FD;} + .d2-1020811824 .color-B4{color:#E3E9FD;} + .d2-1020811824 .color-B5{color:#EDF0FD;} + .d2-1020811824 .color-B6{color:#F7F8FE;} + .d2-1020811824 .color-AA2{color:#4A6FF3;} + .d2-1020811824 .color-AA4{color:#EDF0FD;} + .d2-1020811824 .color-AA5{color:#F7F8FE;} + .d2-1020811824 .color-AB4{color:#EDF0FD;} + .d2-1020811824 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1020811824);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1020811824);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1020811824);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1020811824);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1020811824);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1020811824);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1020811824);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1020811824);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1020811824);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1020811824);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1020811824);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1020811824);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1020811824);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1020811824);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1020811824);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1020811824);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1020811824);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1020811824);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>SuccessfulFailure - - + + \ No newline at end of file diff --git a/e2etests/testdata/stable/arrowhead_adjustment/dagre/board.exp.json b/e2etests/testdata/stable/arrowhead_adjustment/dagre/board.exp.json index b23d23fe4..074f0b402 100644 --- a/e2etests/testdata/stable/arrowhead_adjustment/dagre/board.exp.json +++ b/e2etests/testdata/stable/arrowhead_adjustment/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 10, "fill": "B6", "stroke": "#2bc3d8", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "#0db254", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "AB4", "stroke": "#b2350d", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "#a1a4af", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -191,6 +203,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 23.5, @@ -274,6 +287,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 95, @@ -333,6 +347,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 50, @@ -380,6 +395,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 114, @@ -439,6 +455,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 50, @@ -479,6 +496,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/arrowhead_adjustment/dagre/sketch.exp.svg b/e2etests/testdata/stable/arrowhead_adjustment/dagre/sketch.exp.svg index 1e46140ac..fbeaf3383 100644 --- a/e2etests/testdata/stable/arrowhead_adjustment/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/arrowhead_adjustment/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -abc * + .d2-3861309997 .fill-N1{fill:#0A0F25;} + .d2-3861309997 .fill-N2{fill:#676C7E;} + .d2-3861309997 .fill-N3{fill:#9499AB;} + .d2-3861309997 .fill-N4{fill:#CFD2DD;} + .d2-3861309997 .fill-N5{fill:#DEE1EB;} + .d2-3861309997 .fill-N6{fill:#EEF1F8;} + .d2-3861309997 .fill-N7{fill:#FFFFFF;} + .d2-3861309997 .fill-B1{fill:#0D32B2;} + .d2-3861309997 .fill-B2{fill:#0D32B2;} + .d2-3861309997 .fill-B3{fill:#E3E9FD;} + .d2-3861309997 .fill-B4{fill:#E3E9FD;} + .d2-3861309997 .fill-B5{fill:#EDF0FD;} + .d2-3861309997 .fill-B6{fill:#F7F8FE;} + .d2-3861309997 .fill-AA2{fill:#4A6FF3;} + .d2-3861309997 .fill-AA4{fill:#EDF0FD;} + .d2-3861309997 .fill-AA5{fill:#F7F8FE;} + .d2-3861309997 .fill-AB4{fill:#EDF0FD;} + .d2-3861309997 .fill-AB5{fill:#F7F8FE;} + .d2-3861309997 .stroke-N1{stroke:#0A0F25;} + .d2-3861309997 .stroke-N2{stroke:#676C7E;} + .d2-3861309997 .stroke-N3{stroke:#9499AB;} + .d2-3861309997 .stroke-N4{stroke:#CFD2DD;} + .d2-3861309997 .stroke-N5{stroke:#DEE1EB;} + .d2-3861309997 .stroke-N6{stroke:#EEF1F8;} + .d2-3861309997 .stroke-N7{stroke:#FFFFFF;} + .d2-3861309997 .stroke-B1{stroke:#0D32B2;} + .d2-3861309997 .stroke-B2{stroke:#0D32B2;} + .d2-3861309997 .stroke-B3{stroke:#E3E9FD;} + .d2-3861309997 .stroke-B4{stroke:#E3E9FD;} + .d2-3861309997 .stroke-B5{stroke:#EDF0FD;} + .d2-3861309997 .stroke-B6{stroke:#F7F8FE;} + .d2-3861309997 .stroke-AA2{stroke:#4A6FF3;} + .d2-3861309997 .stroke-AA4{stroke:#EDF0FD;} + .d2-3861309997 .stroke-AA5{stroke:#F7F8FE;} + .d2-3861309997 .stroke-AB4{stroke:#EDF0FD;} + .d2-3861309997 .stroke-AB5{stroke:#F7F8FE;} + .d2-3861309997 .background-color-N1{background-color:#0A0F25;} + .d2-3861309997 .background-color-N2{background-color:#676C7E;} + .d2-3861309997 .background-color-N3{background-color:#9499AB;} + .d2-3861309997 .background-color-N4{background-color:#CFD2DD;} + .d2-3861309997 .background-color-N5{background-color:#DEE1EB;} + .d2-3861309997 .background-color-N6{background-color:#EEF1F8;} + .d2-3861309997 .background-color-N7{background-color:#FFFFFF;} + .d2-3861309997 .background-color-B1{background-color:#0D32B2;} + .d2-3861309997 .background-color-B2{background-color:#0D32B2;} + .d2-3861309997 .background-color-B3{background-color:#E3E9FD;} + .d2-3861309997 .background-color-B4{background-color:#E3E9FD;} + .d2-3861309997 .background-color-B5{background-color:#EDF0FD;} + .d2-3861309997 .background-color-B6{background-color:#F7F8FE;} + .d2-3861309997 .background-color-AA2{background-color:#4A6FF3;} + .d2-3861309997 .background-color-AA4{background-color:#EDF0FD;} + .d2-3861309997 .background-color-AA5{background-color:#F7F8FE;} + .d2-3861309997 .background-color-AB4{background-color:#EDF0FD;} + .d2-3861309997 .background-color-AB5{background-color:#F7F8FE;} + .d2-3861309997 .color-N1{color:#0A0F25;} + .d2-3861309997 .color-N2{color:#676C7E;} + .d2-3861309997 .color-N3{color:#9499AB;} + .d2-3861309997 .color-N4{color:#CFD2DD;} + .d2-3861309997 .color-N5{color:#DEE1EB;} + .d2-3861309997 .color-N6{color:#EEF1F8;} + .d2-3861309997 .color-N7{color:#FFFFFF;} + .d2-3861309997 .color-B1{color:#0D32B2;} + .d2-3861309997 .color-B2{color:#0D32B2;} + .d2-3861309997 .color-B3{color:#E3E9FD;} + .d2-3861309997 .color-B4{color:#E3E9FD;} + .d2-3861309997 .color-B5{color:#EDF0FD;} + .d2-3861309997 .color-B6{color:#F7F8FE;} + .d2-3861309997 .color-AA2{color:#4A6FF3;} + .d2-3861309997 .color-AA4{color:#EDF0FD;} + .d2-3861309997 .color-AA5{color:#F7F8FE;} + .d2-3861309997 .color-AB4{color:#EDF0FD;} + .d2-3861309997 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3861309997);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3861309997);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3861309997);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3861309997);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3861309997);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3861309997);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3861309997);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3861309997);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3861309997);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3861309997);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3861309997);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3861309997);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3861309997);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3861309997);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3861309997);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3861309997);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3861309997);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3861309997);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abc * - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/arrowhead_adjustment/elk/board.exp.json b/e2etests/testdata/stable/arrowhead_adjustment/elk/board.exp.json index f449aba8d..5499dffe2 100644 --- a/e2etests/testdata/stable/arrowhead_adjustment/elk/board.exp.json +++ b/e2etests/testdata/stable/arrowhead_adjustment/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 10, "fill": "B6", "stroke": "#2bc3d8", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "#0db254", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "AB4", "stroke": "#b2350d", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "#a1a4af", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -191,6 +203,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 83, @@ -245,6 +258,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 148, @@ -303,6 +317,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 103, @@ -341,6 +356,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 161, @@ -395,6 +411,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 135, @@ -426,6 +443,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/arrowhead_adjustment/elk/sketch.exp.svg b/e2etests/testdata/stable/arrowhead_adjustment/elk/sketch.exp.svg index dfe54a0a7..5b1b76afb 100644 --- a/e2etests/testdata/stable/arrowhead_adjustment/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/arrowhead_adjustment/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -abc * + .d2-2599376223 .fill-N1{fill:#0A0F25;} + .d2-2599376223 .fill-N2{fill:#676C7E;} + .d2-2599376223 .fill-N3{fill:#9499AB;} + .d2-2599376223 .fill-N4{fill:#CFD2DD;} + .d2-2599376223 .fill-N5{fill:#DEE1EB;} + .d2-2599376223 .fill-N6{fill:#EEF1F8;} + .d2-2599376223 .fill-N7{fill:#FFFFFF;} + .d2-2599376223 .fill-B1{fill:#0D32B2;} + .d2-2599376223 .fill-B2{fill:#0D32B2;} + .d2-2599376223 .fill-B3{fill:#E3E9FD;} + .d2-2599376223 .fill-B4{fill:#E3E9FD;} + .d2-2599376223 .fill-B5{fill:#EDF0FD;} + .d2-2599376223 .fill-B6{fill:#F7F8FE;} + .d2-2599376223 .fill-AA2{fill:#4A6FF3;} + .d2-2599376223 .fill-AA4{fill:#EDF0FD;} + .d2-2599376223 .fill-AA5{fill:#F7F8FE;} + .d2-2599376223 .fill-AB4{fill:#EDF0FD;} + .d2-2599376223 .fill-AB5{fill:#F7F8FE;} + .d2-2599376223 .stroke-N1{stroke:#0A0F25;} + .d2-2599376223 .stroke-N2{stroke:#676C7E;} + .d2-2599376223 .stroke-N3{stroke:#9499AB;} + .d2-2599376223 .stroke-N4{stroke:#CFD2DD;} + .d2-2599376223 .stroke-N5{stroke:#DEE1EB;} + .d2-2599376223 .stroke-N6{stroke:#EEF1F8;} + .d2-2599376223 .stroke-N7{stroke:#FFFFFF;} + .d2-2599376223 .stroke-B1{stroke:#0D32B2;} + .d2-2599376223 .stroke-B2{stroke:#0D32B2;} + .d2-2599376223 .stroke-B3{stroke:#E3E9FD;} + .d2-2599376223 .stroke-B4{stroke:#E3E9FD;} + .d2-2599376223 .stroke-B5{stroke:#EDF0FD;} + .d2-2599376223 .stroke-B6{stroke:#F7F8FE;} + .d2-2599376223 .stroke-AA2{stroke:#4A6FF3;} + .d2-2599376223 .stroke-AA4{stroke:#EDF0FD;} + .d2-2599376223 .stroke-AA5{stroke:#F7F8FE;} + .d2-2599376223 .stroke-AB4{stroke:#EDF0FD;} + .d2-2599376223 .stroke-AB5{stroke:#F7F8FE;} + .d2-2599376223 .background-color-N1{background-color:#0A0F25;} + .d2-2599376223 .background-color-N2{background-color:#676C7E;} + .d2-2599376223 .background-color-N3{background-color:#9499AB;} + .d2-2599376223 .background-color-N4{background-color:#CFD2DD;} + .d2-2599376223 .background-color-N5{background-color:#DEE1EB;} + .d2-2599376223 .background-color-N6{background-color:#EEF1F8;} + .d2-2599376223 .background-color-N7{background-color:#FFFFFF;} + .d2-2599376223 .background-color-B1{background-color:#0D32B2;} + .d2-2599376223 .background-color-B2{background-color:#0D32B2;} + .d2-2599376223 .background-color-B3{background-color:#E3E9FD;} + .d2-2599376223 .background-color-B4{background-color:#E3E9FD;} + .d2-2599376223 .background-color-B5{background-color:#EDF0FD;} + .d2-2599376223 .background-color-B6{background-color:#F7F8FE;} + .d2-2599376223 .background-color-AA2{background-color:#4A6FF3;} + .d2-2599376223 .background-color-AA4{background-color:#EDF0FD;} + .d2-2599376223 .background-color-AA5{background-color:#F7F8FE;} + .d2-2599376223 .background-color-AB4{background-color:#EDF0FD;} + .d2-2599376223 .background-color-AB5{background-color:#F7F8FE;} + .d2-2599376223 .color-N1{color:#0A0F25;} + .d2-2599376223 .color-N2{color:#676C7E;} + .d2-2599376223 .color-N3{color:#9499AB;} + .d2-2599376223 .color-N4{color:#CFD2DD;} + .d2-2599376223 .color-N5{color:#DEE1EB;} + .d2-2599376223 .color-N6{color:#EEF1F8;} + .d2-2599376223 .color-N7{color:#FFFFFF;} + .d2-2599376223 .color-B1{color:#0D32B2;} + .d2-2599376223 .color-B2{color:#0D32B2;} + .d2-2599376223 .color-B3{color:#E3E9FD;} + .d2-2599376223 .color-B4{color:#E3E9FD;} + .d2-2599376223 .color-B5{color:#EDF0FD;} + .d2-2599376223 .color-B6{color:#F7F8FE;} + .d2-2599376223 .color-AA2{color:#4A6FF3;} + .d2-2599376223 .color-AA4{color:#EDF0FD;} + .d2-2599376223 .color-AA5{color:#F7F8FE;} + .d2-2599376223 .color-AB4{color:#EDF0FD;} + .d2-2599376223 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2599376223);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2599376223);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2599376223);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2599376223);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2599376223);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2599376223);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2599376223);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2599376223);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2599376223);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2599376223);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2599376223);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2599376223);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2599376223);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2599376223);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2599376223);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2599376223);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2599376223);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2599376223);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abc * - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/arrowhead_labels/dagre/board.exp.json b/e2etests/testdata/stable/arrowhead_labels/dagre/board.exp.json index 3311c9b1e..6fe7aa1d2 100644 --- a/e2etests/testdata/stable/arrowhead_labels/dagre/board.exp.json +++ b/e2etests/testdata/stable/arrowhead_labels/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -134,6 +144,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 100.5, @@ -174,6 +185,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/arrowhead_labels/dagre/sketch.exp.svg b/e2etests/testdata/stable/arrowhead_labels/dagre/sketch.exp.svg index dfed7d598..09cb26fb4 100644 --- a/e2etests/testdata/stable/arrowhead_labels/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/arrowhead_labels/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -ab To err is human, to moo bovine1* + .d2-3493784442 .fill-N1{fill:#0A0F25;} + .d2-3493784442 .fill-N2{fill:#676C7E;} + .d2-3493784442 .fill-N3{fill:#9499AB;} + .d2-3493784442 .fill-N4{fill:#CFD2DD;} + .d2-3493784442 .fill-N5{fill:#DEE1EB;} + .d2-3493784442 .fill-N6{fill:#EEF1F8;} + .d2-3493784442 .fill-N7{fill:#FFFFFF;} + .d2-3493784442 .fill-B1{fill:#0D32B2;} + .d2-3493784442 .fill-B2{fill:#0D32B2;} + .d2-3493784442 .fill-B3{fill:#E3E9FD;} + .d2-3493784442 .fill-B4{fill:#E3E9FD;} + .d2-3493784442 .fill-B5{fill:#EDF0FD;} + .d2-3493784442 .fill-B6{fill:#F7F8FE;} + .d2-3493784442 .fill-AA2{fill:#4A6FF3;} + .d2-3493784442 .fill-AA4{fill:#EDF0FD;} + .d2-3493784442 .fill-AA5{fill:#F7F8FE;} + .d2-3493784442 .fill-AB4{fill:#EDF0FD;} + .d2-3493784442 .fill-AB5{fill:#F7F8FE;} + .d2-3493784442 .stroke-N1{stroke:#0A0F25;} + .d2-3493784442 .stroke-N2{stroke:#676C7E;} + .d2-3493784442 .stroke-N3{stroke:#9499AB;} + .d2-3493784442 .stroke-N4{stroke:#CFD2DD;} + .d2-3493784442 .stroke-N5{stroke:#DEE1EB;} + .d2-3493784442 .stroke-N6{stroke:#EEF1F8;} + .d2-3493784442 .stroke-N7{stroke:#FFFFFF;} + .d2-3493784442 .stroke-B1{stroke:#0D32B2;} + .d2-3493784442 .stroke-B2{stroke:#0D32B2;} + .d2-3493784442 .stroke-B3{stroke:#E3E9FD;} + .d2-3493784442 .stroke-B4{stroke:#E3E9FD;} + .d2-3493784442 .stroke-B5{stroke:#EDF0FD;} + .d2-3493784442 .stroke-B6{stroke:#F7F8FE;} + .d2-3493784442 .stroke-AA2{stroke:#4A6FF3;} + .d2-3493784442 .stroke-AA4{stroke:#EDF0FD;} + .d2-3493784442 .stroke-AA5{stroke:#F7F8FE;} + .d2-3493784442 .stroke-AB4{stroke:#EDF0FD;} + .d2-3493784442 .stroke-AB5{stroke:#F7F8FE;} + .d2-3493784442 .background-color-N1{background-color:#0A0F25;} + .d2-3493784442 .background-color-N2{background-color:#676C7E;} + .d2-3493784442 .background-color-N3{background-color:#9499AB;} + .d2-3493784442 .background-color-N4{background-color:#CFD2DD;} + .d2-3493784442 .background-color-N5{background-color:#DEE1EB;} + .d2-3493784442 .background-color-N6{background-color:#EEF1F8;} + .d2-3493784442 .background-color-N7{background-color:#FFFFFF;} + .d2-3493784442 .background-color-B1{background-color:#0D32B2;} + .d2-3493784442 .background-color-B2{background-color:#0D32B2;} + .d2-3493784442 .background-color-B3{background-color:#E3E9FD;} + .d2-3493784442 .background-color-B4{background-color:#E3E9FD;} + .d2-3493784442 .background-color-B5{background-color:#EDF0FD;} + .d2-3493784442 .background-color-B6{background-color:#F7F8FE;} + .d2-3493784442 .background-color-AA2{background-color:#4A6FF3;} + .d2-3493784442 .background-color-AA4{background-color:#EDF0FD;} + .d2-3493784442 .background-color-AA5{background-color:#F7F8FE;} + .d2-3493784442 .background-color-AB4{background-color:#EDF0FD;} + .d2-3493784442 .background-color-AB5{background-color:#F7F8FE;} + .d2-3493784442 .color-N1{color:#0A0F25;} + .d2-3493784442 .color-N2{color:#676C7E;} + .d2-3493784442 .color-N3{color:#9499AB;} + .d2-3493784442 .color-N4{color:#CFD2DD;} + .d2-3493784442 .color-N5{color:#DEE1EB;} + .d2-3493784442 .color-N6{color:#EEF1F8;} + .d2-3493784442 .color-N7{color:#FFFFFF;} + .d2-3493784442 .color-B1{color:#0D32B2;} + .d2-3493784442 .color-B2{color:#0D32B2;} + .d2-3493784442 .color-B3{color:#E3E9FD;} + .d2-3493784442 .color-B4{color:#E3E9FD;} + .d2-3493784442 .color-B5{color:#EDF0FD;} + .d2-3493784442 .color-B6{color:#F7F8FE;} + .d2-3493784442 .color-AA2{color:#4A6FF3;} + .d2-3493784442 .color-AA4{color:#EDF0FD;} + .d2-3493784442 .color-AA5{color:#F7F8FE;} + .d2-3493784442 .color-AB4{color:#EDF0FD;} + .d2-3493784442 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3493784442);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3493784442);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3493784442);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3493784442);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3493784442);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3493784442);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3493784442);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3493784442);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3493784442);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3493784442);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3493784442);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3493784442);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3493784442);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3493784442);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3493784442);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3493784442);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3493784442);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3493784442);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ab To err is human, to moo bovine1* - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/arrowhead_labels/elk/board.exp.json b/e2etests/testdata/stable/arrowhead_labels/elk/board.exp.json index 621b52c5e..b8ce2167a 100644 --- a/e2etests/testdata/stable/arrowhead_labels/elk/board.exp.json +++ b/e2etests/testdata/stable/arrowhead_labels/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -134,6 +144,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 112.5, @@ -165,6 +176,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/arrowhead_labels/elk/sketch.exp.svg b/e2etests/testdata/stable/arrowhead_labels/elk/sketch.exp.svg index 4d800a8f7..7118d933c 100644 --- a/e2etests/testdata/stable/arrowhead_labels/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/arrowhead_labels/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -ab To err is human, to moo bovine1* + .d2-3608204017 .fill-N1{fill:#0A0F25;} + .d2-3608204017 .fill-N2{fill:#676C7E;} + .d2-3608204017 .fill-N3{fill:#9499AB;} + .d2-3608204017 .fill-N4{fill:#CFD2DD;} + .d2-3608204017 .fill-N5{fill:#DEE1EB;} + .d2-3608204017 .fill-N6{fill:#EEF1F8;} + .d2-3608204017 .fill-N7{fill:#FFFFFF;} + .d2-3608204017 .fill-B1{fill:#0D32B2;} + .d2-3608204017 .fill-B2{fill:#0D32B2;} + .d2-3608204017 .fill-B3{fill:#E3E9FD;} + .d2-3608204017 .fill-B4{fill:#E3E9FD;} + .d2-3608204017 .fill-B5{fill:#EDF0FD;} + .d2-3608204017 .fill-B6{fill:#F7F8FE;} + .d2-3608204017 .fill-AA2{fill:#4A6FF3;} + .d2-3608204017 .fill-AA4{fill:#EDF0FD;} + .d2-3608204017 .fill-AA5{fill:#F7F8FE;} + .d2-3608204017 .fill-AB4{fill:#EDF0FD;} + .d2-3608204017 .fill-AB5{fill:#F7F8FE;} + .d2-3608204017 .stroke-N1{stroke:#0A0F25;} + .d2-3608204017 .stroke-N2{stroke:#676C7E;} + .d2-3608204017 .stroke-N3{stroke:#9499AB;} + .d2-3608204017 .stroke-N4{stroke:#CFD2DD;} + .d2-3608204017 .stroke-N5{stroke:#DEE1EB;} + .d2-3608204017 .stroke-N6{stroke:#EEF1F8;} + .d2-3608204017 .stroke-N7{stroke:#FFFFFF;} + .d2-3608204017 .stroke-B1{stroke:#0D32B2;} + .d2-3608204017 .stroke-B2{stroke:#0D32B2;} + .d2-3608204017 .stroke-B3{stroke:#E3E9FD;} + .d2-3608204017 .stroke-B4{stroke:#E3E9FD;} + .d2-3608204017 .stroke-B5{stroke:#EDF0FD;} + .d2-3608204017 .stroke-B6{stroke:#F7F8FE;} + .d2-3608204017 .stroke-AA2{stroke:#4A6FF3;} + .d2-3608204017 .stroke-AA4{stroke:#EDF0FD;} + .d2-3608204017 .stroke-AA5{stroke:#F7F8FE;} + .d2-3608204017 .stroke-AB4{stroke:#EDF0FD;} + .d2-3608204017 .stroke-AB5{stroke:#F7F8FE;} + .d2-3608204017 .background-color-N1{background-color:#0A0F25;} + .d2-3608204017 .background-color-N2{background-color:#676C7E;} + .d2-3608204017 .background-color-N3{background-color:#9499AB;} + .d2-3608204017 .background-color-N4{background-color:#CFD2DD;} + .d2-3608204017 .background-color-N5{background-color:#DEE1EB;} + .d2-3608204017 .background-color-N6{background-color:#EEF1F8;} + .d2-3608204017 .background-color-N7{background-color:#FFFFFF;} + .d2-3608204017 .background-color-B1{background-color:#0D32B2;} + .d2-3608204017 .background-color-B2{background-color:#0D32B2;} + .d2-3608204017 .background-color-B3{background-color:#E3E9FD;} + .d2-3608204017 .background-color-B4{background-color:#E3E9FD;} + .d2-3608204017 .background-color-B5{background-color:#EDF0FD;} + .d2-3608204017 .background-color-B6{background-color:#F7F8FE;} + .d2-3608204017 .background-color-AA2{background-color:#4A6FF3;} + .d2-3608204017 .background-color-AA4{background-color:#EDF0FD;} + .d2-3608204017 .background-color-AA5{background-color:#F7F8FE;} + .d2-3608204017 .background-color-AB4{background-color:#EDF0FD;} + .d2-3608204017 .background-color-AB5{background-color:#F7F8FE;} + .d2-3608204017 .color-N1{color:#0A0F25;} + .d2-3608204017 .color-N2{color:#676C7E;} + .d2-3608204017 .color-N3{color:#9499AB;} + .d2-3608204017 .color-N4{color:#CFD2DD;} + .d2-3608204017 .color-N5{color:#DEE1EB;} + .d2-3608204017 .color-N6{color:#EEF1F8;} + .d2-3608204017 .color-N7{color:#FFFFFF;} + .d2-3608204017 .color-B1{color:#0D32B2;} + .d2-3608204017 .color-B2{color:#0D32B2;} + .d2-3608204017 .color-B3{color:#E3E9FD;} + .d2-3608204017 .color-B4{color:#E3E9FD;} + .d2-3608204017 .color-B5{color:#EDF0FD;} + .d2-3608204017 .color-B6{color:#F7F8FE;} + .d2-3608204017 .color-AA2{color:#4A6FF3;} + .d2-3608204017 .color-AA4{color:#EDF0FD;} + .d2-3608204017 .color-AA5{color:#F7F8FE;} + .d2-3608204017 .color-AB4{color:#EDF0FD;} + .d2-3608204017 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3608204017);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3608204017);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3608204017);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3608204017);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3608204017);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3608204017);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3608204017);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3608204017);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3608204017);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3608204017);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3608204017);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3608204017);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3608204017);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3608204017);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3608204017);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3608204017);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3608204017);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3608204017);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ab To err is human, to moo bovine1* - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/arrowhead_scaling/dagre/board.exp.json b/e2etests/testdata/stable/arrowhead_scaling/dagre/board.exp.json index da688e287..3f44e457e 100644 --- a/e2etests/testdata/stable/arrowhead_scaling/dagre/board.exp.json +++ b/e2etests/testdata/stable/arrowhead_scaling/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -139,6 +150,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -180,6 +192,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -221,6 +234,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -262,6 +276,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -303,6 +318,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -344,6 +360,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -385,6 +402,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -426,6 +444,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -467,6 +486,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -508,6 +528,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -549,6 +570,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -590,6 +612,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -630,6 +653,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -670,6 +694,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -711,6 +736,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -752,6 +778,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -793,6 +820,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -834,6 +862,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -875,6 +904,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -916,6 +946,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -957,6 +988,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -998,6 +1030,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1039,6 +1072,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1080,6 +1114,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1121,6 +1156,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1161,6 +1197,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1201,6 +1238,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1242,6 +1280,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1283,6 +1322,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1324,6 +1364,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1365,6 +1406,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1406,6 +1448,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1447,6 +1490,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1488,6 +1532,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1529,6 +1574,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1570,6 +1616,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1611,6 +1658,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1652,6 +1700,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1692,6 +1741,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1732,6 +1782,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1773,6 +1824,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1814,6 +1866,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1855,6 +1908,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1896,6 +1950,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1937,6 +1992,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1978,6 +2034,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2019,6 +2076,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2060,6 +2118,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2101,6 +2160,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2142,6 +2202,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2183,6 +2244,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2223,6 +2285,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2263,6 +2326,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2304,6 +2368,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2345,6 +2410,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2386,6 +2452,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2427,6 +2494,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2468,6 +2536,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2509,6 +2578,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2550,6 +2620,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2591,6 +2662,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2632,6 +2704,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2673,6 +2746,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2714,6 +2788,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2754,6 +2829,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2794,6 +2870,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2835,6 +2912,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2876,6 +2954,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2917,6 +2996,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2958,6 +3038,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2999,6 +3080,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3040,6 +3122,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3081,6 +3164,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3122,6 +3206,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3163,6 +3248,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3204,6 +3290,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3245,6 +3332,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3285,6 +3373,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3325,6 +3414,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3366,6 +3456,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3407,6 +3498,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3448,6 +3540,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3489,6 +3582,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3530,6 +3624,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3571,6 +3666,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3612,6 +3708,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3653,6 +3750,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3694,6 +3792,1095 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "15", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 16, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "box", + "type": "rectangle", + "pos": { + "x": 4571, + "y": 40 + }, + "width": 633, + "height": 473, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "box", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 42, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "box.start", + "type": "rectangle", + "pos": { + "x": 4601, + "y": 70 + }, + "width": 573, + "height": 126, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 2 + }, + { + "id": "box.end", + "type": "rectangle", + "pos": { + "x": 4601, + "y": 357 + }, + "width": 573, + "height": 126, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 2 + }, + { + "id": "box.start.1", + "type": "rectangle", + "pos": { + "x": 4631, + "y": 100 + }, + "width": 52, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "1", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 7, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "box.end.1", + "type": "rectangle", + "pos": { + "x": 4631, + "y": 387 + }, + "width": 52, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "1", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 7, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "box.start.2", + "type": "rectangle", + "pos": { + "x": 4743, + "y": 100 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "2", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "box.end.2", + "type": "rectangle", + "pos": { + "x": 4743, + "y": 387 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "2", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "box.start.4", + "type": "rectangle", + "pos": { + "x": 4856, + "y": 100 + }, + "width": 54, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "4", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "box.end.4", + "type": "rectangle", + "pos": { + "x": 4856, + "y": 387 + }, + "width": 54, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "4", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "box.start.8", + "type": "rectangle", + "pos": { + "x": 4970, + "y": 100 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "8", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "box.end.8", + "type": "rectangle", + "pos": { + "x": 4970, + "y": 387 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "8", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "box.start.15", + "type": "rectangle", + "pos": { + "x": 5083, + "y": 100 + }, + "width": 61, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "15", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 16, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "box.end.15", + "type": "rectangle", + "pos": { + "x": 5083, + "y": 387 + }, + "width": 61, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "15", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 16, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "filled-box", + "type": "rectangle", + "pos": { + "x": 5224, + "y": 40 + }, + "width": 633, + "height": 473, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "filled-box", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 112, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "filled-box.start", + "type": "rectangle", + "pos": { + "x": 5254, + "y": 70 + }, + "width": 573, + "height": 126, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 2 + }, + { + "id": "filled-box.end", + "type": "rectangle", + "pos": { + "x": 5254, + "y": 357 + }, + "width": 573, + "height": 126, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 2 + }, + { + "id": "filled-box.start.1", + "type": "rectangle", + "pos": { + "x": 5284, + "y": 100 + }, + "width": 52, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "1", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 7, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "filled-box.end.1", + "type": "rectangle", + "pos": { + "x": 5284, + "y": 387 + }, + "width": 52, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "1", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 7, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "filled-box.start.2", + "type": "rectangle", + "pos": { + "x": 5396, + "y": 100 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "2", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "filled-box.end.2", + "type": "rectangle", + "pos": { + "x": 5396, + "y": 387 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "2", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "filled-box.start.4", + "type": "rectangle", + "pos": { + "x": 5509, + "y": 100 + }, + "width": 54, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "4", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "filled-box.end.4", + "type": "rectangle", + "pos": { + "x": 5509, + "y": 387 + }, + "width": 54, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "4", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "filled-box.start.8", + "type": "rectangle", + "pos": { + "x": 5623, + "y": 100 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "8", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "filled-box.end.8", + "type": "rectangle", + "pos": { + "x": 5623, + "y": 387 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "8", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "filled-box.start.15", + "type": "rectangle", + "pos": { + "x": 5736, + "y": 100 + }, + "width": 61, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "15", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 16, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "filled-box.end.15", + "type": "rectangle", + "pos": { + "x": 5736, + "y": 387 + }, + "width": 61, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3724,7 +4911,7 @@ "id": "cf one", "type": "rectangle", "pos": { - "x": 4571, + "x": 5877, "y": 40 }, "width": 633, @@ -3735,6 +4922,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3765,7 +4953,7 @@ "id": "cf one.start", "type": "rectangle", "pos": { - "x": 4601, + "x": 5907, "y": 70 }, "width": 573, @@ -3776,6 +4964,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3805,7 +4994,7 @@ "id": "cf one.end", "type": "rectangle", "pos": { - "x": 4601, + "x": 5907, "y": 357 }, "width": 573, @@ -3816,6 +5005,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3845,7 +5035,7 @@ "id": "cf one.start.1", "type": "rectangle", "pos": { - "x": 4631, + "x": 5937, "y": 100 }, "width": 52, @@ -3856,6 +5046,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3886,7 +5077,7 @@ "id": "cf one.end.1", "type": "rectangle", "pos": { - "x": 4631, + "x": 5937, "y": 387 }, "width": 52, @@ -3897,6 +5088,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3927,7 +5119,7 @@ "id": "cf one.start.2", "type": "rectangle", "pos": { - "x": 4743, + "x": 6049, "y": 100 }, "width": 53, @@ -3938,6 +5130,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3968,7 +5161,7 @@ "id": "cf one.end.2", "type": "rectangle", "pos": { - "x": 4743, + "x": 6049, "y": 387 }, "width": 53, @@ -3979,6 +5172,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4009,7 +5203,7 @@ "id": "cf one.start.4", "type": "rectangle", "pos": { - "x": 4856, + "x": 6162, "y": 100 }, "width": 54, @@ -4020,6 +5214,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4050,7 +5245,7 @@ "id": "cf one.end.4", "type": "rectangle", "pos": { - "x": 4856, + "x": 6162, "y": 387 }, "width": 54, @@ -4061,6 +5256,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4091,7 +5287,7 @@ "id": "cf one.start.8", "type": "rectangle", "pos": { - "x": 4970, + "x": 6276, "y": 100 }, "width": 53, @@ -4102,6 +5298,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4132,7 +5329,7 @@ "id": "cf one.end.8", "type": "rectangle", "pos": { - "x": 4970, + "x": 6276, "y": 387 }, "width": 53, @@ -4143,6 +5340,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4173,7 +5371,7 @@ "id": "cf one.start.15", "type": "rectangle", "pos": { - "x": 5083, + "x": 6389, "y": 100 }, "width": 61, @@ -4184,6 +5382,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4214,7 +5413,7 @@ "id": "cf one.end.15", "type": "rectangle", "pos": { - "x": 5083, + "x": 6389, "y": 387 }, "width": 61, @@ -4225,6 +5424,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4255,7 +5455,7 @@ "id": "cf one required", "type": "rectangle", "pos": { - "x": 5224, + "x": 6530, "y": 40 }, "width": 633, @@ -4266,6 +5466,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4296,7 +5497,7 @@ "id": "cf one required.start", "type": "rectangle", "pos": { - "x": 5254, + "x": 6560, "y": 70 }, "width": 573, @@ -4307,6 +5508,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4336,7 +5538,7 @@ "id": "cf one required.end", "type": "rectangle", "pos": { - "x": 5254, + "x": 6560, "y": 357 }, "width": 573, @@ -4347,6 +5549,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4376,7 +5579,7 @@ "id": "cf one required.start.1", "type": "rectangle", "pos": { - "x": 5284, + "x": 6590, "y": 100 }, "width": 52, @@ -4387,6 +5590,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4417,7 +5621,7 @@ "id": "cf one required.end.1", "type": "rectangle", "pos": { - "x": 5284, + "x": 6590, "y": 387 }, "width": 52, @@ -4428,6 +5632,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4458,7 +5663,7 @@ "id": "cf one required.start.2", "type": "rectangle", "pos": { - "x": 5396, + "x": 6702, "y": 100 }, "width": 53, @@ -4469,6 +5674,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4499,7 +5705,7 @@ "id": "cf one required.end.2", "type": "rectangle", "pos": { - "x": 5396, + "x": 6702, "y": 387 }, "width": 53, @@ -4510,6 +5716,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4540,7 +5747,7 @@ "id": "cf one required.start.4", "type": "rectangle", "pos": { - "x": 5509, + "x": 6815, "y": 100 }, "width": 54, @@ -4551,6 +5758,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4581,7 +5789,7 @@ "id": "cf one required.end.4", "type": "rectangle", "pos": { - "x": 5509, + "x": 6815, "y": 387 }, "width": 54, @@ -4592,6 +5800,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4622,7 +5831,7 @@ "id": "cf one required.start.8", "type": "rectangle", "pos": { - "x": 5623, + "x": 6929, "y": 100 }, "width": 53, @@ -4633,6 +5842,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4663,7 +5873,7 @@ "id": "cf one required.end.8", "type": "rectangle", "pos": { - "x": 5623, + "x": 6929, "y": 387 }, "width": 53, @@ -4674,6 +5884,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4704,7 +5915,7 @@ "id": "cf one required.start.15", "type": "rectangle", "pos": { - "x": 5736, + "x": 7042, "y": 100 }, "width": 61, @@ -4715,6 +5926,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4745,7 +5957,7 @@ "id": "cf one required.end.15", "type": "rectangle", "pos": { - "x": 5736, + "x": 7042, "y": 387 }, "width": 61, @@ -4756,6 +5968,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4786,7 +5999,7 @@ "id": "cf many", "type": "rectangle", "pos": { - "x": 5877, + "x": 7183, "y": 40 }, "width": 633, @@ -4797,6 +6010,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4827,7 +6041,7 @@ "id": "cf many.start", "type": "rectangle", "pos": { - "x": 5907, + "x": 7213, "y": 70 }, "width": 573, @@ -4838,6 +6052,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4867,7 +6082,7 @@ "id": "cf many.end", "type": "rectangle", "pos": { - "x": 5907, + "x": 7213, "y": 357 }, "width": 573, @@ -4878,6 +6093,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4907,7 +6123,7 @@ "id": "cf many.start.1", "type": "rectangle", "pos": { - "x": 5937, + "x": 7243, "y": 100 }, "width": 52, @@ -4918,6 +6134,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4948,7 +6165,7 @@ "id": "cf many.end.1", "type": "rectangle", "pos": { - "x": 5937, + "x": 7243, "y": 387 }, "width": 52, @@ -4959,6 +6176,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4989,7 +6207,7 @@ "id": "cf many.start.2", "type": "rectangle", "pos": { - "x": 6049, + "x": 7355, "y": 100 }, "width": 53, @@ -5000,6 +6218,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5030,7 +6249,7 @@ "id": "cf many.end.2", "type": "rectangle", "pos": { - "x": 6049, + "x": 7355, "y": 387 }, "width": 53, @@ -5041,6 +6260,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5071,7 +6291,7 @@ "id": "cf many.start.4", "type": "rectangle", "pos": { - "x": 6162, + "x": 7468, "y": 100 }, "width": 54, @@ -5082,6 +6302,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5112,7 +6333,7 @@ "id": "cf many.end.4", "type": "rectangle", "pos": { - "x": 6162, + "x": 7468, "y": 387 }, "width": 54, @@ -5123,6 +6344,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5153,7 +6375,7 @@ "id": "cf many.start.8", "type": "rectangle", "pos": { - "x": 6276, + "x": 7582, "y": 100 }, "width": 53, @@ -5164,6 +6386,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5194,7 +6417,7 @@ "id": "cf many.end.8", "type": "rectangle", "pos": { - "x": 6276, + "x": 7582, "y": 387 }, "width": 53, @@ -5205,6 +6428,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5235,7 +6459,7 @@ "id": "cf many.start.15", "type": "rectangle", "pos": { - "x": 6389, + "x": 7695, "y": 100 }, "width": 61, @@ -5246,6 +6470,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5276,7 +6501,7 @@ "id": "cf many.end.15", "type": "rectangle", "pos": { - "x": 6389, + "x": 7695, "y": 387 }, "width": 61, @@ -5287,6 +6512,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5317,7 +6543,7 @@ "id": "cf many required", "type": "rectangle", "pos": { - "x": 6530, + "x": 7836, "y": 40 }, "width": 633, @@ -5328,6 +6554,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5358,7 +6585,7 @@ "id": "cf many required.start", "type": "rectangle", "pos": { - "x": 6560, + "x": 7866, "y": 70 }, "width": 573, @@ -5369,6 +6596,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5398,7 +6626,7 @@ "id": "cf many required.end", "type": "rectangle", "pos": { - "x": 6560, + "x": 7866, "y": 357 }, "width": 573, @@ -5409,6 +6637,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5438,7 +6667,7 @@ "id": "cf many required.start.1", "type": "rectangle", "pos": { - "x": 6590, + "x": 7896, "y": 100 }, "width": 52, @@ -5449,6 +6678,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5479,7 +6709,7 @@ "id": "cf many required.end.1", "type": "rectangle", "pos": { - "x": 6590, + "x": 7896, "y": 387 }, "width": 52, @@ -5490,6 +6720,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5520,7 +6751,7 @@ "id": "cf many required.start.2", "type": "rectangle", "pos": { - "x": 6702, + "x": 8008, "y": 100 }, "width": 53, @@ -5531,6 +6762,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5561,7 +6793,7 @@ "id": "cf many required.end.2", "type": "rectangle", "pos": { - "x": 6702, + "x": 8008, "y": 387 }, "width": 53, @@ -5572,6 +6804,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5602,7 +6835,7 @@ "id": "cf many required.start.4", "type": "rectangle", "pos": { - "x": 6815, + "x": 8121, "y": 100 }, "width": 54, @@ -5613,6 +6846,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5643,7 +6877,7 @@ "id": "cf many required.end.4", "type": "rectangle", "pos": { - "x": 6815, + "x": 8121, "y": 387 }, "width": 54, @@ -5654,6 +6888,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5684,7 +6919,7 @@ "id": "cf many required.start.8", "type": "rectangle", "pos": { - "x": 6929, + "x": 8235, "y": 100 }, "width": 53, @@ -5695,6 +6930,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5725,7 +6961,7 @@ "id": "cf many required.end.8", "type": "rectangle", "pos": { - "x": 6929, + "x": 8235, "y": 387 }, "width": 53, @@ -5736,6 +6972,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5766,7 +7003,7 @@ "id": "cf many required.start.15", "type": "rectangle", "pos": { - "x": 7042, + "x": 8348, "y": 100 }, "width": 61, @@ -5777,6 +7014,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5807,7 +7045,7 @@ "id": "cf many required.end.15", "type": "rectangle", "pos": { - "x": 7042, + "x": 8348, "y": 387 }, "width": 61, @@ -5818,6 +7056,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5869,6 +7108,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 86, @@ -5928,6 +7168,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 198.5, @@ -5987,6 +7228,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 312, @@ -6046,6 +7288,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 425.5, @@ -6105,6 +7348,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 542.5, @@ -6164,6 +7408,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 739, @@ -6223,6 +7468,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 851.5, @@ -6282,6 +7528,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 965, @@ -6341,6 +7588,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1078.5, @@ -6400,6 +7648,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1195.5, @@ -6459,6 +7708,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1392, @@ -6518,6 +7768,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1504.5, @@ -6577,6 +7828,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1618, @@ -6636,6 +7888,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1731.5, @@ -6695,6 +7948,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1848.5, @@ -6754,6 +8008,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 2045, @@ -6813,6 +8068,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 2157.5, @@ -6872,6 +8128,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 2271, @@ -6931,6 +8188,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 2384.5, @@ -6990,6 +8248,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 2501.5, @@ -7049,6 +8308,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 2698, @@ -7108,6 +8368,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 2810.5, @@ -7167,6 +8428,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 2924, @@ -7226,6 +8488,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 3037.5, @@ -7285,6 +8548,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 3154.5, @@ -7344,6 +8608,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 3351, @@ -7403,6 +8668,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 3463.5, @@ -7462,6 +8728,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 3577, @@ -7521,6 +8788,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 3690.5, @@ -7580,6 +8848,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 3807.5, @@ -7639,6 +8908,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 4004, @@ -7698,6 +8968,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 4116.5, @@ -7757,6 +9028,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 4230, @@ -7816,6 +9088,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 4343.5, @@ -7875,6 +9148,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 4460.5, @@ -7911,6 +9185,606 @@ "icon": null, "zIndex": 0 }, + { + "id": "box.(start.1 <-> end.1)[0]", + "src": "box.start.1", + "srcArrow": "box", + "dst": "box.end.1", + "dstArrow": "box", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 1, + "stroke": "B1", + "borderRadius": 10, + "label": "1", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 7, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 4657, + "y": 166 + }, + { + "x": 4657, + "y": 206 + }, + { + "x": 4657, + "y": 228.10000610351562 + }, + { + "x": 4657, + "y": 246.25 + }, + { + "x": 4657, + "y": 264.3999938964844 + }, + { + "x": 4657, + "y": 347 + }, + { + "x": 4657, + "y": 387 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "box.(start.2 <-> end.2)[0]", + "src": "box.start.2", + "srcArrow": "box", + "dst": "box.end.2", + "dstArrow": "box", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "2", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 4769.5, + "y": 166 + }, + { + "x": 4769.5, + "y": 206 + }, + { + "x": 4769.5, + "y": 228.10000610351562 + }, + { + "x": 4769.5, + "y": 246.25 + }, + { + "x": 4769.5, + "y": 264.3999938964844 + }, + { + "x": 4769.5, + "y": 347 + }, + { + "x": 4769.5, + "y": 387 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "box.(start.4 <-> end.4)[0]", + "src": "box.start.4", + "srcArrow": "box", + "dst": "box.end.4", + "dstArrow": "box", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 4, + "stroke": "B1", + "borderRadius": 10, + "label": "4", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 4883, + "y": 166 + }, + { + "x": 4883, + "y": 206 + }, + { + "x": 4883, + "y": 228.10000610351562 + }, + { + "x": 4883, + "y": 246.25 + }, + { + "x": 4883, + "y": 264.3999938964844 + }, + { + "x": 4883, + "y": 347 + }, + { + "x": 4883, + "y": 387 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "box.(start.8 <-> end.8)[0]", + "src": "box.start.8", + "srcArrow": "box", + "dst": "box.end.8", + "dstArrow": "box", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 8, + "stroke": "B1", + "borderRadius": 10, + "label": "8", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 4996.5, + "y": 166 + }, + { + "x": 4996.5, + "y": 206 + }, + { + "x": 4996.5, + "y": 228.10000610351562 + }, + { + "x": 4996.5, + "y": 246.25 + }, + { + "x": 4996.5, + "y": 264.3999938964844 + }, + { + "x": 4996.5, + "y": 347 + }, + { + "x": 4996.5, + "y": 387 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "box.(start.15 <-> end.15)[0]", + "src": "box.start.15", + "srcArrow": "box", + "dst": "box.end.15", + "dstArrow": "box", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 15, + "stroke": "B1", + "borderRadius": 10, + "label": "15", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 16, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 5113.5, + "y": 166 + }, + { + "x": 5113.5, + "y": 206 + }, + { + "x": 5113.5, + "y": 228.10000610351562 + }, + { + "x": 5113.5, + "y": 246.25 + }, + { + "x": 5113.5, + "y": 264.3999938964844 + }, + { + "x": 5113.5, + "y": 347 + }, + { + "x": 5113.5, + "y": 387 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "filled-box.(start.1 <-> end.1)[0]", + "src": "filled-box.start.1", + "srcArrow": "filled-box", + "dst": "filled-box.end.1", + "dstArrow": "filled-box", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 1, + "stroke": "B1", + "borderRadius": 10, + "label": "1", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 7, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 5310, + "y": 166 + }, + { + "x": 5310, + "y": 206 + }, + { + "x": 5310, + "y": 228.10000610351562 + }, + { + "x": 5310, + "y": 246.25 + }, + { + "x": 5310, + "y": 264.3999938964844 + }, + { + "x": 5310, + "y": 347 + }, + { + "x": 5310, + "y": 387 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "filled-box.(start.2 <-> end.2)[0]", + "src": "filled-box.start.2", + "srcArrow": "filled-box", + "dst": "filled-box.end.2", + "dstArrow": "filled-box", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "2", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 5422.5, + "y": 166 + }, + { + "x": 5422.5, + "y": 206 + }, + { + "x": 5422.5, + "y": 228.10000610351562 + }, + { + "x": 5422.5, + "y": 246.25 + }, + { + "x": 5422.5, + "y": 264.3999938964844 + }, + { + "x": 5422.5, + "y": 347 + }, + { + "x": 5422.5, + "y": 387 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "filled-box.(start.4 <-> end.4)[0]", + "src": "filled-box.start.4", + "srcArrow": "filled-box", + "dst": "filled-box.end.4", + "dstArrow": "filled-box", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 4, + "stroke": "B1", + "borderRadius": 10, + "label": "4", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 5536, + "y": 166 + }, + { + "x": 5536, + "y": 206 + }, + { + "x": 5536, + "y": 228.10000610351562 + }, + { + "x": 5536, + "y": 246.25 + }, + { + "x": 5536, + "y": 264.3999938964844 + }, + { + "x": 5536, + "y": 347 + }, + { + "x": 5536, + "y": 387 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "filled-box.(start.8 <-> end.8)[0]", + "src": "filled-box.start.8", + "srcArrow": "filled-box", + "dst": "filled-box.end.8", + "dstArrow": "filled-box", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 8, + "stroke": "B1", + "borderRadius": 10, + "label": "8", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 5649.5, + "y": 166 + }, + { + "x": 5649.5, + "y": 206 + }, + { + "x": 5649.5, + "y": 228.10000610351562 + }, + { + "x": 5649.5, + "y": 246.25 + }, + { + "x": 5649.5, + "y": 264.3999938964844 + }, + { + "x": 5649.5, + "y": 347 + }, + { + "x": 5649.5, + "y": 387 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "filled-box.(start.15 <-> end.15)[0]", + "src": "filled-box.start.15", + "srcArrow": "filled-box", + "dst": "filled-box.end.15", + "dstArrow": "filled-box", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 15, + "stroke": "B1", + "borderRadius": 10, + "label": "15", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 16, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 5766.5, + "y": 166 + }, + { + "x": 5766.5, + "y": 206 + }, + { + "x": 5766.5, + "y": 228.10000610351562 + }, + { + "x": 5766.5, + "y": 246.25 + }, + { + "x": 5766.5, + "y": 264.3999938964844 + }, + { + "x": 5766.5, + "y": 347 + }, + { + "x": 5766.5, + "y": 387 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, { "id": "cf one.(start.1 <-> end.1)[0]", "src": "cf one.start.1", @@ -7934,33 +9808,34 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { - "x": 4657, + "x": 5963, "y": 166 }, { - "x": 4657, + "x": 5963, "y": 206 }, { - "x": 4657, + "x": 5963, "y": 228.10000610351562 }, { - "x": 4657, + "x": 5963, "y": 246.25 }, { - "x": 4657, + "x": 5963, "y": 264.3999938964844 }, { - "x": 4657, + "x": 5963, "y": 347 }, { - "x": 4657, + "x": 5963, "y": 387 } ], @@ -7993,33 +9868,34 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { - "x": 4769.5, + "x": 6075.5, "y": 166 }, { - "x": 4769.5, + "x": 6075.5, "y": 206 }, { - "x": 4769.5, + "x": 6075.5, "y": 228.10000610351562 }, { - "x": 4769.5, + "x": 6075.5, "y": 246.25 }, { - "x": 4769.5, + "x": 6075.5, "y": 264.3999938964844 }, { - "x": 4769.5, + "x": 6075.5, "y": 347 }, { - "x": 4769.5, + "x": 6075.5, "y": 387 } ], @@ -8052,33 +9928,34 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { - "x": 4883, + "x": 6189, "y": 166 }, { - "x": 4883, + "x": 6189, "y": 206 }, { - "x": 4883, + "x": 6189, "y": 228.10000610351562 }, { - "x": 4883, + "x": 6189, "y": 246.25 }, { - "x": 4883, + "x": 6189, "y": 264.3999938964844 }, { - "x": 4883, + "x": 6189, "y": 347 }, { - "x": 4883, + "x": 6189, "y": 387 } ], @@ -8111,33 +9988,34 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { - "x": 4996.5, + "x": 6302.5, "y": 166 }, { - "x": 4996.5, + "x": 6302.5, "y": 206 }, { - "x": 4996.5, + "x": 6302.5, "y": 228.10000610351562 }, { - "x": 4996.5, + "x": 6302.5, "y": 246.25 }, { - "x": 4996.5, + "x": 6302.5, "y": 264.3999938964844 }, { - "x": 4996.5, + "x": 6302.5, "y": 347 }, { - "x": 4996.5, + "x": 6302.5, "y": 387 } ], @@ -8170,33 +10048,34 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { - "x": 5113.5, + "x": 6419.5, "y": 166 }, { - "x": 5113.5, + "x": 6419.5, "y": 206 }, { - "x": 5113.5, + "x": 6419.5, "y": 228.10000610351562 }, { - "x": 5113.5, + "x": 6419.5, "y": 246.25 }, { - "x": 5113.5, + "x": 6419.5, "y": 264.3999938964844 }, { - "x": 5113.5, + "x": 6419.5, "y": 347 }, { - "x": 5113.5, + "x": 6419.5, "y": 387 } ], @@ -8229,33 +10108,34 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { - "x": 5310, + "x": 6616, "y": 166 }, { - "x": 5310, + "x": 6616, "y": 206 }, { - "x": 5310, + "x": 6616, "y": 228.10000610351562 }, { - "x": 5310, + "x": 6616, "y": 246.25 }, { - "x": 5310, + "x": 6616, "y": 264.3999938964844 }, { - "x": 5310, + "x": 6616, "y": 347 }, { - "x": 5310, + "x": 6616, "y": 387 } ], @@ -8288,33 +10168,34 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { - "x": 5422.5, + "x": 6728.5, "y": 166 }, { - "x": 5422.5, + "x": 6728.5, "y": 206 }, { - "x": 5422.5, + "x": 6728.5, "y": 228.10000610351562 }, { - "x": 5422.5, + "x": 6728.5, "y": 246.25 }, { - "x": 5422.5, + "x": 6728.5, "y": 264.3999938964844 }, { - "x": 5422.5, + "x": 6728.5, "y": 347 }, { - "x": 5422.5, + "x": 6728.5, "y": 387 } ], @@ -8347,33 +10228,34 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { - "x": 5536, + "x": 6842, "y": 166 }, { - "x": 5536, + "x": 6842, "y": 206 }, { - "x": 5536, + "x": 6842, "y": 228.10000610351562 }, { - "x": 5536, + "x": 6842, "y": 246.25 }, { - "x": 5536, + "x": 6842, "y": 264.3999938964844 }, { - "x": 5536, + "x": 6842, "y": 347 }, { - "x": 5536, + "x": 6842, "y": 387 } ], @@ -8406,33 +10288,34 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { - "x": 5649.5, + "x": 6955.5, "y": 166 }, { - "x": 5649.5, + "x": 6955.5, "y": 206 }, { - "x": 5649.5, + "x": 6955.5, "y": 228.10000610351562 }, { - "x": 5649.5, + "x": 6955.5, "y": 246.25 }, { - "x": 5649.5, + "x": 6955.5, "y": 264.3999938964844 }, { - "x": 5649.5, + "x": 6955.5, "y": 347 }, { - "x": 5649.5, + "x": 6955.5, "y": 387 } ], @@ -8465,33 +10348,34 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { - "x": 5766.5, + "x": 7072.5, "y": 166 }, { - "x": 5766.5, + "x": 7072.5, "y": 206 }, { - "x": 5766.5, + "x": 7072.5, "y": 228.10000610351562 }, { - "x": 5766.5, + "x": 7072.5, "y": 246.25 }, { - "x": 5766.5, + "x": 7072.5, "y": 264.3999938964844 }, { - "x": 5766.5, + "x": 7072.5, "y": 347 }, { - "x": 5766.5, + "x": 7072.5, "y": 387 } ], @@ -8524,33 +10408,34 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { - "x": 5963, + "x": 7269, "y": 166 }, { - "x": 5963, + "x": 7269, "y": 206 }, { - "x": 5963, + "x": 7269, "y": 228.10000610351562 }, { - "x": 5963, + "x": 7269, "y": 246.25 }, { - "x": 5963, + "x": 7269, "y": 264.3999938964844 }, { - "x": 5963, + "x": 7269, "y": 347 }, { - "x": 5963, + "x": 7269, "y": 387 } ], @@ -8583,33 +10468,34 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { - "x": 6075.5, + "x": 7381.5, "y": 166 }, { - "x": 6075.5, + "x": 7381.5, "y": 206 }, { - "x": 6075.5, + "x": 7381.5, "y": 228.10000610351562 }, { - "x": 6075.5, + "x": 7381.5, "y": 246.25 }, { - "x": 6075.5, + "x": 7381.5, "y": 264.3999938964844 }, { - "x": 6075.5, + "x": 7381.5, "y": 347 }, { - "x": 6075.5, + "x": 7381.5, "y": 387 } ], @@ -8642,33 +10528,34 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { - "x": 6189, + "x": 7495, "y": 166 }, { - "x": 6189, + "x": 7495, "y": 206 }, { - "x": 6189, + "x": 7495, "y": 228.10000610351562 }, { - "x": 6189, + "x": 7495, "y": 246.25 }, { - "x": 6189, + "x": 7495, "y": 264.3999938964844 }, { - "x": 6189, + "x": 7495, "y": 347 }, { - "x": 6189, + "x": 7495, "y": 387 } ], @@ -8701,33 +10588,34 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { - "x": 6302.5, + "x": 7608.5, "y": 166 }, { - "x": 6302.5, + "x": 7608.5, "y": 206 }, { - "x": 6302.5, + "x": 7608.5, "y": 228.10000610351562 }, { - "x": 6302.5, + "x": 7608.5, "y": 246.25 }, { - "x": 6302.5, + "x": 7608.5, "y": 264.3999938964844 }, { - "x": 6302.5, + "x": 7608.5, "y": 347 }, { - "x": 6302.5, + "x": 7608.5, "y": 387 } ], @@ -8760,33 +10648,34 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { - "x": 6419.5, + "x": 7725.5, "y": 166 }, { - "x": 6419.5, + "x": 7725.5, "y": 206 }, { - "x": 6419.5, + "x": 7725.5, "y": 228.10000610351562 }, { - "x": 6419.5, + "x": 7725.5, "y": 246.25 }, { - "x": 6419.5, + "x": 7725.5, "y": 264.3999938964844 }, { - "x": 6419.5, + "x": 7725.5, "y": 347 }, { - "x": 6419.5, + "x": 7725.5, "y": 387 } ], @@ -8819,33 +10708,34 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { - "x": 6616, + "x": 7922, "y": 166 }, { - "x": 6616, + "x": 7922, "y": 206 }, { - "x": 6616, + "x": 7922, "y": 228.10000610351562 }, { - "x": 6616, + "x": 7922, "y": 246.25 }, { - "x": 6616, + "x": 7922, "y": 264.3999938964844 }, { - "x": 6616, + "x": 7922, "y": 347 }, { - "x": 6616, + "x": 7922, "y": 387 } ], @@ -8878,33 +10768,34 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { - "x": 6728.5, + "x": 8034.5, "y": 166 }, { - "x": 6728.5, + "x": 8034.5, "y": 206 }, { - "x": 6728.5, + "x": 8034.5, "y": 228.10000610351562 }, { - "x": 6728.5, + "x": 8034.5, "y": 246.25 }, { - "x": 6728.5, + "x": 8034.5, "y": 264.3999938964844 }, { - "x": 6728.5, + "x": 8034.5, "y": 347 }, { - "x": 6728.5, + "x": 8034.5, "y": 387 } ], @@ -8937,33 +10828,34 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { - "x": 6842, + "x": 8148, "y": 166 }, { - "x": 6842, + "x": 8148, "y": 206 }, { - "x": 6842, + "x": 8148, "y": 228.10000610351562 }, { - "x": 6842, + "x": 8148, "y": 246.25 }, { - "x": 6842, + "x": 8148, "y": 264.3999938964844 }, { - "x": 6842, + "x": 8148, "y": 347 }, { - "x": 6842, + "x": 8148, "y": 387 } ], @@ -8996,33 +10888,34 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { - "x": 6955.5, + "x": 8261.5, "y": 166 }, { - "x": 6955.5, + "x": 8261.5, "y": 206 }, { - "x": 6955.5, + "x": 8261.5, "y": 228.10000610351562 }, { - "x": 6955.5, + "x": 8261.5, "y": 246.25 }, { - "x": 6955.5, + "x": 8261.5, "y": 264.3999938964844 }, { - "x": 6955.5, + "x": 8261.5, "y": 347 }, { - "x": 6955.5, + "x": 8261.5, "y": 387 } ], @@ -9055,33 +10948,34 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { - "x": 7072.5, + "x": 8378.5, "y": 166 }, { - "x": 7072.5, + "x": 8378.5, "y": 206 }, { - "x": 7072.5, + "x": 8378.5, "y": 228.10000610351562 }, { - "x": 7072.5, + "x": 8378.5, "y": 246.25 }, { - "x": 7072.5, + "x": 8378.5, "y": 264.3999938964844 }, { - "x": 7072.5, + "x": 8378.5, "y": 347 }, { - "x": 7072.5, + "x": 8378.5, "y": 387 } ], @@ -9107,6 +11001,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/arrowhead_scaling/dagre/sketch.exp.svg b/e2etests/testdata/stable/arrowhead_scaling/dagre/sketch.exp.svg index 78f863c83..38c24bd0d 100644 --- a/e2etests/testdata/stable/arrowhead_scaling/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/arrowhead_scaling/dagre/sketch.exp.svg @@ -1,24 +1,24 @@ -defaultlinearrowdiamondfilled diamondcirclefilled circlecf onecf one requiredcf manycf many required112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515 1 2 4 8 15124815 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + .d2-1889584350 .fill-N1{fill:#0A0F25;} + .d2-1889584350 .fill-N2{fill:#676C7E;} + .d2-1889584350 .fill-N3{fill:#9499AB;} + .d2-1889584350 .fill-N4{fill:#CFD2DD;} + .d2-1889584350 .fill-N5{fill:#DEE1EB;} + .d2-1889584350 .fill-N6{fill:#EEF1F8;} + .d2-1889584350 .fill-N7{fill:#FFFFFF;} + .d2-1889584350 .fill-B1{fill:#0D32B2;} + .d2-1889584350 .fill-B2{fill:#0D32B2;} + .d2-1889584350 .fill-B3{fill:#E3E9FD;} + .d2-1889584350 .fill-B4{fill:#E3E9FD;} + .d2-1889584350 .fill-B5{fill:#EDF0FD;} + .d2-1889584350 .fill-B6{fill:#F7F8FE;} + .d2-1889584350 .fill-AA2{fill:#4A6FF3;} + .d2-1889584350 .fill-AA4{fill:#EDF0FD;} + .d2-1889584350 .fill-AA5{fill:#F7F8FE;} + .d2-1889584350 .fill-AB4{fill:#EDF0FD;} + .d2-1889584350 .fill-AB5{fill:#F7F8FE;} + .d2-1889584350 .stroke-N1{stroke:#0A0F25;} + .d2-1889584350 .stroke-N2{stroke:#676C7E;} + .d2-1889584350 .stroke-N3{stroke:#9499AB;} + .d2-1889584350 .stroke-N4{stroke:#CFD2DD;} + .d2-1889584350 .stroke-N5{stroke:#DEE1EB;} + .d2-1889584350 .stroke-N6{stroke:#EEF1F8;} + .d2-1889584350 .stroke-N7{stroke:#FFFFFF;} + .d2-1889584350 .stroke-B1{stroke:#0D32B2;} + .d2-1889584350 .stroke-B2{stroke:#0D32B2;} + .d2-1889584350 .stroke-B3{stroke:#E3E9FD;} + .d2-1889584350 .stroke-B4{stroke:#E3E9FD;} + .d2-1889584350 .stroke-B5{stroke:#EDF0FD;} + .d2-1889584350 .stroke-B6{stroke:#F7F8FE;} + .d2-1889584350 .stroke-AA2{stroke:#4A6FF3;} + .d2-1889584350 .stroke-AA4{stroke:#EDF0FD;} + .d2-1889584350 .stroke-AA5{stroke:#F7F8FE;} + .d2-1889584350 .stroke-AB4{stroke:#EDF0FD;} + .d2-1889584350 .stroke-AB5{stroke:#F7F8FE;} + .d2-1889584350 .background-color-N1{background-color:#0A0F25;} + .d2-1889584350 .background-color-N2{background-color:#676C7E;} + .d2-1889584350 .background-color-N3{background-color:#9499AB;} + .d2-1889584350 .background-color-N4{background-color:#CFD2DD;} + .d2-1889584350 .background-color-N5{background-color:#DEE1EB;} + .d2-1889584350 .background-color-N6{background-color:#EEF1F8;} + .d2-1889584350 .background-color-N7{background-color:#FFFFFF;} + .d2-1889584350 .background-color-B1{background-color:#0D32B2;} + .d2-1889584350 .background-color-B2{background-color:#0D32B2;} + .d2-1889584350 .background-color-B3{background-color:#E3E9FD;} + .d2-1889584350 .background-color-B4{background-color:#E3E9FD;} + .d2-1889584350 .background-color-B5{background-color:#EDF0FD;} + .d2-1889584350 .background-color-B6{background-color:#F7F8FE;} + .d2-1889584350 .background-color-AA2{background-color:#4A6FF3;} + .d2-1889584350 .background-color-AA4{background-color:#EDF0FD;} + .d2-1889584350 .background-color-AA5{background-color:#F7F8FE;} + .d2-1889584350 .background-color-AB4{background-color:#EDF0FD;} + .d2-1889584350 .background-color-AB5{background-color:#F7F8FE;} + .d2-1889584350 .color-N1{color:#0A0F25;} + .d2-1889584350 .color-N2{color:#676C7E;} + .d2-1889584350 .color-N3{color:#9499AB;} + .d2-1889584350 .color-N4{color:#CFD2DD;} + .d2-1889584350 .color-N5{color:#DEE1EB;} + .d2-1889584350 .color-N6{color:#EEF1F8;} + .d2-1889584350 .color-N7{color:#FFFFFF;} + .d2-1889584350 .color-B1{color:#0D32B2;} + .d2-1889584350 .color-B2{color:#0D32B2;} + .d2-1889584350 .color-B3{color:#E3E9FD;} + .d2-1889584350 .color-B4{color:#E3E9FD;} + .d2-1889584350 .color-B5{color:#EDF0FD;} + .d2-1889584350 .color-B6{color:#F7F8FE;} + .d2-1889584350 .color-AA2{color:#4A6FF3;} + .d2-1889584350 .color-AA4{color:#EDF0FD;} + .d2-1889584350 .color-AA5{color:#F7F8FE;} + .d2-1889584350 .color-AB4{color:#EDF0FD;} + .d2-1889584350 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1889584350);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1889584350);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1889584350);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1889584350);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1889584350);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1889584350);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1889584350);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1889584350);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1889584350);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1889584350);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1889584350);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1889584350);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1889584350);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1889584350);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1889584350);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1889584350);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1889584350);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1889584350);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>defaultlinearrowdiamondfilled diamondcirclefilled circleboxfilled-boxcf onecf one requiredcf manycf many required112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515 1 2 4 8 15124815 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/arrowhead_scaling/elk/board.exp.json b/e2etests/testdata/stable/arrowhead_scaling/elk/board.exp.json index 8c66ee4d4..6422ff21f 100644 --- a/e2etests/testdata/stable/arrowhead_scaling/elk/board.exp.json +++ b/e2etests/testdata/stable/arrowhead_scaling/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -139,6 +150,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -180,6 +192,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -221,6 +234,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -262,6 +276,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -303,6 +318,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -344,6 +360,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -385,6 +402,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -426,6 +444,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -467,6 +486,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -508,6 +528,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -549,6 +570,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -590,6 +612,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -630,6 +653,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -670,6 +694,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -711,6 +736,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -752,6 +778,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -793,6 +820,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -834,6 +862,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -875,6 +904,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -916,6 +946,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -957,6 +988,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -998,6 +1030,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1039,6 +1072,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1080,6 +1114,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1121,6 +1156,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1161,6 +1197,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1201,6 +1238,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1242,6 +1280,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1283,6 +1322,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1324,6 +1364,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1365,6 +1406,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1406,6 +1448,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1447,6 +1490,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1488,6 +1532,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1529,6 +1574,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1570,6 +1616,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1611,6 +1658,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1652,6 +1700,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1692,6 +1741,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1732,6 +1782,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1773,6 +1824,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1814,6 +1866,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1855,6 +1908,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1896,6 +1950,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1937,6 +1992,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1978,6 +2034,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2019,6 +2076,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2060,6 +2118,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2101,6 +2160,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2142,6 +2202,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2183,6 +2244,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2223,6 +2285,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2263,6 +2326,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2304,6 +2368,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2345,6 +2410,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2386,6 +2452,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2427,6 +2494,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2468,6 +2536,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2509,6 +2578,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2550,6 +2620,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2591,6 +2662,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2632,6 +2704,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2673,6 +2746,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2714,6 +2788,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2754,6 +2829,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2794,6 +2870,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2835,6 +2912,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2876,6 +2954,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2917,6 +2996,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2958,6 +3038,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2999,6 +3080,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3040,6 +3122,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3081,6 +3164,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3122,6 +3206,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3163,6 +3248,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3204,6 +3290,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3245,6 +3332,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3285,6 +3373,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3325,6 +3414,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3366,6 +3456,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3407,6 +3498,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3448,6 +3540,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3489,6 +3582,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3530,6 +3624,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3571,6 +3666,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3612,6 +3708,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3653,6 +3750,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3694,6 +3792,1095 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "15", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 16, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "box", + "type": "rectangle", + "pos": { + "x": 4023, + "y": 12 + }, + "width": 553, + "height": 603, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "box", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 42, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "box.start", + "type": "rectangle", + "pos": { + "x": 4073, + "y": 62 + }, + "width": 453, + "height": 166, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 2 + }, + { + "id": "box.end", + "type": "rectangle", + "pos": { + "x": 4073, + "y": 399 + }, + "width": 453, + "height": 166, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 2 + }, + { + "id": "box.start.1", + "type": "rectangle", + "pos": { + "x": 4123, + "y": 112 + }, + "width": 52, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "1", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 7, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "box.end.1", + "type": "rectangle", + "pos": { + "x": 4123, + "y": 449 + }, + "width": 52, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "1", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 7, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "box.start.2", + "type": "rectangle", + "pos": { + "x": 4195, + "y": 112 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "2", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "box.end.2", + "type": "rectangle", + "pos": { + "x": 4195, + "y": 449 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "2", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "box.start.4", + "type": "rectangle", + "pos": { + "x": 4268, + "y": 112 + }, + "width": 54, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "4", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "box.end.4", + "type": "rectangle", + "pos": { + "x": 4268, + "y": 449 + }, + "width": 54, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "4", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "box.start.8", + "type": "rectangle", + "pos": { + "x": 4342, + "y": 112 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "8", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "box.end.8", + "type": "rectangle", + "pos": { + "x": 4342, + "y": 449 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "8", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "box.start.15", + "type": "rectangle", + "pos": { + "x": 4415, + "y": 112 + }, + "width": 61, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "15", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 16, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "box.end.15", + "type": "rectangle", + "pos": { + "x": 4415, + "y": 449 + }, + "width": 61, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "15", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 16, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "filled-box", + "type": "rectangle", + "pos": { + "x": 4596, + "y": 12 + }, + "width": 553, + "height": 603, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "filled-box", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 112, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "filled-box.start", + "type": "rectangle", + "pos": { + "x": 4646, + "y": 62 + }, + "width": 453, + "height": 166, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 2 + }, + { + "id": "filled-box.end", + "type": "rectangle", + "pos": { + "x": 4646, + "y": 399 + }, + "width": 453, + "height": 166, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 24, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 2 + }, + { + "id": "filled-box.start.1", + "type": "rectangle", + "pos": { + "x": 4696, + "y": 112 + }, + "width": 52, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "1", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 7, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "filled-box.end.1", + "type": "rectangle", + "pos": { + "x": 4696, + "y": 449 + }, + "width": 52, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "1", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 7, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "filled-box.start.2", + "type": "rectangle", + "pos": { + "x": 4768, + "y": 112 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "2", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "filled-box.end.2", + "type": "rectangle", + "pos": { + "x": 4768, + "y": 449 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "2", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "filled-box.start.4", + "type": "rectangle", + "pos": { + "x": 4841, + "y": 112 + }, + "width": 54, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "4", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "filled-box.end.4", + "type": "rectangle", + "pos": { + "x": 4841, + "y": 449 + }, + "width": 54, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "4", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "filled-box.start.8", + "type": "rectangle", + "pos": { + "x": 4915, + "y": 112 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "8", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "filled-box.end.8", + "type": "rectangle", + "pos": { + "x": 4915, + "y": 449 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "8", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "filled-box.start.15", + "type": "rectangle", + "pos": { + "x": 4988, + "y": 112 + }, + "width": 61, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "15", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 16, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "filled-box.end.15", + "type": "rectangle", + "pos": { + "x": 4988, + "y": 449 + }, + "width": 61, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3724,7 +4911,7 @@ "id": "cf one", "type": "rectangle", "pos": { - "x": 4023, + "x": 5169, "y": 12 }, "width": 553, @@ -3735,6 +4922,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3765,7 +4953,7 @@ "id": "cf one.start", "type": "rectangle", "pos": { - "x": 4073, + "x": 5219, "y": 62 }, "width": 453, @@ -3776,6 +4964,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3805,7 +4994,7 @@ "id": "cf one.end", "type": "rectangle", "pos": { - "x": 4073, + "x": 5219, "y": 399 }, "width": 453, @@ -3816,6 +5005,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3845,7 +5035,7 @@ "id": "cf one.start.1", "type": "rectangle", "pos": { - "x": 4123, + "x": 5269, "y": 112 }, "width": 52, @@ -3856,6 +5046,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3886,7 +5077,7 @@ "id": "cf one.end.1", "type": "rectangle", "pos": { - "x": 4123, + "x": 5269, "y": 449 }, "width": 52, @@ -3897,6 +5088,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3927,7 +5119,7 @@ "id": "cf one.start.2", "type": "rectangle", "pos": { - "x": 4195, + "x": 5341, "y": 112 }, "width": 53, @@ -3938,6 +5130,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3968,7 +5161,7 @@ "id": "cf one.end.2", "type": "rectangle", "pos": { - "x": 4195, + "x": 5341, "y": 449 }, "width": 53, @@ -3979,6 +5172,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4009,7 +5203,7 @@ "id": "cf one.start.4", "type": "rectangle", "pos": { - "x": 4268, + "x": 5414, "y": 112 }, "width": 54, @@ -4020,6 +5214,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4050,7 +5245,7 @@ "id": "cf one.end.4", "type": "rectangle", "pos": { - "x": 4268, + "x": 5414, "y": 449 }, "width": 54, @@ -4061,6 +5256,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4091,7 +5287,7 @@ "id": "cf one.start.8", "type": "rectangle", "pos": { - "x": 4342, + "x": 5488, "y": 112 }, "width": 53, @@ -4102,6 +5298,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4132,7 +5329,7 @@ "id": "cf one.end.8", "type": "rectangle", "pos": { - "x": 4342, + "x": 5488, "y": 449 }, "width": 53, @@ -4143,6 +5340,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4173,7 +5371,7 @@ "id": "cf one.start.15", "type": "rectangle", "pos": { - "x": 4415, + "x": 5561, "y": 112 }, "width": 61, @@ -4184,6 +5382,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4214,7 +5413,7 @@ "id": "cf one.end.15", "type": "rectangle", "pos": { - "x": 4415, + "x": 5561, "y": 449 }, "width": 61, @@ -4225,6 +5424,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4255,7 +5455,7 @@ "id": "cf one required", "type": "rectangle", "pos": { - "x": 4596, + "x": 5742, "y": 12 }, "width": 553, @@ -4266,6 +5466,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4296,7 +5497,7 @@ "id": "cf one required.start", "type": "rectangle", "pos": { - "x": 4646, + "x": 5792, "y": 62 }, "width": 453, @@ -4307,6 +5508,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4336,7 +5538,7 @@ "id": "cf one required.end", "type": "rectangle", "pos": { - "x": 4646, + "x": 5792, "y": 399 }, "width": 453, @@ -4347,6 +5549,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4376,7 +5579,7 @@ "id": "cf one required.start.1", "type": "rectangle", "pos": { - "x": 4696, + "x": 5842, "y": 112 }, "width": 52, @@ -4387,6 +5590,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4417,7 +5621,7 @@ "id": "cf one required.end.1", "type": "rectangle", "pos": { - "x": 4696, + "x": 5842, "y": 449 }, "width": 52, @@ -4428,6 +5632,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4458,7 +5663,7 @@ "id": "cf one required.start.2", "type": "rectangle", "pos": { - "x": 4768, + "x": 5914, "y": 112 }, "width": 53, @@ -4469,6 +5674,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4499,7 +5705,7 @@ "id": "cf one required.end.2", "type": "rectangle", "pos": { - "x": 4768, + "x": 5914, "y": 449 }, "width": 53, @@ -4510,6 +5716,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4540,7 +5747,7 @@ "id": "cf one required.start.4", "type": "rectangle", "pos": { - "x": 4841, + "x": 5987, "y": 112 }, "width": 54, @@ -4551,6 +5758,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4581,7 +5789,7 @@ "id": "cf one required.end.4", "type": "rectangle", "pos": { - "x": 4841, + "x": 5987, "y": 449 }, "width": 54, @@ -4592,6 +5800,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4622,7 +5831,7 @@ "id": "cf one required.start.8", "type": "rectangle", "pos": { - "x": 4915, + "x": 6061, "y": 112 }, "width": 53, @@ -4633,6 +5842,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4663,7 +5873,7 @@ "id": "cf one required.end.8", "type": "rectangle", "pos": { - "x": 4915, + "x": 6061, "y": 449 }, "width": 53, @@ -4674,6 +5884,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4704,7 +5915,7 @@ "id": "cf one required.start.15", "type": "rectangle", "pos": { - "x": 4988, + "x": 6134, "y": 112 }, "width": 61, @@ -4715,6 +5926,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4745,7 +5957,7 @@ "id": "cf one required.end.15", "type": "rectangle", "pos": { - "x": 4988, + "x": 6134, "y": 449 }, "width": 61, @@ -4756,6 +5968,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4786,7 +5999,7 @@ "id": "cf many", "type": "rectangle", "pos": { - "x": 5169, + "x": 6315, "y": 12 }, "width": 553, @@ -4797,6 +6010,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4827,7 +6041,7 @@ "id": "cf many.start", "type": "rectangle", "pos": { - "x": 5219, + "x": 6365, "y": 62 }, "width": 453, @@ -4838,6 +6052,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4867,7 +6082,7 @@ "id": "cf many.end", "type": "rectangle", "pos": { - "x": 5219, + "x": 6365, "y": 399 }, "width": 453, @@ -4878,6 +6093,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4907,7 +6123,7 @@ "id": "cf many.start.1", "type": "rectangle", "pos": { - "x": 5269, + "x": 6415, "y": 112 }, "width": 52, @@ -4918,6 +6134,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4948,7 +6165,7 @@ "id": "cf many.end.1", "type": "rectangle", "pos": { - "x": 5269, + "x": 6415, "y": 449 }, "width": 52, @@ -4959,6 +6176,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4989,7 +6207,7 @@ "id": "cf many.start.2", "type": "rectangle", "pos": { - "x": 5341, + "x": 6487, "y": 112 }, "width": 53, @@ -5000,6 +6218,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5030,7 +6249,7 @@ "id": "cf many.end.2", "type": "rectangle", "pos": { - "x": 5341, + "x": 6487, "y": 449 }, "width": 53, @@ -5041,6 +6260,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5071,7 +6291,7 @@ "id": "cf many.start.4", "type": "rectangle", "pos": { - "x": 5414, + "x": 6560, "y": 112 }, "width": 54, @@ -5082,6 +6302,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5112,7 +6333,7 @@ "id": "cf many.end.4", "type": "rectangle", "pos": { - "x": 5414, + "x": 6560, "y": 449 }, "width": 54, @@ -5123,6 +6344,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5153,7 +6375,7 @@ "id": "cf many.start.8", "type": "rectangle", "pos": { - "x": 5488, + "x": 6634, "y": 112 }, "width": 53, @@ -5164,6 +6386,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5194,7 +6417,7 @@ "id": "cf many.end.8", "type": "rectangle", "pos": { - "x": 5488, + "x": 6634, "y": 449 }, "width": 53, @@ -5205,6 +6428,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5235,7 +6459,7 @@ "id": "cf many.start.15", "type": "rectangle", "pos": { - "x": 5561, + "x": 6707, "y": 112 }, "width": 61, @@ -5246,6 +6470,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5276,7 +6501,7 @@ "id": "cf many.end.15", "type": "rectangle", "pos": { - "x": 5561, + "x": 6707, "y": 449 }, "width": 61, @@ -5287,6 +6512,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5317,7 +6543,7 @@ "id": "cf many required", "type": "rectangle", "pos": { - "x": 5742, + "x": 6888, "y": 12 }, "width": 553, @@ -5328,6 +6554,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5358,7 +6585,7 @@ "id": "cf many required.start", "type": "rectangle", "pos": { - "x": 5792, + "x": 6938, "y": 62 }, "width": 453, @@ -5369,6 +6596,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5398,7 +6626,7 @@ "id": "cf many required.end", "type": "rectangle", "pos": { - "x": 5792, + "x": 6938, "y": 399 }, "width": 453, @@ -5409,6 +6637,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5438,7 +6667,7 @@ "id": "cf many required.start.1", "type": "rectangle", "pos": { - "x": 5842, + "x": 6988, "y": 112 }, "width": 52, @@ -5449,6 +6678,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5479,7 +6709,7 @@ "id": "cf many required.end.1", "type": "rectangle", "pos": { - "x": 5842, + "x": 6988, "y": 449 }, "width": 52, @@ -5490,6 +6720,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5520,7 +6751,7 @@ "id": "cf many required.start.2", "type": "rectangle", "pos": { - "x": 5914, + "x": 7060, "y": 112 }, "width": 53, @@ -5531,6 +6762,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5561,7 +6793,7 @@ "id": "cf many required.end.2", "type": "rectangle", "pos": { - "x": 5914, + "x": 7060, "y": 449 }, "width": 53, @@ -5572,6 +6804,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5602,7 +6835,7 @@ "id": "cf many required.start.4", "type": "rectangle", "pos": { - "x": 5987, + "x": 7133, "y": 112 }, "width": 54, @@ -5613,6 +6846,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5643,7 +6877,7 @@ "id": "cf many required.end.4", "type": "rectangle", "pos": { - "x": 5987, + "x": 7133, "y": 449 }, "width": 54, @@ -5654,6 +6888,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5684,7 +6919,7 @@ "id": "cf many required.start.8", "type": "rectangle", "pos": { - "x": 6061, + "x": 7207, "y": 112 }, "width": 53, @@ -5695,6 +6930,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5725,7 +6961,7 @@ "id": "cf many required.end.8", "type": "rectangle", "pos": { - "x": 6061, + "x": 7207, "y": 449 }, "width": 53, @@ -5736,6 +6972,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5766,7 +7003,7 @@ "id": "cf many required.start.15", "type": "rectangle", "pos": { - "x": 6134, + "x": 7280, "y": 112 }, "width": 61, @@ -5777,6 +7014,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5807,7 +7045,7 @@ "id": "cf many required.end.15", "type": "rectangle", "pos": { - "x": 6134, + "x": 7280, "y": 449 }, "width": 61, @@ -5818,6 +7056,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5869,6 +7108,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 138, @@ -5907,6 +7147,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 210.5, @@ -5945,6 +7186,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 284, @@ -5983,6 +7225,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 357.5, @@ -6021,6 +7264,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 434.5, @@ -6059,6 +7303,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 711, @@ -6097,6 +7342,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 783.5, @@ -6135,6 +7381,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 857, @@ -6173,6 +7420,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 930.5, @@ -6211,6 +7459,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1007.5, @@ -6249,6 +7498,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1284, @@ -6287,6 +7537,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1356.5, @@ -6325,6 +7576,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1430, @@ -6363,6 +7615,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1503.5, @@ -6401,6 +7654,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1580.5, @@ -6439,6 +7693,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1857, @@ -6477,6 +7732,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1929.5, @@ -6515,6 +7771,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 2003, @@ -6553,6 +7810,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 2076.5, @@ -6591,6 +7849,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 2153.5, @@ -6629,6 +7888,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 2430, @@ -6667,6 +7927,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 2502.5, @@ -6705,6 +7966,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 2576, @@ -6743,6 +8005,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 2649.5, @@ -6781,6 +8044,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 2726.5, @@ -6819,6 +8083,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 3003, @@ -6857,6 +8122,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 3075.5, @@ -6895,6 +8161,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 3149, @@ -6933,6 +8200,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 3222.5, @@ -6971,6 +8239,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 3299.5, @@ -7009,6 +8278,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 3576, @@ -7047,6 +8317,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 3648.5, @@ -7085,6 +8356,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 3722, @@ -7123,6 +8395,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 3795.5, @@ -7161,6 +8434,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 3872.5, @@ -7176,6 +8450,396 @@ "icon": null, "zIndex": 0 }, + { + "id": "box.(start.1 <-> end.1)[0]", + "src": "box.start.1", + "srcArrow": "box", + "dst": "box.end.1", + "dstArrow": "box", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 1, + "stroke": "B1", + "borderRadius": 10, + "label": "1", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 7, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 4149, + "y": 178 + }, + { + "x": 4149, + "y": 449 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "box.(start.2 <-> end.2)[0]", + "src": "box.start.2", + "srcArrow": "box", + "dst": "box.end.2", + "dstArrow": "box", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "2", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 4221.5, + "y": 178 + }, + { + "x": 4221.5, + "y": 449 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "box.(start.4 <-> end.4)[0]", + "src": "box.start.4", + "srcArrow": "box", + "dst": "box.end.4", + "dstArrow": "box", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 4, + "stroke": "B1", + "borderRadius": 10, + "label": "4", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 4295, + "y": 178 + }, + { + "x": 4295, + "y": 449 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "box.(start.8 <-> end.8)[0]", + "src": "box.start.8", + "srcArrow": "box", + "dst": "box.end.8", + "dstArrow": "box", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 8, + "stroke": "B1", + "borderRadius": 10, + "label": "8", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 4368.5, + "y": 178 + }, + { + "x": 4368.5, + "y": 449 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "box.(start.15 <-> end.15)[0]", + "src": "box.start.15", + "srcArrow": "box", + "dst": "box.end.15", + "dstArrow": "box", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 15, + "stroke": "B1", + "borderRadius": 10, + "label": "15", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 16, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 4445.5, + "y": 178 + }, + { + "x": 4445.5, + "y": 449 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "filled-box.(start.1 <-> end.1)[0]", + "src": "filled-box.start.1", + "srcArrow": "filled-box", + "dst": "filled-box.end.1", + "dstArrow": "filled-box", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 1, + "stroke": "B1", + "borderRadius": 10, + "label": "1", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 7, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 4722, + "y": 178 + }, + { + "x": 4722, + "y": 449 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "filled-box.(start.2 <-> end.2)[0]", + "src": "filled-box.start.2", + "srcArrow": "filled-box", + "dst": "filled-box.end.2", + "dstArrow": "filled-box", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "2", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 4794.5, + "y": 178 + }, + { + "x": 4794.5, + "y": 449 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "filled-box.(start.4 <-> end.4)[0]", + "src": "filled-box.start.4", + "srcArrow": "filled-box", + "dst": "filled-box.end.4", + "dstArrow": "filled-box", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 4, + "stroke": "B1", + "borderRadius": 10, + "label": "4", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 4868, + "y": 178 + }, + { + "x": 4868, + "y": 449 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "filled-box.(start.8 <-> end.8)[0]", + "src": "filled-box.start.8", + "srcArrow": "filled-box", + "dst": "filled-box.end.8", + "dstArrow": "filled-box", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 8, + "stroke": "B1", + "borderRadius": 10, + "label": "8", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 4941.5, + "y": 178 + }, + { + "x": 4941.5, + "y": 449 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "filled-box.(start.15 <-> end.15)[0]", + "src": "filled-box.start.15", + "srcArrow": "filled-box", + "dst": "filled-box.end.15", + "dstArrow": "filled-box", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 15, + "stroke": "B1", + "borderRadius": 10, + "label": "15", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 16, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 5018.5, + "y": 178 + }, + { + "x": 5018.5, + "y": 449 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, { "id": "cf one.(start.1 <-> end.1)[0]", "src": "cf one.start.1", @@ -7199,13 +8863,14 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { - "x": 4149, + "x": 5295, "y": 178 }, { - "x": 4149, + "x": 5295, "y": 449 } ], @@ -7237,13 +8902,14 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { - "x": 4221.5, + "x": 5367.5, "y": 178 }, { - "x": 4221.5, + "x": 5367.5, "y": 449 } ], @@ -7275,13 +8941,14 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { - "x": 4295, + "x": 5441, "y": 178 }, { - "x": 4295, + "x": 5441, "y": 449 } ], @@ -7313,13 +8980,14 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { - "x": 4368.5, + "x": 5514.5, "y": 178 }, { - "x": 4368.5, + "x": 5514.5, "y": 449 } ], @@ -7351,13 +9019,14 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { - "x": 4445.5, + "x": 5591.5, "y": 178 }, { - "x": 4445.5, + "x": 5591.5, "y": 449 } ], @@ -7389,13 +9058,14 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { - "x": 4722, + "x": 5868, "y": 178 }, { - "x": 4722, + "x": 5868, "y": 449 } ], @@ -7427,13 +9097,14 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { - "x": 4794.5, + "x": 5940.5, "y": 178 }, { - "x": 4794.5, + "x": 5940.5, "y": 449 } ], @@ -7465,13 +9136,14 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { - "x": 4868, + "x": 6014, "y": 178 }, { - "x": 4868, + "x": 6014, "y": 449 } ], @@ -7503,13 +9175,14 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { - "x": 4941.5, + "x": 6087.5, "y": 178 }, { - "x": 4941.5, + "x": 6087.5, "y": 449 } ], @@ -7541,13 +9214,14 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { - "x": 5018.5, + "x": 6164.5, "y": 178 }, { - "x": 5018.5, + "x": 6164.5, "y": 449 } ], @@ -7579,13 +9253,14 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { - "x": 5295, + "x": 6441, "y": 178 }, { - "x": 5295, + "x": 6441, "y": 449 } ], @@ -7617,13 +9292,14 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { - "x": 5367.5, + "x": 6513.5, "y": 178 }, { - "x": 5367.5, + "x": 6513.5, "y": 449 } ], @@ -7655,13 +9331,14 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { - "x": 5441, + "x": 6587, "y": 178 }, { - "x": 5441, + "x": 6587, "y": 449 } ], @@ -7693,13 +9370,14 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { - "x": 5514.5, + "x": 6660.5, "y": 178 }, { - "x": 5514.5, + "x": 6660.5, "y": 449 } ], @@ -7731,13 +9409,14 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { - "x": 5591.5, + "x": 6737.5, "y": 178 }, { - "x": 5591.5, + "x": 6737.5, "y": 449 } ], @@ -7769,13 +9448,14 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { - "x": 5868, + "x": 7014, "y": 178 }, { - "x": 5868, + "x": 7014, "y": 449 } ], @@ -7807,13 +9487,14 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { - "x": 5940.5, + "x": 7086.5, "y": 178 }, { - "x": 5940.5, + "x": 7086.5, "y": 449 } ], @@ -7845,13 +9526,14 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { - "x": 6014, + "x": 7160, "y": 178 }, { - "x": 6014, + "x": 7160, "y": 449 } ], @@ -7883,13 +9565,14 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { - "x": 6087.5, + "x": 7233.5, "y": 178 }, { - "x": 6087.5, + "x": 7233.5, "y": 449 } ], @@ -7921,13 +9604,14 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { - "x": 6164.5, + "x": 7310.5, "y": 178 }, { - "x": 6164.5, + "x": 7310.5, "y": 449 } ], @@ -7952,6 +9636,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/arrowhead_scaling/elk/sketch.exp.svg b/e2etests/testdata/stable/arrowhead_scaling/elk/sketch.exp.svg index 41f2c2219..0f3fff68f 100644 --- a/e2etests/testdata/stable/arrowhead_scaling/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/arrowhead_scaling/elk/sketch.exp.svg @@ -1,24 +1,24 @@ -defaultlinearrowdiamondfilled diamondcirclefilled circlecf onecf one requiredcf manycf many required112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515 1 2 4 8 15124815 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + .d2-3645959140 .fill-N1{fill:#0A0F25;} + .d2-3645959140 .fill-N2{fill:#676C7E;} + .d2-3645959140 .fill-N3{fill:#9499AB;} + .d2-3645959140 .fill-N4{fill:#CFD2DD;} + .d2-3645959140 .fill-N5{fill:#DEE1EB;} + .d2-3645959140 .fill-N6{fill:#EEF1F8;} + .d2-3645959140 .fill-N7{fill:#FFFFFF;} + .d2-3645959140 .fill-B1{fill:#0D32B2;} + .d2-3645959140 .fill-B2{fill:#0D32B2;} + .d2-3645959140 .fill-B3{fill:#E3E9FD;} + .d2-3645959140 .fill-B4{fill:#E3E9FD;} + .d2-3645959140 .fill-B5{fill:#EDF0FD;} + .d2-3645959140 .fill-B6{fill:#F7F8FE;} + .d2-3645959140 .fill-AA2{fill:#4A6FF3;} + .d2-3645959140 .fill-AA4{fill:#EDF0FD;} + .d2-3645959140 .fill-AA5{fill:#F7F8FE;} + .d2-3645959140 .fill-AB4{fill:#EDF0FD;} + .d2-3645959140 .fill-AB5{fill:#F7F8FE;} + .d2-3645959140 .stroke-N1{stroke:#0A0F25;} + .d2-3645959140 .stroke-N2{stroke:#676C7E;} + .d2-3645959140 .stroke-N3{stroke:#9499AB;} + .d2-3645959140 .stroke-N4{stroke:#CFD2DD;} + .d2-3645959140 .stroke-N5{stroke:#DEE1EB;} + .d2-3645959140 .stroke-N6{stroke:#EEF1F8;} + .d2-3645959140 .stroke-N7{stroke:#FFFFFF;} + .d2-3645959140 .stroke-B1{stroke:#0D32B2;} + .d2-3645959140 .stroke-B2{stroke:#0D32B2;} + .d2-3645959140 .stroke-B3{stroke:#E3E9FD;} + .d2-3645959140 .stroke-B4{stroke:#E3E9FD;} + .d2-3645959140 .stroke-B5{stroke:#EDF0FD;} + .d2-3645959140 .stroke-B6{stroke:#F7F8FE;} + .d2-3645959140 .stroke-AA2{stroke:#4A6FF3;} + .d2-3645959140 .stroke-AA4{stroke:#EDF0FD;} + .d2-3645959140 .stroke-AA5{stroke:#F7F8FE;} + .d2-3645959140 .stroke-AB4{stroke:#EDF0FD;} + .d2-3645959140 .stroke-AB5{stroke:#F7F8FE;} + .d2-3645959140 .background-color-N1{background-color:#0A0F25;} + .d2-3645959140 .background-color-N2{background-color:#676C7E;} + .d2-3645959140 .background-color-N3{background-color:#9499AB;} + .d2-3645959140 .background-color-N4{background-color:#CFD2DD;} + .d2-3645959140 .background-color-N5{background-color:#DEE1EB;} + .d2-3645959140 .background-color-N6{background-color:#EEF1F8;} + .d2-3645959140 .background-color-N7{background-color:#FFFFFF;} + .d2-3645959140 .background-color-B1{background-color:#0D32B2;} + .d2-3645959140 .background-color-B2{background-color:#0D32B2;} + .d2-3645959140 .background-color-B3{background-color:#E3E9FD;} + .d2-3645959140 .background-color-B4{background-color:#E3E9FD;} + .d2-3645959140 .background-color-B5{background-color:#EDF0FD;} + .d2-3645959140 .background-color-B6{background-color:#F7F8FE;} + .d2-3645959140 .background-color-AA2{background-color:#4A6FF3;} + .d2-3645959140 .background-color-AA4{background-color:#EDF0FD;} + .d2-3645959140 .background-color-AA5{background-color:#F7F8FE;} + .d2-3645959140 .background-color-AB4{background-color:#EDF0FD;} + .d2-3645959140 .background-color-AB5{background-color:#F7F8FE;} + .d2-3645959140 .color-N1{color:#0A0F25;} + .d2-3645959140 .color-N2{color:#676C7E;} + .d2-3645959140 .color-N3{color:#9499AB;} + .d2-3645959140 .color-N4{color:#CFD2DD;} + .d2-3645959140 .color-N5{color:#DEE1EB;} + .d2-3645959140 .color-N6{color:#EEF1F8;} + .d2-3645959140 .color-N7{color:#FFFFFF;} + .d2-3645959140 .color-B1{color:#0D32B2;} + .d2-3645959140 .color-B2{color:#0D32B2;} + .d2-3645959140 .color-B3{color:#E3E9FD;} + .d2-3645959140 .color-B4{color:#E3E9FD;} + .d2-3645959140 .color-B5{color:#EDF0FD;} + .d2-3645959140 .color-B6{color:#F7F8FE;} + .d2-3645959140 .color-AA2{color:#4A6FF3;} + .d2-3645959140 .color-AA4{color:#EDF0FD;} + .d2-3645959140 .color-AA5{color:#F7F8FE;} + .d2-3645959140 .color-AB4{color:#EDF0FD;} + .d2-3645959140 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3645959140);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3645959140);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3645959140);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3645959140);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3645959140);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3645959140);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3645959140);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3645959140);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3645959140);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3645959140);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3645959140);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3645959140);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3645959140);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3645959140);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3645959140);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3645959140);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3645959140);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3645959140);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>defaultlinearrowdiamondfilled diamondcirclefilled circleboxfilled-boxcf onecf one requiredcf manycf many required112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515 1 2 4 8 15124815 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/basic-tooltips/dagre/board.exp.json b/e2etests/testdata/stable/basic-tooltips/dagre/board.exp.json index ade6dee49..41fe8d005 100644 --- a/e2etests/testdata/stable/basic-tooltips/dagre/board.exp.json +++ b/e2etests/testdata/stable/basic-tooltips/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -10,7 +18,7 @@ "x": 1, "y": 0 }, - "width": 85, + "width": 53, "height": 66, "opacity": 1, "strokeDash": 0, @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -51,7 +60,7 @@ "x": 0, "y": 166 }, - "width": 86, + "width": 54, "height": 66, "opacity": 1, "strokeDash": 0, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -110,21 +120,22 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 43, + "x": 27, "y": 66 }, { - "x": 43, + "x": 27, "y": 106 }, { - "x": 43, + "x": 27, "y": 126 }, { - "x": 43, + "x": 27, "y": 166 } ], @@ -150,6 +161,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/basic-tooltips/dagre/sketch.exp.svg b/e2etests/testdata/stable/basic-tooltips/dagre/sketch.exp.svg index 0fc8d7b81..698d4b2d8 100644 --- a/e2etests/testdata/stable/basic-tooltips/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/basic-tooltips/dagre/sketch.exp.svg @@ -1,12 +1,12 @@ -xTotal abstinence is easier than perfect moderationyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! Total abstinence is easier than perfect moderation - + .d2-823506279 .fill-N1{fill:#0A0F25;} + .d2-823506279 .fill-N2{fill:#676C7E;} + .d2-823506279 .fill-N3{fill:#9499AB;} + .d2-823506279 .fill-N4{fill:#CFD2DD;} + .d2-823506279 .fill-N5{fill:#DEE1EB;} + .d2-823506279 .fill-N6{fill:#EEF1F8;} + .d2-823506279 .fill-N7{fill:#FFFFFF;} + .d2-823506279 .fill-B1{fill:#0D32B2;} + .d2-823506279 .fill-B2{fill:#0D32B2;} + .d2-823506279 .fill-B3{fill:#E3E9FD;} + .d2-823506279 .fill-B4{fill:#E3E9FD;} + .d2-823506279 .fill-B5{fill:#EDF0FD;} + .d2-823506279 .fill-B6{fill:#F7F8FE;} + .d2-823506279 .fill-AA2{fill:#4A6FF3;} + .d2-823506279 .fill-AA4{fill:#EDF0FD;} + .d2-823506279 .fill-AA5{fill:#F7F8FE;} + .d2-823506279 .fill-AB4{fill:#EDF0FD;} + .d2-823506279 .fill-AB5{fill:#F7F8FE;} + .d2-823506279 .stroke-N1{stroke:#0A0F25;} + .d2-823506279 .stroke-N2{stroke:#676C7E;} + .d2-823506279 .stroke-N3{stroke:#9499AB;} + .d2-823506279 .stroke-N4{stroke:#CFD2DD;} + .d2-823506279 .stroke-N5{stroke:#DEE1EB;} + .d2-823506279 .stroke-N6{stroke:#EEF1F8;} + .d2-823506279 .stroke-N7{stroke:#FFFFFF;} + .d2-823506279 .stroke-B1{stroke:#0D32B2;} + .d2-823506279 .stroke-B2{stroke:#0D32B2;} + .d2-823506279 .stroke-B3{stroke:#E3E9FD;} + .d2-823506279 .stroke-B4{stroke:#E3E9FD;} + .d2-823506279 .stroke-B5{stroke:#EDF0FD;} + .d2-823506279 .stroke-B6{stroke:#F7F8FE;} + .d2-823506279 .stroke-AA2{stroke:#4A6FF3;} + .d2-823506279 .stroke-AA4{stroke:#EDF0FD;} + .d2-823506279 .stroke-AA5{stroke:#F7F8FE;} + .d2-823506279 .stroke-AB4{stroke:#EDF0FD;} + .d2-823506279 .stroke-AB5{stroke:#F7F8FE;} + .d2-823506279 .background-color-N1{background-color:#0A0F25;} + .d2-823506279 .background-color-N2{background-color:#676C7E;} + .d2-823506279 .background-color-N3{background-color:#9499AB;} + .d2-823506279 .background-color-N4{background-color:#CFD2DD;} + .d2-823506279 .background-color-N5{background-color:#DEE1EB;} + .d2-823506279 .background-color-N6{background-color:#EEF1F8;} + .d2-823506279 .background-color-N7{background-color:#FFFFFF;} + .d2-823506279 .background-color-B1{background-color:#0D32B2;} + .d2-823506279 .background-color-B2{background-color:#0D32B2;} + .d2-823506279 .background-color-B3{background-color:#E3E9FD;} + .d2-823506279 .background-color-B4{background-color:#E3E9FD;} + .d2-823506279 .background-color-B5{background-color:#EDF0FD;} + .d2-823506279 .background-color-B6{background-color:#F7F8FE;} + .d2-823506279 .background-color-AA2{background-color:#4A6FF3;} + .d2-823506279 .background-color-AA4{background-color:#EDF0FD;} + .d2-823506279 .background-color-AA5{background-color:#F7F8FE;} + .d2-823506279 .background-color-AB4{background-color:#EDF0FD;} + .d2-823506279 .background-color-AB5{background-color:#F7F8FE;} + .d2-823506279 .color-N1{color:#0A0F25;} + .d2-823506279 .color-N2{color:#676C7E;} + .d2-823506279 .color-N3{color:#9499AB;} + .d2-823506279 .color-N4{color:#CFD2DD;} + .d2-823506279 .color-N5{color:#DEE1EB;} + .d2-823506279 .color-N6{color:#EEF1F8;} + .d2-823506279 .color-N7{color:#FFFFFF;} + .d2-823506279 .color-B1{color:#0D32B2;} + .d2-823506279 .color-B2{color:#0D32B2;} + .d2-823506279 .color-B3{color:#E3E9FD;} + .d2-823506279 .color-B4{color:#E3E9FD;} + .d2-823506279 .color-B5{color:#EDF0FD;} + .d2-823506279 .color-B6{color:#F7F8FE;} + .d2-823506279 .color-AA2{color:#4A6FF3;} + .d2-823506279 .color-AA4{color:#EDF0FD;} + .d2-823506279 .color-AA5{color:#F7F8FE;} + .d2-823506279 .color-AB4{color:#EDF0FD;} + .d2-823506279 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-823506279);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-823506279);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-823506279);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-823506279);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-823506279);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-823506279);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-823506279);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-823506279);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-823506279);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-823506279);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-823506279);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-823506279);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-823506279);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-823506279);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-823506279);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-823506279);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-823506279);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-823506279);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xTotal abstinence is easier than perfect moderationyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! Total abstinence is easier than perfect moderation + - + -Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! - +Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! + - + - - - - + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/basic-tooltips/elk/board.exp.json b/e2etests/testdata/stable/basic-tooltips/elk/board.exp.json index 8c92da7b5..f5968af6b 100644 --- a/e2etests/testdata/stable/basic-tooltips/elk/board.exp.json +++ b/e2etests/testdata/stable/basic-tooltips/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -10,7 +18,7 @@ "x": 12, "y": 12 }, - "width": 85, + "width": 53, "height": 66, "opacity": 1, "strokeDash": 0, @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -51,7 +60,7 @@ "x": 12, "y": 148 }, - "width": 86, + "width": 54, "height": 66, "opacity": 1, "strokeDash": 0, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -110,13 +120,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 55, + "x": 39, "y": 78 }, { - "x": 55, + "x": 39, "y": 148 } ], @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/basic-tooltips/elk/sketch.exp.svg b/e2etests/testdata/stable/basic-tooltips/elk/sketch.exp.svg index c92562f7b..b5fb2fa82 100644 --- a/e2etests/testdata/stable/basic-tooltips/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/basic-tooltips/elk/sketch.exp.svg @@ -1,12 +1,12 @@ -xTotal abstinence is easier than perfect moderationyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! Total abstinence is easier than perfect moderation - + .d2-3290681635 .fill-N1{fill:#0A0F25;} + .d2-3290681635 .fill-N2{fill:#676C7E;} + .d2-3290681635 .fill-N3{fill:#9499AB;} + .d2-3290681635 .fill-N4{fill:#CFD2DD;} + .d2-3290681635 .fill-N5{fill:#DEE1EB;} + .d2-3290681635 .fill-N6{fill:#EEF1F8;} + .d2-3290681635 .fill-N7{fill:#FFFFFF;} + .d2-3290681635 .fill-B1{fill:#0D32B2;} + .d2-3290681635 .fill-B2{fill:#0D32B2;} + .d2-3290681635 .fill-B3{fill:#E3E9FD;} + .d2-3290681635 .fill-B4{fill:#E3E9FD;} + .d2-3290681635 .fill-B5{fill:#EDF0FD;} + .d2-3290681635 .fill-B6{fill:#F7F8FE;} + .d2-3290681635 .fill-AA2{fill:#4A6FF3;} + .d2-3290681635 .fill-AA4{fill:#EDF0FD;} + .d2-3290681635 .fill-AA5{fill:#F7F8FE;} + .d2-3290681635 .fill-AB4{fill:#EDF0FD;} + .d2-3290681635 .fill-AB5{fill:#F7F8FE;} + .d2-3290681635 .stroke-N1{stroke:#0A0F25;} + .d2-3290681635 .stroke-N2{stroke:#676C7E;} + .d2-3290681635 .stroke-N3{stroke:#9499AB;} + .d2-3290681635 .stroke-N4{stroke:#CFD2DD;} + .d2-3290681635 .stroke-N5{stroke:#DEE1EB;} + .d2-3290681635 .stroke-N6{stroke:#EEF1F8;} + .d2-3290681635 .stroke-N7{stroke:#FFFFFF;} + .d2-3290681635 .stroke-B1{stroke:#0D32B2;} + .d2-3290681635 .stroke-B2{stroke:#0D32B2;} + .d2-3290681635 .stroke-B3{stroke:#E3E9FD;} + .d2-3290681635 .stroke-B4{stroke:#E3E9FD;} + .d2-3290681635 .stroke-B5{stroke:#EDF0FD;} + .d2-3290681635 .stroke-B6{stroke:#F7F8FE;} + .d2-3290681635 .stroke-AA2{stroke:#4A6FF3;} + .d2-3290681635 .stroke-AA4{stroke:#EDF0FD;} + .d2-3290681635 .stroke-AA5{stroke:#F7F8FE;} + .d2-3290681635 .stroke-AB4{stroke:#EDF0FD;} + .d2-3290681635 .stroke-AB5{stroke:#F7F8FE;} + .d2-3290681635 .background-color-N1{background-color:#0A0F25;} + .d2-3290681635 .background-color-N2{background-color:#676C7E;} + .d2-3290681635 .background-color-N3{background-color:#9499AB;} + .d2-3290681635 .background-color-N4{background-color:#CFD2DD;} + .d2-3290681635 .background-color-N5{background-color:#DEE1EB;} + .d2-3290681635 .background-color-N6{background-color:#EEF1F8;} + .d2-3290681635 .background-color-N7{background-color:#FFFFFF;} + .d2-3290681635 .background-color-B1{background-color:#0D32B2;} + .d2-3290681635 .background-color-B2{background-color:#0D32B2;} + .d2-3290681635 .background-color-B3{background-color:#E3E9FD;} + .d2-3290681635 .background-color-B4{background-color:#E3E9FD;} + .d2-3290681635 .background-color-B5{background-color:#EDF0FD;} + .d2-3290681635 .background-color-B6{background-color:#F7F8FE;} + .d2-3290681635 .background-color-AA2{background-color:#4A6FF3;} + .d2-3290681635 .background-color-AA4{background-color:#EDF0FD;} + .d2-3290681635 .background-color-AA5{background-color:#F7F8FE;} + .d2-3290681635 .background-color-AB4{background-color:#EDF0FD;} + .d2-3290681635 .background-color-AB5{background-color:#F7F8FE;} + .d2-3290681635 .color-N1{color:#0A0F25;} + .d2-3290681635 .color-N2{color:#676C7E;} + .d2-3290681635 .color-N3{color:#9499AB;} + .d2-3290681635 .color-N4{color:#CFD2DD;} + .d2-3290681635 .color-N5{color:#DEE1EB;} + .d2-3290681635 .color-N6{color:#EEF1F8;} + .d2-3290681635 .color-N7{color:#FFFFFF;} + .d2-3290681635 .color-B1{color:#0D32B2;} + .d2-3290681635 .color-B2{color:#0D32B2;} + .d2-3290681635 .color-B3{color:#E3E9FD;} + .d2-3290681635 .color-B4{color:#E3E9FD;} + .d2-3290681635 .color-B5{color:#EDF0FD;} + .d2-3290681635 .color-B6{color:#F7F8FE;} + .d2-3290681635 .color-AA2{color:#4A6FF3;} + .d2-3290681635 .color-AA4{color:#EDF0FD;} + .d2-3290681635 .color-AA5{color:#F7F8FE;} + .d2-3290681635 .color-AB4{color:#EDF0FD;} + .d2-3290681635 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3290681635);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3290681635);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3290681635);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3290681635);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3290681635);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3290681635);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3290681635);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3290681635);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3290681635);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3290681635);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3290681635);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3290681635);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3290681635);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3290681635);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3290681635);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3290681635);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3290681635);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3290681635);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xTotal abstinence is easier than perfect moderationyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! Total abstinence is easier than perfect moderation + - + -Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! - +Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! + - + - - - - + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/binary_tree/dagre/board.exp.json b/e2etests/testdata/stable/binary_tree/dagre/board.exp.json index 803757e7f..f2a4cc08e 100644 --- a/e2etests/testdata/stable/binary_tree/dagre/board.exp.json +++ b/e2etests/testdata/stable/binary_tree/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -643,6 +666,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 392.5, @@ -690,6 +714,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 445.25, @@ -737,6 +762,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 166, @@ -784,6 +810,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 218.75, @@ -831,6 +858,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 613.75, @@ -878,6 +906,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 667.25, @@ -925,6 +954,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 59.5, @@ -972,6 +1002,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 104.5, @@ -1019,6 +1050,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 281, @@ -1066,6 +1098,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 324.5, @@ -1113,6 +1146,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 503.5, @@ -1160,6 +1194,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 548.5, @@ -1207,6 +1242,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 731.5, @@ -1254,6 +1290,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 777, @@ -1294,6 +1331,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/binary_tree/dagre/sketch.exp.svg b/e2etests/testdata/stable/binary_tree/dagre/sketch.exp.svg index 785e968c0..d62d3d304 100644 --- a/e2etests/testdata/stable/binary_tree/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/binary_tree/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdefghijklmno + .d2-1943064810 .fill-N1{fill:#0A0F25;} + .d2-1943064810 .fill-N2{fill:#676C7E;} + .d2-1943064810 .fill-N3{fill:#9499AB;} + .d2-1943064810 .fill-N4{fill:#CFD2DD;} + .d2-1943064810 .fill-N5{fill:#DEE1EB;} + .d2-1943064810 .fill-N6{fill:#EEF1F8;} + .d2-1943064810 .fill-N7{fill:#FFFFFF;} + .d2-1943064810 .fill-B1{fill:#0D32B2;} + .d2-1943064810 .fill-B2{fill:#0D32B2;} + .d2-1943064810 .fill-B3{fill:#E3E9FD;} + .d2-1943064810 .fill-B4{fill:#E3E9FD;} + .d2-1943064810 .fill-B5{fill:#EDF0FD;} + .d2-1943064810 .fill-B6{fill:#F7F8FE;} + .d2-1943064810 .fill-AA2{fill:#4A6FF3;} + .d2-1943064810 .fill-AA4{fill:#EDF0FD;} + .d2-1943064810 .fill-AA5{fill:#F7F8FE;} + .d2-1943064810 .fill-AB4{fill:#EDF0FD;} + .d2-1943064810 .fill-AB5{fill:#F7F8FE;} + .d2-1943064810 .stroke-N1{stroke:#0A0F25;} + .d2-1943064810 .stroke-N2{stroke:#676C7E;} + .d2-1943064810 .stroke-N3{stroke:#9499AB;} + .d2-1943064810 .stroke-N4{stroke:#CFD2DD;} + .d2-1943064810 .stroke-N5{stroke:#DEE1EB;} + .d2-1943064810 .stroke-N6{stroke:#EEF1F8;} + .d2-1943064810 .stroke-N7{stroke:#FFFFFF;} + .d2-1943064810 .stroke-B1{stroke:#0D32B2;} + .d2-1943064810 .stroke-B2{stroke:#0D32B2;} + .d2-1943064810 .stroke-B3{stroke:#E3E9FD;} + .d2-1943064810 .stroke-B4{stroke:#E3E9FD;} + .d2-1943064810 .stroke-B5{stroke:#EDF0FD;} + .d2-1943064810 .stroke-B6{stroke:#F7F8FE;} + .d2-1943064810 .stroke-AA2{stroke:#4A6FF3;} + .d2-1943064810 .stroke-AA4{stroke:#EDF0FD;} + .d2-1943064810 .stroke-AA5{stroke:#F7F8FE;} + .d2-1943064810 .stroke-AB4{stroke:#EDF0FD;} + .d2-1943064810 .stroke-AB5{stroke:#F7F8FE;} + .d2-1943064810 .background-color-N1{background-color:#0A0F25;} + .d2-1943064810 .background-color-N2{background-color:#676C7E;} + .d2-1943064810 .background-color-N3{background-color:#9499AB;} + .d2-1943064810 .background-color-N4{background-color:#CFD2DD;} + .d2-1943064810 .background-color-N5{background-color:#DEE1EB;} + .d2-1943064810 .background-color-N6{background-color:#EEF1F8;} + .d2-1943064810 .background-color-N7{background-color:#FFFFFF;} + .d2-1943064810 .background-color-B1{background-color:#0D32B2;} + .d2-1943064810 .background-color-B2{background-color:#0D32B2;} + .d2-1943064810 .background-color-B3{background-color:#E3E9FD;} + .d2-1943064810 .background-color-B4{background-color:#E3E9FD;} + .d2-1943064810 .background-color-B5{background-color:#EDF0FD;} + .d2-1943064810 .background-color-B6{background-color:#F7F8FE;} + .d2-1943064810 .background-color-AA2{background-color:#4A6FF3;} + .d2-1943064810 .background-color-AA4{background-color:#EDF0FD;} + .d2-1943064810 .background-color-AA5{background-color:#F7F8FE;} + .d2-1943064810 .background-color-AB4{background-color:#EDF0FD;} + .d2-1943064810 .background-color-AB5{background-color:#F7F8FE;} + .d2-1943064810 .color-N1{color:#0A0F25;} + .d2-1943064810 .color-N2{color:#676C7E;} + .d2-1943064810 .color-N3{color:#9499AB;} + .d2-1943064810 .color-N4{color:#CFD2DD;} + .d2-1943064810 .color-N5{color:#DEE1EB;} + .d2-1943064810 .color-N6{color:#EEF1F8;} + .d2-1943064810 .color-N7{color:#FFFFFF;} + .d2-1943064810 .color-B1{color:#0D32B2;} + .d2-1943064810 .color-B2{color:#0D32B2;} + .d2-1943064810 .color-B3{color:#E3E9FD;} + .d2-1943064810 .color-B4{color:#E3E9FD;} + .d2-1943064810 .color-B5{color:#EDF0FD;} + .d2-1943064810 .color-B6{color:#F7F8FE;} + .d2-1943064810 .color-AA2{color:#4A6FF3;} + .d2-1943064810 .color-AA4{color:#EDF0FD;} + .d2-1943064810 .color-AA5{color:#F7F8FE;} + .d2-1943064810 .color-AB4{color:#EDF0FD;} + .d2-1943064810 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1943064810);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1943064810);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1943064810);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1943064810);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1943064810);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1943064810);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1943064810);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1943064810);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1943064810);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1943064810);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1943064810);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1943064810);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1943064810);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1943064810);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1943064810);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1943064810);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1943064810);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1943064810);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdefghijklmno - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/binary_tree/elk/board.exp.json b/e2etests/testdata/stable/binary_tree/elk/board.exp.json index 30f1361c5..0fe262678 100644 --- a/e2etests/testdata/stable/binary_tree/elk/board.exp.json +++ b/e2etests/testdata/stable/binary_tree/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -643,6 +666,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 277.4159851074219, @@ -689,6 +713,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 304.0830078125, @@ -735,6 +760,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 131.16600036621094, @@ -781,6 +807,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 157.83299255371094, @@ -827,6 +854,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 418.9159851074219, @@ -873,6 +901,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 445.5830078125, @@ -919,6 +948,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 60.66600036621094, @@ -965,6 +995,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 87.33300018310547, @@ -1011,6 +1042,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 201.41600036621094, @@ -1057,6 +1089,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 228.08299255371094, @@ -1103,6 +1136,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 344.6659851074219, @@ -1149,6 +1183,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 371.3330078125, @@ -1195,6 +1230,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 492.9159851074219, @@ -1241,6 +1277,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 519.5830078125, @@ -1280,6 +1317,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/binary_tree/elk/sketch.exp.svg b/e2etests/testdata/stable/binary_tree/elk/sketch.exp.svg index 91a91618d..d2162efe5 100644 --- a/e2etests/testdata/stable/binary_tree/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/binary_tree/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdefghijklmno + .d2-2680786888 .fill-N1{fill:#0A0F25;} + .d2-2680786888 .fill-N2{fill:#676C7E;} + .d2-2680786888 .fill-N3{fill:#9499AB;} + .d2-2680786888 .fill-N4{fill:#CFD2DD;} + .d2-2680786888 .fill-N5{fill:#DEE1EB;} + .d2-2680786888 .fill-N6{fill:#EEF1F8;} + .d2-2680786888 .fill-N7{fill:#FFFFFF;} + .d2-2680786888 .fill-B1{fill:#0D32B2;} + .d2-2680786888 .fill-B2{fill:#0D32B2;} + .d2-2680786888 .fill-B3{fill:#E3E9FD;} + .d2-2680786888 .fill-B4{fill:#E3E9FD;} + .d2-2680786888 .fill-B5{fill:#EDF0FD;} + .d2-2680786888 .fill-B6{fill:#F7F8FE;} + .d2-2680786888 .fill-AA2{fill:#4A6FF3;} + .d2-2680786888 .fill-AA4{fill:#EDF0FD;} + .d2-2680786888 .fill-AA5{fill:#F7F8FE;} + .d2-2680786888 .fill-AB4{fill:#EDF0FD;} + .d2-2680786888 .fill-AB5{fill:#F7F8FE;} + .d2-2680786888 .stroke-N1{stroke:#0A0F25;} + .d2-2680786888 .stroke-N2{stroke:#676C7E;} + .d2-2680786888 .stroke-N3{stroke:#9499AB;} + .d2-2680786888 .stroke-N4{stroke:#CFD2DD;} + .d2-2680786888 .stroke-N5{stroke:#DEE1EB;} + .d2-2680786888 .stroke-N6{stroke:#EEF1F8;} + .d2-2680786888 .stroke-N7{stroke:#FFFFFF;} + .d2-2680786888 .stroke-B1{stroke:#0D32B2;} + .d2-2680786888 .stroke-B2{stroke:#0D32B2;} + .d2-2680786888 .stroke-B3{stroke:#E3E9FD;} + .d2-2680786888 .stroke-B4{stroke:#E3E9FD;} + .d2-2680786888 .stroke-B5{stroke:#EDF0FD;} + .d2-2680786888 .stroke-B6{stroke:#F7F8FE;} + .d2-2680786888 .stroke-AA2{stroke:#4A6FF3;} + .d2-2680786888 .stroke-AA4{stroke:#EDF0FD;} + .d2-2680786888 .stroke-AA5{stroke:#F7F8FE;} + .d2-2680786888 .stroke-AB4{stroke:#EDF0FD;} + .d2-2680786888 .stroke-AB5{stroke:#F7F8FE;} + .d2-2680786888 .background-color-N1{background-color:#0A0F25;} + .d2-2680786888 .background-color-N2{background-color:#676C7E;} + .d2-2680786888 .background-color-N3{background-color:#9499AB;} + .d2-2680786888 .background-color-N4{background-color:#CFD2DD;} + .d2-2680786888 .background-color-N5{background-color:#DEE1EB;} + .d2-2680786888 .background-color-N6{background-color:#EEF1F8;} + .d2-2680786888 .background-color-N7{background-color:#FFFFFF;} + .d2-2680786888 .background-color-B1{background-color:#0D32B2;} + .d2-2680786888 .background-color-B2{background-color:#0D32B2;} + .d2-2680786888 .background-color-B3{background-color:#E3E9FD;} + .d2-2680786888 .background-color-B4{background-color:#E3E9FD;} + .d2-2680786888 .background-color-B5{background-color:#EDF0FD;} + .d2-2680786888 .background-color-B6{background-color:#F7F8FE;} + .d2-2680786888 .background-color-AA2{background-color:#4A6FF3;} + .d2-2680786888 .background-color-AA4{background-color:#EDF0FD;} + .d2-2680786888 .background-color-AA5{background-color:#F7F8FE;} + .d2-2680786888 .background-color-AB4{background-color:#EDF0FD;} + .d2-2680786888 .background-color-AB5{background-color:#F7F8FE;} + .d2-2680786888 .color-N1{color:#0A0F25;} + .d2-2680786888 .color-N2{color:#676C7E;} + .d2-2680786888 .color-N3{color:#9499AB;} + .d2-2680786888 .color-N4{color:#CFD2DD;} + .d2-2680786888 .color-N5{color:#DEE1EB;} + .d2-2680786888 .color-N6{color:#EEF1F8;} + .d2-2680786888 .color-N7{color:#FFFFFF;} + .d2-2680786888 .color-B1{color:#0D32B2;} + .d2-2680786888 .color-B2{color:#0D32B2;} + .d2-2680786888 .color-B3{color:#E3E9FD;} + .d2-2680786888 .color-B4{color:#E3E9FD;} + .d2-2680786888 .color-B5{color:#EDF0FD;} + .d2-2680786888 .color-B6{color:#F7F8FE;} + .d2-2680786888 .color-AA2{color:#4A6FF3;} + .d2-2680786888 .color-AA4{color:#EDF0FD;} + .d2-2680786888 .color-AA5{color:#F7F8FE;} + .d2-2680786888 .color-AB4{color:#EDF0FD;} + .d2-2680786888 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2680786888);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2680786888);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2680786888);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2680786888);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2680786888);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2680786888);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2680786888);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2680786888);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2680786888);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2680786888);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2680786888);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2680786888);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2680786888);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2680786888);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2680786888);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2680786888);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2680786888);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2680786888);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdefghijklmno - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/bold-mono/dagre/board.exp.json b/e2etests/testdata/stable/bold-mono/dagre/board.exp.json index 842e2a92e..845dea5c6 100644 --- a/e2etests/testdata/stable/bold-mono/dagre/board.exp.json +++ b/e2etests/testdata/stable/bold-mono/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -102,6 +112,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/bold-mono/dagre/sketch.exp.svg b/e2etests/testdata/stable/bold-mono/dagre/sketch.exp.svg index 909d5c6f1..837551a41 100644 --- a/e2etests/testdata/stable/bold-mono/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/bold-mono/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -not bold monobold mono + .d2-562755610 .fill-N1{fill:#0A0F25;} + .d2-562755610 .fill-N2{fill:#676C7E;} + .d2-562755610 .fill-N3{fill:#9499AB;} + .d2-562755610 .fill-N4{fill:#CFD2DD;} + .d2-562755610 .fill-N5{fill:#DEE1EB;} + .d2-562755610 .fill-N6{fill:#EEF1F8;} + .d2-562755610 .fill-N7{fill:#FFFFFF;} + .d2-562755610 .fill-B1{fill:#0D32B2;} + .d2-562755610 .fill-B2{fill:#0D32B2;} + .d2-562755610 .fill-B3{fill:#E3E9FD;} + .d2-562755610 .fill-B4{fill:#E3E9FD;} + .d2-562755610 .fill-B5{fill:#EDF0FD;} + .d2-562755610 .fill-B6{fill:#F7F8FE;} + .d2-562755610 .fill-AA2{fill:#4A6FF3;} + .d2-562755610 .fill-AA4{fill:#EDF0FD;} + .d2-562755610 .fill-AA5{fill:#F7F8FE;} + .d2-562755610 .fill-AB4{fill:#EDF0FD;} + .d2-562755610 .fill-AB5{fill:#F7F8FE;} + .d2-562755610 .stroke-N1{stroke:#0A0F25;} + .d2-562755610 .stroke-N2{stroke:#676C7E;} + .d2-562755610 .stroke-N3{stroke:#9499AB;} + .d2-562755610 .stroke-N4{stroke:#CFD2DD;} + .d2-562755610 .stroke-N5{stroke:#DEE1EB;} + .d2-562755610 .stroke-N6{stroke:#EEF1F8;} + .d2-562755610 .stroke-N7{stroke:#FFFFFF;} + .d2-562755610 .stroke-B1{stroke:#0D32B2;} + .d2-562755610 .stroke-B2{stroke:#0D32B2;} + .d2-562755610 .stroke-B3{stroke:#E3E9FD;} + .d2-562755610 .stroke-B4{stroke:#E3E9FD;} + .d2-562755610 .stroke-B5{stroke:#EDF0FD;} + .d2-562755610 .stroke-B6{stroke:#F7F8FE;} + .d2-562755610 .stroke-AA2{stroke:#4A6FF3;} + .d2-562755610 .stroke-AA4{stroke:#EDF0FD;} + .d2-562755610 .stroke-AA5{stroke:#F7F8FE;} + .d2-562755610 .stroke-AB4{stroke:#EDF0FD;} + .d2-562755610 .stroke-AB5{stroke:#F7F8FE;} + .d2-562755610 .background-color-N1{background-color:#0A0F25;} + .d2-562755610 .background-color-N2{background-color:#676C7E;} + .d2-562755610 .background-color-N3{background-color:#9499AB;} + .d2-562755610 .background-color-N4{background-color:#CFD2DD;} + .d2-562755610 .background-color-N5{background-color:#DEE1EB;} + .d2-562755610 .background-color-N6{background-color:#EEF1F8;} + .d2-562755610 .background-color-N7{background-color:#FFFFFF;} + .d2-562755610 .background-color-B1{background-color:#0D32B2;} + .d2-562755610 .background-color-B2{background-color:#0D32B2;} + .d2-562755610 .background-color-B3{background-color:#E3E9FD;} + .d2-562755610 .background-color-B4{background-color:#E3E9FD;} + .d2-562755610 .background-color-B5{background-color:#EDF0FD;} + .d2-562755610 .background-color-B6{background-color:#F7F8FE;} + .d2-562755610 .background-color-AA2{background-color:#4A6FF3;} + .d2-562755610 .background-color-AA4{background-color:#EDF0FD;} + .d2-562755610 .background-color-AA5{background-color:#F7F8FE;} + .d2-562755610 .background-color-AB4{background-color:#EDF0FD;} + .d2-562755610 .background-color-AB5{background-color:#F7F8FE;} + .d2-562755610 .color-N1{color:#0A0F25;} + .d2-562755610 .color-N2{color:#676C7E;} + .d2-562755610 .color-N3{color:#9499AB;} + .d2-562755610 .color-N4{color:#CFD2DD;} + .d2-562755610 .color-N5{color:#DEE1EB;} + .d2-562755610 .color-N6{color:#EEF1F8;} + .d2-562755610 .color-N7{color:#FFFFFF;} + .d2-562755610 .color-B1{color:#0D32B2;} + .d2-562755610 .color-B2{color:#0D32B2;} + .d2-562755610 .color-B3{color:#E3E9FD;} + .d2-562755610 .color-B4{color:#E3E9FD;} + .d2-562755610 .color-B5{color:#EDF0FD;} + .d2-562755610 .color-B6{color:#F7F8FE;} + .d2-562755610 .color-AA2{color:#4A6FF3;} + .d2-562755610 .color-AA4{color:#EDF0FD;} + .d2-562755610 .color-AA5{color:#F7F8FE;} + .d2-562755610 .color-AB4{color:#EDF0FD;} + .d2-562755610 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-562755610);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-562755610);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-562755610);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-562755610);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-562755610);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-562755610);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-562755610);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-562755610);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-562755610);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-562755610);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-562755610);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-562755610);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-562755610);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-562755610);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-562755610);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-562755610);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-562755610);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-562755610);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>not bold monobold mono - - + + \ No newline at end of file diff --git a/e2etests/testdata/stable/bold-mono/elk/board.exp.json b/e2etests/testdata/stable/bold-mono/elk/board.exp.json index 9da9855d4..93564fd61 100644 --- a/e2etests/testdata/stable/bold-mono/elk/board.exp.json +++ b/e2etests/testdata/stable/bold-mono/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -102,6 +112,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/bold-mono/elk/sketch.exp.svg b/e2etests/testdata/stable/bold-mono/elk/sketch.exp.svg index 9d5838546..777206764 100644 --- a/e2etests/testdata/stable/bold-mono/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/bold-mono/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -not bold monobold mono + .d2-3350385123 .fill-N1{fill:#0A0F25;} + .d2-3350385123 .fill-N2{fill:#676C7E;} + .d2-3350385123 .fill-N3{fill:#9499AB;} + .d2-3350385123 .fill-N4{fill:#CFD2DD;} + .d2-3350385123 .fill-N5{fill:#DEE1EB;} + .d2-3350385123 .fill-N6{fill:#EEF1F8;} + .d2-3350385123 .fill-N7{fill:#FFFFFF;} + .d2-3350385123 .fill-B1{fill:#0D32B2;} + .d2-3350385123 .fill-B2{fill:#0D32B2;} + .d2-3350385123 .fill-B3{fill:#E3E9FD;} + .d2-3350385123 .fill-B4{fill:#E3E9FD;} + .d2-3350385123 .fill-B5{fill:#EDF0FD;} + .d2-3350385123 .fill-B6{fill:#F7F8FE;} + .d2-3350385123 .fill-AA2{fill:#4A6FF3;} + .d2-3350385123 .fill-AA4{fill:#EDF0FD;} + .d2-3350385123 .fill-AA5{fill:#F7F8FE;} + .d2-3350385123 .fill-AB4{fill:#EDF0FD;} + .d2-3350385123 .fill-AB5{fill:#F7F8FE;} + .d2-3350385123 .stroke-N1{stroke:#0A0F25;} + .d2-3350385123 .stroke-N2{stroke:#676C7E;} + .d2-3350385123 .stroke-N3{stroke:#9499AB;} + .d2-3350385123 .stroke-N4{stroke:#CFD2DD;} + .d2-3350385123 .stroke-N5{stroke:#DEE1EB;} + .d2-3350385123 .stroke-N6{stroke:#EEF1F8;} + .d2-3350385123 .stroke-N7{stroke:#FFFFFF;} + .d2-3350385123 .stroke-B1{stroke:#0D32B2;} + .d2-3350385123 .stroke-B2{stroke:#0D32B2;} + .d2-3350385123 .stroke-B3{stroke:#E3E9FD;} + .d2-3350385123 .stroke-B4{stroke:#E3E9FD;} + .d2-3350385123 .stroke-B5{stroke:#EDF0FD;} + .d2-3350385123 .stroke-B6{stroke:#F7F8FE;} + .d2-3350385123 .stroke-AA2{stroke:#4A6FF3;} + .d2-3350385123 .stroke-AA4{stroke:#EDF0FD;} + .d2-3350385123 .stroke-AA5{stroke:#F7F8FE;} + .d2-3350385123 .stroke-AB4{stroke:#EDF0FD;} + .d2-3350385123 .stroke-AB5{stroke:#F7F8FE;} + .d2-3350385123 .background-color-N1{background-color:#0A0F25;} + .d2-3350385123 .background-color-N2{background-color:#676C7E;} + .d2-3350385123 .background-color-N3{background-color:#9499AB;} + .d2-3350385123 .background-color-N4{background-color:#CFD2DD;} + .d2-3350385123 .background-color-N5{background-color:#DEE1EB;} + .d2-3350385123 .background-color-N6{background-color:#EEF1F8;} + .d2-3350385123 .background-color-N7{background-color:#FFFFFF;} + .d2-3350385123 .background-color-B1{background-color:#0D32B2;} + .d2-3350385123 .background-color-B2{background-color:#0D32B2;} + .d2-3350385123 .background-color-B3{background-color:#E3E9FD;} + .d2-3350385123 .background-color-B4{background-color:#E3E9FD;} + .d2-3350385123 .background-color-B5{background-color:#EDF0FD;} + .d2-3350385123 .background-color-B6{background-color:#F7F8FE;} + .d2-3350385123 .background-color-AA2{background-color:#4A6FF3;} + .d2-3350385123 .background-color-AA4{background-color:#EDF0FD;} + .d2-3350385123 .background-color-AA5{background-color:#F7F8FE;} + .d2-3350385123 .background-color-AB4{background-color:#EDF0FD;} + .d2-3350385123 .background-color-AB5{background-color:#F7F8FE;} + .d2-3350385123 .color-N1{color:#0A0F25;} + .d2-3350385123 .color-N2{color:#676C7E;} + .d2-3350385123 .color-N3{color:#9499AB;} + .d2-3350385123 .color-N4{color:#CFD2DD;} + .d2-3350385123 .color-N5{color:#DEE1EB;} + .d2-3350385123 .color-N6{color:#EEF1F8;} + .d2-3350385123 .color-N7{color:#FFFFFF;} + .d2-3350385123 .color-B1{color:#0D32B2;} + .d2-3350385123 .color-B2{color:#0D32B2;} + .d2-3350385123 .color-B3{color:#E3E9FD;} + .d2-3350385123 .color-B4{color:#E3E9FD;} + .d2-3350385123 .color-B5{color:#EDF0FD;} + .d2-3350385123 .color-B6{color:#F7F8FE;} + .d2-3350385123 .color-AA2{color:#4A6FF3;} + .d2-3350385123 .color-AA4{color:#EDF0FD;} + .d2-3350385123 .color-AA5{color:#F7F8FE;} + .d2-3350385123 .color-AB4{color:#EDF0FD;} + .d2-3350385123 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3350385123);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3350385123);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3350385123);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3350385123);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3350385123);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3350385123);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3350385123);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3350385123);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3350385123);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3350385123);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3350385123);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3350385123);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3350385123);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3350385123);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3350385123);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3350385123);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3350385123);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3350385123);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>not bold monobold mono - - + + \ No newline at end of file diff --git a/e2etests/testdata/stable/border-radius-pill-shape/dagre/board.exp.json b/e2etests/testdata/stable/border-radius-pill-shape/dagre/board.exp.json index 1909736bc..321ffafde 100644 --- a/e2etests/testdata/stable/border-radius-pill-shape/dagre/board.exp.json +++ b/e2etests/testdata/stable/border-radius-pill-shape/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 999, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 999, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 999, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -141,6 +152,7 @@ "borderRadius": 999, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 999, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -225,6 +238,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/border-radius-pill-shape/dagre/sketch.exp.svg b/e2etests/testdata/stable/border-radius-pill-shape/dagre/sketch.exp.svg index b3921c8c8..99bb6bfbf 100644 --- a/e2etests/testdata/stable/border-radius-pill-shape/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/border-radius-pill-shape/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -xymultiple2double + .d2-448308156 .fill-N1{fill:#0A0F25;} + .d2-448308156 .fill-N2{fill:#676C7E;} + .d2-448308156 .fill-N3{fill:#9499AB;} + .d2-448308156 .fill-N4{fill:#CFD2DD;} + .d2-448308156 .fill-N5{fill:#DEE1EB;} + .d2-448308156 .fill-N6{fill:#EEF1F8;} + .d2-448308156 .fill-N7{fill:#FFFFFF;} + .d2-448308156 .fill-B1{fill:#0D32B2;} + .d2-448308156 .fill-B2{fill:#0D32B2;} + .d2-448308156 .fill-B3{fill:#E3E9FD;} + .d2-448308156 .fill-B4{fill:#E3E9FD;} + .d2-448308156 .fill-B5{fill:#EDF0FD;} + .d2-448308156 .fill-B6{fill:#F7F8FE;} + .d2-448308156 .fill-AA2{fill:#4A6FF3;} + .d2-448308156 .fill-AA4{fill:#EDF0FD;} + .d2-448308156 .fill-AA5{fill:#F7F8FE;} + .d2-448308156 .fill-AB4{fill:#EDF0FD;} + .d2-448308156 .fill-AB5{fill:#F7F8FE;} + .d2-448308156 .stroke-N1{stroke:#0A0F25;} + .d2-448308156 .stroke-N2{stroke:#676C7E;} + .d2-448308156 .stroke-N3{stroke:#9499AB;} + .d2-448308156 .stroke-N4{stroke:#CFD2DD;} + .d2-448308156 .stroke-N5{stroke:#DEE1EB;} + .d2-448308156 .stroke-N6{stroke:#EEF1F8;} + .d2-448308156 .stroke-N7{stroke:#FFFFFF;} + .d2-448308156 .stroke-B1{stroke:#0D32B2;} + .d2-448308156 .stroke-B2{stroke:#0D32B2;} + .d2-448308156 .stroke-B3{stroke:#E3E9FD;} + .d2-448308156 .stroke-B4{stroke:#E3E9FD;} + .d2-448308156 .stroke-B5{stroke:#EDF0FD;} + .d2-448308156 .stroke-B6{stroke:#F7F8FE;} + .d2-448308156 .stroke-AA2{stroke:#4A6FF3;} + .d2-448308156 .stroke-AA4{stroke:#EDF0FD;} + .d2-448308156 .stroke-AA5{stroke:#F7F8FE;} + .d2-448308156 .stroke-AB4{stroke:#EDF0FD;} + .d2-448308156 .stroke-AB5{stroke:#F7F8FE;} + .d2-448308156 .background-color-N1{background-color:#0A0F25;} + .d2-448308156 .background-color-N2{background-color:#676C7E;} + .d2-448308156 .background-color-N3{background-color:#9499AB;} + .d2-448308156 .background-color-N4{background-color:#CFD2DD;} + .d2-448308156 .background-color-N5{background-color:#DEE1EB;} + .d2-448308156 .background-color-N6{background-color:#EEF1F8;} + .d2-448308156 .background-color-N7{background-color:#FFFFFF;} + .d2-448308156 .background-color-B1{background-color:#0D32B2;} + .d2-448308156 .background-color-B2{background-color:#0D32B2;} + .d2-448308156 .background-color-B3{background-color:#E3E9FD;} + .d2-448308156 .background-color-B4{background-color:#E3E9FD;} + .d2-448308156 .background-color-B5{background-color:#EDF0FD;} + .d2-448308156 .background-color-B6{background-color:#F7F8FE;} + .d2-448308156 .background-color-AA2{background-color:#4A6FF3;} + .d2-448308156 .background-color-AA4{background-color:#EDF0FD;} + .d2-448308156 .background-color-AA5{background-color:#F7F8FE;} + .d2-448308156 .background-color-AB4{background-color:#EDF0FD;} + .d2-448308156 .background-color-AB5{background-color:#F7F8FE;} + .d2-448308156 .color-N1{color:#0A0F25;} + .d2-448308156 .color-N2{color:#676C7E;} + .d2-448308156 .color-N3{color:#9499AB;} + .d2-448308156 .color-N4{color:#CFD2DD;} + .d2-448308156 .color-N5{color:#DEE1EB;} + .d2-448308156 .color-N6{color:#EEF1F8;} + .d2-448308156 .color-N7{color:#FFFFFF;} + .d2-448308156 .color-B1{color:#0D32B2;} + .d2-448308156 .color-B2{color:#0D32B2;} + .d2-448308156 .color-B3{color:#E3E9FD;} + .d2-448308156 .color-B4{color:#E3E9FD;} + .d2-448308156 .color-B5{color:#EDF0FD;} + .d2-448308156 .color-B6{color:#F7F8FE;} + .d2-448308156 .color-AA2{color:#4A6FF3;} + .d2-448308156 .color-AA4{color:#EDF0FD;} + .d2-448308156 .color-AA5{color:#F7F8FE;} + .d2-448308156 .color-AB4{color:#EDF0FD;} + .d2-448308156 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-448308156);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-448308156);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-448308156);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-448308156);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-448308156);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-448308156);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-448308156);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-448308156);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-448308156);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-448308156);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-448308156);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-448308156);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-448308156);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-448308156);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-448308156);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-448308156);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-448308156);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-448308156);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xymultiple2double -three-dee +three-dee - - - - - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/border-radius-pill-shape/elk/board.exp.json b/e2etests/testdata/stable/border-radius-pill-shape/elk/board.exp.json index 787c34a0d..920392633 100644 --- a/e2etests/testdata/stable/border-radius-pill-shape/elk/board.exp.json +++ b/e2etests/testdata/stable/border-radius-pill-shape/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 999, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 999, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 999, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -141,6 +152,7 @@ "borderRadius": 999, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 999, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -225,6 +238,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/border-radius-pill-shape/elk/sketch.exp.svg b/e2etests/testdata/stable/border-radius-pill-shape/elk/sketch.exp.svg index 173409b52..7f1545a0c 100644 --- a/e2etests/testdata/stable/border-radius-pill-shape/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/border-radius-pill-shape/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -xymultiple2double + .d2-2886130221 .fill-N1{fill:#0A0F25;} + .d2-2886130221 .fill-N2{fill:#676C7E;} + .d2-2886130221 .fill-N3{fill:#9499AB;} + .d2-2886130221 .fill-N4{fill:#CFD2DD;} + .d2-2886130221 .fill-N5{fill:#DEE1EB;} + .d2-2886130221 .fill-N6{fill:#EEF1F8;} + .d2-2886130221 .fill-N7{fill:#FFFFFF;} + .d2-2886130221 .fill-B1{fill:#0D32B2;} + .d2-2886130221 .fill-B2{fill:#0D32B2;} + .d2-2886130221 .fill-B3{fill:#E3E9FD;} + .d2-2886130221 .fill-B4{fill:#E3E9FD;} + .d2-2886130221 .fill-B5{fill:#EDF0FD;} + .d2-2886130221 .fill-B6{fill:#F7F8FE;} + .d2-2886130221 .fill-AA2{fill:#4A6FF3;} + .d2-2886130221 .fill-AA4{fill:#EDF0FD;} + .d2-2886130221 .fill-AA5{fill:#F7F8FE;} + .d2-2886130221 .fill-AB4{fill:#EDF0FD;} + .d2-2886130221 .fill-AB5{fill:#F7F8FE;} + .d2-2886130221 .stroke-N1{stroke:#0A0F25;} + .d2-2886130221 .stroke-N2{stroke:#676C7E;} + .d2-2886130221 .stroke-N3{stroke:#9499AB;} + .d2-2886130221 .stroke-N4{stroke:#CFD2DD;} + .d2-2886130221 .stroke-N5{stroke:#DEE1EB;} + .d2-2886130221 .stroke-N6{stroke:#EEF1F8;} + .d2-2886130221 .stroke-N7{stroke:#FFFFFF;} + .d2-2886130221 .stroke-B1{stroke:#0D32B2;} + .d2-2886130221 .stroke-B2{stroke:#0D32B2;} + .d2-2886130221 .stroke-B3{stroke:#E3E9FD;} + .d2-2886130221 .stroke-B4{stroke:#E3E9FD;} + .d2-2886130221 .stroke-B5{stroke:#EDF0FD;} + .d2-2886130221 .stroke-B6{stroke:#F7F8FE;} + .d2-2886130221 .stroke-AA2{stroke:#4A6FF3;} + .d2-2886130221 .stroke-AA4{stroke:#EDF0FD;} + .d2-2886130221 .stroke-AA5{stroke:#F7F8FE;} + .d2-2886130221 .stroke-AB4{stroke:#EDF0FD;} + .d2-2886130221 .stroke-AB5{stroke:#F7F8FE;} + .d2-2886130221 .background-color-N1{background-color:#0A0F25;} + .d2-2886130221 .background-color-N2{background-color:#676C7E;} + .d2-2886130221 .background-color-N3{background-color:#9499AB;} + .d2-2886130221 .background-color-N4{background-color:#CFD2DD;} + .d2-2886130221 .background-color-N5{background-color:#DEE1EB;} + .d2-2886130221 .background-color-N6{background-color:#EEF1F8;} + .d2-2886130221 .background-color-N7{background-color:#FFFFFF;} + .d2-2886130221 .background-color-B1{background-color:#0D32B2;} + .d2-2886130221 .background-color-B2{background-color:#0D32B2;} + .d2-2886130221 .background-color-B3{background-color:#E3E9FD;} + .d2-2886130221 .background-color-B4{background-color:#E3E9FD;} + .d2-2886130221 .background-color-B5{background-color:#EDF0FD;} + .d2-2886130221 .background-color-B6{background-color:#F7F8FE;} + .d2-2886130221 .background-color-AA2{background-color:#4A6FF3;} + .d2-2886130221 .background-color-AA4{background-color:#EDF0FD;} + .d2-2886130221 .background-color-AA5{background-color:#F7F8FE;} + .d2-2886130221 .background-color-AB4{background-color:#EDF0FD;} + .d2-2886130221 .background-color-AB5{background-color:#F7F8FE;} + .d2-2886130221 .color-N1{color:#0A0F25;} + .d2-2886130221 .color-N2{color:#676C7E;} + .d2-2886130221 .color-N3{color:#9499AB;} + .d2-2886130221 .color-N4{color:#CFD2DD;} + .d2-2886130221 .color-N5{color:#DEE1EB;} + .d2-2886130221 .color-N6{color:#EEF1F8;} + .d2-2886130221 .color-N7{color:#FFFFFF;} + .d2-2886130221 .color-B1{color:#0D32B2;} + .d2-2886130221 .color-B2{color:#0D32B2;} + .d2-2886130221 .color-B3{color:#E3E9FD;} + .d2-2886130221 .color-B4{color:#E3E9FD;} + .d2-2886130221 .color-B5{color:#EDF0FD;} + .d2-2886130221 .color-B6{color:#F7F8FE;} + .d2-2886130221 .color-AA2{color:#4A6FF3;} + .d2-2886130221 .color-AA4{color:#EDF0FD;} + .d2-2886130221 .color-AA5{color:#F7F8FE;} + .d2-2886130221 .color-AB4{color:#EDF0FD;} + .d2-2886130221 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2886130221);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2886130221);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2886130221);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2886130221);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2886130221);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2886130221);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2886130221);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2886130221);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2886130221);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2886130221);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2886130221);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2886130221);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2886130221);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2886130221);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2886130221);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2886130221);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2886130221);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2886130221);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xymultiple2double -three-dee +three-dee - - - - - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/border-radius/dagre/board.exp.json b/e2etests/testdata/stable/border-radius/dagre/board.exp.json index bf1caec53..7a2d2b95c 100644 --- a/e2etests/testdata/stable/border-radius/dagre/board.exp.json +++ b/e2etests/testdata/stable/border-radius/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 4, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 10, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 6, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -141,6 +152,7 @@ "borderRadius": 6, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 6, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -225,6 +238,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/border-radius/dagre/sketch.exp.svg b/e2etests/testdata/stable/border-radius/dagre/sketch.exp.svg index 00e243e48..e2bfb33c2 100644 --- a/e2etests/testdata/stable/border-radius/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/border-radius/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -xymultiple2double + .d2-1236460180 .fill-N1{fill:#0A0F25;} + .d2-1236460180 .fill-N2{fill:#676C7E;} + .d2-1236460180 .fill-N3{fill:#9499AB;} + .d2-1236460180 .fill-N4{fill:#CFD2DD;} + .d2-1236460180 .fill-N5{fill:#DEE1EB;} + .d2-1236460180 .fill-N6{fill:#EEF1F8;} + .d2-1236460180 .fill-N7{fill:#FFFFFF;} + .d2-1236460180 .fill-B1{fill:#0D32B2;} + .d2-1236460180 .fill-B2{fill:#0D32B2;} + .d2-1236460180 .fill-B3{fill:#E3E9FD;} + .d2-1236460180 .fill-B4{fill:#E3E9FD;} + .d2-1236460180 .fill-B5{fill:#EDF0FD;} + .d2-1236460180 .fill-B6{fill:#F7F8FE;} + .d2-1236460180 .fill-AA2{fill:#4A6FF3;} + .d2-1236460180 .fill-AA4{fill:#EDF0FD;} + .d2-1236460180 .fill-AA5{fill:#F7F8FE;} + .d2-1236460180 .fill-AB4{fill:#EDF0FD;} + .d2-1236460180 .fill-AB5{fill:#F7F8FE;} + .d2-1236460180 .stroke-N1{stroke:#0A0F25;} + .d2-1236460180 .stroke-N2{stroke:#676C7E;} + .d2-1236460180 .stroke-N3{stroke:#9499AB;} + .d2-1236460180 .stroke-N4{stroke:#CFD2DD;} + .d2-1236460180 .stroke-N5{stroke:#DEE1EB;} + .d2-1236460180 .stroke-N6{stroke:#EEF1F8;} + .d2-1236460180 .stroke-N7{stroke:#FFFFFF;} + .d2-1236460180 .stroke-B1{stroke:#0D32B2;} + .d2-1236460180 .stroke-B2{stroke:#0D32B2;} + .d2-1236460180 .stroke-B3{stroke:#E3E9FD;} + .d2-1236460180 .stroke-B4{stroke:#E3E9FD;} + .d2-1236460180 .stroke-B5{stroke:#EDF0FD;} + .d2-1236460180 .stroke-B6{stroke:#F7F8FE;} + .d2-1236460180 .stroke-AA2{stroke:#4A6FF3;} + .d2-1236460180 .stroke-AA4{stroke:#EDF0FD;} + .d2-1236460180 .stroke-AA5{stroke:#F7F8FE;} + .d2-1236460180 .stroke-AB4{stroke:#EDF0FD;} + .d2-1236460180 .stroke-AB5{stroke:#F7F8FE;} + .d2-1236460180 .background-color-N1{background-color:#0A0F25;} + .d2-1236460180 .background-color-N2{background-color:#676C7E;} + .d2-1236460180 .background-color-N3{background-color:#9499AB;} + .d2-1236460180 .background-color-N4{background-color:#CFD2DD;} + .d2-1236460180 .background-color-N5{background-color:#DEE1EB;} + .d2-1236460180 .background-color-N6{background-color:#EEF1F8;} + .d2-1236460180 .background-color-N7{background-color:#FFFFFF;} + .d2-1236460180 .background-color-B1{background-color:#0D32B2;} + .d2-1236460180 .background-color-B2{background-color:#0D32B2;} + .d2-1236460180 .background-color-B3{background-color:#E3E9FD;} + .d2-1236460180 .background-color-B4{background-color:#E3E9FD;} + .d2-1236460180 .background-color-B5{background-color:#EDF0FD;} + .d2-1236460180 .background-color-B6{background-color:#F7F8FE;} + .d2-1236460180 .background-color-AA2{background-color:#4A6FF3;} + .d2-1236460180 .background-color-AA4{background-color:#EDF0FD;} + .d2-1236460180 .background-color-AA5{background-color:#F7F8FE;} + .d2-1236460180 .background-color-AB4{background-color:#EDF0FD;} + .d2-1236460180 .background-color-AB5{background-color:#F7F8FE;} + .d2-1236460180 .color-N1{color:#0A0F25;} + .d2-1236460180 .color-N2{color:#676C7E;} + .d2-1236460180 .color-N3{color:#9499AB;} + .d2-1236460180 .color-N4{color:#CFD2DD;} + .d2-1236460180 .color-N5{color:#DEE1EB;} + .d2-1236460180 .color-N6{color:#EEF1F8;} + .d2-1236460180 .color-N7{color:#FFFFFF;} + .d2-1236460180 .color-B1{color:#0D32B2;} + .d2-1236460180 .color-B2{color:#0D32B2;} + .d2-1236460180 .color-B3{color:#E3E9FD;} + .d2-1236460180 .color-B4{color:#E3E9FD;} + .d2-1236460180 .color-B5{color:#EDF0FD;} + .d2-1236460180 .color-B6{color:#F7F8FE;} + .d2-1236460180 .color-AA2{color:#4A6FF3;} + .d2-1236460180 .color-AA4{color:#EDF0FD;} + .d2-1236460180 .color-AA5{color:#F7F8FE;} + .d2-1236460180 .color-AB4{color:#EDF0FD;} + .d2-1236460180 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1236460180);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1236460180);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1236460180);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1236460180);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1236460180);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1236460180);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1236460180);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1236460180);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1236460180);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1236460180);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1236460180);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1236460180);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1236460180);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1236460180);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1236460180);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1236460180);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1236460180);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1236460180);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xymultiple2double -three-dee +three-dee - - - - - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/border-radius/elk/board.exp.json b/e2etests/testdata/stable/border-radius/elk/board.exp.json index 71e89da9a..ad07d7e72 100644 --- a/e2etests/testdata/stable/border-radius/elk/board.exp.json +++ b/e2etests/testdata/stable/border-radius/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 4, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 10, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 6, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -141,6 +152,7 @@ "borderRadius": 6, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 6, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -225,6 +238,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/border-radius/elk/sketch.exp.svg b/e2etests/testdata/stable/border-radius/elk/sketch.exp.svg index 1e15519b2..7a7f7ef34 100644 --- a/e2etests/testdata/stable/border-radius/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/border-radius/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -xymultiple2double + .d2-773068003 .fill-N1{fill:#0A0F25;} + .d2-773068003 .fill-N2{fill:#676C7E;} + .d2-773068003 .fill-N3{fill:#9499AB;} + .d2-773068003 .fill-N4{fill:#CFD2DD;} + .d2-773068003 .fill-N5{fill:#DEE1EB;} + .d2-773068003 .fill-N6{fill:#EEF1F8;} + .d2-773068003 .fill-N7{fill:#FFFFFF;} + .d2-773068003 .fill-B1{fill:#0D32B2;} + .d2-773068003 .fill-B2{fill:#0D32B2;} + .d2-773068003 .fill-B3{fill:#E3E9FD;} + .d2-773068003 .fill-B4{fill:#E3E9FD;} + .d2-773068003 .fill-B5{fill:#EDF0FD;} + .d2-773068003 .fill-B6{fill:#F7F8FE;} + .d2-773068003 .fill-AA2{fill:#4A6FF3;} + .d2-773068003 .fill-AA4{fill:#EDF0FD;} + .d2-773068003 .fill-AA5{fill:#F7F8FE;} + .d2-773068003 .fill-AB4{fill:#EDF0FD;} + .d2-773068003 .fill-AB5{fill:#F7F8FE;} + .d2-773068003 .stroke-N1{stroke:#0A0F25;} + .d2-773068003 .stroke-N2{stroke:#676C7E;} + .d2-773068003 .stroke-N3{stroke:#9499AB;} + .d2-773068003 .stroke-N4{stroke:#CFD2DD;} + .d2-773068003 .stroke-N5{stroke:#DEE1EB;} + .d2-773068003 .stroke-N6{stroke:#EEF1F8;} + .d2-773068003 .stroke-N7{stroke:#FFFFFF;} + .d2-773068003 .stroke-B1{stroke:#0D32B2;} + .d2-773068003 .stroke-B2{stroke:#0D32B2;} + .d2-773068003 .stroke-B3{stroke:#E3E9FD;} + .d2-773068003 .stroke-B4{stroke:#E3E9FD;} + .d2-773068003 .stroke-B5{stroke:#EDF0FD;} + .d2-773068003 .stroke-B6{stroke:#F7F8FE;} + .d2-773068003 .stroke-AA2{stroke:#4A6FF3;} + .d2-773068003 .stroke-AA4{stroke:#EDF0FD;} + .d2-773068003 .stroke-AA5{stroke:#F7F8FE;} + .d2-773068003 .stroke-AB4{stroke:#EDF0FD;} + .d2-773068003 .stroke-AB5{stroke:#F7F8FE;} + .d2-773068003 .background-color-N1{background-color:#0A0F25;} + .d2-773068003 .background-color-N2{background-color:#676C7E;} + .d2-773068003 .background-color-N3{background-color:#9499AB;} + .d2-773068003 .background-color-N4{background-color:#CFD2DD;} + .d2-773068003 .background-color-N5{background-color:#DEE1EB;} + .d2-773068003 .background-color-N6{background-color:#EEF1F8;} + .d2-773068003 .background-color-N7{background-color:#FFFFFF;} + .d2-773068003 .background-color-B1{background-color:#0D32B2;} + .d2-773068003 .background-color-B2{background-color:#0D32B2;} + .d2-773068003 .background-color-B3{background-color:#E3E9FD;} + .d2-773068003 .background-color-B4{background-color:#E3E9FD;} + .d2-773068003 .background-color-B5{background-color:#EDF0FD;} + .d2-773068003 .background-color-B6{background-color:#F7F8FE;} + .d2-773068003 .background-color-AA2{background-color:#4A6FF3;} + .d2-773068003 .background-color-AA4{background-color:#EDF0FD;} + .d2-773068003 .background-color-AA5{background-color:#F7F8FE;} + .d2-773068003 .background-color-AB4{background-color:#EDF0FD;} + .d2-773068003 .background-color-AB5{background-color:#F7F8FE;} + .d2-773068003 .color-N1{color:#0A0F25;} + .d2-773068003 .color-N2{color:#676C7E;} + .d2-773068003 .color-N3{color:#9499AB;} + .d2-773068003 .color-N4{color:#CFD2DD;} + .d2-773068003 .color-N5{color:#DEE1EB;} + .d2-773068003 .color-N6{color:#EEF1F8;} + .d2-773068003 .color-N7{color:#FFFFFF;} + .d2-773068003 .color-B1{color:#0D32B2;} + .d2-773068003 .color-B2{color:#0D32B2;} + .d2-773068003 .color-B3{color:#E3E9FD;} + .d2-773068003 .color-B4{color:#E3E9FD;} + .d2-773068003 .color-B5{color:#EDF0FD;} + .d2-773068003 .color-B6{color:#F7F8FE;} + .d2-773068003 .color-AA2{color:#4A6FF3;} + .d2-773068003 .color-AA4{color:#EDF0FD;} + .d2-773068003 .color-AA5{color:#F7F8FE;} + .d2-773068003 .color-AB4{color:#EDF0FD;} + .d2-773068003 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-773068003);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-773068003);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-773068003);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-773068003);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-773068003);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-773068003);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-773068003);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-773068003);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-773068003);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-773068003);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-773068003);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-773068003);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-773068003);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-773068003);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-773068003);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-773068003);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-773068003);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-773068003);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xymultiple2double -three-dee +three-dee - - - - - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/box_arrowhead/dagre/board.exp.json b/e2etests/testdata/stable/box_arrowhead/dagre/board.exp.json new file mode 100644 index 000000000..22b3005b0 --- /dev/null +++ b/e2etests/testdata/stable/box_arrowhead/dagre/board.exp.json @@ -0,0 +1,322 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "a", + "type": "rectangle", + "pos": { + "x": 0, + "y": 0 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "b", + "type": "rectangle", + "pos": { + "x": 0, + "y": 187 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "c", + "type": "rectangle", + "pos": { + "x": 114, + "y": 0 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "c", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "d", + "type": "rectangle", + "pos": { + "x": 113, + "y": 187 + }, + "width": 54, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "d", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [ + { + "id": "(a <-> b)[0]", + "src": "a", + "srcArrow": "box", + "dst": "b", + "dstArrow": "box", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "box", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 25, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 26.5, + "y": 65.5 + }, + { + "x": 26.5, + "y": 114.30000305175781 + }, + { + "x": 26.5, + "y": 138.6999969482422 + }, + { + "x": 26.5, + "y": 187.5 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(c <-> d)[0]", + "src": "c", + "srcArrow": "filled-box", + "dst": "d", + "dstArrow": "filled-box", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "filled-box", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 63, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 140, + "y": 65.5 + }, + { + "x": 140, + "y": 114.30000305175781 + }, + { + "x": 140, + "y": 138.6999969482422 + }, + { + "x": 140, + "y": 187.5 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/stable/box_arrowhead/dagre/sketch.exp.svg b/e2etests/testdata/stable/box_arrowhead/dagre/sketch.exp.svg new file mode 100644 index 000000000..8ca6707ca --- /dev/null +++ b/e2etests/testdata/stable/box_arrowhead/dagre/sketch.exp.svg @@ -0,0 +1,107 @@ +abcd box filled-box + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/box_arrowhead/elk/board.exp.json b/e2etests/testdata/stable/box_arrowhead/elk/board.exp.json new file mode 100644 index 000000000..53fce85ad --- /dev/null +++ b/e2etests/testdata/stable/box_arrowhead/elk/board.exp.json @@ -0,0 +1,304 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "a", + "type": "rectangle", + "pos": { + "x": 12, + "y": 12 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "b", + "type": "rectangle", + "pos": { + "x": 12, + "y": 239 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "c", + "type": "rectangle", + "pos": { + "x": 85, + "y": 12 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "c", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "d", + "type": "rectangle", + "pos": { + "x": 85, + "y": 239 + }, + "width": 54, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "d", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [ + { + "id": "(a <-> b)[0]", + "src": "a", + "srcArrow": "box", + "dst": "b", + "dstArrow": "box", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "box", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 25, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 38.5, + "y": 78 + }, + { + "x": 38.5, + "y": 239 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(c <-> d)[0]", + "src": "c", + "srcArrow": "filled-box", + "dst": "d", + "dstArrow": "filled-box", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "filled-box", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 63, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 112, + "y": 78 + }, + { + "x": 112, + "y": 239 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/stable/box_arrowhead/elk/sketch.exp.svg b/e2etests/testdata/stable/box_arrowhead/elk/sketch.exp.svg new file mode 100644 index 000000000..2c7224700 --- /dev/null +++ b/e2etests/testdata/stable/box_arrowhead/elk/sketch.exp.svg @@ -0,0 +1,107 @@ +abcd box filled-box + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/br/dagre/board.exp.json b/e2etests/testdata/stable/br/dagre/board.exp.json index f41a46b19..55ac0c2be 100644 --- a/e2etests/testdata/stable/br/dagre/board.exp.json +++ b/e2etests/testdata/stable/br/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -60,6 +69,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/br/dagre/sketch.exp.svg b/e2etests/testdata/stable/br/dagre/sketch.exp.svg index 576c04407..bdee95ad9 100644 --- a/e2etests/testdata/stable/br/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/br/dagre/sketch.exp.svg @@ -1,13 +1,13 @@ -

    Headline 1

    +

    Headline 1

    Headline 2

    Lorem ipsum dolor

    @@ -840,7 +839,7 @@

    Headline 3

    This just disappears

    -
     +
     - +     \ No newline at end of file diff --git a/e2etests/testdata/stable/br/elk/board.exp.json b/e2etests/testdata/stable/br/elk/board.exp.json index c24afb1d0..d30975654 100644 --- a/e2etests/testdata/stable/br/elk/board.exp.json +++ b/e2etests/testdata/stable/br/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -60,6 +69,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/br/elk/sketch.exp.svg b/e2etests/testdata/stable/br/elk/sketch.exp.svg index 68966fbd1..a42f37463 100644 --- a/e2etests/testdata/stable/br/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/br/elk/sketch.exp.svg @@ -1,13 +1,13 @@ -

    Headline 1

    +

    Headline 1

    Headline 2

    Lorem ipsum dolor

    @@ -840,7 +839,7 @@

    Headline 3

    This just disappears

    -
     +
     - +     \ No newline at end of file diff --git a/e2etests/testdata/stable/centered_horizontal_connections/dagre/board.exp.json b/e2etests/testdata/stable/centered_horizontal_connections/dagre/board.exp.json index 56fda7bc9..c679f2f2c 100644 --- a/e2etests/testdata/stable/centered_horizontal_connections/dagre/board.exp.json +++ b/e2etests/testdata/stable/centered_horizontal_connections/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -21,6 +29,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -77,6 +86,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -164,6 +174,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 32, @@ -204,6 +215,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/centered_horizontal_connections/dagre/sketch.exp.svg b/e2etests/testdata/stable/centered_horizontal_connections/dagre/sketch.exp.svg index 1f20ba253..e133cce24 100644 --- a/e2etests/testdata/stable/centered_horizontal_connections/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/centered_horizontal_connections/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -r1r2 eth1eth1 + .d2-1416268184 .fill-N1{fill:#0A0F25;} + .d2-1416268184 .fill-N2{fill:#676C7E;} + .d2-1416268184 .fill-N3{fill:#9499AB;} + .d2-1416268184 .fill-N4{fill:#CFD2DD;} + .d2-1416268184 .fill-N5{fill:#DEE1EB;} + .d2-1416268184 .fill-N6{fill:#EEF1F8;} + .d2-1416268184 .fill-N7{fill:#FFFFFF;} + .d2-1416268184 .fill-B1{fill:#0D32B2;} + .d2-1416268184 .fill-B2{fill:#0D32B2;} + .d2-1416268184 .fill-B3{fill:#E3E9FD;} + .d2-1416268184 .fill-B4{fill:#E3E9FD;} + .d2-1416268184 .fill-B5{fill:#EDF0FD;} + .d2-1416268184 .fill-B6{fill:#F7F8FE;} + .d2-1416268184 .fill-AA2{fill:#4A6FF3;} + .d2-1416268184 .fill-AA4{fill:#EDF0FD;} + .d2-1416268184 .fill-AA5{fill:#F7F8FE;} + .d2-1416268184 .fill-AB4{fill:#EDF0FD;} + .d2-1416268184 .fill-AB5{fill:#F7F8FE;} + .d2-1416268184 .stroke-N1{stroke:#0A0F25;} + .d2-1416268184 .stroke-N2{stroke:#676C7E;} + .d2-1416268184 .stroke-N3{stroke:#9499AB;} + .d2-1416268184 .stroke-N4{stroke:#CFD2DD;} + .d2-1416268184 .stroke-N5{stroke:#DEE1EB;} + .d2-1416268184 .stroke-N6{stroke:#EEF1F8;} + .d2-1416268184 .stroke-N7{stroke:#FFFFFF;} + .d2-1416268184 .stroke-B1{stroke:#0D32B2;} + .d2-1416268184 .stroke-B2{stroke:#0D32B2;} + .d2-1416268184 .stroke-B3{stroke:#E3E9FD;} + .d2-1416268184 .stroke-B4{stroke:#E3E9FD;} + .d2-1416268184 .stroke-B5{stroke:#EDF0FD;} + .d2-1416268184 .stroke-B6{stroke:#F7F8FE;} + .d2-1416268184 .stroke-AA2{stroke:#4A6FF3;} + .d2-1416268184 .stroke-AA4{stroke:#EDF0FD;} + .d2-1416268184 .stroke-AA5{stroke:#F7F8FE;} + .d2-1416268184 .stroke-AB4{stroke:#EDF0FD;} + .d2-1416268184 .stroke-AB5{stroke:#F7F8FE;} + .d2-1416268184 .background-color-N1{background-color:#0A0F25;} + .d2-1416268184 .background-color-N2{background-color:#676C7E;} + .d2-1416268184 .background-color-N3{background-color:#9499AB;} + .d2-1416268184 .background-color-N4{background-color:#CFD2DD;} + .d2-1416268184 .background-color-N5{background-color:#DEE1EB;} + .d2-1416268184 .background-color-N6{background-color:#EEF1F8;} + .d2-1416268184 .background-color-N7{background-color:#FFFFFF;} + .d2-1416268184 .background-color-B1{background-color:#0D32B2;} + .d2-1416268184 .background-color-B2{background-color:#0D32B2;} + .d2-1416268184 .background-color-B3{background-color:#E3E9FD;} + .d2-1416268184 .background-color-B4{background-color:#E3E9FD;} + .d2-1416268184 .background-color-B5{background-color:#EDF0FD;} + .d2-1416268184 .background-color-B6{background-color:#F7F8FE;} + .d2-1416268184 .background-color-AA2{background-color:#4A6FF3;} + .d2-1416268184 .background-color-AA4{background-color:#EDF0FD;} + .d2-1416268184 .background-color-AA5{background-color:#F7F8FE;} + .d2-1416268184 .background-color-AB4{background-color:#EDF0FD;} + .d2-1416268184 .background-color-AB5{background-color:#F7F8FE;} + .d2-1416268184 .color-N1{color:#0A0F25;} + .d2-1416268184 .color-N2{color:#676C7E;} + .d2-1416268184 .color-N3{color:#9499AB;} + .d2-1416268184 .color-N4{color:#CFD2DD;} + .d2-1416268184 .color-N5{color:#DEE1EB;} + .d2-1416268184 .color-N6{color:#EEF1F8;} + .d2-1416268184 .color-N7{color:#FFFFFF;} + .d2-1416268184 .color-B1{color:#0D32B2;} + .d2-1416268184 .color-B2{color:#0D32B2;} + .d2-1416268184 .color-B3{color:#E3E9FD;} + .d2-1416268184 .color-B4{color:#E3E9FD;} + .d2-1416268184 .color-B5{color:#EDF0FD;} + .d2-1416268184 .color-B6{color:#F7F8FE;} + .d2-1416268184 .color-AA2{color:#4A6FF3;} + .d2-1416268184 .color-AA4{color:#EDF0FD;} + .d2-1416268184 .color-AA5{color:#F7F8FE;} + .d2-1416268184 .color-AB4{color:#EDF0FD;} + .d2-1416268184 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1416268184);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1416268184);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1416268184);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1416268184);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1416268184);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1416268184);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1416268184);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1416268184);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1416268184);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1416268184);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1416268184);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1416268184);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1416268184);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1416268184);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1416268184);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1416268184);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1416268184);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1416268184);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>r1r2 eth1eth1 - - + + \ No newline at end of file diff --git a/e2etests/testdata/stable/centered_horizontal_connections/elk/board.exp.json b/e2etests/testdata/stable/centered_horizontal_connections/elk/board.exp.json index fdf65ac74..9e42b6595 100644 --- a/e2etests/testdata/stable/centered_horizontal_connections/elk/board.exp.json +++ b/e2etests/testdata/stable/centered_horizontal_connections/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -21,6 +29,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -77,6 +86,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -164,6 +174,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 44, @@ -195,6 +206,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/centered_horizontal_connections/elk/sketch.exp.svg b/e2etests/testdata/stable/centered_horizontal_connections/elk/sketch.exp.svg index 7430d7a3e..cc2ef60c7 100644 --- a/e2etests/testdata/stable/centered_horizontal_connections/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/centered_horizontal_connections/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -r1r2 eth1eth1 + .d2-2796079875 .fill-N1{fill:#0A0F25;} + .d2-2796079875 .fill-N2{fill:#676C7E;} + .d2-2796079875 .fill-N3{fill:#9499AB;} + .d2-2796079875 .fill-N4{fill:#CFD2DD;} + .d2-2796079875 .fill-N5{fill:#DEE1EB;} + .d2-2796079875 .fill-N6{fill:#EEF1F8;} + .d2-2796079875 .fill-N7{fill:#FFFFFF;} + .d2-2796079875 .fill-B1{fill:#0D32B2;} + .d2-2796079875 .fill-B2{fill:#0D32B2;} + .d2-2796079875 .fill-B3{fill:#E3E9FD;} + .d2-2796079875 .fill-B4{fill:#E3E9FD;} + .d2-2796079875 .fill-B5{fill:#EDF0FD;} + .d2-2796079875 .fill-B6{fill:#F7F8FE;} + .d2-2796079875 .fill-AA2{fill:#4A6FF3;} + .d2-2796079875 .fill-AA4{fill:#EDF0FD;} + .d2-2796079875 .fill-AA5{fill:#F7F8FE;} + .d2-2796079875 .fill-AB4{fill:#EDF0FD;} + .d2-2796079875 .fill-AB5{fill:#F7F8FE;} + .d2-2796079875 .stroke-N1{stroke:#0A0F25;} + .d2-2796079875 .stroke-N2{stroke:#676C7E;} + .d2-2796079875 .stroke-N3{stroke:#9499AB;} + .d2-2796079875 .stroke-N4{stroke:#CFD2DD;} + .d2-2796079875 .stroke-N5{stroke:#DEE1EB;} + .d2-2796079875 .stroke-N6{stroke:#EEF1F8;} + .d2-2796079875 .stroke-N7{stroke:#FFFFFF;} + .d2-2796079875 .stroke-B1{stroke:#0D32B2;} + .d2-2796079875 .stroke-B2{stroke:#0D32B2;} + .d2-2796079875 .stroke-B3{stroke:#E3E9FD;} + .d2-2796079875 .stroke-B4{stroke:#E3E9FD;} + .d2-2796079875 .stroke-B5{stroke:#EDF0FD;} + .d2-2796079875 .stroke-B6{stroke:#F7F8FE;} + .d2-2796079875 .stroke-AA2{stroke:#4A6FF3;} + .d2-2796079875 .stroke-AA4{stroke:#EDF0FD;} + .d2-2796079875 .stroke-AA5{stroke:#F7F8FE;} + .d2-2796079875 .stroke-AB4{stroke:#EDF0FD;} + .d2-2796079875 .stroke-AB5{stroke:#F7F8FE;} + .d2-2796079875 .background-color-N1{background-color:#0A0F25;} + .d2-2796079875 .background-color-N2{background-color:#676C7E;} + .d2-2796079875 .background-color-N3{background-color:#9499AB;} + .d2-2796079875 .background-color-N4{background-color:#CFD2DD;} + .d2-2796079875 .background-color-N5{background-color:#DEE1EB;} + .d2-2796079875 .background-color-N6{background-color:#EEF1F8;} + .d2-2796079875 .background-color-N7{background-color:#FFFFFF;} + .d2-2796079875 .background-color-B1{background-color:#0D32B2;} + .d2-2796079875 .background-color-B2{background-color:#0D32B2;} + .d2-2796079875 .background-color-B3{background-color:#E3E9FD;} + .d2-2796079875 .background-color-B4{background-color:#E3E9FD;} + .d2-2796079875 .background-color-B5{background-color:#EDF0FD;} + .d2-2796079875 .background-color-B6{background-color:#F7F8FE;} + .d2-2796079875 .background-color-AA2{background-color:#4A6FF3;} + .d2-2796079875 .background-color-AA4{background-color:#EDF0FD;} + .d2-2796079875 .background-color-AA5{background-color:#F7F8FE;} + .d2-2796079875 .background-color-AB4{background-color:#EDF0FD;} + .d2-2796079875 .background-color-AB5{background-color:#F7F8FE;} + .d2-2796079875 .color-N1{color:#0A0F25;} + .d2-2796079875 .color-N2{color:#676C7E;} + .d2-2796079875 .color-N3{color:#9499AB;} + .d2-2796079875 .color-N4{color:#CFD2DD;} + .d2-2796079875 .color-N5{color:#DEE1EB;} + .d2-2796079875 .color-N6{color:#EEF1F8;} + .d2-2796079875 .color-N7{color:#FFFFFF;} + .d2-2796079875 .color-B1{color:#0D32B2;} + .d2-2796079875 .color-B2{color:#0D32B2;} + .d2-2796079875 .color-B3{color:#E3E9FD;} + .d2-2796079875 .color-B4{color:#E3E9FD;} + .d2-2796079875 .color-B5{color:#EDF0FD;} + .d2-2796079875 .color-B6{color:#F7F8FE;} + .d2-2796079875 .color-AA2{color:#4A6FF3;} + .d2-2796079875 .color-AA4{color:#EDF0FD;} + .d2-2796079875 .color-AA5{color:#F7F8FE;} + .d2-2796079875 .color-AB4{color:#EDF0FD;} + .d2-2796079875 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2796079875);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2796079875);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2796079875);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2796079875);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2796079875);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2796079875);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2796079875);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2796079875);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2796079875);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2796079875);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2796079875);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2796079875);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2796079875);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2796079875);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2796079875);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2796079875);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2796079875);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2796079875);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>r1r2 eth1eth1 - - + + \ No newline at end of file diff --git a/e2etests/testdata/stable/chaos2/dagre/board.exp.json b/e2etests/testdata/stable/chaos2/dagre/board.exp.json index 6ebf9adfc..279989389 100644 --- a/e2etests/testdata/stable/chaos2/dagre/board.exp.json +++ b/e2etests/testdata/stable/chaos2/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -222,6 +235,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -263,6 +277,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -303,6 +318,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -344,6 +360,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -385,6 +402,7 @@ "borderRadius": 0, "fill": "N4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -426,6 +444,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -467,6 +486,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -508,6 +528,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -549,6 +570,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -589,6 +611,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -640,6 +663,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 109.75, @@ -687,6 +711,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 179.75, @@ -734,6 +759,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 192, @@ -805,6 +831,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 675.75, @@ -843,6 +870,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 667, @@ -890,6 +918,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 703, @@ -949,6 +978,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 667, @@ -987,6 +1017,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 675.75, @@ -1034,6 +1065,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 667, @@ -1081,6 +1113,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 294.75, @@ -1119,6 +1152,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 403, @@ -1195,6 +1229,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/chaos2/dagre/sketch.exp.svg b/e2etests/testdata/stable/chaos2/dagre/sketch.exp.svg index 5303969e5..d56ba0bd4 100644 --- a/e2etests/testdata/stable/chaos2/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/chaos2/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -aabbllmmnnoocciikkddgghhjjeeff1122 334455667788 + .d2-1133025763 .fill-N1{fill:#0A0F25;} + .d2-1133025763 .fill-N2{fill:#676C7E;} + .d2-1133025763 .fill-N3{fill:#9499AB;} + .d2-1133025763 .fill-N4{fill:#CFD2DD;} + .d2-1133025763 .fill-N5{fill:#DEE1EB;} + .d2-1133025763 .fill-N6{fill:#EEF1F8;} + .d2-1133025763 .fill-N7{fill:#FFFFFF;} + .d2-1133025763 .fill-B1{fill:#0D32B2;} + .d2-1133025763 .fill-B2{fill:#0D32B2;} + .d2-1133025763 .fill-B3{fill:#E3E9FD;} + .d2-1133025763 .fill-B4{fill:#E3E9FD;} + .d2-1133025763 .fill-B5{fill:#EDF0FD;} + .d2-1133025763 .fill-B6{fill:#F7F8FE;} + .d2-1133025763 .fill-AA2{fill:#4A6FF3;} + .d2-1133025763 .fill-AA4{fill:#EDF0FD;} + .d2-1133025763 .fill-AA5{fill:#F7F8FE;} + .d2-1133025763 .fill-AB4{fill:#EDF0FD;} + .d2-1133025763 .fill-AB5{fill:#F7F8FE;} + .d2-1133025763 .stroke-N1{stroke:#0A0F25;} + .d2-1133025763 .stroke-N2{stroke:#676C7E;} + .d2-1133025763 .stroke-N3{stroke:#9499AB;} + .d2-1133025763 .stroke-N4{stroke:#CFD2DD;} + .d2-1133025763 .stroke-N5{stroke:#DEE1EB;} + .d2-1133025763 .stroke-N6{stroke:#EEF1F8;} + .d2-1133025763 .stroke-N7{stroke:#FFFFFF;} + .d2-1133025763 .stroke-B1{stroke:#0D32B2;} + .d2-1133025763 .stroke-B2{stroke:#0D32B2;} + .d2-1133025763 .stroke-B3{stroke:#E3E9FD;} + .d2-1133025763 .stroke-B4{stroke:#E3E9FD;} + .d2-1133025763 .stroke-B5{stroke:#EDF0FD;} + .d2-1133025763 .stroke-B6{stroke:#F7F8FE;} + .d2-1133025763 .stroke-AA2{stroke:#4A6FF3;} + .d2-1133025763 .stroke-AA4{stroke:#EDF0FD;} + .d2-1133025763 .stroke-AA5{stroke:#F7F8FE;} + .d2-1133025763 .stroke-AB4{stroke:#EDF0FD;} + .d2-1133025763 .stroke-AB5{stroke:#F7F8FE;} + .d2-1133025763 .background-color-N1{background-color:#0A0F25;} + .d2-1133025763 .background-color-N2{background-color:#676C7E;} + .d2-1133025763 .background-color-N3{background-color:#9499AB;} + .d2-1133025763 .background-color-N4{background-color:#CFD2DD;} + .d2-1133025763 .background-color-N5{background-color:#DEE1EB;} + .d2-1133025763 .background-color-N6{background-color:#EEF1F8;} + .d2-1133025763 .background-color-N7{background-color:#FFFFFF;} + .d2-1133025763 .background-color-B1{background-color:#0D32B2;} + .d2-1133025763 .background-color-B2{background-color:#0D32B2;} + .d2-1133025763 .background-color-B3{background-color:#E3E9FD;} + .d2-1133025763 .background-color-B4{background-color:#E3E9FD;} + .d2-1133025763 .background-color-B5{background-color:#EDF0FD;} + .d2-1133025763 .background-color-B6{background-color:#F7F8FE;} + .d2-1133025763 .background-color-AA2{background-color:#4A6FF3;} + .d2-1133025763 .background-color-AA4{background-color:#EDF0FD;} + .d2-1133025763 .background-color-AA5{background-color:#F7F8FE;} + .d2-1133025763 .background-color-AB4{background-color:#EDF0FD;} + .d2-1133025763 .background-color-AB5{background-color:#F7F8FE;} + .d2-1133025763 .color-N1{color:#0A0F25;} + .d2-1133025763 .color-N2{color:#676C7E;} + .d2-1133025763 .color-N3{color:#9499AB;} + .d2-1133025763 .color-N4{color:#CFD2DD;} + .d2-1133025763 .color-N5{color:#DEE1EB;} + .d2-1133025763 .color-N6{color:#EEF1F8;} + .d2-1133025763 .color-N7{color:#FFFFFF;} + .d2-1133025763 .color-B1{color:#0D32B2;} + .d2-1133025763 .color-B2{color:#0D32B2;} + .d2-1133025763 .color-B3{color:#E3E9FD;} + .d2-1133025763 .color-B4{color:#E3E9FD;} + .d2-1133025763 .color-B5{color:#EDF0FD;} + .d2-1133025763 .color-B6{color:#F7F8FE;} + .d2-1133025763 .color-AA2{color:#4A6FF3;} + .d2-1133025763 .color-AA4{color:#EDF0FD;} + .d2-1133025763 .color-AA5{color:#F7F8FE;} + .d2-1133025763 .color-AB4{color:#EDF0FD;} + .d2-1133025763 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1133025763);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1133025763);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1133025763);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1133025763);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1133025763);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1133025763);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1133025763);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1133025763);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1133025763);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1133025763);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1133025763);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1133025763);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1133025763);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1133025763);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1133025763);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1133025763);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1133025763);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1133025763);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>aabbllmmnnoocciikkddgghhjjeeff1122 334455667788 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/chaos2/elk/board.exp.json b/e2etests/testdata/stable/chaos2/elk/board.exp.json index 41bc1c8b2..ddfba9ceb 100644 --- a/e2etests/testdata/stable/chaos2/elk/board.exp.json +++ b/e2etests/testdata/stable/chaos2/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -222,6 +235,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -263,6 +277,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -303,6 +318,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -344,6 +360,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -385,6 +402,7 @@ "borderRadius": 0, "fill": "N4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -426,6 +444,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -467,6 +486,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -508,6 +528,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -549,6 +570,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -589,6 +611,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -640,6 +663,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 349, @@ -686,6 +710,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 436.5, @@ -724,6 +749,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 250, @@ -770,6 +796,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 279.8330078125, @@ -824,6 +851,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 409, @@ -870,6 +898,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 441, @@ -924,6 +953,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 377, @@ -962,6 +992,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 339.8330078125, @@ -1024,6 +1055,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 345, @@ -1070,6 +1102,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 309.6659851074219, @@ -1116,6 +1149,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 200, @@ -1155,6 +1189,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/chaos2/elk/sketch.exp.svg b/e2etests/testdata/stable/chaos2/elk/sketch.exp.svg index 79a5c0809..eb08f18eb 100644 --- a/e2etests/testdata/stable/chaos2/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/chaos2/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -aabbllmmnnoocciikkddgghhjjeeff1122 334455667788 + .d2-3265274365 .fill-N1{fill:#0A0F25;} + .d2-3265274365 .fill-N2{fill:#676C7E;} + .d2-3265274365 .fill-N3{fill:#9499AB;} + .d2-3265274365 .fill-N4{fill:#CFD2DD;} + .d2-3265274365 .fill-N5{fill:#DEE1EB;} + .d2-3265274365 .fill-N6{fill:#EEF1F8;} + .d2-3265274365 .fill-N7{fill:#FFFFFF;} + .d2-3265274365 .fill-B1{fill:#0D32B2;} + .d2-3265274365 .fill-B2{fill:#0D32B2;} + .d2-3265274365 .fill-B3{fill:#E3E9FD;} + .d2-3265274365 .fill-B4{fill:#E3E9FD;} + .d2-3265274365 .fill-B5{fill:#EDF0FD;} + .d2-3265274365 .fill-B6{fill:#F7F8FE;} + .d2-3265274365 .fill-AA2{fill:#4A6FF3;} + .d2-3265274365 .fill-AA4{fill:#EDF0FD;} + .d2-3265274365 .fill-AA5{fill:#F7F8FE;} + .d2-3265274365 .fill-AB4{fill:#EDF0FD;} + .d2-3265274365 .fill-AB5{fill:#F7F8FE;} + .d2-3265274365 .stroke-N1{stroke:#0A0F25;} + .d2-3265274365 .stroke-N2{stroke:#676C7E;} + .d2-3265274365 .stroke-N3{stroke:#9499AB;} + .d2-3265274365 .stroke-N4{stroke:#CFD2DD;} + .d2-3265274365 .stroke-N5{stroke:#DEE1EB;} + .d2-3265274365 .stroke-N6{stroke:#EEF1F8;} + .d2-3265274365 .stroke-N7{stroke:#FFFFFF;} + .d2-3265274365 .stroke-B1{stroke:#0D32B2;} + .d2-3265274365 .stroke-B2{stroke:#0D32B2;} + .d2-3265274365 .stroke-B3{stroke:#E3E9FD;} + .d2-3265274365 .stroke-B4{stroke:#E3E9FD;} + .d2-3265274365 .stroke-B5{stroke:#EDF0FD;} + .d2-3265274365 .stroke-B6{stroke:#F7F8FE;} + .d2-3265274365 .stroke-AA2{stroke:#4A6FF3;} + .d2-3265274365 .stroke-AA4{stroke:#EDF0FD;} + .d2-3265274365 .stroke-AA5{stroke:#F7F8FE;} + .d2-3265274365 .stroke-AB4{stroke:#EDF0FD;} + .d2-3265274365 .stroke-AB5{stroke:#F7F8FE;} + .d2-3265274365 .background-color-N1{background-color:#0A0F25;} + .d2-3265274365 .background-color-N2{background-color:#676C7E;} + .d2-3265274365 .background-color-N3{background-color:#9499AB;} + .d2-3265274365 .background-color-N4{background-color:#CFD2DD;} + .d2-3265274365 .background-color-N5{background-color:#DEE1EB;} + .d2-3265274365 .background-color-N6{background-color:#EEF1F8;} + .d2-3265274365 .background-color-N7{background-color:#FFFFFF;} + .d2-3265274365 .background-color-B1{background-color:#0D32B2;} + .d2-3265274365 .background-color-B2{background-color:#0D32B2;} + .d2-3265274365 .background-color-B3{background-color:#E3E9FD;} + .d2-3265274365 .background-color-B4{background-color:#E3E9FD;} + .d2-3265274365 .background-color-B5{background-color:#EDF0FD;} + .d2-3265274365 .background-color-B6{background-color:#F7F8FE;} + .d2-3265274365 .background-color-AA2{background-color:#4A6FF3;} + .d2-3265274365 .background-color-AA4{background-color:#EDF0FD;} + .d2-3265274365 .background-color-AA5{background-color:#F7F8FE;} + .d2-3265274365 .background-color-AB4{background-color:#EDF0FD;} + .d2-3265274365 .background-color-AB5{background-color:#F7F8FE;} + .d2-3265274365 .color-N1{color:#0A0F25;} + .d2-3265274365 .color-N2{color:#676C7E;} + .d2-3265274365 .color-N3{color:#9499AB;} + .d2-3265274365 .color-N4{color:#CFD2DD;} + .d2-3265274365 .color-N5{color:#DEE1EB;} + .d2-3265274365 .color-N6{color:#EEF1F8;} + .d2-3265274365 .color-N7{color:#FFFFFF;} + .d2-3265274365 .color-B1{color:#0D32B2;} + .d2-3265274365 .color-B2{color:#0D32B2;} + .d2-3265274365 .color-B3{color:#E3E9FD;} + .d2-3265274365 .color-B4{color:#E3E9FD;} + .d2-3265274365 .color-B5{color:#EDF0FD;} + .d2-3265274365 .color-B6{color:#F7F8FE;} + .d2-3265274365 .color-AA2{color:#4A6FF3;} + .d2-3265274365 .color-AA4{color:#EDF0FD;} + .d2-3265274365 .color-AA5{color:#F7F8FE;} + .d2-3265274365 .color-AB4{color:#EDF0FD;} + .d2-3265274365 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3265274365);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3265274365);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3265274365);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3265274365);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3265274365);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3265274365);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3265274365);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3265274365);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3265274365);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3265274365);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3265274365);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3265274365);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3265274365);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3265274365);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3265274365);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3265274365);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3265274365);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3265274365);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>aabbllmmnnoocciikkddgghhjjeeff1122 334455667788 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/circle_arrowhead/dagre/board.exp.json b/e2etests/testdata/stable/circle_arrowhead/dagre/board.exp.json index 233454bdb..7886258f0 100644 --- a/e2etests/testdata/stable/circle_arrowhead/dagre/board.exp.json +++ b/e2etests/testdata/stable/circle_arrowhead/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -192,6 +204,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 26.5, @@ -239,6 +252,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 140, @@ -279,6 +293,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/circle_arrowhead/dagre/sketch.exp.svg b/e2etests/testdata/stable/circle_arrowhead/dagre/sketch.exp.svg index 8f9efe08d..38ccfef4f 100644 --- a/e2etests/testdata/stable/circle_arrowhead/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/circle_arrowhead/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -abcd circle filled-circle + .d2-2729429697 .fill-N1{fill:#0A0F25;} + .d2-2729429697 .fill-N2{fill:#676C7E;} + .d2-2729429697 .fill-N3{fill:#9499AB;} + .d2-2729429697 .fill-N4{fill:#CFD2DD;} + .d2-2729429697 .fill-N5{fill:#DEE1EB;} + .d2-2729429697 .fill-N6{fill:#EEF1F8;} + .d2-2729429697 .fill-N7{fill:#FFFFFF;} + .d2-2729429697 .fill-B1{fill:#0D32B2;} + .d2-2729429697 .fill-B2{fill:#0D32B2;} + .d2-2729429697 .fill-B3{fill:#E3E9FD;} + .d2-2729429697 .fill-B4{fill:#E3E9FD;} + .d2-2729429697 .fill-B5{fill:#EDF0FD;} + .d2-2729429697 .fill-B6{fill:#F7F8FE;} + .d2-2729429697 .fill-AA2{fill:#4A6FF3;} + .d2-2729429697 .fill-AA4{fill:#EDF0FD;} + .d2-2729429697 .fill-AA5{fill:#F7F8FE;} + .d2-2729429697 .fill-AB4{fill:#EDF0FD;} + .d2-2729429697 .fill-AB5{fill:#F7F8FE;} + .d2-2729429697 .stroke-N1{stroke:#0A0F25;} + .d2-2729429697 .stroke-N2{stroke:#676C7E;} + .d2-2729429697 .stroke-N3{stroke:#9499AB;} + .d2-2729429697 .stroke-N4{stroke:#CFD2DD;} + .d2-2729429697 .stroke-N5{stroke:#DEE1EB;} + .d2-2729429697 .stroke-N6{stroke:#EEF1F8;} + .d2-2729429697 .stroke-N7{stroke:#FFFFFF;} + .d2-2729429697 .stroke-B1{stroke:#0D32B2;} + .d2-2729429697 .stroke-B2{stroke:#0D32B2;} + .d2-2729429697 .stroke-B3{stroke:#E3E9FD;} + .d2-2729429697 .stroke-B4{stroke:#E3E9FD;} + .d2-2729429697 .stroke-B5{stroke:#EDF0FD;} + .d2-2729429697 .stroke-B6{stroke:#F7F8FE;} + .d2-2729429697 .stroke-AA2{stroke:#4A6FF3;} + .d2-2729429697 .stroke-AA4{stroke:#EDF0FD;} + .d2-2729429697 .stroke-AA5{stroke:#F7F8FE;} + .d2-2729429697 .stroke-AB4{stroke:#EDF0FD;} + .d2-2729429697 .stroke-AB5{stroke:#F7F8FE;} + .d2-2729429697 .background-color-N1{background-color:#0A0F25;} + .d2-2729429697 .background-color-N2{background-color:#676C7E;} + .d2-2729429697 .background-color-N3{background-color:#9499AB;} + .d2-2729429697 .background-color-N4{background-color:#CFD2DD;} + .d2-2729429697 .background-color-N5{background-color:#DEE1EB;} + .d2-2729429697 .background-color-N6{background-color:#EEF1F8;} + .d2-2729429697 .background-color-N7{background-color:#FFFFFF;} + .d2-2729429697 .background-color-B1{background-color:#0D32B2;} + .d2-2729429697 .background-color-B2{background-color:#0D32B2;} + .d2-2729429697 .background-color-B3{background-color:#E3E9FD;} + .d2-2729429697 .background-color-B4{background-color:#E3E9FD;} + .d2-2729429697 .background-color-B5{background-color:#EDF0FD;} + .d2-2729429697 .background-color-B6{background-color:#F7F8FE;} + .d2-2729429697 .background-color-AA2{background-color:#4A6FF3;} + .d2-2729429697 .background-color-AA4{background-color:#EDF0FD;} + .d2-2729429697 .background-color-AA5{background-color:#F7F8FE;} + .d2-2729429697 .background-color-AB4{background-color:#EDF0FD;} + .d2-2729429697 .background-color-AB5{background-color:#F7F8FE;} + .d2-2729429697 .color-N1{color:#0A0F25;} + .d2-2729429697 .color-N2{color:#676C7E;} + .d2-2729429697 .color-N3{color:#9499AB;} + .d2-2729429697 .color-N4{color:#CFD2DD;} + .d2-2729429697 .color-N5{color:#DEE1EB;} + .d2-2729429697 .color-N6{color:#EEF1F8;} + .d2-2729429697 .color-N7{color:#FFFFFF;} + .d2-2729429697 .color-B1{color:#0D32B2;} + .d2-2729429697 .color-B2{color:#0D32B2;} + .d2-2729429697 .color-B3{color:#E3E9FD;} + .d2-2729429697 .color-B4{color:#E3E9FD;} + .d2-2729429697 .color-B5{color:#EDF0FD;} + .d2-2729429697 .color-B6{color:#F7F8FE;} + .d2-2729429697 .color-AA2{color:#4A6FF3;} + .d2-2729429697 .color-AA4{color:#EDF0FD;} + .d2-2729429697 .color-AA5{color:#F7F8FE;} + .d2-2729429697 .color-AB4{color:#EDF0FD;} + .d2-2729429697 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2729429697);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2729429697);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2729429697);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2729429697);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2729429697);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2729429697);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2729429697);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2729429697);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2729429697);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2729429697);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2729429697);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2729429697);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2729429697);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2729429697);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2729429697);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2729429697);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2729429697);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2729429697);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcd circle filled-circle - - - - - - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/circle_arrowhead/elk/board.exp.json b/e2etests/testdata/stable/circle_arrowhead/elk/board.exp.json index 58861b443..334a30b18 100644 --- a/e2etests/testdata/stable/circle_arrowhead/elk/board.exp.json +++ b/e2etests/testdata/stable/circle_arrowhead/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -192,6 +204,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 38.5, @@ -230,6 +243,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 112, @@ -261,6 +275,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/circle_arrowhead/elk/sketch.exp.svg b/e2etests/testdata/stable/circle_arrowhead/elk/sketch.exp.svg index 454bb35ec..0eef4cffd 100644 --- a/e2etests/testdata/stable/circle_arrowhead/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/circle_arrowhead/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -abcd circle filled-circle + .d2-1098479644 .fill-N1{fill:#0A0F25;} + .d2-1098479644 .fill-N2{fill:#676C7E;} + .d2-1098479644 .fill-N3{fill:#9499AB;} + .d2-1098479644 .fill-N4{fill:#CFD2DD;} + .d2-1098479644 .fill-N5{fill:#DEE1EB;} + .d2-1098479644 .fill-N6{fill:#EEF1F8;} + .d2-1098479644 .fill-N7{fill:#FFFFFF;} + .d2-1098479644 .fill-B1{fill:#0D32B2;} + .d2-1098479644 .fill-B2{fill:#0D32B2;} + .d2-1098479644 .fill-B3{fill:#E3E9FD;} + .d2-1098479644 .fill-B4{fill:#E3E9FD;} + .d2-1098479644 .fill-B5{fill:#EDF0FD;} + .d2-1098479644 .fill-B6{fill:#F7F8FE;} + .d2-1098479644 .fill-AA2{fill:#4A6FF3;} + .d2-1098479644 .fill-AA4{fill:#EDF0FD;} + .d2-1098479644 .fill-AA5{fill:#F7F8FE;} + .d2-1098479644 .fill-AB4{fill:#EDF0FD;} + .d2-1098479644 .fill-AB5{fill:#F7F8FE;} + .d2-1098479644 .stroke-N1{stroke:#0A0F25;} + .d2-1098479644 .stroke-N2{stroke:#676C7E;} + .d2-1098479644 .stroke-N3{stroke:#9499AB;} + .d2-1098479644 .stroke-N4{stroke:#CFD2DD;} + .d2-1098479644 .stroke-N5{stroke:#DEE1EB;} + .d2-1098479644 .stroke-N6{stroke:#EEF1F8;} + .d2-1098479644 .stroke-N7{stroke:#FFFFFF;} + .d2-1098479644 .stroke-B1{stroke:#0D32B2;} + .d2-1098479644 .stroke-B2{stroke:#0D32B2;} + .d2-1098479644 .stroke-B3{stroke:#E3E9FD;} + .d2-1098479644 .stroke-B4{stroke:#E3E9FD;} + .d2-1098479644 .stroke-B5{stroke:#EDF0FD;} + .d2-1098479644 .stroke-B6{stroke:#F7F8FE;} + .d2-1098479644 .stroke-AA2{stroke:#4A6FF3;} + .d2-1098479644 .stroke-AA4{stroke:#EDF0FD;} + .d2-1098479644 .stroke-AA5{stroke:#F7F8FE;} + .d2-1098479644 .stroke-AB4{stroke:#EDF0FD;} + .d2-1098479644 .stroke-AB5{stroke:#F7F8FE;} + .d2-1098479644 .background-color-N1{background-color:#0A0F25;} + .d2-1098479644 .background-color-N2{background-color:#676C7E;} + .d2-1098479644 .background-color-N3{background-color:#9499AB;} + .d2-1098479644 .background-color-N4{background-color:#CFD2DD;} + .d2-1098479644 .background-color-N5{background-color:#DEE1EB;} + .d2-1098479644 .background-color-N6{background-color:#EEF1F8;} + .d2-1098479644 .background-color-N7{background-color:#FFFFFF;} + .d2-1098479644 .background-color-B1{background-color:#0D32B2;} + .d2-1098479644 .background-color-B2{background-color:#0D32B2;} + .d2-1098479644 .background-color-B3{background-color:#E3E9FD;} + .d2-1098479644 .background-color-B4{background-color:#E3E9FD;} + .d2-1098479644 .background-color-B5{background-color:#EDF0FD;} + .d2-1098479644 .background-color-B6{background-color:#F7F8FE;} + .d2-1098479644 .background-color-AA2{background-color:#4A6FF3;} + .d2-1098479644 .background-color-AA4{background-color:#EDF0FD;} + .d2-1098479644 .background-color-AA5{background-color:#F7F8FE;} + .d2-1098479644 .background-color-AB4{background-color:#EDF0FD;} + .d2-1098479644 .background-color-AB5{background-color:#F7F8FE;} + .d2-1098479644 .color-N1{color:#0A0F25;} + .d2-1098479644 .color-N2{color:#676C7E;} + .d2-1098479644 .color-N3{color:#9499AB;} + .d2-1098479644 .color-N4{color:#CFD2DD;} + .d2-1098479644 .color-N5{color:#DEE1EB;} + .d2-1098479644 .color-N6{color:#EEF1F8;} + .d2-1098479644 .color-N7{color:#FFFFFF;} + .d2-1098479644 .color-B1{color:#0D32B2;} + .d2-1098479644 .color-B2{color:#0D32B2;} + .d2-1098479644 .color-B3{color:#E3E9FD;} + .d2-1098479644 .color-B4{color:#E3E9FD;} + .d2-1098479644 .color-B5{color:#EDF0FD;} + .d2-1098479644 .color-B6{color:#F7F8FE;} + .d2-1098479644 .color-AA2{color:#4A6FF3;} + .d2-1098479644 .color-AA4{color:#EDF0FD;} + .d2-1098479644 .color-AA5{color:#F7F8FE;} + .d2-1098479644 .color-AB4{color:#EDF0FD;} + .d2-1098479644 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1098479644);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1098479644);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1098479644);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1098479644);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1098479644);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1098479644);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1098479644);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1098479644);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1098479644);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1098479644);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1098479644);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1098479644);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1098479644);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1098479644);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1098479644);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1098479644);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1098479644);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1098479644);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcd circle filled-circle - - - - - - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/circular_dependency/dagre/board.exp.json b/e2etests/testdata/stable/circular_dependency/dagre/board.exp.json index 92810f68e..3d241bd64 100644 --- a/e2etests/testdata/stable/circular_dependency/dagre/board.exp.json +++ b/e2etests/testdata/stable/circular_dependency/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -151,6 +162,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 22.5, @@ -198,6 +210,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 22.5, @@ -245,6 +258,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 30.5, @@ -292,6 +306,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 30.5, @@ -332,6 +347,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/circular_dependency/dagre/sketch.exp.svg b/e2etests/testdata/stable/circular_dependency/dagre/sketch.exp.svg index 38d2810d0..03f389a10 100644 --- a/e2etests/testdata/stable/circular_dependency/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/circular_dependency/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abc + .d2-2537448920 .fill-N1{fill:#0A0F25;} + .d2-2537448920 .fill-N2{fill:#676C7E;} + .d2-2537448920 .fill-N3{fill:#9499AB;} + .d2-2537448920 .fill-N4{fill:#CFD2DD;} + .d2-2537448920 .fill-N5{fill:#DEE1EB;} + .d2-2537448920 .fill-N6{fill:#EEF1F8;} + .d2-2537448920 .fill-N7{fill:#FFFFFF;} + .d2-2537448920 .fill-B1{fill:#0D32B2;} + .d2-2537448920 .fill-B2{fill:#0D32B2;} + .d2-2537448920 .fill-B3{fill:#E3E9FD;} + .d2-2537448920 .fill-B4{fill:#E3E9FD;} + .d2-2537448920 .fill-B5{fill:#EDF0FD;} + .d2-2537448920 .fill-B6{fill:#F7F8FE;} + .d2-2537448920 .fill-AA2{fill:#4A6FF3;} + .d2-2537448920 .fill-AA4{fill:#EDF0FD;} + .d2-2537448920 .fill-AA5{fill:#F7F8FE;} + .d2-2537448920 .fill-AB4{fill:#EDF0FD;} + .d2-2537448920 .fill-AB5{fill:#F7F8FE;} + .d2-2537448920 .stroke-N1{stroke:#0A0F25;} + .d2-2537448920 .stroke-N2{stroke:#676C7E;} + .d2-2537448920 .stroke-N3{stroke:#9499AB;} + .d2-2537448920 .stroke-N4{stroke:#CFD2DD;} + .d2-2537448920 .stroke-N5{stroke:#DEE1EB;} + .d2-2537448920 .stroke-N6{stroke:#EEF1F8;} + .d2-2537448920 .stroke-N7{stroke:#FFFFFF;} + .d2-2537448920 .stroke-B1{stroke:#0D32B2;} + .d2-2537448920 .stroke-B2{stroke:#0D32B2;} + .d2-2537448920 .stroke-B3{stroke:#E3E9FD;} + .d2-2537448920 .stroke-B4{stroke:#E3E9FD;} + .d2-2537448920 .stroke-B5{stroke:#EDF0FD;} + .d2-2537448920 .stroke-B6{stroke:#F7F8FE;} + .d2-2537448920 .stroke-AA2{stroke:#4A6FF3;} + .d2-2537448920 .stroke-AA4{stroke:#EDF0FD;} + .d2-2537448920 .stroke-AA5{stroke:#F7F8FE;} + .d2-2537448920 .stroke-AB4{stroke:#EDF0FD;} + .d2-2537448920 .stroke-AB5{stroke:#F7F8FE;} + .d2-2537448920 .background-color-N1{background-color:#0A0F25;} + .d2-2537448920 .background-color-N2{background-color:#676C7E;} + .d2-2537448920 .background-color-N3{background-color:#9499AB;} + .d2-2537448920 .background-color-N4{background-color:#CFD2DD;} + .d2-2537448920 .background-color-N5{background-color:#DEE1EB;} + .d2-2537448920 .background-color-N6{background-color:#EEF1F8;} + .d2-2537448920 .background-color-N7{background-color:#FFFFFF;} + .d2-2537448920 .background-color-B1{background-color:#0D32B2;} + .d2-2537448920 .background-color-B2{background-color:#0D32B2;} + .d2-2537448920 .background-color-B3{background-color:#E3E9FD;} + .d2-2537448920 .background-color-B4{background-color:#E3E9FD;} + .d2-2537448920 .background-color-B5{background-color:#EDF0FD;} + .d2-2537448920 .background-color-B6{background-color:#F7F8FE;} + .d2-2537448920 .background-color-AA2{background-color:#4A6FF3;} + .d2-2537448920 .background-color-AA4{background-color:#EDF0FD;} + .d2-2537448920 .background-color-AA5{background-color:#F7F8FE;} + .d2-2537448920 .background-color-AB4{background-color:#EDF0FD;} + .d2-2537448920 .background-color-AB5{background-color:#F7F8FE;} + .d2-2537448920 .color-N1{color:#0A0F25;} + .d2-2537448920 .color-N2{color:#676C7E;} + .d2-2537448920 .color-N3{color:#9499AB;} + .d2-2537448920 .color-N4{color:#CFD2DD;} + .d2-2537448920 .color-N5{color:#DEE1EB;} + .d2-2537448920 .color-N6{color:#EEF1F8;} + .d2-2537448920 .color-N7{color:#FFFFFF;} + .d2-2537448920 .color-B1{color:#0D32B2;} + .d2-2537448920 .color-B2{color:#0D32B2;} + .d2-2537448920 .color-B3{color:#E3E9FD;} + .d2-2537448920 .color-B4{color:#E3E9FD;} + .d2-2537448920 .color-B5{color:#EDF0FD;} + .d2-2537448920 .color-B6{color:#F7F8FE;} + .d2-2537448920 .color-AA2{color:#4A6FF3;} + .d2-2537448920 .color-AA4{color:#EDF0FD;} + .d2-2537448920 .color-AA5{color:#F7F8FE;} + .d2-2537448920 .color-AB4{color:#EDF0FD;} + .d2-2537448920 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2537448920);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2537448920);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2537448920);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2537448920);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2537448920);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2537448920);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2537448920);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2537448920);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2537448920);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2537448920);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2537448920);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2537448920);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2537448920);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2537448920);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2537448920);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2537448920);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2537448920);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2537448920);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abc - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/circular_dependency/elk/board.exp.json b/e2etests/testdata/stable/circular_dependency/elk/board.exp.json index 2fa8fc7c5..9337f4351 100644 --- a/e2etests/testdata/stable/circular_dependency/elk/board.exp.json +++ b/e2etests/testdata/stable/circular_dependency/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -151,6 +162,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 38.66600036621094, @@ -189,6 +201,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 38.66600036621094, @@ -227,6 +240,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 65.33300018310547, @@ -265,6 +279,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 60.83300018310547, @@ -296,6 +311,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/circular_dependency/elk/sketch.exp.svg b/e2etests/testdata/stable/circular_dependency/elk/sketch.exp.svg index f095238cd..e22bf2171 100644 --- a/e2etests/testdata/stable/circular_dependency/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/circular_dependency/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abc + .d2-867816087 .fill-N1{fill:#0A0F25;} + .d2-867816087 .fill-N2{fill:#676C7E;} + .d2-867816087 .fill-N3{fill:#9499AB;} + .d2-867816087 .fill-N4{fill:#CFD2DD;} + .d2-867816087 .fill-N5{fill:#DEE1EB;} + .d2-867816087 .fill-N6{fill:#EEF1F8;} + .d2-867816087 .fill-N7{fill:#FFFFFF;} + .d2-867816087 .fill-B1{fill:#0D32B2;} + .d2-867816087 .fill-B2{fill:#0D32B2;} + .d2-867816087 .fill-B3{fill:#E3E9FD;} + .d2-867816087 .fill-B4{fill:#E3E9FD;} + .d2-867816087 .fill-B5{fill:#EDF0FD;} + .d2-867816087 .fill-B6{fill:#F7F8FE;} + .d2-867816087 .fill-AA2{fill:#4A6FF3;} + .d2-867816087 .fill-AA4{fill:#EDF0FD;} + .d2-867816087 .fill-AA5{fill:#F7F8FE;} + .d2-867816087 .fill-AB4{fill:#EDF0FD;} + .d2-867816087 .fill-AB5{fill:#F7F8FE;} + .d2-867816087 .stroke-N1{stroke:#0A0F25;} + .d2-867816087 .stroke-N2{stroke:#676C7E;} + .d2-867816087 .stroke-N3{stroke:#9499AB;} + .d2-867816087 .stroke-N4{stroke:#CFD2DD;} + .d2-867816087 .stroke-N5{stroke:#DEE1EB;} + .d2-867816087 .stroke-N6{stroke:#EEF1F8;} + .d2-867816087 .stroke-N7{stroke:#FFFFFF;} + .d2-867816087 .stroke-B1{stroke:#0D32B2;} + .d2-867816087 .stroke-B2{stroke:#0D32B2;} + .d2-867816087 .stroke-B3{stroke:#E3E9FD;} + .d2-867816087 .stroke-B4{stroke:#E3E9FD;} + .d2-867816087 .stroke-B5{stroke:#EDF0FD;} + .d2-867816087 .stroke-B6{stroke:#F7F8FE;} + .d2-867816087 .stroke-AA2{stroke:#4A6FF3;} + .d2-867816087 .stroke-AA4{stroke:#EDF0FD;} + .d2-867816087 .stroke-AA5{stroke:#F7F8FE;} + .d2-867816087 .stroke-AB4{stroke:#EDF0FD;} + .d2-867816087 .stroke-AB5{stroke:#F7F8FE;} + .d2-867816087 .background-color-N1{background-color:#0A0F25;} + .d2-867816087 .background-color-N2{background-color:#676C7E;} + .d2-867816087 .background-color-N3{background-color:#9499AB;} + .d2-867816087 .background-color-N4{background-color:#CFD2DD;} + .d2-867816087 .background-color-N5{background-color:#DEE1EB;} + .d2-867816087 .background-color-N6{background-color:#EEF1F8;} + .d2-867816087 .background-color-N7{background-color:#FFFFFF;} + .d2-867816087 .background-color-B1{background-color:#0D32B2;} + .d2-867816087 .background-color-B2{background-color:#0D32B2;} + .d2-867816087 .background-color-B3{background-color:#E3E9FD;} + .d2-867816087 .background-color-B4{background-color:#E3E9FD;} + .d2-867816087 .background-color-B5{background-color:#EDF0FD;} + .d2-867816087 .background-color-B6{background-color:#F7F8FE;} + .d2-867816087 .background-color-AA2{background-color:#4A6FF3;} + .d2-867816087 .background-color-AA4{background-color:#EDF0FD;} + .d2-867816087 .background-color-AA5{background-color:#F7F8FE;} + .d2-867816087 .background-color-AB4{background-color:#EDF0FD;} + .d2-867816087 .background-color-AB5{background-color:#F7F8FE;} + .d2-867816087 .color-N1{color:#0A0F25;} + .d2-867816087 .color-N2{color:#676C7E;} + .d2-867816087 .color-N3{color:#9499AB;} + .d2-867816087 .color-N4{color:#CFD2DD;} + .d2-867816087 .color-N5{color:#DEE1EB;} + .d2-867816087 .color-N6{color:#EEF1F8;} + .d2-867816087 .color-N7{color:#FFFFFF;} + .d2-867816087 .color-B1{color:#0D32B2;} + .d2-867816087 .color-B2{color:#0D32B2;} + .d2-867816087 .color-B3{color:#E3E9FD;} + .d2-867816087 .color-B4{color:#E3E9FD;} + .d2-867816087 .color-B5{color:#EDF0FD;} + .d2-867816087 .color-B6{color:#F7F8FE;} + .d2-867816087 .color-AA2{color:#4A6FF3;} + .d2-867816087 .color-AA4{color:#EDF0FD;} + .d2-867816087 .color-AA5{color:#F7F8FE;} + .d2-867816087 .color-AB4{color:#EDF0FD;} + .d2-867816087 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-867816087);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-867816087);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-867816087);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-867816087);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-867816087);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-867816087);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-867816087);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-867816087);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-867816087);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-867816087);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-867816087);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-867816087);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-867816087);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-867816087);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-867816087);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-867816087);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-867816087);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-867816087);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abc - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/class/dagre/board.exp.json b/e2etests/testdata/stable/class/dagre/board.exp.json index 4d73de526..e16573493 100644 --- a/e2etests/testdata/stable/class/dagre/board.exp.json +++ b/e2etests/testdata/stable/class/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -95,6 +104,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/class/dagre/sketch.exp.svg b/e2etests/testdata/stable/class/dagre/sketch.exp.svg index d065bfdf2..bb5f02da2 100644 --- a/e2etests/testdata/stable/class/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/class/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void + .d2-3407647036 .fill-N1{fill:#0A0F25;} + .d2-3407647036 .fill-N2{fill:#676C7E;} + .d2-3407647036 .fill-N3{fill:#9499AB;} + .d2-3407647036 .fill-N4{fill:#CFD2DD;} + .d2-3407647036 .fill-N5{fill:#DEE1EB;} + .d2-3407647036 .fill-N6{fill:#EEF1F8;} + .d2-3407647036 .fill-N7{fill:#FFFFFF;} + .d2-3407647036 .fill-B1{fill:#0D32B2;} + .d2-3407647036 .fill-B2{fill:#0D32B2;} + .d2-3407647036 .fill-B3{fill:#E3E9FD;} + .d2-3407647036 .fill-B4{fill:#E3E9FD;} + .d2-3407647036 .fill-B5{fill:#EDF0FD;} + .d2-3407647036 .fill-B6{fill:#F7F8FE;} + .d2-3407647036 .fill-AA2{fill:#4A6FF3;} + .d2-3407647036 .fill-AA4{fill:#EDF0FD;} + .d2-3407647036 .fill-AA5{fill:#F7F8FE;} + .d2-3407647036 .fill-AB4{fill:#EDF0FD;} + .d2-3407647036 .fill-AB5{fill:#F7F8FE;} + .d2-3407647036 .stroke-N1{stroke:#0A0F25;} + .d2-3407647036 .stroke-N2{stroke:#676C7E;} + .d2-3407647036 .stroke-N3{stroke:#9499AB;} + .d2-3407647036 .stroke-N4{stroke:#CFD2DD;} + .d2-3407647036 .stroke-N5{stroke:#DEE1EB;} + .d2-3407647036 .stroke-N6{stroke:#EEF1F8;} + .d2-3407647036 .stroke-N7{stroke:#FFFFFF;} + .d2-3407647036 .stroke-B1{stroke:#0D32B2;} + .d2-3407647036 .stroke-B2{stroke:#0D32B2;} + .d2-3407647036 .stroke-B3{stroke:#E3E9FD;} + .d2-3407647036 .stroke-B4{stroke:#E3E9FD;} + .d2-3407647036 .stroke-B5{stroke:#EDF0FD;} + .d2-3407647036 .stroke-B6{stroke:#F7F8FE;} + .d2-3407647036 .stroke-AA2{stroke:#4A6FF3;} + .d2-3407647036 .stroke-AA4{stroke:#EDF0FD;} + .d2-3407647036 .stroke-AA5{stroke:#F7F8FE;} + .d2-3407647036 .stroke-AB4{stroke:#EDF0FD;} + .d2-3407647036 .stroke-AB5{stroke:#F7F8FE;} + .d2-3407647036 .background-color-N1{background-color:#0A0F25;} + .d2-3407647036 .background-color-N2{background-color:#676C7E;} + .d2-3407647036 .background-color-N3{background-color:#9499AB;} + .d2-3407647036 .background-color-N4{background-color:#CFD2DD;} + .d2-3407647036 .background-color-N5{background-color:#DEE1EB;} + .d2-3407647036 .background-color-N6{background-color:#EEF1F8;} + .d2-3407647036 .background-color-N7{background-color:#FFFFFF;} + .d2-3407647036 .background-color-B1{background-color:#0D32B2;} + .d2-3407647036 .background-color-B2{background-color:#0D32B2;} + .d2-3407647036 .background-color-B3{background-color:#E3E9FD;} + .d2-3407647036 .background-color-B4{background-color:#E3E9FD;} + .d2-3407647036 .background-color-B5{background-color:#EDF0FD;} + .d2-3407647036 .background-color-B6{background-color:#F7F8FE;} + .d2-3407647036 .background-color-AA2{background-color:#4A6FF3;} + .d2-3407647036 .background-color-AA4{background-color:#EDF0FD;} + .d2-3407647036 .background-color-AA5{background-color:#F7F8FE;} + .d2-3407647036 .background-color-AB4{background-color:#EDF0FD;} + .d2-3407647036 .background-color-AB5{background-color:#F7F8FE;} + .d2-3407647036 .color-N1{color:#0A0F25;} + .d2-3407647036 .color-N2{color:#676C7E;} + .d2-3407647036 .color-N3{color:#9499AB;} + .d2-3407647036 .color-N4{color:#CFD2DD;} + .d2-3407647036 .color-N5{color:#DEE1EB;} + .d2-3407647036 .color-N6{color:#EEF1F8;} + .d2-3407647036 .color-N7{color:#FFFFFF;} + .d2-3407647036 .color-B1{color:#0D32B2;} + .d2-3407647036 .color-B2{color:#0D32B2;} + .d2-3407647036 .color-B3{color:#E3E9FD;} + .d2-3407647036 .color-B4{color:#E3E9FD;} + .d2-3407647036 .color-B5{color:#EDF0FD;} + .d2-3407647036 .color-B6{color:#F7F8FE;} + .d2-3407647036 .color-AA2{color:#4A6FF3;} + .d2-3407647036 .color-AA4{color:#EDF0FD;} + .d2-3407647036 .color-AA5{color:#F7F8FE;} + .d2-3407647036 .color-AB4{color:#EDF0FD;} + .d2-3407647036 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3407647036);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3407647036);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3407647036);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3407647036);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3407647036);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3407647036);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3407647036);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3407647036);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3407647036);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3407647036);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3407647036);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3407647036);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3407647036);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3407647036);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3407647036);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3407647036);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3407647036);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3407647036);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void \ No newline at end of file diff --git a/e2etests/testdata/stable/class/elk/board.exp.json b/e2etests/testdata/stable/class/elk/board.exp.json index 89bf9f16d..7fdf6dfe2 100644 --- a/e2etests/testdata/stable/class/elk/board.exp.json +++ b/e2etests/testdata/stable/class/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -95,6 +104,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/class/elk/sketch.exp.svg b/e2etests/testdata/stable/class/elk/sketch.exp.svg index a18086831..4db4b2a58 100644 --- a/e2etests/testdata/stable/class/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/class/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void + .d2-2696242356 .fill-N1{fill:#0A0F25;} + .d2-2696242356 .fill-N2{fill:#676C7E;} + .d2-2696242356 .fill-N3{fill:#9499AB;} + .d2-2696242356 .fill-N4{fill:#CFD2DD;} + .d2-2696242356 .fill-N5{fill:#DEE1EB;} + .d2-2696242356 .fill-N6{fill:#EEF1F8;} + .d2-2696242356 .fill-N7{fill:#FFFFFF;} + .d2-2696242356 .fill-B1{fill:#0D32B2;} + .d2-2696242356 .fill-B2{fill:#0D32B2;} + .d2-2696242356 .fill-B3{fill:#E3E9FD;} + .d2-2696242356 .fill-B4{fill:#E3E9FD;} + .d2-2696242356 .fill-B5{fill:#EDF0FD;} + .d2-2696242356 .fill-B6{fill:#F7F8FE;} + .d2-2696242356 .fill-AA2{fill:#4A6FF3;} + .d2-2696242356 .fill-AA4{fill:#EDF0FD;} + .d2-2696242356 .fill-AA5{fill:#F7F8FE;} + .d2-2696242356 .fill-AB4{fill:#EDF0FD;} + .d2-2696242356 .fill-AB5{fill:#F7F8FE;} + .d2-2696242356 .stroke-N1{stroke:#0A0F25;} + .d2-2696242356 .stroke-N2{stroke:#676C7E;} + .d2-2696242356 .stroke-N3{stroke:#9499AB;} + .d2-2696242356 .stroke-N4{stroke:#CFD2DD;} + .d2-2696242356 .stroke-N5{stroke:#DEE1EB;} + .d2-2696242356 .stroke-N6{stroke:#EEF1F8;} + .d2-2696242356 .stroke-N7{stroke:#FFFFFF;} + .d2-2696242356 .stroke-B1{stroke:#0D32B2;} + .d2-2696242356 .stroke-B2{stroke:#0D32B2;} + .d2-2696242356 .stroke-B3{stroke:#E3E9FD;} + .d2-2696242356 .stroke-B4{stroke:#E3E9FD;} + .d2-2696242356 .stroke-B5{stroke:#EDF0FD;} + .d2-2696242356 .stroke-B6{stroke:#F7F8FE;} + .d2-2696242356 .stroke-AA2{stroke:#4A6FF3;} + .d2-2696242356 .stroke-AA4{stroke:#EDF0FD;} + .d2-2696242356 .stroke-AA5{stroke:#F7F8FE;} + .d2-2696242356 .stroke-AB4{stroke:#EDF0FD;} + .d2-2696242356 .stroke-AB5{stroke:#F7F8FE;} + .d2-2696242356 .background-color-N1{background-color:#0A0F25;} + .d2-2696242356 .background-color-N2{background-color:#676C7E;} + .d2-2696242356 .background-color-N3{background-color:#9499AB;} + .d2-2696242356 .background-color-N4{background-color:#CFD2DD;} + .d2-2696242356 .background-color-N5{background-color:#DEE1EB;} + .d2-2696242356 .background-color-N6{background-color:#EEF1F8;} + .d2-2696242356 .background-color-N7{background-color:#FFFFFF;} + .d2-2696242356 .background-color-B1{background-color:#0D32B2;} + .d2-2696242356 .background-color-B2{background-color:#0D32B2;} + .d2-2696242356 .background-color-B3{background-color:#E3E9FD;} + .d2-2696242356 .background-color-B4{background-color:#E3E9FD;} + .d2-2696242356 .background-color-B5{background-color:#EDF0FD;} + .d2-2696242356 .background-color-B6{background-color:#F7F8FE;} + .d2-2696242356 .background-color-AA2{background-color:#4A6FF3;} + .d2-2696242356 .background-color-AA4{background-color:#EDF0FD;} + .d2-2696242356 .background-color-AA5{background-color:#F7F8FE;} + .d2-2696242356 .background-color-AB4{background-color:#EDF0FD;} + .d2-2696242356 .background-color-AB5{background-color:#F7F8FE;} + .d2-2696242356 .color-N1{color:#0A0F25;} + .d2-2696242356 .color-N2{color:#676C7E;} + .d2-2696242356 .color-N3{color:#9499AB;} + .d2-2696242356 .color-N4{color:#CFD2DD;} + .d2-2696242356 .color-N5{color:#DEE1EB;} + .d2-2696242356 .color-N6{color:#EEF1F8;} + .d2-2696242356 .color-N7{color:#FFFFFF;} + .d2-2696242356 .color-B1{color:#0D32B2;} + .d2-2696242356 .color-B2{color:#0D32B2;} + .d2-2696242356 .color-B3{color:#E3E9FD;} + .d2-2696242356 .color-B4{color:#E3E9FD;} + .d2-2696242356 .color-B5{color:#EDF0FD;} + .d2-2696242356 .color-B6{color:#F7F8FE;} + .d2-2696242356 .color-AA2{color:#4A6FF3;} + .d2-2696242356 .color-AA4{color:#EDF0FD;} + .d2-2696242356 .color-AA5{color:#F7F8FE;} + .d2-2696242356 .color-AB4{color:#EDF0FD;} + .d2-2696242356 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2696242356);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2696242356);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2696242356);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2696242356);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2696242356);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2696242356);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2696242356);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2696242356);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2696242356);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2696242356);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2696242356);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2696242356);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2696242356);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2696242356);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2696242356);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2696242356);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2696242356);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2696242356);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void \ No newline at end of file diff --git a/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/board.exp.json b/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/board.exp.json index 57c24f1bb..f56d40a0b 100644 --- a/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/board.exp.json +++ b/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 10, "fill": "red", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -180,6 +189,7 @@ "borderRadius": 10, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -235,6 +245,7 @@ "borderRadius": 5, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -278,6 +289,7 @@ "borderRadius": 5, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -323,6 +335,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/sketch.exp.svg b/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/sketch.exp.svg index 5c0af683b..ca0bfa28c 100644 --- a/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/class_and_sqlTable_border_radius/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ - aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zone b+field[]string+method(a uint64)(x, y int) c d + .d2-1154201599 .fill-N1{fill:#0A0F25;} + .d2-1154201599 .fill-N2{fill:#676C7E;} + .d2-1154201599 .fill-N3{fill:#9499AB;} + .d2-1154201599 .fill-N4{fill:#CFD2DD;} + .d2-1154201599 .fill-N5{fill:#DEE1EB;} + .d2-1154201599 .fill-N6{fill:#EEF1F8;} + .d2-1154201599 .fill-N7{fill:#FFFFFF;} + .d2-1154201599 .fill-B1{fill:#0D32B2;} + .d2-1154201599 .fill-B2{fill:#0D32B2;} + .d2-1154201599 .fill-B3{fill:#E3E9FD;} + .d2-1154201599 .fill-B4{fill:#E3E9FD;} + .d2-1154201599 .fill-B5{fill:#EDF0FD;} + .d2-1154201599 .fill-B6{fill:#F7F8FE;} + .d2-1154201599 .fill-AA2{fill:#4A6FF3;} + .d2-1154201599 .fill-AA4{fill:#EDF0FD;} + .d2-1154201599 .fill-AA5{fill:#F7F8FE;} + .d2-1154201599 .fill-AB4{fill:#EDF0FD;} + .d2-1154201599 .fill-AB5{fill:#F7F8FE;} + .d2-1154201599 .stroke-N1{stroke:#0A0F25;} + .d2-1154201599 .stroke-N2{stroke:#676C7E;} + .d2-1154201599 .stroke-N3{stroke:#9499AB;} + .d2-1154201599 .stroke-N4{stroke:#CFD2DD;} + .d2-1154201599 .stroke-N5{stroke:#DEE1EB;} + .d2-1154201599 .stroke-N6{stroke:#EEF1F8;} + .d2-1154201599 .stroke-N7{stroke:#FFFFFF;} + .d2-1154201599 .stroke-B1{stroke:#0D32B2;} + .d2-1154201599 .stroke-B2{stroke:#0D32B2;} + .d2-1154201599 .stroke-B3{stroke:#E3E9FD;} + .d2-1154201599 .stroke-B4{stroke:#E3E9FD;} + .d2-1154201599 .stroke-B5{stroke:#EDF0FD;} + .d2-1154201599 .stroke-B6{stroke:#F7F8FE;} + .d2-1154201599 .stroke-AA2{stroke:#4A6FF3;} + .d2-1154201599 .stroke-AA4{stroke:#EDF0FD;} + .d2-1154201599 .stroke-AA5{stroke:#F7F8FE;} + .d2-1154201599 .stroke-AB4{stroke:#EDF0FD;} + .d2-1154201599 .stroke-AB5{stroke:#F7F8FE;} + .d2-1154201599 .background-color-N1{background-color:#0A0F25;} + .d2-1154201599 .background-color-N2{background-color:#676C7E;} + .d2-1154201599 .background-color-N3{background-color:#9499AB;} + .d2-1154201599 .background-color-N4{background-color:#CFD2DD;} + .d2-1154201599 .background-color-N5{background-color:#DEE1EB;} + .d2-1154201599 .background-color-N6{background-color:#EEF1F8;} + .d2-1154201599 .background-color-N7{background-color:#FFFFFF;} + .d2-1154201599 .background-color-B1{background-color:#0D32B2;} + .d2-1154201599 .background-color-B2{background-color:#0D32B2;} + .d2-1154201599 .background-color-B3{background-color:#E3E9FD;} + .d2-1154201599 .background-color-B4{background-color:#E3E9FD;} + .d2-1154201599 .background-color-B5{background-color:#EDF0FD;} + .d2-1154201599 .background-color-B6{background-color:#F7F8FE;} + .d2-1154201599 .background-color-AA2{background-color:#4A6FF3;} + .d2-1154201599 .background-color-AA4{background-color:#EDF0FD;} + .d2-1154201599 .background-color-AA5{background-color:#F7F8FE;} + .d2-1154201599 .background-color-AB4{background-color:#EDF0FD;} + .d2-1154201599 .background-color-AB5{background-color:#F7F8FE;} + .d2-1154201599 .color-N1{color:#0A0F25;} + .d2-1154201599 .color-N2{color:#676C7E;} + .d2-1154201599 .color-N3{color:#9499AB;} + .d2-1154201599 .color-N4{color:#CFD2DD;} + .d2-1154201599 .color-N5{color:#DEE1EB;} + .d2-1154201599 .color-N6{color:#EEF1F8;} + .d2-1154201599 .color-N7{color:#FFFFFF;} + .d2-1154201599 .color-B1{color:#0D32B2;} + .d2-1154201599 .color-B2{color:#0D32B2;} + .d2-1154201599 .color-B3{color:#E3E9FD;} + .d2-1154201599 .color-B4{color:#E3E9FD;} + .d2-1154201599 .color-B5{color:#EDF0FD;} + .d2-1154201599 .color-B6{color:#F7F8FE;} + .d2-1154201599 .color-AA2{color:#4A6FF3;} + .d2-1154201599 .color-AA4{color:#EDF0FD;} + .d2-1154201599 .color-AA5{color:#F7F8FE;} + .d2-1154201599 .color-AB4{color:#EDF0FD;} + .d2-1154201599 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1154201599);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1154201599);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1154201599);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1154201599);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1154201599);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1154201599);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1154201599);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1154201599);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1154201599);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1154201599);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1154201599);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1154201599);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1154201599);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1154201599);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1154201599);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1154201599);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1154201599);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1154201599);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zone b+field[]string+method(a uint64)(x, y int) c d \ No newline at end of file diff --git a/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/board.exp.json b/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/board.exp.json index 9e58c1d09..753e78670 100644 --- a/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/board.exp.json +++ b/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 10, "fill": "red", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -180,6 +189,7 @@ "borderRadius": 10, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -235,6 +245,7 @@ "borderRadius": 5, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -278,6 +289,7 @@ "borderRadius": 5, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -323,6 +335,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/sketch.exp.svg b/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/sketch.exp.svg index 5583ba698..1fb778348 100644 --- a/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/class_and_sqlTable_border_radius/elk/sketch.exp.svg @@ -1,16 +1,16 @@ - aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zone b+field[]string+method(a uint64)(x, y int) c d + .d2-1612823801 .fill-N1{fill:#0A0F25;} + .d2-1612823801 .fill-N2{fill:#676C7E;} + .d2-1612823801 .fill-N3{fill:#9499AB;} + .d2-1612823801 .fill-N4{fill:#CFD2DD;} + .d2-1612823801 .fill-N5{fill:#DEE1EB;} + .d2-1612823801 .fill-N6{fill:#EEF1F8;} + .d2-1612823801 .fill-N7{fill:#FFFFFF;} + .d2-1612823801 .fill-B1{fill:#0D32B2;} + .d2-1612823801 .fill-B2{fill:#0D32B2;} + .d2-1612823801 .fill-B3{fill:#E3E9FD;} + .d2-1612823801 .fill-B4{fill:#E3E9FD;} + .d2-1612823801 .fill-B5{fill:#EDF0FD;} + .d2-1612823801 .fill-B6{fill:#F7F8FE;} + .d2-1612823801 .fill-AA2{fill:#4A6FF3;} + .d2-1612823801 .fill-AA4{fill:#EDF0FD;} + .d2-1612823801 .fill-AA5{fill:#F7F8FE;} + .d2-1612823801 .fill-AB4{fill:#EDF0FD;} + .d2-1612823801 .fill-AB5{fill:#F7F8FE;} + .d2-1612823801 .stroke-N1{stroke:#0A0F25;} + .d2-1612823801 .stroke-N2{stroke:#676C7E;} + .d2-1612823801 .stroke-N3{stroke:#9499AB;} + .d2-1612823801 .stroke-N4{stroke:#CFD2DD;} + .d2-1612823801 .stroke-N5{stroke:#DEE1EB;} + .d2-1612823801 .stroke-N6{stroke:#EEF1F8;} + .d2-1612823801 .stroke-N7{stroke:#FFFFFF;} + .d2-1612823801 .stroke-B1{stroke:#0D32B2;} + .d2-1612823801 .stroke-B2{stroke:#0D32B2;} + .d2-1612823801 .stroke-B3{stroke:#E3E9FD;} + .d2-1612823801 .stroke-B4{stroke:#E3E9FD;} + .d2-1612823801 .stroke-B5{stroke:#EDF0FD;} + .d2-1612823801 .stroke-B6{stroke:#F7F8FE;} + .d2-1612823801 .stroke-AA2{stroke:#4A6FF3;} + .d2-1612823801 .stroke-AA4{stroke:#EDF0FD;} + .d2-1612823801 .stroke-AA5{stroke:#F7F8FE;} + .d2-1612823801 .stroke-AB4{stroke:#EDF0FD;} + .d2-1612823801 .stroke-AB5{stroke:#F7F8FE;} + .d2-1612823801 .background-color-N1{background-color:#0A0F25;} + .d2-1612823801 .background-color-N2{background-color:#676C7E;} + .d2-1612823801 .background-color-N3{background-color:#9499AB;} + .d2-1612823801 .background-color-N4{background-color:#CFD2DD;} + .d2-1612823801 .background-color-N5{background-color:#DEE1EB;} + .d2-1612823801 .background-color-N6{background-color:#EEF1F8;} + .d2-1612823801 .background-color-N7{background-color:#FFFFFF;} + .d2-1612823801 .background-color-B1{background-color:#0D32B2;} + .d2-1612823801 .background-color-B2{background-color:#0D32B2;} + .d2-1612823801 .background-color-B3{background-color:#E3E9FD;} + .d2-1612823801 .background-color-B4{background-color:#E3E9FD;} + .d2-1612823801 .background-color-B5{background-color:#EDF0FD;} + .d2-1612823801 .background-color-B6{background-color:#F7F8FE;} + .d2-1612823801 .background-color-AA2{background-color:#4A6FF3;} + .d2-1612823801 .background-color-AA4{background-color:#EDF0FD;} + .d2-1612823801 .background-color-AA5{background-color:#F7F8FE;} + .d2-1612823801 .background-color-AB4{background-color:#EDF0FD;} + .d2-1612823801 .background-color-AB5{background-color:#F7F8FE;} + .d2-1612823801 .color-N1{color:#0A0F25;} + .d2-1612823801 .color-N2{color:#676C7E;} + .d2-1612823801 .color-N3{color:#9499AB;} + .d2-1612823801 .color-N4{color:#CFD2DD;} + .d2-1612823801 .color-N5{color:#DEE1EB;} + .d2-1612823801 .color-N6{color:#EEF1F8;} + .d2-1612823801 .color-N7{color:#FFFFFF;} + .d2-1612823801 .color-B1{color:#0D32B2;} + .d2-1612823801 .color-B2{color:#0D32B2;} + .d2-1612823801 .color-B3{color:#E3E9FD;} + .d2-1612823801 .color-B4{color:#E3E9FD;} + .d2-1612823801 .color-B5{color:#EDF0FD;} + .d2-1612823801 .color-B6{color:#F7F8FE;} + .d2-1612823801 .color-AA2{color:#4A6FF3;} + .d2-1612823801 .color-AA4{color:#EDF0FD;} + .d2-1612823801 .color-AA5{color:#F7F8FE;} + .d2-1612823801 .color-AB4{color:#EDF0FD;} + .d2-1612823801 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1612823801);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1612823801);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1612823801);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1612823801);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1612823801);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1612823801);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1612823801);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1612823801);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> aidintPKdiskintFKjsonjsonbUNQlast_updatedtimestamp with time zone b+field[]string+method(a uint64)(x, y int) c d \ No newline at end of file diff --git a/e2etests/testdata/stable/classes/dagre/board.exp.json b/e2etests/testdata/stable/classes/dagre/board.exp.json index 49f6bf8e6..49a2fc0d6 100644 --- a/e2etests/testdata/stable/classes/dagre/board.exp.json +++ b/e2etests/testdata/stable/classes/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -21,6 +29,7 @@ "borderRadius": 0, "fill": "orange", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -64,6 +73,7 @@ "borderRadius": 0, "fill": "orange", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -108,6 +118,7 @@ "borderRadius": 0, "fill": "orange", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -162,6 +173,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 35, @@ -212,6 +224,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 35, @@ -252,6 +265,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/classes/dagre/sketch.exp.svg b/e2etests/testdata/stable/classes/dagre/sketch.exp.svg index 6c7366705..c67d40af8 100644 --- a/e2etests/testdata/stable/classes/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/classes/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -*** thenthen + .d2-1493121911 .fill-N1{fill:#0A0F25;} + .d2-1493121911 .fill-N2{fill:#676C7E;} + .d2-1493121911 .fill-N3{fill:#9499AB;} + .d2-1493121911 .fill-N4{fill:#CFD2DD;} + .d2-1493121911 .fill-N5{fill:#DEE1EB;} + .d2-1493121911 .fill-N6{fill:#EEF1F8;} + .d2-1493121911 .fill-N7{fill:#FFFFFF;} + .d2-1493121911 .fill-B1{fill:#0D32B2;} + .d2-1493121911 .fill-B2{fill:#0D32B2;} + .d2-1493121911 .fill-B3{fill:#E3E9FD;} + .d2-1493121911 .fill-B4{fill:#E3E9FD;} + .d2-1493121911 .fill-B5{fill:#EDF0FD;} + .d2-1493121911 .fill-B6{fill:#F7F8FE;} + .d2-1493121911 .fill-AA2{fill:#4A6FF3;} + .d2-1493121911 .fill-AA4{fill:#EDF0FD;} + .d2-1493121911 .fill-AA5{fill:#F7F8FE;} + .d2-1493121911 .fill-AB4{fill:#EDF0FD;} + .d2-1493121911 .fill-AB5{fill:#F7F8FE;} + .d2-1493121911 .stroke-N1{stroke:#0A0F25;} + .d2-1493121911 .stroke-N2{stroke:#676C7E;} + .d2-1493121911 .stroke-N3{stroke:#9499AB;} + .d2-1493121911 .stroke-N4{stroke:#CFD2DD;} + .d2-1493121911 .stroke-N5{stroke:#DEE1EB;} + .d2-1493121911 .stroke-N6{stroke:#EEF1F8;} + .d2-1493121911 .stroke-N7{stroke:#FFFFFF;} + .d2-1493121911 .stroke-B1{stroke:#0D32B2;} + .d2-1493121911 .stroke-B2{stroke:#0D32B2;} + .d2-1493121911 .stroke-B3{stroke:#E3E9FD;} + .d2-1493121911 .stroke-B4{stroke:#E3E9FD;} + .d2-1493121911 .stroke-B5{stroke:#EDF0FD;} + .d2-1493121911 .stroke-B6{stroke:#F7F8FE;} + .d2-1493121911 .stroke-AA2{stroke:#4A6FF3;} + .d2-1493121911 .stroke-AA4{stroke:#EDF0FD;} + .d2-1493121911 .stroke-AA5{stroke:#F7F8FE;} + .d2-1493121911 .stroke-AB4{stroke:#EDF0FD;} + .d2-1493121911 .stroke-AB5{stroke:#F7F8FE;} + .d2-1493121911 .background-color-N1{background-color:#0A0F25;} + .d2-1493121911 .background-color-N2{background-color:#676C7E;} + .d2-1493121911 .background-color-N3{background-color:#9499AB;} + .d2-1493121911 .background-color-N4{background-color:#CFD2DD;} + .d2-1493121911 .background-color-N5{background-color:#DEE1EB;} + .d2-1493121911 .background-color-N6{background-color:#EEF1F8;} + .d2-1493121911 .background-color-N7{background-color:#FFFFFF;} + .d2-1493121911 .background-color-B1{background-color:#0D32B2;} + .d2-1493121911 .background-color-B2{background-color:#0D32B2;} + .d2-1493121911 .background-color-B3{background-color:#E3E9FD;} + .d2-1493121911 .background-color-B4{background-color:#E3E9FD;} + .d2-1493121911 .background-color-B5{background-color:#EDF0FD;} + .d2-1493121911 .background-color-B6{background-color:#F7F8FE;} + .d2-1493121911 .background-color-AA2{background-color:#4A6FF3;} + .d2-1493121911 .background-color-AA4{background-color:#EDF0FD;} + .d2-1493121911 .background-color-AA5{background-color:#F7F8FE;} + .d2-1493121911 .background-color-AB4{background-color:#EDF0FD;} + .d2-1493121911 .background-color-AB5{background-color:#F7F8FE;} + .d2-1493121911 .color-N1{color:#0A0F25;} + .d2-1493121911 .color-N2{color:#676C7E;} + .d2-1493121911 .color-N3{color:#9499AB;} + .d2-1493121911 .color-N4{color:#CFD2DD;} + .d2-1493121911 .color-N5{color:#DEE1EB;} + .d2-1493121911 .color-N6{color:#EEF1F8;} + .d2-1493121911 .color-N7{color:#FFFFFF;} + .d2-1493121911 .color-B1{color:#0D32B2;} + .d2-1493121911 .color-B2{color:#0D32B2;} + .d2-1493121911 .color-B3{color:#E3E9FD;} + .d2-1493121911 .color-B4{color:#E3E9FD;} + .d2-1493121911 .color-B5{color:#EDF0FD;} + .d2-1493121911 .color-B6{color:#F7F8FE;} + .d2-1493121911 .color-AA2{color:#4A6FF3;} + .d2-1493121911 .color-AA4{color:#EDF0FD;} + .d2-1493121911 .color-AA5{color:#F7F8FE;} + .d2-1493121911 .color-AB4{color:#EDF0FD;} + .d2-1493121911 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1493121911);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1493121911);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1493121911);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1493121911);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1493121911);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1493121911);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1493121911);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1493121911);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1493121911);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1493121911);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1493121911);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1493121911);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1493121911);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1493121911);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1493121911);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1493121911);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1493121911);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1493121911);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>*** thenthen - - - - + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/classes/elk/board.exp.json b/e2etests/testdata/stable/classes/elk/board.exp.json index d496941ec..dbf9f2d1b 100644 --- a/e2etests/testdata/stable/classes/elk/board.exp.json +++ b/e2etests/testdata/stable/classes/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -21,6 +29,7 @@ "borderRadius": 0, "fill": "orange", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -64,6 +73,7 @@ "borderRadius": 0, "fill": "orange", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -108,6 +118,7 @@ "borderRadius": 0, "fill": "orange", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -162,6 +173,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 47, @@ -203,6 +215,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 47, @@ -234,6 +247,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/classes/elk/sketch.exp.svg b/e2etests/testdata/stable/classes/elk/sketch.exp.svg index 573b6ac41..d4a2636dc 100644 --- a/e2etests/testdata/stable/classes/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/classes/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -*** thenthen + .d2-3394539979 .fill-N1{fill:#0A0F25;} + .d2-3394539979 .fill-N2{fill:#676C7E;} + .d2-3394539979 .fill-N3{fill:#9499AB;} + .d2-3394539979 .fill-N4{fill:#CFD2DD;} + .d2-3394539979 .fill-N5{fill:#DEE1EB;} + .d2-3394539979 .fill-N6{fill:#EEF1F8;} + .d2-3394539979 .fill-N7{fill:#FFFFFF;} + .d2-3394539979 .fill-B1{fill:#0D32B2;} + .d2-3394539979 .fill-B2{fill:#0D32B2;} + .d2-3394539979 .fill-B3{fill:#E3E9FD;} + .d2-3394539979 .fill-B4{fill:#E3E9FD;} + .d2-3394539979 .fill-B5{fill:#EDF0FD;} + .d2-3394539979 .fill-B6{fill:#F7F8FE;} + .d2-3394539979 .fill-AA2{fill:#4A6FF3;} + .d2-3394539979 .fill-AA4{fill:#EDF0FD;} + .d2-3394539979 .fill-AA5{fill:#F7F8FE;} + .d2-3394539979 .fill-AB4{fill:#EDF0FD;} + .d2-3394539979 .fill-AB5{fill:#F7F8FE;} + .d2-3394539979 .stroke-N1{stroke:#0A0F25;} + .d2-3394539979 .stroke-N2{stroke:#676C7E;} + .d2-3394539979 .stroke-N3{stroke:#9499AB;} + .d2-3394539979 .stroke-N4{stroke:#CFD2DD;} + .d2-3394539979 .stroke-N5{stroke:#DEE1EB;} + .d2-3394539979 .stroke-N6{stroke:#EEF1F8;} + .d2-3394539979 .stroke-N7{stroke:#FFFFFF;} + .d2-3394539979 .stroke-B1{stroke:#0D32B2;} + .d2-3394539979 .stroke-B2{stroke:#0D32B2;} + .d2-3394539979 .stroke-B3{stroke:#E3E9FD;} + .d2-3394539979 .stroke-B4{stroke:#E3E9FD;} + .d2-3394539979 .stroke-B5{stroke:#EDF0FD;} + .d2-3394539979 .stroke-B6{stroke:#F7F8FE;} + .d2-3394539979 .stroke-AA2{stroke:#4A6FF3;} + .d2-3394539979 .stroke-AA4{stroke:#EDF0FD;} + .d2-3394539979 .stroke-AA5{stroke:#F7F8FE;} + .d2-3394539979 .stroke-AB4{stroke:#EDF0FD;} + .d2-3394539979 .stroke-AB5{stroke:#F7F8FE;} + .d2-3394539979 .background-color-N1{background-color:#0A0F25;} + .d2-3394539979 .background-color-N2{background-color:#676C7E;} + .d2-3394539979 .background-color-N3{background-color:#9499AB;} + .d2-3394539979 .background-color-N4{background-color:#CFD2DD;} + .d2-3394539979 .background-color-N5{background-color:#DEE1EB;} + .d2-3394539979 .background-color-N6{background-color:#EEF1F8;} + .d2-3394539979 .background-color-N7{background-color:#FFFFFF;} + .d2-3394539979 .background-color-B1{background-color:#0D32B2;} + .d2-3394539979 .background-color-B2{background-color:#0D32B2;} + .d2-3394539979 .background-color-B3{background-color:#E3E9FD;} + .d2-3394539979 .background-color-B4{background-color:#E3E9FD;} + .d2-3394539979 .background-color-B5{background-color:#EDF0FD;} + .d2-3394539979 .background-color-B6{background-color:#F7F8FE;} + .d2-3394539979 .background-color-AA2{background-color:#4A6FF3;} + .d2-3394539979 .background-color-AA4{background-color:#EDF0FD;} + .d2-3394539979 .background-color-AA5{background-color:#F7F8FE;} + .d2-3394539979 .background-color-AB4{background-color:#EDF0FD;} + .d2-3394539979 .background-color-AB5{background-color:#F7F8FE;} + .d2-3394539979 .color-N1{color:#0A0F25;} + .d2-3394539979 .color-N2{color:#676C7E;} + .d2-3394539979 .color-N3{color:#9499AB;} + .d2-3394539979 .color-N4{color:#CFD2DD;} + .d2-3394539979 .color-N5{color:#DEE1EB;} + .d2-3394539979 .color-N6{color:#EEF1F8;} + .d2-3394539979 .color-N7{color:#FFFFFF;} + .d2-3394539979 .color-B1{color:#0D32B2;} + .d2-3394539979 .color-B2{color:#0D32B2;} + .d2-3394539979 .color-B3{color:#E3E9FD;} + .d2-3394539979 .color-B4{color:#E3E9FD;} + .d2-3394539979 .color-B5{color:#EDF0FD;} + .d2-3394539979 .color-B6{color:#F7F8FE;} + .d2-3394539979 .color-AA2{color:#4A6FF3;} + .d2-3394539979 .color-AA4{color:#EDF0FD;} + .d2-3394539979 .color-AA5{color:#F7F8FE;} + .d2-3394539979 .color-AB4{color:#EDF0FD;} + .d2-3394539979 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3394539979);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3394539979);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3394539979);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3394539979);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3394539979);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3394539979);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3394539979);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3394539979);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3394539979);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3394539979);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3394539979);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3394539979);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3394539979);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3394539979);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3394539979);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3394539979);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3394539979);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3394539979);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>*** thenthen - - - - + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/code_snippet/dagre/board.exp.json b/e2etests/testdata/stable/code_snippet/dagre/board.exp.json index 5ad185be7..fc32d5a4a 100644 --- a/e2etests/testdata/stable/code_snippet/dagre/board.exp.json +++ b/e2etests/testdata/stable/code_snippet/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -150,6 +161,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 377.5, @@ -197,6 +209,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 377.5, @@ -237,6 +250,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/code_snippet/dagre/sketch.exp.svg b/e2etests/testdata/stable/code_snippet/dagre/sketch.exp.svg index 24d34ab89..6d36717f8 100644 --- a/e2etests/testdata/stable/code_snippet/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/code_snippet/dagre/sketch.exp.svg @@ -1,30 +1,30 @@ -// RegisterHash registers a function that returns a new instance of the given + .d2-3628380806 .fill-N1{fill:#0A0F25;} + .d2-3628380806 .fill-N2{fill:#676C7E;} + .d2-3628380806 .fill-N3{fill:#9499AB;} + .d2-3628380806 .fill-N4{fill:#CFD2DD;} + .d2-3628380806 .fill-N5{fill:#DEE1EB;} + .d2-3628380806 .fill-N6{fill:#EEF1F8;} + .d2-3628380806 .fill-N7{fill:#FFFFFF;} + .d2-3628380806 .fill-B1{fill:#0D32B2;} + .d2-3628380806 .fill-B2{fill:#0D32B2;} + .d2-3628380806 .fill-B3{fill:#E3E9FD;} + .d2-3628380806 .fill-B4{fill:#E3E9FD;} + .d2-3628380806 .fill-B5{fill:#EDF0FD;} + .d2-3628380806 .fill-B6{fill:#F7F8FE;} + .d2-3628380806 .fill-AA2{fill:#4A6FF3;} + .d2-3628380806 .fill-AA4{fill:#EDF0FD;} + .d2-3628380806 .fill-AA5{fill:#F7F8FE;} + .d2-3628380806 .fill-AB4{fill:#EDF0FD;} + .d2-3628380806 .fill-AB5{fill:#F7F8FE;} + .d2-3628380806 .stroke-N1{stroke:#0A0F25;} + .d2-3628380806 .stroke-N2{stroke:#676C7E;} + .d2-3628380806 .stroke-N3{stroke:#9499AB;} + .d2-3628380806 .stroke-N4{stroke:#CFD2DD;} + .d2-3628380806 .stroke-N5{stroke:#DEE1EB;} + .d2-3628380806 .stroke-N6{stroke:#EEF1F8;} + .d2-3628380806 .stroke-N7{stroke:#FFFFFF;} + .d2-3628380806 .stroke-B1{stroke:#0D32B2;} + .d2-3628380806 .stroke-B2{stroke:#0D32B2;} + .d2-3628380806 .stroke-B3{stroke:#E3E9FD;} + .d2-3628380806 .stroke-B4{stroke:#E3E9FD;} + .d2-3628380806 .stroke-B5{stroke:#EDF0FD;} + .d2-3628380806 .stroke-B6{stroke:#F7F8FE;} + .d2-3628380806 .stroke-AA2{stroke:#4A6FF3;} + .d2-3628380806 .stroke-AA4{stroke:#EDF0FD;} + .d2-3628380806 .stroke-AA5{stroke:#F7F8FE;} + .d2-3628380806 .stroke-AB4{stroke:#EDF0FD;} + .d2-3628380806 .stroke-AB5{stroke:#F7F8FE;} + .d2-3628380806 .background-color-N1{background-color:#0A0F25;} + .d2-3628380806 .background-color-N2{background-color:#676C7E;} + .d2-3628380806 .background-color-N3{background-color:#9499AB;} + .d2-3628380806 .background-color-N4{background-color:#CFD2DD;} + .d2-3628380806 .background-color-N5{background-color:#DEE1EB;} + .d2-3628380806 .background-color-N6{background-color:#EEF1F8;} + .d2-3628380806 .background-color-N7{background-color:#FFFFFF;} + .d2-3628380806 .background-color-B1{background-color:#0D32B2;} + .d2-3628380806 .background-color-B2{background-color:#0D32B2;} + .d2-3628380806 .background-color-B3{background-color:#E3E9FD;} + .d2-3628380806 .background-color-B4{background-color:#E3E9FD;} + .d2-3628380806 .background-color-B5{background-color:#EDF0FD;} + .d2-3628380806 .background-color-B6{background-color:#F7F8FE;} + .d2-3628380806 .background-color-AA2{background-color:#4A6FF3;} + .d2-3628380806 .background-color-AA4{background-color:#EDF0FD;} + .d2-3628380806 .background-color-AA5{background-color:#F7F8FE;} + .d2-3628380806 .background-color-AB4{background-color:#EDF0FD;} + .d2-3628380806 .background-color-AB5{background-color:#F7F8FE;} + .d2-3628380806 .color-N1{color:#0A0F25;} + .d2-3628380806 .color-N2{color:#676C7E;} + .d2-3628380806 .color-N3{color:#9499AB;} + .d2-3628380806 .color-N4{color:#CFD2DD;} + .d2-3628380806 .color-N5{color:#DEE1EB;} + .d2-3628380806 .color-N6{color:#EEF1F8;} + .d2-3628380806 .color-N7{color:#FFFFFF;} + .d2-3628380806 .color-B1{color:#0D32B2;} + .d2-3628380806 .color-B2{color:#0D32B2;} + .d2-3628380806 .color-B3{color:#E3E9FD;} + .d2-3628380806 .color-B4{color:#E3E9FD;} + .d2-3628380806 .color-B5{color:#EDF0FD;} + .d2-3628380806 .color-B6{color:#F7F8FE;} + .d2-3628380806 .color-AA2{color:#4A6FF3;} + .d2-3628380806 .color-AA4{color:#EDF0FD;} + .d2-3628380806 .color-AA5{color:#F7F8FE;} + .d2-3628380806 .color-AB4{color:#EDF0FD;} + .d2-3628380806 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3628380806);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3628380806);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3628380806);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3628380806);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3628380806);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3628380806);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3628380806);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3628380806);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3628380806);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3628380806);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3628380806);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3628380806);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3628380806);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3628380806);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3628380806);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3628380806);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3628380806);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3628380806);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>// RegisterHash registers a function that returns a new instance of the given // hash function. This is intended to be called from the init function in // packages that implement hash functions. func RegisterHash(h Hash, f func() hash.Hash) { @@ -126,9 +126,9 @@         panic("crypto: RegisterHash of unknown hash function")     }     hashes[h] = f -}xy +}    xy - - - + + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/code_snippet/elk/board.exp.json b/e2etests/testdata/stable/code_snippet/elk/board.exp.json index b5f7645e6..ff631cf92 100644 --- a/e2etests/testdata/stable/code_snippet/elk/board.exp.json +++ b/e2etests/testdata/stable/code_snippet/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -150,6 +161,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 389.5, @@ -188,6 +200,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 389.5, @@ -219,6 +232,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/code_snippet/elk/sketch.exp.svg b/e2etests/testdata/stable/code_snippet/elk/sketch.exp.svg index 0dd42ae70..9162316da 100644 --- a/e2etests/testdata/stable/code_snippet/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/code_snippet/elk/sketch.exp.svg @@ -1,30 +1,30 @@ -// RegisterHash registers a function that returns a new instance of the given + .d2-1488903789 .fill-N1{fill:#0A0F25;} + .d2-1488903789 .fill-N2{fill:#676C7E;} + .d2-1488903789 .fill-N3{fill:#9499AB;} + .d2-1488903789 .fill-N4{fill:#CFD2DD;} + .d2-1488903789 .fill-N5{fill:#DEE1EB;} + .d2-1488903789 .fill-N6{fill:#EEF1F8;} + .d2-1488903789 .fill-N7{fill:#FFFFFF;} + .d2-1488903789 .fill-B1{fill:#0D32B2;} + .d2-1488903789 .fill-B2{fill:#0D32B2;} + .d2-1488903789 .fill-B3{fill:#E3E9FD;} + .d2-1488903789 .fill-B4{fill:#E3E9FD;} + .d2-1488903789 .fill-B5{fill:#EDF0FD;} + .d2-1488903789 .fill-B6{fill:#F7F8FE;} + .d2-1488903789 .fill-AA2{fill:#4A6FF3;} + .d2-1488903789 .fill-AA4{fill:#EDF0FD;} + .d2-1488903789 .fill-AA5{fill:#F7F8FE;} + .d2-1488903789 .fill-AB4{fill:#EDF0FD;} + .d2-1488903789 .fill-AB5{fill:#F7F8FE;} + .d2-1488903789 .stroke-N1{stroke:#0A0F25;} + .d2-1488903789 .stroke-N2{stroke:#676C7E;} + .d2-1488903789 .stroke-N3{stroke:#9499AB;} + .d2-1488903789 .stroke-N4{stroke:#CFD2DD;} + .d2-1488903789 .stroke-N5{stroke:#DEE1EB;} + .d2-1488903789 .stroke-N6{stroke:#EEF1F8;} + .d2-1488903789 .stroke-N7{stroke:#FFFFFF;} + .d2-1488903789 .stroke-B1{stroke:#0D32B2;} + .d2-1488903789 .stroke-B2{stroke:#0D32B2;} + .d2-1488903789 .stroke-B3{stroke:#E3E9FD;} + .d2-1488903789 .stroke-B4{stroke:#E3E9FD;} + .d2-1488903789 .stroke-B5{stroke:#EDF0FD;} + .d2-1488903789 .stroke-B6{stroke:#F7F8FE;} + .d2-1488903789 .stroke-AA2{stroke:#4A6FF3;} + .d2-1488903789 .stroke-AA4{stroke:#EDF0FD;} + .d2-1488903789 .stroke-AA5{stroke:#F7F8FE;} + .d2-1488903789 .stroke-AB4{stroke:#EDF0FD;} + .d2-1488903789 .stroke-AB5{stroke:#F7F8FE;} + .d2-1488903789 .background-color-N1{background-color:#0A0F25;} + .d2-1488903789 .background-color-N2{background-color:#676C7E;} + .d2-1488903789 .background-color-N3{background-color:#9499AB;} + .d2-1488903789 .background-color-N4{background-color:#CFD2DD;} + .d2-1488903789 .background-color-N5{background-color:#DEE1EB;} + .d2-1488903789 .background-color-N6{background-color:#EEF1F8;} + .d2-1488903789 .background-color-N7{background-color:#FFFFFF;} + .d2-1488903789 .background-color-B1{background-color:#0D32B2;} + .d2-1488903789 .background-color-B2{background-color:#0D32B2;} + .d2-1488903789 .background-color-B3{background-color:#E3E9FD;} + .d2-1488903789 .background-color-B4{background-color:#E3E9FD;} + .d2-1488903789 .background-color-B5{background-color:#EDF0FD;} + .d2-1488903789 .background-color-B6{background-color:#F7F8FE;} + .d2-1488903789 .background-color-AA2{background-color:#4A6FF3;} + .d2-1488903789 .background-color-AA4{background-color:#EDF0FD;} + .d2-1488903789 .background-color-AA5{background-color:#F7F8FE;} + .d2-1488903789 .background-color-AB4{background-color:#EDF0FD;} + .d2-1488903789 .background-color-AB5{background-color:#F7F8FE;} + .d2-1488903789 .color-N1{color:#0A0F25;} + .d2-1488903789 .color-N2{color:#676C7E;} + .d2-1488903789 .color-N3{color:#9499AB;} + .d2-1488903789 .color-N4{color:#CFD2DD;} + .d2-1488903789 .color-N5{color:#DEE1EB;} + .d2-1488903789 .color-N6{color:#EEF1F8;} + .d2-1488903789 .color-N7{color:#FFFFFF;} + .d2-1488903789 .color-B1{color:#0D32B2;} + .d2-1488903789 .color-B2{color:#0D32B2;} + .d2-1488903789 .color-B3{color:#E3E9FD;} + .d2-1488903789 .color-B4{color:#E3E9FD;} + .d2-1488903789 .color-B5{color:#EDF0FD;} + .d2-1488903789 .color-B6{color:#F7F8FE;} + .d2-1488903789 .color-AA2{color:#4A6FF3;} + .d2-1488903789 .color-AA4{color:#EDF0FD;} + .d2-1488903789 .color-AA5{color:#F7F8FE;} + .d2-1488903789 .color-AB4{color:#EDF0FD;} + .d2-1488903789 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1488903789);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1488903789);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1488903789);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1488903789);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1488903789);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1488903789);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1488903789);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1488903789);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1488903789);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1488903789);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1488903789);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1488903789);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1488903789);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1488903789);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1488903789);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1488903789);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1488903789);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1488903789);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>// RegisterHash registers a function that returns a new instance of the given // hash function. This is intended to be called from the init function in // packages that implement hash functions. func RegisterHash(h Hash, f func() hash.Hash) { @@ -126,9 +126,9 @@         panic("crypto: RegisterHash of unknown hash function")     }     hashes[h] = f -}xy +}    xy - - - + + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/complex-layers/dagre/board.exp.json b/e2etests/testdata/stable/complex-layers/dagre/board.exp.json index 3ceacbac4..e4736c98e 100644 --- a/e2etests/testdata/stable/complex-layers/dagre/board.exp.json +++ b/e2etests/testdata/stable/complex-layers/dagre/board.exp.json @@ -1,15 +1,65 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ { - "id": "window", + "id": "desc", "type": "rectangle", "pos": { "x": 0, "y": 0 }, + "width": 261, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Multi-layer diagram of a home.", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 216, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "window", + "type": "rectangle", + "pos": { + "x": 321, + "y": 0 + }, "width": 103, "height": 66, "opacity": 1, @@ -18,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -48,7 +99,7 @@ "id": "roof", "type": "rectangle", "pos": { - "x": 163, + "x": 484, "y": 0 }, "width": 75, @@ -59,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -89,7 +141,7 @@ "id": "garage", "type": "rectangle", "pos": { - "x": 298, + "x": 619, "y": 0 }, "width": 94, @@ -100,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -143,6 +196,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -189,6 +243,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -230,6 +285,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -273,6 +329,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -319,6 +376,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -360,6 +418,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -401,6 +460,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -444,6 +504,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -490,6 +551,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -531,6 +593,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -574,6 +637,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -602,9 +666,52 @@ }, { "name": "repair", - "isFolderOnly": true, + "isFolderOnly": false, "fontFamily": "SourceSansPro", - "shapes": [], + "shapes": [ + { + "id": "desc", + "type": "rectangle", + "pos": { + "x": 0, + "y": 0 + }, + "width": 200, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "How to repair a home.", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 155, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], "connections": [], "root": { "id": "", @@ -621,6 +728,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -652,11 +760,53 @@ "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ + { + "id": "desc", + "type": "rectangle", + "pos": { + "x": 0, + "y": 50 + }, + "width": 200, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "How to repair a home.", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 155, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, { "id": "find contractors", "type": "rectangle", "pos": { - "x": 10, + "x": 250, "y": 20 }, "width": 341, @@ -667,6 +817,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -697,7 +848,7 @@ "id": "find contractors.craigslist", "type": "rectangle", "pos": { - "x": 40, + "x": 280, "y": 50 }, "width": 110, @@ -708,6 +859,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -738,7 +890,7 @@ "id": "find contractors.facebook", "type": "rectangle", "pos": { - "x": 210, + "x": 450, "y": 50 }, "width": 111, @@ -749,6 +901,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -792,6 +945,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -823,11 +977,53 @@ "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ + { + "id": "desc", + "type": "rectangle", + "pos": { + "x": 0, + "y": 50 + }, + "width": 200, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "How to repair a home.", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 155, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, { "id": "find contractors", "type": "rectangle", "pos": { - "x": 10, + "x": 250, "y": 20 }, "width": 341, @@ -838,6 +1034,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -868,7 +1065,7 @@ "id": "find contractors.craigslist", "type": "rectangle", "pos": { - "x": 40, + "x": 280, "y": 50 }, "width": 110, @@ -879,6 +1076,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -909,7 +1107,7 @@ "id": "find contractors.facebook", "type": "rectangle", "pos": { - "x": 210, + "x": 450, "y": 50 }, "width": 111, @@ -920,6 +1118,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -950,7 +1149,7 @@ "id": "solicit quotes", "type": "rectangle", "pos": { - "x": 196, + "x": 436, "y": 266 }, "width": 140, @@ -961,6 +1160,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1012,21 +1212,22 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 265.5, + "x": 505.5, "y": 146 }, { - "x": 265.5, + "x": 505.5, "y": 202 }, { - "x": 265.5, + "x": 505.5, "y": 226 }, { - "x": 265.5, + "x": 505.5, "y": 266 } ], @@ -1052,6 +1253,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1083,11 +1285,53 @@ "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ + { + "id": "desc", + "type": "rectangle", + "pos": { + "x": 0, + "y": 50 + }, + "width": 200, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "How to repair a home.", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 155, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, { "id": "find contractors", "type": "rectangle", "pos": { - "x": 10, + "x": 250, "y": 20 }, "width": 341, @@ -1098,6 +1342,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1128,7 +1373,7 @@ "id": "find contractors.craigslist", "type": "rectangle", "pos": { - "x": 40, + "x": 280, "y": 50 }, "width": 110, @@ -1139,6 +1384,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1169,7 +1415,7 @@ "id": "find contractors.facebook", "type": "rectangle", "pos": { - "x": 210, + "x": 450, "y": 50 }, "width": 111, @@ -1180,6 +1426,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1210,7 +1457,7 @@ "id": "solicit quotes", "type": "rectangle", "pos": { - "x": 196, + "x": 436, "y": 266 }, "width": 140, @@ -1221,6 +1468,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1251,7 +1499,7 @@ "id": "obtain quotes", "type": "rectangle", "pos": { - "x": 401, + "x": 641, "y": 50 }, "width": 143, @@ -1262,6 +1510,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1292,7 +1541,7 @@ "id": "negotiate", "type": "rectangle", "pos": { - "x": 417, + "x": 657, "y": 266 }, "width": 112, @@ -1303,6 +1552,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1354,21 +1604,22 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 265.5, + "x": 505.5, "y": 146 }, { - "x": 265.5, + "x": 505.5, "y": 202 }, { - "x": 265.5, + "x": 505.5, "y": 226 }, { - "x": 265.5, + "x": 505.5, "y": 266 } ], @@ -1401,21 +1652,22 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 472.5, + "x": 712.5, "y": 116 }, { - "x": 472.5, + "x": 712.5, "y": 156 }, { - "x": 472.5, + "x": 712.5, "y": 226 }, { - "x": 472.5, + "x": 712.5, "y": 266 } ], @@ -1441,6 +1693,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1472,11 +1725,53 @@ "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ + { + "id": "desc", + "type": "rectangle", + "pos": { + "x": 0, + "y": 50 + }, + "width": 200, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "How to repair a home.", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 155, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, { "id": "find contractors", "type": "rectangle", "pos": { - "x": 10, + "x": 250, "y": 20 }, "width": 341, @@ -1487,6 +1782,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1517,7 +1813,7 @@ "id": "find contractors.craigslist", "type": "rectangle", "pos": { - "x": 40, + "x": 280, "y": 50 }, "width": 110, @@ -1528,6 +1824,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1558,7 +1855,7 @@ "id": "find contractors.facebook", "type": "rectangle", "pos": { - "x": 210, + "x": 450, "y": 50 }, "width": 111, @@ -1569,6 +1866,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1599,7 +1897,7 @@ "id": "solicit quotes", "type": "rectangle", "pos": { - "x": 196, + "x": 436, "y": 266 }, "width": 140, @@ -1610,6 +1908,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1640,7 +1939,7 @@ "id": "obtain quotes", "type": "rectangle", "pos": { - "x": 401, + "x": 641, "y": 50 }, "width": 143, @@ -1651,6 +1950,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1681,7 +1981,7 @@ "id": "negotiate", "type": "rectangle", "pos": { - "x": 417, + "x": 657, "y": 266 }, "width": 112, @@ -1692,6 +1992,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1722,7 +2023,7 @@ "id": "book the best bid", "type": "rectangle", "pos": { - "x": 389, + "x": 629, "y": 432 }, "width": 167, @@ -1733,6 +2034,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1784,21 +2086,22 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 265.5, + "x": 505.5, "y": 146 }, { - "x": 265.5, + "x": 505.5, "y": 202 }, { - "x": 265.5, + "x": 505.5, "y": 226 }, { - "x": 265.5, + "x": 505.5, "y": 266 } ], @@ -1831,21 +2134,22 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 472.5, + "x": 712.5, "y": 116 }, { - "x": 472.5, + "x": 712.5, "y": 156 }, { - "x": 472.5, + "x": 712.5, "y": 226 }, { - "x": 472.5, + "x": 712.5, "y": 266 } ], @@ -1878,21 +2182,22 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 472.5, + "x": 712.5, "y": 332 }, { - "x": 472.5, + "x": 712.5, "y": 372 }, { - "x": 472.5, + "x": 712.5, "y": 392 }, { - "x": 472.5, + "x": 712.5, "y": 432 } ], @@ -1918,6 +2223,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1954,12 +2260,54 @@ "fontFamily": "SourceSansPro", "shapes": [ { - "id": "window", + "id": "desc", "type": "rectangle", "pos": { "x": 0, "y": 0 }, + "width": 261, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Multi-layer diagram of a home.", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 216, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "window", + "type": "rectangle", + "pos": { + "x": 321, + "y": 0 + }, "width": 103, "height": 66, "opacity": 1, @@ -1968,6 +2316,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1998,7 +2347,7 @@ "id": "roof", "type": "rectangle", "pos": { - "x": 163, + "x": 484, "y": 0 }, "width": 75, @@ -2009,6 +2358,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2039,7 +2389,7 @@ "id": "garage", "type": "rectangle", "pos": { - "x": 298, + "x": 619, "y": 0 }, "width": 94, @@ -2050,6 +2400,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2080,7 +2431,7 @@ "id": "water", "type": "rectangle", "pos": { - "x": 452, + "x": 773, "y": 0 }, "width": 88, @@ -2091,6 +2442,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2121,7 +2473,7 @@ "id": "rain", "type": "rectangle", "pos": { - "x": 600, + "x": 921, "y": 0 }, "width": 73, @@ -2132,6 +2484,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2162,7 +2515,7 @@ "id": "thunder", "type": "rectangle", "pos": { - "x": 733, + "x": 1054, "y": 0 }, "width": 103, @@ -2173,6 +2526,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2216,6 +2570,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/complex-layers/dagre/sketch.exp.svg b/e2etests/testdata/stable/complex-layers/dagre/sketch.exp.svg index 732deb420..3d052b92b 100644 --- a/e2etests/testdata/stable/complex-layers/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/complex-layers/dagre/sketch.exp.svg @@ -1,17 +1,17 @@ -windowroofgarage - - - - -blindsglass + 90.000000%, 100% { + opacity: 0; + } +}@keyframes d2Transition-d2-1618293733-9 { + 0%, 89.990000% { + opacity: 0; + } + 90.000000%, 100.000000% { + opacity: 1; + } +}]]>Multi-layer diagram of a home.windowroofgarage + + + + + +blindsglass - - -shinglesstarlinkutility hookup + + +shinglesstarlinkutility hookup - - - -toolsvehicles + + + +toolsvehicles - - -find contractorscraigslistfacebook - - - - -find contractorssolicit quotescraigslistfacebook - - - - - -find contractorssolicit quotesobtain quotesnegotiatecraigslistfacebook - - - - - - - -find contractorssolicit quotesobtain quotesnegotiatebook the best bidcraigslistfacebook - - - - - - - - -windowroofgaragewaterrainthunder - - - - - - - + + +How to repair a home. + + +How to repair a home.find contractorscraigslistfacebook + + + + + +How to repair a home.find contractorssolicit quotescraigslistfacebook + + + + + + +How to repair a home.find contractorssolicit quotesobtain quotesnegotiatecraigslistfacebook + + + + + + + + +How to repair a home.find contractorssolicit quotesobtain quotesnegotiatebook the best bidcraigslistfacebook + + + + + + + + + +Multi-layer diagram of a home.windowroofgaragewaterrainthunder + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/complex-layers/elk/board.exp.json b/e2etests/testdata/stable/complex-layers/elk/board.exp.json index 4e4aca6ab..5d11e4c39 100644 --- a/e2etests/testdata/stable/complex-layers/elk/board.exp.json +++ b/e2etests/testdata/stable/complex-layers/elk/board.exp.json @@ -1,15 +1,65 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ { - "id": "window", + "id": "desc", "type": "rectangle", "pos": { "x": 12, "y": 12 }, + "width": 261, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Multi-layer diagram of a home.", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 216, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "window", + "type": "rectangle", + "pos": { + "x": 293, + "y": 12 + }, "width": 103, "height": 66, "opacity": 1, @@ -18,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -48,7 +99,7 @@ "id": "roof", "type": "rectangle", "pos": { - "x": 135, + "x": 416, "y": 12 }, "width": 75, @@ -59,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -89,7 +141,7 @@ "id": "garage", "type": "rectangle", "pos": { - "x": 230, + "x": 511, "y": 12 }, "width": 94, @@ -100,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -143,6 +196,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -189,6 +243,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -230,6 +285,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -273,6 +329,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -319,6 +376,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -360,6 +418,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -401,6 +460,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -444,6 +504,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -490,6 +551,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -531,6 +593,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -574,6 +637,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -602,9 +666,52 @@ }, { "name": "repair", - "isFolderOnly": true, + "isFolderOnly": false, "fontFamily": "SourceSansPro", - "shapes": [], + "shapes": [ + { + "id": "desc", + "type": "rectangle", + "pos": { + "x": 12, + "y": 12 + }, + "width": 200, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "How to repair a home.", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 155, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], "connections": [], "root": { "id": "", @@ -621,6 +728,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -653,10 +761,52 @@ "fontFamily": "SourceSansPro", "shapes": [ { - "id": "find contractors", + "id": "desc", "type": "rectangle", "pos": { "x": 12, + "y": 62 + }, + "width": 200, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "How to repair a home.", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 155, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "find contractors", + "type": "rectangle", + "pos": { + "x": 232, "y": 12 }, "width": 341, @@ -667,6 +817,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -697,7 +848,7 @@ "id": "find contractors.craigslist", "type": "rectangle", "pos": { - "x": 62, + "x": 282, "y": 62 }, "width": 110, @@ -708,6 +859,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -738,7 +890,7 @@ "id": "find contractors.facebook", "type": "rectangle", "pos": { - "x": 192, + "x": 412, "y": 62 }, "width": 111, @@ -749,6 +901,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -792,6 +945,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -824,10 +978,52 @@ "fontFamily": "SourceSansPro", "shapes": [ { - "id": "find contractors", + "id": "desc", "type": "rectangle", "pos": { "x": 12, + "y": 62 + }, + "width": 200, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "How to repair a home.", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 155, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "find contractors", + "type": "rectangle", + "pos": { + "x": 232, "y": 12 }, "width": 341, @@ -838,6 +1034,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -868,7 +1065,7 @@ "id": "find contractors.craigslist", "type": "rectangle", "pos": { - "x": 62, + "x": 282, "y": 62 }, "width": 110, @@ -879,6 +1076,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -909,7 +1107,7 @@ "id": "find contractors.facebook", "type": "rectangle", "pos": { - "x": 192, + "x": 412, "y": 62 }, "width": 111, @@ -920,6 +1118,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -950,7 +1149,7 @@ "id": "solicit quotes", "type": "rectangle", "pos": { - "x": 112, + "x": 332, "y": 248 }, "width": 140, @@ -961,6 +1160,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1012,13 +1212,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 182.5, + "x": 402.5, "y": 178 }, { - "x": 182.5, + "x": 402.5, "y": 248 } ], @@ -1043,6 +1244,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1075,10 +1277,52 @@ "fontFamily": "SourceSansPro", "shapes": [ { - "id": "find contractors", + "id": "desc", "type": "rectangle", "pos": { "x": 12, + "y": 62 + }, + "width": 200, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "How to repair a home.", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 155, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "find contractors", + "type": "rectangle", + "pos": { + "x": 232, "y": 12 }, "width": 341, @@ -1089,6 +1333,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1119,7 +1364,7 @@ "id": "find contractors.craigslist", "type": "rectangle", "pos": { - "x": 62, + "x": 282, "y": 62 }, "width": 110, @@ -1130,6 +1375,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1160,7 +1406,7 @@ "id": "find contractors.facebook", "type": "rectangle", "pos": { - "x": 192, + "x": 412, "y": 62 }, "width": 111, @@ -1171,6 +1417,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1201,7 +1448,7 @@ "id": "solicit quotes", "type": "rectangle", "pos": { - "x": 112, + "x": 332, "y": 248 }, "width": 140, @@ -1212,6 +1459,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1242,7 +1490,7 @@ "id": "obtain quotes", "type": "rectangle", "pos": { - "x": 373, + "x": 593, "y": 112 }, "width": 143, @@ -1253,6 +1501,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1283,7 +1532,7 @@ "id": "negotiate", "type": "rectangle", "pos": { - "x": 388, + "x": 608, "y": 248 }, "width": 112, @@ -1294,6 +1543,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1345,13 +1595,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 182.5, + "x": 402.5, "y": 178 }, { - "x": 182.5, + "x": 402.5, "y": 248 } ], @@ -1383,13 +1634,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 444.5, + "x": 664.5, "y": 178 }, { - "x": 444.5, + "x": 664.5, "y": 248 } ], @@ -1414,6 +1666,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1446,10 +1699,52 @@ "fontFamily": "SourceSansPro", "shapes": [ { - "id": "find contractors", + "id": "desc", "type": "rectangle", "pos": { "x": 12, + "y": 62 + }, + "width": 200, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "How to repair a home.", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 155, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "find contractors", + "type": "rectangle", + "pos": { + "x": 232, "y": 12 }, "width": 341, @@ -1460,6 +1755,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1490,7 +1786,7 @@ "id": "find contractors.craigslist", "type": "rectangle", "pos": { - "x": 62, + "x": 282, "y": 62 }, "width": 110, @@ -1501,6 +1797,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1531,7 +1828,7 @@ "id": "find contractors.facebook", "type": "rectangle", "pos": { - "x": 192, + "x": 412, "y": 62 }, "width": 111, @@ -1542,6 +1839,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1572,7 +1870,7 @@ "id": "solicit quotes", "type": "rectangle", "pos": { - "x": 112, + "x": 332, "y": 248 }, "width": 140, @@ -1583,6 +1881,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1613,7 +1912,7 @@ "id": "obtain quotes", "type": "rectangle", "pos": { - "x": 373, + "x": 593, "y": 112 }, "width": 143, @@ -1624,6 +1923,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1654,7 +1954,7 @@ "id": "negotiate", "type": "rectangle", "pos": { - "x": 388, + "x": 608, "y": 248 }, "width": 112, @@ -1665,6 +1965,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1695,7 +1996,7 @@ "id": "book the best bid", "type": "rectangle", "pos": { - "x": 361, + "x": 581, "y": 384 }, "width": 167, @@ -1706,6 +2007,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1757,13 +2059,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 182.5, + "x": 402.5, "y": 178 }, { - "x": 182.5, + "x": 402.5, "y": 248 } ], @@ -1795,13 +2098,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 444.5, + "x": 664.5, "y": 178 }, { - "x": 444.5, + "x": 664.5, "y": 248 } ], @@ -1833,13 +2137,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 444.5, + "x": 664.5, "y": 314 }, { - "x": 444.5, + "x": 664.5, "y": 384 } ], @@ -1864,6 +2169,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1900,12 +2206,54 @@ "fontFamily": "SourceSansPro", "shapes": [ { - "id": "window", + "id": "desc", "type": "rectangle", "pos": { "x": 12, "y": 12 }, + "width": 261, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Multi-layer diagram of a home.", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 216, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "window", + "type": "rectangle", + "pos": { + "x": 293, + "y": 12 + }, "width": 103, "height": 66, "opacity": 1, @@ -1914,6 +2262,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1944,7 +2293,7 @@ "id": "roof", "type": "rectangle", "pos": { - "x": 135, + "x": 416, "y": 12 }, "width": 75, @@ -1955,6 +2304,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1985,7 +2335,7 @@ "id": "garage", "type": "rectangle", "pos": { - "x": 230, + "x": 511, "y": 12 }, "width": 94, @@ -1996,6 +2346,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2026,7 +2377,7 @@ "id": "water", "type": "rectangle", "pos": { - "x": 344, + "x": 625, "y": 12 }, "width": 88, @@ -2037,6 +2388,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2067,7 +2419,7 @@ "id": "rain", "type": "rectangle", "pos": { - "x": 452, + "x": 733, "y": 12 }, "width": 73, @@ -2078,6 +2430,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2108,7 +2461,7 @@ "id": "thunder", "type": "rectangle", "pos": { - "x": 545, + "x": 826, "y": 12 }, "width": 103, @@ -2119,6 +2472,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2162,6 +2516,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/complex-layers/elk/sketch.exp.svg b/e2etests/testdata/stable/complex-layers/elk/sketch.exp.svg index 6421790ea..a98fdc131 100644 --- a/e2etests/testdata/stable/complex-layers/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/complex-layers/elk/sketch.exp.svg @@ -1,17 +1,17 @@ -windowroofgarage - - - - -blindsglass + 90.000000%, 100% { + opacity: 0; + } +}@keyframes d2Transition-d2-1855151594-9 { + 0%, 89.990000% { + opacity: 0; + } + 90.000000%, 100.000000% { + opacity: 1; + } +}]]>Multi-layer diagram of a home.windowroofgarage + + + + + +blindsglass - - -shinglesstarlinkutility hookup + + +shinglesstarlinkutility hookup - - - -toolsvehicles + + + +toolsvehicles - - -find contractorscraigslistfacebook - - - - -find contractorssolicit quotescraigslistfacebook - - - - - -find contractorssolicit quotesobtain quotesnegotiatecraigslistfacebook - - - - - - - -find contractorssolicit quotesobtain quotesnegotiatebook the best bidcraigslistfacebook - - - - - - - - -windowroofgaragewaterrainthunder - - - - - - - + + +How to repair a home. + + +How to repair a home.find contractorscraigslistfacebook + + + + + +How to repair a home.find contractorssolicit quotescraigslistfacebook + + + + + + +How to repair a home.find contractorssolicit quotesobtain quotesnegotiatecraigslistfacebook + + + + + + + + +How to repair a home.find contractorssolicit quotesobtain quotesnegotiatebook the best bidcraigslistfacebook + + + + + + + + + +Multi-layer diagram of a home.windowroofgaragewaterrainthunder + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/connected_container/dagre/board.exp.json b/e2etests/testdata/stable/connected_container/dagre/board.exp.json index a90ceb89c..f4f131d92 100644 --- a/e2etests/testdata/stable/connected_container/dagre/board.exp.json +++ b/e2etests/testdata/stable/connected_container/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -315,6 +330,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 87, @@ -374,6 +390,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 87, @@ -438,6 +455,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/connected_container/dagre/sketch.exp.svg b/e2etests/testdata/stable/connected_container/dagre/sketch.exp.svg index 1e0cfe1af..06dd5fa9f 100644 --- a/e2etests/testdata/stable/connected_container/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/connected_container/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -acfbdhg + .d2-3664366858 .fill-N1{fill:#0A0F25;} + .d2-3664366858 .fill-N2{fill:#676C7E;} + .d2-3664366858 .fill-N3{fill:#9499AB;} + .d2-3664366858 .fill-N4{fill:#CFD2DD;} + .d2-3664366858 .fill-N5{fill:#DEE1EB;} + .d2-3664366858 .fill-N6{fill:#EEF1F8;} + .d2-3664366858 .fill-N7{fill:#FFFFFF;} + .d2-3664366858 .fill-B1{fill:#0D32B2;} + .d2-3664366858 .fill-B2{fill:#0D32B2;} + .d2-3664366858 .fill-B3{fill:#E3E9FD;} + .d2-3664366858 .fill-B4{fill:#E3E9FD;} + .d2-3664366858 .fill-B5{fill:#EDF0FD;} + .d2-3664366858 .fill-B6{fill:#F7F8FE;} + .d2-3664366858 .fill-AA2{fill:#4A6FF3;} + .d2-3664366858 .fill-AA4{fill:#EDF0FD;} + .d2-3664366858 .fill-AA5{fill:#F7F8FE;} + .d2-3664366858 .fill-AB4{fill:#EDF0FD;} + .d2-3664366858 .fill-AB5{fill:#F7F8FE;} + .d2-3664366858 .stroke-N1{stroke:#0A0F25;} + .d2-3664366858 .stroke-N2{stroke:#676C7E;} + .d2-3664366858 .stroke-N3{stroke:#9499AB;} + .d2-3664366858 .stroke-N4{stroke:#CFD2DD;} + .d2-3664366858 .stroke-N5{stroke:#DEE1EB;} + .d2-3664366858 .stroke-N6{stroke:#EEF1F8;} + .d2-3664366858 .stroke-N7{stroke:#FFFFFF;} + .d2-3664366858 .stroke-B1{stroke:#0D32B2;} + .d2-3664366858 .stroke-B2{stroke:#0D32B2;} + .d2-3664366858 .stroke-B3{stroke:#E3E9FD;} + .d2-3664366858 .stroke-B4{stroke:#E3E9FD;} + .d2-3664366858 .stroke-B5{stroke:#EDF0FD;} + .d2-3664366858 .stroke-B6{stroke:#F7F8FE;} + .d2-3664366858 .stroke-AA2{stroke:#4A6FF3;} + .d2-3664366858 .stroke-AA4{stroke:#EDF0FD;} + .d2-3664366858 .stroke-AA5{stroke:#F7F8FE;} + .d2-3664366858 .stroke-AB4{stroke:#EDF0FD;} + .d2-3664366858 .stroke-AB5{stroke:#F7F8FE;} + .d2-3664366858 .background-color-N1{background-color:#0A0F25;} + .d2-3664366858 .background-color-N2{background-color:#676C7E;} + .d2-3664366858 .background-color-N3{background-color:#9499AB;} + .d2-3664366858 .background-color-N4{background-color:#CFD2DD;} + .d2-3664366858 .background-color-N5{background-color:#DEE1EB;} + .d2-3664366858 .background-color-N6{background-color:#EEF1F8;} + .d2-3664366858 .background-color-N7{background-color:#FFFFFF;} + .d2-3664366858 .background-color-B1{background-color:#0D32B2;} + .d2-3664366858 .background-color-B2{background-color:#0D32B2;} + .d2-3664366858 .background-color-B3{background-color:#E3E9FD;} + .d2-3664366858 .background-color-B4{background-color:#E3E9FD;} + .d2-3664366858 .background-color-B5{background-color:#EDF0FD;} + .d2-3664366858 .background-color-B6{background-color:#F7F8FE;} + .d2-3664366858 .background-color-AA2{background-color:#4A6FF3;} + .d2-3664366858 .background-color-AA4{background-color:#EDF0FD;} + .d2-3664366858 .background-color-AA5{background-color:#F7F8FE;} + .d2-3664366858 .background-color-AB4{background-color:#EDF0FD;} + .d2-3664366858 .background-color-AB5{background-color:#F7F8FE;} + .d2-3664366858 .color-N1{color:#0A0F25;} + .d2-3664366858 .color-N2{color:#676C7E;} + .d2-3664366858 .color-N3{color:#9499AB;} + .d2-3664366858 .color-N4{color:#CFD2DD;} + .d2-3664366858 .color-N5{color:#DEE1EB;} + .d2-3664366858 .color-N6{color:#EEF1F8;} + .d2-3664366858 .color-N7{color:#FFFFFF;} + .d2-3664366858 .color-B1{color:#0D32B2;} + .d2-3664366858 .color-B2{color:#0D32B2;} + .d2-3664366858 .color-B3{color:#E3E9FD;} + .d2-3664366858 .color-B4{color:#E3E9FD;} + .d2-3664366858 .color-B5{color:#EDF0FD;} + .d2-3664366858 .color-B6{color:#F7F8FE;} + .d2-3664366858 .color-AA2{color:#4A6FF3;} + .d2-3664366858 .color-AA4{color:#EDF0FD;} + .d2-3664366858 .color-AA5{color:#F7F8FE;} + .d2-3664366858 .color-AB4{color:#EDF0FD;} + .d2-3664366858 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3664366858);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3664366858);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3664366858);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3664366858);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3664366858);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3664366858);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3664366858);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3664366858);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3664366858);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3664366858);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3664366858);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3664366858);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3664366858);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3664366858);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3664366858);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3664366858);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3664366858);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3664366858);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>acfbdhg - - - - - - - + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/connected_container/elk/board.exp.json b/e2etests/testdata/stable/connected_container/elk/board.exp.json index 86e61496e..fb59a543a 100644 --- a/e2etests/testdata/stable/connected_container/elk/board.exp.json +++ b/e2etests/testdata/stable/connected_container/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -315,6 +330,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 139, @@ -353,6 +369,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 139, @@ -384,6 +401,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/connected_container/elk/sketch.exp.svg b/e2etests/testdata/stable/connected_container/elk/sketch.exp.svg index 1cd8300ba..8228e02f7 100644 --- a/e2etests/testdata/stable/connected_container/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/connected_container/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -acfbdhg + .d2-4282962094 .fill-N1{fill:#0A0F25;} + .d2-4282962094 .fill-N2{fill:#676C7E;} + .d2-4282962094 .fill-N3{fill:#9499AB;} + .d2-4282962094 .fill-N4{fill:#CFD2DD;} + .d2-4282962094 .fill-N5{fill:#DEE1EB;} + .d2-4282962094 .fill-N6{fill:#EEF1F8;} + .d2-4282962094 .fill-N7{fill:#FFFFFF;} + .d2-4282962094 .fill-B1{fill:#0D32B2;} + .d2-4282962094 .fill-B2{fill:#0D32B2;} + .d2-4282962094 .fill-B3{fill:#E3E9FD;} + .d2-4282962094 .fill-B4{fill:#E3E9FD;} + .d2-4282962094 .fill-B5{fill:#EDF0FD;} + .d2-4282962094 .fill-B6{fill:#F7F8FE;} + .d2-4282962094 .fill-AA2{fill:#4A6FF3;} + .d2-4282962094 .fill-AA4{fill:#EDF0FD;} + .d2-4282962094 .fill-AA5{fill:#F7F8FE;} + .d2-4282962094 .fill-AB4{fill:#EDF0FD;} + .d2-4282962094 .fill-AB5{fill:#F7F8FE;} + .d2-4282962094 .stroke-N1{stroke:#0A0F25;} + .d2-4282962094 .stroke-N2{stroke:#676C7E;} + .d2-4282962094 .stroke-N3{stroke:#9499AB;} + .d2-4282962094 .stroke-N4{stroke:#CFD2DD;} + .d2-4282962094 .stroke-N5{stroke:#DEE1EB;} + .d2-4282962094 .stroke-N6{stroke:#EEF1F8;} + .d2-4282962094 .stroke-N7{stroke:#FFFFFF;} + .d2-4282962094 .stroke-B1{stroke:#0D32B2;} + .d2-4282962094 .stroke-B2{stroke:#0D32B2;} + .d2-4282962094 .stroke-B3{stroke:#E3E9FD;} + .d2-4282962094 .stroke-B4{stroke:#E3E9FD;} + .d2-4282962094 .stroke-B5{stroke:#EDF0FD;} + .d2-4282962094 .stroke-B6{stroke:#F7F8FE;} + .d2-4282962094 .stroke-AA2{stroke:#4A6FF3;} + .d2-4282962094 .stroke-AA4{stroke:#EDF0FD;} + .d2-4282962094 .stroke-AA5{stroke:#F7F8FE;} + .d2-4282962094 .stroke-AB4{stroke:#EDF0FD;} + .d2-4282962094 .stroke-AB5{stroke:#F7F8FE;} + .d2-4282962094 .background-color-N1{background-color:#0A0F25;} + .d2-4282962094 .background-color-N2{background-color:#676C7E;} + .d2-4282962094 .background-color-N3{background-color:#9499AB;} + .d2-4282962094 .background-color-N4{background-color:#CFD2DD;} + .d2-4282962094 .background-color-N5{background-color:#DEE1EB;} + .d2-4282962094 .background-color-N6{background-color:#EEF1F8;} + .d2-4282962094 .background-color-N7{background-color:#FFFFFF;} + .d2-4282962094 .background-color-B1{background-color:#0D32B2;} + .d2-4282962094 .background-color-B2{background-color:#0D32B2;} + .d2-4282962094 .background-color-B3{background-color:#E3E9FD;} + .d2-4282962094 .background-color-B4{background-color:#E3E9FD;} + .d2-4282962094 .background-color-B5{background-color:#EDF0FD;} + .d2-4282962094 .background-color-B6{background-color:#F7F8FE;} + .d2-4282962094 .background-color-AA2{background-color:#4A6FF3;} + .d2-4282962094 .background-color-AA4{background-color:#EDF0FD;} + .d2-4282962094 .background-color-AA5{background-color:#F7F8FE;} + .d2-4282962094 .background-color-AB4{background-color:#EDF0FD;} + .d2-4282962094 .background-color-AB5{background-color:#F7F8FE;} + .d2-4282962094 .color-N1{color:#0A0F25;} + .d2-4282962094 .color-N2{color:#676C7E;} + .d2-4282962094 .color-N3{color:#9499AB;} + .d2-4282962094 .color-N4{color:#CFD2DD;} + .d2-4282962094 .color-N5{color:#DEE1EB;} + .d2-4282962094 .color-N6{color:#EEF1F8;} + .d2-4282962094 .color-N7{color:#FFFFFF;} + .d2-4282962094 .color-B1{color:#0D32B2;} + .d2-4282962094 .color-B2{color:#0D32B2;} + .d2-4282962094 .color-B3{color:#E3E9FD;} + .d2-4282962094 .color-B4{color:#E3E9FD;} + .d2-4282962094 .color-B5{color:#EDF0FD;} + .d2-4282962094 .color-B6{color:#F7F8FE;} + .d2-4282962094 .color-AA2{color:#4A6FF3;} + .d2-4282962094 .color-AA4{color:#EDF0FD;} + .d2-4282962094 .color-AA5{color:#F7F8FE;} + .d2-4282962094 .color-AB4{color:#EDF0FD;} + .d2-4282962094 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4282962094);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4282962094);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4282962094);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4282962094);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4282962094);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4282962094);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4282962094);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4282962094);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4282962094);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4282962094);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4282962094);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4282962094);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4282962094);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4282962094);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4282962094);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4282962094);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4282962094);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4282962094);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>acfbdhg - - - - - - - + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/constant_near_stress/dagre/board.exp.json b/e2etests/testdata/stable/constant_near_stress/dagre/board.exp.json index b550af1dd..a867983a8 100644 --- a/e2etests/testdata/stable/constant_near_stress/dagre/board.exp.json +++ b/e2etests/testdata/stable/constant_near_stress/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -140,6 +151,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -181,6 +193,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -222,6 +235,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -262,6 +276,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -302,6 +317,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -342,6 +358,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -382,6 +399,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -432,6 +450,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 27, @@ -472,6 +491,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/constant_near_stress/dagre/sketch.exp.svg b/e2etests/testdata/stable/constant_near_stress/dagre/sketch.exp.svg index 6ab61583a..d320275e1 100644 --- a/e2etests/testdata/stable/constant_near_stress/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/constant_near_stress/dagre/sketch.exp.svg @@ -1,20 +1,20 @@ -xyThe top of the mountainJoeDonald

    Cats, no less liquid than their shadows, offer no angles to the wind.

    +xyThe top of the mountainJoeDonald

    Cats, no less liquid than their shadows, offer no angles to the wind.

    If we can't fix it, it ain't broke.

    Dieters live life in the fasting lane.

    -
    i am top lefti am top righti am bottom lefti am bottom right +
    i am top lefti am top righti am bottom lefti am bottom right - - - - - - - - - - + + + + + + + + + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/constant_near_stress/elk/board.exp.json b/e2etests/testdata/stable/constant_near_stress/elk/board.exp.json index 603b35fc4..d0de387fa 100644 --- a/e2etests/testdata/stable/constant_near_stress/elk/board.exp.json +++ b/e2etests/testdata/stable/constant_near_stress/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -140,6 +151,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -181,6 +193,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -222,6 +235,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -262,6 +276,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -302,6 +317,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -342,6 +358,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -382,6 +399,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -432,6 +450,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 39, @@ -463,6 +482,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/constant_near_stress/elk/sketch.exp.svg b/e2etests/testdata/stable/constant_near_stress/elk/sketch.exp.svg index 074e70214..ff80da1f3 100644 --- a/e2etests/testdata/stable/constant_near_stress/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/constant_near_stress/elk/sketch.exp.svg @@ -1,20 +1,20 @@ -xyThe top of the mountainJoeDonald

    Cats, no less liquid than their shadows, offer no angles to the wind.

    +xyThe top of the mountainJoeDonald

    Cats, no less liquid than their shadows, offer no angles to the wind.

    If we can't fix it, it ain't broke.

    Dieters live life in the fasting lane.

    -
    i am top lefti am top righti am bottom lefti am bottom right +
    i am top lefti am top righti am bottom lefti am bottom right - - - - - - - - - - + + + + + + + + + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/constant_near_title/dagre/board.exp.json b/e2etests/testdata/stable/constant_near_title/dagre/board.exp.json index 62e89f006..4a2121a1b 100644 --- a/e2etests/testdata/stable/constant_near_title/dagre/board.exp.json +++ b/e2etests/testdata/stable/constant_near_title/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -140,6 +151,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -181,6 +193,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -222,6 +235,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -273,6 +287,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 188.5, @@ -320,6 +335,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 201.5, @@ -367,6 +383,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 61.5, @@ -426,6 +443,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 241.5, @@ -473,6 +491,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 247.5, @@ -513,6 +532,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/constant_near_title/dagre/sketch.exp.svg b/e2etests/testdata/stable/constant_near_title/dagre/sketch.exp.svg index ea64931d6..898ed95cb 100644 --- a/e2etests/testdata/stable/constant_near_title/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/constant_near_title/dagre/sketch.exp.svg @@ -1,20 +1,20 @@ -

    A winning strategy

    -
    poll the peopleresultsunfavorablefavorablewill of the people +

    A winning strategy

    +
    poll the peopleresultsunfavorablefavorablewill of the people - - - - - - + + + + + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/constant_near_title/elk/board.exp.json b/e2etests/testdata/stable/constant_near_title/elk/board.exp.json index 1eb62f0b7..23805f459 100644 --- a/e2etests/testdata/stable/constant_near_title/elk/board.exp.json +++ b/e2etests/testdata/stable/constant_near_title/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -140,6 +151,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -181,6 +193,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -222,6 +235,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -273,6 +287,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 160.16600036621094, @@ -319,6 +334,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 126.5, @@ -365,6 +381,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 259.3330078125, @@ -411,6 +428,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 95.5, @@ -449,6 +467,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 95.5, @@ -480,6 +499,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/constant_near_title/elk/sketch.exp.svg b/e2etests/testdata/stable/constant_near_title/elk/sketch.exp.svg index 2f85c8f32..89c9e92da 100644 --- a/e2etests/testdata/stable/constant_near_title/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/constant_near_title/elk/sketch.exp.svg @@ -1,20 +1,20 @@ -

    A winning strategy

    -
    poll the peopleresultsunfavorablefavorablewill of the people +

    A winning strategy

    +
    poll the peopleresultsunfavorablefavorablewill of the people - - - - - - + + + + + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/container_edges/dagre/board.exp.json b/e2etests/testdata/stable/container_edges/dagre/board.exp.json index 94aba95e2..594cfacef 100644 --- a/e2etests/testdata/stable/container_edges/dagre/board.exp.json +++ b/e2etests/testdata/stable/container_edges/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -356,6 +372,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 66.5, @@ -403,6 +420,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 66.5, @@ -462,6 +480,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 226.25, @@ -509,6 +528,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 61.25, @@ -556,6 +576,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 75.75, @@ -603,6 +624,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 122.75, @@ -643,6 +665,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/container_edges/dagre/sketch.exp.svg b/e2etests/testdata/stable/container_edges/dagre/sketch.exp.svg index 67fe4e649..6b23330ab 100644 --- a/e2etests/testdata/stable/container_edges/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/container_edges/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -agdfbhec + .d2-48619404 .fill-N1{fill:#0A0F25;} + .d2-48619404 .fill-N2{fill:#676C7E;} + .d2-48619404 .fill-N3{fill:#9499AB;} + .d2-48619404 .fill-N4{fill:#CFD2DD;} + .d2-48619404 .fill-N5{fill:#DEE1EB;} + .d2-48619404 .fill-N6{fill:#EEF1F8;} + .d2-48619404 .fill-N7{fill:#FFFFFF;} + .d2-48619404 .fill-B1{fill:#0D32B2;} + .d2-48619404 .fill-B2{fill:#0D32B2;} + .d2-48619404 .fill-B3{fill:#E3E9FD;} + .d2-48619404 .fill-B4{fill:#E3E9FD;} + .d2-48619404 .fill-B5{fill:#EDF0FD;} + .d2-48619404 .fill-B6{fill:#F7F8FE;} + .d2-48619404 .fill-AA2{fill:#4A6FF3;} + .d2-48619404 .fill-AA4{fill:#EDF0FD;} + .d2-48619404 .fill-AA5{fill:#F7F8FE;} + .d2-48619404 .fill-AB4{fill:#EDF0FD;} + .d2-48619404 .fill-AB5{fill:#F7F8FE;} + .d2-48619404 .stroke-N1{stroke:#0A0F25;} + .d2-48619404 .stroke-N2{stroke:#676C7E;} + .d2-48619404 .stroke-N3{stroke:#9499AB;} + .d2-48619404 .stroke-N4{stroke:#CFD2DD;} + .d2-48619404 .stroke-N5{stroke:#DEE1EB;} + .d2-48619404 .stroke-N6{stroke:#EEF1F8;} + .d2-48619404 .stroke-N7{stroke:#FFFFFF;} + .d2-48619404 .stroke-B1{stroke:#0D32B2;} + .d2-48619404 .stroke-B2{stroke:#0D32B2;} + .d2-48619404 .stroke-B3{stroke:#E3E9FD;} + .d2-48619404 .stroke-B4{stroke:#E3E9FD;} + .d2-48619404 .stroke-B5{stroke:#EDF0FD;} + .d2-48619404 .stroke-B6{stroke:#F7F8FE;} + .d2-48619404 .stroke-AA2{stroke:#4A6FF3;} + .d2-48619404 .stroke-AA4{stroke:#EDF0FD;} + .d2-48619404 .stroke-AA5{stroke:#F7F8FE;} + .d2-48619404 .stroke-AB4{stroke:#EDF0FD;} + .d2-48619404 .stroke-AB5{stroke:#F7F8FE;} + .d2-48619404 .background-color-N1{background-color:#0A0F25;} + .d2-48619404 .background-color-N2{background-color:#676C7E;} + .d2-48619404 .background-color-N3{background-color:#9499AB;} + .d2-48619404 .background-color-N4{background-color:#CFD2DD;} + .d2-48619404 .background-color-N5{background-color:#DEE1EB;} + .d2-48619404 .background-color-N6{background-color:#EEF1F8;} + .d2-48619404 .background-color-N7{background-color:#FFFFFF;} + .d2-48619404 .background-color-B1{background-color:#0D32B2;} + .d2-48619404 .background-color-B2{background-color:#0D32B2;} + .d2-48619404 .background-color-B3{background-color:#E3E9FD;} + .d2-48619404 .background-color-B4{background-color:#E3E9FD;} + .d2-48619404 .background-color-B5{background-color:#EDF0FD;} + .d2-48619404 .background-color-B6{background-color:#F7F8FE;} + .d2-48619404 .background-color-AA2{background-color:#4A6FF3;} + .d2-48619404 .background-color-AA4{background-color:#EDF0FD;} + .d2-48619404 .background-color-AA5{background-color:#F7F8FE;} + .d2-48619404 .background-color-AB4{background-color:#EDF0FD;} + .d2-48619404 .background-color-AB5{background-color:#F7F8FE;} + .d2-48619404 .color-N1{color:#0A0F25;} + .d2-48619404 .color-N2{color:#676C7E;} + .d2-48619404 .color-N3{color:#9499AB;} + .d2-48619404 .color-N4{color:#CFD2DD;} + .d2-48619404 .color-N5{color:#DEE1EB;} + .d2-48619404 .color-N6{color:#EEF1F8;} + .d2-48619404 .color-N7{color:#FFFFFF;} + .d2-48619404 .color-B1{color:#0D32B2;} + .d2-48619404 .color-B2{color:#0D32B2;} + .d2-48619404 .color-B3{color:#E3E9FD;} + .d2-48619404 .color-B4{color:#E3E9FD;} + .d2-48619404 .color-B5{color:#EDF0FD;} + .d2-48619404 .color-B6{color:#F7F8FE;} + .d2-48619404 .color-AA2{color:#4A6FF3;} + .d2-48619404 .color-AA4{color:#EDF0FD;} + .d2-48619404 .color-AA5{color:#F7F8FE;} + .d2-48619404 .color-AB4{color:#EDF0FD;} + .d2-48619404 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-48619404);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-48619404);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-48619404);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-48619404);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-48619404);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-48619404);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-48619404);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-48619404);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-48619404);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-48619404);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-48619404);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-48619404);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-48619404);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-48619404);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-48619404);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-48619404);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-48619404);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-48619404);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>agdfbhec - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/container_edges/elk/board.exp.json b/e2etests/testdata/stable/container_edges/elk/board.exp.json index 3be49b9c6..66f6cbd65 100644 --- a/e2etests/testdata/stable/container_edges/elk/board.exp.json +++ b/e2etests/testdata/stable/container_edges/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -356,6 +372,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 120.75, @@ -394,6 +411,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 120.75, @@ -440,6 +458,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -494,6 +513,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 193.75, @@ -540,6 +560,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 319, @@ -586,6 +607,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 148.5, @@ -617,6 +639,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/container_edges/elk/sketch.exp.svg b/e2etests/testdata/stable/container_edges/elk/sketch.exp.svg index 2332d4717..9b2801426 100644 --- a/e2etests/testdata/stable/container_edges/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/container_edges/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -agdfbhec + .d2-3618905511 .fill-N1{fill:#0A0F25;} + .d2-3618905511 .fill-N2{fill:#676C7E;} + .d2-3618905511 .fill-N3{fill:#9499AB;} + .d2-3618905511 .fill-N4{fill:#CFD2DD;} + .d2-3618905511 .fill-N5{fill:#DEE1EB;} + .d2-3618905511 .fill-N6{fill:#EEF1F8;} + .d2-3618905511 .fill-N7{fill:#FFFFFF;} + .d2-3618905511 .fill-B1{fill:#0D32B2;} + .d2-3618905511 .fill-B2{fill:#0D32B2;} + .d2-3618905511 .fill-B3{fill:#E3E9FD;} + .d2-3618905511 .fill-B4{fill:#E3E9FD;} + .d2-3618905511 .fill-B5{fill:#EDF0FD;} + .d2-3618905511 .fill-B6{fill:#F7F8FE;} + .d2-3618905511 .fill-AA2{fill:#4A6FF3;} + .d2-3618905511 .fill-AA4{fill:#EDF0FD;} + .d2-3618905511 .fill-AA5{fill:#F7F8FE;} + .d2-3618905511 .fill-AB4{fill:#EDF0FD;} + .d2-3618905511 .fill-AB5{fill:#F7F8FE;} + .d2-3618905511 .stroke-N1{stroke:#0A0F25;} + .d2-3618905511 .stroke-N2{stroke:#676C7E;} + .d2-3618905511 .stroke-N3{stroke:#9499AB;} + .d2-3618905511 .stroke-N4{stroke:#CFD2DD;} + .d2-3618905511 .stroke-N5{stroke:#DEE1EB;} + .d2-3618905511 .stroke-N6{stroke:#EEF1F8;} + .d2-3618905511 .stroke-N7{stroke:#FFFFFF;} + .d2-3618905511 .stroke-B1{stroke:#0D32B2;} + .d2-3618905511 .stroke-B2{stroke:#0D32B2;} + .d2-3618905511 .stroke-B3{stroke:#E3E9FD;} + .d2-3618905511 .stroke-B4{stroke:#E3E9FD;} + .d2-3618905511 .stroke-B5{stroke:#EDF0FD;} + .d2-3618905511 .stroke-B6{stroke:#F7F8FE;} + .d2-3618905511 .stroke-AA2{stroke:#4A6FF3;} + .d2-3618905511 .stroke-AA4{stroke:#EDF0FD;} + .d2-3618905511 .stroke-AA5{stroke:#F7F8FE;} + .d2-3618905511 .stroke-AB4{stroke:#EDF0FD;} + .d2-3618905511 .stroke-AB5{stroke:#F7F8FE;} + .d2-3618905511 .background-color-N1{background-color:#0A0F25;} + .d2-3618905511 .background-color-N2{background-color:#676C7E;} + .d2-3618905511 .background-color-N3{background-color:#9499AB;} + .d2-3618905511 .background-color-N4{background-color:#CFD2DD;} + .d2-3618905511 .background-color-N5{background-color:#DEE1EB;} + .d2-3618905511 .background-color-N6{background-color:#EEF1F8;} + .d2-3618905511 .background-color-N7{background-color:#FFFFFF;} + .d2-3618905511 .background-color-B1{background-color:#0D32B2;} + .d2-3618905511 .background-color-B2{background-color:#0D32B2;} + .d2-3618905511 .background-color-B3{background-color:#E3E9FD;} + .d2-3618905511 .background-color-B4{background-color:#E3E9FD;} + .d2-3618905511 .background-color-B5{background-color:#EDF0FD;} + .d2-3618905511 .background-color-B6{background-color:#F7F8FE;} + .d2-3618905511 .background-color-AA2{background-color:#4A6FF3;} + .d2-3618905511 .background-color-AA4{background-color:#EDF0FD;} + .d2-3618905511 .background-color-AA5{background-color:#F7F8FE;} + .d2-3618905511 .background-color-AB4{background-color:#EDF0FD;} + .d2-3618905511 .background-color-AB5{background-color:#F7F8FE;} + .d2-3618905511 .color-N1{color:#0A0F25;} + .d2-3618905511 .color-N2{color:#676C7E;} + .d2-3618905511 .color-N3{color:#9499AB;} + .d2-3618905511 .color-N4{color:#CFD2DD;} + .d2-3618905511 .color-N5{color:#DEE1EB;} + .d2-3618905511 .color-N6{color:#EEF1F8;} + .d2-3618905511 .color-N7{color:#FFFFFF;} + .d2-3618905511 .color-B1{color:#0D32B2;} + .d2-3618905511 .color-B2{color:#0D32B2;} + .d2-3618905511 .color-B3{color:#E3E9FD;} + .d2-3618905511 .color-B4{color:#E3E9FD;} + .d2-3618905511 .color-B5{color:#EDF0FD;} + .d2-3618905511 .color-B6{color:#F7F8FE;} + .d2-3618905511 .color-AA2{color:#4A6FF3;} + .d2-3618905511 .color-AA4{color:#EDF0FD;} + .d2-3618905511 .color-AA5{color:#F7F8FE;} + .d2-3618905511 .color-AB4{color:#EDF0FD;} + .d2-3618905511 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3618905511);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3618905511);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3618905511);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3618905511);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3618905511);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3618905511);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3618905511);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3618905511);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3618905511);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3618905511);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3618905511);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3618905511);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3618905511);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3618905511);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3618905511);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3618905511);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3618905511);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3618905511);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>agdfbhec - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/crow_foot_arrowhead/dagre/board.exp.json b/e2etests/testdata/stable/crow_foot_arrowhead/dagre/board.exp.json index fe4dfc709..b506b35bf 100644 --- a/e2etests/testdata/stable/crow_foot_arrowhead/dagre/board.exp.json +++ b/e2etests/testdata/stable/crow_foot_arrowhead/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -715,6 +740,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -756,6 +782,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -797,6 +824,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -838,6 +866,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -879,6 +908,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -920,6 +950,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -961,6 +992,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1002,6 +1034,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1043,6 +1076,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1084,6 +1118,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1135,6 +1170,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 31, @@ -1182,6 +1218,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 153, @@ -1229,6 +1266,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 275, @@ -1276,6 +1314,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 397.5, @@ -1323,6 +1362,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 520.5, @@ -1370,6 +1410,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 643.5, @@ -1417,6 +1458,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 765, @@ -1464,6 +1506,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 887, @@ -1511,6 +1554,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1009, @@ -1558,6 +1602,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1131, @@ -1605,6 +1650,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1253, @@ -1652,6 +1698,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1375, @@ -1699,6 +1746,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1493, @@ -1746,6 +1794,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1493, @@ -1786,6 +1835,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/crow_foot_arrowhead/dagre/sketch.exp.svg b/e2etests/testdata/stable/crow_foot_arrowhead/dagre/sketch.exp.svg index 77e682c09..7e5a70e67 100644 --- a/e2etests/testdata/stable/crow_foot_arrowhead/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/crow_foot_arrowhead/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -a1b1a2b2a3b3c1d1c2d2c3d3e1f1e2f2e3f3g1h1g2h2g3h3cdf + .d2-1818408294 .fill-N1{fill:#0A0F25;} + .d2-1818408294 .fill-N2{fill:#676C7E;} + .d2-1818408294 .fill-N3{fill:#9499AB;} + .d2-1818408294 .fill-N4{fill:#CFD2DD;} + .d2-1818408294 .fill-N5{fill:#DEE1EB;} + .d2-1818408294 .fill-N6{fill:#EEF1F8;} + .d2-1818408294 .fill-N7{fill:#FFFFFF;} + .d2-1818408294 .fill-B1{fill:#0D32B2;} + .d2-1818408294 .fill-B2{fill:#0D32B2;} + .d2-1818408294 .fill-B3{fill:#E3E9FD;} + .d2-1818408294 .fill-B4{fill:#E3E9FD;} + .d2-1818408294 .fill-B5{fill:#EDF0FD;} + .d2-1818408294 .fill-B6{fill:#F7F8FE;} + .d2-1818408294 .fill-AA2{fill:#4A6FF3;} + .d2-1818408294 .fill-AA4{fill:#EDF0FD;} + .d2-1818408294 .fill-AA5{fill:#F7F8FE;} + .d2-1818408294 .fill-AB4{fill:#EDF0FD;} + .d2-1818408294 .fill-AB5{fill:#F7F8FE;} + .d2-1818408294 .stroke-N1{stroke:#0A0F25;} + .d2-1818408294 .stroke-N2{stroke:#676C7E;} + .d2-1818408294 .stroke-N3{stroke:#9499AB;} + .d2-1818408294 .stroke-N4{stroke:#CFD2DD;} + .d2-1818408294 .stroke-N5{stroke:#DEE1EB;} + .d2-1818408294 .stroke-N6{stroke:#EEF1F8;} + .d2-1818408294 .stroke-N7{stroke:#FFFFFF;} + .d2-1818408294 .stroke-B1{stroke:#0D32B2;} + .d2-1818408294 .stroke-B2{stroke:#0D32B2;} + .d2-1818408294 .stroke-B3{stroke:#E3E9FD;} + .d2-1818408294 .stroke-B4{stroke:#E3E9FD;} + .d2-1818408294 .stroke-B5{stroke:#EDF0FD;} + .d2-1818408294 .stroke-B6{stroke:#F7F8FE;} + .d2-1818408294 .stroke-AA2{stroke:#4A6FF3;} + .d2-1818408294 .stroke-AA4{stroke:#EDF0FD;} + .d2-1818408294 .stroke-AA5{stroke:#F7F8FE;} + .d2-1818408294 .stroke-AB4{stroke:#EDF0FD;} + .d2-1818408294 .stroke-AB5{stroke:#F7F8FE;} + .d2-1818408294 .background-color-N1{background-color:#0A0F25;} + .d2-1818408294 .background-color-N2{background-color:#676C7E;} + .d2-1818408294 .background-color-N3{background-color:#9499AB;} + .d2-1818408294 .background-color-N4{background-color:#CFD2DD;} + .d2-1818408294 .background-color-N5{background-color:#DEE1EB;} + .d2-1818408294 .background-color-N6{background-color:#EEF1F8;} + .d2-1818408294 .background-color-N7{background-color:#FFFFFF;} + .d2-1818408294 .background-color-B1{background-color:#0D32B2;} + .d2-1818408294 .background-color-B2{background-color:#0D32B2;} + .d2-1818408294 .background-color-B3{background-color:#E3E9FD;} + .d2-1818408294 .background-color-B4{background-color:#E3E9FD;} + .d2-1818408294 .background-color-B5{background-color:#EDF0FD;} + .d2-1818408294 .background-color-B6{background-color:#F7F8FE;} + .d2-1818408294 .background-color-AA2{background-color:#4A6FF3;} + .d2-1818408294 .background-color-AA4{background-color:#EDF0FD;} + .d2-1818408294 .background-color-AA5{background-color:#F7F8FE;} + .d2-1818408294 .background-color-AB4{background-color:#EDF0FD;} + .d2-1818408294 .background-color-AB5{background-color:#F7F8FE;} + .d2-1818408294 .color-N1{color:#0A0F25;} + .d2-1818408294 .color-N2{color:#676C7E;} + .d2-1818408294 .color-N3{color:#9499AB;} + .d2-1818408294 .color-N4{color:#CFD2DD;} + .d2-1818408294 .color-N5{color:#DEE1EB;} + .d2-1818408294 .color-N6{color:#EEF1F8;} + .d2-1818408294 .color-N7{color:#FFFFFF;} + .d2-1818408294 .color-B1{color:#0D32B2;} + .d2-1818408294 .color-B2{color:#0D32B2;} + .d2-1818408294 .color-B3{color:#E3E9FD;} + .d2-1818408294 .color-B4{color:#E3E9FD;} + .d2-1818408294 .color-B5{color:#EDF0FD;} + .d2-1818408294 .color-B6{color:#F7F8FE;} + .d2-1818408294 .color-AA2{color:#4A6FF3;} + .d2-1818408294 .color-AA4{color:#EDF0FD;} + .d2-1818408294 .color-AA5{color:#F7F8FE;} + .d2-1818408294 .color-AB4{color:#EDF0FD;} + .d2-1818408294 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1818408294);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1818408294);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1818408294);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1818408294);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1818408294);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1818408294);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1818408294);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1818408294);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1818408294);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1818408294);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1818408294);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1818408294);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1818408294);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1818408294);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1818408294);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1818408294);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1818408294);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1818408294);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>a1b1a2b2a3b3c1d1c2d2c3d3e1f1e2f2e3f3g1h1g2h2g3h3cdf - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/crow_foot_arrowhead/elk/board.exp.json b/e2etests/testdata/stable/crow_foot_arrowhead/elk/board.exp.json index cd8a64f35..ae8e35d94 100644 --- a/e2etests/testdata/stable/crow_foot_arrowhead/elk/board.exp.json +++ b/e2etests/testdata/stable/crow_foot_arrowhead/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -715,6 +740,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -756,6 +782,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -797,6 +824,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -838,6 +866,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -879,6 +908,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -920,6 +950,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -961,6 +992,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1002,6 +1034,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1043,6 +1076,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1084,6 +1118,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1135,6 +1170,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 43, @@ -1173,6 +1209,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 125, @@ -1211,6 +1248,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 207, @@ -1249,6 +1287,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 289.5, @@ -1287,6 +1326,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 372.5, @@ -1325,6 +1365,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 455.5, @@ -1363,6 +1404,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 537, @@ -1401,6 +1443,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 619, @@ -1439,6 +1482,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 701, @@ -1477,6 +1521,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 783, @@ -1515,6 +1560,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 865, @@ -1553,6 +1599,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 947, @@ -1591,6 +1638,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1025, @@ -1629,6 +1677,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1025, @@ -1660,6 +1709,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/crow_foot_arrowhead/elk/sketch.exp.svg b/e2etests/testdata/stable/crow_foot_arrowhead/elk/sketch.exp.svg index 09111d3c1..5e515ced3 100644 --- a/e2etests/testdata/stable/crow_foot_arrowhead/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/crow_foot_arrowhead/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -a1b1a2b2a3b3c1d1c2d2c3d3e1f1e2f2e3f3g1h1g2h2g3h3cdf + .d2-3080237064 .fill-N1{fill:#0A0F25;} + .d2-3080237064 .fill-N2{fill:#676C7E;} + .d2-3080237064 .fill-N3{fill:#9499AB;} + .d2-3080237064 .fill-N4{fill:#CFD2DD;} + .d2-3080237064 .fill-N5{fill:#DEE1EB;} + .d2-3080237064 .fill-N6{fill:#EEF1F8;} + .d2-3080237064 .fill-N7{fill:#FFFFFF;} + .d2-3080237064 .fill-B1{fill:#0D32B2;} + .d2-3080237064 .fill-B2{fill:#0D32B2;} + .d2-3080237064 .fill-B3{fill:#E3E9FD;} + .d2-3080237064 .fill-B4{fill:#E3E9FD;} + .d2-3080237064 .fill-B5{fill:#EDF0FD;} + .d2-3080237064 .fill-B6{fill:#F7F8FE;} + .d2-3080237064 .fill-AA2{fill:#4A6FF3;} + .d2-3080237064 .fill-AA4{fill:#EDF0FD;} + .d2-3080237064 .fill-AA5{fill:#F7F8FE;} + .d2-3080237064 .fill-AB4{fill:#EDF0FD;} + .d2-3080237064 .fill-AB5{fill:#F7F8FE;} + .d2-3080237064 .stroke-N1{stroke:#0A0F25;} + .d2-3080237064 .stroke-N2{stroke:#676C7E;} + .d2-3080237064 .stroke-N3{stroke:#9499AB;} + .d2-3080237064 .stroke-N4{stroke:#CFD2DD;} + .d2-3080237064 .stroke-N5{stroke:#DEE1EB;} + .d2-3080237064 .stroke-N6{stroke:#EEF1F8;} + .d2-3080237064 .stroke-N7{stroke:#FFFFFF;} + .d2-3080237064 .stroke-B1{stroke:#0D32B2;} + .d2-3080237064 .stroke-B2{stroke:#0D32B2;} + .d2-3080237064 .stroke-B3{stroke:#E3E9FD;} + .d2-3080237064 .stroke-B4{stroke:#E3E9FD;} + .d2-3080237064 .stroke-B5{stroke:#EDF0FD;} + .d2-3080237064 .stroke-B6{stroke:#F7F8FE;} + .d2-3080237064 .stroke-AA2{stroke:#4A6FF3;} + .d2-3080237064 .stroke-AA4{stroke:#EDF0FD;} + .d2-3080237064 .stroke-AA5{stroke:#F7F8FE;} + .d2-3080237064 .stroke-AB4{stroke:#EDF0FD;} + .d2-3080237064 .stroke-AB5{stroke:#F7F8FE;} + .d2-3080237064 .background-color-N1{background-color:#0A0F25;} + .d2-3080237064 .background-color-N2{background-color:#676C7E;} + .d2-3080237064 .background-color-N3{background-color:#9499AB;} + .d2-3080237064 .background-color-N4{background-color:#CFD2DD;} + .d2-3080237064 .background-color-N5{background-color:#DEE1EB;} + .d2-3080237064 .background-color-N6{background-color:#EEF1F8;} + .d2-3080237064 .background-color-N7{background-color:#FFFFFF;} + .d2-3080237064 .background-color-B1{background-color:#0D32B2;} + .d2-3080237064 .background-color-B2{background-color:#0D32B2;} + .d2-3080237064 .background-color-B3{background-color:#E3E9FD;} + .d2-3080237064 .background-color-B4{background-color:#E3E9FD;} + .d2-3080237064 .background-color-B5{background-color:#EDF0FD;} + .d2-3080237064 .background-color-B6{background-color:#F7F8FE;} + .d2-3080237064 .background-color-AA2{background-color:#4A6FF3;} + .d2-3080237064 .background-color-AA4{background-color:#EDF0FD;} + .d2-3080237064 .background-color-AA5{background-color:#F7F8FE;} + .d2-3080237064 .background-color-AB4{background-color:#EDF0FD;} + .d2-3080237064 .background-color-AB5{background-color:#F7F8FE;} + .d2-3080237064 .color-N1{color:#0A0F25;} + .d2-3080237064 .color-N2{color:#676C7E;} + .d2-3080237064 .color-N3{color:#9499AB;} + .d2-3080237064 .color-N4{color:#CFD2DD;} + .d2-3080237064 .color-N5{color:#DEE1EB;} + .d2-3080237064 .color-N6{color:#EEF1F8;} + .d2-3080237064 .color-N7{color:#FFFFFF;} + .d2-3080237064 .color-B1{color:#0D32B2;} + .d2-3080237064 .color-B2{color:#0D32B2;} + .d2-3080237064 .color-B3{color:#E3E9FD;} + .d2-3080237064 .color-B4{color:#E3E9FD;} + .d2-3080237064 .color-B5{color:#EDF0FD;} + .d2-3080237064 .color-B6{color:#F7F8FE;} + .d2-3080237064 .color-AA2{color:#4A6FF3;} + .d2-3080237064 .color-AA4{color:#EDF0FD;} + .d2-3080237064 .color-AA5{color:#F7F8FE;} + .d2-3080237064 .color-AB4{color:#EDF0FD;} + .d2-3080237064 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3080237064);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3080237064);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3080237064);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3080237064);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3080237064);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3080237064);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3080237064);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3080237064);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3080237064);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3080237064);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3080237064);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3080237064);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3080237064);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3080237064);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3080237064);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3080237064);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3080237064);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3080237064);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>a1b1a2b2a3b3c1d1c2d2c3d3e1f1e2f2e3f3g1h1g2h2g3h3cdf - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/cycle-order/dagre/board.exp.json b/e2etests/testdata/stable/cycle-order/dagre/board.exp.json index aae8b0aa5..30cd9bd67 100644 --- a/e2etests/testdata/stable/cycle-order/dagre/board.exp.json +++ b/e2etests/testdata/stable/cycle-order/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -21,6 +29,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -65,6 +74,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -109,6 +119,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -153,6 +164,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -197,6 +209,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -241,6 +254,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -285,6 +299,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -329,6 +344,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -373,6 +389,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -417,6 +434,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -473,6 +491,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -529,6 +548,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -585,6 +605,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -641,6 +662,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -697,6 +719,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -753,6 +776,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -809,6 +833,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -865,6 +890,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -928,6 +954,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 150, @@ -975,6 +1002,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 420, @@ -1022,6 +1050,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 690, @@ -1069,6 +1098,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 960, @@ -1116,6 +1146,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1230, @@ -1163,6 +1194,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1500, @@ -1210,6 +1242,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1770, @@ -1257,6 +1290,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2040, @@ -1304,6 +1338,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2180, @@ -1668,6 +1703,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/cycle-order/dagre/sketch.exp.svg b/e2etests/testdata/stable/cycle-order/dagre/sketch.exp.svg index 74bf7012f..5ad71f035 100644 --- a/e2etests/testdata/stable/cycle-order/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/cycle-order/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -PlanCodeBuildTestCheckReleaseDeployOperateMonitorClickUpGitDockerPlaywrightTruffleHogGithub ActionAWS CopilotAWS ECSGrafana + .d2-722044365 .fill-N1{fill:#0A0F25;} + .d2-722044365 .fill-N2{fill:#676C7E;} + .d2-722044365 .fill-N3{fill:#9499AB;} + .d2-722044365 .fill-N4{fill:#CFD2DD;} + .d2-722044365 .fill-N5{fill:#DEE1EB;} + .d2-722044365 .fill-N6{fill:#EEF1F8;} + .d2-722044365 .fill-N7{fill:#FFFFFF;} + .d2-722044365 .fill-B1{fill:#0D32B2;} + .d2-722044365 .fill-B2{fill:#0D32B2;} + .d2-722044365 .fill-B3{fill:#E3E9FD;} + .d2-722044365 .fill-B4{fill:#E3E9FD;} + .d2-722044365 .fill-B5{fill:#EDF0FD;} + .d2-722044365 .fill-B6{fill:#F7F8FE;} + .d2-722044365 .fill-AA2{fill:#4A6FF3;} + .d2-722044365 .fill-AA4{fill:#EDF0FD;} + .d2-722044365 .fill-AA5{fill:#F7F8FE;} + .d2-722044365 .fill-AB4{fill:#EDF0FD;} + .d2-722044365 .fill-AB5{fill:#F7F8FE;} + .d2-722044365 .stroke-N1{stroke:#0A0F25;} + .d2-722044365 .stroke-N2{stroke:#676C7E;} + .d2-722044365 .stroke-N3{stroke:#9499AB;} + .d2-722044365 .stroke-N4{stroke:#CFD2DD;} + .d2-722044365 .stroke-N5{stroke:#DEE1EB;} + .d2-722044365 .stroke-N6{stroke:#EEF1F8;} + .d2-722044365 .stroke-N7{stroke:#FFFFFF;} + .d2-722044365 .stroke-B1{stroke:#0D32B2;} + .d2-722044365 .stroke-B2{stroke:#0D32B2;} + .d2-722044365 .stroke-B3{stroke:#E3E9FD;} + .d2-722044365 .stroke-B4{stroke:#E3E9FD;} + .d2-722044365 .stroke-B5{stroke:#EDF0FD;} + .d2-722044365 .stroke-B6{stroke:#F7F8FE;} + .d2-722044365 .stroke-AA2{stroke:#4A6FF3;} + .d2-722044365 .stroke-AA4{stroke:#EDF0FD;} + .d2-722044365 .stroke-AA5{stroke:#F7F8FE;} + .d2-722044365 .stroke-AB4{stroke:#EDF0FD;} + .d2-722044365 .stroke-AB5{stroke:#F7F8FE;} + .d2-722044365 .background-color-N1{background-color:#0A0F25;} + .d2-722044365 .background-color-N2{background-color:#676C7E;} + .d2-722044365 .background-color-N3{background-color:#9499AB;} + .d2-722044365 .background-color-N4{background-color:#CFD2DD;} + .d2-722044365 .background-color-N5{background-color:#DEE1EB;} + .d2-722044365 .background-color-N6{background-color:#EEF1F8;} + .d2-722044365 .background-color-N7{background-color:#FFFFFF;} + .d2-722044365 .background-color-B1{background-color:#0D32B2;} + .d2-722044365 .background-color-B2{background-color:#0D32B2;} + .d2-722044365 .background-color-B3{background-color:#E3E9FD;} + .d2-722044365 .background-color-B4{background-color:#E3E9FD;} + .d2-722044365 .background-color-B5{background-color:#EDF0FD;} + .d2-722044365 .background-color-B6{background-color:#F7F8FE;} + .d2-722044365 .background-color-AA2{background-color:#4A6FF3;} + .d2-722044365 .background-color-AA4{background-color:#EDF0FD;} + .d2-722044365 .background-color-AA5{background-color:#F7F8FE;} + .d2-722044365 .background-color-AB4{background-color:#EDF0FD;} + .d2-722044365 .background-color-AB5{background-color:#F7F8FE;} + .d2-722044365 .color-N1{color:#0A0F25;} + .d2-722044365 .color-N2{color:#676C7E;} + .d2-722044365 .color-N3{color:#9499AB;} + .d2-722044365 .color-N4{color:#CFD2DD;} + .d2-722044365 .color-N5{color:#DEE1EB;} + .d2-722044365 .color-N6{color:#EEF1F8;} + .d2-722044365 .color-N7{color:#FFFFFF;} + .d2-722044365 .color-B1{color:#0D32B2;} + .d2-722044365 .color-B2{color:#0D32B2;} + .d2-722044365 .color-B3{color:#E3E9FD;} + .d2-722044365 .color-B4{color:#E3E9FD;} + .d2-722044365 .color-B5{color:#EDF0FD;} + .d2-722044365 .color-B6{color:#F7F8FE;} + .d2-722044365 .color-AA2{color:#4A6FF3;} + .d2-722044365 .color-AA4{color:#EDF0FD;} + .d2-722044365 .color-AA5{color:#F7F8FE;} + .d2-722044365 .color-AB4{color:#EDF0FD;} + .d2-722044365 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-722044365);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-722044365);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-722044365);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-722044365);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-722044365);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-722044365);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-722044365);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-722044365);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-722044365);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-722044365);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-722044365);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-722044365);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-722044365);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-722044365);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-722044365);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-722044365);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-722044365);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-722044365);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>PlanCodeBuildTestCheckReleaseDeployOperateMonitorClickUpGitDockerPlaywrightTruffleHogGithub ActionAWS CopilotAWS ECSGrafana - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/cycle-order/elk/board.exp.json b/e2etests/testdata/stable/cycle-order/elk/board.exp.json index 013018d81..1e431669d 100644 --- a/e2etests/testdata/stable/cycle-order/elk/board.exp.json +++ b/e2etests/testdata/stable/cycle-order/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -21,6 +29,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -65,6 +74,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -109,6 +119,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -153,6 +164,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -197,6 +209,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -241,6 +254,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -285,6 +299,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -329,6 +344,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -373,6 +389,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -417,6 +434,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -473,6 +491,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -529,6 +548,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -585,6 +605,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -641,6 +662,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -697,6 +719,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -753,6 +776,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -809,6 +833,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -865,6 +890,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -928,6 +954,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 182, @@ -966,6 +993,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 432, @@ -1004,6 +1032,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 672, @@ -1042,6 +1071,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 919, @@ -1080,6 +1110,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1166, @@ -1118,6 +1149,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1433, @@ -1156,6 +1188,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1690, @@ -1194,6 +1227,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1930, @@ -1232,6 +1266,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2010, @@ -1263,6 +1298,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/cycle-order/elk/sketch.exp.svg b/e2etests/testdata/stable/cycle-order/elk/sketch.exp.svg index c24b121f6..539787abb 100644 --- a/e2etests/testdata/stable/cycle-order/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/cycle-order/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -PlanCodeBuildTestCheckReleaseDeployOperateMonitorClickUpGitDockerPlaywrightTruffleHogGithub ActionAWS CopilotAWS ECSGrafana + .d2-1100051568 .fill-N1{fill:#0A0F25;} + .d2-1100051568 .fill-N2{fill:#676C7E;} + .d2-1100051568 .fill-N3{fill:#9499AB;} + .d2-1100051568 .fill-N4{fill:#CFD2DD;} + .d2-1100051568 .fill-N5{fill:#DEE1EB;} + .d2-1100051568 .fill-N6{fill:#EEF1F8;} + .d2-1100051568 .fill-N7{fill:#FFFFFF;} + .d2-1100051568 .fill-B1{fill:#0D32B2;} + .d2-1100051568 .fill-B2{fill:#0D32B2;} + .d2-1100051568 .fill-B3{fill:#E3E9FD;} + .d2-1100051568 .fill-B4{fill:#E3E9FD;} + .d2-1100051568 .fill-B5{fill:#EDF0FD;} + .d2-1100051568 .fill-B6{fill:#F7F8FE;} + .d2-1100051568 .fill-AA2{fill:#4A6FF3;} + .d2-1100051568 .fill-AA4{fill:#EDF0FD;} + .d2-1100051568 .fill-AA5{fill:#F7F8FE;} + .d2-1100051568 .fill-AB4{fill:#EDF0FD;} + .d2-1100051568 .fill-AB5{fill:#F7F8FE;} + .d2-1100051568 .stroke-N1{stroke:#0A0F25;} + .d2-1100051568 .stroke-N2{stroke:#676C7E;} + .d2-1100051568 .stroke-N3{stroke:#9499AB;} + .d2-1100051568 .stroke-N4{stroke:#CFD2DD;} + .d2-1100051568 .stroke-N5{stroke:#DEE1EB;} + .d2-1100051568 .stroke-N6{stroke:#EEF1F8;} + .d2-1100051568 .stroke-N7{stroke:#FFFFFF;} + .d2-1100051568 .stroke-B1{stroke:#0D32B2;} + .d2-1100051568 .stroke-B2{stroke:#0D32B2;} + .d2-1100051568 .stroke-B3{stroke:#E3E9FD;} + .d2-1100051568 .stroke-B4{stroke:#E3E9FD;} + .d2-1100051568 .stroke-B5{stroke:#EDF0FD;} + .d2-1100051568 .stroke-B6{stroke:#F7F8FE;} + .d2-1100051568 .stroke-AA2{stroke:#4A6FF3;} + .d2-1100051568 .stroke-AA4{stroke:#EDF0FD;} + .d2-1100051568 .stroke-AA5{stroke:#F7F8FE;} + .d2-1100051568 .stroke-AB4{stroke:#EDF0FD;} + .d2-1100051568 .stroke-AB5{stroke:#F7F8FE;} + .d2-1100051568 .background-color-N1{background-color:#0A0F25;} + .d2-1100051568 .background-color-N2{background-color:#676C7E;} + .d2-1100051568 .background-color-N3{background-color:#9499AB;} + .d2-1100051568 .background-color-N4{background-color:#CFD2DD;} + .d2-1100051568 .background-color-N5{background-color:#DEE1EB;} + .d2-1100051568 .background-color-N6{background-color:#EEF1F8;} + .d2-1100051568 .background-color-N7{background-color:#FFFFFF;} + .d2-1100051568 .background-color-B1{background-color:#0D32B2;} + .d2-1100051568 .background-color-B2{background-color:#0D32B2;} + .d2-1100051568 .background-color-B3{background-color:#E3E9FD;} + .d2-1100051568 .background-color-B4{background-color:#E3E9FD;} + .d2-1100051568 .background-color-B5{background-color:#EDF0FD;} + .d2-1100051568 .background-color-B6{background-color:#F7F8FE;} + .d2-1100051568 .background-color-AA2{background-color:#4A6FF3;} + .d2-1100051568 .background-color-AA4{background-color:#EDF0FD;} + .d2-1100051568 .background-color-AA5{background-color:#F7F8FE;} + .d2-1100051568 .background-color-AB4{background-color:#EDF0FD;} + .d2-1100051568 .background-color-AB5{background-color:#F7F8FE;} + .d2-1100051568 .color-N1{color:#0A0F25;} + .d2-1100051568 .color-N2{color:#676C7E;} + .d2-1100051568 .color-N3{color:#9499AB;} + .d2-1100051568 .color-N4{color:#CFD2DD;} + .d2-1100051568 .color-N5{color:#DEE1EB;} + .d2-1100051568 .color-N6{color:#EEF1F8;} + .d2-1100051568 .color-N7{color:#FFFFFF;} + .d2-1100051568 .color-B1{color:#0D32B2;} + .d2-1100051568 .color-B2{color:#0D32B2;} + .d2-1100051568 .color-B3{color:#E3E9FD;} + .d2-1100051568 .color-B4{color:#E3E9FD;} + .d2-1100051568 .color-B5{color:#EDF0FD;} + .d2-1100051568 .color-B6{color:#F7F8FE;} + .d2-1100051568 .color-AA2{color:#4A6FF3;} + .d2-1100051568 .color-AA4{color:#EDF0FD;} + .d2-1100051568 .color-AA5{color:#F7F8FE;} + .d2-1100051568 .color-AB4{color:#EDF0FD;} + .d2-1100051568 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1100051568);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1100051568);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1100051568);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1100051568);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1100051568);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1100051568);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1100051568);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1100051568);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1100051568);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1100051568);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1100051568);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1100051568);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1100051568);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1100051568);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1100051568);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1100051568);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1100051568);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1100051568);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>PlanCodeBuildTestCheckReleaseDeployOperateMonitorClickUpGitDockerPlaywrightTruffleHogGithub ActionAWS CopilotAWS ECSGrafana - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/dagger_grid/dagre/board.exp.json b/e2etests/testdata/stable/dagger_grid/dagre/board.exp.json index 8d239b03a..bea50988c 100644 --- a/e2etests/testdata/stable/dagger_grid/dagre/board.exp.json +++ b/e2etests/testdata/stable/dagger_grid/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "white", "stroke": "cornflowerblue", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "white", "stroke": "cornflowerblue", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -98,6 +108,7 @@ "borderRadius": 0, "fill": "white", "stroke": "cornflowerblue", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -138,6 +149,7 @@ "borderRadius": 0, "fill": "white", "stroke": "cornflowerblue", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -178,6 +190,7 @@ "borderRadius": 0, "fill": "white", "stroke": "cornflowerblue", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -218,6 +231,7 @@ "borderRadius": 0, "fill": "white", "stroke": "cornflowerblue", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -258,6 +272,7 @@ "borderRadius": 0, "fill": "white", "stroke": "cornflowerblue", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -298,6 +313,7 @@ "borderRadius": 0, "fill": "white", "stroke": "cornflowerblue", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -338,6 +354,7 @@ "borderRadius": 0, "fill": "white", "stroke": "cornflowerblue", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -378,6 +395,7 @@ "borderRadius": 0, "fill": "beige", "stroke": "darkcyan", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -419,6 +437,7 @@ "borderRadius": 0, "fill": "lightcyan", "stroke": "darkcyan", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -472,6 +491,7 @@ "borderRadius": 0, "fill": "gold", "stroke": "maroon", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -513,6 +533,7 @@ "borderRadius": 0, "fill": "darkcyan", "stroke": "black", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -554,6 +575,7 @@ "borderRadius": 0, "fill": "darkcyan", "stroke": "black", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -595,6 +617,7 @@ "borderRadius": 0, "fill": "darkcyan", "stroke": "black", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -636,6 +659,7 @@ "borderRadius": 0, "fill": "darkcyan", "stroke": "black", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -679,6 +703,7 @@ "borderRadius": 0, "fill": "black", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/dagger_grid/dagre/sketch.exp.svg b/e2etests/testdata/stable/dagger_grid/dagre/sketch.exp.svg index 0e229d51f..ffe22d0ca 100644 --- a/e2etests/testdata/stable/dagger_grid/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/dagger_grid/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -DAGGER ENGINEANY DOCKER COMPATIBLE RUNTIMEANY CIWINDOWSLINUXMACOSKUBERNETES + .d2-1211730185 .fill-N1{fill:#0A0F25;} + .d2-1211730185 .fill-N2{fill:#676C7E;} + .d2-1211730185 .fill-N3{fill:#9499AB;} + .d2-1211730185 .fill-N4{fill:#CFD2DD;} + .d2-1211730185 .fill-N5{fill:#DEE1EB;} + .d2-1211730185 .fill-N6{fill:#EEF1F8;} + .d2-1211730185 .fill-N7{fill:#FFFFFF;} + .d2-1211730185 .fill-B1{fill:#0D32B2;} + .d2-1211730185 .fill-B2{fill:#0D32B2;} + .d2-1211730185 .fill-B3{fill:#E3E9FD;} + .d2-1211730185 .fill-B4{fill:#E3E9FD;} + .d2-1211730185 .fill-B5{fill:#EDF0FD;} + .d2-1211730185 .fill-B6{fill:#F7F8FE;} + .d2-1211730185 .fill-AA2{fill:#4A6FF3;} + .d2-1211730185 .fill-AA4{fill:#EDF0FD;} + .d2-1211730185 .fill-AA5{fill:#F7F8FE;} + .d2-1211730185 .fill-AB4{fill:#EDF0FD;} + .d2-1211730185 .fill-AB5{fill:#F7F8FE;} + .d2-1211730185 .stroke-N1{stroke:#0A0F25;} + .d2-1211730185 .stroke-N2{stroke:#676C7E;} + .d2-1211730185 .stroke-N3{stroke:#9499AB;} + .d2-1211730185 .stroke-N4{stroke:#CFD2DD;} + .d2-1211730185 .stroke-N5{stroke:#DEE1EB;} + .d2-1211730185 .stroke-N6{stroke:#EEF1F8;} + .d2-1211730185 .stroke-N7{stroke:#FFFFFF;} + .d2-1211730185 .stroke-B1{stroke:#0D32B2;} + .d2-1211730185 .stroke-B2{stroke:#0D32B2;} + .d2-1211730185 .stroke-B3{stroke:#E3E9FD;} + .d2-1211730185 .stroke-B4{stroke:#E3E9FD;} + .d2-1211730185 .stroke-B5{stroke:#EDF0FD;} + .d2-1211730185 .stroke-B6{stroke:#F7F8FE;} + .d2-1211730185 .stroke-AA2{stroke:#4A6FF3;} + .d2-1211730185 .stroke-AA4{stroke:#EDF0FD;} + .d2-1211730185 .stroke-AA5{stroke:#F7F8FE;} + .d2-1211730185 .stroke-AB4{stroke:#EDF0FD;} + .d2-1211730185 .stroke-AB5{stroke:#F7F8FE;} + .d2-1211730185 .background-color-N1{background-color:#0A0F25;} + .d2-1211730185 .background-color-N2{background-color:#676C7E;} + .d2-1211730185 .background-color-N3{background-color:#9499AB;} + .d2-1211730185 .background-color-N4{background-color:#CFD2DD;} + .d2-1211730185 .background-color-N5{background-color:#DEE1EB;} + .d2-1211730185 .background-color-N6{background-color:#EEF1F8;} + .d2-1211730185 .background-color-N7{background-color:#FFFFFF;} + .d2-1211730185 .background-color-B1{background-color:#0D32B2;} + .d2-1211730185 .background-color-B2{background-color:#0D32B2;} + .d2-1211730185 .background-color-B3{background-color:#E3E9FD;} + .d2-1211730185 .background-color-B4{background-color:#E3E9FD;} + .d2-1211730185 .background-color-B5{background-color:#EDF0FD;} + .d2-1211730185 .background-color-B6{background-color:#F7F8FE;} + .d2-1211730185 .background-color-AA2{background-color:#4A6FF3;} + .d2-1211730185 .background-color-AA4{background-color:#EDF0FD;} + .d2-1211730185 .background-color-AA5{background-color:#F7F8FE;} + .d2-1211730185 .background-color-AB4{background-color:#EDF0FD;} + .d2-1211730185 .background-color-AB5{background-color:#F7F8FE;} + .d2-1211730185 .color-N1{color:#0A0F25;} + .d2-1211730185 .color-N2{color:#676C7E;} + .d2-1211730185 .color-N3{color:#9499AB;} + .d2-1211730185 .color-N4{color:#CFD2DD;} + .d2-1211730185 .color-N5{color:#DEE1EB;} + .d2-1211730185 .color-N6{color:#EEF1F8;} + .d2-1211730185 .color-N7{color:#FFFFFF;} + .d2-1211730185 .color-B1{color:#0D32B2;} + .d2-1211730185 .color-B2{color:#0D32B2;} + .d2-1211730185 .color-B3{color:#E3E9FD;} + .d2-1211730185 .color-B4{color:#E3E9FD;} + .d2-1211730185 .color-B5{color:#EDF0FD;} + .d2-1211730185 .color-B6{color:#F7F8FE;} + .d2-1211730185 .color-AA2{color:#4A6FF3;} + .d2-1211730185 .color-AA4{color:#EDF0FD;} + .d2-1211730185 .color-AA5{color:#F7F8FE;} + .d2-1211730185 .color-AB4{color:#EDF0FD;} + .d2-1211730185 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1211730185);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1211730185);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1211730185);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1211730185);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1211730185);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1211730185);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1211730185);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1211730185);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1211730185);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1211730185);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1211730185);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1211730185);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1211730185);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1211730185);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1211730185);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1211730185);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1211730185);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1211730185);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>DAGGER ENGINEANY DOCKER COMPATIBLE RUNTIMEANY CIWINDOWSLINUXMACOSKUBERNETES - - - - - - - + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/dagger_grid/elk/board.exp.json b/e2etests/testdata/stable/dagger_grid/elk/board.exp.json index 8d239b03a..bea50988c 100644 --- a/e2etests/testdata/stable/dagger_grid/elk/board.exp.json +++ b/e2etests/testdata/stable/dagger_grid/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "white", "stroke": "cornflowerblue", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "white", "stroke": "cornflowerblue", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -98,6 +108,7 @@ "borderRadius": 0, "fill": "white", "stroke": "cornflowerblue", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -138,6 +149,7 @@ "borderRadius": 0, "fill": "white", "stroke": "cornflowerblue", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -178,6 +190,7 @@ "borderRadius": 0, "fill": "white", "stroke": "cornflowerblue", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -218,6 +231,7 @@ "borderRadius": 0, "fill": "white", "stroke": "cornflowerblue", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -258,6 +272,7 @@ "borderRadius": 0, "fill": "white", "stroke": "cornflowerblue", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -298,6 +313,7 @@ "borderRadius": 0, "fill": "white", "stroke": "cornflowerblue", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -338,6 +354,7 @@ "borderRadius": 0, "fill": "white", "stroke": "cornflowerblue", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -378,6 +395,7 @@ "borderRadius": 0, "fill": "beige", "stroke": "darkcyan", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -419,6 +437,7 @@ "borderRadius": 0, "fill": "lightcyan", "stroke": "darkcyan", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -472,6 +491,7 @@ "borderRadius": 0, "fill": "gold", "stroke": "maroon", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -513,6 +533,7 @@ "borderRadius": 0, "fill": "darkcyan", "stroke": "black", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -554,6 +575,7 @@ "borderRadius": 0, "fill": "darkcyan", "stroke": "black", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -595,6 +617,7 @@ "borderRadius": 0, "fill": "darkcyan", "stroke": "black", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -636,6 +659,7 @@ "borderRadius": 0, "fill": "darkcyan", "stroke": "black", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -679,6 +703,7 @@ "borderRadius": 0, "fill": "black", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/dagger_grid/elk/sketch.exp.svg b/e2etests/testdata/stable/dagger_grid/elk/sketch.exp.svg index 0e229d51f..ffe22d0ca 100644 --- a/e2etests/testdata/stable/dagger_grid/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/dagger_grid/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -DAGGER ENGINEANY DOCKER COMPATIBLE RUNTIMEANY CIWINDOWSLINUXMACOSKUBERNETES + .d2-1211730185 .fill-N1{fill:#0A0F25;} + .d2-1211730185 .fill-N2{fill:#676C7E;} + .d2-1211730185 .fill-N3{fill:#9499AB;} + .d2-1211730185 .fill-N4{fill:#CFD2DD;} + .d2-1211730185 .fill-N5{fill:#DEE1EB;} + .d2-1211730185 .fill-N6{fill:#EEF1F8;} + .d2-1211730185 .fill-N7{fill:#FFFFFF;} + .d2-1211730185 .fill-B1{fill:#0D32B2;} + .d2-1211730185 .fill-B2{fill:#0D32B2;} + .d2-1211730185 .fill-B3{fill:#E3E9FD;} + .d2-1211730185 .fill-B4{fill:#E3E9FD;} + .d2-1211730185 .fill-B5{fill:#EDF0FD;} + .d2-1211730185 .fill-B6{fill:#F7F8FE;} + .d2-1211730185 .fill-AA2{fill:#4A6FF3;} + .d2-1211730185 .fill-AA4{fill:#EDF0FD;} + .d2-1211730185 .fill-AA5{fill:#F7F8FE;} + .d2-1211730185 .fill-AB4{fill:#EDF0FD;} + .d2-1211730185 .fill-AB5{fill:#F7F8FE;} + .d2-1211730185 .stroke-N1{stroke:#0A0F25;} + .d2-1211730185 .stroke-N2{stroke:#676C7E;} + .d2-1211730185 .stroke-N3{stroke:#9499AB;} + .d2-1211730185 .stroke-N4{stroke:#CFD2DD;} + .d2-1211730185 .stroke-N5{stroke:#DEE1EB;} + .d2-1211730185 .stroke-N6{stroke:#EEF1F8;} + .d2-1211730185 .stroke-N7{stroke:#FFFFFF;} + .d2-1211730185 .stroke-B1{stroke:#0D32B2;} + .d2-1211730185 .stroke-B2{stroke:#0D32B2;} + .d2-1211730185 .stroke-B3{stroke:#E3E9FD;} + .d2-1211730185 .stroke-B4{stroke:#E3E9FD;} + .d2-1211730185 .stroke-B5{stroke:#EDF0FD;} + .d2-1211730185 .stroke-B6{stroke:#F7F8FE;} + .d2-1211730185 .stroke-AA2{stroke:#4A6FF3;} + .d2-1211730185 .stroke-AA4{stroke:#EDF0FD;} + .d2-1211730185 .stroke-AA5{stroke:#F7F8FE;} + .d2-1211730185 .stroke-AB4{stroke:#EDF0FD;} + .d2-1211730185 .stroke-AB5{stroke:#F7F8FE;} + .d2-1211730185 .background-color-N1{background-color:#0A0F25;} + .d2-1211730185 .background-color-N2{background-color:#676C7E;} + .d2-1211730185 .background-color-N3{background-color:#9499AB;} + .d2-1211730185 .background-color-N4{background-color:#CFD2DD;} + .d2-1211730185 .background-color-N5{background-color:#DEE1EB;} + .d2-1211730185 .background-color-N6{background-color:#EEF1F8;} + .d2-1211730185 .background-color-N7{background-color:#FFFFFF;} + .d2-1211730185 .background-color-B1{background-color:#0D32B2;} + .d2-1211730185 .background-color-B2{background-color:#0D32B2;} + .d2-1211730185 .background-color-B3{background-color:#E3E9FD;} + .d2-1211730185 .background-color-B4{background-color:#E3E9FD;} + .d2-1211730185 .background-color-B5{background-color:#EDF0FD;} + .d2-1211730185 .background-color-B6{background-color:#F7F8FE;} + .d2-1211730185 .background-color-AA2{background-color:#4A6FF3;} + .d2-1211730185 .background-color-AA4{background-color:#EDF0FD;} + .d2-1211730185 .background-color-AA5{background-color:#F7F8FE;} + .d2-1211730185 .background-color-AB4{background-color:#EDF0FD;} + .d2-1211730185 .background-color-AB5{background-color:#F7F8FE;} + .d2-1211730185 .color-N1{color:#0A0F25;} + .d2-1211730185 .color-N2{color:#676C7E;} + .d2-1211730185 .color-N3{color:#9499AB;} + .d2-1211730185 .color-N4{color:#CFD2DD;} + .d2-1211730185 .color-N5{color:#DEE1EB;} + .d2-1211730185 .color-N6{color:#EEF1F8;} + .d2-1211730185 .color-N7{color:#FFFFFF;} + .d2-1211730185 .color-B1{color:#0D32B2;} + .d2-1211730185 .color-B2{color:#0D32B2;} + .d2-1211730185 .color-B3{color:#E3E9FD;} + .d2-1211730185 .color-B4{color:#E3E9FD;} + .d2-1211730185 .color-B5{color:#EDF0FD;} + .d2-1211730185 .color-B6{color:#F7F8FE;} + .d2-1211730185 .color-AA2{color:#4A6FF3;} + .d2-1211730185 .color-AA4{color:#EDF0FD;} + .d2-1211730185 .color-AA5{color:#F7F8FE;} + .d2-1211730185 .color-AB4{color:#EDF0FD;} + .d2-1211730185 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1211730185);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1211730185);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1211730185);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1211730185);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1211730185);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1211730185);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1211730185);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1211730185);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1211730185);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1211730185);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1211730185);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1211730185);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1211730185);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1211730185);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1211730185);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1211730185);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1211730185);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1211730185);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>DAGGER ENGINEANY DOCKER COMPATIBLE RUNTIMEANY CIWINDOWSLINUXMACOSKUBERNETES - - - - - - - + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/dagre-container/dagre/board.exp.json b/e2etests/testdata/stable/dagre-container/dagre/board.exp.json index e74934654..c34c0d36a 100644 --- a/e2etests/testdata/stable/dagre-container/dagre/board.exp.json +++ b/e2etests/testdata/stable/dagre-container/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -356,6 +372,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 179.5, @@ -396,6 +413,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/dagre-container/dagre/sketch.exp.svg b/e2etests/testdata/stable/dagre-container/dagre/sketch.exp.svg index 976cf9a6f..b87713a2c 100644 --- a/e2etests/testdata/stable/dagre-container/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/dagre-container/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -ababcabc + .d2-3150240150 .fill-N1{fill:#0A0F25;} + .d2-3150240150 .fill-N2{fill:#676C7E;} + .d2-3150240150 .fill-N3{fill:#9499AB;} + .d2-3150240150 .fill-N4{fill:#CFD2DD;} + .d2-3150240150 .fill-N5{fill:#DEE1EB;} + .d2-3150240150 .fill-N6{fill:#EEF1F8;} + .d2-3150240150 .fill-N7{fill:#FFFFFF;} + .d2-3150240150 .fill-B1{fill:#0D32B2;} + .d2-3150240150 .fill-B2{fill:#0D32B2;} + .d2-3150240150 .fill-B3{fill:#E3E9FD;} + .d2-3150240150 .fill-B4{fill:#E3E9FD;} + .d2-3150240150 .fill-B5{fill:#EDF0FD;} + .d2-3150240150 .fill-B6{fill:#F7F8FE;} + .d2-3150240150 .fill-AA2{fill:#4A6FF3;} + .d2-3150240150 .fill-AA4{fill:#EDF0FD;} + .d2-3150240150 .fill-AA5{fill:#F7F8FE;} + .d2-3150240150 .fill-AB4{fill:#EDF0FD;} + .d2-3150240150 .fill-AB5{fill:#F7F8FE;} + .d2-3150240150 .stroke-N1{stroke:#0A0F25;} + .d2-3150240150 .stroke-N2{stroke:#676C7E;} + .d2-3150240150 .stroke-N3{stroke:#9499AB;} + .d2-3150240150 .stroke-N4{stroke:#CFD2DD;} + .d2-3150240150 .stroke-N5{stroke:#DEE1EB;} + .d2-3150240150 .stroke-N6{stroke:#EEF1F8;} + .d2-3150240150 .stroke-N7{stroke:#FFFFFF;} + .d2-3150240150 .stroke-B1{stroke:#0D32B2;} + .d2-3150240150 .stroke-B2{stroke:#0D32B2;} + .d2-3150240150 .stroke-B3{stroke:#E3E9FD;} + .d2-3150240150 .stroke-B4{stroke:#E3E9FD;} + .d2-3150240150 .stroke-B5{stroke:#EDF0FD;} + .d2-3150240150 .stroke-B6{stroke:#F7F8FE;} + .d2-3150240150 .stroke-AA2{stroke:#4A6FF3;} + .d2-3150240150 .stroke-AA4{stroke:#EDF0FD;} + .d2-3150240150 .stroke-AA5{stroke:#F7F8FE;} + .d2-3150240150 .stroke-AB4{stroke:#EDF0FD;} + .d2-3150240150 .stroke-AB5{stroke:#F7F8FE;} + .d2-3150240150 .background-color-N1{background-color:#0A0F25;} + .d2-3150240150 .background-color-N2{background-color:#676C7E;} + .d2-3150240150 .background-color-N3{background-color:#9499AB;} + .d2-3150240150 .background-color-N4{background-color:#CFD2DD;} + .d2-3150240150 .background-color-N5{background-color:#DEE1EB;} + .d2-3150240150 .background-color-N6{background-color:#EEF1F8;} + .d2-3150240150 .background-color-N7{background-color:#FFFFFF;} + .d2-3150240150 .background-color-B1{background-color:#0D32B2;} + .d2-3150240150 .background-color-B2{background-color:#0D32B2;} + .d2-3150240150 .background-color-B3{background-color:#E3E9FD;} + .d2-3150240150 .background-color-B4{background-color:#E3E9FD;} + .d2-3150240150 .background-color-B5{background-color:#EDF0FD;} + .d2-3150240150 .background-color-B6{background-color:#F7F8FE;} + .d2-3150240150 .background-color-AA2{background-color:#4A6FF3;} + .d2-3150240150 .background-color-AA4{background-color:#EDF0FD;} + .d2-3150240150 .background-color-AA5{background-color:#F7F8FE;} + .d2-3150240150 .background-color-AB4{background-color:#EDF0FD;} + .d2-3150240150 .background-color-AB5{background-color:#F7F8FE;} + .d2-3150240150 .color-N1{color:#0A0F25;} + .d2-3150240150 .color-N2{color:#676C7E;} + .d2-3150240150 .color-N3{color:#9499AB;} + .d2-3150240150 .color-N4{color:#CFD2DD;} + .d2-3150240150 .color-N5{color:#DEE1EB;} + .d2-3150240150 .color-N6{color:#EEF1F8;} + .d2-3150240150 .color-N7{color:#FFFFFF;} + .d2-3150240150 .color-B1{color:#0D32B2;} + .d2-3150240150 .color-B2{color:#0D32B2;} + .d2-3150240150 .color-B3{color:#E3E9FD;} + .d2-3150240150 .color-B4{color:#E3E9FD;} + .d2-3150240150 .color-B5{color:#EDF0FD;} + .d2-3150240150 .color-B6{color:#F7F8FE;} + .d2-3150240150 .color-AA2{color:#4A6FF3;} + .d2-3150240150 .color-AA4{color:#EDF0FD;} + .d2-3150240150 .color-AA5{color:#F7F8FE;} + .d2-3150240150 .color-AB4{color:#EDF0FD;} + .d2-3150240150 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3150240150);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3150240150);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3150240150);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3150240150);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3150240150);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3150240150);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3150240150);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3150240150);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3150240150);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3150240150);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3150240150);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3150240150);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3150240150);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3150240150);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3150240150);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3150240150);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3150240150);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3150240150);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ababcabc - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/dagre-container/elk/board.exp.json b/e2etests/testdata/stable/dagre-container/elk/board.exp.json index 09e17e037..87cf58236 100644 --- a/e2etests/testdata/stable/dagre-container/elk/board.exp.json +++ b/e2etests/testdata/stable/dagre-container/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -356,6 +372,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 161.5, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/dagre-container/elk/sketch.exp.svg b/e2etests/testdata/stable/dagre-container/elk/sketch.exp.svg index ea534b494..c05dc6596 100644 --- a/e2etests/testdata/stable/dagre-container/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/dagre-container/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -ababcabc + .d2-775279753 .fill-N1{fill:#0A0F25;} + .d2-775279753 .fill-N2{fill:#676C7E;} + .d2-775279753 .fill-N3{fill:#9499AB;} + .d2-775279753 .fill-N4{fill:#CFD2DD;} + .d2-775279753 .fill-N5{fill:#DEE1EB;} + .d2-775279753 .fill-N6{fill:#EEF1F8;} + .d2-775279753 .fill-N7{fill:#FFFFFF;} + .d2-775279753 .fill-B1{fill:#0D32B2;} + .d2-775279753 .fill-B2{fill:#0D32B2;} + .d2-775279753 .fill-B3{fill:#E3E9FD;} + .d2-775279753 .fill-B4{fill:#E3E9FD;} + .d2-775279753 .fill-B5{fill:#EDF0FD;} + .d2-775279753 .fill-B6{fill:#F7F8FE;} + .d2-775279753 .fill-AA2{fill:#4A6FF3;} + .d2-775279753 .fill-AA4{fill:#EDF0FD;} + .d2-775279753 .fill-AA5{fill:#F7F8FE;} + .d2-775279753 .fill-AB4{fill:#EDF0FD;} + .d2-775279753 .fill-AB5{fill:#F7F8FE;} + .d2-775279753 .stroke-N1{stroke:#0A0F25;} + .d2-775279753 .stroke-N2{stroke:#676C7E;} + .d2-775279753 .stroke-N3{stroke:#9499AB;} + .d2-775279753 .stroke-N4{stroke:#CFD2DD;} + .d2-775279753 .stroke-N5{stroke:#DEE1EB;} + .d2-775279753 .stroke-N6{stroke:#EEF1F8;} + .d2-775279753 .stroke-N7{stroke:#FFFFFF;} + .d2-775279753 .stroke-B1{stroke:#0D32B2;} + .d2-775279753 .stroke-B2{stroke:#0D32B2;} + .d2-775279753 .stroke-B3{stroke:#E3E9FD;} + .d2-775279753 .stroke-B4{stroke:#E3E9FD;} + .d2-775279753 .stroke-B5{stroke:#EDF0FD;} + .d2-775279753 .stroke-B6{stroke:#F7F8FE;} + .d2-775279753 .stroke-AA2{stroke:#4A6FF3;} + .d2-775279753 .stroke-AA4{stroke:#EDF0FD;} + .d2-775279753 .stroke-AA5{stroke:#F7F8FE;} + .d2-775279753 .stroke-AB4{stroke:#EDF0FD;} + .d2-775279753 .stroke-AB5{stroke:#F7F8FE;} + .d2-775279753 .background-color-N1{background-color:#0A0F25;} + .d2-775279753 .background-color-N2{background-color:#676C7E;} + .d2-775279753 .background-color-N3{background-color:#9499AB;} + .d2-775279753 .background-color-N4{background-color:#CFD2DD;} + .d2-775279753 .background-color-N5{background-color:#DEE1EB;} + .d2-775279753 .background-color-N6{background-color:#EEF1F8;} + .d2-775279753 .background-color-N7{background-color:#FFFFFF;} + .d2-775279753 .background-color-B1{background-color:#0D32B2;} + .d2-775279753 .background-color-B2{background-color:#0D32B2;} + .d2-775279753 .background-color-B3{background-color:#E3E9FD;} + .d2-775279753 .background-color-B4{background-color:#E3E9FD;} + .d2-775279753 .background-color-B5{background-color:#EDF0FD;} + .d2-775279753 .background-color-B6{background-color:#F7F8FE;} + .d2-775279753 .background-color-AA2{background-color:#4A6FF3;} + .d2-775279753 .background-color-AA4{background-color:#EDF0FD;} + .d2-775279753 .background-color-AA5{background-color:#F7F8FE;} + .d2-775279753 .background-color-AB4{background-color:#EDF0FD;} + .d2-775279753 .background-color-AB5{background-color:#F7F8FE;} + .d2-775279753 .color-N1{color:#0A0F25;} + .d2-775279753 .color-N2{color:#676C7E;} + .d2-775279753 .color-N3{color:#9499AB;} + .d2-775279753 .color-N4{color:#CFD2DD;} + .d2-775279753 .color-N5{color:#DEE1EB;} + .d2-775279753 .color-N6{color:#EEF1F8;} + .d2-775279753 .color-N7{color:#FFFFFF;} + .d2-775279753 .color-B1{color:#0D32B2;} + .d2-775279753 .color-B2{color:#0D32B2;} + .d2-775279753 .color-B3{color:#E3E9FD;} + .d2-775279753 .color-B4{color:#E3E9FD;} + .d2-775279753 .color-B5{color:#EDF0FD;} + .d2-775279753 .color-B6{color:#F7F8FE;} + .d2-775279753 .color-AA2{color:#4A6FF3;} + .d2-775279753 .color-AA4{color:#EDF0FD;} + .d2-775279753 .color-AA5{color:#F7F8FE;} + .d2-775279753 .color-AB4{color:#EDF0FD;} + .d2-775279753 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-775279753);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-775279753);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-775279753);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-775279753);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-775279753);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-775279753);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-775279753);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-775279753);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-775279753);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-775279753);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-775279753);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-775279753);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-775279753);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-775279753);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-775279753);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-775279753);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-775279753);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-775279753);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ababcabc - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/dagre_spacing/dagre/board.exp.json b/e2etests/testdata/stable/dagre_spacing/dagre/board.exp.json index e8ecc9ba9..0b06543e6 100644 --- a/e2etests/testdata/stable/dagre_spacing/dagre/board.exp.json +++ b/e2etests/testdata/stable/dagre_spacing/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -185,6 +197,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -226,6 +239,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -267,6 +281,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -311,6 +326,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "red", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -364,6 +380,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -405,6 +422,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -446,6 +464,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -487,6 +506,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -528,6 +548,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -569,6 +590,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -610,6 +632,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -655,6 +678,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -711,6 +735,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -755,6 +780,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -799,6 +825,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -840,6 +867,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -881,6 +909,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -922,6 +951,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -963,6 +993,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1004,6 +1035,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1045,6 +1077,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1086,6 +1119,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1137,6 +1171,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 87, @@ -1220,6 +1255,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 201, @@ -1303,6 +1339,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1579.5, @@ -1386,6 +1423,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 928.25, @@ -1469,6 +1507,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 400, @@ -1552,6 +1591,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1235, @@ -1635,6 +1675,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 754.5, @@ -1706,6 +1747,7 @@ "labelHeight": 69, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 583.5, @@ -1770,6 +1812,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/dagre_spacing/dagre/sketch.exp.svg b/e2etests/testdata/stable/dagre_spacing/dagre/sketch.exp.svg index c4fa7cbf0..af1f36daa 100644 --- a/e2etests/testdata/stable/dagre_spacing/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/dagre_spacing/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 + .d2-2274843716 .fill-N1{fill:#0A0F25;} + .d2-2274843716 .fill-N2{fill:#676C7E;} + .d2-2274843716 .fill-N3{fill:#9499AB;} + .d2-2274843716 .fill-N4{fill:#CFD2DD;} + .d2-2274843716 .fill-N5{fill:#DEE1EB;} + .d2-2274843716 .fill-N6{fill:#EEF1F8;} + .d2-2274843716 .fill-N7{fill:#FFFFFF;} + .d2-2274843716 .fill-B1{fill:#0D32B2;} + .d2-2274843716 .fill-B2{fill:#0D32B2;} + .d2-2274843716 .fill-B3{fill:#E3E9FD;} + .d2-2274843716 .fill-B4{fill:#E3E9FD;} + .d2-2274843716 .fill-B5{fill:#EDF0FD;} + .d2-2274843716 .fill-B6{fill:#F7F8FE;} + .d2-2274843716 .fill-AA2{fill:#4A6FF3;} + .d2-2274843716 .fill-AA4{fill:#EDF0FD;} + .d2-2274843716 .fill-AA5{fill:#F7F8FE;} + .d2-2274843716 .fill-AB4{fill:#EDF0FD;} + .d2-2274843716 .fill-AB5{fill:#F7F8FE;} + .d2-2274843716 .stroke-N1{stroke:#0A0F25;} + .d2-2274843716 .stroke-N2{stroke:#676C7E;} + .d2-2274843716 .stroke-N3{stroke:#9499AB;} + .d2-2274843716 .stroke-N4{stroke:#CFD2DD;} + .d2-2274843716 .stroke-N5{stroke:#DEE1EB;} + .d2-2274843716 .stroke-N6{stroke:#EEF1F8;} + .d2-2274843716 .stroke-N7{stroke:#FFFFFF;} + .d2-2274843716 .stroke-B1{stroke:#0D32B2;} + .d2-2274843716 .stroke-B2{stroke:#0D32B2;} + .d2-2274843716 .stroke-B3{stroke:#E3E9FD;} + .d2-2274843716 .stroke-B4{stroke:#E3E9FD;} + .d2-2274843716 .stroke-B5{stroke:#EDF0FD;} + .d2-2274843716 .stroke-B6{stroke:#F7F8FE;} + .d2-2274843716 .stroke-AA2{stroke:#4A6FF3;} + .d2-2274843716 .stroke-AA4{stroke:#EDF0FD;} + .d2-2274843716 .stroke-AA5{stroke:#F7F8FE;} + .d2-2274843716 .stroke-AB4{stroke:#EDF0FD;} + .d2-2274843716 .stroke-AB5{stroke:#F7F8FE;} + .d2-2274843716 .background-color-N1{background-color:#0A0F25;} + .d2-2274843716 .background-color-N2{background-color:#676C7E;} + .d2-2274843716 .background-color-N3{background-color:#9499AB;} + .d2-2274843716 .background-color-N4{background-color:#CFD2DD;} + .d2-2274843716 .background-color-N5{background-color:#DEE1EB;} + .d2-2274843716 .background-color-N6{background-color:#EEF1F8;} + .d2-2274843716 .background-color-N7{background-color:#FFFFFF;} + .d2-2274843716 .background-color-B1{background-color:#0D32B2;} + .d2-2274843716 .background-color-B2{background-color:#0D32B2;} + .d2-2274843716 .background-color-B3{background-color:#E3E9FD;} + .d2-2274843716 .background-color-B4{background-color:#E3E9FD;} + .d2-2274843716 .background-color-B5{background-color:#EDF0FD;} + .d2-2274843716 .background-color-B6{background-color:#F7F8FE;} + .d2-2274843716 .background-color-AA2{background-color:#4A6FF3;} + .d2-2274843716 .background-color-AA4{background-color:#EDF0FD;} + .d2-2274843716 .background-color-AA5{background-color:#F7F8FE;} + .d2-2274843716 .background-color-AB4{background-color:#EDF0FD;} + .d2-2274843716 .background-color-AB5{background-color:#F7F8FE;} + .d2-2274843716 .color-N1{color:#0A0F25;} + .d2-2274843716 .color-N2{color:#676C7E;} + .d2-2274843716 .color-N3{color:#9499AB;} + .d2-2274843716 .color-N4{color:#CFD2DD;} + .d2-2274843716 .color-N5{color:#DEE1EB;} + .d2-2274843716 .color-N6{color:#EEF1F8;} + .d2-2274843716 .color-N7{color:#FFFFFF;} + .d2-2274843716 .color-B1{color:#0D32B2;} + .d2-2274843716 .color-B2{color:#0D32B2;} + .d2-2274843716 .color-B3{color:#E3E9FD;} + .d2-2274843716 .color-B4{color:#E3E9FD;} + .d2-2274843716 .color-B5{color:#EDF0FD;} + .d2-2274843716 .color-B6{color:#F7F8FE;} + .d2-2274843716 .color-AA2{color:#4A6FF3;} + .d2-2274843716 .color-AA4{color:#EDF0FD;} + .d2-2274843716 .color-AA5{color:#F7F8FE;} + .d2-2274843716 .color-AB4{color:#EDF0FD;} + .d2-2274843716 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2274843716);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2274843716);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2274843716);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2274843716);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2274843716);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2274843716);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2274843716);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2274843716);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2274843716);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2274843716);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2274843716);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2274843716);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2274843716);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2274843716);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2274843716);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2274843716);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2274843716);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2274843716);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/dagre_spacing/elk/board.exp.json b/e2etests/testdata/stable/dagre_spacing/elk/board.exp.json index e6a4ed52f..e443f09fa 100644 --- a/e2etests/testdata/stable/dagre_spacing/elk/board.exp.json +++ b/e2etests/testdata/stable/dagre_spacing/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -185,6 +197,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -226,6 +239,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -267,6 +281,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -311,6 +326,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "red", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -364,6 +380,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -405,6 +422,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -446,6 +464,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -487,6 +506,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -528,6 +548,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -569,6 +590,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -610,6 +632,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -655,6 +678,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -711,6 +735,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -755,6 +780,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -799,6 +825,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -840,6 +867,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -881,6 +909,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -922,6 +951,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -963,6 +993,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1004,6 +1035,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1045,6 +1077,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1086,6 +1119,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1137,6 +1171,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 309.5, @@ -1183,6 +1218,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 404.25, @@ -1237,6 +1273,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 88, @@ -1283,6 +1320,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 425, @@ -1329,6 +1367,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 510.75, @@ -1375,6 +1414,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 678.5, @@ -1413,6 +1453,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 506.5, @@ -1451,6 +1492,7 @@ "labelHeight": 69, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 506.5, @@ -1498,6 +1540,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/dagre_spacing/elk/sketch.exp.svg b/e2etests/testdata/stable/dagre_spacing/elk/sketch.exp.svg index c8241b94b..541ec5ae6 100644 --- a/e2etests/testdata/stable/dagre_spacing/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/dagre_spacing/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 + .d2-1144684252 .fill-N1{fill:#0A0F25;} + .d2-1144684252 .fill-N2{fill:#676C7E;} + .d2-1144684252 .fill-N3{fill:#9499AB;} + .d2-1144684252 .fill-N4{fill:#CFD2DD;} + .d2-1144684252 .fill-N5{fill:#DEE1EB;} + .d2-1144684252 .fill-N6{fill:#EEF1F8;} + .d2-1144684252 .fill-N7{fill:#FFFFFF;} + .d2-1144684252 .fill-B1{fill:#0D32B2;} + .d2-1144684252 .fill-B2{fill:#0D32B2;} + .d2-1144684252 .fill-B3{fill:#E3E9FD;} + .d2-1144684252 .fill-B4{fill:#E3E9FD;} + .d2-1144684252 .fill-B5{fill:#EDF0FD;} + .d2-1144684252 .fill-B6{fill:#F7F8FE;} + .d2-1144684252 .fill-AA2{fill:#4A6FF3;} + .d2-1144684252 .fill-AA4{fill:#EDF0FD;} + .d2-1144684252 .fill-AA5{fill:#F7F8FE;} + .d2-1144684252 .fill-AB4{fill:#EDF0FD;} + .d2-1144684252 .fill-AB5{fill:#F7F8FE;} + .d2-1144684252 .stroke-N1{stroke:#0A0F25;} + .d2-1144684252 .stroke-N2{stroke:#676C7E;} + .d2-1144684252 .stroke-N3{stroke:#9499AB;} + .d2-1144684252 .stroke-N4{stroke:#CFD2DD;} + .d2-1144684252 .stroke-N5{stroke:#DEE1EB;} + .d2-1144684252 .stroke-N6{stroke:#EEF1F8;} + .d2-1144684252 .stroke-N7{stroke:#FFFFFF;} + .d2-1144684252 .stroke-B1{stroke:#0D32B2;} + .d2-1144684252 .stroke-B2{stroke:#0D32B2;} + .d2-1144684252 .stroke-B3{stroke:#E3E9FD;} + .d2-1144684252 .stroke-B4{stroke:#E3E9FD;} + .d2-1144684252 .stroke-B5{stroke:#EDF0FD;} + .d2-1144684252 .stroke-B6{stroke:#F7F8FE;} + .d2-1144684252 .stroke-AA2{stroke:#4A6FF3;} + .d2-1144684252 .stroke-AA4{stroke:#EDF0FD;} + .d2-1144684252 .stroke-AA5{stroke:#F7F8FE;} + .d2-1144684252 .stroke-AB4{stroke:#EDF0FD;} + .d2-1144684252 .stroke-AB5{stroke:#F7F8FE;} + .d2-1144684252 .background-color-N1{background-color:#0A0F25;} + .d2-1144684252 .background-color-N2{background-color:#676C7E;} + .d2-1144684252 .background-color-N3{background-color:#9499AB;} + .d2-1144684252 .background-color-N4{background-color:#CFD2DD;} + .d2-1144684252 .background-color-N5{background-color:#DEE1EB;} + .d2-1144684252 .background-color-N6{background-color:#EEF1F8;} + .d2-1144684252 .background-color-N7{background-color:#FFFFFF;} + .d2-1144684252 .background-color-B1{background-color:#0D32B2;} + .d2-1144684252 .background-color-B2{background-color:#0D32B2;} + .d2-1144684252 .background-color-B3{background-color:#E3E9FD;} + .d2-1144684252 .background-color-B4{background-color:#E3E9FD;} + .d2-1144684252 .background-color-B5{background-color:#EDF0FD;} + .d2-1144684252 .background-color-B6{background-color:#F7F8FE;} + .d2-1144684252 .background-color-AA2{background-color:#4A6FF3;} + .d2-1144684252 .background-color-AA4{background-color:#EDF0FD;} + .d2-1144684252 .background-color-AA5{background-color:#F7F8FE;} + .d2-1144684252 .background-color-AB4{background-color:#EDF0FD;} + .d2-1144684252 .background-color-AB5{background-color:#F7F8FE;} + .d2-1144684252 .color-N1{color:#0A0F25;} + .d2-1144684252 .color-N2{color:#676C7E;} + .d2-1144684252 .color-N3{color:#9499AB;} + .d2-1144684252 .color-N4{color:#CFD2DD;} + .d2-1144684252 .color-N5{color:#DEE1EB;} + .d2-1144684252 .color-N6{color:#EEF1F8;} + .d2-1144684252 .color-N7{color:#FFFFFF;} + .d2-1144684252 .color-B1{color:#0D32B2;} + .d2-1144684252 .color-B2{color:#0D32B2;} + .d2-1144684252 .color-B3{color:#E3E9FD;} + .d2-1144684252 .color-B4{color:#E3E9FD;} + .d2-1144684252 .color-B5{color:#EDF0FD;} + .d2-1144684252 .color-B6{color:#F7F8FE;} + .d2-1144684252 .color-AA2{color:#4A6FF3;} + .d2-1144684252 .color-AA4{color:#EDF0FD;} + .d2-1144684252 .color-AA5{color:#F7F8FE;} + .d2-1144684252 .color-AB4{color:#EDF0FD;} + .d2-1144684252 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1144684252);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1144684252);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1144684252);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1144684252);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1144684252);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1144684252);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1144684252);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1144684252);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1144684252);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1144684252);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1144684252);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1144684252);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1144684252);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1144684252);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1144684252);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1144684252);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1144684252);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1144684252);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/dagre_spacing_right/dagre/board.exp.json b/e2etests/testdata/stable/dagre_spacing_right/dagre/board.exp.json index b2a164720..e8b484deb 100644 --- a/e2etests/testdata/stable/dagre_spacing_right/dagre/board.exp.json +++ b/e2etests/testdata/stable/dagre_spacing_right/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -185,6 +197,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -226,6 +239,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -267,6 +281,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -311,6 +326,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "red", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -364,6 +380,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -405,6 +422,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -446,6 +464,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -487,6 +506,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -528,6 +548,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -569,6 +590,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -610,6 +632,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -655,6 +678,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -711,6 +735,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -755,6 +780,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -799,6 +825,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -840,6 +867,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -881,6 +909,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -922,6 +951,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -963,6 +993,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1004,6 +1035,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1045,6 +1077,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1086,6 +1119,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1137,6 +1171,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 128.5, @@ -1220,6 +1255,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 517, @@ -1303,6 +1339,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 516, @@ -1386,6 +1423,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 128, @@ -1469,6 +1507,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 528, @@ -1552,6 +1591,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1023, @@ -1635,6 +1675,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 981, @@ -1706,6 +1747,7 @@ "labelHeight": 69, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1435, @@ -1770,6 +1812,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/dagre_spacing_right/dagre/sketch.exp.svg b/e2etests/testdata/stable/dagre_spacing_right/dagre/sketch.exp.svg index eb080290e..9b3b04786 100644 --- a/e2etests/testdata/stable/dagre_spacing_right/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/dagre_spacing_right/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 + .d2-3618677374 .fill-N1{fill:#0A0F25;} + .d2-3618677374 .fill-N2{fill:#676C7E;} + .d2-3618677374 .fill-N3{fill:#9499AB;} + .d2-3618677374 .fill-N4{fill:#CFD2DD;} + .d2-3618677374 .fill-N5{fill:#DEE1EB;} + .d2-3618677374 .fill-N6{fill:#EEF1F8;} + .d2-3618677374 .fill-N7{fill:#FFFFFF;} + .d2-3618677374 .fill-B1{fill:#0D32B2;} + .d2-3618677374 .fill-B2{fill:#0D32B2;} + .d2-3618677374 .fill-B3{fill:#E3E9FD;} + .d2-3618677374 .fill-B4{fill:#E3E9FD;} + .d2-3618677374 .fill-B5{fill:#EDF0FD;} + .d2-3618677374 .fill-B6{fill:#F7F8FE;} + .d2-3618677374 .fill-AA2{fill:#4A6FF3;} + .d2-3618677374 .fill-AA4{fill:#EDF0FD;} + .d2-3618677374 .fill-AA5{fill:#F7F8FE;} + .d2-3618677374 .fill-AB4{fill:#EDF0FD;} + .d2-3618677374 .fill-AB5{fill:#F7F8FE;} + .d2-3618677374 .stroke-N1{stroke:#0A0F25;} + .d2-3618677374 .stroke-N2{stroke:#676C7E;} + .d2-3618677374 .stroke-N3{stroke:#9499AB;} + .d2-3618677374 .stroke-N4{stroke:#CFD2DD;} + .d2-3618677374 .stroke-N5{stroke:#DEE1EB;} + .d2-3618677374 .stroke-N6{stroke:#EEF1F8;} + .d2-3618677374 .stroke-N7{stroke:#FFFFFF;} + .d2-3618677374 .stroke-B1{stroke:#0D32B2;} + .d2-3618677374 .stroke-B2{stroke:#0D32B2;} + .d2-3618677374 .stroke-B3{stroke:#E3E9FD;} + .d2-3618677374 .stroke-B4{stroke:#E3E9FD;} + .d2-3618677374 .stroke-B5{stroke:#EDF0FD;} + .d2-3618677374 .stroke-B6{stroke:#F7F8FE;} + .d2-3618677374 .stroke-AA2{stroke:#4A6FF3;} + .d2-3618677374 .stroke-AA4{stroke:#EDF0FD;} + .d2-3618677374 .stroke-AA5{stroke:#F7F8FE;} + .d2-3618677374 .stroke-AB4{stroke:#EDF0FD;} + .d2-3618677374 .stroke-AB5{stroke:#F7F8FE;} + .d2-3618677374 .background-color-N1{background-color:#0A0F25;} + .d2-3618677374 .background-color-N2{background-color:#676C7E;} + .d2-3618677374 .background-color-N3{background-color:#9499AB;} + .d2-3618677374 .background-color-N4{background-color:#CFD2DD;} + .d2-3618677374 .background-color-N5{background-color:#DEE1EB;} + .d2-3618677374 .background-color-N6{background-color:#EEF1F8;} + .d2-3618677374 .background-color-N7{background-color:#FFFFFF;} + .d2-3618677374 .background-color-B1{background-color:#0D32B2;} + .d2-3618677374 .background-color-B2{background-color:#0D32B2;} + .d2-3618677374 .background-color-B3{background-color:#E3E9FD;} + .d2-3618677374 .background-color-B4{background-color:#E3E9FD;} + .d2-3618677374 .background-color-B5{background-color:#EDF0FD;} + .d2-3618677374 .background-color-B6{background-color:#F7F8FE;} + .d2-3618677374 .background-color-AA2{background-color:#4A6FF3;} + .d2-3618677374 .background-color-AA4{background-color:#EDF0FD;} + .d2-3618677374 .background-color-AA5{background-color:#F7F8FE;} + .d2-3618677374 .background-color-AB4{background-color:#EDF0FD;} + .d2-3618677374 .background-color-AB5{background-color:#F7F8FE;} + .d2-3618677374 .color-N1{color:#0A0F25;} + .d2-3618677374 .color-N2{color:#676C7E;} + .d2-3618677374 .color-N3{color:#9499AB;} + .d2-3618677374 .color-N4{color:#CFD2DD;} + .d2-3618677374 .color-N5{color:#DEE1EB;} + .d2-3618677374 .color-N6{color:#EEF1F8;} + .d2-3618677374 .color-N7{color:#FFFFFF;} + .d2-3618677374 .color-B1{color:#0D32B2;} + .d2-3618677374 .color-B2{color:#0D32B2;} + .d2-3618677374 .color-B3{color:#E3E9FD;} + .d2-3618677374 .color-B4{color:#E3E9FD;} + .d2-3618677374 .color-B5{color:#EDF0FD;} + .d2-3618677374 .color-B6{color:#F7F8FE;} + .d2-3618677374 .color-AA2{color:#4A6FF3;} + .d2-3618677374 .color-AA4{color:#EDF0FD;} + .d2-3618677374 .color-AA5{color:#F7F8FE;} + .d2-3618677374 .color-AB4{color:#EDF0FD;} + .d2-3618677374 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3618677374);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3618677374);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3618677374);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3618677374);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3618677374);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3618677374);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3618677374);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3618677374);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3618677374);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3618677374);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3618677374);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3618677374);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3618677374);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3618677374);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3618677374);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3618677374);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3618677374);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3618677374);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/dagre_spacing_right/elk/board.exp.json b/e2etests/testdata/stable/dagre_spacing_right/elk/board.exp.json index a25b67e74..7124186db 100644 --- a/e2etests/testdata/stable/dagre_spacing_right/elk/board.exp.json +++ b/e2etests/testdata/stable/dagre_spacing_right/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -185,6 +197,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -226,6 +239,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -267,6 +281,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -311,6 +326,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "red", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -364,6 +380,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -405,6 +422,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -446,6 +464,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -487,6 +506,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -528,6 +548,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -569,6 +590,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -610,6 +632,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -655,6 +678,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -711,6 +735,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -755,6 +780,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -799,6 +825,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -840,6 +867,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -881,6 +909,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -922,6 +951,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -963,6 +993,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1004,6 +1035,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1045,6 +1077,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1086,6 +1119,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1137,6 +1171,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 510, @@ -1175,6 +1210,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 786, @@ -1229,6 +1265,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 874, @@ -1275,6 +1312,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 164, @@ -1313,6 +1351,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 819, @@ -1351,6 +1390,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1469, @@ -1397,6 +1437,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1808, @@ -1435,6 +1476,7 @@ "labelHeight": 69, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 2043, @@ -1482,6 +1524,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/dagre_spacing_right/elk/sketch.exp.svg b/e2etests/testdata/stable/dagre_spacing_right/elk/sketch.exp.svg index d2824702b..5ed10f232 100644 --- a/e2etests/testdata/stable/dagre_spacing_right/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/dagre_spacing_right/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 + .d2-539119460 .fill-N1{fill:#0A0F25;} + .d2-539119460 .fill-N2{fill:#676C7E;} + .d2-539119460 .fill-N3{fill:#9499AB;} + .d2-539119460 .fill-N4{fill:#CFD2DD;} + .d2-539119460 .fill-N5{fill:#DEE1EB;} + .d2-539119460 .fill-N6{fill:#EEF1F8;} + .d2-539119460 .fill-N7{fill:#FFFFFF;} + .d2-539119460 .fill-B1{fill:#0D32B2;} + .d2-539119460 .fill-B2{fill:#0D32B2;} + .d2-539119460 .fill-B3{fill:#E3E9FD;} + .d2-539119460 .fill-B4{fill:#E3E9FD;} + .d2-539119460 .fill-B5{fill:#EDF0FD;} + .d2-539119460 .fill-B6{fill:#F7F8FE;} + .d2-539119460 .fill-AA2{fill:#4A6FF3;} + .d2-539119460 .fill-AA4{fill:#EDF0FD;} + .d2-539119460 .fill-AA5{fill:#F7F8FE;} + .d2-539119460 .fill-AB4{fill:#EDF0FD;} + .d2-539119460 .fill-AB5{fill:#F7F8FE;} + .d2-539119460 .stroke-N1{stroke:#0A0F25;} + .d2-539119460 .stroke-N2{stroke:#676C7E;} + .d2-539119460 .stroke-N3{stroke:#9499AB;} + .d2-539119460 .stroke-N4{stroke:#CFD2DD;} + .d2-539119460 .stroke-N5{stroke:#DEE1EB;} + .d2-539119460 .stroke-N6{stroke:#EEF1F8;} + .d2-539119460 .stroke-N7{stroke:#FFFFFF;} + .d2-539119460 .stroke-B1{stroke:#0D32B2;} + .d2-539119460 .stroke-B2{stroke:#0D32B2;} + .d2-539119460 .stroke-B3{stroke:#E3E9FD;} + .d2-539119460 .stroke-B4{stroke:#E3E9FD;} + .d2-539119460 .stroke-B5{stroke:#EDF0FD;} + .d2-539119460 .stroke-B6{stroke:#F7F8FE;} + .d2-539119460 .stroke-AA2{stroke:#4A6FF3;} + .d2-539119460 .stroke-AA4{stroke:#EDF0FD;} + .d2-539119460 .stroke-AA5{stroke:#F7F8FE;} + .d2-539119460 .stroke-AB4{stroke:#EDF0FD;} + .d2-539119460 .stroke-AB5{stroke:#F7F8FE;} + .d2-539119460 .background-color-N1{background-color:#0A0F25;} + .d2-539119460 .background-color-N2{background-color:#676C7E;} + .d2-539119460 .background-color-N3{background-color:#9499AB;} + .d2-539119460 .background-color-N4{background-color:#CFD2DD;} + .d2-539119460 .background-color-N5{background-color:#DEE1EB;} + .d2-539119460 .background-color-N6{background-color:#EEF1F8;} + .d2-539119460 .background-color-N7{background-color:#FFFFFF;} + .d2-539119460 .background-color-B1{background-color:#0D32B2;} + .d2-539119460 .background-color-B2{background-color:#0D32B2;} + .d2-539119460 .background-color-B3{background-color:#E3E9FD;} + .d2-539119460 .background-color-B4{background-color:#E3E9FD;} + .d2-539119460 .background-color-B5{background-color:#EDF0FD;} + .d2-539119460 .background-color-B6{background-color:#F7F8FE;} + .d2-539119460 .background-color-AA2{background-color:#4A6FF3;} + .d2-539119460 .background-color-AA4{background-color:#EDF0FD;} + .d2-539119460 .background-color-AA5{background-color:#F7F8FE;} + .d2-539119460 .background-color-AB4{background-color:#EDF0FD;} + .d2-539119460 .background-color-AB5{background-color:#F7F8FE;} + .d2-539119460 .color-N1{color:#0A0F25;} + .d2-539119460 .color-N2{color:#676C7E;} + .d2-539119460 .color-N3{color:#9499AB;} + .d2-539119460 .color-N4{color:#CFD2DD;} + .d2-539119460 .color-N5{color:#DEE1EB;} + .d2-539119460 .color-N6{color:#EEF1F8;} + .d2-539119460 .color-N7{color:#FFFFFF;} + .d2-539119460 .color-B1{color:#0D32B2;} + .d2-539119460 .color-B2{color:#0D32B2;} + .d2-539119460 .color-B3{color:#E3E9FD;} + .d2-539119460 .color-B4{color:#E3E9FD;} + .d2-539119460 .color-B5{color:#EDF0FD;} + .d2-539119460 .color-B6{color:#F7F8FE;} + .d2-539119460 .color-AA2{color:#4A6FF3;} + .d2-539119460 .color-AA4{color:#EDF0FD;} + .d2-539119460 .color-AA5{color:#F7F8FE;} + .d2-539119460 .color-AB4{color:#EDF0FD;} + .d2-539119460 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-539119460);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-539119460);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-539119460);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-539119460);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-539119460);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-539119460);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-539119460);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-539119460);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-539119460);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-539119460);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-539119460);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-539119460);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-539119460);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-539119460);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-539119460);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-539119460);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-539119460);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-539119460);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/dense/dagre/board.exp.json b/e2etests/testdata/stable/dense/dagre/board.exp.json index 1e0ce8804..c969d6233 100644 --- a/e2etests/testdata/stable/dense/dagre/board.exp.json +++ b/e2etests/testdata/stable/dense/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -725,6 +750,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 263.25, @@ -772,6 +798,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 117, @@ -831,6 +858,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 480, @@ -890,6 +918,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 592.5, @@ -949,6 +978,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 340.25, @@ -1008,6 +1038,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 339.5, @@ -1055,6 +1086,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 602.5, @@ -1102,6 +1134,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 287.5, @@ -1149,6 +1182,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 323, @@ -1256,6 +1290,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 340, @@ -1315,6 +1350,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 25, @@ -1362,6 +1398,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 37.5, @@ -1421,6 +1458,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 287, @@ -1468,6 +1506,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 346.75, @@ -1515,6 +1554,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 506.5, @@ -1562,6 +1602,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 759, @@ -1609,6 +1650,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 710.5, @@ -1656,6 +1698,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 678.25, @@ -1703,6 +1746,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 413.5, @@ -1750,6 +1794,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 453.5, @@ -1797,6 +1842,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 566.75, @@ -1844,6 +1890,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 296, @@ -1891,6 +1938,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 826.5, @@ -1938,6 +1986,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 603.5, @@ -1978,6 +2027,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/dense/dagre/sketch.exp.svg b/e2etests/testdata/stable/dense/dagre/sketch.exp.svg index cc8a36101..12c8df54a 100644 --- a/e2etests/testdata/stable/dense/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/dense/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdefghijklmnopq + .d2-3894923546 .fill-N1{fill:#0A0F25;} + .d2-3894923546 .fill-N2{fill:#676C7E;} + .d2-3894923546 .fill-N3{fill:#9499AB;} + .d2-3894923546 .fill-N4{fill:#CFD2DD;} + .d2-3894923546 .fill-N5{fill:#DEE1EB;} + .d2-3894923546 .fill-N6{fill:#EEF1F8;} + .d2-3894923546 .fill-N7{fill:#FFFFFF;} + .d2-3894923546 .fill-B1{fill:#0D32B2;} + .d2-3894923546 .fill-B2{fill:#0D32B2;} + .d2-3894923546 .fill-B3{fill:#E3E9FD;} + .d2-3894923546 .fill-B4{fill:#E3E9FD;} + .d2-3894923546 .fill-B5{fill:#EDF0FD;} + .d2-3894923546 .fill-B6{fill:#F7F8FE;} + .d2-3894923546 .fill-AA2{fill:#4A6FF3;} + .d2-3894923546 .fill-AA4{fill:#EDF0FD;} + .d2-3894923546 .fill-AA5{fill:#F7F8FE;} + .d2-3894923546 .fill-AB4{fill:#EDF0FD;} + .d2-3894923546 .fill-AB5{fill:#F7F8FE;} + .d2-3894923546 .stroke-N1{stroke:#0A0F25;} + .d2-3894923546 .stroke-N2{stroke:#676C7E;} + .d2-3894923546 .stroke-N3{stroke:#9499AB;} + .d2-3894923546 .stroke-N4{stroke:#CFD2DD;} + .d2-3894923546 .stroke-N5{stroke:#DEE1EB;} + .d2-3894923546 .stroke-N6{stroke:#EEF1F8;} + .d2-3894923546 .stroke-N7{stroke:#FFFFFF;} + .d2-3894923546 .stroke-B1{stroke:#0D32B2;} + .d2-3894923546 .stroke-B2{stroke:#0D32B2;} + .d2-3894923546 .stroke-B3{stroke:#E3E9FD;} + .d2-3894923546 .stroke-B4{stroke:#E3E9FD;} + .d2-3894923546 .stroke-B5{stroke:#EDF0FD;} + .d2-3894923546 .stroke-B6{stroke:#F7F8FE;} + .d2-3894923546 .stroke-AA2{stroke:#4A6FF3;} + .d2-3894923546 .stroke-AA4{stroke:#EDF0FD;} + .d2-3894923546 .stroke-AA5{stroke:#F7F8FE;} + .d2-3894923546 .stroke-AB4{stroke:#EDF0FD;} + .d2-3894923546 .stroke-AB5{stroke:#F7F8FE;} + .d2-3894923546 .background-color-N1{background-color:#0A0F25;} + .d2-3894923546 .background-color-N2{background-color:#676C7E;} + .d2-3894923546 .background-color-N3{background-color:#9499AB;} + .d2-3894923546 .background-color-N4{background-color:#CFD2DD;} + .d2-3894923546 .background-color-N5{background-color:#DEE1EB;} + .d2-3894923546 .background-color-N6{background-color:#EEF1F8;} + .d2-3894923546 .background-color-N7{background-color:#FFFFFF;} + .d2-3894923546 .background-color-B1{background-color:#0D32B2;} + .d2-3894923546 .background-color-B2{background-color:#0D32B2;} + .d2-3894923546 .background-color-B3{background-color:#E3E9FD;} + .d2-3894923546 .background-color-B4{background-color:#E3E9FD;} + .d2-3894923546 .background-color-B5{background-color:#EDF0FD;} + .d2-3894923546 .background-color-B6{background-color:#F7F8FE;} + .d2-3894923546 .background-color-AA2{background-color:#4A6FF3;} + .d2-3894923546 .background-color-AA4{background-color:#EDF0FD;} + .d2-3894923546 .background-color-AA5{background-color:#F7F8FE;} + .d2-3894923546 .background-color-AB4{background-color:#EDF0FD;} + .d2-3894923546 .background-color-AB5{background-color:#F7F8FE;} + .d2-3894923546 .color-N1{color:#0A0F25;} + .d2-3894923546 .color-N2{color:#676C7E;} + .d2-3894923546 .color-N3{color:#9499AB;} + .d2-3894923546 .color-N4{color:#CFD2DD;} + .d2-3894923546 .color-N5{color:#DEE1EB;} + .d2-3894923546 .color-N6{color:#EEF1F8;} + .d2-3894923546 .color-N7{color:#FFFFFF;} + .d2-3894923546 .color-B1{color:#0D32B2;} + .d2-3894923546 .color-B2{color:#0D32B2;} + .d2-3894923546 .color-B3{color:#E3E9FD;} + .d2-3894923546 .color-B4{color:#E3E9FD;} + .d2-3894923546 .color-B5{color:#EDF0FD;} + .d2-3894923546 .color-B6{color:#F7F8FE;} + .d2-3894923546 .color-AA2{color:#4A6FF3;} + .d2-3894923546 .color-AA4{color:#EDF0FD;} + .d2-3894923546 .color-AA5{color:#F7F8FE;} + .d2-3894923546 .color-AB4{color:#EDF0FD;} + .d2-3894923546 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3894923546);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3894923546);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3894923546);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3894923546);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3894923546);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3894923546);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3894923546);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3894923546);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3894923546);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3894923546);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3894923546);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3894923546);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3894923546);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3894923546);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3894923546);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3894923546);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3894923546);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3894923546);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdefghijklmnopq - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/dense/elk/board.exp.json b/e2etests/testdata/stable/dense/elk/board.exp.json index d1aca654b..f8091b1f3 100644 --- a/e2etests/testdata/stable/dense/elk/board.exp.json +++ b/e2etests/testdata/stable/dense/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -725,6 +750,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 192.16600036621094, @@ -763,6 +789,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 122.16600036621094, @@ -801,6 +828,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 439.5, @@ -847,6 +875,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 275, @@ -893,6 +922,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 227.66600036621094, @@ -939,6 +969,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 252.16600036621094, @@ -985,6 +1016,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 295.6659851074219, @@ -1031,6 +1063,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 112.5, @@ -1069,6 +1102,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 179, @@ -1115,6 +1149,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 292.1659851074219, @@ -1161,6 +1196,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 173.66600036621094, @@ -1207,6 +1243,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 193.66600036621094, @@ -1245,6 +1282,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 262.1659851074219, @@ -1291,6 +1329,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 253, @@ -1329,6 +1368,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 459.8330078125, @@ -1375,6 +1415,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 629.8330078125, @@ -1421,6 +1462,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 570.3330078125, @@ -1467,6 +1509,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 543.666015625, @@ -1513,6 +1556,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 359.3330078125, @@ -1559,6 +1603,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 399.8330078125, @@ -1605,6 +1650,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 248.33299255371094, @@ -1651,6 +1697,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 92.16600036621094, @@ -1697,6 +1744,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 659.8330078125, @@ -1735,6 +1783,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 499.3330078125, @@ -1766,6 +1815,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/dense/elk/sketch.exp.svg b/e2etests/testdata/stable/dense/elk/sketch.exp.svg index ae6d231b6..fa9779ab9 100644 --- a/e2etests/testdata/stable/dense/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/dense/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdefghijklmnopq + .d2-3804571861 .fill-N1{fill:#0A0F25;} + .d2-3804571861 .fill-N2{fill:#676C7E;} + .d2-3804571861 .fill-N3{fill:#9499AB;} + .d2-3804571861 .fill-N4{fill:#CFD2DD;} + .d2-3804571861 .fill-N5{fill:#DEE1EB;} + .d2-3804571861 .fill-N6{fill:#EEF1F8;} + .d2-3804571861 .fill-N7{fill:#FFFFFF;} + .d2-3804571861 .fill-B1{fill:#0D32B2;} + .d2-3804571861 .fill-B2{fill:#0D32B2;} + .d2-3804571861 .fill-B3{fill:#E3E9FD;} + .d2-3804571861 .fill-B4{fill:#E3E9FD;} + .d2-3804571861 .fill-B5{fill:#EDF0FD;} + .d2-3804571861 .fill-B6{fill:#F7F8FE;} + .d2-3804571861 .fill-AA2{fill:#4A6FF3;} + .d2-3804571861 .fill-AA4{fill:#EDF0FD;} + .d2-3804571861 .fill-AA5{fill:#F7F8FE;} + .d2-3804571861 .fill-AB4{fill:#EDF0FD;} + .d2-3804571861 .fill-AB5{fill:#F7F8FE;} + .d2-3804571861 .stroke-N1{stroke:#0A0F25;} + .d2-3804571861 .stroke-N2{stroke:#676C7E;} + .d2-3804571861 .stroke-N3{stroke:#9499AB;} + .d2-3804571861 .stroke-N4{stroke:#CFD2DD;} + .d2-3804571861 .stroke-N5{stroke:#DEE1EB;} + .d2-3804571861 .stroke-N6{stroke:#EEF1F8;} + .d2-3804571861 .stroke-N7{stroke:#FFFFFF;} + .d2-3804571861 .stroke-B1{stroke:#0D32B2;} + .d2-3804571861 .stroke-B2{stroke:#0D32B2;} + .d2-3804571861 .stroke-B3{stroke:#E3E9FD;} + .d2-3804571861 .stroke-B4{stroke:#E3E9FD;} + .d2-3804571861 .stroke-B5{stroke:#EDF0FD;} + .d2-3804571861 .stroke-B6{stroke:#F7F8FE;} + .d2-3804571861 .stroke-AA2{stroke:#4A6FF3;} + .d2-3804571861 .stroke-AA4{stroke:#EDF0FD;} + .d2-3804571861 .stroke-AA5{stroke:#F7F8FE;} + .d2-3804571861 .stroke-AB4{stroke:#EDF0FD;} + .d2-3804571861 .stroke-AB5{stroke:#F7F8FE;} + .d2-3804571861 .background-color-N1{background-color:#0A0F25;} + .d2-3804571861 .background-color-N2{background-color:#676C7E;} + .d2-3804571861 .background-color-N3{background-color:#9499AB;} + .d2-3804571861 .background-color-N4{background-color:#CFD2DD;} + .d2-3804571861 .background-color-N5{background-color:#DEE1EB;} + .d2-3804571861 .background-color-N6{background-color:#EEF1F8;} + .d2-3804571861 .background-color-N7{background-color:#FFFFFF;} + .d2-3804571861 .background-color-B1{background-color:#0D32B2;} + .d2-3804571861 .background-color-B2{background-color:#0D32B2;} + .d2-3804571861 .background-color-B3{background-color:#E3E9FD;} + .d2-3804571861 .background-color-B4{background-color:#E3E9FD;} + .d2-3804571861 .background-color-B5{background-color:#EDF0FD;} + .d2-3804571861 .background-color-B6{background-color:#F7F8FE;} + .d2-3804571861 .background-color-AA2{background-color:#4A6FF3;} + .d2-3804571861 .background-color-AA4{background-color:#EDF0FD;} + .d2-3804571861 .background-color-AA5{background-color:#F7F8FE;} + .d2-3804571861 .background-color-AB4{background-color:#EDF0FD;} + .d2-3804571861 .background-color-AB5{background-color:#F7F8FE;} + .d2-3804571861 .color-N1{color:#0A0F25;} + .d2-3804571861 .color-N2{color:#676C7E;} + .d2-3804571861 .color-N3{color:#9499AB;} + .d2-3804571861 .color-N4{color:#CFD2DD;} + .d2-3804571861 .color-N5{color:#DEE1EB;} + .d2-3804571861 .color-N6{color:#EEF1F8;} + .d2-3804571861 .color-N7{color:#FFFFFF;} + .d2-3804571861 .color-B1{color:#0D32B2;} + .d2-3804571861 .color-B2{color:#0D32B2;} + .d2-3804571861 .color-B3{color:#E3E9FD;} + .d2-3804571861 .color-B4{color:#E3E9FD;} + .d2-3804571861 .color-B5{color:#EDF0FD;} + .d2-3804571861 .color-B6{color:#F7F8FE;} + .d2-3804571861 .color-AA2{color:#4A6FF3;} + .d2-3804571861 .color-AA4{color:#EDF0FD;} + .d2-3804571861 .color-AA5{color:#F7F8FE;} + .d2-3804571861 .color-AB4{color:#EDF0FD;} + .d2-3804571861 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3804571861);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3804571861);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3804571861);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3804571861);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3804571861);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3804571861);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3804571861);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3804571861);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3804571861);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3804571861);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3804571861);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3804571861);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3804571861);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3804571861);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3804571861);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3804571861);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3804571861);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3804571861);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdefghijklmnopq - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/different_subgraphs/dagre/board.exp.json b/e2etests/testdata/stable/different_subgraphs/dagre/board.exp.json index 641c7ddcd..4bf6ab0ed 100644 --- a/e2etests/testdata/stable/different_subgraphs/dagre/board.exp.json +++ b/e2etests/testdata/stable/different_subgraphs/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -715,6 +740,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -756,6 +782,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -797,6 +824,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -838,6 +866,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -879,6 +908,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -930,6 +960,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 301, @@ -977,6 +1008,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 327.5, @@ -1024,6 +1056,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 354, @@ -1071,6 +1104,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 327.5, @@ -1118,6 +1152,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 83.5, @@ -1165,6 +1200,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 140.5, @@ -1212,6 +1248,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 614.5, @@ -1259,6 +1296,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 608.5, @@ -1306,6 +1344,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 774.75, @@ -1353,6 +1392,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 648.75, @@ -1400,6 +1440,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 930.75, @@ -1447,6 +1488,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 930.75, @@ -1494,6 +1536,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1263.25, @@ -1541,6 +1584,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1055, @@ -1588,6 +1632,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 999.75, @@ -1635,6 +1680,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1026.25, @@ -1682,6 +1728,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 959, @@ -1729,6 +1776,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1052.5, @@ -1769,6 +1817,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/different_subgraphs/dagre/sketch.exp.svg b/e2etests/testdata/stable/different_subgraphs/dagre/sketch.exp.svg index e94638e4b..22a3233cf 100644 --- a/e2etests/testdata/stable/different_subgraphs/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/different_subgraphs/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -atreeandnodessomemoremanythenhereyouhavehierarchyfinallyanotherofnestingtreesatreeinsidehierarchyroot + .d2-2745425119 .fill-N1{fill:#0A0F25;} + .d2-2745425119 .fill-N2{fill:#676C7E;} + .d2-2745425119 .fill-N3{fill:#9499AB;} + .d2-2745425119 .fill-N4{fill:#CFD2DD;} + .d2-2745425119 .fill-N5{fill:#DEE1EB;} + .d2-2745425119 .fill-N6{fill:#EEF1F8;} + .d2-2745425119 .fill-N7{fill:#FFFFFF;} + .d2-2745425119 .fill-B1{fill:#0D32B2;} + .d2-2745425119 .fill-B2{fill:#0D32B2;} + .d2-2745425119 .fill-B3{fill:#E3E9FD;} + .d2-2745425119 .fill-B4{fill:#E3E9FD;} + .d2-2745425119 .fill-B5{fill:#EDF0FD;} + .d2-2745425119 .fill-B6{fill:#F7F8FE;} + .d2-2745425119 .fill-AA2{fill:#4A6FF3;} + .d2-2745425119 .fill-AA4{fill:#EDF0FD;} + .d2-2745425119 .fill-AA5{fill:#F7F8FE;} + .d2-2745425119 .fill-AB4{fill:#EDF0FD;} + .d2-2745425119 .fill-AB5{fill:#F7F8FE;} + .d2-2745425119 .stroke-N1{stroke:#0A0F25;} + .d2-2745425119 .stroke-N2{stroke:#676C7E;} + .d2-2745425119 .stroke-N3{stroke:#9499AB;} + .d2-2745425119 .stroke-N4{stroke:#CFD2DD;} + .d2-2745425119 .stroke-N5{stroke:#DEE1EB;} + .d2-2745425119 .stroke-N6{stroke:#EEF1F8;} + .d2-2745425119 .stroke-N7{stroke:#FFFFFF;} + .d2-2745425119 .stroke-B1{stroke:#0D32B2;} + .d2-2745425119 .stroke-B2{stroke:#0D32B2;} + .d2-2745425119 .stroke-B3{stroke:#E3E9FD;} + .d2-2745425119 .stroke-B4{stroke:#E3E9FD;} + .d2-2745425119 .stroke-B5{stroke:#EDF0FD;} + .d2-2745425119 .stroke-B6{stroke:#F7F8FE;} + .d2-2745425119 .stroke-AA2{stroke:#4A6FF3;} + .d2-2745425119 .stroke-AA4{stroke:#EDF0FD;} + .d2-2745425119 .stroke-AA5{stroke:#F7F8FE;} + .d2-2745425119 .stroke-AB4{stroke:#EDF0FD;} + .d2-2745425119 .stroke-AB5{stroke:#F7F8FE;} + .d2-2745425119 .background-color-N1{background-color:#0A0F25;} + .d2-2745425119 .background-color-N2{background-color:#676C7E;} + .d2-2745425119 .background-color-N3{background-color:#9499AB;} + .d2-2745425119 .background-color-N4{background-color:#CFD2DD;} + .d2-2745425119 .background-color-N5{background-color:#DEE1EB;} + .d2-2745425119 .background-color-N6{background-color:#EEF1F8;} + .d2-2745425119 .background-color-N7{background-color:#FFFFFF;} + .d2-2745425119 .background-color-B1{background-color:#0D32B2;} + .d2-2745425119 .background-color-B2{background-color:#0D32B2;} + .d2-2745425119 .background-color-B3{background-color:#E3E9FD;} + .d2-2745425119 .background-color-B4{background-color:#E3E9FD;} + .d2-2745425119 .background-color-B5{background-color:#EDF0FD;} + .d2-2745425119 .background-color-B6{background-color:#F7F8FE;} + .d2-2745425119 .background-color-AA2{background-color:#4A6FF3;} + .d2-2745425119 .background-color-AA4{background-color:#EDF0FD;} + .d2-2745425119 .background-color-AA5{background-color:#F7F8FE;} + .d2-2745425119 .background-color-AB4{background-color:#EDF0FD;} + .d2-2745425119 .background-color-AB5{background-color:#F7F8FE;} + .d2-2745425119 .color-N1{color:#0A0F25;} + .d2-2745425119 .color-N2{color:#676C7E;} + .d2-2745425119 .color-N3{color:#9499AB;} + .d2-2745425119 .color-N4{color:#CFD2DD;} + .d2-2745425119 .color-N5{color:#DEE1EB;} + .d2-2745425119 .color-N6{color:#EEF1F8;} + .d2-2745425119 .color-N7{color:#FFFFFF;} + .d2-2745425119 .color-B1{color:#0D32B2;} + .d2-2745425119 .color-B2{color:#0D32B2;} + .d2-2745425119 .color-B3{color:#E3E9FD;} + .d2-2745425119 .color-B4{color:#E3E9FD;} + .d2-2745425119 .color-B5{color:#EDF0FD;} + .d2-2745425119 .color-B6{color:#F7F8FE;} + .d2-2745425119 .color-AA2{color:#4A6FF3;} + .d2-2745425119 .color-AA4{color:#EDF0FD;} + .d2-2745425119 .color-AA5{color:#F7F8FE;} + .d2-2745425119 .color-AB4{color:#EDF0FD;} + .d2-2745425119 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2745425119);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2745425119);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2745425119);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2745425119);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2745425119);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2745425119);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2745425119);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2745425119);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2745425119);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2745425119);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2745425119);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2745425119);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2745425119);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2745425119);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2745425119);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2745425119);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2745425119);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2745425119);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>atreeandnodessomemoremanythenhereyouhavehierarchyfinallyanotherofnestingtreesatreeinsidehierarchyroot - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/different_subgraphs/elk/board.exp.json b/e2etests/testdata/stable/different_subgraphs/elk/board.exp.json index 0256134d0..a27fe3c93 100644 --- a/e2etests/testdata/stable/different_subgraphs/elk/board.exp.json +++ b/e2etests/testdata/stable/different_subgraphs/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -715,6 +740,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -756,6 +782,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -797,6 +824,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -838,6 +866,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -879,6 +908,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -930,6 +960,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 229.5, @@ -976,6 +1007,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 259.5, @@ -1014,6 +1046,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 289.5, @@ -1060,6 +1093,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 259.5, @@ -1098,6 +1132,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 90.66600036621094, @@ -1144,6 +1179,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 117.33300018310547, @@ -1190,6 +1226,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 460.5, @@ -1228,6 +1265,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 460.5, @@ -1266,6 +1304,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 593.8330078125, @@ -1304,6 +1343,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 487.1659851074219, @@ -1350,6 +1390,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 749, @@ -1388,6 +1429,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 749, @@ -1426,6 +1468,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1010.3330078125, @@ -1464,6 +1507,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 845.166015625, @@ -1510,6 +1554,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 793.25, @@ -1556,6 +1601,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 806.5830078125, @@ -1594,6 +1640,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 759.3330078125, @@ -1632,6 +1679,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 819.916015625, @@ -1671,6 +1719,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/different_subgraphs/elk/sketch.exp.svg b/e2etests/testdata/stable/different_subgraphs/elk/sketch.exp.svg index 5b1c18023..fed3406bc 100644 --- a/e2etests/testdata/stable/different_subgraphs/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/different_subgraphs/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -atreeandnodessomemoremanythenhereyouhavehierarchyfinallyanotherofnestingtreesatreeinsidehierarchyroot + .d2-1988633182 .fill-N1{fill:#0A0F25;} + .d2-1988633182 .fill-N2{fill:#676C7E;} + .d2-1988633182 .fill-N3{fill:#9499AB;} + .d2-1988633182 .fill-N4{fill:#CFD2DD;} + .d2-1988633182 .fill-N5{fill:#DEE1EB;} + .d2-1988633182 .fill-N6{fill:#EEF1F8;} + .d2-1988633182 .fill-N7{fill:#FFFFFF;} + .d2-1988633182 .fill-B1{fill:#0D32B2;} + .d2-1988633182 .fill-B2{fill:#0D32B2;} + .d2-1988633182 .fill-B3{fill:#E3E9FD;} + .d2-1988633182 .fill-B4{fill:#E3E9FD;} + .d2-1988633182 .fill-B5{fill:#EDF0FD;} + .d2-1988633182 .fill-B6{fill:#F7F8FE;} + .d2-1988633182 .fill-AA2{fill:#4A6FF3;} + .d2-1988633182 .fill-AA4{fill:#EDF0FD;} + .d2-1988633182 .fill-AA5{fill:#F7F8FE;} + .d2-1988633182 .fill-AB4{fill:#EDF0FD;} + .d2-1988633182 .fill-AB5{fill:#F7F8FE;} + .d2-1988633182 .stroke-N1{stroke:#0A0F25;} + .d2-1988633182 .stroke-N2{stroke:#676C7E;} + .d2-1988633182 .stroke-N3{stroke:#9499AB;} + .d2-1988633182 .stroke-N4{stroke:#CFD2DD;} + .d2-1988633182 .stroke-N5{stroke:#DEE1EB;} + .d2-1988633182 .stroke-N6{stroke:#EEF1F8;} + .d2-1988633182 .stroke-N7{stroke:#FFFFFF;} + .d2-1988633182 .stroke-B1{stroke:#0D32B2;} + .d2-1988633182 .stroke-B2{stroke:#0D32B2;} + .d2-1988633182 .stroke-B3{stroke:#E3E9FD;} + .d2-1988633182 .stroke-B4{stroke:#E3E9FD;} + .d2-1988633182 .stroke-B5{stroke:#EDF0FD;} + .d2-1988633182 .stroke-B6{stroke:#F7F8FE;} + .d2-1988633182 .stroke-AA2{stroke:#4A6FF3;} + .d2-1988633182 .stroke-AA4{stroke:#EDF0FD;} + .d2-1988633182 .stroke-AA5{stroke:#F7F8FE;} + .d2-1988633182 .stroke-AB4{stroke:#EDF0FD;} + .d2-1988633182 .stroke-AB5{stroke:#F7F8FE;} + .d2-1988633182 .background-color-N1{background-color:#0A0F25;} + .d2-1988633182 .background-color-N2{background-color:#676C7E;} + .d2-1988633182 .background-color-N3{background-color:#9499AB;} + .d2-1988633182 .background-color-N4{background-color:#CFD2DD;} + .d2-1988633182 .background-color-N5{background-color:#DEE1EB;} + .d2-1988633182 .background-color-N6{background-color:#EEF1F8;} + .d2-1988633182 .background-color-N7{background-color:#FFFFFF;} + .d2-1988633182 .background-color-B1{background-color:#0D32B2;} + .d2-1988633182 .background-color-B2{background-color:#0D32B2;} + .d2-1988633182 .background-color-B3{background-color:#E3E9FD;} + .d2-1988633182 .background-color-B4{background-color:#E3E9FD;} + .d2-1988633182 .background-color-B5{background-color:#EDF0FD;} + .d2-1988633182 .background-color-B6{background-color:#F7F8FE;} + .d2-1988633182 .background-color-AA2{background-color:#4A6FF3;} + .d2-1988633182 .background-color-AA4{background-color:#EDF0FD;} + .d2-1988633182 .background-color-AA5{background-color:#F7F8FE;} + .d2-1988633182 .background-color-AB4{background-color:#EDF0FD;} + .d2-1988633182 .background-color-AB5{background-color:#F7F8FE;} + .d2-1988633182 .color-N1{color:#0A0F25;} + .d2-1988633182 .color-N2{color:#676C7E;} + .d2-1988633182 .color-N3{color:#9499AB;} + .d2-1988633182 .color-N4{color:#CFD2DD;} + .d2-1988633182 .color-N5{color:#DEE1EB;} + .d2-1988633182 .color-N6{color:#EEF1F8;} + .d2-1988633182 .color-N7{color:#FFFFFF;} + .d2-1988633182 .color-B1{color:#0D32B2;} + .d2-1988633182 .color-B2{color:#0D32B2;} + .d2-1988633182 .color-B3{color:#E3E9FD;} + .d2-1988633182 .color-B4{color:#E3E9FD;} + .d2-1988633182 .color-B5{color:#EDF0FD;} + .d2-1988633182 .color-B6{color:#F7F8FE;} + .d2-1988633182 .color-AA2{color:#4A6FF3;} + .d2-1988633182 .color-AA4{color:#EDF0FD;} + .d2-1988633182 .color-AA5{color:#F7F8FE;} + .d2-1988633182 .color-AB4{color:#EDF0FD;} + .d2-1988633182 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1988633182);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1988633182);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1988633182);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1988633182);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1988633182);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1988633182);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1988633182);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1988633182);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1988633182);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1988633182);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1988633182);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1988633182);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1988633182);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1988633182);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1988633182);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1988633182);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1988633182);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1988633182);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>atreeandnodessomemoremanythenhereyouhavehierarchyfinallyanotherofnestingtreesatreeinsidehierarchyroot - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/direction/dagre/board.exp.json b/e2etests/testdata/stable/direction/dagre/board.exp.json index 51c75f9e1..1d84340b3 100644 --- a/e2etests/testdata/stable/direction/dagre/board.exp.json +++ b/e2etests/testdata/stable/direction/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -643,6 +666,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 87, @@ -690,6 +714,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 87, @@ -737,6 +762,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 87, @@ -784,6 +810,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 87, @@ -831,6 +858,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 87, @@ -878,6 +906,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 87, @@ -925,6 +954,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 87, @@ -972,6 +1002,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 87, @@ -1019,6 +1050,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 87, @@ -1066,6 +1098,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 87, @@ -1113,6 +1146,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 87, @@ -1160,6 +1194,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 87, @@ -1200,6 +1235,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/direction/dagre/sketch.exp.svg b/e2etests/testdata/stable/direction/dagre/sketch.exp.svg index ca0925081..070f0596b 100644 --- a/e2etests/testdata/stable/direction/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/direction/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -abcde12345abcde + .d2-1738057064 .fill-N1{fill:#0A0F25;} + .d2-1738057064 .fill-N2{fill:#676C7E;} + .d2-1738057064 .fill-N3{fill:#9499AB;} + .d2-1738057064 .fill-N4{fill:#CFD2DD;} + .d2-1738057064 .fill-N5{fill:#DEE1EB;} + .d2-1738057064 .fill-N6{fill:#EEF1F8;} + .d2-1738057064 .fill-N7{fill:#FFFFFF;} + .d2-1738057064 .fill-B1{fill:#0D32B2;} + .d2-1738057064 .fill-B2{fill:#0D32B2;} + .d2-1738057064 .fill-B3{fill:#E3E9FD;} + .d2-1738057064 .fill-B4{fill:#E3E9FD;} + .d2-1738057064 .fill-B5{fill:#EDF0FD;} + .d2-1738057064 .fill-B6{fill:#F7F8FE;} + .d2-1738057064 .fill-AA2{fill:#4A6FF3;} + .d2-1738057064 .fill-AA4{fill:#EDF0FD;} + .d2-1738057064 .fill-AA5{fill:#F7F8FE;} + .d2-1738057064 .fill-AB4{fill:#EDF0FD;} + .d2-1738057064 .fill-AB5{fill:#F7F8FE;} + .d2-1738057064 .stroke-N1{stroke:#0A0F25;} + .d2-1738057064 .stroke-N2{stroke:#676C7E;} + .d2-1738057064 .stroke-N3{stroke:#9499AB;} + .d2-1738057064 .stroke-N4{stroke:#CFD2DD;} + .d2-1738057064 .stroke-N5{stroke:#DEE1EB;} + .d2-1738057064 .stroke-N6{stroke:#EEF1F8;} + .d2-1738057064 .stroke-N7{stroke:#FFFFFF;} + .d2-1738057064 .stroke-B1{stroke:#0D32B2;} + .d2-1738057064 .stroke-B2{stroke:#0D32B2;} + .d2-1738057064 .stroke-B3{stroke:#E3E9FD;} + .d2-1738057064 .stroke-B4{stroke:#E3E9FD;} + .d2-1738057064 .stroke-B5{stroke:#EDF0FD;} + .d2-1738057064 .stroke-B6{stroke:#F7F8FE;} + .d2-1738057064 .stroke-AA2{stroke:#4A6FF3;} + .d2-1738057064 .stroke-AA4{stroke:#EDF0FD;} + .d2-1738057064 .stroke-AA5{stroke:#F7F8FE;} + .d2-1738057064 .stroke-AB4{stroke:#EDF0FD;} + .d2-1738057064 .stroke-AB5{stroke:#F7F8FE;} + .d2-1738057064 .background-color-N1{background-color:#0A0F25;} + .d2-1738057064 .background-color-N2{background-color:#676C7E;} + .d2-1738057064 .background-color-N3{background-color:#9499AB;} + .d2-1738057064 .background-color-N4{background-color:#CFD2DD;} + .d2-1738057064 .background-color-N5{background-color:#DEE1EB;} + .d2-1738057064 .background-color-N6{background-color:#EEF1F8;} + .d2-1738057064 .background-color-N7{background-color:#FFFFFF;} + .d2-1738057064 .background-color-B1{background-color:#0D32B2;} + .d2-1738057064 .background-color-B2{background-color:#0D32B2;} + .d2-1738057064 .background-color-B3{background-color:#E3E9FD;} + .d2-1738057064 .background-color-B4{background-color:#E3E9FD;} + .d2-1738057064 .background-color-B5{background-color:#EDF0FD;} + .d2-1738057064 .background-color-B6{background-color:#F7F8FE;} + .d2-1738057064 .background-color-AA2{background-color:#4A6FF3;} + .d2-1738057064 .background-color-AA4{background-color:#EDF0FD;} + .d2-1738057064 .background-color-AA5{background-color:#F7F8FE;} + .d2-1738057064 .background-color-AB4{background-color:#EDF0FD;} + .d2-1738057064 .background-color-AB5{background-color:#F7F8FE;} + .d2-1738057064 .color-N1{color:#0A0F25;} + .d2-1738057064 .color-N2{color:#676C7E;} + .d2-1738057064 .color-N3{color:#9499AB;} + .d2-1738057064 .color-N4{color:#CFD2DD;} + .d2-1738057064 .color-N5{color:#DEE1EB;} + .d2-1738057064 .color-N6{color:#EEF1F8;} + .d2-1738057064 .color-N7{color:#FFFFFF;} + .d2-1738057064 .color-B1{color:#0D32B2;} + .d2-1738057064 .color-B2{color:#0D32B2;} + .d2-1738057064 .color-B3{color:#E3E9FD;} + .d2-1738057064 .color-B4{color:#E3E9FD;} + .d2-1738057064 .color-B5{color:#EDF0FD;} + .d2-1738057064 .color-B6{color:#F7F8FE;} + .d2-1738057064 .color-AA2{color:#4A6FF3;} + .d2-1738057064 .color-AA4{color:#EDF0FD;} + .d2-1738057064 .color-AA5{color:#F7F8FE;} + .d2-1738057064 .color-AB4{color:#EDF0FD;} + .d2-1738057064 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1738057064);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1738057064);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1738057064);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1738057064);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1738057064);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1738057064);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1738057064);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1738057064);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1738057064);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1738057064);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1738057064);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1738057064);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1738057064);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1738057064);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1738057064);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1738057064);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1738057064);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1738057064);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcde12345abcde - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/direction/elk/board.exp.json b/e2etests/testdata/stable/direction/elk/board.exp.json index af3194378..42918427f 100644 --- a/e2etests/testdata/stable/direction/elk/board.exp.json +++ b/e2etests/testdata/stable/direction/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -643,6 +666,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 139, @@ -681,6 +705,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 139, @@ -719,6 +744,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 139, @@ -757,6 +783,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 139, @@ -795,6 +822,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 139, @@ -833,6 +861,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 139, @@ -871,6 +900,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 139, @@ -909,6 +939,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 139, @@ -947,6 +978,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 139, @@ -985,6 +1017,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 139, @@ -1023,6 +1056,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 139, @@ -1061,6 +1095,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 139, @@ -1092,6 +1127,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/direction/elk/sketch.exp.svg b/e2etests/testdata/stable/direction/elk/sketch.exp.svg index d1e533389..1a4278f25 100644 --- a/e2etests/testdata/stable/direction/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/direction/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -abcde12345abcde + .d2-1034360298 .fill-N1{fill:#0A0F25;} + .d2-1034360298 .fill-N2{fill:#676C7E;} + .d2-1034360298 .fill-N3{fill:#9499AB;} + .d2-1034360298 .fill-N4{fill:#CFD2DD;} + .d2-1034360298 .fill-N5{fill:#DEE1EB;} + .d2-1034360298 .fill-N6{fill:#EEF1F8;} + .d2-1034360298 .fill-N7{fill:#FFFFFF;} + .d2-1034360298 .fill-B1{fill:#0D32B2;} + .d2-1034360298 .fill-B2{fill:#0D32B2;} + .d2-1034360298 .fill-B3{fill:#E3E9FD;} + .d2-1034360298 .fill-B4{fill:#E3E9FD;} + .d2-1034360298 .fill-B5{fill:#EDF0FD;} + .d2-1034360298 .fill-B6{fill:#F7F8FE;} + .d2-1034360298 .fill-AA2{fill:#4A6FF3;} + .d2-1034360298 .fill-AA4{fill:#EDF0FD;} + .d2-1034360298 .fill-AA5{fill:#F7F8FE;} + .d2-1034360298 .fill-AB4{fill:#EDF0FD;} + .d2-1034360298 .fill-AB5{fill:#F7F8FE;} + .d2-1034360298 .stroke-N1{stroke:#0A0F25;} + .d2-1034360298 .stroke-N2{stroke:#676C7E;} + .d2-1034360298 .stroke-N3{stroke:#9499AB;} + .d2-1034360298 .stroke-N4{stroke:#CFD2DD;} + .d2-1034360298 .stroke-N5{stroke:#DEE1EB;} + .d2-1034360298 .stroke-N6{stroke:#EEF1F8;} + .d2-1034360298 .stroke-N7{stroke:#FFFFFF;} + .d2-1034360298 .stroke-B1{stroke:#0D32B2;} + .d2-1034360298 .stroke-B2{stroke:#0D32B2;} + .d2-1034360298 .stroke-B3{stroke:#E3E9FD;} + .d2-1034360298 .stroke-B4{stroke:#E3E9FD;} + .d2-1034360298 .stroke-B5{stroke:#EDF0FD;} + .d2-1034360298 .stroke-B6{stroke:#F7F8FE;} + .d2-1034360298 .stroke-AA2{stroke:#4A6FF3;} + .d2-1034360298 .stroke-AA4{stroke:#EDF0FD;} + .d2-1034360298 .stroke-AA5{stroke:#F7F8FE;} + .d2-1034360298 .stroke-AB4{stroke:#EDF0FD;} + .d2-1034360298 .stroke-AB5{stroke:#F7F8FE;} + .d2-1034360298 .background-color-N1{background-color:#0A0F25;} + .d2-1034360298 .background-color-N2{background-color:#676C7E;} + .d2-1034360298 .background-color-N3{background-color:#9499AB;} + .d2-1034360298 .background-color-N4{background-color:#CFD2DD;} + .d2-1034360298 .background-color-N5{background-color:#DEE1EB;} + .d2-1034360298 .background-color-N6{background-color:#EEF1F8;} + .d2-1034360298 .background-color-N7{background-color:#FFFFFF;} + .d2-1034360298 .background-color-B1{background-color:#0D32B2;} + .d2-1034360298 .background-color-B2{background-color:#0D32B2;} + .d2-1034360298 .background-color-B3{background-color:#E3E9FD;} + .d2-1034360298 .background-color-B4{background-color:#E3E9FD;} + .d2-1034360298 .background-color-B5{background-color:#EDF0FD;} + .d2-1034360298 .background-color-B6{background-color:#F7F8FE;} + .d2-1034360298 .background-color-AA2{background-color:#4A6FF3;} + .d2-1034360298 .background-color-AA4{background-color:#EDF0FD;} + .d2-1034360298 .background-color-AA5{background-color:#F7F8FE;} + .d2-1034360298 .background-color-AB4{background-color:#EDF0FD;} + .d2-1034360298 .background-color-AB5{background-color:#F7F8FE;} + .d2-1034360298 .color-N1{color:#0A0F25;} + .d2-1034360298 .color-N2{color:#676C7E;} + .d2-1034360298 .color-N3{color:#9499AB;} + .d2-1034360298 .color-N4{color:#CFD2DD;} + .d2-1034360298 .color-N5{color:#DEE1EB;} + .d2-1034360298 .color-N6{color:#EEF1F8;} + .d2-1034360298 .color-N7{color:#FFFFFF;} + .d2-1034360298 .color-B1{color:#0D32B2;} + .d2-1034360298 .color-B2{color:#0D32B2;} + .d2-1034360298 .color-B3{color:#E3E9FD;} + .d2-1034360298 .color-B4{color:#E3E9FD;} + .d2-1034360298 .color-B5{color:#EDF0FD;} + .d2-1034360298 .color-B6{color:#F7F8FE;} + .d2-1034360298 .color-AA2{color:#4A6FF3;} + .d2-1034360298 .color-AA4{color:#EDF0FD;} + .d2-1034360298 .color-AA5{color:#F7F8FE;} + .d2-1034360298 .color-AB4{color:#EDF0FD;} + .d2-1034360298 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1034360298);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1034360298);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1034360298);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1034360298);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1034360298);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1034360298);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1034360298);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1034360298);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1034360298);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1034360298);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1034360298);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1034360298);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1034360298);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1034360298);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1034360298);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1034360298);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1034360298);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1034360298);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcde12345abcde - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/edge-label-overflow/dagre/board.exp.json b/e2etests/testdata/stable/edge-label-overflow/dagre/board.exp.json index 4b3264707..d59b36fbb 100644 --- a/e2etests/testdata/stable/edge-label-overflow/dagre/board.exp.json +++ b/e2etests/testdata/stable/edge-label-overflow/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -151,6 +162,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 126.5, @@ -198,6 +210,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 193, @@ -245,6 +258,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 159.75, @@ -285,6 +299,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/edge-label-overflow/dagre/sketch.exp.svg b/e2etests/testdata/stable/edge-label-overflow/dagre/sketch.exp.svg index e271c7acf..a7baa367c 100644 --- a/e2etests/testdata/stable/edge-label-overflow/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/edge-label-overflow/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -studentcommittee chaircommittee Apply for appeal Deny. Need more informationAccept appeal + .d2-1419111113 .fill-N1{fill:#0A0F25;} + .d2-1419111113 .fill-N2{fill:#676C7E;} + .d2-1419111113 .fill-N3{fill:#9499AB;} + .d2-1419111113 .fill-N4{fill:#CFD2DD;} + .d2-1419111113 .fill-N5{fill:#DEE1EB;} + .d2-1419111113 .fill-N6{fill:#EEF1F8;} + .d2-1419111113 .fill-N7{fill:#FFFFFF;} + .d2-1419111113 .fill-B1{fill:#0D32B2;} + .d2-1419111113 .fill-B2{fill:#0D32B2;} + .d2-1419111113 .fill-B3{fill:#E3E9FD;} + .d2-1419111113 .fill-B4{fill:#E3E9FD;} + .d2-1419111113 .fill-B5{fill:#EDF0FD;} + .d2-1419111113 .fill-B6{fill:#F7F8FE;} + .d2-1419111113 .fill-AA2{fill:#4A6FF3;} + .d2-1419111113 .fill-AA4{fill:#EDF0FD;} + .d2-1419111113 .fill-AA5{fill:#F7F8FE;} + .d2-1419111113 .fill-AB4{fill:#EDF0FD;} + .d2-1419111113 .fill-AB5{fill:#F7F8FE;} + .d2-1419111113 .stroke-N1{stroke:#0A0F25;} + .d2-1419111113 .stroke-N2{stroke:#676C7E;} + .d2-1419111113 .stroke-N3{stroke:#9499AB;} + .d2-1419111113 .stroke-N4{stroke:#CFD2DD;} + .d2-1419111113 .stroke-N5{stroke:#DEE1EB;} + .d2-1419111113 .stroke-N6{stroke:#EEF1F8;} + .d2-1419111113 .stroke-N7{stroke:#FFFFFF;} + .d2-1419111113 .stroke-B1{stroke:#0D32B2;} + .d2-1419111113 .stroke-B2{stroke:#0D32B2;} + .d2-1419111113 .stroke-B3{stroke:#E3E9FD;} + .d2-1419111113 .stroke-B4{stroke:#E3E9FD;} + .d2-1419111113 .stroke-B5{stroke:#EDF0FD;} + .d2-1419111113 .stroke-B6{stroke:#F7F8FE;} + .d2-1419111113 .stroke-AA2{stroke:#4A6FF3;} + .d2-1419111113 .stroke-AA4{stroke:#EDF0FD;} + .d2-1419111113 .stroke-AA5{stroke:#F7F8FE;} + .d2-1419111113 .stroke-AB4{stroke:#EDF0FD;} + .d2-1419111113 .stroke-AB5{stroke:#F7F8FE;} + .d2-1419111113 .background-color-N1{background-color:#0A0F25;} + .d2-1419111113 .background-color-N2{background-color:#676C7E;} + .d2-1419111113 .background-color-N3{background-color:#9499AB;} + .d2-1419111113 .background-color-N4{background-color:#CFD2DD;} + .d2-1419111113 .background-color-N5{background-color:#DEE1EB;} + .d2-1419111113 .background-color-N6{background-color:#EEF1F8;} + .d2-1419111113 .background-color-N7{background-color:#FFFFFF;} + .d2-1419111113 .background-color-B1{background-color:#0D32B2;} + .d2-1419111113 .background-color-B2{background-color:#0D32B2;} + .d2-1419111113 .background-color-B3{background-color:#E3E9FD;} + .d2-1419111113 .background-color-B4{background-color:#E3E9FD;} + .d2-1419111113 .background-color-B5{background-color:#EDF0FD;} + .d2-1419111113 .background-color-B6{background-color:#F7F8FE;} + .d2-1419111113 .background-color-AA2{background-color:#4A6FF3;} + .d2-1419111113 .background-color-AA4{background-color:#EDF0FD;} + .d2-1419111113 .background-color-AA5{background-color:#F7F8FE;} + .d2-1419111113 .background-color-AB4{background-color:#EDF0FD;} + .d2-1419111113 .background-color-AB5{background-color:#F7F8FE;} + .d2-1419111113 .color-N1{color:#0A0F25;} + .d2-1419111113 .color-N2{color:#676C7E;} + .d2-1419111113 .color-N3{color:#9499AB;} + .d2-1419111113 .color-N4{color:#CFD2DD;} + .d2-1419111113 .color-N5{color:#DEE1EB;} + .d2-1419111113 .color-N6{color:#EEF1F8;} + .d2-1419111113 .color-N7{color:#FFFFFF;} + .d2-1419111113 .color-B1{color:#0D32B2;} + .d2-1419111113 .color-B2{color:#0D32B2;} + .d2-1419111113 .color-B3{color:#E3E9FD;} + .d2-1419111113 .color-B4{color:#E3E9FD;} + .d2-1419111113 .color-B5{color:#EDF0FD;} + .d2-1419111113 .color-B6{color:#F7F8FE;} + .d2-1419111113 .color-AA2{color:#4A6FF3;} + .d2-1419111113 .color-AA4{color:#EDF0FD;} + .d2-1419111113 .color-AA5{color:#F7F8FE;} + .d2-1419111113 .color-AB4{color:#EDF0FD;} + .d2-1419111113 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1419111113);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1419111113);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1419111113);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1419111113);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1419111113);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1419111113);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1419111113);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1419111113);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1419111113);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1419111113);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1419111113);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1419111113);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1419111113);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1419111113);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1419111113);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1419111113);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1419111113);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1419111113);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>studentcommittee chaircommittee Apply for appeal Deny. Need more informationAccept appeal - - - - - - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/edge-label-overflow/elk/board.exp.json b/e2etests/testdata/stable/edge-label-overflow/elk/board.exp.json index ba7cc813d..bdba02f48 100644 --- a/e2etests/testdata/stable/edge-label-overflow/elk/board.exp.json +++ b/e2etests/testdata/stable/edge-label-overflow/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -151,6 +162,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 130.58299255371094, @@ -205,6 +217,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 163.91600036621094, @@ -259,6 +272,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 147.25, @@ -290,6 +304,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/edge-label-overflow/elk/sketch.exp.svg b/e2etests/testdata/stable/edge-label-overflow/elk/sketch.exp.svg index 4f9dab96d..a08aa8a99 100644 --- a/e2etests/testdata/stable/edge-label-overflow/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/edge-label-overflow/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -studentcommittee chaircommittee Apply for appeal Deny. Need more informationAccept appeal + .d2-1163779077 .fill-N1{fill:#0A0F25;} + .d2-1163779077 .fill-N2{fill:#676C7E;} + .d2-1163779077 .fill-N3{fill:#9499AB;} + .d2-1163779077 .fill-N4{fill:#CFD2DD;} + .d2-1163779077 .fill-N5{fill:#DEE1EB;} + .d2-1163779077 .fill-N6{fill:#EEF1F8;} + .d2-1163779077 .fill-N7{fill:#FFFFFF;} + .d2-1163779077 .fill-B1{fill:#0D32B2;} + .d2-1163779077 .fill-B2{fill:#0D32B2;} + .d2-1163779077 .fill-B3{fill:#E3E9FD;} + .d2-1163779077 .fill-B4{fill:#E3E9FD;} + .d2-1163779077 .fill-B5{fill:#EDF0FD;} + .d2-1163779077 .fill-B6{fill:#F7F8FE;} + .d2-1163779077 .fill-AA2{fill:#4A6FF3;} + .d2-1163779077 .fill-AA4{fill:#EDF0FD;} + .d2-1163779077 .fill-AA5{fill:#F7F8FE;} + .d2-1163779077 .fill-AB4{fill:#EDF0FD;} + .d2-1163779077 .fill-AB5{fill:#F7F8FE;} + .d2-1163779077 .stroke-N1{stroke:#0A0F25;} + .d2-1163779077 .stroke-N2{stroke:#676C7E;} + .d2-1163779077 .stroke-N3{stroke:#9499AB;} + .d2-1163779077 .stroke-N4{stroke:#CFD2DD;} + .d2-1163779077 .stroke-N5{stroke:#DEE1EB;} + .d2-1163779077 .stroke-N6{stroke:#EEF1F8;} + .d2-1163779077 .stroke-N7{stroke:#FFFFFF;} + .d2-1163779077 .stroke-B1{stroke:#0D32B2;} + .d2-1163779077 .stroke-B2{stroke:#0D32B2;} + .d2-1163779077 .stroke-B3{stroke:#E3E9FD;} + .d2-1163779077 .stroke-B4{stroke:#E3E9FD;} + .d2-1163779077 .stroke-B5{stroke:#EDF0FD;} + .d2-1163779077 .stroke-B6{stroke:#F7F8FE;} + .d2-1163779077 .stroke-AA2{stroke:#4A6FF3;} + .d2-1163779077 .stroke-AA4{stroke:#EDF0FD;} + .d2-1163779077 .stroke-AA5{stroke:#F7F8FE;} + .d2-1163779077 .stroke-AB4{stroke:#EDF0FD;} + .d2-1163779077 .stroke-AB5{stroke:#F7F8FE;} + .d2-1163779077 .background-color-N1{background-color:#0A0F25;} + .d2-1163779077 .background-color-N2{background-color:#676C7E;} + .d2-1163779077 .background-color-N3{background-color:#9499AB;} + .d2-1163779077 .background-color-N4{background-color:#CFD2DD;} + .d2-1163779077 .background-color-N5{background-color:#DEE1EB;} + .d2-1163779077 .background-color-N6{background-color:#EEF1F8;} + .d2-1163779077 .background-color-N7{background-color:#FFFFFF;} + .d2-1163779077 .background-color-B1{background-color:#0D32B2;} + .d2-1163779077 .background-color-B2{background-color:#0D32B2;} + .d2-1163779077 .background-color-B3{background-color:#E3E9FD;} + .d2-1163779077 .background-color-B4{background-color:#E3E9FD;} + .d2-1163779077 .background-color-B5{background-color:#EDF0FD;} + .d2-1163779077 .background-color-B6{background-color:#F7F8FE;} + .d2-1163779077 .background-color-AA2{background-color:#4A6FF3;} + .d2-1163779077 .background-color-AA4{background-color:#EDF0FD;} + .d2-1163779077 .background-color-AA5{background-color:#F7F8FE;} + .d2-1163779077 .background-color-AB4{background-color:#EDF0FD;} + .d2-1163779077 .background-color-AB5{background-color:#F7F8FE;} + .d2-1163779077 .color-N1{color:#0A0F25;} + .d2-1163779077 .color-N2{color:#676C7E;} + .d2-1163779077 .color-N3{color:#9499AB;} + .d2-1163779077 .color-N4{color:#CFD2DD;} + .d2-1163779077 .color-N5{color:#DEE1EB;} + .d2-1163779077 .color-N6{color:#EEF1F8;} + .d2-1163779077 .color-N7{color:#FFFFFF;} + .d2-1163779077 .color-B1{color:#0D32B2;} + .d2-1163779077 .color-B2{color:#0D32B2;} + .d2-1163779077 .color-B3{color:#E3E9FD;} + .d2-1163779077 .color-B4{color:#E3E9FD;} + .d2-1163779077 .color-B5{color:#EDF0FD;} + .d2-1163779077 .color-B6{color:#F7F8FE;} + .d2-1163779077 .color-AA2{color:#4A6FF3;} + .d2-1163779077 .color-AA4{color:#EDF0FD;} + .d2-1163779077 .color-AA5{color:#F7F8FE;} + .d2-1163779077 .color-AB4{color:#EDF0FD;} + .d2-1163779077 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1163779077);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1163779077);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1163779077);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1163779077);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1163779077);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1163779077);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1163779077);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1163779077);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1163779077);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1163779077);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1163779077);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1163779077);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1163779077);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1163779077);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1163779077);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1163779077);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1163779077);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1163779077);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>studentcommittee chaircommittee Apply for appeal Deny. Need more informationAccept appeal - - - - - - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/elk_border_radius/dagre/board.exp.json b/e2etests/testdata/stable/elk_border_radius/dagre/board.exp.json index 8539ce287..5543d610f 100644 --- a/e2etests/testdata/stable/elk_border_radius/dagre/board.exp.json +++ b/e2etests/testdata/stable/elk_border_radius/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -274,6 +288,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 226.5, @@ -320,6 +335,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 226.5, @@ -367,6 +383,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 252.5, @@ -414,6 +431,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 278.5, @@ -461,6 +479,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 279, @@ -501,6 +520,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/elk_border_radius/dagre/sketch.exp.svg b/e2etests/testdata/stable/elk_border_radius/dagre/sketch.exp.svg index 9064fd6b5..c69b09d7c 100644 --- a/e2etests/testdata/stable/elk_border_radius/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/elk_border_radius/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcefg + .d2-1700810770 .fill-N1{fill:#0A0F25;} + .d2-1700810770 .fill-N2{fill:#676C7E;} + .d2-1700810770 .fill-N3{fill:#9499AB;} + .d2-1700810770 .fill-N4{fill:#CFD2DD;} + .d2-1700810770 .fill-N5{fill:#DEE1EB;} + .d2-1700810770 .fill-N6{fill:#EEF1F8;} + .d2-1700810770 .fill-N7{fill:#FFFFFF;} + .d2-1700810770 .fill-B1{fill:#0D32B2;} + .d2-1700810770 .fill-B2{fill:#0D32B2;} + .d2-1700810770 .fill-B3{fill:#E3E9FD;} + .d2-1700810770 .fill-B4{fill:#E3E9FD;} + .d2-1700810770 .fill-B5{fill:#EDF0FD;} + .d2-1700810770 .fill-B6{fill:#F7F8FE;} + .d2-1700810770 .fill-AA2{fill:#4A6FF3;} + .d2-1700810770 .fill-AA4{fill:#EDF0FD;} + .d2-1700810770 .fill-AA5{fill:#F7F8FE;} + .d2-1700810770 .fill-AB4{fill:#EDF0FD;} + .d2-1700810770 .fill-AB5{fill:#F7F8FE;} + .d2-1700810770 .stroke-N1{stroke:#0A0F25;} + .d2-1700810770 .stroke-N2{stroke:#676C7E;} + .d2-1700810770 .stroke-N3{stroke:#9499AB;} + .d2-1700810770 .stroke-N4{stroke:#CFD2DD;} + .d2-1700810770 .stroke-N5{stroke:#DEE1EB;} + .d2-1700810770 .stroke-N6{stroke:#EEF1F8;} + .d2-1700810770 .stroke-N7{stroke:#FFFFFF;} + .d2-1700810770 .stroke-B1{stroke:#0D32B2;} + .d2-1700810770 .stroke-B2{stroke:#0D32B2;} + .d2-1700810770 .stroke-B3{stroke:#E3E9FD;} + .d2-1700810770 .stroke-B4{stroke:#E3E9FD;} + .d2-1700810770 .stroke-B5{stroke:#EDF0FD;} + .d2-1700810770 .stroke-B6{stroke:#F7F8FE;} + .d2-1700810770 .stroke-AA2{stroke:#4A6FF3;} + .d2-1700810770 .stroke-AA4{stroke:#EDF0FD;} + .d2-1700810770 .stroke-AA5{stroke:#F7F8FE;} + .d2-1700810770 .stroke-AB4{stroke:#EDF0FD;} + .d2-1700810770 .stroke-AB5{stroke:#F7F8FE;} + .d2-1700810770 .background-color-N1{background-color:#0A0F25;} + .d2-1700810770 .background-color-N2{background-color:#676C7E;} + .d2-1700810770 .background-color-N3{background-color:#9499AB;} + .d2-1700810770 .background-color-N4{background-color:#CFD2DD;} + .d2-1700810770 .background-color-N5{background-color:#DEE1EB;} + .d2-1700810770 .background-color-N6{background-color:#EEF1F8;} + .d2-1700810770 .background-color-N7{background-color:#FFFFFF;} + .d2-1700810770 .background-color-B1{background-color:#0D32B2;} + .d2-1700810770 .background-color-B2{background-color:#0D32B2;} + .d2-1700810770 .background-color-B3{background-color:#E3E9FD;} + .d2-1700810770 .background-color-B4{background-color:#E3E9FD;} + .d2-1700810770 .background-color-B5{background-color:#EDF0FD;} + .d2-1700810770 .background-color-B6{background-color:#F7F8FE;} + .d2-1700810770 .background-color-AA2{background-color:#4A6FF3;} + .d2-1700810770 .background-color-AA4{background-color:#EDF0FD;} + .d2-1700810770 .background-color-AA5{background-color:#F7F8FE;} + .d2-1700810770 .background-color-AB4{background-color:#EDF0FD;} + .d2-1700810770 .background-color-AB5{background-color:#F7F8FE;} + .d2-1700810770 .color-N1{color:#0A0F25;} + .d2-1700810770 .color-N2{color:#676C7E;} + .d2-1700810770 .color-N3{color:#9499AB;} + .d2-1700810770 .color-N4{color:#CFD2DD;} + .d2-1700810770 .color-N5{color:#DEE1EB;} + .d2-1700810770 .color-N6{color:#EEF1F8;} + .d2-1700810770 .color-N7{color:#FFFFFF;} + .d2-1700810770 .color-B1{color:#0D32B2;} + .d2-1700810770 .color-B2{color:#0D32B2;} + .d2-1700810770 .color-B3{color:#E3E9FD;} + .d2-1700810770 .color-B4{color:#E3E9FD;} + .d2-1700810770 .color-B5{color:#EDF0FD;} + .d2-1700810770 .color-B6{color:#F7F8FE;} + .d2-1700810770 .color-AA2{color:#4A6FF3;} + .d2-1700810770 .color-AA4{color:#EDF0FD;} + .d2-1700810770 .color-AA5{color:#F7F8FE;} + .d2-1700810770 .color-AB4{color:#EDF0FD;} + .d2-1700810770 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1700810770);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1700810770);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1700810770);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1700810770);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1700810770);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1700810770);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1700810770);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1700810770);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1700810770);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1700810770);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1700810770);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1700810770);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1700810770);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1700810770);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1700810770);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1700810770);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1700810770);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1700810770);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcefg - - - - - - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/elk_border_radius/elk/board.exp.json b/e2etests/testdata/stable/elk_border_radius/elk/board.exp.json index 823bb7a76..6eb7566cb 100644 --- a/e2etests/testdata/stable/elk_border_radius/elk/board.exp.json +++ b/e2etests/testdata/stable/elk_border_radius/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -274,6 +288,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 117.83300018310547, @@ -319,6 +334,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 151.16600036621094, @@ -365,6 +381,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 184.5, @@ -403,6 +420,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 217.83299255371094, @@ -449,6 +467,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 251.16600036621094, @@ -488,6 +507,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/elk_border_radius/elk/sketch.exp.svg b/e2etests/testdata/stable/elk_border_radius/elk/sketch.exp.svg index 7636d603e..0d4d22486 100644 --- a/e2etests/testdata/stable/elk_border_radius/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/elk_border_radius/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcefg + .d2-102651400 .fill-N1{fill:#0A0F25;} + .d2-102651400 .fill-N2{fill:#676C7E;} + .d2-102651400 .fill-N3{fill:#9499AB;} + .d2-102651400 .fill-N4{fill:#CFD2DD;} + .d2-102651400 .fill-N5{fill:#DEE1EB;} + .d2-102651400 .fill-N6{fill:#EEF1F8;} + .d2-102651400 .fill-N7{fill:#FFFFFF;} + .d2-102651400 .fill-B1{fill:#0D32B2;} + .d2-102651400 .fill-B2{fill:#0D32B2;} + .d2-102651400 .fill-B3{fill:#E3E9FD;} + .d2-102651400 .fill-B4{fill:#E3E9FD;} + .d2-102651400 .fill-B5{fill:#EDF0FD;} + .d2-102651400 .fill-B6{fill:#F7F8FE;} + .d2-102651400 .fill-AA2{fill:#4A6FF3;} + .d2-102651400 .fill-AA4{fill:#EDF0FD;} + .d2-102651400 .fill-AA5{fill:#F7F8FE;} + .d2-102651400 .fill-AB4{fill:#EDF0FD;} + .d2-102651400 .fill-AB5{fill:#F7F8FE;} + .d2-102651400 .stroke-N1{stroke:#0A0F25;} + .d2-102651400 .stroke-N2{stroke:#676C7E;} + .d2-102651400 .stroke-N3{stroke:#9499AB;} + .d2-102651400 .stroke-N4{stroke:#CFD2DD;} + .d2-102651400 .stroke-N5{stroke:#DEE1EB;} + .d2-102651400 .stroke-N6{stroke:#EEF1F8;} + .d2-102651400 .stroke-N7{stroke:#FFFFFF;} + .d2-102651400 .stroke-B1{stroke:#0D32B2;} + .d2-102651400 .stroke-B2{stroke:#0D32B2;} + .d2-102651400 .stroke-B3{stroke:#E3E9FD;} + .d2-102651400 .stroke-B4{stroke:#E3E9FD;} + .d2-102651400 .stroke-B5{stroke:#EDF0FD;} + .d2-102651400 .stroke-B6{stroke:#F7F8FE;} + .d2-102651400 .stroke-AA2{stroke:#4A6FF3;} + .d2-102651400 .stroke-AA4{stroke:#EDF0FD;} + .d2-102651400 .stroke-AA5{stroke:#F7F8FE;} + .d2-102651400 .stroke-AB4{stroke:#EDF0FD;} + .d2-102651400 .stroke-AB5{stroke:#F7F8FE;} + .d2-102651400 .background-color-N1{background-color:#0A0F25;} + .d2-102651400 .background-color-N2{background-color:#676C7E;} + .d2-102651400 .background-color-N3{background-color:#9499AB;} + .d2-102651400 .background-color-N4{background-color:#CFD2DD;} + .d2-102651400 .background-color-N5{background-color:#DEE1EB;} + .d2-102651400 .background-color-N6{background-color:#EEF1F8;} + .d2-102651400 .background-color-N7{background-color:#FFFFFF;} + .d2-102651400 .background-color-B1{background-color:#0D32B2;} + .d2-102651400 .background-color-B2{background-color:#0D32B2;} + .d2-102651400 .background-color-B3{background-color:#E3E9FD;} + .d2-102651400 .background-color-B4{background-color:#E3E9FD;} + .d2-102651400 .background-color-B5{background-color:#EDF0FD;} + .d2-102651400 .background-color-B6{background-color:#F7F8FE;} + .d2-102651400 .background-color-AA2{background-color:#4A6FF3;} + .d2-102651400 .background-color-AA4{background-color:#EDF0FD;} + .d2-102651400 .background-color-AA5{background-color:#F7F8FE;} + .d2-102651400 .background-color-AB4{background-color:#EDF0FD;} + .d2-102651400 .background-color-AB5{background-color:#F7F8FE;} + .d2-102651400 .color-N1{color:#0A0F25;} + .d2-102651400 .color-N2{color:#676C7E;} + .d2-102651400 .color-N3{color:#9499AB;} + .d2-102651400 .color-N4{color:#CFD2DD;} + .d2-102651400 .color-N5{color:#DEE1EB;} + .d2-102651400 .color-N6{color:#EEF1F8;} + .d2-102651400 .color-N7{color:#FFFFFF;} + .d2-102651400 .color-B1{color:#0D32B2;} + .d2-102651400 .color-B2{color:#0D32B2;} + .d2-102651400 .color-B3{color:#E3E9FD;} + .d2-102651400 .color-B4{color:#E3E9FD;} + .d2-102651400 .color-B5{color:#EDF0FD;} + .d2-102651400 .color-B6{color:#F7F8FE;} + .d2-102651400 .color-AA2{color:#4A6FF3;} + .d2-102651400 .color-AA4{color:#EDF0FD;} + .d2-102651400 .color-AA5{color:#F7F8FE;} + .d2-102651400 .color-AB4{color:#EDF0FD;} + .d2-102651400 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-102651400);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-102651400);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-102651400);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-102651400);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-102651400);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-102651400);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-102651400);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-102651400);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-102651400);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-102651400);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-102651400);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-102651400);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-102651400);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-102651400);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-102651400);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-102651400);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-102651400);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-102651400);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcefg - - - - - - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/elk_container_height/dagre/board.exp.json b/e2etests/testdata/stable/elk_container_height/dagre/board.exp.json index 33cdbc41a..03e2ec4d3 100644 --- a/e2etests/testdata/stable/elk_container_height/dagre/board.exp.json +++ b/e2etests/testdata/stable/elk_container_height/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "AA4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -102,6 +112,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/elk_container_height/dagre/sketch.exp.svg b/e2etests/testdata/stable/elk_container_height/dagre/sketch.exp.svg index 6f16cbc5a..e7b359aab 100644 --- a/e2etests/testdata/stable/elk_container_height/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/elk_container_height/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -i can not see the titlex + .d2-185692502 .fill-N1{fill:#0A0F25;} + .d2-185692502 .fill-N2{fill:#676C7E;} + .d2-185692502 .fill-N3{fill:#9499AB;} + .d2-185692502 .fill-N4{fill:#CFD2DD;} + .d2-185692502 .fill-N5{fill:#DEE1EB;} + .d2-185692502 .fill-N6{fill:#EEF1F8;} + .d2-185692502 .fill-N7{fill:#FFFFFF;} + .d2-185692502 .fill-B1{fill:#0D32B2;} + .d2-185692502 .fill-B2{fill:#0D32B2;} + .d2-185692502 .fill-B3{fill:#E3E9FD;} + .d2-185692502 .fill-B4{fill:#E3E9FD;} + .d2-185692502 .fill-B5{fill:#EDF0FD;} + .d2-185692502 .fill-B6{fill:#F7F8FE;} + .d2-185692502 .fill-AA2{fill:#4A6FF3;} + .d2-185692502 .fill-AA4{fill:#EDF0FD;} + .d2-185692502 .fill-AA5{fill:#F7F8FE;} + .d2-185692502 .fill-AB4{fill:#EDF0FD;} + .d2-185692502 .fill-AB5{fill:#F7F8FE;} + .d2-185692502 .stroke-N1{stroke:#0A0F25;} + .d2-185692502 .stroke-N2{stroke:#676C7E;} + .d2-185692502 .stroke-N3{stroke:#9499AB;} + .d2-185692502 .stroke-N4{stroke:#CFD2DD;} + .d2-185692502 .stroke-N5{stroke:#DEE1EB;} + .d2-185692502 .stroke-N6{stroke:#EEF1F8;} + .d2-185692502 .stroke-N7{stroke:#FFFFFF;} + .d2-185692502 .stroke-B1{stroke:#0D32B2;} + .d2-185692502 .stroke-B2{stroke:#0D32B2;} + .d2-185692502 .stroke-B3{stroke:#E3E9FD;} + .d2-185692502 .stroke-B4{stroke:#E3E9FD;} + .d2-185692502 .stroke-B5{stroke:#EDF0FD;} + .d2-185692502 .stroke-B6{stroke:#F7F8FE;} + .d2-185692502 .stroke-AA2{stroke:#4A6FF3;} + .d2-185692502 .stroke-AA4{stroke:#EDF0FD;} + .d2-185692502 .stroke-AA5{stroke:#F7F8FE;} + .d2-185692502 .stroke-AB4{stroke:#EDF0FD;} + .d2-185692502 .stroke-AB5{stroke:#F7F8FE;} + .d2-185692502 .background-color-N1{background-color:#0A0F25;} + .d2-185692502 .background-color-N2{background-color:#676C7E;} + .d2-185692502 .background-color-N3{background-color:#9499AB;} + .d2-185692502 .background-color-N4{background-color:#CFD2DD;} + .d2-185692502 .background-color-N5{background-color:#DEE1EB;} + .d2-185692502 .background-color-N6{background-color:#EEF1F8;} + .d2-185692502 .background-color-N7{background-color:#FFFFFF;} + .d2-185692502 .background-color-B1{background-color:#0D32B2;} + .d2-185692502 .background-color-B2{background-color:#0D32B2;} + .d2-185692502 .background-color-B3{background-color:#E3E9FD;} + .d2-185692502 .background-color-B4{background-color:#E3E9FD;} + .d2-185692502 .background-color-B5{background-color:#EDF0FD;} + .d2-185692502 .background-color-B6{background-color:#F7F8FE;} + .d2-185692502 .background-color-AA2{background-color:#4A6FF3;} + .d2-185692502 .background-color-AA4{background-color:#EDF0FD;} + .d2-185692502 .background-color-AA5{background-color:#F7F8FE;} + .d2-185692502 .background-color-AB4{background-color:#EDF0FD;} + .d2-185692502 .background-color-AB5{background-color:#F7F8FE;} + .d2-185692502 .color-N1{color:#0A0F25;} + .d2-185692502 .color-N2{color:#676C7E;} + .d2-185692502 .color-N3{color:#9499AB;} + .d2-185692502 .color-N4{color:#CFD2DD;} + .d2-185692502 .color-N5{color:#DEE1EB;} + .d2-185692502 .color-N6{color:#EEF1F8;} + .d2-185692502 .color-N7{color:#FFFFFF;} + .d2-185692502 .color-B1{color:#0D32B2;} + .d2-185692502 .color-B2{color:#0D32B2;} + .d2-185692502 .color-B3{color:#E3E9FD;} + .d2-185692502 .color-B4{color:#E3E9FD;} + .d2-185692502 .color-B5{color:#EDF0FD;} + .d2-185692502 .color-B6{color:#F7F8FE;} + .d2-185692502 .color-AA2{color:#4A6FF3;} + .d2-185692502 .color-AA4{color:#EDF0FD;} + .d2-185692502 .color-AA5{color:#F7F8FE;} + .d2-185692502 .color-AB4{color:#EDF0FD;} + .d2-185692502 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-185692502);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-185692502);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-185692502);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-185692502);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-185692502);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-185692502);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-185692502);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-185692502);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-185692502);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-185692502);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-185692502);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-185692502);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-185692502);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-185692502);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-185692502);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-185692502);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-185692502);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-185692502);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>i can not see the titlex - - + + \ No newline at end of file diff --git a/e2etests/testdata/stable/elk_container_height/elk/board.exp.json b/e2etests/testdata/stable/elk_container_height/elk/board.exp.json index d13aaf328..4772de62e 100644 --- a/e2etests/testdata/stable/elk_container_height/elk/board.exp.json +++ b/e2etests/testdata/stable/elk_container_height/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "AA4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -102,6 +112,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/elk_container_height/elk/sketch.exp.svg b/e2etests/testdata/stable/elk_container_height/elk/sketch.exp.svg index e5d4b8fd9..018f43316 100644 --- a/e2etests/testdata/stable/elk_container_height/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/elk_container_height/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -i can not see the titlex + .d2-1378542223 .fill-N1{fill:#0A0F25;} + .d2-1378542223 .fill-N2{fill:#676C7E;} + .d2-1378542223 .fill-N3{fill:#9499AB;} + .d2-1378542223 .fill-N4{fill:#CFD2DD;} + .d2-1378542223 .fill-N5{fill:#DEE1EB;} + .d2-1378542223 .fill-N6{fill:#EEF1F8;} + .d2-1378542223 .fill-N7{fill:#FFFFFF;} + .d2-1378542223 .fill-B1{fill:#0D32B2;} + .d2-1378542223 .fill-B2{fill:#0D32B2;} + .d2-1378542223 .fill-B3{fill:#E3E9FD;} + .d2-1378542223 .fill-B4{fill:#E3E9FD;} + .d2-1378542223 .fill-B5{fill:#EDF0FD;} + .d2-1378542223 .fill-B6{fill:#F7F8FE;} + .d2-1378542223 .fill-AA2{fill:#4A6FF3;} + .d2-1378542223 .fill-AA4{fill:#EDF0FD;} + .d2-1378542223 .fill-AA5{fill:#F7F8FE;} + .d2-1378542223 .fill-AB4{fill:#EDF0FD;} + .d2-1378542223 .fill-AB5{fill:#F7F8FE;} + .d2-1378542223 .stroke-N1{stroke:#0A0F25;} + .d2-1378542223 .stroke-N2{stroke:#676C7E;} + .d2-1378542223 .stroke-N3{stroke:#9499AB;} + .d2-1378542223 .stroke-N4{stroke:#CFD2DD;} + .d2-1378542223 .stroke-N5{stroke:#DEE1EB;} + .d2-1378542223 .stroke-N6{stroke:#EEF1F8;} + .d2-1378542223 .stroke-N7{stroke:#FFFFFF;} + .d2-1378542223 .stroke-B1{stroke:#0D32B2;} + .d2-1378542223 .stroke-B2{stroke:#0D32B2;} + .d2-1378542223 .stroke-B3{stroke:#E3E9FD;} + .d2-1378542223 .stroke-B4{stroke:#E3E9FD;} + .d2-1378542223 .stroke-B5{stroke:#EDF0FD;} + .d2-1378542223 .stroke-B6{stroke:#F7F8FE;} + .d2-1378542223 .stroke-AA2{stroke:#4A6FF3;} + .d2-1378542223 .stroke-AA4{stroke:#EDF0FD;} + .d2-1378542223 .stroke-AA5{stroke:#F7F8FE;} + .d2-1378542223 .stroke-AB4{stroke:#EDF0FD;} + .d2-1378542223 .stroke-AB5{stroke:#F7F8FE;} + .d2-1378542223 .background-color-N1{background-color:#0A0F25;} + .d2-1378542223 .background-color-N2{background-color:#676C7E;} + .d2-1378542223 .background-color-N3{background-color:#9499AB;} + .d2-1378542223 .background-color-N4{background-color:#CFD2DD;} + .d2-1378542223 .background-color-N5{background-color:#DEE1EB;} + .d2-1378542223 .background-color-N6{background-color:#EEF1F8;} + .d2-1378542223 .background-color-N7{background-color:#FFFFFF;} + .d2-1378542223 .background-color-B1{background-color:#0D32B2;} + .d2-1378542223 .background-color-B2{background-color:#0D32B2;} + .d2-1378542223 .background-color-B3{background-color:#E3E9FD;} + .d2-1378542223 .background-color-B4{background-color:#E3E9FD;} + .d2-1378542223 .background-color-B5{background-color:#EDF0FD;} + .d2-1378542223 .background-color-B6{background-color:#F7F8FE;} + .d2-1378542223 .background-color-AA2{background-color:#4A6FF3;} + .d2-1378542223 .background-color-AA4{background-color:#EDF0FD;} + .d2-1378542223 .background-color-AA5{background-color:#F7F8FE;} + .d2-1378542223 .background-color-AB4{background-color:#EDF0FD;} + .d2-1378542223 .background-color-AB5{background-color:#F7F8FE;} + .d2-1378542223 .color-N1{color:#0A0F25;} + .d2-1378542223 .color-N2{color:#676C7E;} + .d2-1378542223 .color-N3{color:#9499AB;} + .d2-1378542223 .color-N4{color:#CFD2DD;} + .d2-1378542223 .color-N5{color:#DEE1EB;} + .d2-1378542223 .color-N6{color:#EEF1F8;} + .d2-1378542223 .color-N7{color:#FFFFFF;} + .d2-1378542223 .color-B1{color:#0D32B2;} + .d2-1378542223 .color-B2{color:#0D32B2;} + .d2-1378542223 .color-B3{color:#E3E9FD;} + .d2-1378542223 .color-B4{color:#E3E9FD;} + .d2-1378542223 .color-B5{color:#EDF0FD;} + .d2-1378542223 .color-B6{color:#F7F8FE;} + .d2-1378542223 .color-AA2{color:#4A6FF3;} + .d2-1378542223 .color-AA4{color:#EDF0FD;} + .d2-1378542223 .color-AA5{color:#F7F8FE;} + .d2-1378542223 .color-AB4{color:#EDF0FD;} + .d2-1378542223 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1378542223);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1378542223);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1378542223);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1378542223);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1378542223);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1378542223);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1378542223);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1378542223);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1378542223);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1378542223);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1378542223);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1378542223);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1378542223);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1378542223);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1378542223);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1378542223);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1378542223);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1378542223);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>i can not see the titlex - - + + \ No newline at end of file diff --git a/e2etests/testdata/stable/elk_shim/dagre/board.exp.json b/e2etests/testdata/stable/elk_shim/dagre/board.exp.json index cbad13b6e..ccdee2f08 100644 --- a/e2etests/testdata/stable/elk_shim/dagre/board.exp.json +++ b/e2etests/testdata/stable/elk_shim/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "AB4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -479,6 +498,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 222, @@ -526,6 +546,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 246, @@ -573,6 +594,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 270, @@ -620,6 +642,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 246, @@ -679,6 +702,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 187, @@ -726,6 +750,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 115, @@ -929,6 +954,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 477.5, @@ -976,6 +1002,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 535.25, @@ -1023,6 +1050,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 246, @@ -1063,6 +1091,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/elk_shim/dagre/sketch.exp.svg b/e2etests/testdata/stable/elk_shim/dagre/sketch.exp.svg index f63c2989c..d3e69ba72 100644 --- a/e2etests/testdata/stable/elk_shim/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/elk_shim/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -networkuserapi serverlogscell towerONLINE PORTALLLLdata processorsatellitestransmitteruistorage sendsendsendphone logsmake call accessdisplaypersist + .d2-183595053 .fill-N1{fill:#0A0F25;} + .d2-183595053 .fill-N2{fill:#676C7E;} + .d2-183595053 .fill-N3{fill:#9499AB;} + .d2-183595053 .fill-N4{fill:#CFD2DD;} + .d2-183595053 .fill-N5{fill:#DEE1EB;} + .d2-183595053 .fill-N6{fill:#EEF1F8;} + .d2-183595053 .fill-N7{fill:#FFFFFF;} + .d2-183595053 .fill-B1{fill:#0D32B2;} + .d2-183595053 .fill-B2{fill:#0D32B2;} + .d2-183595053 .fill-B3{fill:#E3E9FD;} + .d2-183595053 .fill-B4{fill:#E3E9FD;} + .d2-183595053 .fill-B5{fill:#EDF0FD;} + .d2-183595053 .fill-B6{fill:#F7F8FE;} + .d2-183595053 .fill-AA2{fill:#4A6FF3;} + .d2-183595053 .fill-AA4{fill:#EDF0FD;} + .d2-183595053 .fill-AA5{fill:#F7F8FE;} + .d2-183595053 .fill-AB4{fill:#EDF0FD;} + .d2-183595053 .fill-AB5{fill:#F7F8FE;} + .d2-183595053 .stroke-N1{stroke:#0A0F25;} + .d2-183595053 .stroke-N2{stroke:#676C7E;} + .d2-183595053 .stroke-N3{stroke:#9499AB;} + .d2-183595053 .stroke-N4{stroke:#CFD2DD;} + .d2-183595053 .stroke-N5{stroke:#DEE1EB;} + .d2-183595053 .stroke-N6{stroke:#EEF1F8;} + .d2-183595053 .stroke-N7{stroke:#FFFFFF;} + .d2-183595053 .stroke-B1{stroke:#0D32B2;} + .d2-183595053 .stroke-B2{stroke:#0D32B2;} + .d2-183595053 .stroke-B3{stroke:#E3E9FD;} + .d2-183595053 .stroke-B4{stroke:#E3E9FD;} + .d2-183595053 .stroke-B5{stroke:#EDF0FD;} + .d2-183595053 .stroke-B6{stroke:#F7F8FE;} + .d2-183595053 .stroke-AA2{stroke:#4A6FF3;} + .d2-183595053 .stroke-AA4{stroke:#EDF0FD;} + .d2-183595053 .stroke-AA5{stroke:#F7F8FE;} + .d2-183595053 .stroke-AB4{stroke:#EDF0FD;} + .d2-183595053 .stroke-AB5{stroke:#F7F8FE;} + .d2-183595053 .background-color-N1{background-color:#0A0F25;} + .d2-183595053 .background-color-N2{background-color:#676C7E;} + .d2-183595053 .background-color-N3{background-color:#9499AB;} + .d2-183595053 .background-color-N4{background-color:#CFD2DD;} + .d2-183595053 .background-color-N5{background-color:#DEE1EB;} + .d2-183595053 .background-color-N6{background-color:#EEF1F8;} + .d2-183595053 .background-color-N7{background-color:#FFFFFF;} + .d2-183595053 .background-color-B1{background-color:#0D32B2;} + .d2-183595053 .background-color-B2{background-color:#0D32B2;} + .d2-183595053 .background-color-B3{background-color:#E3E9FD;} + .d2-183595053 .background-color-B4{background-color:#E3E9FD;} + .d2-183595053 .background-color-B5{background-color:#EDF0FD;} + .d2-183595053 .background-color-B6{background-color:#F7F8FE;} + .d2-183595053 .background-color-AA2{background-color:#4A6FF3;} + .d2-183595053 .background-color-AA4{background-color:#EDF0FD;} + .d2-183595053 .background-color-AA5{background-color:#F7F8FE;} + .d2-183595053 .background-color-AB4{background-color:#EDF0FD;} + .d2-183595053 .background-color-AB5{background-color:#F7F8FE;} + .d2-183595053 .color-N1{color:#0A0F25;} + .d2-183595053 .color-N2{color:#676C7E;} + .d2-183595053 .color-N3{color:#9499AB;} + .d2-183595053 .color-N4{color:#CFD2DD;} + .d2-183595053 .color-N5{color:#DEE1EB;} + .d2-183595053 .color-N6{color:#EEF1F8;} + .d2-183595053 .color-N7{color:#FFFFFF;} + .d2-183595053 .color-B1{color:#0D32B2;} + .d2-183595053 .color-B2{color:#0D32B2;} + .d2-183595053 .color-B3{color:#E3E9FD;} + .d2-183595053 .color-B4{color:#E3E9FD;} + .d2-183595053 .color-B5{color:#EDF0FD;} + .d2-183595053 .color-B6{color:#F7F8FE;} + .d2-183595053 .color-AA2{color:#4A6FF3;} + .d2-183595053 .color-AA4{color:#EDF0FD;} + .d2-183595053 .color-AA5{color:#F7F8FE;} + .d2-183595053 .color-AB4{color:#EDF0FD;} + .d2-183595053 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-183595053);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-183595053);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-183595053);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-183595053);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-183595053);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-183595053);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-183595053);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-183595053);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-183595053);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-183595053);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-183595053);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-183595053);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-183595053);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-183595053);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-183595053);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-183595053);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-183595053);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-183595053);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>networkuserapi serverlogscell towerONLINE PORTALLLLdata processorsatellitestransmitteruistorage sendsendsendphone logsmake call accessdisplaypersist - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/elk_shim/elk/board.exp.json b/e2etests/testdata/stable/elk_shim/elk/board.exp.json index e70b9c475..8cfb97011 100644 --- a/e2etests/testdata/stable/elk_shim/elk/board.exp.json +++ b/e2etests/testdata/stable/elk_shim/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "AB4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -479,6 +498,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 143, @@ -517,6 +537,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 187, @@ -555,6 +576,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 231, @@ -593,6 +615,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 187, @@ -631,6 +654,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 254, @@ -677,6 +701,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 298, @@ -723,6 +748,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 420.0830078125, @@ -777,6 +803,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 400.75, @@ -815,6 +842,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 132.5, @@ -854,6 +882,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/elk_shim/elk/sketch.exp.svg b/e2etests/testdata/stable/elk_shim/elk/sketch.exp.svg index 59f88daf2..5050d66d5 100644 --- a/e2etests/testdata/stable/elk_shim/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/elk_shim/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -networkuserapi serverlogscell towerONLINE PORTALLLLdata processorsatellitestransmitteruistorage sendsendsendphone logsmake call accessdisplaypersist + .d2-2410870253 .fill-N1{fill:#0A0F25;} + .d2-2410870253 .fill-N2{fill:#676C7E;} + .d2-2410870253 .fill-N3{fill:#9499AB;} + .d2-2410870253 .fill-N4{fill:#CFD2DD;} + .d2-2410870253 .fill-N5{fill:#DEE1EB;} + .d2-2410870253 .fill-N6{fill:#EEF1F8;} + .d2-2410870253 .fill-N7{fill:#FFFFFF;} + .d2-2410870253 .fill-B1{fill:#0D32B2;} + .d2-2410870253 .fill-B2{fill:#0D32B2;} + .d2-2410870253 .fill-B3{fill:#E3E9FD;} + .d2-2410870253 .fill-B4{fill:#E3E9FD;} + .d2-2410870253 .fill-B5{fill:#EDF0FD;} + .d2-2410870253 .fill-B6{fill:#F7F8FE;} + .d2-2410870253 .fill-AA2{fill:#4A6FF3;} + .d2-2410870253 .fill-AA4{fill:#EDF0FD;} + .d2-2410870253 .fill-AA5{fill:#F7F8FE;} + .d2-2410870253 .fill-AB4{fill:#EDF0FD;} + .d2-2410870253 .fill-AB5{fill:#F7F8FE;} + .d2-2410870253 .stroke-N1{stroke:#0A0F25;} + .d2-2410870253 .stroke-N2{stroke:#676C7E;} + .d2-2410870253 .stroke-N3{stroke:#9499AB;} + .d2-2410870253 .stroke-N4{stroke:#CFD2DD;} + .d2-2410870253 .stroke-N5{stroke:#DEE1EB;} + .d2-2410870253 .stroke-N6{stroke:#EEF1F8;} + .d2-2410870253 .stroke-N7{stroke:#FFFFFF;} + .d2-2410870253 .stroke-B1{stroke:#0D32B2;} + .d2-2410870253 .stroke-B2{stroke:#0D32B2;} + .d2-2410870253 .stroke-B3{stroke:#E3E9FD;} + .d2-2410870253 .stroke-B4{stroke:#E3E9FD;} + .d2-2410870253 .stroke-B5{stroke:#EDF0FD;} + .d2-2410870253 .stroke-B6{stroke:#F7F8FE;} + .d2-2410870253 .stroke-AA2{stroke:#4A6FF3;} + .d2-2410870253 .stroke-AA4{stroke:#EDF0FD;} + .d2-2410870253 .stroke-AA5{stroke:#F7F8FE;} + .d2-2410870253 .stroke-AB4{stroke:#EDF0FD;} + .d2-2410870253 .stroke-AB5{stroke:#F7F8FE;} + .d2-2410870253 .background-color-N1{background-color:#0A0F25;} + .d2-2410870253 .background-color-N2{background-color:#676C7E;} + .d2-2410870253 .background-color-N3{background-color:#9499AB;} + .d2-2410870253 .background-color-N4{background-color:#CFD2DD;} + .d2-2410870253 .background-color-N5{background-color:#DEE1EB;} + .d2-2410870253 .background-color-N6{background-color:#EEF1F8;} + .d2-2410870253 .background-color-N7{background-color:#FFFFFF;} + .d2-2410870253 .background-color-B1{background-color:#0D32B2;} + .d2-2410870253 .background-color-B2{background-color:#0D32B2;} + .d2-2410870253 .background-color-B3{background-color:#E3E9FD;} + .d2-2410870253 .background-color-B4{background-color:#E3E9FD;} + .d2-2410870253 .background-color-B5{background-color:#EDF0FD;} + .d2-2410870253 .background-color-B6{background-color:#F7F8FE;} + .d2-2410870253 .background-color-AA2{background-color:#4A6FF3;} + .d2-2410870253 .background-color-AA4{background-color:#EDF0FD;} + .d2-2410870253 .background-color-AA5{background-color:#F7F8FE;} + .d2-2410870253 .background-color-AB4{background-color:#EDF0FD;} + .d2-2410870253 .background-color-AB5{background-color:#F7F8FE;} + .d2-2410870253 .color-N1{color:#0A0F25;} + .d2-2410870253 .color-N2{color:#676C7E;} + .d2-2410870253 .color-N3{color:#9499AB;} + .d2-2410870253 .color-N4{color:#CFD2DD;} + .d2-2410870253 .color-N5{color:#DEE1EB;} + .d2-2410870253 .color-N6{color:#EEF1F8;} + .d2-2410870253 .color-N7{color:#FFFFFF;} + .d2-2410870253 .color-B1{color:#0D32B2;} + .d2-2410870253 .color-B2{color:#0D32B2;} + .d2-2410870253 .color-B3{color:#E3E9FD;} + .d2-2410870253 .color-B4{color:#E3E9FD;} + .d2-2410870253 .color-B5{color:#EDF0FD;} + .d2-2410870253 .color-B6{color:#F7F8FE;} + .d2-2410870253 .color-AA2{color:#4A6FF3;} + .d2-2410870253 .color-AA4{color:#EDF0FD;} + .d2-2410870253 .color-AA5{color:#F7F8FE;} + .d2-2410870253 .color-AB4{color:#EDF0FD;} + .d2-2410870253 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2410870253);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2410870253);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2410870253);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2410870253);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2410870253);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2410870253);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2410870253);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2410870253);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2410870253);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2410870253);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2410870253);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2410870253);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2410870253);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2410870253);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2410870253);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2410870253);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2410870253);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2410870253);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>networkuserapi serverlogscell towerONLINE PORTALLLLdata processorsatellitestransmitteruistorage sendsendsendphone logsmake call accessdisplaypersist - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/ent2d2_basic/dagre/board.exp.json b/e2etests/testdata/stable/ent2d2_basic/dagre/board.exp.json index 50be0ee60..a99cd50e2 100644 --- a/e2etests/testdata/stable/ent2d2_basic/dagre/board.exp.json +++ b/e2etests/testdata/stable/ent2d2_basic/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -152,6 +161,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -256,6 +266,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -360,6 +371,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -492,6 +504,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -594,6 +607,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -706,6 +720,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 719.8330078125, @@ -789,6 +804,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 720.166015625, @@ -872,6 +888,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 518.5, @@ -919,6 +936,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 518.5, @@ -966,6 +984,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 619, @@ -1013,6 +1032,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 720.5, @@ -1060,6 +1080,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 720.5, @@ -1100,6 +1121,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/ent2d2_basic/dagre/sketch.exp.svg b/e2etests/testdata/stable/ent2d2_basic/dagre/sketch.exp.svg index 1f00dbe62..a269d3d91 100644 --- a/e2etests/testdata/stable/ent2d2_basic/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/ent2d2_basic/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spouse children/parent/ancestorpets/ownercard/ownerposts/authormetadata/userinfo/user + .d2-1567609802 .fill-N1{fill:#0A0F25;} + .d2-1567609802 .fill-N2{fill:#676C7E;} + .d2-1567609802 .fill-N3{fill:#9499AB;} + .d2-1567609802 .fill-N4{fill:#CFD2DD;} + .d2-1567609802 .fill-N5{fill:#DEE1EB;} + .d2-1567609802 .fill-N6{fill:#EEF1F8;} + .d2-1567609802 .fill-N7{fill:#FFFFFF;} + .d2-1567609802 .fill-B1{fill:#0D32B2;} + .d2-1567609802 .fill-B2{fill:#0D32B2;} + .d2-1567609802 .fill-B3{fill:#E3E9FD;} + .d2-1567609802 .fill-B4{fill:#E3E9FD;} + .d2-1567609802 .fill-B5{fill:#EDF0FD;} + .d2-1567609802 .fill-B6{fill:#F7F8FE;} + .d2-1567609802 .fill-AA2{fill:#4A6FF3;} + .d2-1567609802 .fill-AA4{fill:#EDF0FD;} + .d2-1567609802 .fill-AA5{fill:#F7F8FE;} + .d2-1567609802 .fill-AB4{fill:#EDF0FD;} + .d2-1567609802 .fill-AB5{fill:#F7F8FE;} + .d2-1567609802 .stroke-N1{stroke:#0A0F25;} + .d2-1567609802 .stroke-N2{stroke:#676C7E;} + .d2-1567609802 .stroke-N3{stroke:#9499AB;} + .d2-1567609802 .stroke-N4{stroke:#CFD2DD;} + .d2-1567609802 .stroke-N5{stroke:#DEE1EB;} + .d2-1567609802 .stroke-N6{stroke:#EEF1F8;} + .d2-1567609802 .stroke-N7{stroke:#FFFFFF;} + .d2-1567609802 .stroke-B1{stroke:#0D32B2;} + .d2-1567609802 .stroke-B2{stroke:#0D32B2;} + .d2-1567609802 .stroke-B3{stroke:#E3E9FD;} + .d2-1567609802 .stroke-B4{stroke:#E3E9FD;} + .d2-1567609802 .stroke-B5{stroke:#EDF0FD;} + .d2-1567609802 .stroke-B6{stroke:#F7F8FE;} + .d2-1567609802 .stroke-AA2{stroke:#4A6FF3;} + .d2-1567609802 .stroke-AA4{stroke:#EDF0FD;} + .d2-1567609802 .stroke-AA5{stroke:#F7F8FE;} + .d2-1567609802 .stroke-AB4{stroke:#EDF0FD;} + .d2-1567609802 .stroke-AB5{stroke:#F7F8FE;} + .d2-1567609802 .background-color-N1{background-color:#0A0F25;} + .d2-1567609802 .background-color-N2{background-color:#676C7E;} + .d2-1567609802 .background-color-N3{background-color:#9499AB;} + .d2-1567609802 .background-color-N4{background-color:#CFD2DD;} + .d2-1567609802 .background-color-N5{background-color:#DEE1EB;} + .d2-1567609802 .background-color-N6{background-color:#EEF1F8;} + .d2-1567609802 .background-color-N7{background-color:#FFFFFF;} + .d2-1567609802 .background-color-B1{background-color:#0D32B2;} + .d2-1567609802 .background-color-B2{background-color:#0D32B2;} + .d2-1567609802 .background-color-B3{background-color:#E3E9FD;} + .d2-1567609802 .background-color-B4{background-color:#E3E9FD;} + .d2-1567609802 .background-color-B5{background-color:#EDF0FD;} + .d2-1567609802 .background-color-B6{background-color:#F7F8FE;} + .d2-1567609802 .background-color-AA2{background-color:#4A6FF3;} + .d2-1567609802 .background-color-AA4{background-color:#EDF0FD;} + .d2-1567609802 .background-color-AA5{background-color:#F7F8FE;} + .d2-1567609802 .background-color-AB4{background-color:#EDF0FD;} + .d2-1567609802 .background-color-AB5{background-color:#F7F8FE;} + .d2-1567609802 .color-N1{color:#0A0F25;} + .d2-1567609802 .color-N2{color:#676C7E;} + .d2-1567609802 .color-N3{color:#9499AB;} + .d2-1567609802 .color-N4{color:#CFD2DD;} + .d2-1567609802 .color-N5{color:#DEE1EB;} + .d2-1567609802 .color-N6{color:#EEF1F8;} + .d2-1567609802 .color-N7{color:#FFFFFF;} + .d2-1567609802 .color-B1{color:#0D32B2;} + .d2-1567609802 .color-B2{color:#0D32B2;} + .d2-1567609802 .color-B3{color:#E3E9FD;} + .d2-1567609802 .color-B4{color:#E3E9FD;} + .d2-1567609802 .color-B5{color:#EDF0FD;} + .d2-1567609802 .color-B6{color:#F7F8FE;} + .d2-1567609802 .color-AA2{color:#4A6FF3;} + .d2-1567609802 .color-AA4{color:#EDF0FD;} + .d2-1567609802 .color-AA5{color:#F7F8FE;} + .d2-1567609802 .color-AB4{color:#EDF0FD;} + .d2-1567609802 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1567609802);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1567609802);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1567609802);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1567609802);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1567609802);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1567609802);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1567609802);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1567609802);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1567609802);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1567609802);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1567609802);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1567609802);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1567609802);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1567609802);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1567609802);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1567609802);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1567609802);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1567609802);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spouse children/parent/ancestorpets/ownercard/ownerposts/authormetadata/userinfo/user - - - - - - - + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/ent2d2_basic/elk/board.exp.json b/e2etests/testdata/stable/ent2d2_basic/elk/board.exp.json index 296c132a9..f0dbcba28 100644 --- a/e2etests/testdata/stable/ent2d2_basic/elk/board.exp.json +++ b/e2etests/testdata/stable/ent2d2_basic/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -152,6 +161,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -256,6 +266,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -360,6 +371,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -492,6 +504,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -594,6 +607,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -706,6 +720,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 411, @@ -760,6 +775,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 446, @@ -814,6 +830,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 481, @@ -860,6 +877,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 516, @@ -906,6 +924,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 551, @@ -944,6 +963,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 586, @@ -990,6 +1010,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 621, @@ -1029,6 +1050,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/ent2d2_basic/elk/sketch.exp.svg b/e2etests/testdata/stable/ent2d2_basic/elk/sketch.exp.svg index 0485d747c..ca4901cb9 100644 --- a/e2etests/testdata/stable/ent2d2_basic/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/ent2d2_basic/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spouse children/parent/ancestorpets/ownercard/ownerposts/authormetadata/userinfo/user + .d2-4104069460 .fill-N1{fill:#0A0F25;} + .d2-4104069460 .fill-N2{fill:#676C7E;} + .d2-4104069460 .fill-N3{fill:#9499AB;} + .d2-4104069460 .fill-N4{fill:#CFD2DD;} + .d2-4104069460 .fill-N5{fill:#DEE1EB;} + .d2-4104069460 .fill-N6{fill:#EEF1F8;} + .d2-4104069460 .fill-N7{fill:#FFFFFF;} + .d2-4104069460 .fill-B1{fill:#0D32B2;} + .d2-4104069460 .fill-B2{fill:#0D32B2;} + .d2-4104069460 .fill-B3{fill:#E3E9FD;} + .d2-4104069460 .fill-B4{fill:#E3E9FD;} + .d2-4104069460 .fill-B5{fill:#EDF0FD;} + .d2-4104069460 .fill-B6{fill:#F7F8FE;} + .d2-4104069460 .fill-AA2{fill:#4A6FF3;} + .d2-4104069460 .fill-AA4{fill:#EDF0FD;} + .d2-4104069460 .fill-AA5{fill:#F7F8FE;} + .d2-4104069460 .fill-AB4{fill:#EDF0FD;} + .d2-4104069460 .fill-AB5{fill:#F7F8FE;} + .d2-4104069460 .stroke-N1{stroke:#0A0F25;} + .d2-4104069460 .stroke-N2{stroke:#676C7E;} + .d2-4104069460 .stroke-N3{stroke:#9499AB;} + .d2-4104069460 .stroke-N4{stroke:#CFD2DD;} + .d2-4104069460 .stroke-N5{stroke:#DEE1EB;} + .d2-4104069460 .stroke-N6{stroke:#EEF1F8;} + .d2-4104069460 .stroke-N7{stroke:#FFFFFF;} + .d2-4104069460 .stroke-B1{stroke:#0D32B2;} + .d2-4104069460 .stroke-B2{stroke:#0D32B2;} + .d2-4104069460 .stroke-B3{stroke:#E3E9FD;} + .d2-4104069460 .stroke-B4{stroke:#E3E9FD;} + .d2-4104069460 .stroke-B5{stroke:#EDF0FD;} + .d2-4104069460 .stroke-B6{stroke:#F7F8FE;} + .d2-4104069460 .stroke-AA2{stroke:#4A6FF3;} + .d2-4104069460 .stroke-AA4{stroke:#EDF0FD;} + .d2-4104069460 .stroke-AA5{stroke:#F7F8FE;} + .d2-4104069460 .stroke-AB4{stroke:#EDF0FD;} + .d2-4104069460 .stroke-AB5{stroke:#F7F8FE;} + .d2-4104069460 .background-color-N1{background-color:#0A0F25;} + .d2-4104069460 .background-color-N2{background-color:#676C7E;} + .d2-4104069460 .background-color-N3{background-color:#9499AB;} + .d2-4104069460 .background-color-N4{background-color:#CFD2DD;} + .d2-4104069460 .background-color-N5{background-color:#DEE1EB;} + .d2-4104069460 .background-color-N6{background-color:#EEF1F8;} + .d2-4104069460 .background-color-N7{background-color:#FFFFFF;} + .d2-4104069460 .background-color-B1{background-color:#0D32B2;} + .d2-4104069460 .background-color-B2{background-color:#0D32B2;} + .d2-4104069460 .background-color-B3{background-color:#E3E9FD;} + .d2-4104069460 .background-color-B4{background-color:#E3E9FD;} + .d2-4104069460 .background-color-B5{background-color:#EDF0FD;} + .d2-4104069460 .background-color-B6{background-color:#F7F8FE;} + .d2-4104069460 .background-color-AA2{background-color:#4A6FF3;} + .d2-4104069460 .background-color-AA4{background-color:#EDF0FD;} + .d2-4104069460 .background-color-AA5{background-color:#F7F8FE;} + .d2-4104069460 .background-color-AB4{background-color:#EDF0FD;} + .d2-4104069460 .background-color-AB5{background-color:#F7F8FE;} + .d2-4104069460 .color-N1{color:#0A0F25;} + .d2-4104069460 .color-N2{color:#676C7E;} + .d2-4104069460 .color-N3{color:#9499AB;} + .d2-4104069460 .color-N4{color:#CFD2DD;} + .d2-4104069460 .color-N5{color:#DEE1EB;} + .d2-4104069460 .color-N6{color:#EEF1F8;} + .d2-4104069460 .color-N7{color:#FFFFFF;} + .d2-4104069460 .color-B1{color:#0D32B2;} + .d2-4104069460 .color-B2{color:#0D32B2;} + .d2-4104069460 .color-B3{color:#E3E9FD;} + .d2-4104069460 .color-B4{color:#E3E9FD;} + .d2-4104069460 .color-B5{color:#EDF0FD;} + .d2-4104069460 .color-B6{color:#F7F8FE;} + .d2-4104069460 .color-AA2{color:#4A6FF3;} + .d2-4104069460 .color-AA4{color:#EDF0FD;} + .d2-4104069460 .color-AA5{color:#F7F8FE;} + .d2-4104069460 .color-AB4{color:#EDF0FD;} + .d2-4104069460 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4104069460);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4104069460);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4104069460);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4104069460);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4104069460);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4104069460);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4104069460);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4104069460);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4104069460);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4104069460);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4104069460);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4104069460);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4104069460);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4104069460);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4104069460);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4104069460);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4104069460);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4104069460);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spouse children/parent/ancestorpets/ownercard/ownerposts/authormetadata/userinfo/user - - - - - - - + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/ent2d2_right/dagre/board.exp.json b/e2etests/testdata/stable/ent2d2_right/dagre/board.exp.json index 04c9f6208..479494c8d 100644 --- a/e2etests/testdata/stable/ent2d2_right/dagre/board.exp.json +++ b/e2etests/testdata/stable/ent2d2_right/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -152,6 +161,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -256,6 +266,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -360,6 +371,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -492,6 +504,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -594,6 +607,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -706,6 +720,7 @@ "labelHeight": 37, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 39, @@ -789,6 +804,7 @@ "labelHeight": 85, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 61, @@ -872,6 +888,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 146, @@ -919,6 +936,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 186, @@ -966,6 +984,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 201, @@ -1013,6 +1032,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 186, @@ -1060,6 +1080,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 146, @@ -1100,6 +1121,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/ent2d2_right/dagre/sketch.exp.svg b/e2etests/testdata/stable/ent2d2_right/dagre/sketch.exp.svg index 3c145cf3e..3b4165a6e 100644 --- a/e2etests/testdata/stable/ent2d2_right/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/ent2d2_right/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spousespouse childrenparentyowhoaheypets/ownercard/ownerposts/authormetadata/userinfo/user + .d2-4184542223 .fill-N1{fill:#0A0F25;} + .d2-4184542223 .fill-N2{fill:#676C7E;} + .d2-4184542223 .fill-N3{fill:#9499AB;} + .d2-4184542223 .fill-N4{fill:#CFD2DD;} + .d2-4184542223 .fill-N5{fill:#DEE1EB;} + .d2-4184542223 .fill-N6{fill:#EEF1F8;} + .d2-4184542223 .fill-N7{fill:#FFFFFF;} + .d2-4184542223 .fill-B1{fill:#0D32B2;} + .d2-4184542223 .fill-B2{fill:#0D32B2;} + .d2-4184542223 .fill-B3{fill:#E3E9FD;} + .d2-4184542223 .fill-B4{fill:#E3E9FD;} + .d2-4184542223 .fill-B5{fill:#EDF0FD;} + .d2-4184542223 .fill-B6{fill:#F7F8FE;} + .d2-4184542223 .fill-AA2{fill:#4A6FF3;} + .d2-4184542223 .fill-AA4{fill:#EDF0FD;} + .d2-4184542223 .fill-AA5{fill:#F7F8FE;} + .d2-4184542223 .fill-AB4{fill:#EDF0FD;} + .d2-4184542223 .fill-AB5{fill:#F7F8FE;} + .d2-4184542223 .stroke-N1{stroke:#0A0F25;} + .d2-4184542223 .stroke-N2{stroke:#676C7E;} + .d2-4184542223 .stroke-N3{stroke:#9499AB;} + .d2-4184542223 .stroke-N4{stroke:#CFD2DD;} + .d2-4184542223 .stroke-N5{stroke:#DEE1EB;} + .d2-4184542223 .stroke-N6{stroke:#EEF1F8;} + .d2-4184542223 .stroke-N7{stroke:#FFFFFF;} + .d2-4184542223 .stroke-B1{stroke:#0D32B2;} + .d2-4184542223 .stroke-B2{stroke:#0D32B2;} + .d2-4184542223 .stroke-B3{stroke:#E3E9FD;} + .d2-4184542223 .stroke-B4{stroke:#E3E9FD;} + .d2-4184542223 .stroke-B5{stroke:#EDF0FD;} + .d2-4184542223 .stroke-B6{stroke:#F7F8FE;} + .d2-4184542223 .stroke-AA2{stroke:#4A6FF3;} + .d2-4184542223 .stroke-AA4{stroke:#EDF0FD;} + .d2-4184542223 .stroke-AA5{stroke:#F7F8FE;} + .d2-4184542223 .stroke-AB4{stroke:#EDF0FD;} + .d2-4184542223 .stroke-AB5{stroke:#F7F8FE;} + .d2-4184542223 .background-color-N1{background-color:#0A0F25;} + .d2-4184542223 .background-color-N2{background-color:#676C7E;} + .d2-4184542223 .background-color-N3{background-color:#9499AB;} + .d2-4184542223 .background-color-N4{background-color:#CFD2DD;} + .d2-4184542223 .background-color-N5{background-color:#DEE1EB;} + .d2-4184542223 .background-color-N6{background-color:#EEF1F8;} + .d2-4184542223 .background-color-N7{background-color:#FFFFFF;} + .d2-4184542223 .background-color-B1{background-color:#0D32B2;} + .d2-4184542223 .background-color-B2{background-color:#0D32B2;} + .d2-4184542223 .background-color-B3{background-color:#E3E9FD;} + .d2-4184542223 .background-color-B4{background-color:#E3E9FD;} + .d2-4184542223 .background-color-B5{background-color:#EDF0FD;} + .d2-4184542223 .background-color-B6{background-color:#F7F8FE;} + .d2-4184542223 .background-color-AA2{background-color:#4A6FF3;} + .d2-4184542223 .background-color-AA4{background-color:#EDF0FD;} + .d2-4184542223 .background-color-AA5{background-color:#F7F8FE;} + .d2-4184542223 .background-color-AB4{background-color:#EDF0FD;} + .d2-4184542223 .background-color-AB5{background-color:#F7F8FE;} + .d2-4184542223 .color-N1{color:#0A0F25;} + .d2-4184542223 .color-N2{color:#676C7E;} + .d2-4184542223 .color-N3{color:#9499AB;} + .d2-4184542223 .color-N4{color:#CFD2DD;} + .d2-4184542223 .color-N5{color:#DEE1EB;} + .d2-4184542223 .color-N6{color:#EEF1F8;} + .d2-4184542223 .color-N7{color:#FFFFFF;} + .d2-4184542223 .color-B1{color:#0D32B2;} + .d2-4184542223 .color-B2{color:#0D32B2;} + .d2-4184542223 .color-B3{color:#E3E9FD;} + .d2-4184542223 .color-B4{color:#E3E9FD;} + .d2-4184542223 .color-B5{color:#EDF0FD;} + .d2-4184542223 .color-B6{color:#F7F8FE;} + .d2-4184542223 .color-AA2{color:#4A6FF3;} + .d2-4184542223 .color-AA4{color:#EDF0FD;} + .d2-4184542223 .color-AA5{color:#F7F8FE;} + .d2-4184542223 .color-AB4{color:#EDF0FD;} + .d2-4184542223 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4184542223);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4184542223);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4184542223);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4184542223);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4184542223);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4184542223);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4184542223);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4184542223);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4184542223);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4184542223);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4184542223);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4184542223);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4184542223);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4184542223);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4184542223);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4184542223);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4184542223);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4184542223);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spousespouse childrenparentyowhoaheypets/ownercard/ownerposts/authormetadata/userinfo/user - - - - - - - + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/ent2d2_right/elk/board.exp.json b/e2etests/testdata/stable/ent2d2_right/elk/board.exp.json index 498bfb706..e2df0a061 100644 --- a/e2etests/testdata/stable/ent2d2_right/elk/board.exp.json +++ b/e2etests/testdata/stable/ent2d2_right/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -152,6 +161,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -256,6 +266,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -360,6 +371,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -492,6 +504,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -594,6 +607,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -706,6 +720,7 @@ "labelHeight": 37, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 97.125, @@ -760,6 +775,7 @@ "labelHeight": 85, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 122.25, @@ -814,6 +830,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 147.375, @@ -860,6 +877,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 172.5, @@ -906,6 +924,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 197.625, @@ -952,6 +971,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 222.75, @@ -998,6 +1018,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 247.875, @@ -1037,6 +1058,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/ent2d2_right/elk/sketch.exp.svg b/e2etests/testdata/stable/ent2d2_right/elk/sketch.exp.svg index 3e36c3d74..ce8e3c160 100644 --- a/e2etests/testdata/stable/ent2d2_right/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/ent2d2_right/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spousespouse childrenparentyowhoaheypets/ownercard/ownerposts/authormetadata/userinfo/user + .d2-1569576663 .fill-N1{fill:#0A0F25;} + .d2-1569576663 .fill-N2{fill:#676C7E;} + .d2-1569576663 .fill-N3{fill:#9499AB;} + .d2-1569576663 .fill-N4{fill:#CFD2DD;} + .d2-1569576663 .fill-N5{fill:#DEE1EB;} + .d2-1569576663 .fill-N6{fill:#EEF1F8;} + .d2-1569576663 .fill-N7{fill:#FFFFFF;} + .d2-1569576663 .fill-B1{fill:#0D32B2;} + .d2-1569576663 .fill-B2{fill:#0D32B2;} + .d2-1569576663 .fill-B3{fill:#E3E9FD;} + .d2-1569576663 .fill-B4{fill:#E3E9FD;} + .d2-1569576663 .fill-B5{fill:#EDF0FD;} + .d2-1569576663 .fill-B6{fill:#F7F8FE;} + .d2-1569576663 .fill-AA2{fill:#4A6FF3;} + .d2-1569576663 .fill-AA4{fill:#EDF0FD;} + .d2-1569576663 .fill-AA5{fill:#F7F8FE;} + .d2-1569576663 .fill-AB4{fill:#EDF0FD;} + .d2-1569576663 .fill-AB5{fill:#F7F8FE;} + .d2-1569576663 .stroke-N1{stroke:#0A0F25;} + .d2-1569576663 .stroke-N2{stroke:#676C7E;} + .d2-1569576663 .stroke-N3{stroke:#9499AB;} + .d2-1569576663 .stroke-N4{stroke:#CFD2DD;} + .d2-1569576663 .stroke-N5{stroke:#DEE1EB;} + .d2-1569576663 .stroke-N6{stroke:#EEF1F8;} + .d2-1569576663 .stroke-N7{stroke:#FFFFFF;} + .d2-1569576663 .stroke-B1{stroke:#0D32B2;} + .d2-1569576663 .stroke-B2{stroke:#0D32B2;} + .d2-1569576663 .stroke-B3{stroke:#E3E9FD;} + .d2-1569576663 .stroke-B4{stroke:#E3E9FD;} + .d2-1569576663 .stroke-B5{stroke:#EDF0FD;} + .d2-1569576663 .stroke-B6{stroke:#F7F8FE;} + .d2-1569576663 .stroke-AA2{stroke:#4A6FF3;} + .d2-1569576663 .stroke-AA4{stroke:#EDF0FD;} + .d2-1569576663 .stroke-AA5{stroke:#F7F8FE;} + .d2-1569576663 .stroke-AB4{stroke:#EDF0FD;} + .d2-1569576663 .stroke-AB5{stroke:#F7F8FE;} + .d2-1569576663 .background-color-N1{background-color:#0A0F25;} + .d2-1569576663 .background-color-N2{background-color:#676C7E;} + .d2-1569576663 .background-color-N3{background-color:#9499AB;} + .d2-1569576663 .background-color-N4{background-color:#CFD2DD;} + .d2-1569576663 .background-color-N5{background-color:#DEE1EB;} + .d2-1569576663 .background-color-N6{background-color:#EEF1F8;} + .d2-1569576663 .background-color-N7{background-color:#FFFFFF;} + .d2-1569576663 .background-color-B1{background-color:#0D32B2;} + .d2-1569576663 .background-color-B2{background-color:#0D32B2;} + .d2-1569576663 .background-color-B3{background-color:#E3E9FD;} + .d2-1569576663 .background-color-B4{background-color:#E3E9FD;} + .d2-1569576663 .background-color-B5{background-color:#EDF0FD;} + .d2-1569576663 .background-color-B6{background-color:#F7F8FE;} + .d2-1569576663 .background-color-AA2{background-color:#4A6FF3;} + .d2-1569576663 .background-color-AA4{background-color:#EDF0FD;} + .d2-1569576663 .background-color-AA5{background-color:#F7F8FE;} + .d2-1569576663 .background-color-AB4{background-color:#EDF0FD;} + .d2-1569576663 .background-color-AB5{background-color:#F7F8FE;} + .d2-1569576663 .color-N1{color:#0A0F25;} + .d2-1569576663 .color-N2{color:#676C7E;} + .d2-1569576663 .color-N3{color:#9499AB;} + .d2-1569576663 .color-N4{color:#CFD2DD;} + .d2-1569576663 .color-N5{color:#DEE1EB;} + .d2-1569576663 .color-N6{color:#EEF1F8;} + .d2-1569576663 .color-N7{color:#FFFFFF;} + .d2-1569576663 .color-B1{color:#0D32B2;} + .d2-1569576663 .color-B2{color:#0D32B2;} + .d2-1569576663 .color-B3{color:#E3E9FD;} + .d2-1569576663 .color-B4{color:#E3E9FD;} + .d2-1569576663 .color-B5{color:#EDF0FD;} + .d2-1569576663 .color-B6{color:#F7F8FE;} + .d2-1569576663 .color-AA2{color:#4A6FF3;} + .d2-1569576663 .color-AA4{color:#EDF0FD;} + .d2-1569576663 .color-AA5{color:#F7F8FE;} + .d2-1569576663 .color-AB4{color:#EDF0FD;} + .d2-1569576663 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1569576663);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1569576663);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1569576663);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1569576663);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1569576663);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1569576663);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1569576663);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1569576663);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1569576663);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1569576663);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1569576663);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1569576663);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1569576663);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1569576663);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1569576663);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1569576663);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1569576663);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1569576663);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spousespouse childrenparentyowhoaheypets/ownercard/ownerposts/authormetadata/userinfo/user - - - - - - - + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/executive_grid/dagre/board.exp.json b/e2etests/testdata/stable/executive_grid/dagre/board.exp.json index 6ec7a989f..72b55ee8c 100644 --- a/e2etests/testdata/stable/executive_grid/dagre/board.exp.json +++ b/e2etests/testdata/stable/executive_grid/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -430,6 +448,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/executive_grid/dagre/sketch.exp.svg b/e2etests/testdata/stable/executive_grid/dagre/sketch.exp.svg index ed45459be..536f3815a 100644 --- a/e2etests/testdata/stable/executive_grid/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/executive_grid/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -Executive ServicesI/OManagerSecurityReferenceMonitorIPCManagerVirtualMemoryManager(VMM)ProcessManagerPnPManagerPowerManagerWindowManager GDIObject Manager + .d2-228003089 .fill-N1{fill:#0A0F25;} + .d2-228003089 .fill-N2{fill:#676C7E;} + .d2-228003089 .fill-N3{fill:#9499AB;} + .d2-228003089 .fill-N4{fill:#CFD2DD;} + .d2-228003089 .fill-N5{fill:#DEE1EB;} + .d2-228003089 .fill-N6{fill:#EEF1F8;} + .d2-228003089 .fill-N7{fill:#FFFFFF;} + .d2-228003089 .fill-B1{fill:#0D32B2;} + .d2-228003089 .fill-B2{fill:#0D32B2;} + .d2-228003089 .fill-B3{fill:#E3E9FD;} + .d2-228003089 .fill-B4{fill:#E3E9FD;} + .d2-228003089 .fill-B5{fill:#EDF0FD;} + .d2-228003089 .fill-B6{fill:#F7F8FE;} + .d2-228003089 .fill-AA2{fill:#4A6FF3;} + .d2-228003089 .fill-AA4{fill:#EDF0FD;} + .d2-228003089 .fill-AA5{fill:#F7F8FE;} + .d2-228003089 .fill-AB4{fill:#EDF0FD;} + .d2-228003089 .fill-AB5{fill:#F7F8FE;} + .d2-228003089 .stroke-N1{stroke:#0A0F25;} + .d2-228003089 .stroke-N2{stroke:#676C7E;} + .d2-228003089 .stroke-N3{stroke:#9499AB;} + .d2-228003089 .stroke-N4{stroke:#CFD2DD;} + .d2-228003089 .stroke-N5{stroke:#DEE1EB;} + .d2-228003089 .stroke-N6{stroke:#EEF1F8;} + .d2-228003089 .stroke-N7{stroke:#FFFFFF;} + .d2-228003089 .stroke-B1{stroke:#0D32B2;} + .d2-228003089 .stroke-B2{stroke:#0D32B2;} + .d2-228003089 .stroke-B3{stroke:#E3E9FD;} + .d2-228003089 .stroke-B4{stroke:#E3E9FD;} + .d2-228003089 .stroke-B5{stroke:#EDF0FD;} + .d2-228003089 .stroke-B6{stroke:#F7F8FE;} + .d2-228003089 .stroke-AA2{stroke:#4A6FF3;} + .d2-228003089 .stroke-AA4{stroke:#EDF0FD;} + .d2-228003089 .stroke-AA5{stroke:#F7F8FE;} + .d2-228003089 .stroke-AB4{stroke:#EDF0FD;} + .d2-228003089 .stroke-AB5{stroke:#F7F8FE;} + .d2-228003089 .background-color-N1{background-color:#0A0F25;} + .d2-228003089 .background-color-N2{background-color:#676C7E;} + .d2-228003089 .background-color-N3{background-color:#9499AB;} + .d2-228003089 .background-color-N4{background-color:#CFD2DD;} + .d2-228003089 .background-color-N5{background-color:#DEE1EB;} + .d2-228003089 .background-color-N6{background-color:#EEF1F8;} + .d2-228003089 .background-color-N7{background-color:#FFFFFF;} + .d2-228003089 .background-color-B1{background-color:#0D32B2;} + .d2-228003089 .background-color-B2{background-color:#0D32B2;} + .d2-228003089 .background-color-B3{background-color:#E3E9FD;} + .d2-228003089 .background-color-B4{background-color:#E3E9FD;} + .d2-228003089 .background-color-B5{background-color:#EDF0FD;} + .d2-228003089 .background-color-B6{background-color:#F7F8FE;} + .d2-228003089 .background-color-AA2{background-color:#4A6FF3;} + .d2-228003089 .background-color-AA4{background-color:#EDF0FD;} + .d2-228003089 .background-color-AA5{background-color:#F7F8FE;} + .d2-228003089 .background-color-AB4{background-color:#EDF0FD;} + .d2-228003089 .background-color-AB5{background-color:#F7F8FE;} + .d2-228003089 .color-N1{color:#0A0F25;} + .d2-228003089 .color-N2{color:#676C7E;} + .d2-228003089 .color-N3{color:#9499AB;} + .d2-228003089 .color-N4{color:#CFD2DD;} + .d2-228003089 .color-N5{color:#DEE1EB;} + .d2-228003089 .color-N6{color:#EEF1F8;} + .d2-228003089 .color-N7{color:#FFFFFF;} + .d2-228003089 .color-B1{color:#0D32B2;} + .d2-228003089 .color-B2{color:#0D32B2;} + .d2-228003089 .color-B3{color:#E3E9FD;} + .d2-228003089 .color-B4{color:#E3E9FD;} + .d2-228003089 .color-B5{color:#EDF0FD;} + .d2-228003089 .color-B6{color:#F7F8FE;} + .d2-228003089 .color-AA2{color:#4A6FF3;} + .d2-228003089 .color-AA4{color:#EDF0FD;} + .d2-228003089 .color-AA5{color:#F7F8FE;} + .d2-228003089 .color-AB4{color:#EDF0FD;} + .d2-228003089 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-228003089);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-228003089);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-228003089);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-228003089);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-228003089);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-228003089);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-228003089);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-228003089);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-228003089);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-228003089);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-228003089);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-228003089);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-228003089);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-228003089);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-228003089);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-228003089);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-228003089);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-228003089);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>Executive ServicesI/OManagerSecurityReferenceMonitorIPCManagerVirtualMemoryManager(VMM)ProcessManagerPnPManagerPowerManagerWindowManager GDIObject Manager - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/executive_grid/elk/board.exp.json b/e2etests/testdata/stable/executive_grid/elk/board.exp.json index 6ec7a989f..72b55ee8c 100644 --- a/e2etests/testdata/stable/executive_grid/elk/board.exp.json +++ b/e2etests/testdata/stable/executive_grid/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -430,6 +448,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/executive_grid/elk/sketch.exp.svg b/e2etests/testdata/stable/executive_grid/elk/sketch.exp.svg index ed45459be..536f3815a 100644 --- a/e2etests/testdata/stable/executive_grid/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/executive_grid/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -Executive ServicesI/OManagerSecurityReferenceMonitorIPCManagerVirtualMemoryManager(VMM)ProcessManagerPnPManagerPowerManagerWindowManager GDIObject Manager + .d2-228003089 .fill-N1{fill:#0A0F25;} + .d2-228003089 .fill-N2{fill:#676C7E;} + .d2-228003089 .fill-N3{fill:#9499AB;} + .d2-228003089 .fill-N4{fill:#CFD2DD;} + .d2-228003089 .fill-N5{fill:#DEE1EB;} + .d2-228003089 .fill-N6{fill:#EEF1F8;} + .d2-228003089 .fill-N7{fill:#FFFFFF;} + .d2-228003089 .fill-B1{fill:#0D32B2;} + .d2-228003089 .fill-B2{fill:#0D32B2;} + .d2-228003089 .fill-B3{fill:#E3E9FD;} + .d2-228003089 .fill-B4{fill:#E3E9FD;} + .d2-228003089 .fill-B5{fill:#EDF0FD;} + .d2-228003089 .fill-B6{fill:#F7F8FE;} + .d2-228003089 .fill-AA2{fill:#4A6FF3;} + .d2-228003089 .fill-AA4{fill:#EDF0FD;} + .d2-228003089 .fill-AA5{fill:#F7F8FE;} + .d2-228003089 .fill-AB4{fill:#EDF0FD;} + .d2-228003089 .fill-AB5{fill:#F7F8FE;} + .d2-228003089 .stroke-N1{stroke:#0A0F25;} + .d2-228003089 .stroke-N2{stroke:#676C7E;} + .d2-228003089 .stroke-N3{stroke:#9499AB;} + .d2-228003089 .stroke-N4{stroke:#CFD2DD;} + .d2-228003089 .stroke-N5{stroke:#DEE1EB;} + .d2-228003089 .stroke-N6{stroke:#EEF1F8;} + .d2-228003089 .stroke-N7{stroke:#FFFFFF;} + .d2-228003089 .stroke-B1{stroke:#0D32B2;} + .d2-228003089 .stroke-B2{stroke:#0D32B2;} + .d2-228003089 .stroke-B3{stroke:#E3E9FD;} + .d2-228003089 .stroke-B4{stroke:#E3E9FD;} + .d2-228003089 .stroke-B5{stroke:#EDF0FD;} + .d2-228003089 .stroke-B6{stroke:#F7F8FE;} + .d2-228003089 .stroke-AA2{stroke:#4A6FF3;} + .d2-228003089 .stroke-AA4{stroke:#EDF0FD;} + .d2-228003089 .stroke-AA5{stroke:#F7F8FE;} + .d2-228003089 .stroke-AB4{stroke:#EDF0FD;} + .d2-228003089 .stroke-AB5{stroke:#F7F8FE;} + .d2-228003089 .background-color-N1{background-color:#0A0F25;} + .d2-228003089 .background-color-N2{background-color:#676C7E;} + .d2-228003089 .background-color-N3{background-color:#9499AB;} + .d2-228003089 .background-color-N4{background-color:#CFD2DD;} + .d2-228003089 .background-color-N5{background-color:#DEE1EB;} + .d2-228003089 .background-color-N6{background-color:#EEF1F8;} + .d2-228003089 .background-color-N7{background-color:#FFFFFF;} + .d2-228003089 .background-color-B1{background-color:#0D32B2;} + .d2-228003089 .background-color-B2{background-color:#0D32B2;} + .d2-228003089 .background-color-B3{background-color:#E3E9FD;} + .d2-228003089 .background-color-B4{background-color:#E3E9FD;} + .d2-228003089 .background-color-B5{background-color:#EDF0FD;} + .d2-228003089 .background-color-B6{background-color:#F7F8FE;} + .d2-228003089 .background-color-AA2{background-color:#4A6FF3;} + .d2-228003089 .background-color-AA4{background-color:#EDF0FD;} + .d2-228003089 .background-color-AA5{background-color:#F7F8FE;} + .d2-228003089 .background-color-AB4{background-color:#EDF0FD;} + .d2-228003089 .background-color-AB5{background-color:#F7F8FE;} + .d2-228003089 .color-N1{color:#0A0F25;} + .d2-228003089 .color-N2{color:#676C7E;} + .d2-228003089 .color-N3{color:#9499AB;} + .d2-228003089 .color-N4{color:#CFD2DD;} + .d2-228003089 .color-N5{color:#DEE1EB;} + .d2-228003089 .color-N6{color:#EEF1F8;} + .d2-228003089 .color-N7{color:#FFFFFF;} + .d2-228003089 .color-B1{color:#0D32B2;} + .d2-228003089 .color-B2{color:#0D32B2;} + .d2-228003089 .color-B3{color:#E3E9FD;} + .d2-228003089 .color-B4{color:#E3E9FD;} + .d2-228003089 .color-B5{color:#EDF0FD;} + .d2-228003089 .color-B6{color:#F7F8FE;} + .d2-228003089 .color-AA2{color:#4A6FF3;} + .d2-228003089 .color-AA4{color:#EDF0FD;} + .d2-228003089 .color-AA5{color:#F7F8FE;} + .d2-228003089 .color-AB4{color:#EDF0FD;} + .d2-228003089 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-228003089);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-228003089);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-228003089);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-228003089);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-228003089);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-228003089);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-228003089);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-228003089);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-228003089);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-228003089);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-228003089);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-228003089);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-228003089);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-228003089);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-228003089);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-228003089);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-228003089);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-228003089);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>Executive ServicesI/OManagerSecurityReferenceMonitorIPCManagerVirtualMemoryManager(VMM)ProcessManagerPnPManagerPowerManagerWindowManager GDIObject Manager - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/font_colors/dagre/board.exp.json b/e2etests/testdata/stable/font_colors/dagre/board.exp.json index f866fb092..59e0e1cf6 100644 --- a/e2etests/testdata/stable/font_colors/dagre/board.exp.json +++ b/e2etests/testdata/stable/font_colors/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -150,6 +161,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 42.5, @@ -190,6 +202,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/font_colors/dagre/sketch.exp.svg b/e2etests/testdata/stable/font_colors/dagre/sketch.exp.svg index 4e64f7ab5..b1fe5947c 100644 --- a/e2etests/testdata/stable/font_colors/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/font_colors/dagre/sketch.exp.svg @@ -1,27 +1,27 @@ -alphabeta

    colored

    -
     gamma +alphabeta

    colored

    +
     gamma - - - - + + + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/font_colors/elk/board.exp.json b/e2etests/testdata/stable/font_colors/elk/board.exp.json index 7362626fe..c3bdf3312 100644 --- a/e2etests/testdata/stable/font_colors/elk/board.exp.json +++ b/e2etests/testdata/stable/font_colors/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -150,6 +161,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 54.5, @@ -181,6 +193,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/font_colors/elk/sketch.exp.svg b/e2etests/testdata/stable/font_colors/elk/sketch.exp.svg index c197a3485..16276d10e 100644 --- a/e2etests/testdata/stable/font_colors/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/font_colors/elk/sketch.exp.svg @@ -1,27 +1,27 @@ -alphabeta

    colored

    -
     gamma +alphabeta

    colored

    +
     gamma - - - - + + + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/font_sizes/dagre/board.exp.json b/e2etests/testdata/stable/font_sizes/dagre/board.exp.json index b1c7f7484..c8a801775 100644 --- a/e2etests/testdata/stable/font_sizes/dagre/board.exp.json +++ b/e2etests/testdata/stable/font_sizes/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -520,6 +540,7 @@ "labelHeight": 13, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1035, @@ -567,6 +588,7 @@ "labelHeight": 19, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 43.5, @@ -615,6 +637,7 @@ "labelHeight": 61, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 766, @@ -655,6 +678,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/font_sizes/dagre/sketch.exp.svg b/e2etests/testdata/stable/font_sizes/dagre/sketch.exp.svg index bd140da53..a325cc5c3 100644 --- a/e2etests/testdata/stable/font_sizes/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/font_sizes/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -size XSsize Ssize Msize Lsize XLsize XXLsize XXXLcustom 8custom 12custom 18custom 21custom 64 custom 10custom 15custom 48 + .d2-550964723 .fill-N1{fill:#0A0F25;} + .d2-550964723 .fill-N2{fill:#676C7E;} + .d2-550964723 .fill-N3{fill:#9499AB;} + .d2-550964723 .fill-N4{fill:#CFD2DD;} + .d2-550964723 .fill-N5{fill:#DEE1EB;} + .d2-550964723 .fill-N6{fill:#EEF1F8;} + .d2-550964723 .fill-N7{fill:#FFFFFF;} + .d2-550964723 .fill-B1{fill:#0D32B2;} + .d2-550964723 .fill-B2{fill:#0D32B2;} + .d2-550964723 .fill-B3{fill:#E3E9FD;} + .d2-550964723 .fill-B4{fill:#E3E9FD;} + .d2-550964723 .fill-B5{fill:#EDF0FD;} + .d2-550964723 .fill-B6{fill:#F7F8FE;} + .d2-550964723 .fill-AA2{fill:#4A6FF3;} + .d2-550964723 .fill-AA4{fill:#EDF0FD;} + .d2-550964723 .fill-AA5{fill:#F7F8FE;} + .d2-550964723 .fill-AB4{fill:#EDF0FD;} + .d2-550964723 .fill-AB5{fill:#F7F8FE;} + .d2-550964723 .stroke-N1{stroke:#0A0F25;} + .d2-550964723 .stroke-N2{stroke:#676C7E;} + .d2-550964723 .stroke-N3{stroke:#9499AB;} + .d2-550964723 .stroke-N4{stroke:#CFD2DD;} + .d2-550964723 .stroke-N5{stroke:#DEE1EB;} + .d2-550964723 .stroke-N6{stroke:#EEF1F8;} + .d2-550964723 .stroke-N7{stroke:#FFFFFF;} + .d2-550964723 .stroke-B1{stroke:#0D32B2;} + .d2-550964723 .stroke-B2{stroke:#0D32B2;} + .d2-550964723 .stroke-B3{stroke:#E3E9FD;} + .d2-550964723 .stroke-B4{stroke:#E3E9FD;} + .d2-550964723 .stroke-B5{stroke:#EDF0FD;} + .d2-550964723 .stroke-B6{stroke:#F7F8FE;} + .d2-550964723 .stroke-AA2{stroke:#4A6FF3;} + .d2-550964723 .stroke-AA4{stroke:#EDF0FD;} + .d2-550964723 .stroke-AA5{stroke:#F7F8FE;} + .d2-550964723 .stroke-AB4{stroke:#EDF0FD;} + .d2-550964723 .stroke-AB5{stroke:#F7F8FE;} + .d2-550964723 .background-color-N1{background-color:#0A0F25;} + .d2-550964723 .background-color-N2{background-color:#676C7E;} + .d2-550964723 .background-color-N3{background-color:#9499AB;} + .d2-550964723 .background-color-N4{background-color:#CFD2DD;} + .d2-550964723 .background-color-N5{background-color:#DEE1EB;} + .d2-550964723 .background-color-N6{background-color:#EEF1F8;} + .d2-550964723 .background-color-N7{background-color:#FFFFFF;} + .d2-550964723 .background-color-B1{background-color:#0D32B2;} + .d2-550964723 .background-color-B2{background-color:#0D32B2;} + .d2-550964723 .background-color-B3{background-color:#E3E9FD;} + .d2-550964723 .background-color-B4{background-color:#E3E9FD;} + .d2-550964723 .background-color-B5{background-color:#EDF0FD;} + .d2-550964723 .background-color-B6{background-color:#F7F8FE;} + .d2-550964723 .background-color-AA2{background-color:#4A6FF3;} + .d2-550964723 .background-color-AA4{background-color:#EDF0FD;} + .d2-550964723 .background-color-AA5{background-color:#F7F8FE;} + .d2-550964723 .background-color-AB4{background-color:#EDF0FD;} + .d2-550964723 .background-color-AB5{background-color:#F7F8FE;} + .d2-550964723 .color-N1{color:#0A0F25;} + .d2-550964723 .color-N2{color:#676C7E;} + .d2-550964723 .color-N3{color:#9499AB;} + .d2-550964723 .color-N4{color:#CFD2DD;} + .d2-550964723 .color-N5{color:#DEE1EB;} + .d2-550964723 .color-N6{color:#EEF1F8;} + .d2-550964723 .color-N7{color:#FFFFFF;} + .d2-550964723 .color-B1{color:#0D32B2;} + .d2-550964723 .color-B2{color:#0D32B2;} + .d2-550964723 .color-B3{color:#E3E9FD;} + .d2-550964723 .color-B4{color:#E3E9FD;} + .d2-550964723 .color-B5{color:#EDF0FD;} + .d2-550964723 .color-B6{color:#F7F8FE;} + .d2-550964723 .color-AA2{color:#4A6FF3;} + .d2-550964723 .color-AA4{color:#EDF0FD;} + .d2-550964723 .color-AA5{color:#F7F8FE;} + .d2-550964723 .color-AB4{color:#EDF0FD;} + .d2-550964723 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-550964723);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-550964723);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-550964723);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-550964723);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-550964723);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-550964723);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-550964723);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-550964723);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-550964723);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-550964723);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-550964723);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-550964723);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-550964723);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-550964723);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-550964723);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-550964723);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-550964723);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-550964723);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>size XSsize Ssize Msize Lsize XLsize XXLsize XXXLcustom 8custom 12custom 18custom 21custom 64 custom 10custom 15custom 48 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/font_sizes/elk/board.exp.json b/e2etests/testdata/stable/font_sizes/elk/board.exp.json index 735ab1761..bc83a5559 100644 --- a/e2etests/testdata/stable/font_sizes/elk/board.exp.json +++ b/e2etests/testdata/stable/font_sizes/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -520,6 +540,7 @@ "labelHeight": 13, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 847, @@ -558,6 +579,7 @@ "labelHeight": 19, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 55.5, @@ -597,6 +619,7 @@ "labelHeight": 61, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 618, @@ -628,6 +651,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/font_sizes/elk/sketch.exp.svg b/e2etests/testdata/stable/font_sizes/elk/sketch.exp.svg index 85f17fef4..92e23715e 100644 --- a/e2etests/testdata/stable/font_sizes/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/font_sizes/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -size XSsize Ssize Msize Lsize XLsize XXLsize XXXLcustom 8custom 12custom 18custom 21custom 64 custom 10custom 15custom 48 + .d2-2146040414 .fill-N1{fill:#0A0F25;} + .d2-2146040414 .fill-N2{fill:#676C7E;} + .d2-2146040414 .fill-N3{fill:#9499AB;} + .d2-2146040414 .fill-N4{fill:#CFD2DD;} + .d2-2146040414 .fill-N5{fill:#DEE1EB;} + .d2-2146040414 .fill-N6{fill:#EEF1F8;} + .d2-2146040414 .fill-N7{fill:#FFFFFF;} + .d2-2146040414 .fill-B1{fill:#0D32B2;} + .d2-2146040414 .fill-B2{fill:#0D32B2;} + .d2-2146040414 .fill-B3{fill:#E3E9FD;} + .d2-2146040414 .fill-B4{fill:#E3E9FD;} + .d2-2146040414 .fill-B5{fill:#EDF0FD;} + .d2-2146040414 .fill-B6{fill:#F7F8FE;} + .d2-2146040414 .fill-AA2{fill:#4A6FF3;} + .d2-2146040414 .fill-AA4{fill:#EDF0FD;} + .d2-2146040414 .fill-AA5{fill:#F7F8FE;} + .d2-2146040414 .fill-AB4{fill:#EDF0FD;} + .d2-2146040414 .fill-AB5{fill:#F7F8FE;} + .d2-2146040414 .stroke-N1{stroke:#0A0F25;} + .d2-2146040414 .stroke-N2{stroke:#676C7E;} + .d2-2146040414 .stroke-N3{stroke:#9499AB;} + .d2-2146040414 .stroke-N4{stroke:#CFD2DD;} + .d2-2146040414 .stroke-N5{stroke:#DEE1EB;} + .d2-2146040414 .stroke-N6{stroke:#EEF1F8;} + .d2-2146040414 .stroke-N7{stroke:#FFFFFF;} + .d2-2146040414 .stroke-B1{stroke:#0D32B2;} + .d2-2146040414 .stroke-B2{stroke:#0D32B2;} + .d2-2146040414 .stroke-B3{stroke:#E3E9FD;} + .d2-2146040414 .stroke-B4{stroke:#E3E9FD;} + .d2-2146040414 .stroke-B5{stroke:#EDF0FD;} + .d2-2146040414 .stroke-B6{stroke:#F7F8FE;} + .d2-2146040414 .stroke-AA2{stroke:#4A6FF3;} + .d2-2146040414 .stroke-AA4{stroke:#EDF0FD;} + .d2-2146040414 .stroke-AA5{stroke:#F7F8FE;} + .d2-2146040414 .stroke-AB4{stroke:#EDF0FD;} + .d2-2146040414 .stroke-AB5{stroke:#F7F8FE;} + .d2-2146040414 .background-color-N1{background-color:#0A0F25;} + .d2-2146040414 .background-color-N2{background-color:#676C7E;} + .d2-2146040414 .background-color-N3{background-color:#9499AB;} + .d2-2146040414 .background-color-N4{background-color:#CFD2DD;} + .d2-2146040414 .background-color-N5{background-color:#DEE1EB;} + .d2-2146040414 .background-color-N6{background-color:#EEF1F8;} + .d2-2146040414 .background-color-N7{background-color:#FFFFFF;} + .d2-2146040414 .background-color-B1{background-color:#0D32B2;} + .d2-2146040414 .background-color-B2{background-color:#0D32B2;} + .d2-2146040414 .background-color-B3{background-color:#E3E9FD;} + .d2-2146040414 .background-color-B4{background-color:#E3E9FD;} + .d2-2146040414 .background-color-B5{background-color:#EDF0FD;} + .d2-2146040414 .background-color-B6{background-color:#F7F8FE;} + .d2-2146040414 .background-color-AA2{background-color:#4A6FF3;} + .d2-2146040414 .background-color-AA4{background-color:#EDF0FD;} + .d2-2146040414 .background-color-AA5{background-color:#F7F8FE;} + .d2-2146040414 .background-color-AB4{background-color:#EDF0FD;} + .d2-2146040414 .background-color-AB5{background-color:#F7F8FE;} + .d2-2146040414 .color-N1{color:#0A0F25;} + .d2-2146040414 .color-N2{color:#676C7E;} + .d2-2146040414 .color-N3{color:#9499AB;} + .d2-2146040414 .color-N4{color:#CFD2DD;} + .d2-2146040414 .color-N5{color:#DEE1EB;} + .d2-2146040414 .color-N6{color:#EEF1F8;} + .d2-2146040414 .color-N7{color:#FFFFFF;} + .d2-2146040414 .color-B1{color:#0D32B2;} + .d2-2146040414 .color-B2{color:#0D32B2;} + .d2-2146040414 .color-B3{color:#E3E9FD;} + .d2-2146040414 .color-B4{color:#E3E9FD;} + .d2-2146040414 .color-B5{color:#EDF0FD;} + .d2-2146040414 .color-B6{color:#F7F8FE;} + .d2-2146040414 .color-AA2{color:#4A6FF3;} + .d2-2146040414 .color-AA4{color:#EDF0FD;} + .d2-2146040414 .color-AA5{color:#F7F8FE;} + .d2-2146040414 .color-AB4{color:#EDF0FD;} + .d2-2146040414 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2146040414);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2146040414);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2146040414);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2146040414);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2146040414);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2146040414);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2146040414);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2146040414);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2146040414);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2146040414);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2146040414);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2146040414);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2146040414);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2146040414);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2146040414);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2146040414);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2146040414);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2146040414);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>size XSsize Ssize Msize Lsize XLsize XXLsize XXXLcustom 8custom 12custom 18custom 21custom 64 custom 10custom 15custom 48 - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/font_sizes_containers_large/dagre/board.exp.json b/e2etests/testdata/stable/font_sizes_containers_large/dagre/board.exp.json index 20ed6b86e..1533fd235 100644 --- a/e2etests/testdata/stable/font_sizes_containers_large/dagre/board.exp.json +++ b/e2etests/testdata/stable/font_sizes_containers_large/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -225,6 +238,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/font_sizes_containers_large/dagre/sketch.exp.svg b/e2etests/testdata/stable/font_sizes_containers_large/dagre/sketch.exp.svg index 2d1e8eaa7..d89452616 100644 --- a/e2etests/testdata/stable/font_sizes_containers_large/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/font_sizes_containers_large/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -ninety ninesixty fourthirty twosixteeneight + .d2-4122384584 .fill-N1{fill:#0A0F25;} + .d2-4122384584 .fill-N2{fill:#676C7E;} + .d2-4122384584 .fill-N3{fill:#9499AB;} + .d2-4122384584 .fill-N4{fill:#CFD2DD;} + .d2-4122384584 .fill-N5{fill:#DEE1EB;} + .d2-4122384584 .fill-N6{fill:#EEF1F8;} + .d2-4122384584 .fill-N7{fill:#FFFFFF;} + .d2-4122384584 .fill-B1{fill:#0D32B2;} + .d2-4122384584 .fill-B2{fill:#0D32B2;} + .d2-4122384584 .fill-B3{fill:#E3E9FD;} + .d2-4122384584 .fill-B4{fill:#E3E9FD;} + .d2-4122384584 .fill-B5{fill:#EDF0FD;} + .d2-4122384584 .fill-B6{fill:#F7F8FE;} + .d2-4122384584 .fill-AA2{fill:#4A6FF3;} + .d2-4122384584 .fill-AA4{fill:#EDF0FD;} + .d2-4122384584 .fill-AA5{fill:#F7F8FE;} + .d2-4122384584 .fill-AB4{fill:#EDF0FD;} + .d2-4122384584 .fill-AB5{fill:#F7F8FE;} + .d2-4122384584 .stroke-N1{stroke:#0A0F25;} + .d2-4122384584 .stroke-N2{stroke:#676C7E;} + .d2-4122384584 .stroke-N3{stroke:#9499AB;} + .d2-4122384584 .stroke-N4{stroke:#CFD2DD;} + .d2-4122384584 .stroke-N5{stroke:#DEE1EB;} + .d2-4122384584 .stroke-N6{stroke:#EEF1F8;} + .d2-4122384584 .stroke-N7{stroke:#FFFFFF;} + .d2-4122384584 .stroke-B1{stroke:#0D32B2;} + .d2-4122384584 .stroke-B2{stroke:#0D32B2;} + .d2-4122384584 .stroke-B3{stroke:#E3E9FD;} + .d2-4122384584 .stroke-B4{stroke:#E3E9FD;} + .d2-4122384584 .stroke-B5{stroke:#EDF0FD;} + .d2-4122384584 .stroke-B6{stroke:#F7F8FE;} + .d2-4122384584 .stroke-AA2{stroke:#4A6FF3;} + .d2-4122384584 .stroke-AA4{stroke:#EDF0FD;} + .d2-4122384584 .stroke-AA5{stroke:#F7F8FE;} + .d2-4122384584 .stroke-AB4{stroke:#EDF0FD;} + .d2-4122384584 .stroke-AB5{stroke:#F7F8FE;} + .d2-4122384584 .background-color-N1{background-color:#0A0F25;} + .d2-4122384584 .background-color-N2{background-color:#676C7E;} + .d2-4122384584 .background-color-N3{background-color:#9499AB;} + .d2-4122384584 .background-color-N4{background-color:#CFD2DD;} + .d2-4122384584 .background-color-N5{background-color:#DEE1EB;} + .d2-4122384584 .background-color-N6{background-color:#EEF1F8;} + .d2-4122384584 .background-color-N7{background-color:#FFFFFF;} + .d2-4122384584 .background-color-B1{background-color:#0D32B2;} + .d2-4122384584 .background-color-B2{background-color:#0D32B2;} + .d2-4122384584 .background-color-B3{background-color:#E3E9FD;} + .d2-4122384584 .background-color-B4{background-color:#E3E9FD;} + .d2-4122384584 .background-color-B5{background-color:#EDF0FD;} + .d2-4122384584 .background-color-B6{background-color:#F7F8FE;} + .d2-4122384584 .background-color-AA2{background-color:#4A6FF3;} + .d2-4122384584 .background-color-AA4{background-color:#EDF0FD;} + .d2-4122384584 .background-color-AA5{background-color:#F7F8FE;} + .d2-4122384584 .background-color-AB4{background-color:#EDF0FD;} + .d2-4122384584 .background-color-AB5{background-color:#F7F8FE;} + .d2-4122384584 .color-N1{color:#0A0F25;} + .d2-4122384584 .color-N2{color:#676C7E;} + .d2-4122384584 .color-N3{color:#9499AB;} + .d2-4122384584 .color-N4{color:#CFD2DD;} + .d2-4122384584 .color-N5{color:#DEE1EB;} + .d2-4122384584 .color-N6{color:#EEF1F8;} + .d2-4122384584 .color-N7{color:#FFFFFF;} + .d2-4122384584 .color-B1{color:#0D32B2;} + .d2-4122384584 .color-B2{color:#0D32B2;} + .d2-4122384584 .color-B3{color:#E3E9FD;} + .d2-4122384584 .color-B4{color:#E3E9FD;} + .d2-4122384584 .color-B5{color:#EDF0FD;} + .d2-4122384584 .color-B6{color:#F7F8FE;} + .d2-4122384584 .color-AA2{color:#4A6FF3;} + .d2-4122384584 .color-AA4{color:#EDF0FD;} + .d2-4122384584 .color-AA5{color:#F7F8FE;} + .d2-4122384584 .color-AB4{color:#EDF0FD;} + .d2-4122384584 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4122384584);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4122384584);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4122384584);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4122384584);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4122384584);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4122384584);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4122384584);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4122384584);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4122384584);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4122384584);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4122384584);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4122384584);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4122384584);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4122384584);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4122384584);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4122384584);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4122384584);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4122384584);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ninety ninesixty fourthirty twosixteeneight - - - - - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/font_sizes_containers_large/elk/board.exp.json b/e2etests/testdata/stable/font_sizes_containers_large/elk/board.exp.json index 9f21c148b..4ddb41393 100644 --- a/e2etests/testdata/stable/font_sizes_containers_large/elk/board.exp.json +++ b/e2etests/testdata/stable/font_sizes_containers_large/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -225,6 +238,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/font_sizes_containers_large/elk/sketch.exp.svg b/e2etests/testdata/stable/font_sizes_containers_large/elk/sketch.exp.svg index 64c1788b4..fcf9634bc 100644 --- a/e2etests/testdata/stable/font_sizes_containers_large/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/font_sizes_containers_large/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -ninety ninesixty fourthirty twosixteeneight + .d2-890588727 .fill-N1{fill:#0A0F25;} + .d2-890588727 .fill-N2{fill:#676C7E;} + .d2-890588727 .fill-N3{fill:#9499AB;} + .d2-890588727 .fill-N4{fill:#CFD2DD;} + .d2-890588727 .fill-N5{fill:#DEE1EB;} + .d2-890588727 .fill-N6{fill:#EEF1F8;} + .d2-890588727 .fill-N7{fill:#FFFFFF;} + .d2-890588727 .fill-B1{fill:#0D32B2;} + .d2-890588727 .fill-B2{fill:#0D32B2;} + .d2-890588727 .fill-B3{fill:#E3E9FD;} + .d2-890588727 .fill-B4{fill:#E3E9FD;} + .d2-890588727 .fill-B5{fill:#EDF0FD;} + .d2-890588727 .fill-B6{fill:#F7F8FE;} + .d2-890588727 .fill-AA2{fill:#4A6FF3;} + .d2-890588727 .fill-AA4{fill:#EDF0FD;} + .d2-890588727 .fill-AA5{fill:#F7F8FE;} + .d2-890588727 .fill-AB4{fill:#EDF0FD;} + .d2-890588727 .fill-AB5{fill:#F7F8FE;} + .d2-890588727 .stroke-N1{stroke:#0A0F25;} + .d2-890588727 .stroke-N2{stroke:#676C7E;} + .d2-890588727 .stroke-N3{stroke:#9499AB;} + .d2-890588727 .stroke-N4{stroke:#CFD2DD;} + .d2-890588727 .stroke-N5{stroke:#DEE1EB;} + .d2-890588727 .stroke-N6{stroke:#EEF1F8;} + .d2-890588727 .stroke-N7{stroke:#FFFFFF;} + .d2-890588727 .stroke-B1{stroke:#0D32B2;} + .d2-890588727 .stroke-B2{stroke:#0D32B2;} + .d2-890588727 .stroke-B3{stroke:#E3E9FD;} + .d2-890588727 .stroke-B4{stroke:#E3E9FD;} + .d2-890588727 .stroke-B5{stroke:#EDF0FD;} + .d2-890588727 .stroke-B6{stroke:#F7F8FE;} + .d2-890588727 .stroke-AA2{stroke:#4A6FF3;} + .d2-890588727 .stroke-AA4{stroke:#EDF0FD;} + .d2-890588727 .stroke-AA5{stroke:#F7F8FE;} + .d2-890588727 .stroke-AB4{stroke:#EDF0FD;} + .d2-890588727 .stroke-AB5{stroke:#F7F8FE;} + .d2-890588727 .background-color-N1{background-color:#0A0F25;} + .d2-890588727 .background-color-N2{background-color:#676C7E;} + .d2-890588727 .background-color-N3{background-color:#9499AB;} + .d2-890588727 .background-color-N4{background-color:#CFD2DD;} + .d2-890588727 .background-color-N5{background-color:#DEE1EB;} + .d2-890588727 .background-color-N6{background-color:#EEF1F8;} + .d2-890588727 .background-color-N7{background-color:#FFFFFF;} + .d2-890588727 .background-color-B1{background-color:#0D32B2;} + .d2-890588727 .background-color-B2{background-color:#0D32B2;} + .d2-890588727 .background-color-B3{background-color:#E3E9FD;} + .d2-890588727 .background-color-B4{background-color:#E3E9FD;} + .d2-890588727 .background-color-B5{background-color:#EDF0FD;} + .d2-890588727 .background-color-B6{background-color:#F7F8FE;} + .d2-890588727 .background-color-AA2{background-color:#4A6FF3;} + .d2-890588727 .background-color-AA4{background-color:#EDF0FD;} + .d2-890588727 .background-color-AA5{background-color:#F7F8FE;} + .d2-890588727 .background-color-AB4{background-color:#EDF0FD;} + .d2-890588727 .background-color-AB5{background-color:#F7F8FE;} + .d2-890588727 .color-N1{color:#0A0F25;} + .d2-890588727 .color-N2{color:#676C7E;} + .d2-890588727 .color-N3{color:#9499AB;} + .d2-890588727 .color-N4{color:#CFD2DD;} + .d2-890588727 .color-N5{color:#DEE1EB;} + .d2-890588727 .color-N6{color:#EEF1F8;} + .d2-890588727 .color-N7{color:#FFFFFF;} + .d2-890588727 .color-B1{color:#0D32B2;} + .d2-890588727 .color-B2{color:#0D32B2;} + .d2-890588727 .color-B3{color:#E3E9FD;} + .d2-890588727 .color-B4{color:#E3E9FD;} + .d2-890588727 .color-B5{color:#EDF0FD;} + .d2-890588727 .color-B6{color:#F7F8FE;} + .d2-890588727 .color-AA2{color:#4A6FF3;} + .d2-890588727 .color-AA4{color:#EDF0FD;} + .d2-890588727 .color-AA5{color:#F7F8FE;} + .d2-890588727 .color-AB4{color:#EDF0FD;} + .d2-890588727 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-890588727);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-890588727);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-890588727);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-890588727);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-890588727);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-890588727);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-890588727);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-890588727);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-890588727);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-890588727);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-890588727);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-890588727);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-890588727);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-890588727);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-890588727);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-890588727);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-890588727);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-890588727);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ninety ninesixty fourthirty twosixteeneight - - - - - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/font_sizes_containers_large_right/dagre/board.exp.json b/e2etests/testdata/stable/font_sizes_containers_large_right/dagre/board.exp.json index dadeae729..b9ca0ac00 100644 --- a/e2etests/testdata/stable/font_sizes_containers_large_right/dagre/board.exp.json +++ b/e2etests/testdata/stable/font_sizes_containers_large_right/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -225,6 +238,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/font_sizes_containers_large_right/dagre/sketch.exp.svg b/e2etests/testdata/stable/font_sizes_containers_large_right/dagre/sketch.exp.svg index 1dea81320..71f79e550 100644 --- a/e2etests/testdata/stable/font_sizes_containers_large_right/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/font_sizes_containers_large_right/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -ninety ninesixty fourthirty twosixteeneight + .d2-3426383182 .fill-N1{fill:#0A0F25;} + .d2-3426383182 .fill-N2{fill:#676C7E;} + .d2-3426383182 .fill-N3{fill:#9499AB;} + .d2-3426383182 .fill-N4{fill:#CFD2DD;} + .d2-3426383182 .fill-N5{fill:#DEE1EB;} + .d2-3426383182 .fill-N6{fill:#EEF1F8;} + .d2-3426383182 .fill-N7{fill:#FFFFFF;} + .d2-3426383182 .fill-B1{fill:#0D32B2;} + .d2-3426383182 .fill-B2{fill:#0D32B2;} + .d2-3426383182 .fill-B3{fill:#E3E9FD;} + .d2-3426383182 .fill-B4{fill:#E3E9FD;} + .d2-3426383182 .fill-B5{fill:#EDF0FD;} + .d2-3426383182 .fill-B6{fill:#F7F8FE;} + .d2-3426383182 .fill-AA2{fill:#4A6FF3;} + .d2-3426383182 .fill-AA4{fill:#EDF0FD;} + .d2-3426383182 .fill-AA5{fill:#F7F8FE;} + .d2-3426383182 .fill-AB4{fill:#EDF0FD;} + .d2-3426383182 .fill-AB5{fill:#F7F8FE;} + .d2-3426383182 .stroke-N1{stroke:#0A0F25;} + .d2-3426383182 .stroke-N2{stroke:#676C7E;} + .d2-3426383182 .stroke-N3{stroke:#9499AB;} + .d2-3426383182 .stroke-N4{stroke:#CFD2DD;} + .d2-3426383182 .stroke-N5{stroke:#DEE1EB;} + .d2-3426383182 .stroke-N6{stroke:#EEF1F8;} + .d2-3426383182 .stroke-N7{stroke:#FFFFFF;} + .d2-3426383182 .stroke-B1{stroke:#0D32B2;} + .d2-3426383182 .stroke-B2{stroke:#0D32B2;} + .d2-3426383182 .stroke-B3{stroke:#E3E9FD;} + .d2-3426383182 .stroke-B4{stroke:#E3E9FD;} + .d2-3426383182 .stroke-B5{stroke:#EDF0FD;} + .d2-3426383182 .stroke-B6{stroke:#F7F8FE;} + .d2-3426383182 .stroke-AA2{stroke:#4A6FF3;} + .d2-3426383182 .stroke-AA4{stroke:#EDF0FD;} + .d2-3426383182 .stroke-AA5{stroke:#F7F8FE;} + .d2-3426383182 .stroke-AB4{stroke:#EDF0FD;} + .d2-3426383182 .stroke-AB5{stroke:#F7F8FE;} + .d2-3426383182 .background-color-N1{background-color:#0A0F25;} + .d2-3426383182 .background-color-N2{background-color:#676C7E;} + .d2-3426383182 .background-color-N3{background-color:#9499AB;} + .d2-3426383182 .background-color-N4{background-color:#CFD2DD;} + .d2-3426383182 .background-color-N5{background-color:#DEE1EB;} + .d2-3426383182 .background-color-N6{background-color:#EEF1F8;} + .d2-3426383182 .background-color-N7{background-color:#FFFFFF;} + .d2-3426383182 .background-color-B1{background-color:#0D32B2;} + .d2-3426383182 .background-color-B2{background-color:#0D32B2;} + .d2-3426383182 .background-color-B3{background-color:#E3E9FD;} + .d2-3426383182 .background-color-B4{background-color:#E3E9FD;} + .d2-3426383182 .background-color-B5{background-color:#EDF0FD;} + .d2-3426383182 .background-color-B6{background-color:#F7F8FE;} + .d2-3426383182 .background-color-AA2{background-color:#4A6FF3;} + .d2-3426383182 .background-color-AA4{background-color:#EDF0FD;} + .d2-3426383182 .background-color-AA5{background-color:#F7F8FE;} + .d2-3426383182 .background-color-AB4{background-color:#EDF0FD;} + .d2-3426383182 .background-color-AB5{background-color:#F7F8FE;} + .d2-3426383182 .color-N1{color:#0A0F25;} + .d2-3426383182 .color-N2{color:#676C7E;} + .d2-3426383182 .color-N3{color:#9499AB;} + .d2-3426383182 .color-N4{color:#CFD2DD;} + .d2-3426383182 .color-N5{color:#DEE1EB;} + .d2-3426383182 .color-N6{color:#EEF1F8;} + .d2-3426383182 .color-N7{color:#FFFFFF;} + .d2-3426383182 .color-B1{color:#0D32B2;} + .d2-3426383182 .color-B2{color:#0D32B2;} + .d2-3426383182 .color-B3{color:#E3E9FD;} + .d2-3426383182 .color-B4{color:#E3E9FD;} + .d2-3426383182 .color-B5{color:#EDF0FD;} + .d2-3426383182 .color-B6{color:#F7F8FE;} + .d2-3426383182 .color-AA2{color:#4A6FF3;} + .d2-3426383182 .color-AA4{color:#EDF0FD;} + .d2-3426383182 .color-AA5{color:#F7F8FE;} + .d2-3426383182 .color-AB4{color:#EDF0FD;} + .d2-3426383182 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3426383182);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3426383182);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3426383182);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3426383182);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3426383182);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3426383182);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3426383182);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3426383182);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3426383182);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3426383182);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3426383182);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3426383182);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3426383182);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3426383182);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3426383182);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3426383182);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3426383182);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3426383182);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ninety ninesixty fourthirty twosixteeneight - - - - - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/font_sizes_containers_large_right/elk/board.exp.json b/e2etests/testdata/stable/font_sizes_containers_large_right/elk/board.exp.json index 9f21c148b..4ddb41393 100644 --- a/e2etests/testdata/stable/font_sizes_containers_large_right/elk/board.exp.json +++ b/e2etests/testdata/stable/font_sizes_containers_large_right/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -225,6 +238,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/font_sizes_containers_large_right/elk/sketch.exp.svg b/e2etests/testdata/stable/font_sizes_containers_large_right/elk/sketch.exp.svg index 64c1788b4..fcf9634bc 100644 --- a/e2etests/testdata/stable/font_sizes_containers_large_right/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/font_sizes_containers_large_right/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -ninety ninesixty fourthirty twosixteeneight + .d2-890588727 .fill-N1{fill:#0A0F25;} + .d2-890588727 .fill-N2{fill:#676C7E;} + .d2-890588727 .fill-N3{fill:#9499AB;} + .d2-890588727 .fill-N4{fill:#CFD2DD;} + .d2-890588727 .fill-N5{fill:#DEE1EB;} + .d2-890588727 .fill-N6{fill:#EEF1F8;} + .d2-890588727 .fill-N7{fill:#FFFFFF;} + .d2-890588727 .fill-B1{fill:#0D32B2;} + .d2-890588727 .fill-B2{fill:#0D32B2;} + .d2-890588727 .fill-B3{fill:#E3E9FD;} + .d2-890588727 .fill-B4{fill:#E3E9FD;} + .d2-890588727 .fill-B5{fill:#EDF0FD;} + .d2-890588727 .fill-B6{fill:#F7F8FE;} + .d2-890588727 .fill-AA2{fill:#4A6FF3;} + .d2-890588727 .fill-AA4{fill:#EDF0FD;} + .d2-890588727 .fill-AA5{fill:#F7F8FE;} + .d2-890588727 .fill-AB4{fill:#EDF0FD;} + .d2-890588727 .fill-AB5{fill:#F7F8FE;} + .d2-890588727 .stroke-N1{stroke:#0A0F25;} + .d2-890588727 .stroke-N2{stroke:#676C7E;} + .d2-890588727 .stroke-N3{stroke:#9499AB;} + .d2-890588727 .stroke-N4{stroke:#CFD2DD;} + .d2-890588727 .stroke-N5{stroke:#DEE1EB;} + .d2-890588727 .stroke-N6{stroke:#EEF1F8;} + .d2-890588727 .stroke-N7{stroke:#FFFFFF;} + .d2-890588727 .stroke-B1{stroke:#0D32B2;} + .d2-890588727 .stroke-B2{stroke:#0D32B2;} + .d2-890588727 .stroke-B3{stroke:#E3E9FD;} + .d2-890588727 .stroke-B4{stroke:#E3E9FD;} + .d2-890588727 .stroke-B5{stroke:#EDF0FD;} + .d2-890588727 .stroke-B6{stroke:#F7F8FE;} + .d2-890588727 .stroke-AA2{stroke:#4A6FF3;} + .d2-890588727 .stroke-AA4{stroke:#EDF0FD;} + .d2-890588727 .stroke-AA5{stroke:#F7F8FE;} + .d2-890588727 .stroke-AB4{stroke:#EDF0FD;} + .d2-890588727 .stroke-AB5{stroke:#F7F8FE;} + .d2-890588727 .background-color-N1{background-color:#0A0F25;} + .d2-890588727 .background-color-N2{background-color:#676C7E;} + .d2-890588727 .background-color-N3{background-color:#9499AB;} + .d2-890588727 .background-color-N4{background-color:#CFD2DD;} + .d2-890588727 .background-color-N5{background-color:#DEE1EB;} + .d2-890588727 .background-color-N6{background-color:#EEF1F8;} + .d2-890588727 .background-color-N7{background-color:#FFFFFF;} + .d2-890588727 .background-color-B1{background-color:#0D32B2;} + .d2-890588727 .background-color-B2{background-color:#0D32B2;} + .d2-890588727 .background-color-B3{background-color:#E3E9FD;} + .d2-890588727 .background-color-B4{background-color:#E3E9FD;} + .d2-890588727 .background-color-B5{background-color:#EDF0FD;} + .d2-890588727 .background-color-B6{background-color:#F7F8FE;} + .d2-890588727 .background-color-AA2{background-color:#4A6FF3;} + .d2-890588727 .background-color-AA4{background-color:#EDF0FD;} + .d2-890588727 .background-color-AA5{background-color:#F7F8FE;} + .d2-890588727 .background-color-AB4{background-color:#EDF0FD;} + .d2-890588727 .background-color-AB5{background-color:#F7F8FE;} + .d2-890588727 .color-N1{color:#0A0F25;} + .d2-890588727 .color-N2{color:#676C7E;} + .d2-890588727 .color-N3{color:#9499AB;} + .d2-890588727 .color-N4{color:#CFD2DD;} + .d2-890588727 .color-N5{color:#DEE1EB;} + .d2-890588727 .color-N6{color:#EEF1F8;} + .d2-890588727 .color-N7{color:#FFFFFF;} + .d2-890588727 .color-B1{color:#0D32B2;} + .d2-890588727 .color-B2{color:#0D32B2;} + .d2-890588727 .color-B3{color:#E3E9FD;} + .d2-890588727 .color-B4{color:#E3E9FD;} + .d2-890588727 .color-B5{color:#EDF0FD;} + .d2-890588727 .color-B6{color:#F7F8FE;} + .d2-890588727 .color-AA2{color:#4A6FF3;} + .d2-890588727 .color-AA4{color:#EDF0FD;} + .d2-890588727 .color-AA5{color:#F7F8FE;} + .d2-890588727 .color-AB4{color:#EDF0FD;} + .d2-890588727 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-890588727);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-890588727);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-890588727);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-890588727);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-890588727);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-890588727);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-890588727);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-890588727);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-890588727);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-890588727);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-890588727);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-890588727);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-890588727);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-890588727);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-890588727);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-890588727);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-890588727);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-890588727);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ninety ninesixty fourthirty twosixteeneight - - - - - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/giant_markdown_test/dagre/board.exp.json b/e2etests/testdata/stable/giant_markdown_test/dagre/board.exp.json index f42b09620..7e66723e8 100644 --- a/e2etests/testdata/stable/giant_markdown_test/dagre/board.exp.json +++ b/e2etests/testdata/stable/giant_markdown_test/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -150,6 +161,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1525.5, @@ -197,6 +209,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1525.5, @@ -237,6 +250,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/giant_markdown_test/dagre/sketch.exp.svg b/e2etests/testdata/stable/giant_markdown_test/dagre/sketch.exp.svg index 08d39172e..cd01de1a5 100644 --- a/e2etests/testdata/stable/giant_markdown_test/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/giant_markdown_test/dagre/sketch.exp.svg @@ -1,34 +1,34 @@ -

    Markdown: Syntax

    +

    Markdown: Syntax

    • Overview
        @@ -1107,9 +1106,9 @@ title for the link, surrounded in quotes. For example:

        Code

        Unlike a pre-formatted code block, a code span indicates code within a normal paragraph. For example:

        -
    ab +
    ab - - - + + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/giant_markdown_test/elk/board.exp.json b/e2etests/testdata/stable/giant_markdown_test/elk/board.exp.json index 08f802e1d..df64ec378 100644 --- a/e2etests/testdata/stable/giant_markdown_test/elk/board.exp.json +++ b/e2etests/testdata/stable/giant_markdown_test/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -150,6 +161,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1537.5, @@ -188,6 +200,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1537.5, @@ -219,6 +232,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/giant_markdown_test/elk/sketch.exp.svg b/e2etests/testdata/stable/giant_markdown_test/elk/sketch.exp.svg index 443a01a16..f708bfd7e 100644 --- a/e2etests/testdata/stable/giant_markdown_test/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/giant_markdown_test/elk/sketch.exp.svg @@ -1,34 +1,34 @@ -

    Markdown: Syntax

    +

    Markdown: Syntax

    • Overview
        @@ -1107,9 +1106,9 @@ title for the link, surrounded in quotes. For example:

        Code

        Unlike a pre-formatted code block, a code span indicates code within a normal paragraph. For example:

        -
    ab +
    ab - - - + + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_animated/dagre/board.exp.json b/e2etests/testdata/stable/grid_animated/dagre/board.exp.json index f9eee7255..c39bc0bb1 100644 --- a/e2etests/testdata/stable/grid_animated/dagre/board.exp.json +++ b/e2etests/testdata/stable/grid_animated/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -102,6 +112,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -148,6 +159,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -189,6 +201,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -230,6 +243,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -273,6 +287,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -319,6 +334,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -360,6 +376,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -401,6 +418,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -442,6 +460,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -485,6 +504,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -531,6 +551,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -572,6 +593,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -613,6 +635,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -654,6 +677,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -695,6 +719,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -738,6 +763,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -784,6 +810,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -825,6 +852,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -866,6 +894,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -907,6 +936,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -948,6 +978,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -989,6 +1020,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1032,6 +1064,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1078,6 +1111,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1119,6 +1153,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1160,6 +1195,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1201,6 +1237,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1242,6 +1279,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1283,6 +1321,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1324,6 +1363,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1367,6 +1407,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1413,6 +1454,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1454,6 +1496,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1495,6 +1538,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1536,6 +1580,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1577,6 +1622,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1618,6 +1664,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1659,6 +1706,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1702,6 +1750,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1748,6 +1797,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1789,6 +1839,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1830,6 +1881,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1871,6 +1923,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1912,6 +1965,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1953,6 +2007,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1994,6 +2049,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2037,6 +2093,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2083,6 +2140,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2124,6 +2182,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2165,6 +2224,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2206,6 +2266,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2247,6 +2308,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2288,6 +2350,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2329,6 +2392,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2370,6 +2434,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2413,6 +2478,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2459,6 +2525,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2500,6 +2567,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2541,6 +2609,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2582,6 +2651,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2623,6 +2693,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2664,6 +2735,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2705,6 +2777,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2746,6 +2819,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2787,6 +2861,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2830,6 +2905,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2876,6 +2952,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2917,6 +2994,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2958,6 +3036,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2999,6 +3078,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3040,6 +3120,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3081,6 +3162,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3122,6 +3204,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3163,6 +3246,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3204,6 +3288,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3245,6 +3330,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3288,6 +3374,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3334,6 +3421,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3375,6 +3463,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3416,6 +3505,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3457,6 +3547,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3498,6 +3589,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3539,6 +3631,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3580,6 +3673,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3621,6 +3715,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3662,6 +3757,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3703,6 +3799,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3744,6 +3841,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3787,6 +3885,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3833,6 +3932,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3874,6 +3974,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3915,6 +4016,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3956,6 +4058,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3997,6 +4100,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4038,6 +4142,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4079,6 +4184,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4120,6 +4226,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4161,6 +4268,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4202,6 +4310,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4243,6 +4352,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4284,6 +4394,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4327,6 +4438,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4373,6 +4485,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4414,6 +4527,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4455,6 +4569,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4496,6 +4611,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4537,6 +4653,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4578,6 +4695,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4619,6 +4737,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4660,6 +4779,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4701,6 +4821,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4742,6 +4863,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4783,6 +4905,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4824,6 +4947,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4865,6 +4989,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4908,6 +5033,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4954,6 +5080,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4995,6 +5122,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5036,6 +5164,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5077,6 +5206,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5118,6 +5248,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5159,6 +5290,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5200,6 +5332,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5241,6 +5374,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5282,6 +5416,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5323,6 +5458,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5364,6 +5500,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5405,6 +5542,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5446,6 +5584,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5489,6 +5628,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/grid_animated/dagre/sketch.exp.svg b/e2etests/testdata/stable/grid_animated/dagre/sketch.exp.svg index 3f890a4bc..482511d53 100644 --- a/e2etests/testdata/stable/grid_animated/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_animated/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -rows 2 columns 3 (<cap)a +}]]>rows 2 columns 3 (<cap)a - - -rows 2 columns 3 (<cap)ab + + +rows 2 columns 3 (<cap)ab - - - -rows 2 columns 3 (<cap)abc + + + +rows 2 columns 3 (<cap)abc - - - - -rows 2 columns 3 (<cap)abcd + + + + +rows 2 columns 3 (<cap)abcd - - - - - -rows 2 columns 3 (<cap)abcde + + + + + +rows 2 columns 3 (<cap)abcde - - - - - - -rows 2 columns 3 (=cap)abcdef + + + + + + +rows 2 columns 3 (=cap)abcdef - - - - - - - -rows 2 columns 3 (=cap)abcdef + + + + + + + +rows 2 columns 3 (=cap)abcdef - - - - - - - -rows 2 columns 3 (=cap)abcdef + + + + + + + +rows 2 columns 3 (=cap)abcdef - - - - - - - -rows 2 columns 3 (>cap)abcdefg + + + + + + + +rows 2 columns 3 (>cap)abcdefg - - - - - - - - -rows 2 columns 3 (>cap)abcdefgh + + + + + + + + +rows 2 columns 3 (>cap)abcdefgh - - - - - - - - - -rows 2 columns 3 (>cap)abcdefghi + + + + + + + + + +rows 2 columns 3 (>cap)abcdefghi - - - - - - - - - - -rows 2 columns 3 (>cap)abcdefghij + + + + + + + + + + +rows 2 columns 3 (>cap)abcdefghij - - - - - - - - - - - -rows 2 columns 3 (>cap)abcdefghijk + + + + + + + + + + + +rows 2 columns 3 (>cap)abcdefghijk - - - - - - - - - - - - -rows 2 columns 3 (>cap)abcdefghijkl + + + + + + + + + + + + +rows 2 columns 3 (>cap)abcdefghijkl - - - - - - - - - - - - - -rows 2 columns 3 (>cap)abcdefghijkl + + + + + + + + + + + + + +rows 2 columns 3 (>cap)abcdefghijkl - - - - - - - - - - - - - + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_animated/elk/board.exp.json b/e2etests/testdata/stable/grid_animated/elk/board.exp.json index 8ecc1270f..c2c0a4b48 100644 --- a/e2etests/testdata/stable/grid_animated/elk/board.exp.json +++ b/e2etests/testdata/stable/grid_animated/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -102,6 +112,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -148,6 +159,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -189,6 +201,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -230,6 +243,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -273,6 +287,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -319,6 +334,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -360,6 +376,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -401,6 +418,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -442,6 +460,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -485,6 +504,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -531,6 +551,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -572,6 +593,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -613,6 +635,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -654,6 +677,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -695,6 +719,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -738,6 +763,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -784,6 +810,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -825,6 +852,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -866,6 +894,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -907,6 +936,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -948,6 +978,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -989,6 +1020,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1032,6 +1064,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1078,6 +1111,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1119,6 +1153,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1160,6 +1195,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1201,6 +1237,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1242,6 +1279,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1283,6 +1321,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1324,6 +1363,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1367,6 +1407,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1413,6 +1454,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1454,6 +1496,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1495,6 +1538,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1536,6 +1580,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1577,6 +1622,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1618,6 +1664,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1659,6 +1706,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1702,6 +1750,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1748,6 +1797,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1789,6 +1839,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1830,6 +1881,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1871,6 +1923,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1912,6 +1965,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1953,6 +2007,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1994,6 +2049,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2037,6 +2093,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2083,6 +2140,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2124,6 +2182,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2165,6 +2224,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2206,6 +2266,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2247,6 +2308,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2288,6 +2350,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2329,6 +2392,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2370,6 +2434,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2413,6 +2478,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2459,6 +2525,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2500,6 +2567,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2541,6 +2609,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2582,6 +2651,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2623,6 +2693,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2664,6 +2735,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2705,6 +2777,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2746,6 +2819,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2787,6 +2861,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2830,6 +2905,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2876,6 +2952,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2917,6 +2994,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2958,6 +3036,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2999,6 +3078,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3040,6 +3120,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3081,6 +3162,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3122,6 +3204,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3163,6 +3246,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3204,6 +3288,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3245,6 +3330,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3288,6 +3374,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3334,6 +3421,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3375,6 +3463,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3416,6 +3505,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3457,6 +3547,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3498,6 +3589,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3539,6 +3631,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3580,6 +3673,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3621,6 +3715,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3662,6 +3757,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3703,6 +3799,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3744,6 +3841,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3787,6 +3885,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3833,6 +3932,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3874,6 +3974,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3915,6 +4016,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3956,6 +4058,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3997,6 +4100,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4038,6 +4142,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4079,6 +4184,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4120,6 +4226,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4161,6 +4268,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4202,6 +4310,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4243,6 +4352,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4284,6 +4394,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4327,6 +4438,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4373,6 +4485,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4414,6 +4527,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4455,6 +4569,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4496,6 +4611,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4537,6 +4653,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4578,6 +4695,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4619,6 +4737,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4660,6 +4779,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4701,6 +4821,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4742,6 +4863,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4783,6 +4905,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4824,6 +4947,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4865,6 +4989,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4908,6 +5033,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4954,6 +5080,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4995,6 +5122,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5036,6 +5164,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5077,6 +5206,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5118,6 +5248,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5159,6 +5290,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5200,6 +5332,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5241,6 +5374,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5282,6 +5416,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5323,6 +5458,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5364,6 +5500,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5405,6 +5542,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5446,6 +5584,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5489,6 +5628,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/grid_animated/elk/sketch.exp.svg b/e2etests/testdata/stable/grid_animated/elk/sketch.exp.svg index 0aabc7280..7ead64e43 100644 --- a/e2etests/testdata/stable/grid_animated/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_animated/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -rows 2 columns 3 (<cap)a +}]]>rows 2 columns 3 (<cap)a - - -rows 2 columns 3 (<cap)ab + + +rows 2 columns 3 (<cap)ab - - - -rows 2 columns 3 (<cap)abc + + + +rows 2 columns 3 (<cap)abc - - - - -rows 2 columns 3 (<cap)abcd + + + + +rows 2 columns 3 (<cap)abcd - - - - - -rows 2 columns 3 (<cap)abcde + + + + + +rows 2 columns 3 (<cap)abcde - - - - - - -rows 2 columns 3 (=cap)abcdef + + + + + + +rows 2 columns 3 (=cap)abcdef - - - - - - - -rows 2 columns 3 (=cap)abcdef + + + + + + + +rows 2 columns 3 (=cap)abcdef - - - - - - - -rows 2 columns 3 (=cap)abcdef + + + + + + + +rows 2 columns 3 (=cap)abcdef - - - - - - - -rows 2 columns 3 (>cap)abcdefg + + + + + + + +rows 2 columns 3 (>cap)abcdefg - - - - - - - - -rows 2 columns 3 (>cap)abcdefgh + + + + + + + + +rows 2 columns 3 (>cap)abcdefgh - - - - - - - - - -rows 2 columns 3 (>cap)abcdefghi + + + + + + + + + +rows 2 columns 3 (>cap)abcdefghi - - - - - - - - - - -rows 2 columns 3 (>cap)abcdefghij + + + + + + + + + + +rows 2 columns 3 (>cap)abcdefghij - - - - - - - - - - - -rows 2 columns 3 (>cap)abcdefghijk + + + + + + + + + + + +rows 2 columns 3 (>cap)abcdefghijk - - - - - - - - - - - - -rows 2 columns 3 (>cap)abcdefghijkl + + + + + + + + + + + + +rows 2 columns 3 (>cap)abcdefghijkl - - - - - - - - - - - - - -rows 2 columns 3 (>cap)abcdefghijkl + + + + + + + + + + + + + +rows 2 columns 3 (>cap)abcdefghijkl - - - - - - - - - - - - - + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_container_dimensions/dagre/board.exp.json b/e2etests/testdata/stable/grid_container_dimensions/dagre/board.exp.json index a55ca4731..f4132ae60 100644 --- a/e2etests/testdata/stable/grid_container_dimensions/dagre/board.exp.json +++ b/e2etests/testdata/stable/grid_container_dimensions/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -225,6 +238,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/grid_container_dimensions/dagre/sketch.exp.svg b/e2etests/testdata/stable/grid_container_dimensions/dagre/sketch.exp.svg index 46285da7a..9171d1a7f 100644 --- a/e2etests/testdata/stable/grid_container_dimensions/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_container_dimensions/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -gridabcd + .d2-2279133948 .fill-N1{fill:#0A0F25;} + .d2-2279133948 .fill-N2{fill:#676C7E;} + .d2-2279133948 .fill-N3{fill:#9499AB;} + .d2-2279133948 .fill-N4{fill:#CFD2DD;} + .d2-2279133948 .fill-N5{fill:#DEE1EB;} + .d2-2279133948 .fill-N6{fill:#EEF1F8;} + .d2-2279133948 .fill-N7{fill:#FFFFFF;} + .d2-2279133948 .fill-B1{fill:#0D32B2;} + .d2-2279133948 .fill-B2{fill:#0D32B2;} + .d2-2279133948 .fill-B3{fill:#E3E9FD;} + .d2-2279133948 .fill-B4{fill:#E3E9FD;} + .d2-2279133948 .fill-B5{fill:#EDF0FD;} + .d2-2279133948 .fill-B6{fill:#F7F8FE;} + .d2-2279133948 .fill-AA2{fill:#4A6FF3;} + .d2-2279133948 .fill-AA4{fill:#EDF0FD;} + .d2-2279133948 .fill-AA5{fill:#F7F8FE;} + .d2-2279133948 .fill-AB4{fill:#EDF0FD;} + .d2-2279133948 .fill-AB5{fill:#F7F8FE;} + .d2-2279133948 .stroke-N1{stroke:#0A0F25;} + .d2-2279133948 .stroke-N2{stroke:#676C7E;} + .d2-2279133948 .stroke-N3{stroke:#9499AB;} + .d2-2279133948 .stroke-N4{stroke:#CFD2DD;} + .d2-2279133948 .stroke-N5{stroke:#DEE1EB;} + .d2-2279133948 .stroke-N6{stroke:#EEF1F8;} + .d2-2279133948 .stroke-N7{stroke:#FFFFFF;} + .d2-2279133948 .stroke-B1{stroke:#0D32B2;} + .d2-2279133948 .stroke-B2{stroke:#0D32B2;} + .d2-2279133948 .stroke-B3{stroke:#E3E9FD;} + .d2-2279133948 .stroke-B4{stroke:#E3E9FD;} + .d2-2279133948 .stroke-B5{stroke:#EDF0FD;} + .d2-2279133948 .stroke-B6{stroke:#F7F8FE;} + .d2-2279133948 .stroke-AA2{stroke:#4A6FF3;} + .d2-2279133948 .stroke-AA4{stroke:#EDF0FD;} + .d2-2279133948 .stroke-AA5{stroke:#F7F8FE;} + .d2-2279133948 .stroke-AB4{stroke:#EDF0FD;} + .d2-2279133948 .stroke-AB5{stroke:#F7F8FE;} + .d2-2279133948 .background-color-N1{background-color:#0A0F25;} + .d2-2279133948 .background-color-N2{background-color:#676C7E;} + .d2-2279133948 .background-color-N3{background-color:#9499AB;} + .d2-2279133948 .background-color-N4{background-color:#CFD2DD;} + .d2-2279133948 .background-color-N5{background-color:#DEE1EB;} + .d2-2279133948 .background-color-N6{background-color:#EEF1F8;} + .d2-2279133948 .background-color-N7{background-color:#FFFFFF;} + .d2-2279133948 .background-color-B1{background-color:#0D32B2;} + .d2-2279133948 .background-color-B2{background-color:#0D32B2;} + .d2-2279133948 .background-color-B3{background-color:#E3E9FD;} + .d2-2279133948 .background-color-B4{background-color:#E3E9FD;} + .d2-2279133948 .background-color-B5{background-color:#EDF0FD;} + .d2-2279133948 .background-color-B6{background-color:#F7F8FE;} + .d2-2279133948 .background-color-AA2{background-color:#4A6FF3;} + .d2-2279133948 .background-color-AA4{background-color:#EDF0FD;} + .d2-2279133948 .background-color-AA5{background-color:#F7F8FE;} + .d2-2279133948 .background-color-AB4{background-color:#EDF0FD;} + .d2-2279133948 .background-color-AB5{background-color:#F7F8FE;} + .d2-2279133948 .color-N1{color:#0A0F25;} + .d2-2279133948 .color-N2{color:#676C7E;} + .d2-2279133948 .color-N3{color:#9499AB;} + .d2-2279133948 .color-N4{color:#CFD2DD;} + .d2-2279133948 .color-N5{color:#DEE1EB;} + .d2-2279133948 .color-N6{color:#EEF1F8;} + .d2-2279133948 .color-N7{color:#FFFFFF;} + .d2-2279133948 .color-B1{color:#0D32B2;} + .d2-2279133948 .color-B2{color:#0D32B2;} + .d2-2279133948 .color-B3{color:#E3E9FD;} + .d2-2279133948 .color-B4{color:#E3E9FD;} + .d2-2279133948 .color-B5{color:#EDF0FD;} + .d2-2279133948 .color-B6{color:#F7F8FE;} + .d2-2279133948 .color-AA2{color:#4A6FF3;} + .d2-2279133948 .color-AA4{color:#EDF0FD;} + .d2-2279133948 .color-AA5{color:#F7F8FE;} + .d2-2279133948 .color-AB4{color:#EDF0FD;} + .d2-2279133948 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2279133948);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2279133948);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2279133948);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2279133948);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2279133948);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2279133948);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2279133948);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2279133948);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2279133948);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2279133948);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2279133948);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2279133948);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2279133948);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2279133948);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2279133948);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2279133948);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2279133948);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2279133948);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>gridabcd - - - - - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_container_dimensions/elk/board.exp.json b/e2etests/testdata/stable/grid_container_dimensions/elk/board.exp.json index f9a8e2442..8358de43c 100644 --- a/e2etests/testdata/stable/grid_container_dimensions/elk/board.exp.json +++ b/e2etests/testdata/stable/grid_container_dimensions/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -225,6 +238,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/grid_container_dimensions/elk/sketch.exp.svg b/e2etests/testdata/stable/grid_container_dimensions/elk/sketch.exp.svg index e14b36430..72d298684 100644 --- a/e2etests/testdata/stable/grid_container_dimensions/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_container_dimensions/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -gridabcd + .d2-480039938 .fill-N1{fill:#0A0F25;} + .d2-480039938 .fill-N2{fill:#676C7E;} + .d2-480039938 .fill-N3{fill:#9499AB;} + .d2-480039938 .fill-N4{fill:#CFD2DD;} + .d2-480039938 .fill-N5{fill:#DEE1EB;} + .d2-480039938 .fill-N6{fill:#EEF1F8;} + .d2-480039938 .fill-N7{fill:#FFFFFF;} + .d2-480039938 .fill-B1{fill:#0D32B2;} + .d2-480039938 .fill-B2{fill:#0D32B2;} + .d2-480039938 .fill-B3{fill:#E3E9FD;} + .d2-480039938 .fill-B4{fill:#E3E9FD;} + .d2-480039938 .fill-B5{fill:#EDF0FD;} + .d2-480039938 .fill-B6{fill:#F7F8FE;} + .d2-480039938 .fill-AA2{fill:#4A6FF3;} + .d2-480039938 .fill-AA4{fill:#EDF0FD;} + .d2-480039938 .fill-AA5{fill:#F7F8FE;} + .d2-480039938 .fill-AB4{fill:#EDF0FD;} + .d2-480039938 .fill-AB5{fill:#F7F8FE;} + .d2-480039938 .stroke-N1{stroke:#0A0F25;} + .d2-480039938 .stroke-N2{stroke:#676C7E;} + .d2-480039938 .stroke-N3{stroke:#9499AB;} + .d2-480039938 .stroke-N4{stroke:#CFD2DD;} + .d2-480039938 .stroke-N5{stroke:#DEE1EB;} + .d2-480039938 .stroke-N6{stroke:#EEF1F8;} + .d2-480039938 .stroke-N7{stroke:#FFFFFF;} + .d2-480039938 .stroke-B1{stroke:#0D32B2;} + .d2-480039938 .stroke-B2{stroke:#0D32B2;} + .d2-480039938 .stroke-B3{stroke:#E3E9FD;} + .d2-480039938 .stroke-B4{stroke:#E3E9FD;} + .d2-480039938 .stroke-B5{stroke:#EDF0FD;} + .d2-480039938 .stroke-B6{stroke:#F7F8FE;} + .d2-480039938 .stroke-AA2{stroke:#4A6FF3;} + .d2-480039938 .stroke-AA4{stroke:#EDF0FD;} + .d2-480039938 .stroke-AA5{stroke:#F7F8FE;} + .d2-480039938 .stroke-AB4{stroke:#EDF0FD;} + .d2-480039938 .stroke-AB5{stroke:#F7F8FE;} + .d2-480039938 .background-color-N1{background-color:#0A0F25;} + .d2-480039938 .background-color-N2{background-color:#676C7E;} + .d2-480039938 .background-color-N3{background-color:#9499AB;} + .d2-480039938 .background-color-N4{background-color:#CFD2DD;} + .d2-480039938 .background-color-N5{background-color:#DEE1EB;} + .d2-480039938 .background-color-N6{background-color:#EEF1F8;} + .d2-480039938 .background-color-N7{background-color:#FFFFFF;} + .d2-480039938 .background-color-B1{background-color:#0D32B2;} + .d2-480039938 .background-color-B2{background-color:#0D32B2;} + .d2-480039938 .background-color-B3{background-color:#E3E9FD;} + .d2-480039938 .background-color-B4{background-color:#E3E9FD;} + .d2-480039938 .background-color-B5{background-color:#EDF0FD;} + .d2-480039938 .background-color-B6{background-color:#F7F8FE;} + .d2-480039938 .background-color-AA2{background-color:#4A6FF3;} + .d2-480039938 .background-color-AA4{background-color:#EDF0FD;} + .d2-480039938 .background-color-AA5{background-color:#F7F8FE;} + .d2-480039938 .background-color-AB4{background-color:#EDF0FD;} + .d2-480039938 .background-color-AB5{background-color:#F7F8FE;} + .d2-480039938 .color-N1{color:#0A0F25;} + .d2-480039938 .color-N2{color:#676C7E;} + .d2-480039938 .color-N3{color:#9499AB;} + .d2-480039938 .color-N4{color:#CFD2DD;} + .d2-480039938 .color-N5{color:#DEE1EB;} + .d2-480039938 .color-N6{color:#EEF1F8;} + .d2-480039938 .color-N7{color:#FFFFFF;} + .d2-480039938 .color-B1{color:#0D32B2;} + .d2-480039938 .color-B2{color:#0D32B2;} + .d2-480039938 .color-B3{color:#E3E9FD;} + .d2-480039938 .color-B4{color:#E3E9FD;} + .d2-480039938 .color-B5{color:#EDF0FD;} + .d2-480039938 .color-B6{color:#F7F8FE;} + .d2-480039938 .color-AA2{color:#4A6FF3;} + .d2-480039938 .color-AA4{color:#EDF0FD;} + .d2-480039938 .color-AA5{color:#F7F8FE;} + .d2-480039938 .color-AB4{color:#EDF0FD;} + .d2-480039938 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-480039938);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-480039938);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-480039938);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-480039938);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-480039938);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-480039938);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-480039938);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-480039938);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-480039938);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-480039938);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-480039938);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-480039938);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-480039938);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-480039938);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-480039938);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-480039938);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-480039938);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-480039938);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>gridabcd - - - - - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_edge_across_cell/dagre/board.exp.json b/e2etests/testdata/stable/grid_edge_across_cell/dagre/board.exp.json index d2cd11023..1c4d0009b 100644 --- a/e2etests/testdata/stable/grid_edge_across_cell/dagre/board.exp.json +++ b/e2etests/testdata/stable/grid_edge_across_cell/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -482,6 +501,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 66.875, @@ -523,6 +543,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 93.625, @@ -561,6 +582,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 193.375, @@ -608,6 +630,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 286.875, @@ -670,6 +693,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 299.875, @@ -701,6 +725,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/grid_edge_across_cell/dagre/sketch.exp.svg b/e2etests/testdata/stable/grid_edge_across_cell/dagre/sketch.exp.svg index 68920386a..26630cd87 100644 --- a/e2etests/testdata/stable/grid_edge_across_cell/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_edge_across_cell/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -gridcell 1cell 2cell 3abcefdg + .d2-1130197831 .fill-N1{fill:#0A0F25;} + .d2-1130197831 .fill-N2{fill:#676C7E;} + .d2-1130197831 .fill-N3{fill:#9499AB;} + .d2-1130197831 .fill-N4{fill:#CFD2DD;} + .d2-1130197831 .fill-N5{fill:#DEE1EB;} + .d2-1130197831 .fill-N6{fill:#EEF1F8;} + .d2-1130197831 .fill-N7{fill:#FFFFFF;} + .d2-1130197831 .fill-B1{fill:#0D32B2;} + .d2-1130197831 .fill-B2{fill:#0D32B2;} + .d2-1130197831 .fill-B3{fill:#E3E9FD;} + .d2-1130197831 .fill-B4{fill:#E3E9FD;} + .d2-1130197831 .fill-B5{fill:#EDF0FD;} + .d2-1130197831 .fill-B6{fill:#F7F8FE;} + .d2-1130197831 .fill-AA2{fill:#4A6FF3;} + .d2-1130197831 .fill-AA4{fill:#EDF0FD;} + .d2-1130197831 .fill-AA5{fill:#F7F8FE;} + .d2-1130197831 .fill-AB4{fill:#EDF0FD;} + .d2-1130197831 .fill-AB5{fill:#F7F8FE;} + .d2-1130197831 .stroke-N1{stroke:#0A0F25;} + .d2-1130197831 .stroke-N2{stroke:#676C7E;} + .d2-1130197831 .stroke-N3{stroke:#9499AB;} + .d2-1130197831 .stroke-N4{stroke:#CFD2DD;} + .d2-1130197831 .stroke-N5{stroke:#DEE1EB;} + .d2-1130197831 .stroke-N6{stroke:#EEF1F8;} + .d2-1130197831 .stroke-N7{stroke:#FFFFFF;} + .d2-1130197831 .stroke-B1{stroke:#0D32B2;} + .d2-1130197831 .stroke-B2{stroke:#0D32B2;} + .d2-1130197831 .stroke-B3{stroke:#E3E9FD;} + .d2-1130197831 .stroke-B4{stroke:#E3E9FD;} + .d2-1130197831 .stroke-B5{stroke:#EDF0FD;} + .d2-1130197831 .stroke-B6{stroke:#F7F8FE;} + .d2-1130197831 .stroke-AA2{stroke:#4A6FF3;} + .d2-1130197831 .stroke-AA4{stroke:#EDF0FD;} + .d2-1130197831 .stroke-AA5{stroke:#F7F8FE;} + .d2-1130197831 .stroke-AB4{stroke:#EDF0FD;} + .d2-1130197831 .stroke-AB5{stroke:#F7F8FE;} + .d2-1130197831 .background-color-N1{background-color:#0A0F25;} + .d2-1130197831 .background-color-N2{background-color:#676C7E;} + .d2-1130197831 .background-color-N3{background-color:#9499AB;} + .d2-1130197831 .background-color-N4{background-color:#CFD2DD;} + .d2-1130197831 .background-color-N5{background-color:#DEE1EB;} + .d2-1130197831 .background-color-N6{background-color:#EEF1F8;} + .d2-1130197831 .background-color-N7{background-color:#FFFFFF;} + .d2-1130197831 .background-color-B1{background-color:#0D32B2;} + .d2-1130197831 .background-color-B2{background-color:#0D32B2;} + .d2-1130197831 .background-color-B3{background-color:#E3E9FD;} + .d2-1130197831 .background-color-B4{background-color:#E3E9FD;} + .d2-1130197831 .background-color-B5{background-color:#EDF0FD;} + .d2-1130197831 .background-color-B6{background-color:#F7F8FE;} + .d2-1130197831 .background-color-AA2{background-color:#4A6FF3;} + .d2-1130197831 .background-color-AA4{background-color:#EDF0FD;} + .d2-1130197831 .background-color-AA5{background-color:#F7F8FE;} + .d2-1130197831 .background-color-AB4{background-color:#EDF0FD;} + .d2-1130197831 .background-color-AB5{background-color:#F7F8FE;} + .d2-1130197831 .color-N1{color:#0A0F25;} + .d2-1130197831 .color-N2{color:#676C7E;} + .d2-1130197831 .color-N3{color:#9499AB;} + .d2-1130197831 .color-N4{color:#CFD2DD;} + .d2-1130197831 .color-N5{color:#DEE1EB;} + .d2-1130197831 .color-N6{color:#EEF1F8;} + .d2-1130197831 .color-N7{color:#FFFFFF;} + .d2-1130197831 .color-B1{color:#0D32B2;} + .d2-1130197831 .color-B2{color:#0D32B2;} + .d2-1130197831 .color-B3{color:#E3E9FD;} + .d2-1130197831 .color-B4{color:#E3E9FD;} + .d2-1130197831 .color-B5{color:#EDF0FD;} + .d2-1130197831 .color-B6{color:#F7F8FE;} + .d2-1130197831 .color-AA2{color:#4A6FF3;} + .d2-1130197831 .color-AA4{color:#EDF0FD;} + .d2-1130197831 .color-AA5{color:#F7F8FE;} + .d2-1130197831 .color-AB4{color:#EDF0FD;} + .d2-1130197831 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1130197831);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1130197831);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1130197831);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1130197831);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1130197831);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1130197831);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1130197831);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1130197831);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1130197831);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1130197831);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1130197831);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1130197831);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1130197831);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1130197831);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1130197831);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1130197831);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1130197831);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1130197831);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>gridcell 1cell 2cell 3abcefdg - - - - - - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_edge_across_cell/elk/board.exp.json b/e2etests/testdata/stable/grid_edge_across_cell/elk/board.exp.json index ee976406e..3395150d1 100644 --- a/e2etests/testdata/stable/grid_edge_across_cell/elk/board.exp.json +++ b/e2etests/testdata/stable/grid_edge_across_cell/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -482,6 +501,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 98.5, @@ -523,6 +543,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 125.25, @@ -561,6 +582,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 261.5, @@ -599,6 +621,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 328.25, @@ -648,6 +671,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 358.5, @@ -679,6 +703,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/grid_edge_across_cell/elk/sketch.exp.svg b/e2etests/testdata/stable/grid_edge_across_cell/elk/sketch.exp.svg index c70dd0c7b..2ea79fc54 100644 --- a/e2etests/testdata/stable/grid_edge_across_cell/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_edge_across_cell/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -gridcell 1cell 2cell 3abcefdg + .d2-307761279 .fill-N1{fill:#0A0F25;} + .d2-307761279 .fill-N2{fill:#676C7E;} + .d2-307761279 .fill-N3{fill:#9499AB;} + .d2-307761279 .fill-N4{fill:#CFD2DD;} + .d2-307761279 .fill-N5{fill:#DEE1EB;} + .d2-307761279 .fill-N6{fill:#EEF1F8;} + .d2-307761279 .fill-N7{fill:#FFFFFF;} + .d2-307761279 .fill-B1{fill:#0D32B2;} + .d2-307761279 .fill-B2{fill:#0D32B2;} + .d2-307761279 .fill-B3{fill:#E3E9FD;} + .d2-307761279 .fill-B4{fill:#E3E9FD;} + .d2-307761279 .fill-B5{fill:#EDF0FD;} + .d2-307761279 .fill-B6{fill:#F7F8FE;} + .d2-307761279 .fill-AA2{fill:#4A6FF3;} + .d2-307761279 .fill-AA4{fill:#EDF0FD;} + .d2-307761279 .fill-AA5{fill:#F7F8FE;} + .d2-307761279 .fill-AB4{fill:#EDF0FD;} + .d2-307761279 .fill-AB5{fill:#F7F8FE;} + .d2-307761279 .stroke-N1{stroke:#0A0F25;} + .d2-307761279 .stroke-N2{stroke:#676C7E;} + .d2-307761279 .stroke-N3{stroke:#9499AB;} + .d2-307761279 .stroke-N4{stroke:#CFD2DD;} + .d2-307761279 .stroke-N5{stroke:#DEE1EB;} + .d2-307761279 .stroke-N6{stroke:#EEF1F8;} + .d2-307761279 .stroke-N7{stroke:#FFFFFF;} + .d2-307761279 .stroke-B1{stroke:#0D32B2;} + .d2-307761279 .stroke-B2{stroke:#0D32B2;} + .d2-307761279 .stroke-B3{stroke:#E3E9FD;} + .d2-307761279 .stroke-B4{stroke:#E3E9FD;} + .d2-307761279 .stroke-B5{stroke:#EDF0FD;} + .d2-307761279 .stroke-B6{stroke:#F7F8FE;} + .d2-307761279 .stroke-AA2{stroke:#4A6FF3;} + .d2-307761279 .stroke-AA4{stroke:#EDF0FD;} + .d2-307761279 .stroke-AA5{stroke:#F7F8FE;} + .d2-307761279 .stroke-AB4{stroke:#EDF0FD;} + .d2-307761279 .stroke-AB5{stroke:#F7F8FE;} + .d2-307761279 .background-color-N1{background-color:#0A0F25;} + .d2-307761279 .background-color-N2{background-color:#676C7E;} + .d2-307761279 .background-color-N3{background-color:#9499AB;} + .d2-307761279 .background-color-N4{background-color:#CFD2DD;} + .d2-307761279 .background-color-N5{background-color:#DEE1EB;} + .d2-307761279 .background-color-N6{background-color:#EEF1F8;} + .d2-307761279 .background-color-N7{background-color:#FFFFFF;} + .d2-307761279 .background-color-B1{background-color:#0D32B2;} + .d2-307761279 .background-color-B2{background-color:#0D32B2;} + .d2-307761279 .background-color-B3{background-color:#E3E9FD;} + .d2-307761279 .background-color-B4{background-color:#E3E9FD;} + .d2-307761279 .background-color-B5{background-color:#EDF0FD;} + .d2-307761279 .background-color-B6{background-color:#F7F8FE;} + .d2-307761279 .background-color-AA2{background-color:#4A6FF3;} + .d2-307761279 .background-color-AA4{background-color:#EDF0FD;} + .d2-307761279 .background-color-AA5{background-color:#F7F8FE;} + .d2-307761279 .background-color-AB4{background-color:#EDF0FD;} + .d2-307761279 .background-color-AB5{background-color:#F7F8FE;} + .d2-307761279 .color-N1{color:#0A0F25;} + .d2-307761279 .color-N2{color:#676C7E;} + .d2-307761279 .color-N3{color:#9499AB;} + .d2-307761279 .color-N4{color:#CFD2DD;} + .d2-307761279 .color-N5{color:#DEE1EB;} + .d2-307761279 .color-N6{color:#EEF1F8;} + .d2-307761279 .color-N7{color:#FFFFFF;} + .d2-307761279 .color-B1{color:#0D32B2;} + .d2-307761279 .color-B2{color:#0D32B2;} + .d2-307761279 .color-B3{color:#E3E9FD;} + .d2-307761279 .color-B4{color:#E3E9FD;} + .d2-307761279 .color-B5{color:#EDF0FD;} + .d2-307761279 .color-B6{color:#F7F8FE;} + .d2-307761279 .color-AA2{color:#4A6FF3;} + .d2-307761279 .color-AA4{color:#EDF0FD;} + .d2-307761279 .color-AA5{color:#F7F8FE;} + .d2-307761279 .color-AB4{color:#EDF0FD;} + .d2-307761279 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-307761279);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-307761279);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-307761279);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-307761279);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-307761279);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-307761279);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-307761279);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-307761279);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-307761279);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-307761279);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-307761279);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-307761279);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-307761279);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-307761279);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-307761279);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-307761279);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-307761279);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-307761279);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>gridcell 1cell 2cell 3abcefdg - - - - - - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_even/dagre/board.exp.json b/e2etests/testdata/stable/grid_even/dagre/board.exp.json index ea41292ec..13e49815e 100644 --- a/e2etests/testdata/stable/grid_even/dagre/board.exp.json +++ b/e2etests/testdata/stable/grid_even/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -715,6 +740,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -756,6 +782,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -797,6 +824,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -838,6 +866,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -879,6 +908,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -920,6 +950,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -961,6 +992,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1002,6 +1034,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1043,6 +1076,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1084,6 +1118,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1125,6 +1160,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1166,6 +1202,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1207,6 +1244,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1248,6 +1286,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1289,6 +1328,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1330,6 +1370,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1371,6 +1412,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1412,6 +1454,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1453,6 +1496,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1496,6 +1540,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/grid_even/dagre/sketch.exp.svg b/e2etests/testdata/stable/grid_even/dagre/sketch.exp.svg index d0a38c8bb..d94b57b1d 100644 --- a/e2etests/testdata/stable/grid_even/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_even/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -row no growthrow 200 growthrow big growthcolumn no growthcolumn 200 growthcolumn big growthabcdeabcdeabcdeabcdeabcdeabcde + .d2-1852192406 .fill-N1{fill:#0A0F25;} + .d2-1852192406 .fill-N2{fill:#676C7E;} + .d2-1852192406 .fill-N3{fill:#9499AB;} + .d2-1852192406 .fill-N4{fill:#CFD2DD;} + .d2-1852192406 .fill-N5{fill:#DEE1EB;} + .d2-1852192406 .fill-N6{fill:#EEF1F8;} + .d2-1852192406 .fill-N7{fill:#FFFFFF;} + .d2-1852192406 .fill-B1{fill:#0D32B2;} + .d2-1852192406 .fill-B2{fill:#0D32B2;} + .d2-1852192406 .fill-B3{fill:#E3E9FD;} + .d2-1852192406 .fill-B4{fill:#E3E9FD;} + .d2-1852192406 .fill-B5{fill:#EDF0FD;} + .d2-1852192406 .fill-B6{fill:#F7F8FE;} + .d2-1852192406 .fill-AA2{fill:#4A6FF3;} + .d2-1852192406 .fill-AA4{fill:#EDF0FD;} + .d2-1852192406 .fill-AA5{fill:#F7F8FE;} + .d2-1852192406 .fill-AB4{fill:#EDF0FD;} + .d2-1852192406 .fill-AB5{fill:#F7F8FE;} + .d2-1852192406 .stroke-N1{stroke:#0A0F25;} + .d2-1852192406 .stroke-N2{stroke:#676C7E;} + .d2-1852192406 .stroke-N3{stroke:#9499AB;} + .d2-1852192406 .stroke-N4{stroke:#CFD2DD;} + .d2-1852192406 .stroke-N5{stroke:#DEE1EB;} + .d2-1852192406 .stroke-N6{stroke:#EEF1F8;} + .d2-1852192406 .stroke-N7{stroke:#FFFFFF;} + .d2-1852192406 .stroke-B1{stroke:#0D32B2;} + .d2-1852192406 .stroke-B2{stroke:#0D32B2;} + .d2-1852192406 .stroke-B3{stroke:#E3E9FD;} + .d2-1852192406 .stroke-B4{stroke:#E3E9FD;} + .d2-1852192406 .stroke-B5{stroke:#EDF0FD;} + .d2-1852192406 .stroke-B6{stroke:#F7F8FE;} + .d2-1852192406 .stroke-AA2{stroke:#4A6FF3;} + .d2-1852192406 .stroke-AA4{stroke:#EDF0FD;} + .d2-1852192406 .stroke-AA5{stroke:#F7F8FE;} + .d2-1852192406 .stroke-AB4{stroke:#EDF0FD;} + .d2-1852192406 .stroke-AB5{stroke:#F7F8FE;} + .d2-1852192406 .background-color-N1{background-color:#0A0F25;} + .d2-1852192406 .background-color-N2{background-color:#676C7E;} + .d2-1852192406 .background-color-N3{background-color:#9499AB;} + .d2-1852192406 .background-color-N4{background-color:#CFD2DD;} + .d2-1852192406 .background-color-N5{background-color:#DEE1EB;} + .d2-1852192406 .background-color-N6{background-color:#EEF1F8;} + .d2-1852192406 .background-color-N7{background-color:#FFFFFF;} + .d2-1852192406 .background-color-B1{background-color:#0D32B2;} + .d2-1852192406 .background-color-B2{background-color:#0D32B2;} + .d2-1852192406 .background-color-B3{background-color:#E3E9FD;} + .d2-1852192406 .background-color-B4{background-color:#E3E9FD;} + .d2-1852192406 .background-color-B5{background-color:#EDF0FD;} + .d2-1852192406 .background-color-B6{background-color:#F7F8FE;} + .d2-1852192406 .background-color-AA2{background-color:#4A6FF3;} + .d2-1852192406 .background-color-AA4{background-color:#EDF0FD;} + .d2-1852192406 .background-color-AA5{background-color:#F7F8FE;} + .d2-1852192406 .background-color-AB4{background-color:#EDF0FD;} + .d2-1852192406 .background-color-AB5{background-color:#F7F8FE;} + .d2-1852192406 .color-N1{color:#0A0F25;} + .d2-1852192406 .color-N2{color:#676C7E;} + .d2-1852192406 .color-N3{color:#9499AB;} + .d2-1852192406 .color-N4{color:#CFD2DD;} + .d2-1852192406 .color-N5{color:#DEE1EB;} + .d2-1852192406 .color-N6{color:#EEF1F8;} + .d2-1852192406 .color-N7{color:#FFFFFF;} + .d2-1852192406 .color-B1{color:#0D32B2;} + .d2-1852192406 .color-B2{color:#0D32B2;} + .d2-1852192406 .color-B3{color:#E3E9FD;} + .d2-1852192406 .color-B4{color:#E3E9FD;} + .d2-1852192406 .color-B5{color:#EDF0FD;} + .d2-1852192406 .color-B6{color:#F7F8FE;} + .d2-1852192406 .color-AA2{color:#4A6FF3;} + .d2-1852192406 .color-AA4{color:#EDF0FD;} + .d2-1852192406 .color-AA5{color:#F7F8FE;} + .d2-1852192406 .color-AB4{color:#EDF0FD;} + .d2-1852192406 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1852192406);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1852192406);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1852192406);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1852192406);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1852192406);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1852192406);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1852192406);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1852192406);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1852192406);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1852192406);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1852192406);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1852192406);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1852192406);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1852192406);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1852192406);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1852192406);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1852192406);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1852192406);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>row no growthrow 200 growthrow big growthcolumn no growthcolumn 200 growthcolumn big growthabcdeabcdeabcdeabcdeabcdeabcde - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_even/elk/board.exp.json b/e2etests/testdata/stable/grid_even/elk/board.exp.json index b02a67867..4a7cfa91b 100644 --- a/e2etests/testdata/stable/grid_even/elk/board.exp.json +++ b/e2etests/testdata/stable/grid_even/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -715,6 +740,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -756,6 +782,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -797,6 +824,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -838,6 +866,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -879,6 +908,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -920,6 +950,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -961,6 +992,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1002,6 +1034,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1043,6 +1076,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1084,6 +1118,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1125,6 +1160,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1166,6 +1202,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1207,6 +1244,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1248,6 +1286,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1289,6 +1328,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1330,6 +1370,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1371,6 +1412,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1412,6 +1454,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1453,6 +1496,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1496,6 +1540,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/grid_even/elk/sketch.exp.svg b/e2etests/testdata/stable/grid_even/elk/sketch.exp.svg index 2806dd292..9ac99690c 100644 --- a/e2etests/testdata/stable/grid_even/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_even/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -row no growthrow 200 growthrow big growthcolumn no growthcolumn 200 growthcolumn big growthabcdeabcdeabcdeabcdeabcdeabcde + .d2-302285083 .fill-N1{fill:#0A0F25;} + .d2-302285083 .fill-N2{fill:#676C7E;} + .d2-302285083 .fill-N3{fill:#9499AB;} + .d2-302285083 .fill-N4{fill:#CFD2DD;} + .d2-302285083 .fill-N5{fill:#DEE1EB;} + .d2-302285083 .fill-N6{fill:#EEF1F8;} + .d2-302285083 .fill-N7{fill:#FFFFFF;} + .d2-302285083 .fill-B1{fill:#0D32B2;} + .d2-302285083 .fill-B2{fill:#0D32B2;} + .d2-302285083 .fill-B3{fill:#E3E9FD;} + .d2-302285083 .fill-B4{fill:#E3E9FD;} + .d2-302285083 .fill-B5{fill:#EDF0FD;} + .d2-302285083 .fill-B6{fill:#F7F8FE;} + .d2-302285083 .fill-AA2{fill:#4A6FF3;} + .d2-302285083 .fill-AA4{fill:#EDF0FD;} + .d2-302285083 .fill-AA5{fill:#F7F8FE;} + .d2-302285083 .fill-AB4{fill:#EDF0FD;} + .d2-302285083 .fill-AB5{fill:#F7F8FE;} + .d2-302285083 .stroke-N1{stroke:#0A0F25;} + .d2-302285083 .stroke-N2{stroke:#676C7E;} + .d2-302285083 .stroke-N3{stroke:#9499AB;} + .d2-302285083 .stroke-N4{stroke:#CFD2DD;} + .d2-302285083 .stroke-N5{stroke:#DEE1EB;} + .d2-302285083 .stroke-N6{stroke:#EEF1F8;} + .d2-302285083 .stroke-N7{stroke:#FFFFFF;} + .d2-302285083 .stroke-B1{stroke:#0D32B2;} + .d2-302285083 .stroke-B2{stroke:#0D32B2;} + .d2-302285083 .stroke-B3{stroke:#E3E9FD;} + .d2-302285083 .stroke-B4{stroke:#E3E9FD;} + .d2-302285083 .stroke-B5{stroke:#EDF0FD;} + .d2-302285083 .stroke-B6{stroke:#F7F8FE;} + .d2-302285083 .stroke-AA2{stroke:#4A6FF3;} + .d2-302285083 .stroke-AA4{stroke:#EDF0FD;} + .d2-302285083 .stroke-AA5{stroke:#F7F8FE;} + .d2-302285083 .stroke-AB4{stroke:#EDF0FD;} + .d2-302285083 .stroke-AB5{stroke:#F7F8FE;} + .d2-302285083 .background-color-N1{background-color:#0A0F25;} + .d2-302285083 .background-color-N2{background-color:#676C7E;} + .d2-302285083 .background-color-N3{background-color:#9499AB;} + .d2-302285083 .background-color-N4{background-color:#CFD2DD;} + .d2-302285083 .background-color-N5{background-color:#DEE1EB;} + .d2-302285083 .background-color-N6{background-color:#EEF1F8;} + .d2-302285083 .background-color-N7{background-color:#FFFFFF;} + .d2-302285083 .background-color-B1{background-color:#0D32B2;} + .d2-302285083 .background-color-B2{background-color:#0D32B2;} + .d2-302285083 .background-color-B3{background-color:#E3E9FD;} + .d2-302285083 .background-color-B4{background-color:#E3E9FD;} + .d2-302285083 .background-color-B5{background-color:#EDF0FD;} + .d2-302285083 .background-color-B6{background-color:#F7F8FE;} + .d2-302285083 .background-color-AA2{background-color:#4A6FF3;} + .d2-302285083 .background-color-AA4{background-color:#EDF0FD;} + .d2-302285083 .background-color-AA5{background-color:#F7F8FE;} + .d2-302285083 .background-color-AB4{background-color:#EDF0FD;} + .d2-302285083 .background-color-AB5{background-color:#F7F8FE;} + .d2-302285083 .color-N1{color:#0A0F25;} + .d2-302285083 .color-N2{color:#676C7E;} + .d2-302285083 .color-N3{color:#9499AB;} + .d2-302285083 .color-N4{color:#CFD2DD;} + .d2-302285083 .color-N5{color:#DEE1EB;} + .d2-302285083 .color-N6{color:#EEF1F8;} + .d2-302285083 .color-N7{color:#FFFFFF;} + .d2-302285083 .color-B1{color:#0D32B2;} + .d2-302285083 .color-B2{color:#0D32B2;} + .d2-302285083 .color-B3{color:#E3E9FD;} + .d2-302285083 .color-B4{color:#E3E9FD;} + .d2-302285083 .color-B5{color:#EDF0FD;} + .d2-302285083 .color-B6{color:#F7F8FE;} + .d2-302285083 .color-AA2{color:#4A6FF3;} + .d2-302285083 .color-AA4{color:#EDF0FD;} + .d2-302285083 .color-AA5{color:#F7F8FE;} + .d2-302285083 .color-AB4{color:#EDF0FD;} + .d2-302285083 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-302285083);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-302285083);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-302285083);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-302285083);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-302285083);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-302285083);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-302285083);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-302285083);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-302285083);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-302285083);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-302285083);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-302285083);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-302285083);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-302285083);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-302285083);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-302285083);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-302285083);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-302285083);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>row no growthrow 200 growthrow big growthcolumn no growthcolumn 200 growthcolumn big growthabcdeabcdeabcdeabcdeabcdeabcde - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_gap/dagre/board.exp.json b/e2etests/testdata/stable/grid_gap/dagre/board.exp.json index 635617683..2555de0c1 100644 --- a/e2etests/testdata/stable/grid_gap/dagre/board.exp.json +++ b/e2etests/testdata/stable/grid_gap/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -715,6 +740,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -756,6 +782,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -797,6 +824,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -838,6 +866,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -879,6 +908,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -920,6 +950,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -961,6 +992,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1002,6 +1034,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1043,6 +1076,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1084,6 +1118,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1125,6 +1160,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1166,6 +1202,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1207,6 +1244,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1248,6 +1286,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1289,6 +1328,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1330,6 +1370,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1371,6 +1412,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1412,6 +1454,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1453,6 +1496,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1494,6 +1538,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1535,6 +1580,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1576,6 +1622,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1617,6 +1664,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1660,6 +1708,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/grid_gap/dagre/sketch.exp.svg b/e2etests/testdata/stable/grid_gap/dagre/sketch.exp.svg index 12ecd9850..24e677b2e 100644 --- a/e2etests/testdata/stable/grid_gap/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_gap/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -vertical-gap 30 horizontal-gap 100vertical-gap 100 horizontal-gap 30gap 0gap 10 vertical-gap 100abcdefghiabcdefghiabcdefghiabcdefghi + .d2-1250799286 .fill-N1{fill:#0A0F25;} + .d2-1250799286 .fill-N2{fill:#676C7E;} + .d2-1250799286 .fill-N3{fill:#9499AB;} + .d2-1250799286 .fill-N4{fill:#CFD2DD;} + .d2-1250799286 .fill-N5{fill:#DEE1EB;} + .d2-1250799286 .fill-N6{fill:#EEF1F8;} + .d2-1250799286 .fill-N7{fill:#FFFFFF;} + .d2-1250799286 .fill-B1{fill:#0D32B2;} + .d2-1250799286 .fill-B2{fill:#0D32B2;} + .d2-1250799286 .fill-B3{fill:#E3E9FD;} + .d2-1250799286 .fill-B4{fill:#E3E9FD;} + .d2-1250799286 .fill-B5{fill:#EDF0FD;} + .d2-1250799286 .fill-B6{fill:#F7F8FE;} + .d2-1250799286 .fill-AA2{fill:#4A6FF3;} + .d2-1250799286 .fill-AA4{fill:#EDF0FD;} + .d2-1250799286 .fill-AA5{fill:#F7F8FE;} + .d2-1250799286 .fill-AB4{fill:#EDF0FD;} + .d2-1250799286 .fill-AB5{fill:#F7F8FE;} + .d2-1250799286 .stroke-N1{stroke:#0A0F25;} + .d2-1250799286 .stroke-N2{stroke:#676C7E;} + .d2-1250799286 .stroke-N3{stroke:#9499AB;} + .d2-1250799286 .stroke-N4{stroke:#CFD2DD;} + .d2-1250799286 .stroke-N5{stroke:#DEE1EB;} + .d2-1250799286 .stroke-N6{stroke:#EEF1F8;} + .d2-1250799286 .stroke-N7{stroke:#FFFFFF;} + .d2-1250799286 .stroke-B1{stroke:#0D32B2;} + .d2-1250799286 .stroke-B2{stroke:#0D32B2;} + .d2-1250799286 .stroke-B3{stroke:#E3E9FD;} + .d2-1250799286 .stroke-B4{stroke:#E3E9FD;} + .d2-1250799286 .stroke-B5{stroke:#EDF0FD;} + .d2-1250799286 .stroke-B6{stroke:#F7F8FE;} + .d2-1250799286 .stroke-AA2{stroke:#4A6FF3;} + .d2-1250799286 .stroke-AA4{stroke:#EDF0FD;} + .d2-1250799286 .stroke-AA5{stroke:#F7F8FE;} + .d2-1250799286 .stroke-AB4{stroke:#EDF0FD;} + .d2-1250799286 .stroke-AB5{stroke:#F7F8FE;} + .d2-1250799286 .background-color-N1{background-color:#0A0F25;} + .d2-1250799286 .background-color-N2{background-color:#676C7E;} + .d2-1250799286 .background-color-N3{background-color:#9499AB;} + .d2-1250799286 .background-color-N4{background-color:#CFD2DD;} + .d2-1250799286 .background-color-N5{background-color:#DEE1EB;} + .d2-1250799286 .background-color-N6{background-color:#EEF1F8;} + .d2-1250799286 .background-color-N7{background-color:#FFFFFF;} + .d2-1250799286 .background-color-B1{background-color:#0D32B2;} + .d2-1250799286 .background-color-B2{background-color:#0D32B2;} + .d2-1250799286 .background-color-B3{background-color:#E3E9FD;} + .d2-1250799286 .background-color-B4{background-color:#E3E9FD;} + .d2-1250799286 .background-color-B5{background-color:#EDF0FD;} + .d2-1250799286 .background-color-B6{background-color:#F7F8FE;} + .d2-1250799286 .background-color-AA2{background-color:#4A6FF3;} + .d2-1250799286 .background-color-AA4{background-color:#EDF0FD;} + .d2-1250799286 .background-color-AA5{background-color:#F7F8FE;} + .d2-1250799286 .background-color-AB4{background-color:#EDF0FD;} + .d2-1250799286 .background-color-AB5{background-color:#F7F8FE;} + .d2-1250799286 .color-N1{color:#0A0F25;} + .d2-1250799286 .color-N2{color:#676C7E;} + .d2-1250799286 .color-N3{color:#9499AB;} + .d2-1250799286 .color-N4{color:#CFD2DD;} + .d2-1250799286 .color-N5{color:#DEE1EB;} + .d2-1250799286 .color-N6{color:#EEF1F8;} + .d2-1250799286 .color-N7{color:#FFFFFF;} + .d2-1250799286 .color-B1{color:#0D32B2;} + .d2-1250799286 .color-B2{color:#0D32B2;} + .d2-1250799286 .color-B3{color:#E3E9FD;} + .d2-1250799286 .color-B4{color:#E3E9FD;} + .d2-1250799286 .color-B5{color:#EDF0FD;} + .d2-1250799286 .color-B6{color:#F7F8FE;} + .d2-1250799286 .color-AA2{color:#4A6FF3;} + .d2-1250799286 .color-AA4{color:#EDF0FD;} + .d2-1250799286 .color-AA5{color:#F7F8FE;} + .d2-1250799286 .color-AB4{color:#EDF0FD;} + .d2-1250799286 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1250799286);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1250799286);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1250799286);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1250799286);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1250799286);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1250799286);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1250799286);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1250799286);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1250799286);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1250799286);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1250799286);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1250799286);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1250799286);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1250799286);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1250799286);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1250799286);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1250799286);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1250799286);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>vertical-gap 30 horizontal-gap 100vertical-gap 100 horizontal-gap 30gap 0gap 10 vertical-gap 100abcdefghiabcdefghiabcdefghiabcdefghi - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_gap/elk/board.exp.json b/e2etests/testdata/stable/grid_gap/elk/board.exp.json index 74816850f..6f57af9fb 100644 --- a/e2etests/testdata/stable/grid_gap/elk/board.exp.json +++ b/e2etests/testdata/stable/grid_gap/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -715,6 +740,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -756,6 +782,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -797,6 +824,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -838,6 +866,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -879,6 +908,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -920,6 +950,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -961,6 +992,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1002,6 +1034,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1043,6 +1076,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1084,6 +1118,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1125,6 +1160,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1166,6 +1202,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1207,6 +1244,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1248,6 +1286,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1289,6 +1328,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1330,6 +1370,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1371,6 +1412,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1412,6 +1454,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1453,6 +1496,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1494,6 +1538,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1535,6 +1580,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1576,6 +1622,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1617,6 +1664,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1660,6 +1708,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/grid_gap/elk/sketch.exp.svg b/e2etests/testdata/stable/grid_gap/elk/sketch.exp.svg index c9ba74789..09a8b4cf2 100644 --- a/e2etests/testdata/stable/grid_gap/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_gap/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -vertical-gap 30 horizontal-gap 100vertical-gap 100 horizontal-gap 30gap 0gap 10 vertical-gap 100abcdefghiabcdefghiabcdefghiabcdefghi + .d2-2241197024 .fill-N1{fill:#0A0F25;} + .d2-2241197024 .fill-N2{fill:#676C7E;} + .d2-2241197024 .fill-N3{fill:#9499AB;} + .d2-2241197024 .fill-N4{fill:#CFD2DD;} + .d2-2241197024 .fill-N5{fill:#DEE1EB;} + .d2-2241197024 .fill-N6{fill:#EEF1F8;} + .d2-2241197024 .fill-N7{fill:#FFFFFF;} + .d2-2241197024 .fill-B1{fill:#0D32B2;} + .d2-2241197024 .fill-B2{fill:#0D32B2;} + .d2-2241197024 .fill-B3{fill:#E3E9FD;} + .d2-2241197024 .fill-B4{fill:#E3E9FD;} + .d2-2241197024 .fill-B5{fill:#EDF0FD;} + .d2-2241197024 .fill-B6{fill:#F7F8FE;} + .d2-2241197024 .fill-AA2{fill:#4A6FF3;} + .d2-2241197024 .fill-AA4{fill:#EDF0FD;} + .d2-2241197024 .fill-AA5{fill:#F7F8FE;} + .d2-2241197024 .fill-AB4{fill:#EDF0FD;} + .d2-2241197024 .fill-AB5{fill:#F7F8FE;} + .d2-2241197024 .stroke-N1{stroke:#0A0F25;} + .d2-2241197024 .stroke-N2{stroke:#676C7E;} + .d2-2241197024 .stroke-N3{stroke:#9499AB;} + .d2-2241197024 .stroke-N4{stroke:#CFD2DD;} + .d2-2241197024 .stroke-N5{stroke:#DEE1EB;} + .d2-2241197024 .stroke-N6{stroke:#EEF1F8;} + .d2-2241197024 .stroke-N7{stroke:#FFFFFF;} + .d2-2241197024 .stroke-B1{stroke:#0D32B2;} + .d2-2241197024 .stroke-B2{stroke:#0D32B2;} + .d2-2241197024 .stroke-B3{stroke:#E3E9FD;} + .d2-2241197024 .stroke-B4{stroke:#E3E9FD;} + .d2-2241197024 .stroke-B5{stroke:#EDF0FD;} + .d2-2241197024 .stroke-B6{stroke:#F7F8FE;} + .d2-2241197024 .stroke-AA2{stroke:#4A6FF3;} + .d2-2241197024 .stroke-AA4{stroke:#EDF0FD;} + .d2-2241197024 .stroke-AA5{stroke:#F7F8FE;} + .d2-2241197024 .stroke-AB4{stroke:#EDF0FD;} + .d2-2241197024 .stroke-AB5{stroke:#F7F8FE;} + .d2-2241197024 .background-color-N1{background-color:#0A0F25;} + .d2-2241197024 .background-color-N2{background-color:#676C7E;} + .d2-2241197024 .background-color-N3{background-color:#9499AB;} + .d2-2241197024 .background-color-N4{background-color:#CFD2DD;} + .d2-2241197024 .background-color-N5{background-color:#DEE1EB;} + .d2-2241197024 .background-color-N6{background-color:#EEF1F8;} + .d2-2241197024 .background-color-N7{background-color:#FFFFFF;} + .d2-2241197024 .background-color-B1{background-color:#0D32B2;} + .d2-2241197024 .background-color-B2{background-color:#0D32B2;} + .d2-2241197024 .background-color-B3{background-color:#E3E9FD;} + .d2-2241197024 .background-color-B4{background-color:#E3E9FD;} + .d2-2241197024 .background-color-B5{background-color:#EDF0FD;} + .d2-2241197024 .background-color-B6{background-color:#F7F8FE;} + .d2-2241197024 .background-color-AA2{background-color:#4A6FF3;} + .d2-2241197024 .background-color-AA4{background-color:#EDF0FD;} + .d2-2241197024 .background-color-AA5{background-color:#F7F8FE;} + .d2-2241197024 .background-color-AB4{background-color:#EDF0FD;} + .d2-2241197024 .background-color-AB5{background-color:#F7F8FE;} + .d2-2241197024 .color-N1{color:#0A0F25;} + .d2-2241197024 .color-N2{color:#676C7E;} + .d2-2241197024 .color-N3{color:#9499AB;} + .d2-2241197024 .color-N4{color:#CFD2DD;} + .d2-2241197024 .color-N5{color:#DEE1EB;} + .d2-2241197024 .color-N6{color:#EEF1F8;} + .d2-2241197024 .color-N7{color:#FFFFFF;} + .d2-2241197024 .color-B1{color:#0D32B2;} + .d2-2241197024 .color-B2{color:#0D32B2;} + .d2-2241197024 .color-B3{color:#E3E9FD;} + .d2-2241197024 .color-B4{color:#E3E9FD;} + .d2-2241197024 .color-B5{color:#EDF0FD;} + .d2-2241197024 .color-B6{color:#F7F8FE;} + .d2-2241197024 .color-AA2{color:#4A6FF3;} + .d2-2241197024 .color-AA4{color:#EDF0FD;} + .d2-2241197024 .color-AA5{color:#F7F8FE;} + .d2-2241197024 .color-AB4{color:#EDF0FD;} + .d2-2241197024 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2241197024);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2241197024);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2241197024);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2241197024);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2241197024);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2241197024);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2241197024);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2241197024);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2241197024);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2241197024);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2241197024);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2241197024);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2241197024);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2241197024);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2241197024);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2241197024);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2241197024);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2241197024);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>vertical-gap 30 horizontal-gap 100vertical-gap 100 horizontal-gap 30gap 0gap 10 vertical-gap 100abcdefghiabcdefghiabcdefghiabcdefghi - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_icon/dagre/board.exp.json b/e2etests/testdata/stable/grid_icon/dagre/board.exp.json index 7fabf8ce7..59213417c 100644 --- a/e2etests/testdata/stable/grid_icon/dagre/board.exp.json +++ b/e2etests/testdata/stable/grid_icon/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -21,6 +29,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -62,6 +71,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -103,6 +113,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -156,6 +167,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -197,6 +209,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -238,6 +251,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -282,6 +296,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -335,6 +350,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -376,6 +392,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -417,6 +434,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -458,6 +476,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -502,6 +521,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -555,6 +575,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -596,6 +617,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -637,6 +659,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -678,6 +701,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -719,6 +743,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -763,6 +788,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -803,6 +829,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -844,6 +871,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -897,6 +925,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -938,6 +967,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -979,6 +1009,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1023,6 +1054,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1075,6 +1107,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1116,6 +1149,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1157,6 +1191,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1198,6 +1233,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1241,6 +1277,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/grid_icon/dagre/sketch.exp.svg b/e2etests/testdata/stable/grid_icon/dagre/sketch.exp.svg index 7e16c2926..6cad4788c 100644 --- a/e2etests/testdata/stable/grid_icon/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_icon/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -grid w/ container + icongrid + icongrid + icon w/ containerabcdabcdabcdabcdabcdb childb childb child + .d2-715121405 .fill-N1{fill:#0A0F25;} + .d2-715121405 .fill-N2{fill:#676C7E;} + .d2-715121405 .fill-N3{fill:#9499AB;} + .d2-715121405 .fill-N4{fill:#CFD2DD;} + .d2-715121405 .fill-N5{fill:#DEE1EB;} + .d2-715121405 .fill-N6{fill:#EEF1F8;} + .d2-715121405 .fill-N7{fill:#FFFFFF;} + .d2-715121405 .fill-B1{fill:#0D32B2;} + .d2-715121405 .fill-B2{fill:#0D32B2;} + .d2-715121405 .fill-B3{fill:#E3E9FD;} + .d2-715121405 .fill-B4{fill:#E3E9FD;} + .d2-715121405 .fill-B5{fill:#EDF0FD;} + .d2-715121405 .fill-B6{fill:#F7F8FE;} + .d2-715121405 .fill-AA2{fill:#4A6FF3;} + .d2-715121405 .fill-AA4{fill:#EDF0FD;} + .d2-715121405 .fill-AA5{fill:#F7F8FE;} + .d2-715121405 .fill-AB4{fill:#EDF0FD;} + .d2-715121405 .fill-AB5{fill:#F7F8FE;} + .d2-715121405 .stroke-N1{stroke:#0A0F25;} + .d2-715121405 .stroke-N2{stroke:#676C7E;} + .d2-715121405 .stroke-N3{stroke:#9499AB;} + .d2-715121405 .stroke-N4{stroke:#CFD2DD;} + .d2-715121405 .stroke-N5{stroke:#DEE1EB;} + .d2-715121405 .stroke-N6{stroke:#EEF1F8;} + .d2-715121405 .stroke-N7{stroke:#FFFFFF;} + .d2-715121405 .stroke-B1{stroke:#0D32B2;} + .d2-715121405 .stroke-B2{stroke:#0D32B2;} + .d2-715121405 .stroke-B3{stroke:#E3E9FD;} + .d2-715121405 .stroke-B4{stroke:#E3E9FD;} + .d2-715121405 .stroke-B5{stroke:#EDF0FD;} + .d2-715121405 .stroke-B6{stroke:#F7F8FE;} + .d2-715121405 .stroke-AA2{stroke:#4A6FF3;} + .d2-715121405 .stroke-AA4{stroke:#EDF0FD;} + .d2-715121405 .stroke-AA5{stroke:#F7F8FE;} + .d2-715121405 .stroke-AB4{stroke:#EDF0FD;} + .d2-715121405 .stroke-AB5{stroke:#F7F8FE;} + .d2-715121405 .background-color-N1{background-color:#0A0F25;} + .d2-715121405 .background-color-N2{background-color:#676C7E;} + .d2-715121405 .background-color-N3{background-color:#9499AB;} + .d2-715121405 .background-color-N4{background-color:#CFD2DD;} + .d2-715121405 .background-color-N5{background-color:#DEE1EB;} + .d2-715121405 .background-color-N6{background-color:#EEF1F8;} + .d2-715121405 .background-color-N7{background-color:#FFFFFF;} + .d2-715121405 .background-color-B1{background-color:#0D32B2;} + .d2-715121405 .background-color-B2{background-color:#0D32B2;} + .d2-715121405 .background-color-B3{background-color:#E3E9FD;} + .d2-715121405 .background-color-B4{background-color:#E3E9FD;} + .d2-715121405 .background-color-B5{background-color:#EDF0FD;} + .d2-715121405 .background-color-B6{background-color:#F7F8FE;} + .d2-715121405 .background-color-AA2{background-color:#4A6FF3;} + .d2-715121405 .background-color-AA4{background-color:#EDF0FD;} + .d2-715121405 .background-color-AA5{background-color:#F7F8FE;} + .d2-715121405 .background-color-AB4{background-color:#EDF0FD;} + .d2-715121405 .background-color-AB5{background-color:#F7F8FE;} + .d2-715121405 .color-N1{color:#0A0F25;} + .d2-715121405 .color-N2{color:#676C7E;} + .d2-715121405 .color-N3{color:#9499AB;} + .d2-715121405 .color-N4{color:#CFD2DD;} + .d2-715121405 .color-N5{color:#DEE1EB;} + .d2-715121405 .color-N6{color:#EEF1F8;} + .d2-715121405 .color-N7{color:#FFFFFF;} + .d2-715121405 .color-B1{color:#0D32B2;} + .d2-715121405 .color-B2{color:#0D32B2;} + .d2-715121405 .color-B3{color:#E3E9FD;} + .d2-715121405 .color-B4{color:#E3E9FD;} + .d2-715121405 .color-B5{color:#EDF0FD;} + .d2-715121405 .color-B6{color:#F7F8FE;} + .d2-715121405 .color-AA2{color:#4A6FF3;} + .d2-715121405 .color-AA4{color:#EDF0FD;} + .d2-715121405 .color-AA5{color:#F7F8FE;} + .d2-715121405 .color-AB4{color:#EDF0FD;} + .d2-715121405 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-715121405);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-715121405);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-715121405);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-715121405);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-715121405);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-715121405);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-715121405);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-715121405);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-715121405);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-715121405);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-715121405);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-715121405);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-715121405);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-715121405);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-715121405);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-715121405);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-715121405);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-715121405);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>grid w/ container + icongrid + icongrid + icon w/ containerabcdabcdabcdabcdabcdb childb childb child - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_icon/elk/board.exp.json b/e2etests/testdata/stable/grid_icon/elk/board.exp.json index b93a4720f..9436c78f1 100644 --- a/e2etests/testdata/stable/grid_icon/elk/board.exp.json +++ b/e2etests/testdata/stable/grid_icon/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -21,6 +29,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -62,6 +71,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -103,6 +113,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -156,6 +167,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -197,6 +209,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -238,6 +251,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -282,6 +296,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -335,6 +350,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -376,6 +392,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -417,6 +434,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -458,6 +476,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -502,6 +521,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -555,6 +575,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -596,6 +617,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -637,6 +659,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -678,6 +701,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -719,6 +743,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -763,6 +788,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -803,6 +829,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -844,6 +871,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -897,6 +925,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -938,6 +967,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -979,6 +1009,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1023,6 +1054,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1075,6 +1107,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1116,6 +1149,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1157,6 +1191,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1198,6 +1233,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1241,6 +1277,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/grid_icon/elk/sketch.exp.svg b/e2etests/testdata/stable/grid_icon/elk/sketch.exp.svg index 7ac76decb..944d416dd 100644 --- a/e2etests/testdata/stable/grid_icon/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_icon/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -grid w/ container + icongrid + icongrid + icon w/ containerabcdabcdabcdabcdabcdb childb childb child + .d2-526712847 .fill-N1{fill:#0A0F25;} + .d2-526712847 .fill-N2{fill:#676C7E;} + .d2-526712847 .fill-N3{fill:#9499AB;} + .d2-526712847 .fill-N4{fill:#CFD2DD;} + .d2-526712847 .fill-N5{fill:#DEE1EB;} + .d2-526712847 .fill-N6{fill:#EEF1F8;} + .d2-526712847 .fill-N7{fill:#FFFFFF;} + .d2-526712847 .fill-B1{fill:#0D32B2;} + .d2-526712847 .fill-B2{fill:#0D32B2;} + .d2-526712847 .fill-B3{fill:#E3E9FD;} + .d2-526712847 .fill-B4{fill:#E3E9FD;} + .d2-526712847 .fill-B5{fill:#EDF0FD;} + .d2-526712847 .fill-B6{fill:#F7F8FE;} + .d2-526712847 .fill-AA2{fill:#4A6FF3;} + .d2-526712847 .fill-AA4{fill:#EDF0FD;} + .d2-526712847 .fill-AA5{fill:#F7F8FE;} + .d2-526712847 .fill-AB4{fill:#EDF0FD;} + .d2-526712847 .fill-AB5{fill:#F7F8FE;} + .d2-526712847 .stroke-N1{stroke:#0A0F25;} + .d2-526712847 .stroke-N2{stroke:#676C7E;} + .d2-526712847 .stroke-N3{stroke:#9499AB;} + .d2-526712847 .stroke-N4{stroke:#CFD2DD;} + .d2-526712847 .stroke-N5{stroke:#DEE1EB;} + .d2-526712847 .stroke-N6{stroke:#EEF1F8;} + .d2-526712847 .stroke-N7{stroke:#FFFFFF;} + .d2-526712847 .stroke-B1{stroke:#0D32B2;} + .d2-526712847 .stroke-B2{stroke:#0D32B2;} + .d2-526712847 .stroke-B3{stroke:#E3E9FD;} + .d2-526712847 .stroke-B4{stroke:#E3E9FD;} + .d2-526712847 .stroke-B5{stroke:#EDF0FD;} + .d2-526712847 .stroke-B6{stroke:#F7F8FE;} + .d2-526712847 .stroke-AA2{stroke:#4A6FF3;} + .d2-526712847 .stroke-AA4{stroke:#EDF0FD;} + .d2-526712847 .stroke-AA5{stroke:#F7F8FE;} + .d2-526712847 .stroke-AB4{stroke:#EDF0FD;} + .d2-526712847 .stroke-AB5{stroke:#F7F8FE;} + .d2-526712847 .background-color-N1{background-color:#0A0F25;} + .d2-526712847 .background-color-N2{background-color:#676C7E;} + .d2-526712847 .background-color-N3{background-color:#9499AB;} + .d2-526712847 .background-color-N4{background-color:#CFD2DD;} + .d2-526712847 .background-color-N5{background-color:#DEE1EB;} + .d2-526712847 .background-color-N6{background-color:#EEF1F8;} + .d2-526712847 .background-color-N7{background-color:#FFFFFF;} + .d2-526712847 .background-color-B1{background-color:#0D32B2;} + .d2-526712847 .background-color-B2{background-color:#0D32B2;} + .d2-526712847 .background-color-B3{background-color:#E3E9FD;} + .d2-526712847 .background-color-B4{background-color:#E3E9FD;} + .d2-526712847 .background-color-B5{background-color:#EDF0FD;} + .d2-526712847 .background-color-B6{background-color:#F7F8FE;} + .d2-526712847 .background-color-AA2{background-color:#4A6FF3;} + .d2-526712847 .background-color-AA4{background-color:#EDF0FD;} + .d2-526712847 .background-color-AA5{background-color:#F7F8FE;} + .d2-526712847 .background-color-AB4{background-color:#EDF0FD;} + .d2-526712847 .background-color-AB5{background-color:#F7F8FE;} + .d2-526712847 .color-N1{color:#0A0F25;} + .d2-526712847 .color-N2{color:#676C7E;} + .d2-526712847 .color-N3{color:#9499AB;} + .d2-526712847 .color-N4{color:#CFD2DD;} + .d2-526712847 .color-N5{color:#DEE1EB;} + .d2-526712847 .color-N6{color:#EEF1F8;} + .d2-526712847 .color-N7{color:#FFFFFF;} + .d2-526712847 .color-B1{color:#0D32B2;} + .d2-526712847 .color-B2{color:#0D32B2;} + .d2-526712847 .color-B3{color:#E3E9FD;} + .d2-526712847 .color-B4{color:#E3E9FD;} + .d2-526712847 .color-B5{color:#EDF0FD;} + .d2-526712847 .color-B6{color:#F7F8FE;} + .d2-526712847 .color-AA2{color:#4A6FF3;} + .d2-526712847 .color-AA4{color:#EDF0FD;} + .d2-526712847 .color-AA5{color:#F7F8FE;} + .d2-526712847 .color-AB4{color:#EDF0FD;} + .d2-526712847 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-526712847);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-526712847);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-526712847);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-526712847);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-526712847);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-526712847);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-526712847);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-526712847);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-526712847);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-526712847);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-526712847);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-526712847);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-526712847);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-526712847);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-526712847);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-526712847);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-526712847);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-526712847);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>grid w/ container + icongrid + icongrid + icon w/ containerabcdabcdabcdabcdabcdb childb childb child - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_label_positions/dagre/board.exp.json b/e2etests/testdata/stable/grid_label_positions/dagre/board.exp.json index a089e0b7d..9076ee2f8 100644 --- a/e2etests/testdata/stable/grid_label_positions/dagre/board.exp.json +++ b/e2etests/testdata/stable/grid_label_positions/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -98,6 +108,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -139,6 +150,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -180,6 +192,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -221,6 +234,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -262,6 +276,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -303,6 +318,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -344,6 +360,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -385,6 +402,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -426,6 +444,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -467,6 +486,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -508,6 +528,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -549,6 +570,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -590,6 +612,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -631,6 +654,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -672,6 +696,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -713,6 +738,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -754,6 +780,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -795,6 +822,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -836,6 +864,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -877,6 +906,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -918,6 +948,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -959,6 +990,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1000,6 +1032,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1041,6 +1074,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1082,6 +1116,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1123,6 +1158,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1164,6 +1200,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1205,6 +1242,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1246,6 +1284,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1287,6 +1326,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1328,6 +1368,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1369,6 +1410,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1410,6 +1452,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1451,6 +1494,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1491,6 +1535,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1531,6 +1576,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1572,6 +1618,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1613,6 +1660,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1654,6 +1702,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1695,6 +1744,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1736,6 +1786,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1777,6 +1828,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1818,6 +1870,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1859,6 +1912,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1900,6 +1954,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1941,6 +1996,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1982,6 +2038,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2023,6 +2080,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2064,6 +2122,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2105,6 +2164,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2146,6 +2206,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2187,6 +2248,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2228,6 +2290,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2269,6 +2332,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2310,6 +2374,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2351,6 +2416,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2392,6 +2458,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2433,6 +2500,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2474,6 +2542,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2515,6 +2584,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2556,6 +2626,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2597,6 +2668,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2638,6 +2710,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2679,6 +2752,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2720,6 +2794,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2761,6 +2836,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2802,6 +2878,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2843,6 +2920,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2884,6 +2962,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2925,6 +3004,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2966,6 +3046,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3007,6 +3088,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3048,6 +3130,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3089,6 +3172,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3130,6 +3214,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3171,6 +3256,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3212,6 +3298,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3253,6 +3340,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3294,6 +3382,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3335,6 +3424,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3376,6 +3466,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3417,6 +3508,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3458,6 +3550,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3499,6 +3592,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3540,6 +3634,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3581,6 +3676,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3622,6 +3718,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3663,6 +3760,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3704,6 +3802,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3745,6 +3844,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3786,6 +3886,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3826,6 +3927,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3867,6 +3969,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3908,6 +4011,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3949,6 +4053,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3990,6 +4095,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4031,6 +4137,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4072,6 +4179,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4113,6 +4221,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4154,6 +4263,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4195,6 +4305,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4236,6 +4347,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4277,6 +4389,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4318,6 +4431,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4359,6 +4473,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4400,6 +4515,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4441,6 +4557,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4482,6 +4599,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4523,6 +4641,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4564,6 +4683,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4605,6 +4725,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4646,6 +4767,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4687,6 +4809,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4728,6 +4851,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4769,6 +4893,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4810,6 +4935,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4851,6 +4977,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4892,6 +5019,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4933,6 +5061,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4974,6 +5103,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5015,6 +5145,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5056,6 +5187,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5097,6 +5229,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5138,6 +5271,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5179,6 +5313,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5220,6 +5355,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5261,6 +5397,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5302,6 +5439,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5343,6 +5481,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5384,6 +5523,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5425,6 +5565,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5466,6 +5607,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5507,6 +5649,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5548,6 +5691,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5589,6 +5733,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5630,6 +5775,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5671,6 +5817,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5712,6 +5859,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5753,6 +5901,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5794,6 +5943,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5835,6 +5985,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5876,6 +6027,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5917,6 +6069,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5958,6 +6111,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5999,6 +6153,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6040,6 +6195,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6081,6 +6237,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6121,6 +6278,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6162,6 +6320,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6203,6 +6362,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6244,6 +6404,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6285,6 +6446,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6326,6 +6488,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6367,6 +6530,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6408,6 +6572,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6449,6 +6614,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6490,6 +6656,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6531,6 +6698,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6572,6 +6740,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6613,6 +6782,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6654,6 +6824,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6695,6 +6866,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6736,6 +6908,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6777,6 +6950,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6818,6 +6992,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6859,6 +7034,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6900,6 +7076,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6941,6 +7118,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6982,6 +7160,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7023,6 +7202,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7064,6 +7244,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7105,6 +7286,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7146,6 +7328,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7187,6 +7370,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7228,6 +7412,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7269,6 +7454,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7310,6 +7496,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7351,6 +7538,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7392,6 +7580,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7433,6 +7622,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7474,6 +7664,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7515,6 +7706,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7556,6 +7748,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7597,6 +7790,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7638,6 +7832,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7679,6 +7874,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7720,6 +7916,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7761,6 +7958,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7802,6 +8000,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7843,6 +8042,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7884,6 +8084,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7925,6 +8126,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7966,6 +8168,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8007,6 +8210,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8048,6 +8252,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8089,6 +8294,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8130,6 +8336,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8171,6 +8378,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8212,6 +8420,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8253,6 +8462,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8294,6 +8504,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8335,6 +8546,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8376,6 +8588,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8416,6 +8629,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8456,6 +8670,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8497,6 +8712,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8538,6 +8754,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8579,6 +8796,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8620,6 +8838,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8661,6 +8880,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8702,6 +8922,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8743,6 +8964,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8784,6 +9006,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8825,6 +9048,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8866,6 +9090,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8907,6 +9132,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8948,6 +9174,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8989,6 +9216,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9030,6 +9258,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9071,6 +9300,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9112,6 +9342,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9153,6 +9384,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9194,6 +9426,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9235,6 +9468,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9276,6 +9510,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9317,6 +9552,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9358,6 +9594,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9399,6 +9636,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9440,6 +9678,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9481,6 +9720,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9522,6 +9762,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9563,6 +9804,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9604,6 +9846,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9645,6 +9888,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9686,6 +9930,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9727,6 +9972,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9768,6 +10014,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9809,6 +10056,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9859,6 +10107,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 942.5, @@ -9906,6 +10155,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 942.5, @@ -9953,6 +10203,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 942.5, @@ -10000,6 +10251,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 942.5, @@ -10040,6 +10292,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/grid_label_positions/dagre/sketch.exp.svg b/e2etests/testdata/stable/grid_label_positions/dagre/sketch.exp.svg index 26f01d9b4..d1b2c769d 100644 --- a/e2etests/testdata/stable/grid_label_positions/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_label_positions/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -OutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopTopLeftTopCenterTopRightOutsideRightTopOutsideLeftCenterCenterLeftCenterCenterCenterRightOutsideRightCenterOutsideLeftBottomBottomLeftBottomCenterBottomRightOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij + .d2-368790956 .fill-N1{fill:#0A0F25;} + .d2-368790956 .fill-N2{fill:#676C7E;} + .d2-368790956 .fill-N3{fill:#9499AB;} + .d2-368790956 .fill-N4{fill:#CFD2DD;} + .d2-368790956 .fill-N5{fill:#DEE1EB;} + .d2-368790956 .fill-N6{fill:#EEF1F8;} + .d2-368790956 .fill-N7{fill:#FFFFFF;} + .d2-368790956 .fill-B1{fill:#0D32B2;} + .d2-368790956 .fill-B2{fill:#0D32B2;} + .d2-368790956 .fill-B3{fill:#E3E9FD;} + .d2-368790956 .fill-B4{fill:#E3E9FD;} + .d2-368790956 .fill-B5{fill:#EDF0FD;} + .d2-368790956 .fill-B6{fill:#F7F8FE;} + .d2-368790956 .fill-AA2{fill:#4A6FF3;} + .d2-368790956 .fill-AA4{fill:#EDF0FD;} + .d2-368790956 .fill-AA5{fill:#F7F8FE;} + .d2-368790956 .fill-AB4{fill:#EDF0FD;} + .d2-368790956 .fill-AB5{fill:#F7F8FE;} + .d2-368790956 .stroke-N1{stroke:#0A0F25;} + .d2-368790956 .stroke-N2{stroke:#676C7E;} + .d2-368790956 .stroke-N3{stroke:#9499AB;} + .d2-368790956 .stroke-N4{stroke:#CFD2DD;} + .d2-368790956 .stroke-N5{stroke:#DEE1EB;} + .d2-368790956 .stroke-N6{stroke:#EEF1F8;} + .d2-368790956 .stroke-N7{stroke:#FFFFFF;} + .d2-368790956 .stroke-B1{stroke:#0D32B2;} + .d2-368790956 .stroke-B2{stroke:#0D32B2;} + .d2-368790956 .stroke-B3{stroke:#E3E9FD;} + .d2-368790956 .stroke-B4{stroke:#E3E9FD;} + .d2-368790956 .stroke-B5{stroke:#EDF0FD;} + .d2-368790956 .stroke-B6{stroke:#F7F8FE;} + .d2-368790956 .stroke-AA2{stroke:#4A6FF3;} + .d2-368790956 .stroke-AA4{stroke:#EDF0FD;} + .d2-368790956 .stroke-AA5{stroke:#F7F8FE;} + .d2-368790956 .stroke-AB4{stroke:#EDF0FD;} + .d2-368790956 .stroke-AB5{stroke:#F7F8FE;} + .d2-368790956 .background-color-N1{background-color:#0A0F25;} + .d2-368790956 .background-color-N2{background-color:#676C7E;} + .d2-368790956 .background-color-N3{background-color:#9499AB;} + .d2-368790956 .background-color-N4{background-color:#CFD2DD;} + .d2-368790956 .background-color-N5{background-color:#DEE1EB;} + .d2-368790956 .background-color-N6{background-color:#EEF1F8;} + .d2-368790956 .background-color-N7{background-color:#FFFFFF;} + .d2-368790956 .background-color-B1{background-color:#0D32B2;} + .d2-368790956 .background-color-B2{background-color:#0D32B2;} + .d2-368790956 .background-color-B3{background-color:#E3E9FD;} + .d2-368790956 .background-color-B4{background-color:#E3E9FD;} + .d2-368790956 .background-color-B5{background-color:#EDF0FD;} + .d2-368790956 .background-color-B6{background-color:#F7F8FE;} + .d2-368790956 .background-color-AA2{background-color:#4A6FF3;} + .d2-368790956 .background-color-AA4{background-color:#EDF0FD;} + .d2-368790956 .background-color-AA5{background-color:#F7F8FE;} + .d2-368790956 .background-color-AB4{background-color:#EDF0FD;} + .d2-368790956 .background-color-AB5{background-color:#F7F8FE;} + .d2-368790956 .color-N1{color:#0A0F25;} + .d2-368790956 .color-N2{color:#676C7E;} + .d2-368790956 .color-N3{color:#9499AB;} + .d2-368790956 .color-N4{color:#CFD2DD;} + .d2-368790956 .color-N5{color:#DEE1EB;} + .d2-368790956 .color-N6{color:#EEF1F8;} + .d2-368790956 .color-N7{color:#FFFFFF;} + .d2-368790956 .color-B1{color:#0D32B2;} + .d2-368790956 .color-B2{color:#0D32B2;} + .d2-368790956 .color-B3{color:#E3E9FD;} + .d2-368790956 .color-B4{color:#E3E9FD;} + .d2-368790956 .color-B5{color:#EDF0FD;} + .d2-368790956 .color-B6{color:#F7F8FE;} + .d2-368790956 .color-AA2{color:#4A6FF3;} + .d2-368790956 .color-AA4{color:#EDF0FD;} + .d2-368790956 .color-AA5{color:#F7F8FE;} + .d2-368790956 .color-AB4{color:#EDF0FD;} + .d2-368790956 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-368790956);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-368790956);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-368790956);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-368790956);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-368790956);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-368790956);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-368790956);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-368790956);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-368790956);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-368790956);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-368790956);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-368790956);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-368790956);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-368790956);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-368790956);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-368790956);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-368790956);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-368790956);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>OutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopTopLeftTopCenterTopRightOutsideRightTopOutsideLeftCenterCenterLeftCenterCenterCenterRightOutsideRightCenterOutsideLeftBottomBottomLeftBottomCenterBottomRightOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_label_positions/elk/board.exp.json b/e2etests/testdata/stable/grid_label_positions/elk/board.exp.json index 30297164f..5168f65ef 100644 --- a/e2etests/testdata/stable/grid_label_positions/elk/board.exp.json +++ b/e2etests/testdata/stable/grid_label_positions/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -98,6 +108,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -139,6 +150,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -180,6 +192,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -221,6 +234,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -262,6 +276,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -303,6 +318,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -344,6 +360,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -385,6 +402,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -426,6 +444,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -467,6 +486,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -508,6 +528,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -549,6 +570,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -590,6 +612,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -631,6 +654,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -672,6 +696,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -713,6 +738,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -754,6 +780,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -795,6 +822,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -836,6 +864,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -877,6 +906,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -918,6 +948,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -959,6 +990,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1000,6 +1032,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1041,6 +1074,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1082,6 +1116,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1123,6 +1158,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1164,6 +1200,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1205,6 +1242,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1246,6 +1284,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1287,6 +1326,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1328,6 +1368,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1369,6 +1410,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1410,6 +1452,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1451,6 +1494,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1491,6 +1535,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1531,6 +1576,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1572,6 +1618,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1613,6 +1660,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1654,6 +1702,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1695,6 +1744,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1736,6 +1786,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1777,6 +1828,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1818,6 +1870,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1859,6 +1912,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1900,6 +1954,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1941,6 +1996,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1982,6 +2038,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2023,6 +2080,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2064,6 +2122,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2105,6 +2164,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2146,6 +2206,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2187,6 +2248,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2228,6 +2290,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2269,6 +2332,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2310,6 +2374,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2351,6 +2416,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2392,6 +2458,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2433,6 +2500,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2474,6 +2542,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2515,6 +2584,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2556,6 +2626,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2597,6 +2668,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2638,6 +2710,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2679,6 +2752,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2720,6 +2794,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2761,6 +2836,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2802,6 +2878,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2843,6 +2920,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2884,6 +2962,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2925,6 +3004,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2966,6 +3046,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3007,6 +3088,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3048,6 +3130,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3089,6 +3172,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3130,6 +3214,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3171,6 +3256,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3212,6 +3298,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3253,6 +3340,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3294,6 +3382,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3335,6 +3424,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3376,6 +3466,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3417,6 +3508,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3458,6 +3550,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3499,6 +3592,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3540,6 +3634,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3581,6 +3676,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3622,6 +3718,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3663,6 +3760,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3704,6 +3802,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3745,6 +3844,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3786,6 +3886,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3826,6 +3927,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3867,6 +3969,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3908,6 +4011,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3949,6 +4053,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3990,6 +4095,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4031,6 +4137,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4072,6 +4179,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4113,6 +4221,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4154,6 +4263,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4195,6 +4305,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4236,6 +4347,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4277,6 +4389,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4318,6 +4431,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4359,6 +4473,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4400,6 +4515,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4441,6 +4557,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4482,6 +4599,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4523,6 +4641,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4564,6 +4683,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4605,6 +4725,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4646,6 +4767,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4687,6 +4809,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4728,6 +4851,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4769,6 +4893,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4810,6 +4935,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4851,6 +4977,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4892,6 +5019,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4933,6 +5061,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4974,6 +5103,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5015,6 +5145,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5056,6 +5187,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5097,6 +5229,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5138,6 +5271,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5179,6 +5313,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5220,6 +5355,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5261,6 +5397,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5302,6 +5439,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5343,6 +5481,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5384,6 +5523,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5425,6 +5565,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5466,6 +5607,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5507,6 +5649,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5548,6 +5691,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5589,6 +5733,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5630,6 +5775,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5671,6 +5817,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5712,6 +5859,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5753,6 +5901,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5794,6 +5943,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5835,6 +5985,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5876,6 +6027,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5917,6 +6069,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5958,6 +6111,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5999,6 +6153,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6040,6 +6195,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6081,6 +6237,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6121,6 +6278,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6162,6 +6320,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6203,6 +6362,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6244,6 +6404,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6285,6 +6446,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6326,6 +6488,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6367,6 +6530,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6408,6 +6572,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6449,6 +6614,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6490,6 +6656,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6531,6 +6698,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6572,6 +6740,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6613,6 +6782,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6654,6 +6824,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6695,6 +6866,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6736,6 +6908,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6777,6 +6950,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6818,6 +6992,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6859,6 +7034,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6900,6 +7076,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6941,6 +7118,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6982,6 +7160,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7023,6 +7202,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7064,6 +7244,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7105,6 +7286,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7146,6 +7328,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7187,6 +7370,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7228,6 +7412,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7269,6 +7454,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7310,6 +7496,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7351,6 +7538,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7392,6 +7580,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7433,6 +7622,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7474,6 +7664,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7515,6 +7706,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7556,6 +7748,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7597,6 +7790,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7638,6 +7832,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7679,6 +7874,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7720,6 +7916,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7761,6 +7958,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7802,6 +8000,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7843,6 +8042,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7884,6 +8084,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7925,6 +8126,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7966,6 +8168,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8007,6 +8210,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8048,6 +8252,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8089,6 +8294,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8130,6 +8336,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8171,6 +8378,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8212,6 +8420,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8253,6 +8462,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8294,6 +8504,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8335,6 +8546,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8376,6 +8588,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8416,6 +8629,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8456,6 +8670,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8497,6 +8712,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8538,6 +8754,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8579,6 +8796,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8620,6 +8838,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8661,6 +8880,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8702,6 +8922,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8743,6 +8964,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8784,6 +9006,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8825,6 +9048,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8866,6 +9090,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8907,6 +9132,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8948,6 +9174,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8989,6 +9216,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9030,6 +9258,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9071,6 +9300,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9112,6 +9342,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9153,6 +9384,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9194,6 +9426,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9235,6 +9468,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9276,6 +9510,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9317,6 +9552,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9358,6 +9594,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9399,6 +9636,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9440,6 +9678,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9481,6 +9720,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9522,6 +9762,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9563,6 +9804,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9604,6 +9846,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9645,6 +9888,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9686,6 +9930,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9727,6 +9972,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9768,6 +10014,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9809,6 +10056,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9859,6 +10107,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1087.5, @@ -9897,6 +10146,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1087.5, @@ -9935,6 +10185,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1087.5, @@ -9973,6 +10224,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1087.5, @@ -10004,6 +10256,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/grid_label_positions/elk/sketch.exp.svg b/e2etests/testdata/stable/grid_label_positions/elk/sketch.exp.svg index d311c2ee3..4de0763e4 100644 --- a/e2etests/testdata/stable/grid_label_positions/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_label_positions/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -OutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopTopLeftTopCenterTopRightOutsideRightTopOutsideLeftCenterCenterLeftCenterCenterCenterRightOutsideRightCenterOutsideLeftBottomBottomLeftBottomCenterBottomRightOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij + .d2-1046269778 .fill-N1{fill:#0A0F25;} + .d2-1046269778 .fill-N2{fill:#676C7E;} + .d2-1046269778 .fill-N3{fill:#9499AB;} + .d2-1046269778 .fill-N4{fill:#CFD2DD;} + .d2-1046269778 .fill-N5{fill:#DEE1EB;} + .d2-1046269778 .fill-N6{fill:#EEF1F8;} + .d2-1046269778 .fill-N7{fill:#FFFFFF;} + .d2-1046269778 .fill-B1{fill:#0D32B2;} + .d2-1046269778 .fill-B2{fill:#0D32B2;} + .d2-1046269778 .fill-B3{fill:#E3E9FD;} + .d2-1046269778 .fill-B4{fill:#E3E9FD;} + .d2-1046269778 .fill-B5{fill:#EDF0FD;} + .d2-1046269778 .fill-B6{fill:#F7F8FE;} + .d2-1046269778 .fill-AA2{fill:#4A6FF3;} + .d2-1046269778 .fill-AA4{fill:#EDF0FD;} + .d2-1046269778 .fill-AA5{fill:#F7F8FE;} + .d2-1046269778 .fill-AB4{fill:#EDF0FD;} + .d2-1046269778 .fill-AB5{fill:#F7F8FE;} + .d2-1046269778 .stroke-N1{stroke:#0A0F25;} + .d2-1046269778 .stroke-N2{stroke:#676C7E;} + .d2-1046269778 .stroke-N3{stroke:#9499AB;} + .d2-1046269778 .stroke-N4{stroke:#CFD2DD;} + .d2-1046269778 .stroke-N5{stroke:#DEE1EB;} + .d2-1046269778 .stroke-N6{stroke:#EEF1F8;} + .d2-1046269778 .stroke-N7{stroke:#FFFFFF;} + .d2-1046269778 .stroke-B1{stroke:#0D32B2;} + .d2-1046269778 .stroke-B2{stroke:#0D32B2;} + .d2-1046269778 .stroke-B3{stroke:#E3E9FD;} + .d2-1046269778 .stroke-B4{stroke:#E3E9FD;} + .d2-1046269778 .stroke-B5{stroke:#EDF0FD;} + .d2-1046269778 .stroke-B6{stroke:#F7F8FE;} + .d2-1046269778 .stroke-AA2{stroke:#4A6FF3;} + .d2-1046269778 .stroke-AA4{stroke:#EDF0FD;} + .d2-1046269778 .stroke-AA5{stroke:#F7F8FE;} + .d2-1046269778 .stroke-AB4{stroke:#EDF0FD;} + .d2-1046269778 .stroke-AB5{stroke:#F7F8FE;} + .d2-1046269778 .background-color-N1{background-color:#0A0F25;} + .d2-1046269778 .background-color-N2{background-color:#676C7E;} + .d2-1046269778 .background-color-N3{background-color:#9499AB;} + .d2-1046269778 .background-color-N4{background-color:#CFD2DD;} + .d2-1046269778 .background-color-N5{background-color:#DEE1EB;} + .d2-1046269778 .background-color-N6{background-color:#EEF1F8;} + .d2-1046269778 .background-color-N7{background-color:#FFFFFF;} + .d2-1046269778 .background-color-B1{background-color:#0D32B2;} + .d2-1046269778 .background-color-B2{background-color:#0D32B2;} + .d2-1046269778 .background-color-B3{background-color:#E3E9FD;} + .d2-1046269778 .background-color-B4{background-color:#E3E9FD;} + .d2-1046269778 .background-color-B5{background-color:#EDF0FD;} + .d2-1046269778 .background-color-B6{background-color:#F7F8FE;} + .d2-1046269778 .background-color-AA2{background-color:#4A6FF3;} + .d2-1046269778 .background-color-AA4{background-color:#EDF0FD;} + .d2-1046269778 .background-color-AA5{background-color:#F7F8FE;} + .d2-1046269778 .background-color-AB4{background-color:#EDF0FD;} + .d2-1046269778 .background-color-AB5{background-color:#F7F8FE;} + .d2-1046269778 .color-N1{color:#0A0F25;} + .d2-1046269778 .color-N2{color:#676C7E;} + .d2-1046269778 .color-N3{color:#9499AB;} + .d2-1046269778 .color-N4{color:#CFD2DD;} + .d2-1046269778 .color-N5{color:#DEE1EB;} + .d2-1046269778 .color-N6{color:#EEF1F8;} + .d2-1046269778 .color-N7{color:#FFFFFF;} + .d2-1046269778 .color-B1{color:#0D32B2;} + .d2-1046269778 .color-B2{color:#0D32B2;} + .d2-1046269778 .color-B3{color:#E3E9FD;} + .d2-1046269778 .color-B4{color:#E3E9FD;} + .d2-1046269778 .color-B5{color:#EDF0FD;} + .d2-1046269778 .color-B6{color:#F7F8FE;} + .d2-1046269778 .color-AA2{color:#4A6FF3;} + .d2-1046269778 .color-AA4{color:#EDF0FD;} + .d2-1046269778 .color-AA5{color:#F7F8FE;} + .d2-1046269778 .color-AB4{color:#EDF0FD;} + .d2-1046269778 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1046269778);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1046269778);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1046269778);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1046269778);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1046269778);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1046269778);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1046269778);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1046269778);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1046269778);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1046269778);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1046269778);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1046269778);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1046269778);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1046269778);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1046269778);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1046269778);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1046269778);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1046269778);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>OutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopTopLeftTopCenterTopRightOutsideRightTopOutsideLeftCenterCenterLeftCenterCenterCenterRightOutsideRightCenterOutsideLeftBottomBottomLeftBottomCenterBottomRightOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_large_checkered/dagre/board.exp.json b/e2etests/testdata/stable/grid_large_checkered/dagre/board.exp.json index 311c148ab..9489fa09a 100644 --- a/e2etests/testdata/stable/grid_large_checkered/dagre/board.exp.json +++ b/e2etests/testdata/stable/grid_large_checkered/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -21,6 +29,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -64,6 +73,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -107,6 +117,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -150,6 +161,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -193,6 +205,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -236,6 +249,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -279,6 +293,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -322,6 +337,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -365,6 +381,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -408,6 +425,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -451,6 +469,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -494,6 +513,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -537,6 +557,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -580,6 +601,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -623,6 +645,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -666,6 +689,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -709,6 +733,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -752,6 +777,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -795,6 +821,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -838,6 +865,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -881,6 +909,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -924,6 +953,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -967,6 +997,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1010,6 +1041,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1053,6 +1085,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1096,6 +1129,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1139,6 +1173,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1182,6 +1217,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1225,6 +1261,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1268,6 +1305,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1311,6 +1349,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1354,6 +1393,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1397,6 +1437,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1440,6 +1481,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1483,6 +1525,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1526,6 +1569,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1569,6 +1613,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1612,6 +1657,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1655,6 +1701,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1698,6 +1745,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1741,6 +1789,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1784,6 +1833,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1827,6 +1877,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1870,6 +1921,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1913,6 +1965,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1956,6 +2009,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1999,6 +2053,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2042,6 +2097,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2085,6 +2141,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2128,6 +2185,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2171,6 +2229,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2214,6 +2273,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2257,6 +2317,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2300,6 +2361,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2343,6 +2405,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2386,6 +2449,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2429,6 +2493,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2472,6 +2537,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2515,6 +2581,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2558,6 +2625,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2601,6 +2669,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2644,6 +2713,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2687,6 +2757,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2730,6 +2801,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2773,6 +2845,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2816,6 +2889,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2859,6 +2933,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2902,6 +2977,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2945,6 +3021,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2988,6 +3065,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3031,6 +3109,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3074,6 +3153,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3117,6 +3197,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3160,6 +3241,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3203,6 +3285,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3246,6 +3329,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3289,6 +3373,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3332,6 +3417,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3375,6 +3461,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3418,6 +3505,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3461,6 +3549,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3504,6 +3593,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3547,6 +3637,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3590,6 +3681,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3633,6 +3725,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3676,6 +3769,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3719,6 +3813,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3762,6 +3857,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3805,6 +3901,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3848,6 +3945,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3891,6 +3989,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3934,6 +4033,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3977,6 +4077,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4020,6 +4121,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4063,6 +4165,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4106,6 +4209,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4149,6 +4253,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4192,6 +4297,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4235,6 +4341,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4278,6 +4385,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4321,6 +4429,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4364,6 +4473,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4407,6 +4517,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4450,6 +4561,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4493,6 +4605,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4536,6 +4649,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4579,6 +4693,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4622,6 +4737,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4665,6 +4781,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4708,6 +4825,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4751,6 +4869,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4794,6 +4913,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4837,6 +4957,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4880,6 +5001,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4923,6 +5045,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4966,6 +5089,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5009,6 +5133,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5052,6 +5177,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5095,6 +5221,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5138,6 +5265,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5181,6 +5309,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5224,6 +5353,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5267,6 +5397,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5310,6 +5441,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5353,6 +5485,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5396,6 +5529,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5439,6 +5573,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5482,6 +5617,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5525,6 +5661,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5568,6 +5705,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5611,6 +5749,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5654,6 +5793,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5697,6 +5837,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5740,6 +5881,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5783,6 +5925,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5826,6 +5969,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5869,6 +6013,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5912,6 +6057,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5955,6 +6101,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5998,6 +6145,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6041,6 +6189,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6084,6 +6233,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6127,6 +6277,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6170,6 +6321,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6213,6 +6365,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6256,6 +6409,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6299,6 +6453,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6342,6 +6497,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6385,6 +6541,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6428,6 +6585,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6471,6 +6629,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6514,6 +6673,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6557,6 +6717,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6600,6 +6761,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6643,6 +6805,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6686,6 +6849,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6729,6 +6893,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6772,6 +6937,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6815,6 +6981,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6858,6 +7025,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6901,6 +7069,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6944,6 +7113,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6987,6 +7157,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7030,6 +7201,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7073,6 +7245,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7116,6 +7289,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7159,6 +7333,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7202,6 +7377,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7245,6 +7421,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7288,6 +7465,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7331,6 +7509,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7374,6 +7553,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7417,6 +7597,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7460,6 +7641,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7503,6 +7685,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7546,6 +7729,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7589,6 +7773,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7632,6 +7817,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7675,6 +7861,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7718,6 +7905,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7761,6 +7949,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7804,6 +7993,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7847,6 +8037,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7890,6 +8081,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7933,6 +8125,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7976,6 +8169,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8019,6 +8213,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8062,6 +8257,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8105,6 +8301,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8148,6 +8345,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8191,6 +8389,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8234,6 +8433,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8277,6 +8477,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8320,6 +8521,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8363,6 +8565,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8406,6 +8609,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8449,6 +8653,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8492,6 +8697,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8535,6 +8741,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8578,6 +8785,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8621,6 +8829,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8664,6 +8873,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8707,6 +8917,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8750,6 +8961,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8793,6 +9005,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8836,6 +9049,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8879,6 +9093,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8922,6 +9137,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8965,6 +9181,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9008,6 +9225,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9051,6 +9269,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9094,6 +9313,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9137,6 +9357,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9180,6 +9401,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9223,6 +9445,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9266,6 +9489,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9309,6 +9533,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9352,6 +9577,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9395,6 +9621,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9438,6 +9665,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9481,6 +9709,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9524,6 +9753,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9567,6 +9797,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9610,6 +9841,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9653,6 +9885,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9696,6 +9929,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9739,6 +9973,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9782,6 +10017,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9825,6 +10061,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9868,6 +10105,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9911,6 +10149,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9954,6 +10193,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9997,6 +10237,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -10040,6 +10281,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -10083,6 +10325,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -10126,6 +10369,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -10169,6 +10413,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -10212,6 +10457,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -10255,6 +10501,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -10298,6 +10545,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -10341,6 +10589,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -10384,6 +10633,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -10427,6 +10677,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -10470,6 +10721,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -10513,6 +10765,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -10556,6 +10809,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -10599,6 +10853,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -10642,6 +10897,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -10685,6 +10941,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -10728,6 +10985,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -10771,6 +11029,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -10814,6 +11073,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -10857,6 +11117,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -10900,6 +11161,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -10943,6 +11205,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -10986,6 +11249,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -11029,6 +11293,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -11072,6 +11337,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -11115,6 +11381,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -11158,6 +11425,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -11201,6 +11469,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -11244,6 +11513,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -11287,6 +11557,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -11330,6 +11601,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -11373,6 +11645,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -11416,6 +11689,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -11459,6 +11733,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -11502,6 +11777,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -11545,6 +11821,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -11588,6 +11865,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -11631,6 +11909,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -11674,6 +11953,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -11717,6 +11997,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -11760,6 +12041,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -11803,6 +12085,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -11846,6 +12129,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -11889,6 +12173,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -11932,6 +12217,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -11975,6 +12261,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -12018,6 +12305,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -12061,6 +12349,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -12104,6 +12393,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -12147,6 +12437,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -12190,6 +12481,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -12233,6 +12525,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -12276,6 +12569,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -12319,6 +12613,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -12362,6 +12657,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -12405,6 +12701,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -12448,6 +12745,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -12491,6 +12789,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -12534,6 +12833,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -12577,6 +12877,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -12620,6 +12921,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -12663,6 +12965,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -12706,6 +13009,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -12749,6 +13053,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -12792,6 +13097,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -12835,6 +13141,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -12878,6 +13185,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -12921,6 +13229,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -12964,6 +13273,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13007,6 +13317,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13050,6 +13361,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13093,6 +13405,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13136,6 +13449,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13179,6 +13493,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13222,6 +13537,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13265,6 +13581,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13308,6 +13625,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13351,6 +13669,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13394,6 +13713,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13437,6 +13757,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13480,6 +13801,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13523,6 +13845,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13566,6 +13889,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13609,6 +13933,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13652,6 +13977,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13695,6 +14021,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13738,6 +14065,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13781,6 +14109,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13824,6 +14153,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13867,6 +14197,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13910,6 +14241,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13953,6 +14285,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13996,6 +14329,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -14039,6 +14373,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -14082,6 +14417,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -14125,6 +14461,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -14168,6 +14505,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -14211,6 +14549,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -14254,6 +14593,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -14297,6 +14637,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -14340,6 +14681,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -14383,6 +14725,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -14426,6 +14769,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -14469,6 +14813,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -14512,6 +14857,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -14555,6 +14901,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -14598,6 +14945,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -14641,6 +14989,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -14684,6 +15033,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -14727,6 +15077,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -14770,6 +15121,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -14813,6 +15165,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -14856,6 +15209,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -14899,6 +15253,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -14942,6 +15297,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -14985,6 +15341,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -15028,6 +15385,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -15071,6 +15429,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -15114,6 +15473,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -15157,6 +15517,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -15200,6 +15561,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -15243,6 +15605,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -15286,6 +15649,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -15329,6 +15693,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -15372,6 +15737,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -15415,6 +15781,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -15458,6 +15825,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -15501,6 +15869,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -15544,6 +15913,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -15587,6 +15957,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -15630,6 +16001,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -15673,6 +16045,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -15716,6 +16089,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -15759,6 +16133,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -15802,6 +16177,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -15845,6 +16221,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -15888,6 +16265,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -15931,6 +16309,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -15974,6 +16353,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -16017,6 +16397,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -16060,6 +16441,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -16103,6 +16485,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -16146,6 +16529,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -16189,6 +16573,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -16232,6 +16617,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -16275,6 +16661,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -16318,6 +16705,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -16361,6 +16749,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -16404,6 +16793,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -16447,6 +16837,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -16490,6 +16881,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -16533,6 +16925,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -16576,6 +16969,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -16619,6 +17013,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -16662,6 +17057,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -16705,6 +17101,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -16748,6 +17145,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -16791,6 +17189,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -16834,6 +17233,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -16877,6 +17277,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -16920,6 +17321,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -16963,6 +17365,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17006,6 +17409,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17049,6 +17453,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17092,6 +17497,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17135,6 +17541,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17178,6 +17585,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17221,6 +17629,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17264,6 +17673,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17307,6 +17717,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17350,6 +17761,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17393,6 +17805,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17436,6 +17849,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17479,6 +17893,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17522,6 +17937,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17565,6 +17981,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17608,6 +18025,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17651,6 +18069,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17694,6 +18113,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17737,6 +18157,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17780,6 +18201,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17823,6 +18245,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17866,6 +18289,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17909,6 +18333,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17952,6 +18377,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17995,6 +18421,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -18038,6 +18465,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -18081,6 +18509,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -18124,6 +18553,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -18167,6 +18597,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -18210,6 +18641,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -18253,6 +18685,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -18296,6 +18729,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -18339,6 +18773,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -18382,6 +18817,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -18425,6 +18861,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -18468,6 +18905,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -18511,6 +18949,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -18554,6 +18993,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -18597,6 +19037,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -18640,6 +19081,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -18683,6 +19125,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -18726,6 +19169,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -18769,6 +19213,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -18812,6 +19257,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -18855,6 +19301,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -18898,6 +19345,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -18941,6 +19389,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -18983,6 +19432,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/grid_large_checkered/dagre/sketch.exp.svg b/e2etests/testdata/stable/grid_large_checkered/dagre/sketch.exp.svg index dbec33afd..64dc774a0 100644 --- a/e2etests/testdata/stable/grid_large_checkered/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_large_checkered/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ - + .d2-2580690818 .fill-N1{fill:#0A0F25;} + .d2-2580690818 .fill-N2{fill:#676C7E;} + .d2-2580690818 .fill-N3{fill:#9499AB;} + .d2-2580690818 .fill-N4{fill:#CFD2DD;} + .d2-2580690818 .fill-N5{fill:#DEE1EB;} + .d2-2580690818 .fill-N6{fill:#EEF1F8;} + .d2-2580690818 .fill-N7{fill:#FFFFFF;} + .d2-2580690818 .fill-B1{fill:#0D32B2;} + .d2-2580690818 .fill-B2{fill:#0D32B2;} + .d2-2580690818 .fill-B3{fill:#E3E9FD;} + .d2-2580690818 .fill-B4{fill:#E3E9FD;} + .d2-2580690818 .fill-B5{fill:#EDF0FD;} + .d2-2580690818 .fill-B6{fill:#F7F8FE;} + .d2-2580690818 .fill-AA2{fill:#4A6FF3;} + .d2-2580690818 .fill-AA4{fill:#EDF0FD;} + .d2-2580690818 .fill-AA5{fill:#F7F8FE;} + .d2-2580690818 .fill-AB4{fill:#EDF0FD;} + .d2-2580690818 .fill-AB5{fill:#F7F8FE;} + .d2-2580690818 .stroke-N1{stroke:#0A0F25;} + .d2-2580690818 .stroke-N2{stroke:#676C7E;} + .d2-2580690818 .stroke-N3{stroke:#9499AB;} + .d2-2580690818 .stroke-N4{stroke:#CFD2DD;} + .d2-2580690818 .stroke-N5{stroke:#DEE1EB;} + .d2-2580690818 .stroke-N6{stroke:#EEF1F8;} + .d2-2580690818 .stroke-N7{stroke:#FFFFFF;} + .d2-2580690818 .stroke-B1{stroke:#0D32B2;} + .d2-2580690818 .stroke-B2{stroke:#0D32B2;} + .d2-2580690818 .stroke-B3{stroke:#E3E9FD;} + .d2-2580690818 .stroke-B4{stroke:#E3E9FD;} + .d2-2580690818 .stroke-B5{stroke:#EDF0FD;} + .d2-2580690818 .stroke-B6{stroke:#F7F8FE;} + .d2-2580690818 .stroke-AA2{stroke:#4A6FF3;} + .d2-2580690818 .stroke-AA4{stroke:#EDF0FD;} + .d2-2580690818 .stroke-AA5{stroke:#F7F8FE;} + .d2-2580690818 .stroke-AB4{stroke:#EDF0FD;} + .d2-2580690818 .stroke-AB5{stroke:#F7F8FE;} + .d2-2580690818 .background-color-N1{background-color:#0A0F25;} + .d2-2580690818 .background-color-N2{background-color:#676C7E;} + .d2-2580690818 .background-color-N3{background-color:#9499AB;} + .d2-2580690818 .background-color-N4{background-color:#CFD2DD;} + .d2-2580690818 .background-color-N5{background-color:#DEE1EB;} + .d2-2580690818 .background-color-N6{background-color:#EEF1F8;} + .d2-2580690818 .background-color-N7{background-color:#FFFFFF;} + .d2-2580690818 .background-color-B1{background-color:#0D32B2;} + .d2-2580690818 .background-color-B2{background-color:#0D32B2;} + .d2-2580690818 .background-color-B3{background-color:#E3E9FD;} + .d2-2580690818 .background-color-B4{background-color:#E3E9FD;} + .d2-2580690818 .background-color-B5{background-color:#EDF0FD;} + .d2-2580690818 .background-color-B6{background-color:#F7F8FE;} + .d2-2580690818 .background-color-AA2{background-color:#4A6FF3;} + .d2-2580690818 .background-color-AA4{background-color:#EDF0FD;} + .d2-2580690818 .background-color-AA5{background-color:#F7F8FE;} + .d2-2580690818 .background-color-AB4{background-color:#EDF0FD;} + .d2-2580690818 .background-color-AB5{background-color:#F7F8FE;} + .d2-2580690818 .color-N1{color:#0A0F25;} + .d2-2580690818 .color-N2{color:#676C7E;} + .d2-2580690818 .color-N3{color:#9499AB;} + .d2-2580690818 .color-N4{color:#CFD2DD;} + .d2-2580690818 .color-N5{color:#DEE1EB;} + .d2-2580690818 .color-N6{color:#EEF1F8;} + .d2-2580690818 .color-N7{color:#FFFFFF;} + .d2-2580690818 .color-B1{color:#0D32B2;} + .d2-2580690818 .color-B2{color:#0D32B2;} + .d2-2580690818 .color-B3{color:#E3E9FD;} + .d2-2580690818 .color-B4{color:#E3E9FD;} + .d2-2580690818 .color-B5{color:#EDF0FD;} + .d2-2580690818 .color-B6{color:#F7F8FE;} + .d2-2580690818 .color-AA2{color:#4A6FF3;} + .d2-2580690818 .color-AA4{color:#EDF0FD;} + .d2-2580690818 .color-AA5{color:#F7F8FE;} + .d2-2580690818 .color-AB4{color:#EDF0FD;} + .d2-2580690818 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2580690818);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2580690818);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2580690818);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2580690818);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2580690818);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2580690818);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2580690818);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2580690818);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2580690818);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2580690818);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2580690818);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2580690818);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2580690818);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2580690818);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2580690818);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2580690818);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2580690818);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2580690818);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_large_checkered/elk/board.exp.json b/e2etests/testdata/stable/grid_large_checkered/elk/board.exp.json index 311c148ab..9489fa09a 100644 --- a/e2etests/testdata/stable/grid_large_checkered/elk/board.exp.json +++ b/e2etests/testdata/stable/grid_large_checkered/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -21,6 +29,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -64,6 +73,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -107,6 +117,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -150,6 +161,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -193,6 +205,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -236,6 +249,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -279,6 +293,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -322,6 +337,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -365,6 +381,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -408,6 +425,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -451,6 +469,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -494,6 +513,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -537,6 +557,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -580,6 +601,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -623,6 +645,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -666,6 +689,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -709,6 +733,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -752,6 +777,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -795,6 +821,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -838,6 +865,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -881,6 +909,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -924,6 +953,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -967,6 +997,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1010,6 +1041,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1053,6 +1085,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1096,6 +1129,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1139,6 +1173,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1182,6 +1217,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1225,6 +1261,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1268,6 +1305,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1311,6 +1349,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1354,6 +1393,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1397,6 +1437,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1440,6 +1481,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1483,6 +1525,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1526,6 +1569,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1569,6 +1613,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1612,6 +1657,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1655,6 +1701,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1698,6 +1745,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1741,6 +1789,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1784,6 +1833,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1827,6 +1877,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1870,6 +1921,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1913,6 +1965,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1956,6 +2009,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1999,6 +2053,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2042,6 +2097,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2085,6 +2141,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2128,6 +2185,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2171,6 +2229,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2214,6 +2273,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2257,6 +2317,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2300,6 +2361,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2343,6 +2405,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2386,6 +2449,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2429,6 +2493,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2472,6 +2537,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2515,6 +2581,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2558,6 +2625,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2601,6 +2669,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2644,6 +2713,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2687,6 +2757,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2730,6 +2801,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2773,6 +2845,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2816,6 +2889,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2859,6 +2933,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2902,6 +2977,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2945,6 +3021,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2988,6 +3065,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3031,6 +3109,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3074,6 +3153,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3117,6 +3197,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3160,6 +3241,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3203,6 +3285,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3246,6 +3329,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3289,6 +3373,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3332,6 +3417,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3375,6 +3461,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3418,6 +3505,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3461,6 +3549,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3504,6 +3593,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3547,6 +3637,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3590,6 +3681,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3633,6 +3725,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3676,6 +3769,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3719,6 +3813,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3762,6 +3857,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3805,6 +3901,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3848,6 +3945,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3891,6 +3989,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3934,6 +4033,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3977,6 +4077,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4020,6 +4121,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4063,6 +4165,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4106,6 +4209,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4149,6 +4253,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4192,6 +4297,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4235,6 +4341,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4278,6 +4385,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4321,6 +4429,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4364,6 +4473,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4407,6 +4517,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4450,6 +4561,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4493,6 +4605,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4536,6 +4649,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4579,6 +4693,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4622,6 +4737,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4665,6 +4781,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4708,6 +4825,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4751,6 +4869,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4794,6 +4913,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4837,6 +4957,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4880,6 +5001,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4923,6 +5045,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4966,6 +5089,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5009,6 +5133,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5052,6 +5177,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5095,6 +5221,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5138,6 +5265,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5181,6 +5309,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5224,6 +5353,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5267,6 +5397,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5310,6 +5441,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5353,6 +5485,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5396,6 +5529,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5439,6 +5573,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5482,6 +5617,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5525,6 +5661,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5568,6 +5705,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5611,6 +5749,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5654,6 +5793,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5697,6 +5837,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5740,6 +5881,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5783,6 +5925,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5826,6 +5969,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5869,6 +6013,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5912,6 +6057,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5955,6 +6101,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5998,6 +6145,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6041,6 +6189,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6084,6 +6233,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6127,6 +6277,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6170,6 +6321,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6213,6 +6365,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6256,6 +6409,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6299,6 +6453,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6342,6 +6497,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6385,6 +6541,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6428,6 +6585,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6471,6 +6629,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6514,6 +6673,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6557,6 +6717,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6600,6 +6761,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6643,6 +6805,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6686,6 +6849,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6729,6 +6893,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6772,6 +6937,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6815,6 +6981,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6858,6 +7025,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6901,6 +7069,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6944,6 +7113,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6987,6 +7157,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7030,6 +7201,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7073,6 +7245,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7116,6 +7289,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7159,6 +7333,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7202,6 +7377,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7245,6 +7421,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7288,6 +7465,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7331,6 +7509,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7374,6 +7553,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7417,6 +7597,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7460,6 +7641,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7503,6 +7685,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7546,6 +7729,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7589,6 +7773,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7632,6 +7817,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7675,6 +7861,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7718,6 +7905,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7761,6 +7949,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7804,6 +7993,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7847,6 +8037,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7890,6 +8081,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7933,6 +8125,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -7976,6 +8169,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8019,6 +8213,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8062,6 +8257,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8105,6 +8301,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8148,6 +8345,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8191,6 +8389,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8234,6 +8433,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8277,6 +8477,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8320,6 +8521,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8363,6 +8565,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8406,6 +8609,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8449,6 +8653,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8492,6 +8697,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8535,6 +8741,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8578,6 +8785,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8621,6 +8829,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8664,6 +8873,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8707,6 +8917,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8750,6 +8961,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8793,6 +9005,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8836,6 +9049,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8879,6 +9093,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8922,6 +9137,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -8965,6 +9181,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9008,6 +9225,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9051,6 +9269,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9094,6 +9313,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9137,6 +9357,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9180,6 +9401,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9223,6 +9445,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9266,6 +9489,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9309,6 +9533,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9352,6 +9577,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9395,6 +9621,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9438,6 +9665,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9481,6 +9709,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9524,6 +9753,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9567,6 +9797,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9610,6 +9841,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9653,6 +9885,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9696,6 +9929,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9739,6 +9973,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9782,6 +10017,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9825,6 +10061,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9868,6 +10105,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9911,6 +10149,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9954,6 +10193,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -9997,6 +10237,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -10040,6 +10281,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -10083,6 +10325,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -10126,6 +10369,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -10169,6 +10413,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -10212,6 +10457,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -10255,6 +10501,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -10298,6 +10545,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -10341,6 +10589,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -10384,6 +10633,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -10427,6 +10677,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -10470,6 +10721,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -10513,6 +10765,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -10556,6 +10809,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -10599,6 +10853,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -10642,6 +10897,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -10685,6 +10941,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -10728,6 +10985,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -10771,6 +11029,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -10814,6 +11073,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -10857,6 +11117,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -10900,6 +11161,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -10943,6 +11205,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -10986,6 +11249,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -11029,6 +11293,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -11072,6 +11337,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -11115,6 +11381,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -11158,6 +11425,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -11201,6 +11469,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -11244,6 +11513,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -11287,6 +11557,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -11330,6 +11601,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -11373,6 +11645,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -11416,6 +11689,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -11459,6 +11733,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -11502,6 +11777,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -11545,6 +11821,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -11588,6 +11865,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -11631,6 +11909,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -11674,6 +11953,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -11717,6 +11997,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -11760,6 +12041,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -11803,6 +12085,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -11846,6 +12129,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -11889,6 +12173,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -11932,6 +12217,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -11975,6 +12261,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -12018,6 +12305,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -12061,6 +12349,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -12104,6 +12393,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -12147,6 +12437,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -12190,6 +12481,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -12233,6 +12525,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -12276,6 +12569,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -12319,6 +12613,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -12362,6 +12657,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -12405,6 +12701,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -12448,6 +12745,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -12491,6 +12789,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -12534,6 +12833,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -12577,6 +12877,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -12620,6 +12921,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -12663,6 +12965,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -12706,6 +13009,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -12749,6 +13053,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -12792,6 +13097,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -12835,6 +13141,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -12878,6 +13185,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -12921,6 +13229,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -12964,6 +13273,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13007,6 +13317,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13050,6 +13361,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13093,6 +13405,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13136,6 +13449,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13179,6 +13493,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13222,6 +13537,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13265,6 +13581,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13308,6 +13625,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13351,6 +13669,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13394,6 +13713,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13437,6 +13757,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13480,6 +13801,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13523,6 +13845,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13566,6 +13889,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13609,6 +13933,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13652,6 +13977,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13695,6 +14021,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13738,6 +14065,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13781,6 +14109,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13824,6 +14153,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13867,6 +14197,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13910,6 +14241,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13953,6 +14285,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -13996,6 +14329,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -14039,6 +14373,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -14082,6 +14417,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -14125,6 +14461,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -14168,6 +14505,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -14211,6 +14549,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -14254,6 +14593,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -14297,6 +14637,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -14340,6 +14681,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -14383,6 +14725,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -14426,6 +14769,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -14469,6 +14813,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -14512,6 +14857,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -14555,6 +14901,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -14598,6 +14945,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -14641,6 +14989,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -14684,6 +15033,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -14727,6 +15077,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -14770,6 +15121,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -14813,6 +15165,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -14856,6 +15209,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -14899,6 +15253,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -14942,6 +15297,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -14985,6 +15341,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -15028,6 +15385,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -15071,6 +15429,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -15114,6 +15473,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -15157,6 +15517,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -15200,6 +15561,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -15243,6 +15605,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -15286,6 +15649,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -15329,6 +15693,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -15372,6 +15737,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -15415,6 +15781,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -15458,6 +15825,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -15501,6 +15869,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -15544,6 +15913,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -15587,6 +15957,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -15630,6 +16001,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -15673,6 +16045,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -15716,6 +16089,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -15759,6 +16133,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -15802,6 +16177,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -15845,6 +16221,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -15888,6 +16265,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -15931,6 +16309,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -15974,6 +16353,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -16017,6 +16397,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -16060,6 +16441,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -16103,6 +16485,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -16146,6 +16529,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -16189,6 +16573,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -16232,6 +16617,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -16275,6 +16661,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -16318,6 +16705,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -16361,6 +16749,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -16404,6 +16793,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -16447,6 +16837,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -16490,6 +16881,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -16533,6 +16925,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -16576,6 +16969,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -16619,6 +17013,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -16662,6 +17057,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -16705,6 +17101,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -16748,6 +17145,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -16791,6 +17189,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -16834,6 +17233,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -16877,6 +17277,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -16920,6 +17321,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -16963,6 +17365,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17006,6 +17409,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17049,6 +17453,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17092,6 +17497,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17135,6 +17541,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17178,6 +17585,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17221,6 +17629,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17264,6 +17673,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17307,6 +17717,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17350,6 +17761,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17393,6 +17805,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17436,6 +17849,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17479,6 +17893,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17522,6 +17937,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17565,6 +17981,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17608,6 +18025,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17651,6 +18069,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17694,6 +18113,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17737,6 +18157,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17780,6 +18201,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17823,6 +18245,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17866,6 +18289,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17909,6 +18333,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17952,6 +18377,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -17995,6 +18421,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -18038,6 +18465,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -18081,6 +18509,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -18124,6 +18553,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -18167,6 +18597,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -18210,6 +18641,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -18253,6 +18685,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -18296,6 +18729,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -18339,6 +18773,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -18382,6 +18817,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -18425,6 +18861,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -18468,6 +18905,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -18511,6 +18949,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -18554,6 +18993,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -18597,6 +19037,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -18640,6 +19081,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -18683,6 +19125,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -18726,6 +19169,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -18769,6 +19213,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -18812,6 +19257,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -18855,6 +19301,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -18898,6 +19345,7 @@ "borderRadius": 0, "fill": "white", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -18941,6 +19389,7 @@ "borderRadius": 0, "fill": "black", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -18983,6 +19432,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/grid_large_checkered/elk/sketch.exp.svg b/e2etests/testdata/stable/grid_large_checkered/elk/sketch.exp.svg index dbec33afd..64dc774a0 100644 --- a/e2etests/testdata/stable/grid_large_checkered/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_large_checkered/elk/sketch.exp.svg @@ -1,4 +1,4 @@ - + .d2-2580690818 .fill-N1{fill:#0A0F25;} + .d2-2580690818 .fill-N2{fill:#676C7E;} + .d2-2580690818 .fill-N3{fill:#9499AB;} + .d2-2580690818 .fill-N4{fill:#CFD2DD;} + .d2-2580690818 .fill-N5{fill:#DEE1EB;} + .d2-2580690818 .fill-N6{fill:#EEF1F8;} + .d2-2580690818 .fill-N7{fill:#FFFFFF;} + .d2-2580690818 .fill-B1{fill:#0D32B2;} + .d2-2580690818 .fill-B2{fill:#0D32B2;} + .d2-2580690818 .fill-B3{fill:#E3E9FD;} + .d2-2580690818 .fill-B4{fill:#E3E9FD;} + .d2-2580690818 .fill-B5{fill:#EDF0FD;} + .d2-2580690818 .fill-B6{fill:#F7F8FE;} + .d2-2580690818 .fill-AA2{fill:#4A6FF3;} + .d2-2580690818 .fill-AA4{fill:#EDF0FD;} + .d2-2580690818 .fill-AA5{fill:#F7F8FE;} + .d2-2580690818 .fill-AB4{fill:#EDF0FD;} + .d2-2580690818 .fill-AB5{fill:#F7F8FE;} + .d2-2580690818 .stroke-N1{stroke:#0A0F25;} + .d2-2580690818 .stroke-N2{stroke:#676C7E;} + .d2-2580690818 .stroke-N3{stroke:#9499AB;} + .d2-2580690818 .stroke-N4{stroke:#CFD2DD;} + .d2-2580690818 .stroke-N5{stroke:#DEE1EB;} + .d2-2580690818 .stroke-N6{stroke:#EEF1F8;} + .d2-2580690818 .stroke-N7{stroke:#FFFFFF;} + .d2-2580690818 .stroke-B1{stroke:#0D32B2;} + .d2-2580690818 .stroke-B2{stroke:#0D32B2;} + .d2-2580690818 .stroke-B3{stroke:#E3E9FD;} + .d2-2580690818 .stroke-B4{stroke:#E3E9FD;} + .d2-2580690818 .stroke-B5{stroke:#EDF0FD;} + .d2-2580690818 .stroke-B6{stroke:#F7F8FE;} + .d2-2580690818 .stroke-AA2{stroke:#4A6FF3;} + .d2-2580690818 .stroke-AA4{stroke:#EDF0FD;} + .d2-2580690818 .stroke-AA5{stroke:#F7F8FE;} + .d2-2580690818 .stroke-AB4{stroke:#EDF0FD;} + .d2-2580690818 .stroke-AB5{stroke:#F7F8FE;} + .d2-2580690818 .background-color-N1{background-color:#0A0F25;} + .d2-2580690818 .background-color-N2{background-color:#676C7E;} + .d2-2580690818 .background-color-N3{background-color:#9499AB;} + .d2-2580690818 .background-color-N4{background-color:#CFD2DD;} + .d2-2580690818 .background-color-N5{background-color:#DEE1EB;} + .d2-2580690818 .background-color-N6{background-color:#EEF1F8;} + .d2-2580690818 .background-color-N7{background-color:#FFFFFF;} + .d2-2580690818 .background-color-B1{background-color:#0D32B2;} + .d2-2580690818 .background-color-B2{background-color:#0D32B2;} + .d2-2580690818 .background-color-B3{background-color:#E3E9FD;} + .d2-2580690818 .background-color-B4{background-color:#E3E9FD;} + .d2-2580690818 .background-color-B5{background-color:#EDF0FD;} + .d2-2580690818 .background-color-B6{background-color:#F7F8FE;} + .d2-2580690818 .background-color-AA2{background-color:#4A6FF3;} + .d2-2580690818 .background-color-AA4{background-color:#EDF0FD;} + .d2-2580690818 .background-color-AA5{background-color:#F7F8FE;} + .d2-2580690818 .background-color-AB4{background-color:#EDF0FD;} + .d2-2580690818 .background-color-AB5{background-color:#F7F8FE;} + .d2-2580690818 .color-N1{color:#0A0F25;} + .d2-2580690818 .color-N2{color:#676C7E;} + .d2-2580690818 .color-N3{color:#9499AB;} + .d2-2580690818 .color-N4{color:#CFD2DD;} + .d2-2580690818 .color-N5{color:#DEE1EB;} + .d2-2580690818 .color-N6{color:#EEF1F8;} + .d2-2580690818 .color-N7{color:#FFFFFF;} + .d2-2580690818 .color-B1{color:#0D32B2;} + .d2-2580690818 .color-B2{color:#0D32B2;} + .d2-2580690818 .color-B3{color:#E3E9FD;} + .d2-2580690818 .color-B4{color:#E3E9FD;} + .d2-2580690818 .color-B5{color:#EDF0FD;} + .d2-2580690818 .color-B6{color:#F7F8FE;} + .d2-2580690818 .color-AA2{color:#4A6FF3;} + .d2-2580690818 .color-AA4{color:#EDF0FD;} + .d2-2580690818 .color-AA5{color:#F7F8FE;} + .d2-2580690818 .color-AB4{color:#EDF0FD;} + .d2-2580690818 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2580690818);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2580690818);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2580690818);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2580690818);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2580690818);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2580690818);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2580690818);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2580690818);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2580690818);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2580690818);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2580690818);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2580690818);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2580690818);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2580690818);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2580690818);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2580690818);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2580690818);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2580690818);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_nested/dagre/board.exp.json b/e2etests/testdata/stable/grid_nested/dagre/board.exp.json index 99cef9427..fd9aed2dd 100644 --- a/e2etests/testdata/stable/grid_nested/dagre/board.exp.json +++ b/e2etests/testdata/stable/grid_nested/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -21,6 +29,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -62,6 +71,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -103,6 +113,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -144,6 +155,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -185,6 +197,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -226,6 +239,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -270,6 +284,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -311,6 +326,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -352,6 +368,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -393,6 +410,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -434,6 +452,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -475,6 +494,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -516,6 +536,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -557,6 +578,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -598,6 +620,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -639,6 +662,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -680,6 +704,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -721,6 +746,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -765,6 +791,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -806,6 +833,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -850,6 +878,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -891,6 +920,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -932,6 +962,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -973,6 +1004,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1014,6 +1046,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1055,6 +1088,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1096,6 +1130,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1141,6 +1176,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1182,6 +1218,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1227,6 +1264,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1268,6 +1306,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1309,6 +1348,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1354,6 +1394,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1395,6 +1436,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1436,6 +1478,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1477,6 +1520,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1522,6 +1566,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1567,6 +1612,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1608,6 +1654,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1649,6 +1696,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1690,6 +1738,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1731,6 +1780,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1772,6 +1822,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1813,6 +1864,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1854,6 +1906,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1895,6 +1948,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1936,6 +1990,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1977,6 +2032,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2020,6 +2076,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/grid_nested/dagre/sketch.exp.svg b/e2etests/testdata/stable/grid_nested/dagre/sketch.exp.svg index 69c184d4a..6d9efb31d 100644 --- a/e2etests/testdata/stable/grid_nested/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_nested/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -grid w/ containergrid w/ nested containersgrid in gridgrid w/ grid w/ gridabcdabcdabcdabcdb childb 1abcdabcdb 2b 2aabcdb 3b 3aabcdb 4b 3aabcd + .d2-899422249 .fill-N1{fill:#0A0F25;} + .d2-899422249 .fill-N2{fill:#676C7E;} + .d2-899422249 .fill-N3{fill:#9499AB;} + .d2-899422249 .fill-N4{fill:#CFD2DD;} + .d2-899422249 .fill-N5{fill:#DEE1EB;} + .d2-899422249 .fill-N6{fill:#EEF1F8;} + .d2-899422249 .fill-N7{fill:#FFFFFF;} + .d2-899422249 .fill-B1{fill:#0D32B2;} + .d2-899422249 .fill-B2{fill:#0D32B2;} + .d2-899422249 .fill-B3{fill:#E3E9FD;} + .d2-899422249 .fill-B4{fill:#E3E9FD;} + .d2-899422249 .fill-B5{fill:#EDF0FD;} + .d2-899422249 .fill-B6{fill:#F7F8FE;} + .d2-899422249 .fill-AA2{fill:#4A6FF3;} + .d2-899422249 .fill-AA4{fill:#EDF0FD;} + .d2-899422249 .fill-AA5{fill:#F7F8FE;} + .d2-899422249 .fill-AB4{fill:#EDF0FD;} + .d2-899422249 .fill-AB5{fill:#F7F8FE;} + .d2-899422249 .stroke-N1{stroke:#0A0F25;} + .d2-899422249 .stroke-N2{stroke:#676C7E;} + .d2-899422249 .stroke-N3{stroke:#9499AB;} + .d2-899422249 .stroke-N4{stroke:#CFD2DD;} + .d2-899422249 .stroke-N5{stroke:#DEE1EB;} + .d2-899422249 .stroke-N6{stroke:#EEF1F8;} + .d2-899422249 .stroke-N7{stroke:#FFFFFF;} + .d2-899422249 .stroke-B1{stroke:#0D32B2;} + .d2-899422249 .stroke-B2{stroke:#0D32B2;} + .d2-899422249 .stroke-B3{stroke:#E3E9FD;} + .d2-899422249 .stroke-B4{stroke:#E3E9FD;} + .d2-899422249 .stroke-B5{stroke:#EDF0FD;} + .d2-899422249 .stroke-B6{stroke:#F7F8FE;} + .d2-899422249 .stroke-AA2{stroke:#4A6FF3;} + .d2-899422249 .stroke-AA4{stroke:#EDF0FD;} + .d2-899422249 .stroke-AA5{stroke:#F7F8FE;} + .d2-899422249 .stroke-AB4{stroke:#EDF0FD;} + .d2-899422249 .stroke-AB5{stroke:#F7F8FE;} + .d2-899422249 .background-color-N1{background-color:#0A0F25;} + .d2-899422249 .background-color-N2{background-color:#676C7E;} + .d2-899422249 .background-color-N3{background-color:#9499AB;} + .d2-899422249 .background-color-N4{background-color:#CFD2DD;} + .d2-899422249 .background-color-N5{background-color:#DEE1EB;} + .d2-899422249 .background-color-N6{background-color:#EEF1F8;} + .d2-899422249 .background-color-N7{background-color:#FFFFFF;} + .d2-899422249 .background-color-B1{background-color:#0D32B2;} + .d2-899422249 .background-color-B2{background-color:#0D32B2;} + .d2-899422249 .background-color-B3{background-color:#E3E9FD;} + .d2-899422249 .background-color-B4{background-color:#E3E9FD;} + .d2-899422249 .background-color-B5{background-color:#EDF0FD;} + .d2-899422249 .background-color-B6{background-color:#F7F8FE;} + .d2-899422249 .background-color-AA2{background-color:#4A6FF3;} + .d2-899422249 .background-color-AA4{background-color:#EDF0FD;} + .d2-899422249 .background-color-AA5{background-color:#F7F8FE;} + .d2-899422249 .background-color-AB4{background-color:#EDF0FD;} + .d2-899422249 .background-color-AB5{background-color:#F7F8FE;} + .d2-899422249 .color-N1{color:#0A0F25;} + .d2-899422249 .color-N2{color:#676C7E;} + .d2-899422249 .color-N3{color:#9499AB;} + .d2-899422249 .color-N4{color:#CFD2DD;} + .d2-899422249 .color-N5{color:#DEE1EB;} + .d2-899422249 .color-N6{color:#EEF1F8;} + .d2-899422249 .color-N7{color:#FFFFFF;} + .d2-899422249 .color-B1{color:#0D32B2;} + .d2-899422249 .color-B2{color:#0D32B2;} + .d2-899422249 .color-B3{color:#E3E9FD;} + .d2-899422249 .color-B4{color:#E3E9FD;} + .d2-899422249 .color-B5{color:#EDF0FD;} + .d2-899422249 .color-B6{color:#F7F8FE;} + .d2-899422249 .color-AA2{color:#4A6FF3;} + .d2-899422249 .color-AA4{color:#EDF0FD;} + .d2-899422249 .color-AA5{color:#F7F8FE;} + .d2-899422249 .color-AB4{color:#EDF0FD;} + .d2-899422249 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-899422249);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-899422249);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-899422249);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-899422249);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-899422249);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-899422249);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-899422249);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-899422249);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-899422249);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-899422249);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-899422249);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-899422249);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-899422249);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-899422249);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-899422249);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-899422249);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-899422249);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-899422249);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>grid w/ containergrid w/ nested containersgrid in gridgrid w/ grid w/ gridabcdabcdabcdabcdb childb 1abcdabcdb 2b 2aabcdb 3b 3aabcdb 4b 3aabcd - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_nested/elk/board.exp.json b/e2etests/testdata/stable/grid_nested/elk/board.exp.json index d91b1c82a..73bb2834b 100644 --- a/e2etests/testdata/stable/grid_nested/elk/board.exp.json +++ b/e2etests/testdata/stable/grid_nested/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -21,6 +29,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -62,6 +71,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -103,6 +113,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -144,6 +155,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -185,6 +197,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -226,6 +239,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -270,6 +284,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -311,6 +326,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -352,6 +368,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -393,6 +410,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -434,6 +452,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -475,6 +494,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -516,6 +536,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -557,6 +578,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -598,6 +620,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -639,6 +662,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -680,6 +704,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -721,6 +746,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -765,6 +791,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -806,6 +833,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -850,6 +878,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -891,6 +920,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -932,6 +962,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -973,6 +1004,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1014,6 +1046,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1055,6 +1088,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1096,6 +1130,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1141,6 +1176,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1182,6 +1218,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1227,6 +1264,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1268,6 +1306,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1309,6 +1348,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1354,6 +1394,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1395,6 +1436,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1436,6 +1478,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1477,6 +1520,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1522,6 +1566,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1567,6 +1612,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1608,6 +1654,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1649,6 +1696,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1690,6 +1738,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1731,6 +1780,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1772,6 +1822,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1813,6 +1864,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1854,6 +1906,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1895,6 +1948,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1936,6 +1990,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1977,6 +2032,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2020,6 +2076,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/grid_nested/elk/sketch.exp.svg b/e2etests/testdata/stable/grid_nested/elk/sketch.exp.svg index 4a8af9457..6ac63808c 100644 --- a/e2etests/testdata/stable/grid_nested/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_nested/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -grid w/ containergrid w/ nested containersgrid in gridgrid w/ grid w/ gridabcdabcdabcdabcdb childb 1abcdabcdb 2b 2aabcdb 3b 3aabcdb 4b 3aabcd + .d2-597577078 .fill-N1{fill:#0A0F25;} + .d2-597577078 .fill-N2{fill:#676C7E;} + .d2-597577078 .fill-N3{fill:#9499AB;} + .d2-597577078 .fill-N4{fill:#CFD2DD;} + .d2-597577078 .fill-N5{fill:#DEE1EB;} + .d2-597577078 .fill-N6{fill:#EEF1F8;} + .d2-597577078 .fill-N7{fill:#FFFFFF;} + .d2-597577078 .fill-B1{fill:#0D32B2;} + .d2-597577078 .fill-B2{fill:#0D32B2;} + .d2-597577078 .fill-B3{fill:#E3E9FD;} + .d2-597577078 .fill-B4{fill:#E3E9FD;} + .d2-597577078 .fill-B5{fill:#EDF0FD;} + .d2-597577078 .fill-B6{fill:#F7F8FE;} + .d2-597577078 .fill-AA2{fill:#4A6FF3;} + .d2-597577078 .fill-AA4{fill:#EDF0FD;} + .d2-597577078 .fill-AA5{fill:#F7F8FE;} + .d2-597577078 .fill-AB4{fill:#EDF0FD;} + .d2-597577078 .fill-AB5{fill:#F7F8FE;} + .d2-597577078 .stroke-N1{stroke:#0A0F25;} + .d2-597577078 .stroke-N2{stroke:#676C7E;} + .d2-597577078 .stroke-N3{stroke:#9499AB;} + .d2-597577078 .stroke-N4{stroke:#CFD2DD;} + .d2-597577078 .stroke-N5{stroke:#DEE1EB;} + .d2-597577078 .stroke-N6{stroke:#EEF1F8;} + .d2-597577078 .stroke-N7{stroke:#FFFFFF;} + .d2-597577078 .stroke-B1{stroke:#0D32B2;} + .d2-597577078 .stroke-B2{stroke:#0D32B2;} + .d2-597577078 .stroke-B3{stroke:#E3E9FD;} + .d2-597577078 .stroke-B4{stroke:#E3E9FD;} + .d2-597577078 .stroke-B5{stroke:#EDF0FD;} + .d2-597577078 .stroke-B6{stroke:#F7F8FE;} + .d2-597577078 .stroke-AA2{stroke:#4A6FF3;} + .d2-597577078 .stroke-AA4{stroke:#EDF0FD;} + .d2-597577078 .stroke-AA5{stroke:#F7F8FE;} + .d2-597577078 .stroke-AB4{stroke:#EDF0FD;} + .d2-597577078 .stroke-AB5{stroke:#F7F8FE;} + .d2-597577078 .background-color-N1{background-color:#0A0F25;} + .d2-597577078 .background-color-N2{background-color:#676C7E;} + .d2-597577078 .background-color-N3{background-color:#9499AB;} + .d2-597577078 .background-color-N4{background-color:#CFD2DD;} + .d2-597577078 .background-color-N5{background-color:#DEE1EB;} + .d2-597577078 .background-color-N6{background-color:#EEF1F8;} + .d2-597577078 .background-color-N7{background-color:#FFFFFF;} + .d2-597577078 .background-color-B1{background-color:#0D32B2;} + .d2-597577078 .background-color-B2{background-color:#0D32B2;} + .d2-597577078 .background-color-B3{background-color:#E3E9FD;} + .d2-597577078 .background-color-B4{background-color:#E3E9FD;} + .d2-597577078 .background-color-B5{background-color:#EDF0FD;} + .d2-597577078 .background-color-B6{background-color:#F7F8FE;} + .d2-597577078 .background-color-AA2{background-color:#4A6FF3;} + .d2-597577078 .background-color-AA4{background-color:#EDF0FD;} + .d2-597577078 .background-color-AA5{background-color:#F7F8FE;} + .d2-597577078 .background-color-AB4{background-color:#EDF0FD;} + .d2-597577078 .background-color-AB5{background-color:#F7F8FE;} + .d2-597577078 .color-N1{color:#0A0F25;} + .d2-597577078 .color-N2{color:#676C7E;} + .d2-597577078 .color-N3{color:#9499AB;} + .d2-597577078 .color-N4{color:#CFD2DD;} + .d2-597577078 .color-N5{color:#DEE1EB;} + .d2-597577078 .color-N6{color:#EEF1F8;} + .d2-597577078 .color-N7{color:#FFFFFF;} + .d2-597577078 .color-B1{color:#0D32B2;} + .d2-597577078 .color-B2{color:#0D32B2;} + .d2-597577078 .color-B3{color:#E3E9FD;} + .d2-597577078 .color-B4{color:#E3E9FD;} + .d2-597577078 .color-B5{color:#EDF0FD;} + .d2-597577078 .color-B6{color:#F7F8FE;} + .d2-597577078 .color-AA2{color:#4A6FF3;} + .d2-597577078 .color-AA4{color:#EDF0FD;} + .d2-597577078 .color-AA5{color:#F7F8FE;} + .d2-597577078 .color-AB4{color:#EDF0FD;} + .d2-597577078 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-597577078);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-597577078);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-597577078);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-597577078);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-597577078);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-597577078);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-597577078);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-597577078);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-597577078);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-597577078);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-597577078);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-597577078);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-597577078);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-597577078);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-597577078);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-597577078);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-597577078);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-597577078);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>grid w/ containergrid w/ nested containersgrid in gridgrid w/ grid w/ gridabcdabcdabcdabcdb childb 1abcdabcdb 2b 2aabcdb 3b 3aabcdb 4b 3aabcd - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_nested_gap0/dagre/board.exp.json b/e2etests/testdata/stable/grid_nested_gap0/dagre/board.exp.json index 76463d963..b6c81fd87 100644 --- a/e2etests/testdata/stable/grid_nested_gap0/dagre/board.exp.json +++ b/e2etests/testdata/stable/grid_nested_gap0/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "red", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -181,6 +193,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -222,6 +235,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -263,6 +277,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -304,6 +319,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -345,6 +361,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -386,6 +403,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -429,6 +447,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/grid_nested_gap0/dagre/sketch.exp.svg b/e2etests/testdata/stable/grid_nested_gap0/dagre/sketch.exp.svg index 5e17f6605..0799483c0 100644 --- a/e2etests/testdata/stable/grid_nested_gap0/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_nested_gap0/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -The UniverseFirstTwoLastD2CloudTerrastructTALAD2Cloud + .d2-556637885 .fill-N1{fill:#0A0F25;} + .d2-556637885 .fill-N2{fill:#676C7E;} + .d2-556637885 .fill-N3{fill:#9499AB;} + .d2-556637885 .fill-N4{fill:#CFD2DD;} + .d2-556637885 .fill-N5{fill:#DEE1EB;} + .d2-556637885 .fill-N6{fill:#EEF1F8;} + .d2-556637885 .fill-N7{fill:#FFFFFF;} + .d2-556637885 .fill-B1{fill:#0D32B2;} + .d2-556637885 .fill-B2{fill:#0D32B2;} + .d2-556637885 .fill-B3{fill:#E3E9FD;} + .d2-556637885 .fill-B4{fill:#E3E9FD;} + .d2-556637885 .fill-B5{fill:#EDF0FD;} + .d2-556637885 .fill-B6{fill:#F7F8FE;} + .d2-556637885 .fill-AA2{fill:#4A6FF3;} + .d2-556637885 .fill-AA4{fill:#EDF0FD;} + .d2-556637885 .fill-AA5{fill:#F7F8FE;} + .d2-556637885 .fill-AB4{fill:#EDF0FD;} + .d2-556637885 .fill-AB5{fill:#F7F8FE;} + .d2-556637885 .stroke-N1{stroke:#0A0F25;} + .d2-556637885 .stroke-N2{stroke:#676C7E;} + .d2-556637885 .stroke-N3{stroke:#9499AB;} + .d2-556637885 .stroke-N4{stroke:#CFD2DD;} + .d2-556637885 .stroke-N5{stroke:#DEE1EB;} + .d2-556637885 .stroke-N6{stroke:#EEF1F8;} + .d2-556637885 .stroke-N7{stroke:#FFFFFF;} + .d2-556637885 .stroke-B1{stroke:#0D32B2;} + .d2-556637885 .stroke-B2{stroke:#0D32B2;} + .d2-556637885 .stroke-B3{stroke:#E3E9FD;} + .d2-556637885 .stroke-B4{stroke:#E3E9FD;} + .d2-556637885 .stroke-B5{stroke:#EDF0FD;} + .d2-556637885 .stroke-B6{stroke:#F7F8FE;} + .d2-556637885 .stroke-AA2{stroke:#4A6FF3;} + .d2-556637885 .stroke-AA4{stroke:#EDF0FD;} + .d2-556637885 .stroke-AA5{stroke:#F7F8FE;} + .d2-556637885 .stroke-AB4{stroke:#EDF0FD;} + .d2-556637885 .stroke-AB5{stroke:#F7F8FE;} + .d2-556637885 .background-color-N1{background-color:#0A0F25;} + .d2-556637885 .background-color-N2{background-color:#676C7E;} + .d2-556637885 .background-color-N3{background-color:#9499AB;} + .d2-556637885 .background-color-N4{background-color:#CFD2DD;} + .d2-556637885 .background-color-N5{background-color:#DEE1EB;} + .d2-556637885 .background-color-N6{background-color:#EEF1F8;} + .d2-556637885 .background-color-N7{background-color:#FFFFFF;} + .d2-556637885 .background-color-B1{background-color:#0D32B2;} + .d2-556637885 .background-color-B2{background-color:#0D32B2;} + .d2-556637885 .background-color-B3{background-color:#E3E9FD;} + .d2-556637885 .background-color-B4{background-color:#E3E9FD;} + .d2-556637885 .background-color-B5{background-color:#EDF0FD;} + .d2-556637885 .background-color-B6{background-color:#F7F8FE;} + .d2-556637885 .background-color-AA2{background-color:#4A6FF3;} + .d2-556637885 .background-color-AA4{background-color:#EDF0FD;} + .d2-556637885 .background-color-AA5{background-color:#F7F8FE;} + .d2-556637885 .background-color-AB4{background-color:#EDF0FD;} + .d2-556637885 .background-color-AB5{background-color:#F7F8FE;} + .d2-556637885 .color-N1{color:#0A0F25;} + .d2-556637885 .color-N2{color:#676C7E;} + .d2-556637885 .color-N3{color:#9499AB;} + .d2-556637885 .color-N4{color:#CFD2DD;} + .d2-556637885 .color-N5{color:#DEE1EB;} + .d2-556637885 .color-N6{color:#EEF1F8;} + .d2-556637885 .color-N7{color:#FFFFFF;} + .d2-556637885 .color-B1{color:#0D32B2;} + .d2-556637885 .color-B2{color:#0D32B2;} + .d2-556637885 .color-B3{color:#E3E9FD;} + .d2-556637885 .color-B4{color:#E3E9FD;} + .d2-556637885 .color-B5{color:#EDF0FD;} + .d2-556637885 .color-B6{color:#F7F8FE;} + .d2-556637885 .color-AA2{color:#4A6FF3;} + .d2-556637885 .color-AA4{color:#EDF0FD;} + .d2-556637885 .color-AA5{color:#F7F8FE;} + .d2-556637885 .color-AB4{color:#EDF0FD;} + .d2-556637885 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-556637885);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-556637885);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-556637885);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-556637885);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-556637885);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-556637885);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-556637885);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-556637885);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-556637885);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-556637885);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-556637885);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-556637885);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-556637885);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-556637885);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-556637885);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-556637885);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-556637885);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-556637885);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>The UniverseFirstTwoLastD2CloudTerrastructTALAD2Cloud - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_nested_gap0/elk/board.exp.json b/e2etests/testdata/stable/grid_nested_gap0/elk/board.exp.json index 290e144de..4b7c37192 100644 --- a/e2etests/testdata/stable/grid_nested_gap0/elk/board.exp.json +++ b/e2etests/testdata/stable/grid_nested_gap0/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "red", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -181,6 +193,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -222,6 +235,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -263,6 +277,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -304,6 +319,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -345,6 +361,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -386,6 +403,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -429,6 +447,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/grid_nested_gap0/elk/sketch.exp.svg b/e2etests/testdata/stable/grid_nested_gap0/elk/sketch.exp.svg index d2a4c3297..4616221a0 100644 --- a/e2etests/testdata/stable/grid_nested_gap0/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_nested_gap0/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -The UniverseFirstTwoLastD2CloudTerrastructTALAD2Cloud + .d2-4128783962 .fill-N1{fill:#0A0F25;} + .d2-4128783962 .fill-N2{fill:#676C7E;} + .d2-4128783962 .fill-N3{fill:#9499AB;} + .d2-4128783962 .fill-N4{fill:#CFD2DD;} + .d2-4128783962 .fill-N5{fill:#DEE1EB;} + .d2-4128783962 .fill-N6{fill:#EEF1F8;} + .d2-4128783962 .fill-N7{fill:#FFFFFF;} + .d2-4128783962 .fill-B1{fill:#0D32B2;} + .d2-4128783962 .fill-B2{fill:#0D32B2;} + .d2-4128783962 .fill-B3{fill:#E3E9FD;} + .d2-4128783962 .fill-B4{fill:#E3E9FD;} + .d2-4128783962 .fill-B5{fill:#EDF0FD;} + .d2-4128783962 .fill-B6{fill:#F7F8FE;} + .d2-4128783962 .fill-AA2{fill:#4A6FF3;} + .d2-4128783962 .fill-AA4{fill:#EDF0FD;} + .d2-4128783962 .fill-AA5{fill:#F7F8FE;} + .d2-4128783962 .fill-AB4{fill:#EDF0FD;} + .d2-4128783962 .fill-AB5{fill:#F7F8FE;} + .d2-4128783962 .stroke-N1{stroke:#0A0F25;} + .d2-4128783962 .stroke-N2{stroke:#676C7E;} + .d2-4128783962 .stroke-N3{stroke:#9499AB;} + .d2-4128783962 .stroke-N4{stroke:#CFD2DD;} + .d2-4128783962 .stroke-N5{stroke:#DEE1EB;} + .d2-4128783962 .stroke-N6{stroke:#EEF1F8;} + .d2-4128783962 .stroke-N7{stroke:#FFFFFF;} + .d2-4128783962 .stroke-B1{stroke:#0D32B2;} + .d2-4128783962 .stroke-B2{stroke:#0D32B2;} + .d2-4128783962 .stroke-B3{stroke:#E3E9FD;} + .d2-4128783962 .stroke-B4{stroke:#E3E9FD;} + .d2-4128783962 .stroke-B5{stroke:#EDF0FD;} + .d2-4128783962 .stroke-B6{stroke:#F7F8FE;} + .d2-4128783962 .stroke-AA2{stroke:#4A6FF3;} + .d2-4128783962 .stroke-AA4{stroke:#EDF0FD;} + .d2-4128783962 .stroke-AA5{stroke:#F7F8FE;} + .d2-4128783962 .stroke-AB4{stroke:#EDF0FD;} + .d2-4128783962 .stroke-AB5{stroke:#F7F8FE;} + .d2-4128783962 .background-color-N1{background-color:#0A0F25;} + .d2-4128783962 .background-color-N2{background-color:#676C7E;} + .d2-4128783962 .background-color-N3{background-color:#9499AB;} + .d2-4128783962 .background-color-N4{background-color:#CFD2DD;} + .d2-4128783962 .background-color-N5{background-color:#DEE1EB;} + .d2-4128783962 .background-color-N6{background-color:#EEF1F8;} + .d2-4128783962 .background-color-N7{background-color:#FFFFFF;} + .d2-4128783962 .background-color-B1{background-color:#0D32B2;} + .d2-4128783962 .background-color-B2{background-color:#0D32B2;} + .d2-4128783962 .background-color-B3{background-color:#E3E9FD;} + .d2-4128783962 .background-color-B4{background-color:#E3E9FD;} + .d2-4128783962 .background-color-B5{background-color:#EDF0FD;} + .d2-4128783962 .background-color-B6{background-color:#F7F8FE;} + .d2-4128783962 .background-color-AA2{background-color:#4A6FF3;} + .d2-4128783962 .background-color-AA4{background-color:#EDF0FD;} + .d2-4128783962 .background-color-AA5{background-color:#F7F8FE;} + .d2-4128783962 .background-color-AB4{background-color:#EDF0FD;} + .d2-4128783962 .background-color-AB5{background-color:#F7F8FE;} + .d2-4128783962 .color-N1{color:#0A0F25;} + .d2-4128783962 .color-N2{color:#676C7E;} + .d2-4128783962 .color-N3{color:#9499AB;} + .d2-4128783962 .color-N4{color:#CFD2DD;} + .d2-4128783962 .color-N5{color:#DEE1EB;} + .d2-4128783962 .color-N6{color:#EEF1F8;} + .d2-4128783962 .color-N7{color:#FFFFFF;} + .d2-4128783962 .color-B1{color:#0D32B2;} + .d2-4128783962 .color-B2{color:#0D32B2;} + .d2-4128783962 .color-B3{color:#E3E9FD;} + .d2-4128783962 .color-B4{color:#E3E9FD;} + .d2-4128783962 .color-B5{color:#EDF0FD;} + .d2-4128783962 .color-B6{color:#F7F8FE;} + .d2-4128783962 .color-AA2{color:#4A6FF3;} + .d2-4128783962 .color-AA4{color:#EDF0FD;} + .d2-4128783962 .color-AA5{color:#F7F8FE;} + .d2-4128783962 .color-AB4{color:#EDF0FD;} + .d2-4128783962 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4128783962);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4128783962);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4128783962);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4128783962);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4128783962);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4128783962);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4128783962);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4128783962);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4128783962);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4128783962);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4128783962);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4128783962);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4128783962);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4128783962);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4128783962);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4128783962);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4128783962);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4128783962);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>The UniverseFirstTwoLastD2CloudTerrastructTALAD2Cloud - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_nested_simple_edges/dagre/board.exp.json b/e2etests/testdata/stable/grid_nested_simple_edges/dagre/board.exp.json index 45b186a93..5f0e5de10 100644 --- a/e2etests/testdata/stable/grid_nested_simple_edges/dagre/board.exp.json +++ b/e2etests/testdata/stable/grid_nested_simple_edges/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -715,6 +740,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -756,6 +782,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -797,6 +824,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -838,6 +866,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -879,6 +908,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -920,6 +950,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -961,6 +992,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1002,6 +1034,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1043,6 +1076,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1084,6 +1118,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1125,6 +1160,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1176,6 +1212,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 554, @@ -1223,6 +1260,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 277, @@ -1261,6 +1299,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 277, @@ -1302,6 +1341,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 182, @@ -1352,6 +1392,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 187.75, @@ -1414,6 +1455,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 107.25, @@ -1500,6 +1542,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 396, @@ -1550,6 +1593,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 437, @@ -1612,6 +1656,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 351, @@ -1662,6 +1707,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 325, @@ -1712,6 +1758,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 231, @@ -1762,6 +1809,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 171.5, @@ -1803,6 +1851,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 264.5, @@ -1841,6 +1890,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1062, @@ -1888,6 +1938,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 815.5, @@ -1926,6 +1977,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 908.5, @@ -1964,6 +2016,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1266, @@ -2011,6 +2064,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1469, @@ -2058,6 +2112,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1469, @@ -2098,6 +2153,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/grid_nested_simple_edges/dagre/sketch.exp.svg b/e2etests/testdata/stable/grid_nested_simple_edges/dagre/sketch.exp.svg index 267f2ed0b..df288e688 100644 --- a/e2etests/testdata/stable/grid_nested_simple_edges/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_nested_simple_edges/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -outer-gridouter-containerinner-gridcontaineretcgridcontainerabcdegf123123456nested containerh78i + .d2-3897662443 .fill-N1{fill:#0A0F25;} + .d2-3897662443 .fill-N2{fill:#676C7E;} + .d2-3897662443 .fill-N3{fill:#9499AB;} + .d2-3897662443 .fill-N4{fill:#CFD2DD;} + .d2-3897662443 .fill-N5{fill:#DEE1EB;} + .d2-3897662443 .fill-N6{fill:#EEF1F8;} + .d2-3897662443 .fill-N7{fill:#FFFFFF;} + .d2-3897662443 .fill-B1{fill:#0D32B2;} + .d2-3897662443 .fill-B2{fill:#0D32B2;} + .d2-3897662443 .fill-B3{fill:#E3E9FD;} + .d2-3897662443 .fill-B4{fill:#E3E9FD;} + .d2-3897662443 .fill-B5{fill:#EDF0FD;} + .d2-3897662443 .fill-B6{fill:#F7F8FE;} + .d2-3897662443 .fill-AA2{fill:#4A6FF3;} + .d2-3897662443 .fill-AA4{fill:#EDF0FD;} + .d2-3897662443 .fill-AA5{fill:#F7F8FE;} + .d2-3897662443 .fill-AB4{fill:#EDF0FD;} + .d2-3897662443 .fill-AB5{fill:#F7F8FE;} + .d2-3897662443 .stroke-N1{stroke:#0A0F25;} + .d2-3897662443 .stroke-N2{stroke:#676C7E;} + .d2-3897662443 .stroke-N3{stroke:#9499AB;} + .d2-3897662443 .stroke-N4{stroke:#CFD2DD;} + .d2-3897662443 .stroke-N5{stroke:#DEE1EB;} + .d2-3897662443 .stroke-N6{stroke:#EEF1F8;} + .d2-3897662443 .stroke-N7{stroke:#FFFFFF;} + .d2-3897662443 .stroke-B1{stroke:#0D32B2;} + .d2-3897662443 .stroke-B2{stroke:#0D32B2;} + .d2-3897662443 .stroke-B3{stroke:#E3E9FD;} + .d2-3897662443 .stroke-B4{stroke:#E3E9FD;} + .d2-3897662443 .stroke-B5{stroke:#EDF0FD;} + .d2-3897662443 .stroke-B6{stroke:#F7F8FE;} + .d2-3897662443 .stroke-AA2{stroke:#4A6FF3;} + .d2-3897662443 .stroke-AA4{stroke:#EDF0FD;} + .d2-3897662443 .stroke-AA5{stroke:#F7F8FE;} + .d2-3897662443 .stroke-AB4{stroke:#EDF0FD;} + .d2-3897662443 .stroke-AB5{stroke:#F7F8FE;} + .d2-3897662443 .background-color-N1{background-color:#0A0F25;} + .d2-3897662443 .background-color-N2{background-color:#676C7E;} + .d2-3897662443 .background-color-N3{background-color:#9499AB;} + .d2-3897662443 .background-color-N4{background-color:#CFD2DD;} + .d2-3897662443 .background-color-N5{background-color:#DEE1EB;} + .d2-3897662443 .background-color-N6{background-color:#EEF1F8;} + .d2-3897662443 .background-color-N7{background-color:#FFFFFF;} + .d2-3897662443 .background-color-B1{background-color:#0D32B2;} + .d2-3897662443 .background-color-B2{background-color:#0D32B2;} + .d2-3897662443 .background-color-B3{background-color:#E3E9FD;} + .d2-3897662443 .background-color-B4{background-color:#E3E9FD;} + .d2-3897662443 .background-color-B5{background-color:#EDF0FD;} + .d2-3897662443 .background-color-B6{background-color:#F7F8FE;} + .d2-3897662443 .background-color-AA2{background-color:#4A6FF3;} + .d2-3897662443 .background-color-AA4{background-color:#EDF0FD;} + .d2-3897662443 .background-color-AA5{background-color:#F7F8FE;} + .d2-3897662443 .background-color-AB4{background-color:#EDF0FD;} + .d2-3897662443 .background-color-AB5{background-color:#F7F8FE;} + .d2-3897662443 .color-N1{color:#0A0F25;} + .d2-3897662443 .color-N2{color:#676C7E;} + .d2-3897662443 .color-N3{color:#9499AB;} + .d2-3897662443 .color-N4{color:#CFD2DD;} + .d2-3897662443 .color-N5{color:#DEE1EB;} + .d2-3897662443 .color-N6{color:#EEF1F8;} + .d2-3897662443 .color-N7{color:#FFFFFF;} + .d2-3897662443 .color-B1{color:#0D32B2;} + .d2-3897662443 .color-B2{color:#0D32B2;} + .d2-3897662443 .color-B3{color:#E3E9FD;} + .d2-3897662443 .color-B4{color:#E3E9FD;} + .d2-3897662443 .color-B5{color:#EDF0FD;} + .d2-3897662443 .color-B6{color:#F7F8FE;} + .d2-3897662443 .color-AA2{color:#4A6FF3;} + .d2-3897662443 .color-AA4{color:#EDF0FD;} + .d2-3897662443 .color-AA5{color:#F7F8FE;} + .d2-3897662443 .color-AB4{color:#EDF0FD;} + .d2-3897662443 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3897662443);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3897662443);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3897662443);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3897662443);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3897662443);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3897662443);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3897662443);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3897662443);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3897662443);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3897662443);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3897662443);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3897662443);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3897662443);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3897662443);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3897662443);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3897662443);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3897662443);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3897662443);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>outer-gridouter-containerinner-gridcontaineretcgridcontainerabcdegf123123456nested containerh78i - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_nested_simple_edges/elk/board.exp.json b/e2etests/testdata/stable/grid_nested_simple_edges/elk/board.exp.json index 1a40e7989..96c116205 100644 --- a/e2etests/testdata/stable/grid_nested_simple_edges/elk/board.exp.json +++ b/e2etests/testdata/stable/grid_nested_simple_edges/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -715,6 +740,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -756,6 +782,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -797,6 +824,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -838,6 +866,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -879,6 +908,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -920,6 +950,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -961,6 +992,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1002,6 +1034,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1043,6 +1076,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1084,6 +1118,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1125,6 +1160,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1176,6 +1212,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 562, @@ -1214,6 +1251,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 287, @@ -1252,6 +1290,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 287, @@ -1293,6 +1332,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 171.33299255371094, @@ -1342,6 +1382,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 189.66600036621094, @@ -1391,6 +1432,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 147, @@ -1448,6 +1490,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 349.5, @@ -1497,6 +1540,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 326.8330078125, @@ -1538,6 +1582,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 376.1659851074219, @@ -1587,6 +1632,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 398.8330078125, @@ -1636,6 +1682,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 216.33299255371094, @@ -1685,6 +1732,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 183.5, @@ -1726,6 +1774,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 276.5, @@ -1764,6 +1813,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1040, @@ -1802,6 +1852,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 793.5, @@ -1840,6 +1891,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 886.5, @@ -1878,6 +1930,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1436, @@ -1916,6 +1969,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1559, @@ -1954,6 +2008,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1263, @@ -1985,6 +2040,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/grid_nested_simple_edges/elk/sketch.exp.svg b/e2etests/testdata/stable/grid_nested_simple_edges/elk/sketch.exp.svg index be153bd22..ddcfccb54 100644 --- a/e2etests/testdata/stable/grid_nested_simple_edges/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_nested_simple_edges/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -outer-gridouter-containerinner-gridcontaineretcgridcontainerabcdegf123123456nested containerh78i + .d2-3946346664 .fill-N1{fill:#0A0F25;} + .d2-3946346664 .fill-N2{fill:#676C7E;} + .d2-3946346664 .fill-N3{fill:#9499AB;} + .d2-3946346664 .fill-N4{fill:#CFD2DD;} + .d2-3946346664 .fill-N5{fill:#DEE1EB;} + .d2-3946346664 .fill-N6{fill:#EEF1F8;} + .d2-3946346664 .fill-N7{fill:#FFFFFF;} + .d2-3946346664 .fill-B1{fill:#0D32B2;} + .d2-3946346664 .fill-B2{fill:#0D32B2;} + .d2-3946346664 .fill-B3{fill:#E3E9FD;} + .d2-3946346664 .fill-B4{fill:#E3E9FD;} + .d2-3946346664 .fill-B5{fill:#EDF0FD;} + .d2-3946346664 .fill-B6{fill:#F7F8FE;} + .d2-3946346664 .fill-AA2{fill:#4A6FF3;} + .d2-3946346664 .fill-AA4{fill:#EDF0FD;} + .d2-3946346664 .fill-AA5{fill:#F7F8FE;} + .d2-3946346664 .fill-AB4{fill:#EDF0FD;} + .d2-3946346664 .fill-AB5{fill:#F7F8FE;} + .d2-3946346664 .stroke-N1{stroke:#0A0F25;} + .d2-3946346664 .stroke-N2{stroke:#676C7E;} + .d2-3946346664 .stroke-N3{stroke:#9499AB;} + .d2-3946346664 .stroke-N4{stroke:#CFD2DD;} + .d2-3946346664 .stroke-N5{stroke:#DEE1EB;} + .d2-3946346664 .stroke-N6{stroke:#EEF1F8;} + .d2-3946346664 .stroke-N7{stroke:#FFFFFF;} + .d2-3946346664 .stroke-B1{stroke:#0D32B2;} + .d2-3946346664 .stroke-B2{stroke:#0D32B2;} + .d2-3946346664 .stroke-B3{stroke:#E3E9FD;} + .d2-3946346664 .stroke-B4{stroke:#E3E9FD;} + .d2-3946346664 .stroke-B5{stroke:#EDF0FD;} + .d2-3946346664 .stroke-B6{stroke:#F7F8FE;} + .d2-3946346664 .stroke-AA2{stroke:#4A6FF3;} + .d2-3946346664 .stroke-AA4{stroke:#EDF0FD;} + .d2-3946346664 .stroke-AA5{stroke:#F7F8FE;} + .d2-3946346664 .stroke-AB4{stroke:#EDF0FD;} + .d2-3946346664 .stroke-AB5{stroke:#F7F8FE;} + .d2-3946346664 .background-color-N1{background-color:#0A0F25;} + .d2-3946346664 .background-color-N2{background-color:#676C7E;} + .d2-3946346664 .background-color-N3{background-color:#9499AB;} + .d2-3946346664 .background-color-N4{background-color:#CFD2DD;} + .d2-3946346664 .background-color-N5{background-color:#DEE1EB;} + .d2-3946346664 .background-color-N6{background-color:#EEF1F8;} + .d2-3946346664 .background-color-N7{background-color:#FFFFFF;} + .d2-3946346664 .background-color-B1{background-color:#0D32B2;} + .d2-3946346664 .background-color-B2{background-color:#0D32B2;} + .d2-3946346664 .background-color-B3{background-color:#E3E9FD;} + .d2-3946346664 .background-color-B4{background-color:#E3E9FD;} + .d2-3946346664 .background-color-B5{background-color:#EDF0FD;} + .d2-3946346664 .background-color-B6{background-color:#F7F8FE;} + .d2-3946346664 .background-color-AA2{background-color:#4A6FF3;} + .d2-3946346664 .background-color-AA4{background-color:#EDF0FD;} + .d2-3946346664 .background-color-AA5{background-color:#F7F8FE;} + .d2-3946346664 .background-color-AB4{background-color:#EDF0FD;} + .d2-3946346664 .background-color-AB5{background-color:#F7F8FE;} + .d2-3946346664 .color-N1{color:#0A0F25;} + .d2-3946346664 .color-N2{color:#676C7E;} + .d2-3946346664 .color-N3{color:#9499AB;} + .d2-3946346664 .color-N4{color:#CFD2DD;} + .d2-3946346664 .color-N5{color:#DEE1EB;} + .d2-3946346664 .color-N6{color:#EEF1F8;} + .d2-3946346664 .color-N7{color:#FFFFFF;} + .d2-3946346664 .color-B1{color:#0D32B2;} + .d2-3946346664 .color-B2{color:#0D32B2;} + .d2-3946346664 .color-B3{color:#E3E9FD;} + .d2-3946346664 .color-B4{color:#E3E9FD;} + .d2-3946346664 .color-B5{color:#EDF0FD;} + .d2-3946346664 .color-B6{color:#F7F8FE;} + .d2-3946346664 .color-AA2{color:#4A6FF3;} + .d2-3946346664 .color-AA4{color:#EDF0FD;} + .d2-3946346664 .color-AA5{color:#F7F8FE;} + .d2-3946346664 .color-AB4{color:#EDF0FD;} + .d2-3946346664 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3946346664);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3946346664);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3946346664);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3946346664);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3946346664);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3946346664);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3946346664);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3946346664);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3946346664);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3946346664);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3946346664);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3946346664);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3946346664);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3946346664);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3946346664);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3946346664);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3946346664);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3946346664);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>outer-gridouter-containerinner-gridcontaineretcgridcontainerabcdegf123123456nested containerh78i - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_outside_labels/dagre/board.exp.json b/e2etests/testdata/stable/grid_outside_labels/dagre/board.exp.json index 7140db237..70d9e4ece 100644 --- a/e2etests/testdata/stable/grid_outside_labels/dagre/board.exp.json +++ b/e2etests/testdata/stable/grid_outside_labels/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -10,7 +18,7 @@ "x": 0, "y": 0 }, - "width": 1213, + "width": 1184, "height": 524, "opacity": 1, "strokeDash": 0, @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -112,7 +123,7 @@ "fields": null, "methods": null, "columns": null, - "label": "\\\\begin{CD} B @>{\\\\text{very long label}}>> C S^{{\\\\mathcal{W}}_\\\\Lambda}\\\\otimes T @>j>> T\\\\\\\\ @VVV V \\\\end{CD}", + "label": "\\begin{CD} B @>{\\text{very long label}}>> C S^{{\\mathcal{W}}_\\Lambda}\\otimes T @>j>> T\\\\ @VVV V \\end{CD}", "fontSize": 16, "fontFamily": "DEFAULT", "language": "latex", @@ -140,6 +151,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -181,6 +193,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -193,7 +206,7 @@ "fields": null, "methods": null, "columns": null, - "label": "\\\\bra{a}\\\\ket{b}", + "label": "\\bra{a}\\ket{b}", "fontSize": 16, "fontFamily": "DEFAULT", "language": "latex", @@ -221,6 +234,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -262,6 +276,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -274,7 +289,7 @@ "fields": null, "methods": null, "columns": null, - "label": "\\\\cancel{Culture + 5}", + "label": "\\cancel{Culture + 5}", "fontSize": 16, "fontFamily": "DEFAULT", "language": "latex", @@ -294,7 +309,7 @@ "x": 385, "y": 82 }, - "width": 255, + "width": 226, "height": 103, "opacity": 1, "strokeDash": 0, @@ -302,6 +317,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -355,6 +371,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -367,7 +384,7 @@ "fields": null, "methods": null, "columns": null, - "label": "\\\\textcolor{red}{y} = \\\\textcolor{green}{\\\\sin} x", + "label": "\\textcolor{red}{y} = \\textcolor{green}{\\sin} x", "fontSize": 16, "fontFamily": "DEFAULT", "language": "latex", @@ -387,7 +404,7 @@ "x": 385, "y": 241 }, - "width": 324, + "width": 295, "height": 103, "opacity": 1, "strokeDash": 0, @@ -395,6 +412,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -436,6 +454,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -448,7 +467,7 @@ "fields": null, "methods": null, "columns": null, - "label": "\\\\lambda = 10.6\\\\,\\\\micro\\\\mathrm{m}", + "label": "\\lambda = 10.6\\,\\micro\\mathrm{m}", "fontSize": 16, "fontFamily": "DEFAULT", "language": "latex", @@ -468,7 +487,7 @@ "x": 385, "y": 410 }, - "width": 314, + "width": 285, "height": 93, "opacity": 1, "strokeDash": 0, @@ -476,6 +495,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -509,14 +529,15 @@ "x": 415, "y": 440 }, - "width": 254, - "height": 18, + "width": 225, + "height": 20, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -537,8 +558,8 @@ "italic": false, "bold": false, "underline": false, - "labelWidth": 254, - "labelHeight": 18, + "labelWidth": 225, + "labelHeight": 20, "zIndex": 0, "level": 3 }, @@ -546,7 +567,7 @@ "id": "container.physics plugin", "type": "rectangle", "pos": { - "x": 729, + "x": 700, "y": 82 }, "width": 464, @@ -557,6 +578,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -587,7 +609,7 @@ "id": "container.physics plugin.ex", "type": "text", "pos": { - "x": 759, + "x": 730, "y": 112 }, "width": 128, @@ -598,6 +620,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -610,7 +633,7 @@ "fields": null, "methods": null, "columns": null, - "label": "\\\\var{F[g(x)]}\n\\\\dd(\\\\cos\\\\theta)", + "label": "\\var{F[g(x)]}\n\\dd(\\cos\\theta)", "fontSize": 16, "fontFamily": "DEFAULT", "language": "latex", @@ -627,7 +650,7 @@ "id": "container.multilines", "type": "rectangle", "pos": { - "x": 729, + "x": 700, "y": 233 }, "width": 464, @@ -638,6 +661,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -668,7 +692,7 @@ "id": "container.multilines.ex", "type": "text", "pos": { - "x": 759, + "x": 730, "y": 263 }, "width": 404, @@ -679,6 +703,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -691,7 +716,7 @@ "fields": null, "methods": null, "columns": null, - "label": "\\\\displaylines{x = a + b \\\\\\\\ y = b + c}\n\\\\sum_{k=1}^{n} h_{k} \\\\int_{0}^{1} \\\\bigl(\\\\partial_{k} f(x_{k-1}+t h_{k} e_{k}) -\\\\partial_{k} f(a)\\\\bigr) \\\\,dt", + "label": "\\displaylines{x = a + b \\\\ y = b + c}\n\\sum_{k=1}^{n} h_{k} \\int_{0}^{1} \\bigl(\\partial_{k} f(x_{k-1}+t h_{k} e_{k}) -\\partial_{k} f(a)\\bigr) \\,dt", "fontSize": 16, "fontFamily": "DEFAULT", "language": "latex", @@ -708,7 +733,7 @@ "id": "container.asm", "type": "rectangle", "pos": { - "x": 729, + "x": 700, "y": 401 }, "width": 464, @@ -719,6 +744,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -749,7 +775,7 @@ "id": "container.asm.ex", "type": "text", "pos": { - "x": 759, + "x": 730, "y": 431 }, "width": 62, @@ -760,6 +786,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -772,7 +799,7 @@ "fields": null, "methods": null, "columns": null, - "label": "\\\\min_{ \\\\mathclap{\\\\substack{ x \\\\in \\\\mathbb{R}^n \\\\ x \\\\geq 0 \\\\ Ax \\\\leq b }}} c^T x", + "label": "\\min_{ \\mathclap{\\substack{ x \\in \\mathbb{R}^n \\ x \\geq 0 \\ Ax \\leq b }}} c^T x", "fontSize": 16, "fontFamily": "DEFAULT", "language": "latex", @@ -802,6 +829,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/grid_outside_labels/dagre/sketch.exp.svg b/e2etests/testdata/stable/grid_outside_labels/dagre/sketch.exp.svg index 469f106b2..667a59d1f 100644 --- a/e2etests/testdata/stable/grid_outside_labels/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_outside_labels/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -___________________________________container____________________________________amscd plugin + .d2-269116138 .fill-N1{fill:#0A0F25;} + .d2-269116138 .fill-N2{fill:#676C7E;} + .d2-269116138 .fill-N3{fill:#9499AB;} + .d2-269116138 .fill-N4{fill:#CFD2DD;} + .d2-269116138 .fill-N5{fill:#DEE1EB;} + .d2-269116138 .fill-N6{fill:#EEF1F8;} + .d2-269116138 .fill-N7{fill:#FFFFFF;} + .d2-269116138 .fill-B1{fill:#0D32B2;} + .d2-269116138 .fill-B2{fill:#0D32B2;} + .d2-269116138 .fill-B3{fill:#E3E9FD;} + .d2-269116138 .fill-B4{fill:#E3E9FD;} + .d2-269116138 .fill-B5{fill:#EDF0FD;} + .d2-269116138 .fill-B6{fill:#F7F8FE;} + .d2-269116138 .fill-AA2{fill:#4A6FF3;} + .d2-269116138 .fill-AA4{fill:#EDF0FD;} + .d2-269116138 .fill-AA5{fill:#F7F8FE;} + .d2-269116138 .fill-AB4{fill:#EDF0FD;} + .d2-269116138 .fill-AB5{fill:#F7F8FE;} + .d2-269116138 .stroke-N1{stroke:#0A0F25;} + .d2-269116138 .stroke-N2{stroke:#676C7E;} + .d2-269116138 .stroke-N3{stroke:#9499AB;} + .d2-269116138 .stroke-N4{stroke:#CFD2DD;} + .d2-269116138 .stroke-N5{stroke:#DEE1EB;} + .d2-269116138 .stroke-N6{stroke:#EEF1F8;} + .d2-269116138 .stroke-N7{stroke:#FFFFFF;} + .d2-269116138 .stroke-B1{stroke:#0D32B2;} + .d2-269116138 .stroke-B2{stroke:#0D32B2;} + .d2-269116138 .stroke-B3{stroke:#E3E9FD;} + .d2-269116138 .stroke-B4{stroke:#E3E9FD;} + .d2-269116138 .stroke-B5{stroke:#EDF0FD;} + .d2-269116138 .stroke-B6{stroke:#F7F8FE;} + .d2-269116138 .stroke-AA2{stroke:#4A6FF3;} + .d2-269116138 .stroke-AA4{stroke:#EDF0FD;} + .d2-269116138 .stroke-AA5{stroke:#F7F8FE;} + .d2-269116138 .stroke-AB4{stroke:#EDF0FD;} + .d2-269116138 .stroke-AB5{stroke:#F7F8FE;} + .d2-269116138 .background-color-N1{background-color:#0A0F25;} + .d2-269116138 .background-color-N2{background-color:#676C7E;} + .d2-269116138 .background-color-N3{background-color:#9499AB;} + .d2-269116138 .background-color-N4{background-color:#CFD2DD;} + .d2-269116138 .background-color-N5{background-color:#DEE1EB;} + .d2-269116138 .background-color-N6{background-color:#EEF1F8;} + .d2-269116138 .background-color-N7{background-color:#FFFFFF;} + .d2-269116138 .background-color-B1{background-color:#0D32B2;} + .d2-269116138 .background-color-B2{background-color:#0D32B2;} + .d2-269116138 .background-color-B3{background-color:#E3E9FD;} + .d2-269116138 .background-color-B4{background-color:#E3E9FD;} + .d2-269116138 .background-color-B5{background-color:#EDF0FD;} + .d2-269116138 .background-color-B6{background-color:#F7F8FE;} + .d2-269116138 .background-color-AA2{background-color:#4A6FF3;} + .d2-269116138 .background-color-AA4{background-color:#EDF0FD;} + .d2-269116138 .background-color-AA5{background-color:#F7F8FE;} + .d2-269116138 .background-color-AB4{background-color:#EDF0FD;} + .d2-269116138 .background-color-AB5{background-color:#F7F8FE;} + .d2-269116138 .color-N1{color:#0A0F25;} + .d2-269116138 .color-N2{color:#676C7E;} + .d2-269116138 .color-N3{color:#9499AB;} + .d2-269116138 .color-N4{color:#CFD2DD;} + .d2-269116138 .color-N5{color:#DEE1EB;} + .d2-269116138 .color-N6{color:#EEF1F8;} + .d2-269116138 .color-N7{color:#FFFFFF;} + .d2-269116138 .color-B1{color:#0D32B2;} + .d2-269116138 .color-B2{color:#0D32B2;} + .d2-269116138 .color-B3{color:#E3E9FD;} + .d2-269116138 .color-B4{color:#E3E9FD;} + .d2-269116138 .color-B5{color:#EDF0FD;} + .d2-269116138 .color-B6{color:#F7F8FE;} + .d2-269116138 .color-AA2{color:#4A6FF3;} + .d2-269116138 .color-AA4{color:#EDF0FD;} + .d2-269116138 .color-AA5{color:#F7F8FE;} + .d2-269116138 .color-AB4{color:#EDF0FD;} + .d2-269116138 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-269116138);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-269116138);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-269116138);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-269116138);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-269116138);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-269116138);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-269116138);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-269116138);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-269116138);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-269116138);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-269116138);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-269116138);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-269116138);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-269116138);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-269116138);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-269116138);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-269116138);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-269116138);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>___________________________________container____________________________________amscd plugin -braket plugincancel plugincolor plugingensymb pluginmhchem pluginphysics pluginmultilinesasmµ - - - - - - - - - - - - - - - - - - - - +braket plugincancel plugincolor plugingensymb pluginmhchem pluginphysics pluginmultilinesasmµ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_outside_labels/elk/board.exp.json b/e2etests/testdata/stable/grid_outside_labels/elk/board.exp.json index 21f554c1e..43fae785c 100644 --- a/e2etests/testdata/stable/grid_outside_labels/elk/board.exp.json +++ b/e2etests/testdata/stable/grid_outside_labels/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -10,7 +18,7 @@ "x": 12, "y": 12 }, - "width": 1323, + "width": 1294, "height": 521, "opacity": 1, "strokeDash": 0, @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -112,7 +123,7 @@ "fields": null, "methods": null, "columns": null, - "label": "\\\\begin{CD} B @>{\\\\text{very long label}}>> C S^{{\\\\mathcal{W}}_\\\\Lambda}\\\\otimes T @>j>> T\\\\\\\\ @VVV V \\\\end{CD}", + "label": "\\begin{CD} B @>{\\text{very long label}}>> C S^{{\\mathcal{W}}_\\Lambda}\\otimes T @>j>> T\\\\ @VVV V \\end{CD}", "fontSize": 16, "fontFamily": "DEFAULT", "language": "latex", @@ -140,6 +151,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -181,6 +193,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -193,7 +206,7 @@ "fields": null, "methods": null, "columns": null, - "label": "\\\\bra{a}\\\\ket{b}", + "label": "\\bra{a}\\ket{b}", "fontSize": 16, "fontFamily": "DEFAULT", "language": "latex", @@ -221,6 +234,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -262,6 +276,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -274,7 +289,7 @@ "fields": null, "methods": null, "columns": null, - "label": "\\\\cancel{Culture + 5}", + "label": "\\cancel{Culture + 5}", "fontSize": 16, "fontFamily": "DEFAULT", "language": "latex", @@ -294,7 +309,7 @@ "x": 437, "y": 58 }, - "width": 285, + "width": 256, "height": 148, "opacity": 1, "strokeDash": 0, @@ -302,6 +317,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -355,6 +371,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -367,7 +384,7 @@ "fields": null, "methods": null, "columns": null, - "label": "\\\\textcolor{red}{y} = \\\\textcolor{green}{\\\\sin} x", + "label": "\\textcolor{red}{y} = \\textcolor{green}{\\sin} x", "fontSize": 16, "fontFamily": "DEFAULT", "language": "latex", @@ -387,7 +404,7 @@ "x": 437, "y": 226 }, - "width": 354, + "width": 325, "height": 133, "opacity": 1, "strokeDash": 0, @@ -395,6 +412,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -436,6 +454,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -448,7 +467,7 @@ "fields": null, "methods": null, "columns": null, - "label": "\\\\lambda = 10.6\\\\,\\\\micro\\\\mathrm{m}", + "label": "\\lambda = 10.6\\,\\micro\\mathrm{m}", "fontSize": 16, "fontFamily": "DEFAULT", "language": "latex", @@ -468,14 +487,15 @@ "x": 437, "y": 389 }, - "width": 344, - "height": 123, + "width": 315, + "height": 124, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -509,14 +529,15 @@ "x": 482, "y": 434 }, - "width": 254, - "height": 18, + "width": 225, + "height": 20, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -537,8 +558,8 @@ "italic": false, "bold": false, "underline": false, - "labelWidth": 254, - "labelHeight": 18, + "labelWidth": 225, + "labelHeight": 20, "zIndex": 0, "level": 3 }, @@ -546,7 +567,7 @@ "id": "container.physics plugin", "type": "rectangle", "pos": { - "x": 811, + "x": 782, "y": 58 }, "width": 504, @@ -557,6 +578,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -587,7 +609,7 @@ "id": "container.physics plugin.ex", "type": "text", "pos": { - "x": 861, + "x": 832, "y": 108 }, "width": 128, @@ -598,6 +620,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -610,7 +633,7 @@ "fields": null, "methods": null, "columns": null, - "label": "\\\\var{F[g(x)]}\n\\\\dd(\\\\cos\\\\theta)", + "label": "\\var{F[g(x)]}\n\\dd(\\cos\\theta)", "fontSize": 16, "fontFamily": "DEFAULT", "language": "latex", @@ -627,7 +650,7 @@ "id": "container.multilines", "type": "rectangle", "pos": { - "x": 811, + "x": 782, "y": 204 }, "width": 504, @@ -638,6 +661,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -668,7 +692,7 @@ "id": "container.multilines.ex", "type": "text", "pos": { - "x": 861, + "x": 832, "y": 254 }, "width": 404, @@ -679,6 +703,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -691,7 +716,7 @@ "fields": null, "methods": null, "columns": null, - "label": "\\\\displaylines{x = a + b \\\\\\\\ y = b + c}\n\\\\sum_{k=1}^{n} h_{k} \\\\int_{0}^{1} \\\\bigl(\\\\partial_{k} f(x_{k-1}+t h_{k} e_{k}) -\\\\partial_{k} f(a)\\\\bigr) \\\\,dt", + "label": "\\displaylines{x = a + b \\\\ y = b + c}\n\\sum_{k=1}^{n} h_{k} \\int_{0}^{1} \\bigl(\\partial_{k} f(x_{k-1}+t h_{k} e_{k}) -\\partial_{k} f(a)\\bigr) \\,dt", "fontSize": 16, "fontFamily": "DEFAULT", "language": "latex", @@ -708,7 +733,7 @@ "id": "container.asm", "type": "rectangle", "pos": { - "x": 811, + "x": 782, "y": 376 }, "width": 504, @@ -719,6 +744,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -749,7 +775,7 @@ "id": "container.asm.ex", "type": "text", "pos": { - "x": 861, + "x": 832, "y": 426 }, "width": 62, @@ -760,6 +786,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -772,7 +799,7 @@ "fields": null, "methods": null, "columns": null, - "label": "\\\\min_{ \\\\mathclap{\\\\substack{ x \\\\in \\\\mathbb{R}^n \\\\ x \\\\geq 0 \\\\ Ax \\\\leq b }}} c^T x", + "label": "\\min_{ \\mathclap{\\substack{ x \\in \\mathbb{R}^n \\ x \\geq 0 \\ Ax \\leq b }}} c^T x", "fontSize": 16, "fontFamily": "DEFAULT", "language": "latex", @@ -802,6 +829,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/grid_outside_labels/elk/sketch.exp.svg b/e2etests/testdata/stable/grid_outside_labels/elk/sketch.exp.svg index 91c99c92c..47dacb265 100644 --- a/e2etests/testdata/stable/grid_outside_labels/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_outside_labels/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -___________________________________container____________________________________amscd plugin + .d2-1333473382 .fill-N1{fill:#0A0F25;} + .d2-1333473382 .fill-N2{fill:#676C7E;} + .d2-1333473382 .fill-N3{fill:#9499AB;} + .d2-1333473382 .fill-N4{fill:#CFD2DD;} + .d2-1333473382 .fill-N5{fill:#DEE1EB;} + .d2-1333473382 .fill-N6{fill:#EEF1F8;} + .d2-1333473382 .fill-N7{fill:#FFFFFF;} + .d2-1333473382 .fill-B1{fill:#0D32B2;} + .d2-1333473382 .fill-B2{fill:#0D32B2;} + .d2-1333473382 .fill-B3{fill:#E3E9FD;} + .d2-1333473382 .fill-B4{fill:#E3E9FD;} + .d2-1333473382 .fill-B5{fill:#EDF0FD;} + .d2-1333473382 .fill-B6{fill:#F7F8FE;} + .d2-1333473382 .fill-AA2{fill:#4A6FF3;} + .d2-1333473382 .fill-AA4{fill:#EDF0FD;} + .d2-1333473382 .fill-AA5{fill:#F7F8FE;} + .d2-1333473382 .fill-AB4{fill:#EDF0FD;} + .d2-1333473382 .fill-AB5{fill:#F7F8FE;} + .d2-1333473382 .stroke-N1{stroke:#0A0F25;} + .d2-1333473382 .stroke-N2{stroke:#676C7E;} + .d2-1333473382 .stroke-N3{stroke:#9499AB;} + .d2-1333473382 .stroke-N4{stroke:#CFD2DD;} + .d2-1333473382 .stroke-N5{stroke:#DEE1EB;} + .d2-1333473382 .stroke-N6{stroke:#EEF1F8;} + .d2-1333473382 .stroke-N7{stroke:#FFFFFF;} + .d2-1333473382 .stroke-B1{stroke:#0D32B2;} + .d2-1333473382 .stroke-B2{stroke:#0D32B2;} + .d2-1333473382 .stroke-B3{stroke:#E3E9FD;} + .d2-1333473382 .stroke-B4{stroke:#E3E9FD;} + .d2-1333473382 .stroke-B5{stroke:#EDF0FD;} + .d2-1333473382 .stroke-B6{stroke:#F7F8FE;} + .d2-1333473382 .stroke-AA2{stroke:#4A6FF3;} + .d2-1333473382 .stroke-AA4{stroke:#EDF0FD;} + .d2-1333473382 .stroke-AA5{stroke:#F7F8FE;} + .d2-1333473382 .stroke-AB4{stroke:#EDF0FD;} + .d2-1333473382 .stroke-AB5{stroke:#F7F8FE;} + .d2-1333473382 .background-color-N1{background-color:#0A0F25;} + .d2-1333473382 .background-color-N2{background-color:#676C7E;} + .d2-1333473382 .background-color-N3{background-color:#9499AB;} + .d2-1333473382 .background-color-N4{background-color:#CFD2DD;} + .d2-1333473382 .background-color-N5{background-color:#DEE1EB;} + .d2-1333473382 .background-color-N6{background-color:#EEF1F8;} + .d2-1333473382 .background-color-N7{background-color:#FFFFFF;} + .d2-1333473382 .background-color-B1{background-color:#0D32B2;} + .d2-1333473382 .background-color-B2{background-color:#0D32B2;} + .d2-1333473382 .background-color-B3{background-color:#E3E9FD;} + .d2-1333473382 .background-color-B4{background-color:#E3E9FD;} + .d2-1333473382 .background-color-B5{background-color:#EDF0FD;} + .d2-1333473382 .background-color-B6{background-color:#F7F8FE;} + .d2-1333473382 .background-color-AA2{background-color:#4A6FF3;} + .d2-1333473382 .background-color-AA4{background-color:#EDF0FD;} + .d2-1333473382 .background-color-AA5{background-color:#F7F8FE;} + .d2-1333473382 .background-color-AB4{background-color:#EDF0FD;} + .d2-1333473382 .background-color-AB5{background-color:#F7F8FE;} + .d2-1333473382 .color-N1{color:#0A0F25;} + .d2-1333473382 .color-N2{color:#676C7E;} + .d2-1333473382 .color-N3{color:#9499AB;} + .d2-1333473382 .color-N4{color:#CFD2DD;} + .d2-1333473382 .color-N5{color:#DEE1EB;} + .d2-1333473382 .color-N6{color:#EEF1F8;} + .d2-1333473382 .color-N7{color:#FFFFFF;} + .d2-1333473382 .color-B1{color:#0D32B2;} + .d2-1333473382 .color-B2{color:#0D32B2;} + .d2-1333473382 .color-B3{color:#E3E9FD;} + .d2-1333473382 .color-B4{color:#E3E9FD;} + .d2-1333473382 .color-B5{color:#EDF0FD;} + .d2-1333473382 .color-B6{color:#F7F8FE;} + .d2-1333473382 .color-AA2{color:#4A6FF3;} + .d2-1333473382 .color-AA4{color:#EDF0FD;} + .d2-1333473382 .color-AA5{color:#F7F8FE;} + .d2-1333473382 .color-AB4{color:#EDF0FD;} + .d2-1333473382 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1333473382);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1333473382);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1333473382);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1333473382);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1333473382);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1333473382);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1333473382);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1333473382);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1333473382);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1333473382);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1333473382);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1333473382);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1333473382);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1333473382);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1333473382);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1333473382);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1333473382);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1333473382);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>___________________________________container____________________________________amscd plugin -braket plugincancel plugincolor plugingensymb pluginmhchem pluginphysics pluginmultilinesasmµ - - - - - - - - - - - - - - - - - - - - +braket plugincancel plugincolor plugingensymb pluginmhchem pluginphysics pluginmultilinesasmµ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_tests/dagre/board.exp.json b/e2etests/testdata/stable/grid_tests/dagre/board.exp.json index 7b3ccd502..47df77ca6 100644 --- a/e2etests/testdata/stable/grid_tests/dagre/board.exp.json +++ b/e2etests/testdata/stable/grid_tests/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -715,6 +740,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -756,6 +782,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -797,6 +824,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -838,6 +866,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -879,6 +908,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -920,6 +950,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -961,6 +992,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1002,6 +1034,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1043,6 +1076,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1084,6 +1118,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1125,6 +1160,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1166,6 +1202,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1207,6 +1244,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1248,6 +1286,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1289,6 +1328,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1330,6 +1370,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1371,6 +1412,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1412,6 +1454,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1453,6 +1496,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1494,6 +1538,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1535,6 +1580,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1576,6 +1622,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1617,6 +1664,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1658,6 +1706,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1699,6 +1748,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1740,6 +1790,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1781,6 +1832,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1822,6 +1874,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1863,6 +1916,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1904,6 +1958,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1945,6 +2000,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1986,6 +2042,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2027,6 +2084,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2068,6 +2126,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2109,6 +2168,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2150,6 +2210,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2191,6 +2252,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2232,6 +2294,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2273,6 +2336,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2314,6 +2378,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2355,6 +2420,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2396,6 +2462,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2437,6 +2504,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2478,6 +2546,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2519,6 +2588,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2560,6 +2630,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2601,6 +2672,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2642,6 +2714,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2683,6 +2756,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2724,6 +2798,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2765,6 +2840,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2806,6 +2882,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2847,6 +2924,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2888,6 +2966,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2929,6 +3008,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2970,6 +3050,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3011,6 +3092,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3052,6 +3134,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3093,6 +3176,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3134,6 +3218,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3175,6 +3260,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3216,6 +3302,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3257,6 +3344,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3298,6 +3386,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3339,6 +3428,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3380,6 +3470,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3421,6 +3512,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3462,6 +3554,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3503,6 +3596,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3544,6 +3638,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3585,6 +3680,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3626,6 +3722,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3667,6 +3764,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3710,6 +3808,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/grid_tests/dagre/sketch.exp.svg b/e2etests/testdata/stable/grid_tests/dagre/sketch.exp.svg index 0ea2f2c0f..96e929a5b 100644 --- a/e2etests/testdata/stable/grid_tests/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_tests/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -rows 1columns 1rows 2columns 2rows 2 columns 2columns 2 rows 2rows 3 columns 3columns 3 rows 3rows 3columns 3widths heightsabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefga w200b h300cd h200ef w400ghi + .d2-222718692 .fill-N1{fill:#0A0F25;} + .d2-222718692 .fill-N2{fill:#676C7E;} + .d2-222718692 .fill-N3{fill:#9499AB;} + .d2-222718692 .fill-N4{fill:#CFD2DD;} + .d2-222718692 .fill-N5{fill:#DEE1EB;} + .d2-222718692 .fill-N6{fill:#EEF1F8;} + .d2-222718692 .fill-N7{fill:#FFFFFF;} + .d2-222718692 .fill-B1{fill:#0D32B2;} + .d2-222718692 .fill-B2{fill:#0D32B2;} + .d2-222718692 .fill-B3{fill:#E3E9FD;} + .d2-222718692 .fill-B4{fill:#E3E9FD;} + .d2-222718692 .fill-B5{fill:#EDF0FD;} + .d2-222718692 .fill-B6{fill:#F7F8FE;} + .d2-222718692 .fill-AA2{fill:#4A6FF3;} + .d2-222718692 .fill-AA4{fill:#EDF0FD;} + .d2-222718692 .fill-AA5{fill:#F7F8FE;} + .d2-222718692 .fill-AB4{fill:#EDF0FD;} + .d2-222718692 .fill-AB5{fill:#F7F8FE;} + .d2-222718692 .stroke-N1{stroke:#0A0F25;} + .d2-222718692 .stroke-N2{stroke:#676C7E;} + .d2-222718692 .stroke-N3{stroke:#9499AB;} + .d2-222718692 .stroke-N4{stroke:#CFD2DD;} + .d2-222718692 .stroke-N5{stroke:#DEE1EB;} + .d2-222718692 .stroke-N6{stroke:#EEF1F8;} + .d2-222718692 .stroke-N7{stroke:#FFFFFF;} + .d2-222718692 .stroke-B1{stroke:#0D32B2;} + .d2-222718692 .stroke-B2{stroke:#0D32B2;} + .d2-222718692 .stroke-B3{stroke:#E3E9FD;} + .d2-222718692 .stroke-B4{stroke:#E3E9FD;} + .d2-222718692 .stroke-B5{stroke:#EDF0FD;} + .d2-222718692 .stroke-B6{stroke:#F7F8FE;} + .d2-222718692 .stroke-AA2{stroke:#4A6FF3;} + .d2-222718692 .stroke-AA4{stroke:#EDF0FD;} + .d2-222718692 .stroke-AA5{stroke:#F7F8FE;} + .d2-222718692 .stroke-AB4{stroke:#EDF0FD;} + .d2-222718692 .stroke-AB5{stroke:#F7F8FE;} + .d2-222718692 .background-color-N1{background-color:#0A0F25;} + .d2-222718692 .background-color-N2{background-color:#676C7E;} + .d2-222718692 .background-color-N3{background-color:#9499AB;} + .d2-222718692 .background-color-N4{background-color:#CFD2DD;} + .d2-222718692 .background-color-N5{background-color:#DEE1EB;} + .d2-222718692 .background-color-N6{background-color:#EEF1F8;} + .d2-222718692 .background-color-N7{background-color:#FFFFFF;} + .d2-222718692 .background-color-B1{background-color:#0D32B2;} + .d2-222718692 .background-color-B2{background-color:#0D32B2;} + .d2-222718692 .background-color-B3{background-color:#E3E9FD;} + .d2-222718692 .background-color-B4{background-color:#E3E9FD;} + .d2-222718692 .background-color-B5{background-color:#EDF0FD;} + .d2-222718692 .background-color-B6{background-color:#F7F8FE;} + .d2-222718692 .background-color-AA2{background-color:#4A6FF3;} + .d2-222718692 .background-color-AA4{background-color:#EDF0FD;} + .d2-222718692 .background-color-AA5{background-color:#F7F8FE;} + .d2-222718692 .background-color-AB4{background-color:#EDF0FD;} + .d2-222718692 .background-color-AB5{background-color:#F7F8FE;} + .d2-222718692 .color-N1{color:#0A0F25;} + .d2-222718692 .color-N2{color:#676C7E;} + .d2-222718692 .color-N3{color:#9499AB;} + .d2-222718692 .color-N4{color:#CFD2DD;} + .d2-222718692 .color-N5{color:#DEE1EB;} + .d2-222718692 .color-N6{color:#EEF1F8;} + .d2-222718692 .color-N7{color:#FFFFFF;} + .d2-222718692 .color-B1{color:#0D32B2;} + .d2-222718692 .color-B2{color:#0D32B2;} + .d2-222718692 .color-B3{color:#E3E9FD;} + .d2-222718692 .color-B4{color:#E3E9FD;} + .d2-222718692 .color-B5{color:#EDF0FD;} + .d2-222718692 .color-B6{color:#F7F8FE;} + .d2-222718692 .color-AA2{color:#4A6FF3;} + .d2-222718692 .color-AA4{color:#EDF0FD;} + .d2-222718692 .color-AA5{color:#F7F8FE;} + .d2-222718692 .color-AB4{color:#EDF0FD;} + .d2-222718692 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-222718692);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-222718692);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-222718692);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-222718692);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-222718692);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-222718692);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-222718692);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-222718692);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-222718692);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-222718692);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-222718692);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-222718692);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-222718692);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-222718692);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-222718692);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-222718692);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-222718692);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-222718692);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>rows 1columns 1rows 2columns 2rows 2 columns 2columns 2 rows 2rows 3 columns 3columns 3 rows 3rows 3columns 3widths heightsabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefga w200b h300cd h200ef w400ghi - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/grid_tests/elk/board.exp.json b/e2etests/testdata/stable/grid_tests/elk/board.exp.json index a0054417b..f794f546f 100644 --- a/e2etests/testdata/stable/grid_tests/elk/board.exp.json +++ b/e2etests/testdata/stable/grid_tests/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -715,6 +740,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -756,6 +782,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -797,6 +824,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -838,6 +866,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -879,6 +908,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -920,6 +950,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -961,6 +992,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1002,6 +1034,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1043,6 +1076,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1084,6 +1118,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1125,6 +1160,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1166,6 +1202,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1207,6 +1244,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1248,6 +1286,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1289,6 +1328,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1330,6 +1370,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1371,6 +1412,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1412,6 +1454,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1453,6 +1496,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1494,6 +1538,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1535,6 +1580,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1576,6 +1622,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1617,6 +1664,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1658,6 +1706,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1699,6 +1748,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1740,6 +1790,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1781,6 +1832,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1822,6 +1874,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1863,6 +1916,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1904,6 +1958,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1945,6 +2000,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1986,6 +2042,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2027,6 +2084,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2068,6 +2126,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2109,6 +2168,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2150,6 +2210,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2191,6 +2252,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2232,6 +2294,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2273,6 +2336,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2314,6 +2378,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2355,6 +2420,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2396,6 +2462,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2437,6 +2504,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2478,6 +2546,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2519,6 +2588,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2560,6 +2630,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2601,6 +2672,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2642,6 +2714,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2683,6 +2756,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2724,6 +2798,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2765,6 +2840,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2806,6 +2882,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2847,6 +2924,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2888,6 +2966,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2929,6 +3008,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2970,6 +3050,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3011,6 +3092,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3052,6 +3134,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3093,6 +3176,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3134,6 +3218,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3175,6 +3260,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3216,6 +3302,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3257,6 +3344,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3298,6 +3386,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3339,6 +3428,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3380,6 +3470,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3421,6 +3512,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3462,6 +3554,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3503,6 +3596,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3544,6 +3638,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3585,6 +3680,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3626,6 +3722,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3667,6 +3764,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3710,6 +3808,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/grid_tests/elk/sketch.exp.svg b/e2etests/testdata/stable/grid_tests/elk/sketch.exp.svg index bc44fb107..454300d63 100644 --- a/e2etests/testdata/stable/grid_tests/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_tests/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -rows 1columns 1rows 2columns 2rows 2 columns 2columns 2 rows 2rows 3 columns 3columns 3 rows 3rows 3columns 3widths heightsabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefga w200b h300cd h200ef w400ghi + .d2-2824137340 .fill-N1{fill:#0A0F25;} + .d2-2824137340 .fill-N2{fill:#676C7E;} + .d2-2824137340 .fill-N3{fill:#9499AB;} + .d2-2824137340 .fill-N4{fill:#CFD2DD;} + .d2-2824137340 .fill-N5{fill:#DEE1EB;} + .d2-2824137340 .fill-N6{fill:#EEF1F8;} + .d2-2824137340 .fill-N7{fill:#FFFFFF;} + .d2-2824137340 .fill-B1{fill:#0D32B2;} + .d2-2824137340 .fill-B2{fill:#0D32B2;} + .d2-2824137340 .fill-B3{fill:#E3E9FD;} + .d2-2824137340 .fill-B4{fill:#E3E9FD;} + .d2-2824137340 .fill-B5{fill:#EDF0FD;} + .d2-2824137340 .fill-B6{fill:#F7F8FE;} + .d2-2824137340 .fill-AA2{fill:#4A6FF3;} + .d2-2824137340 .fill-AA4{fill:#EDF0FD;} + .d2-2824137340 .fill-AA5{fill:#F7F8FE;} + .d2-2824137340 .fill-AB4{fill:#EDF0FD;} + .d2-2824137340 .fill-AB5{fill:#F7F8FE;} + .d2-2824137340 .stroke-N1{stroke:#0A0F25;} + .d2-2824137340 .stroke-N2{stroke:#676C7E;} + .d2-2824137340 .stroke-N3{stroke:#9499AB;} + .d2-2824137340 .stroke-N4{stroke:#CFD2DD;} + .d2-2824137340 .stroke-N5{stroke:#DEE1EB;} + .d2-2824137340 .stroke-N6{stroke:#EEF1F8;} + .d2-2824137340 .stroke-N7{stroke:#FFFFFF;} + .d2-2824137340 .stroke-B1{stroke:#0D32B2;} + .d2-2824137340 .stroke-B2{stroke:#0D32B2;} + .d2-2824137340 .stroke-B3{stroke:#E3E9FD;} + .d2-2824137340 .stroke-B4{stroke:#E3E9FD;} + .d2-2824137340 .stroke-B5{stroke:#EDF0FD;} + .d2-2824137340 .stroke-B6{stroke:#F7F8FE;} + .d2-2824137340 .stroke-AA2{stroke:#4A6FF3;} + .d2-2824137340 .stroke-AA4{stroke:#EDF0FD;} + .d2-2824137340 .stroke-AA5{stroke:#F7F8FE;} + .d2-2824137340 .stroke-AB4{stroke:#EDF0FD;} + .d2-2824137340 .stroke-AB5{stroke:#F7F8FE;} + .d2-2824137340 .background-color-N1{background-color:#0A0F25;} + .d2-2824137340 .background-color-N2{background-color:#676C7E;} + .d2-2824137340 .background-color-N3{background-color:#9499AB;} + .d2-2824137340 .background-color-N4{background-color:#CFD2DD;} + .d2-2824137340 .background-color-N5{background-color:#DEE1EB;} + .d2-2824137340 .background-color-N6{background-color:#EEF1F8;} + .d2-2824137340 .background-color-N7{background-color:#FFFFFF;} + .d2-2824137340 .background-color-B1{background-color:#0D32B2;} + .d2-2824137340 .background-color-B2{background-color:#0D32B2;} + .d2-2824137340 .background-color-B3{background-color:#E3E9FD;} + .d2-2824137340 .background-color-B4{background-color:#E3E9FD;} + .d2-2824137340 .background-color-B5{background-color:#EDF0FD;} + .d2-2824137340 .background-color-B6{background-color:#F7F8FE;} + .d2-2824137340 .background-color-AA2{background-color:#4A6FF3;} + .d2-2824137340 .background-color-AA4{background-color:#EDF0FD;} + .d2-2824137340 .background-color-AA5{background-color:#F7F8FE;} + .d2-2824137340 .background-color-AB4{background-color:#EDF0FD;} + .d2-2824137340 .background-color-AB5{background-color:#F7F8FE;} + .d2-2824137340 .color-N1{color:#0A0F25;} + .d2-2824137340 .color-N2{color:#676C7E;} + .d2-2824137340 .color-N3{color:#9499AB;} + .d2-2824137340 .color-N4{color:#CFD2DD;} + .d2-2824137340 .color-N5{color:#DEE1EB;} + .d2-2824137340 .color-N6{color:#EEF1F8;} + .d2-2824137340 .color-N7{color:#FFFFFF;} + .d2-2824137340 .color-B1{color:#0D32B2;} + .d2-2824137340 .color-B2{color:#0D32B2;} + .d2-2824137340 .color-B3{color:#E3E9FD;} + .d2-2824137340 .color-B4{color:#E3E9FD;} + .d2-2824137340 .color-B5{color:#EDF0FD;} + .d2-2824137340 .color-B6{color:#F7F8FE;} + .d2-2824137340 .color-AA2{color:#4A6FF3;} + .d2-2824137340 .color-AA4{color:#EDF0FD;} + .d2-2824137340 .color-AA5{color:#F7F8FE;} + .d2-2824137340 .color-AB4{color:#EDF0FD;} + .d2-2824137340 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2824137340);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2824137340);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2824137340);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2824137340);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2824137340);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2824137340);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2824137340);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2824137340);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2824137340);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2824137340);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2824137340);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2824137340);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2824137340);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2824137340);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2824137340);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2824137340);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2824137340);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2824137340);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>rows 1columns 1rows 2columns 2rows 2 columns 2columns 2 rows 2rows 3 columns 3columns 3 rows 3rows 3columns 3widths heightsabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefgabcdefga w200b h300cd h200ef w400ghi - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/hexagon_3d/dagre/board.exp.json b/e2etests/testdata/stable/hexagon_3d/dagre/board.exp.json index 2cfd1d39c..2a19dd547 100644 --- a/e2etests/testdata/stable/hexagon_3d/dagre/board.exp.json +++ b/e2etests/testdata/stable/hexagon_3d/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -61,6 +70,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/hexagon_3d/dagre/sketch.exp.svg b/e2etests/testdata/stable/hexagon_3d/dagre/sketch.exp.svg index fa312a920..46a19317d 100644 --- a/e2etests/testdata/stable/hexagon_3d/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/hexagon_3d/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-3899102652 .fill-N1{fill:#0A0F25;} + .d2-3899102652 .fill-N2{fill:#676C7E;} + .d2-3899102652 .fill-N3{fill:#9499AB;} + .d2-3899102652 .fill-N4{fill:#CFD2DD;} + .d2-3899102652 .fill-N5{fill:#DEE1EB;} + .d2-3899102652 .fill-N6{fill:#EEF1F8;} + .d2-3899102652 .fill-N7{fill:#FFFFFF;} + .d2-3899102652 .fill-B1{fill:#0D32B2;} + .d2-3899102652 .fill-B2{fill:#0D32B2;} + .d2-3899102652 .fill-B3{fill:#E3E9FD;} + .d2-3899102652 .fill-B4{fill:#E3E9FD;} + .d2-3899102652 .fill-B5{fill:#EDF0FD;} + .d2-3899102652 .fill-B6{fill:#F7F8FE;} + .d2-3899102652 .fill-AA2{fill:#4A6FF3;} + .d2-3899102652 .fill-AA4{fill:#EDF0FD;} + .d2-3899102652 .fill-AA5{fill:#F7F8FE;} + .d2-3899102652 .fill-AB4{fill:#EDF0FD;} + .d2-3899102652 .fill-AB5{fill:#F7F8FE;} + .d2-3899102652 .stroke-N1{stroke:#0A0F25;} + .d2-3899102652 .stroke-N2{stroke:#676C7E;} + .d2-3899102652 .stroke-N3{stroke:#9499AB;} + .d2-3899102652 .stroke-N4{stroke:#CFD2DD;} + .d2-3899102652 .stroke-N5{stroke:#DEE1EB;} + .d2-3899102652 .stroke-N6{stroke:#EEF1F8;} + .d2-3899102652 .stroke-N7{stroke:#FFFFFF;} + .d2-3899102652 .stroke-B1{stroke:#0D32B2;} + .d2-3899102652 .stroke-B2{stroke:#0D32B2;} + .d2-3899102652 .stroke-B3{stroke:#E3E9FD;} + .d2-3899102652 .stroke-B4{stroke:#E3E9FD;} + .d2-3899102652 .stroke-B5{stroke:#EDF0FD;} + .d2-3899102652 .stroke-B6{stroke:#F7F8FE;} + .d2-3899102652 .stroke-AA2{stroke:#4A6FF3;} + .d2-3899102652 .stroke-AA4{stroke:#EDF0FD;} + .d2-3899102652 .stroke-AA5{stroke:#F7F8FE;} + .d2-3899102652 .stroke-AB4{stroke:#EDF0FD;} + .d2-3899102652 .stroke-AB5{stroke:#F7F8FE;} + .d2-3899102652 .background-color-N1{background-color:#0A0F25;} + .d2-3899102652 .background-color-N2{background-color:#676C7E;} + .d2-3899102652 .background-color-N3{background-color:#9499AB;} + .d2-3899102652 .background-color-N4{background-color:#CFD2DD;} + .d2-3899102652 .background-color-N5{background-color:#DEE1EB;} + .d2-3899102652 .background-color-N6{background-color:#EEF1F8;} + .d2-3899102652 .background-color-N7{background-color:#FFFFFF;} + .d2-3899102652 .background-color-B1{background-color:#0D32B2;} + .d2-3899102652 .background-color-B2{background-color:#0D32B2;} + .d2-3899102652 .background-color-B3{background-color:#E3E9FD;} + .d2-3899102652 .background-color-B4{background-color:#E3E9FD;} + .d2-3899102652 .background-color-B5{background-color:#EDF0FD;} + .d2-3899102652 .background-color-B6{background-color:#F7F8FE;} + .d2-3899102652 .background-color-AA2{background-color:#4A6FF3;} + .d2-3899102652 .background-color-AA4{background-color:#EDF0FD;} + .d2-3899102652 .background-color-AA5{background-color:#F7F8FE;} + .d2-3899102652 .background-color-AB4{background-color:#EDF0FD;} + .d2-3899102652 .background-color-AB5{background-color:#F7F8FE;} + .d2-3899102652 .color-N1{color:#0A0F25;} + .d2-3899102652 .color-N2{color:#676C7E;} + .d2-3899102652 .color-N3{color:#9499AB;} + .d2-3899102652 .color-N4{color:#CFD2DD;} + .d2-3899102652 .color-N5{color:#DEE1EB;} + .d2-3899102652 .color-N6{color:#EEF1F8;} + .d2-3899102652 .color-N7{color:#FFFFFF;} + .d2-3899102652 .color-B1{color:#0D32B2;} + .d2-3899102652 .color-B2{color:#0D32B2;} + .d2-3899102652 .color-B3{color:#E3E9FD;} + .d2-3899102652 .color-B4{color:#E3E9FD;} + .d2-3899102652 .color-B5{color:#EDF0FD;} + .d2-3899102652 .color-B6{color:#F7F8FE;} + .d2-3899102652 .color-AA2{color:#4A6FF3;} + .d2-3899102652 .color-AA4{color:#EDF0FD;} + .d2-3899102652 .color-AA5{color:#F7F8FE;} + .d2-3899102652 .color-AB4{color:#EDF0FD;} + .d2-3899102652 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3899102652);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3899102652);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3899102652);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3899102652);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3899102652);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3899102652);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3899102652);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3899102652);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3899102652);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3899102652);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3899102652);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3899102652);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3899102652);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3899102652);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3899102652);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3899102652);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3899102652);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3899102652);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> -hexagon +hexagon - + \ No newline at end of file diff --git a/e2etests/testdata/stable/hexagon_3d/elk/board.exp.json b/e2etests/testdata/stable/hexagon_3d/elk/board.exp.json index bdbf19a73..b67cf8ece 100644 --- a/e2etests/testdata/stable/hexagon_3d/elk/board.exp.json +++ b/e2etests/testdata/stable/hexagon_3d/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -61,6 +70,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/hexagon_3d/elk/sketch.exp.svg b/e2etests/testdata/stable/hexagon_3d/elk/sketch.exp.svg index 7b8d89709..c175c84e2 100644 --- a/e2etests/testdata/stable/hexagon_3d/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/hexagon_3d/elk/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-2494068767 .fill-N1{fill:#0A0F25;} + .d2-2494068767 .fill-N2{fill:#676C7E;} + .d2-2494068767 .fill-N3{fill:#9499AB;} + .d2-2494068767 .fill-N4{fill:#CFD2DD;} + .d2-2494068767 .fill-N5{fill:#DEE1EB;} + .d2-2494068767 .fill-N6{fill:#EEF1F8;} + .d2-2494068767 .fill-N7{fill:#FFFFFF;} + .d2-2494068767 .fill-B1{fill:#0D32B2;} + .d2-2494068767 .fill-B2{fill:#0D32B2;} + .d2-2494068767 .fill-B3{fill:#E3E9FD;} + .d2-2494068767 .fill-B4{fill:#E3E9FD;} + .d2-2494068767 .fill-B5{fill:#EDF0FD;} + .d2-2494068767 .fill-B6{fill:#F7F8FE;} + .d2-2494068767 .fill-AA2{fill:#4A6FF3;} + .d2-2494068767 .fill-AA4{fill:#EDF0FD;} + .d2-2494068767 .fill-AA5{fill:#F7F8FE;} + .d2-2494068767 .fill-AB4{fill:#EDF0FD;} + .d2-2494068767 .fill-AB5{fill:#F7F8FE;} + .d2-2494068767 .stroke-N1{stroke:#0A0F25;} + .d2-2494068767 .stroke-N2{stroke:#676C7E;} + .d2-2494068767 .stroke-N3{stroke:#9499AB;} + .d2-2494068767 .stroke-N4{stroke:#CFD2DD;} + .d2-2494068767 .stroke-N5{stroke:#DEE1EB;} + .d2-2494068767 .stroke-N6{stroke:#EEF1F8;} + .d2-2494068767 .stroke-N7{stroke:#FFFFFF;} + .d2-2494068767 .stroke-B1{stroke:#0D32B2;} + .d2-2494068767 .stroke-B2{stroke:#0D32B2;} + .d2-2494068767 .stroke-B3{stroke:#E3E9FD;} + .d2-2494068767 .stroke-B4{stroke:#E3E9FD;} + .d2-2494068767 .stroke-B5{stroke:#EDF0FD;} + .d2-2494068767 .stroke-B6{stroke:#F7F8FE;} + .d2-2494068767 .stroke-AA2{stroke:#4A6FF3;} + .d2-2494068767 .stroke-AA4{stroke:#EDF0FD;} + .d2-2494068767 .stroke-AA5{stroke:#F7F8FE;} + .d2-2494068767 .stroke-AB4{stroke:#EDF0FD;} + .d2-2494068767 .stroke-AB5{stroke:#F7F8FE;} + .d2-2494068767 .background-color-N1{background-color:#0A0F25;} + .d2-2494068767 .background-color-N2{background-color:#676C7E;} + .d2-2494068767 .background-color-N3{background-color:#9499AB;} + .d2-2494068767 .background-color-N4{background-color:#CFD2DD;} + .d2-2494068767 .background-color-N5{background-color:#DEE1EB;} + .d2-2494068767 .background-color-N6{background-color:#EEF1F8;} + .d2-2494068767 .background-color-N7{background-color:#FFFFFF;} + .d2-2494068767 .background-color-B1{background-color:#0D32B2;} + .d2-2494068767 .background-color-B2{background-color:#0D32B2;} + .d2-2494068767 .background-color-B3{background-color:#E3E9FD;} + .d2-2494068767 .background-color-B4{background-color:#E3E9FD;} + .d2-2494068767 .background-color-B5{background-color:#EDF0FD;} + .d2-2494068767 .background-color-B6{background-color:#F7F8FE;} + .d2-2494068767 .background-color-AA2{background-color:#4A6FF3;} + .d2-2494068767 .background-color-AA4{background-color:#EDF0FD;} + .d2-2494068767 .background-color-AA5{background-color:#F7F8FE;} + .d2-2494068767 .background-color-AB4{background-color:#EDF0FD;} + .d2-2494068767 .background-color-AB5{background-color:#F7F8FE;} + .d2-2494068767 .color-N1{color:#0A0F25;} + .d2-2494068767 .color-N2{color:#676C7E;} + .d2-2494068767 .color-N3{color:#9499AB;} + .d2-2494068767 .color-N4{color:#CFD2DD;} + .d2-2494068767 .color-N5{color:#DEE1EB;} + .d2-2494068767 .color-N6{color:#EEF1F8;} + .d2-2494068767 .color-N7{color:#FFFFFF;} + .d2-2494068767 .color-B1{color:#0D32B2;} + .d2-2494068767 .color-B2{color:#0D32B2;} + .d2-2494068767 .color-B3{color:#E3E9FD;} + .d2-2494068767 .color-B4{color:#E3E9FD;} + .d2-2494068767 .color-B5{color:#EDF0FD;} + .d2-2494068767 .color-B6{color:#F7F8FE;} + .d2-2494068767 .color-AA2{color:#4A6FF3;} + .d2-2494068767 .color-AA4{color:#EDF0FD;} + .d2-2494068767 .color-AA5{color:#F7F8FE;} + .d2-2494068767 .color-AB4{color:#EDF0FD;} + .d2-2494068767 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2494068767);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2494068767);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2494068767);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2494068767);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2494068767);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2494068767);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2494068767);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2494068767);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2494068767);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2494068767);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2494068767);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2494068767);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2494068767);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2494068767);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2494068767);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2494068767);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2494068767);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2494068767);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> -hexagon +hexagon - + \ No newline at end of file diff --git a/e2etests/testdata/stable/hr/dagre/board.exp.json b/e2etests/testdata/stable/hr/dagre/board.exp.json index 419f22434..46f7eeb48 100644 --- a/e2etests/testdata/stable/hr/dagre/board.exp.json +++ b/e2etests/testdata/stable/hr/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -150,6 +161,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 369, @@ -197,6 +209,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 369, @@ -237,6 +250,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/hr/dagre/sketch.exp.svg b/e2etests/testdata/stable/hr/dagre/sketch.exp.svg index 0b84d708a..3b62ef999 100644 --- a/e2etests/testdata/stable/hr/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/hr/dagre/sketch.exp.svg @@ -1,20 +1,20 @@ -

    Note: This document is itself written using Markdown; you +

    Note: This document is itself written using Markdown; you can see the source for it by adding '.text' to the URL.

    Overview

    -
    ab +
    ab - - - + + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/hr/elk/board.exp.json b/e2etests/testdata/stable/hr/elk/board.exp.json index b379b245a..4bb581eba 100644 --- a/e2etests/testdata/stable/hr/elk/board.exp.json +++ b/e2etests/testdata/stable/hr/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -150,6 +161,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 381, @@ -188,6 +200,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 381, @@ -219,6 +232,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/hr/elk/sketch.exp.svg b/e2etests/testdata/stable/hr/elk/sketch.exp.svg index ab33ac985..75e8a13e4 100644 --- a/e2etests/testdata/stable/hr/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/hr/elk/sketch.exp.svg @@ -1,20 +1,20 @@ -

    Note: This document is itself written using Markdown; you +

    Note: This document is itself written using Markdown; you can see the source for it by adding '.text' to the URL.

    Overview

    -
    ab +
    ab - - - + + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/icon-containers/dagre/board.exp.json b/e2etests/testdata/stable/icon-containers/dagre/board.exp.json index 0ea754bd6..27c914ca4 100644 --- a/e2etests/testdata/stable/icon-containers/dagre/board.exp.json +++ b/e2etests/testdata/stable/icon-containers/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "white", "stroke": "green", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -71,6 +80,7 @@ "borderRadius": 0, "fill": "white", "stroke": "blue", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -112,6 +122,7 @@ "borderRadius": 0, "fill": "#e1d5e7", "stroke": "purple", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -165,6 +176,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -220,6 +232,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/icon-containers/dagre/sketch.exp.svg b/e2etests/testdata/stable/icon-containers/dagre/sketch.exp.svg index 423e50fc9..d51f2696b 100644 --- a/e2etests/testdata/stable/icon-containers/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/icon-containers/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -VPC 1 10.1.0.0./16Availability Zone AFirewall Subnet AEC2 Instance + .d2-128916829 .fill-N1{fill:#0A0F25;} + .d2-128916829 .fill-N2{fill:#676C7E;} + .d2-128916829 .fill-N3{fill:#9499AB;} + .d2-128916829 .fill-N4{fill:#CFD2DD;} + .d2-128916829 .fill-N5{fill:#DEE1EB;} + .d2-128916829 .fill-N6{fill:#EEF1F8;} + .d2-128916829 .fill-N7{fill:#FFFFFF;} + .d2-128916829 .fill-B1{fill:#0D32B2;} + .d2-128916829 .fill-B2{fill:#0D32B2;} + .d2-128916829 .fill-B3{fill:#E3E9FD;} + .d2-128916829 .fill-B4{fill:#E3E9FD;} + .d2-128916829 .fill-B5{fill:#EDF0FD;} + .d2-128916829 .fill-B6{fill:#F7F8FE;} + .d2-128916829 .fill-AA2{fill:#4A6FF3;} + .d2-128916829 .fill-AA4{fill:#EDF0FD;} + .d2-128916829 .fill-AA5{fill:#F7F8FE;} + .d2-128916829 .fill-AB4{fill:#EDF0FD;} + .d2-128916829 .fill-AB5{fill:#F7F8FE;} + .d2-128916829 .stroke-N1{stroke:#0A0F25;} + .d2-128916829 .stroke-N2{stroke:#676C7E;} + .d2-128916829 .stroke-N3{stroke:#9499AB;} + .d2-128916829 .stroke-N4{stroke:#CFD2DD;} + .d2-128916829 .stroke-N5{stroke:#DEE1EB;} + .d2-128916829 .stroke-N6{stroke:#EEF1F8;} + .d2-128916829 .stroke-N7{stroke:#FFFFFF;} + .d2-128916829 .stroke-B1{stroke:#0D32B2;} + .d2-128916829 .stroke-B2{stroke:#0D32B2;} + .d2-128916829 .stroke-B3{stroke:#E3E9FD;} + .d2-128916829 .stroke-B4{stroke:#E3E9FD;} + .d2-128916829 .stroke-B5{stroke:#EDF0FD;} + .d2-128916829 .stroke-B6{stroke:#F7F8FE;} + .d2-128916829 .stroke-AA2{stroke:#4A6FF3;} + .d2-128916829 .stroke-AA4{stroke:#EDF0FD;} + .d2-128916829 .stroke-AA5{stroke:#F7F8FE;} + .d2-128916829 .stroke-AB4{stroke:#EDF0FD;} + .d2-128916829 .stroke-AB5{stroke:#F7F8FE;} + .d2-128916829 .background-color-N1{background-color:#0A0F25;} + .d2-128916829 .background-color-N2{background-color:#676C7E;} + .d2-128916829 .background-color-N3{background-color:#9499AB;} + .d2-128916829 .background-color-N4{background-color:#CFD2DD;} + .d2-128916829 .background-color-N5{background-color:#DEE1EB;} + .d2-128916829 .background-color-N6{background-color:#EEF1F8;} + .d2-128916829 .background-color-N7{background-color:#FFFFFF;} + .d2-128916829 .background-color-B1{background-color:#0D32B2;} + .d2-128916829 .background-color-B2{background-color:#0D32B2;} + .d2-128916829 .background-color-B3{background-color:#E3E9FD;} + .d2-128916829 .background-color-B4{background-color:#E3E9FD;} + .d2-128916829 .background-color-B5{background-color:#EDF0FD;} + .d2-128916829 .background-color-B6{background-color:#F7F8FE;} + .d2-128916829 .background-color-AA2{background-color:#4A6FF3;} + .d2-128916829 .background-color-AA4{background-color:#EDF0FD;} + .d2-128916829 .background-color-AA5{background-color:#F7F8FE;} + .d2-128916829 .background-color-AB4{background-color:#EDF0FD;} + .d2-128916829 .background-color-AB5{background-color:#F7F8FE;} + .d2-128916829 .color-N1{color:#0A0F25;} + .d2-128916829 .color-N2{color:#676C7E;} + .d2-128916829 .color-N3{color:#9499AB;} + .d2-128916829 .color-N4{color:#CFD2DD;} + .d2-128916829 .color-N5{color:#DEE1EB;} + .d2-128916829 .color-N6{color:#EEF1F8;} + .d2-128916829 .color-N7{color:#FFFFFF;} + .d2-128916829 .color-B1{color:#0D32B2;} + .d2-128916829 .color-B2{color:#0D32B2;} + .d2-128916829 .color-B3{color:#E3E9FD;} + .d2-128916829 .color-B4{color:#E3E9FD;} + .d2-128916829 .color-B5{color:#EDF0FD;} + .d2-128916829 .color-B6{color:#F7F8FE;} + .d2-128916829 .color-AA2{color:#4A6FF3;} + .d2-128916829 .color-AA4{color:#EDF0FD;} + .d2-128916829 .color-AA5{color:#F7F8FE;} + .d2-128916829 .color-AB4{color:#EDF0FD;} + .d2-128916829 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-128916829);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-128916829);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-128916829);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-128916829);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-128916829);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-128916829);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-128916829);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-128916829);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-128916829);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-128916829);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-128916829);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-128916829);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-128916829);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-128916829);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-128916829);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-128916829);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-128916829);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-128916829);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>VPC 1 10.1.0.0./16Availability Zone AFirewall Subnet AEC2 Instance - - - - + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/icon-containers/elk/board.exp.json b/e2etests/testdata/stable/icon-containers/elk/board.exp.json index 224f5d296..f4a19b29d 100644 --- a/e2etests/testdata/stable/icon-containers/elk/board.exp.json +++ b/e2etests/testdata/stable/icon-containers/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "white", "stroke": "green", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -71,6 +80,7 @@ "borderRadius": 0, "fill": "white", "stroke": "blue", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -112,6 +122,7 @@ "borderRadius": 0, "fill": "#e1d5e7", "stroke": "purple", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -165,6 +176,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -220,6 +232,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/icon-containers/elk/sketch.exp.svg b/e2etests/testdata/stable/icon-containers/elk/sketch.exp.svg index 1d83010b7..4b2c0a90a 100644 --- a/e2etests/testdata/stable/icon-containers/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/icon-containers/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -VPC 1 10.1.0.0./16Availability Zone AFirewall Subnet AEC2 Instance + .d2-2538888798 .fill-N1{fill:#0A0F25;} + .d2-2538888798 .fill-N2{fill:#676C7E;} + .d2-2538888798 .fill-N3{fill:#9499AB;} + .d2-2538888798 .fill-N4{fill:#CFD2DD;} + .d2-2538888798 .fill-N5{fill:#DEE1EB;} + .d2-2538888798 .fill-N6{fill:#EEF1F8;} + .d2-2538888798 .fill-N7{fill:#FFFFFF;} + .d2-2538888798 .fill-B1{fill:#0D32B2;} + .d2-2538888798 .fill-B2{fill:#0D32B2;} + .d2-2538888798 .fill-B3{fill:#E3E9FD;} + .d2-2538888798 .fill-B4{fill:#E3E9FD;} + .d2-2538888798 .fill-B5{fill:#EDF0FD;} + .d2-2538888798 .fill-B6{fill:#F7F8FE;} + .d2-2538888798 .fill-AA2{fill:#4A6FF3;} + .d2-2538888798 .fill-AA4{fill:#EDF0FD;} + .d2-2538888798 .fill-AA5{fill:#F7F8FE;} + .d2-2538888798 .fill-AB4{fill:#EDF0FD;} + .d2-2538888798 .fill-AB5{fill:#F7F8FE;} + .d2-2538888798 .stroke-N1{stroke:#0A0F25;} + .d2-2538888798 .stroke-N2{stroke:#676C7E;} + .d2-2538888798 .stroke-N3{stroke:#9499AB;} + .d2-2538888798 .stroke-N4{stroke:#CFD2DD;} + .d2-2538888798 .stroke-N5{stroke:#DEE1EB;} + .d2-2538888798 .stroke-N6{stroke:#EEF1F8;} + .d2-2538888798 .stroke-N7{stroke:#FFFFFF;} + .d2-2538888798 .stroke-B1{stroke:#0D32B2;} + .d2-2538888798 .stroke-B2{stroke:#0D32B2;} + .d2-2538888798 .stroke-B3{stroke:#E3E9FD;} + .d2-2538888798 .stroke-B4{stroke:#E3E9FD;} + .d2-2538888798 .stroke-B5{stroke:#EDF0FD;} + .d2-2538888798 .stroke-B6{stroke:#F7F8FE;} + .d2-2538888798 .stroke-AA2{stroke:#4A6FF3;} + .d2-2538888798 .stroke-AA4{stroke:#EDF0FD;} + .d2-2538888798 .stroke-AA5{stroke:#F7F8FE;} + .d2-2538888798 .stroke-AB4{stroke:#EDF0FD;} + .d2-2538888798 .stroke-AB5{stroke:#F7F8FE;} + .d2-2538888798 .background-color-N1{background-color:#0A0F25;} + .d2-2538888798 .background-color-N2{background-color:#676C7E;} + .d2-2538888798 .background-color-N3{background-color:#9499AB;} + .d2-2538888798 .background-color-N4{background-color:#CFD2DD;} + .d2-2538888798 .background-color-N5{background-color:#DEE1EB;} + .d2-2538888798 .background-color-N6{background-color:#EEF1F8;} + .d2-2538888798 .background-color-N7{background-color:#FFFFFF;} + .d2-2538888798 .background-color-B1{background-color:#0D32B2;} + .d2-2538888798 .background-color-B2{background-color:#0D32B2;} + .d2-2538888798 .background-color-B3{background-color:#E3E9FD;} + .d2-2538888798 .background-color-B4{background-color:#E3E9FD;} + .d2-2538888798 .background-color-B5{background-color:#EDF0FD;} + .d2-2538888798 .background-color-B6{background-color:#F7F8FE;} + .d2-2538888798 .background-color-AA2{background-color:#4A6FF3;} + .d2-2538888798 .background-color-AA4{background-color:#EDF0FD;} + .d2-2538888798 .background-color-AA5{background-color:#F7F8FE;} + .d2-2538888798 .background-color-AB4{background-color:#EDF0FD;} + .d2-2538888798 .background-color-AB5{background-color:#F7F8FE;} + .d2-2538888798 .color-N1{color:#0A0F25;} + .d2-2538888798 .color-N2{color:#676C7E;} + .d2-2538888798 .color-N3{color:#9499AB;} + .d2-2538888798 .color-N4{color:#CFD2DD;} + .d2-2538888798 .color-N5{color:#DEE1EB;} + .d2-2538888798 .color-N6{color:#EEF1F8;} + .d2-2538888798 .color-N7{color:#FFFFFF;} + .d2-2538888798 .color-B1{color:#0D32B2;} + .d2-2538888798 .color-B2{color:#0D32B2;} + .d2-2538888798 .color-B3{color:#E3E9FD;} + .d2-2538888798 .color-B4{color:#E3E9FD;} + .d2-2538888798 .color-B5{color:#EDF0FD;} + .d2-2538888798 .color-B6{color:#F7F8FE;} + .d2-2538888798 .color-AA2{color:#4A6FF3;} + .d2-2538888798 .color-AA4{color:#EDF0FD;} + .d2-2538888798 .color-AA5{color:#F7F8FE;} + .d2-2538888798 .color-AB4{color:#EDF0FD;} + .d2-2538888798 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2538888798);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2538888798);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2538888798);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2538888798);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2538888798);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2538888798);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2538888798);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2538888798);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2538888798);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2538888798);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2538888798);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2538888798);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2538888798);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2538888798);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2538888798);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2538888798);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2538888798);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2538888798);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>VPC 1 10.1.0.0./16Availability Zone AFirewall Subnet AEC2 Instance - - - - + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/icon-label/dagre/board.exp.json b/e2etests/testdata/stable/icon-label/dagre/board.exp.json index 7592012a6..bb8a01c0e 100644 --- a/e2etests/testdata/stable/icon-label/dagre/board.exp.json +++ b/e2etests/testdata/stable/icon-label/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -73,6 +82,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/icon-label/dagre/sketch.exp.svg b/e2etests/testdata/stable/icon-label/dagre/sketch.exp.svg index 260b63c82..ace8e849d 100644 --- a/e2etests/testdata/stable/icon-label/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/icon-label/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -hello + .d2-1121055843 .fill-N1{fill:#0A0F25;} + .d2-1121055843 .fill-N2{fill:#676C7E;} + .d2-1121055843 .fill-N3{fill:#9499AB;} + .d2-1121055843 .fill-N4{fill:#CFD2DD;} + .d2-1121055843 .fill-N5{fill:#DEE1EB;} + .d2-1121055843 .fill-N6{fill:#EEF1F8;} + .d2-1121055843 .fill-N7{fill:#FFFFFF;} + .d2-1121055843 .fill-B1{fill:#0D32B2;} + .d2-1121055843 .fill-B2{fill:#0D32B2;} + .d2-1121055843 .fill-B3{fill:#E3E9FD;} + .d2-1121055843 .fill-B4{fill:#E3E9FD;} + .d2-1121055843 .fill-B5{fill:#EDF0FD;} + .d2-1121055843 .fill-B6{fill:#F7F8FE;} + .d2-1121055843 .fill-AA2{fill:#4A6FF3;} + .d2-1121055843 .fill-AA4{fill:#EDF0FD;} + .d2-1121055843 .fill-AA5{fill:#F7F8FE;} + .d2-1121055843 .fill-AB4{fill:#EDF0FD;} + .d2-1121055843 .fill-AB5{fill:#F7F8FE;} + .d2-1121055843 .stroke-N1{stroke:#0A0F25;} + .d2-1121055843 .stroke-N2{stroke:#676C7E;} + .d2-1121055843 .stroke-N3{stroke:#9499AB;} + .d2-1121055843 .stroke-N4{stroke:#CFD2DD;} + .d2-1121055843 .stroke-N5{stroke:#DEE1EB;} + .d2-1121055843 .stroke-N6{stroke:#EEF1F8;} + .d2-1121055843 .stroke-N7{stroke:#FFFFFF;} + .d2-1121055843 .stroke-B1{stroke:#0D32B2;} + .d2-1121055843 .stroke-B2{stroke:#0D32B2;} + .d2-1121055843 .stroke-B3{stroke:#E3E9FD;} + .d2-1121055843 .stroke-B4{stroke:#E3E9FD;} + .d2-1121055843 .stroke-B5{stroke:#EDF0FD;} + .d2-1121055843 .stroke-B6{stroke:#F7F8FE;} + .d2-1121055843 .stroke-AA2{stroke:#4A6FF3;} + .d2-1121055843 .stroke-AA4{stroke:#EDF0FD;} + .d2-1121055843 .stroke-AA5{stroke:#F7F8FE;} + .d2-1121055843 .stroke-AB4{stroke:#EDF0FD;} + .d2-1121055843 .stroke-AB5{stroke:#F7F8FE;} + .d2-1121055843 .background-color-N1{background-color:#0A0F25;} + .d2-1121055843 .background-color-N2{background-color:#676C7E;} + .d2-1121055843 .background-color-N3{background-color:#9499AB;} + .d2-1121055843 .background-color-N4{background-color:#CFD2DD;} + .d2-1121055843 .background-color-N5{background-color:#DEE1EB;} + .d2-1121055843 .background-color-N6{background-color:#EEF1F8;} + .d2-1121055843 .background-color-N7{background-color:#FFFFFF;} + .d2-1121055843 .background-color-B1{background-color:#0D32B2;} + .d2-1121055843 .background-color-B2{background-color:#0D32B2;} + .d2-1121055843 .background-color-B3{background-color:#E3E9FD;} + .d2-1121055843 .background-color-B4{background-color:#E3E9FD;} + .d2-1121055843 .background-color-B5{background-color:#EDF0FD;} + .d2-1121055843 .background-color-B6{background-color:#F7F8FE;} + .d2-1121055843 .background-color-AA2{background-color:#4A6FF3;} + .d2-1121055843 .background-color-AA4{background-color:#EDF0FD;} + .d2-1121055843 .background-color-AA5{background-color:#F7F8FE;} + .d2-1121055843 .background-color-AB4{background-color:#EDF0FD;} + .d2-1121055843 .background-color-AB5{background-color:#F7F8FE;} + .d2-1121055843 .color-N1{color:#0A0F25;} + .d2-1121055843 .color-N2{color:#676C7E;} + .d2-1121055843 .color-N3{color:#9499AB;} + .d2-1121055843 .color-N4{color:#CFD2DD;} + .d2-1121055843 .color-N5{color:#DEE1EB;} + .d2-1121055843 .color-N6{color:#EEF1F8;} + .d2-1121055843 .color-N7{color:#FFFFFF;} + .d2-1121055843 .color-B1{color:#0D32B2;} + .d2-1121055843 .color-B2{color:#0D32B2;} + .d2-1121055843 .color-B3{color:#E3E9FD;} + .d2-1121055843 .color-B4{color:#E3E9FD;} + .d2-1121055843 .color-B5{color:#EDF0FD;} + .d2-1121055843 .color-B6{color:#F7F8FE;} + .d2-1121055843 .color-AA2{color:#4A6FF3;} + .d2-1121055843 .color-AA4{color:#EDF0FD;} + .d2-1121055843 .color-AA5{color:#F7F8FE;} + .d2-1121055843 .color-AB4{color:#EDF0FD;} + .d2-1121055843 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1121055843);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1121055843);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1121055843);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1121055843);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1121055843);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1121055843);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1121055843);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1121055843);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1121055843);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1121055843);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1121055843);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1121055843);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1121055843);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1121055843);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1121055843);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1121055843);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1121055843);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1121055843);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>hello - + \ No newline at end of file diff --git a/e2etests/testdata/stable/icon-label/elk/board.exp.json b/e2etests/testdata/stable/icon-label/elk/board.exp.json index 587ce2c59..7ef379977 100644 --- a/e2etests/testdata/stable/icon-label/elk/board.exp.json +++ b/e2etests/testdata/stable/icon-label/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -73,6 +82,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/icon-label/elk/sketch.exp.svg b/e2etests/testdata/stable/icon-label/elk/sketch.exp.svg index e08d2b971..beef3dd06 100644 --- a/e2etests/testdata/stable/icon-label/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/icon-label/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -hello + .d2-553243892 .fill-N1{fill:#0A0F25;} + .d2-553243892 .fill-N2{fill:#676C7E;} + .d2-553243892 .fill-N3{fill:#9499AB;} + .d2-553243892 .fill-N4{fill:#CFD2DD;} + .d2-553243892 .fill-N5{fill:#DEE1EB;} + .d2-553243892 .fill-N6{fill:#EEF1F8;} + .d2-553243892 .fill-N7{fill:#FFFFFF;} + .d2-553243892 .fill-B1{fill:#0D32B2;} + .d2-553243892 .fill-B2{fill:#0D32B2;} + .d2-553243892 .fill-B3{fill:#E3E9FD;} + .d2-553243892 .fill-B4{fill:#E3E9FD;} + .d2-553243892 .fill-B5{fill:#EDF0FD;} + .d2-553243892 .fill-B6{fill:#F7F8FE;} + .d2-553243892 .fill-AA2{fill:#4A6FF3;} + .d2-553243892 .fill-AA4{fill:#EDF0FD;} + .d2-553243892 .fill-AA5{fill:#F7F8FE;} + .d2-553243892 .fill-AB4{fill:#EDF0FD;} + .d2-553243892 .fill-AB5{fill:#F7F8FE;} + .d2-553243892 .stroke-N1{stroke:#0A0F25;} + .d2-553243892 .stroke-N2{stroke:#676C7E;} + .d2-553243892 .stroke-N3{stroke:#9499AB;} + .d2-553243892 .stroke-N4{stroke:#CFD2DD;} + .d2-553243892 .stroke-N5{stroke:#DEE1EB;} + .d2-553243892 .stroke-N6{stroke:#EEF1F8;} + .d2-553243892 .stroke-N7{stroke:#FFFFFF;} + .d2-553243892 .stroke-B1{stroke:#0D32B2;} + .d2-553243892 .stroke-B2{stroke:#0D32B2;} + .d2-553243892 .stroke-B3{stroke:#E3E9FD;} + .d2-553243892 .stroke-B4{stroke:#E3E9FD;} + .d2-553243892 .stroke-B5{stroke:#EDF0FD;} + .d2-553243892 .stroke-B6{stroke:#F7F8FE;} + .d2-553243892 .stroke-AA2{stroke:#4A6FF3;} + .d2-553243892 .stroke-AA4{stroke:#EDF0FD;} + .d2-553243892 .stroke-AA5{stroke:#F7F8FE;} + .d2-553243892 .stroke-AB4{stroke:#EDF0FD;} + .d2-553243892 .stroke-AB5{stroke:#F7F8FE;} + .d2-553243892 .background-color-N1{background-color:#0A0F25;} + .d2-553243892 .background-color-N2{background-color:#676C7E;} + .d2-553243892 .background-color-N3{background-color:#9499AB;} + .d2-553243892 .background-color-N4{background-color:#CFD2DD;} + .d2-553243892 .background-color-N5{background-color:#DEE1EB;} + .d2-553243892 .background-color-N6{background-color:#EEF1F8;} + .d2-553243892 .background-color-N7{background-color:#FFFFFF;} + .d2-553243892 .background-color-B1{background-color:#0D32B2;} + .d2-553243892 .background-color-B2{background-color:#0D32B2;} + .d2-553243892 .background-color-B3{background-color:#E3E9FD;} + .d2-553243892 .background-color-B4{background-color:#E3E9FD;} + .d2-553243892 .background-color-B5{background-color:#EDF0FD;} + .d2-553243892 .background-color-B6{background-color:#F7F8FE;} + .d2-553243892 .background-color-AA2{background-color:#4A6FF3;} + .d2-553243892 .background-color-AA4{background-color:#EDF0FD;} + .d2-553243892 .background-color-AA5{background-color:#F7F8FE;} + .d2-553243892 .background-color-AB4{background-color:#EDF0FD;} + .d2-553243892 .background-color-AB5{background-color:#F7F8FE;} + .d2-553243892 .color-N1{color:#0A0F25;} + .d2-553243892 .color-N2{color:#676C7E;} + .d2-553243892 .color-N3{color:#9499AB;} + .d2-553243892 .color-N4{color:#CFD2DD;} + .d2-553243892 .color-N5{color:#DEE1EB;} + .d2-553243892 .color-N6{color:#EEF1F8;} + .d2-553243892 .color-N7{color:#FFFFFF;} + .d2-553243892 .color-B1{color:#0D32B2;} + .d2-553243892 .color-B2{color:#0D32B2;} + .d2-553243892 .color-B3{color:#E3E9FD;} + .d2-553243892 .color-B4{color:#E3E9FD;} + .d2-553243892 .color-B5{color:#EDF0FD;} + .d2-553243892 .color-B6{color:#F7F8FE;} + .d2-553243892 .color-AA2{color:#4A6FF3;} + .d2-553243892 .color-AA4{color:#EDF0FD;} + .d2-553243892 .color-AA5{color:#F7F8FE;} + .d2-553243892 .color-AB4{color:#EDF0FD;} + .d2-553243892 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-553243892);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-553243892);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-553243892);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-553243892);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-553243892);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-553243892);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-553243892);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-553243892);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-553243892);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-553243892);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-553243892);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-553243892);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-553243892);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-553243892);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-553243892);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-553243892);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-553243892);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-553243892);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>hello - + \ No newline at end of file diff --git a/e2etests/testdata/stable/icon_positions/dagre/board.exp.json b/e2etests/testdata/stable/icon_positions/dagre/board.exp.json index a2eecb56f..fdf4e81da 100644 --- a/e2etests/testdata/stable/icon_positions/dagre/board.exp.json +++ b/e2etests/testdata/stable/icon_positions/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -62,6 +71,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -119,6 +129,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -176,6 +187,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -233,6 +245,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -290,6 +303,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -347,6 +361,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -404,6 +419,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -461,6 +477,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -518,6 +535,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -575,6 +593,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -632,6 +651,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -689,6 +709,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -746,6 +767,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -803,6 +825,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -860,6 +883,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -917,6 +941,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -974,6 +999,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1031,6 +1057,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1088,6 +1115,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1145,6 +1173,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1202,6 +1231,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1259,6 +1289,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1312,6 +1343,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1356,6 +1388,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1409,6 +1442,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1454,6 +1488,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1511,6 +1546,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1568,6 +1604,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1625,6 +1662,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1682,6 +1720,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1739,6 +1778,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1796,6 +1836,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1853,6 +1894,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1910,6 +1952,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1967,6 +2010,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2024,6 +2068,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2081,6 +2126,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2138,6 +2184,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2195,6 +2242,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2252,6 +2300,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2309,6 +2358,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2366,6 +2416,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2423,6 +2474,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2480,6 +2532,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2537,6 +2590,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2594,6 +2648,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2647,6 +2702,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2688,6 +2744,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2729,6 +2786,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2770,6 +2828,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2811,6 +2870,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2852,6 +2912,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2893,6 +2954,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2934,6 +2996,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2975,6 +3038,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3016,6 +3080,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3057,6 +3122,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3098,6 +3164,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3139,6 +3206,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3180,6 +3248,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3221,6 +3290,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3262,6 +3332,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3303,6 +3374,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3344,6 +3416,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3385,6 +3458,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3426,6 +3500,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3467,6 +3542,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3508,6 +3584,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3553,6 +3630,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3611,6 +3689,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3669,6 +3748,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3727,6 +3807,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3785,6 +3866,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3843,6 +3925,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3901,6 +3984,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3959,6 +4043,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4017,6 +4102,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4075,6 +4161,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4133,6 +4220,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4191,6 +4279,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4249,6 +4338,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4307,6 +4397,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4365,6 +4456,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4423,6 +4515,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4481,6 +4574,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4539,6 +4633,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4597,6 +4692,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4655,6 +4751,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4713,6 +4810,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4771,6 +4869,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4834,6 +4933,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 3091, @@ -4881,6 +4981,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 3091, @@ -4921,6 +5022,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/icon_positions/dagre/sketch.exp.svg b/e2etests/testdata/stable/icon_positions/dagre/sketch.exp.svg index 45d2fa5d5..9ea9becb9 100644 --- a/e2etests/testdata/stable/icon_positions/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/icon_positions/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -non containercontainerimageDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight + .d2-2162997408 .fill-N1{fill:#0A0F25;} + .d2-2162997408 .fill-N2{fill:#676C7E;} + .d2-2162997408 .fill-N3{fill:#9499AB;} + .d2-2162997408 .fill-N4{fill:#CFD2DD;} + .d2-2162997408 .fill-N5{fill:#DEE1EB;} + .d2-2162997408 .fill-N6{fill:#EEF1F8;} + .d2-2162997408 .fill-N7{fill:#FFFFFF;} + .d2-2162997408 .fill-B1{fill:#0D32B2;} + .d2-2162997408 .fill-B2{fill:#0D32B2;} + .d2-2162997408 .fill-B3{fill:#E3E9FD;} + .d2-2162997408 .fill-B4{fill:#E3E9FD;} + .d2-2162997408 .fill-B5{fill:#EDF0FD;} + .d2-2162997408 .fill-B6{fill:#F7F8FE;} + .d2-2162997408 .fill-AA2{fill:#4A6FF3;} + .d2-2162997408 .fill-AA4{fill:#EDF0FD;} + .d2-2162997408 .fill-AA5{fill:#F7F8FE;} + .d2-2162997408 .fill-AB4{fill:#EDF0FD;} + .d2-2162997408 .fill-AB5{fill:#F7F8FE;} + .d2-2162997408 .stroke-N1{stroke:#0A0F25;} + .d2-2162997408 .stroke-N2{stroke:#676C7E;} + .d2-2162997408 .stroke-N3{stroke:#9499AB;} + .d2-2162997408 .stroke-N4{stroke:#CFD2DD;} + .d2-2162997408 .stroke-N5{stroke:#DEE1EB;} + .d2-2162997408 .stroke-N6{stroke:#EEF1F8;} + .d2-2162997408 .stroke-N7{stroke:#FFFFFF;} + .d2-2162997408 .stroke-B1{stroke:#0D32B2;} + .d2-2162997408 .stroke-B2{stroke:#0D32B2;} + .d2-2162997408 .stroke-B3{stroke:#E3E9FD;} + .d2-2162997408 .stroke-B4{stroke:#E3E9FD;} + .d2-2162997408 .stroke-B5{stroke:#EDF0FD;} + .d2-2162997408 .stroke-B6{stroke:#F7F8FE;} + .d2-2162997408 .stroke-AA2{stroke:#4A6FF3;} + .d2-2162997408 .stroke-AA4{stroke:#EDF0FD;} + .d2-2162997408 .stroke-AA5{stroke:#F7F8FE;} + .d2-2162997408 .stroke-AB4{stroke:#EDF0FD;} + .d2-2162997408 .stroke-AB5{stroke:#F7F8FE;} + .d2-2162997408 .background-color-N1{background-color:#0A0F25;} + .d2-2162997408 .background-color-N2{background-color:#676C7E;} + .d2-2162997408 .background-color-N3{background-color:#9499AB;} + .d2-2162997408 .background-color-N4{background-color:#CFD2DD;} + .d2-2162997408 .background-color-N5{background-color:#DEE1EB;} + .d2-2162997408 .background-color-N6{background-color:#EEF1F8;} + .d2-2162997408 .background-color-N7{background-color:#FFFFFF;} + .d2-2162997408 .background-color-B1{background-color:#0D32B2;} + .d2-2162997408 .background-color-B2{background-color:#0D32B2;} + .d2-2162997408 .background-color-B3{background-color:#E3E9FD;} + .d2-2162997408 .background-color-B4{background-color:#E3E9FD;} + .d2-2162997408 .background-color-B5{background-color:#EDF0FD;} + .d2-2162997408 .background-color-B6{background-color:#F7F8FE;} + .d2-2162997408 .background-color-AA2{background-color:#4A6FF3;} + .d2-2162997408 .background-color-AA4{background-color:#EDF0FD;} + .d2-2162997408 .background-color-AA5{background-color:#F7F8FE;} + .d2-2162997408 .background-color-AB4{background-color:#EDF0FD;} + .d2-2162997408 .background-color-AB5{background-color:#F7F8FE;} + .d2-2162997408 .color-N1{color:#0A0F25;} + .d2-2162997408 .color-N2{color:#676C7E;} + .d2-2162997408 .color-N3{color:#9499AB;} + .d2-2162997408 .color-N4{color:#CFD2DD;} + .d2-2162997408 .color-N5{color:#DEE1EB;} + .d2-2162997408 .color-N6{color:#EEF1F8;} + .d2-2162997408 .color-N7{color:#FFFFFF;} + .d2-2162997408 .color-B1{color:#0D32B2;} + .d2-2162997408 .color-B2{color:#0D32B2;} + .d2-2162997408 .color-B3{color:#E3E9FD;} + .d2-2162997408 .color-B4{color:#E3E9FD;} + .d2-2162997408 .color-B5{color:#EDF0FD;} + .d2-2162997408 .color-B6{color:#F7F8FE;} + .d2-2162997408 .color-AA2{color:#4A6FF3;} + .d2-2162997408 .color-AA4{color:#EDF0FD;} + .d2-2162997408 .color-AA5{color:#F7F8FE;} + .d2-2162997408 .color-AB4{color:#EDF0FD;} + .d2-2162997408 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2162997408);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2162997408);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2162997408);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2162997408);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2162997408);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2162997408);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2162997408);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2162997408);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2162997408);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2162997408);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2162997408);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2162997408);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2162997408);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2162997408);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2162997408);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2162997408);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2162997408);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2162997408);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>non containercontainerimageDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/icon_positions/elk/board.exp.json b/e2etests/testdata/stable/icon_positions/elk/board.exp.json index c5c6db1aa..7a8b20025 100644 --- a/e2etests/testdata/stable/icon_positions/elk/board.exp.json +++ b/e2etests/testdata/stable/icon_positions/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -62,6 +71,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -119,6 +129,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -176,6 +187,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -233,6 +245,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -290,6 +303,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -347,6 +361,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -404,6 +419,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -461,6 +477,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -518,6 +535,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -575,6 +593,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -632,6 +651,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -689,6 +709,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -746,6 +767,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -803,6 +825,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -860,6 +883,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -917,6 +941,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -974,6 +999,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1031,6 +1057,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1088,6 +1115,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1145,6 +1173,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1202,6 +1231,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1259,6 +1289,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1312,6 +1343,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1356,6 +1388,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1409,6 +1442,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1454,6 +1488,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1511,6 +1546,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1568,6 +1604,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1625,6 +1662,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1682,6 +1720,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1739,6 +1778,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1796,6 +1836,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1853,6 +1894,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1910,6 +1952,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1967,6 +2010,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2024,6 +2068,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2081,6 +2126,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2138,6 +2184,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2195,6 +2242,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2252,6 +2300,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2309,6 +2358,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2366,6 +2416,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2423,6 +2474,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2480,6 +2532,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2537,6 +2590,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2594,6 +2648,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2647,6 +2702,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2688,6 +2744,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2729,6 +2786,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2770,6 +2828,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2811,6 +2870,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2852,6 +2912,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2893,6 +2954,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2934,6 +2996,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2975,6 +3038,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3016,6 +3080,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3057,6 +3122,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3098,6 +3164,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3139,6 +3206,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3180,6 +3248,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3221,6 +3290,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3262,6 +3332,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3303,6 +3374,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3344,6 +3416,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3385,6 +3458,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3426,6 +3500,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3467,6 +3542,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3508,6 +3584,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3553,6 +3630,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3611,6 +3689,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3669,6 +3748,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3727,6 +3807,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3785,6 +3866,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3843,6 +3925,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3901,6 +3984,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3959,6 +4043,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4017,6 +4102,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4075,6 +4161,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4133,6 +4220,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4191,6 +4279,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4249,6 +4338,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4307,6 +4397,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4365,6 +4456,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4423,6 +4515,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4481,6 +4574,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4539,6 +4633,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4597,6 +4692,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4655,6 +4751,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4713,6 +4810,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4771,6 +4869,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4834,6 +4933,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 3439.5, @@ -4872,6 +4972,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 3439.5, @@ -4903,6 +5004,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/icon_positions/elk/sketch.exp.svg b/e2etests/testdata/stable/icon_positions/elk/sketch.exp.svg index 6e5254a54..6c5cd5143 100644 --- a/e2etests/testdata/stable/icon_positions/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/icon_positions/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -non containercontainerimageDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight + .d2-2411270012 .fill-N1{fill:#0A0F25;} + .d2-2411270012 .fill-N2{fill:#676C7E;} + .d2-2411270012 .fill-N3{fill:#9499AB;} + .d2-2411270012 .fill-N4{fill:#CFD2DD;} + .d2-2411270012 .fill-N5{fill:#DEE1EB;} + .d2-2411270012 .fill-N6{fill:#EEF1F8;} + .d2-2411270012 .fill-N7{fill:#FFFFFF;} + .d2-2411270012 .fill-B1{fill:#0D32B2;} + .d2-2411270012 .fill-B2{fill:#0D32B2;} + .d2-2411270012 .fill-B3{fill:#E3E9FD;} + .d2-2411270012 .fill-B4{fill:#E3E9FD;} + .d2-2411270012 .fill-B5{fill:#EDF0FD;} + .d2-2411270012 .fill-B6{fill:#F7F8FE;} + .d2-2411270012 .fill-AA2{fill:#4A6FF3;} + .d2-2411270012 .fill-AA4{fill:#EDF0FD;} + .d2-2411270012 .fill-AA5{fill:#F7F8FE;} + .d2-2411270012 .fill-AB4{fill:#EDF0FD;} + .d2-2411270012 .fill-AB5{fill:#F7F8FE;} + .d2-2411270012 .stroke-N1{stroke:#0A0F25;} + .d2-2411270012 .stroke-N2{stroke:#676C7E;} + .d2-2411270012 .stroke-N3{stroke:#9499AB;} + .d2-2411270012 .stroke-N4{stroke:#CFD2DD;} + .d2-2411270012 .stroke-N5{stroke:#DEE1EB;} + .d2-2411270012 .stroke-N6{stroke:#EEF1F8;} + .d2-2411270012 .stroke-N7{stroke:#FFFFFF;} + .d2-2411270012 .stroke-B1{stroke:#0D32B2;} + .d2-2411270012 .stroke-B2{stroke:#0D32B2;} + .d2-2411270012 .stroke-B3{stroke:#E3E9FD;} + .d2-2411270012 .stroke-B4{stroke:#E3E9FD;} + .d2-2411270012 .stroke-B5{stroke:#EDF0FD;} + .d2-2411270012 .stroke-B6{stroke:#F7F8FE;} + .d2-2411270012 .stroke-AA2{stroke:#4A6FF3;} + .d2-2411270012 .stroke-AA4{stroke:#EDF0FD;} + .d2-2411270012 .stroke-AA5{stroke:#F7F8FE;} + .d2-2411270012 .stroke-AB4{stroke:#EDF0FD;} + .d2-2411270012 .stroke-AB5{stroke:#F7F8FE;} + .d2-2411270012 .background-color-N1{background-color:#0A0F25;} + .d2-2411270012 .background-color-N2{background-color:#676C7E;} + .d2-2411270012 .background-color-N3{background-color:#9499AB;} + .d2-2411270012 .background-color-N4{background-color:#CFD2DD;} + .d2-2411270012 .background-color-N5{background-color:#DEE1EB;} + .d2-2411270012 .background-color-N6{background-color:#EEF1F8;} + .d2-2411270012 .background-color-N7{background-color:#FFFFFF;} + .d2-2411270012 .background-color-B1{background-color:#0D32B2;} + .d2-2411270012 .background-color-B2{background-color:#0D32B2;} + .d2-2411270012 .background-color-B3{background-color:#E3E9FD;} + .d2-2411270012 .background-color-B4{background-color:#E3E9FD;} + .d2-2411270012 .background-color-B5{background-color:#EDF0FD;} + .d2-2411270012 .background-color-B6{background-color:#F7F8FE;} + .d2-2411270012 .background-color-AA2{background-color:#4A6FF3;} + .d2-2411270012 .background-color-AA4{background-color:#EDF0FD;} + .d2-2411270012 .background-color-AA5{background-color:#F7F8FE;} + .d2-2411270012 .background-color-AB4{background-color:#EDF0FD;} + .d2-2411270012 .background-color-AB5{background-color:#F7F8FE;} + .d2-2411270012 .color-N1{color:#0A0F25;} + .d2-2411270012 .color-N2{color:#676C7E;} + .d2-2411270012 .color-N3{color:#9499AB;} + .d2-2411270012 .color-N4{color:#CFD2DD;} + .d2-2411270012 .color-N5{color:#DEE1EB;} + .d2-2411270012 .color-N6{color:#EEF1F8;} + .d2-2411270012 .color-N7{color:#FFFFFF;} + .d2-2411270012 .color-B1{color:#0D32B2;} + .d2-2411270012 .color-B2{color:#0D32B2;} + .d2-2411270012 .color-B3{color:#E3E9FD;} + .d2-2411270012 .color-B4{color:#E3E9FD;} + .d2-2411270012 .color-B5{color:#EDF0FD;} + .d2-2411270012 .color-B6{color:#F7F8FE;} + .d2-2411270012 .color-AA2{color:#4A6FF3;} + .d2-2411270012 .color-AA4{color:#EDF0FD;} + .d2-2411270012 .color-AA5{color:#F7F8FE;} + .d2-2411270012 .color-AB4{color:#EDF0FD;} + .d2-2411270012 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2411270012);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2411270012);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2411270012);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2411270012);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2411270012);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2411270012);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2411270012);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2411270012);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2411270012);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2411270012);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2411270012);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2411270012);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2411270012);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2411270012);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2411270012);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2411270012);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2411270012);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2411270012);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>non containercontainerimageDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/images/dagre/board.exp.json b/e2etests/testdata/stable/images/dagre/board.exp.json index 0bff6ddbc..b712f3f4d 100644 --- a/e2etests/testdata/stable/images/dagre/board.exp.json +++ b/e2etests/testdata/stable/images/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -71,6 +80,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -134,6 +144,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 64, @@ -174,6 +185,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/images/dagre/sketch.exp.svg b/e2etests/testdata/stable/images/dagre/sketch.exp.svg index f562d9b68..7cac1fd46 100644 --- a/e2etests/testdata/stable/images/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/images/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -ab + .d2-697317802 .fill-N1{fill:#0A0F25;} + .d2-697317802 .fill-N2{fill:#676C7E;} + .d2-697317802 .fill-N3{fill:#9499AB;} + .d2-697317802 .fill-N4{fill:#CFD2DD;} + .d2-697317802 .fill-N5{fill:#DEE1EB;} + .d2-697317802 .fill-N6{fill:#EEF1F8;} + .d2-697317802 .fill-N7{fill:#FFFFFF;} + .d2-697317802 .fill-B1{fill:#0D32B2;} + .d2-697317802 .fill-B2{fill:#0D32B2;} + .d2-697317802 .fill-B3{fill:#E3E9FD;} + .d2-697317802 .fill-B4{fill:#E3E9FD;} + .d2-697317802 .fill-B5{fill:#EDF0FD;} + .d2-697317802 .fill-B6{fill:#F7F8FE;} + .d2-697317802 .fill-AA2{fill:#4A6FF3;} + .d2-697317802 .fill-AA4{fill:#EDF0FD;} + .d2-697317802 .fill-AA5{fill:#F7F8FE;} + .d2-697317802 .fill-AB4{fill:#EDF0FD;} + .d2-697317802 .fill-AB5{fill:#F7F8FE;} + .d2-697317802 .stroke-N1{stroke:#0A0F25;} + .d2-697317802 .stroke-N2{stroke:#676C7E;} + .d2-697317802 .stroke-N3{stroke:#9499AB;} + .d2-697317802 .stroke-N4{stroke:#CFD2DD;} + .d2-697317802 .stroke-N5{stroke:#DEE1EB;} + .d2-697317802 .stroke-N6{stroke:#EEF1F8;} + .d2-697317802 .stroke-N7{stroke:#FFFFFF;} + .d2-697317802 .stroke-B1{stroke:#0D32B2;} + .d2-697317802 .stroke-B2{stroke:#0D32B2;} + .d2-697317802 .stroke-B3{stroke:#E3E9FD;} + .d2-697317802 .stroke-B4{stroke:#E3E9FD;} + .d2-697317802 .stroke-B5{stroke:#EDF0FD;} + .d2-697317802 .stroke-B6{stroke:#F7F8FE;} + .d2-697317802 .stroke-AA2{stroke:#4A6FF3;} + .d2-697317802 .stroke-AA4{stroke:#EDF0FD;} + .d2-697317802 .stroke-AA5{stroke:#F7F8FE;} + .d2-697317802 .stroke-AB4{stroke:#EDF0FD;} + .d2-697317802 .stroke-AB5{stroke:#F7F8FE;} + .d2-697317802 .background-color-N1{background-color:#0A0F25;} + .d2-697317802 .background-color-N2{background-color:#676C7E;} + .d2-697317802 .background-color-N3{background-color:#9499AB;} + .d2-697317802 .background-color-N4{background-color:#CFD2DD;} + .d2-697317802 .background-color-N5{background-color:#DEE1EB;} + .d2-697317802 .background-color-N6{background-color:#EEF1F8;} + .d2-697317802 .background-color-N7{background-color:#FFFFFF;} + .d2-697317802 .background-color-B1{background-color:#0D32B2;} + .d2-697317802 .background-color-B2{background-color:#0D32B2;} + .d2-697317802 .background-color-B3{background-color:#E3E9FD;} + .d2-697317802 .background-color-B4{background-color:#E3E9FD;} + .d2-697317802 .background-color-B5{background-color:#EDF0FD;} + .d2-697317802 .background-color-B6{background-color:#F7F8FE;} + .d2-697317802 .background-color-AA2{background-color:#4A6FF3;} + .d2-697317802 .background-color-AA4{background-color:#EDF0FD;} + .d2-697317802 .background-color-AA5{background-color:#F7F8FE;} + .d2-697317802 .background-color-AB4{background-color:#EDF0FD;} + .d2-697317802 .background-color-AB5{background-color:#F7F8FE;} + .d2-697317802 .color-N1{color:#0A0F25;} + .d2-697317802 .color-N2{color:#676C7E;} + .d2-697317802 .color-N3{color:#9499AB;} + .d2-697317802 .color-N4{color:#CFD2DD;} + .d2-697317802 .color-N5{color:#DEE1EB;} + .d2-697317802 .color-N6{color:#EEF1F8;} + .d2-697317802 .color-N7{color:#FFFFFF;} + .d2-697317802 .color-B1{color:#0D32B2;} + .d2-697317802 .color-B2{color:#0D32B2;} + .d2-697317802 .color-B3{color:#E3E9FD;} + .d2-697317802 .color-B4{color:#E3E9FD;} + .d2-697317802 .color-B5{color:#EDF0FD;} + .d2-697317802 .color-B6{color:#F7F8FE;} + .d2-697317802 .color-AA2{color:#4A6FF3;} + .d2-697317802 .color-AA4{color:#EDF0FD;} + .d2-697317802 .color-AA5{color:#F7F8FE;} + .d2-697317802 .color-AB4{color:#EDF0FD;} + .d2-697317802 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-697317802);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-697317802);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-697317802);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-697317802);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-697317802);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-697317802);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-697317802);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-697317802);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-697317802);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-697317802);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-697317802);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-697317802);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-697317802);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-697317802);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-697317802);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-697317802);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-697317802);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-697317802);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ab - - + + \ No newline at end of file diff --git a/e2etests/testdata/stable/images/elk/board.exp.json b/e2etests/testdata/stable/images/elk/board.exp.json index 06af1dac1..fdc35cca7 100644 --- a/e2etests/testdata/stable/images/elk/board.exp.json +++ b/e2etests/testdata/stable/images/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -71,6 +80,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -134,6 +144,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 76, @@ -165,6 +176,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/images/elk/sketch.exp.svg b/e2etests/testdata/stable/images/elk/sketch.exp.svg index 8ce9a722a..93d065fb4 100644 --- a/e2etests/testdata/stable/images/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/images/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -ab + .d2-4116162699 .fill-N1{fill:#0A0F25;} + .d2-4116162699 .fill-N2{fill:#676C7E;} + .d2-4116162699 .fill-N3{fill:#9499AB;} + .d2-4116162699 .fill-N4{fill:#CFD2DD;} + .d2-4116162699 .fill-N5{fill:#DEE1EB;} + .d2-4116162699 .fill-N6{fill:#EEF1F8;} + .d2-4116162699 .fill-N7{fill:#FFFFFF;} + .d2-4116162699 .fill-B1{fill:#0D32B2;} + .d2-4116162699 .fill-B2{fill:#0D32B2;} + .d2-4116162699 .fill-B3{fill:#E3E9FD;} + .d2-4116162699 .fill-B4{fill:#E3E9FD;} + .d2-4116162699 .fill-B5{fill:#EDF0FD;} + .d2-4116162699 .fill-B6{fill:#F7F8FE;} + .d2-4116162699 .fill-AA2{fill:#4A6FF3;} + .d2-4116162699 .fill-AA4{fill:#EDF0FD;} + .d2-4116162699 .fill-AA5{fill:#F7F8FE;} + .d2-4116162699 .fill-AB4{fill:#EDF0FD;} + .d2-4116162699 .fill-AB5{fill:#F7F8FE;} + .d2-4116162699 .stroke-N1{stroke:#0A0F25;} + .d2-4116162699 .stroke-N2{stroke:#676C7E;} + .d2-4116162699 .stroke-N3{stroke:#9499AB;} + .d2-4116162699 .stroke-N4{stroke:#CFD2DD;} + .d2-4116162699 .stroke-N5{stroke:#DEE1EB;} + .d2-4116162699 .stroke-N6{stroke:#EEF1F8;} + .d2-4116162699 .stroke-N7{stroke:#FFFFFF;} + .d2-4116162699 .stroke-B1{stroke:#0D32B2;} + .d2-4116162699 .stroke-B2{stroke:#0D32B2;} + .d2-4116162699 .stroke-B3{stroke:#E3E9FD;} + .d2-4116162699 .stroke-B4{stroke:#E3E9FD;} + .d2-4116162699 .stroke-B5{stroke:#EDF0FD;} + .d2-4116162699 .stroke-B6{stroke:#F7F8FE;} + .d2-4116162699 .stroke-AA2{stroke:#4A6FF3;} + .d2-4116162699 .stroke-AA4{stroke:#EDF0FD;} + .d2-4116162699 .stroke-AA5{stroke:#F7F8FE;} + .d2-4116162699 .stroke-AB4{stroke:#EDF0FD;} + .d2-4116162699 .stroke-AB5{stroke:#F7F8FE;} + .d2-4116162699 .background-color-N1{background-color:#0A0F25;} + .d2-4116162699 .background-color-N2{background-color:#676C7E;} + .d2-4116162699 .background-color-N3{background-color:#9499AB;} + .d2-4116162699 .background-color-N4{background-color:#CFD2DD;} + .d2-4116162699 .background-color-N5{background-color:#DEE1EB;} + .d2-4116162699 .background-color-N6{background-color:#EEF1F8;} + .d2-4116162699 .background-color-N7{background-color:#FFFFFF;} + .d2-4116162699 .background-color-B1{background-color:#0D32B2;} + .d2-4116162699 .background-color-B2{background-color:#0D32B2;} + .d2-4116162699 .background-color-B3{background-color:#E3E9FD;} + .d2-4116162699 .background-color-B4{background-color:#E3E9FD;} + .d2-4116162699 .background-color-B5{background-color:#EDF0FD;} + .d2-4116162699 .background-color-B6{background-color:#F7F8FE;} + .d2-4116162699 .background-color-AA2{background-color:#4A6FF3;} + .d2-4116162699 .background-color-AA4{background-color:#EDF0FD;} + .d2-4116162699 .background-color-AA5{background-color:#F7F8FE;} + .d2-4116162699 .background-color-AB4{background-color:#EDF0FD;} + .d2-4116162699 .background-color-AB5{background-color:#F7F8FE;} + .d2-4116162699 .color-N1{color:#0A0F25;} + .d2-4116162699 .color-N2{color:#676C7E;} + .d2-4116162699 .color-N3{color:#9499AB;} + .d2-4116162699 .color-N4{color:#CFD2DD;} + .d2-4116162699 .color-N5{color:#DEE1EB;} + .d2-4116162699 .color-N6{color:#EEF1F8;} + .d2-4116162699 .color-N7{color:#FFFFFF;} + .d2-4116162699 .color-B1{color:#0D32B2;} + .d2-4116162699 .color-B2{color:#0D32B2;} + .d2-4116162699 .color-B3{color:#E3E9FD;} + .d2-4116162699 .color-B4{color:#E3E9FD;} + .d2-4116162699 .color-B5{color:#EDF0FD;} + .d2-4116162699 .color-B6{color:#F7F8FE;} + .d2-4116162699 .color-AA2{color:#4A6FF3;} + .d2-4116162699 .color-AA4{color:#EDF0FD;} + .d2-4116162699 .color-AA5{color:#F7F8FE;} + .d2-4116162699 .color-AB4{color:#EDF0FD;} + .d2-4116162699 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4116162699);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4116162699);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4116162699);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4116162699);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4116162699);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4116162699);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4116162699);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4116162699);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4116162699);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4116162699);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4116162699);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4116162699);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4116162699);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4116162699);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4116162699);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4116162699);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4116162699);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4116162699);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ab - - + + \ No newline at end of file diff --git a/e2etests/testdata/stable/investigate/dagre/board.exp.json b/e2etests/testdata/stable/investigate/dagre/board.exp.json index 00f4bf257..acbc7deb6 100644 --- a/e2etests/testdata/stable/investigate/dagre/board.exp.json +++ b/e2etests/testdata/stable/investigate/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "AB4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "AB4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "AB4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "N4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "N4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "N4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "AA4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -715,6 +740,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -756,6 +782,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -797,6 +824,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -838,6 +866,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -879,6 +908,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -920,6 +950,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -961,6 +992,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1014,6 +1046,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1055,6 +1088,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1096,6 +1130,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1137,6 +1172,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1190,6 +1226,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1231,6 +1268,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1272,6 +1310,7 @@ "borderRadius": 0, "fill": "red", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1323,6 +1362,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 164, @@ -1370,6 +1410,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 333, @@ -1417,6 +1458,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 103, @@ -1512,6 +1554,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 374, @@ -1775,6 +1818,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 308, @@ -1822,6 +1866,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 82, @@ -1869,6 +1914,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 82, @@ -1916,6 +1962,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 82, @@ -1975,6 +2022,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 82, @@ -2082,6 +2130,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 82, @@ -2165,6 +2214,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 82, @@ -2296,6 +2346,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 282, @@ -2343,6 +2394,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 282.25, @@ -2402,6 +2454,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 282.25, @@ -2449,6 +2502,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 308, @@ -2532,6 +2586,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 457.25, @@ -2591,6 +2646,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 113, @@ -2638,6 +2694,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 457.25, @@ -2685,6 +2742,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 421, @@ -2828,6 +2886,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 422.5, @@ -2959,6 +3018,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 282.25, @@ -3018,6 +3078,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 441.25, @@ -3077,6 +3138,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 408, @@ -3124,6 +3186,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 408.5, @@ -3183,6 +3246,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 408.5, @@ -3230,6 +3294,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 380, @@ -3270,6 +3335,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/investigate/dagre/sketch.exp.svg b/e2etests/testdata/stable/investigate/dagre/sketch.exp.svg index a193b8063..86c5a28a3 100644 --- a/e2etests/testdata/stable/investigate/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/investigate/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -aabbccddffiijjkkllnnssuuwwrmyyeegghhmmmmooppqqrrttvvxxzzabac 123456 + .d2-4157473222 .fill-N1{fill:#0A0F25;} + .d2-4157473222 .fill-N2{fill:#676C7E;} + .d2-4157473222 .fill-N3{fill:#9499AB;} + .d2-4157473222 .fill-N4{fill:#CFD2DD;} + .d2-4157473222 .fill-N5{fill:#DEE1EB;} + .d2-4157473222 .fill-N6{fill:#EEF1F8;} + .d2-4157473222 .fill-N7{fill:#FFFFFF;} + .d2-4157473222 .fill-B1{fill:#0D32B2;} + .d2-4157473222 .fill-B2{fill:#0D32B2;} + .d2-4157473222 .fill-B3{fill:#E3E9FD;} + .d2-4157473222 .fill-B4{fill:#E3E9FD;} + .d2-4157473222 .fill-B5{fill:#EDF0FD;} + .d2-4157473222 .fill-B6{fill:#F7F8FE;} + .d2-4157473222 .fill-AA2{fill:#4A6FF3;} + .d2-4157473222 .fill-AA4{fill:#EDF0FD;} + .d2-4157473222 .fill-AA5{fill:#F7F8FE;} + .d2-4157473222 .fill-AB4{fill:#EDF0FD;} + .d2-4157473222 .fill-AB5{fill:#F7F8FE;} + .d2-4157473222 .stroke-N1{stroke:#0A0F25;} + .d2-4157473222 .stroke-N2{stroke:#676C7E;} + .d2-4157473222 .stroke-N3{stroke:#9499AB;} + .d2-4157473222 .stroke-N4{stroke:#CFD2DD;} + .d2-4157473222 .stroke-N5{stroke:#DEE1EB;} + .d2-4157473222 .stroke-N6{stroke:#EEF1F8;} + .d2-4157473222 .stroke-N7{stroke:#FFFFFF;} + .d2-4157473222 .stroke-B1{stroke:#0D32B2;} + .d2-4157473222 .stroke-B2{stroke:#0D32B2;} + .d2-4157473222 .stroke-B3{stroke:#E3E9FD;} + .d2-4157473222 .stroke-B4{stroke:#E3E9FD;} + .d2-4157473222 .stroke-B5{stroke:#EDF0FD;} + .d2-4157473222 .stroke-B6{stroke:#F7F8FE;} + .d2-4157473222 .stroke-AA2{stroke:#4A6FF3;} + .d2-4157473222 .stroke-AA4{stroke:#EDF0FD;} + .d2-4157473222 .stroke-AA5{stroke:#F7F8FE;} + .d2-4157473222 .stroke-AB4{stroke:#EDF0FD;} + .d2-4157473222 .stroke-AB5{stroke:#F7F8FE;} + .d2-4157473222 .background-color-N1{background-color:#0A0F25;} + .d2-4157473222 .background-color-N2{background-color:#676C7E;} + .d2-4157473222 .background-color-N3{background-color:#9499AB;} + .d2-4157473222 .background-color-N4{background-color:#CFD2DD;} + .d2-4157473222 .background-color-N5{background-color:#DEE1EB;} + .d2-4157473222 .background-color-N6{background-color:#EEF1F8;} + .d2-4157473222 .background-color-N7{background-color:#FFFFFF;} + .d2-4157473222 .background-color-B1{background-color:#0D32B2;} + .d2-4157473222 .background-color-B2{background-color:#0D32B2;} + .d2-4157473222 .background-color-B3{background-color:#E3E9FD;} + .d2-4157473222 .background-color-B4{background-color:#E3E9FD;} + .d2-4157473222 .background-color-B5{background-color:#EDF0FD;} + .d2-4157473222 .background-color-B6{background-color:#F7F8FE;} + .d2-4157473222 .background-color-AA2{background-color:#4A6FF3;} + .d2-4157473222 .background-color-AA4{background-color:#EDF0FD;} + .d2-4157473222 .background-color-AA5{background-color:#F7F8FE;} + .d2-4157473222 .background-color-AB4{background-color:#EDF0FD;} + .d2-4157473222 .background-color-AB5{background-color:#F7F8FE;} + .d2-4157473222 .color-N1{color:#0A0F25;} + .d2-4157473222 .color-N2{color:#676C7E;} + .d2-4157473222 .color-N3{color:#9499AB;} + .d2-4157473222 .color-N4{color:#CFD2DD;} + .d2-4157473222 .color-N5{color:#DEE1EB;} + .d2-4157473222 .color-N6{color:#EEF1F8;} + .d2-4157473222 .color-N7{color:#FFFFFF;} + .d2-4157473222 .color-B1{color:#0D32B2;} + .d2-4157473222 .color-B2{color:#0D32B2;} + .d2-4157473222 .color-B3{color:#E3E9FD;} + .d2-4157473222 .color-B4{color:#E3E9FD;} + .d2-4157473222 .color-B5{color:#EDF0FD;} + .d2-4157473222 .color-B6{color:#F7F8FE;} + .d2-4157473222 .color-AA2{color:#4A6FF3;} + .d2-4157473222 .color-AA4{color:#EDF0FD;} + .d2-4157473222 .color-AA5{color:#F7F8FE;} + .d2-4157473222 .color-AB4{color:#EDF0FD;} + .d2-4157473222 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4157473222);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4157473222);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4157473222);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4157473222);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4157473222);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4157473222);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4157473222);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4157473222);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4157473222);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4157473222);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4157473222);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4157473222);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4157473222);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4157473222);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4157473222);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4157473222);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4157473222);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4157473222);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>aabbccddffiijjkkllnnssuuwwrmyyadeegghhmmmmooppqqrrttvvxxzzabac 123456 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/investigate/elk/board.exp.json b/e2etests/testdata/stable/investigate/elk/board.exp.json index 35304cfc6..4a69c8959 100644 --- a/e2etests/testdata/stable/investigate/elk/board.exp.json +++ b/e2etests/testdata/stable/investigate/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "AB4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "AB4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "AB4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "N4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "N4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "N4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "AA4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -715,6 +740,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -756,6 +782,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -797,6 +824,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -838,6 +866,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -879,6 +908,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -920,6 +950,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -961,6 +992,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1014,6 +1046,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1055,6 +1088,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1096,6 +1130,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1137,6 +1172,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1190,6 +1226,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1231,6 +1268,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1272,6 +1310,7 @@ "borderRadius": 0, "fill": "red", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1323,6 +1362,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 263, @@ -1361,6 +1401,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 280, @@ -1407,6 +1448,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 229, @@ -1453,6 +1495,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 314, @@ -1499,6 +1542,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 236, @@ -1537,6 +1581,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 151, @@ -1583,6 +1628,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 235, @@ -1621,6 +1667,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 235, @@ -1659,6 +1706,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 248.33299255371094, @@ -1705,6 +1753,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 465, @@ -1751,6 +1800,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 342, @@ -1805,6 +1855,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 363, @@ -1851,6 +1902,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 435.6659851074219, @@ -1889,6 +1941,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 435.6659851074219, @@ -1927,6 +1980,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 236, @@ -1973,6 +2027,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 93.5, @@ -2011,6 +2066,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 221.66600036621094, @@ -2049,6 +2105,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 93.5, @@ -2095,6 +2152,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 153, @@ -2133,6 +2191,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 139.66600036621094, @@ -2179,6 +2238,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 454.0830078125, @@ -2217,6 +2277,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 166.33299255371094, @@ -2263,6 +2324,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 431, @@ -2301,6 +2363,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 431.0830078125, @@ -2347,6 +2410,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 325.8330078125, @@ -2385,6 +2449,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 203, @@ -2424,6 +2489,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/investigate/elk/sketch.exp.svg b/e2etests/testdata/stable/investigate/elk/sketch.exp.svg index e8a8f5c85..8b25dde74 100644 --- a/e2etests/testdata/stable/investigate/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/investigate/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -aabbccddffiijjkkllnnssuuwwrmyyeegghhmmmmooppqqrrttvvxxzzabac 123456 + .d2-1161114692 .fill-N1{fill:#0A0F25;} + .d2-1161114692 .fill-N2{fill:#676C7E;} + .d2-1161114692 .fill-N3{fill:#9499AB;} + .d2-1161114692 .fill-N4{fill:#CFD2DD;} + .d2-1161114692 .fill-N5{fill:#DEE1EB;} + .d2-1161114692 .fill-N6{fill:#EEF1F8;} + .d2-1161114692 .fill-N7{fill:#FFFFFF;} + .d2-1161114692 .fill-B1{fill:#0D32B2;} + .d2-1161114692 .fill-B2{fill:#0D32B2;} + .d2-1161114692 .fill-B3{fill:#E3E9FD;} + .d2-1161114692 .fill-B4{fill:#E3E9FD;} + .d2-1161114692 .fill-B5{fill:#EDF0FD;} + .d2-1161114692 .fill-B6{fill:#F7F8FE;} + .d2-1161114692 .fill-AA2{fill:#4A6FF3;} + .d2-1161114692 .fill-AA4{fill:#EDF0FD;} + .d2-1161114692 .fill-AA5{fill:#F7F8FE;} + .d2-1161114692 .fill-AB4{fill:#EDF0FD;} + .d2-1161114692 .fill-AB5{fill:#F7F8FE;} + .d2-1161114692 .stroke-N1{stroke:#0A0F25;} + .d2-1161114692 .stroke-N2{stroke:#676C7E;} + .d2-1161114692 .stroke-N3{stroke:#9499AB;} + .d2-1161114692 .stroke-N4{stroke:#CFD2DD;} + .d2-1161114692 .stroke-N5{stroke:#DEE1EB;} + .d2-1161114692 .stroke-N6{stroke:#EEF1F8;} + .d2-1161114692 .stroke-N7{stroke:#FFFFFF;} + .d2-1161114692 .stroke-B1{stroke:#0D32B2;} + .d2-1161114692 .stroke-B2{stroke:#0D32B2;} + .d2-1161114692 .stroke-B3{stroke:#E3E9FD;} + .d2-1161114692 .stroke-B4{stroke:#E3E9FD;} + .d2-1161114692 .stroke-B5{stroke:#EDF0FD;} + .d2-1161114692 .stroke-B6{stroke:#F7F8FE;} + .d2-1161114692 .stroke-AA2{stroke:#4A6FF3;} + .d2-1161114692 .stroke-AA4{stroke:#EDF0FD;} + .d2-1161114692 .stroke-AA5{stroke:#F7F8FE;} + .d2-1161114692 .stroke-AB4{stroke:#EDF0FD;} + .d2-1161114692 .stroke-AB5{stroke:#F7F8FE;} + .d2-1161114692 .background-color-N1{background-color:#0A0F25;} + .d2-1161114692 .background-color-N2{background-color:#676C7E;} + .d2-1161114692 .background-color-N3{background-color:#9499AB;} + .d2-1161114692 .background-color-N4{background-color:#CFD2DD;} + .d2-1161114692 .background-color-N5{background-color:#DEE1EB;} + .d2-1161114692 .background-color-N6{background-color:#EEF1F8;} + .d2-1161114692 .background-color-N7{background-color:#FFFFFF;} + .d2-1161114692 .background-color-B1{background-color:#0D32B2;} + .d2-1161114692 .background-color-B2{background-color:#0D32B2;} + .d2-1161114692 .background-color-B3{background-color:#E3E9FD;} + .d2-1161114692 .background-color-B4{background-color:#E3E9FD;} + .d2-1161114692 .background-color-B5{background-color:#EDF0FD;} + .d2-1161114692 .background-color-B6{background-color:#F7F8FE;} + .d2-1161114692 .background-color-AA2{background-color:#4A6FF3;} + .d2-1161114692 .background-color-AA4{background-color:#EDF0FD;} + .d2-1161114692 .background-color-AA5{background-color:#F7F8FE;} + .d2-1161114692 .background-color-AB4{background-color:#EDF0FD;} + .d2-1161114692 .background-color-AB5{background-color:#F7F8FE;} + .d2-1161114692 .color-N1{color:#0A0F25;} + .d2-1161114692 .color-N2{color:#676C7E;} + .d2-1161114692 .color-N3{color:#9499AB;} + .d2-1161114692 .color-N4{color:#CFD2DD;} + .d2-1161114692 .color-N5{color:#DEE1EB;} + .d2-1161114692 .color-N6{color:#EEF1F8;} + .d2-1161114692 .color-N7{color:#FFFFFF;} + .d2-1161114692 .color-B1{color:#0D32B2;} + .d2-1161114692 .color-B2{color:#0D32B2;} + .d2-1161114692 .color-B3{color:#E3E9FD;} + .d2-1161114692 .color-B4{color:#E3E9FD;} + .d2-1161114692 .color-B5{color:#EDF0FD;} + .d2-1161114692 .color-B6{color:#F7F8FE;} + .d2-1161114692 .color-AA2{color:#4A6FF3;} + .d2-1161114692 .color-AA4{color:#EDF0FD;} + .d2-1161114692 .color-AA5{color:#F7F8FE;} + .d2-1161114692 .color-AB4{color:#EDF0FD;} + .d2-1161114692 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1161114692);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1161114692);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1161114692);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1161114692);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1161114692);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1161114692);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1161114692);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1161114692);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1161114692);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1161114692);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1161114692);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1161114692);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1161114692);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1161114692);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1161114692);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1161114692);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1161114692);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1161114692);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>aabbccddffiijjkkllnnssuuwwrmyyadeegghhmmmmooppqqrrttvvxxzzabac 123456 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/label-near/dagre/board.exp.json b/e2etests/testdata/stable/label-near/dagre/board.exp.json index 58330c06c..aecb6776f 100644 --- a/e2etests/testdata/stable/label-near/dagre/board.exp.json +++ b/e2etests/testdata/stable/label-near/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -71,6 +80,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -134,6 +144,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 123, @@ -174,6 +185,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/label-near/dagre/sketch.exp.svg b/e2etests/testdata/stable/label-near/dagre/sketch.exp.svg index 92a65d87b..4b61fcc43 100644 --- a/e2etests/testdata/stable/label-near/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/label-near/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -workerprofits + .d2-2112050560 .fill-N1{fill:#0A0F25;} + .d2-2112050560 .fill-N2{fill:#676C7E;} + .d2-2112050560 .fill-N3{fill:#9499AB;} + .d2-2112050560 .fill-N4{fill:#CFD2DD;} + .d2-2112050560 .fill-N5{fill:#DEE1EB;} + .d2-2112050560 .fill-N6{fill:#EEF1F8;} + .d2-2112050560 .fill-N7{fill:#FFFFFF;} + .d2-2112050560 .fill-B1{fill:#0D32B2;} + .d2-2112050560 .fill-B2{fill:#0D32B2;} + .d2-2112050560 .fill-B3{fill:#E3E9FD;} + .d2-2112050560 .fill-B4{fill:#E3E9FD;} + .d2-2112050560 .fill-B5{fill:#EDF0FD;} + .d2-2112050560 .fill-B6{fill:#F7F8FE;} + .d2-2112050560 .fill-AA2{fill:#4A6FF3;} + .d2-2112050560 .fill-AA4{fill:#EDF0FD;} + .d2-2112050560 .fill-AA5{fill:#F7F8FE;} + .d2-2112050560 .fill-AB4{fill:#EDF0FD;} + .d2-2112050560 .fill-AB5{fill:#F7F8FE;} + .d2-2112050560 .stroke-N1{stroke:#0A0F25;} + .d2-2112050560 .stroke-N2{stroke:#676C7E;} + .d2-2112050560 .stroke-N3{stroke:#9499AB;} + .d2-2112050560 .stroke-N4{stroke:#CFD2DD;} + .d2-2112050560 .stroke-N5{stroke:#DEE1EB;} + .d2-2112050560 .stroke-N6{stroke:#EEF1F8;} + .d2-2112050560 .stroke-N7{stroke:#FFFFFF;} + .d2-2112050560 .stroke-B1{stroke:#0D32B2;} + .d2-2112050560 .stroke-B2{stroke:#0D32B2;} + .d2-2112050560 .stroke-B3{stroke:#E3E9FD;} + .d2-2112050560 .stroke-B4{stroke:#E3E9FD;} + .d2-2112050560 .stroke-B5{stroke:#EDF0FD;} + .d2-2112050560 .stroke-B6{stroke:#F7F8FE;} + .d2-2112050560 .stroke-AA2{stroke:#4A6FF3;} + .d2-2112050560 .stroke-AA4{stroke:#EDF0FD;} + .d2-2112050560 .stroke-AA5{stroke:#F7F8FE;} + .d2-2112050560 .stroke-AB4{stroke:#EDF0FD;} + .d2-2112050560 .stroke-AB5{stroke:#F7F8FE;} + .d2-2112050560 .background-color-N1{background-color:#0A0F25;} + .d2-2112050560 .background-color-N2{background-color:#676C7E;} + .d2-2112050560 .background-color-N3{background-color:#9499AB;} + .d2-2112050560 .background-color-N4{background-color:#CFD2DD;} + .d2-2112050560 .background-color-N5{background-color:#DEE1EB;} + .d2-2112050560 .background-color-N6{background-color:#EEF1F8;} + .d2-2112050560 .background-color-N7{background-color:#FFFFFF;} + .d2-2112050560 .background-color-B1{background-color:#0D32B2;} + .d2-2112050560 .background-color-B2{background-color:#0D32B2;} + .d2-2112050560 .background-color-B3{background-color:#E3E9FD;} + .d2-2112050560 .background-color-B4{background-color:#E3E9FD;} + .d2-2112050560 .background-color-B5{background-color:#EDF0FD;} + .d2-2112050560 .background-color-B6{background-color:#F7F8FE;} + .d2-2112050560 .background-color-AA2{background-color:#4A6FF3;} + .d2-2112050560 .background-color-AA4{background-color:#EDF0FD;} + .d2-2112050560 .background-color-AA5{background-color:#F7F8FE;} + .d2-2112050560 .background-color-AB4{background-color:#EDF0FD;} + .d2-2112050560 .background-color-AB5{background-color:#F7F8FE;} + .d2-2112050560 .color-N1{color:#0A0F25;} + .d2-2112050560 .color-N2{color:#676C7E;} + .d2-2112050560 .color-N3{color:#9499AB;} + .d2-2112050560 .color-N4{color:#CFD2DD;} + .d2-2112050560 .color-N5{color:#DEE1EB;} + .d2-2112050560 .color-N6{color:#EEF1F8;} + .d2-2112050560 .color-N7{color:#FFFFFF;} + .d2-2112050560 .color-B1{color:#0D32B2;} + .d2-2112050560 .color-B2{color:#0D32B2;} + .d2-2112050560 .color-B3{color:#E3E9FD;} + .d2-2112050560 .color-B4{color:#E3E9FD;} + .d2-2112050560 .color-B5{color:#EDF0FD;} + .d2-2112050560 .color-B6{color:#F7F8FE;} + .d2-2112050560 .color-AA2{color:#4A6FF3;} + .d2-2112050560 .color-AA4{color:#EDF0FD;} + .d2-2112050560 .color-AA5{color:#F7F8FE;} + .d2-2112050560 .color-AB4{color:#EDF0FD;} + .d2-2112050560 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2112050560);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2112050560);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2112050560);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2112050560);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2112050560);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2112050560);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2112050560);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2112050560);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2112050560);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2112050560);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2112050560);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2112050560);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2112050560);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2112050560);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2112050560);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2112050560);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2112050560);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2112050560);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>workerprofits - - + + \ No newline at end of file diff --git a/e2etests/testdata/stable/label-near/elk/board.exp.json b/e2etests/testdata/stable/label-near/elk/board.exp.json index 8dd364c10..65ffbcc89 100644 --- a/e2etests/testdata/stable/label-near/elk/board.exp.json +++ b/e2etests/testdata/stable/label-near/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -71,6 +80,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -134,6 +144,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 135, @@ -165,6 +176,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/label-near/elk/sketch.exp.svg b/e2etests/testdata/stable/label-near/elk/sketch.exp.svg index 94bbb9ff2..08c6c80cf 100644 --- a/e2etests/testdata/stable/label-near/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/label-near/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -workerprofits + .d2-4142095785 .fill-N1{fill:#0A0F25;} + .d2-4142095785 .fill-N2{fill:#676C7E;} + .d2-4142095785 .fill-N3{fill:#9499AB;} + .d2-4142095785 .fill-N4{fill:#CFD2DD;} + .d2-4142095785 .fill-N5{fill:#DEE1EB;} + .d2-4142095785 .fill-N6{fill:#EEF1F8;} + .d2-4142095785 .fill-N7{fill:#FFFFFF;} + .d2-4142095785 .fill-B1{fill:#0D32B2;} + .d2-4142095785 .fill-B2{fill:#0D32B2;} + .d2-4142095785 .fill-B3{fill:#E3E9FD;} + .d2-4142095785 .fill-B4{fill:#E3E9FD;} + .d2-4142095785 .fill-B5{fill:#EDF0FD;} + .d2-4142095785 .fill-B6{fill:#F7F8FE;} + .d2-4142095785 .fill-AA2{fill:#4A6FF3;} + .d2-4142095785 .fill-AA4{fill:#EDF0FD;} + .d2-4142095785 .fill-AA5{fill:#F7F8FE;} + .d2-4142095785 .fill-AB4{fill:#EDF0FD;} + .d2-4142095785 .fill-AB5{fill:#F7F8FE;} + .d2-4142095785 .stroke-N1{stroke:#0A0F25;} + .d2-4142095785 .stroke-N2{stroke:#676C7E;} + .d2-4142095785 .stroke-N3{stroke:#9499AB;} + .d2-4142095785 .stroke-N4{stroke:#CFD2DD;} + .d2-4142095785 .stroke-N5{stroke:#DEE1EB;} + .d2-4142095785 .stroke-N6{stroke:#EEF1F8;} + .d2-4142095785 .stroke-N7{stroke:#FFFFFF;} + .d2-4142095785 .stroke-B1{stroke:#0D32B2;} + .d2-4142095785 .stroke-B2{stroke:#0D32B2;} + .d2-4142095785 .stroke-B3{stroke:#E3E9FD;} + .d2-4142095785 .stroke-B4{stroke:#E3E9FD;} + .d2-4142095785 .stroke-B5{stroke:#EDF0FD;} + .d2-4142095785 .stroke-B6{stroke:#F7F8FE;} + .d2-4142095785 .stroke-AA2{stroke:#4A6FF3;} + .d2-4142095785 .stroke-AA4{stroke:#EDF0FD;} + .d2-4142095785 .stroke-AA5{stroke:#F7F8FE;} + .d2-4142095785 .stroke-AB4{stroke:#EDF0FD;} + .d2-4142095785 .stroke-AB5{stroke:#F7F8FE;} + .d2-4142095785 .background-color-N1{background-color:#0A0F25;} + .d2-4142095785 .background-color-N2{background-color:#676C7E;} + .d2-4142095785 .background-color-N3{background-color:#9499AB;} + .d2-4142095785 .background-color-N4{background-color:#CFD2DD;} + .d2-4142095785 .background-color-N5{background-color:#DEE1EB;} + .d2-4142095785 .background-color-N6{background-color:#EEF1F8;} + .d2-4142095785 .background-color-N7{background-color:#FFFFFF;} + .d2-4142095785 .background-color-B1{background-color:#0D32B2;} + .d2-4142095785 .background-color-B2{background-color:#0D32B2;} + .d2-4142095785 .background-color-B3{background-color:#E3E9FD;} + .d2-4142095785 .background-color-B4{background-color:#E3E9FD;} + .d2-4142095785 .background-color-B5{background-color:#EDF0FD;} + .d2-4142095785 .background-color-B6{background-color:#F7F8FE;} + .d2-4142095785 .background-color-AA2{background-color:#4A6FF3;} + .d2-4142095785 .background-color-AA4{background-color:#EDF0FD;} + .d2-4142095785 .background-color-AA5{background-color:#F7F8FE;} + .d2-4142095785 .background-color-AB4{background-color:#EDF0FD;} + .d2-4142095785 .background-color-AB5{background-color:#F7F8FE;} + .d2-4142095785 .color-N1{color:#0A0F25;} + .d2-4142095785 .color-N2{color:#676C7E;} + .d2-4142095785 .color-N3{color:#9499AB;} + .d2-4142095785 .color-N4{color:#CFD2DD;} + .d2-4142095785 .color-N5{color:#DEE1EB;} + .d2-4142095785 .color-N6{color:#EEF1F8;} + .d2-4142095785 .color-N7{color:#FFFFFF;} + .d2-4142095785 .color-B1{color:#0D32B2;} + .d2-4142095785 .color-B2{color:#0D32B2;} + .d2-4142095785 .color-B3{color:#E3E9FD;} + .d2-4142095785 .color-B4{color:#E3E9FD;} + .d2-4142095785 .color-B5{color:#EDF0FD;} + .d2-4142095785 .color-B6{color:#F7F8FE;} + .d2-4142095785 .color-AA2{color:#4A6FF3;} + .d2-4142095785 .color-AA4{color:#EDF0FD;} + .d2-4142095785 .color-AA5{color:#F7F8FE;} + .d2-4142095785 .color-AB4{color:#EDF0FD;} + .d2-4142095785 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4142095785);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4142095785);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4142095785);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4142095785);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4142095785);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4142095785);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4142095785);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4142095785);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4142095785);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4142095785);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4142095785);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4142095785);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4142095785);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4142095785);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4142095785);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4142095785);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4142095785);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4142095785);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>workerprofits - - + + \ No newline at end of file diff --git a/e2etests/testdata/stable/label_positions/dagre/board.exp.json b/e2etests/testdata/stable/label_positions/dagre/board.exp.json index 2e5f24e9e..d8a4296d7 100644 --- a/e2etests/testdata/stable/label_positions/dagre/board.exp.json +++ b/e2etests/testdata/stable/label_positions/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -103,6 +113,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -147,6 +158,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -191,6 +203,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -235,6 +248,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -279,6 +293,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -323,6 +338,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -367,6 +383,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -411,6 +428,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -455,6 +473,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -499,6 +518,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -543,6 +563,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -587,6 +608,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -631,6 +653,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -675,6 +698,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -719,6 +743,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -763,6 +788,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -807,6 +833,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -851,6 +878,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -895,6 +923,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -939,6 +968,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -983,6 +1013,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1024,6 +1055,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1065,6 +1097,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1106,6 +1139,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1150,6 +1184,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1194,6 +1229,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1238,6 +1274,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1282,6 +1319,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1326,6 +1364,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1370,6 +1409,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1414,6 +1454,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1458,6 +1499,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1502,6 +1544,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1546,6 +1589,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1590,6 +1634,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1634,6 +1679,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1678,6 +1724,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1722,6 +1769,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1766,6 +1814,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1810,6 +1859,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1854,6 +1904,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1898,6 +1949,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1942,6 +1994,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1986,6 +2039,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2030,6 +2084,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2071,6 +2126,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2112,6 +2168,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2153,6 +2210,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2194,6 +2252,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2235,6 +2294,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2276,6 +2336,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2317,6 +2378,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2358,6 +2420,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2399,6 +2462,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2440,6 +2504,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2481,6 +2546,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2522,6 +2588,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2563,6 +2630,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2604,6 +2672,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2645,6 +2714,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2686,6 +2756,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2727,6 +2798,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2768,6 +2840,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2809,6 +2882,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2850,6 +2924,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2891,6 +2966,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2932,6 +3008,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2976,6 +3053,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3033,6 +3111,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3090,6 +3169,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3147,6 +3227,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3204,6 +3285,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3261,6 +3343,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3318,6 +3401,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3375,6 +3459,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3432,6 +3517,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3489,6 +3575,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3546,6 +3633,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3603,6 +3691,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3660,6 +3749,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3717,6 +3807,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3774,6 +3865,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3831,6 +3923,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3888,6 +3981,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3945,6 +4039,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4002,6 +4097,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4059,6 +4155,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4116,6 +4213,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4173,6 +4271,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4226,6 +4325,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4270,6 +4370,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4323,6 +4424,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4368,6 +4470,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4421,6 +4524,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4466,6 +4570,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4519,6 +4624,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4564,6 +4670,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4617,6 +4724,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4662,6 +4770,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4715,6 +4824,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4760,6 +4870,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4813,6 +4924,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4858,6 +4970,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4911,6 +5024,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4956,6 +5070,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5009,6 +5124,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5054,6 +5170,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5107,6 +5224,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5152,6 +5270,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5205,6 +5324,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5250,6 +5370,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5303,6 +5424,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5348,6 +5470,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5401,6 +5524,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5446,6 +5570,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5499,6 +5624,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5544,6 +5670,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5597,6 +5724,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5642,6 +5770,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5695,6 +5824,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5740,6 +5870,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5793,6 +5924,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5838,6 +5970,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5891,6 +6024,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5936,6 +6070,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5989,6 +6124,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6034,6 +6170,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6087,6 +6224,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6132,6 +6270,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6185,6 +6324,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6230,6 +6370,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6283,6 +6424,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6328,6 +6470,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6381,6 +6524,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6432,6 +6576,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 3091, @@ -6479,6 +6624,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 3091, @@ -6526,6 +6672,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 3091, @@ -6566,6 +6713,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/label_positions/dagre/sketch.exp.svg b/e2etests/testdata/stable/label_positions/dagre/sketch.exp.svg index eaaef11e8..cbebad19b 100644 --- a/e2etests/testdata/stable/label_positions/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/label_positions/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -non containercontainerwith iconcontainer with iconDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight + .d2-3369429973 .fill-N1{fill:#0A0F25;} + .d2-3369429973 .fill-N2{fill:#676C7E;} + .d2-3369429973 .fill-N3{fill:#9499AB;} + .d2-3369429973 .fill-N4{fill:#CFD2DD;} + .d2-3369429973 .fill-N5{fill:#DEE1EB;} + .d2-3369429973 .fill-N6{fill:#EEF1F8;} + .d2-3369429973 .fill-N7{fill:#FFFFFF;} + .d2-3369429973 .fill-B1{fill:#0D32B2;} + .d2-3369429973 .fill-B2{fill:#0D32B2;} + .d2-3369429973 .fill-B3{fill:#E3E9FD;} + .d2-3369429973 .fill-B4{fill:#E3E9FD;} + .d2-3369429973 .fill-B5{fill:#EDF0FD;} + .d2-3369429973 .fill-B6{fill:#F7F8FE;} + .d2-3369429973 .fill-AA2{fill:#4A6FF3;} + .d2-3369429973 .fill-AA4{fill:#EDF0FD;} + .d2-3369429973 .fill-AA5{fill:#F7F8FE;} + .d2-3369429973 .fill-AB4{fill:#EDF0FD;} + .d2-3369429973 .fill-AB5{fill:#F7F8FE;} + .d2-3369429973 .stroke-N1{stroke:#0A0F25;} + .d2-3369429973 .stroke-N2{stroke:#676C7E;} + .d2-3369429973 .stroke-N3{stroke:#9499AB;} + .d2-3369429973 .stroke-N4{stroke:#CFD2DD;} + .d2-3369429973 .stroke-N5{stroke:#DEE1EB;} + .d2-3369429973 .stroke-N6{stroke:#EEF1F8;} + .d2-3369429973 .stroke-N7{stroke:#FFFFFF;} + .d2-3369429973 .stroke-B1{stroke:#0D32B2;} + .d2-3369429973 .stroke-B2{stroke:#0D32B2;} + .d2-3369429973 .stroke-B3{stroke:#E3E9FD;} + .d2-3369429973 .stroke-B4{stroke:#E3E9FD;} + .d2-3369429973 .stroke-B5{stroke:#EDF0FD;} + .d2-3369429973 .stroke-B6{stroke:#F7F8FE;} + .d2-3369429973 .stroke-AA2{stroke:#4A6FF3;} + .d2-3369429973 .stroke-AA4{stroke:#EDF0FD;} + .d2-3369429973 .stroke-AA5{stroke:#F7F8FE;} + .d2-3369429973 .stroke-AB4{stroke:#EDF0FD;} + .d2-3369429973 .stroke-AB5{stroke:#F7F8FE;} + .d2-3369429973 .background-color-N1{background-color:#0A0F25;} + .d2-3369429973 .background-color-N2{background-color:#676C7E;} + .d2-3369429973 .background-color-N3{background-color:#9499AB;} + .d2-3369429973 .background-color-N4{background-color:#CFD2DD;} + .d2-3369429973 .background-color-N5{background-color:#DEE1EB;} + .d2-3369429973 .background-color-N6{background-color:#EEF1F8;} + .d2-3369429973 .background-color-N7{background-color:#FFFFFF;} + .d2-3369429973 .background-color-B1{background-color:#0D32B2;} + .d2-3369429973 .background-color-B2{background-color:#0D32B2;} + .d2-3369429973 .background-color-B3{background-color:#E3E9FD;} + .d2-3369429973 .background-color-B4{background-color:#E3E9FD;} + .d2-3369429973 .background-color-B5{background-color:#EDF0FD;} + .d2-3369429973 .background-color-B6{background-color:#F7F8FE;} + .d2-3369429973 .background-color-AA2{background-color:#4A6FF3;} + .d2-3369429973 .background-color-AA4{background-color:#EDF0FD;} + .d2-3369429973 .background-color-AA5{background-color:#F7F8FE;} + .d2-3369429973 .background-color-AB4{background-color:#EDF0FD;} + .d2-3369429973 .background-color-AB5{background-color:#F7F8FE;} + .d2-3369429973 .color-N1{color:#0A0F25;} + .d2-3369429973 .color-N2{color:#676C7E;} + .d2-3369429973 .color-N3{color:#9499AB;} + .d2-3369429973 .color-N4{color:#CFD2DD;} + .d2-3369429973 .color-N5{color:#DEE1EB;} + .d2-3369429973 .color-N6{color:#EEF1F8;} + .d2-3369429973 .color-N7{color:#FFFFFF;} + .d2-3369429973 .color-B1{color:#0D32B2;} + .d2-3369429973 .color-B2{color:#0D32B2;} + .d2-3369429973 .color-B3{color:#E3E9FD;} + .d2-3369429973 .color-B4{color:#E3E9FD;} + .d2-3369429973 .color-B5{color:#EDF0FD;} + .d2-3369429973 .color-B6{color:#F7F8FE;} + .d2-3369429973 .color-AA2{color:#4A6FF3;} + .d2-3369429973 .color-AA4{color:#EDF0FD;} + .d2-3369429973 .color-AA5{color:#F7F8FE;} + .d2-3369429973 .color-AB4{color:#EDF0FD;} + .d2-3369429973 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3369429973);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3369429973);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3369429973);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3369429973);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3369429973);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3369429973);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3369429973);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3369429973);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3369429973);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3369429973);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3369429973);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3369429973);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3369429973);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3369429973);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3369429973);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3369429973);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3369429973);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3369429973);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>non containercontainerwith iconcontainer with iconDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/label_positions/elk/board.exp.json b/e2etests/testdata/stable/label_positions/elk/board.exp.json index eba6a5c35..8d8b65698 100644 --- a/e2etests/testdata/stable/label_positions/elk/board.exp.json +++ b/e2etests/testdata/stable/label_positions/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -103,6 +113,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -147,6 +158,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -191,6 +203,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -235,6 +248,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -279,6 +293,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -323,6 +338,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -367,6 +383,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -411,6 +428,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -455,6 +473,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -499,6 +518,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -543,6 +563,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -587,6 +608,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -631,6 +653,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -675,6 +698,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -719,6 +743,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -763,6 +788,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -807,6 +833,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -851,6 +878,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -895,6 +923,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -939,6 +968,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -983,6 +1013,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1024,6 +1055,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1065,6 +1097,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1106,6 +1139,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1150,6 +1184,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1194,6 +1229,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1238,6 +1274,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1282,6 +1319,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1326,6 +1364,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1370,6 +1409,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1414,6 +1454,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1458,6 +1499,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1502,6 +1544,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1546,6 +1589,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1590,6 +1634,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1634,6 +1679,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1678,6 +1724,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1722,6 +1769,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1766,6 +1814,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1810,6 +1859,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1854,6 +1904,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1898,6 +1949,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1942,6 +1994,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1986,6 +2039,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2030,6 +2084,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2071,6 +2126,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2112,6 +2168,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2153,6 +2210,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2194,6 +2252,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2235,6 +2294,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2276,6 +2336,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2317,6 +2378,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2358,6 +2420,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2399,6 +2462,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2440,6 +2504,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2481,6 +2546,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2522,6 +2588,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2563,6 +2630,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2604,6 +2672,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2645,6 +2714,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2686,6 +2756,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2727,6 +2798,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2768,6 +2840,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2809,6 +2882,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2850,6 +2924,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2891,6 +2966,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2932,6 +3008,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2976,6 +3053,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3033,6 +3111,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3090,6 +3169,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3147,6 +3227,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3204,6 +3285,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3261,6 +3343,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3318,6 +3401,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3375,6 +3459,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3432,6 +3517,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3489,6 +3575,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3546,6 +3633,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3603,6 +3691,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3660,6 +3749,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3717,6 +3807,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3774,6 +3865,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3831,6 +3923,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3888,6 +3981,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3945,6 +4039,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4002,6 +4097,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4059,6 +4155,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4116,6 +4213,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4173,6 +4271,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4226,6 +4325,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4270,6 +4370,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4323,6 +4424,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4368,6 +4470,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4421,6 +4524,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4466,6 +4570,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4519,6 +4624,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4564,6 +4670,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4617,6 +4724,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4662,6 +4770,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4715,6 +4824,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4760,6 +4870,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4813,6 +4924,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4858,6 +4970,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4911,6 +5024,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4956,6 +5070,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5009,6 +5124,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5054,6 +5170,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5107,6 +5224,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5152,6 +5270,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5205,6 +5324,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5250,6 +5370,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5303,6 +5424,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5348,6 +5470,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5401,6 +5524,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5446,6 +5570,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5499,6 +5624,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5544,6 +5670,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5597,6 +5724,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5642,6 +5770,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5695,6 +5824,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5740,6 +5870,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5793,6 +5924,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5838,6 +5970,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5891,6 +6024,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5936,6 +6070,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5989,6 +6124,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6034,6 +6170,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6087,6 +6224,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6132,6 +6270,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6185,6 +6324,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6230,6 +6370,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6283,6 +6424,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6328,6 +6470,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6381,6 +6524,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6432,6 +6576,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 3908.5, @@ -6470,6 +6615,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 3908.5, @@ -6508,6 +6654,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 3908.5, @@ -6539,6 +6686,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/label_positions/elk/sketch.exp.svg b/e2etests/testdata/stable/label_positions/elk/sketch.exp.svg index 07c788e0f..9d82f05a9 100644 --- a/e2etests/testdata/stable/label_positions/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/label_positions/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -non containercontainerwith iconcontainer with iconDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight + .d2-4011467175 .fill-N1{fill:#0A0F25;} + .d2-4011467175 .fill-N2{fill:#676C7E;} + .d2-4011467175 .fill-N3{fill:#9499AB;} + .d2-4011467175 .fill-N4{fill:#CFD2DD;} + .d2-4011467175 .fill-N5{fill:#DEE1EB;} + .d2-4011467175 .fill-N6{fill:#EEF1F8;} + .d2-4011467175 .fill-N7{fill:#FFFFFF;} + .d2-4011467175 .fill-B1{fill:#0D32B2;} + .d2-4011467175 .fill-B2{fill:#0D32B2;} + .d2-4011467175 .fill-B3{fill:#E3E9FD;} + .d2-4011467175 .fill-B4{fill:#E3E9FD;} + .d2-4011467175 .fill-B5{fill:#EDF0FD;} + .d2-4011467175 .fill-B6{fill:#F7F8FE;} + .d2-4011467175 .fill-AA2{fill:#4A6FF3;} + .d2-4011467175 .fill-AA4{fill:#EDF0FD;} + .d2-4011467175 .fill-AA5{fill:#F7F8FE;} + .d2-4011467175 .fill-AB4{fill:#EDF0FD;} + .d2-4011467175 .fill-AB5{fill:#F7F8FE;} + .d2-4011467175 .stroke-N1{stroke:#0A0F25;} + .d2-4011467175 .stroke-N2{stroke:#676C7E;} + .d2-4011467175 .stroke-N3{stroke:#9499AB;} + .d2-4011467175 .stroke-N4{stroke:#CFD2DD;} + .d2-4011467175 .stroke-N5{stroke:#DEE1EB;} + .d2-4011467175 .stroke-N6{stroke:#EEF1F8;} + .d2-4011467175 .stroke-N7{stroke:#FFFFFF;} + .d2-4011467175 .stroke-B1{stroke:#0D32B2;} + .d2-4011467175 .stroke-B2{stroke:#0D32B2;} + .d2-4011467175 .stroke-B3{stroke:#E3E9FD;} + .d2-4011467175 .stroke-B4{stroke:#E3E9FD;} + .d2-4011467175 .stroke-B5{stroke:#EDF0FD;} + .d2-4011467175 .stroke-B6{stroke:#F7F8FE;} + .d2-4011467175 .stroke-AA2{stroke:#4A6FF3;} + .d2-4011467175 .stroke-AA4{stroke:#EDF0FD;} + .d2-4011467175 .stroke-AA5{stroke:#F7F8FE;} + .d2-4011467175 .stroke-AB4{stroke:#EDF0FD;} + .d2-4011467175 .stroke-AB5{stroke:#F7F8FE;} + .d2-4011467175 .background-color-N1{background-color:#0A0F25;} + .d2-4011467175 .background-color-N2{background-color:#676C7E;} + .d2-4011467175 .background-color-N3{background-color:#9499AB;} + .d2-4011467175 .background-color-N4{background-color:#CFD2DD;} + .d2-4011467175 .background-color-N5{background-color:#DEE1EB;} + .d2-4011467175 .background-color-N6{background-color:#EEF1F8;} + .d2-4011467175 .background-color-N7{background-color:#FFFFFF;} + .d2-4011467175 .background-color-B1{background-color:#0D32B2;} + .d2-4011467175 .background-color-B2{background-color:#0D32B2;} + .d2-4011467175 .background-color-B3{background-color:#E3E9FD;} + .d2-4011467175 .background-color-B4{background-color:#E3E9FD;} + .d2-4011467175 .background-color-B5{background-color:#EDF0FD;} + .d2-4011467175 .background-color-B6{background-color:#F7F8FE;} + .d2-4011467175 .background-color-AA2{background-color:#4A6FF3;} + .d2-4011467175 .background-color-AA4{background-color:#EDF0FD;} + .d2-4011467175 .background-color-AA5{background-color:#F7F8FE;} + .d2-4011467175 .background-color-AB4{background-color:#EDF0FD;} + .d2-4011467175 .background-color-AB5{background-color:#F7F8FE;} + .d2-4011467175 .color-N1{color:#0A0F25;} + .d2-4011467175 .color-N2{color:#676C7E;} + .d2-4011467175 .color-N3{color:#9499AB;} + .d2-4011467175 .color-N4{color:#CFD2DD;} + .d2-4011467175 .color-N5{color:#DEE1EB;} + .d2-4011467175 .color-N6{color:#EEF1F8;} + .d2-4011467175 .color-N7{color:#FFFFFF;} + .d2-4011467175 .color-B1{color:#0D32B2;} + .d2-4011467175 .color-B2{color:#0D32B2;} + .d2-4011467175 .color-B3{color:#E3E9FD;} + .d2-4011467175 .color-B4{color:#E3E9FD;} + .d2-4011467175 .color-B5{color:#EDF0FD;} + .d2-4011467175 .color-B6{color:#F7F8FE;} + .d2-4011467175 .color-AA2{color:#4A6FF3;} + .d2-4011467175 .color-AA4{color:#EDF0FD;} + .d2-4011467175 .color-AA5{color:#F7F8FE;} + .d2-4011467175 .color-AB4{color:#EDF0FD;} + .d2-4011467175 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4011467175);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4011467175);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4011467175);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4011467175);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4011467175);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4011467175);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4011467175);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4011467175);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4011467175);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4011467175);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4011467175);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4011467175);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4011467175);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4011467175);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4011467175);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4011467175);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4011467175);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4011467175);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>non containercontainerwith iconcontainer with iconDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/large_arch/dagre/board.exp.json b/e2etests/testdata/stable/large_arch/dagre/board.exp.json index 28358af13..6a43763e9 100644 --- a/e2etests/testdata/stable/large_arch/dagre/board.exp.json +++ b/e2etests/testdata/stable/large_arch/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -715,6 +740,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -756,6 +782,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -797,6 +824,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -838,6 +866,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -879,6 +908,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -920,6 +950,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -961,6 +992,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1002,6 +1034,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1043,6 +1076,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1084,6 +1118,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1125,6 +1160,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1166,6 +1202,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1207,6 +1244,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1248,6 +1286,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1289,6 +1328,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1330,6 +1370,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1381,6 +1422,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1731.5, @@ -1452,6 +1494,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1513.75, @@ -1523,6 +1566,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1814, @@ -1582,6 +1626,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1749.75, @@ -1641,6 +1686,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1836.5, @@ -1700,6 +1746,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1693.5, @@ -1759,6 +1806,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1693.5, @@ -1818,6 +1866,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1736, @@ -1877,6 +1926,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1699.25, @@ -1936,6 +1986,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1007.25, @@ -1983,6 +2034,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 629, @@ -2054,6 +2106,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 657.5, @@ -2125,6 +2178,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 431, @@ -2196,6 +2250,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 781.75, @@ -2267,6 +2322,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 307.75, @@ -2338,6 +2394,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 671.5, @@ -2409,6 +2466,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 576.25, @@ -2528,6 +2586,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 543.75, @@ -2599,6 +2658,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1053.75, @@ -2663,6 +2723,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg b/e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg index 245da23f8..e3ca25ba8 100644 --- a/e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -abcdefghiqrjmnoszaabbeeffggklptuwxyccddv + .d2-3911258808 .fill-N1{fill:#0A0F25;} + .d2-3911258808 .fill-N2{fill:#676C7E;} + .d2-3911258808 .fill-N3{fill:#9499AB;} + .d2-3911258808 .fill-N4{fill:#CFD2DD;} + .d2-3911258808 .fill-N5{fill:#DEE1EB;} + .d2-3911258808 .fill-N6{fill:#EEF1F8;} + .d2-3911258808 .fill-N7{fill:#FFFFFF;} + .d2-3911258808 .fill-B1{fill:#0D32B2;} + .d2-3911258808 .fill-B2{fill:#0D32B2;} + .d2-3911258808 .fill-B3{fill:#E3E9FD;} + .d2-3911258808 .fill-B4{fill:#E3E9FD;} + .d2-3911258808 .fill-B5{fill:#EDF0FD;} + .d2-3911258808 .fill-B6{fill:#F7F8FE;} + .d2-3911258808 .fill-AA2{fill:#4A6FF3;} + .d2-3911258808 .fill-AA4{fill:#EDF0FD;} + .d2-3911258808 .fill-AA5{fill:#F7F8FE;} + .d2-3911258808 .fill-AB4{fill:#EDF0FD;} + .d2-3911258808 .fill-AB5{fill:#F7F8FE;} + .d2-3911258808 .stroke-N1{stroke:#0A0F25;} + .d2-3911258808 .stroke-N2{stroke:#676C7E;} + .d2-3911258808 .stroke-N3{stroke:#9499AB;} + .d2-3911258808 .stroke-N4{stroke:#CFD2DD;} + .d2-3911258808 .stroke-N5{stroke:#DEE1EB;} + .d2-3911258808 .stroke-N6{stroke:#EEF1F8;} + .d2-3911258808 .stroke-N7{stroke:#FFFFFF;} + .d2-3911258808 .stroke-B1{stroke:#0D32B2;} + .d2-3911258808 .stroke-B2{stroke:#0D32B2;} + .d2-3911258808 .stroke-B3{stroke:#E3E9FD;} + .d2-3911258808 .stroke-B4{stroke:#E3E9FD;} + .d2-3911258808 .stroke-B5{stroke:#EDF0FD;} + .d2-3911258808 .stroke-B6{stroke:#F7F8FE;} + .d2-3911258808 .stroke-AA2{stroke:#4A6FF3;} + .d2-3911258808 .stroke-AA4{stroke:#EDF0FD;} + .d2-3911258808 .stroke-AA5{stroke:#F7F8FE;} + .d2-3911258808 .stroke-AB4{stroke:#EDF0FD;} + .d2-3911258808 .stroke-AB5{stroke:#F7F8FE;} + .d2-3911258808 .background-color-N1{background-color:#0A0F25;} + .d2-3911258808 .background-color-N2{background-color:#676C7E;} + .d2-3911258808 .background-color-N3{background-color:#9499AB;} + .d2-3911258808 .background-color-N4{background-color:#CFD2DD;} + .d2-3911258808 .background-color-N5{background-color:#DEE1EB;} + .d2-3911258808 .background-color-N6{background-color:#EEF1F8;} + .d2-3911258808 .background-color-N7{background-color:#FFFFFF;} + .d2-3911258808 .background-color-B1{background-color:#0D32B2;} + .d2-3911258808 .background-color-B2{background-color:#0D32B2;} + .d2-3911258808 .background-color-B3{background-color:#E3E9FD;} + .d2-3911258808 .background-color-B4{background-color:#E3E9FD;} + .d2-3911258808 .background-color-B5{background-color:#EDF0FD;} + .d2-3911258808 .background-color-B6{background-color:#F7F8FE;} + .d2-3911258808 .background-color-AA2{background-color:#4A6FF3;} + .d2-3911258808 .background-color-AA4{background-color:#EDF0FD;} + .d2-3911258808 .background-color-AA5{background-color:#F7F8FE;} + .d2-3911258808 .background-color-AB4{background-color:#EDF0FD;} + .d2-3911258808 .background-color-AB5{background-color:#F7F8FE;} + .d2-3911258808 .color-N1{color:#0A0F25;} + .d2-3911258808 .color-N2{color:#676C7E;} + .d2-3911258808 .color-N3{color:#9499AB;} + .d2-3911258808 .color-N4{color:#CFD2DD;} + .d2-3911258808 .color-N5{color:#DEE1EB;} + .d2-3911258808 .color-N6{color:#EEF1F8;} + .d2-3911258808 .color-N7{color:#FFFFFF;} + .d2-3911258808 .color-B1{color:#0D32B2;} + .d2-3911258808 .color-B2{color:#0D32B2;} + .d2-3911258808 .color-B3{color:#E3E9FD;} + .d2-3911258808 .color-B4{color:#E3E9FD;} + .d2-3911258808 .color-B5{color:#EDF0FD;} + .d2-3911258808 .color-B6{color:#F7F8FE;} + .d2-3911258808 .color-AA2{color:#4A6FF3;} + .d2-3911258808 .color-AA4{color:#EDF0FD;} + .d2-3911258808 .color-AA5{color:#F7F8FE;} + .d2-3911258808 .color-AB4{color:#EDF0FD;} + .d2-3911258808 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3911258808);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3911258808);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3911258808);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3911258808);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3911258808);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3911258808);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3911258808);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3911258808);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3911258808);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3911258808);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3911258808);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3911258808);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3911258808);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3911258808);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3911258808);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3911258808);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3911258808);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3911258808);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdefghiqrjmnoszaabbeeffggklptuwxyccddv - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/large_arch/elk/board.exp.json b/e2etests/testdata/stable/large_arch/elk/board.exp.json index 331db4ae7..8a3561679 100644 --- a/e2etests/testdata/stable/large_arch/elk/board.exp.json +++ b/e2etests/testdata/stable/large_arch/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -715,6 +740,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -756,6 +782,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -797,6 +824,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -838,6 +866,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -879,6 +908,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -920,6 +950,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -961,6 +992,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1002,6 +1034,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1043,6 +1076,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1084,6 +1118,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1125,6 +1160,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1166,6 +1202,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1207,6 +1244,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1248,6 +1286,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1289,6 +1328,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1330,6 +1370,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1381,6 +1422,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 801.25, @@ -1427,6 +1469,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 872.25, @@ -1465,6 +1508,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1028.75, @@ -1519,6 +1563,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 669.416015625, @@ -1565,6 +1610,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 749.25, @@ -1611,6 +1657,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 646.166015625, @@ -1649,6 +1696,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 602.75, @@ -1695,6 +1743,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 536.0830078125, @@ -1741,6 +1790,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 569.416015625, @@ -1787,6 +1837,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 572.666015625, @@ -1825,6 +1876,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 574.3330078125, @@ -1871,6 +1923,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 601, @@ -1909,6 +1962,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 882.666015625, @@ -1955,6 +2009,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 475, @@ -1993,6 +2048,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 288, @@ -2031,6 +2087,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 601, @@ -2077,6 +2134,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 270.5, @@ -2115,6 +2173,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 338, @@ -2153,6 +2212,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 800.166015625, @@ -2184,6 +2244,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/large_arch/elk/sketch.exp.svg b/e2etests/testdata/stable/large_arch/elk/sketch.exp.svg index 495ddea58..520b07e6b 100644 --- a/e2etests/testdata/stable/large_arch/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/large_arch/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -abcdefghiqrjmnoszaabbeeffggklptuwxyccddv + .d2-1704780360 .fill-N1{fill:#0A0F25;} + .d2-1704780360 .fill-N2{fill:#676C7E;} + .d2-1704780360 .fill-N3{fill:#9499AB;} + .d2-1704780360 .fill-N4{fill:#CFD2DD;} + .d2-1704780360 .fill-N5{fill:#DEE1EB;} + .d2-1704780360 .fill-N6{fill:#EEF1F8;} + .d2-1704780360 .fill-N7{fill:#FFFFFF;} + .d2-1704780360 .fill-B1{fill:#0D32B2;} + .d2-1704780360 .fill-B2{fill:#0D32B2;} + .d2-1704780360 .fill-B3{fill:#E3E9FD;} + .d2-1704780360 .fill-B4{fill:#E3E9FD;} + .d2-1704780360 .fill-B5{fill:#EDF0FD;} + .d2-1704780360 .fill-B6{fill:#F7F8FE;} + .d2-1704780360 .fill-AA2{fill:#4A6FF3;} + .d2-1704780360 .fill-AA4{fill:#EDF0FD;} + .d2-1704780360 .fill-AA5{fill:#F7F8FE;} + .d2-1704780360 .fill-AB4{fill:#EDF0FD;} + .d2-1704780360 .fill-AB5{fill:#F7F8FE;} + .d2-1704780360 .stroke-N1{stroke:#0A0F25;} + .d2-1704780360 .stroke-N2{stroke:#676C7E;} + .d2-1704780360 .stroke-N3{stroke:#9499AB;} + .d2-1704780360 .stroke-N4{stroke:#CFD2DD;} + .d2-1704780360 .stroke-N5{stroke:#DEE1EB;} + .d2-1704780360 .stroke-N6{stroke:#EEF1F8;} + .d2-1704780360 .stroke-N7{stroke:#FFFFFF;} + .d2-1704780360 .stroke-B1{stroke:#0D32B2;} + .d2-1704780360 .stroke-B2{stroke:#0D32B2;} + .d2-1704780360 .stroke-B3{stroke:#E3E9FD;} + .d2-1704780360 .stroke-B4{stroke:#E3E9FD;} + .d2-1704780360 .stroke-B5{stroke:#EDF0FD;} + .d2-1704780360 .stroke-B6{stroke:#F7F8FE;} + .d2-1704780360 .stroke-AA2{stroke:#4A6FF3;} + .d2-1704780360 .stroke-AA4{stroke:#EDF0FD;} + .d2-1704780360 .stroke-AA5{stroke:#F7F8FE;} + .d2-1704780360 .stroke-AB4{stroke:#EDF0FD;} + .d2-1704780360 .stroke-AB5{stroke:#F7F8FE;} + .d2-1704780360 .background-color-N1{background-color:#0A0F25;} + .d2-1704780360 .background-color-N2{background-color:#676C7E;} + .d2-1704780360 .background-color-N3{background-color:#9499AB;} + .d2-1704780360 .background-color-N4{background-color:#CFD2DD;} + .d2-1704780360 .background-color-N5{background-color:#DEE1EB;} + .d2-1704780360 .background-color-N6{background-color:#EEF1F8;} + .d2-1704780360 .background-color-N7{background-color:#FFFFFF;} + .d2-1704780360 .background-color-B1{background-color:#0D32B2;} + .d2-1704780360 .background-color-B2{background-color:#0D32B2;} + .d2-1704780360 .background-color-B3{background-color:#E3E9FD;} + .d2-1704780360 .background-color-B4{background-color:#E3E9FD;} + .d2-1704780360 .background-color-B5{background-color:#EDF0FD;} + .d2-1704780360 .background-color-B6{background-color:#F7F8FE;} + .d2-1704780360 .background-color-AA2{background-color:#4A6FF3;} + .d2-1704780360 .background-color-AA4{background-color:#EDF0FD;} + .d2-1704780360 .background-color-AA5{background-color:#F7F8FE;} + .d2-1704780360 .background-color-AB4{background-color:#EDF0FD;} + .d2-1704780360 .background-color-AB5{background-color:#F7F8FE;} + .d2-1704780360 .color-N1{color:#0A0F25;} + .d2-1704780360 .color-N2{color:#676C7E;} + .d2-1704780360 .color-N3{color:#9499AB;} + .d2-1704780360 .color-N4{color:#CFD2DD;} + .d2-1704780360 .color-N5{color:#DEE1EB;} + .d2-1704780360 .color-N6{color:#EEF1F8;} + .d2-1704780360 .color-N7{color:#FFFFFF;} + .d2-1704780360 .color-B1{color:#0D32B2;} + .d2-1704780360 .color-B2{color:#0D32B2;} + .d2-1704780360 .color-B3{color:#E3E9FD;} + .d2-1704780360 .color-B4{color:#E3E9FD;} + .d2-1704780360 .color-B5{color:#EDF0FD;} + .d2-1704780360 .color-B6{color:#F7F8FE;} + .d2-1704780360 .color-AA2{color:#4A6FF3;} + .d2-1704780360 .color-AA4{color:#EDF0FD;} + .d2-1704780360 .color-AA5{color:#F7F8FE;} + .d2-1704780360 .color-AB4{color:#EDF0FD;} + .d2-1704780360 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1704780360);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1704780360);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1704780360);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1704780360);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1704780360);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1704780360);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1704780360);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1704780360);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1704780360);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1704780360);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1704780360);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1704780360);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1704780360);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1704780360);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1704780360);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1704780360);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1704780360);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1704780360);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdefghiqrjmnoszaabbeeffggklptuwxyccddv - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/latex/dagre/board.exp.json b/e2etests/testdata/stable/latex/dagre/board.exp.json index fd550384b..c9f049bb5 100644 --- a/e2etests/testdata/stable/latex/dagre/board.exp.json +++ b/e2etests/testdata/stable/latex/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -30,7 +39,7 @@ "fields": null, "methods": null, "columns": null, - "label": "\\\\Huge{\\\\frac{\\\\alpha g^2}{\\\\omega^5} e^{[ -0.74\\\\bigl\\\\{\\\\frac{\\\\omega U_\\\\omega 19.5}{g}\\\\bigr\\\\}^{\\\\!-4}\\\\,]}}", + "label": "\\Huge{\\frac{\\alpha g^2}{\\omega^5} e^{[ -0.74\\bigl\\{\\frac{\\omega U_\\omega 19.5}{g}\\bigr\\}^{\\!-4}\\,]}}", "fontSize": 16, "fontFamily": "DEFAULT", "language": "latex", @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -98,6 +108,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -110,7 +121,7 @@ "fields": null, "methods": null, "columns": null, - "label": "gibberish\\\\; math:\\\\sum_{i=0}^\\\\infty i^2", + "label": "gibberish\\; math:\\sum_{i=0}^\\infty i^2", "fontSize": 16, "fontFamily": "DEFAULT", "language": "latex", @@ -138,6 +149,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -179,6 +191,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -220,6 +233,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -261,6 +275,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -302,6 +317,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -314,7 +330,7 @@ "fields": null, "methods": null, "columns": null, - "label": "\\\\min_{ \\\\mathclap{\\\\substack{ x \\\\in \\\\mathbb{R}^n \\\\ x \\\\geq 0 \\\\ Ax \\\\leq b }}} c^T x", + "label": "\\min_{ \\mathclap{\\substack{ x \\in \\mathbb{R}^n \\ x \\geq 0 \\ Ax \\leq b }}} c^T x", "fontSize": 16, "fontFamily": "DEFAULT", "language": "latex", @@ -352,6 +368,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 310.75, @@ -399,6 +416,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 406.25, @@ -446,6 +464,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 216.75, @@ -493,6 +512,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 500.25, @@ -540,6 +560,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 635.75, @@ -587,6 +608,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 500.25, @@ -627,6 +649,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/latex/dagre/sketch.exp.svg b/e2etests/testdata/stable/latex/dagre/sketch.exp.svg index 1eb320eb1..c48be9364 100644 --- a/e2etests/testdata/stable/latex/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/latex/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -mixed togethersugarsolutionLinear program we get + .d2-1592195744 .fill-N1{fill:#0A0F25;} + .d2-1592195744 .fill-N2{fill:#676C7E;} + .d2-1592195744 .fill-N3{fill:#9499AB;} + .d2-1592195744 .fill-N4{fill:#CFD2DD;} + .d2-1592195744 .fill-N5{fill:#DEE1EB;} + .d2-1592195744 .fill-N6{fill:#EEF1F8;} + .d2-1592195744 .fill-N7{fill:#FFFFFF;} + .d2-1592195744 .fill-B1{fill:#0D32B2;} + .d2-1592195744 .fill-B2{fill:#0D32B2;} + .d2-1592195744 .fill-B3{fill:#E3E9FD;} + .d2-1592195744 .fill-B4{fill:#E3E9FD;} + .d2-1592195744 .fill-B5{fill:#EDF0FD;} + .d2-1592195744 .fill-B6{fill:#F7F8FE;} + .d2-1592195744 .fill-AA2{fill:#4A6FF3;} + .d2-1592195744 .fill-AA4{fill:#EDF0FD;} + .d2-1592195744 .fill-AA5{fill:#F7F8FE;} + .d2-1592195744 .fill-AB4{fill:#EDF0FD;} + .d2-1592195744 .fill-AB5{fill:#F7F8FE;} + .d2-1592195744 .stroke-N1{stroke:#0A0F25;} + .d2-1592195744 .stroke-N2{stroke:#676C7E;} + .d2-1592195744 .stroke-N3{stroke:#9499AB;} + .d2-1592195744 .stroke-N4{stroke:#CFD2DD;} + .d2-1592195744 .stroke-N5{stroke:#DEE1EB;} + .d2-1592195744 .stroke-N6{stroke:#EEF1F8;} + .d2-1592195744 .stroke-N7{stroke:#FFFFFF;} + .d2-1592195744 .stroke-B1{stroke:#0D32B2;} + .d2-1592195744 .stroke-B2{stroke:#0D32B2;} + .d2-1592195744 .stroke-B3{stroke:#E3E9FD;} + .d2-1592195744 .stroke-B4{stroke:#E3E9FD;} + .d2-1592195744 .stroke-B5{stroke:#EDF0FD;} + .d2-1592195744 .stroke-B6{stroke:#F7F8FE;} + .d2-1592195744 .stroke-AA2{stroke:#4A6FF3;} + .d2-1592195744 .stroke-AA4{stroke:#EDF0FD;} + .d2-1592195744 .stroke-AA5{stroke:#F7F8FE;} + .d2-1592195744 .stroke-AB4{stroke:#EDF0FD;} + .d2-1592195744 .stroke-AB5{stroke:#F7F8FE;} + .d2-1592195744 .background-color-N1{background-color:#0A0F25;} + .d2-1592195744 .background-color-N2{background-color:#676C7E;} + .d2-1592195744 .background-color-N3{background-color:#9499AB;} + .d2-1592195744 .background-color-N4{background-color:#CFD2DD;} + .d2-1592195744 .background-color-N5{background-color:#DEE1EB;} + .d2-1592195744 .background-color-N6{background-color:#EEF1F8;} + .d2-1592195744 .background-color-N7{background-color:#FFFFFF;} + .d2-1592195744 .background-color-B1{background-color:#0D32B2;} + .d2-1592195744 .background-color-B2{background-color:#0D32B2;} + .d2-1592195744 .background-color-B3{background-color:#E3E9FD;} + .d2-1592195744 .background-color-B4{background-color:#E3E9FD;} + .d2-1592195744 .background-color-B5{background-color:#EDF0FD;} + .d2-1592195744 .background-color-B6{background-color:#F7F8FE;} + .d2-1592195744 .background-color-AA2{background-color:#4A6FF3;} + .d2-1592195744 .background-color-AA4{background-color:#EDF0FD;} + .d2-1592195744 .background-color-AA5{background-color:#F7F8FE;} + .d2-1592195744 .background-color-AB4{background-color:#EDF0FD;} + .d2-1592195744 .background-color-AB5{background-color:#F7F8FE;} + .d2-1592195744 .color-N1{color:#0A0F25;} + .d2-1592195744 .color-N2{color:#676C7E;} + .d2-1592195744 .color-N3{color:#9499AB;} + .d2-1592195744 .color-N4{color:#CFD2DD;} + .d2-1592195744 .color-N5{color:#DEE1EB;} + .d2-1592195744 .color-N6{color:#EEF1F8;} + .d2-1592195744 .color-N7{color:#FFFFFF;} + .d2-1592195744 .color-B1{color:#0D32B2;} + .d2-1592195744 .color-B2{color:#0D32B2;} + .d2-1592195744 .color-B3{color:#E3E9FD;} + .d2-1592195744 .color-B4{color:#E3E9FD;} + .d2-1592195744 .color-B5{color:#EDF0FD;} + .d2-1592195744 .color-B6{color:#F7F8FE;} + .d2-1592195744 .color-AA2{color:#4A6FF3;} + .d2-1592195744 .color-AA4{color:#EDF0FD;} + .d2-1592195744 .color-AA5{color:#F7F8FE;} + .d2-1592195744 .color-AB4{color:#EDF0FD;} + .d2-1592195744 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1592195744);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1592195744);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1592195744);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1592195744);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1592195744);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1592195744);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1592195744);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1592195744);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1592195744);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1592195744);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1592195744);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1592195744);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1592195744);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1592195744);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1592195744);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1592195744);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1592195744);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1592195744);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>mixed togethersugarsolutionLinear program we get - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/latex/elk/board.exp.json b/e2etests/testdata/stable/latex/elk/board.exp.json index a12309b84..07e486399 100644 --- a/e2etests/testdata/stable/latex/elk/board.exp.json +++ b/e2etests/testdata/stable/latex/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -30,7 +39,7 @@ "fields": null, "methods": null, "columns": null, - "label": "\\\\Huge{\\\\frac{\\\\alpha g^2}{\\\\omega^5} e^{[ -0.74\\\\bigl\\\\{\\\\frac{\\\\omega U_\\\\omega 19.5}{g}\\\\bigr\\\\}^{\\\\!-4}\\\\,]}}", + "label": "\\Huge{\\frac{\\alpha g^2}{\\omega^5} e^{[ -0.74\\bigl\\{\\frac{\\omega U_\\omega 19.5}{g}\\bigr\\}^{\\!-4}\\,]}}", "fontSize": 16, "fontFamily": "DEFAULT", "language": "latex", @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -98,6 +108,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -110,7 +121,7 @@ "fields": null, "methods": null, "columns": null, - "label": "gibberish\\\\; math:\\\\sum_{i=0}^\\\\infty i^2", + "label": "gibberish\\; math:\\sum_{i=0}^\\infty i^2", "fontSize": 16, "fontFamily": "DEFAULT", "language": "latex", @@ -138,6 +149,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -179,6 +191,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -220,6 +233,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -261,6 +275,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -302,6 +317,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -314,7 +330,7 @@ "fields": null, "methods": null, "columns": null, - "label": "\\\\min_{ \\\\mathclap{\\\\substack{ x \\\\in \\\\mathbb{R}^n \\\\ x \\\\geq 0 \\\\ Ax \\\\leq b }}} c^T x", + "label": "\\min_{ \\mathclap{\\substack{ x \\in \\mathbb{R}^n \\ x \\geq 0 \\ Ax \\leq b }}} c^T x", "fontSize": 16, "fontFamily": "DEFAULT", "language": "latex", @@ -352,6 +368,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 294.9159851074219, @@ -390,6 +407,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 354.5830078125, @@ -436,6 +454,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 354.4159851074219, @@ -474,6 +493,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 446.5, @@ -520,6 +540,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 542, @@ -566,6 +587,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 392.9159851074219, @@ -597,6 +619,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/latex/elk/sketch.exp.svg b/e2etests/testdata/stable/latex/elk/sketch.exp.svg index 1a7e47c77..fb64a5455 100644 --- a/e2etests/testdata/stable/latex/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/latex/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -mixed togethersugarsolutionLinear program we get + .d2-1402787666 .fill-N1{fill:#0A0F25;} + .d2-1402787666 .fill-N2{fill:#676C7E;} + .d2-1402787666 .fill-N3{fill:#9499AB;} + .d2-1402787666 .fill-N4{fill:#CFD2DD;} + .d2-1402787666 .fill-N5{fill:#DEE1EB;} + .d2-1402787666 .fill-N6{fill:#EEF1F8;} + .d2-1402787666 .fill-N7{fill:#FFFFFF;} + .d2-1402787666 .fill-B1{fill:#0D32B2;} + .d2-1402787666 .fill-B2{fill:#0D32B2;} + .d2-1402787666 .fill-B3{fill:#E3E9FD;} + .d2-1402787666 .fill-B4{fill:#E3E9FD;} + .d2-1402787666 .fill-B5{fill:#EDF0FD;} + .d2-1402787666 .fill-B6{fill:#F7F8FE;} + .d2-1402787666 .fill-AA2{fill:#4A6FF3;} + .d2-1402787666 .fill-AA4{fill:#EDF0FD;} + .d2-1402787666 .fill-AA5{fill:#F7F8FE;} + .d2-1402787666 .fill-AB4{fill:#EDF0FD;} + .d2-1402787666 .fill-AB5{fill:#F7F8FE;} + .d2-1402787666 .stroke-N1{stroke:#0A0F25;} + .d2-1402787666 .stroke-N2{stroke:#676C7E;} + .d2-1402787666 .stroke-N3{stroke:#9499AB;} + .d2-1402787666 .stroke-N4{stroke:#CFD2DD;} + .d2-1402787666 .stroke-N5{stroke:#DEE1EB;} + .d2-1402787666 .stroke-N6{stroke:#EEF1F8;} + .d2-1402787666 .stroke-N7{stroke:#FFFFFF;} + .d2-1402787666 .stroke-B1{stroke:#0D32B2;} + .d2-1402787666 .stroke-B2{stroke:#0D32B2;} + .d2-1402787666 .stroke-B3{stroke:#E3E9FD;} + .d2-1402787666 .stroke-B4{stroke:#E3E9FD;} + .d2-1402787666 .stroke-B5{stroke:#EDF0FD;} + .d2-1402787666 .stroke-B6{stroke:#F7F8FE;} + .d2-1402787666 .stroke-AA2{stroke:#4A6FF3;} + .d2-1402787666 .stroke-AA4{stroke:#EDF0FD;} + .d2-1402787666 .stroke-AA5{stroke:#F7F8FE;} + .d2-1402787666 .stroke-AB4{stroke:#EDF0FD;} + .d2-1402787666 .stroke-AB5{stroke:#F7F8FE;} + .d2-1402787666 .background-color-N1{background-color:#0A0F25;} + .d2-1402787666 .background-color-N2{background-color:#676C7E;} + .d2-1402787666 .background-color-N3{background-color:#9499AB;} + .d2-1402787666 .background-color-N4{background-color:#CFD2DD;} + .d2-1402787666 .background-color-N5{background-color:#DEE1EB;} + .d2-1402787666 .background-color-N6{background-color:#EEF1F8;} + .d2-1402787666 .background-color-N7{background-color:#FFFFFF;} + .d2-1402787666 .background-color-B1{background-color:#0D32B2;} + .d2-1402787666 .background-color-B2{background-color:#0D32B2;} + .d2-1402787666 .background-color-B3{background-color:#E3E9FD;} + .d2-1402787666 .background-color-B4{background-color:#E3E9FD;} + .d2-1402787666 .background-color-B5{background-color:#EDF0FD;} + .d2-1402787666 .background-color-B6{background-color:#F7F8FE;} + .d2-1402787666 .background-color-AA2{background-color:#4A6FF3;} + .d2-1402787666 .background-color-AA4{background-color:#EDF0FD;} + .d2-1402787666 .background-color-AA5{background-color:#F7F8FE;} + .d2-1402787666 .background-color-AB4{background-color:#EDF0FD;} + .d2-1402787666 .background-color-AB5{background-color:#F7F8FE;} + .d2-1402787666 .color-N1{color:#0A0F25;} + .d2-1402787666 .color-N2{color:#676C7E;} + .d2-1402787666 .color-N3{color:#9499AB;} + .d2-1402787666 .color-N4{color:#CFD2DD;} + .d2-1402787666 .color-N5{color:#DEE1EB;} + .d2-1402787666 .color-N6{color:#EEF1F8;} + .d2-1402787666 .color-N7{color:#FFFFFF;} + .d2-1402787666 .color-B1{color:#0D32B2;} + .d2-1402787666 .color-B2{color:#0D32B2;} + .d2-1402787666 .color-B3{color:#E3E9FD;} + .d2-1402787666 .color-B4{color:#E3E9FD;} + .d2-1402787666 .color-B5{color:#EDF0FD;} + .d2-1402787666 .color-B6{color:#F7F8FE;} + .d2-1402787666 .color-AA2{color:#4A6FF3;} + .d2-1402787666 .color-AA4{color:#EDF0FD;} + .d2-1402787666 .color-AA5{color:#F7F8FE;} + .d2-1402787666 .color-AB4{color:#EDF0FD;} + .d2-1402787666 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1402787666);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1402787666);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1402787666);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1402787666);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1402787666);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1402787666);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1402787666);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1402787666);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1402787666);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1402787666);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1402787666);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1402787666);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1402787666);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1402787666);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1402787666);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1402787666);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1402787666);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1402787666);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>mixed togethersugarsolutionLinear program we get - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/legend_with_near_key/dagre/board.exp.json b/e2etests/testdata/stable/legend_with_near_key/dagre/board.exp.json index 66f51a747..1c40dceae 100644 --- a/e2etests/testdata/stable/legend_with_near_key/dagre/board.exp.json +++ b/e2etests/testdata/stable/legend_with_near_key/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -222,6 +235,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -272,6 +286,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 53, @@ -319,6 +334,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 207, @@ -359,6 +375,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/legend_with_near_key/dagre/sketch.exp.svg b/e2etests/testdata/stable/legend_with_near_key/dagre/sketch.exp.svg index b347d1f0b..7ade7431d 100644 --- a/e2etests/testdata/stable/legend_with_near_key/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/legend_with_near_key/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -xyzlegendfoobar + .d2-3802857277 .fill-N1{fill:#0A0F25;} + .d2-3802857277 .fill-N2{fill:#676C7E;} + .d2-3802857277 .fill-N3{fill:#9499AB;} + .d2-3802857277 .fill-N4{fill:#CFD2DD;} + .d2-3802857277 .fill-N5{fill:#DEE1EB;} + .d2-3802857277 .fill-N6{fill:#EEF1F8;} + .d2-3802857277 .fill-N7{fill:#FFFFFF;} + .d2-3802857277 .fill-B1{fill:#0D32B2;} + .d2-3802857277 .fill-B2{fill:#0D32B2;} + .d2-3802857277 .fill-B3{fill:#E3E9FD;} + .d2-3802857277 .fill-B4{fill:#E3E9FD;} + .d2-3802857277 .fill-B5{fill:#EDF0FD;} + .d2-3802857277 .fill-B6{fill:#F7F8FE;} + .d2-3802857277 .fill-AA2{fill:#4A6FF3;} + .d2-3802857277 .fill-AA4{fill:#EDF0FD;} + .d2-3802857277 .fill-AA5{fill:#F7F8FE;} + .d2-3802857277 .fill-AB4{fill:#EDF0FD;} + .d2-3802857277 .fill-AB5{fill:#F7F8FE;} + .d2-3802857277 .stroke-N1{stroke:#0A0F25;} + .d2-3802857277 .stroke-N2{stroke:#676C7E;} + .d2-3802857277 .stroke-N3{stroke:#9499AB;} + .d2-3802857277 .stroke-N4{stroke:#CFD2DD;} + .d2-3802857277 .stroke-N5{stroke:#DEE1EB;} + .d2-3802857277 .stroke-N6{stroke:#EEF1F8;} + .d2-3802857277 .stroke-N7{stroke:#FFFFFF;} + .d2-3802857277 .stroke-B1{stroke:#0D32B2;} + .d2-3802857277 .stroke-B2{stroke:#0D32B2;} + .d2-3802857277 .stroke-B3{stroke:#E3E9FD;} + .d2-3802857277 .stroke-B4{stroke:#E3E9FD;} + .d2-3802857277 .stroke-B5{stroke:#EDF0FD;} + .d2-3802857277 .stroke-B6{stroke:#F7F8FE;} + .d2-3802857277 .stroke-AA2{stroke:#4A6FF3;} + .d2-3802857277 .stroke-AA4{stroke:#EDF0FD;} + .d2-3802857277 .stroke-AA5{stroke:#F7F8FE;} + .d2-3802857277 .stroke-AB4{stroke:#EDF0FD;} + .d2-3802857277 .stroke-AB5{stroke:#F7F8FE;} + .d2-3802857277 .background-color-N1{background-color:#0A0F25;} + .d2-3802857277 .background-color-N2{background-color:#676C7E;} + .d2-3802857277 .background-color-N3{background-color:#9499AB;} + .d2-3802857277 .background-color-N4{background-color:#CFD2DD;} + .d2-3802857277 .background-color-N5{background-color:#DEE1EB;} + .d2-3802857277 .background-color-N6{background-color:#EEF1F8;} + .d2-3802857277 .background-color-N7{background-color:#FFFFFF;} + .d2-3802857277 .background-color-B1{background-color:#0D32B2;} + .d2-3802857277 .background-color-B2{background-color:#0D32B2;} + .d2-3802857277 .background-color-B3{background-color:#E3E9FD;} + .d2-3802857277 .background-color-B4{background-color:#E3E9FD;} + .d2-3802857277 .background-color-B5{background-color:#EDF0FD;} + .d2-3802857277 .background-color-B6{background-color:#F7F8FE;} + .d2-3802857277 .background-color-AA2{background-color:#4A6FF3;} + .d2-3802857277 .background-color-AA4{background-color:#EDF0FD;} + .d2-3802857277 .background-color-AA5{background-color:#F7F8FE;} + .d2-3802857277 .background-color-AB4{background-color:#EDF0FD;} + .d2-3802857277 .background-color-AB5{background-color:#F7F8FE;} + .d2-3802857277 .color-N1{color:#0A0F25;} + .d2-3802857277 .color-N2{color:#676C7E;} + .d2-3802857277 .color-N3{color:#9499AB;} + .d2-3802857277 .color-N4{color:#CFD2DD;} + .d2-3802857277 .color-N5{color:#DEE1EB;} + .d2-3802857277 .color-N6{color:#EEF1F8;} + .d2-3802857277 .color-N7{color:#FFFFFF;} + .d2-3802857277 .color-B1{color:#0D32B2;} + .d2-3802857277 .color-B2{color:#0D32B2;} + .d2-3802857277 .color-B3{color:#E3E9FD;} + .d2-3802857277 .color-B4{color:#E3E9FD;} + .d2-3802857277 .color-B5{color:#EDF0FD;} + .d2-3802857277 .color-B6{color:#F7F8FE;} + .d2-3802857277 .color-AA2{color:#4A6FF3;} + .d2-3802857277 .color-AA4{color:#EDF0FD;} + .d2-3802857277 .color-AA5{color:#F7F8FE;} + .d2-3802857277 .color-AB4{color:#EDF0FD;} + .d2-3802857277 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3802857277);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3802857277);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3802857277);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3802857277);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3802857277);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3802857277);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3802857277);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3802857277);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3802857277);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3802857277);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3802857277);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3802857277);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3802857277);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3802857277);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3802857277);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3802857277);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3802857277);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3802857277);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xyzlegendfoobar - - - - - - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/legend_with_near_key/elk/board.exp.json b/e2etests/testdata/stable/legend_with_near_key/elk/board.exp.json index 4c4053a0c..acbb743e0 100644 --- a/e2etests/testdata/stable/legend_with_near_key/elk/board.exp.json +++ b/e2etests/testdata/stable/legend_with_near_key/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -222,6 +235,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -272,6 +286,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 65, @@ -310,6 +325,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 189, @@ -341,6 +357,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/legend_with_near_key/elk/sketch.exp.svg b/e2etests/testdata/stable/legend_with_near_key/elk/sketch.exp.svg index 62c50fecc..0877a86ae 100644 --- a/e2etests/testdata/stable/legend_with_near_key/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/legend_with_near_key/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -xyzlegendfoobar + .d2-2470799862 .fill-N1{fill:#0A0F25;} + .d2-2470799862 .fill-N2{fill:#676C7E;} + .d2-2470799862 .fill-N3{fill:#9499AB;} + .d2-2470799862 .fill-N4{fill:#CFD2DD;} + .d2-2470799862 .fill-N5{fill:#DEE1EB;} + .d2-2470799862 .fill-N6{fill:#EEF1F8;} + .d2-2470799862 .fill-N7{fill:#FFFFFF;} + .d2-2470799862 .fill-B1{fill:#0D32B2;} + .d2-2470799862 .fill-B2{fill:#0D32B2;} + .d2-2470799862 .fill-B3{fill:#E3E9FD;} + .d2-2470799862 .fill-B4{fill:#E3E9FD;} + .d2-2470799862 .fill-B5{fill:#EDF0FD;} + .d2-2470799862 .fill-B6{fill:#F7F8FE;} + .d2-2470799862 .fill-AA2{fill:#4A6FF3;} + .d2-2470799862 .fill-AA4{fill:#EDF0FD;} + .d2-2470799862 .fill-AA5{fill:#F7F8FE;} + .d2-2470799862 .fill-AB4{fill:#EDF0FD;} + .d2-2470799862 .fill-AB5{fill:#F7F8FE;} + .d2-2470799862 .stroke-N1{stroke:#0A0F25;} + .d2-2470799862 .stroke-N2{stroke:#676C7E;} + .d2-2470799862 .stroke-N3{stroke:#9499AB;} + .d2-2470799862 .stroke-N4{stroke:#CFD2DD;} + .d2-2470799862 .stroke-N5{stroke:#DEE1EB;} + .d2-2470799862 .stroke-N6{stroke:#EEF1F8;} + .d2-2470799862 .stroke-N7{stroke:#FFFFFF;} + .d2-2470799862 .stroke-B1{stroke:#0D32B2;} + .d2-2470799862 .stroke-B2{stroke:#0D32B2;} + .d2-2470799862 .stroke-B3{stroke:#E3E9FD;} + .d2-2470799862 .stroke-B4{stroke:#E3E9FD;} + .d2-2470799862 .stroke-B5{stroke:#EDF0FD;} + .d2-2470799862 .stroke-B6{stroke:#F7F8FE;} + .d2-2470799862 .stroke-AA2{stroke:#4A6FF3;} + .d2-2470799862 .stroke-AA4{stroke:#EDF0FD;} + .d2-2470799862 .stroke-AA5{stroke:#F7F8FE;} + .d2-2470799862 .stroke-AB4{stroke:#EDF0FD;} + .d2-2470799862 .stroke-AB5{stroke:#F7F8FE;} + .d2-2470799862 .background-color-N1{background-color:#0A0F25;} + .d2-2470799862 .background-color-N2{background-color:#676C7E;} + .d2-2470799862 .background-color-N3{background-color:#9499AB;} + .d2-2470799862 .background-color-N4{background-color:#CFD2DD;} + .d2-2470799862 .background-color-N5{background-color:#DEE1EB;} + .d2-2470799862 .background-color-N6{background-color:#EEF1F8;} + .d2-2470799862 .background-color-N7{background-color:#FFFFFF;} + .d2-2470799862 .background-color-B1{background-color:#0D32B2;} + .d2-2470799862 .background-color-B2{background-color:#0D32B2;} + .d2-2470799862 .background-color-B3{background-color:#E3E9FD;} + .d2-2470799862 .background-color-B4{background-color:#E3E9FD;} + .d2-2470799862 .background-color-B5{background-color:#EDF0FD;} + .d2-2470799862 .background-color-B6{background-color:#F7F8FE;} + .d2-2470799862 .background-color-AA2{background-color:#4A6FF3;} + .d2-2470799862 .background-color-AA4{background-color:#EDF0FD;} + .d2-2470799862 .background-color-AA5{background-color:#F7F8FE;} + .d2-2470799862 .background-color-AB4{background-color:#EDF0FD;} + .d2-2470799862 .background-color-AB5{background-color:#F7F8FE;} + .d2-2470799862 .color-N1{color:#0A0F25;} + .d2-2470799862 .color-N2{color:#676C7E;} + .d2-2470799862 .color-N3{color:#9499AB;} + .d2-2470799862 .color-N4{color:#CFD2DD;} + .d2-2470799862 .color-N5{color:#DEE1EB;} + .d2-2470799862 .color-N6{color:#EEF1F8;} + .d2-2470799862 .color-N7{color:#FFFFFF;} + .d2-2470799862 .color-B1{color:#0D32B2;} + .d2-2470799862 .color-B2{color:#0D32B2;} + .d2-2470799862 .color-B3{color:#E3E9FD;} + .d2-2470799862 .color-B4{color:#E3E9FD;} + .d2-2470799862 .color-B5{color:#EDF0FD;} + .d2-2470799862 .color-B6{color:#F7F8FE;} + .d2-2470799862 .color-AA2{color:#4A6FF3;} + .d2-2470799862 .color-AA4{color:#EDF0FD;} + .d2-2470799862 .color-AA5{color:#F7F8FE;} + .d2-2470799862 .color-AB4{color:#EDF0FD;} + .d2-2470799862 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2470799862);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2470799862);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2470799862);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2470799862);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2470799862);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2470799862);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2470799862);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2470799862);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2470799862);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2470799862);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2470799862);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2470799862);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2470799862);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2470799862);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2470799862);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2470799862);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2470799862);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2470799862);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xyzlegendfoobar - - - - - - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/li1/dagre/board.exp.json b/e2etests/testdata/stable/li1/dagre/board.exp.json index ee30644ec..8043599b0 100644 --- a/e2etests/testdata/stable/li1/dagre/board.exp.json +++ b/e2etests/testdata/stable/li1/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -150,6 +161,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 189.5, @@ -197,6 +209,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 189.5, @@ -237,6 +250,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/li1/dagre/sketch.exp.svg b/e2etests/testdata/stable/li1/dagre/sketch.exp.svg index 1a4e0614b..4c56f8d0e 100644 --- a/e2etests/testdata/stable/li1/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/li1/dagre/sketch.exp.svg @@ -1,20 +1,20 @@ -
    ab - - - + + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/li1/elk/board.exp.json b/e2etests/testdata/stable/li1/elk/board.exp.json index 211e446e7..7ee198837 100644 --- a/e2etests/testdata/stable/li1/elk/board.exp.json +++ b/e2etests/testdata/stable/li1/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -150,6 +161,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 201.5, @@ -188,6 +200,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 201.5, @@ -219,6 +232,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/li1/elk/sketch.exp.svg b/e2etests/testdata/stable/li1/elk/sketch.exp.svg index 5984b17fd..2bf9822fd 100644 --- a/e2etests/testdata/stable/li1/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/li1/elk/sketch.exp.svg @@ -1,20 +1,20 @@ -
    ab - - - + + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/li2/dagre/board.exp.json b/e2etests/testdata/stable/li2/dagre/board.exp.json index 30d438f05..97274daa8 100644 --- a/e2etests/testdata/stable/li2/dagre/board.exp.json +++ b/e2etests/testdata/stable/li2/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -150,6 +161,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 122.5, @@ -197,6 +209,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 122.5, @@ -237,6 +250,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/li2/dagre/sketch.exp.svg b/e2etests/testdata/stable/li2/dagre/sketch.exp.svg index f1832c96f..fedb3ad69 100644 --- a/e2etests/testdata/stable/li2/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/li2/dagre/sketch.exp.svg @@ -1,27 +1,27 @@ -
    ab - - - + + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/li2/elk/board.exp.json b/e2etests/testdata/stable/li2/elk/board.exp.json index c6e49bf40..0f8ed1aba 100644 --- a/e2etests/testdata/stable/li2/elk/board.exp.json +++ b/e2etests/testdata/stable/li2/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -150,6 +161,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 134.5, @@ -188,6 +200,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 134.5, @@ -219,6 +232,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/li2/elk/sketch.exp.svg b/e2etests/testdata/stable/li2/elk/sketch.exp.svg index a6449c5cb..f4f21366b 100644 --- a/e2etests/testdata/stable/li2/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/li2/elk/sketch.exp.svg @@ -1,27 +1,27 @@ -
    ab - - - + + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/li3/dagre/board.exp.json b/e2etests/testdata/stable/li3/dagre/board.exp.json index db4b055e9..67e25a766 100644 --- a/e2etests/testdata/stable/li3/dagre/board.exp.json +++ b/e2etests/testdata/stable/li3/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -150,6 +161,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 173.5, @@ -197,6 +209,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 173.5, @@ -237,6 +250,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/li3/dagre/sketch.exp.svg b/e2etests/testdata/stable/li3/dagre/sketch.exp.svg index d609164c1..e26b012ff 100644 --- a/e2etests/testdata/stable/li3/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/li3/dagre/sketch.exp.svg @@ -1,20 +1,20 @@ -
    ab - - - + + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/li3/elk/board.exp.json b/e2etests/testdata/stable/li3/elk/board.exp.json index 48e3e3a4b..e63e9aeea 100644 --- a/e2etests/testdata/stable/li3/elk/board.exp.json +++ b/e2etests/testdata/stable/li3/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -150,6 +161,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 185.5, @@ -188,6 +200,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 185.5, @@ -219,6 +232,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/li3/elk/sketch.exp.svg b/e2etests/testdata/stable/li3/elk/sketch.exp.svg index 3d20c63bd..488e5791d 100644 --- a/e2etests/testdata/stable/li3/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/li3/elk/sketch.exp.svg @@ -1,20 +1,20 @@ -
    ab - - - + + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/li4/dagre/board.exp.json b/e2etests/testdata/stable/li4/dagre/board.exp.json index 7956cd4aa..e15809e76 100644 --- a/e2etests/testdata/stable/li4/dagre/board.exp.json +++ b/e2etests/testdata/stable/li4/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -150,6 +161,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 460, @@ -197,6 +209,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 460, @@ -237,6 +250,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/li4/dagre/sketch.exp.svg b/e2etests/testdata/stable/li4/dagre/sketch.exp.svg index 669072462..b3044cd2f 100644 --- a/e2etests/testdata/stable/li4/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/li4/dagre/sketch.exp.svg @@ -1,27 +1,27 @@ -

    List items may consist of multiple paragraphs. Each subsequent +

    List items may consist of multiple paragraphs. Each subsequent paragraph in a list item must be indented by either 4 spaces or one tab:

      @@ -874,9 +873,9 @@ sit amet, consectetuer adipiscing elit.

      Another item in the same list.

      -
    ab +
    ab - - - + + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/li4/elk/board.exp.json b/e2etests/testdata/stable/li4/elk/board.exp.json index 24a1774dd..9955ab569 100644 --- a/e2etests/testdata/stable/li4/elk/board.exp.json +++ b/e2etests/testdata/stable/li4/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -150,6 +161,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 472, @@ -188,6 +200,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 472, @@ -219,6 +232,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/li4/elk/sketch.exp.svg b/e2etests/testdata/stable/li4/elk/sketch.exp.svg index 2c738b7bb..664411d5e 100644 --- a/e2etests/testdata/stable/li4/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/li4/elk/sketch.exp.svg @@ -1,27 +1,27 @@ -

    List items may consist of multiple paragraphs. Each subsequent +

    List items may consist of multiple paragraphs. Each subsequent paragraph in a list item must be indented by either 4 spaces or one tab:

      @@ -874,9 +873,9 @@ sit amet, consectetuer adipiscing elit.

      Another item in the same list.

      -
    ab +
    ab - - - + + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/links/dagre/board.exp.json b/e2etests/testdata/stable/links/dagre/board.exp.json index 2b6959d56..51e6be3ee 100644 --- a/e2etests/testdata/stable/links/dagre/board.exp.json +++ b/e2etests/testdata/stable/links/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -7,10 +15,10 @@ "id": "x", "type": "rectangle", "pos": { - "x": 17, + "x": 33, "y": 0 }, - "width": 85, + "width": 53, "height": 66, "opacity": 1, "strokeDash": 0, @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -60,6 +69,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -112,6 +122,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 59, @@ -152,6 +163,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/links/dagre/sketch.exp.svg b/e2etests/testdata/stable/links/dagre/sketch.exp.svg index 7b199c7fe..d778513ac 100644 --- a/e2etests/testdata/stable/links/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/links/dagre/sketch.exp.svg @@ -1,12 +1,12 @@ -xyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! - + .d2-4260260088 .fill-N1{fill:#0A0F25;} + .d2-4260260088 .fill-N2{fill:#676C7E;} + .d2-4260260088 .fill-N3{fill:#9499AB;} + .d2-4260260088 .fill-N4{fill:#CFD2DD;} + .d2-4260260088 .fill-N5{fill:#DEE1EB;} + .d2-4260260088 .fill-N6{fill:#EEF1F8;} + .d2-4260260088 .fill-N7{fill:#FFFFFF;} + .d2-4260260088 .fill-B1{fill:#0D32B2;} + .d2-4260260088 .fill-B2{fill:#0D32B2;} + .d2-4260260088 .fill-B3{fill:#E3E9FD;} + .d2-4260260088 .fill-B4{fill:#E3E9FD;} + .d2-4260260088 .fill-B5{fill:#EDF0FD;} + .d2-4260260088 .fill-B6{fill:#F7F8FE;} + .d2-4260260088 .fill-AA2{fill:#4A6FF3;} + .d2-4260260088 .fill-AA4{fill:#EDF0FD;} + .d2-4260260088 .fill-AA5{fill:#F7F8FE;} + .d2-4260260088 .fill-AB4{fill:#EDF0FD;} + .d2-4260260088 .fill-AB5{fill:#F7F8FE;} + .d2-4260260088 .stroke-N1{stroke:#0A0F25;} + .d2-4260260088 .stroke-N2{stroke:#676C7E;} + .d2-4260260088 .stroke-N3{stroke:#9499AB;} + .d2-4260260088 .stroke-N4{stroke:#CFD2DD;} + .d2-4260260088 .stroke-N5{stroke:#DEE1EB;} + .d2-4260260088 .stroke-N6{stroke:#EEF1F8;} + .d2-4260260088 .stroke-N7{stroke:#FFFFFF;} + .d2-4260260088 .stroke-B1{stroke:#0D32B2;} + .d2-4260260088 .stroke-B2{stroke:#0D32B2;} + .d2-4260260088 .stroke-B3{stroke:#E3E9FD;} + .d2-4260260088 .stroke-B4{stroke:#E3E9FD;} + .d2-4260260088 .stroke-B5{stroke:#EDF0FD;} + .d2-4260260088 .stroke-B6{stroke:#F7F8FE;} + .d2-4260260088 .stroke-AA2{stroke:#4A6FF3;} + .d2-4260260088 .stroke-AA4{stroke:#EDF0FD;} + .d2-4260260088 .stroke-AA5{stroke:#F7F8FE;} + .d2-4260260088 .stroke-AB4{stroke:#EDF0FD;} + .d2-4260260088 .stroke-AB5{stroke:#F7F8FE;} + .d2-4260260088 .background-color-N1{background-color:#0A0F25;} + .d2-4260260088 .background-color-N2{background-color:#676C7E;} + .d2-4260260088 .background-color-N3{background-color:#9499AB;} + .d2-4260260088 .background-color-N4{background-color:#CFD2DD;} + .d2-4260260088 .background-color-N5{background-color:#DEE1EB;} + .d2-4260260088 .background-color-N6{background-color:#EEF1F8;} + .d2-4260260088 .background-color-N7{background-color:#FFFFFF;} + .d2-4260260088 .background-color-B1{background-color:#0D32B2;} + .d2-4260260088 .background-color-B2{background-color:#0D32B2;} + .d2-4260260088 .background-color-B3{background-color:#E3E9FD;} + .d2-4260260088 .background-color-B4{background-color:#E3E9FD;} + .d2-4260260088 .background-color-B5{background-color:#EDF0FD;} + .d2-4260260088 .background-color-B6{background-color:#F7F8FE;} + .d2-4260260088 .background-color-AA2{background-color:#4A6FF3;} + .d2-4260260088 .background-color-AA4{background-color:#EDF0FD;} + .d2-4260260088 .background-color-AA5{background-color:#F7F8FE;} + .d2-4260260088 .background-color-AB4{background-color:#EDF0FD;} + .d2-4260260088 .background-color-AB5{background-color:#F7F8FE;} + .d2-4260260088 .color-N1{color:#0A0F25;} + .d2-4260260088 .color-N2{color:#676C7E;} + .d2-4260260088 .color-N3{color:#9499AB;} + .d2-4260260088 .color-N4{color:#CFD2DD;} + .d2-4260260088 .color-N5{color:#DEE1EB;} + .d2-4260260088 .color-N6{color:#EEF1F8;} + .d2-4260260088 .color-N7{color:#FFFFFF;} + .d2-4260260088 .color-B1{color:#0D32B2;} + .d2-4260260088 .color-B2{color:#0D32B2;} + .d2-4260260088 .color-B3{color:#E3E9FD;} + .d2-4260260088 .color-B4{color:#E3E9FD;} + .d2-4260260088 .color-B5{color:#EDF0FD;} + .d2-4260260088 .color-B6{color:#F7F8FE;} + .d2-4260260088 .color-AA2{color:#4A6FF3;} + .d2-4260260088 .color-AA4{color:#EDF0FD;} + .d2-4260260088 .color-AA5{color:#F7F8FE;} + .d2-4260260088 .color-AB4{color:#EDF0FD;} + .d2-4260260088 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4260260088);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4260260088);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4260260088);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4260260088);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4260260088);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4260260088);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4260260088);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4260260088);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4260260088);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4260260088);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4260260088);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4260260088);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4260260088);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4260260088);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4260260088);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4260260088);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4260260088);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4260260088);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! + - + Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! - + - + - + - + - + - - + + \ No newline at end of file diff --git a/e2etests/testdata/stable/links/elk/board.exp.json b/e2etests/testdata/stable/links/elk/board.exp.json index 7f3984ef9..032cbe6d4 100644 --- a/e2etests/testdata/stable/links/elk/board.exp.json +++ b/e2etests/testdata/stable/links/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -7,10 +15,10 @@ "id": "x", "type": "rectangle", "pos": { - "x": 28, + "x": 44, "y": 12 }, - "width": 85, + "width": 53, "height": 66, "opacity": 1, "strokeDash": 0, @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -60,6 +69,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -112,6 +122,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 71, @@ -143,6 +154,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/links/elk/sketch.exp.svg b/e2etests/testdata/stable/links/elk/sketch.exp.svg index acd9b6a90..a5a08b07f 100644 --- a/e2etests/testdata/stable/links/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/links/elk/sketch.exp.svg @@ -1,12 +1,12 @@ -xyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! - + .d2-2469556660 .fill-N1{fill:#0A0F25;} + .d2-2469556660 .fill-N2{fill:#676C7E;} + .d2-2469556660 .fill-N3{fill:#9499AB;} + .d2-2469556660 .fill-N4{fill:#CFD2DD;} + .d2-2469556660 .fill-N5{fill:#DEE1EB;} + .d2-2469556660 .fill-N6{fill:#EEF1F8;} + .d2-2469556660 .fill-N7{fill:#FFFFFF;} + .d2-2469556660 .fill-B1{fill:#0D32B2;} + .d2-2469556660 .fill-B2{fill:#0D32B2;} + .d2-2469556660 .fill-B3{fill:#E3E9FD;} + .d2-2469556660 .fill-B4{fill:#E3E9FD;} + .d2-2469556660 .fill-B5{fill:#EDF0FD;} + .d2-2469556660 .fill-B6{fill:#F7F8FE;} + .d2-2469556660 .fill-AA2{fill:#4A6FF3;} + .d2-2469556660 .fill-AA4{fill:#EDF0FD;} + .d2-2469556660 .fill-AA5{fill:#F7F8FE;} + .d2-2469556660 .fill-AB4{fill:#EDF0FD;} + .d2-2469556660 .fill-AB5{fill:#F7F8FE;} + .d2-2469556660 .stroke-N1{stroke:#0A0F25;} + .d2-2469556660 .stroke-N2{stroke:#676C7E;} + .d2-2469556660 .stroke-N3{stroke:#9499AB;} + .d2-2469556660 .stroke-N4{stroke:#CFD2DD;} + .d2-2469556660 .stroke-N5{stroke:#DEE1EB;} + .d2-2469556660 .stroke-N6{stroke:#EEF1F8;} + .d2-2469556660 .stroke-N7{stroke:#FFFFFF;} + .d2-2469556660 .stroke-B1{stroke:#0D32B2;} + .d2-2469556660 .stroke-B2{stroke:#0D32B2;} + .d2-2469556660 .stroke-B3{stroke:#E3E9FD;} + .d2-2469556660 .stroke-B4{stroke:#E3E9FD;} + .d2-2469556660 .stroke-B5{stroke:#EDF0FD;} + .d2-2469556660 .stroke-B6{stroke:#F7F8FE;} + .d2-2469556660 .stroke-AA2{stroke:#4A6FF3;} + .d2-2469556660 .stroke-AA4{stroke:#EDF0FD;} + .d2-2469556660 .stroke-AA5{stroke:#F7F8FE;} + .d2-2469556660 .stroke-AB4{stroke:#EDF0FD;} + .d2-2469556660 .stroke-AB5{stroke:#F7F8FE;} + .d2-2469556660 .background-color-N1{background-color:#0A0F25;} + .d2-2469556660 .background-color-N2{background-color:#676C7E;} + .d2-2469556660 .background-color-N3{background-color:#9499AB;} + .d2-2469556660 .background-color-N4{background-color:#CFD2DD;} + .d2-2469556660 .background-color-N5{background-color:#DEE1EB;} + .d2-2469556660 .background-color-N6{background-color:#EEF1F8;} + .d2-2469556660 .background-color-N7{background-color:#FFFFFF;} + .d2-2469556660 .background-color-B1{background-color:#0D32B2;} + .d2-2469556660 .background-color-B2{background-color:#0D32B2;} + .d2-2469556660 .background-color-B3{background-color:#E3E9FD;} + .d2-2469556660 .background-color-B4{background-color:#E3E9FD;} + .d2-2469556660 .background-color-B5{background-color:#EDF0FD;} + .d2-2469556660 .background-color-B6{background-color:#F7F8FE;} + .d2-2469556660 .background-color-AA2{background-color:#4A6FF3;} + .d2-2469556660 .background-color-AA4{background-color:#EDF0FD;} + .d2-2469556660 .background-color-AA5{background-color:#F7F8FE;} + .d2-2469556660 .background-color-AB4{background-color:#EDF0FD;} + .d2-2469556660 .background-color-AB5{background-color:#F7F8FE;} + .d2-2469556660 .color-N1{color:#0A0F25;} + .d2-2469556660 .color-N2{color:#676C7E;} + .d2-2469556660 .color-N3{color:#9499AB;} + .d2-2469556660 .color-N4{color:#CFD2DD;} + .d2-2469556660 .color-N5{color:#DEE1EB;} + .d2-2469556660 .color-N6{color:#EEF1F8;} + .d2-2469556660 .color-N7{color:#FFFFFF;} + .d2-2469556660 .color-B1{color:#0D32B2;} + .d2-2469556660 .color-B2{color:#0D32B2;} + .d2-2469556660 .color-B3{color:#E3E9FD;} + .d2-2469556660 .color-B4{color:#E3E9FD;} + .d2-2469556660 .color-B5{color:#EDF0FD;} + .d2-2469556660 .color-B6{color:#F7F8FE;} + .d2-2469556660 .color-AA2{color:#4A6FF3;} + .d2-2469556660 .color-AA4{color:#EDF0FD;} + .d2-2469556660 .color-AA5{color:#F7F8FE;} + .d2-2469556660 .color-AB4{color:#EDF0FD;} + .d2-2469556660 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2469556660);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2469556660);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2469556660);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2469556660);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2469556660);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2469556660);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2469556660);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2469556660);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2469556660);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2469556660);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2469556660);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2469556660);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2469556660);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2469556660);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2469556660);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2469556660);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2469556660);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2469556660);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! + - + Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! - + - + - + - + - + - - + + \ No newline at end of file diff --git a/e2etests/testdata/stable/lone_h1/dagre/board.exp.json b/e2etests/testdata/stable/lone_h1/dagre/board.exp.json index 505d6d68e..6d39288e4 100644 --- a/e2etests/testdata/stable/lone_h1/dagre/board.exp.json +++ b/e2etests/testdata/stable/lone_h1/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -150,6 +161,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 128.5, @@ -197,6 +209,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 128.5, @@ -237,6 +250,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/lone_h1/dagre/sketch.exp.svg b/e2etests/testdata/stable/lone_h1/dagre/sketch.exp.svg index 23bb9552d..71c376cec 100644 --- a/e2etests/testdata/stable/lone_h1/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/lone_h1/dagre/sketch.exp.svg @@ -1,20 +1,20 @@ -

    Markdown: Syntax

    -
    ab +

    Markdown: Syntax

    +
    ab - - - + + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/lone_h1/elk/board.exp.json b/e2etests/testdata/stable/lone_h1/elk/board.exp.json index d19c13dd0..b60e50019 100644 --- a/e2etests/testdata/stable/lone_h1/elk/board.exp.json +++ b/e2etests/testdata/stable/lone_h1/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -150,6 +161,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 140.5, @@ -188,6 +200,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 140.5, @@ -219,6 +232,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/lone_h1/elk/sketch.exp.svg b/e2etests/testdata/stable/lone_h1/elk/sketch.exp.svg index 451beab0e..2af2c650f 100644 --- a/e2etests/testdata/stable/lone_h1/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/lone_h1/elk/sketch.exp.svg @@ -1,20 +1,20 @@ -

    Markdown: Syntax

    -
    ab +

    Markdown: Syntax

    +
    ab - - - + + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/markdown/dagre/board.exp.json b/e2etests/testdata/stable/markdown/dagre/board.exp.json index 28860c0ee..c03338953 100644 --- a/e2etests/testdata/stable/markdown/dagre/board.exp.json +++ b/e2etests/testdata/stable/markdown/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -150,6 +161,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 265.5, @@ -197,6 +209,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 265.5, @@ -237,6 +250,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/markdown/dagre/sketch.exp.svg b/e2etests/testdata/stable/markdown/dagre/sketch.exp.svg index 696c6a7f1..685fccb06 100644 --- a/e2etests/testdata/stable/markdown/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/markdown/dagre/sketch.exp.svg @@ -1,27 +1,27 @@ -

    Every frustum longs to be a cone

    +

    Every frustum longs to be a cone

    • A continuing flow of paper is sufficient to continue the flow of paper
    • Please remain calm, it's no use both of us being hysterical at the same time
      • @@ -851,9 +850,9 @@

    Festivity Level 1: Your guests are chatting amiably with each other.

    test strikethrough test

    -
    xy +
    xy - - - + + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/markdown/elk/board.exp.json b/e2etests/testdata/stable/markdown/elk/board.exp.json index 92ac04bef..13d89320e 100644 --- a/e2etests/testdata/stable/markdown/elk/board.exp.json +++ b/e2etests/testdata/stable/markdown/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -150,6 +161,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 277.5, @@ -188,6 +200,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 277.5, @@ -219,6 +232,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/markdown/elk/sketch.exp.svg b/e2etests/testdata/stable/markdown/elk/sketch.exp.svg index 5a35cd244..d30dbdda2 100644 --- a/e2etests/testdata/stable/markdown/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/markdown/elk/sketch.exp.svg @@ -1,27 +1,27 @@ -

    Every frustum longs to be a cone

    +

    Every frustum longs to be a cone

    • A continuing flow of paper is sufficient to continue the flow of paper
    • Please remain calm, it's no use both of us being hysterical at the same time
      • @@ -851,9 +850,9 @@

    Festivity Level 1: Your guests are chatting amiably with each other.

    test strikethrough test

    -
    xy +
    xy - - - + + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/markdown_stroke_fill/dagre/board.exp.json b/e2etests/testdata/stable/markdown_stroke_fill/dagre/board.exp.json index 9c152eae3..371254550 100644 --- a/e2etests/testdata/stable/markdown_stroke_fill/dagre/board.exp.json +++ b/e2etests/testdata/stable/markdown_stroke_fill/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "#CEEDEE", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -149,6 +160,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 146, @@ -189,6 +201,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/markdown_stroke_fill/dagre/sketch.exp.svg b/e2etests/testdata/stable/markdown_stroke_fill/dagre/sketch.exp.svg index 04acfb834..e45208709 100644 --- a/e2etests/testdata/stable/markdown_stroke_fill/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/markdown_stroke_fill/dagre/sketch.exp.svg @@ -1,20 +1,20 @@ -container

    they did it in style

    -

    a header

    +container

    they did it in style

    +

    a header

    a line of text and an

    {
 	indented: "block",
@@ -845,9 +844,9 @@
 }

    walk into a bar.

    -
     +
     - - - + + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/markdown_stroke_fill/elk/board.exp.json b/e2etests/testdata/stable/markdown_stroke_fill/elk/board.exp.json index 3a3f429c3..92041b1b6 100644 --- a/e2etests/testdata/stable/markdown_stroke_fill/elk/board.exp.json +++ b/e2etests/testdata/stable/markdown_stroke_fill/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "#CEEDEE", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -149,6 +160,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 168, @@ -180,6 +192,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/markdown_stroke_fill/elk/sketch.exp.svg b/e2etests/testdata/stable/markdown_stroke_fill/elk/sketch.exp.svg index 8d9fb9228..b51d61cea 100644 --- a/e2etests/testdata/stable/markdown_stroke_fill/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/markdown_stroke_fill/elk/sketch.exp.svg @@ -1,20 +1,20 @@ -container

    they did it in style

    -

    a header

    +container

    they did it in style

    +

    a header

    a line of text and an

    {
 	indented: "block",
@@ -845,9 +844,9 @@
 }

    walk into a bar.

    -
     +
     - - - + + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/md_2space_newline/dagre/board.exp.json b/e2etests/testdata/stable/md_2space_newline/dagre/board.exp.json index dd8959eb9..5bf373844 100644 --- a/e2etests/testdata/stable/md_2space_newline/dagre/board.exp.json +++ b/e2etests/testdata/stable/md_2space_newline/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -101,6 +111,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/md_2space_newline/dagre/sketch.exp.svg b/e2etests/testdata/stable/md_2space_newline/dagre/sketch.exp.svg index 248ebebc3..1667f6975 100644 --- a/e2etests/testdata/stable/md_2space_newline/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/md_2space_newline/dagre/sketch.exp.svg @@ -1,13 +1,13 @@ -markdown

    Lorem ipsum dolor sit amet, consectetur adipiscing elit,
    +markdown

    Lorem ipsum dolor sit amet, consectetur adipiscing elit,
    sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.

    -
    +
     - - + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/md_2space_newline/elk/board.exp.json b/e2etests/testdata/stable/md_2space_newline/elk/board.exp.json index 55717edfc..c5c4697ed 100644 --- a/e2etests/testdata/stable/md_2space_newline/elk/board.exp.json +++ b/e2etests/testdata/stable/md_2space_newline/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -101,6 +111,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/md_2space_newline/elk/sketch.exp.svg b/e2etests/testdata/stable/md_2space_newline/elk/sketch.exp.svg index 0ea278197..30938c77c 100644 --- a/e2etests/testdata/stable/md_2space_newline/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/md_2space_newline/elk/sketch.exp.svg @@ -1,13 +1,13 @@ -markdown

    Lorem ipsum dolor sit amet, consectetur adipiscing elit,
    +markdown

    Lorem ipsum dolor sit amet, consectetur adipiscing elit,
    sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.

    -
    +
     - - + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/md_backslash_newline/dagre/board.exp.json b/e2etests/testdata/stable/md_backslash_newline/dagre/board.exp.json index 7a28b31e8..cdf3f1d6a 100644 --- a/e2etests/testdata/stable/md_backslash_newline/dagre/board.exp.json +++ b/e2etests/testdata/stable/md_backslash_newline/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -101,6 +111,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/md_backslash_newline/dagre/sketch.exp.svg b/e2etests/testdata/stable/md_backslash_newline/dagre/sketch.exp.svg index 11afb8500..4983ee428 100644 --- a/e2etests/testdata/stable/md_backslash_newline/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/md_backslash_newline/dagre/sketch.exp.svg @@ -1,13 +1,13 @@ -markdown

    Lorem ipsum dolor sit amet, consectetur adipiscing elit,
    +markdown

    Lorem ipsum dolor sit amet, consectetur adipiscing elit,
    sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.

    -
    +
     - - + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/md_backslash_newline/elk/board.exp.json b/e2etests/testdata/stable/md_backslash_newline/elk/board.exp.json index ecae4e115..0ef5f851e 100644 --- a/e2etests/testdata/stable/md_backslash_newline/elk/board.exp.json +++ b/e2etests/testdata/stable/md_backslash_newline/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -101,6 +111,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/md_backslash_newline/elk/sketch.exp.svg b/e2etests/testdata/stable/md_backslash_newline/elk/sketch.exp.svg index 6e706343a..ae134d9d7 100644 --- a/e2etests/testdata/stable/md_backslash_newline/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/md_backslash_newline/elk/sketch.exp.svg @@ -1,13 +1,13 @@ -markdown

    Lorem ipsum dolor sit amet, consectetur adipiscing elit,
    +markdown

    Lorem ipsum dolor sit amet, consectetur adipiscing elit,
    sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.

    -
    +
     - - + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/md_code_block_fenced/dagre/board.exp.json b/e2etests/testdata/stable/md_code_block_fenced/dagre/board.exp.json index c6fade64f..7e8471d3f 100644 --- a/e2etests/testdata/stable/md_code_block_fenced/dagre/board.exp.json +++ b/e2etests/testdata/stable/md_code_block_fenced/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -150,6 +161,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 98, @@ -197,6 +209,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 98, @@ -237,6 +250,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/md_code_block_fenced/dagre/sketch.exp.svg b/e2etests/testdata/stable/md_code_block_fenced/dagre/sketch.exp.svg index 4d0ad32f9..4c6f4ad36 100644 --- a/e2etests/testdata/stable/md_code_block_fenced/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/md_code_block_fenced/dagre/sketch.exp.svg @@ -1,27 +1,27 @@ -
    {
+
    {
 	fenced: "block",
 	of: "json",
 }
 
    
-
    ab  
+
    ab - - - + + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/md_code_block_fenced/elk/board.exp.json b/e2etests/testdata/stable/md_code_block_fenced/elk/board.exp.json index cc732dc11..b057c2f13 100644 --- a/e2etests/testdata/stable/md_code_block_fenced/elk/board.exp.json +++ b/e2etests/testdata/stable/md_code_block_fenced/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -150,6 +161,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 110, @@ -188,6 +200,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 110, @@ -219,6 +232,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/md_code_block_fenced/elk/sketch.exp.svg b/e2etests/testdata/stable/md_code_block_fenced/elk/sketch.exp.svg index 4cb3a33d6..a94ac633a 100644 --- a/e2etests/testdata/stable/md_code_block_fenced/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/md_code_block_fenced/elk/sketch.exp.svg @@ -1,27 +1,27 @@ -
    {
+
    {
 	fenced: "block",
 	of: "json",
 }
 
    
-
    ab  
+
    ab - - - + + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/md_code_block_indented/dagre/board.exp.json b/e2etests/testdata/stable/md_code_block_indented/dagre/board.exp.json index 392c9757a..2a1ec0b54 100644 --- a/e2etests/testdata/stable/md_code_block_indented/dagre/board.exp.json +++ b/e2etests/testdata/stable/md_code_block_indented/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -150,6 +161,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 106, @@ -197,6 +209,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 106, @@ -237,6 +250,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/md_code_block_indented/dagre/sketch.exp.svg b/e2etests/testdata/stable/md_code_block_indented/dagre/sketch.exp.svg index 09b782b1c..e8ea79b0f 100644 --- a/e2etests/testdata/stable/md_code_block_indented/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/md_code_block_indented/dagre/sketch.exp.svg @@ -1,27 +1,27 @@ -

    a line of text and an

    +

    a line of text and an

    {
 	indented: "block",
 	of: "json",
 }
    -
    ab +
    ab - - - + + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/md_code_block_indented/elk/board.exp.json b/e2etests/testdata/stable/md_code_block_indented/elk/board.exp.json index 1856b2a09..c3a6c2d32 100644 --- a/e2etests/testdata/stable/md_code_block_indented/elk/board.exp.json +++ b/e2etests/testdata/stable/md_code_block_indented/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -150,6 +161,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 118, @@ -188,6 +200,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 118, @@ -219,6 +232,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/md_code_block_indented/elk/sketch.exp.svg b/e2etests/testdata/stable/md_code_block_indented/elk/sketch.exp.svg index 61362a278..ae570232e 100644 --- a/e2etests/testdata/stable/md_code_block_indented/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/md_code_block_indented/elk/sketch.exp.svg @@ -1,27 +1,27 @@ -

    a line of text and an

    +

    a line of text and an

    {
 	indented: "block",
 	of: "json",
 }
    -
    ab +
    ab - - - + + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/md_code_inline/dagre/board.exp.json b/e2etests/testdata/stable/md_code_inline/dagre/board.exp.json index e09e0e2f6..08296c7f1 100644 --- a/e2etests/testdata/stable/md_code_inline/dagre/board.exp.json +++ b/e2etests/testdata/stable/md_code_inline/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -150,6 +161,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 26.5, @@ -197,6 +209,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 26.5, @@ -237,6 +250,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/md_code_inline/dagre/sketch.exp.svg b/e2etests/testdata/stable/md_code_inline/dagre/sketch.exp.svg index ee8e4ac06..a583beaae 100644 --- a/e2etests/testdata/stable/md_code_inline/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/md_code_inline/dagre/sketch.exp.svg @@ -1,27 +1,27 @@ -

    code

    -
    ab +

    code

    +
    ab - - - + + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/md_code_inline/elk/board.exp.json b/e2etests/testdata/stable/md_code_inline/elk/board.exp.json index 98251845a..83206e1e3 100644 --- a/e2etests/testdata/stable/md_code_inline/elk/board.exp.json +++ b/e2etests/testdata/stable/md_code_inline/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -150,6 +161,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 38.5, @@ -188,6 +200,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 38.5, @@ -219,6 +232,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/md_code_inline/elk/sketch.exp.svg b/e2etests/testdata/stable/md_code_inline/elk/sketch.exp.svg index ceead38c3..fd7c88b27 100644 --- a/e2etests/testdata/stable/md_code_inline/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/md_code_inline/elk/sketch.exp.svg @@ -1,27 +1,27 @@ -

    code

    -
    ab +

    code

    +
    ab - - - + + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/md_fontsize_10/dagre/board.exp.json b/e2etests/testdata/stable/md_fontsize_10/dagre/board.exp.json index 40662f9b0..ef45b3f8b 100644 --- a/e2etests/testdata/stable/md_fontsize_10/dagre/board.exp.json +++ b/e2etests/testdata/stable/md_fontsize_10/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -150,6 +161,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 166, @@ -197,6 +209,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 166, @@ -237,6 +250,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/md_fontsize_10/dagre/sketch.exp.svg b/e2etests/testdata/stable/md_fontsize_10/dagre/sketch.exp.svg index c1b6f8806..e3fcb25ad 100644 --- a/e2etests/testdata/stable/md_fontsize_10/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/md_fontsize_10/dagre/sketch.exp.svg @@ -1,27 +1,27 @@ -

    Every frustum longs to be a cone

    +

    Every frustum longs to be a cone

    • A continuing flow of paper is sufficient to continue the flow of paper
    • Please remain calm, it's no use both of us being hysterical at the same time
      • @@ -851,9 +850,9 @@

    Festivity Level 1: Your guests are chatting amiably with each other.

    test strikethrough test

    -
    xy +
    xy - - - + + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/md_fontsize_10/elk/board.exp.json b/e2etests/testdata/stable/md_fontsize_10/elk/board.exp.json index 409296980..b30202742 100644 --- a/e2etests/testdata/stable/md_fontsize_10/elk/board.exp.json +++ b/e2etests/testdata/stable/md_fontsize_10/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -150,6 +161,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 178, @@ -188,6 +200,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 178, @@ -219,6 +232,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/md_fontsize_10/elk/sketch.exp.svg b/e2etests/testdata/stable/md_fontsize_10/elk/sketch.exp.svg index 7d86eda9f..7f7cc16f6 100644 --- a/e2etests/testdata/stable/md_fontsize_10/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/md_fontsize_10/elk/sketch.exp.svg @@ -1,27 +1,27 @@ -

    Every frustum longs to be a cone

    +

    Every frustum longs to be a cone

    • A continuing flow of paper is sufficient to continue the flow of paper
    • Please remain calm, it's no use both of us being hysterical at the same time
      • @@ -851,9 +850,9 @@

    Festivity Level 1: Your guests are chatting amiably with each other.

    test strikethrough test

    -
    xy +
    xy - - - + + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/md_mixed/dagre/board.exp.json b/e2etests/testdata/stable/md_mixed/dagre/board.exp.json index e26f2eeff..eab69f148 100644 --- a/e2etests/testdata/stable/md_mixed/dagre/board.exp.json +++ b/e2etests/testdata/stable/md_mixed/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -101,6 +111,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/md_mixed/dagre/sketch.exp.svg b/e2etests/testdata/stable/md_mixed/dagre/sketch.exp.svg index 2ddab441d..89dd3bf0d 100644 --- a/e2etests/testdata/stable/md_mixed/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/md_mixed/dagre/sketch.exp.svg @@ -1,27 +1,27 @@ -example

    one two three!

    -
     +example

    one two three!

    +
     - - + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/md_mixed/elk/board.exp.json b/e2etests/testdata/stable/md_mixed/elk/board.exp.json index 1c804d033..249d25760 100644 --- a/e2etests/testdata/stable/md_mixed/elk/board.exp.json +++ b/e2etests/testdata/stable/md_mixed/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -101,6 +111,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/md_mixed/elk/sketch.exp.svg b/e2etests/testdata/stable/md_mixed/elk/sketch.exp.svg index acbfc3a47..14b202445 100644 --- a/e2etests/testdata/stable/md_mixed/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/md_mixed/elk/sketch.exp.svg @@ -1,27 +1,27 @@ -example

    one two three!

    -
     +example

    one two three!

    +
     - - + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/mono-edge/dagre/board.exp.json b/e2etests/testdata/stable/mono-edge/dagre/board.exp.json index e356ca3ce..84e5c968f 100644 --- a/e2etests/testdata/stable/mono-edge/dagre/board.exp.json +++ b/e2etests/testdata/stable/mono-edge/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -110,6 +120,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 53, @@ -150,6 +161,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/mono-edge/dagre/sketch.exp.svg b/e2etests/testdata/stable/mono-edge/dagre/sketch.exp.svg index 53dfc5075..57f2c7f47 100644 --- a/e2etests/testdata/stable/mono-edge/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/mono-edge/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -xy hi + .d2-1619416325 .fill-N1{fill:#0A0F25;} + .d2-1619416325 .fill-N2{fill:#676C7E;} + .d2-1619416325 .fill-N3{fill:#9499AB;} + .d2-1619416325 .fill-N4{fill:#CFD2DD;} + .d2-1619416325 .fill-N5{fill:#DEE1EB;} + .d2-1619416325 .fill-N6{fill:#EEF1F8;} + .d2-1619416325 .fill-N7{fill:#FFFFFF;} + .d2-1619416325 .fill-B1{fill:#0D32B2;} + .d2-1619416325 .fill-B2{fill:#0D32B2;} + .d2-1619416325 .fill-B3{fill:#E3E9FD;} + .d2-1619416325 .fill-B4{fill:#E3E9FD;} + .d2-1619416325 .fill-B5{fill:#EDF0FD;} + .d2-1619416325 .fill-B6{fill:#F7F8FE;} + .d2-1619416325 .fill-AA2{fill:#4A6FF3;} + .d2-1619416325 .fill-AA4{fill:#EDF0FD;} + .d2-1619416325 .fill-AA5{fill:#F7F8FE;} + .d2-1619416325 .fill-AB4{fill:#EDF0FD;} + .d2-1619416325 .fill-AB5{fill:#F7F8FE;} + .d2-1619416325 .stroke-N1{stroke:#0A0F25;} + .d2-1619416325 .stroke-N2{stroke:#676C7E;} + .d2-1619416325 .stroke-N3{stroke:#9499AB;} + .d2-1619416325 .stroke-N4{stroke:#CFD2DD;} + .d2-1619416325 .stroke-N5{stroke:#DEE1EB;} + .d2-1619416325 .stroke-N6{stroke:#EEF1F8;} + .d2-1619416325 .stroke-N7{stroke:#FFFFFF;} + .d2-1619416325 .stroke-B1{stroke:#0D32B2;} + .d2-1619416325 .stroke-B2{stroke:#0D32B2;} + .d2-1619416325 .stroke-B3{stroke:#E3E9FD;} + .d2-1619416325 .stroke-B4{stroke:#E3E9FD;} + .d2-1619416325 .stroke-B5{stroke:#EDF0FD;} + .d2-1619416325 .stroke-B6{stroke:#F7F8FE;} + .d2-1619416325 .stroke-AA2{stroke:#4A6FF3;} + .d2-1619416325 .stroke-AA4{stroke:#EDF0FD;} + .d2-1619416325 .stroke-AA5{stroke:#F7F8FE;} + .d2-1619416325 .stroke-AB4{stroke:#EDF0FD;} + .d2-1619416325 .stroke-AB5{stroke:#F7F8FE;} + .d2-1619416325 .background-color-N1{background-color:#0A0F25;} + .d2-1619416325 .background-color-N2{background-color:#676C7E;} + .d2-1619416325 .background-color-N3{background-color:#9499AB;} + .d2-1619416325 .background-color-N4{background-color:#CFD2DD;} + .d2-1619416325 .background-color-N5{background-color:#DEE1EB;} + .d2-1619416325 .background-color-N6{background-color:#EEF1F8;} + .d2-1619416325 .background-color-N7{background-color:#FFFFFF;} + .d2-1619416325 .background-color-B1{background-color:#0D32B2;} + .d2-1619416325 .background-color-B2{background-color:#0D32B2;} + .d2-1619416325 .background-color-B3{background-color:#E3E9FD;} + .d2-1619416325 .background-color-B4{background-color:#E3E9FD;} + .d2-1619416325 .background-color-B5{background-color:#EDF0FD;} + .d2-1619416325 .background-color-B6{background-color:#F7F8FE;} + .d2-1619416325 .background-color-AA2{background-color:#4A6FF3;} + .d2-1619416325 .background-color-AA4{background-color:#EDF0FD;} + .d2-1619416325 .background-color-AA5{background-color:#F7F8FE;} + .d2-1619416325 .background-color-AB4{background-color:#EDF0FD;} + .d2-1619416325 .background-color-AB5{background-color:#F7F8FE;} + .d2-1619416325 .color-N1{color:#0A0F25;} + .d2-1619416325 .color-N2{color:#676C7E;} + .d2-1619416325 .color-N3{color:#9499AB;} + .d2-1619416325 .color-N4{color:#CFD2DD;} + .d2-1619416325 .color-N5{color:#DEE1EB;} + .d2-1619416325 .color-N6{color:#EEF1F8;} + .d2-1619416325 .color-N7{color:#FFFFFF;} + .d2-1619416325 .color-B1{color:#0D32B2;} + .d2-1619416325 .color-B2{color:#0D32B2;} + .d2-1619416325 .color-B3{color:#E3E9FD;} + .d2-1619416325 .color-B4{color:#E3E9FD;} + .d2-1619416325 .color-B5{color:#EDF0FD;} + .d2-1619416325 .color-B6{color:#F7F8FE;} + .d2-1619416325 .color-AA2{color:#4A6FF3;} + .d2-1619416325 .color-AA4{color:#EDF0FD;} + .d2-1619416325 .color-AA5{color:#F7F8FE;} + .d2-1619416325 .color-AB4{color:#EDF0FD;} + .d2-1619416325 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1619416325);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1619416325);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1619416325);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1619416325);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1619416325);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1619416325);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1619416325);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1619416325);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1619416325);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1619416325);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1619416325);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1619416325);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1619416325);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1619416325);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1619416325);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1619416325);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1619416325);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1619416325);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xy hi - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/mono-edge/elk/board.exp.json b/e2etests/testdata/stable/mono-edge/elk/board.exp.json index 5a6cab54b..1b3ed0eab 100644 --- a/e2etests/testdata/stable/mono-edge/elk/board.exp.json +++ b/e2etests/testdata/stable/mono-edge/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -110,6 +120,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 65, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/mono-edge/elk/sketch.exp.svg b/e2etests/testdata/stable/mono-edge/elk/sketch.exp.svg index 5a3a14051..18056093a 100644 --- a/e2etests/testdata/stable/mono-edge/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/mono-edge/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -xy hi + .d2-4138149642 .fill-N1{fill:#0A0F25;} + .d2-4138149642 .fill-N2{fill:#676C7E;} + .d2-4138149642 .fill-N3{fill:#9499AB;} + .d2-4138149642 .fill-N4{fill:#CFD2DD;} + .d2-4138149642 .fill-N5{fill:#DEE1EB;} + .d2-4138149642 .fill-N6{fill:#EEF1F8;} + .d2-4138149642 .fill-N7{fill:#FFFFFF;} + .d2-4138149642 .fill-B1{fill:#0D32B2;} + .d2-4138149642 .fill-B2{fill:#0D32B2;} + .d2-4138149642 .fill-B3{fill:#E3E9FD;} + .d2-4138149642 .fill-B4{fill:#E3E9FD;} + .d2-4138149642 .fill-B5{fill:#EDF0FD;} + .d2-4138149642 .fill-B6{fill:#F7F8FE;} + .d2-4138149642 .fill-AA2{fill:#4A6FF3;} + .d2-4138149642 .fill-AA4{fill:#EDF0FD;} + .d2-4138149642 .fill-AA5{fill:#F7F8FE;} + .d2-4138149642 .fill-AB4{fill:#EDF0FD;} + .d2-4138149642 .fill-AB5{fill:#F7F8FE;} + .d2-4138149642 .stroke-N1{stroke:#0A0F25;} + .d2-4138149642 .stroke-N2{stroke:#676C7E;} + .d2-4138149642 .stroke-N3{stroke:#9499AB;} + .d2-4138149642 .stroke-N4{stroke:#CFD2DD;} + .d2-4138149642 .stroke-N5{stroke:#DEE1EB;} + .d2-4138149642 .stroke-N6{stroke:#EEF1F8;} + .d2-4138149642 .stroke-N7{stroke:#FFFFFF;} + .d2-4138149642 .stroke-B1{stroke:#0D32B2;} + .d2-4138149642 .stroke-B2{stroke:#0D32B2;} + .d2-4138149642 .stroke-B3{stroke:#E3E9FD;} + .d2-4138149642 .stroke-B4{stroke:#E3E9FD;} + .d2-4138149642 .stroke-B5{stroke:#EDF0FD;} + .d2-4138149642 .stroke-B6{stroke:#F7F8FE;} + .d2-4138149642 .stroke-AA2{stroke:#4A6FF3;} + .d2-4138149642 .stroke-AA4{stroke:#EDF0FD;} + .d2-4138149642 .stroke-AA5{stroke:#F7F8FE;} + .d2-4138149642 .stroke-AB4{stroke:#EDF0FD;} + .d2-4138149642 .stroke-AB5{stroke:#F7F8FE;} + .d2-4138149642 .background-color-N1{background-color:#0A0F25;} + .d2-4138149642 .background-color-N2{background-color:#676C7E;} + .d2-4138149642 .background-color-N3{background-color:#9499AB;} + .d2-4138149642 .background-color-N4{background-color:#CFD2DD;} + .d2-4138149642 .background-color-N5{background-color:#DEE1EB;} + .d2-4138149642 .background-color-N6{background-color:#EEF1F8;} + .d2-4138149642 .background-color-N7{background-color:#FFFFFF;} + .d2-4138149642 .background-color-B1{background-color:#0D32B2;} + .d2-4138149642 .background-color-B2{background-color:#0D32B2;} + .d2-4138149642 .background-color-B3{background-color:#E3E9FD;} + .d2-4138149642 .background-color-B4{background-color:#E3E9FD;} + .d2-4138149642 .background-color-B5{background-color:#EDF0FD;} + .d2-4138149642 .background-color-B6{background-color:#F7F8FE;} + .d2-4138149642 .background-color-AA2{background-color:#4A6FF3;} + .d2-4138149642 .background-color-AA4{background-color:#EDF0FD;} + .d2-4138149642 .background-color-AA5{background-color:#F7F8FE;} + .d2-4138149642 .background-color-AB4{background-color:#EDF0FD;} + .d2-4138149642 .background-color-AB5{background-color:#F7F8FE;} + .d2-4138149642 .color-N1{color:#0A0F25;} + .d2-4138149642 .color-N2{color:#676C7E;} + .d2-4138149642 .color-N3{color:#9499AB;} + .d2-4138149642 .color-N4{color:#CFD2DD;} + .d2-4138149642 .color-N5{color:#DEE1EB;} + .d2-4138149642 .color-N6{color:#EEF1F8;} + .d2-4138149642 .color-N7{color:#FFFFFF;} + .d2-4138149642 .color-B1{color:#0D32B2;} + .d2-4138149642 .color-B2{color:#0D32B2;} + .d2-4138149642 .color-B3{color:#E3E9FD;} + .d2-4138149642 .color-B4{color:#E3E9FD;} + .d2-4138149642 .color-B5{color:#EDF0FD;} + .d2-4138149642 .color-B6{color:#F7F8FE;} + .d2-4138149642 .color-AA2{color:#4A6FF3;} + .d2-4138149642 .color-AA4{color:#EDF0FD;} + .d2-4138149642 .color-AA5{color:#F7F8FE;} + .d2-4138149642 .color-AB4{color:#EDF0FD;} + .d2-4138149642 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4138149642);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4138149642);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4138149642);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4138149642);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4138149642);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4138149642);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4138149642);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4138149642);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4138149642);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4138149642);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4138149642);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4138149642);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4138149642);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4138149642);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4138149642);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4138149642);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4138149642);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4138149642);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xy hi - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/mono-font/dagre/board.exp.json b/e2etests/testdata/stable/mono-font/dagre/board.exp.json index 35ed1a099..ea46de75d 100644 --- a/e2etests/testdata/stable/mono-font/dagre/board.exp.json +++ b/e2etests/testdata/stable/mono-font/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "white", "stroke": "black", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "white", "stroke": "black", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -110,6 +120,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 79, @@ -157,6 +168,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 107, @@ -204,6 +216,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 135, @@ -244,6 +257,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/mono-font/dagre/sketch.exp.svg b/e2etests/testdata/stable/mono-font/dagre/sketch.exp.svg index 588d3cb7a..534d66a50 100644 --- a/e2etests/testdata/stable/mono-font/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/mono-font/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -SATELLITESTRANSMITTER SENDSENDSEND + .d2-3097297157 .fill-N1{fill:#0A0F25;} + .d2-3097297157 .fill-N2{fill:#676C7E;} + .d2-3097297157 .fill-N3{fill:#9499AB;} + .d2-3097297157 .fill-N4{fill:#CFD2DD;} + .d2-3097297157 .fill-N5{fill:#DEE1EB;} + .d2-3097297157 .fill-N6{fill:#EEF1F8;} + .d2-3097297157 .fill-N7{fill:#FFFFFF;} + .d2-3097297157 .fill-B1{fill:#0D32B2;} + .d2-3097297157 .fill-B2{fill:#0D32B2;} + .d2-3097297157 .fill-B3{fill:#E3E9FD;} + .d2-3097297157 .fill-B4{fill:#E3E9FD;} + .d2-3097297157 .fill-B5{fill:#EDF0FD;} + .d2-3097297157 .fill-B6{fill:#F7F8FE;} + .d2-3097297157 .fill-AA2{fill:#4A6FF3;} + .d2-3097297157 .fill-AA4{fill:#EDF0FD;} + .d2-3097297157 .fill-AA5{fill:#F7F8FE;} + .d2-3097297157 .fill-AB4{fill:#EDF0FD;} + .d2-3097297157 .fill-AB5{fill:#F7F8FE;} + .d2-3097297157 .stroke-N1{stroke:#0A0F25;} + .d2-3097297157 .stroke-N2{stroke:#676C7E;} + .d2-3097297157 .stroke-N3{stroke:#9499AB;} + .d2-3097297157 .stroke-N4{stroke:#CFD2DD;} + .d2-3097297157 .stroke-N5{stroke:#DEE1EB;} + .d2-3097297157 .stroke-N6{stroke:#EEF1F8;} + .d2-3097297157 .stroke-N7{stroke:#FFFFFF;} + .d2-3097297157 .stroke-B1{stroke:#0D32B2;} + .d2-3097297157 .stroke-B2{stroke:#0D32B2;} + .d2-3097297157 .stroke-B3{stroke:#E3E9FD;} + .d2-3097297157 .stroke-B4{stroke:#E3E9FD;} + .d2-3097297157 .stroke-B5{stroke:#EDF0FD;} + .d2-3097297157 .stroke-B6{stroke:#F7F8FE;} + .d2-3097297157 .stroke-AA2{stroke:#4A6FF3;} + .d2-3097297157 .stroke-AA4{stroke:#EDF0FD;} + .d2-3097297157 .stroke-AA5{stroke:#F7F8FE;} + .d2-3097297157 .stroke-AB4{stroke:#EDF0FD;} + .d2-3097297157 .stroke-AB5{stroke:#F7F8FE;} + .d2-3097297157 .background-color-N1{background-color:#0A0F25;} + .d2-3097297157 .background-color-N2{background-color:#676C7E;} + .d2-3097297157 .background-color-N3{background-color:#9499AB;} + .d2-3097297157 .background-color-N4{background-color:#CFD2DD;} + .d2-3097297157 .background-color-N5{background-color:#DEE1EB;} + .d2-3097297157 .background-color-N6{background-color:#EEF1F8;} + .d2-3097297157 .background-color-N7{background-color:#FFFFFF;} + .d2-3097297157 .background-color-B1{background-color:#0D32B2;} + .d2-3097297157 .background-color-B2{background-color:#0D32B2;} + .d2-3097297157 .background-color-B3{background-color:#E3E9FD;} + .d2-3097297157 .background-color-B4{background-color:#E3E9FD;} + .d2-3097297157 .background-color-B5{background-color:#EDF0FD;} + .d2-3097297157 .background-color-B6{background-color:#F7F8FE;} + .d2-3097297157 .background-color-AA2{background-color:#4A6FF3;} + .d2-3097297157 .background-color-AA4{background-color:#EDF0FD;} + .d2-3097297157 .background-color-AA5{background-color:#F7F8FE;} + .d2-3097297157 .background-color-AB4{background-color:#EDF0FD;} + .d2-3097297157 .background-color-AB5{background-color:#F7F8FE;} + .d2-3097297157 .color-N1{color:#0A0F25;} + .d2-3097297157 .color-N2{color:#676C7E;} + .d2-3097297157 .color-N3{color:#9499AB;} + .d2-3097297157 .color-N4{color:#CFD2DD;} + .d2-3097297157 .color-N5{color:#DEE1EB;} + .d2-3097297157 .color-N6{color:#EEF1F8;} + .d2-3097297157 .color-N7{color:#FFFFFF;} + .d2-3097297157 .color-B1{color:#0D32B2;} + .d2-3097297157 .color-B2{color:#0D32B2;} + .d2-3097297157 .color-B3{color:#E3E9FD;} + .d2-3097297157 .color-B4{color:#E3E9FD;} + .d2-3097297157 .color-B5{color:#EDF0FD;} + .d2-3097297157 .color-B6{color:#F7F8FE;} + .d2-3097297157 .color-AA2{color:#4A6FF3;} + .d2-3097297157 .color-AA4{color:#EDF0FD;} + .d2-3097297157 .color-AA5{color:#F7F8FE;} + .d2-3097297157 .color-AB4{color:#EDF0FD;} + .d2-3097297157 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3097297157);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3097297157);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3097297157);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3097297157);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3097297157);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3097297157);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3097297157);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3097297157);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3097297157);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3097297157);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3097297157);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3097297157);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3097297157);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3097297157);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3097297157);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3097297157);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3097297157);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3097297157);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>SATELLITESTRANSMITTER SENDSENDSEND - - - - - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/mono-font/elk/board.exp.json b/e2etests/testdata/stable/mono-font/elk/board.exp.json index 9609194e3..2ebd411c7 100644 --- a/e2etests/testdata/stable/mono-font/elk/board.exp.json +++ b/e2etests/testdata/stable/mono-font/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "white", "stroke": "black", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "white", "stroke": "black", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -110,6 +120,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 48, @@ -148,6 +159,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 97, @@ -186,6 +198,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 146, @@ -217,6 +230,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/mono-font/elk/sketch.exp.svg b/e2etests/testdata/stable/mono-font/elk/sketch.exp.svg index 0aac65e47..21f5c447b 100644 --- a/e2etests/testdata/stable/mono-font/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/mono-font/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -SATELLITESTRANSMITTER SENDSENDSEND + .d2-3660418575 .fill-N1{fill:#0A0F25;} + .d2-3660418575 .fill-N2{fill:#676C7E;} + .d2-3660418575 .fill-N3{fill:#9499AB;} + .d2-3660418575 .fill-N4{fill:#CFD2DD;} + .d2-3660418575 .fill-N5{fill:#DEE1EB;} + .d2-3660418575 .fill-N6{fill:#EEF1F8;} + .d2-3660418575 .fill-N7{fill:#FFFFFF;} + .d2-3660418575 .fill-B1{fill:#0D32B2;} + .d2-3660418575 .fill-B2{fill:#0D32B2;} + .d2-3660418575 .fill-B3{fill:#E3E9FD;} + .d2-3660418575 .fill-B4{fill:#E3E9FD;} + .d2-3660418575 .fill-B5{fill:#EDF0FD;} + .d2-3660418575 .fill-B6{fill:#F7F8FE;} + .d2-3660418575 .fill-AA2{fill:#4A6FF3;} + .d2-3660418575 .fill-AA4{fill:#EDF0FD;} + .d2-3660418575 .fill-AA5{fill:#F7F8FE;} + .d2-3660418575 .fill-AB4{fill:#EDF0FD;} + .d2-3660418575 .fill-AB5{fill:#F7F8FE;} + .d2-3660418575 .stroke-N1{stroke:#0A0F25;} + .d2-3660418575 .stroke-N2{stroke:#676C7E;} + .d2-3660418575 .stroke-N3{stroke:#9499AB;} + .d2-3660418575 .stroke-N4{stroke:#CFD2DD;} + .d2-3660418575 .stroke-N5{stroke:#DEE1EB;} + .d2-3660418575 .stroke-N6{stroke:#EEF1F8;} + .d2-3660418575 .stroke-N7{stroke:#FFFFFF;} + .d2-3660418575 .stroke-B1{stroke:#0D32B2;} + .d2-3660418575 .stroke-B2{stroke:#0D32B2;} + .d2-3660418575 .stroke-B3{stroke:#E3E9FD;} + .d2-3660418575 .stroke-B4{stroke:#E3E9FD;} + .d2-3660418575 .stroke-B5{stroke:#EDF0FD;} + .d2-3660418575 .stroke-B6{stroke:#F7F8FE;} + .d2-3660418575 .stroke-AA2{stroke:#4A6FF3;} + .d2-3660418575 .stroke-AA4{stroke:#EDF0FD;} + .d2-3660418575 .stroke-AA5{stroke:#F7F8FE;} + .d2-3660418575 .stroke-AB4{stroke:#EDF0FD;} + .d2-3660418575 .stroke-AB5{stroke:#F7F8FE;} + .d2-3660418575 .background-color-N1{background-color:#0A0F25;} + .d2-3660418575 .background-color-N2{background-color:#676C7E;} + .d2-3660418575 .background-color-N3{background-color:#9499AB;} + .d2-3660418575 .background-color-N4{background-color:#CFD2DD;} + .d2-3660418575 .background-color-N5{background-color:#DEE1EB;} + .d2-3660418575 .background-color-N6{background-color:#EEF1F8;} + .d2-3660418575 .background-color-N7{background-color:#FFFFFF;} + .d2-3660418575 .background-color-B1{background-color:#0D32B2;} + .d2-3660418575 .background-color-B2{background-color:#0D32B2;} + .d2-3660418575 .background-color-B3{background-color:#E3E9FD;} + .d2-3660418575 .background-color-B4{background-color:#E3E9FD;} + .d2-3660418575 .background-color-B5{background-color:#EDF0FD;} + .d2-3660418575 .background-color-B6{background-color:#F7F8FE;} + .d2-3660418575 .background-color-AA2{background-color:#4A6FF3;} + .d2-3660418575 .background-color-AA4{background-color:#EDF0FD;} + .d2-3660418575 .background-color-AA5{background-color:#F7F8FE;} + .d2-3660418575 .background-color-AB4{background-color:#EDF0FD;} + .d2-3660418575 .background-color-AB5{background-color:#F7F8FE;} + .d2-3660418575 .color-N1{color:#0A0F25;} + .d2-3660418575 .color-N2{color:#676C7E;} + .d2-3660418575 .color-N3{color:#9499AB;} + .d2-3660418575 .color-N4{color:#CFD2DD;} + .d2-3660418575 .color-N5{color:#DEE1EB;} + .d2-3660418575 .color-N6{color:#EEF1F8;} + .d2-3660418575 .color-N7{color:#FFFFFF;} + .d2-3660418575 .color-B1{color:#0D32B2;} + .d2-3660418575 .color-B2{color:#0D32B2;} + .d2-3660418575 .color-B3{color:#E3E9FD;} + .d2-3660418575 .color-B4{color:#E3E9FD;} + .d2-3660418575 .color-B5{color:#EDF0FD;} + .d2-3660418575 .color-B6{color:#F7F8FE;} + .d2-3660418575 .color-AA2{color:#4A6FF3;} + .d2-3660418575 .color-AA4{color:#EDF0FD;} + .d2-3660418575 .color-AA5{color:#F7F8FE;} + .d2-3660418575 .color-AB4{color:#EDF0FD;} + .d2-3660418575 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3660418575);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3660418575);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3660418575);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3660418575);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3660418575);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3660418575);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3660418575);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3660418575);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3660418575);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3660418575);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3660418575);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3660418575);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3660418575);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3660418575);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3660418575);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3660418575);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3660418575);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3660418575);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>SATELLITESTRANSMITTER SENDSENDSEND - - - - - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/multiline_text/dagre/board.exp.json b/e2etests/testdata/stable/multiline_text/dagre/board.exp.json index aeea56bc2..2015760f1 100644 --- a/e2etests/testdata/stable/multiline_text/dagre/board.exp.json +++ b/e2etests/testdata/stable/multiline_text/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -61,6 +70,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/multiline_text/dagre/sketch.exp.svg b/e2etests/testdata/stable/multiline_text/dagre/sketch.exp.svg index 641c3bd1f..84030e835 100644 --- a/e2etests/testdata/stable/multiline_text/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/multiline_text/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -thisgoesmultiple lines + .d2-3040487587 .fill-N1{fill:#0A0F25;} + .d2-3040487587 .fill-N2{fill:#676C7E;} + .d2-3040487587 .fill-N3{fill:#9499AB;} + .d2-3040487587 .fill-N4{fill:#CFD2DD;} + .d2-3040487587 .fill-N5{fill:#DEE1EB;} + .d2-3040487587 .fill-N6{fill:#EEF1F8;} + .d2-3040487587 .fill-N7{fill:#FFFFFF;} + .d2-3040487587 .fill-B1{fill:#0D32B2;} + .d2-3040487587 .fill-B2{fill:#0D32B2;} + .d2-3040487587 .fill-B3{fill:#E3E9FD;} + .d2-3040487587 .fill-B4{fill:#E3E9FD;} + .d2-3040487587 .fill-B5{fill:#EDF0FD;} + .d2-3040487587 .fill-B6{fill:#F7F8FE;} + .d2-3040487587 .fill-AA2{fill:#4A6FF3;} + .d2-3040487587 .fill-AA4{fill:#EDF0FD;} + .d2-3040487587 .fill-AA5{fill:#F7F8FE;} + .d2-3040487587 .fill-AB4{fill:#EDF0FD;} + .d2-3040487587 .fill-AB5{fill:#F7F8FE;} + .d2-3040487587 .stroke-N1{stroke:#0A0F25;} + .d2-3040487587 .stroke-N2{stroke:#676C7E;} + .d2-3040487587 .stroke-N3{stroke:#9499AB;} + .d2-3040487587 .stroke-N4{stroke:#CFD2DD;} + .d2-3040487587 .stroke-N5{stroke:#DEE1EB;} + .d2-3040487587 .stroke-N6{stroke:#EEF1F8;} + .d2-3040487587 .stroke-N7{stroke:#FFFFFF;} + .d2-3040487587 .stroke-B1{stroke:#0D32B2;} + .d2-3040487587 .stroke-B2{stroke:#0D32B2;} + .d2-3040487587 .stroke-B3{stroke:#E3E9FD;} + .d2-3040487587 .stroke-B4{stroke:#E3E9FD;} + .d2-3040487587 .stroke-B5{stroke:#EDF0FD;} + .d2-3040487587 .stroke-B6{stroke:#F7F8FE;} + .d2-3040487587 .stroke-AA2{stroke:#4A6FF3;} + .d2-3040487587 .stroke-AA4{stroke:#EDF0FD;} + .d2-3040487587 .stroke-AA5{stroke:#F7F8FE;} + .d2-3040487587 .stroke-AB4{stroke:#EDF0FD;} + .d2-3040487587 .stroke-AB5{stroke:#F7F8FE;} + .d2-3040487587 .background-color-N1{background-color:#0A0F25;} + .d2-3040487587 .background-color-N2{background-color:#676C7E;} + .d2-3040487587 .background-color-N3{background-color:#9499AB;} + .d2-3040487587 .background-color-N4{background-color:#CFD2DD;} + .d2-3040487587 .background-color-N5{background-color:#DEE1EB;} + .d2-3040487587 .background-color-N6{background-color:#EEF1F8;} + .d2-3040487587 .background-color-N7{background-color:#FFFFFF;} + .d2-3040487587 .background-color-B1{background-color:#0D32B2;} + .d2-3040487587 .background-color-B2{background-color:#0D32B2;} + .d2-3040487587 .background-color-B3{background-color:#E3E9FD;} + .d2-3040487587 .background-color-B4{background-color:#E3E9FD;} + .d2-3040487587 .background-color-B5{background-color:#EDF0FD;} + .d2-3040487587 .background-color-B6{background-color:#F7F8FE;} + .d2-3040487587 .background-color-AA2{background-color:#4A6FF3;} + .d2-3040487587 .background-color-AA4{background-color:#EDF0FD;} + .d2-3040487587 .background-color-AA5{background-color:#F7F8FE;} + .d2-3040487587 .background-color-AB4{background-color:#EDF0FD;} + .d2-3040487587 .background-color-AB5{background-color:#F7F8FE;} + .d2-3040487587 .color-N1{color:#0A0F25;} + .d2-3040487587 .color-N2{color:#676C7E;} + .d2-3040487587 .color-N3{color:#9499AB;} + .d2-3040487587 .color-N4{color:#CFD2DD;} + .d2-3040487587 .color-N5{color:#DEE1EB;} + .d2-3040487587 .color-N6{color:#EEF1F8;} + .d2-3040487587 .color-N7{color:#FFFFFF;} + .d2-3040487587 .color-B1{color:#0D32B2;} + .d2-3040487587 .color-B2{color:#0D32B2;} + .d2-3040487587 .color-B3{color:#E3E9FD;} + .d2-3040487587 .color-B4{color:#E3E9FD;} + .d2-3040487587 .color-B5{color:#EDF0FD;} + .d2-3040487587 .color-B6{color:#F7F8FE;} + .d2-3040487587 .color-AA2{color:#4A6FF3;} + .d2-3040487587 .color-AA4{color:#EDF0FD;} + .d2-3040487587 .color-AA5{color:#F7F8FE;} + .d2-3040487587 .color-AB4{color:#EDF0FD;} + .d2-3040487587 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3040487587);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3040487587);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3040487587);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3040487587);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3040487587);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3040487587);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3040487587);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3040487587);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3040487587);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3040487587);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3040487587);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3040487587);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3040487587);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3040487587);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3040487587);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3040487587);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3040487587);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3040487587);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>thisgoesmultiple lines - + \ No newline at end of file diff --git a/e2etests/testdata/stable/multiline_text/elk/board.exp.json b/e2etests/testdata/stable/multiline_text/elk/board.exp.json index a10d63b38..b58bf098a 100644 --- a/e2etests/testdata/stable/multiline_text/elk/board.exp.json +++ b/e2etests/testdata/stable/multiline_text/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -61,6 +70,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/multiline_text/elk/sketch.exp.svg b/e2etests/testdata/stable/multiline_text/elk/sketch.exp.svg index b7eea26af..9d10a57b5 100644 --- a/e2etests/testdata/stable/multiline_text/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/multiline_text/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -thisgoesmultiple lines + .d2-1171476499 .fill-N1{fill:#0A0F25;} + .d2-1171476499 .fill-N2{fill:#676C7E;} + .d2-1171476499 .fill-N3{fill:#9499AB;} + .d2-1171476499 .fill-N4{fill:#CFD2DD;} + .d2-1171476499 .fill-N5{fill:#DEE1EB;} + .d2-1171476499 .fill-N6{fill:#EEF1F8;} + .d2-1171476499 .fill-N7{fill:#FFFFFF;} + .d2-1171476499 .fill-B1{fill:#0D32B2;} + .d2-1171476499 .fill-B2{fill:#0D32B2;} + .d2-1171476499 .fill-B3{fill:#E3E9FD;} + .d2-1171476499 .fill-B4{fill:#E3E9FD;} + .d2-1171476499 .fill-B5{fill:#EDF0FD;} + .d2-1171476499 .fill-B6{fill:#F7F8FE;} + .d2-1171476499 .fill-AA2{fill:#4A6FF3;} + .d2-1171476499 .fill-AA4{fill:#EDF0FD;} + .d2-1171476499 .fill-AA5{fill:#F7F8FE;} + .d2-1171476499 .fill-AB4{fill:#EDF0FD;} + .d2-1171476499 .fill-AB5{fill:#F7F8FE;} + .d2-1171476499 .stroke-N1{stroke:#0A0F25;} + .d2-1171476499 .stroke-N2{stroke:#676C7E;} + .d2-1171476499 .stroke-N3{stroke:#9499AB;} + .d2-1171476499 .stroke-N4{stroke:#CFD2DD;} + .d2-1171476499 .stroke-N5{stroke:#DEE1EB;} + .d2-1171476499 .stroke-N6{stroke:#EEF1F8;} + .d2-1171476499 .stroke-N7{stroke:#FFFFFF;} + .d2-1171476499 .stroke-B1{stroke:#0D32B2;} + .d2-1171476499 .stroke-B2{stroke:#0D32B2;} + .d2-1171476499 .stroke-B3{stroke:#E3E9FD;} + .d2-1171476499 .stroke-B4{stroke:#E3E9FD;} + .d2-1171476499 .stroke-B5{stroke:#EDF0FD;} + .d2-1171476499 .stroke-B6{stroke:#F7F8FE;} + .d2-1171476499 .stroke-AA2{stroke:#4A6FF3;} + .d2-1171476499 .stroke-AA4{stroke:#EDF0FD;} + .d2-1171476499 .stroke-AA5{stroke:#F7F8FE;} + .d2-1171476499 .stroke-AB4{stroke:#EDF0FD;} + .d2-1171476499 .stroke-AB5{stroke:#F7F8FE;} + .d2-1171476499 .background-color-N1{background-color:#0A0F25;} + .d2-1171476499 .background-color-N2{background-color:#676C7E;} + .d2-1171476499 .background-color-N3{background-color:#9499AB;} + .d2-1171476499 .background-color-N4{background-color:#CFD2DD;} + .d2-1171476499 .background-color-N5{background-color:#DEE1EB;} + .d2-1171476499 .background-color-N6{background-color:#EEF1F8;} + .d2-1171476499 .background-color-N7{background-color:#FFFFFF;} + .d2-1171476499 .background-color-B1{background-color:#0D32B2;} + .d2-1171476499 .background-color-B2{background-color:#0D32B2;} + .d2-1171476499 .background-color-B3{background-color:#E3E9FD;} + .d2-1171476499 .background-color-B4{background-color:#E3E9FD;} + .d2-1171476499 .background-color-B5{background-color:#EDF0FD;} + .d2-1171476499 .background-color-B6{background-color:#F7F8FE;} + .d2-1171476499 .background-color-AA2{background-color:#4A6FF3;} + .d2-1171476499 .background-color-AA4{background-color:#EDF0FD;} + .d2-1171476499 .background-color-AA5{background-color:#F7F8FE;} + .d2-1171476499 .background-color-AB4{background-color:#EDF0FD;} + .d2-1171476499 .background-color-AB5{background-color:#F7F8FE;} + .d2-1171476499 .color-N1{color:#0A0F25;} + .d2-1171476499 .color-N2{color:#676C7E;} + .d2-1171476499 .color-N3{color:#9499AB;} + .d2-1171476499 .color-N4{color:#CFD2DD;} + .d2-1171476499 .color-N5{color:#DEE1EB;} + .d2-1171476499 .color-N6{color:#EEF1F8;} + .d2-1171476499 .color-N7{color:#FFFFFF;} + .d2-1171476499 .color-B1{color:#0D32B2;} + .d2-1171476499 .color-B2{color:#0D32B2;} + .d2-1171476499 .color-B3{color:#E3E9FD;} + .d2-1171476499 .color-B4{color:#E3E9FD;} + .d2-1171476499 .color-B5{color:#EDF0FD;} + .d2-1171476499 .color-B6{color:#F7F8FE;} + .d2-1171476499 .color-AA2{color:#4A6FF3;} + .d2-1171476499 .color-AA4{color:#EDF0FD;} + .d2-1171476499 .color-AA5{color:#F7F8FE;} + .d2-1171476499 .color-AB4{color:#EDF0FD;} + .d2-1171476499 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1171476499);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1171476499);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1171476499);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1171476499);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1171476499);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1171476499);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1171476499);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1171476499);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1171476499);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1171476499);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1171476499);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1171476499);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1171476499);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1171476499);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1171476499);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1171476499);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1171476499);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1171476499);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>thisgoesmultiple lines - + \ No newline at end of file diff --git a/e2etests/testdata/stable/multiple_box_selection/dagre/board.exp.json b/e2etests/testdata/stable/multiple_box_selection/dagre/board.exp.json index 65b1e9991..00eb008b5 100644 --- a/e2etests/testdata/stable/multiple_box_selection/dagre/board.exp.json +++ b/e2etests/testdata/stable/multiple_box_selection/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -274,6 +288,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 129, @@ -345,6 +360,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 129, @@ -409,6 +425,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/multiple_box_selection/dagre/sketch.exp.svg b/e2etests/testdata/stable/multiple_box_selection/dagre/sketch.exp.svg index 3e4c218ea..962862f03 100644 --- a/e2etests/testdata/stable/multiple_box_selection/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_box_selection/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -outerstartendvolume groupvolume definitionvolume + .d2-3028019976 .fill-N1{fill:#0A0F25;} + .d2-3028019976 .fill-N2{fill:#676C7E;} + .d2-3028019976 .fill-N3{fill:#9499AB;} + .d2-3028019976 .fill-N4{fill:#CFD2DD;} + .d2-3028019976 .fill-N5{fill:#DEE1EB;} + .d2-3028019976 .fill-N6{fill:#EEF1F8;} + .d2-3028019976 .fill-N7{fill:#FFFFFF;} + .d2-3028019976 .fill-B1{fill:#0D32B2;} + .d2-3028019976 .fill-B2{fill:#0D32B2;} + .d2-3028019976 .fill-B3{fill:#E3E9FD;} + .d2-3028019976 .fill-B4{fill:#E3E9FD;} + .d2-3028019976 .fill-B5{fill:#EDF0FD;} + .d2-3028019976 .fill-B6{fill:#F7F8FE;} + .d2-3028019976 .fill-AA2{fill:#4A6FF3;} + .d2-3028019976 .fill-AA4{fill:#EDF0FD;} + .d2-3028019976 .fill-AA5{fill:#F7F8FE;} + .d2-3028019976 .fill-AB4{fill:#EDF0FD;} + .d2-3028019976 .fill-AB5{fill:#F7F8FE;} + .d2-3028019976 .stroke-N1{stroke:#0A0F25;} + .d2-3028019976 .stroke-N2{stroke:#676C7E;} + .d2-3028019976 .stroke-N3{stroke:#9499AB;} + .d2-3028019976 .stroke-N4{stroke:#CFD2DD;} + .d2-3028019976 .stroke-N5{stroke:#DEE1EB;} + .d2-3028019976 .stroke-N6{stroke:#EEF1F8;} + .d2-3028019976 .stroke-N7{stroke:#FFFFFF;} + .d2-3028019976 .stroke-B1{stroke:#0D32B2;} + .d2-3028019976 .stroke-B2{stroke:#0D32B2;} + .d2-3028019976 .stroke-B3{stroke:#E3E9FD;} + .d2-3028019976 .stroke-B4{stroke:#E3E9FD;} + .d2-3028019976 .stroke-B5{stroke:#EDF0FD;} + .d2-3028019976 .stroke-B6{stroke:#F7F8FE;} + .d2-3028019976 .stroke-AA2{stroke:#4A6FF3;} + .d2-3028019976 .stroke-AA4{stroke:#EDF0FD;} + .d2-3028019976 .stroke-AA5{stroke:#F7F8FE;} + .d2-3028019976 .stroke-AB4{stroke:#EDF0FD;} + .d2-3028019976 .stroke-AB5{stroke:#F7F8FE;} + .d2-3028019976 .background-color-N1{background-color:#0A0F25;} + .d2-3028019976 .background-color-N2{background-color:#676C7E;} + .d2-3028019976 .background-color-N3{background-color:#9499AB;} + .d2-3028019976 .background-color-N4{background-color:#CFD2DD;} + .d2-3028019976 .background-color-N5{background-color:#DEE1EB;} + .d2-3028019976 .background-color-N6{background-color:#EEF1F8;} + .d2-3028019976 .background-color-N7{background-color:#FFFFFF;} + .d2-3028019976 .background-color-B1{background-color:#0D32B2;} + .d2-3028019976 .background-color-B2{background-color:#0D32B2;} + .d2-3028019976 .background-color-B3{background-color:#E3E9FD;} + .d2-3028019976 .background-color-B4{background-color:#E3E9FD;} + .d2-3028019976 .background-color-B5{background-color:#EDF0FD;} + .d2-3028019976 .background-color-B6{background-color:#F7F8FE;} + .d2-3028019976 .background-color-AA2{background-color:#4A6FF3;} + .d2-3028019976 .background-color-AA4{background-color:#EDF0FD;} + .d2-3028019976 .background-color-AA5{background-color:#F7F8FE;} + .d2-3028019976 .background-color-AB4{background-color:#EDF0FD;} + .d2-3028019976 .background-color-AB5{background-color:#F7F8FE;} + .d2-3028019976 .color-N1{color:#0A0F25;} + .d2-3028019976 .color-N2{color:#676C7E;} + .d2-3028019976 .color-N3{color:#9499AB;} + .d2-3028019976 .color-N4{color:#CFD2DD;} + .d2-3028019976 .color-N5{color:#DEE1EB;} + .d2-3028019976 .color-N6{color:#EEF1F8;} + .d2-3028019976 .color-N7{color:#FFFFFF;} + .d2-3028019976 .color-B1{color:#0D32B2;} + .d2-3028019976 .color-B2{color:#0D32B2;} + .d2-3028019976 .color-B3{color:#E3E9FD;} + .d2-3028019976 .color-B4{color:#E3E9FD;} + .d2-3028019976 .color-B5{color:#EDF0FD;} + .d2-3028019976 .color-B6{color:#F7F8FE;} + .d2-3028019976 .color-AA2{color:#4A6FF3;} + .d2-3028019976 .color-AA4{color:#EDF0FD;} + .d2-3028019976 .color-AA5{color:#F7F8FE;} + .d2-3028019976 .color-AB4{color:#EDF0FD;} + .d2-3028019976 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3028019976);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3028019976);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3028019976);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3028019976);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3028019976);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3028019976);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3028019976);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3028019976);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3028019976);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3028019976);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3028019976);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3028019976);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3028019976);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3028019976);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3028019976);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3028019976);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3028019976);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3028019976);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>outerstartendvolume groupvolume definitionvolume - - - - - - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/multiple_box_selection/elk/board.exp.json b/e2etests/testdata/stable/multiple_box_selection/elk/board.exp.json index 07a9ea89a..d433cedcf 100644 --- a/e2etests/testdata/stable/multiple_box_selection/elk/board.exp.json +++ b/e2etests/testdata/stable/multiple_box_selection/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -274,6 +288,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 216, @@ -312,6 +327,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 211, @@ -343,6 +359,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/multiple_box_selection/elk/sketch.exp.svg b/e2etests/testdata/stable/multiple_box_selection/elk/sketch.exp.svg index 890b3d475..1e8d24e29 100644 --- a/e2etests/testdata/stable/multiple_box_selection/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_box_selection/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -outerstartendvolume groupvolume definitionvolume + .d2-2029988810 .fill-N1{fill:#0A0F25;} + .d2-2029988810 .fill-N2{fill:#676C7E;} + .d2-2029988810 .fill-N3{fill:#9499AB;} + .d2-2029988810 .fill-N4{fill:#CFD2DD;} + .d2-2029988810 .fill-N5{fill:#DEE1EB;} + .d2-2029988810 .fill-N6{fill:#EEF1F8;} + .d2-2029988810 .fill-N7{fill:#FFFFFF;} + .d2-2029988810 .fill-B1{fill:#0D32B2;} + .d2-2029988810 .fill-B2{fill:#0D32B2;} + .d2-2029988810 .fill-B3{fill:#E3E9FD;} + .d2-2029988810 .fill-B4{fill:#E3E9FD;} + .d2-2029988810 .fill-B5{fill:#EDF0FD;} + .d2-2029988810 .fill-B6{fill:#F7F8FE;} + .d2-2029988810 .fill-AA2{fill:#4A6FF3;} + .d2-2029988810 .fill-AA4{fill:#EDF0FD;} + .d2-2029988810 .fill-AA5{fill:#F7F8FE;} + .d2-2029988810 .fill-AB4{fill:#EDF0FD;} + .d2-2029988810 .fill-AB5{fill:#F7F8FE;} + .d2-2029988810 .stroke-N1{stroke:#0A0F25;} + .d2-2029988810 .stroke-N2{stroke:#676C7E;} + .d2-2029988810 .stroke-N3{stroke:#9499AB;} + .d2-2029988810 .stroke-N4{stroke:#CFD2DD;} + .d2-2029988810 .stroke-N5{stroke:#DEE1EB;} + .d2-2029988810 .stroke-N6{stroke:#EEF1F8;} + .d2-2029988810 .stroke-N7{stroke:#FFFFFF;} + .d2-2029988810 .stroke-B1{stroke:#0D32B2;} + .d2-2029988810 .stroke-B2{stroke:#0D32B2;} + .d2-2029988810 .stroke-B3{stroke:#E3E9FD;} + .d2-2029988810 .stroke-B4{stroke:#E3E9FD;} + .d2-2029988810 .stroke-B5{stroke:#EDF0FD;} + .d2-2029988810 .stroke-B6{stroke:#F7F8FE;} + .d2-2029988810 .stroke-AA2{stroke:#4A6FF3;} + .d2-2029988810 .stroke-AA4{stroke:#EDF0FD;} + .d2-2029988810 .stroke-AA5{stroke:#F7F8FE;} + .d2-2029988810 .stroke-AB4{stroke:#EDF0FD;} + .d2-2029988810 .stroke-AB5{stroke:#F7F8FE;} + .d2-2029988810 .background-color-N1{background-color:#0A0F25;} + .d2-2029988810 .background-color-N2{background-color:#676C7E;} + .d2-2029988810 .background-color-N3{background-color:#9499AB;} + .d2-2029988810 .background-color-N4{background-color:#CFD2DD;} + .d2-2029988810 .background-color-N5{background-color:#DEE1EB;} + .d2-2029988810 .background-color-N6{background-color:#EEF1F8;} + .d2-2029988810 .background-color-N7{background-color:#FFFFFF;} + .d2-2029988810 .background-color-B1{background-color:#0D32B2;} + .d2-2029988810 .background-color-B2{background-color:#0D32B2;} + .d2-2029988810 .background-color-B3{background-color:#E3E9FD;} + .d2-2029988810 .background-color-B4{background-color:#E3E9FD;} + .d2-2029988810 .background-color-B5{background-color:#EDF0FD;} + .d2-2029988810 .background-color-B6{background-color:#F7F8FE;} + .d2-2029988810 .background-color-AA2{background-color:#4A6FF3;} + .d2-2029988810 .background-color-AA4{background-color:#EDF0FD;} + .d2-2029988810 .background-color-AA5{background-color:#F7F8FE;} + .d2-2029988810 .background-color-AB4{background-color:#EDF0FD;} + .d2-2029988810 .background-color-AB5{background-color:#F7F8FE;} + .d2-2029988810 .color-N1{color:#0A0F25;} + .d2-2029988810 .color-N2{color:#676C7E;} + .d2-2029988810 .color-N3{color:#9499AB;} + .d2-2029988810 .color-N4{color:#CFD2DD;} + .d2-2029988810 .color-N5{color:#DEE1EB;} + .d2-2029988810 .color-N6{color:#EEF1F8;} + .d2-2029988810 .color-N7{color:#FFFFFF;} + .d2-2029988810 .color-B1{color:#0D32B2;} + .d2-2029988810 .color-B2{color:#0D32B2;} + .d2-2029988810 .color-B3{color:#E3E9FD;} + .d2-2029988810 .color-B4{color:#E3E9FD;} + .d2-2029988810 .color-B5{color:#EDF0FD;} + .d2-2029988810 .color-B6{color:#F7F8FE;} + .d2-2029988810 .color-AA2{color:#4A6FF3;} + .d2-2029988810 .color-AA4{color:#EDF0FD;} + .d2-2029988810 .color-AA5{color:#F7F8FE;} + .d2-2029988810 .color-AB4{color:#EDF0FD;} + .d2-2029988810 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2029988810);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2029988810);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2029988810);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2029988810);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2029988810);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2029988810);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2029988810);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2029988810);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2029988810);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2029988810);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2029988810);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2029988810);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2029988810);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2029988810);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2029988810);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2029988810);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2029988810);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2029988810);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>outerstartendvolume groupvolume definitionvolume - - - - - - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/multiple_offset/dagre/board.exp.json b/e2etests/testdata/stable/multiple_offset/dagre/board.exp.json index 33fe35aad..b9c5fc125 100644 --- a/e2etests/testdata/stable/multiple_offset/dagre/board.exp.json +++ b/e2etests/testdata/stable/multiple_offset/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B2", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B2", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -715,6 +740,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -756,6 +782,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -797,6 +824,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -838,6 +866,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -879,6 +908,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -920,6 +950,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -961,6 +992,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1002,6 +1034,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -1043,6 +1076,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -1084,6 +1118,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -1125,6 +1160,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -1166,6 +1202,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -1207,6 +1244,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B2", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -1258,6 +1296,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 66.5, @@ -1305,6 +1344,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 229.5, @@ -1352,6 +1392,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 397.5, @@ -1399,6 +1440,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 570.5, @@ -1446,6 +1488,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 743.5, @@ -1493,6 +1536,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 901.5, @@ -1540,6 +1584,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1064.5, @@ -1587,6 +1632,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1227.5, @@ -1634,6 +1680,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1410.5, @@ -1681,6 +1728,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1583.5, @@ -1721,6 +1769,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/multiple_offset/dagre/sketch.exp.svg b/e2etests/testdata/stable/multiple_offset/dagre/sketch.exp.svg index 798195c1a..7c1899b68 100644 --- a/e2etests/testdata/stable/multiple_offset/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_offset/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -n1n2n3 + .d2-3863633706 .fill-N1{fill:#0A0F25;} + .d2-3863633706 .fill-N2{fill:#676C7E;} + .d2-3863633706 .fill-N3{fill:#9499AB;} + .d2-3863633706 .fill-N4{fill:#CFD2DD;} + .d2-3863633706 .fill-N5{fill:#DEE1EB;} + .d2-3863633706 .fill-N6{fill:#EEF1F8;} + .d2-3863633706 .fill-N7{fill:#FFFFFF;} + .d2-3863633706 .fill-B1{fill:#0D32B2;} + .d2-3863633706 .fill-B2{fill:#0D32B2;} + .d2-3863633706 .fill-B3{fill:#E3E9FD;} + .d2-3863633706 .fill-B4{fill:#E3E9FD;} + .d2-3863633706 .fill-B5{fill:#EDF0FD;} + .d2-3863633706 .fill-B6{fill:#F7F8FE;} + .d2-3863633706 .fill-AA2{fill:#4A6FF3;} + .d2-3863633706 .fill-AA4{fill:#EDF0FD;} + .d2-3863633706 .fill-AA5{fill:#F7F8FE;} + .d2-3863633706 .fill-AB4{fill:#EDF0FD;} + .d2-3863633706 .fill-AB5{fill:#F7F8FE;} + .d2-3863633706 .stroke-N1{stroke:#0A0F25;} + .d2-3863633706 .stroke-N2{stroke:#676C7E;} + .d2-3863633706 .stroke-N3{stroke:#9499AB;} + .d2-3863633706 .stroke-N4{stroke:#CFD2DD;} + .d2-3863633706 .stroke-N5{stroke:#DEE1EB;} + .d2-3863633706 .stroke-N6{stroke:#EEF1F8;} + .d2-3863633706 .stroke-N7{stroke:#FFFFFF;} + .d2-3863633706 .stroke-B1{stroke:#0D32B2;} + .d2-3863633706 .stroke-B2{stroke:#0D32B2;} + .d2-3863633706 .stroke-B3{stroke:#E3E9FD;} + .d2-3863633706 .stroke-B4{stroke:#E3E9FD;} + .d2-3863633706 .stroke-B5{stroke:#EDF0FD;} + .d2-3863633706 .stroke-B6{stroke:#F7F8FE;} + .d2-3863633706 .stroke-AA2{stroke:#4A6FF3;} + .d2-3863633706 .stroke-AA4{stroke:#EDF0FD;} + .d2-3863633706 .stroke-AA5{stroke:#F7F8FE;} + .d2-3863633706 .stroke-AB4{stroke:#EDF0FD;} + .d2-3863633706 .stroke-AB5{stroke:#F7F8FE;} + .d2-3863633706 .background-color-N1{background-color:#0A0F25;} + .d2-3863633706 .background-color-N2{background-color:#676C7E;} + .d2-3863633706 .background-color-N3{background-color:#9499AB;} + .d2-3863633706 .background-color-N4{background-color:#CFD2DD;} + .d2-3863633706 .background-color-N5{background-color:#DEE1EB;} + .d2-3863633706 .background-color-N6{background-color:#EEF1F8;} + .d2-3863633706 .background-color-N7{background-color:#FFFFFF;} + .d2-3863633706 .background-color-B1{background-color:#0D32B2;} + .d2-3863633706 .background-color-B2{background-color:#0D32B2;} + .d2-3863633706 .background-color-B3{background-color:#E3E9FD;} + .d2-3863633706 .background-color-B4{background-color:#E3E9FD;} + .d2-3863633706 .background-color-B5{background-color:#EDF0FD;} + .d2-3863633706 .background-color-B6{background-color:#F7F8FE;} + .d2-3863633706 .background-color-AA2{background-color:#4A6FF3;} + .d2-3863633706 .background-color-AA4{background-color:#EDF0FD;} + .d2-3863633706 .background-color-AA5{background-color:#F7F8FE;} + .d2-3863633706 .background-color-AB4{background-color:#EDF0FD;} + .d2-3863633706 .background-color-AB5{background-color:#F7F8FE;} + .d2-3863633706 .color-N1{color:#0A0F25;} + .d2-3863633706 .color-N2{color:#676C7E;} + .d2-3863633706 .color-N3{color:#9499AB;} + .d2-3863633706 .color-N4{color:#CFD2DD;} + .d2-3863633706 .color-N5{color:#DEE1EB;} + .d2-3863633706 .color-N6{color:#EEF1F8;} + .d2-3863633706 .color-N7{color:#FFFFFF;} + .d2-3863633706 .color-B1{color:#0D32B2;} + .d2-3863633706 .color-B2{color:#0D32B2;} + .d2-3863633706 .color-B3{color:#E3E9FD;} + .d2-3863633706 .color-B4{color:#E3E9FD;} + .d2-3863633706 .color-B5{color:#EDF0FD;} + .d2-3863633706 .color-B6{color:#F7F8FE;} + .d2-3863633706 .color-AA2{color:#4A6FF3;} + .d2-3863633706 .color-AA4{color:#EDF0FD;} + .d2-3863633706 .color-AA5{color:#F7F8FE;} + .d2-3863633706 .color-AB4{color:#EDF0FD;} + .d2-3863633706 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3863633706);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3863633706);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3863633706);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3863633706);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3863633706);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3863633706);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3863633706);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3863633706);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3863633706);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3863633706);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3863633706);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3863633706);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3863633706);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3863633706);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3863633706);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3863633706);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3863633706);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3863633706);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>n1n2n3 -n4n5 +n4n5 -n6n7 +n6n7 -n8n9 +n8n9 -n10aba +n10aba -baba +baba -bababab +bababab -abab +abab -a +a -b +b - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/multiple_offset/elk/board.exp.json b/e2etests/testdata/stable/multiple_offset/elk/board.exp.json index be7577a12..e886d0518 100644 --- a/e2etests/testdata/stable/multiple_offset/elk/board.exp.json +++ b/e2etests/testdata/stable/multiple_offset/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B2", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B2", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -715,6 +740,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -756,6 +782,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -797,6 +824,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -838,6 +866,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -879,6 +908,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -920,6 +950,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -961,6 +992,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1002,6 +1034,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -1043,6 +1076,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -1084,6 +1118,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -1125,6 +1160,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -1166,6 +1202,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -1207,6 +1244,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B2", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -1258,6 +1296,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 93.5, @@ -1296,6 +1335,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 279, @@ -1334,6 +1374,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 459.5, @@ -1372,6 +1413,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 642.5, @@ -1410,6 +1452,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 825.5, @@ -1448,6 +1491,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 996, @@ -1486,6 +1530,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1176.5, @@ -1524,6 +1569,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1359.5, @@ -1562,6 +1608,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1547.5, @@ -1600,6 +1647,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1730.5, @@ -1631,6 +1679,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/multiple_offset/elk/sketch.exp.svg b/e2etests/testdata/stable/multiple_offset/elk/sketch.exp.svg index 8adb928f8..aaf2ac6d6 100644 --- a/e2etests/testdata/stable/multiple_offset/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_offset/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -n1n2n3 + .d2-2956067749 .fill-N1{fill:#0A0F25;} + .d2-2956067749 .fill-N2{fill:#676C7E;} + .d2-2956067749 .fill-N3{fill:#9499AB;} + .d2-2956067749 .fill-N4{fill:#CFD2DD;} + .d2-2956067749 .fill-N5{fill:#DEE1EB;} + .d2-2956067749 .fill-N6{fill:#EEF1F8;} + .d2-2956067749 .fill-N7{fill:#FFFFFF;} + .d2-2956067749 .fill-B1{fill:#0D32B2;} + .d2-2956067749 .fill-B2{fill:#0D32B2;} + .d2-2956067749 .fill-B3{fill:#E3E9FD;} + .d2-2956067749 .fill-B4{fill:#E3E9FD;} + .d2-2956067749 .fill-B5{fill:#EDF0FD;} + .d2-2956067749 .fill-B6{fill:#F7F8FE;} + .d2-2956067749 .fill-AA2{fill:#4A6FF3;} + .d2-2956067749 .fill-AA4{fill:#EDF0FD;} + .d2-2956067749 .fill-AA5{fill:#F7F8FE;} + .d2-2956067749 .fill-AB4{fill:#EDF0FD;} + .d2-2956067749 .fill-AB5{fill:#F7F8FE;} + .d2-2956067749 .stroke-N1{stroke:#0A0F25;} + .d2-2956067749 .stroke-N2{stroke:#676C7E;} + .d2-2956067749 .stroke-N3{stroke:#9499AB;} + .d2-2956067749 .stroke-N4{stroke:#CFD2DD;} + .d2-2956067749 .stroke-N5{stroke:#DEE1EB;} + .d2-2956067749 .stroke-N6{stroke:#EEF1F8;} + .d2-2956067749 .stroke-N7{stroke:#FFFFFF;} + .d2-2956067749 .stroke-B1{stroke:#0D32B2;} + .d2-2956067749 .stroke-B2{stroke:#0D32B2;} + .d2-2956067749 .stroke-B3{stroke:#E3E9FD;} + .d2-2956067749 .stroke-B4{stroke:#E3E9FD;} + .d2-2956067749 .stroke-B5{stroke:#EDF0FD;} + .d2-2956067749 .stroke-B6{stroke:#F7F8FE;} + .d2-2956067749 .stroke-AA2{stroke:#4A6FF3;} + .d2-2956067749 .stroke-AA4{stroke:#EDF0FD;} + .d2-2956067749 .stroke-AA5{stroke:#F7F8FE;} + .d2-2956067749 .stroke-AB4{stroke:#EDF0FD;} + .d2-2956067749 .stroke-AB5{stroke:#F7F8FE;} + .d2-2956067749 .background-color-N1{background-color:#0A0F25;} + .d2-2956067749 .background-color-N2{background-color:#676C7E;} + .d2-2956067749 .background-color-N3{background-color:#9499AB;} + .d2-2956067749 .background-color-N4{background-color:#CFD2DD;} + .d2-2956067749 .background-color-N5{background-color:#DEE1EB;} + .d2-2956067749 .background-color-N6{background-color:#EEF1F8;} + .d2-2956067749 .background-color-N7{background-color:#FFFFFF;} + .d2-2956067749 .background-color-B1{background-color:#0D32B2;} + .d2-2956067749 .background-color-B2{background-color:#0D32B2;} + .d2-2956067749 .background-color-B3{background-color:#E3E9FD;} + .d2-2956067749 .background-color-B4{background-color:#E3E9FD;} + .d2-2956067749 .background-color-B5{background-color:#EDF0FD;} + .d2-2956067749 .background-color-B6{background-color:#F7F8FE;} + .d2-2956067749 .background-color-AA2{background-color:#4A6FF3;} + .d2-2956067749 .background-color-AA4{background-color:#EDF0FD;} + .d2-2956067749 .background-color-AA5{background-color:#F7F8FE;} + .d2-2956067749 .background-color-AB4{background-color:#EDF0FD;} + .d2-2956067749 .background-color-AB5{background-color:#F7F8FE;} + .d2-2956067749 .color-N1{color:#0A0F25;} + .d2-2956067749 .color-N2{color:#676C7E;} + .d2-2956067749 .color-N3{color:#9499AB;} + .d2-2956067749 .color-N4{color:#CFD2DD;} + .d2-2956067749 .color-N5{color:#DEE1EB;} + .d2-2956067749 .color-N6{color:#EEF1F8;} + .d2-2956067749 .color-N7{color:#FFFFFF;} + .d2-2956067749 .color-B1{color:#0D32B2;} + .d2-2956067749 .color-B2{color:#0D32B2;} + .d2-2956067749 .color-B3{color:#E3E9FD;} + .d2-2956067749 .color-B4{color:#E3E9FD;} + .d2-2956067749 .color-B5{color:#EDF0FD;} + .d2-2956067749 .color-B6{color:#F7F8FE;} + .d2-2956067749 .color-AA2{color:#4A6FF3;} + .d2-2956067749 .color-AA4{color:#EDF0FD;} + .d2-2956067749 .color-AA5{color:#F7F8FE;} + .d2-2956067749 .color-AB4{color:#EDF0FD;} + .d2-2956067749 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2956067749);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2956067749);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2956067749);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2956067749);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2956067749);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2956067749);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2956067749);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2956067749);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2956067749);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2956067749);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2956067749);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2956067749);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2956067749);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2956067749);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2956067749);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2956067749);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2956067749);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2956067749);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>n1n2n3 -n4n5 +n4n5 -n6n7 +n6n7 -n8n9 +n8n9 -n10aba +n10aba -baba +baba -bababab +bababab -abab +abab -a +a -b +b - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/multiple_offset_left/dagre/board.exp.json b/e2etests/testdata/stable/multiple_offset_left/dagre/board.exp.json index 3d6c59d59..92a882415 100644 --- a/e2etests/testdata/stable/multiple_offset_left/dagre/board.exp.json +++ b/e2etests/testdata/stable/multiple_offset_left/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B2", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B2", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -715,6 +740,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -756,6 +782,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -797,6 +824,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -838,6 +866,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -879,6 +908,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -920,6 +950,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -961,6 +992,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1002,6 +1034,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -1043,6 +1076,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -1084,6 +1118,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -1125,6 +1160,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -1166,6 +1202,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -1207,6 +1244,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B2", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -1258,6 +1296,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 203, @@ -1305,6 +1344,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 203, @@ -1352,6 +1392,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 203, @@ -1399,6 +1440,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 203, @@ -1446,6 +1488,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 203, @@ -1493,6 +1536,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 203, @@ -1540,6 +1584,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 203, @@ -1587,6 +1632,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 203, @@ -1634,6 +1680,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 203, @@ -1681,6 +1728,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 203, @@ -1721,6 +1769,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/multiple_offset_left/dagre/sketch.exp.svg b/e2etests/testdata/stable/multiple_offset_left/dagre/sketch.exp.svg index 4fc2ff5e9..70b2a01fe 100644 --- a/e2etests/testdata/stable/multiple_offset_left/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_offset_left/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -n1n2n3 + .d2-1825809757 .fill-N1{fill:#0A0F25;} + .d2-1825809757 .fill-N2{fill:#676C7E;} + .d2-1825809757 .fill-N3{fill:#9499AB;} + .d2-1825809757 .fill-N4{fill:#CFD2DD;} + .d2-1825809757 .fill-N5{fill:#DEE1EB;} + .d2-1825809757 .fill-N6{fill:#EEF1F8;} + .d2-1825809757 .fill-N7{fill:#FFFFFF;} + .d2-1825809757 .fill-B1{fill:#0D32B2;} + .d2-1825809757 .fill-B2{fill:#0D32B2;} + .d2-1825809757 .fill-B3{fill:#E3E9FD;} + .d2-1825809757 .fill-B4{fill:#E3E9FD;} + .d2-1825809757 .fill-B5{fill:#EDF0FD;} + .d2-1825809757 .fill-B6{fill:#F7F8FE;} + .d2-1825809757 .fill-AA2{fill:#4A6FF3;} + .d2-1825809757 .fill-AA4{fill:#EDF0FD;} + .d2-1825809757 .fill-AA5{fill:#F7F8FE;} + .d2-1825809757 .fill-AB4{fill:#EDF0FD;} + .d2-1825809757 .fill-AB5{fill:#F7F8FE;} + .d2-1825809757 .stroke-N1{stroke:#0A0F25;} + .d2-1825809757 .stroke-N2{stroke:#676C7E;} + .d2-1825809757 .stroke-N3{stroke:#9499AB;} + .d2-1825809757 .stroke-N4{stroke:#CFD2DD;} + .d2-1825809757 .stroke-N5{stroke:#DEE1EB;} + .d2-1825809757 .stroke-N6{stroke:#EEF1F8;} + .d2-1825809757 .stroke-N7{stroke:#FFFFFF;} + .d2-1825809757 .stroke-B1{stroke:#0D32B2;} + .d2-1825809757 .stroke-B2{stroke:#0D32B2;} + .d2-1825809757 .stroke-B3{stroke:#E3E9FD;} + .d2-1825809757 .stroke-B4{stroke:#E3E9FD;} + .d2-1825809757 .stroke-B5{stroke:#EDF0FD;} + .d2-1825809757 .stroke-B6{stroke:#F7F8FE;} + .d2-1825809757 .stroke-AA2{stroke:#4A6FF3;} + .d2-1825809757 .stroke-AA4{stroke:#EDF0FD;} + .d2-1825809757 .stroke-AA5{stroke:#F7F8FE;} + .d2-1825809757 .stroke-AB4{stroke:#EDF0FD;} + .d2-1825809757 .stroke-AB5{stroke:#F7F8FE;} + .d2-1825809757 .background-color-N1{background-color:#0A0F25;} + .d2-1825809757 .background-color-N2{background-color:#676C7E;} + .d2-1825809757 .background-color-N3{background-color:#9499AB;} + .d2-1825809757 .background-color-N4{background-color:#CFD2DD;} + .d2-1825809757 .background-color-N5{background-color:#DEE1EB;} + .d2-1825809757 .background-color-N6{background-color:#EEF1F8;} + .d2-1825809757 .background-color-N7{background-color:#FFFFFF;} + .d2-1825809757 .background-color-B1{background-color:#0D32B2;} + .d2-1825809757 .background-color-B2{background-color:#0D32B2;} + .d2-1825809757 .background-color-B3{background-color:#E3E9FD;} + .d2-1825809757 .background-color-B4{background-color:#E3E9FD;} + .d2-1825809757 .background-color-B5{background-color:#EDF0FD;} + .d2-1825809757 .background-color-B6{background-color:#F7F8FE;} + .d2-1825809757 .background-color-AA2{background-color:#4A6FF3;} + .d2-1825809757 .background-color-AA4{background-color:#EDF0FD;} + .d2-1825809757 .background-color-AA5{background-color:#F7F8FE;} + .d2-1825809757 .background-color-AB4{background-color:#EDF0FD;} + .d2-1825809757 .background-color-AB5{background-color:#F7F8FE;} + .d2-1825809757 .color-N1{color:#0A0F25;} + .d2-1825809757 .color-N2{color:#676C7E;} + .d2-1825809757 .color-N3{color:#9499AB;} + .d2-1825809757 .color-N4{color:#CFD2DD;} + .d2-1825809757 .color-N5{color:#DEE1EB;} + .d2-1825809757 .color-N6{color:#EEF1F8;} + .d2-1825809757 .color-N7{color:#FFFFFF;} + .d2-1825809757 .color-B1{color:#0D32B2;} + .d2-1825809757 .color-B2{color:#0D32B2;} + .d2-1825809757 .color-B3{color:#E3E9FD;} + .d2-1825809757 .color-B4{color:#E3E9FD;} + .d2-1825809757 .color-B5{color:#EDF0FD;} + .d2-1825809757 .color-B6{color:#F7F8FE;} + .d2-1825809757 .color-AA2{color:#4A6FF3;} + .d2-1825809757 .color-AA4{color:#EDF0FD;} + .d2-1825809757 .color-AA5{color:#F7F8FE;} + .d2-1825809757 .color-AB4{color:#EDF0FD;} + .d2-1825809757 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1825809757);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1825809757);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1825809757);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1825809757);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1825809757);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1825809757);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1825809757);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1825809757);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1825809757);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1825809757);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1825809757);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1825809757);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1825809757);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1825809757);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1825809757);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1825809757);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1825809757);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1825809757);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>n1n2n3 -n4n5 +n4n5 -n6n7 +n6n7 -n8n9 +n8n9 -n10aba +n10aba -baba +baba -bababab +bababab -abab +abab -a +a -b +b - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/multiple_offset_left/elk/board.exp.json b/e2etests/testdata/stable/multiple_offset_left/elk/board.exp.json index 54075d48a..80ce4d282 100644 --- a/e2etests/testdata/stable/multiple_offset_left/elk/board.exp.json +++ b/e2etests/testdata/stable/multiple_offset_left/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B2", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B2", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -715,6 +740,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -756,6 +782,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -797,6 +824,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -838,6 +866,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -879,6 +908,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -920,6 +950,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -961,6 +992,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1002,6 +1034,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -1043,6 +1076,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -1084,6 +1118,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B2", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -1125,6 +1160,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -1166,6 +1202,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -1207,6 +1244,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B2", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -1258,6 +1296,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 205, @@ -1296,6 +1335,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 207.5, @@ -1334,6 +1374,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 200, @@ -1372,6 +1413,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 200, @@ -1410,6 +1452,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 195, @@ -1448,6 +1491,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 192.5, @@ -1486,6 +1530,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 190, @@ -1524,6 +1569,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 185, @@ -1562,6 +1608,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 195, @@ -1600,6 +1647,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 192.5, @@ -1631,6 +1679,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/multiple_offset_left/elk/sketch.exp.svg b/e2etests/testdata/stable/multiple_offset_left/elk/sketch.exp.svg index 8f6463a22..bbfab5a67 100644 --- a/e2etests/testdata/stable/multiple_offset_left/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_offset_left/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -n1n2n3 + .d2-1207717161 .fill-N1{fill:#0A0F25;} + .d2-1207717161 .fill-N2{fill:#676C7E;} + .d2-1207717161 .fill-N3{fill:#9499AB;} + .d2-1207717161 .fill-N4{fill:#CFD2DD;} + .d2-1207717161 .fill-N5{fill:#DEE1EB;} + .d2-1207717161 .fill-N6{fill:#EEF1F8;} + .d2-1207717161 .fill-N7{fill:#FFFFFF;} + .d2-1207717161 .fill-B1{fill:#0D32B2;} + .d2-1207717161 .fill-B2{fill:#0D32B2;} + .d2-1207717161 .fill-B3{fill:#E3E9FD;} + .d2-1207717161 .fill-B4{fill:#E3E9FD;} + .d2-1207717161 .fill-B5{fill:#EDF0FD;} + .d2-1207717161 .fill-B6{fill:#F7F8FE;} + .d2-1207717161 .fill-AA2{fill:#4A6FF3;} + .d2-1207717161 .fill-AA4{fill:#EDF0FD;} + .d2-1207717161 .fill-AA5{fill:#F7F8FE;} + .d2-1207717161 .fill-AB4{fill:#EDF0FD;} + .d2-1207717161 .fill-AB5{fill:#F7F8FE;} + .d2-1207717161 .stroke-N1{stroke:#0A0F25;} + .d2-1207717161 .stroke-N2{stroke:#676C7E;} + .d2-1207717161 .stroke-N3{stroke:#9499AB;} + .d2-1207717161 .stroke-N4{stroke:#CFD2DD;} + .d2-1207717161 .stroke-N5{stroke:#DEE1EB;} + .d2-1207717161 .stroke-N6{stroke:#EEF1F8;} + .d2-1207717161 .stroke-N7{stroke:#FFFFFF;} + .d2-1207717161 .stroke-B1{stroke:#0D32B2;} + .d2-1207717161 .stroke-B2{stroke:#0D32B2;} + .d2-1207717161 .stroke-B3{stroke:#E3E9FD;} + .d2-1207717161 .stroke-B4{stroke:#E3E9FD;} + .d2-1207717161 .stroke-B5{stroke:#EDF0FD;} + .d2-1207717161 .stroke-B6{stroke:#F7F8FE;} + .d2-1207717161 .stroke-AA2{stroke:#4A6FF3;} + .d2-1207717161 .stroke-AA4{stroke:#EDF0FD;} + .d2-1207717161 .stroke-AA5{stroke:#F7F8FE;} + .d2-1207717161 .stroke-AB4{stroke:#EDF0FD;} + .d2-1207717161 .stroke-AB5{stroke:#F7F8FE;} + .d2-1207717161 .background-color-N1{background-color:#0A0F25;} + .d2-1207717161 .background-color-N2{background-color:#676C7E;} + .d2-1207717161 .background-color-N3{background-color:#9499AB;} + .d2-1207717161 .background-color-N4{background-color:#CFD2DD;} + .d2-1207717161 .background-color-N5{background-color:#DEE1EB;} + .d2-1207717161 .background-color-N6{background-color:#EEF1F8;} + .d2-1207717161 .background-color-N7{background-color:#FFFFFF;} + .d2-1207717161 .background-color-B1{background-color:#0D32B2;} + .d2-1207717161 .background-color-B2{background-color:#0D32B2;} + .d2-1207717161 .background-color-B3{background-color:#E3E9FD;} + .d2-1207717161 .background-color-B4{background-color:#E3E9FD;} + .d2-1207717161 .background-color-B5{background-color:#EDF0FD;} + .d2-1207717161 .background-color-B6{background-color:#F7F8FE;} + .d2-1207717161 .background-color-AA2{background-color:#4A6FF3;} + .d2-1207717161 .background-color-AA4{background-color:#EDF0FD;} + .d2-1207717161 .background-color-AA5{background-color:#F7F8FE;} + .d2-1207717161 .background-color-AB4{background-color:#EDF0FD;} + .d2-1207717161 .background-color-AB5{background-color:#F7F8FE;} + .d2-1207717161 .color-N1{color:#0A0F25;} + .d2-1207717161 .color-N2{color:#676C7E;} + .d2-1207717161 .color-N3{color:#9499AB;} + .d2-1207717161 .color-N4{color:#CFD2DD;} + .d2-1207717161 .color-N5{color:#DEE1EB;} + .d2-1207717161 .color-N6{color:#EEF1F8;} + .d2-1207717161 .color-N7{color:#FFFFFF;} + .d2-1207717161 .color-B1{color:#0D32B2;} + .d2-1207717161 .color-B2{color:#0D32B2;} + .d2-1207717161 .color-B3{color:#E3E9FD;} + .d2-1207717161 .color-B4{color:#E3E9FD;} + .d2-1207717161 .color-B5{color:#EDF0FD;} + .d2-1207717161 .color-B6{color:#F7F8FE;} + .d2-1207717161 .color-AA2{color:#4A6FF3;} + .d2-1207717161 .color-AA4{color:#EDF0FD;} + .d2-1207717161 .color-AA5{color:#F7F8FE;} + .d2-1207717161 .color-AB4{color:#EDF0FD;} + .d2-1207717161 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1207717161);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1207717161);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1207717161);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1207717161);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1207717161);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1207717161);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1207717161);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1207717161);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1207717161);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1207717161);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1207717161);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1207717161);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1207717161);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1207717161);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1207717161);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1207717161);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1207717161);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1207717161);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>n1n2n3 -n4n5 +n4n5 -n6n7 +n6n7 -n8n9 +n8n9 -n10aba +n10aba -baba +baba -bababab +bababab -abab +abab -a +a -b +b - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/multiple_person_label/dagre/board.exp.json b/e2etests/testdata/stable/multiple_person_label/dagre/board.exp.json index 35fb68f2f..d8b5ae8c2 100644 --- a/e2etests/testdata/stable/multiple_person_label/dagre/board.exp.json +++ b/e2etests/testdata/stable/multiple_person_label/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -61,6 +70,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/multiple_person_label/dagre/sketch.exp.svg b/e2etests/testdata/stable/multiple_person_label/dagre/sketch.exp.svg index 71ddf07cd..cc74a4c08 100644 --- a/e2etests/testdata/stable/multiple_person_label/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_person_label/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -あ + .d2-1389951319 .fill-N1{fill:#0A0F25;} + .d2-1389951319 .fill-N2{fill:#676C7E;} + .d2-1389951319 .fill-N3{fill:#9499AB;} + .d2-1389951319 .fill-N4{fill:#CFD2DD;} + .d2-1389951319 .fill-N5{fill:#DEE1EB;} + .d2-1389951319 .fill-N6{fill:#EEF1F8;} + .d2-1389951319 .fill-N7{fill:#FFFFFF;} + .d2-1389951319 .fill-B1{fill:#0D32B2;} + .d2-1389951319 .fill-B2{fill:#0D32B2;} + .d2-1389951319 .fill-B3{fill:#E3E9FD;} + .d2-1389951319 .fill-B4{fill:#E3E9FD;} + .d2-1389951319 .fill-B5{fill:#EDF0FD;} + .d2-1389951319 .fill-B6{fill:#F7F8FE;} + .d2-1389951319 .fill-AA2{fill:#4A6FF3;} + .d2-1389951319 .fill-AA4{fill:#EDF0FD;} + .d2-1389951319 .fill-AA5{fill:#F7F8FE;} + .d2-1389951319 .fill-AB4{fill:#EDF0FD;} + .d2-1389951319 .fill-AB5{fill:#F7F8FE;} + .d2-1389951319 .stroke-N1{stroke:#0A0F25;} + .d2-1389951319 .stroke-N2{stroke:#676C7E;} + .d2-1389951319 .stroke-N3{stroke:#9499AB;} + .d2-1389951319 .stroke-N4{stroke:#CFD2DD;} + .d2-1389951319 .stroke-N5{stroke:#DEE1EB;} + .d2-1389951319 .stroke-N6{stroke:#EEF1F8;} + .d2-1389951319 .stroke-N7{stroke:#FFFFFF;} + .d2-1389951319 .stroke-B1{stroke:#0D32B2;} + .d2-1389951319 .stroke-B2{stroke:#0D32B2;} + .d2-1389951319 .stroke-B3{stroke:#E3E9FD;} + .d2-1389951319 .stroke-B4{stroke:#E3E9FD;} + .d2-1389951319 .stroke-B5{stroke:#EDF0FD;} + .d2-1389951319 .stroke-B6{stroke:#F7F8FE;} + .d2-1389951319 .stroke-AA2{stroke:#4A6FF3;} + .d2-1389951319 .stroke-AA4{stroke:#EDF0FD;} + .d2-1389951319 .stroke-AA5{stroke:#F7F8FE;} + .d2-1389951319 .stroke-AB4{stroke:#EDF0FD;} + .d2-1389951319 .stroke-AB5{stroke:#F7F8FE;} + .d2-1389951319 .background-color-N1{background-color:#0A0F25;} + .d2-1389951319 .background-color-N2{background-color:#676C7E;} + .d2-1389951319 .background-color-N3{background-color:#9499AB;} + .d2-1389951319 .background-color-N4{background-color:#CFD2DD;} + .d2-1389951319 .background-color-N5{background-color:#DEE1EB;} + .d2-1389951319 .background-color-N6{background-color:#EEF1F8;} + .d2-1389951319 .background-color-N7{background-color:#FFFFFF;} + .d2-1389951319 .background-color-B1{background-color:#0D32B2;} + .d2-1389951319 .background-color-B2{background-color:#0D32B2;} + .d2-1389951319 .background-color-B3{background-color:#E3E9FD;} + .d2-1389951319 .background-color-B4{background-color:#E3E9FD;} + .d2-1389951319 .background-color-B5{background-color:#EDF0FD;} + .d2-1389951319 .background-color-B6{background-color:#F7F8FE;} + .d2-1389951319 .background-color-AA2{background-color:#4A6FF3;} + .d2-1389951319 .background-color-AA4{background-color:#EDF0FD;} + .d2-1389951319 .background-color-AA5{background-color:#F7F8FE;} + .d2-1389951319 .background-color-AB4{background-color:#EDF0FD;} + .d2-1389951319 .background-color-AB5{background-color:#F7F8FE;} + .d2-1389951319 .color-N1{color:#0A0F25;} + .d2-1389951319 .color-N2{color:#676C7E;} + .d2-1389951319 .color-N3{color:#9499AB;} + .d2-1389951319 .color-N4{color:#CFD2DD;} + .d2-1389951319 .color-N5{color:#DEE1EB;} + .d2-1389951319 .color-N6{color:#EEF1F8;} + .d2-1389951319 .color-N7{color:#FFFFFF;} + .d2-1389951319 .color-B1{color:#0D32B2;} + .d2-1389951319 .color-B2{color:#0D32B2;} + .d2-1389951319 .color-B3{color:#E3E9FD;} + .d2-1389951319 .color-B4{color:#E3E9FD;} + .d2-1389951319 .color-B5{color:#EDF0FD;} + .d2-1389951319 .color-B6{color:#F7F8FE;} + .d2-1389951319 .color-AA2{color:#4A6FF3;} + .d2-1389951319 .color-AA4{color:#EDF0FD;} + .d2-1389951319 .color-AA5{color:#F7F8FE;} + .d2-1389951319 .color-AB4{color:#EDF0FD;} + .d2-1389951319 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1389951319);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1389951319);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1389951319);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1389951319);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1389951319);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1389951319);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1389951319);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1389951319);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1389951319);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1389951319);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1389951319);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1389951319);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1389951319);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1389951319);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1389951319);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1389951319);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1389951319);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1389951319);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>あ - + \ No newline at end of file diff --git a/e2etests/testdata/stable/multiple_person_label/elk/board.exp.json b/e2etests/testdata/stable/multiple_person_label/elk/board.exp.json index 6e11b66cb..fc2028c33 100644 --- a/e2etests/testdata/stable/multiple_person_label/elk/board.exp.json +++ b/e2etests/testdata/stable/multiple_person_label/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -61,6 +70,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/multiple_person_label/elk/sketch.exp.svg b/e2etests/testdata/stable/multiple_person_label/elk/sketch.exp.svg index 6fe32ab1a..ef269e2f1 100644 --- a/e2etests/testdata/stable/multiple_person_label/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_person_label/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -あ + .d2-3688633770 .fill-N1{fill:#0A0F25;} + .d2-3688633770 .fill-N2{fill:#676C7E;} + .d2-3688633770 .fill-N3{fill:#9499AB;} + .d2-3688633770 .fill-N4{fill:#CFD2DD;} + .d2-3688633770 .fill-N5{fill:#DEE1EB;} + .d2-3688633770 .fill-N6{fill:#EEF1F8;} + .d2-3688633770 .fill-N7{fill:#FFFFFF;} + .d2-3688633770 .fill-B1{fill:#0D32B2;} + .d2-3688633770 .fill-B2{fill:#0D32B2;} + .d2-3688633770 .fill-B3{fill:#E3E9FD;} + .d2-3688633770 .fill-B4{fill:#E3E9FD;} + .d2-3688633770 .fill-B5{fill:#EDF0FD;} + .d2-3688633770 .fill-B6{fill:#F7F8FE;} + .d2-3688633770 .fill-AA2{fill:#4A6FF3;} + .d2-3688633770 .fill-AA4{fill:#EDF0FD;} + .d2-3688633770 .fill-AA5{fill:#F7F8FE;} + .d2-3688633770 .fill-AB4{fill:#EDF0FD;} + .d2-3688633770 .fill-AB5{fill:#F7F8FE;} + .d2-3688633770 .stroke-N1{stroke:#0A0F25;} + .d2-3688633770 .stroke-N2{stroke:#676C7E;} + .d2-3688633770 .stroke-N3{stroke:#9499AB;} + .d2-3688633770 .stroke-N4{stroke:#CFD2DD;} + .d2-3688633770 .stroke-N5{stroke:#DEE1EB;} + .d2-3688633770 .stroke-N6{stroke:#EEF1F8;} + .d2-3688633770 .stroke-N7{stroke:#FFFFFF;} + .d2-3688633770 .stroke-B1{stroke:#0D32B2;} + .d2-3688633770 .stroke-B2{stroke:#0D32B2;} + .d2-3688633770 .stroke-B3{stroke:#E3E9FD;} + .d2-3688633770 .stroke-B4{stroke:#E3E9FD;} + .d2-3688633770 .stroke-B5{stroke:#EDF0FD;} + .d2-3688633770 .stroke-B6{stroke:#F7F8FE;} + .d2-3688633770 .stroke-AA2{stroke:#4A6FF3;} + .d2-3688633770 .stroke-AA4{stroke:#EDF0FD;} + .d2-3688633770 .stroke-AA5{stroke:#F7F8FE;} + .d2-3688633770 .stroke-AB4{stroke:#EDF0FD;} + .d2-3688633770 .stroke-AB5{stroke:#F7F8FE;} + .d2-3688633770 .background-color-N1{background-color:#0A0F25;} + .d2-3688633770 .background-color-N2{background-color:#676C7E;} + .d2-3688633770 .background-color-N3{background-color:#9499AB;} + .d2-3688633770 .background-color-N4{background-color:#CFD2DD;} + .d2-3688633770 .background-color-N5{background-color:#DEE1EB;} + .d2-3688633770 .background-color-N6{background-color:#EEF1F8;} + .d2-3688633770 .background-color-N7{background-color:#FFFFFF;} + .d2-3688633770 .background-color-B1{background-color:#0D32B2;} + .d2-3688633770 .background-color-B2{background-color:#0D32B2;} + .d2-3688633770 .background-color-B3{background-color:#E3E9FD;} + .d2-3688633770 .background-color-B4{background-color:#E3E9FD;} + .d2-3688633770 .background-color-B5{background-color:#EDF0FD;} + .d2-3688633770 .background-color-B6{background-color:#F7F8FE;} + .d2-3688633770 .background-color-AA2{background-color:#4A6FF3;} + .d2-3688633770 .background-color-AA4{background-color:#EDF0FD;} + .d2-3688633770 .background-color-AA5{background-color:#F7F8FE;} + .d2-3688633770 .background-color-AB4{background-color:#EDF0FD;} + .d2-3688633770 .background-color-AB5{background-color:#F7F8FE;} + .d2-3688633770 .color-N1{color:#0A0F25;} + .d2-3688633770 .color-N2{color:#676C7E;} + .d2-3688633770 .color-N3{color:#9499AB;} + .d2-3688633770 .color-N4{color:#CFD2DD;} + .d2-3688633770 .color-N5{color:#DEE1EB;} + .d2-3688633770 .color-N6{color:#EEF1F8;} + .d2-3688633770 .color-N7{color:#FFFFFF;} + .d2-3688633770 .color-B1{color:#0D32B2;} + .d2-3688633770 .color-B2{color:#0D32B2;} + .d2-3688633770 .color-B3{color:#E3E9FD;} + .d2-3688633770 .color-B4{color:#E3E9FD;} + .d2-3688633770 .color-B5{color:#EDF0FD;} + .d2-3688633770 .color-B6{color:#F7F8FE;} + .d2-3688633770 .color-AA2{color:#4A6FF3;} + .d2-3688633770 .color-AA4{color:#EDF0FD;} + .d2-3688633770 .color-AA5{color:#F7F8FE;} + .d2-3688633770 .color-AB4{color:#EDF0FD;} + .d2-3688633770 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3688633770);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3688633770);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3688633770);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3688633770);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3688633770);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3688633770);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3688633770);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3688633770);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3688633770);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3688633770);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3688633770);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3688633770);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3688633770);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3688633770);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3688633770);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3688633770);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3688633770);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3688633770);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>あ - + \ No newline at end of file diff --git a/e2etests/testdata/stable/multiple_trees/dagre/board.exp.json b/e2etests/testdata/stable/multiple_trees/dagre/board.exp.json index 2140eaba0..33aeb09d5 100644 --- a/e2etests/testdata/stable/multiple_trees/dagre/board.exp.json +++ b/e2etests/testdata/stable/multiple_trees/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -715,6 +740,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -756,6 +782,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -797,6 +824,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -838,6 +866,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -879,6 +908,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -920,6 +950,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -971,6 +1002,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 514.75, @@ -1018,6 +1050,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 514.75, @@ -1065,6 +1098,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 515.5, @@ -1112,6 +1146,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 568, @@ -1159,6 +1194,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 567.5, @@ -1206,6 +1242,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 541.5, @@ -1253,6 +1290,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 567.5, @@ -1300,6 +1338,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 24.75, @@ -1347,6 +1386,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 134.25, @@ -1394,6 +1434,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 486, @@ -1441,6 +1482,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 597, @@ -1488,6 +1530,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 178.25, @@ -1535,6 +1578,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 223.25, @@ -1582,6 +1626,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 405.75, @@ -1629,6 +1674,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 451.25, @@ -1676,6 +1722,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 632.75, @@ -1723,6 +1770,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 677.25, @@ -1770,6 +1818,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 485.25, @@ -1817,6 +1866,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 856.25, @@ -1864,6 +1914,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 900.75, @@ -1911,6 +1962,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 964.5, @@ -1958,6 +2010,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1080.5, @@ -1998,6 +2051,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/multiple_trees/dagre/sketch.exp.svg b/e2etests/testdata/stable/multiple_trees/dagre/sketch.exp.svg index 5e8074f20..fea75cb19 100644 --- a/e2etests/testdata/stable/multiple_trees/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_trees/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdefghijklmnopqrstuvw + .d2-3476439640 .fill-N1{fill:#0A0F25;} + .d2-3476439640 .fill-N2{fill:#676C7E;} + .d2-3476439640 .fill-N3{fill:#9499AB;} + .d2-3476439640 .fill-N4{fill:#CFD2DD;} + .d2-3476439640 .fill-N5{fill:#DEE1EB;} + .d2-3476439640 .fill-N6{fill:#EEF1F8;} + .d2-3476439640 .fill-N7{fill:#FFFFFF;} + .d2-3476439640 .fill-B1{fill:#0D32B2;} + .d2-3476439640 .fill-B2{fill:#0D32B2;} + .d2-3476439640 .fill-B3{fill:#E3E9FD;} + .d2-3476439640 .fill-B4{fill:#E3E9FD;} + .d2-3476439640 .fill-B5{fill:#EDF0FD;} + .d2-3476439640 .fill-B6{fill:#F7F8FE;} + .d2-3476439640 .fill-AA2{fill:#4A6FF3;} + .d2-3476439640 .fill-AA4{fill:#EDF0FD;} + .d2-3476439640 .fill-AA5{fill:#F7F8FE;} + .d2-3476439640 .fill-AB4{fill:#EDF0FD;} + .d2-3476439640 .fill-AB5{fill:#F7F8FE;} + .d2-3476439640 .stroke-N1{stroke:#0A0F25;} + .d2-3476439640 .stroke-N2{stroke:#676C7E;} + .d2-3476439640 .stroke-N3{stroke:#9499AB;} + .d2-3476439640 .stroke-N4{stroke:#CFD2DD;} + .d2-3476439640 .stroke-N5{stroke:#DEE1EB;} + .d2-3476439640 .stroke-N6{stroke:#EEF1F8;} + .d2-3476439640 .stroke-N7{stroke:#FFFFFF;} + .d2-3476439640 .stroke-B1{stroke:#0D32B2;} + .d2-3476439640 .stroke-B2{stroke:#0D32B2;} + .d2-3476439640 .stroke-B3{stroke:#E3E9FD;} + .d2-3476439640 .stroke-B4{stroke:#E3E9FD;} + .d2-3476439640 .stroke-B5{stroke:#EDF0FD;} + .d2-3476439640 .stroke-B6{stroke:#F7F8FE;} + .d2-3476439640 .stroke-AA2{stroke:#4A6FF3;} + .d2-3476439640 .stroke-AA4{stroke:#EDF0FD;} + .d2-3476439640 .stroke-AA5{stroke:#F7F8FE;} + .d2-3476439640 .stroke-AB4{stroke:#EDF0FD;} + .d2-3476439640 .stroke-AB5{stroke:#F7F8FE;} + .d2-3476439640 .background-color-N1{background-color:#0A0F25;} + .d2-3476439640 .background-color-N2{background-color:#676C7E;} + .d2-3476439640 .background-color-N3{background-color:#9499AB;} + .d2-3476439640 .background-color-N4{background-color:#CFD2DD;} + .d2-3476439640 .background-color-N5{background-color:#DEE1EB;} + .d2-3476439640 .background-color-N6{background-color:#EEF1F8;} + .d2-3476439640 .background-color-N7{background-color:#FFFFFF;} + .d2-3476439640 .background-color-B1{background-color:#0D32B2;} + .d2-3476439640 .background-color-B2{background-color:#0D32B2;} + .d2-3476439640 .background-color-B3{background-color:#E3E9FD;} + .d2-3476439640 .background-color-B4{background-color:#E3E9FD;} + .d2-3476439640 .background-color-B5{background-color:#EDF0FD;} + .d2-3476439640 .background-color-B6{background-color:#F7F8FE;} + .d2-3476439640 .background-color-AA2{background-color:#4A6FF3;} + .d2-3476439640 .background-color-AA4{background-color:#EDF0FD;} + .d2-3476439640 .background-color-AA5{background-color:#F7F8FE;} + .d2-3476439640 .background-color-AB4{background-color:#EDF0FD;} + .d2-3476439640 .background-color-AB5{background-color:#F7F8FE;} + .d2-3476439640 .color-N1{color:#0A0F25;} + .d2-3476439640 .color-N2{color:#676C7E;} + .d2-3476439640 .color-N3{color:#9499AB;} + .d2-3476439640 .color-N4{color:#CFD2DD;} + .d2-3476439640 .color-N5{color:#DEE1EB;} + .d2-3476439640 .color-N6{color:#EEF1F8;} + .d2-3476439640 .color-N7{color:#FFFFFF;} + .d2-3476439640 .color-B1{color:#0D32B2;} + .d2-3476439640 .color-B2{color:#0D32B2;} + .d2-3476439640 .color-B3{color:#E3E9FD;} + .d2-3476439640 .color-B4{color:#E3E9FD;} + .d2-3476439640 .color-B5{color:#EDF0FD;} + .d2-3476439640 .color-B6{color:#F7F8FE;} + .d2-3476439640 .color-AA2{color:#4A6FF3;} + .d2-3476439640 .color-AA4{color:#EDF0FD;} + .d2-3476439640 .color-AA5{color:#F7F8FE;} + .d2-3476439640 .color-AB4{color:#EDF0FD;} + .d2-3476439640 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3476439640);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3476439640);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3476439640);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3476439640);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3476439640);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3476439640);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3476439640);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3476439640);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3476439640);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3476439640);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3476439640);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3476439640);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3476439640);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3476439640);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3476439640);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3476439640);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3476439640);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3476439640);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdefghijklmnopqrstuvw - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/multiple_trees/elk/board.exp.json b/e2etests/testdata/stable/multiple_trees/elk/board.exp.json index 06d7589dc..07a47e638 100644 --- a/e2etests/testdata/stable/multiple_trees/elk/board.exp.json +++ b/e2etests/testdata/stable/multiple_trees/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -715,6 +740,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -756,6 +782,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -797,6 +824,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -838,6 +866,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -879,6 +908,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -920,6 +950,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -971,6 +1002,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 344.2850036621094, @@ -1017,6 +1049,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 378.5710144042969, @@ -1063,6 +1096,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 412.85699462890625, @@ -1109,6 +1143,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 447.1419982910156, @@ -1155,6 +1190,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 481.4280090332031, @@ -1201,6 +1237,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 430, @@ -1239,6 +1276,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 515.7139892578125, @@ -1285,6 +1323,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 106.5, @@ -1331,6 +1370,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 37, @@ -1377,6 +1417,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 465.5, @@ -1423,6 +1464,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 394.5, @@ -1469,6 +1511,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 195.91600036621094, @@ -1515,6 +1558,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 222.58299255371094, @@ -1561,6 +1605,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 343.6659851074219, @@ -1607,6 +1652,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 370.3330078125, @@ -1653,6 +1699,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 490.1659851074219, @@ -1699,6 +1746,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 516.8330078125, @@ -1745,6 +1793,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 393.75, @@ -1783,6 +1832,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 633.666015625, @@ -1829,6 +1879,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 660.3330078125, @@ -1875,6 +1926,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 744.5, @@ -1921,6 +1973,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 820.5, @@ -1960,6 +2013,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/multiple_trees/elk/sketch.exp.svg b/e2etests/testdata/stable/multiple_trees/elk/sketch.exp.svg index ac43a4503..fde8dad92 100644 --- a/e2etests/testdata/stable/multiple_trees/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_trees/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdefghijklmnopqrstuvw + .d2-3817465703 .fill-N1{fill:#0A0F25;} + .d2-3817465703 .fill-N2{fill:#676C7E;} + .d2-3817465703 .fill-N3{fill:#9499AB;} + .d2-3817465703 .fill-N4{fill:#CFD2DD;} + .d2-3817465703 .fill-N5{fill:#DEE1EB;} + .d2-3817465703 .fill-N6{fill:#EEF1F8;} + .d2-3817465703 .fill-N7{fill:#FFFFFF;} + .d2-3817465703 .fill-B1{fill:#0D32B2;} + .d2-3817465703 .fill-B2{fill:#0D32B2;} + .d2-3817465703 .fill-B3{fill:#E3E9FD;} + .d2-3817465703 .fill-B4{fill:#E3E9FD;} + .d2-3817465703 .fill-B5{fill:#EDF0FD;} + .d2-3817465703 .fill-B6{fill:#F7F8FE;} + .d2-3817465703 .fill-AA2{fill:#4A6FF3;} + .d2-3817465703 .fill-AA4{fill:#EDF0FD;} + .d2-3817465703 .fill-AA5{fill:#F7F8FE;} + .d2-3817465703 .fill-AB4{fill:#EDF0FD;} + .d2-3817465703 .fill-AB5{fill:#F7F8FE;} + .d2-3817465703 .stroke-N1{stroke:#0A0F25;} + .d2-3817465703 .stroke-N2{stroke:#676C7E;} + .d2-3817465703 .stroke-N3{stroke:#9499AB;} + .d2-3817465703 .stroke-N4{stroke:#CFD2DD;} + .d2-3817465703 .stroke-N5{stroke:#DEE1EB;} + .d2-3817465703 .stroke-N6{stroke:#EEF1F8;} + .d2-3817465703 .stroke-N7{stroke:#FFFFFF;} + .d2-3817465703 .stroke-B1{stroke:#0D32B2;} + .d2-3817465703 .stroke-B2{stroke:#0D32B2;} + .d2-3817465703 .stroke-B3{stroke:#E3E9FD;} + .d2-3817465703 .stroke-B4{stroke:#E3E9FD;} + .d2-3817465703 .stroke-B5{stroke:#EDF0FD;} + .d2-3817465703 .stroke-B6{stroke:#F7F8FE;} + .d2-3817465703 .stroke-AA2{stroke:#4A6FF3;} + .d2-3817465703 .stroke-AA4{stroke:#EDF0FD;} + .d2-3817465703 .stroke-AA5{stroke:#F7F8FE;} + .d2-3817465703 .stroke-AB4{stroke:#EDF0FD;} + .d2-3817465703 .stroke-AB5{stroke:#F7F8FE;} + .d2-3817465703 .background-color-N1{background-color:#0A0F25;} + .d2-3817465703 .background-color-N2{background-color:#676C7E;} + .d2-3817465703 .background-color-N3{background-color:#9499AB;} + .d2-3817465703 .background-color-N4{background-color:#CFD2DD;} + .d2-3817465703 .background-color-N5{background-color:#DEE1EB;} + .d2-3817465703 .background-color-N6{background-color:#EEF1F8;} + .d2-3817465703 .background-color-N7{background-color:#FFFFFF;} + .d2-3817465703 .background-color-B1{background-color:#0D32B2;} + .d2-3817465703 .background-color-B2{background-color:#0D32B2;} + .d2-3817465703 .background-color-B3{background-color:#E3E9FD;} + .d2-3817465703 .background-color-B4{background-color:#E3E9FD;} + .d2-3817465703 .background-color-B5{background-color:#EDF0FD;} + .d2-3817465703 .background-color-B6{background-color:#F7F8FE;} + .d2-3817465703 .background-color-AA2{background-color:#4A6FF3;} + .d2-3817465703 .background-color-AA4{background-color:#EDF0FD;} + .d2-3817465703 .background-color-AA5{background-color:#F7F8FE;} + .d2-3817465703 .background-color-AB4{background-color:#EDF0FD;} + .d2-3817465703 .background-color-AB5{background-color:#F7F8FE;} + .d2-3817465703 .color-N1{color:#0A0F25;} + .d2-3817465703 .color-N2{color:#676C7E;} + .d2-3817465703 .color-N3{color:#9499AB;} + .d2-3817465703 .color-N4{color:#CFD2DD;} + .d2-3817465703 .color-N5{color:#DEE1EB;} + .d2-3817465703 .color-N6{color:#EEF1F8;} + .d2-3817465703 .color-N7{color:#FFFFFF;} + .d2-3817465703 .color-B1{color:#0D32B2;} + .d2-3817465703 .color-B2{color:#0D32B2;} + .d2-3817465703 .color-B3{color:#E3E9FD;} + .d2-3817465703 .color-B4{color:#E3E9FD;} + .d2-3817465703 .color-B5{color:#EDF0FD;} + .d2-3817465703 .color-B6{color:#F7F8FE;} + .d2-3817465703 .color-AA2{color:#4A6FF3;} + .d2-3817465703 .color-AA4{color:#EDF0FD;} + .d2-3817465703 .color-AA5{color:#F7F8FE;} + .d2-3817465703 .color-AB4{color:#EDF0FD;} + .d2-3817465703 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3817465703);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3817465703);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3817465703);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3817465703);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3817465703);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3817465703);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3817465703);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3817465703);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3817465703);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3817465703);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3817465703);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3817465703);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3817465703);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3817465703);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3817465703);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3817465703);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3817465703);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3817465703);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdefghijklmnopqrstuvw - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/n22_e32/dagre/board.exp.json b/e2etests/testdata/stable/n22_e32/dagre/board.exp.json index 82cc56b50..e3e87a4fd 100644 --- a/e2etests/testdata/stable/n22_e32/dagre/board.exp.json +++ b/e2etests/testdata/stable/n22_e32/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -715,6 +740,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -756,6 +782,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -797,6 +824,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -838,6 +866,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -889,6 +918,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 259.25, @@ -948,6 +978,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 279, @@ -1031,6 +1062,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 189.25, @@ -1078,6 +1110,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 162.25, @@ -1161,6 +1194,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 139.5, @@ -1208,6 +1242,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 68.75, @@ -1255,6 +1290,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 25.5, @@ -1302,6 +1338,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 252.5, @@ -1409,6 +1446,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 186, @@ -1468,6 +1506,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 131.75, @@ -1515,6 +1554,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 48.75, @@ -1562,6 +1602,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 48.75, @@ -1609,6 +1650,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 48.75, @@ -1656,6 +1698,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 48.75, @@ -1703,6 +1746,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 23.75, @@ -1786,6 +1830,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 631.5, @@ -1845,6 +1890,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 603.5, @@ -1892,6 +1938,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 590.25, @@ -1939,6 +1986,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 574, @@ -2022,6 +2070,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 556.5, @@ -2069,6 +2118,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 500, @@ -2116,6 +2166,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 456.75, @@ -2163,6 +2214,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 552, @@ -2222,6 +2274,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 551.5, @@ -2329,6 +2382,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 507.25, @@ -2376,6 +2430,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 403.25, @@ -2423,6 +2478,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 425, @@ -2470,6 +2526,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 380, @@ -2517,6 +2574,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 372.5, @@ -2564,6 +2622,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 407, @@ -2647,6 +2706,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 296.5, @@ -2694,6 +2754,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 377, @@ -2777,6 +2838,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 319.5, @@ -2817,6 +2879,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/n22_e32/dagre/sketch.exp.svg b/e2etests/testdata/stable/n22_e32/dagre/sketch.exp.svg index 8cad65d97..6080ae7c5 100644 --- a/e2etests/testdata/stable/n22_e32/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/n22_e32/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdefghijklmnopqrstu + .d2-695461815 .fill-N1{fill:#0A0F25;} + .d2-695461815 .fill-N2{fill:#676C7E;} + .d2-695461815 .fill-N3{fill:#9499AB;} + .d2-695461815 .fill-N4{fill:#CFD2DD;} + .d2-695461815 .fill-N5{fill:#DEE1EB;} + .d2-695461815 .fill-N6{fill:#EEF1F8;} + .d2-695461815 .fill-N7{fill:#FFFFFF;} + .d2-695461815 .fill-B1{fill:#0D32B2;} + .d2-695461815 .fill-B2{fill:#0D32B2;} + .d2-695461815 .fill-B3{fill:#E3E9FD;} + .d2-695461815 .fill-B4{fill:#E3E9FD;} + .d2-695461815 .fill-B5{fill:#EDF0FD;} + .d2-695461815 .fill-B6{fill:#F7F8FE;} + .d2-695461815 .fill-AA2{fill:#4A6FF3;} + .d2-695461815 .fill-AA4{fill:#EDF0FD;} + .d2-695461815 .fill-AA5{fill:#F7F8FE;} + .d2-695461815 .fill-AB4{fill:#EDF0FD;} + .d2-695461815 .fill-AB5{fill:#F7F8FE;} + .d2-695461815 .stroke-N1{stroke:#0A0F25;} + .d2-695461815 .stroke-N2{stroke:#676C7E;} + .d2-695461815 .stroke-N3{stroke:#9499AB;} + .d2-695461815 .stroke-N4{stroke:#CFD2DD;} + .d2-695461815 .stroke-N5{stroke:#DEE1EB;} + .d2-695461815 .stroke-N6{stroke:#EEF1F8;} + .d2-695461815 .stroke-N7{stroke:#FFFFFF;} + .d2-695461815 .stroke-B1{stroke:#0D32B2;} + .d2-695461815 .stroke-B2{stroke:#0D32B2;} + .d2-695461815 .stroke-B3{stroke:#E3E9FD;} + .d2-695461815 .stroke-B4{stroke:#E3E9FD;} + .d2-695461815 .stroke-B5{stroke:#EDF0FD;} + .d2-695461815 .stroke-B6{stroke:#F7F8FE;} + .d2-695461815 .stroke-AA2{stroke:#4A6FF3;} + .d2-695461815 .stroke-AA4{stroke:#EDF0FD;} + .d2-695461815 .stroke-AA5{stroke:#F7F8FE;} + .d2-695461815 .stroke-AB4{stroke:#EDF0FD;} + .d2-695461815 .stroke-AB5{stroke:#F7F8FE;} + .d2-695461815 .background-color-N1{background-color:#0A0F25;} + .d2-695461815 .background-color-N2{background-color:#676C7E;} + .d2-695461815 .background-color-N3{background-color:#9499AB;} + .d2-695461815 .background-color-N4{background-color:#CFD2DD;} + .d2-695461815 .background-color-N5{background-color:#DEE1EB;} + .d2-695461815 .background-color-N6{background-color:#EEF1F8;} + .d2-695461815 .background-color-N7{background-color:#FFFFFF;} + .d2-695461815 .background-color-B1{background-color:#0D32B2;} + .d2-695461815 .background-color-B2{background-color:#0D32B2;} + .d2-695461815 .background-color-B3{background-color:#E3E9FD;} + .d2-695461815 .background-color-B4{background-color:#E3E9FD;} + .d2-695461815 .background-color-B5{background-color:#EDF0FD;} + .d2-695461815 .background-color-B6{background-color:#F7F8FE;} + .d2-695461815 .background-color-AA2{background-color:#4A6FF3;} + .d2-695461815 .background-color-AA4{background-color:#EDF0FD;} + .d2-695461815 .background-color-AA5{background-color:#F7F8FE;} + .d2-695461815 .background-color-AB4{background-color:#EDF0FD;} + .d2-695461815 .background-color-AB5{background-color:#F7F8FE;} + .d2-695461815 .color-N1{color:#0A0F25;} + .d2-695461815 .color-N2{color:#676C7E;} + .d2-695461815 .color-N3{color:#9499AB;} + .d2-695461815 .color-N4{color:#CFD2DD;} + .d2-695461815 .color-N5{color:#DEE1EB;} + .d2-695461815 .color-N6{color:#EEF1F8;} + .d2-695461815 .color-N7{color:#FFFFFF;} + .d2-695461815 .color-B1{color:#0D32B2;} + .d2-695461815 .color-B2{color:#0D32B2;} + .d2-695461815 .color-B3{color:#E3E9FD;} + .d2-695461815 .color-B4{color:#E3E9FD;} + .d2-695461815 .color-B5{color:#EDF0FD;} + .d2-695461815 .color-B6{color:#F7F8FE;} + .d2-695461815 .color-AA2{color:#4A6FF3;} + .d2-695461815 .color-AA4{color:#EDF0FD;} + .d2-695461815 .color-AA5{color:#F7F8FE;} + .d2-695461815 .color-AB4{color:#EDF0FD;} + .d2-695461815 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-695461815);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-695461815);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-695461815);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-695461815);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-695461815);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-695461815);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-695461815);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-695461815);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-695461815);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-695461815);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-695461815);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-695461815);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-695461815);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-695461815);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-695461815);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-695461815);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-695461815);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-695461815);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdefghijklmnopqrstu - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/n22_e32/elk/board.exp.json b/e2etests/testdata/stable/n22_e32/elk/board.exp.json index fdd25bc6b..200e474b5 100644 --- a/e2etests/testdata/stable/n22_e32/elk/board.exp.json +++ b/e2etests/testdata/stable/n22_e32/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -715,6 +740,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -756,6 +782,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -797,6 +824,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -838,6 +866,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -889,6 +918,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 493.3330078125, @@ -935,6 +965,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 524.3330078125, @@ -981,6 +1012,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 583.3330078125, @@ -1027,6 +1059,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 613.3330078125, @@ -1065,6 +1098,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 643.3330078125, @@ -1111,6 +1145,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 706.5, @@ -1157,6 +1192,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 786.4990234375, @@ -1203,6 +1239,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 554.3330078125, @@ -1249,6 +1286,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 685.0830078125, @@ -1295,6 +1333,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 711.75, @@ -1341,6 +1380,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 867.4990234375, @@ -1379,6 +1419,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 867.4990234375, @@ -1417,6 +1458,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 854.166015625, @@ -1463,6 +1505,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 719.8330078125, @@ -1501,6 +1544,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 880.8330078125, @@ -1547,6 +1591,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 52, @@ -1593,6 +1638,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 38.66600036621094, @@ -1631,6 +1677,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 65.33300018310547, @@ -1669,6 +1716,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 122, @@ -1715,6 +1763,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 188.66600036621094, @@ -1761,6 +1810,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 233, @@ -1799,6 +1849,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 233, @@ -1845,6 +1896,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 150.83299255371094, @@ -1891,6 +1943,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 243.99899291992188, @@ -1937,6 +1990,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 270.6659851074219, @@ -1983,6 +2037,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 380, @@ -2021,6 +2076,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 366.6659851074219, @@ -2067,6 +2123,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 368.4989929199219, @@ -2105,6 +2162,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 383.9989929199219, @@ -2151,6 +2209,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 341.8330078125, @@ -2205,6 +2264,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 494.3330078125, @@ -2251,6 +2311,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 393.3330078125, @@ -2297,6 +2358,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 410.6659851074219, @@ -2336,6 +2398,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/n22_e32/elk/sketch.exp.svg b/e2etests/testdata/stable/n22_e32/elk/sketch.exp.svg index ef298cb4d..bc46eea52 100644 --- a/e2etests/testdata/stable/n22_e32/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/n22_e32/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abcdefghijklmnopqrstu + .d2-2914178136 .fill-N1{fill:#0A0F25;} + .d2-2914178136 .fill-N2{fill:#676C7E;} + .d2-2914178136 .fill-N3{fill:#9499AB;} + .d2-2914178136 .fill-N4{fill:#CFD2DD;} + .d2-2914178136 .fill-N5{fill:#DEE1EB;} + .d2-2914178136 .fill-N6{fill:#EEF1F8;} + .d2-2914178136 .fill-N7{fill:#FFFFFF;} + .d2-2914178136 .fill-B1{fill:#0D32B2;} + .d2-2914178136 .fill-B2{fill:#0D32B2;} + .d2-2914178136 .fill-B3{fill:#E3E9FD;} + .d2-2914178136 .fill-B4{fill:#E3E9FD;} + .d2-2914178136 .fill-B5{fill:#EDF0FD;} + .d2-2914178136 .fill-B6{fill:#F7F8FE;} + .d2-2914178136 .fill-AA2{fill:#4A6FF3;} + .d2-2914178136 .fill-AA4{fill:#EDF0FD;} + .d2-2914178136 .fill-AA5{fill:#F7F8FE;} + .d2-2914178136 .fill-AB4{fill:#EDF0FD;} + .d2-2914178136 .fill-AB5{fill:#F7F8FE;} + .d2-2914178136 .stroke-N1{stroke:#0A0F25;} + .d2-2914178136 .stroke-N2{stroke:#676C7E;} + .d2-2914178136 .stroke-N3{stroke:#9499AB;} + .d2-2914178136 .stroke-N4{stroke:#CFD2DD;} + .d2-2914178136 .stroke-N5{stroke:#DEE1EB;} + .d2-2914178136 .stroke-N6{stroke:#EEF1F8;} + .d2-2914178136 .stroke-N7{stroke:#FFFFFF;} + .d2-2914178136 .stroke-B1{stroke:#0D32B2;} + .d2-2914178136 .stroke-B2{stroke:#0D32B2;} + .d2-2914178136 .stroke-B3{stroke:#E3E9FD;} + .d2-2914178136 .stroke-B4{stroke:#E3E9FD;} + .d2-2914178136 .stroke-B5{stroke:#EDF0FD;} + .d2-2914178136 .stroke-B6{stroke:#F7F8FE;} + .d2-2914178136 .stroke-AA2{stroke:#4A6FF3;} + .d2-2914178136 .stroke-AA4{stroke:#EDF0FD;} + .d2-2914178136 .stroke-AA5{stroke:#F7F8FE;} + .d2-2914178136 .stroke-AB4{stroke:#EDF0FD;} + .d2-2914178136 .stroke-AB5{stroke:#F7F8FE;} + .d2-2914178136 .background-color-N1{background-color:#0A0F25;} + .d2-2914178136 .background-color-N2{background-color:#676C7E;} + .d2-2914178136 .background-color-N3{background-color:#9499AB;} + .d2-2914178136 .background-color-N4{background-color:#CFD2DD;} + .d2-2914178136 .background-color-N5{background-color:#DEE1EB;} + .d2-2914178136 .background-color-N6{background-color:#EEF1F8;} + .d2-2914178136 .background-color-N7{background-color:#FFFFFF;} + .d2-2914178136 .background-color-B1{background-color:#0D32B2;} + .d2-2914178136 .background-color-B2{background-color:#0D32B2;} + .d2-2914178136 .background-color-B3{background-color:#E3E9FD;} + .d2-2914178136 .background-color-B4{background-color:#E3E9FD;} + .d2-2914178136 .background-color-B5{background-color:#EDF0FD;} + .d2-2914178136 .background-color-B6{background-color:#F7F8FE;} + .d2-2914178136 .background-color-AA2{background-color:#4A6FF3;} + .d2-2914178136 .background-color-AA4{background-color:#EDF0FD;} + .d2-2914178136 .background-color-AA5{background-color:#F7F8FE;} + .d2-2914178136 .background-color-AB4{background-color:#EDF0FD;} + .d2-2914178136 .background-color-AB5{background-color:#F7F8FE;} + .d2-2914178136 .color-N1{color:#0A0F25;} + .d2-2914178136 .color-N2{color:#676C7E;} + .d2-2914178136 .color-N3{color:#9499AB;} + .d2-2914178136 .color-N4{color:#CFD2DD;} + .d2-2914178136 .color-N5{color:#DEE1EB;} + .d2-2914178136 .color-N6{color:#EEF1F8;} + .d2-2914178136 .color-N7{color:#FFFFFF;} + .d2-2914178136 .color-B1{color:#0D32B2;} + .d2-2914178136 .color-B2{color:#0D32B2;} + .d2-2914178136 .color-B3{color:#E3E9FD;} + .d2-2914178136 .color-B4{color:#E3E9FD;} + .d2-2914178136 .color-B5{color:#EDF0FD;} + .d2-2914178136 .color-B6{color:#F7F8FE;} + .d2-2914178136 .color-AA2{color:#4A6FF3;} + .d2-2914178136 .color-AA4{color:#EDF0FD;} + .d2-2914178136 .color-AA5{color:#F7F8FE;} + .d2-2914178136 .color-AB4{color:#EDF0FD;} + .d2-2914178136 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2914178136);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2914178136);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2914178136);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2914178136);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2914178136);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2914178136);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2914178136);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2914178136);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2914178136);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2914178136);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2914178136);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2914178136);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2914178136);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2914178136);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2914178136);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2914178136);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2914178136);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2914178136);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdefghijklmnopqrstu - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/near-alone/dagre/board.exp.json b/e2etests/testdata/stable/near-alone/dagre/board.exp.json index 52ab93dbc..52b59fcbf 100644 --- a/e2etests/testdata/stable/near-alone/dagre/board.exp.json +++ b/e2etests/testdata/stable/near-alone/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -143,6 +154,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/near-alone/dagre/sketch.exp.svg b/e2etests/testdata/stable/near-alone/dagre/sketch.exp.svg index 3d894043c..6c1f727b5 100644 --- a/e2etests/testdata/stable/near-alone/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/near-alone/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -xyz + .d2-1475290061 .fill-N1{fill:#0A0F25;} + .d2-1475290061 .fill-N2{fill:#676C7E;} + .d2-1475290061 .fill-N3{fill:#9499AB;} + .d2-1475290061 .fill-N4{fill:#CFD2DD;} + .d2-1475290061 .fill-N5{fill:#DEE1EB;} + .d2-1475290061 .fill-N6{fill:#EEF1F8;} + .d2-1475290061 .fill-N7{fill:#FFFFFF;} + .d2-1475290061 .fill-B1{fill:#0D32B2;} + .d2-1475290061 .fill-B2{fill:#0D32B2;} + .d2-1475290061 .fill-B3{fill:#E3E9FD;} + .d2-1475290061 .fill-B4{fill:#E3E9FD;} + .d2-1475290061 .fill-B5{fill:#EDF0FD;} + .d2-1475290061 .fill-B6{fill:#F7F8FE;} + .d2-1475290061 .fill-AA2{fill:#4A6FF3;} + .d2-1475290061 .fill-AA4{fill:#EDF0FD;} + .d2-1475290061 .fill-AA5{fill:#F7F8FE;} + .d2-1475290061 .fill-AB4{fill:#EDF0FD;} + .d2-1475290061 .fill-AB5{fill:#F7F8FE;} + .d2-1475290061 .stroke-N1{stroke:#0A0F25;} + .d2-1475290061 .stroke-N2{stroke:#676C7E;} + .d2-1475290061 .stroke-N3{stroke:#9499AB;} + .d2-1475290061 .stroke-N4{stroke:#CFD2DD;} + .d2-1475290061 .stroke-N5{stroke:#DEE1EB;} + .d2-1475290061 .stroke-N6{stroke:#EEF1F8;} + .d2-1475290061 .stroke-N7{stroke:#FFFFFF;} + .d2-1475290061 .stroke-B1{stroke:#0D32B2;} + .d2-1475290061 .stroke-B2{stroke:#0D32B2;} + .d2-1475290061 .stroke-B3{stroke:#E3E9FD;} + .d2-1475290061 .stroke-B4{stroke:#E3E9FD;} + .d2-1475290061 .stroke-B5{stroke:#EDF0FD;} + .d2-1475290061 .stroke-B6{stroke:#F7F8FE;} + .d2-1475290061 .stroke-AA2{stroke:#4A6FF3;} + .d2-1475290061 .stroke-AA4{stroke:#EDF0FD;} + .d2-1475290061 .stroke-AA5{stroke:#F7F8FE;} + .d2-1475290061 .stroke-AB4{stroke:#EDF0FD;} + .d2-1475290061 .stroke-AB5{stroke:#F7F8FE;} + .d2-1475290061 .background-color-N1{background-color:#0A0F25;} + .d2-1475290061 .background-color-N2{background-color:#676C7E;} + .d2-1475290061 .background-color-N3{background-color:#9499AB;} + .d2-1475290061 .background-color-N4{background-color:#CFD2DD;} + .d2-1475290061 .background-color-N5{background-color:#DEE1EB;} + .d2-1475290061 .background-color-N6{background-color:#EEF1F8;} + .d2-1475290061 .background-color-N7{background-color:#FFFFFF;} + .d2-1475290061 .background-color-B1{background-color:#0D32B2;} + .d2-1475290061 .background-color-B2{background-color:#0D32B2;} + .d2-1475290061 .background-color-B3{background-color:#E3E9FD;} + .d2-1475290061 .background-color-B4{background-color:#E3E9FD;} + .d2-1475290061 .background-color-B5{background-color:#EDF0FD;} + .d2-1475290061 .background-color-B6{background-color:#F7F8FE;} + .d2-1475290061 .background-color-AA2{background-color:#4A6FF3;} + .d2-1475290061 .background-color-AA4{background-color:#EDF0FD;} + .d2-1475290061 .background-color-AA5{background-color:#F7F8FE;} + .d2-1475290061 .background-color-AB4{background-color:#EDF0FD;} + .d2-1475290061 .background-color-AB5{background-color:#F7F8FE;} + .d2-1475290061 .color-N1{color:#0A0F25;} + .d2-1475290061 .color-N2{color:#676C7E;} + .d2-1475290061 .color-N3{color:#9499AB;} + .d2-1475290061 .color-N4{color:#CFD2DD;} + .d2-1475290061 .color-N5{color:#DEE1EB;} + .d2-1475290061 .color-N6{color:#EEF1F8;} + .d2-1475290061 .color-N7{color:#FFFFFF;} + .d2-1475290061 .color-B1{color:#0D32B2;} + .d2-1475290061 .color-B2{color:#0D32B2;} + .d2-1475290061 .color-B3{color:#E3E9FD;} + .d2-1475290061 .color-B4{color:#E3E9FD;} + .d2-1475290061 .color-B5{color:#EDF0FD;} + .d2-1475290061 .color-B6{color:#F7F8FE;} + .d2-1475290061 .color-AA2{color:#4A6FF3;} + .d2-1475290061 .color-AA4{color:#EDF0FD;} + .d2-1475290061 .color-AA5{color:#F7F8FE;} + .d2-1475290061 .color-AB4{color:#EDF0FD;} + .d2-1475290061 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1475290061);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1475290061);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1475290061);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1475290061);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1475290061);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1475290061);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1475290061);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1475290061);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1475290061);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1475290061);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1475290061);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1475290061);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1475290061);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1475290061);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1475290061);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1475290061);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1475290061);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1475290061);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xyz - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/near-alone/elk/board.exp.json b/e2etests/testdata/stable/near-alone/elk/board.exp.json index 52ab93dbc..52b59fcbf 100644 --- a/e2etests/testdata/stable/near-alone/elk/board.exp.json +++ b/e2etests/testdata/stable/near-alone/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -143,6 +154,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/near-alone/elk/sketch.exp.svg b/e2etests/testdata/stable/near-alone/elk/sketch.exp.svg index 3d894043c..6c1f727b5 100644 --- a/e2etests/testdata/stable/near-alone/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/near-alone/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -xyz + .d2-1475290061 .fill-N1{fill:#0A0F25;} + .d2-1475290061 .fill-N2{fill:#676C7E;} + .d2-1475290061 .fill-N3{fill:#9499AB;} + .d2-1475290061 .fill-N4{fill:#CFD2DD;} + .d2-1475290061 .fill-N5{fill:#DEE1EB;} + .d2-1475290061 .fill-N6{fill:#EEF1F8;} + .d2-1475290061 .fill-N7{fill:#FFFFFF;} + .d2-1475290061 .fill-B1{fill:#0D32B2;} + .d2-1475290061 .fill-B2{fill:#0D32B2;} + .d2-1475290061 .fill-B3{fill:#E3E9FD;} + .d2-1475290061 .fill-B4{fill:#E3E9FD;} + .d2-1475290061 .fill-B5{fill:#EDF0FD;} + .d2-1475290061 .fill-B6{fill:#F7F8FE;} + .d2-1475290061 .fill-AA2{fill:#4A6FF3;} + .d2-1475290061 .fill-AA4{fill:#EDF0FD;} + .d2-1475290061 .fill-AA5{fill:#F7F8FE;} + .d2-1475290061 .fill-AB4{fill:#EDF0FD;} + .d2-1475290061 .fill-AB5{fill:#F7F8FE;} + .d2-1475290061 .stroke-N1{stroke:#0A0F25;} + .d2-1475290061 .stroke-N2{stroke:#676C7E;} + .d2-1475290061 .stroke-N3{stroke:#9499AB;} + .d2-1475290061 .stroke-N4{stroke:#CFD2DD;} + .d2-1475290061 .stroke-N5{stroke:#DEE1EB;} + .d2-1475290061 .stroke-N6{stroke:#EEF1F8;} + .d2-1475290061 .stroke-N7{stroke:#FFFFFF;} + .d2-1475290061 .stroke-B1{stroke:#0D32B2;} + .d2-1475290061 .stroke-B2{stroke:#0D32B2;} + .d2-1475290061 .stroke-B3{stroke:#E3E9FD;} + .d2-1475290061 .stroke-B4{stroke:#E3E9FD;} + .d2-1475290061 .stroke-B5{stroke:#EDF0FD;} + .d2-1475290061 .stroke-B6{stroke:#F7F8FE;} + .d2-1475290061 .stroke-AA2{stroke:#4A6FF3;} + .d2-1475290061 .stroke-AA4{stroke:#EDF0FD;} + .d2-1475290061 .stroke-AA5{stroke:#F7F8FE;} + .d2-1475290061 .stroke-AB4{stroke:#EDF0FD;} + .d2-1475290061 .stroke-AB5{stroke:#F7F8FE;} + .d2-1475290061 .background-color-N1{background-color:#0A0F25;} + .d2-1475290061 .background-color-N2{background-color:#676C7E;} + .d2-1475290061 .background-color-N3{background-color:#9499AB;} + .d2-1475290061 .background-color-N4{background-color:#CFD2DD;} + .d2-1475290061 .background-color-N5{background-color:#DEE1EB;} + .d2-1475290061 .background-color-N6{background-color:#EEF1F8;} + .d2-1475290061 .background-color-N7{background-color:#FFFFFF;} + .d2-1475290061 .background-color-B1{background-color:#0D32B2;} + .d2-1475290061 .background-color-B2{background-color:#0D32B2;} + .d2-1475290061 .background-color-B3{background-color:#E3E9FD;} + .d2-1475290061 .background-color-B4{background-color:#E3E9FD;} + .d2-1475290061 .background-color-B5{background-color:#EDF0FD;} + .d2-1475290061 .background-color-B6{background-color:#F7F8FE;} + .d2-1475290061 .background-color-AA2{background-color:#4A6FF3;} + .d2-1475290061 .background-color-AA4{background-color:#EDF0FD;} + .d2-1475290061 .background-color-AA5{background-color:#F7F8FE;} + .d2-1475290061 .background-color-AB4{background-color:#EDF0FD;} + .d2-1475290061 .background-color-AB5{background-color:#F7F8FE;} + .d2-1475290061 .color-N1{color:#0A0F25;} + .d2-1475290061 .color-N2{color:#676C7E;} + .d2-1475290061 .color-N3{color:#9499AB;} + .d2-1475290061 .color-N4{color:#CFD2DD;} + .d2-1475290061 .color-N5{color:#DEE1EB;} + .d2-1475290061 .color-N6{color:#EEF1F8;} + .d2-1475290061 .color-N7{color:#FFFFFF;} + .d2-1475290061 .color-B1{color:#0D32B2;} + .d2-1475290061 .color-B2{color:#0D32B2;} + .d2-1475290061 .color-B3{color:#E3E9FD;} + .d2-1475290061 .color-B4{color:#E3E9FD;} + .d2-1475290061 .color-B5{color:#EDF0FD;} + .d2-1475290061 .color-B6{color:#F7F8FE;} + .d2-1475290061 .color-AA2{color:#4A6FF3;} + .d2-1475290061 .color-AA4{color:#EDF0FD;} + .d2-1475290061 .color-AA5{color:#F7F8FE;} + .d2-1475290061 .color-AB4{color:#EDF0FD;} + .d2-1475290061 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1475290061);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1475290061);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1475290061);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1475290061);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1475290061);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1475290061);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1475290061);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1475290061);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1475290061);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1475290061);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1475290061);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1475290061);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1475290061);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1475290061);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1475290061);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1475290061);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1475290061);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1475290061);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xyz - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/near_keys_for_container#01/dagre/board.exp.json b/e2etests/testdata/stable/near_keys_for_container#01/dagre/board.exp.json index f0d9f8c63..c3b657542 100644 --- a/e2etests/testdata/stable/near_keys_for_container#01/dagre/board.exp.json +++ b/e2etests/testdata/stable/near_keys_for_container#01/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -715,6 +740,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -756,6 +782,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -797,6 +824,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -838,6 +866,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -879,6 +908,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -930,6 +960,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -304, @@ -977,6 +1008,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -190.5, @@ -1024,6 +1056,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 190, @@ -1071,6 +1104,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 303.5, @@ -1118,6 +1152,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -57, @@ -1165,6 +1200,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 56.5, @@ -1205,6 +1241,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/near_keys_for_container#01/dagre/sketch.exp.svg b/e2etests/testdata/stable/near_keys_for_container#01/dagre/sketch.exp.svg index 8c8c21cfd..7709f6128 100644 --- a/e2etests/testdata/stable/near_keys_for_container#01/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/near_keys_for_container#01/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -xyzababcdabcdabcdbaccd + .d2-3709579870 .fill-N1{fill:#0A0F25;} + .d2-3709579870 .fill-N2{fill:#676C7E;} + .d2-3709579870 .fill-N3{fill:#9499AB;} + .d2-3709579870 .fill-N4{fill:#CFD2DD;} + .d2-3709579870 .fill-N5{fill:#DEE1EB;} + .d2-3709579870 .fill-N6{fill:#EEF1F8;} + .d2-3709579870 .fill-N7{fill:#FFFFFF;} + .d2-3709579870 .fill-B1{fill:#0D32B2;} + .d2-3709579870 .fill-B2{fill:#0D32B2;} + .d2-3709579870 .fill-B3{fill:#E3E9FD;} + .d2-3709579870 .fill-B4{fill:#E3E9FD;} + .d2-3709579870 .fill-B5{fill:#EDF0FD;} + .d2-3709579870 .fill-B6{fill:#F7F8FE;} + .d2-3709579870 .fill-AA2{fill:#4A6FF3;} + .d2-3709579870 .fill-AA4{fill:#EDF0FD;} + .d2-3709579870 .fill-AA5{fill:#F7F8FE;} + .d2-3709579870 .fill-AB4{fill:#EDF0FD;} + .d2-3709579870 .fill-AB5{fill:#F7F8FE;} + .d2-3709579870 .stroke-N1{stroke:#0A0F25;} + .d2-3709579870 .stroke-N2{stroke:#676C7E;} + .d2-3709579870 .stroke-N3{stroke:#9499AB;} + .d2-3709579870 .stroke-N4{stroke:#CFD2DD;} + .d2-3709579870 .stroke-N5{stroke:#DEE1EB;} + .d2-3709579870 .stroke-N6{stroke:#EEF1F8;} + .d2-3709579870 .stroke-N7{stroke:#FFFFFF;} + .d2-3709579870 .stroke-B1{stroke:#0D32B2;} + .d2-3709579870 .stroke-B2{stroke:#0D32B2;} + .d2-3709579870 .stroke-B3{stroke:#E3E9FD;} + .d2-3709579870 .stroke-B4{stroke:#E3E9FD;} + .d2-3709579870 .stroke-B5{stroke:#EDF0FD;} + .d2-3709579870 .stroke-B6{stroke:#F7F8FE;} + .d2-3709579870 .stroke-AA2{stroke:#4A6FF3;} + .d2-3709579870 .stroke-AA4{stroke:#EDF0FD;} + .d2-3709579870 .stroke-AA5{stroke:#F7F8FE;} + .d2-3709579870 .stroke-AB4{stroke:#EDF0FD;} + .d2-3709579870 .stroke-AB5{stroke:#F7F8FE;} + .d2-3709579870 .background-color-N1{background-color:#0A0F25;} + .d2-3709579870 .background-color-N2{background-color:#676C7E;} + .d2-3709579870 .background-color-N3{background-color:#9499AB;} + .d2-3709579870 .background-color-N4{background-color:#CFD2DD;} + .d2-3709579870 .background-color-N5{background-color:#DEE1EB;} + .d2-3709579870 .background-color-N6{background-color:#EEF1F8;} + .d2-3709579870 .background-color-N7{background-color:#FFFFFF;} + .d2-3709579870 .background-color-B1{background-color:#0D32B2;} + .d2-3709579870 .background-color-B2{background-color:#0D32B2;} + .d2-3709579870 .background-color-B3{background-color:#E3E9FD;} + .d2-3709579870 .background-color-B4{background-color:#E3E9FD;} + .d2-3709579870 .background-color-B5{background-color:#EDF0FD;} + .d2-3709579870 .background-color-B6{background-color:#F7F8FE;} + .d2-3709579870 .background-color-AA2{background-color:#4A6FF3;} + .d2-3709579870 .background-color-AA4{background-color:#EDF0FD;} + .d2-3709579870 .background-color-AA5{background-color:#F7F8FE;} + .d2-3709579870 .background-color-AB4{background-color:#EDF0FD;} + .d2-3709579870 .background-color-AB5{background-color:#F7F8FE;} + .d2-3709579870 .color-N1{color:#0A0F25;} + .d2-3709579870 .color-N2{color:#676C7E;} + .d2-3709579870 .color-N3{color:#9499AB;} + .d2-3709579870 .color-N4{color:#CFD2DD;} + .d2-3709579870 .color-N5{color:#DEE1EB;} + .d2-3709579870 .color-N6{color:#EEF1F8;} + .d2-3709579870 .color-N7{color:#FFFFFF;} + .d2-3709579870 .color-B1{color:#0D32B2;} + .d2-3709579870 .color-B2{color:#0D32B2;} + .d2-3709579870 .color-B3{color:#E3E9FD;} + .d2-3709579870 .color-B4{color:#E3E9FD;} + .d2-3709579870 .color-B5{color:#EDF0FD;} + .d2-3709579870 .color-B6{color:#F7F8FE;} + .d2-3709579870 .color-AA2{color:#4A6FF3;} + .d2-3709579870 .color-AA4{color:#EDF0FD;} + .d2-3709579870 .color-AA5{color:#F7F8FE;} + .d2-3709579870 .color-AB4{color:#EDF0FD;} + .d2-3709579870 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3709579870);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3709579870);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3709579870);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3709579870);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3709579870);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3709579870);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3709579870);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3709579870);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3709579870);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3709579870);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3709579870);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3709579870);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3709579870);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3709579870);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3709579870);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3709579870);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3709579870);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3709579870);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xyzababcdabcdabcdbaccd - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/near_keys_for_container#01/elk/board.exp.json b/e2etests/testdata/stable/near_keys_for_container#01/elk/board.exp.json index 461bd39c7..28fa08488 100644 --- a/e2etests/testdata/stable/near_keys_for_container#01/elk/board.exp.json +++ b/e2etests/testdata/stable/near_keys_for_container#01/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -715,6 +740,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -756,6 +782,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -797,6 +824,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -838,6 +866,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -879,6 +908,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -930,6 +960,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -297, @@ -968,6 +999,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -223.5, @@ -1006,6 +1038,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 223, @@ -1044,6 +1077,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 296.5, @@ -1082,6 +1116,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -37, @@ -1120,6 +1155,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 36.5, @@ -1151,6 +1187,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/near_keys_for_container#01/elk/sketch.exp.svg b/e2etests/testdata/stable/near_keys_for_container#01/elk/sketch.exp.svg index 662859dd9..7bf585d60 100644 --- a/e2etests/testdata/stable/near_keys_for_container#01/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/near_keys_for_container#01/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -xyzababcdabcdabcdbaccd + .d2-1117439875 .fill-N1{fill:#0A0F25;} + .d2-1117439875 .fill-N2{fill:#676C7E;} + .d2-1117439875 .fill-N3{fill:#9499AB;} + .d2-1117439875 .fill-N4{fill:#CFD2DD;} + .d2-1117439875 .fill-N5{fill:#DEE1EB;} + .d2-1117439875 .fill-N6{fill:#EEF1F8;} + .d2-1117439875 .fill-N7{fill:#FFFFFF;} + .d2-1117439875 .fill-B1{fill:#0D32B2;} + .d2-1117439875 .fill-B2{fill:#0D32B2;} + .d2-1117439875 .fill-B3{fill:#E3E9FD;} + .d2-1117439875 .fill-B4{fill:#E3E9FD;} + .d2-1117439875 .fill-B5{fill:#EDF0FD;} + .d2-1117439875 .fill-B6{fill:#F7F8FE;} + .d2-1117439875 .fill-AA2{fill:#4A6FF3;} + .d2-1117439875 .fill-AA4{fill:#EDF0FD;} + .d2-1117439875 .fill-AA5{fill:#F7F8FE;} + .d2-1117439875 .fill-AB4{fill:#EDF0FD;} + .d2-1117439875 .fill-AB5{fill:#F7F8FE;} + .d2-1117439875 .stroke-N1{stroke:#0A0F25;} + .d2-1117439875 .stroke-N2{stroke:#676C7E;} + .d2-1117439875 .stroke-N3{stroke:#9499AB;} + .d2-1117439875 .stroke-N4{stroke:#CFD2DD;} + .d2-1117439875 .stroke-N5{stroke:#DEE1EB;} + .d2-1117439875 .stroke-N6{stroke:#EEF1F8;} + .d2-1117439875 .stroke-N7{stroke:#FFFFFF;} + .d2-1117439875 .stroke-B1{stroke:#0D32B2;} + .d2-1117439875 .stroke-B2{stroke:#0D32B2;} + .d2-1117439875 .stroke-B3{stroke:#E3E9FD;} + .d2-1117439875 .stroke-B4{stroke:#E3E9FD;} + .d2-1117439875 .stroke-B5{stroke:#EDF0FD;} + .d2-1117439875 .stroke-B6{stroke:#F7F8FE;} + .d2-1117439875 .stroke-AA2{stroke:#4A6FF3;} + .d2-1117439875 .stroke-AA4{stroke:#EDF0FD;} + .d2-1117439875 .stroke-AA5{stroke:#F7F8FE;} + .d2-1117439875 .stroke-AB4{stroke:#EDF0FD;} + .d2-1117439875 .stroke-AB5{stroke:#F7F8FE;} + .d2-1117439875 .background-color-N1{background-color:#0A0F25;} + .d2-1117439875 .background-color-N2{background-color:#676C7E;} + .d2-1117439875 .background-color-N3{background-color:#9499AB;} + .d2-1117439875 .background-color-N4{background-color:#CFD2DD;} + .d2-1117439875 .background-color-N5{background-color:#DEE1EB;} + .d2-1117439875 .background-color-N6{background-color:#EEF1F8;} + .d2-1117439875 .background-color-N7{background-color:#FFFFFF;} + .d2-1117439875 .background-color-B1{background-color:#0D32B2;} + .d2-1117439875 .background-color-B2{background-color:#0D32B2;} + .d2-1117439875 .background-color-B3{background-color:#E3E9FD;} + .d2-1117439875 .background-color-B4{background-color:#E3E9FD;} + .d2-1117439875 .background-color-B5{background-color:#EDF0FD;} + .d2-1117439875 .background-color-B6{background-color:#F7F8FE;} + .d2-1117439875 .background-color-AA2{background-color:#4A6FF3;} + .d2-1117439875 .background-color-AA4{background-color:#EDF0FD;} + .d2-1117439875 .background-color-AA5{background-color:#F7F8FE;} + .d2-1117439875 .background-color-AB4{background-color:#EDF0FD;} + .d2-1117439875 .background-color-AB5{background-color:#F7F8FE;} + .d2-1117439875 .color-N1{color:#0A0F25;} + .d2-1117439875 .color-N2{color:#676C7E;} + .d2-1117439875 .color-N3{color:#9499AB;} + .d2-1117439875 .color-N4{color:#CFD2DD;} + .d2-1117439875 .color-N5{color:#DEE1EB;} + .d2-1117439875 .color-N6{color:#EEF1F8;} + .d2-1117439875 .color-N7{color:#FFFFFF;} + .d2-1117439875 .color-B1{color:#0D32B2;} + .d2-1117439875 .color-B2{color:#0D32B2;} + .d2-1117439875 .color-B3{color:#E3E9FD;} + .d2-1117439875 .color-B4{color:#E3E9FD;} + .d2-1117439875 .color-B5{color:#EDF0FD;} + .d2-1117439875 .color-B6{color:#F7F8FE;} + .d2-1117439875 .color-AA2{color:#4A6FF3;} + .d2-1117439875 .color-AA4{color:#EDF0FD;} + .d2-1117439875 .color-AA5{color:#F7F8FE;} + .d2-1117439875 .color-AB4{color:#EDF0FD;} + .d2-1117439875 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1117439875);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1117439875);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1117439875);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1117439875);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1117439875);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1117439875);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1117439875);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1117439875);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1117439875);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1117439875);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1117439875);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1117439875);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1117439875);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1117439875);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1117439875);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1117439875);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1117439875);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1117439875);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xyzababcdabcdabcdbaccd - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/near_keys_for_container/dagre/board.exp.json b/e2etests/testdata/stable/near_keys_for_container/dagre/board.exp.json index f47124672..4febf83cc 100644 --- a/e2etests/testdata/stable/near_keys_for_container/dagre/board.exp.json +++ b/e2etests/testdata/stable/near_keys_for_container/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -60,6 +69,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/near_keys_for_container/dagre/sketch.exp.svg b/e2etests/testdata/stable/near_keys_for_container/dagre/sketch.exp.svg index 0618f1b4a..27a755734 100644 --- a/e2etests/testdata/stable/near_keys_for_container/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/near_keys_for_container/dagre/sketch.exp.svg @@ -1,13 +1,13 @@ -

    Service-Cluster Provisioning ("Outside view")

    -
     +

    Service-Cluster Provisioning ("Outside view")

    +
     - +     \ No newline at end of file diff --git a/e2etests/testdata/stable/near_keys_for_container/elk/board.exp.json b/e2etests/testdata/stable/near_keys_for_container/elk/board.exp.json index f47124672..4febf83cc 100644 --- a/e2etests/testdata/stable/near_keys_for_container/elk/board.exp.json +++ b/e2etests/testdata/stable/near_keys_for_container/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -60,6 +69,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/near_keys_for_container/elk/sketch.exp.svg b/e2etests/testdata/stable/near_keys_for_container/elk/sketch.exp.svg index 0618f1b4a..27a755734 100644 --- a/e2etests/testdata/stable/near_keys_for_container/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/near_keys_for_container/elk/sketch.exp.svg @@ -1,13 +1,13 @@ -

    Service-Cluster Provisioning ("Outside view")

    -
     +

    Service-Cluster Provisioning ("Outside view")

    +
     - +     \ No newline at end of file diff --git a/e2etests/testdata/stable/nested_diagram_types/dagre/board.exp.json b/e2etests/testdata/stable/nested_diagram_types/dagre/board.exp.json index 84d833a62..4dbf01dfd 100644 --- a/e2etests/testdata/stable/nested_diagram_types/dagre/board.exp.json +++ b/e2etests/testdata/stable/nested_diagram_types/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -591,6 +613,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -632,6 +655,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -673,6 +697,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -714,6 +739,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -755,6 +781,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -806,6 +833,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 184.5, @@ -844,6 +872,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 278, @@ -882,6 +911,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 135, @@ -920,6 +950,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 380, @@ -958,6 +989,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 530, @@ -996,6 +1028,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 135, @@ -1034,6 +1067,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 403.5, @@ -1065,6 +1099,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/nested_diagram_types/dagre/sketch.exp.svg b/e2etests/testdata/stable/nested_diagram_types/dagre/sketch.exp.svg index 07054ca1f..aba077250 100644 --- a/e2etests/testdata/stable/nested_diagram_types/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/nested_diagram_types/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -abc12312xyxyz yzuvw + .d2-1187856662 .fill-N1{fill:#0A0F25;} + .d2-1187856662 .fill-N2{fill:#676C7E;} + .d2-1187856662 .fill-N3{fill:#9499AB;} + .d2-1187856662 .fill-N4{fill:#CFD2DD;} + .d2-1187856662 .fill-N5{fill:#DEE1EB;} + .d2-1187856662 .fill-N6{fill:#EEF1F8;} + .d2-1187856662 .fill-N7{fill:#FFFFFF;} + .d2-1187856662 .fill-B1{fill:#0D32B2;} + .d2-1187856662 .fill-B2{fill:#0D32B2;} + .d2-1187856662 .fill-B3{fill:#E3E9FD;} + .d2-1187856662 .fill-B4{fill:#E3E9FD;} + .d2-1187856662 .fill-B5{fill:#EDF0FD;} + .d2-1187856662 .fill-B6{fill:#F7F8FE;} + .d2-1187856662 .fill-AA2{fill:#4A6FF3;} + .d2-1187856662 .fill-AA4{fill:#EDF0FD;} + .d2-1187856662 .fill-AA5{fill:#F7F8FE;} + .d2-1187856662 .fill-AB4{fill:#EDF0FD;} + .d2-1187856662 .fill-AB5{fill:#F7F8FE;} + .d2-1187856662 .stroke-N1{stroke:#0A0F25;} + .d2-1187856662 .stroke-N2{stroke:#676C7E;} + .d2-1187856662 .stroke-N3{stroke:#9499AB;} + .d2-1187856662 .stroke-N4{stroke:#CFD2DD;} + .d2-1187856662 .stroke-N5{stroke:#DEE1EB;} + .d2-1187856662 .stroke-N6{stroke:#EEF1F8;} + .d2-1187856662 .stroke-N7{stroke:#FFFFFF;} + .d2-1187856662 .stroke-B1{stroke:#0D32B2;} + .d2-1187856662 .stroke-B2{stroke:#0D32B2;} + .d2-1187856662 .stroke-B3{stroke:#E3E9FD;} + .d2-1187856662 .stroke-B4{stroke:#E3E9FD;} + .d2-1187856662 .stroke-B5{stroke:#EDF0FD;} + .d2-1187856662 .stroke-B6{stroke:#F7F8FE;} + .d2-1187856662 .stroke-AA2{stroke:#4A6FF3;} + .d2-1187856662 .stroke-AA4{stroke:#EDF0FD;} + .d2-1187856662 .stroke-AA5{stroke:#F7F8FE;} + .d2-1187856662 .stroke-AB4{stroke:#EDF0FD;} + .d2-1187856662 .stroke-AB5{stroke:#F7F8FE;} + .d2-1187856662 .background-color-N1{background-color:#0A0F25;} + .d2-1187856662 .background-color-N2{background-color:#676C7E;} + .d2-1187856662 .background-color-N3{background-color:#9499AB;} + .d2-1187856662 .background-color-N4{background-color:#CFD2DD;} + .d2-1187856662 .background-color-N5{background-color:#DEE1EB;} + .d2-1187856662 .background-color-N6{background-color:#EEF1F8;} + .d2-1187856662 .background-color-N7{background-color:#FFFFFF;} + .d2-1187856662 .background-color-B1{background-color:#0D32B2;} + .d2-1187856662 .background-color-B2{background-color:#0D32B2;} + .d2-1187856662 .background-color-B3{background-color:#E3E9FD;} + .d2-1187856662 .background-color-B4{background-color:#E3E9FD;} + .d2-1187856662 .background-color-B5{background-color:#EDF0FD;} + .d2-1187856662 .background-color-B6{background-color:#F7F8FE;} + .d2-1187856662 .background-color-AA2{background-color:#4A6FF3;} + .d2-1187856662 .background-color-AA4{background-color:#EDF0FD;} + .d2-1187856662 .background-color-AA5{background-color:#F7F8FE;} + .d2-1187856662 .background-color-AB4{background-color:#EDF0FD;} + .d2-1187856662 .background-color-AB5{background-color:#F7F8FE;} + .d2-1187856662 .color-N1{color:#0A0F25;} + .d2-1187856662 .color-N2{color:#676C7E;} + .d2-1187856662 .color-N3{color:#9499AB;} + .d2-1187856662 .color-N4{color:#CFD2DD;} + .d2-1187856662 .color-N5{color:#DEE1EB;} + .d2-1187856662 .color-N6{color:#EEF1F8;} + .d2-1187856662 .color-N7{color:#FFFFFF;} + .d2-1187856662 .color-B1{color:#0D32B2;} + .d2-1187856662 .color-B2{color:#0D32B2;} + .d2-1187856662 .color-B3{color:#E3E9FD;} + .d2-1187856662 .color-B4{color:#E3E9FD;} + .d2-1187856662 .color-B5{color:#EDF0FD;} + .d2-1187856662 .color-B6{color:#F7F8FE;} + .d2-1187856662 .color-AA2{color:#4A6FF3;} + .d2-1187856662 .color-AA4{color:#EDF0FD;} + .d2-1187856662 .color-AA5{color:#F7F8FE;} + .d2-1187856662 .color-AB4{color:#EDF0FD;} + .d2-1187856662 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1187856662);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1187856662);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1187856662);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1187856662);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1187856662);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1187856662);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1187856662);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1187856662);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1187856662);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1187856662);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1187856662);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1187856662);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1187856662);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1187856662);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1187856662);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1187856662);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1187856662);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1187856662);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abc12312xyxyz yzuvw - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/nested_diagram_types/elk/board.exp.json b/e2etests/testdata/stable/nested_diagram_types/elk/board.exp.json index 2c26323ff..d4cc126dd 100644 --- a/e2etests/testdata/stable/nested_diagram_types/elk/board.exp.json +++ b/e2etests/testdata/stable/nested_diagram_types/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -591,6 +613,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -632,6 +655,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -673,6 +697,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -714,6 +739,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -755,6 +781,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -806,6 +833,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 196.5, @@ -844,6 +872,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 290, @@ -882,6 +911,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 147, @@ -920,6 +950,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 392, @@ -958,6 +989,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 542, @@ -996,6 +1028,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 147, @@ -1034,6 +1067,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 415.5, @@ -1065,6 +1099,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/nested_diagram_types/elk/sketch.exp.svg b/e2etests/testdata/stable/nested_diagram_types/elk/sketch.exp.svg index a3b7aad32..064fd8edd 100644 --- a/e2etests/testdata/stable/nested_diagram_types/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/nested_diagram_types/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -abc12312xyxyz yzuvw + .d2-721829498 .fill-N1{fill:#0A0F25;} + .d2-721829498 .fill-N2{fill:#676C7E;} + .d2-721829498 .fill-N3{fill:#9499AB;} + .d2-721829498 .fill-N4{fill:#CFD2DD;} + .d2-721829498 .fill-N5{fill:#DEE1EB;} + .d2-721829498 .fill-N6{fill:#EEF1F8;} + .d2-721829498 .fill-N7{fill:#FFFFFF;} + .d2-721829498 .fill-B1{fill:#0D32B2;} + .d2-721829498 .fill-B2{fill:#0D32B2;} + .d2-721829498 .fill-B3{fill:#E3E9FD;} + .d2-721829498 .fill-B4{fill:#E3E9FD;} + .d2-721829498 .fill-B5{fill:#EDF0FD;} + .d2-721829498 .fill-B6{fill:#F7F8FE;} + .d2-721829498 .fill-AA2{fill:#4A6FF3;} + .d2-721829498 .fill-AA4{fill:#EDF0FD;} + .d2-721829498 .fill-AA5{fill:#F7F8FE;} + .d2-721829498 .fill-AB4{fill:#EDF0FD;} + .d2-721829498 .fill-AB5{fill:#F7F8FE;} + .d2-721829498 .stroke-N1{stroke:#0A0F25;} + .d2-721829498 .stroke-N2{stroke:#676C7E;} + .d2-721829498 .stroke-N3{stroke:#9499AB;} + .d2-721829498 .stroke-N4{stroke:#CFD2DD;} + .d2-721829498 .stroke-N5{stroke:#DEE1EB;} + .d2-721829498 .stroke-N6{stroke:#EEF1F8;} + .d2-721829498 .stroke-N7{stroke:#FFFFFF;} + .d2-721829498 .stroke-B1{stroke:#0D32B2;} + .d2-721829498 .stroke-B2{stroke:#0D32B2;} + .d2-721829498 .stroke-B3{stroke:#E3E9FD;} + .d2-721829498 .stroke-B4{stroke:#E3E9FD;} + .d2-721829498 .stroke-B5{stroke:#EDF0FD;} + .d2-721829498 .stroke-B6{stroke:#F7F8FE;} + .d2-721829498 .stroke-AA2{stroke:#4A6FF3;} + .d2-721829498 .stroke-AA4{stroke:#EDF0FD;} + .d2-721829498 .stroke-AA5{stroke:#F7F8FE;} + .d2-721829498 .stroke-AB4{stroke:#EDF0FD;} + .d2-721829498 .stroke-AB5{stroke:#F7F8FE;} + .d2-721829498 .background-color-N1{background-color:#0A0F25;} + .d2-721829498 .background-color-N2{background-color:#676C7E;} + .d2-721829498 .background-color-N3{background-color:#9499AB;} + .d2-721829498 .background-color-N4{background-color:#CFD2DD;} + .d2-721829498 .background-color-N5{background-color:#DEE1EB;} + .d2-721829498 .background-color-N6{background-color:#EEF1F8;} + .d2-721829498 .background-color-N7{background-color:#FFFFFF;} + .d2-721829498 .background-color-B1{background-color:#0D32B2;} + .d2-721829498 .background-color-B2{background-color:#0D32B2;} + .d2-721829498 .background-color-B3{background-color:#E3E9FD;} + .d2-721829498 .background-color-B4{background-color:#E3E9FD;} + .d2-721829498 .background-color-B5{background-color:#EDF0FD;} + .d2-721829498 .background-color-B6{background-color:#F7F8FE;} + .d2-721829498 .background-color-AA2{background-color:#4A6FF3;} + .d2-721829498 .background-color-AA4{background-color:#EDF0FD;} + .d2-721829498 .background-color-AA5{background-color:#F7F8FE;} + .d2-721829498 .background-color-AB4{background-color:#EDF0FD;} + .d2-721829498 .background-color-AB5{background-color:#F7F8FE;} + .d2-721829498 .color-N1{color:#0A0F25;} + .d2-721829498 .color-N2{color:#676C7E;} + .d2-721829498 .color-N3{color:#9499AB;} + .d2-721829498 .color-N4{color:#CFD2DD;} + .d2-721829498 .color-N5{color:#DEE1EB;} + .d2-721829498 .color-N6{color:#EEF1F8;} + .d2-721829498 .color-N7{color:#FFFFFF;} + .d2-721829498 .color-B1{color:#0D32B2;} + .d2-721829498 .color-B2{color:#0D32B2;} + .d2-721829498 .color-B3{color:#E3E9FD;} + .d2-721829498 .color-B4{color:#E3E9FD;} + .d2-721829498 .color-B5{color:#EDF0FD;} + .d2-721829498 .color-B6{color:#F7F8FE;} + .d2-721829498 .color-AA2{color:#4A6FF3;} + .d2-721829498 .color-AA4{color:#EDF0FD;} + .d2-721829498 .color-AA5{color:#F7F8FE;} + .d2-721829498 .color-AB4{color:#EDF0FD;} + .d2-721829498 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-721829498);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-721829498);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-721829498);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-721829498);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-721829498);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-721829498);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-721829498);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-721829498);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-721829498);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-721829498);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-721829498);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-721829498);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-721829498);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-721829498);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-721829498);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-721829498);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-721829498);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-721829498);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abc12312xyxyz yzuvw - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/nested_shape_labels/dagre/board.exp.json b/e2etests/testdata/stable/nested_shape_labels/dagre/board.exp.json index 2217f3830..240577373 100644 --- a/e2etests/testdata/stable/nested_shape_labels/dagre/board.exp.json +++ b/e2etests/testdata/stable/nested_shape_labels/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "AA4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "N4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "N4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -184,6 +196,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/nested_shape_labels/dagre/sketch.exp.svg b/e2etests/testdata/stable/nested_shape_labels/dagre/sketch.exp.svg index ab941ca28..603b3f1cd 100644 --- a/e2etests/testdata/stable/nested_shape_labels/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/nested_shape_labels/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -aaccbbdd + .d2-987145224 .fill-N1{fill:#0A0F25;} + .d2-987145224 .fill-N2{fill:#676C7E;} + .d2-987145224 .fill-N3{fill:#9499AB;} + .d2-987145224 .fill-N4{fill:#CFD2DD;} + .d2-987145224 .fill-N5{fill:#DEE1EB;} + .d2-987145224 .fill-N6{fill:#EEF1F8;} + .d2-987145224 .fill-N7{fill:#FFFFFF;} + .d2-987145224 .fill-B1{fill:#0D32B2;} + .d2-987145224 .fill-B2{fill:#0D32B2;} + .d2-987145224 .fill-B3{fill:#E3E9FD;} + .d2-987145224 .fill-B4{fill:#E3E9FD;} + .d2-987145224 .fill-B5{fill:#EDF0FD;} + .d2-987145224 .fill-B6{fill:#F7F8FE;} + .d2-987145224 .fill-AA2{fill:#4A6FF3;} + .d2-987145224 .fill-AA4{fill:#EDF0FD;} + .d2-987145224 .fill-AA5{fill:#F7F8FE;} + .d2-987145224 .fill-AB4{fill:#EDF0FD;} + .d2-987145224 .fill-AB5{fill:#F7F8FE;} + .d2-987145224 .stroke-N1{stroke:#0A0F25;} + .d2-987145224 .stroke-N2{stroke:#676C7E;} + .d2-987145224 .stroke-N3{stroke:#9499AB;} + .d2-987145224 .stroke-N4{stroke:#CFD2DD;} + .d2-987145224 .stroke-N5{stroke:#DEE1EB;} + .d2-987145224 .stroke-N6{stroke:#EEF1F8;} + .d2-987145224 .stroke-N7{stroke:#FFFFFF;} + .d2-987145224 .stroke-B1{stroke:#0D32B2;} + .d2-987145224 .stroke-B2{stroke:#0D32B2;} + .d2-987145224 .stroke-B3{stroke:#E3E9FD;} + .d2-987145224 .stroke-B4{stroke:#E3E9FD;} + .d2-987145224 .stroke-B5{stroke:#EDF0FD;} + .d2-987145224 .stroke-B6{stroke:#F7F8FE;} + .d2-987145224 .stroke-AA2{stroke:#4A6FF3;} + .d2-987145224 .stroke-AA4{stroke:#EDF0FD;} + .d2-987145224 .stroke-AA5{stroke:#F7F8FE;} + .d2-987145224 .stroke-AB4{stroke:#EDF0FD;} + .d2-987145224 .stroke-AB5{stroke:#F7F8FE;} + .d2-987145224 .background-color-N1{background-color:#0A0F25;} + .d2-987145224 .background-color-N2{background-color:#676C7E;} + .d2-987145224 .background-color-N3{background-color:#9499AB;} + .d2-987145224 .background-color-N4{background-color:#CFD2DD;} + .d2-987145224 .background-color-N5{background-color:#DEE1EB;} + .d2-987145224 .background-color-N6{background-color:#EEF1F8;} + .d2-987145224 .background-color-N7{background-color:#FFFFFF;} + .d2-987145224 .background-color-B1{background-color:#0D32B2;} + .d2-987145224 .background-color-B2{background-color:#0D32B2;} + .d2-987145224 .background-color-B3{background-color:#E3E9FD;} + .d2-987145224 .background-color-B4{background-color:#E3E9FD;} + .d2-987145224 .background-color-B5{background-color:#EDF0FD;} + .d2-987145224 .background-color-B6{background-color:#F7F8FE;} + .d2-987145224 .background-color-AA2{background-color:#4A6FF3;} + .d2-987145224 .background-color-AA4{background-color:#EDF0FD;} + .d2-987145224 .background-color-AA5{background-color:#F7F8FE;} + .d2-987145224 .background-color-AB4{background-color:#EDF0FD;} + .d2-987145224 .background-color-AB5{background-color:#F7F8FE;} + .d2-987145224 .color-N1{color:#0A0F25;} + .d2-987145224 .color-N2{color:#676C7E;} + .d2-987145224 .color-N3{color:#9499AB;} + .d2-987145224 .color-N4{color:#CFD2DD;} + .d2-987145224 .color-N5{color:#DEE1EB;} + .d2-987145224 .color-N6{color:#EEF1F8;} + .d2-987145224 .color-N7{color:#FFFFFF;} + .d2-987145224 .color-B1{color:#0D32B2;} + .d2-987145224 .color-B2{color:#0D32B2;} + .d2-987145224 .color-B3{color:#E3E9FD;} + .d2-987145224 .color-B4{color:#E3E9FD;} + .d2-987145224 .color-B5{color:#EDF0FD;} + .d2-987145224 .color-B6{color:#F7F8FE;} + .d2-987145224 .color-AA2{color:#4A6FF3;} + .d2-987145224 .color-AA4{color:#EDF0FD;} + .d2-987145224 .color-AA5{color:#F7F8FE;} + .d2-987145224 .color-AB4{color:#EDF0FD;} + .d2-987145224 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-987145224);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-987145224);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-987145224);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-987145224);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-987145224);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-987145224);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-987145224);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-987145224);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-987145224);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-987145224);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-987145224);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-987145224);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-987145224);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-987145224);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-987145224);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-987145224);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-987145224);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-987145224);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>aaccbbdd - - - - + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/nested_shape_labels/elk/board.exp.json b/e2etests/testdata/stable/nested_shape_labels/elk/board.exp.json index f9ebb73f3..b87fc8a4b 100644 --- a/e2etests/testdata/stable/nested_shape_labels/elk/board.exp.json +++ b/e2etests/testdata/stable/nested_shape_labels/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "AA4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "N4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "N4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -184,6 +196,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/nested_shape_labels/elk/sketch.exp.svg b/e2etests/testdata/stable/nested_shape_labels/elk/sketch.exp.svg index 4414c8226..4a0fccede 100644 --- a/e2etests/testdata/stable/nested_shape_labels/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/nested_shape_labels/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -aaccbbdd + .d2-2187683597 .fill-N1{fill:#0A0F25;} + .d2-2187683597 .fill-N2{fill:#676C7E;} + .d2-2187683597 .fill-N3{fill:#9499AB;} + .d2-2187683597 .fill-N4{fill:#CFD2DD;} + .d2-2187683597 .fill-N5{fill:#DEE1EB;} + .d2-2187683597 .fill-N6{fill:#EEF1F8;} + .d2-2187683597 .fill-N7{fill:#FFFFFF;} + .d2-2187683597 .fill-B1{fill:#0D32B2;} + .d2-2187683597 .fill-B2{fill:#0D32B2;} + .d2-2187683597 .fill-B3{fill:#E3E9FD;} + .d2-2187683597 .fill-B4{fill:#E3E9FD;} + .d2-2187683597 .fill-B5{fill:#EDF0FD;} + .d2-2187683597 .fill-B6{fill:#F7F8FE;} + .d2-2187683597 .fill-AA2{fill:#4A6FF3;} + .d2-2187683597 .fill-AA4{fill:#EDF0FD;} + .d2-2187683597 .fill-AA5{fill:#F7F8FE;} + .d2-2187683597 .fill-AB4{fill:#EDF0FD;} + .d2-2187683597 .fill-AB5{fill:#F7F8FE;} + .d2-2187683597 .stroke-N1{stroke:#0A0F25;} + .d2-2187683597 .stroke-N2{stroke:#676C7E;} + .d2-2187683597 .stroke-N3{stroke:#9499AB;} + .d2-2187683597 .stroke-N4{stroke:#CFD2DD;} + .d2-2187683597 .stroke-N5{stroke:#DEE1EB;} + .d2-2187683597 .stroke-N6{stroke:#EEF1F8;} + .d2-2187683597 .stroke-N7{stroke:#FFFFFF;} + .d2-2187683597 .stroke-B1{stroke:#0D32B2;} + .d2-2187683597 .stroke-B2{stroke:#0D32B2;} + .d2-2187683597 .stroke-B3{stroke:#E3E9FD;} + .d2-2187683597 .stroke-B4{stroke:#E3E9FD;} + .d2-2187683597 .stroke-B5{stroke:#EDF0FD;} + .d2-2187683597 .stroke-B6{stroke:#F7F8FE;} + .d2-2187683597 .stroke-AA2{stroke:#4A6FF3;} + .d2-2187683597 .stroke-AA4{stroke:#EDF0FD;} + .d2-2187683597 .stroke-AA5{stroke:#F7F8FE;} + .d2-2187683597 .stroke-AB4{stroke:#EDF0FD;} + .d2-2187683597 .stroke-AB5{stroke:#F7F8FE;} + .d2-2187683597 .background-color-N1{background-color:#0A0F25;} + .d2-2187683597 .background-color-N2{background-color:#676C7E;} + .d2-2187683597 .background-color-N3{background-color:#9499AB;} + .d2-2187683597 .background-color-N4{background-color:#CFD2DD;} + .d2-2187683597 .background-color-N5{background-color:#DEE1EB;} + .d2-2187683597 .background-color-N6{background-color:#EEF1F8;} + .d2-2187683597 .background-color-N7{background-color:#FFFFFF;} + .d2-2187683597 .background-color-B1{background-color:#0D32B2;} + .d2-2187683597 .background-color-B2{background-color:#0D32B2;} + .d2-2187683597 .background-color-B3{background-color:#E3E9FD;} + .d2-2187683597 .background-color-B4{background-color:#E3E9FD;} + .d2-2187683597 .background-color-B5{background-color:#EDF0FD;} + .d2-2187683597 .background-color-B6{background-color:#F7F8FE;} + .d2-2187683597 .background-color-AA2{background-color:#4A6FF3;} + .d2-2187683597 .background-color-AA4{background-color:#EDF0FD;} + .d2-2187683597 .background-color-AA5{background-color:#F7F8FE;} + .d2-2187683597 .background-color-AB4{background-color:#EDF0FD;} + .d2-2187683597 .background-color-AB5{background-color:#F7F8FE;} + .d2-2187683597 .color-N1{color:#0A0F25;} + .d2-2187683597 .color-N2{color:#676C7E;} + .d2-2187683597 .color-N3{color:#9499AB;} + .d2-2187683597 .color-N4{color:#CFD2DD;} + .d2-2187683597 .color-N5{color:#DEE1EB;} + .d2-2187683597 .color-N6{color:#EEF1F8;} + .d2-2187683597 .color-N7{color:#FFFFFF;} + .d2-2187683597 .color-B1{color:#0D32B2;} + .d2-2187683597 .color-B2{color:#0D32B2;} + .d2-2187683597 .color-B3{color:#E3E9FD;} + .d2-2187683597 .color-B4{color:#E3E9FD;} + .d2-2187683597 .color-B5{color:#EDF0FD;} + .d2-2187683597 .color-B6{color:#F7F8FE;} + .d2-2187683597 .color-AA2{color:#4A6FF3;} + .d2-2187683597 .color-AA4{color:#EDF0FD;} + .d2-2187683597 .color-AA5{color:#F7F8FE;} + .d2-2187683597 .color-AB4{color:#EDF0FD;} + .d2-2187683597 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2187683597);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2187683597);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2187683597);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2187683597);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2187683597);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2187683597);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2187683597);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2187683597);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2187683597);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2187683597);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2187683597);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2187683597);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2187683597);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2187683597);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2187683597);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2187683597);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2187683597);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2187683597);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>aaccbbdd - - - - + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/nesting_power/dagre/board.exp.json b/e2etests/testdata/stable/nesting_power/dagre/board.exp.json index 4ac89c233..6b841b003 100644 --- a/e2etests/testdata/stable/nesting_power/dagre/board.exp.json +++ b/e2etests/testdata/stable/nesting_power/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -715,6 +740,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -756,6 +782,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -796,6 +823,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -837,6 +865,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -878,6 +907,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -919,6 +949,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -960,6 +991,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1001,6 +1033,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1042,6 +1075,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1083,6 +1117,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1124,6 +1159,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1165,6 +1201,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1206,6 +1243,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1247,6 +1285,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1288,6 +1327,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1329,6 +1369,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1370,6 +1411,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -1411,6 +1453,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -1452,6 +1495,7 @@ "borderRadius": 0, "fill": "AB5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -1493,6 +1537,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -1534,6 +1579,7 @@ "borderRadius": 0, "fill": "AB5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -1575,6 +1621,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -1616,6 +1663,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -1657,6 +1705,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -1698,6 +1747,7 @@ "borderRadius": 0, "fill": "AB5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -1739,6 +1789,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -1780,6 +1831,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -1821,6 +1873,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -1862,6 +1915,7 @@ "borderRadius": 0, "fill": "N4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -1903,6 +1957,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -1944,6 +1999,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -1985,6 +2041,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -2026,6 +2083,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -2068,6 +2126,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2109,6 +2168,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2150,6 +2210,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2191,6 +2252,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2232,6 +2294,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2273,6 +2336,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2314,6 +2378,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2355,6 +2420,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2396,6 +2462,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2437,6 +2504,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2478,6 +2546,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2518,6 +2587,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2559,6 +2629,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2600,6 +2671,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2641,6 +2713,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2682,6 +2755,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2723,6 +2797,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2764,6 +2839,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2805,6 +2881,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2846,6 +2923,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2887,6 +2965,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2928,6 +3007,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2969,6 +3049,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3010,6 +3091,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3051,6 +3133,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3092,6 +3175,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3133,6 +3217,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3174,6 +3259,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3215,6 +3301,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3256,6 +3343,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3297,6 +3385,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "red", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3338,6 +3427,7 @@ "borderRadius": 0, "fill": "yellow", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3378,6 +3468,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3419,6 +3510,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3459,6 +3551,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3500,6 +3593,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3540,6 +3634,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3580,6 +3675,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3621,6 +3717,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3661,6 +3758,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3701,6 +3799,7 @@ "borderRadius": 0, "fill": "N6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3741,6 +3840,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3782,6 +3882,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3822,6 +3923,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3862,6 +3964,7 @@ "borderRadius": 0, "fill": "N6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3902,6 +4005,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3942,6 +4046,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3983,6 +4088,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4023,6 +4129,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4063,6 +4170,7 @@ "borderRadius": 0, "fill": "N6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4103,6 +4211,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4143,6 +4252,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4183,6 +4293,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4223,6 +4334,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4264,6 +4376,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4305,6 +4418,7 @@ "borderRadius": 0, "fill": "orange", "stroke": "#53C0D8", + "animated": false, "shadow": true, "3d": false, "multiple": false, @@ -4346,6 +4460,7 @@ "borderRadius": 0, "fill": "red", "stroke": "black", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -4387,6 +4502,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4428,6 +4544,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4469,6 +4586,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4510,6 +4628,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4551,6 +4670,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4591,6 +4711,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4632,6 +4753,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4672,6 +4794,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4713,6 +4836,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4753,6 +4877,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4794,6 +4919,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4834,6 +4960,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4874,6 +5001,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4915,6 +5043,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4955,6 +5084,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4996,6 +5126,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5037,6 +5168,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5078,6 +5210,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "red", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5119,6 +5252,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5160,6 +5294,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5201,6 +5336,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5242,6 +5378,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5283,6 +5420,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5324,6 +5462,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5364,6 +5503,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5404,6 +5544,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5444,6 +5585,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5484,6 +5626,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5524,6 +5667,7 @@ "borderRadius": 0, "fill": "N6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5564,6 +5708,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5604,6 +5749,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5644,6 +5790,7 @@ "borderRadius": 0, "fill": "N6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5684,6 +5831,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5724,6 +5872,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5764,6 +5913,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5804,6 +5954,7 @@ "borderRadius": 0, "fill": "N6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5844,6 +5995,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5884,6 +6036,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5924,6 +6077,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5964,6 +6118,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6004,6 +6159,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6045,6 +6201,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6086,6 +6243,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6127,6 +6285,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6178,6 +6337,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -1937.5, @@ -6225,6 +6385,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -1670, @@ -6272,6 +6433,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": -2380, @@ -6319,6 +6481,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": -2197.5, @@ -6366,6 +6529,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": -1967, @@ -6413,6 +6577,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": -2380, @@ -6508,6 +6673,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": -2197.5, @@ -6579,6 +6745,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -1306, @@ -6617,6 +6784,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -1408, @@ -6655,6 +6823,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -1408, @@ -6693,6 +6862,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -1408, @@ -6731,6 +6901,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -1408, @@ -6769,6 +6940,7 @@ "labelHeight": 31, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": -1024, @@ -6807,6 +6979,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -922, @@ -6845,6 +7018,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -772, @@ -6883,6 +7057,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -592, @@ -6921,6 +7096,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -437.5, @@ -6959,6 +7135,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -437.5, @@ -6997,6 +7174,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -332.5, @@ -7038,6 +7216,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -220, @@ -7079,6 +7258,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -1366, @@ -7120,6 +7300,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": -1450, @@ -7161,6 +7342,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": -1449.5, @@ -7199,6 +7381,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 288.75, @@ -7246,6 +7429,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 249.5, @@ -7293,6 +7477,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 249.5, @@ -7340,6 +7525,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 473, @@ -7387,6 +7573,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 473, @@ -7434,6 +7621,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1160, @@ -7481,6 +7669,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1160, @@ -7528,6 +7717,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2181, @@ -7575,6 +7765,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2181, @@ -7622,6 +7813,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2387, @@ -7669,6 +7861,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2387, @@ -7716,6 +7909,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2579, @@ -7763,6 +7957,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 144, @@ -7810,6 +8005,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 297, @@ -7857,6 +8053,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 297, @@ -7904,6 +8101,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 399, @@ -7951,6 +8149,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 246, @@ -7998,6 +8197,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 246, @@ -8045,6 +8245,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 175.25, @@ -8092,6 +8293,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 152.5, @@ -8139,6 +8341,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 198, @@ -8186,6 +8389,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 402.25, @@ -8233,6 +8437,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 379.5, @@ -8280,6 +8485,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 425, @@ -8330,6 +8536,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 3770.5, @@ -8371,6 +8578,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 3918, @@ -8412,6 +8620,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 4059.5, @@ -8453,6 +8662,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 4183, @@ -8491,6 +8701,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1094.25, @@ -8538,6 +8749,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 698, @@ -8576,6 +8788,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 864, @@ -8614,6 +8827,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1018, @@ -8652,6 +8866,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1175, @@ -8690,6 +8905,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1014, @@ -8728,6 +8944,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1332, @@ -8766,6 +8983,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 704, @@ -8804,6 +9022,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1450.5, @@ -8842,6 +9061,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 698, @@ -8880,6 +9100,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 2623.25, @@ -8928,6 +9149,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1826, @@ -8969,6 +9191,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1958.5, @@ -9007,6 +9230,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1771, @@ -9045,6 +9269,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1771, @@ -9083,6 +9308,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1771, @@ -9121,6 +9347,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1771, @@ -9159,6 +9386,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1771, @@ -9197,6 +9425,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1925, @@ -9235,6 +9464,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 2238, @@ -9273,6 +9503,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1765, @@ -9311,6 +9542,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2511, @@ -9358,6 +9590,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2101.5, @@ -9405,6 +9638,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2638, @@ -9452,6 +9686,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 3047, @@ -9499,6 +9734,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 3426, @@ -9537,6 +9773,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 3085, @@ -9575,6 +9812,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2931, @@ -9613,6 +9851,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 3089, @@ -9651,6 +9890,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2810, @@ -9689,6 +9929,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2648, @@ -9727,6 +9968,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 3231.5, @@ -9765,6 +10007,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2642, @@ -9806,6 +10049,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1703, @@ -9847,6 +10091,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 299, @@ -9888,6 +10133,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1201, @@ -9929,6 +10175,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 451, @@ -9970,6 +10217,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 451, @@ -10011,6 +10259,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 429, @@ -10052,6 +10301,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2584, @@ -10093,6 +10343,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 2640, @@ -10134,6 +10385,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": -1366, @@ -10175,6 +10427,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": -253, @@ -10213,6 +10466,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -922, @@ -10251,6 +10505,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -772, @@ -10289,6 +10544,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -598, @@ -10327,6 +10583,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -297, @@ -10365,6 +10622,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -332.5, @@ -10403,6 +10661,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -182, @@ -10441,6 +10700,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 698, @@ -10479,6 +10739,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 858, @@ -10517,6 +10778,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1008, @@ -10555,6 +10817,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1161, @@ -10593,6 +10856,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1314, @@ -10631,6 +10895,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1472.5, @@ -10669,6 +10934,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1765, @@ -10707,6 +10973,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1925, @@ -10745,6 +11012,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2075, @@ -10783,6 +11051,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2228, @@ -10821,6 +11090,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2438, @@ -10859,6 +11129,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2642, @@ -10897,6 +11168,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2792, @@ -10935,6 +11207,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2945, @@ -10973,6 +11246,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 3095, @@ -11011,6 +11285,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 3253.5, @@ -11049,6 +11324,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 3432, @@ -11080,6 +11356,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/nesting_power/dagre/sketch.exp.svg b/e2etests/testdata/stable/nesting_power/dagre/sketch.exp.svg index e14ed0b14..a7cfde624 100644 --- a/e2etests/testdata/stable/nesting_power/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/nesting_power/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ - + .d2-2048267517 .fill-N1{fill:#0A0F25;} + .d2-2048267517 .fill-N2{fill:#676C7E;} + .d2-2048267517 .fill-N3{fill:#9499AB;} + .d2-2048267517 .fill-N4{fill:#CFD2DD;} + .d2-2048267517 .fill-N5{fill:#DEE1EB;} + .d2-2048267517 .fill-N6{fill:#EEF1F8;} + .d2-2048267517 .fill-N7{fill:#FFFFFF;} + .d2-2048267517 .fill-B1{fill:#0D32B2;} + .d2-2048267517 .fill-B2{fill:#0D32B2;} + .d2-2048267517 .fill-B3{fill:#E3E9FD;} + .d2-2048267517 .fill-B4{fill:#E3E9FD;} + .d2-2048267517 .fill-B5{fill:#EDF0FD;} + .d2-2048267517 .fill-B6{fill:#F7F8FE;} + .d2-2048267517 .fill-AA2{fill:#4A6FF3;} + .d2-2048267517 .fill-AA4{fill:#EDF0FD;} + .d2-2048267517 .fill-AA5{fill:#F7F8FE;} + .d2-2048267517 .fill-AB4{fill:#EDF0FD;} + .d2-2048267517 .fill-AB5{fill:#F7F8FE;} + .d2-2048267517 .stroke-N1{stroke:#0A0F25;} + .d2-2048267517 .stroke-N2{stroke:#676C7E;} + .d2-2048267517 .stroke-N3{stroke:#9499AB;} + .d2-2048267517 .stroke-N4{stroke:#CFD2DD;} + .d2-2048267517 .stroke-N5{stroke:#DEE1EB;} + .d2-2048267517 .stroke-N6{stroke:#EEF1F8;} + .d2-2048267517 .stroke-N7{stroke:#FFFFFF;} + .d2-2048267517 .stroke-B1{stroke:#0D32B2;} + .d2-2048267517 .stroke-B2{stroke:#0D32B2;} + .d2-2048267517 .stroke-B3{stroke:#E3E9FD;} + .d2-2048267517 .stroke-B4{stroke:#E3E9FD;} + .d2-2048267517 .stroke-B5{stroke:#EDF0FD;} + .d2-2048267517 .stroke-B6{stroke:#F7F8FE;} + .d2-2048267517 .stroke-AA2{stroke:#4A6FF3;} + .d2-2048267517 .stroke-AA4{stroke:#EDF0FD;} + .d2-2048267517 .stroke-AA5{stroke:#F7F8FE;} + .d2-2048267517 .stroke-AB4{stroke:#EDF0FD;} + .d2-2048267517 .stroke-AB5{stroke:#F7F8FE;} + .d2-2048267517 .background-color-N1{background-color:#0A0F25;} + .d2-2048267517 .background-color-N2{background-color:#676C7E;} + .d2-2048267517 .background-color-N3{background-color:#9499AB;} + .d2-2048267517 .background-color-N4{background-color:#CFD2DD;} + .d2-2048267517 .background-color-N5{background-color:#DEE1EB;} + .d2-2048267517 .background-color-N6{background-color:#EEF1F8;} + .d2-2048267517 .background-color-N7{background-color:#FFFFFF;} + .d2-2048267517 .background-color-B1{background-color:#0D32B2;} + .d2-2048267517 .background-color-B2{background-color:#0D32B2;} + .d2-2048267517 .background-color-B3{background-color:#E3E9FD;} + .d2-2048267517 .background-color-B4{background-color:#E3E9FD;} + .d2-2048267517 .background-color-B5{background-color:#EDF0FD;} + .d2-2048267517 .background-color-B6{background-color:#F7F8FE;} + .d2-2048267517 .background-color-AA2{background-color:#4A6FF3;} + .d2-2048267517 .background-color-AA4{background-color:#EDF0FD;} + .d2-2048267517 .background-color-AA5{background-color:#F7F8FE;} + .d2-2048267517 .background-color-AB4{background-color:#EDF0FD;} + .d2-2048267517 .background-color-AB5{background-color:#F7F8FE;} + .d2-2048267517 .color-N1{color:#0A0F25;} + .d2-2048267517 .color-N2{color:#676C7E;} + .d2-2048267517 .color-N3{color:#9499AB;} + .d2-2048267517 .color-N4{color:#CFD2DD;} + .d2-2048267517 .color-N5{color:#DEE1EB;} + .d2-2048267517 .color-N6{color:#EEF1F8;} + .d2-2048267517 .color-N7{color:#FFFFFF;} + .d2-2048267517 .color-B1{color:#0D32B2;} + .d2-2048267517 .color-B2{color:#0D32B2;} + .d2-2048267517 .color-B3{color:#E3E9FD;} + .d2-2048267517 .color-B4{color:#E3E9FD;} + .d2-2048267517 .color-B5{color:#EDF0FD;} + .d2-2048267517 .color-B6{color:#F7F8FE;} + .d2-2048267517 .color-AA2{color:#4A6FF3;} + .d2-2048267517 .color-AA4{color:#EDF0FD;} + .d2-2048267517 .color-AA5{color:#F7F8FE;} + .d2-2048267517 .color-AB4{color:#EDF0FD;} + .d2-2048267517 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2048267517);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2048267517);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2048267517);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2048267517);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2048267517);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2048267517);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2048267517);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2048267517);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2048267517);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2048267517);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2048267517);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2048267517);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2048267517);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2048267517);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2048267517);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2048267517);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2048267517);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2048267517);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> @@ -111,142 +111,142 @@ -Left Constant NearcenterdirectionsRight Constant NearseqmoreBottom Left Constant Neardefaultlayouthererectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrightleftisconstantandalsogridscoreritemResponseitemessayRubricconceptitemOutcomestylishcontaineradagreelktalathisisgrid12341234updownnearax +Left Constant NearcenterdirectionsRight Constant NearseqmoreBottom Left Constant Neardefaultlayouthererectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrightleftisconstantandalsogridscoreritemResponseitemessayRubricconceptitemOutcomestylishcontaineradagreelktalathisisgrid12341234updownnearax -ya_sequencea_shapesequencefinallybrow 1row 2row 3row 4row 5withasequence diagramyou canchild of is12341234scoreritemResponseitemessayRubricconceptsequencefrom one constant nearhaveanothergridhere andgrandchildscorerconceptessayRubricitemitemOutcomeitemResponse123continuenesting ororruns thisruns thisruns thisA straight edge across straight edge across nested typesdefault layoutdefault layoutdefault layout in styleto inside sequence diagramto inside sequence diagramto inside sequence diagramto constant nearfrom within constant nearto another getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)score +    y    a_sequencea_shapesequencefinallybrow 1row 2row 3row 4row 5withasequence diagramyou canchild of is12341234scoreritemResponseitemessayRubricconceptsequencefrom one constant nearhaveanothergridhere andgrandchildscorerconceptessayRubricitemitemOutcomeitemResponse123continuenesting ororruns thisruns thisruns thisA straight edge across straight edge across nested typesdefault layoutdefault layoutdefault layout in styleto inside sequence diagramto inside sequence diagramto inside sequence diagramto constant nearfrom within constant nearto another getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)score - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/nesting_power/elk/board.exp.json b/e2etests/testdata/stable/nesting_power/elk/board.exp.json index 2f3eb3fde..c71aa490b 100644 --- a/e2etests/testdata/stable/nesting_power/elk/board.exp.json +++ b/e2etests/testdata/stable/nesting_power/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -715,6 +740,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -756,6 +782,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -796,6 +823,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -837,6 +865,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -878,6 +907,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -919,6 +949,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -960,6 +991,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1001,6 +1033,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1042,6 +1075,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1083,6 +1117,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1124,6 +1159,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1165,6 +1201,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1206,6 +1243,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1247,6 +1285,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1288,6 +1327,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1329,6 +1369,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1370,6 +1411,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -1411,6 +1453,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -1452,6 +1495,7 @@ "borderRadius": 0, "fill": "AB5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -1493,6 +1537,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -1534,6 +1579,7 @@ "borderRadius": 0, "fill": "AB5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -1575,6 +1621,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -1616,6 +1663,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -1657,6 +1705,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -1698,6 +1747,7 @@ "borderRadius": 0, "fill": "AB5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -1739,6 +1789,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -1780,6 +1831,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -1821,6 +1873,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -1862,6 +1915,7 @@ "borderRadius": 0, "fill": "N4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -1903,6 +1957,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -1944,6 +1999,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -1985,6 +2041,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -2026,6 +2083,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -2068,6 +2126,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2109,6 +2168,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2150,6 +2210,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2191,6 +2252,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2232,6 +2294,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2273,6 +2336,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2314,6 +2378,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2355,6 +2420,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2396,6 +2462,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2437,6 +2504,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2478,6 +2546,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2518,6 +2587,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2559,6 +2629,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2600,6 +2671,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2641,6 +2713,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2682,6 +2755,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2723,6 +2797,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2764,6 +2839,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2805,6 +2881,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2846,6 +2923,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2887,6 +2965,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2928,6 +3007,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2969,6 +3049,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3010,6 +3091,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3051,6 +3133,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3092,6 +3175,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3133,6 +3217,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3174,6 +3259,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3215,6 +3301,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3256,6 +3343,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3297,6 +3385,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "red", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3338,6 +3427,7 @@ "borderRadius": 0, "fill": "yellow", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3378,6 +3468,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3419,6 +3510,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3459,6 +3551,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3500,6 +3593,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3540,6 +3634,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3580,6 +3675,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3621,6 +3717,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3661,6 +3758,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3701,6 +3799,7 @@ "borderRadius": 0, "fill": "N6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3741,6 +3840,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3782,6 +3882,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3822,6 +3923,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3862,6 +3964,7 @@ "borderRadius": 0, "fill": "N6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3902,6 +4005,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3942,6 +4046,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -3983,6 +4088,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4023,6 +4129,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4063,6 +4170,7 @@ "borderRadius": 0, "fill": "N6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4103,6 +4211,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4143,6 +4252,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4183,6 +4293,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4223,6 +4334,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4264,6 +4376,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4305,6 +4418,7 @@ "borderRadius": 0, "fill": "orange", "stroke": "#53C0D8", + "animated": false, "shadow": true, "3d": false, "multiple": false, @@ -4346,6 +4460,7 @@ "borderRadius": 0, "fill": "red", "stroke": "black", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -4387,6 +4502,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4428,6 +4544,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4469,6 +4586,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4510,6 +4628,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4551,6 +4670,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4591,6 +4711,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4632,6 +4753,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4672,6 +4794,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4713,6 +4836,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4753,6 +4877,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4794,6 +4919,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4834,6 +4960,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4874,6 +5001,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4915,6 +5043,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4955,6 +5084,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -4996,6 +5126,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5037,6 +5168,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5078,6 +5210,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "red", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5119,6 +5252,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5160,6 +5294,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5201,6 +5336,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5242,6 +5378,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5283,6 +5420,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5324,6 +5462,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5364,6 +5503,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5404,6 +5544,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5444,6 +5585,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5484,6 +5626,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5524,6 +5667,7 @@ "borderRadius": 0, "fill": "N6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5564,6 +5708,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5604,6 +5749,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5644,6 +5790,7 @@ "borderRadius": 0, "fill": "N6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5684,6 +5831,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5724,6 +5872,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5764,6 +5913,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5804,6 +5954,7 @@ "borderRadius": 0, "fill": "N6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5844,6 +5995,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5884,6 +6036,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5924,6 +6077,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -5964,6 +6118,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6004,6 +6159,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6045,6 +6201,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6086,6 +6243,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6127,6 +6285,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -6178,6 +6337,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -2092, @@ -6216,6 +6376,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -1730, @@ -6254,6 +6415,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": -2614, @@ -6292,6 +6454,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": -2381, @@ -6338,6 +6501,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": -2142, @@ -6384,6 +6548,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": -2614, @@ -6430,6 +6595,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": -2381, @@ -6476,6 +6642,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -1396, @@ -6514,6 +6681,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -1498, @@ -6552,6 +6720,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -1498, @@ -6590,6 +6759,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -1498, @@ -6628,6 +6798,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -1498, @@ -6666,6 +6837,7 @@ "labelHeight": 31, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": -1034, @@ -6704,6 +6876,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -932, @@ -6742,6 +6915,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -782, @@ -6780,6 +6954,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -602, @@ -6818,6 +6993,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -447.5, @@ -6856,6 +7032,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -447.5, @@ -6894,6 +7071,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -342.5, @@ -6935,6 +7113,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -230, @@ -6976,6 +7155,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -1456, @@ -7017,6 +7197,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": -1540, @@ -7058,6 +7239,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": -1539.5, @@ -7096,6 +7278,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 790.5, @@ -7142,6 +7325,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 627, @@ -7180,6 +7364,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 627, @@ -7218,6 +7403,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 810, @@ -7256,6 +7442,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 811, @@ -7294,6 +7481,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1009, @@ -7332,6 +7520,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1009, @@ -7370,6 +7559,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1166, @@ -7408,6 +7598,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1166, @@ -7446,6 +7637,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1321, @@ -7484,6 +7676,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1322, @@ -7522,6 +7715,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1494, @@ -7560,6 +7754,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 174, @@ -7598,6 +7793,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 297, @@ -7644,6 +7840,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 297, @@ -7690,6 +7887,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 379, @@ -7728,6 +7926,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 256, @@ -7774,6 +7973,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 256, @@ -7820,6 +8020,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 185.25, @@ -7858,6 +8059,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 171.91600036621094, @@ -7904,6 +8106,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 198.58299255371094, @@ -7950,6 +8153,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 412.25, @@ -7988,6 +8192,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 398.9159851074219, @@ -8034,6 +8239,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 425.5830078125, @@ -8083,6 +8289,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 3750.5, @@ -8124,6 +8331,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 3918, @@ -8165,6 +8373,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 4079.5, @@ -8206,6 +8415,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 4223, @@ -8244,6 +8454,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1064.5, @@ -8282,6 +8493,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 668, @@ -8320,6 +8532,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 834, @@ -8358,6 +8571,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 988, @@ -8396,6 +8610,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1145, @@ -8434,6 +8649,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 984, @@ -8472,6 +8688,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1302, @@ -8510,6 +8727,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 674, @@ -8548,6 +8766,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1420.5, @@ -8586,6 +8805,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 668, @@ -8624,6 +8844,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1338.5, @@ -8671,6 +8892,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1756, @@ -8712,6 +8934,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1889.5, @@ -8750,6 +8973,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1721, @@ -8788,6 +9012,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1721, @@ -8826,6 +9051,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1721, @@ -8864,6 +9090,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1721, @@ -8902,6 +9129,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1721, @@ -8940,6 +9168,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1875, @@ -8978,6 +9207,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 2188, @@ -9016,6 +9246,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1715, @@ -9054,6 +9285,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2497, @@ -9100,6 +9332,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2051.5, @@ -9146,6 +9379,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2541, @@ -9184,6 +9418,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2538, @@ -9222,6 +9457,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 3366, @@ -9260,6 +9496,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 3025, @@ -9298,6 +9535,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2871, @@ -9336,6 +9574,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 3029, @@ -9374,6 +9613,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2750, @@ -9412,6 +9652,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2588, @@ -9450,6 +9691,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 3171.5, @@ -9488,6 +9730,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2582, @@ -9529,6 +9772,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1653, @@ -9570,6 +9814,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 309, @@ -9611,6 +9856,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1045, @@ -9652,6 +9898,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 431, @@ -9693,6 +9940,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 431, @@ -9734,6 +9982,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 452, @@ -9775,6 +10024,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1538, @@ -9816,6 +10066,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 2585, @@ -9857,6 +10108,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": -1455.75, @@ -9898,6 +10150,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": -318, @@ -9936,6 +10189,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -932, @@ -9974,6 +10228,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -782, @@ -10012,6 +10267,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -608, @@ -10050,6 +10306,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -307, @@ -10088,6 +10345,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -342.5, @@ -10126,6 +10384,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": -192, @@ -10164,6 +10423,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 668, @@ -10202,6 +10462,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 828, @@ -10240,6 +10501,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 978, @@ -10278,6 +10540,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1131, @@ -10316,6 +10579,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1284, @@ -10354,6 +10618,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1442.5, @@ -10392,6 +10657,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1715, @@ -10430,6 +10696,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1875, @@ -10468,6 +10735,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2025, @@ -10506,6 +10774,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2178, @@ -10544,6 +10813,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2388, @@ -10582,6 +10852,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2582, @@ -10620,6 +10891,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2732, @@ -10658,6 +10930,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2885, @@ -10696,6 +10969,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 3035, @@ -10734,6 +11008,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 3193.5, @@ -10772,6 +11047,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 3372, @@ -10803,6 +11079,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/nesting_power/elk/sketch.exp.svg b/e2etests/testdata/stable/nesting_power/elk/sketch.exp.svg index 0e848cb40..39f3aef5c 100644 --- a/e2etests/testdata/stable/nesting_power/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/nesting_power/elk/sketch.exp.svg @@ -1,23 +1,23 @@ - + .d2-1360173770 .fill-N1{fill:#0A0F25;} + .d2-1360173770 .fill-N2{fill:#676C7E;} + .d2-1360173770 .fill-N3{fill:#9499AB;} + .d2-1360173770 .fill-N4{fill:#CFD2DD;} + .d2-1360173770 .fill-N5{fill:#DEE1EB;} + .d2-1360173770 .fill-N6{fill:#EEF1F8;} + .d2-1360173770 .fill-N7{fill:#FFFFFF;} + .d2-1360173770 .fill-B1{fill:#0D32B2;} + .d2-1360173770 .fill-B2{fill:#0D32B2;} + .d2-1360173770 .fill-B3{fill:#E3E9FD;} + .d2-1360173770 .fill-B4{fill:#E3E9FD;} + .d2-1360173770 .fill-B5{fill:#EDF0FD;} + .d2-1360173770 .fill-B6{fill:#F7F8FE;} + .d2-1360173770 .fill-AA2{fill:#4A6FF3;} + .d2-1360173770 .fill-AA4{fill:#EDF0FD;} + .d2-1360173770 .fill-AA5{fill:#F7F8FE;} + .d2-1360173770 .fill-AB4{fill:#EDF0FD;} + .d2-1360173770 .fill-AB5{fill:#F7F8FE;} + .d2-1360173770 .stroke-N1{stroke:#0A0F25;} + .d2-1360173770 .stroke-N2{stroke:#676C7E;} + .d2-1360173770 .stroke-N3{stroke:#9499AB;} + .d2-1360173770 .stroke-N4{stroke:#CFD2DD;} + .d2-1360173770 .stroke-N5{stroke:#DEE1EB;} + .d2-1360173770 .stroke-N6{stroke:#EEF1F8;} + .d2-1360173770 .stroke-N7{stroke:#FFFFFF;} + .d2-1360173770 .stroke-B1{stroke:#0D32B2;} + .d2-1360173770 .stroke-B2{stroke:#0D32B2;} + .d2-1360173770 .stroke-B3{stroke:#E3E9FD;} + .d2-1360173770 .stroke-B4{stroke:#E3E9FD;} + .d2-1360173770 .stroke-B5{stroke:#EDF0FD;} + .d2-1360173770 .stroke-B6{stroke:#F7F8FE;} + .d2-1360173770 .stroke-AA2{stroke:#4A6FF3;} + .d2-1360173770 .stroke-AA4{stroke:#EDF0FD;} + .d2-1360173770 .stroke-AA5{stroke:#F7F8FE;} + .d2-1360173770 .stroke-AB4{stroke:#EDF0FD;} + .d2-1360173770 .stroke-AB5{stroke:#F7F8FE;} + .d2-1360173770 .background-color-N1{background-color:#0A0F25;} + .d2-1360173770 .background-color-N2{background-color:#676C7E;} + .d2-1360173770 .background-color-N3{background-color:#9499AB;} + .d2-1360173770 .background-color-N4{background-color:#CFD2DD;} + .d2-1360173770 .background-color-N5{background-color:#DEE1EB;} + .d2-1360173770 .background-color-N6{background-color:#EEF1F8;} + .d2-1360173770 .background-color-N7{background-color:#FFFFFF;} + .d2-1360173770 .background-color-B1{background-color:#0D32B2;} + .d2-1360173770 .background-color-B2{background-color:#0D32B2;} + .d2-1360173770 .background-color-B3{background-color:#E3E9FD;} + .d2-1360173770 .background-color-B4{background-color:#E3E9FD;} + .d2-1360173770 .background-color-B5{background-color:#EDF0FD;} + .d2-1360173770 .background-color-B6{background-color:#F7F8FE;} + .d2-1360173770 .background-color-AA2{background-color:#4A6FF3;} + .d2-1360173770 .background-color-AA4{background-color:#EDF0FD;} + .d2-1360173770 .background-color-AA5{background-color:#F7F8FE;} + .d2-1360173770 .background-color-AB4{background-color:#EDF0FD;} + .d2-1360173770 .background-color-AB5{background-color:#F7F8FE;} + .d2-1360173770 .color-N1{color:#0A0F25;} + .d2-1360173770 .color-N2{color:#676C7E;} + .d2-1360173770 .color-N3{color:#9499AB;} + .d2-1360173770 .color-N4{color:#CFD2DD;} + .d2-1360173770 .color-N5{color:#DEE1EB;} + .d2-1360173770 .color-N6{color:#EEF1F8;} + .d2-1360173770 .color-N7{color:#FFFFFF;} + .d2-1360173770 .color-B1{color:#0D32B2;} + .d2-1360173770 .color-B2{color:#0D32B2;} + .d2-1360173770 .color-B3{color:#E3E9FD;} + .d2-1360173770 .color-B4{color:#E3E9FD;} + .d2-1360173770 .color-B5{color:#EDF0FD;} + .d2-1360173770 .color-B6{color:#F7F8FE;} + .d2-1360173770 .color-AA2{color:#4A6FF3;} + .d2-1360173770 .color-AA4{color:#EDF0FD;} + .d2-1360173770 .color-AA5{color:#F7F8FE;} + .d2-1360173770 .color-AB4{color:#EDF0FD;} + .d2-1360173770 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1360173770);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1360173770);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1360173770);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1360173770);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1360173770);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1360173770);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1360173770);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1360173770);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1360173770);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1360173770);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1360173770);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1360173770);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1360173770);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1360173770);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1360173770);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1360173770);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1360173770);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1360173770);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> @@ -111,142 +111,142 @@ -Left Constant NearcenterdirectionsRight Constant NearseqmoreBottom Left Constant Neardefaultlayouthererectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrightleftisconstantandalsogridscoreritemResponseitemessayRubricconceptitemOutcomestylishcontaineradagreelktalathisisgrid12341234updownnearax +Left Constant NearcenterdirectionsRight Constant NearseqmoreBottom Left Constant Neardefaultlayouthererectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrightleftisconstantandalsogridscoreritemResponseitemessayRubricconceptitemOutcomestylishcontaineradagreelktalathisisgrid12341234updownnearax -ya_sequencea_shapesequencefinallybrow 1row 2row 3row 4row 5withasequence diagramyou canchild of is12341234scoreritemResponseitemessayRubricconceptsequencefrom one constant nearhaveanothergridhere andgrandchildscorerconceptessayRubricitemitemOutcomeitemResponse123continuenesting ororruns thisruns thisruns thisA straight edge across straight edge across nested typesdefault layoutdefault layoutdefault layout in styleto inside sequence diagramto inside sequence diagramto inside sequence diagramto constant nearfrom within constant nearto another getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)score +    y    a_sequencea_shapesequencefinallybrow 1row 2row 3row 4row 5withasequence diagramyou canchild of is12341234scoreritemResponseitemessayRubricconceptsequencefrom one constant nearhaveanothergridhere andgrandchildscorerconceptessayRubricitemitemOutcomeitemResponse123continuenesting ororruns thisruns thisruns thisA straight edge across straight edge across nested typesdefault layoutdefault layoutdefault layout in styleto inside sequence diagramto inside sequence diagramto inside sequence diagramto constant nearfrom within constant nearto another getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)score - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/number_connections/dagre/board.exp.json b/e2etests/testdata/stable/number_connections/dagre/board.exp.json index 7b55ac709..7300b6102 100644 --- a/e2etests/testdata/stable/number_connections/dagre/board.exp.json +++ b/e2etests/testdata/stable/number_connections/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -192,6 +204,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 26.5, @@ -239,6 +252,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 162, @@ -279,6 +293,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/number_connections/dagre/sketch.exp.svg b/e2etests/testdata/stable/number_connections/dagre/sketch.exp.svg index 4bb7cb82d..19d57b8c7 100644 --- a/e2etests/testdata/stable/number_connections/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/number_connections/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -12Foo Bazhello + .d2-210766368 .fill-N1{fill:#0A0F25;} + .d2-210766368 .fill-N2{fill:#676C7E;} + .d2-210766368 .fill-N3{fill:#9499AB;} + .d2-210766368 .fill-N4{fill:#CFD2DD;} + .d2-210766368 .fill-N5{fill:#DEE1EB;} + .d2-210766368 .fill-N6{fill:#EEF1F8;} + .d2-210766368 .fill-N7{fill:#FFFFFF;} + .d2-210766368 .fill-B1{fill:#0D32B2;} + .d2-210766368 .fill-B2{fill:#0D32B2;} + .d2-210766368 .fill-B3{fill:#E3E9FD;} + .d2-210766368 .fill-B4{fill:#E3E9FD;} + .d2-210766368 .fill-B5{fill:#EDF0FD;} + .d2-210766368 .fill-B6{fill:#F7F8FE;} + .d2-210766368 .fill-AA2{fill:#4A6FF3;} + .d2-210766368 .fill-AA4{fill:#EDF0FD;} + .d2-210766368 .fill-AA5{fill:#F7F8FE;} + .d2-210766368 .fill-AB4{fill:#EDF0FD;} + .d2-210766368 .fill-AB5{fill:#F7F8FE;} + .d2-210766368 .stroke-N1{stroke:#0A0F25;} + .d2-210766368 .stroke-N2{stroke:#676C7E;} + .d2-210766368 .stroke-N3{stroke:#9499AB;} + .d2-210766368 .stroke-N4{stroke:#CFD2DD;} + .d2-210766368 .stroke-N5{stroke:#DEE1EB;} + .d2-210766368 .stroke-N6{stroke:#EEF1F8;} + .d2-210766368 .stroke-N7{stroke:#FFFFFF;} + .d2-210766368 .stroke-B1{stroke:#0D32B2;} + .d2-210766368 .stroke-B2{stroke:#0D32B2;} + .d2-210766368 .stroke-B3{stroke:#E3E9FD;} + .d2-210766368 .stroke-B4{stroke:#E3E9FD;} + .d2-210766368 .stroke-B5{stroke:#EDF0FD;} + .d2-210766368 .stroke-B6{stroke:#F7F8FE;} + .d2-210766368 .stroke-AA2{stroke:#4A6FF3;} + .d2-210766368 .stroke-AA4{stroke:#EDF0FD;} + .d2-210766368 .stroke-AA5{stroke:#F7F8FE;} + .d2-210766368 .stroke-AB4{stroke:#EDF0FD;} + .d2-210766368 .stroke-AB5{stroke:#F7F8FE;} + .d2-210766368 .background-color-N1{background-color:#0A0F25;} + .d2-210766368 .background-color-N2{background-color:#676C7E;} + .d2-210766368 .background-color-N3{background-color:#9499AB;} + .d2-210766368 .background-color-N4{background-color:#CFD2DD;} + .d2-210766368 .background-color-N5{background-color:#DEE1EB;} + .d2-210766368 .background-color-N6{background-color:#EEF1F8;} + .d2-210766368 .background-color-N7{background-color:#FFFFFF;} + .d2-210766368 .background-color-B1{background-color:#0D32B2;} + .d2-210766368 .background-color-B2{background-color:#0D32B2;} + .d2-210766368 .background-color-B3{background-color:#E3E9FD;} + .d2-210766368 .background-color-B4{background-color:#E3E9FD;} + .d2-210766368 .background-color-B5{background-color:#EDF0FD;} + .d2-210766368 .background-color-B6{background-color:#F7F8FE;} + .d2-210766368 .background-color-AA2{background-color:#4A6FF3;} + .d2-210766368 .background-color-AA4{background-color:#EDF0FD;} + .d2-210766368 .background-color-AA5{background-color:#F7F8FE;} + .d2-210766368 .background-color-AB4{background-color:#EDF0FD;} + .d2-210766368 .background-color-AB5{background-color:#F7F8FE;} + .d2-210766368 .color-N1{color:#0A0F25;} + .d2-210766368 .color-N2{color:#676C7E;} + .d2-210766368 .color-N3{color:#9499AB;} + .d2-210766368 .color-N4{color:#CFD2DD;} + .d2-210766368 .color-N5{color:#DEE1EB;} + .d2-210766368 .color-N6{color:#EEF1F8;} + .d2-210766368 .color-N7{color:#FFFFFF;} + .d2-210766368 .color-B1{color:#0D32B2;} + .d2-210766368 .color-B2{color:#0D32B2;} + .d2-210766368 .color-B3{color:#E3E9FD;} + .d2-210766368 .color-B4{color:#E3E9FD;} + .d2-210766368 .color-B5{color:#EDF0FD;} + .d2-210766368 .color-B6{color:#F7F8FE;} + .d2-210766368 .color-AA2{color:#4A6FF3;} + .d2-210766368 .color-AA4{color:#EDF0FD;} + .d2-210766368 .color-AA5{color:#F7F8FE;} + .d2-210766368 .color-AB4{color:#EDF0FD;} + .d2-210766368 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-210766368);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-210766368);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-210766368);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-210766368);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-210766368);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-210766368);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-210766368);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-210766368);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-210766368);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-210766368);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-210766368);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-210766368);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-210766368);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-210766368);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-210766368);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-210766368);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-210766368);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-210766368);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>12Foo Bazhello - - - - + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/number_connections/elk/board.exp.json b/e2etests/testdata/stable/number_connections/elk/board.exp.json index 65a6da4a5..e4b98768b 100644 --- a/e2etests/testdata/stable/number_connections/elk/board.exp.json +++ b/e2etests/testdata/stable/number_connections/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -192,6 +204,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 38.5, @@ -230,6 +243,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 134, @@ -261,6 +275,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/number_connections/elk/sketch.exp.svg b/e2etests/testdata/stable/number_connections/elk/sketch.exp.svg index 805596efc..5514cffd6 100644 --- a/e2etests/testdata/stable/number_connections/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/number_connections/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -12Foo Bazhello + .d2-666023914 .fill-N1{fill:#0A0F25;} + .d2-666023914 .fill-N2{fill:#676C7E;} + .d2-666023914 .fill-N3{fill:#9499AB;} + .d2-666023914 .fill-N4{fill:#CFD2DD;} + .d2-666023914 .fill-N5{fill:#DEE1EB;} + .d2-666023914 .fill-N6{fill:#EEF1F8;} + .d2-666023914 .fill-N7{fill:#FFFFFF;} + .d2-666023914 .fill-B1{fill:#0D32B2;} + .d2-666023914 .fill-B2{fill:#0D32B2;} + .d2-666023914 .fill-B3{fill:#E3E9FD;} + .d2-666023914 .fill-B4{fill:#E3E9FD;} + .d2-666023914 .fill-B5{fill:#EDF0FD;} + .d2-666023914 .fill-B6{fill:#F7F8FE;} + .d2-666023914 .fill-AA2{fill:#4A6FF3;} + .d2-666023914 .fill-AA4{fill:#EDF0FD;} + .d2-666023914 .fill-AA5{fill:#F7F8FE;} + .d2-666023914 .fill-AB4{fill:#EDF0FD;} + .d2-666023914 .fill-AB5{fill:#F7F8FE;} + .d2-666023914 .stroke-N1{stroke:#0A0F25;} + .d2-666023914 .stroke-N2{stroke:#676C7E;} + .d2-666023914 .stroke-N3{stroke:#9499AB;} + .d2-666023914 .stroke-N4{stroke:#CFD2DD;} + .d2-666023914 .stroke-N5{stroke:#DEE1EB;} + .d2-666023914 .stroke-N6{stroke:#EEF1F8;} + .d2-666023914 .stroke-N7{stroke:#FFFFFF;} + .d2-666023914 .stroke-B1{stroke:#0D32B2;} + .d2-666023914 .stroke-B2{stroke:#0D32B2;} + .d2-666023914 .stroke-B3{stroke:#E3E9FD;} + .d2-666023914 .stroke-B4{stroke:#E3E9FD;} + .d2-666023914 .stroke-B5{stroke:#EDF0FD;} + .d2-666023914 .stroke-B6{stroke:#F7F8FE;} + .d2-666023914 .stroke-AA2{stroke:#4A6FF3;} + .d2-666023914 .stroke-AA4{stroke:#EDF0FD;} + .d2-666023914 .stroke-AA5{stroke:#F7F8FE;} + .d2-666023914 .stroke-AB4{stroke:#EDF0FD;} + .d2-666023914 .stroke-AB5{stroke:#F7F8FE;} + .d2-666023914 .background-color-N1{background-color:#0A0F25;} + .d2-666023914 .background-color-N2{background-color:#676C7E;} + .d2-666023914 .background-color-N3{background-color:#9499AB;} + .d2-666023914 .background-color-N4{background-color:#CFD2DD;} + .d2-666023914 .background-color-N5{background-color:#DEE1EB;} + .d2-666023914 .background-color-N6{background-color:#EEF1F8;} + .d2-666023914 .background-color-N7{background-color:#FFFFFF;} + .d2-666023914 .background-color-B1{background-color:#0D32B2;} + .d2-666023914 .background-color-B2{background-color:#0D32B2;} + .d2-666023914 .background-color-B3{background-color:#E3E9FD;} + .d2-666023914 .background-color-B4{background-color:#E3E9FD;} + .d2-666023914 .background-color-B5{background-color:#EDF0FD;} + .d2-666023914 .background-color-B6{background-color:#F7F8FE;} + .d2-666023914 .background-color-AA2{background-color:#4A6FF3;} + .d2-666023914 .background-color-AA4{background-color:#EDF0FD;} + .d2-666023914 .background-color-AA5{background-color:#F7F8FE;} + .d2-666023914 .background-color-AB4{background-color:#EDF0FD;} + .d2-666023914 .background-color-AB5{background-color:#F7F8FE;} + .d2-666023914 .color-N1{color:#0A0F25;} + .d2-666023914 .color-N2{color:#676C7E;} + .d2-666023914 .color-N3{color:#9499AB;} + .d2-666023914 .color-N4{color:#CFD2DD;} + .d2-666023914 .color-N5{color:#DEE1EB;} + .d2-666023914 .color-N6{color:#EEF1F8;} + .d2-666023914 .color-N7{color:#FFFFFF;} + .d2-666023914 .color-B1{color:#0D32B2;} + .d2-666023914 .color-B2{color:#0D32B2;} + .d2-666023914 .color-B3{color:#E3E9FD;} + .d2-666023914 .color-B4{color:#E3E9FD;} + .d2-666023914 .color-B5{color:#EDF0FD;} + .d2-666023914 .color-B6{color:#F7F8FE;} + .d2-666023914 .color-AA2{color:#4A6FF3;} + .d2-666023914 .color-AA4{color:#EDF0FD;} + .d2-666023914 .color-AA5{color:#F7F8FE;} + .d2-666023914 .color-AB4{color:#EDF0FD;} + .d2-666023914 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-666023914);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-666023914);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-666023914);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-666023914);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-666023914);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-666023914);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-666023914);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-666023914);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-666023914);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-666023914);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-666023914);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-666023914);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-666023914);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-666023914);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-666023914);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-666023914);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-666023914);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-666023914);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>12Foo Bazhello - - - - + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/one_container_loop/dagre/board.exp.json b/e2etests/testdata/stable/one_container_loop/dagre/board.exp.json index 16ddc4df3..eaa366049 100644 --- a/e2etests/testdata/stable/one_container_loop/dagre/board.exp.json +++ b/e2etests/testdata/stable/one_container_loop/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -356,6 +372,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 66.5, @@ -475,6 +492,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 156.5, @@ -522,6 +540,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 270, @@ -569,6 +588,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 156.5, @@ -616,6 +636,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 270, @@ -699,6 +720,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 156.5, @@ -746,6 +768,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 190.5, @@ -786,6 +809,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/one_container_loop/dagre/sketch.exp.svg b/e2etests/testdata/stable/one_container_loop/dagre/sketch.exp.svg index 5a1188454..352811f52 100644 --- a/e2etests/testdata/stable/one_container_loop/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/one_container_loop/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -acdefgbh + .d2-90893687 .fill-N1{fill:#0A0F25;} + .d2-90893687 .fill-N2{fill:#676C7E;} + .d2-90893687 .fill-N3{fill:#9499AB;} + .d2-90893687 .fill-N4{fill:#CFD2DD;} + .d2-90893687 .fill-N5{fill:#DEE1EB;} + .d2-90893687 .fill-N6{fill:#EEF1F8;} + .d2-90893687 .fill-N7{fill:#FFFFFF;} + .d2-90893687 .fill-B1{fill:#0D32B2;} + .d2-90893687 .fill-B2{fill:#0D32B2;} + .d2-90893687 .fill-B3{fill:#E3E9FD;} + .d2-90893687 .fill-B4{fill:#E3E9FD;} + .d2-90893687 .fill-B5{fill:#EDF0FD;} + .d2-90893687 .fill-B6{fill:#F7F8FE;} + .d2-90893687 .fill-AA2{fill:#4A6FF3;} + .d2-90893687 .fill-AA4{fill:#EDF0FD;} + .d2-90893687 .fill-AA5{fill:#F7F8FE;} + .d2-90893687 .fill-AB4{fill:#EDF0FD;} + .d2-90893687 .fill-AB5{fill:#F7F8FE;} + .d2-90893687 .stroke-N1{stroke:#0A0F25;} + .d2-90893687 .stroke-N2{stroke:#676C7E;} + .d2-90893687 .stroke-N3{stroke:#9499AB;} + .d2-90893687 .stroke-N4{stroke:#CFD2DD;} + .d2-90893687 .stroke-N5{stroke:#DEE1EB;} + .d2-90893687 .stroke-N6{stroke:#EEF1F8;} + .d2-90893687 .stroke-N7{stroke:#FFFFFF;} + .d2-90893687 .stroke-B1{stroke:#0D32B2;} + .d2-90893687 .stroke-B2{stroke:#0D32B2;} + .d2-90893687 .stroke-B3{stroke:#E3E9FD;} + .d2-90893687 .stroke-B4{stroke:#E3E9FD;} + .d2-90893687 .stroke-B5{stroke:#EDF0FD;} + .d2-90893687 .stroke-B6{stroke:#F7F8FE;} + .d2-90893687 .stroke-AA2{stroke:#4A6FF3;} + .d2-90893687 .stroke-AA4{stroke:#EDF0FD;} + .d2-90893687 .stroke-AA5{stroke:#F7F8FE;} + .d2-90893687 .stroke-AB4{stroke:#EDF0FD;} + .d2-90893687 .stroke-AB5{stroke:#F7F8FE;} + .d2-90893687 .background-color-N1{background-color:#0A0F25;} + .d2-90893687 .background-color-N2{background-color:#676C7E;} + .d2-90893687 .background-color-N3{background-color:#9499AB;} + .d2-90893687 .background-color-N4{background-color:#CFD2DD;} + .d2-90893687 .background-color-N5{background-color:#DEE1EB;} + .d2-90893687 .background-color-N6{background-color:#EEF1F8;} + .d2-90893687 .background-color-N7{background-color:#FFFFFF;} + .d2-90893687 .background-color-B1{background-color:#0D32B2;} + .d2-90893687 .background-color-B2{background-color:#0D32B2;} + .d2-90893687 .background-color-B3{background-color:#E3E9FD;} + .d2-90893687 .background-color-B4{background-color:#E3E9FD;} + .d2-90893687 .background-color-B5{background-color:#EDF0FD;} + .d2-90893687 .background-color-B6{background-color:#F7F8FE;} + .d2-90893687 .background-color-AA2{background-color:#4A6FF3;} + .d2-90893687 .background-color-AA4{background-color:#EDF0FD;} + .d2-90893687 .background-color-AA5{background-color:#F7F8FE;} + .d2-90893687 .background-color-AB4{background-color:#EDF0FD;} + .d2-90893687 .background-color-AB5{background-color:#F7F8FE;} + .d2-90893687 .color-N1{color:#0A0F25;} + .d2-90893687 .color-N2{color:#676C7E;} + .d2-90893687 .color-N3{color:#9499AB;} + .d2-90893687 .color-N4{color:#CFD2DD;} + .d2-90893687 .color-N5{color:#DEE1EB;} + .d2-90893687 .color-N6{color:#EEF1F8;} + .d2-90893687 .color-N7{color:#FFFFFF;} + .d2-90893687 .color-B1{color:#0D32B2;} + .d2-90893687 .color-B2{color:#0D32B2;} + .d2-90893687 .color-B3{color:#E3E9FD;} + .d2-90893687 .color-B4{color:#E3E9FD;} + .d2-90893687 .color-B5{color:#EDF0FD;} + .d2-90893687 .color-B6{color:#F7F8FE;} + .d2-90893687 .color-AA2{color:#4A6FF3;} + .d2-90893687 .color-AA4{color:#EDF0FD;} + .d2-90893687 .color-AA5{color:#F7F8FE;} + .d2-90893687 .color-AB4{color:#EDF0FD;} + .d2-90893687 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-90893687);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-90893687);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-90893687);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-90893687);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-90893687);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-90893687);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-90893687);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-90893687);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-90893687);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-90893687);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-90893687);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-90893687);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-90893687);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-90893687);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-90893687);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-90893687);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-90893687);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-90893687);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>acdefgbh - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/one_container_loop/elk/board.exp.json b/e2etests/testdata/stable/one_container_loop/elk/board.exp.json index dbbe7f64d..830da223b 100644 --- a/e2etests/testdata/stable/one_container_loop/elk/board.exp.json +++ b/e2etests/testdata/stable/one_container_loop/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -356,6 +372,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 78.25, @@ -402,6 +419,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 142.5, @@ -440,6 +458,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 220.75, @@ -486,6 +505,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 148.75, @@ -524,6 +544,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 220.75, @@ -562,6 +583,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 148.75, @@ -600,6 +622,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 161.5, @@ -631,6 +654,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/one_container_loop/elk/sketch.exp.svg b/e2etests/testdata/stable/one_container_loop/elk/sketch.exp.svg index 00ee7fa62..8ee0cb719 100644 --- a/e2etests/testdata/stable/one_container_loop/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/one_container_loop/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -acdefgbh + .d2-820792970 .fill-N1{fill:#0A0F25;} + .d2-820792970 .fill-N2{fill:#676C7E;} + .d2-820792970 .fill-N3{fill:#9499AB;} + .d2-820792970 .fill-N4{fill:#CFD2DD;} + .d2-820792970 .fill-N5{fill:#DEE1EB;} + .d2-820792970 .fill-N6{fill:#EEF1F8;} + .d2-820792970 .fill-N7{fill:#FFFFFF;} + .d2-820792970 .fill-B1{fill:#0D32B2;} + .d2-820792970 .fill-B2{fill:#0D32B2;} + .d2-820792970 .fill-B3{fill:#E3E9FD;} + .d2-820792970 .fill-B4{fill:#E3E9FD;} + .d2-820792970 .fill-B5{fill:#EDF0FD;} + .d2-820792970 .fill-B6{fill:#F7F8FE;} + .d2-820792970 .fill-AA2{fill:#4A6FF3;} + .d2-820792970 .fill-AA4{fill:#EDF0FD;} + .d2-820792970 .fill-AA5{fill:#F7F8FE;} + .d2-820792970 .fill-AB4{fill:#EDF0FD;} + .d2-820792970 .fill-AB5{fill:#F7F8FE;} + .d2-820792970 .stroke-N1{stroke:#0A0F25;} + .d2-820792970 .stroke-N2{stroke:#676C7E;} + .d2-820792970 .stroke-N3{stroke:#9499AB;} + .d2-820792970 .stroke-N4{stroke:#CFD2DD;} + .d2-820792970 .stroke-N5{stroke:#DEE1EB;} + .d2-820792970 .stroke-N6{stroke:#EEF1F8;} + .d2-820792970 .stroke-N7{stroke:#FFFFFF;} + .d2-820792970 .stroke-B1{stroke:#0D32B2;} + .d2-820792970 .stroke-B2{stroke:#0D32B2;} + .d2-820792970 .stroke-B3{stroke:#E3E9FD;} + .d2-820792970 .stroke-B4{stroke:#E3E9FD;} + .d2-820792970 .stroke-B5{stroke:#EDF0FD;} + .d2-820792970 .stroke-B6{stroke:#F7F8FE;} + .d2-820792970 .stroke-AA2{stroke:#4A6FF3;} + .d2-820792970 .stroke-AA4{stroke:#EDF0FD;} + .d2-820792970 .stroke-AA5{stroke:#F7F8FE;} + .d2-820792970 .stroke-AB4{stroke:#EDF0FD;} + .d2-820792970 .stroke-AB5{stroke:#F7F8FE;} + .d2-820792970 .background-color-N1{background-color:#0A0F25;} + .d2-820792970 .background-color-N2{background-color:#676C7E;} + .d2-820792970 .background-color-N3{background-color:#9499AB;} + .d2-820792970 .background-color-N4{background-color:#CFD2DD;} + .d2-820792970 .background-color-N5{background-color:#DEE1EB;} + .d2-820792970 .background-color-N6{background-color:#EEF1F8;} + .d2-820792970 .background-color-N7{background-color:#FFFFFF;} + .d2-820792970 .background-color-B1{background-color:#0D32B2;} + .d2-820792970 .background-color-B2{background-color:#0D32B2;} + .d2-820792970 .background-color-B3{background-color:#E3E9FD;} + .d2-820792970 .background-color-B4{background-color:#E3E9FD;} + .d2-820792970 .background-color-B5{background-color:#EDF0FD;} + .d2-820792970 .background-color-B6{background-color:#F7F8FE;} + .d2-820792970 .background-color-AA2{background-color:#4A6FF3;} + .d2-820792970 .background-color-AA4{background-color:#EDF0FD;} + .d2-820792970 .background-color-AA5{background-color:#F7F8FE;} + .d2-820792970 .background-color-AB4{background-color:#EDF0FD;} + .d2-820792970 .background-color-AB5{background-color:#F7F8FE;} + .d2-820792970 .color-N1{color:#0A0F25;} + .d2-820792970 .color-N2{color:#676C7E;} + .d2-820792970 .color-N3{color:#9499AB;} + .d2-820792970 .color-N4{color:#CFD2DD;} + .d2-820792970 .color-N5{color:#DEE1EB;} + .d2-820792970 .color-N6{color:#EEF1F8;} + .d2-820792970 .color-N7{color:#FFFFFF;} + .d2-820792970 .color-B1{color:#0D32B2;} + .d2-820792970 .color-B2{color:#0D32B2;} + .d2-820792970 .color-B3{color:#E3E9FD;} + .d2-820792970 .color-B4{color:#E3E9FD;} + .d2-820792970 .color-B5{color:#EDF0FD;} + .d2-820792970 .color-B6{color:#F7F8FE;} + .d2-820792970 .color-AA2{color:#4A6FF3;} + .d2-820792970 .color-AA4{color:#EDF0FD;} + .d2-820792970 .color-AA5{color:#F7F8FE;} + .d2-820792970 .color-AB4{color:#EDF0FD;} + .d2-820792970 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-820792970);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-820792970);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-820792970);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-820792970);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-820792970);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-820792970);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-820792970);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-820792970);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-820792970);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-820792970);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-820792970);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-820792970);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-820792970);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-820792970);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-820792970);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-820792970);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-820792970);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-820792970);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>acdefgbh - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/one_three_one_container/dagre/board.exp.json b/e2etests/testdata/stable/one_three_one_container/dagre/board.exp.json index a853f9265..c92e6ec85 100644 --- a/e2etests/testdata/stable/one_three_one_container/dagre/board.exp.json +++ b/e2etests/testdata/stable/one_three_one_container/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -315,6 +330,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 123, @@ -362,6 +378,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 166, @@ -409,6 +426,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 203, @@ -456,6 +474,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 58, @@ -503,6 +522,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 171, @@ -550,6 +570,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 284, @@ -590,6 +611,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/one_three_one_container/dagre/sketch.exp.svg b/e2etests/testdata/stable/one_three_one_container/dagre/sketch.exp.svg index e6cb8cf41..3ec3edd64 100644 --- a/e2etests/testdata/stable/one_three_one_container/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/one_three_one_container/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -top2abcbottomstartend + .d2-2457780664 .fill-N1{fill:#0A0F25;} + .d2-2457780664 .fill-N2{fill:#676C7E;} + .d2-2457780664 .fill-N3{fill:#9499AB;} + .d2-2457780664 .fill-N4{fill:#CFD2DD;} + .d2-2457780664 .fill-N5{fill:#DEE1EB;} + .d2-2457780664 .fill-N6{fill:#EEF1F8;} + .d2-2457780664 .fill-N7{fill:#FFFFFF;} + .d2-2457780664 .fill-B1{fill:#0D32B2;} + .d2-2457780664 .fill-B2{fill:#0D32B2;} + .d2-2457780664 .fill-B3{fill:#E3E9FD;} + .d2-2457780664 .fill-B4{fill:#E3E9FD;} + .d2-2457780664 .fill-B5{fill:#EDF0FD;} + .d2-2457780664 .fill-B6{fill:#F7F8FE;} + .d2-2457780664 .fill-AA2{fill:#4A6FF3;} + .d2-2457780664 .fill-AA4{fill:#EDF0FD;} + .d2-2457780664 .fill-AA5{fill:#F7F8FE;} + .d2-2457780664 .fill-AB4{fill:#EDF0FD;} + .d2-2457780664 .fill-AB5{fill:#F7F8FE;} + .d2-2457780664 .stroke-N1{stroke:#0A0F25;} + .d2-2457780664 .stroke-N2{stroke:#676C7E;} + .d2-2457780664 .stroke-N3{stroke:#9499AB;} + .d2-2457780664 .stroke-N4{stroke:#CFD2DD;} + .d2-2457780664 .stroke-N5{stroke:#DEE1EB;} + .d2-2457780664 .stroke-N6{stroke:#EEF1F8;} + .d2-2457780664 .stroke-N7{stroke:#FFFFFF;} + .d2-2457780664 .stroke-B1{stroke:#0D32B2;} + .d2-2457780664 .stroke-B2{stroke:#0D32B2;} + .d2-2457780664 .stroke-B3{stroke:#E3E9FD;} + .d2-2457780664 .stroke-B4{stroke:#E3E9FD;} + .d2-2457780664 .stroke-B5{stroke:#EDF0FD;} + .d2-2457780664 .stroke-B6{stroke:#F7F8FE;} + .d2-2457780664 .stroke-AA2{stroke:#4A6FF3;} + .d2-2457780664 .stroke-AA4{stroke:#EDF0FD;} + .d2-2457780664 .stroke-AA5{stroke:#F7F8FE;} + .d2-2457780664 .stroke-AB4{stroke:#EDF0FD;} + .d2-2457780664 .stroke-AB5{stroke:#F7F8FE;} + .d2-2457780664 .background-color-N1{background-color:#0A0F25;} + .d2-2457780664 .background-color-N2{background-color:#676C7E;} + .d2-2457780664 .background-color-N3{background-color:#9499AB;} + .d2-2457780664 .background-color-N4{background-color:#CFD2DD;} + .d2-2457780664 .background-color-N5{background-color:#DEE1EB;} + .d2-2457780664 .background-color-N6{background-color:#EEF1F8;} + .d2-2457780664 .background-color-N7{background-color:#FFFFFF;} + .d2-2457780664 .background-color-B1{background-color:#0D32B2;} + .d2-2457780664 .background-color-B2{background-color:#0D32B2;} + .d2-2457780664 .background-color-B3{background-color:#E3E9FD;} + .d2-2457780664 .background-color-B4{background-color:#E3E9FD;} + .d2-2457780664 .background-color-B5{background-color:#EDF0FD;} + .d2-2457780664 .background-color-B6{background-color:#F7F8FE;} + .d2-2457780664 .background-color-AA2{background-color:#4A6FF3;} + .d2-2457780664 .background-color-AA4{background-color:#EDF0FD;} + .d2-2457780664 .background-color-AA5{background-color:#F7F8FE;} + .d2-2457780664 .background-color-AB4{background-color:#EDF0FD;} + .d2-2457780664 .background-color-AB5{background-color:#F7F8FE;} + .d2-2457780664 .color-N1{color:#0A0F25;} + .d2-2457780664 .color-N2{color:#676C7E;} + .d2-2457780664 .color-N3{color:#9499AB;} + .d2-2457780664 .color-N4{color:#CFD2DD;} + .d2-2457780664 .color-N5{color:#DEE1EB;} + .d2-2457780664 .color-N6{color:#EEF1F8;} + .d2-2457780664 .color-N7{color:#FFFFFF;} + .d2-2457780664 .color-B1{color:#0D32B2;} + .d2-2457780664 .color-B2{color:#0D32B2;} + .d2-2457780664 .color-B3{color:#E3E9FD;} + .d2-2457780664 .color-B4{color:#E3E9FD;} + .d2-2457780664 .color-B5{color:#EDF0FD;} + .d2-2457780664 .color-B6{color:#F7F8FE;} + .d2-2457780664 .color-AA2{color:#4A6FF3;} + .d2-2457780664 .color-AA4{color:#EDF0FD;} + .d2-2457780664 .color-AA5{color:#F7F8FE;} + .d2-2457780664 .color-AB4{color:#EDF0FD;} + .d2-2457780664 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2457780664);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2457780664);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2457780664);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2457780664);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2457780664);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2457780664);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2457780664);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2457780664);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2457780664);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2457780664);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2457780664);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2457780664);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2457780664);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2457780664);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2457780664);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2457780664);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2457780664);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2457780664);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>top2abcbottomstartend - - - - - - - + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/one_three_one_container/elk/board.exp.json b/e2etests/testdata/stable/one_three_one_container/elk/board.exp.json index a8953cb56..0977a4f5b 100644 --- a/e2etests/testdata/stable/one_three_one_container/elk/board.exp.json +++ b/e2etests/testdata/stable/one_three_one_container/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -315,6 +330,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 92, @@ -361,6 +377,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 122, @@ -399,6 +416,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 152, @@ -445,6 +463,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 49, @@ -491,6 +510,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 122, @@ -529,6 +549,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 195, @@ -568,6 +589,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/one_three_one_container/elk/sketch.exp.svg b/e2etests/testdata/stable/one_three_one_container/elk/sketch.exp.svg index 4e8d16331..ba6154bf4 100644 --- a/e2etests/testdata/stable/one_three_one_container/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/one_three_one_container/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -top2abcbottomstartend + .d2-1616386778 .fill-N1{fill:#0A0F25;} + .d2-1616386778 .fill-N2{fill:#676C7E;} + .d2-1616386778 .fill-N3{fill:#9499AB;} + .d2-1616386778 .fill-N4{fill:#CFD2DD;} + .d2-1616386778 .fill-N5{fill:#DEE1EB;} + .d2-1616386778 .fill-N6{fill:#EEF1F8;} + .d2-1616386778 .fill-N7{fill:#FFFFFF;} + .d2-1616386778 .fill-B1{fill:#0D32B2;} + .d2-1616386778 .fill-B2{fill:#0D32B2;} + .d2-1616386778 .fill-B3{fill:#E3E9FD;} + .d2-1616386778 .fill-B4{fill:#E3E9FD;} + .d2-1616386778 .fill-B5{fill:#EDF0FD;} + .d2-1616386778 .fill-B6{fill:#F7F8FE;} + .d2-1616386778 .fill-AA2{fill:#4A6FF3;} + .d2-1616386778 .fill-AA4{fill:#EDF0FD;} + .d2-1616386778 .fill-AA5{fill:#F7F8FE;} + .d2-1616386778 .fill-AB4{fill:#EDF0FD;} + .d2-1616386778 .fill-AB5{fill:#F7F8FE;} + .d2-1616386778 .stroke-N1{stroke:#0A0F25;} + .d2-1616386778 .stroke-N2{stroke:#676C7E;} + .d2-1616386778 .stroke-N3{stroke:#9499AB;} + .d2-1616386778 .stroke-N4{stroke:#CFD2DD;} + .d2-1616386778 .stroke-N5{stroke:#DEE1EB;} + .d2-1616386778 .stroke-N6{stroke:#EEF1F8;} + .d2-1616386778 .stroke-N7{stroke:#FFFFFF;} + .d2-1616386778 .stroke-B1{stroke:#0D32B2;} + .d2-1616386778 .stroke-B2{stroke:#0D32B2;} + .d2-1616386778 .stroke-B3{stroke:#E3E9FD;} + .d2-1616386778 .stroke-B4{stroke:#E3E9FD;} + .d2-1616386778 .stroke-B5{stroke:#EDF0FD;} + .d2-1616386778 .stroke-B6{stroke:#F7F8FE;} + .d2-1616386778 .stroke-AA2{stroke:#4A6FF3;} + .d2-1616386778 .stroke-AA4{stroke:#EDF0FD;} + .d2-1616386778 .stroke-AA5{stroke:#F7F8FE;} + .d2-1616386778 .stroke-AB4{stroke:#EDF0FD;} + .d2-1616386778 .stroke-AB5{stroke:#F7F8FE;} + .d2-1616386778 .background-color-N1{background-color:#0A0F25;} + .d2-1616386778 .background-color-N2{background-color:#676C7E;} + .d2-1616386778 .background-color-N3{background-color:#9499AB;} + .d2-1616386778 .background-color-N4{background-color:#CFD2DD;} + .d2-1616386778 .background-color-N5{background-color:#DEE1EB;} + .d2-1616386778 .background-color-N6{background-color:#EEF1F8;} + .d2-1616386778 .background-color-N7{background-color:#FFFFFF;} + .d2-1616386778 .background-color-B1{background-color:#0D32B2;} + .d2-1616386778 .background-color-B2{background-color:#0D32B2;} + .d2-1616386778 .background-color-B3{background-color:#E3E9FD;} + .d2-1616386778 .background-color-B4{background-color:#E3E9FD;} + .d2-1616386778 .background-color-B5{background-color:#EDF0FD;} + .d2-1616386778 .background-color-B6{background-color:#F7F8FE;} + .d2-1616386778 .background-color-AA2{background-color:#4A6FF3;} + .d2-1616386778 .background-color-AA4{background-color:#EDF0FD;} + .d2-1616386778 .background-color-AA5{background-color:#F7F8FE;} + .d2-1616386778 .background-color-AB4{background-color:#EDF0FD;} + .d2-1616386778 .background-color-AB5{background-color:#F7F8FE;} + .d2-1616386778 .color-N1{color:#0A0F25;} + .d2-1616386778 .color-N2{color:#676C7E;} + .d2-1616386778 .color-N3{color:#9499AB;} + .d2-1616386778 .color-N4{color:#CFD2DD;} + .d2-1616386778 .color-N5{color:#DEE1EB;} + .d2-1616386778 .color-N6{color:#EEF1F8;} + .d2-1616386778 .color-N7{color:#FFFFFF;} + .d2-1616386778 .color-B1{color:#0D32B2;} + .d2-1616386778 .color-B2{color:#0D32B2;} + .d2-1616386778 .color-B3{color:#E3E9FD;} + .d2-1616386778 .color-B4{color:#E3E9FD;} + .d2-1616386778 .color-B5{color:#EDF0FD;} + .d2-1616386778 .color-B6{color:#F7F8FE;} + .d2-1616386778 .color-AA2{color:#4A6FF3;} + .d2-1616386778 .color-AA4{color:#EDF0FD;} + .d2-1616386778 .color-AA5{color:#F7F8FE;} + .d2-1616386778 .color-AB4{color:#EDF0FD;} + .d2-1616386778 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1616386778);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1616386778);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1616386778);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1616386778);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1616386778);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1616386778);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1616386778);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1616386778);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1616386778);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1616386778);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1616386778);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1616386778);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1616386778);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1616386778);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1616386778);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1616386778);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1616386778);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1616386778);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>top2abcbottomstartend - - - - - - - + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/outside_bottom_labels/dagre/board.exp.json b/e2etests/testdata/stable/outside_bottom_labels/dagre/board.exp.json index f424c7cf9..249c6d436 100644 --- a/e2etests/testdata/stable/outside_bottom_labels/dagre/board.exp.json +++ b/e2etests/testdata/stable/outside_bottom_labels/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -151,6 +162,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 71, @@ -198,6 +210,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 87, @@ -245,6 +258,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 87, @@ -292,6 +306,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 97, @@ -339,6 +354,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 72, @@ -386,6 +402,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 96, @@ -426,6 +443,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/outside_bottom_labels/dagre/sketch.exp.svg b/e2etests/testdata/stable/outside_bottom_labels/dagre/sketch.exp.svg index 1d4df221a..63abb2d6e 100644 --- a/e2etests/testdata/stable/outside_bottom_labels/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/outside_bottom_labels/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -Daphne SnickerdoodlePrudence McSnortlePolly Pizzazzle + .d2-96532193 .fill-N1{fill:#0A0F25;} + .d2-96532193 .fill-N2{fill:#676C7E;} + .d2-96532193 .fill-N3{fill:#9499AB;} + .d2-96532193 .fill-N4{fill:#CFD2DD;} + .d2-96532193 .fill-N5{fill:#DEE1EB;} + .d2-96532193 .fill-N6{fill:#EEF1F8;} + .d2-96532193 .fill-N7{fill:#FFFFFF;} + .d2-96532193 .fill-B1{fill:#0D32B2;} + .d2-96532193 .fill-B2{fill:#0D32B2;} + .d2-96532193 .fill-B3{fill:#E3E9FD;} + .d2-96532193 .fill-B4{fill:#E3E9FD;} + .d2-96532193 .fill-B5{fill:#EDF0FD;} + .d2-96532193 .fill-B6{fill:#F7F8FE;} + .d2-96532193 .fill-AA2{fill:#4A6FF3;} + .d2-96532193 .fill-AA4{fill:#EDF0FD;} + .d2-96532193 .fill-AA5{fill:#F7F8FE;} + .d2-96532193 .fill-AB4{fill:#EDF0FD;} + .d2-96532193 .fill-AB5{fill:#F7F8FE;} + .d2-96532193 .stroke-N1{stroke:#0A0F25;} + .d2-96532193 .stroke-N2{stroke:#676C7E;} + .d2-96532193 .stroke-N3{stroke:#9499AB;} + .d2-96532193 .stroke-N4{stroke:#CFD2DD;} + .d2-96532193 .stroke-N5{stroke:#DEE1EB;} + .d2-96532193 .stroke-N6{stroke:#EEF1F8;} + .d2-96532193 .stroke-N7{stroke:#FFFFFF;} + .d2-96532193 .stroke-B1{stroke:#0D32B2;} + .d2-96532193 .stroke-B2{stroke:#0D32B2;} + .d2-96532193 .stroke-B3{stroke:#E3E9FD;} + .d2-96532193 .stroke-B4{stroke:#E3E9FD;} + .d2-96532193 .stroke-B5{stroke:#EDF0FD;} + .d2-96532193 .stroke-B6{stroke:#F7F8FE;} + .d2-96532193 .stroke-AA2{stroke:#4A6FF3;} + .d2-96532193 .stroke-AA4{stroke:#EDF0FD;} + .d2-96532193 .stroke-AA5{stroke:#F7F8FE;} + .d2-96532193 .stroke-AB4{stroke:#EDF0FD;} + .d2-96532193 .stroke-AB5{stroke:#F7F8FE;} + .d2-96532193 .background-color-N1{background-color:#0A0F25;} + .d2-96532193 .background-color-N2{background-color:#676C7E;} + .d2-96532193 .background-color-N3{background-color:#9499AB;} + .d2-96532193 .background-color-N4{background-color:#CFD2DD;} + .d2-96532193 .background-color-N5{background-color:#DEE1EB;} + .d2-96532193 .background-color-N6{background-color:#EEF1F8;} + .d2-96532193 .background-color-N7{background-color:#FFFFFF;} + .d2-96532193 .background-color-B1{background-color:#0D32B2;} + .d2-96532193 .background-color-B2{background-color:#0D32B2;} + .d2-96532193 .background-color-B3{background-color:#E3E9FD;} + .d2-96532193 .background-color-B4{background-color:#E3E9FD;} + .d2-96532193 .background-color-B5{background-color:#EDF0FD;} + .d2-96532193 .background-color-B6{background-color:#F7F8FE;} + .d2-96532193 .background-color-AA2{background-color:#4A6FF3;} + .d2-96532193 .background-color-AA4{background-color:#EDF0FD;} + .d2-96532193 .background-color-AA5{background-color:#F7F8FE;} + .d2-96532193 .background-color-AB4{background-color:#EDF0FD;} + .d2-96532193 .background-color-AB5{background-color:#F7F8FE;} + .d2-96532193 .color-N1{color:#0A0F25;} + .d2-96532193 .color-N2{color:#676C7E;} + .d2-96532193 .color-N3{color:#9499AB;} + .d2-96532193 .color-N4{color:#CFD2DD;} + .d2-96532193 .color-N5{color:#DEE1EB;} + .d2-96532193 .color-N6{color:#EEF1F8;} + .d2-96532193 .color-N7{color:#FFFFFF;} + .d2-96532193 .color-B1{color:#0D32B2;} + .d2-96532193 .color-B2{color:#0D32B2;} + .d2-96532193 .color-B3{color:#E3E9FD;} + .d2-96532193 .color-B4{color:#E3E9FD;} + .d2-96532193 .color-B5{color:#EDF0FD;} + .d2-96532193 .color-B6{color:#F7F8FE;} + .d2-96532193 .color-AA2{color:#4A6FF3;} + .d2-96532193 .color-AA4{color:#EDF0FD;} + .d2-96532193 .color-AA5{color:#F7F8FE;} + .d2-96532193 .color-AB4{color:#EDF0FD;} + .d2-96532193 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-96532193);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-96532193);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-96532193);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-96532193);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-96532193);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-96532193);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-96532193);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-96532193);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-96532193);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-96532193);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-96532193);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-96532193);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-96532193);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-96532193);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-96532193);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-96532193);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-96532193);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-96532193);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>Daphne SnickerdoodlePrudence McSnortlePolly Pizzazzle - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/outside_bottom_labels/elk/board.exp.json b/e2etests/testdata/stable/outside_bottom_labels/elk/board.exp.json index d67978742..5ba4b676c 100644 --- a/e2etests/testdata/stable/outside_bottom_labels/elk/board.exp.json +++ b/e2etests/testdata/stable/outside_bottom_labels/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -151,6 +162,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 55.5, @@ -197,6 +209,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 245.25, @@ -243,6 +256,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 99, @@ -289,6 +303,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 284.5, @@ -335,6 +350,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 251, @@ -381,6 +397,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 182, @@ -420,6 +437,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/outside_bottom_labels/elk/sketch.exp.svg b/e2etests/testdata/stable/outside_bottom_labels/elk/sketch.exp.svg index cda6897ca..5024f2ff5 100644 --- a/e2etests/testdata/stable/outside_bottom_labels/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/outside_bottom_labels/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -Daphne SnickerdoodlePrudence McSnortlePolly Pizzazzle + .d2-4066350492 .fill-N1{fill:#0A0F25;} + .d2-4066350492 .fill-N2{fill:#676C7E;} + .d2-4066350492 .fill-N3{fill:#9499AB;} + .d2-4066350492 .fill-N4{fill:#CFD2DD;} + .d2-4066350492 .fill-N5{fill:#DEE1EB;} + .d2-4066350492 .fill-N6{fill:#EEF1F8;} + .d2-4066350492 .fill-N7{fill:#FFFFFF;} + .d2-4066350492 .fill-B1{fill:#0D32B2;} + .d2-4066350492 .fill-B2{fill:#0D32B2;} + .d2-4066350492 .fill-B3{fill:#E3E9FD;} + .d2-4066350492 .fill-B4{fill:#E3E9FD;} + .d2-4066350492 .fill-B5{fill:#EDF0FD;} + .d2-4066350492 .fill-B6{fill:#F7F8FE;} + .d2-4066350492 .fill-AA2{fill:#4A6FF3;} + .d2-4066350492 .fill-AA4{fill:#EDF0FD;} + .d2-4066350492 .fill-AA5{fill:#F7F8FE;} + .d2-4066350492 .fill-AB4{fill:#EDF0FD;} + .d2-4066350492 .fill-AB5{fill:#F7F8FE;} + .d2-4066350492 .stroke-N1{stroke:#0A0F25;} + .d2-4066350492 .stroke-N2{stroke:#676C7E;} + .d2-4066350492 .stroke-N3{stroke:#9499AB;} + .d2-4066350492 .stroke-N4{stroke:#CFD2DD;} + .d2-4066350492 .stroke-N5{stroke:#DEE1EB;} + .d2-4066350492 .stroke-N6{stroke:#EEF1F8;} + .d2-4066350492 .stroke-N7{stroke:#FFFFFF;} + .d2-4066350492 .stroke-B1{stroke:#0D32B2;} + .d2-4066350492 .stroke-B2{stroke:#0D32B2;} + .d2-4066350492 .stroke-B3{stroke:#E3E9FD;} + .d2-4066350492 .stroke-B4{stroke:#E3E9FD;} + .d2-4066350492 .stroke-B5{stroke:#EDF0FD;} + .d2-4066350492 .stroke-B6{stroke:#F7F8FE;} + .d2-4066350492 .stroke-AA2{stroke:#4A6FF3;} + .d2-4066350492 .stroke-AA4{stroke:#EDF0FD;} + .d2-4066350492 .stroke-AA5{stroke:#F7F8FE;} + .d2-4066350492 .stroke-AB4{stroke:#EDF0FD;} + .d2-4066350492 .stroke-AB5{stroke:#F7F8FE;} + .d2-4066350492 .background-color-N1{background-color:#0A0F25;} + .d2-4066350492 .background-color-N2{background-color:#676C7E;} + .d2-4066350492 .background-color-N3{background-color:#9499AB;} + .d2-4066350492 .background-color-N4{background-color:#CFD2DD;} + .d2-4066350492 .background-color-N5{background-color:#DEE1EB;} + .d2-4066350492 .background-color-N6{background-color:#EEF1F8;} + .d2-4066350492 .background-color-N7{background-color:#FFFFFF;} + .d2-4066350492 .background-color-B1{background-color:#0D32B2;} + .d2-4066350492 .background-color-B2{background-color:#0D32B2;} + .d2-4066350492 .background-color-B3{background-color:#E3E9FD;} + .d2-4066350492 .background-color-B4{background-color:#E3E9FD;} + .d2-4066350492 .background-color-B5{background-color:#EDF0FD;} + .d2-4066350492 .background-color-B6{background-color:#F7F8FE;} + .d2-4066350492 .background-color-AA2{background-color:#4A6FF3;} + .d2-4066350492 .background-color-AA4{background-color:#EDF0FD;} + .d2-4066350492 .background-color-AA5{background-color:#F7F8FE;} + .d2-4066350492 .background-color-AB4{background-color:#EDF0FD;} + .d2-4066350492 .background-color-AB5{background-color:#F7F8FE;} + .d2-4066350492 .color-N1{color:#0A0F25;} + .d2-4066350492 .color-N2{color:#676C7E;} + .d2-4066350492 .color-N3{color:#9499AB;} + .d2-4066350492 .color-N4{color:#CFD2DD;} + .d2-4066350492 .color-N5{color:#DEE1EB;} + .d2-4066350492 .color-N6{color:#EEF1F8;} + .d2-4066350492 .color-N7{color:#FFFFFF;} + .d2-4066350492 .color-B1{color:#0D32B2;} + .d2-4066350492 .color-B2{color:#0D32B2;} + .d2-4066350492 .color-B3{color:#E3E9FD;} + .d2-4066350492 .color-B4{color:#E3E9FD;} + .d2-4066350492 .color-B5{color:#EDF0FD;} + .d2-4066350492 .color-B6{color:#F7F8FE;} + .d2-4066350492 .color-AA2{color:#4A6FF3;} + .d2-4066350492 .color-AA4{color:#EDF0FD;} + .d2-4066350492 .color-AA5{color:#F7F8FE;} + .d2-4066350492 .color-AB4{color:#EDF0FD;} + .d2-4066350492 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4066350492);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4066350492);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4066350492);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4066350492);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4066350492);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4066350492);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4066350492);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4066350492);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4066350492);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4066350492);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4066350492);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4066350492);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4066350492);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4066350492);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4066350492);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4066350492);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4066350492);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4066350492);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>Daphne SnickerdoodlePrudence McSnortlePolly Pizzazzle - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/ovals/dagre/board.exp.json b/e2etests/testdata/stable/ovals/dagre/board.exp.json index a46940e27..0793e906e 100644 --- a/e2etests/testdata/stable/ovals/dagre/board.exp.json +++ b/e2etests/testdata/stable/ovals/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -512,6 +532,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/ovals/dagre/sketch.exp.svg b/e2etests/testdata/stable/ovals/dagre/sketch.exp.svg index 15c9b4180..9ac15b09e 100644 --- a/e2etests/testdata/stable/ovals/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/ovals/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ --------------------------------------------------------------------------------------------------------------------------------12345 + .d2-1872962512 .fill-N1{fill:#0A0F25;} + .d2-1872962512 .fill-N2{fill:#676C7E;} + .d2-1872962512 .fill-N3{fill:#9499AB;} + .d2-1872962512 .fill-N4{fill:#CFD2DD;} + .d2-1872962512 .fill-N5{fill:#DEE1EB;} + .d2-1872962512 .fill-N6{fill:#EEF1F8;} + .d2-1872962512 .fill-N7{fill:#FFFFFF;} + .d2-1872962512 .fill-B1{fill:#0D32B2;} + .d2-1872962512 .fill-B2{fill:#0D32B2;} + .d2-1872962512 .fill-B3{fill:#E3E9FD;} + .d2-1872962512 .fill-B4{fill:#E3E9FD;} + .d2-1872962512 .fill-B5{fill:#EDF0FD;} + .d2-1872962512 .fill-B6{fill:#F7F8FE;} + .d2-1872962512 .fill-AA2{fill:#4A6FF3;} + .d2-1872962512 .fill-AA4{fill:#EDF0FD;} + .d2-1872962512 .fill-AA5{fill:#F7F8FE;} + .d2-1872962512 .fill-AB4{fill:#EDF0FD;} + .d2-1872962512 .fill-AB5{fill:#F7F8FE;} + .d2-1872962512 .stroke-N1{stroke:#0A0F25;} + .d2-1872962512 .stroke-N2{stroke:#676C7E;} + .d2-1872962512 .stroke-N3{stroke:#9499AB;} + .d2-1872962512 .stroke-N4{stroke:#CFD2DD;} + .d2-1872962512 .stroke-N5{stroke:#DEE1EB;} + .d2-1872962512 .stroke-N6{stroke:#EEF1F8;} + .d2-1872962512 .stroke-N7{stroke:#FFFFFF;} + .d2-1872962512 .stroke-B1{stroke:#0D32B2;} + .d2-1872962512 .stroke-B2{stroke:#0D32B2;} + .d2-1872962512 .stroke-B3{stroke:#E3E9FD;} + .d2-1872962512 .stroke-B4{stroke:#E3E9FD;} + .d2-1872962512 .stroke-B5{stroke:#EDF0FD;} + .d2-1872962512 .stroke-B6{stroke:#F7F8FE;} + .d2-1872962512 .stroke-AA2{stroke:#4A6FF3;} + .d2-1872962512 .stroke-AA4{stroke:#EDF0FD;} + .d2-1872962512 .stroke-AA5{stroke:#F7F8FE;} + .d2-1872962512 .stroke-AB4{stroke:#EDF0FD;} + .d2-1872962512 .stroke-AB5{stroke:#F7F8FE;} + .d2-1872962512 .background-color-N1{background-color:#0A0F25;} + .d2-1872962512 .background-color-N2{background-color:#676C7E;} + .d2-1872962512 .background-color-N3{background-color:#9499AB;} + .d2-1872962512 .background-color-N4{background-color:#CFD2DD;} + .d2-1872962512 .background-color-N5{background-color:#DEE1EB;} + .d2-1872962512 .background-color-N6{background-color:#EEF1F8;} + .d2-1872962512 .background-color-N7{background-color:#FFFFFF;} + .d2-1872962512 .background-color-B1{background-color:#0D32B2;} + .d2-1872962512 .background-color-B2{background-color:#0D32B2;} + .d2-1872962512 .background-color-B3{background-color:#E3E9FD;} + .d2-1872962512 .background-color-B4{background-color:#E3E9FD;} + .d2-1872962512 .background-color-B5{background-color:#EDF0FD;} + .d2-1872962512 .background-color-B6{background-color:#F7F8FE;} + .d2-1872962512 .background-color-AA2{background-color:#4A6FF3;} + .d2-1872962512 .background-color-AA4{background-color:#EDF0FD;} + .d2-1872962512 .background-color-AA5{background-color:#F7F8FE;} + .d2-1872962512 .background-color-AB4{background-color:#EDF0FD;} + .d2-1872962512 .background-color-AB5{background-color:#F7F8FE;} + .d2-1872962512 .color-N1{color:#0A0F25;} + .d2-1872962512 .color-N2{color:#676C7E;} + .d2-1872962512 .color-N3{color:#9499AB;} + .d2-1872962512 .color-N4{color:#CFD2DD;} + .d2-1872962512 .color-N5{color:#DEE1EB;} + .d2-1872962512 .color-N6{color:#EEF1F8;} + .d2-1872962512 .color-N7{color:#FFFFFF;} + .d2-1872962512 .color-B1{color:#0D32B2;} + .d2-1872962512 .color-B2{color:#0D32B2;} + .d2-1872962512 .color-B3{color:#E3E9FD;} + .d2-1872962512 .color-B4{color:#E3E9FD;} + .d2-1872962512 .color-B5{color:#EDF0FD;} + .d2-1872962512 .color-B6{color:#F7F8FE;} + .d2-1872962512 .color-AA2{color:#4A6FF3;} + .d2-1872962512 .color-AA4{color:#EDF0FD;} + .d2-1872962512 .color-AA5{color:#F7F8FE;} + .d2-1872962512 .color-AB4{color:#EDF0FD;} + .d2-1872962512 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1872962512);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1872962512);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1872962512);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1872962512);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1872962512);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1872962512);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1872962512);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1872962512);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1872962512);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1872962512);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1872962512);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1872962512);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1872962512);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1872962512);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1872962512);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1872962512);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1872962512);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1872962512);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>-------------------------------------------------------------------------------------------------------------------------------12345 - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/ovals/elk/board.exp.json b/e2etests/testdata/stable/ovals/elk/board.exp.json index 2c54b17be..96b326d2f 100644 --- a/e2etests/testdata/stable/ovals/elk/board.exp.json +++ b/e2etests/testdata/stable/ovals/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -512,6 +532,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/ovals/elk/sketch.exp.svg b/e2etests/testdata/stable/ovals/elk/sketch.exp.svg index bf4cb20bb..95667b5a1 100644 --- a/e2etests/testdata/stable/ovals/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/ovals/elk/sketch.exp.svg @@ -1,9 +1,9 @@ --------------------------------------------------------------------------------------------------------------------------------12345 + .d2-4048860831 .fill-N1{fill:#0A0F25;} + .d2-4048860831 .fill-N2{fill:#676C7E;} + .d2-4048860831 .fill-N3{fill:#9499AB;} + .d2-4048860831 .fill-N4{fill:#CFD2DD;} + .d2-4048860831 .fill-N5{fill:#DEE1EB;} + .d2-4048860831 .fill-N6{fill:#EEF1F8;} + .d2-4048860831 .fill-N7{fill:#FFFFFF;} + .d2-4048860831 .fill-B1{fill:#0D32B2;} + .d2-4048860831 .fill-B2{fill:#0D32B2;} + .d2-4048860831 .fill-B3{fill:#E3E9FD;} + .d2-4048860831 .fill-B4{fill:#E3E9FD;} + .d2-4048860831 .fill-B5{fill:#EDF0FD;} + .d2-4048860831 .fill-B6{fill:#F7F8FE;} + .d2-4048860831 .fill-AA2{fill:#4A6FF3;} + .d2-4048860831 .fill-AA4{fill:#EDF0FD;} + .d2-4048860831 .fill-AA5{fill:#F7F8FE;} + .d2-4048860831 .fill-AB4{fill:#EDF0FD;} + .d2-4048860831 .fill-AB5{fill:#F7F8FE;} + .d2-4048860831 .stroke-N1{stroke:#0A0F25;} + .d2-4048860831 .stroke-N2{stroke:#676C7E;} + .d2-4048860831 .stroke-N3{stroke:#9499AB;} + .d2-4048860831 .stroke-N4{stroke:#CFD2DD;} + .d2-4048860831 .stroke-N5{stroke:#DEE1EB;} + .d2-4048860831 .stroke-N6{stroke:#EEF1F8;} + .d2-4048860831 .stroke-N7{stroke:#FFFFFF;} + .d2-4048860831 .stroke-B1{stroke:#0D32B2;} + .d2-4048860831 .stroke-B2{stroke:#0D32B2;} + .d2-4048860831 .stroke-B3{stroke:#E3E9FD;} + .d2-4048860831 .stroke-B4{stroke:#E3E9FD;} + .d2-4048860831 .stroke-B5{stroke:#EDF0FD;} + .d2-4048860831 .stroke-B6{stroke:#F7F8FE;} + .d2-4048860831 .stroke-AA2{stroke:#4A6FF3;} + .d2-4048860831 .stroke-AA4{stroke:#EDF0FD;} + .d2-4048860831 .stroke-AA5{stroke:#F7F8FE;} + .d2-4048860831 .stroke-AB4{stroke:#EDF0FD;} + .d2-4048860831 .stroke-AB5{stroke:#F7F8FE;} + .d2-4048860831 .background-color-N1{background-color:#0A0F25;} + .d2-4048860831 .background-color-N2{background-color:#676C7E;} + .d2-4048860831 .background-color-N3{background-color:#9499AB;} + .d2-4048860831 .background-color-N4{background-color:#CFD2DD;} + .d2-4048860831 .background-color-N5{background-color:#DEE1EB;} + .d2-4048860831 .background-color-N6{background-color:#EEF1F8;} + .d2-4048860831 .background-color-N7{background-color:#FFFFFF;} + .d2-4048860831 .background-color-B1{background-color:#0D32B2;} + .d2-4048860831 .background-color-B2{background-color:#0D32B2;} + .d2-4048860831 .background-color-B3{background-color:#E3E9FD;} + .d2-4048860831 .background-color-B4{background-color:#E3E9FD;} + .d2-4048860831 .background-color-B5{background-color:#EDF0FD;} + .d2-4048860831 .background-color-B6{background-color:#F7F8FE;} + .d2-4048860831 .background-color-AA2{background-color:#4A6FF3;} + .d2-4048860831 .background-color-AA4{background-color:#EDF0FD;} + .d2-4048860831 .background-color-AA5{background-color:#F7F8FE;} + .d2-4048860831 .background-color-AB4{background-color:#EDF0FD;} + .d2-4048860831 .background-color-AB5{background-color:#F7F8FE;} + .d2-4048860831 .color-N1{color:#0A0F25;} + .d2-4048860831 .color-N2{color:#676C7E;} + .d2-4048860831 .color-N3{color:#9499AB;} + .d2-4048860831 .color-N4{color:#CFD2DD;} + .d2-4048860831 .color-N5{color:#DEE1EB;} + .d2-4048860831 .color-N6{color:#EEF1F8;} + .d2-4048860831 .color-N7{color:#FFFFFF;} + .d2-4048860831 .color-B1{color:#0D32B2;} + .d2-4048860831 .color-B2{color:#0D32B2;} + .d2-4048860831 .color-B3{color:#E3E9FD;} + .d2-4048860831 .color-B4{color:#E3E9FD;} + .d2-4048860831 .color-B5{color:#EDF0FD;} + .d2-4048860831 .color-B6{color:#F7F8FE;} + .d2-4048860831 .color-AA2{color:#4A6FF3;} + .d2-4048860831 .color-AA4{color:#EDF0FD;} + .d2-4048860831 .color-AA5{color:#F7F8FE;} + .d2-4048860831 .color-AB4{color:#EDF0FD;} + .d2-4048860831 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4048860831);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4048860831);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4048860831);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4048860831);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4048860831);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4048860831);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4048860831);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4048860831);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4048860831);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4048860831);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4048860831);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4048860831);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4048860831);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4048860831);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4048860831);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4048860831);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4048860831);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4048860831);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>-------------------------------------------------------------------------------------------------------------------------------12345 - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/overlapping_child_label/dagre/board.exp.json b/e2etests/testdata/stable/overlapping_child_label/dagre/board.exp.json index 68e4a89c8..5e2e7a15c 100644 --- a/e2etests/testdata/stable/overlapping_child_label/dagre/board.exp.json +++ b/e2etests/testdata/stable/overlapping_child_label/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -144,6 +155,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -200,6 +212,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -256,6 +269,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -312,6 +326,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -368,6 +383,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -424,6 +440,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -487,6 +504,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 75.5, @@ -527,6 +545,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/overlapping_child_label/dagre/sketch.exp.svg b/e2etests/testdata/stable/overlapping_child_label/dagre/sketch.exp.svg index 8271eb5e9..d8a40a210 100644 --- a/e2etests/testdata/stable/overlapping_child_label/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/overlapping_child_label/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -heyyaaaacccceeeeeeeeeeeeeeeeeeeyoheybbbbddddfffffffffff + .d2-855785339 .fill-N1{fill:#0A0F25;} + .d2-855785339 .fill-N2{fill:#676C7E;} + .d2-855785339 .fill-N3{fill:#9499AB;} + .d2-855785339 .fill-N4{fill:#CFD2DD;} + .d2-855785339 .fill-N5{fill:#DEE1EB;} + .d2-855785339 .fill-N6{fill:#EEF1F8;} + .d2-855785339 .fill-N7{fill:#FFFFFF;} + .d2-855785339 .fill-B1{fill:#0D32B2;} + .d2-855785339 .fill-B2{fill:#0D32B2;} + .d2-855785339 .fill-B3{fill:#E3E9FD;} + .d2-855785339 .fill-B4{fill:#E3E9FD;} + .d2-855785339 .fill-B5{fill:#EDF0FD;} + .d2-855785339 .fill-B6{fill:#F7F8FE;} + .d2-855785339 .fill-AA2{fill:#4A6FF3;} + .d2-855785339 .fill-AA4{fill:#EDF0FD;} + .d2-855785339 .fill-AA5{fill:#F7F8FE;} + .d2-855785339 .fill-AB4{fill:#EDF0FD;} + .d2-855785339 .fill-AB5{fill:#F7F8FE;} + .d2-855785339 .stroke-N1{stroke:#0A0F25;} + .d2-855785339 .stroke-N2{stroke:#676C7E;} + .d2-855785339 .stroke-N3{stroke:#9499AB;} + .d2-855785339 .stroke-N4{stroke:#CFD2DD;} + .d2-855785339 .stroke-N5{stroke:#DEE1EB;} + .d2-855785339 .stroke-N6{stroke:#EEF1F8;} + .d2-855785339 .stroke-N7{stroke:#FFFFFF;} + .d2-855785339 .stroke-B1{stroke:#0D32B2;} + .d2-855785339 .stroke-B2{stroke:#0D32B2;} + .d2-855785339 .stroke-B3{stroke:#E3E9FD;} + .d2-855785339 .stroke-B4{stroke:#E3E9FD;} + .d2-855785339 .stroke-B5{stroke:#EDF0FD;} + .d2-855785339 .stroke-B6{stroke:#F7F8FE;} + .d2-855785339 .stroke-AA2{stroke:#4A6FF3;} + .d2-855785339 .stroke-AA4{stroke:#EDF0FD;} + .d2-855785339 .stroke-AA5{stroke:#F7F8FE;} + .d2-855785339 .stroke-AB4{stroke:#EDF0FD;} + .d2-855785339 .stroke-AB5{stroke:#F7F8FE;} + .d2-855785339 .background-color-N1{background-color:#0A0F25;} + .d2-855785339 .background-color-N2{background-color:#676C7E;} + .d2-855785339 .background-color-N3{background-color:#9499AB;} + .d2-855785339 .background-color-N4{background-color:#CFD2DD;} + .d2-855785339 .background-color-N5{background-color:#DEE1EB;} + .d2-855785339 .background-color-N6{background-color:#EEF1F8;} + .d2-855785339 .background-color-N7{background-color:#FFFFFF;} + .d2-855785339 .background-color-B1{background-color:#0D32B2;} + .d2-855785339 .background-color-B2{background-color:#0D32B2;} + .d2-855785339 .background-color-B3{background-color:#E3E9FD;} + .d2-855785339 .background-color-B4{background-color:#E3E9FD;} + .d2-855785339 .background-color-B5{background-color:#EDF0FD;} + .d2-855785339 .background-color-B6{background-color:#F7F8FE;} + .d2-855785339 .background-color-AA2{background-color:#4A6FF3;} + .d2-855785339 .background-color-AA4{background-color:#EDF0FD;} + .d2-855785339 .background-color-AA5{background-color:#F7F8FE;} + .d2-855785339 .background-color-AB4{background-color:#EDF0FD;} + .d2-855785339 .background-color-AB5{background-color:#F7F8FE;} + .d2-855785339 .color-N1{color:#0A0F25;} + .d2-855785339 .color-N2{color:#676C7E;} + .d2-855785339 .color-N3{color:#9499AB;} + .d2-855785339 .color-N4{color:#CFD2DD;} + .d2-855785339 .color-N5{color:#DEE1EB;} + .d2-855785339 .color-N6{color:#EEF1F8;} + .d2-855785339 .color-N7{color:#FFFFFF;} + .d2-855785339 .color-B1{color:#0D32B2;} + .d2-855785339 .color-B2{color:#0D32B2;} + .d2-855785339 .color-B3{color:#E3E9FD;} + .d2-855785339 .color-B4{color:#E3E9FD;} + .d2-855785339 .color-B5{color:#EDF0FD;} + .d2-855785339 .color-B6{color:#F7F8FE;} + .d2-855785339 .color-AA2{color:#4A6FF3;} + .d2-855785339 .color-AA4{color:#EDF0FD;} + .d2-855785339 .color-AA5{color:#F7F8FE;} + .d2-855785339 .color-AB4{color:#EDF0FD;} + .d2-855785339 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-855785339);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-855785339);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-855785339);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-855785339);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-855785339);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-855785339);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-855785339);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-855785339);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-855785339);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-855785339);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-855785339);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-855785339);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-855785339);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-855785339);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-855785339);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-855785339);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-855785339);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-855785339);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>heyyaaaacccceeeeeeeeeeeeeeeeeeeyoheybbbbddddfffffffffff - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/overlapping_child_label/elk/board.exp.json b/e2etests/testdata/stable/overlapping_child_label/elk/board.exp.json index 1875b17a2..6d6554230 100644 --- a/e2etests/testdata/stable/overlapping_child_label/elk/board.exp.json +++ b/e2etests/testdata/stable/overlapping_child_label/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -144,6 +155,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -200,6 +212,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -256,6 +269,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -312,6 +326,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -368,6 +383,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -424,6 +440,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -487,6 +504,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 97.5, @@ -518,6 +536,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/overlapping_child_label/elk/sketch.exp.svg b/e2etests/testdata/stable/overlapping_child_label/elk/sketch.exp.svg index e2e993723..d97bd0032 100644 --- a/e2etests/testdata/stable/overlapping_child_label/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/overlapping_child_label/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -heyyaaaacccceeeeeeeeeeeeeeeeeeeyoheybbbbddddfffffffffff + .d2-2464702185 .fill-N1{fill:#0A0F25;} + .d2-2464702185 .fill-N2{fill:#676C7E;} + .d2-2464702185 .fill-N3{fill:#9499AB;} + .d2-2464702185 .fill-N4{fill:#CFD2DD;} + .d2-2464702185 .fill-N5{fill:#DEE1EB;} + .d2-2464702185 .fill-N6{fill:#EEF1F8;} + .d2-2464702185 .fill-N7{fill:#FFFFFF;} + .d2-2464702185 .fill-B1{fill:#0D32B2;} + .d2-2464702185 .fill-B2{fill:#0D32B2;} + .d2-2464702185 .fill-B3{fill:#E3E9FD;} + .d2-2464702185 .fill-B4{fill:#E3E9FD;} + .d2-2464702185 .fill-B5{fill:#EDF0FD;} + .d2-2464702185 .fill-B6{fill:#F7F8FE;} + .d2-2464702185 .fill-AA2{fill:#4A6FF3;} + .d2-2464702185 .fill-AA4{fill:#EDF0FD;} + .d2-2464702185 .fill-AA5{fill:#F7F8FE;} + .d2-2464702185 .fill-AB4{fill:#EDF0FD;} + .d2-2464702185 .fill-AB5{fill:#F7F8FE;} + .d2-2464702185 .stroke-N1{stroke:#0A0F25;} + .d2-2464702185 .stroke-N2{stroke:#676C7E;} + .d2-2464702185 .stroke-N3{stroke:#9499AB;} + .d2-2464702185 .stroke-N4{stroke:#CFD2DD;} + .d2-2464702185 .stroke-N5{stroke:#DEE1EB;} + .d2-2464702185 .stroke-N6{stroke:#EEF1F8;} + .d2-2464702185 .stroke-N7{stroke:#FFFFFF;} + .d2-2464702185 .stroke-B1{stroke:#0D32B2;} + .d2-2464702185 .stroke-B2{stroke:#0D32B2;} + .d2-2464702185 .stroke-B3{stroke:#E3E9FD;} + .d2-2464702185 .stroke-B4{stroke:#E3E9FD;} + .d2-2464702185 .stroke-B5{stroke:#EDF0FD;} + .d2-2464702185 .stroke-B6{stroke:#F7F8FE;} + .d2-2464702185 .stroke-AA2{stroke:#4A6FF3;} + .d2-2464702185 .stroke-AA4{stroke:#EDF0FD;} + .d2-2464702185 .stroke-AA5{stroke:#F7F8FE;} + .d2-2464702185 .stroke-AB4{stroke:#EDF0FD;} + .d2-2464702185 .stroke-AB5{stroke:#F7F8FE;} + .d2-2464702185 .background-color-N1{background-color:#0A0F25;} + .d2-2464702185 .background-color-N2{background-color:#676C7E;} + .d2-2464702185 .background-color-N3{background-color:#9499AB;} + .d2-2464702185 .background-color-N4{background-color:#CFD2DD;} + .d2-2464702185 .background-color-N5{background-color:#DEE1EB;} + .d2-2464702185 .background-color-N6{background-color:#EEF1F8;} + .d2-2464702185 .background-color-N7{background-color:#FFFFFF;} + .d2-2464702185 .background-color-B1{background-color:#0D32B2;} + .d2-2464702185 .background-color-B2{background-color:#0D32B2;} + .d2-2464702185 .background-color-B3{background-color:#E3E9FD;} + .d2-2464702185 .background-color-B4{background-color:#E3E9FD;} + .d2-2464702185 .background-color-B5{background-color:#EDF0FD;} + .d2-2464702185 .background-color-B6{background-color:#F7F8FE;} + .d2-2464702185 .background-color-AA2{background-color:#4A6FF3;} + .d2-2464702185 .background-color-AA4{background-color:#EDF0FD;} + .d2-2464702185 .background-color-AA5{background-color:#F7F8FE;} + .d2-2464702185 .background-color-AB4{background-color:#EDF0FD;} + .d2-2464702185 .background-color-AB5{background-color:#F7F8FE;} + .d2-2464702185 .color-N1{color:#0A0F25;} + .d2-2464702185 .color-N2{color:#676C7E;} + .d2-2464702185 .color-N3{color:#9499AB;} + .d2-2464702185 .color-N4{color:#CFD2DD;} + .d2-2464702185 .color-N5{color:#DEE1EB;} + .d2-2464702185 .color-N6{color:#EEF1F8;} + .d2-2464702185 .color-N7{color:#FFFFFF;} + .d2-2464702185 .color-B1{color:#0D32B2;} + .d2-2464702185 .color-B2{color:#0D32B2;} + .d2-2464702185 .color-B3{color:#E3E9FD;} + .d2-2464702185 .color-B4{color:#E3E9FD;} + .d2-2464702185 .color-B5{color:#EDF0FD;} + .d2-2464702185 .color-B6{color:#F7F8FE;} + .d2-2464702185 .color-AA2{color:#4A6FF3;} + .d2-2464702185 .color-AA4{color:#EDF0FD;} + .d2-2464702185 .color-AA5{color:#F7F8FE;} + .d2-2464702185 .color-AB4{color:#EDF0FD;} + .d2-2464702185 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2464702185);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2464702185);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2464702185);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2464702185);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2464702185);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2464702185);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2464702185);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2464702185);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2464702185);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2464702185);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2464702185);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2464702185);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2464702185);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2464702185);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2464702185);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2464702185);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2464702185);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2464702185);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>heyyaaaacccceeeeeeeeeeeeeeeeeeeyoheybbbbddddfffffffffff - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/overlapping_image_container_labels/dagre/board.exp.json b/e2etests/testdata/stable/overlapping_image_container_labels/dagre/board.exp.json index 8241c4499..0bb940b4f 100644 --- a/e2etests/testdata/stable/overlapping_image_container_labels/dagre/board.exp.json +++ b/e2etests/testdata/stable/overlapping_image_container_labels/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -71,6 +80,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -112,6 +122,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -165,6 +176,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -206,6 +218,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -259,6 +272,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -300,6 +314,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -353,6 +368,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -406,6 +422,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -447,6 +464,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -500,6 +518,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -541,6 +560,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -594,6 +614,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -657,6 +678,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 466, @@ -704,6 +726,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 190, @@ -751,6 +774,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 286, @@ -798,6 +822,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 646, @@ -845,6 +870,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 742, @@ -892,6 +918,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 402, @@ -939,6 +966,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 530, @@ -979,6 +1007,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/overlapping_image_container_labels/dagre/sketch.exp.svg b/e2etests/testdata/stable/overlapping_image_container_labels/dagre/sketch.exp.svg index 23c3d7923..dec9d9c78 100644 --- a/e2etests/testdata/stable/overlapping_image_container_labels/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/overlapping_image_container_labels/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -rootcontainerrootleft2rightrootinnerrootinnerleft2rightleft2right to inner left2to inner rightto inner left2to inner rightto left2 container rootto right container root + .d2-3504869247 .fill-N1{fill:#0A0F25;} + .d2-3504869247 .fill-N2{fill:#676C7E;} + .d2-3504869247 .fill-N3{fill:#9499AB;} + .d2-3504869247 .fill-N4{fill:#CFD2DD;} + .d2-3504869247 .fill-N5{fill:#DEE1EB;} + .d2-3504869247 .fill-N6{fill:#EEF1F8;} + .d2-3504869247 .fill-N7{fill:#FFFFFF;} + .d2-3504869247 .fill-B1{fill:#0D32B2;} + .d2-3504869247 .fill-B2{fill:#0D32B2;} + .d2-3504869247 .fill-B3{fill:#E3E9FD;} + .d2-3504869247 .fill-B4{fill:#E3E9FD;} + .d2-3504869247 .fill-B5{fill:#EDF0FD;} + .d2-3504869247 .fill-B6{fill:#F7F8FE;} + .d2-3504869247 .fill-AA2{fill:#4A6FF3;} + .d2-3504869247 .fill-AA4{fill:#EDF0FD;} + .d2-3504869247 .fill-AA5{fill:#F7F8FE;} + .d2-3504869247 .fill-AB4{fill:#EDF0FD;} + .d2-3504869247 .fill-AB5{fill:#F7F8FE;} + .d2-3504869247 .stroke-N1{stroke:#0A0F25;} + .d2-3504869247 .stroke-N2{stroke:#676C7E;} + .d2-3504869247 .stroke-N3{stroke:#9499AB;} + .d2-3504869247 .stroke-N4{stroke:#CFD2DD;} + .d2-3504869247 .stroke-N5{stroke:#DEE1EB;} + .d2-3504869247 .stroke-N6{stroke:#EEF1F8;} + .d2-3504869247 .stroke-N7{stroke:#FFFFFF;} + .d2-3504869247 .stroke-B1{stroke:#0D32B2;} + .d2-3504869247 .stroke-B2{stroke:#0D32B2;} + .d2-3504869247 .stroke-B3{stroke:#E3E9FD;} + .d2-3504869247 .stroke-B4{stroke:#E3E9FD;} + .d2-3504869247 .stroke-B5{stroke:#EDF0FD;} + .d2-3504869247 .stroke-B6{stroke:#F7F8FE;} + .d2-3504869247 .stroke-AA2{stroke:#4A6FF3;} + .d2-3504869247 .stroke-AA4{stroke:#EDF0FD;} + .d2-3504869247 .stroke-AA5{stroke:#F7F8FE;} + .d2-3504869247 .stroke-AB4{stroke:#EDF0FD;} + .d2-3504869247 .stroke-AB5{stroke:#F7F8FE;} + .d2-3504869247 .background-color-N1{background-color:#0A0F25;} + .d2-3504869247 .background-color-N2{background-color:#676C7E;} + .d2-3504869247 .background-color-N3{background-color:#9499AB;} + .d2-3504869247 .background-color-N4{background-color:#CFD2DD;} + .d2-3504869247 .background-color-N5{background-color:#DEE1EB;} + .d2-3504869247 .background-color-N6{background-color:#EEF1F8;} + .d2-3504869247 .background-color-N7{background-color:#FFFFFF;} + .d2-3504869247 .background-color-B1{background-color:#0D32B2;} + .d2-3504869247 .background-color-B2{background-color:#0D32B2;} + .d2-3504869247 .background-color-B3{background-color:#E3E9FD;} + .d2-3504869247 .background-color-B4{background-color:#E3E9FD;} + .d2-3504869247 .background-color-B5{background-color:#EDF0FD;} + .d2-3504869247 .background-color-B6{background-color:#F7F8FE;} + .d2-3504869247 .background-color-AA2{background-color:#4A6FF3;} + .d2-3504869247 .background-color-AA4{background-color:#EDF0FD;} + .d2-3504869247 .background-color-AA5{background-color:#F7F8FE;} + .d2-3504869247 .background-color-AB4{background-color:#EDF0FD;} + .d2-3504869247 .background-color-AB5{background-color:#F7F8FE;} + .d2-3504869247 .color-N1{color:#0A0F25;} + .d2-3504869247 .color-N2{color:#676C7E;} + .d2-3504869247 .color-N3{color:#9499AB;} + .d2-3504869247 .color-N4{color:#CFD2DD;} + .d2-3504869247 .color-N5{color:#DEE1EB;} + .d2-3504869247 .color-N6{color:#EEF1F8;} + .d2-3504869247 .color-N7{color:#FFFFFF;} + .d2-3504869247 .color-B1{color:#0D32B2;} + .d2-3504869247 .color-B2{color:#0D32B2;} + .d2-3504869247 .color-B3{color:#E3E9FD;} + .d2-3504869247 .color-B4{color:#E3E9FD;} + .d2-3504869247 .color-B5{color:#EDF0FD;} + .d2-3504869247 .color-B6{color:#F7F8FE;} + .d2-3504869247 .color-AA2{color:#4A6FF3;} + .d2-3504869247 .color-AA4{color:#EDF0FD;} + .d2-3504869247 .color-AA5{color:#F7F8FE;} + .d2-3504869247 .color-AB4{color:#EDF0FD;} + .d2-3504869247 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3504869247);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3504869247);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3504869247);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3504869247);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3504869247);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3504869247);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3504869247);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3504869247);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3504869247);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3504869247);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3504869247);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3504869247);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3504869247);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3504869247);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3504869247);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3504869247);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3504869247);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3504869247);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>rootcontainerrootleft2rightrootinnerrootinnerleft2rightleft2right to inner left2to inner rightto inner left2to inner rightto left2 container rootto right container root - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/overlapping_image_container_labels/elk/board.exp.json b/e2etests/testdata/stable/overlapping_image_container_labels/elk/board.exp.json index a986f5e44..f962eda07 100644 --- a/e2etests/testdata/stable/overlapping_image_container_labels/elk/board.exp.json +++ b/e2etests/testdata/stable/overlapping_image_container_labels/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -71,6 +80,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -112,6 +122,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -165,6 +176,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -206,6 +218,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -259,6 +272,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -300,6 +314,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -353,6 +368,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -406,6 +422,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -447,6 +464,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -500,6 +518,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -541,6 +560,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -594,6 +614,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -657,6 +678,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 548, @@ -695,6 +717,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 278.6659851074219, @@ -741,6 +764,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 321.3330078125, @@ -787,6 +811,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 774.666015625, @@ -833,6 +858,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 817.3330078125, @@ -879,6 +905,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 526.666015625, @@ -925,6 +952,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 569.3330078125, @@ -964,6 +992,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/overlapping_image_container_labels/elk/sketch.exp.svg b/e2etests/testdata/stable/overlapping_image_container_labels/elk/sketch.exp.svg index b24f8a956..3f0a9d16f 100644 --- a/e2etests/testdata/stable/overlapping_image_container_labels/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/overlapping_image_container_labels/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -rootcontainerrootleft2rightrootinnerrootinnerleft2rightleft2right to inner left2to inner rightto inner left2to inner rightto left2 container rootto right container root + .d2-2585312087 .fill-N1{fill:#0A0F25;} + .d2-2585312087 .fill-N2{fill:#676C7E;} + .d2-2585312087 .fill-N3{fill:#9499AB;} + .d2-2585312087 .fill-N4{fill:#CFD2DD;} + .d2-2585312087 .fill-N5{fill:#DEE1EB;} + .d2-2585312087 .fill-N6{fill:#EEF1F8;} + .d2-2585312087 .fill-N7{fill:#FFFFFF;} + .d2-2585312087 .fill-B1{fill:#0D32B2;} + .d2-2585312087 .fill-B2{fill:#0D32B2;} + .d2-2585312087 .fill-B3{fill:#E3E9FD;} + .d2-2585312087 .fill-B4{fill:#E3E9FD;} + .d2-2585312087 .fill-B5{fill:#EDF0FD;} + .d2-2585312087 .fill-B6{fill:#F7F8FE;} + .d2-2585312087 .fill-AA2{fill:#4A6FF3;} + .d2-2585312087 .fill-AA4{fill:#EDF0FD;} + .d2-2585312087 .fill-AA5{fill:#F7F8FE;} + .d2-2585312087 .fill-AB4{fill:#EDF0FD;} + .d2-2585312087 .fill-AB5{fill:#F7F8FE;} + .d2-2585312087 .stroke-N1{stroke:#0A0F25;} + .d2-2585312087 .stroke-N2{stroke:#676C7E;} + .d2-2585312087 .stroke-N3{stroke:#9499AB;} + .d2-2585312087 .stroke-N4{stroke:#CFD2DD;} + .d2-2585312087 .stroke-N5{stroke:#DEE1EB;} + .d2-2585312087 .stroke-N6{stroke:#EEF1F8;} + .d2-2585312087 .stroke-N7{stroke:#FFFFFF;} + .d2-2585312087 .stroke-B1{stroke:#0D32B2;} + .d2-2585312087 .stroke-B2{stroke:#0D32B2;} + .d2-2585312087 .stroke-B3{stroke:#E3E9FD;} + .d2-2585312087 .stroke-B4{stroke:#E3E9FD;} + .d2-2585312087 .stroke-B5{stroke:#EDF0FD;} + .d2-2585312087 .stroke-B6{stroke:#F7F8FE;} + .d2-2585312087 .stroke-AA2{stroke:#4A6FF3;} + .d2-2585312087 .stroke-AA4{stroke:#EDF0FD;} + .d2-2585312087 .stroke-AA5{stroke:#F7F8FE;} + .d2-2585312087 .stroke-AB4{stroke:#EDF0FD;} + .d2-2585312087 .stroke-AB5{stroke:#F7F8FE;} + .d2-2585312087 .background-color-N1{background-color:#0A0F25;} + .d2-2585312087 .background-color-N2{background-color:#676C7E;} + .d2-2585312087 .background-color-N3{background-color:#9499AB;} + .d2-2585312087 .background-color-N4{background-color:#CFD2DD;} + .d2-2585312087 .background-color-N5{background-color:#DEE1EB;} + .d2-2585312087 .background-color-N6{background-color:#EEF1F8;} + .d2-2585312087 .background-color-N7{background-color:#FFFFFF;} + .d2-2585312087 .background-color-B1{background-color:#0D32B2;} + .d2-2585312087 .background-color-B2{background-color:#0D32B2;} + .d2-2585312087 .background-color-B3{background-color:#E3E9FD;} + .d2-2585312087 .background-color-B4{background-color:#E3E9FD;} + .d2-2585312087 .background-color-B5{background-color:#EDF0FD;} + .d2-2585312087 .background-color-B6{background-color:#F7F8FE;} + .d2-2585312087 .background-color-AA2{background-color:#4A6FF3;} + .d2-2585312087 .background-color-AA4{background-color:#EDF0FD;} + .d2-2585312087 .background-color-AA5{background-color:#F7F8FE;} + .d2-2585312087 .background-color-AB4{background-color:#EDF0FD;} + .d2-2585312087 .background-color-AB5{background-color:#F7F8FE;} + .d2-2585312087 .color-N1{color:#0A0F25;} + .d2-2585312087 .color-N2{color:#676C7E;} + .d2-2585312087 .color-N3{color:#9499AB;} + .d2-2585312087 .color-N4{color:#CFD2DD;} + .d2-2585312087 .color-N5{color:#DEE1EB;} + .d2-2585312087 .color-N6{color:#EEF1F8;} + .d2-2585312087 .color-N7{color:#FFFFFF;} + .d2-2585312087 .color-B1{color:#0D32B2;} + .d2-2585312087 .color-B2{color:#0D32B2;} + .d2-2585312087 .color-B3{color:#E3E9FD;} + .d2-2585312087 .color-B4{color:#E3E9FD;} + .d2-2585312087 .color-B5{color:#EDF0FD;} + .d2-2585312087 .color-B6{color:#F7F8FE;} + .d2-2585312087 .color-AA2{color:#4A6FF3;} + .d2-2585312087 .color-AA4{color:#EDF0FD;} + .d2-2585312087 .color-AA5{color:#F7F8FE;} + .d2-2585312087 .color-AB4{color:#EDF0FD;} + .d2-2585312087 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2585312087);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2585312087);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2585312087);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2585312087);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2585312087);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2585312087);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2585312087);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2585312087);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2585312087);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2585312087);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2585312087);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2585312087);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2585312087);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2585312087);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2585312087);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2585312087);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2585312087);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2585312087);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>rootcontainerrootleft2rightrootinnerrootinnerleft2rightleft2right to inner left2to inner rightto inner left2to inner rightto left2 container rootto right container root - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/p/dagre/board.exp.json b/e2etests/testdata/stable/p/dagre/board.exp.json index 74eaf4077..a095c646a 100644 --- a/e2etests/testdata/stable/p/dagre/board.exp.json +++ b/e2etests/testdata/stable/p/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -150,6 +161,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 928.5, @@ -197,6 +209,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 928.5, @@ -237,6 +250,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/p/dagre/sketch.exp.svg b/e2etests/testdata/stable/p/dagre/sketch.exp.svg index 0441993cb..937d461dc 100644 --- a/e2etests/testdata/stable/p/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/p/dagre/sketch.exp.svg @@ -1,20 +1,20 @@ -

    A paragraph is simply one or more consecutive lines of text, separated +

    A paragraph is simply one or more consecutive lines of text, separated by one or more blank lines. (A blank line is any line that looks like a blank line -- a line containing nothing but spaces or tabs is considered blank.) Normal paragraphs should not be indented with spaces or tabs.

    -
    ab +
    ab - - - + + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/p/elk/board.exp.json b/e2etests/testdata/stable/p/elk/board.exp.json index 73da20318..4050254af 100644 --- a/e2etests/testdata/stable/p/elk/board.exp.json +++ b/e2etests/testdata/stable/p/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -150,6 +161,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 940.5, @@ -188,6 +200,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 940.5, @@ -219,6 +232,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/p/elk/sketch.exp.svg b/e2etests/testdata/stable/p/elk/sketch.exp.svg index 519ef346f..364afa32d 100644 --- a/e2etests/testdata/stable/p/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/p/elk/sketch.exp.svg @@ -1,20 +1,20 @@ -

    A paragraph is simply one or more consecutive lines of text, separated +

    A paragraph is simply one or more consecutive lines of text, separated by one or more blank lines. (A blank line is any line that looks like a blank line -- a line containing nothing but spaces or tabs is considered blank.) Normal paragraphs should not be indented with spaces or tabs.

    -
    ab +
    ab - - - + + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/people/dagre/board.exp.json b/e2etests/testdata/stable/people/dagre/board.exp.json index 5267ee627..d4b921ce2 100644 --- a/e2etests/testdata/stable/people/dagre/board.exp.json +++ b/e2etests/testdata/stable/people/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -512,6 +532,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/people/dagre/sketch.exp.svg b/e2etests/testdata/stable/people/dagre/sketch.exp.svg index 3428225e8..dd38260ae 100644 --- a/e2etests/testdata/stable/people/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/people/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ --------------------------------------------------------------------------------------------------------------------------------12345 + .d2-2633060914 .fill-N1{fill:#0A0F25;} + .d2-2633060914 .fill-N2{fill:#676C7E;} + .d2-2633060914 .fill-N3{fill:#9499AB;} + .d2-2633060914 .fill-N4{fill:#CFD2DD;} + .d2-2633060914 .fill-N5{fill:#DEE1EB;} + .d2-2633060914 .fill-N6{fill:#EEF1F8;} + .d2-2633060914 .fill-N7{fill:#FFFFFF;} + .d2-2633060914 .fill-B1{fill:#0D32B2;} + .d2-2633060914 .fill-B2{fill:#0D32B2;} + .d2-2633060914 .fill-B3{fill:#E3E9FD;} + .d2-2633060914 .fill-B4{fill:#E3E9FD;} + .d2-2633060914 .fill-B5{fill:#EDF0FD;} + .d2-2633060914 .fill-B6{fill:#F7F8FE;} + .d2-2633060914 .fill-AA2{fill:#4A6FF3;} + .d2-2633060914 .fill-AA4{fill:#EDF0FD;} + .d2-2633060914 .fill-AA5{fill:#F7F8FE;} + .d2-2633060914 .fill-AB4{fill:#EDF0FD;} + .d2-2633060914 .fill-AB5{fill:#F7F8FE;} + .d2-2633060914 .stroke-N1{stroke:#0A0F25;} + .d2-2633060914 .stroke-N2{stroke:#676C7E;} + .d2-2633060914 .stroke-N3{stroke:#9499AB;} + .d2-2633060914 .stroke-N4{stroke:#CFD2DD;} + .d2-2633060914 .stroke-N5{stroke:#DEE1EB;} + .d2-2633060914 .stroke-N6{stroke:#EEF1F8;} + .d2-2633060914 .stroke-N7{stroke:#FFFFFF;} + .d2-2633060914 .stroke-B1{stroke:#0D32B2;} + .d2-2633060914 .stroke-B2{stroke:#0D32B2;} + .d2-2633060914 .stroke-B3{stroke:#E3E9FD;} + .d2-2633060914 .stroke-B4{stroke:#E3E9FD;} + .d2-2633060914 .stroke-B5{stroke:#EDF0FD;} + .d2-2633060914 .stroke-B6{stroke:#F7F8FE;} + .d2-2633060914 .stroke-AA2{stroke:#4A6FF3;} + .d2-2633060914 .stroke-AA4{stroke:#EDF0FD;} + .d2-2633060914 .stroke-AA5{stroke:#F7F8FE;} + .d2-2633060914 .stroke-AB4{stroke:#EDF0FD;} + .d2-2633060914 .stroke-AB5{stroke:#F7F8FE;} + .d2-2633060914 .background-color-N1{background-color:#0A0F25;} + .d2-2633060914 .background-color-N2{background-color:#676C7E;} + .d2-2633060914 .background-color-N3{background-color:#9499AB;} + .d2-2633060914 .background-color-N4{background-color:#CFD2DD;} + .d2-2633060914 .background-color-N5{background-color:#DEE1EB;} + .d2-2633060914 .background-color-N6{background-color:#EEF1F8;} + .d2-2633060914 .background-color-N7{background-color:#FFFFFF;} + .d2-2633060914 .background-color-B1{background-color:#0D32B2;} + .d2-2633060914 .background-color-B2{background-color:#0D32B2;} + .d2-2633060914 .background-color-B3{background-color:#E3E9FD;} + .d2-2633060914 .background-color-B4{background-color:#E3E9FD;} + .d2-2633060914 .background-color-B5{background-color:#EDF0FD;} + .d2-2633060914 .background-color-B6{background-color:#F7F8FE;} + .d2-2633060914 .background-color-AA2{background-color:#4A6FF3;} + .d2-2633060914 .background-color-AA4{background-color:#EDF0FD;} + .d2-2633060914 .background-color-AA5{background-color:#F7F8FE;} + .d2-2633060914 .background-color-AB4{background-color:#EDF0FD;} + .d2-2633060914 .background-color-AB5{background-color:#F7F8FE;} + .d2-2633060914 .color-N1{color:#0A0F25;} + .d2-2633060914 .color-N2{color:#676C7E;} + .d2-2633060914 .color-N3{color:#9499AB;} + .d2-2633060914 .color-N4{color:#CFD2DD;} + .d2-2633060914 .color-N5{color:#DEE1EB;} + .d2-2633060914 .color-N6{color:#EEF1F8;} + .d2-2633060914 .color-N7{color:#FFFFFF;} + .d2-2633060914 .color-B1{color:#0D32B2;} + .d2-2633060914 .color-B2{color:#0D32B2;} + .d2-2633060914 .color-B3{color:#E3E9FD;} + .d2-2633060914 .color-B4{color:#E3E9FD;} + .d2-2633060914 .color-B5{color:#EDF0FD;} + .d2-2633060914 .color-B6{color:#F7F8FE;} + .d2-2633060914 .color-AA2{color:#4A6FF3;} + .d2-2633060914 .color-AA4{color:#EDF0FD;} + .d2-2633060914 .color-AA5{color:#F7F8FE;} + .d2-2633060914 .color-AB4{color:#EDF0FD;} + .d2-2633060914 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2633060914);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2633060914);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2633060914);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2633060914);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2633060914);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2633060914);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2633060914);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2633060914);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2633060914);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2633060914);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2633060914);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2633060914);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2633060914);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2633060914);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2633060914);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2633060914);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2633060914);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2633060914);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>-------------------------------------------------------------------------------------------------------------------------------12345 - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/people/elk/board.exp.json b/e2etests/testdata/stable/people/elk/board.exp.json index 9b289de78..d74194ef4 100644 --- a/e2etests/testdata/stable/people/elk/board.exp.json +++ b/e2etests/testdata/stable/people/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -512,6 +532,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/people/elk/sketch.exp.svg b/e2etests/testdata/stable/people/elk/sketch.exp.svg index 674e509bf..afe197db4 100644 --- a/e2etests/testdata/stable/people/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/people/elk/sketch.exp.svg @@ -1,9 +1,9 @@ --------------------------------------------------------------------------------------------------------------------------------12345 + .d2-3598752363 .fill-N1{fill:#0A0F25;} + .d2-3598752363 .fill-N2{fill:#676C7E;} + .d2-3598752363 .fill-N3{fill:#9499AB;} + .d2-3598752363 .fill-N4{fill:#CFD2DD;} + .d2-3598752363 .fill-N5{fill:#DEE1EB;} + .d2-3598752363 .fill-N6{fill:#EEF1F8;} + .d2-3598752363 .fill-N7{fill:#FFFFFF;} + .d2-3598752363 .fill-B1{fill:#0D32B2;} + .d2-3598752363 .fill-B2{fill:#0D32B2;} + .d2-3598752363 .fill-B3{fill:#E3E9FD;} + .d2-3598752363 .fill-B4{fill:#E3E9FD;} + .d2-3598752363 .fill-B5{fill:#EDF0FD;} + .d2-3598752363 .fill-B6{fill:#F7F8FE;} + .d2-3598752363 .fill-AA2{fill:#4A6FF3;} + .d2-3598752363 .fill-AA4{fill:#EDF0FD;} + .d2-3598752363 .fill-AA5{fill:#F7F8FE;} + .d2-3598752363 .fill-AB4{fill:#EDF0FD;} + .d2-3598752363 .fill-AB5{fill:#F7F8FE;} + .d2-3598752363 .stroke-N1{stroke:#0A0F25;} + .d2-3598752363 .stroke-N2{stroke:#676C7E;} + .d2-3598752363 .stroke-N3{stroke:#9499AB;} + .d2-3598752363 .stroke-N4{stroke:#CFD2DD;} + .d2-3598752363 .stroke-N5{stroke:#DEE1EB;} + .d2-3598752363 .stroke-N6{stroke:#EEF1F8;} + .d2-3598752363 .stroke-N7{stroke:#FFFFFF;} + .d2-3598752363 .stroke-B1{stroke:#0D32B2;} + .d2-3598752363 .stroke-B2{stroke:#0D32B2;} + .d2-3598752363 .stroke-B3{stroke:#E3E9FD;} + .d2-3598752363 .stroke-B4{stroke:#E3E9FD;} + .d2-3598752363 .stroke-B5{stroke:#EDF0FD;} + .d2-3598752363 .stroke-B6{stroke:#F7F8FE;} + .d2-3598752363 .stroke-AA2{stroke:#4A6FF3;} + .d2-3598752363 .stroke-AA4{stroke:#EDF0FD;} + .d2-3598752363 .stroke-AA5{stroke:#F7F8FE;} + .d2-3598752363 .stroke-AB4{stroke:#EDF0FD;} + .d2-3598752363 .stroke-AB5{stroke:#F7F8FE;} + .d2-3598752363 .background-color-N1{background-color:#0A0F25;} + .d2-3598752363 .background-color-N2{background-color:#676C7E;} + .d2-3598752363 .background-color-N3{background-color:#9499AB;} + .d2-3598752363 .background-color-N4{background-color:#CFD2DD;} + .d2-3598752363 .background-color-N5{background-color:#DEE1EB;} + .d2-3598752363 .background-color-N6{background-color:#EEF1F8;} + .d2-3598752363 .background-color-N7{background-color:#FFFFFF;} + .d2-3598752363 .background-color-B1{background-color:#0D32B2;} + .d2-3598752363 .background-color-B2{background-color:#0D32B2;} + .d2-3598752363 .background-color-B3{background-color:#E3E9FD;} + .d2-3598752363 .background-color-B4{background-color:#E3E9FD;} + .d2-3598752363 .background-color-B5{background-color:#EDF0FD;} + .d2-3598752363 .background-color-B6{background-color:#F7F8FE;} + .d2-3598752363 .background-color-AA2{background-color:#4A6FF3;} + .d2-3598752363 .background-color-AA4{background-color:#EDF0FD;} + .d2-3598752363 .background-color-AA5{background-color:#F7F8FE;} + .d2-3598752363 .background-color-AB4{background-color:#EDF0FD;} + .d2-3598752363 .background-color-AB5{background-color:#F7F8FE;} + .d2-3598752363 .color-N1{color:#0A0F25;} + .d2-3598752363 .color-N2{color:#676C7E;} + .d2-3598752363 .color-N3{color:#9499AB;} + .d2-3598752363 .color-N4{color:#CFD2DD;} + .d2-3598752363 .color-N5{color:#DEE1EB;} + .d2-3598752363 .color-N6{color:#EEF1F8;} + .d2-3598752363 .color-N7{color:#FFFFFF;} + .d2-3598752363 .color-B1{color:#0D32B2;} + .d2-3598752363 .color-B2{color:#0D32B2;} + .d2-3598752363 .color-B3{color:#E3E9FD;} + .d2-3598752363 .color-B4{color:#E3E9FD;} + .d2-3598752363 .color-B5{color:#EDF0FD;} + .d2-3598752363 .color-B6{color:#F7F8FE;} + .d2-3598752363 .color-AA2{color:#4A6FF3;} + .d2-3598752363 .color-AA4{color:#EDF0FD;} + .d2-3598752363 .color-AA5{color:#F7F8FE;} + .d2-3598752363 .color-AB4{color:#EDF0FD;} + .d2-3598752363 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3598752363);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3598752363);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3598752363);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3598752363);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3598752363);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3598752363);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3598752363);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3598752363);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3598752363);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3598752363);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3598752363);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3598752363);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3598752363);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3598752363);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3598752363);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3598752363);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3598752363);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3598752363);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>-------------------------------------------------------------------------------------------------------------------------------12345 - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/pre/dagre/board.exp.json b/e2etests/testdata/stable/pre/dagre/board.exp.json index d272f4e63..c095f593e 100644 --- a/e2etests/testdata/stable/pre/dagre/board.exp.json +++ b/e2etests/testdata/stable/pre/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -150,6 +161,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 301, @@ -197,6 +209,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 301, @@ -237,6 +250,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/pre/dagre/sketch.exp.svg b/e2etests/testdata/stable/pre/dagre/sketch.exp.svg index 3ac7db40d..511e4b844 100644 --- a/e2etests/testdata/stable/pre/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/pre/dagre/sketch.exp.svg @@ -1,27 +1,27 @@ -

    Here is an example of AppleScript:

    +

    Here is an example of AppleScript:

    tell application "Foo"
     beep
 end tell

    A code block continues until it reaches a line that is not indented (or the end of the article).

    -
    ab +
    ab - - - + + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/pre/elk/board.exp.json b/e2etests/testdata/stable/pre/elk/board.exp.json index fecef5b09..06cbff0cb 100644 --- a/e2etests/testdata/stable/pre/elk/board.exp.json +++ b/e2etests/testdata/stable/pre/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -150,6 +161,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 313, @@ -188,6 +200,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 313, @@ -219,6 +232,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/pre/elk/sketch.exp.svg b/e2etests/testdata/stable/pre/elk/sketch.exp.svg index 5f32a7751..ada9bbdd3 100644 --- a/e2etests/testdata/stable/pre/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/pre/elk/sketch.exp.svg @@ -1,27 +1,27 @@ -

    Here is an example of AppleScript:

    +

    Here is an example of AppleScript:

    tell application "Foo"
     beep
 end tell

    A code block continues until it reaches a line that is not indented (or the end of the article).

    -
    ab +
    ab - - - + + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/self-referencing/dagre/board.exp.json b/e2etests/testdata/stable/self-referencing/dagre/board.exp.json index 504fa726a..224613a78 100644 --- a/e2etests/testdata/stable/self-referencing/dagre/board.exp.json +++ b/e2etests/testdata/stable/self-referencing/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -151,6 +162,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 53.33300018310547, @@ -234,6 +246,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 53, @@ -317,6 +330,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 26.5, @@ -364,6 +378,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 219, @@ -411,6 +426,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 244.66600036621094, @@ -487,6 +503,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/self-referencing/dagre/sketch.exp.svg b/e2etests/testdata/stable/self-referencing/dagre/sketch.exp.svg index 828f5af81..77b4c0a3b 100644 --- a/e2etests/testdata/stable/self-referencing/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/self-referencing/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -xyz hello + .d2-2111702612 .fill-N1{fill:#0A0F25;} + .d2-2111702612 .fill-N2{fill:#676C7E;} + .d2-2111702612 .fill-N3{fill:#9499AB;} + .d2-2111702612 .fill-N4{fill:#CFD2DD;} + .d2-2111702612 .fill-N5{fill:#DEE1EB;} + .d2-2111702612 .fill-N6{fill:#EEF1F8;} + .d2-2111702612 .fill-N7{fill:#FFFFFF;} + .d2-2111702612 .fill-B1{fill:#0D32B2;} + .d2-2111702612 .fill-B2{fill:#0D32B2;} + .d2-2111702612 .fill-B3{fill:#E3E9FD;} + .d2-2111702612 .fill-B4{fill:#E3E9FD;} + .d2-2111702612 .fill-B5{fill:#EDF0FD;} + .d2-2111702612 .fill-B6{fill:#F7F8FE;} + .d2-2111702612 .fill-AA2{fill:#4A6FF3;} + .d2-2111702612 .fill-AA4{fill:#EDF0FD;} + .d2-2111702612 .fill-AA5{fill:#F7F8FE;} + .d2-2111702612 .fill-AB4{fill:#EDF0FD;} + .d2-2111702612 .fill-AB5{fill:#F7F8FE;} + .d2-2111702612 .stroke-N1{stroke:#0A0F25;} + .d2-2111702612 .stroke-N2{stroke:#676C7E;} + .d2-2111702612 .stroke-N3{stroke:#9499AB;} + .d2-2111702612 .stroke-N4{stroke:#CFD2DD;} + .d2-2111702612 .stroke-N5{stroke:#DEE1EB;} + .d2-2111702612 .stroke-N6{stroke:#EEF1F8;} + .d2-2111702612 .stroke-N7{stroke:#FFFFFF;} + .d2-2111702612 .stroke-B1{stroke:#0D32B2;} + .d2-2111702612 .stroke-B2{stroke:#0D32B2;} + .d2-2111702612 .stroke-B3{stroke:#E3E9FD;} + .d2-2111702612 .stroke-B4{stroke:#E3E9FD;} + .d2-2111702612 .stroke-B5{stroke:#EDF0FD;} + .d2-2111702612 .stroke-B6{stroke:#F7F8FE;} + .d2-2111702612 .stroke-AA2{stroke:#4A6FF3;} + .d2-2111702612 .stroke-AA4{stroke:#EDF0FD;} + .d2-2111702612 .stroke-AA5{stroke:#F7F8FE;} + .d2-2111702612 .stroke-AB4{stroke:#EDF0FD;} + .d2-2111702612 .stroke-AB5{stroke:#F7F8FE;} + .d2-2111702612 .background-color-N1{background-color:#0A0F25;} + .d2-2111702612 .background-color-N2{background-color:#676C7E;} + .d2-2111702612 .background-color-N3{background-color:#9499AB;} + .d2-2111702612 .background-color-N4{background-color:#CFD2DD;} + .d2-2111702612 .background-color-N5{background-color:#DEE1EB;} + .d2-2111702612 .background-color-N6{background-color:#EEF1F8;} + .d2-2111702612 .background-color-N7{background-color:#FFFFFF;} + .d2-2111702612 .background-color-B1{background-color:#0D32B2;} + .d2-2111702612 .background-color-B2{background-color:#0D32B2;} + .d2-2111702612 .background-color-B3{background-color:#E3E9FD;} + .d2-2111702612 .background-color-B4{background-color:#E3E9FD;} + .d2-2111702612 .background-color-B5{background-color:#EDF0FD;} + .d2-2111702612 .background-color-B6{background-color:#F7F8FE;} + .d2-2111702612 .background-color-AA2{background-color:#4A6FF3;} + .d2-2111702612 .background-color-AA4{background-color:#EDF0FD;} + .d2-2111702612 .background-color-AA5{background-color:#F7F8FE;} + .d2-2111702612 .background-color-AB4{background-color:#EDF0FD;} + .d2-2111702612 .background-color-AB5{background-color:#F7F8FE;} + .d2-2111702612 .color-N1{color:#0A0F25;} + .d2-2111702612 .color-N2{color:#676C7E;} + .d2-2111702612 .color-N3{color:#9499AB;} + .d2-2111702612 .color-N4{color:#CFD2DD;} + .d2-2111702612 .color-N5{color:#DEE1EB;} + .d2-2111702612 .color-N6{color:#EEF1F8;} + .d2-2111702612 .color-N7{color:#FFFFFF;} + .d2-2111702612 .color-B1{color:#0D32B2;} + .d2-2111702612 .color-B2{color:#0D32B2;} + .d2-2111702612 .color-B3{color:#E3E9FD;} + .d2-2111702612 .color-B4{color:#E3E9FD;} + .d2-2111702612 .color-B5{color:#EDF0FD;} + .d2-2111702612 .color-B6{color:#F7F8FE;} + .d2-2111702612 .color-AA2{color:#4A6FF3;} + .d2-2111702612 .color-AA4{color:#EDF0FD;} + .d2-2111702612 .color-AA5{color:#F7F8FE;} + .d2-2111702612 .color-AB4{color:#EDF0FD;} + .d2-2111702612 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2111702612);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2111702612);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2111702612);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2111702612);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2111702612);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2111702612);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2111702612);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2111702612);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2111702612);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2111702612);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2111702612);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2111702612);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2111702612);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2111702612);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2111702612);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2111702612);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2111702612);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2111702612);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xyz hello - - - - + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/self-referencing/elk/board.exp.json b/e2etests/testdata/stable/self-referencing/elk/board.exp.json index 91abeece7..26dedc1bc 100644 --- a/e2etests/testdata/stable/self-referencing/elk/board.exp.json +++ b/e2etests/testdata/stable/self-referencing/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -151,6 +162,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -197,6 +209,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 182, @@ -243,6 +256,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 122, @@ -289,6 +303,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 377, @@ -335,6 +350,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 337, @@ -374,6 +390,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/self-referencing/elk/sketch.exp.svg b/e2etests/testdata/stable/self-referencing/elk/sketch.exp.svg index f4223cbe5..2b316e159 100644 --- a/e2etests/testdata/stable/self-referencing/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/self-referencing/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -xyz hello + .d2-312013241 .fill-N1{fill:#0A0F25;} + .d2-312013241 .fill-N2{fill:#676C7E;} + .d2-312013241 .fill-N3{fill:#9499AB;} + .d2-312013241 .fill-N4{fill:#CFD2DD;} + .d2-312013241 .fill-N5{fill:#DEE1EB;} + .d2-312013241 .fill-N6{fill:#EEF1F8;} + .d2-312013241 .fill-N7{fill:#FFFFFF;} + .d2-312013241 .fill-B1{fill:#0D32B2;} + .d2-312013241 .fill-B2{fill:#0D32B2;} + .d2-312013241 .fill-B3{fill:#E3E9FD;} + .d2-312013241 .fill-B4{fill:#E3E9FD;} + .d2-312013241 .fill-B5{fill:#EDF0FD;} + .d2-312013241 .fill-B6{fill:#F7F8FE;} + .d2-312013241 .fill-AA2{fill:#4A6FF3;} + .d2-312013241 .fill-AA4{fill:#EDF0FD;} + .d2-312013241 .fill-AA5{fill:#F7F8FE;} + .d2-312013241 .fill-AB4{fill:#EDF0FD;} + .d2-312013241 .fill-AB5{fill:#F7F8FE;} + .d2-312013241 .stroke-N1{stroke:#0A0F25;} + .d2-312013241 .stroke-N2{stroke:#676C7E;} + .d2-312013241 .stroke-N3{stroke:#9499AB;} + .d2-312013241 .stroke-N4{stroke:#CFD2DD;} + .d2-312013241 .stroke-N5{stroke:#DEE1EB;} + .d2-312013241 .stroke-N6{stroke:#EEF1F8;} + .d2-312013241 .stroke-N7{stroke:#FFFFFF;} + .d2-312013241 .stroke-B1{stroke:#0D32B2;} + .d2-312013241 .stroke-B2{stroke:#0D32B2;} + .d2-312013241 .stroke-B3{stroke:#E3E9FD;} + .d2-312013241 .stroke-B4{stroke:#E3E9FD;} + .d2-312013241 .stroke-B5{stroke:#EDF0FD;} + .d2-312013241 .stroke-B6{stroke:#F7F8FE;} + .d2-312013241 .stroke-AA2{stroke:#4A6FF3;} + .d2-312013241 .stroke-AA4{stroke:#EDF0FD;} + .d2-312013241 .stroke-AA5{stroke:#F7F8FE;} + .d2-312013241 .stroke-AB4{stroke:#EDF0FD;} + .d2-312013241 .stroke-AB5{stroke:#F7F8FE;} + .d2-312013241 .background-color-N1{background-color:#0A0F25;} + .d2-312013241 .background-color-N2{background-color:#676C7E;} + .d2-312013241 .background-color-N3{background-color:#9499AB;} + .d2-312013241 .background-color-N4{background-color:#CFD2DD;} + .d2-312013241 .background-color-N5{background-color:#DEE1EB;} + .d2-312013241 .background-color-N6{background-color:#EEF1F8;} + .d2-312013241 .background-color-N7{background-color:#FFFFFF;} + .d2-312013241 .background-color-B1{background-color:#0D32B2;} + .d2-312013241 .background-color-B2{background-color:#0D32B2;} + .d2-312013241 .background-color-B3{background-color:#E3E9FD;} + .d2-312013241 .background-color-B4{background-color:#E3E9FD;} + .d2-312013241 .background-color-B5{background-color:#EDF0FD;} + .d2-312013241 .background-color-B6{background-color:#F7F8FE;} + .d2-312013241 .background-color-AA2{background-color:#4A6FF3;} + .d2-312013241 .background-color-AA4{background-color:#EDF0FD;} + .d2-312013241 .background-color-AA5{background-color:#F7F8FE;} + .d2-312013241 .background-color-AB4{background-color:#EDF0FD;} + .d2-312013241 .background-color-AB5{background-color:#F7F8FE;} + .d2-312013241 .color-N1{color:#0A0F25;} + .d2-312013241 .color-N2{color:#676C7E;} + .d2-312013241 .color-N3{color:#9499AB;} + .d2-312013241 .color-N4{color:#CFD2DD;} + .d2-312013241 .color-N5{color:#DEE1EB;} + .d2-312013241 .color-N6{color:#EEF1F8;} + .d2-312013241 .color-N7{color:#FFFFFF;} + .d2-312013241 .color-B1{color:#0D32B2;} + .d2-312013241 .color-B2{color:#0D32B2;} + .d2-312013241 .color-B3{color:#E3E9FD;} + .d2-312013241 .color-B4{color:#E3E9FD;} + .d2-312013241 .color-B5{color:#EDF0FD;} + .d2-312013241 .color-B6{color:#F7F8FE;} + .d2-312013241 .color-AA2{color:#4A6FF3;} + .d2-312013241 .color-AA4{color:#EDF0FD;} + .d2-312013241 .color-AA5{color:#F7F8FE;} + .d2-312013241 .color-AB4{color:#EDF0FD;} + .d2-312013241 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-312013241);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-312013241);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-312013241);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-312013241);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-312013241);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-312013241);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-312013241);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-312013241);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-312013241);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-312013241);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-312013241);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-312013241);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-312013241);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-312013241);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-312013241);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-312013241);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-312013241);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-312013241);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xyz hello - - - - + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence-inter-span-self/dagre/board.exp.json b/e2etests/testdata/stable/sequence-inter-span-self/dagre/board.exp.json index 8ee037517..05baa0635 100644 --- a/e2etests/testdata/stable/sequence-inter-span-self/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence-inter-span-self/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -140,6 +151,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -190,6 +202,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -228,6 +241,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -274,6 +288,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -312,6 +327,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -350,6 +366,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -381,6 +398,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/sequence-inter-span-self/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence-inter-span-self/dagre/sketch.exp.svg index 73df25be5..3b511ec0c 100644 --- a/e2etests/testdata/stable/sequence-inter-span-self/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence-inter-span-self/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -AB fooredirectbar + .d2-1074780573 .fill-N1{fill:#0A0F25;} + .d2-1074780573 .fill-N2{fill:#676C7E;} + .d2-1074780573 .fill-N3{fill:#9499AB;} + .d2-1074780573 .fill-N4{fill:#CFD2DD;} + .d2-1074780573 .fill-N5{fill:#DEE1EB;} + .d2-1074780573 .fill-N6{fill:#EEF1F8;} + .d2-1074780573 .fill-N7{fill:#FFFFFF;} + .d2-1074780573 .fill-B1{fill:#0D32B2;} + .d2-1074780573 .fill-B2{fill:#0D32B2;} + .d2-1074780573 .fill-B3{fill:#E3E9FD;} + .d2-1074780573 .fill-B4{fill:#E3E9FD;} + .d2-1074780573 .fill-B5{fill:#EDF0FD;} + .d2-1074780573 .fill-B6{fill:#F7F8FE;} + .d2-1074780573 .fill-AA2{fill:#4A6FF3;} + .d2-1074780573 .fill-AA4{fill:#EDF0FD;} + .d2-1074780573 .fill-AA5{fill:#F7F8FE;} + .d2-1074780573 .fill-AB4{fill:#EDF0FD;} + .d2-1074780573 .fill-AB5{fill:#F7F8FE;} + .d2-1074780573 .stroke-N1{stroke:#0A0F25;} + .d2-1074780573 .stroke-N2{stroke:#676C7E;} + .d2-1074780573 .stroke-N3{stroke:#9499AB;} + .d2-1074780573 .stroke-N4{stroke:#CFD2DD;} + .d2-1074780573 .stroke-N5{stroke:#DEE1EB;} + .d2-1074780573 .stroke-N6{stroke:#EEF1F8;} + .d2-1074780573 .stroke-N7{stroke:#FFFFFF;} + .d2-1074780573 .stroke-B1{stroke:#0D32B2;} + .d2-1074780573 .stroke-B2{stroke:#0D32B2;} + .d2-1074780573 .stroke-B3{stroke:#E3E9FD;} + .d2-1074780573 .stroke-B4{stroke:#E3E9FD;} + .d2-1074780573 .stroke-B5{stroke:#EDF0FD;} + .d2-1074780573 .stroke-B6{stroke:#F7F8FE;} + .d2-1074780573 .stroke-AA2{stroke:#4A6FF3;} + .d2-1074780573 .stroke-AA4{stroke:#EDF0FD;} + .d2-1074780573 .stroke-AA5{stroke:#F7F8FE;} + .d2-1074780573 .stroke-AB4{stroke:#EDF0FD;} + .d2-1074780573 .stroke-AB5{stroke:#F7F8FE;} + .d2-1074780573 .background-color-N1{background-color:#0A0F25;} + .d2-1074780573 .background-color-N2{background-color:#676C7E;} + .d2-1074780573 .background-color-N3{background-color:#9499AB;} + .d2-1074780573 .background-color-N4{background-color:#CFD2DD;} + .d2-1074780573 .background-color-N5{background-color:#DEE1EB;} + .d2-1074780573 .background-color-N6{background-color:#EEF1F8;} + .d2-1074780573 .background-color-N7{background-color:#FFFFFF;} + .d2-1074780573 .background-color-B1{background-color:#0D32B2;} + .d2-1074780573 .background-color-B2{background-color:#0D32B2;} + .d2-1074780573 .background-color-B3{background-color:#E3E9FD;} + .d2-1074780573 .background-color-B4{background-color:#E3E9FD;} + .d2-1074780573 .background-color-B5{background-color:#EDF0FD;} + .d2-1074780573 .background-color-B6{background-color:#F7F8FE;} + .d2-1074780573 .background-color-AA2{background-color:#4A6FF3;} + .d2-1074780573 .background-color-AA4{background-color:#EDF0FD;} + .d2-1074780573 .background-color-AA5{background-color:#F7F8FE;} + .d2-1074780573 .background-color-AB4{background-color:#EDF0FD;} + .d2-1074780573 .background-color-AB5{background-color:#F7F8FE;} + .d2-1074780573 .color-N1{color:#0A0F25;} + .d2-1074780573 .color-N2{color:#676C7E;} + .d2-1074780573 .color-N3{color:#9499AB;} + .d2-1074780573 .color-N4{color:#CFD2DD;} + .d2-1074780573 .color-N5{color:#DEE1EB;} + .d2-1074780573 .color-N6{color:#EEF1F8;} + .d2-1074780573 .color-N7{color:#FFFFFF;} + .d2-1074780573 .color-B1{color:#0D32B2;} + .d2-1074780573 .color-B2{color:#0D32B2;} + .d2-1074780573 .color-B3{color:#E3E9FD;} + .d2-1074780573 .color-B4{color:#E3E9FD;} + .d2-1074780573 .color-B5{color:#EDF0FD;} + .d2-1074780573 .color-B6{color:#F7F8FE;} + .d2-1074780573 .color-AA2{color:#4A6FF3;} + .d2-1074780573 .color-AA4{color:#EDF0FD;} + .d2-1074780573 .color-AA5{color:#F7F8FE;} + .d2-1074780573 .color-AB4{color:#EDF0FD;} + .d2-1074780573 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1074780573);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1074780573);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1074780573);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1074780573);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1074780573);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1074780573);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1074780573);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1074780573);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1074780573);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1074780573);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1074780573);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1074780573);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1074780573);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1074780573);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1074780573);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1074780573);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1074780573);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1074780573);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>AB fooredirectbar - - - - - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence-inter-span-self/elk/board.exp.json b/e2etests/testdata/stable/sequence-inter-span-self/elk/board.exp.json index 8ee037517..05baa0635 100644 --- a/e2etests/testdata/stable/sequence-inter-span-self/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence-inter-span-self/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -140,6 +151,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -190,6 +202,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -228,6 +241,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -274,6 +288,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -312,6 +327,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -350,6 +366,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -381,6 +398,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/sequence-inter-span-self/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence-inter-span-self/elk/sketch.exp.svg index 73df25be5..3b511ec0c 100644 --- a/e2etests/testdata/stable/sequence-inter-span-self/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence-inter-span-self/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -AB fooredirectbar + .d2-1074780573 .fill-N1{fill:#0A0F25;} + .d2-1074780573 .fill-N2{fill:#676C7E;} + .d2-1074780573 .fill-N3{fill:#9499AB;} + .d2-1074780573 .fill-N4{fill:#CFD2DD;} + .d2-1074780573 .fill-N5{fill:#DEE1EB;} + .d2-1074780573 .fill-N6{fill:#EEF1F8;} + .d2-1074780573 .fill-N7{fill:#FFFFFF;} + .d2-1074780573 .fill-B1{fill:#0D32B2;} + .d2-1074780573 .fill-B2{fill:#0D32B2;} + .d2-1074780573 .fill-B3{fill:#E3E9FD;} + .d2-1074780573 .fill-B4{fill:#E3E9FD;} + .d2-1074780573 .fill-B5{fill:#EDF0FD;} + .d2-1074780573 .fill-B6{fill:#F7F8FE;} + .d2-1074780573 .fill-AA2{fill:#4A6FF3;} + .d2-1074780573 .fill-AA4{fill:#EDF0FD;} + .d2-1074780573 .fill-AA5{fill:#F7F8FE;} + .d2-1074780573 .fill-AB4{fill:#EDF0FD;} + .d2-1074780573 .fill-AB5{fill:#F7F8FE;} + .d2-1074780573 .stroke-N1{stroke:#0A0F25;} + .d2-1074780573 .stroke-N2{stroke:#676C7E;} + .d2-1074780573 .stroke-N3{stroke:#9499AB;} + .d2-1074780573 .stroke-N4{stroke:#CFD2DD;} + .d2-1074780573 .stroke-N5{stroke:#DEE1EB;} + .d2-1074780573 .stroke-N6{stroke:#EEF1F8;} + .d2-1074780573 .stroke-N7{stroke:#FFFFFF;} + .d2-1074780573 .stroke-B1{stroke:#0D32B2;} + .d2-1074780573 .stroke-B2{stroke:#0D32B2;} + .d2-1074780573 .stroke-B3{stroke:#E3E9FD;} + .d2-1074780573 .stroke-B4{stroke:#E3E9FD;} + .d2-1074780573 .stroke-B5{stroke:#EDF0FD;} + .d2-1074780573 .stroke-B6{stroke:#F7F8FE;} + .d2-1074780573 .stroke-AA2{stroke:#4A6FF3;} + .d2-1074780573 .stroke-AA4{stroke:#EDF0FD;} + .d2-1074780573 .stroke-AA5{stroke:#F7F8FE;} + .d2-1074780573 .stroke-AB4{stroke:#EDF0FD;} + .d2-1074780573 .stroke-AB5{stroke:#F7F8FE;} + .d2-1074780573 .background-color-N1{background-color:#0A0F25;} + .d2-1074780573 .background-color-N2{background-color:#676C7E;} + .d2-1074780573 .background-color-N3{background-color:#9499AB;} + .d2-1074780573 .background-color-N4{background-color:#CFD2DD;} + .d2-1074780573 .background-color-N5{background-color:#DEE1EB;} + .d2-1074780573 .background-color-N6{background-color:#EEF1F8;} + .d2-1074780573 .background-color-N7{background-color:#FFFFFF;} + .d2-1074780573 .background-color-B1{background-color:#0D32B2;} + .d2-1074780573 .background-color-B2{background-color:#0D32B2;} + .d2-1074780573 .background-color-B3{background-color:#E3E9FD;} + .d2-1074780573 .background-color-B4{background-color:#E3E9FD;} + .d2-1074780573 .background-color-B5{background-color:#EDF0FD;} + .d2-1074780573 .background-color-B6{background-color:#F7F8FE;} + .d2-1074780573 .background-color-AA2{background-color:#4A6FF3;} + .d2-1074780573 .background-color-AA4{background-color:#EDF0FD;} + .d2-1074780573 .background-color-AA5{background-color:#F7F8FE;} + .d2-1074780573 .background-color-AB4{background-color:#EDF0FD;} + .d2-1074780573 .background-color-AB5{background-color:#F7F8FE;} + .d2-1074780573 .color-N1{color:#0A0F25;} + .d2-1074780573 .color-N2{color:#676C7E;} + .d2-1074780573 .color-N3{color:#9499AB;} + .d2-1074780573 .color-N4{color:#CFD2DD;} + .d2-1074780573 .color-N5{color:#DEE1EB;} + .d2-1074780573 .color-N6{color:#EEF1F8;} + .d2-1074780573 .color-N7{color:#FFFFFF;} + .d2-1074780573 .color-B1{color:#0D32B2;} + .d2-1074780573 .color-B2{color:#0D32B2;} + .d2-1074780573 .color-B3{color:#E3E9FD;} + .d2-1074780573 .color-B4{color:#E3E9FD;} + .d2-1074780573 .color-B5{color:#EDF0FD;} + .d2-1074780573 .color-B6{color:#F7F8FE;} + .d2-1074780573 .color-AA2{color:#4A6FF3;} + .d2-1074780573 .color-AA4{color:#EDF0FD;} + .d2-1074780573 .color-AA5{color:#F7F8FE;} + .d2-1074780573 .color-AB4{color:#EDF0FD;} + .d2-1074780573 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1074780573);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1074780573);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1074780573);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1074780573);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1074780573);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1074780573);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1074780573);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1074780573);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1074780573);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1074780573);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1074780573);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1074780573);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1074780573);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1074780573);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1074780573);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1074780573);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1074780573);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1074780573);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>AB fooredirectbar - - - - - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_actor_distance/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_actor_distance/dagre/board.exp.json index 055bab384..33aa67ee3 100644 --- a/e2etests/testdata/stable/sequence_diagram_actor_distance/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_actor_distance/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -274,6 +288,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 225.5, @@ -312,6 +327,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 225.5, @@ -350,6 +366,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 658.5, @@ -388,6 +405,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 225.5, @@ -426,6 +444,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1091, @@ -464,6 +483,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 225.5, @@ -502,6 +522,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 225.5, @@ -540,6 +561,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 658.5, @@ -578,6 +600,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1091, @@ -616,6 +639,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1562, @@ -654,6 +678,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1724.5, @@ -692,6 +717,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2066.5, @@ -723,6 +749,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/sequence_diagram_actor_distance/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_actor_distance/dagre/sketch.exp.svg index 07f2d7c44..4b68d8110 100644 --- a/e2etests/testdata/stable/sequence_diagram_actor_distance/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_actor_distance/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -an actor with a really long label that will break everythinganactorwithareallylonglabelthatwillbreakeverythingsimplea short onefar awaywhat if there were no labels between this actor and the previous one shortlong label for testing purposes and it must be really, really longshortthis should span many actors lifelines so we know how it will look like when redering a long label over many actorslong label for testing purposes and it must be really, really long + .d2-2590733828 .fill-N1{fill:#0A0F25;} + .d2-2590733828 .fill-N2{fill:#676C7E;} + .d2-2590733828 .fill-N3{fill:#9499AB;} + .d2-2590733828 .fill-N4{fill:#CFD2DD;} + .d2-2590733828 .fill-N5{fill:#DEE1EB;} + .d2-2590733828 .fill-N6{fill:#EEF1F8;} + .d2-2590733828 .fill-N7{fill:#FFFFFF;} + .d2-2590733828 .fill-B1{fill:#0D32B2;} + .d2-2590733828 .fill-B2{fill:#0D32B2;} + .d2-2590733828 .fill-B3{fill:#E3E9FD;} + .d2-2590733828 .fill-B4{fill:#E3E9FD;} + .d2-2590733828 .fill-B5{fill:#EDF0FD;} + .d2-2590733828 .fill-B6{fill:#F7F8FE;} + .d2-2590733828 .fill-AA2{fill:#4A6FF3;} + .d2-2590733828 .fill-AA4{fill:#EDF0FD;} + .d2-2590733828 .fill-AA5{fill:#F7F8FE;} + .d2-2590733828 .fill-AB4{fill:#EDF0FD;} + .d2-2590733828 .fill-AB5{fill:#F7F8FE;} + .d2-2590733828 .stroke-N1{stroke:#0A0F25;} + .d2-2590733828 .stroke-N2{stroke:#676C7E;} + .d2-2590733828 .stroke-N3{stroke:#9499AB;} + .d2-2590733828 .stroke-N4{stroke:#CFD2DD;} + .d2-2590733828 .stroke-N5{stroke:#DEE1EB;} + .d2-2590733828 .stroke-N6{stroke:#EEF1F8;} + .d2-2590733828 .stroke-N7{stroke:#FFFFFF;} + .d2-2590733828 .stroke-B1{stroke:#0D32B2;} + .d2-2590733828 .stroke-B2{stroke:#0D32B2;} + .d2-2590733828 .stroke-B3{stroke:#E3E9FD;} + .d2-2590733828 .stroke-B4{stroke:#E3E9FD;} + .d2-2590733828 .stroke-B5{stroke:#EDF0FD;} + .d2-2590733828 .stroke-B6{stroke:#F7F8FE;} + .d2-2590733828 .stroke-AA2{stroke:#4A6FF3;} + .d2-2590733828 .stroke-AA4{stroke:#EDF0FD;} + .d2-2590733828 .stroke-AA5{stroke:#F7F8FE;} + .d2-2590733828 .stroke-AB4{stroke:#EDF0FD;} + .d2-2590733828 .stroke-AB5{stroke:#F7F8FE;} + .d2-2590733828 .background-color-N1{background-color:#0A0F25;} + .d2-2590733828 .background-color-N2{background-color:#676C7E;} + .d2-2590733828 .background-color-N3{background-color:#9499AB;} + .d2-2590733828 .background-color-N4{background-color:#CFD2DD;} + .d2-2590733828 .background-color-N5{background-color:#DEE1EB;} + .d2-2590733828 .background-color-N6{background-color:#EEF1F8;} + .d2-2590733828 .background-color-N7{background-color:#FFFFFF;} + .d2-2590733828 .background-color-B1{background-color:#0D32B2;} + .d2-2590733828 .background-color-B2{background-color:#0D32B2;} + .d2-2590733828 .background-color-B3{background-color:#E3E9FD;} + .d2-2590733828 .background-color-B4{background-color:#E3E9FD;} + .d2-2590733828 .background-color-B5{background-color:#EDF0FD;} + .d2-2590733828 .background-color-B6{background-color:#F7F8FE;} + .d2-2590733828 .background-color-AA2{background-color:#4A6FF3;} + .d2-2590733828 .background-color-AA4{background-color:#EDF0FD;} + .d2-2590733828 .background-color-AA5{background-color:#F7F8FE;} + .d2-2590733828 .background-color-AB4{background-color:#EDF0FD;} + .d2-2590733828 .background-color-AB5{background-color:#F7F8FE;} + .d2-2590733828 .color-N1{color:#0A0F25;} + .d2-2590733828 .color-N2{color:#676C7E;} + .d2-2590733828 .color-N3{color:#9499AB;} + .d2-2590733828 .color-N4{color:#CFD2DD;} + .d2-2590733828 .color-N5{color:#DEE1EB;} + .d2-2590733828 .color-N6{color:#EEF1F8;} + .d2-2590733828 .color-N7{color:#FFFFFF;} + .d2-2590733828 .color-B1{color:#0D32B2;} + .d2-2590733828 .color-B2{color:#0D32B2;} + .d2-2590733828 .color-B3{color:#E3E9FD;} + .d2-2590733828 .color-B4{color:#E3E9FD;} + .d2-2590733828 .color-B5{color:#EDF0FD;} + .d2-2590733828 .color-B6{color:#F7F8FE;} + .d2-2590733828 .color-AA2{color:#4A6FF3;} + .d2-2590733828 .color-AA4{color:#EDF0FD;} + .d2-2590733828 .color-AA5{color:#F7F8FE;} + .d2-2590733828 .color-AB4{color:#EDF0FD;} + .d2-2590733828 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2590733828);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2590733828);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2590733828);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2590733828);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2590733828);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2590733828);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2590733828);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2590733828);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2590733828);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2590733828);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2590733828);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2590733828);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2590733828);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2590733828);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2590733828);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2590733828);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2590733828);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2590733828);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>an actor with a really long label that will break everythinganactorwithareallylonglabelthatwillbreakeverythingsimplea short onefar awaywhat if there were no labels between this actor and the previous one shortlong label for testing purposes and it must be really, really longshortthis should span many actors lifelines so we know how it will look like when redering a long label over many actorslong label for testing purposes and it must be really, really long - - - - - - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_actor_distance/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_actor_distance/elk/board.exp.json index 055bab384..33aa67ee3 100644 --- a/e2etests/testdata/stable/sequence_diagram_actor_distance/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_actor_distance/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -274,6 +288,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 225.5, @@ -312,6 +327,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 225.5, @@ -350,6 +366,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 658.5, @@ -388,6 +405,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 225.5, @@ -426,6 +444,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1091, @@ -464,6 +483,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 225.5, @@ -502,6 +522,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 225.5, @@ -540,6 +561,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 658.5, @@ -578,6 +600,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1091, @@ -616,6 +639,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1562, @@ -654,6 +678,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1724.5, @@ -692,6 +717,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2066.5, @@ -723,6 +749,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/sequence_diagram_actor_distance/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_actor_distance/elk/sketch.exp.svg index 07f2d7c44..4b68d8110 100644 --- a/e2etests/testdata/stable/sequence_diagram_actor_distance/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_actor_distance/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -an actor with a really long label that will break everythinganactorwithareallylonglabelthatwillbreakeverythingsimplea short onefar awaywhat if there were no labels between this actor and the previous one shortlong label for testing purposes and it must be really, really longshortthis should span many actors lifelines so we know how it will look like when redering a long label over many actorslong label for testing purposes and it must be really, really long + .d2-2590733828 .fill-N1{fill:#0A0F25;} + .d2-2590733828 .fill-N2{fill:#676C7E;} + .d2-2590733828 .fill-N3{fill:#9499AB;} + .d2-2590733828 .fill-N4{fill:#CFD2DD;} + .d2-2590733828 .fill-N5{fill:#DEE1EB;} + .d2-2590733828 .fill-N6{fill:#EEF1F8;} + .d2-2590733828 .fill-N7{fill:#FFFFFF;} + .d2-2590733828 .fill-B1{fill:#0D32B2;} + .d2-2590733828 .fill-B2{fill:#0D32B2;} + .d2-2590733828 .fill-B3{fill:#E3E9FD;} + .d2-2590733828 .fill-B4{fill:#E3E9FD;} + .d2-2590733828 .fill-B5{fill:#EDF0FD;} + .d2-2590733828 .fill-B6{fill:#F7F8FE;} + .d2-2590733828 .fill-AA2{fill:#4A6FF3;} + .d2-2590733828 .fill-AA4{fill:#EDF0FD;} + .d2-2590733828 .fill-AA5{fill:#F7F8FE;} + .d2-2590733828 .fill-AB4{fill:#EDF0FD;} + .d2-2590733828 .fill-AB5{fill:#F7F8FE;} + .d2-2590733828 .stroke-N1{stroke:#0A0F25;} + .d2-2590733828 .stroke-N2{stroke:#676C7E;} + .d2-2590733828 .stroke-N3{stroke:#9499AB;} + .d2-2590733828 .stroke-N4{stroke:#CFD2DD;} + .d2-2590733828 .stroke-N5{stroke:#DEE1EB;} + .d2-2590733828 .stroke-N6{stroke:#EEF1F8;} + .d2-2590733828 .stroke-N7{stroke:#FFFFFF;} + .d2-2590733828 .stroke-B1{stroke:#0D32B2;} + .d2-2590733828 .stroke-B2{stroke:#0D32B2;} + .d2-2590733828 .stroke-B3{stroke:#E3E9FD;} + .d2-2590733828 .stroke-B4{stroke:#E3E9FD;} + .d2-2590733828 .stroke-B5{stroke:#EDF0FD;} + .d2-2590733828 .stroke-B6{stroke:#F7F8FE;} + .d2-2590733828 .stroke-AA2{stroke:#4A6FF3;} + .d2-2590733828 .stroke-AA4{stroke:#EDF0FD;} + .d2-2590733828 .stroke-AA5{stroke:#F7F8FE;} + .d2-2590733828 .stroke-AB4{stroke:#EDF0FD;} + .d2-2590733828 .stroke-AB5{stroke:#F7F8FE;} + .d2-2590733828 .background-color-N1{background-color:#0A0F25;} + .d2-2590733828 .background-color-N2{background-color:#676C7E;} + .d2-2590733828 .background-color-N3{background-color:#9499AB;} + .d2-2590733828 .background-color-N4{background-color:#CFD2DD;} + .d2-2590733828 .background-color-N5{background-color:#DEE1EB;} + .d2-2590733828 .background-color-N6{background-color:#EEF1F8;} + .d2-2590733828 .background-color-N7{background-color:#FFFFFF;} + .d2-2590733828 .background-color-B1{background-color:#0D32B2;} + .d2-2590733828 .background-color-B2{background-color:#0D32B2;} + .d2-2590733828 .background-color-B3{background-color:#E3E9FD;} + .d2-2590733828 .background-color-B4{background-color:#E3E9FD;} + .d2-2590733828 .background-color-B5{background-color:#EDF0FD;} + .d2-2590733828 .background-color-B6{background-color:#F7F8FE;} + .d2-2590733828 .background-color-AA2{background-color:#4A6FF3;} + .d2-2590733828 .background-color-AA4{background-color:#EDF0FD;} + .d2-2590733828 .background-color-AA5{background-color:#F7F8FE;} + .d2-2590733828 .background-color-AB4{background-color:#EDF0FD;} + .d2-2590733828 .background-color-AB5{background-color:#F7F8FE;} + .d2-2590733828 .color-N1{color:#0A0F25;} + .d2-2590733828 .color-N2{color:#676C7E;} + .d2-2590733828 .color-N3{color:#9499AB;} + .d2-2590733828 .color-N4{color:#CFD2DD;} + .d2-2590733828 .color-N5{color:#DEE1EB;} + .d2-2590733828 .color-N6{color:#EEF1F8;} + .d2-2590733828 .color-N7{color:#FFFFFF;} + .d2-2590733828 .color-B1{color:#0D32B2;} + .d2-2590733828 .color-B2{color:#0D32B2;} + .d2-2590733828 .color-B3{color:#E3E9FD;} + .d2-2590733828 .color-B4{color:#E3E9FD;} + .d2-2590733828 .color-B5{color:#EDF0FD;} + .d2-2590733828 .color-B6{color:#F7F8FE;} + .d2-2590733828 .color-AA2{color:#4A6FF3;} + .d2-2590733828 .color-AA4{color:#EDF0FD;} + .d2-2590733828 .color-AA5{color:#F7F8FE;} + .d2-2590733828 .color-AB4{color:#EDF0FD;} + .d2-2590733828 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2590733828);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2590733828);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2590733828);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2590733828);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2590733828);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2590733828);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2590733828);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2590733828);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2590733828);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2590733828);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2590733828);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2590733828);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2590733828);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2590733828);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2590733828);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2590733828);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2590733828);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2590733828);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>an actor with a really long label that will break everythinganactorwithareallylonglabelthatwillbreakeverythingsimplea short onefar awaywhat if there were no labels between this actor and the previous one shortlong label for testing purposes and it must be really, really longshortthis should span many actors lifelines so we know how it will look like when redering a long label over many actorslong label for testing purposes and it must be really, really long - - - - - - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/board.exp.json index 8931f7f4d..facf6dc0f 100644 --- a/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -155,6 +166,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -184,19 +196,20 @@ }, { "id": "e", - "type": "code", + "type": "rectangle", "pos": { "x": 943, - "y": 158 + "y": 167 }, - "width": 199, - "height": 78, + "width": 270, + "height": 69, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, "fill": "B5", - "stroke": "N1", + "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -217,8 +230,8 @@ "italic": false, "bold": false, "underline": false, - "labelWidth": 183, - "labelHeight": 62, + "labelWidth": 225, + "labelHeight": 24, "labelPosition": "INSIDE_MIDDLE_CENTER", "zIndex": 0, "level": 1 @@ -227,7 +240,7 @@ "id": "f", "type": "cylinder", "pos": { - "x": 1164, + "x": 1235, "y": 118 }, "width": 100, @@ -238,6 +251,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -268,7 +282,7 @@ "id": "g", "type": "diamond", "pos": { - "x": 1314, + "x": 1385, "y": 144 }, "width": 100, @@ -279,6 +293,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -309,7 +324,7 @@ "id": "h", "type": "document", "pos": { - "x": 1464, + "x": 1535, "y": 160 }, "width": 100, @@ -320,6 +335,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -350,7 +366,7 @@ "id": "i", "type": "hexagon", "pos": { - "x": 1604, + "x": 1675, "y": 167 }, "width": 146, @@ -361,6 +377,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -391,7 +408,7 @@ "id": "j", "type": "image", "pos": { - "x": 1790, + "x": 1861, "y": 87 }, "width": 128, @@ -402,6 +419,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -444,7 +462,7 @@ "id": "k", "type": "oval", "pos": { - "x": 1956, + "x": 2027, "y": 163 }, "width": 100, @@ -455,6 +473,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -485,7 +504,7 @@ "id": "l", "type": "package", "pos": { - "x": 2106, + "x": 2177, "y": 163 }, "width": 100, @@ -496,6 +515,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -526,7 +546,7 @@ "id": "m", "type": "page", "pos": { - "x": 2250, + "x": 2321, "y": 149 }, "width": 113, @@ -537,6 +557,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -567,7 +588,7 @@ "id": "n", "type": "parallelogram", "pos": { - "x": 2403, + "x": 2474, "y": 154 }, "width": 169, @@ -578,6 +599,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -608,7 +630,7 @@ "id": "o", "type": "person", "pos": { - "x": 2592, + "x": 2663, "y": 64 }, "width": 100, @@ -619,6 +641,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -649,7 +672,7 @@ "id": "p", "type": "queue", "pos": { - "x": 2732, + "x": 2803, "y": 170 }, "width": 151, @@ -660,6 +683,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -690,7 +714,7 @@ "id": "q", "type": "rectangle", "pos": { - "x": 2923, + "x": 2994, "y": 133 }, "width": 103, @@ -701,6 +725,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -731,7 +756,7 @@ "id": "r", "type": "step", "pos": { - "x": 3066, + "x": 3137, "y": 135 }, "width": 187, @@ -742,6 +767,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -772,7 +798,7 @@ "id": "s", "type": "stored_data", "pos": { - "x": 3291, + "x": 3362, "y": 170 }, "width": 100, @@ -783,6 +809,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -813,7 +840,7 @@ "id": "t", "type": "sql_table", "pos": { - "x": 3431, + "x": 3502, "y": 128 }, "width": 161, @@ -824,6 +851,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -935,6 +963,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -997,6 +1026,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 329.5, @@ -1035,6 +1065,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 572, @@ -1073,13 +1104,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 833, "y": 556 }, { - "x": 1042.5, + "x": 1078, "y": 556 } ], @@ -1111,13 +1143,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 1042.5, + "x": 1078, "y": 626 }, { - "x": 1214, + "x": 1285, "y": 626 } ], @@ -1149,13 +1182,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 1214, + "x": 1285, "y": 696 }, { - "x": 1364, + "x": 1435, "y": 696 } ], @@ -1187,13 +1221,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 1364, + "x": 1435, "y": 766 }, { - "x": 1514, + "x": 1585, "y": 766 } ], @@ -1225,13 +1260,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 1514, + "x": 1585, "y": 836 }, { - "x": 1677, + "x": 1748, "y": 836 } ], @@ -1263,13 +1299,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 1677, + "x": 1748, "y": 906 }, { - "x": 1854, + "x": 1925, "y": 906 } ], @@ -1301,13 +1338,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 1854, + "x": 1925, "y": 976 }, { - "x": 2006, + "x": 2077, "y": 976 } ], @@ -1339,13 +1377,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 2006, + "x": 2077, "y": 1046 }, { - "x": 2156, + "x": 2227, "y": 1046 } ], @@ -1377,13 +1416,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 2156, + "x": 2227, "y": 1116 }, { - "x": 2306.5, + "x": 2377.5, "y": 1116 } ], @@ -1415,13 +1455,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 2306.5, + "x": 2377.5, "y": 1186 }, { - "x": 2487.5, + "x": 2558.5, "y": 1186 } ], @@ -1453,13 +1494,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 2487.5, + "x": 2558.5, "y": 1256 }, { - "x": 2642, + "x": 2713, "y": 1256 } ], @@ -1491,13 +1533,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 2642, + "x": 2713, "y": 1326 }, { - "x": 2807.5, + "x": 2878.5, "y": 1326 } ], @@ -1529,13 +1572,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 2807.5, + "x": 2878.5, "y": 1396 }, { - "x": 2974.5, + "x": 3045.5, "y": 1396 } ], @@ -1567,13 +1611,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 2974.5, + "x": 3045.5, "y": 1466 }, { - "x": 3159.5, + "x": 3230.5, "y": 1466 } ], @@ -1605,13 +1650,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 3159.5, + "x": 3230.5, "y": 1536 }, { - "x": 3341, + "x": 3412, "y": 1536 } ], @@ -1643,13 +1689,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 3341, + "x": 3412, "y": 1606 }, { - "x": 3511.5, + "x": 3582.5, "y": 1606 } ], @@ -1681,6 +1728,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -1719,6 +1767,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 329.5, @@ -1757,6 +1806,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 572, @@ -1795,6 +1845,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 833, @@ -1833,13 +1884,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 1042.5, + "x": 1078, "y": 236 }, { - "x": 1042.5, + "x": 1078, "y": 1676 } ], @@ -1871,13 +1923,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 1214, + "x": 1285, "y": 236 }, { - "x": 1214, + "x": 1285, "y": 1676 } ], @@ -1909,13 +1962,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 1364, + "x": 1435, "y": 236 }, { - "x": 1364, + "x": 1435, "y": 1676 } ], @@ -1947,13 +2001,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 1514, + "x": 1585, "y": 236 }, { - "x": 1514, + "x": 1585, "y": 1676 } ], @@ -1985,13 +2040,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 1677, + "x": 1748, "y": 236 }, { - "x": 1677, + "x": 1748, "y": 1676 } ], @@ -2023,13 +2079,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 1854, + "x": 1925, "y": 241 }, { - "x": 1854, + "x": 1925, "y": 1676 } ], @@ -2061,13 +2118,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 2006, + "x": 2077, "y": 236 }, { - "x": 2006, + "x": 2077, "y": 1676 } ], @@ -2099,13 +2157,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 2156, + "x": 2227, "y": 236 }, { - "x": 2156, + "x": 2227, "y": 1676 } ], @@ -2137,13 +2196,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 2306.5, + "x": 2377.5, "y": 236 }, { - "x": 2306.5, + "x": 2377.5, "y": 1676 } ], @@ -2175,13 +2235,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 2487.5, + "x": 2558.5, "y": 236 }, { - "x": 2487.5, + "x": 2558.5, "y": 1676 } ], @@ -2213,13 +2274,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 2642, + "x": 2713, "y": 241 }, { - "x": 2642, + "x": 2713, "y": 1676 } ], @@ -2251,13 +2313,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 2807.5, + "x": 2878.5, "y": 236 }, { - "x": 2807.5, + "x": 2878.5, "y": 1676 } ], @@ -2289,13 +2352,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 2974.5, + "x": 3045.5, "y": 236 }, { - "x": 2974.5, + "x": 3045.5, "y": 1676 } ], @@ -2327,13 +2391,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 3159.5, + "x": 3230.5, "y": 236 }, { - "x": 3159.5, + "x": 3230.5, "y": 1676 } ], @@ -2365,13 +2430,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 3341, + "x": 3412, "y": 236 }, { - "x": 3341, + "x": 3412, "y": 1676 } ], @@ -2403,13 +2469,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 3511.5, + "x": 3582.5, "y": 236 }, { - "x": 3511.5, + "x": 3582.5, "y": 1676 } ], @@ -2434,6 +2501,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg index 7bd240b00..4cd8243c8 100644 --- a/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg @@ -1,30 +1,30 @@ -a labelblabelsa class+public() boolvoid-private() intvoidcloudyyyya := 5 + .d2-2618151458 .fill-N1{fill:#0A0F25;} + .d2-2618151458 .fill-N2{fill:#676C7E;} + .d2-2618151458 .fill-N3{fill:#9499AB;} + .d2-2618151458 .fill-N4{fill:#CFD2DD;} + .d2-2618151458 .fill-N5{fill:#DEE1EB;} + .d2-2618151458 .fill-N6{fill:#EEF1F8;} + .d2-2618151458 .fill-N7{fill:#FFFFFF;} + .d2-2618151458 .fill-B1{fill:#0D32B2;} + .d2-2618151458 .fill-B2{fill:#0D32B2;} + .d2-2618151458 .fill-B3{fill:#E3E9FD;} + .d2-2618151458 .fill-B4{fill:#E3E9FD;} + .d2-2618151458 .fill-B5{fill:#EDF0FD;} + .d2-2618151458 .fill-B6{fill:#F7F8FE;} + .d2-2618151458 .fill-AA2{fill:#4A6FF3;} + .d2-2618151458 .fill-AA4{fill:#EDF0FD;} + .d2-2618151458 .fill-AA5{fill:#F7F8FE;} + .d2-2618151458 .fill-AB4{fill:#EDF0FD;} + .d2-2618151458 .fill-AB5{fill:#F7F8FE;} + .d2-2618151458 .stroke-N1{stroke:#0A0F25;} + .d2-2618151458 .stroke-N2{stroke:#676C7E;} + .d2-2618151458 .stroke-N3{stroke:#9499AB;} + .d2-2618151458 .stroke-N4{stroke:#CFD2DD;} + .d2-2618151458 .stroke-N5{stroke:#DEE1EB;} + .d2-2618151458 .stroke-N6{stroke:#EEF1F8;} + .d2-2618151458 .stroke-N7{stroke:#FFFFFF;} + .d2-2618151458 .stroke-B1{stroke:#0D32B2;} + .d2-2618151458 .stroke-B2{stroke:#0D32B2;} + .d2-2618151458 .stroke-B3{stroke:#E3E9FD;} + .d2-2618151458 .stroke-B4{stroke:#E3E9FD;} + .d2-2618151458 .stroke-B5{stroke:#EDF0FD;} + .d2-2618151458 .stroke-B6{stroke:#F7F8FE;} + .d2-2618151458 .stroke-AA2{stroke:#4A6FF3;} + .d2-2618151458 .stroke-AA4{stroke:#EDF0FD;} + .d2-2618151458 .stroke-AA5{stroke:#F7F8FE;} + .d2-2618151458 .stroke-AB4{stroke:#EDF0FD;} + .d2-2618151458 .stroke-AB5{stroke:#F7F8FE;} + .d2-2618151458 .background-color-N1{background-color:#0A0F25;} + .d2-2618151458 .background-color-N2{background-color:#676C7E;} + .d2-2618151458 .background-color-N3{background-color:#9499AB;} + .d2-2618151458 .background-color-N4{background-color:#CFD2DD;} + .d2-2618151458 .background-color-N5{background-color:#DEE1EB;} + .d2-2618151458 .background-color-N6{background-color:#EEF1F8;} + .d2-2618151458 .background-color-N7{background-color:#FFFFFF;} + .d2-2618151458 .background-color-B1{background-color:#0D32B2;} + .d2-2618151458 .background-color-B2{background-color:#0D32B2;} + .d2-2618151458 .background-color-B3{background-color:#E3E9FD;} + .d2-2618151458 .background-color-B4{background-color:#E3E9FD;} + .d2-2618151458 .background-color-B5{background-color:#EDF0FD;} + .d2-2618151458 .background-color-B6{background-color:#F7F8FE;} + .d2-2618151458 .background-color-AA2{background-color:#4A6FF3;} + .d2-2618151458 .background-color-AA4{background-color:#EDF0FD;} + .d2-2618151458 .background-color-AA5{background-color:#F7F8FE;} + .d2-2618151458 .background-color-AB4{background-color:#EDF0FD;} + .d2-2618151458 .background-color-AB5{background-color:#F7F8FE;} + .d2-2618151458 .color-N1{color:#0A0F25;} + .d2-2618151458 .color-N2{color:#676C7E;} + .d2-2618151458 .color-N3{color:#9499AB;} + .d2-2618151458 .color-N4{color:#CFD2DD;} + .d2-2618151458 .color-N5{color:#DEE1EB;} + .d2-2618151458 .color-N6{color:#EEF1F8;} + .d2-2618151458 .color-N7{color:#FFFFFF;} + .d2-2618151458 .color-B1{color:#0D32B2;} + .d2-2618151458 .color-B2{color:#0D32B2;} + .d2-2618151458 .color-B3{color:#E3E9FD;} + .d2-2618151458 .color-B4{color:#E3E9FD;} + .d2-2618151458 .color-B5{color:#EDF0FD;} + .d2-2618151458 .color-B6{color:#F7F8FE;} + .d2-2618151458 .color-AA2{color:#4A6FF3;} + .d2-2618151458 .color-AA4{color:#EDF0FD;} + .d2-2618151458 .color-AA5{color:#F7F8FE;} + .d2-2618151458 .color-AB4{color:#EDF0FD;} + .d2-2618151458 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2618151458);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2618151458);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2618151458);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2618151458);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2618151458);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2618151458);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2618151458);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2618151458);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2618151458);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2618151458);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2618151458);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2618151458);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2618151458);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2618151458);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2618151458);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2618151458);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2618151458);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2618151458);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>a labelblabelsa class+public() boolvoid-private() intvoidcloudyyyya := 5 b := a + 7 -fmt.Printf("%d", b)a := 5 +fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side - - - - - - - - - - - - - - - - - - - - - +fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/board.exp.json index 8931f7f4d..facf6dc0f 100644 --- a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -155,6 +166,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -184,19 +196,20 @@ }, { "id": "e", - "type": "code", + "type": "rectangle", "pos": { "x": 943, - "y": 158 + "y": 167 }, - "width": 199, - "height": 78, + "width": 270, + "height": 69, "opacity": 1, "strokeDash": 0, "strokeWidth": 2, "borderRadius": 0, "fill": "B5", - "stroke": "N1", + "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -217,8 +230,8 @@ "italic": false, "bold": false, "underline": false, - "labelWidth": 183, - "labelHeight": 62, + "labelWidth": 225, + "labelHeight": 24, "labelPosition": "INSIDE_MIDDLE_CENTER", "zIndex": 0, "level": 1 @@ -227,7 +240,7 @@ "id": "f", "type": "cylinder", "pos": { - "x": 1164, + "x": 1235, "y": 118 }, "width": 100, @@ -238,6 +251,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -268,7 +282,7 @@ "id": "g", "type": "diamond", "pos": { - "x": 1314, + "x": 1385, "y": 144 }, "width": 100, @@ -279,6 +293,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -309,7 +324,7 @@ "id": "h", "type": "document", "pos": { - "x": 1464, + "x": 1535, "y": 160 }, "width": 100, @@ -320,6 +335,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -350,7 +366,7 @@ "id": "i", "type": "hexagon", "pos": { - "x": 1604, + "x": 1675, "y": 167 }, "width": 146, @@ -361,6 +377,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -391,7 +408,7 @@ "id": "j", "type": "image", "pos": { - "x": 1790, + "x": 1861, "y": 87 }, "width": 128, @@ -402,6 +419,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -444,7 +462,7 @@ "id": "k", "type": "oval", "pos": { - "x": 1956, + "x": 2027, "y": 163 }, "width": 100, @@ -455,6 +473,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -485,7 +504,7 @@ "id": "l", "type": "package", "pos": { - "x": 2106, + "x": 2177, "y": 163 }, "width": 100, @@ -496,6 +515,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -526,7 +546,7 @@ "id": "m", "type": "page", "pos": { - "x": 2250, + "x": 2321, "y": 149 }, "width": 113, @@ -537,6 +557,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -567,7 +588,7 @@ "id": "n", "type": "parallelogram", "pos": { - "x": 2403, + "x": 2474, "y": 154 }, "width": 169, @@ -578,6 +599,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -608,7 +630,7 @@ "id": "o", "type": "person", "pos": { - "x": 2592, + "x": 2663, "y": 64 }, "width": 100, @@ -619,6 +641,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -649,7 +672,7 @@ "id": "p", "type": "queue", "pos": { - "x": 2732, + "x": 2803, "y": 170 }, "width": 151, @@ -660,6 +683,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -690,7 +714,7 @@ "id": "q", "type": "rectangle", "pos": { - "x": 2923, + "x": 2994, "y": 133 }, "width": 103, @@ -701,6 +725,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -731,7 +756,7 @@ "id": "r", "type": "step", "pos": { - "x": 3066, + "x": 3137, "y": 135 }, "width": 187, @@ -742,6 +767,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -772,7 +798,7 @@ "id": "s", "type": "stored_data", "pos": { - "x": 3291, + "x": 3362, "y": 170 }, "width": 100, @@ -783,6 +809,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -813,7 +840,7 @@ "id": "t", "type": "sql_table", "pos": { - "x": 3431, + "x": 3502, "y": 128 }, "width": 161, @@ -824,6 +851,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -935,6 +963,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -997,6 +1026,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 329.5, @@ -1035,6 +1065,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 572, @@ -1073,13 +1104,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 833, "y": 556 }, { - "x": 1042.5, + "x": 1078, "y": 556 } ], @@ -1111,13 +1143,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 1042.5, + "x": 1078, "y": 626 }, { - "x": 1214, + "x": 1285, "y": 626 } ], @@ -1149,13 +1182,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 1214, + "x": 1285, "y": 696 }, { - "x": 1364, + "x": 1435, "y": 696 } ], @@ -1187,13 +1221,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 1364, + "x": 1435, "y": 766 }, { - "x": 1514, + "x": 1585, "y": 766 } ], @@ -1225,13 +1260,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 1514, + "x": 1585, "y": 836 }, { - "x": 1677, + "x": 1748, "y": 836 } ], @@ -1263,13 +1299,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 1677, + "x": 1748, "y": 906 }, { - "x": 1854, + "x": 1925, "y": 906 } ], @@ -1301,13 +1338,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 1854, + "x": 1925, "y": 976 }, { - "x": 2006, + "x": 2077, "y": 976 } ], @@ -1339,13 +1377,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 2006, + "x": 2077, "y": 1046 }, { - "x": 2156, + "x": 2227, "y": 1046 } ], @@ -1377,13 +1416,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 2156, + "x": 2227, "y": 1116 }, { - "x": 2306.5, + "x": 2377.5, "y": 1116 } ], @@ -1415,13 +1455,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 2306.5, + "x": 2377.5, "y": 1186 }, { - "x": 2487.5, + "x": 2558.5, "y": 1186 } ], @@ -1453,13 +1494,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 2487.5, + "x": 2558.5, "y": 1256 }, { - "x": 2642, + "x": 2713, "y": 1256 } ], @@ -1491,13 +1533,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 2642, + "x": 2713, "y": 1326 }, { - "x": 2807.5, + "x": 2878.5, "y": 1326 } ], @@ -1529,13 +1572,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 2807.5, + "x": 2878.5, "y": 1396 }, { - "x": 2974.5, + "x": 3045.5, "y": 1396 } ], @@ -1567,13 +1611,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 2974.5, + "x": 3045.5, "y": 1466 }, { - "x": 3159.5, + "x": 3230.5, "y": 1466 } ], @@ -1605,13 +1650,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 3159.5, + "x": 3230.5, "y": 1536 }, { - "x": 3341, + "x": 3412, "y": 1536 } ], @@ -1643,13 +1689,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 3341, + "x": 3412, "y": 1606 }, { - "x": 3511.5, + "x": 3582.5, "y": 1606 } ], @@ -1681,6 +1728,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -1719,6 +1767,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 329.5, @@ -1757,6 +1806,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 572, @@ -1795,6 +1845,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 833, @@ -1833,13 +1884,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 1042.5, + "x": 1078, "y": 236 }, { - "x": 1042.5, + "x": 1078, "y": 1676 } ], @@ -1871,13 +1923,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 1214, + "x": 1285, "y": 236 }, { - "x": 1214, + "x": 1285, "y": 1676 } ], @@ -1909,13 +1962,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 1364, + "x": 1435, "y": 236 }, { - "x": 1364, + "x": 1435, "y": 1676 } ], @@ -1947,13 +2001,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 1514, + "x": 1585, "y": 236 }, { - "x": 1514, + "x": 1585, "y": 1676 } ], @@ -1985,13 +2040,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 1677, + "x": 1748, "y": 236 }, { - "x": 1677, + "x": 1748, "y": 1676 } ], @@ -2023,13 +2079,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 1854, + "x": 1925, "y": 241 }, { - "x": 1854, + "x": 1925, "y": 1676 } ], @@ -2061,13 +2118,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 2006, + "x": 2077, "y": 236 }, { - "x": 2006, + "x": 2077, "y": 1676 } ], @@ -2099,13 +2157,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 2156, + "x": 2227, "y": 236 }, { - "x": 2156, + "x": 2227, "y": 1676 } ], @@ -2137,13 +2196,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 2306.5, + "x": 2377.5, "y": 236 }, { - "x": 2306.5, + "x": 2377.5, "y": 1676 } ], @@ -2175,13 +2235,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 2487.5, + "x": 2558.5, "y": 236 }, { - "x": 2487.5, + "x": 2558.5, "y": 1676 } ], @@ -2213,13 +2274,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 2642, + "x": 2713, "y": 241 }, { - "x": 2642, + "x": 2713, "y": 1676 } ], @@ -2251,13 +2313,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 2807.5, + "x": 2878.5, "y": 236 }, { - "x": 2807.5, + "x": 2878.5, "y": 1676 } ], @@ -2289,13 +2352,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 2974.5, + "x": 3045.5, "y": 236 }, { - "x": 2974.5, + "x": 3045.5, "y": 1676 } ], @@ -2327,13 +2391,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 3159.5, + "x": 3230.5, "y": 236 }, { - "x": 3159.5, + "x": 3230.5, "y": 1676 } ], @@ -2365,13 +2430,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 3341, + "x": 3412, "y": 236 }, { - "x": 3341, + "x": 3412, "y": 1676 } ], @@ -2403,13 +2469,14 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { - "x": 3511.5, + "x": 3582.5, "y": 236 }, { - "x": 3511.5, + "x": 3582.5, "y": 1676 } ], @@ -2434,6 +2501,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg index 7bd240b00..4cd8243c8 100644 --- a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg @@ -1,30 +1,30 @@ -a labelblabelsa class+public() boolvoid-private() intvoidcloudyyyya := 5 + .d2-2618151458 .fill-N1{fill:#0A0F25;} + .d2-2618151458 .fill-N2{fill:#676C7E;} + .d2-2618151458 .fill-N3{fill:#9499AB;} + .d2-2618151458 .fill-N4{fill:#CFD2DD;} + .d2-2618151458 .fill-N5{fill:#DEE1EB;} + .d2-2618151458 .fill-N6{fill:#EEF1F8;} + .d2-2618151458 .fill-N7{fill:#FFFFFF;} + .d2-2618151458 .fill-B1{fill:#0D32B2;} + .d2-2618151458 .fill-B2{fill:#0D32B2;} + .d2-2618151458 .fill-B3{fill:#E3E9FD;} + .d2-2618151458 .fill-B4{fill:#E3E9FD;} + .d2-2618151458 .fill-B5{fill:#EDF0FD;} + .d2-2618151458 .fill-B6{fill:#F7F8FE;} + .d2-2618151458 .fill-AA2{fill:#4A6FF3;} + .d2-2618151458 .fill-AA4{fill:#EDF0FD;} + .d2-2618151458 .fill-AA5{fill:#F7F8FE;} + .d2-2618151458 .fill-AB4{fill:#EDF0FD;} + .d2-2618151458 .fill-AB5{fill:#F7F8FE;} + .d2-2618151458 .stroke-N1{stroke:#0A0F25;} + .d2-2618151458 .stroke-N2{stroke:#676C7E;} + .d2-2618151458 .stroke-N3{stroke:#9499AB;} + .d2-2618151458 .stroke-N4{stroke:#CFD2DD;} + .d2-2618151458 .stroke-N5{stroke:#DEE1EB;} + .d2-2618151458 .stroke-N6{stroke:#EEF1F8;} + .d2-2618151458 .stroke-N7{stroke:#FFFFFF;} + .d2-2618151458 .stroke-B1{stroke:#0D32B2;} + .d2-2618151458 .stroke-B2{stroke:#0D32B2;} + .d2-2618151458 .stroke-B3{stroke:#E3E9FD;} + .d2-2618151458 .stroke-B4{stroke:#E3E9FD;} + .d2-2618151458 .stroke-B5{stroke:#EDF0FD;} + .d2-2618151458 .stroke-B6{stroke:#F7F8FE;} + .d2-2618151458 .stroke-AA2{stroke:#4A6FF3;} + .d2-2618151458 .stroke-AA4{stroke:#EDF0FD;} + .d2-2618151458 .stroke-AA5{stroke:#F7F8FE;} + .d2-2618151458 .stroke-AB4{stroke:#EDF0FD;} + .d2-2618151458 .stroke-AB5{stroke:#F7F8FE;} + .d2-2618151458 .background-color-N1{background-color:#0A0F25;} + .d2-2618151458 .background-color-N2{background-color:#676C7E;} + .d2-2618151458 .background-color-N3{background-color:#9499AB;} + .d2-2618151458 .background-color-N4{background-color:#CFD2DD;} + .d2-2618151458 .background-color-N5{background-color:#DEE1EB;} + .d2-2618151458 .background-color-N6{background-color:#EEF1F8;} + .d2-2618151458 .background-color-N7{background-color:#FFFFFF;} + .d2-2618151458 .background-color-B1{background-color:#0D32B2;} + .d2-2618151458 .background-color-B2{background-color:#0D32B2;} + .d2-2618151458 .background-color-B3{background-color:#E3E9FD;} + .d2-2618151458 .background-color-B4{background-color:#E3E9FD;} + .d2-2618151458 .background-color-B5{background-color:#EDF0FD;} + .d2-2618151458 .background-color-B6{background-color:#F7F8FE;} + .d2-2618151458 .background-color-AA2{background-color:#4A6FF3;} + .d2-2618151458 .background-color-AA4{background-color:#EDF0FD;} + .d2-2618151458 .background-color-AA5{background-color:#F7F8FE;} + .d2-2618151458 .background-color-AB4{background-color:#EDF0FD;} + .d2-2618151458 .background-color-AB5{background-color:#F7F8FE;} + .d2-2618151458 .color-N1{color:#0A0F25;} + .d2-2618151458 .color-N2{color:#676C7E;} + .d2-2618151458 .color-N3{color:#9499AB;} + .d2-2618151458 .color-N4{color:#CFD2DD;} + .d2-2618151458 .color-N5{color:#DEE1EB;} + .d2-2618151458 .color-N6{color:#EEF1F8;} + .d2-2618151458 .color-N7{color:#FFFFFF;} + .d2-2618151458 .color-B1{color:#0D32B2;} + .d2-2618151458 .color-B2{color:#0D32B2;} + .d2-2618151458 .color-B3{color:#E3E9FD;} + .d2-2618151458 .color-B4{color:#E3E9FD;} + .d2-2618151458 .color-B5{color:#EDF0FD;} + .d2-2618151458 .color-B6{color:#F7F8FE;} + .d2-2618151458 .color-AA2{color:#4A6FF3;} + .d2-2618151458 .color-AA4{color:#EDF0FD;} + .d2-2618151458 .color-AA5{color:#F7F8FE;} + .d2-2618151458 .color-AB4{color:#EDF0FD;} + .d2-2618151458 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2618151458);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2618151458);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2618151458);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2618151458);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2618151458);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2618151458);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2618151458);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2618151458);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2618151458);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2618151458);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2618151458);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2618151458);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2618151458);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2618151458);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2618151458);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2618151458);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2618151458);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2618151458);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>a labelblabelsa class+public() boolvoid-private() intvoidcloudyyyya := 5 b := a + 7 -fmt.Printf("%d", b)a := 5 +fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side - - - - - - - - - - - - - - - - - - - - - +fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_distance/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_distance/dagre/board.exp.json index ceafe1afe..1efabbeb5 100644 --- a/e2etests/testdata/stable/sequence_diagram_distance/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_distance/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -110,6 +120,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -148,6 +159,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 474, @@ -186,6 +198,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -224,6 +237,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 474, @@ -255,6 +269,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/sequence_diagram_distance/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_distance/dagre/sketch.exp.svg index 3e35e6025..7ac8b5b8f 100644 --- a/e2etests/testdata/stable/sequence_diagram_distance/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_distance/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -alicebob what does it mean to be well-adjustedThe ability to play bridge or golf as if they were games + .d2-2546385477 .fill-N1{fill:#0A0F25;} + .d2-2546385477 .fill-N2{fill:#676C7E;} + .d2-2546385477 .fill-N3{fill:#9499AB;} + .d2-2546385477 .fill-N4{fill:#CFD2DD;} + .d2-2546385477 .fill-N5{fill:#DEE1EB;} + .d2-2546385477 .fill-N6{fill:#EEF1F8;} + .d2-2546385477 .fill-N7{fill:#FFFFFF;} + .d2-2546385477 .fill-B1{fill:#0D32B2;} + .d2-2546385477 .fill-B2{fill:#0D32B2;} + .d2-2546385477 .fill-B3{fill:#E3E9FD;} + .d2-2546385477 .fill-B4{fill:#E3E9FD;} + .d2-2546385477 .fill-B5{fill:#EDF0FD;} + .d2-2546385477 .fill-B6{fill:#F7F8FE;} + .d2-2546385477 .fill-AA2{fill:#4A6FF3;} + .d2-2546385477 .fill-AA4{fill:#EDF0FD;} + .d2-2546385477 .fill-AA5{fill:#F7F8FE;} + .d2-2546385477 .fill-AB4{fill:#EDF0FD;} + .d2-2546385477 .fill-AB5{fill:#F7F8FE;} + .d2-2546385477 .stroke-N1{stroke:#0A0F25;} + .d2-2546385477 .stroke-N2{stroke:#676C7E;} + .d2-2546385477 .stroke-N3{stroke:#9499AB;} + .d2-2546385477 .stroke-N4{stroke:#CFD2DD;} + .d2-2546385477 .stroke-N5{stroke:#DEE1EB;} + .d2-2546385477 .stroke-N6{stroke:#EEF1F8;} + .d2-2546385477 .stroke-N7{stroke:#FFFFFF;} + .d2-2546385477 .stroke-B1{stroke:#0D32B2;} + .d2-2546385477 .stroke-B2{stroke:#0D32B2;} + .d2-2546385477 .stroke-B3{stroke:#E3E9FD;} + .d2-2546385477 .stroke-B4{stroke:#E3E9FD;} + .d2-2546385477 .stroke-B5{stroke:#EDF0FD;} + .d2-2546385477 .stroke-B6{stroke:#F7F8FE;} + .d2-2546385477 .stroke-AA2{stroke:#4A6FF3;} + .d2-2546385477 .stroke-AA4{stroke:#EDF0FD;} + .d2-2546385477 .stroke-AA5{stroke:#F7F8FE;} + .d2-2546385477 .stroke-AB4{stroke:#EDF0FD;} + .d2-2546385477 .stroke-AB5{stroke:#F7F8FE;} + .d2-2546385477 .background-color-N1{background-color:#0A0F25;} + .d2-2546385477 .background-color-N2{background-color:#676C7E;} + .d2-2546385477 .background-color-N3{background-color:#9499AB;} + .d2-2546385477 .background-color-N4{background-color:#CFD2DD;} + .d2-2546385477 .background-color-N5{background-color:#DEE1EB;} + .d2-2546385477 .background-color-N6{background-color:#EEF1F8;} + .d2-2546385477 .background-color-N7{background-color:#FFFFFF;} + .d2-2546385477 .background-color-B1{background-color:#0D32B2;} + .d2-2546385477 .background-color-B2{background-color:#0D32B2;} + .d2-2546385477 .background-color-B3{background-color:#E3E9FD;} + .d2-2546385477 .background-color-B4{background-color:#E3E9FD;} + .d2-2546385477 .background-color-B5{background-color:#EDF0FD;} + .d2-2546385477 .background-color-B6{background-color:#F7F8FE;} + .d2-2546385477 .background-color-AA2{background-color:#4A6FF3;} + .d2-2546385477 .background-color-AA4{background-color:#EDF0FD;} + .d2-2546385477 .background-color-AA5{background-color:#F7F8FE;} + .d2-2546385477 .background-color-AB4{background-color:#EDF0FD;} + .d2-2546385477 .background-color-AB5{background-color:#F7F8FE;} + .d2-2546385477 .color-N1{color:#0A0F25;} + .d2-2546385477 .color-N2{color:#676C7E;} + .d2-2546385477 .color-N3{color:#9499AB;} + .d2-2546385477 .color-N4{color:#CFD2DD;} + .d2-2546385477 .color-N5{color:#DEE1EB;} + .d2-2546385477 .color-N6{color:#EEF1F8;} + .d2-2546385477 .color-N7{color:#FFFFFF;} + .d2-2546385477 .color-B1{color:#0D32B2;} + .d2-2546385477 .color-B2{color:#0D32B2;} + .d2-2546385477 .color-B3{color:#E3E9FD;} + .d2-2546385477 .color-B4{color:#E3E9FD;} + .d2-2546385477 .color-B5{color:#EDF0FD;} + .d2-2546385477 .color-B6{color:#F7F8FE;} + .d2-2546385477 .color-AA2{color:#4A6FF3;} + .d2-2546385477 .color-AA4{color:#EDF0FD;} + .d2-2546385477 .color-AA5{color:#F7F8FE;} + .d2-2546385477 .color-AB4{color:#EDF0FD;} + .d2-2546385477 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2546385477);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2546385477);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2546385477);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2546385477);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2546385477);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2546385477);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2546385477);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2546385477);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2546385477);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2546385477);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2546385477);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2546385477);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2546385477);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2546385477);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2546385477);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2546385477);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2546385477);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2546385477);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>alicebob what does it mean to be well-adjustedThe ability to play bridge or golf as if they were games - - - - + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_distance/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_distance/elk/board.exp.json index ceafe1afe..1efabbeb5 100644 --- a/e2etests/testdata/stable/sequence_diagram_distance/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_distance/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -110,6 +120,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -148,6 +159,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 474, @@ -186,6 +198,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -224,6 +237,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 474, @@ -255,6 +269,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/sequence_diagram_distance/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_distance/elk/sketch.exp.svg index 3e35e6025..7ac8b5b8f 100644 --- a/e2etests/testdata/stable/sequence_diagram_distance/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_distance/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -alicebob what does it mean to be well-adjustedThe ability to play bridge or golf as if they were games + .d2-2546385477 .fill-N1{fill:#0A0F25;} + .d2-2546385477 .fill-N2{fill:#676C7E;} + .d2-2546385477 .fill-N3{fill:#9499AB;} + .d2-2546385477 .fill-N4{fill:#CFD2DD;} + .d2-2546385477 .fill-N5{fill:#DEE1EB;} + .d2-2546385477 .fill-N6{fill:#EEF1F8;} + .d2-2546385477 .fill-N7{fill:#FFFFFF;} + .d2-2546385477 .fill-B1{fill:#0D32B2;} + .d2-2546385477 .fill-B2{fill:#0D32B2;} + .d2-2546385477 .fill-B3{fill:#E3E9FD;} + .d2-2546385477 .fill-B4{fill:#E3E9FD;} + .d2-2546385477 .fill-B5{fill:#EDF0FD;} + .d2-2546385477 .fill-B6{fill:#F7F8FE;} + .d2-2546385477 .fill-AA2{fill:#4A6FF3;} + .d2-2546385477 .fill-AA4{fill:#EDF0FD;} + .d2-2546385477 .fill-AA5{fill:#F7F8FE;} + .d2-2546385477 .fill-AB4{fill:#EDF0FD;} + .d2-2546385477 .fill-AB5{fill:#F7F8FE;} + .d2-2546385477 .stroke-N1{stroke:#0A0F25;} + .d2-2546385477 .stroke-N2{stroke:#676C7E;} + .d2-2546385477 .stroke-N3{stroke:#9499AB;} + .d2-2546385477 .stroke-N4{stroke:#CFD2DD;} + .d2-2546385477 .stroke-N5{stroke:#DEE1EB;} + .d2-2546385477 .stroke-N6{stroke:#EEF1F8;} + .d2-2546385477 .stroke-N7{stroke:#FFFFFF;} + .d2-2546385477 .stroke-B1{stroke:#0D32B2;} + .d2-2546385477 .stroke-B2{stroke:#0D32B2;} + .d2-2546385477 .stroke-B3{stroke:#E3E9FD;} + .d2-2546385477 .stroke-B4{stroke:#E3E9FD;} + .d2-2546385477 .stroke-B5{stroke:#EDF0FD;} + .d2-2546385477 .stroke-B6{stroke:#F7F8FE;} + .d2-2546385477 .stroke-AA2{stroke:#4A6FF3;} + .d2-2546385477 .stroke-AA4{stroke:#EDF0FD;} + .d2-2546385477 .stroke-AA5{stroke:#F7F8FE;} + .d2-2546385477 .stroke-AB4{stroke:#EDF0FD;} + .d2-2546385477 .stroke-AB5{stroke:#F7F8FE;} + .d2-2546385477 .background-color-N1{background-color:#0A0F25;} + .d2-2546385477 .background-color-N2{background-color:#676C7E;} + .d2-2546385477 .background-color-N3{background-color:#9499AB;} + .d2-2546385477 .background-color-N4{background-color:#CFD2DD;} + .d2-2546385477 .background-color-N5{background-color:#DEE1EB;} + .d2-2546385477 .background-color-N6{background-color:#EEF1F8;} + .d2-2546385477 .background-color-N7{background-color:#FFFFFF;} + .d2-2546385477 .background-color-B1{background-color:#0D32B2;} + .d2-2546385477 .background-color-B2{background-color:#0D32B2;} + .d2-2546385477 .background-color-B3{background-color:#E3E9FD;} + .d2-2546385477 .background-color-B4{background-color:#E3E9FD;} + .d2-2546385477 .background-color-B5{background-color:#EDF0FD;} + .d2-2546385477 .background-color-B6{background-color:#F7F8FE;} + .d2-2546385477 .background-color-AA2{background-color:#4A6FF3;} + .d2-2546385477 .background-color-AA4{background-color:#EDF0FD;} + .d2-2546385477 .background-color-AA5{background-color:#F7F8FE;} + .d2-2546385477 .background-color-AB4{background-color:#EDF0FD;} + .d2-2546385477 .background-color-AB5{background-color:#F7F8FE;} + .d2-2546385477 .color-N1{color:#0A0F25;} + .d2-2546385477 .color-N2{color:#676C7E;} + .d2-2546385477 .color-N3{color:#9499AB;} + .d2-2546385477 .color-N4{color:#CFD2DD;} + .d2-2546385477 .color-N5{color:#DEE1EB;} + .d2-2546385477 .color-N6{color:#EEF1F8;} + .d2-2546385477 .color-N7{color:#FFFFFF;} + .d2-2546385477 .color-B1{color:#0D32B2;} + .d2-2546385477 .color-B2{color:#0D32B2;} + .d2-2546385477 .color-B3{color:#E3E9FD;} + .d2-2546385477 .color-B4{color:#E3E9FD;} + .d2-2546385477 .color-B5{color:#EDF0FD;} + .d2-2546385477 .color-B6{color:#F7F8FE;} + .d2-2546385477 .color-AA2{color:#4A6FF3;} + .d2-2546385477 .color-AA4{color:#EDF0FD;} + .d2-2546385477 .color-AA5{color:#F7F8FE;} + .d2-2546385477 .color-AB4{color:#EDF0FD;} + .d2-2546385477 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2546385477);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2546385477);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2546385477);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2546385477);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2546385477);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2546385477);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2546385477);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2546385477);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2546385477);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2546385477);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2546385477);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2546385477);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2546385477);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2546385477);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2546385477);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2546385477);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2546385477);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2546385477);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>alicebob what does it mean to be well-adjustedThe ability to play bridge or golf as if they were games - - - - + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_groups/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_groups/dagre/board.exp.json index 66e38b660..a29ad54ce 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_groups/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -224,6 +237,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -266,6 +280,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -308,6 +323,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -348,6 +364,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -388,6 +405,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -470,6 +489,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -511,6 +531,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -553,6 +574,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -604,6 +626,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -642,6 +665,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -680,6 +704,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -718,6 +743,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 362, @@ -756,6 +782,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 362, @@ -794,6 +821,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 218, @@ -832,6 +860,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 222, @@ -870,6 +899,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 356, @@ -908,6 +938,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -946,6 +977,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 362, @@ -984,6 +1016,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -1022,6 +1055,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -1060,6 +1094,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 362, @@ -1098,6 +1133,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 512, @@ -1129,6 +1165,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/sequence_diagram_groups/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_groups/dagre/sketch.exp.svg index 373a97329..c9e493fb1 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_groups/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note + .d2-3716732714 .fill-N1{fill:#0A0F25;} + .d2-3716732714 .fill-N2{fill:#676C7E;} + .d2-3716732714 .fill-N3{fill:#9499AB;} + .d2-3716732714 .fill-N4{fill:#CFD2DD;} + .d2-3716732714 .fill-N5{fill:#DEE1EB;} + .d2-3716732714 .fill-N6{fill:#EEF1F8;} + .d2-3716732714 .fill-N7{fill:#FFFFFF;} + .d2-3716732714 .fill-B1{fill:#0D32B2;} + .d2-3716732714 .fill-B2{fill:#0D32B2;} + .d2-3716732714 .fill-B3{fill:#E3E9FD;} + .d2-3716732714 .fill-B4{fill:#E3E9FD;} + .d2-3716732714 .fill-B5{fill:#EDF0FD;} + .d2-3716732714 .fill-B6{fill:#F7F8FE;} + .d2-3716732714 .fill-AA2{fill:#4A6FF3;} + .d2-3716732714 .fill-AA4{fill:#EDF0FD;} + .d2-3716732714 .fill-AA5{fill:#F7F8FE;} + .d2-3716732714 .fill-AB4{fill:#EDF0FD;} + .d2-3716732714 .fill-AB5{fill:#F7F8FE;} + .d2-3716732714 .stroke-N1{stroke:#0A0F25;} + .d2-3716732714 .stroke-N2{stroke:#676C7E;} + .d2-3716732714 .stroke-N3{stroke:#9499AB;} + .d2-3716732714 .stroke-N4{stroke:#CFD2DD;} + .d2-3716732714 .stroke-N5{stroke:#DEE1EB;} + .d2-3716732714 .stroke-N6{stroke:#EEF1F8;} + .d2-3716732714 .stroke-N7{stroke:#FFFFFF;} + .d2-3716732714 .stroke-B1{stroke:#0D32B2;} + .d2-3716732714 .stroke-B2{stroke:#0D32B2;} + .d2-3716732714 .stroke-B3{stroke:#E3E9FD;} + .d2-3716732714 .stroke-B4{stroke:#E3E9FD;} + .d2-3716732714 .stroke-B5{stroke:#EDF0FD;} + .d2-3716732714 .stroke-B6{stroke:#F7F8FE;} + .d2-3716732714 .stroke-AA2{stroke:#4A6FF3;} + .d2-3716732714 .stroke-AA4{stroke:#EDF0FD;} + .d2-3716732714 .stroke-AA5{stroke:#F7F8FE;} + .d2-3716732714 .stroke-AB4{stroke:#EDF0FD;} + .d2-3716732714 .stroke-AB5{stroke:#F7F8FE;} + .d2-3716732714 .background-color-N1{background-color:#0A0F25;} + .d2-3716732714 .background-color-N2{background-color:#676C7E;} + .d2-3716732714 .background-color-N3{background-color:#9499AB;} + .d2-3716732714 .background-color-N4{background-color:#CFD2DD;} + .d2-3716732714 .background-color-N5{background-color:#DEE1EB;} + .d2-3716732714 .background-color-N6{background-color:#EEF1F8;} + .d2-3716732714 .background-color-N7{background-color:#FFFFFF;} + .d2-3716732714 .background-color-B1{background-color:#0D32B2;} + .d2-3716732714 .background-color-B2{background-color:#0D32B2;} + .d2-3716732714 .background-color-B3{background-color:#E3E9FD;} + .d2-3716732714 .background-color-B4{background-color:#E3E9FD;} + .d2-3716732714 .background-color-B5{background-color:#EDF0FD;} + .d2-3716732714 .background-color-B6{background-color:#F7F8FE;} + .d2-3716732714 .background-color-AA2{background-color:#4A6FF3;} + .d2-3716732714 .background-color-AA4{background-color:#EDF0FD;} + .d2-3716732714 .background-color-AA5{background-color:#F7F8FE;} + .d2-3716732714 .background-color-AB4{background-color:#EDF0FD;} + .d2-3716732714 .background-color-AB5{background-color:#F7F8FE;} + .d2-3716732714 .color-N1{color:#0A0F25;} + .d2-3716732714 .color-N2{color:#676C7E;} + .d2-3716732714 .color-N3{color:#9499AB;} + .d2-3716732714 .color-N4{color:#CFD2DD;} + .d2-3716732714 .color-N5{color:#DEE1EB;} + .d2-3716732714 .color-N6{color:#EEF1F8;} + .d2-3716732714 .color-N7{color:#FFFFFF;} + .d2-3716732714 .color-B1{color:#0D32B2;} + .d2-3716732714 .color-B2{color:#0D32B2;} + .d2-3716732714 .color-B3{color:#E3E9FD;} + .d2-3716732714 .color-B4{color:#E3E9FD;} + .d2-3716732714 .color-B5{color:#EDF0FD;} + .d2-3716732714 .color-B6{color:#F7F8FE;} + .d2-3716732714 .color-AA2{color:#4A6FF3;} + .d2-3716732714 .color-AA4{color:#EDF0FD;} + .d2-3716732714 .color-AA5{color:#F7F8FE;} + .d2-3716732714 .color-AB4{color:#EDF0FD;} + .d2-3716732714 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3716732714);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3716732714);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3716732714);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3716732714);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3716732714);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3716732714);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3716732714);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3716732714);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3716732714);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3716732714);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3716732714);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3716732714);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3716732714);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3716732714);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3716732714);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3716732714);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3716732714);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3716732714);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_groups/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_groups/elk/board.exp.json index 66e38b660..a29ad54ce 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_groups/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -224,6 +237,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -266,6 +280,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -308,6 +323,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -348,6 +364,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -388,6 +405,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -470,6 +489,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -511,6 +531,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -553,6 +574,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -604,6 +626,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -642,6 +665,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -680,6 +704,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -718,6 +743,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 362, @@ -756,6 +782,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 362, @@ -794,6 +821,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 218, @@ -832,6 +860,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 222, @@ -870,6 +899,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 356, @@ -908,6 +938,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -946,6 +977,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 362, @@ -984,6 +1016,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -1022,6 +1055,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -1060,6 +1094,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 362, @@ -1098,6 +1133,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 512, @@ -1129,6 +1165,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/sequence_diagram_groups/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_groups/elk/sketch.exp.svg index 373a97329..c9e493fb1 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_groups/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note + .d2-3716732714 .fill-N1{fill:#0A0F25;} + .d2-3716732714 .fill-N2{fill:#676C7E;} + .d2-3716732714 .fill-N3{fill:#9499AB;} + .d2-3716732714 .fill-N4{fill:#CFD2DD;} + .d2-3716732714 .fill-N5{fill:#DEE1EB;} + .d2-3716732714 .fill-N6{fill:#EEF1F8;} + .d2-3716732714 .fill-N7{fill:#FFFFFF;} + .d2-3716732714 .fill-B1{fill:#0D32B2;} + .d2-3716732714 .fill-B2{fill:#0D32B2;} + .d2-3716732714 .fill-B3{fill:#E3E9FD;} + .d2-3716732714 .fill-B4{fill:#E3E9FD;} + .d2-3716732714 .fill-B5{fill:#EDF0FD;} + .d2-3716732714 .fill-B6{fill:#F7F8FE;} + .d2-3716732714 .fill-AA2{fill:#4A6FF3;} + .d2-3716732714 .fill-AA4{fill:#EDF0FD;} + .d2-3716732714 .fill-AA5{fill:#F7F8FE;} + .d2-3716732714 .fill-AB4{fill:#EDF0FD;} + .d2-3716732714 .fill-AB5{fill:#F7F8FE;} + .d2-3716732714 .stroke-N1{stroke:#0A0F25;} + .d2-3716732714 .stroke-N2{stroke:#676C7E;} + .d2-3716732714 .stroke-N3{stroke:#9499AB;} + .d2-3716732714 .stroke-N4{stroke:#CFD2DD;} + .d2-3716732714 .stroke-N5{stroke:#DEE1EB;} + .d2-3716732714 .stroke-N6{stroke:#EEF1F8;} + .d2-3716732714 .stroke-N7{stroke:#FFFFFF;} + .d2-3716732714 .stroke-B1{stroke:#0D32B2;} + .d2-3716732714 .stroke-B2{stroke:#0D32B2;} + .d2-3716732714 .stroke-B3{stroke:#E3E9FD;} + .d2-3716732714 .stroke-B4{stroke:#E3E9FD;} + .d2-3716732714 .stroke-B5{stroke:#EDF0FD;} + .d2-3716732714 .stroke-B6{stroke:#F7F8FE;} + .d2-3716732714 .stroke-AA2{stroke:#4A6FF3;} + .d2-3716732714 .stroke-AA4{stroke:#EDF0FD;} + .d2-3716732714 .stroke-AA5{stroke:#F7F8FE;} + .d2-3716732714 .stroke-AB4{stroke:#EDF0FD;} + .d2-3716732714 .stroke-AB5{stroke:#F7F8FE;} + .d2-3716732714 .background-color-N1{background-color:#0A0F25;} + .d2-3716732714 .background-color-N2{background-color:#676C7E;} + .d2-3716732714 .background-color-N3{background-color:#9499AB;} + .d2-3716732714 .background-color-N4{background-color:#CFD2DD;} + .d2-3716732714 .background-color-N5{background-color:#DEE1EB;} + .d2-3716732714 .background-color-N6{background-color:#EEF1F8;} + .d2-3716732714 .background-color-N7{background-color:#FFFFFF;} + .d2-3716732714 .background-color-B1{background-color:#0D32B2;} + .d2-3716732714 .background-color-B2{background-color:#0D32B2;} + .d2-3716732714 .background-color-B3{background-color:#E3E9FD;} + .d2-3716732714 .background-color-B4{background-color:#E3E9FD;} + .d2-3716732714 .background-color-B5{background-color:#EDF0FD;} + .d2-3716732714 .background-color-B6{background-color:#F7F8FE;} + .d2-3716732714 .background-color-AA2{background-color:#4A6FF3;} + .d2-3716732714 .background-color-AA4{background-color:#EDF0FD;} + .d2-3716732714 .background-color-AA5{background-color:#F7F8FE;} + .d2-3716732714 .background-color-AB4{background-color:#EDF0FD;} + .d2-3716732714 .background-color-AB5{background-color:#F7F8FE;} + .d2-3716732714 .color-N1{color:#0A0F25;} + .d2-3716732714 .color-N2{color:#676C7E;} + .d2-3716732714 .color-N3{color:#9499AB;} + .d2-3716732714 .color-N4{color:#CFD2DD;} + .d2-3716732714 .color-N5{color:#DEE1EB;} + .d2-3716732714 .color-N6{color:#EEF1F8;} + .d2-3716732714 .color-N7{color:#FFFFFF;} + .d2-3716732714 .color-B1{color:#0D32B2;} + .d2-3716732714 .color-B2{color:#0D32B2;} + .d2-3716732714 .color-B3{color:#E3E9FD;} + .d2-3716732714 .color-B4{color:#E3E9FD;} + .d2-3716732714 .color-B5{color:#EDF0FD;} + .d2-3716732714 .color-B6{color:#F7F8FE;} + .d2-3716732714 .color-AA2{color:#4A6FF3;} + .d2-3716732714 .color-AA4{color:#EDF0FD;} + .d2-3716732714 .color-AA5{color:#F7F8FE;} + .d2-3716732714 .color-AB4{color:#EDF0FD;} + .d2-3716732714 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3716732714);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3716732714);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3716732714);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3716732714);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3716732714);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3716732714);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3716732714);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3716732714);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3716732714);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3716732714);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3716732714);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3716732714);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3716732714);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3716732714);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3716732714);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3716732714);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3716732714);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3716732714);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_long_note/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_long_note/dagre/board.exp.json index 3bf4762ef..edcce039d 100644 --- a/e2etests/testdata/stable/sequence_diagram_long_note/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_long_note/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -192,6 +204,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -230,6 +243,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -268,6 +282,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -299,6 +314,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/sequence_diagram_long_note/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_long_note/dagre/sketch.exp.svg index 0efdd6abc..1270a94aa 100644 --- a/e2etests/testdata/stable/sequence_diagram_long_note/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_long_note/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -ab a note here to remember that padding must consider notes toojustalongnotehere + .d2-3766203208 .fill-N1{fill:#0A0F25;} + .d2-3766203208 .fill-N2{fill:#676C7E;} + .d2-3766203208 .fill-N3{fill:#9499AB;} + .d2-3766203208 .fill-N4{fill:#CFD2DD;} + .d2-3766203208 .fill-N5{fill:#DEE1EB;} + .d2-3766203208 .fill-N6{fill:#EEF1F8;} + .d2-3766203208 .fill-N7{fill:#FFFFFF;} + .d2-3766203208 .fill-B1{fill:#0D32B2;} + .d2-3766203208 .fill-B2{fill:#0D32B2;} + .d2-3766203208 .fill-B3{fill:#E3E9FD;} + .d2-3766203208 .fill-B4{fill:#E3E9FD;} + .d2-3766203208 .fill-B5{fill:#EDF0FD;} + .d2-3766203208 .fill-B6{fill:#F7F8FE;} + .d2-3766203208 .fill-AA2{fill:#4A6FF3;} + .d2-3766203208 .fill-AA4{fill:#EDF0FD;} + .d2-3766203208 .fill-AA5{fill:#F7F8FE;} + .d2-3766203208 .fill-AB4{fill:#EDF0FD;} + .d2-3766203208 .fill-AB5{fill:#F7F8FE;} + .d2-3766203208 .stroke-N1{stroke:#0A0F25;} + .d2-3766203208 .stroke-N2{stroke:#676C7E;} + .d2-3766203208 .stroke-N3{stroke:#9499AB;} + .d2-3766203208 .stroke-N4{stroke:#CFD2DD;} + .d2-3766203208 .stroke-N5{stroke:#DEE1EB;} + .d2-3766203208 .stroke-N6{stroke:#EEF1F8;} + .d2-3766203208 .stroke-N7{stroke:#FFFFFF;} + .d2-3766203208 .stroke-B1{stroke:#0D32B2;} + .d2-3766203208 .stroke-B2{stroke:#0D32B2;} + .d2-3766203208 .stroke-B3{stroke:#E3E9FD;} + .d2-3766203208 .stroke-B4{stroke:#E3E9FD;} + .d2-3766203208 .stroke-B5{stroke:#EDF0FD;} + .d2-3766203208 .stroke-B6{stroke:#F7F8FE;} + .d2-3766203208 .stroke-AA2{stroke:#4A6FF3;} + .d2-3766203208 .stroke-AA4{stroke:#EDF0FD;} + .d2-3766203208 .stroke-AA5{stroke:#F7F8FE;} + .d2-3766203208 .stroke-AB4{stroke:#EDF0FD;} + .d2-3766203208 .stroke-AB5{stroke:#F7F8FE;} + .d2-3766203208 .background-color-N1{background-color:#0A0F25;} + .d2-3766203208 .background-color-N2{background-color:#676C7E;} + .d2-3766203208 .background-color-N3{background-color:#9499AB;} + .d2-3766203208 .background-color-N4{background-color:#CFD2DD;} + .d2-3766203208 .background-color-N5{background-color:#DEE1EB;} + .d2-3766203208 .background-color-N6{background-color:#EEF1F8;} + .d2-3766203208 .background-color-N7{background-color:#FFFFFF;} + .d2-3766203208 .background-color-B1{background-color:#0D32B2;} + .d2-3766203208 .background-color-B2{background-color:#0D32B2;} + .d2-3766203208 .background-color-B3{background-color:#E3E9FD;} + .d2-3766203208 .background-color-B4{background-color:#E3E9FD;} + .d2-3766203208 .background-color-B5{background-color:#EDF0FD;} + .d2-3766203208 .background-color-B6{background-color:#F7F8FE;} + .d2-3766203208 .background-color-AA2{background-color:#4A6FF3;} + .d2-3766203208 .background-color-AA4{background-color:#EDF0FD;} + .d2-3766203208 .background-color-AA5{background-color:#F7F8FE;} + .d2-3766203208 .background-color-AB4{background-color:#EDF0FD;} + .d2-3766203208 .background-color-AB5{background-color:#F7F8FE;} + .d2-3766203208 .color-N1{color:#0A0F25;} + .d2-3766203208 .color-N2{color:#676C7E;} + .d2-3766203208 .color-N3{color:#9499AB;} + .d2-3766203208 .color-N4{color:#CFD2DD;} + .d2-3766203208 .color-N5{color:#DEE1EB;} + .d2-3766203208 .color-N6{color:#EEF1F8;} + .d2-3766203208 .color-N7{color:#FFFFFF;} + .d2-3766203208 .color-B1{color:#0D32B2;} + .d2-3766203208 .color-B2{color:#0D32B2;} + .d2-3766203208 .color-B3{color:#E3E9FD;} + .d2-3766203208 .color-B4{color:#E3E9FD;} + .d2-3766203208 .color-B5{color:#EDF0FD;} + .d2-3766203208 .color-B6{color:#F7F8FE;} + .d2-3766203208 .color-AA2{color:#4A6FF3;} + .d2-3766203208 .color-AA4{color:#EDF0FD;} + .d2-3766203208 .color-AA5{color:#F7F8FE;} + .d2-3766203208 .color-AB4{color:#EDF0FD;} + .d2-3766203208 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3766203208);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3766203208);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3766203208);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3766203208);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3766203208);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3766203208);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3766203208);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3766203208);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3766203208);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3766203208);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3766203208);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3766203208);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3766203208);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3766203208);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3766203208);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3766203208);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3766203208);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3766203208);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ab a note here to remember that padding must consider notes toojustalongnotehere - - - - + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_long_note/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_long_note/elk/board.exp.json index 3bf4762ef..edcce039d 100644 --- a/e2etests/testdata/stable/sequence_diagram_long_note/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_long_note/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -192,6 +204,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -230,6 +243,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -268,6 +282,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -299,6 +314,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/sequence_diagram_long_note/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_long_note/elk/sketch.exp.svg index 0efdd6abc..1270a94aa 100644 --- a/e2etests/testdata/stable/sequence_diagram_long_note/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_long_note/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -ab a note here to remember that padding must consider notes toojustalongnotehere + .d2-3766203208 .fill-N1{fill:#0A0F25;} + .d2-3766203208 .fill-N2{fill:#676C7E;} + .d2-3766203208 .fill-N3{fill:#9499AB;} + .d2-3766203208 .fill-N4{fill:#CFD2DD;} + .d2-3766203208 .fill-N5{fill:#DEE1EB;} + .d2-3766203208 .fill-N6{fill:#EEF1F8;} + .d2-3766203208 .fill-N7{fill:#FFFFFF;} + .d2-3766203208 .fill-B1{fill:#0D32B2;} + .d2-3766203208 .fill-B2{fill:#0D32B2;} + .d2-3766203208 .fill-B3{fill:#E3E9FD;} + .d2-3766203208 .fill-B4{fill:#E3E9FD;} + .d2-3766203208 .fill-B5{fill:#EDF0FD;} + .d2-3766203208 .fill-B6{fill:#F7F8FE;} + .d2-3766203208 .fill-AA2{fill:#4A6FF3;} + .d2-3766203208 .fill-AA4{fill:#EDF0FD;} + .d2-3766203208 .fill-AA5{fill:#F7F8FE;} + .d2-3766203208 .fill-AB4{fill:#EDF0FD;} + .d2-3766203208 .fill-AB5{fill:#F7F8FE;} + .d2-3766203208 .stroke-N1{stroke:#0A0F25;} + .d2-3766203208 .stroke-N2{stroke:#676C7E;} + .d2-3766203208 .stroke-N3{stroke:#9499AB;} + .d2-3766203208 .stroke-N4{stroke:#CFD2DD;} + .d2-3766203208 .stroke-N5{stroke:#DEE1EB;} + .d2-3766203208 .stroke-N6{stroke:#EEF1F8;} + .d2-3766203208 .stroke-N7{stroke:#FFFFFF;} + .d2-3766203208 .stroke-B1{stroke:#0D32B2;} + .d2-3766203208 .stroke-B2{stroke:#0D32B2;} + .d2-3766203208 .stroke-B3{stroke:#E3E9FD;} + .d2-3766203208 .stroke-B4{stroke:#E3E9FD;} + .d2-3766203208 .stroke-B5{stroke:#EDF0FD;} + .d2-3766203208 .stroke-B6{stroke:#F7F8FE;} + .d2-3766203208 .stroke-AA2{stroke:#4A6FF3;} + .d2-3766203208 .stroke-AA4{stroke:#EDF0FD;} + .d2-3766203208 .stroke-AA5{stroke:#F7F8FE;} + .d2-3766203208 .stroke-AB4{stroke:#EDF0FD;} + .d2-3766203208 .stroke-AB5{stroke:#F7F8FE;} + .d2-3766203208 .background-color-N1{background-color:#0A0F25;} + .d2-3766203208 .background-color-N2{background-color:#676C7E;} + .d2-3766203208 .background-color-N3{background-color:#9499AB;} + .d2-3766203208 .background-color-N4{background-color:#CFD2DD;} + .d2-3766203208 .background-color-N5{background-color:#DEE1EB;} + .d2-3766203208 .background-color-N6{background-color:#EEF1F8;} + .d2-3766203208 .background-color-N7{background-color:#FFFFFF;} + .d2-3766203208 .background-color-B1{background-color:#0D32B2;} + .d2-3766203208 .background-color-B2{background-color:#0D32B2;} + .d2-3766203208 .background-color-B3{background-color:#E3E9FD;} + .d2-3766203208 .background-color-B4{background-color:#E3E9FD;} + .d2-3766203208 .background-color-B5{background-color:#EDF0FD;} + .d2-3766203208 .background-color-B6{background-color:#F7F8FE;} + .d2-3766203208 .background-color-AA2{background-color:#4A6FF3;} + .d2-3766203208 .background-color-AA4{background-color:#EDF0FD;} + .d2-3766203208 .background-color-AA5{background-color:#F7F8FE;} + .d2-3766203208 .background-color-AB4{background-color:#EDF0FD;} + .d2-3766203208 .background-color-AB5{background-color:#F7F8FE;} + .d2-3766203208 .color-N1{color:#0A0F25;} + .d2-3766203208 .color-N2{color:#676C7E;} + .d2-3766203208 .color-N3{color:#9499AB;} + .d2-3766203208 .color-N4{color:#CFD2DD;} + .d2-3766203208 .color-N5{color:#DEE1EB;} + .d2-3766203208 .color-N6{color:#EEF1F8;} + .d2-3766203208 .color-N7{color:#FFFFFF;} + .d2-3766203208 .color-B1{color:#0D32B2;} + .d2-3766203208 .color-B2{color:#0D32B2;} + .d2-3766203208 .color-B3{color:#E3E9FD;} + .d2-3766203208 .color-B4{color:#E3E9FD;} + .d2-3766203208 .color-B5{color:#EDF0FD;} + .d2-3766203208 .color-B6{color:#F7F8FE;} + .d2-3766203208 .color-AA2{color:#4A6FF3;} + .d2-3766203208 .color-AA4{color:#EDF0FD;} + .d2-3766203208 .color-AA5{color:#F7F8FE;} + .d2-3766203208 .color-AB4{color:#EDF0FD;} + .d2-3766203208 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3766203208);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3766203208);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3766203208);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3766203208);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3766203208);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3766203208);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3766203208);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3766203208);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3766203208);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3766203208);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3766203208);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3766203208);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3766203208);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3766203208);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3766203208);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3766203208);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3766203208);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3766203208);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ab a note here to remember that padding must consider notes toojustalongnotehere - - - - + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_nested_groups/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_nested_groups/dagre/board.exp.json index d61770367..b2d59c031 100644 --- a/e2etests/testdata/stable/sequence_diagram_nested_groups/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_nested_groups/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -183,6 +195,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -225,6 +238,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -267,6 +281,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -309,6 +324,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -350,6 +366,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -392,6 +409,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -434,6 +452,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -476,6 +495,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -518,6 +538,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -560,6 +581,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -602,6 +624,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -643,6 +666,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -694,6 +718,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -732,6 +757,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -770,6 +796,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -808,6 +835,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -846,6 +874,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -884,6 +913,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 335, @@ -922,6 +952,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 335, @@ -960,6 +991,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 335, @@ -998,6 +1030,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 335, @@ -1036,6 +1069,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -1074,6 +1108,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 335, @@ -1112,6 +1147,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 607, @@ -1143,6 +1179,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/sequence_diagram_nested_groups/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_nested_groups/dagre/sketch.exp.svg index 5119bdb1b..5e74aa1c5 100644 --- a/e2etests/testdata/stable/sequence_diagram_nested_groups/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_nested_groups/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -abjust an actorthis is a message groupaltand this is a nested message groupcase 1case 2case 3case 4what about more nestingcrazy townwhoa a notea note here to remember that padding must consider notes toojustalongnotehere + .d2-2630294448 .fill-N1{fill:#0A0F25;} + .d2-2630294448 .fill-N2{fill:#676C7E;} + .d2-2630294448 .fill-N3{fill:#9499AB;} + .d2-2630294448 .fill-N4{fill:#CFD2DD;} + .d2-2630294448 .fill-N5{fill:#DEE1EB;} + .d2-2630294448 .fill-N6{fill:#EEF1F8;} + .d2-2630294448 .fill-N7{fill:#FFFFFF;} + .d2-2630294448 .fill-B1{fill:#0D32B2;} + .d2-2630294448 .fill-B2{fill:#0D32B2;} + .d2-2630294448 .fill-B3{fill:#E3E9FD;} + .d2-2630294448 .fill-B4{fill:#E3E9FD;} + .d2-2630294448 .fill-B5{fill:#EDF0FD;} + .d2-2630294448 .fill-B6{fill:#F7F8FE;} + .d2-2630294448 .fill-AA2{fill:#4A6FF3;} + .d2-2630294448 .fill-AA4{fill:#EDF0FD;} + .d2-2630294448 .fill-AA5{fill:#F7F8FE;} + .d2-2630294448 .fill-AB4{fill:#EDF0FD;} + .d2-2630294448 .fill-AB5{fill:#F7F8FE;} + .d2-2630294448 .stroke-N1{stroke:#0A0F25;} + .d2-2630294448 .stroke-N2{stroke:#676C7E;} + .d2-2630294448 .stroke-N3{stroke:#9499AB;} + .d2-2630294448 .stroke-N4{stroke:#CFD2DD;} + .d2-2630294448 .stroke-N5{stroke:#DEE1EB;} + .d2-2630294448 .stroke-N6{stroke:#EEF1F8;} + .d2-2630294448 .stroke-N7{stroke:#FFFFFF;} + .d2-2630294448 .stroke-B1{stroke:#0D32B2;} + .d2-2630294448 .stroke-B2{stroke:#0D32B2;} + .d2-2630294448 .stroke-B3{stroke:#E3E9FD;} + .d2-2630294448 .stroke-B4{stroke:#E3E9FD;} + .d2-2630294448 .stroke-B5{stroke:#EDF0FD;} + .d2-2630294448 .stroke-B6{stroke:#F7F8FE;} + .d2-2630294448 .stroke-AA2{stroke:#4A6FF3;} + .d2-2630294448 .stroke-AA4{stroke:#EDF0FD;} + .d2-2630294448 .stroke-AA5{stroke:#F7F8FE;} + .d2-2630294448 .stroke-AB4{stroke:#EDF0FD;} + .d2-2630294448 .stroke-AB5{stroke:#F7F8FE;} + .d2-2630294448 .background-color-N1{background-color:#0A0F25;} + .d2-2630294448 .background-color-N2{background-color:#676C7E;} + .d2-2630294448 .background-color-N3{background-color:#9499AB;} + .d2-2630294448 .background-color-N4{background-color:#CFD2DD;} + .d2-2630294448 .background-color-N5{background-color:#DEE1EB;} + .d2-2630294448 .background-color-N6{background-color:#EEF1F8;} + .d2-2630294448 .background-color-N7{background-color:#FFFFFF;} + .d2-2630294448 .background-color-B1{background-color:#0D32B2;} + .d2-2630294448 .background-color-B2{background-color:#0D32B2;} + .d2-2630294448 .background-color-B3{background-color:#E3E9FD;} + .d2-2630294448 .background-color-B4{background-color:#E3E9FD;} + .d2-2630294448 .background-color-B5{background-color:#EDF0FD;} + .d2-2630294448 .background-color-B6{background-color:#F7F8FE;} + .d2-2630294448 .background-color-AA2{background-color:#4A6FF3;} + .d2-2630294448 .background-color-AA4{background-color:#EDF0FD;} + .d2-2630294448 .background-color-AA5{background-color:#F7F8FE;} + .d2-2630294448 .background-color-AB4{background-color:#EDF0FD;} + .d2-2630294448 .background-color-AB5{background-color:#F7F8FE;} + .d2-2630294448 .color-N1{color:#0A0F25;} + .d2-2630294448 .color-N2{color:#676C7E;} + .d2-2630294448 .color-N3{color:#9499AB;} + .d2-2630294448 .color-N4{color:#CFD2DD;} + .d2-2630294448 .color-N5{color:#DEE1EB;} + .d2-2630294448 .color-N6{color:#EEF1F8;} + .d2-2630294448 .color-N7{color:#FFFFFF;} + .d2-2630294448 .color-B1{color:#0D32B2;} + .d2-2630294448 .color-B2{color:#0D32B2;} + .d2-2630294448 .color-B3{color:#E3E9FD;} + .d2-2630294448 .color-B4{color:#E3E9FD;} + .d2-2630294448 .color-B5{color:#EDF0FD;} + .d2-2630294448 .color-B6{color:#F7F8FE;} + .d2-2630294448 .color-AA2{color:#4A6FF3;} + .d2-2630294448 .color-AA4{color:#EDF0FD;} + .d2-2630294448 .color-AA5{color:#F7F8FE;} + .d2-2630294448 .color-AB4{color:#EDF0FD;} + .d2-2630294448 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2630294448);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2630294448);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2630294448);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2630294448);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2630294448);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2630294448);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2630294448);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2630294448);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2630294448);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2630294448);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2630294448);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2630294448);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2630294448);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2630294448);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2630294448);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2630294448);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2630294448);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2630294448);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abjust an actorthis is a message groupaltand this is a nested message groupcase 1case 2case 3case 4what about more nestingcrazy townwhoa a notea note here to remember that padding must consider notes toojustalongnotehere - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_nested_groups/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_nested_groups/elk/board.exp.json index d61770367..b2d59c031 100644 --- a/e2etests/testdata/stable/sequence_diagram_nested_groups/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_nested_groups/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -183,6 +195,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -225,6 +238,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -267,6 +281,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -309,6 +324,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -350,6 +366,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -392,6 +409,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -434,6 +452,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -476,6 +495,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -518,6 +538,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -560,6 +581,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -602,6 +624,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -643,6 +666,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -694,6 +718,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -732,6 +757,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -770,6 +796,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -808,6 +835,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -846,6 +874,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -884,6 +913,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 335, @@ -922,6 +952,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 335, @@ -960,6 +991,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 335, @@ -998,6 +1030,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 335, @@ -1036,6 +1069,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -1074,6 +1108,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 335, @@ -1112,6 +1147,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 607, @@ -1143,6 +1179,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/sequence_diagram_nested_groups/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_nested_groups/elk/sketch.exp.svg index 5119bdb1b..5e74aa1c5 100644 --- a/e2etests/testdata/stable/sequence_diagram_nested_groups/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_nested_groups/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -abjust an actorthis is a message groupaltand this is a nested message groupcase 1case 2case 3case 4what about more nestingcrazy townwhoa a notea note here to remember that padding must consider notes toojustalongnotehere + .d2-2630294448 .fill-N1{fill:#0A0F25;} + .d2-2630294448 .fill-N2{fill:#676C7E;} + .d2-2630294448 .fill-N3{fill:#9499AB;} + .d2-2630294448 .fill-N4{fill:#CFD2DD;} + .d2-2630294448 .fill-N5{fill:#DEE1EB;} + .d2-2630294448 .fill-N6{fill:#EEF1F8;} + .d2-2630294448 .fill-N7{fill:#FFFFFF;} + .d2-2630294448 .fill-B1{fill:#0D32B2;} + .d2-2630294448 .fill-B2{fill:#0D32B2;} + .d2-2630294448 .fill-B3{fill:#E3E9FD;} + .d2-2630294448 .fill-B4{fill:#E3E9FD;} + .d2-2630294448 .fill-B5{fill:#EDF0FD;} + .d2-2630294448 .fill-B6{fill:#F7F8FE;} + .d2-2630294448 .fill-AA2{fill:#4A6FF3;} + .d2-2630294448 .fill-AA4{fill:#EDF0FD;} + .d2-2630294448 .fill-AA5{fill:#F7F8FE;} + .d2-2630294448 .fill-AB4{fill:#EDF0FD;} + .d2-2630294448 .fill-AB5{fill:#F7F8FE;} + .d2-2630294448 .stroke-N1{stroke:#0A0F25;} + .d2-2630294448 .stroke-N2{stroke:#676C7E;} + .d2-2630294448 .stroke-N3{stroke:#9499AB;} + .d2-2630294448 .stroke-N4{stroke:#CFD2DD;} + .d2-2630294448 .stroke-N5{stroke:#DEE1EB;} + .d2-2630294448 .stroke-N6{stroke:#EEF1F8;} + .d2-2630294448 .stroke-N7{stroke:#FFFFFF;} + .d2-2630294448 .stroke-B1{stroke:#0D32B2;} + .d2-2630294448 .stroke-B2{stroke:#0D32B2;} + .d2-2630294448 .stroke-B3{stroke:#E3E9FD;} + .d2-2630294448 .stroke-B4{stroke:#E3E9FD;} + .d2-2630294448 .stroke-B5{stroke:#EDF0FD;} + .d2-2630294448 .stroke-B6{stroke:#F7F8FE;} + .d2-2630294448 .stroke-AA2{stroke:#4A6FF3;} + .d2-2630294448 .stroke-AA4{stroke:#EDF0FD;} + .d2-2630294448 .stroke-AA5{stroke:#F7F8FE;} + .d2-2630294448 .stroke-AB4{stroke:#EDF0FD;} + .d2-2630294448 .stroke-AB5{stroke:#F7F8FE;} + .d2-2630294448 .background-color-N1{background-color:#0A0F25;} + .d2-2630294448 .background-color-N2{background-color:#676C7E;} + .d2-2630294448 .background-color-N3{background-color:#9499AB;} + .d2-2630294448 .background-color-N4{background-color:#CFD2DD;} + .d2-2630294448 .background-color-N5{background-color:#DEE1EB;} + .d2-2630294448 .background-color-N6{background-color:#EEF1F8;} + .d2-2630294448 .background-color-N7{background-color:#FFFFFF;} + .d2-2630294448 .background-color-B1{background-color:#0D32B2;} + .d2-2630294448 .background-color-B2{background-color:#0D32B2;} + .d2-2630294448 .background-color-B3{background-color:#E3E9FD;} + .d2-2630294448 .background-color-B4{background-color:#E3E9FD;} + .d2-2630294448 .background-color-B5{background-color:#EDF0FD;} + .d2-2630294448 .background-color-B6{background-color:#F7F8FE;} + .d2-2630294448 .background-color-AA2{background-color:#4A6FF3;} + .d2-2630294448 .background-color-AA4{background-color:#EDF0FD;} + .d2-2630294448 .background-color-AA5{background-color:#F7F8FE;} + .d2-2630294448 .background-color-AB4{background-color:#EDF0FD;} + .d2-2630294448 .background-color-AB5{background-color:#F7F8FE;} + .d2-2630294448 .color-N1{color:#0A0F25;} + .d2-2630294448 .color-N2{color:#676C7E;} + .d2-2630294448 .color-N3{color:#9499AB;} + .d2-2630294448 .color-N4{color:#CFD2DD;} + .d2-2630294448 .color-N5{color:#DEE1EB;} + .d2-2630294448 .color-N6{color:#EEF1F8;} + .d2-2630294448 .color-N7{color:#FFFFFF;} + .d2-2630294448 .color-B1{color:#0D32B2;} + .d2-2630294448 .color-B2{color:#0D32B2;} + .d2-2630294448 .color-B3{color:#E3E9FD;} + .d2-2630294448 .color-B4{color:#E3E9FD;} + .d2-2630294448 .color-B5{color:#EDF0FD;} + .d2-2630294448 .color-B6{color:#F7F8FE;} + .d2-2630294448 .color-AA2{color:#4A6FF3;} + .d2-2630294448 .color-AA4{color:#EDF0FD;} + .d2-2630294448 .color-AA5{color:#F7F8FE;} + .d2-2630294448 .color-AB4{color:#EDF0FD;} + .d2-2630294448 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2630294448);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2630294448);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2630294448);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2630294448);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2630294448);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2630294448);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2630294448);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2630294448);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2630294448);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2630294448);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2630294448);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2630294448);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2630294448);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2630294448);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2630294448);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2630294448);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2630294448);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2630294448);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abjust an actorthis is a message groupaltand this is a nested message groupcase 1case 2case 3case 4what about more nestingcrazy townwhoa a notea note here to remember that padding must consider notes toojustalongnotehere - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/board.exp.json index 01de76e5d..b0335f033 100644 --- a/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "red", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "yellow", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -140,6 +151,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -180,6 +192,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -221,6 +234,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -261,6 +275,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -301,6 +316,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -342,6 +358,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -382,6 +399,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -422,6 +440,7 @@ "borderRadius": 0, "fill": "N6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -462,6 +481,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -503,6 +523,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -543,6 +564,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -583,6 +605,7 @@ "borderRadius": 0, "fill": "N6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -623,6 +646,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -663,6 +687,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -704,6 +729,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -744,6 +770,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -784,6 +811,7 @@ "borderRadius": 0, "fill": "N6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -824,6 +852,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -864,6 +893,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -904,6 +934,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -954,6 +985,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -992,6 +1024,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 228, @@ -1030,6 +1063,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 382, @@ -1068,6 +1102,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 539, @@ -1106,6 +1141,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 378, @@ -1144,6 +1180,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 696, @@ -1182,6 +1219,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -1220,6 +1258,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 814.5, @@ -1258,6 +1297,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -1296,6 +1336,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -1334,6 +1375,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 222, @@ -1372,6 +1414,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 372, @@ -1410,6 +1453,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 525, @@ -1448,6 +1492,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 678, @@ -1486,6 +1531,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 836.5, @@ -1517,6 +1563,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/sketch.exp.svg index d31c7a0b5..d573b93fc 100644 --- a/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -scoreritemResponseitemessayRubricconceptitemOutcome + .d2-3097415557 .fill-N1{fill:#0A0F25;} + .d2-3097415557 .fill-N2{fill:#676C7E;} + .d2-3097415557 .fill-N3{fill:#9499AB;} + .d2-3097415557 .fill-N4{fill:#CFD2DD;} + .d2-3097415557 .fill-N5{fill:#DEE1EB;} + .d2-3097415557 .fill-N6{fill:#EEF1F8;} + .d2-3097415557 .fill-N7{fill:#FFFFFF;} + .d2-3097415557 .fill-B1{fill:#0D32B2;} + .d2-3097415557 .fill-B2{fill:#0D32B2;} + .d2-3097415557 .fill-B3{fill:#E3E9FD;} + .d2-3097415557 .fill-B4{fill:#E3E9FD;} + .d2-3097415557 .fill-B5{fill:#EDF0FD;} + .d2-3097415557 .fill-B6{fill:#F7F8FE;} + .d2-3097415557 .fill-AA2{fill:#4A6FF3;} + .d2-3097415557 .fill-AA4{fill:#EDF0FD;} + .d2-3097415557 .fill-AA5{fill:#F7F8FE;} + .d2-3097415557 .fill-AB4{fill:#EDF0FD;} + .d2-3097415557 .fill-AB5{fill:#F7F8FE;} + .d2-3097415557 .stroke-N1{stroke:#0A0F25;} + .d2-3097415557 .stroke-N2{stroke:#676C7E;} + .d2-3097415557 .stroke-N3{stroke:#9499AB;} + .d2-3097415557 .stroke-N4{stroke:#CFD2DD;} + .d2-3097415557 .stroke-N5{stroke:#DEE1EB;} + .d2-3097415557 .stroke-N6{stroke:#EEF1F8;} + .d2-3097415557 .stroke-N7{stroke:#FFFFFF;} + .d2-3097415557 .stroke-B1{stroke:#0D32B2;} + .d2-3097415557 .stroke-B2{stroke:#0D32B2;} + .d2-3097415557 .stroke-B3{stroke:#E3E9FD;} + .d2-3097415557 .stroke-B4{stroke:#E3E9FD;} + .d2-3097415557 .stroke-B5{stroke:#EDF0FD;} + .d2-3097415557 .stroke-B6{stroke:#F7F8FE;} + .d2-3097415557 .stroke-AA2{stroke:#4A6FF3;} + .d2-3097415557 .stroke-AA4{stroke:#EDF0FD;} + .d2-3097415557 .stroke-AA5{stroke:#F7F8FE;} + .d2-3097415557 .stroke-AB4{stroke:#EDF0FD;} + .d2-3097415557 .stroke-AB5{stroke:#F7F8FE;} + .d2-3097415557 .background-color-N1{background-color:#0A0F25;} + .d2-3097415557 .background-color-N2{background-color:#676C7E;} + .d2-3097415557 .background-color-N3{background-color:#9499AB;} + .d2-3097415557 .background-color-N4{background-color:#CFD2DD;} + .d2-3097415557 .background-color-N5{background-color:#DEE1EB;} + .d2-3097415557 .background-color-N6{background-color:#EEF1F8;} + .d2-3097415557 .background-color-N7{background-color:#FFFFFF;} + .d2-3097415557 .background-color-B1{background-color:#0D32B2;} + .d2-3097415557 .background-color-B2{background-color:#0D32B2;} + .d2-3097415557 .background-color-B3{background-color:#E3E9FD;} + .d2-3097415557 .background-color-B4{background-color:#E3E9FD;} + .d2-3097415557 .background-color-B5{background-color:#EDF0FD;} + .d2-3097415557 .background-color-B6{background-color:#F7F8FE;} + .d2-3097415557 .background-color-AA2{background-color:#4A6FF3;} + .d2-3097415557 .background-color-AA4{background-color:#EDF0FD;} + .d2-3097415557 .background-color-AA5{background-color:#F7F8FE;} + .d2-3097415557 .background-color-AB4{background-color:#EDF0FD;} + .d2-3097415557 .background-color-AB5{background-color:#F7F8FE;} + .d2-3097415557 .color-N1{color:#0A0F25;} + .d2-3097415557 .color-N2{color:#676C7E;} + .d2-3097415557 .color-N3{color:#9499AB;} + .d2-3097415557 .color-N4{color:#CFD2DD;} + .d2-3097415557 .color-N5{color:#DEE1EB;} + .d2-3097415557 .color-N6{color:#EEF1F8;} + .d2-3097415557 .color-N7{color:#FFFFFF;} + .d2-3097415557 .color-B1{color:#0D32B2;} + .d2-3097415557 .color-B2{color:#0D32B2;} + .d2-3097415557 .color-B3{color:#E3E9FD;} + .d2-3097415557 .color-B4{color:#E3E9FD;} + .d2-3097415557 .color-B5{color:#EDF0FD;} + .d2-3097415557 .color-B6{color:#F7F8FE;} + .d2-3097415557 .color-AA2{color:#4A6FF3;} + .d2-3097415557 .color-AA4{color:#EDF0FD;} + .d2-3097415557 .color-AA5{color:#F7F8FE;} + .d2-3097415557 .color-AB4{color:#EDF0FD;} + .d2-3097415557 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3097415557);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3097415557);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3097415557);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3097415557);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3097415557);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3097415557);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3097415557);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3097415557);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3097415557);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3097415557);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3097415557);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3097415557);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3097415557);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3097415557);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3097415557);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3097415557);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3097415557);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3097415557);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>scoreritemResponseitemessayRubricconceptitemOutcome - - - - - - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_nested_span/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_nested_span/elk/board.exp.json index 01de76e5d..b0335f033 100644 --- a/e2etests/testdata/stable/sequence_diagram_nested_span/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_nested_span/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "red", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "yellow", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -140,6 +151,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -180,6 +192,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -221,6 +234,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -261,6 +275,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -301,6 +316,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -342,6 +358,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -382,6 +399,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -422,6 +440,7 @@ "borderRadius": 0, "fill": "N6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -462,6 +481,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -503,6 +523,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -543,6 +564,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -583,6 +605,7 @@ "borderRadius": 0, "fill": "N6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -623,6 +646,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -663,6 +687,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -704,6 +729,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -744,6 +770,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -784,6 +811,7 @@ "borderRadius": 0, "fill": "N6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -824,6 +852,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -864,6 +893,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -904,6 +934,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -954,6 +985,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -992,6 +1024,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 228, @@ -1030,6 +1063,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 382, @@ -1068,6 +1102,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 539, @@ -1106,6 +1141,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 378, @@ -1144,6 +1180,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 696, @@ -1182,6 +1219,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -1220,6 +1258,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 814.5, @@ -1258,6 +1297,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -1296,6 +1336,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -1334,6 +1375,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 222, @@ -1372,6 +1414,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 372, @@ -1410,6 +1453,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 525, @@ -1448,6 +1492,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 678, @@ -1486,6 +1531,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 836.5, @@ -1517,6 +1563,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/sequence_diagram_nested_span/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_nested_span/elk/sketch.exp.svg index d31c7a0b5..d573b93fc 100644 --- a/e2etests/testdata/stable/sequence_diagram_nested_span/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_nested_span/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -scoreritemResponseitemessayRubricconceptitemOutcome + .d2-3097415557 .fill-N1{fill:#0A0F25;} + .d2-3097415557 .fill-N2{fill:#676C7E;} + .d2-3097415557 .fill-N3{fill:#9499AB;} + .d2-3097415557 .fill-N4{fill:#CFD2DD;} + .d2-3097415557 .fill-N5{fill:#DEE1EB;} + .d2-3097415557 .fill-N6{fill:#EEF1F8;} + .d2-3097415557 .fill-N7{fill:#FFFFFF;} + .d2-3097415557 .fill-B1{fill:#0D32B2;} + .d2-3097415557 .fill-B2{fill:#0D32B2;} + .d2-3097415557 .fill-B3{fill:#E3E9FD;} + .d2-3097415557 .fill-B4{fill:#E3E9FD;} + .d2-3097415557 .fill-B5{fill:#EDF0FD;} + .d2-3097415557 .fill-B6{fill:#F7F8FE;} + .d2-3097415557 .fill-AA2{fill:#4A6FF3;} + .d2-3097415557 .fill-AA4{fill:#EDF0FD;} + .d2-3097415557 .fill-AA5{fill:#F7F8FE;} + .d2-3097415557 .fill-AB4{fill:#EDF0FD;} + .d2-3097415557 .fill-AB5{fill:#F7F8FE;} + .d2-3097415557 .stroke-N1{stroke:#0A0F25;} + .d2-3097415557 .stroke-N2{stroke:#676C7E;} + .d2-3097415557 .stroke-N3{stroke:#9499AB;} + .d2-3097415557 .stroke-N4{stroke:#CFD2DD;} + .d2-3097415557 .stroke-N5{stroke:#DEE1EB;} + .d2-3097415557 .stroke-N6{stroke:#EEF1F8;} + .d2-3097415557 .stroke-N7{stroke:#FFFFFF;} + .d2-3097415557 .stroke-B1{stroke:#0D32B2;} + .d2-3097415557 .stroke-B2{stroke:#0D32B2;} + .d2-3097415557 .stroke-B3{stroke:#E3E9FD;} + .d2-3097415557 .stroke-B4{stroke:#E3E9FD;} + .d2-3097415557 .stroke-B5{stroke:#EDF0FD;} + .d2-3097415557 .stroke-B6{stroke:#F7F8FE;} + .d2-3097415557 .stroke-AA2{stroke:#4A6FF3;} + .d2-3097415557 .stroke-AA4{stroke:#EDF0FD;} + .d2-3097415557 .stroke-AA5{stroke:#F7F8FE;} + .d2-3097415557 .stroke-AB4{stroke:#EDF0FD;} + .d2-3097415557 .stroke-AB5{stroke:#F7F8FE;} + .d2-3097415557 .background-color-N1{background-color:#0A0F25;} + .d2-3097415557 .background-color-N2{background-color:#676C7E;} + .d2-3097415557 .background-color-N3{background-color:#9499AB;} + .d2-3097415557 .background-color-N4{background-color:#CFD2DD;} + .d2-3097415557 .background-color-N5{background-color:#DEE1EB;} + .d2-3097415557 .background-color-N6{background-color:#EEF1F8;} + .d2-3097415557 .background-color-N7{background-color:#FFFFFF;} + .d2-3097415557 .background-color-B1{background-color:#0D32B2;} + .d2-3097415557 .background-color-B2{background-color:#0D32B2;} + .d2-3097415557 .background-color-B3{background-color:#E3E9FD;} + .d2-3097415557 .background-color-B4{background-color:#E3E9FD;} + .d2-3097415557 .background-color-B5{background-color:#EDF0FD;} + .d2-3097415557 .background-color-B6{background-color:#F7F8FE;} + .d2-3097415557 .background-color-AA2{background-color:#4A6FF3;} + .d2-3097415557 .background-color-AA4{background-color:#EDF0FD;} + .d2-3097415557 .background-color-AA5{background-color:#F7F8FE;} + .d2-3097415557 .background-color-AB4{background-color:#EDF0FD;} + .d2-3097415557 .background-color-AB5{background-color:#F7F8FE;} + .d2-3097415557 .color-N1{color:#0A0F25;} + .d2-3097415557 .color-N2{color:#676C7E;} + .d2-3097415557 .color-N3{color:#9499AB;} + .d2-3097415557 .color-N4{color:#CFD2DD;} + .d2-3097415557 .color-N5{color:#DEE1EB;} + .d2-3097415557 .color-N6{color:#EEF1F8;} + .d2-3097415557 .color-N7{color:#FFFFFF;} + .d2-3097415557 .color-B1{color:#0D32B2;} + .d2-3097415557 .color-B2{color:#0D32B2;} + .d2-3097415557 .color-B3{color:#E3E9FD;} + .d2-3097415557 .color-B4{color:#E3E9FD;} + .d2-3097415557 .color-B5{color:#EDF0FD;} + .d2-3097415557 .color-B6{color:#F7F8FE;} + .d2-3097415557 .color-AA2{color:#4A6FF3;} + .d2-3097415557 .color-AA4{color:#EDF0FD;} + .d2-3097415557 .color-AA5{color:#F7F8FE;} + .d2-3097415557 .color-AB4{color:#EDF0FD;} + .d2-3097415557 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3097415557);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3097415557);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3097415557);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3097415557);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3097415557);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3097415557);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3097415557);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3097415557);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3097415557);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3097415557);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3097415557);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3097415557);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3097415557);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3097415557);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3097415557);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3097415557);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3097415557);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3097415557);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>scoreritemResponseitemessayRubricconceptitemOutcome - - - - - - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_note/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_note/dagre/board.exp.json index 59218525e..a7ae4cc4b 100644 --- a/e2etests/testdata/stable/sequence_diagram_note/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_note/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -356,6 +372,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -394,6 +411,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 261, @@ -432,6 +450,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 460, @@ -470,6 +489,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -508,6 +528,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 261, @@ -546,6 +567,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 460, @@ -584,6 +606,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 610, @@ -615,6 +638,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/sequence_diagram_note/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_note/dagre/sketch.exp.svg index ddebdf832..eebbb6dd4 100644 --- a/e2etests/testdata/stable/sequence_diagram_note/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_note/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -abcd okayexplanationanother explanationSome one who believes imaginary things appear right before your i's.The earth is like a tiny grain of sand, only much, much heavier + .d2-2097074713 .fill-N1{fill:#0A0F25;} + .d2-2097074713 .fill-N2{fill:#676C7E;} + .d2-2097074713 .fill-N3{fill:#9499AB;} + .d2-2097074713 .fill-N4{fill:#CFD2DD;} + .d2-2097074713 .fill-N5{fill:#DEE1EB;} + .d2-2097074713 .fill-N6{fill:#EEF1F8;} + .d2-2097074713 .fill-N7{fill:#FFFFFF;} + .d2-2097074713 .fill-B1{fill:#0D32B2;} + .d2-2097074713 .fill-B2{fill:#0D32B2;} + .d2-2097074713 .fill-B3{fill:#E3E9FD;} + .d2-2097074713 .fill-B4{fill:#E3E9FD;} + .d2-2097074713 .fill-B5{fill:#EDF0FD;} + .d2-2097074713 .fill-B6{fill:#F7F8FE;} + .d2-2097074713 .fill-AA2{fill:#4A6FF3;} + .d2-2097074713 .fill-AA4{fill:#EDF0FD;} + .d2-2097074713 .fill-AA5{fill:#F7F8FE;} + .d2-2097074713 .fill-AB4{fill:#EDF0FD;} + .d2-2097074713 .fill-AB5{fill:#F7F8FE;} + .d2-2097074713 .stroke-N1{stroke:#0A0F25;} + .d2-2097074713 .stroke-N2{stroke:#676C7E;} + .d2-2097074713 .stroke-N3{stroke:#9499AB;} + .d2-2097074713 .stroke-N4{stroke:#CFD2DD;} + .d2-2097074713 .stroke-N5{stroke:#DEE1EB;} + .d2-2097074713 .stroke-N6{stroke:#EEF1F8;} + .d2-2097074713 .stroke-N7{stroke:#FFFFFF;} + .d2-2097074713 .stroke-B1{stroke:#0D32B2;} + .d2-2097074713 .stroke-B2{stroke:#0D32B2;} + .d2-2097074713 .stroke-B3{stroke:#E3E9FD;} + .d2-2097074713 .stroke-B4{stroke:#E3E9FD;} + .d2-2097074713 .stroke-B5{stroke:#EDF0FD;} + .d2-2097074713 .stroke-B6{stroke:#F7F8FE;} + .d2-2097074713 .stroke-AA2{stroke:#4A6FF3;} + .d2-2097074713 .stroke-AA4{stroke:#EDF0FD;} + .d2-2097074713 .stroke-AA5{stroke:#F7F8FE;} + .d2-2097074713 .stroke-AB4{stroke:#EDF0FD;} + .d2-2097074713 .stroke-AB5{stroke:#F7F8FE;} + .d2-2097074713 .background-color-N1{background-color:#0A0F25;} + .d2-2097074713 .background-color-N2{background-color:#676C7E;} + .d2-2097074713 .background-color-N3{background-color:#9499AB;} + .d2-2097074713 .background-color-N4{background-color:#CFD2DD;} + .d2-2097074713 .background-color-N5{background-color:#DEE1EB;} + .d2-2097074713 .background-color-N6{background-color:#EEF1F8;} + .d2-2097074713 .background-color-N7{background-color:#FFFFFF;} + .d2-2097074713 .background-color-B1{background-color:#0D32B2;} + .d2-2097074713 .background-color-B2{background-color:#0D32B2;} + .d2-2097074713 .background-color-B3{background-color:#E3E9FD;} + .d2-2097074713 .background-color-B4{background-color:#E3E9FD;} + .d2-2097074713 .background-color-B5{background-color:#EDF0FD;} + .d2-2097074713 .background-color-B6{background-color:#F7F8FE;} + .d2-2097074713 .background-color-AA2{background-color:#4A6FF3;} + .d2-2097074713 .background-color-AA4{background-color:#EDF0FD;} + .d2-2097074713 .background-color-AA5{background-color:#F7F8FE;} + .d2-2097074713 .background-color-AB4{background-color:#EDF0FD;} + .d2-2097074713 .background-color-AB5{background-color:#F7F8FE;} + .d2-2097074713 .color-N1{color:#0A0F25;} + .d2-2097074713 .color-N2{color:#676C7E;} + .d2-2097074713 .color-N3{color:#9499AB;} + .d2-2097074713 .color-N4{color:#CFD2DD;} + .d2-2097074713 .color-N5{color:#DEE1EB;} + .d2-2097074713 .color-N6{color:#EEF1F8;} + .d2-2097074713 .color-N7{color:#FFFFFF;} + .d2-2097074713 .color-B1{color:#0D32B2;} + .d2-2097074713 .color-B2{color:#0D32B2;} + .d2-2097074713 .color-B3{color:#E3E9FD;} + .d2-2097074713 .color-B4{color:#E3E9FD;} + .d2-2097074713 .color-B5{color:#EDF0FD;} + .d2-2097074713 .color-B6{color:#F7F8FE;} + .d2-2097074713 .color-AA2{color:#4A6FF3;} + .d2-2097074713 .color-AA4{color:#EDF0FD;} + .d2-2097074713 .color-AA5{color:#F7F8FE;} + .d2-2097074713 .color-AB4{color:#EDF0FD;} + .d2-2097074713 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2097074713);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2097074713);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2097074713);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2097074713);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2097074713);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2097074713);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2097074713);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2097074713);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2097074713);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2097074713);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2097074713);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2097074713);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2097074713);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2097074713);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2097074713);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2097074713);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2097074713);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2097074713);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcd okayexplanationanother explanationSome one who believes imaginary things appear right before your i's.The earth is like a tiny grain of sand, only much, much heavier - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_note/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_note/elk/board.exp.json index 59218525e..a7ae4cc4b 100644 --- a/e2etests/testdata/stable/sequence_diagram_note/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_note/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -356,6 +372,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -394,6 +411,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 261, @@ -432,6 +450,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 460, @@ -470,6 +489,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -508,6 +528,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 261, @@ -546,6 +567,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 460, @@ -584,6 +606,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 610, @@ -615,6 +638,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/sequence_diagram_note/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_note/elk/sketch.exp.svg index ddebdf832..eebbb6dd4 100644 --- a/e2etests/testdata/stable/sequence_diagram_note/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_note/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -abcd okayexplanationanother explanationSome one who believes imaginary things appear right before your i's.The earth is like a tiny grain of sand, only much, much heavier + .d2-2097074713 .fill-N1{fill:#0A0F25;} + .d2-2097074713 .fill-N2{fill:#676C7E;} + .d2-2097074713 .fill-N3{fill:#9499AB;} + .d2-2097074713 .fill-N4{fill:#CFD2DD;} + .d2-2097074713 .fill-N5{fill:#DEE1EB;} + .d2-2097074713 .fill-N6{fill:#EEF1F8;} + .d2-2097074713 .fill-N7{fill:#FFFFFF;} + .d2-2097074713 .fill-B1{fill:#0D32B2;} + .d2-2097074713 .fill-B2{fill:#0D32B2;} + .d2-2097074713 .fill-B3{fill:#E3E9FD;} + .d2-2097074713 .fill-B4{fill:#E3E9FD;} + .d2-2097074713 .fill-B5{fill:#EDF0FD;} + .d2-2097074713 .fill-B6{fill:#F7F8FE;} + .d2-2097074713 .fill-AA2{fill:#4A6FF3;} + .d2-2097074713 .fill-AA4{fill:#EDF0FD;} + .d2-2097074713 .fill-AA5{fill:#F7F8FE;} + .d2-2097074713 .fill-AB4{fill:#EDF0FD;} + .d2-2097074713 .fill-AB5{fill:#F7F8FE;} + .d2-2097074713 .stroke-N1{stroke:#0A0F25;} + .d2-2097074713 .stroke-N2{stroke:#676C7E;} + .d2-2097074713 .stroke-N3{stroke:#9499AB;} + .d2-2097074713 .stroke-N4{stroke:#CFD2DD;} + .d2-2097074713 .stroke-N5{stroke:#DEE1EB;} + .d2-2097074713 .stroke-N6{stroke:#EEF1F8;} + .d2-2097074713 .stroke-N7{stroke:#FFFFFF;} + .d2-2097074713 .stroke-B1{stroke:#0D32B2;} + .d2-2097074713 .stroke-B2{stroke:#0D32B2;} + .d2-2097074713 .stroke-B3{stroke:#E3E9FD;} + .d2-2097074713 .stroke-B4{stroke:#E3E9FD;} + .d2-2097074713 .stroke-B5{stroke:#EDF0FD;} + .d2-2097074713 .stroke-B6{stroke:#F7F8FE;} + .d2-2097074713 .stroke-AA2{stroke:#4A6FF3;} + .d2-2097074713 .stroke-AA4{stroke:#EDF0FD;} + .d2-2097074713 .stroke-AA5{stroke:#F7F8FE;} + .d2-2097074713 .stroke-AB4{stroke:#EDF0FD;} + .d2-2097074713 .stroke-AB5{stroke:#F7F8FE;} + .d2-2097074713 .background-color-N1{background-color:#0A0F25;} + .d2-2097074713 .background-color-N2{background-color:#676C7E;} + .d2-2097074713 .background-color-N3{background-color:#9499AB;} + .d2-2097074713 .background-color-N4{background-color:#CFD2DD;} + .d2-2097074713 .background-color-N5{background-color:#DEE1EB;} + .d2-2097074713 .background-color-N6{background-color:#EEF1F8;} + .d2-2097074713 .background-color-N7{background-color:#FFFFFF;} + .d2-2097074713 .background-color-B1{background-color:#0D32B2;} + .d2-2097074713 .background-color-B2{background-color:#0D32B2;} + .d2-2097074713 .background-color-B3{background-color:#E3E9FD;} + .d2-2097074713 .background-color-B4{background-color:#E3E9FD;} + .d2-2097074713 .background-color-B5{background-color:#EDF0FD;} + .d2-2097074713 .background-color-B6{background-color:#F7F8FE;} + .d2-2097074713 .background-color-AA2{background-color:#4A6FF3;} + .d2-2097074713 .background-color-AA4{background-color:#EDF0FD;} + .d2-2097074713 .background-color-AA5{background-color:#F7F8FE;} + .d2-2097074713 .background-color-AB4{background-color:#EDF0FD;} + .d2-2097074713 .background-color-AB5{background-color:#F7F8FE;} + .d2-2097074713 .color-N1{color:#0A0F25;} + .d2-2097074713 .color-N2{color:#676C7E;} + .d2-2097074713 .color-N3{color:#9499AB;} + .d2-2097074713 .color-N4{color:#CFD2DD;} + .d2-2097074713 .color-N5{color:#DEE1EB;} + .d2-2097074713 .color-N6{color:#EEF1F8;} + .d2-2097074713 .color-N7{color:#FFFFFF;} + .d2-2097074713 .color-B1{color:#0D32B2;} + .d2-2097074713 .color-B2{color:#0D32B2;} + .d2-2097074713 .color-B3{color:#E3E9FD;} + .d2-2097074713 .color-B4{color:#E3E9FD;} + .d2-2097074713 .color-B5{color:#EDF0FD;} + .d2-2097074713 .color-B6{color:#F7F8FE;} + .d2-2097074713 .color-AA2{color:#4A6FF3;} + .d2-2097074713 .color-AA4{color:#EDF0FD;} + .d2-2097074713 .color-AA5{color:#F7F8FE;} + .d2-2097074713 .color-AB4{color:#EDF0FD;} + .d2-2097074713 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2097074713);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2097074713);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2097074713);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2097074713);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2097074713);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2097074713);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2097074713);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2097074713);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2097074713);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2097074713);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2097074713);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2097074713);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2097074713);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2097074713);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2097074713);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2097074713);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2097074713);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2097074713);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcd okayexplanationanother explanationSome one who believes imaginary things appear right before your i's.The earth is like a tiny grain of sand, only much, much heavier - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_real/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_real/dagre/board.exp.json index ec3cc375e..a5f1de83d 100644 --- a/e2etests/testdata/stable/sequence_diagram_real/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_real/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -509,6 +529,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -601,6 +623,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -639,6 +662,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 289, @@ -677,6 +701,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -715,6 +740,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 453, @@ -753,6 +779,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -791,6 +818,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 622.5, @@ -829,6 +857,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 622.5, @@ -867,6 +896,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 622.5, @@ -905,6 +935,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 616.5, @@ -943,6 +974,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -981,6 +1013,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 783, @@ -1019,6 +1052,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 783, @@ -1057,6 +1091,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 771, @@ -1095,6 +1130,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -1133,6 +1169,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 289, @@ -1171,6 +1208,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 453, @@ -1209,6 +1247,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 616.5, @@ -1247,6 +1286,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 777, @@ -1285,6 +1325,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 944.5, @@ -1323,6 +1364,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1105.5, @@ -1361,6 +1403,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1290.5, @@ -1399,6 +1442,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1487, @@ -1430,6 +1474,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/sequence_diagram_real/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_real/dagre/sketch.exp.svg index 8da11e3b5..8cb05b7df 100644 --- a/e2etests/testdata/stable/sequence_diagram_real/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_real/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutonly if root is not sequence 'How this is rendered: {...}'tokenized ASTcompile ASTobjects and edgesrun layout enginesrun engine on shape: sequence_diagram, temporarily removerun core engine on rest add back in sequence diagramsdiagram with correct positions and dimensionsexport diagram with chosen theme and rendererget theme stylesrender to SVGresulting SVGmeasurements also take place + .d2-2641195439 .fill-N1{fill:#0A0F25;} + .d2-2641195439 .fill-N2{fill:#676C7E;} + .d2-2641195439 .fill-N3{fill:#9499AB;} + .d2-2641195439 .fill-N4{fill:#CFD2DD;} + .d2-2641195439 .fill-N5{fill:#DEE1EB;} + .d2-2641195439 .fill-N6{fill:#EEF1F8;} + .d2-2641195439 .fill-N7{fill:#FFFFFF;} + .d2-2641195439 .fill-B1{fill:#0D32B2;} + .d2-2641195439 .fill-B2{fill:#0D32B2;} + .d2-2641195439 .fill-B3{fill:#E3E9FD;} + .d2-2641195439 .fill-B4{fill:#E3E9FD;} + .d2-2641195439 .fill-B5{fill:#EDF0FD;} + .d2-2641195439 .fill-B6{fill:#F7F8FE;} + .d2-2641195439 .fill-AA2{fill:#4A6FF3;} + .d2-2641195439 .fill-AA4{fill:#EDF0FD;} + .d2-2641195439 .fill-AA5{fill:#F7F8FE;} + .d2-2641195439 .fill-AB4{fill:#EDF0FD;} + .d2-2641195439 .fill-AB5{fill:#F7F8FE;} + .d2-2641195439 .stroke-N1{stroke:#0A0F25;} + .d2-2641195439 .stroke-N2{stroke:#676C7E;} + .d2-2641195439 .stroke-N3{stroke:#9499AB;} + .d2-2641195439 .stroke-N4{stroke:#CFD2DD;} + .d2-2641195439 .stroke-N5{stroke:#DEE1EB;} + .d2-2641195439 .stroke-N6{stroke:#EEF1F8;} + .d2-2641195439 .stroke-N7{stroke:#FFFFFF;} + .d2-2641195439 .stroke-B1{stroke:#0D32B2;} + .d2-2641195439 .stroke-B2{stroke:#0D32B2;} + .d2-2641195439 .stroke-B3{stroke:#E3E9FD;} + .d2-2641195439 .stroke-B4{stroke:#E3E9FD;} + .d2-2641195439 .stroke-B5{stroke:#EDF0FD;} + .d2-2641195439 .stroke-B6{stroke:#F7F8FE;} + .d2-2641195439 .stroke-AA2{stroke:#4A6FF3;} + .d2-2641195439 .stroke-AA4{stroke:#EDF0FD;} + .d2-2641195439 .stroke-AA5{stroke:#F7F8FE;} + .d2-2641195439 .stroke-AB4{stroke:#EDF0FD;} + .d2-2641195439 .stroke-AB5{stroke:#F7F8FE;} + .d2-2641195439 .background-color-N1{background-color:#0A0F25;} + .d2-2641195439 .background-color-N2{background-color:#676C7E;} + .d2-2641195439 .background-color-N3{background-color:#9499AB;} + .d2-2641195439 .background-color-N4{background-color:#CFD2DD;} + .d2-2641195439 .background-color-N5{background-color:#DEE1EB;} + .d2-2641195439 .background-color-N6{background-color:#EEF1F8;} + .d2-2641195439 .background-color-N7{background-color:#FFFFFF;} + .d2-2641195439 .background-color-B1{background-color:#0D32B2;} + .d2-2641195439 .background-color-B2{background-color:#0D32B2;} + .d2-2641195439 .background-color-B3{background-color:#E3E9FD;} + .d2-2641195439 .background-color-B4{background-color:#E3E9FD;} + .d2-2641195439 .background-color-B5{background-color:#EDF0FD;} + .d2-2641195439 .background-color-B6{background-color:#F7F8FE;} + .d2-2641195439 .background-color-AA2{background-color:#4A6FF3;} + .d2-2641195439 .background-color-AA4{background-color:#EDF0FD;} + .d2-2641195439 .background-color-AA5{background-color:#F7F8FE;} + .d2-2641195439 .background-color-AB4{background-color:#EDF0FD;} + .d2-2641195439 .background-color-AB5{background-color:#F7F8FE;} + .d2-2641195439 .color-N1{color:#0A0F25;} + .d2-2641195439 .color-N2{color:#676C7E;} + .d2-2641195439 .color-N3{color:#9499AB;} + .d2-2641195439 .color-N4{color:#CFD2DD;} + .d2-2641195439 .color-N5{color:#DEE1EB;} + .d2-2641195439 .color-N6{color:#EEF1F8;} + .d2-2641195439 .color-N7{color:#FFFFFF;} + .d2-2641195439 .color-B1{color:#0D32B2;} + .d2-2641195439 .color-B2{color:#0D32B2;} + .d2-2641195439 .color-B3{color:#E3E9FD;} + .d2-2641195439 .color-B4{color:#E3E9FD;} + .d2-2641195439 .color-B5{color:#EDF0FD;} + .d2-2641195439 .color-B6{color:#F7F8FE;} + .d2-2641195439 .color-AA2{color:#4A6FF3;} + .d2-2641195439 .color-AA4{color:#EDF0FD;} + .d2-2641195439 .color-AA5{color:#F7F8FE;} + .d2-2641195439 .color-AB4{color:#EDF0FD;} + .d2-2641195439 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2641195439);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2641195439);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2641195439);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2641195439);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2641195439);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2641195439);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2641195439);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2641195439);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2641195439);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2641195439);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2641195439);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2641195439);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2641195439);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2641195439);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2641195439);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2641195439);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2641195439);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2641195439);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutonly if root is not sequence 'How this is rendered: {...}'tokenized ASTcompile ASTobjects and edgesrun layout enginesrun engine on shape: sequence_diagram, temporarily removerun core engine on rest add back in sequence diagramsdiagram with correct positions and dimensionsexport diagram with chosen theme and rendererget theme stylesrender to SVGresulting SVGmeasurements also take place - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_real/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_real/elk/board.exp.json index ea3d3d9eb..8ea5d300a 100644 --- a/e2etests/testdata/stable/sequence_diagram_real/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_real/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -509,6 +529,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -601,6 +623,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 74, @@ -639,6 +662,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 301, @@ -677,6 +701,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 74, @@ -715,6 +740,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 465, @@ -753,6 +779,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 74, @@ -791,6 +818,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 634.5, @@ -829,6 +857,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 634.5, @@ -867,6 +896,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 634.5, @@ -905,6 +935,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 628.5, @@ -943,6 +974,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 74, @@ -981,6 +1013,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 795, @@ -1019,6 +1052,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 795, @@ -1057,6 +1091,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 783, @@ -1095,6 +1130,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 74, @@ -1133,6 +1169,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 301, @@ -1171,6 +1208,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 465, @@ -1209,6 +1247,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 628.5, @@ -1247,6 +1286,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 789, @@ -1285,6 +1325,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 956.5, @@ -1323,6 +1364,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1117.5, @@ -1361,6 +1403,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1302.5, @@ -1399,6 +1442,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1499, @@ -1430,6 +1474,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg index 1f7ada525..eda6250ff 100644 --- a/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutonly if root is not sequence 'How this is rendered: {...}'tokenized ASTcompile ASTobjects and edgesrun layout enginesrun engine on shape: sequence_diagram, temporarily removerun core engine on rest add back in sequence diagramsdiagram with correct positions and dimensionsexport diagram with chosen theme and rendererget theme stylesrender to SVGresulting SVGmeasurements also take place + .d2-3370217372 .fill-N1{fill:#0A0F25;} + .d2-3370217372 .fill-N2{fill:#676C7E;} + .d2-3370217372 .fill-N3{fill:#9499AB;} + .d2-3370217372 .fill-N4{fill:#CFD2DD;} + .d2-3370217372 .fill-N5{fill:#DEE1EB;} + .d2-3370217372 .fill-N6{fill:#EEF1F8;} + .d2-3370217372 .fill-N7{fill:#FFFFFF;} + .d2-3370217372 .fill-B1{fill:#0D32B2;} + .d2-3370217372 .fill-B2{fill:#0D32B2;} + .d2-3370217372 .fill-B3{fill:#E3E9FD;} + .d2-3370217372 .fill-B4{fill:#E3E9FD;} + .d2-3370217372 .fill-B5{fill:#EDF0FD;} + .d2-3370217372 .fill-B6{fill:#F7F8FE;} + .d2-3370217372 .fill-AA2{fill:#4A6FF3;} + .d2-3370217372 .fill-AA4{fill:#EDF0FD;} + .d2-3370217372 .fill-AA5{fill:#F7F8FE;} + .d2-3370217372 .fill-AB4{fill:#EDF0FD;} + .d2-3370217372 .fill-AB5{fill:#F7F8FE;} + .d2-3370217372 .stroke-N1{stroke:#0A0F25;} + .d2-3370217372 .stroke-N2{stroke:#676C7E;} + .d2-3370217372 .stroke-N3{stroke:#9499AB;} + .d2-3370217372 .stroke-N4{stroke:#CFD2DD;} + .d2-3370217372 .stroke-N5{stroke:#DEE1EB;} + .d2-3370217372 .stroke-N6{stroke:#EEF1F8;} + .d2-3370217372 .stroke-N7{stroke:#FFFFFF;} + .d2-3370217372 .stroke-B1{stroke:#0D32B2;} + .d2-3370217372 .stroke-B2{stroke:#0D32B2;} + .d2-3370217372 .stroke-B3{stroke:#E3E9FD;} + .d2-3370217372 .stroke-B4{stroke:#E3E9FD;} + .d2-3370217372 .stroke-B5{stroke:#EDF0FD;} + .d2-3370217372 .stroke-B6{stroke:#F7F8FE;} + .d2-3370217372 .stroke-AA2{stroke:#4A6FF3;} + .d2-3370217372 .stroke-AA4{stroke:#EDF0FD;} + .d2-3370217372 .stroke-AA5{stroke:#F7F8FE;} + .d2-3370217372 .stroke-AB4{stroke:#EDF0FD;} + .d2-3370217372 .stroke-AB5{stroke:#F7F8FE;} + .d2-3370217372 .background-color-N1{background-color:#0A0F25;} + .d2-3370217372 .background-color-N2{background-color:#676C7E;} + .d2-3370217372 .background-color-N3{background-color:#9499AB;} + .d2-3370217372 .background-color-N4{background-color:#CFD2DD;} + .d2-3370217372 .background-color-N5{background-color:#DEE1EB;} + .d2-3370217372 .background-color-N6{background-color:#EEF1F8;} + .d2-3370217372 .background-color-N7{background-color:#FFFFFF;} + .d2-3370217372 .background-color-B1{background-color:#0D32B2;} + .d2-3370217372 .background-color-B2{background-color:#0D32B2;} + .d2-3370217372 .background-color-B3{background-color:#E3E9FD;} + .d2-3370217372 .background-color-B4{background-color:#E3E9FD;} + .d2-3370217372 .background-color-B5{background-color:#EDF0FD;} + .d2-3370217372 .background-color-B6{background-color:#F7F8FE;} + .d2-3370217372 .background-color-AA2{background-color:#4A6FF3;} + .d2-3370217372 .background-color-AA4{background-color:#EDF0FD;} + .d2-3370217372 .background-color-AA5{background-color:#F7F8FE;} + .d2-3370217372 .background-color-AB4{background-color:#EDF0FD;} + .d2-3370217372 .background-color-AB5{background-color:#F7F8FE;} + .d2-3370217372 .color-N1{color:#0A0F25;} + .d2-3370217372 .color-N2{color:#676C7E;} + .d2-3370217372 .color-N3{color:#9499AB;} + .d2-3370217372 .color-N4{color:#CFD2DD;} + .d2-3370217372 .color-N5{color:#DEE1EB;} + .d2-3370217372 .color-N6{color:#EEF1F8;} + .d2-3370217372 .color-N7{color:#FFFFFF;} + .d2-3370217372 .color-B1{color:#0D32B2;} + .d2-3370217372 .color-B2{color:#0D32B2;} + .d2-3370217372 .color-B3{color:#E3E9FD;} + .d2-3370217372 .color-B4{color:#E3E9FD;} + .d2-3370217372 .color-B5{color:#EDF0FD;} + .d2-3370217372 .color-B6{color:#F7F8FE;} + .d2-3370217372 .color-AA2{color:#4A6FF3;} + .d2-3370217372 .color-AA4{color:#EDF0FD;} + .d2-3370217372 .color-AA5{color:#F7F8FE;} + .d2-3370217372 .color-AB4{color:#EDF0FD;} + .d2-3370217372 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3370217372);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3370217372);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3370217372);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3370217372);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3370217372);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3370217372);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3370217372);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3370217372);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3370217372);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3370217372);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3370217372);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3370217372);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3370217372);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3370217372);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3370217372);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3370217372);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3370217372);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3370217372);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutonly if root is not sequence 'How this is rendered: {...}'tokenized ASTcompile ASTobjects and edgesrun layout enginesrun engine on shape: sequence_diagram, temporarily removerun core engine on rest add back in sequence diagramsdiagram with correct positions and dimensionsexport diagram with chosen theme and rendererget theme stylesrender to SVGresulting SVGmeasurements also take place - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/board.exp.json index 4f41f89eb..ce13e5e54 100644 --- a/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -140,6 +151,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -180,6 +192,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -220,6 +233,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -260,6 +274,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -310,6 +325,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -356,6 +372,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -394,6 +411,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 224, @@ -440,6 +458,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 230, @@ -486,6 +505,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 234, @@ -532,6 +552,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 224, @@ -570,6 +591,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -608,6 +630,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -646,6 +669,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 224, @@ -677,6 +701,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/sketch.exp.svg index f837426d6..92c3d8a9e 100644 --- a/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -ab a self edge herebetween actorsto descendantto deeper descendantto parentactor + .d2-2793058613 .fill-N1{fill:#0A0F25;} + .d2-2793058613 .fill-N2{fill:#676C7E;} + .d2-2793058613 .fill-N3{fill:#9499AB;} + .d2-2793058613 .fill-N4{fill:#CFD2DD;} + .d2-2793058613 .fill-N5{fill:#DEE1EB;} + .d2-2793058613 .fill-N6{fill:#EEF1F8;} + .d2-2793058613 .fill-N7{fill:#FFFFFF;} + .d2-2793058613 .fill-B1{fill:#0D32B2;} + .d2-2793058613 .fill-B2{fill:#0D32B2;} + .d2-2793058613 .fill-B3{fill:#E3E9FD;} + .d2-2793058613 .fill-B4{fill:#E3E9FD;} + .d2-2793058613 .fill-B5{fill:#EDF0FD;} + .d2-2793058613 .fill-B6{fill:#F7F8FE;} + .d2-2793058613 .fill-AA2{fill:#4A6FF3;} + .d2-2793058613 .fill-AA4{fill:#EDF0FD;} + .d2-2793058613 .fill-AA5{fill:#F7F8FE;} + .d2-2793058613 .fill-AB4{fill:#EDF0FD;} + .d2-2793058613 .fill-AB5{fill:#F7F8FE;} + .d2-2793058613 .stroke-N1{stroke:#0A0F25;} + .d2-2793058613 .stroke-N2{stroke:#676C7E;} + .d2-2793058613 .stroke-N3{stroke:#9499AB;} + .d2-2793058613 .stroke-N4{stroke:#CFD2DD;} + .d2-2793058613 .stroke-N5{stroke:#DEE1EB;} + .d2-2793058613 .stroke-N6{stroke:#EEF1F8;} + .d2-2793058613 .stroke-N7{stroke:#FFFFFF;} + .d2-2793058613 .stroke-B1{stroke:#0D32B2;} + .d2-2793058613 .stroke-B2{stroke:#0D32B2;} + .d2-2793058613 .stroke-B3{stroke:#E3E9FD;} + .d2-2793058613 .stroke-B4{stroke:#E3E9FD;} + .d2-2793058613 .stroke-B5{stroke:#EDF0FD;} + .d2-2793058613 .stroke-B6{stroke:#F7F8FE;} + .d2-2793058613 .stroke-AA2{stroke:#4A6FF3;} + .d2-2793058613 .stroke-AA4{stroke:#EDF0FD;} + .d2-2793058613 .stroke-AA5{stroke:#F7F8FE;} + .d2-2793058613 .stroke-AB4{stroke:#EDF0FD;} + .d2-2793058613 .stroke-AB5{stroke:#F7F8FE;} + .d2-2793058613 .background-color-N1{background-color:#0A0F25;} + .d2-2793058613 .background-color-N2{background-color:#676C7E;} + .d2-2793058613 .background-color-N3{background-color:#9499AB;} + .d2-2793058613 .background-color-N4{background-color:#CFD2DD;} + .d2-2793058613 .background-color-N5{background-color:#DEE1EB;} + .d2-2793058613 .background-color-N6{background-color:#EEF1F8;} + .d2-2793058613 .background-color-N7{background-color:#FFFFFF;} + .d2-2793058613 .background-color-B1{background-color:#0D32B2;} + .d2-2793058613 .background-color-B2{background-color:#0D32B2;} + .d2-2793058613 .background-color-B3{background-color:#E3E9FD;} + .d2-2793058613 .background-color-B4{background-color:#E3E9FD;} + .d2-2793058613 .background-color-B5{background-color:#EDF0FD;} + .d2-2793058613 .background-color-B6{background-color:#F7F8FE;} + .d2-2793058613 .background-color-AA2{background-color:#4A6FF3;} + .d2-2793058613 .background-color-AA4{background-color:#EDF0FD;} + .d2-2793058613 .background-color-AA5{background-color:#F7F8FE;} + .d2-2793058613 .background-color-AB4{background-color:#EDF0FD;} + .d2-2793058613 .background-color-AB5{background-color:#F7F8FE;} + .d2-2793058613 .color-N1{color:#0A0F25;} + .d2-2793058613 .color-N2{color:#676C7E;} + .d2-2793058613 .color-N3{color:#9499AB;} + .d2-2793058613 .color-N4{color:#CFD2DD;} + .d2-2793058613 .color-N5{color:#DEE1EB;} + .d2-2793058613 .color-N6{color:#EEF1F8;} + .d2-2793058613 .color-N7{color:#FFFFFF;} + .d2-2793058613 .color-B1{color:#0D32B2;} + .d2-2793058613 .color-B2{color:#0D32B2;} + .d2-2793058613 .color-B3{color:#E3E9FD;} + .d2-2793058613 .color-B4{color:#E3E9FD;} + .d2-2793058613 .color-B5{color:#EDF0FD;} + .d2-2793058613 .color-B6{color:#F7F8FE;} + .d2-2793058613 .color-AA2{color:#4A6FF3;} + .d2-2793058613 .color-AA4{color:#EDF0FD;} + .d2-2793058613 .color-AA5{color:#F7F8FE;} + .d2-2793058613 .color-AB4{color:#EDF0FD;} + .d2-2793058613 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2793058613);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2793058613);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2793058613);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2793058613);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2793058613);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2793058613);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2793058613);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2793058613);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2793058613);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2793058613);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2793058613);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2793058613);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2793058613);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2793058613);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2793058613);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2793058613);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2793058613);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2793058613);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ab a self edge herebetween actorsto descendantto deeper descendantto parentactor - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_self_edges/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_self_edges/elk/board.exp.json index 4f41f89eb..ce13e5e54 100644 --- a/e2etests/testdata/stable/sequence_diagram_self_edges/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_self_edges/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -140,6 +151,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -180,6 +192,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -220,6 +233,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -260,6 +274,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -310,6 +325,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -356,6 +372,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -394,6 +411,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 224, @@ -440,6 +458,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 230, @@ -486,6 +505,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 234, @@ -532,6 +552,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 224, @@ -570,6 +591,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -608,6 +630,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -646,6 +669,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 224, @@ -677,6 +701,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/sequence_diagram_self_edges/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_self_edges/elk/sketch.exp.svg index f837426d6..92c3d8a9e 100644 --- a/e2etests/testdata/stable/sequence_diagram_self_edges/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_self_edges/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -ab a self edge herebetween actorsto descendantto deeper descendantto parentactor + .d2-2793058613 .fill-N1{fill:#0A0F25;} + .d2-2793058613 .fill-N2{fill:#676C7E;} + .d2-2793058613 .fill-N3{fill:#9499AB;} + .d2-2793058613 .fill-N4{fill:#CFD2DD;} + .d2-2793058613 .fill-N5{fill:#DEE1EB;} + .d2-2793058613 .fill-N6{fill:#EEF1F8;} + .d2-2793058613 .fill-N7{fill:#FFFFFF;} + .d2-2793058613 .fill-B1{fill:#0D32B2;} + .d2-2793058613 .fill-B2{fill:#0D32B2;} + .d2-2793058613 .fill-B3{fill:#E3E9FD;} + .d2-2793058613 .fill-B4{fill:#E3E9FD;} + .d2-2793058613 .fill-B5{fill:#EDF0FD;} + .d2-2793058613 .fill-B6{fill:#F7F8FE;} + .d2-2793058613 .fill-AA2{fill:#4A6FF3;} + .d2-2793058613 .fill-AA4{fill:#EDF0FD;} + .d2-2793058613 .fill-AA5{fill:#F7F8FE;} + .d2-2793058613 .fill-AB4{fill:#EDF0FD;} + .d2-2793058613 .fill-AB5{fill:#F7F8FE;} + .d2-2793058613 .stroke-N1{stroke:#0A0F25;} + .d2-2793058613 .stroke-N2{stroke:#676C7E;} + .d2-2793058613 .stroke-N3{stroke:#9499AB;} + .d2-2793058613 .stroke-N4{stroke:#CFD2DD;} + .d2-2793058613 .stroke-N5{stroke:#DEE1EB;} + .d2-2793058613 .stroke-N6{stroke:#EEF1F8;} + .d2-2793058613 .stroke-N7{stroke:#FFFFFF;} + .d2-2793058613 .stroke-B1{stroke:#0D32B2;} + .d2-2793058613 .stroke-B2{stroke:#0D32B2;} + .d2-2793058613 .stroke-B3{stroke:#E3E9FD;} + .d2-2793058613 .stroke-B4{stroke:#E3E9FD;} + .d2-2793058613 .stroke-B5{stroke:#EDF0FD;} + .d2-2793058613 .stroke-B6{stroke:#F7F8FE;} + .d2-2793058613 .stroke-AA2{stroke:#4A6FF3;} + .d2-2793058613 .stroke-AA4{stroke:#EDF0FD;} + .d2-2793058613 .stroke-AA5{stroke:#F7F8FE;} + .d2-2793058613 .stroke-AB4{stroke:#EDF0FD;} + .d2-2793058613 .stroke-AB5{stroke:#F7F8FE;} + .d2-2793058613 .background-color-N1{background-color:#0A0F25;} + .d2-2793058613 .background-color-N2{background-color:#676C7E;} + .d2-2793058613 .background-color-N3{background-color:#9499AB;} + .d2-2793058613 .background-color-N4{background-color:#CFD2DD;} + .d2-2793058613 .background-color-N5{background-color:#DEE1EB;} + .d2-2793058613 .background-color-N6{background-color:#EEF1F8;} + .d2-2793058613 .background-color-N7{background-color:#FFFFFF;} + .d2-2793058613 .background-color-B1{background-color:#0D32B2;} + .d2-2793058613 .background-color-B2{background-color:#0D32B2;} + .d2-2793058613 .background-color-B3{background-color:#E3E9FD;} + .d2-2793058613 .background-color-B4{background-color:#E3E9FD;} + .d2-2793058613 .background-color-B5{background-color:#EDF0FD;} + .d2-2793058613 .background-color-B6{background-color:#F7F8FE;} + .d2-2793058613 .background-color-AA2{background-color:#4A6FF3;} + .d2-2793058613 .background-color-AA4{background-color:#EDF0FD;} + .d2-2793058613 .background-color-AA5{background-color:#F7F8FE;} + .d2-2793058613 .background-color-AB4{background-color:#EDF0FD;} + .d2-2793058613 .background-color-AB5{background-color:#F7F8FE;} + .d2-2793058613 .color-N1{color:#0A0F25;} + .d2-2793058613 .color-N2{color:#676C7E;} + .d2-2793058613 .color-N3{color:#9499AB;} + .d2-2793058613 .color-N4{color:#CFD2DD;} + .d2-2793058613 .color-N5{color:#DEE1EB;} + .d2-2793058613 .color-N6{color:#EEF1F8;} + .d2-2793058613 .color-N7{color:#FFFFFF;} + .d2-2793058613 .color-B1{color:#0D32B2;} + .d2-2793058613 .color-B2{color:#0D32B2;} + .d2-2793058613 .color-B3{color:#E3E9FD;} + .d2-2793058613 .color-B4{color:#E3E9FD;} + .d2-2793058613 .color-B5{color:#EDF0FD;} + .d2-2793058613 .color-B6{color:#F7F8FE;} + .d2-2793058613 .color-AA2{color:#4A6FF3;} + .d2-2793058613 .color-AA4{color:#EDF0FD;} + .d2-2793058613 .color-AA5{color:#F7F8FE;} + .d2-2793058613 .color-AB4{color:#EDF0FD;} + .d2-2793058613 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2793058613);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2793058613);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2793058613);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2793058613);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2793058613);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2793058613);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2793058613);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2793058613);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2793058613);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2793058613);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2793058613);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2793058613);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2793058613);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2793058613);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2793058613);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2793058613);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2793058613);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2793058613);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ab a self edge herebetween actorsto descendantto deeper descendantto parentactor - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_simple/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_simple/dagre/board.exp.json index 5f057e7b8..ea18c667b 100644 --- a/e2etests/testdata/stable/sequence_diagram_simple/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_simple/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "red", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -233,6 +246,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -271,6 +285,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 341, @@ -309,6 +324,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1322.5, @@ -347,6 +363,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 668, @@ -385,6 +402,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1322.5, @@ -423,6 +441,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 341, @@ -461,6 +480,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -499,6 +519,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 341, @@ -537,6 +558,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 995, @@ -575,6 +597,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 341, @@ -613,6 +636,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -651,6 +675,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 341, @@ -689,6 +714,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 668, @@ -727,6 +753,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 995, @@ -765,6 +792,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1322.5, @@ -796,6 +824,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/sequence_diagram_simple/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_simple/dagre/sketch.exp.svg index 46ab06d3d..3772789ba 100644 --- a/e2etests/testdata/stable/sequence_diagram_simple/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_simple/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -AlicelinebreakerBobdbqueueanoddservicewithanameinmultiple lines Authentication Requestmake request for something that is quite far away and requires a really long label to take all the space between the objectsvalidate credentials Authentication ResponseAnother authentication Requestdo it later storedAnother authentication Response + .d2-1868966526 .fill-N1{fill:#0A0F25;} + .d2-1868966526 .fill-N2{fill:#676C7E;} + .d2-1868966526 .fill-N3{fill:#9499AB;} + .d2-1868966526 .fill-N4{fill:#CFD2DD;} + .d2-1868966526 .fill-N5{fill:#DEE1EB;} + .d2-1868966526 .fill-N6{fill:#EEF1F8;} + .d2-1868966526 .fill-N7{fill:#FFFFFF;} + .d2-1868966526 .fill-B1{fill:#0D32B2;} + .d2-1868966526 .fill-B2{fill:#0D32B2;} + .d2-1868966526 .fill-B3{fill:#E3E9FD;} + .d2-1868966526 .fill-B4{fill:#E3E9FD;} + .d2-1868966526 .fill-B5{fill:#EDF0FD;} + .d2-1868966526 .fill-B6{fill:#F7F8FE;} + .d2-1868966526 .fill-AA2{fill:#4A6FF3;} + .d2-1868966526 .fill-AA4{fill:#EDF0FD;} + .d2-1868966526 .fill-AA5{fill:#F7F8FE;} + .d2-1868966526 .fill-AB4{fill:#EDF0FD;} + .d2-1868966526 .fill-AB5{fill:#F7F8FE;} + .d2-1868966526 .stroke-N1{stroke:#0A0F25;} + .d2-1868966526 .stroke-N2{stroke:#676C7E;} + .d2-1868966526 .stroke-N3{stroke:#9499AB;} + .d2-1868966526 .stroke-N4{stroke:#CFD2DD;} + .d2-1868966526 .stroke-N5{stroke:#DEE1EB;} + .d2-1868966526 .stroke-N6{stroke:#EEF1F8;} + .d2-1868966526 .stroke-N7{stroke:#FFFFFF;} + .d2-1868966526 .stroke-B1{stroke:#0D32B2;} + .d2-1868966526 .stroke-B2{stroke:#0D32B2;} + .d2-1868966526 .stroke-B3{stroke:#E3E9FD;} + .d2-1868966526 .stroke-B4{stroke:#E3E9FD;} + .d2-1868966526 .stroke-B5{stroke:#EDF0FD;} + .d2-1868966526 .stroke-B6{stroke:#F7F8FE;} + .d2-1868966526 .stroke-AA2{stroke:#4A6FF3;} + .d2-1868966526 .stroke-AA4{stroke:#EDF0FD;} + .d2-1868966526 .stroke-AA5{stroke:#F7F8FE;} + .d2-1868966526 .stroke-AB4{stroke:#EDF0FD;} + .d2-1868966526 .stroke-AB5{stroke:#F7F8FE;} + .d2-1868966526 .background-color-N1{background-color:#0A0F25;} + .d2-1868966526 .background-color-N2{background-color:#676C7E;} + .d2-1868966526 .background-color-N3{background-color:#9499AB;} + .d2-1868966526 .background-color-N4{background-color:#CFD2DD;} + .d2-1868966526 .background-color-N5{background-color:#DEE1EB;} + .d2-1868966526 .background-color-N6{background-color:#EEF1F8;} + .d2-1868966526 .background-color-N7{background-color:#FFFFFF;} + .d2-1868966526 .background-color-B1{background-color:#0D32B2;} + .d2-1868966526 .background-color-B2{background-color:#0D32B2;} + .d2-1868966526 .background-color-B3{background-color:#E3E9FD;} + .d2-1868966526 .background-color-B4{background-color:#E3E9FD;} + .d2-1868966526 .background-color-B5{background-color:#EDF0FD;} + .d2-1868966526 .background-color-B6{background-color:#F7F8FE;} + .d2-1868966526 .background-color-AA2{background-color:#4A6FF3;} + .d2-1868966526 .background-color-AA4{background-color:#EDF0FD;} + .d2-1868966526 .background-color-AA5{background-color:#F7F8FE;} + .d2-1868966526 .background-color-AB4{background-color:#EDF0FD;} + .d2-1868966526 .background-color-AB5{background-color:#F7F8FE;} + .d2-1868966526 .color-N1{color:#0A0F25;} + .d2-1868966526 .color-N2{color:#676C7E;} + .d2-1868966526 .color-N3{color:#9499AB;} + .d2-1868966526 .color-N4{color:#CFD2DD;} + .d2-1868966526 .color-N5{color:#DEE1EB;} + .d2-1868966526 .color-N6{color:#EEF1F8;} + .d2-1868966526 .color-N7{color:#FFFFFF;} + .d2-1868966526 .color-B1{color:#0D32B2;} + .d2-1868966526 .color-B2{color:#0D32B2;} + .d2-1868966526 .color-B3{color:#E3E9FD;} + .d2-1868966526 .color-B4{color:#E3E9FD;} + .d2-1868966526 .color-B5{color:#EDF0FD;} + .d2-1868966526 .color-B6{color:#F7F8FE;} + .d2-1868966526 .color-AA2{color:#4A6FF3;} + .d2-1868966526 .color-AA4{color:#EDF0FD;} + .d2-1868966526 .color-AA5{color:#F7F8FE;} + .d2-1868966526 .color-AB4{color:#EDF0FD;} + .d2-1868966526 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1868966526);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1868966526);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1868966526);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1868966526);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1868966526);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1868966526);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1868966526);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1868966526);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1868966526);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1868966526);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1868966526);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1868966526);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1868966526);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1868966526);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1868966526);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1868966526);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1868966526);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1868966526);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>AlicelinebreakerBobdbqueueanoddservicewithanameinmultiple lines Authentication Requestmake request for something that is quite far away and requires a really long label to take all the space between the objectsvalidate credentials Authentication ResponseAnother authentication Requestdo it later storedAnother authentication Response - - - - - - - - - - - - - + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_simple/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_simple/elk/board.exp.json index 5f057e7b8..ea18c667b 100644 --- a/e2etests/testdata/stable/sequence_diagram_simple/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_simple/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "red", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -233,6 +246,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -271,6 +285,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 341, @@ -309,6 +324,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1322.5, @@ -347,6 +363,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 668, @@ -385,6 +402,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1322.5, @@ -423,6 +441,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 341, @@ -461,6 +480,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -499,6 +519,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 341, @@ -537,6 +558,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 995, @@ -575,6 +597,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 341, @@ -613,6 +636,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -651,6 +675,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 341, @@ -689,6 +714,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 668, @@ -727,6 +753,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 995, @@ -765,6 +792,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1322.5, @@ -796,6 +824,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/sequence_diagram_simple/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_simple/elk/sketch.exp.svg index 46ab06d3d..3772789ba 100644 --- a/e2etests/testdata/stable/sequence_diagram_simple/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_simple/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -AlicelinebreakerBobdbqueueanoddservicewithanameinmultiple lines Authentication Requestmake request for something that is quite far away and requires a really long label to take all the space between the objectsvalidate credentials Authentication ResponseAnother authentication Requestdo it later storedAnother authentication Response + .d2-1868966526 .fill-N1{fill:#0A0F25;} + .d2-1868966526 .fill-N2{fill:#676C7E;} + .d2-1868966526 .fill-N3{fill:#9499AB;} + .d2-1868966526 .fill-N4{fill:#CFD2DD;} + .d2-1868966526 .fill-N5{fill:#DEE1EB;} + .d2-1868966526 .fill-N6{fill:#EEF1F8;} + .d2-1868966526 .fill-N7{fill:#FFFFFF;} + .d2-1868966526 .fill-B1{fill:#0D32B2;} + .d2-1868966526 .fill-B2{fill:#0D32B2;} + .d2-1868966526 .fill-B3{fill:#E3E9FD;} + .d2-1868966526 .fill-B4{fill:#E3E9FD;} + .d2-1868966526 .fill-B5{fill:#EDF0FD;} + .d2-1868966526 .fill-B6{fill:#F7F8FE;} + .d2-1868966526 .fill-AA2{fill:#4A6FF3;} + .d2-1868966526 .fill-AA4{fill:#EDF0FD;} + .d2-1868966526 .fill-AA5{fill:#F7F8FE;} + .d2-1868966526 .fill-AB4{fill:#EDF0FD;} + .d2-1868966526 .fill-AB5{fill:#F7F8FE;} + .d2-1868966526 .stroke-N1{stroke:#0A0F25;} + .d2-1868966526 .stroke-N2{stroke:#676C7E;} + .d2-1868966526 .stroke-N3{stroke:#9499AB;} + .d2-1868966526 .stroke-N4{stroke:#CFD2DD;} + .d2-1868966526 .stroke-N5{stroke:#DEE1EB;} + .d2-1868966526 .stroke-N6{stroke:#EEF1F8;} + .d2-1868966526 .stroke-N7{stroke:#FFFFFF;} + .d2-1868966526 .stroke-B1{stroke:#0D32B2;} + .d2-1868966526 .stroke-B2{stroke:#0D32B2;} + .d2-1868966526 .stroke-B3{stroke:#E3E9FD;} + .d2-1868966526 .stroke-B4{stroke:#E3E9FD;} + .d2-1868966526 .stroke-B5{stroke:#EDF0FD;} + .d2-1868966526 .stroke-B6{stroke:#F7F8FE;} + .d2-1868966526 .stroke-AA2{stroke:#4A6FF3;} + .d2-1868966526 .stroke-AA4{stroke:#EDF0FD;} + .d2-1868966526 .stroke-AA5{stroke:#F7F8FE;} + .d2-1868966526 .stroke-AB4{stroke:#EDF0FD;} + .d2-1868966526 .stroke-AB5{stroke:#F7F8FE;} + .d2-1868966526 .background-color-N1{background-color:#0A0F25;} + .d2-1868966526 .background-color-N2{background-color:#676C7E;} + .d2-1868966526 .background-color-N3{background-color:#9499AB;} + .d2-1868966526 .background-color-N4{background-color:#CFD2DD;} + .d2-1868966526 .background-color-N5{background-color:#DEE1EB;} + .d2-1868966526 .background-color-N6{background-color:#EEF1F8;} + .d2-1868966526 .background-color-N7{background-color:#FFFFFF;} + .d2-1868966526 .background-color-B1{background-color:#0D32B2;} + .d2-1868966526 .background-color-B2{background-color:#0D32B2;} + .d2-1868966526 .background-color-B3{background-color:#E3E9FD;} + .d2-1868966526 .background-color-B4{background-color:#E3E9FD;} + .d2-1868966526 .background-color-B5{background-color:#EDF0FD;} + .d2-1868966526 .background-color-B6{background-color:#F7F8FE;} + .d2-1868966526 .background-color-AA2{background-color:#4A6FF3;} + .d2-1868966526 .background-color-AA4{background-color:#EDF0FD;} + .d2-1868966526 .background-color-AA5{background-color:#F7F8FE;} + .d2-1868966526 .background-color-AB4{background-color:#EDF0FD;} + .d2-1868966526 .background-color-AB5{background-color:#F7F8FE;} + .d2-1868966526 .color-N1{color:#0A0F25;} + .d2-1868966526 .color-N2{color:#676C7E;} + .d2-1868966526 .color-N3{color:#9499AB;} + .d2-1868966526 .color-N4{color:#CFD2DD;} + .d2-1868966526 .color-N5{color:#DEE1EB;} + .d2-1868966526 .color-N6{color:#EEF1F8;} + .d2-1868966526 .color-N7{color:#FFFFFF;} + .d2-1868966526 .color-B1{color:#0D32B2;} + .d2-1868966526 .color-B2{color:#0D32B2;} + .d2-1868966526 .color-B3{color:#E3E9FD;} + .d2-1868966526 .color-B4{color:#E3E9FD;} + .d2-1868966526 .color-B5{color:#EDF0FD;} + .d2-1868966526 .color-B6{color:#F7F8FE;} + .d2-1868966526 .color-AA2{color:#4A6FF3;} + .d2-1868966526 .color-AA4{color:#EDF0FD;} + .d2-1868966526 .color-AA5{color:#F7F8FE;} + .d2-1868966526 .color-AB4{color:#EDF0FD;} + .d2-1868966526 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1868966526);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1868966526);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1868966526);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1868966526);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1868966526);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1868966526);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1868966526);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1868966526);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1868966526);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1868966526);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1868966526);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1868966526);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1868966526);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1868966526);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1868966526);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1868966526);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1868966526);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1868966526);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>AlicelinebreakerBobdbqueueanoddservicewithanameinmultiple lines Authentication Requestmake request for something that is quite far away and requires a really long label to take all the space between the objectsvalidate credentials Authentication ResponseAnother authentication Requestdo it later storedAnother authentication Response - - - - - - - - - - - - - + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_span/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagram_span/dagre/board.exp.json index 9d2501234..a954b3bb3 100644 --- a/e2etests/testdata/stable/sequence_diagram_span/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_span/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -140,6 +151,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -180,6 +192,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -221,6 +234,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -261,6 +275,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -302,6 +317,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -342,6 +358,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -382,6 +399,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -423,6 +441,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -463,6 +482,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -504,6 +524,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -544,6 +565,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -584,6 +606,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -624,6 +647,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -664,6 +688,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -714,6 +739,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -752,6 +778,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -790,6 +817,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -828,6 +856,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -866,6 +895,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -904,6 +934,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 222, @@ -942,6 +973,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 535, @@ -980,6 +1012,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -1018,6 +1051,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -1056,6 +1090,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -1094,6 +1129,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -1132,6 +1168,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -1170,6 +1207,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -1208,6 +1246,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -1246,6 +1285,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 222, @@ -1284,6 +1324,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 372, @@ -1322,6 +1363,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 525, @@ -1360,6 +1402,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 735, @@ -1398,6 +1441,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 893.5, @@ -1429,6 +1473,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/sequence_diagram_span/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_span/dagre/sketch.exp.svg index ff5f44f98..11886cc95 100644 --- a/e2etests/testdata/stable/sequence_diagram_span/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_span/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -scoreritemResponseitemessayRubricconceptitemOutcome getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) + .d2-3943405684 .fill-N1{fill:#0A0F25;} + .d2-3943405684 .fill-N2{fill:#676C7E;} + .d2-3943405684 .fill-N3{fill:#9499AB;} + .d2-3943405684 .fill-N4{fill:#CFD2DD;} + .d2-3943405684 .fill-N5{fill:#DEE1EB;} + .d2-3943405684 .fill-N6{fill:#EEF1F8;} + .d2-3943405684 .fill-N7{fill:#FFFFFF;} + .d2-3943405684 .fill-B1{fill:#0D32B2;} + .d2-3943405684 .fill-B2{fill:#0D32B2;} + .d2-3943405684 .fill-B3{fill:#E3E9FD;} + .d2-3943405684 .fill-B4{fill:#E3E9FD;} + .d2-3943405684 .fill-B5{fill:#EDF0FD;} + .d2-3943405684 .fill-B6{fill:#F7F8FE;} + .d2-3943405684 .fill-AA2{fill:#4A6FF3;} + .d2-3943405684 .fill-AA4{fill:#EDF0FD;} + .d2-3943405684 .fill-AA5{fill:#F7F8FE;} + .d2-3943405684 .fill-AB4{fill:#EDF0FD;} + .d2-3943405684 .fill-AB5{fill:#F7F8FE;} + .d2-3943405684 .stroke-N1{stroke:#0A0F25;} + .d2-3943405684 .stroke-N2{stroke:#676C7E;} + .d2-3943405684 .stroke-N3{stroke:#9499AB;} + .d2-3943405684 .stroke-N4{stroke:#CFD2DD;} + .d2-3943405684 .stroke-N5{stroke:#DEE1EB;} + .d2-3943405684 .stroke-N6{stroke:#EEF1F8;} + .d2-3943405684 .stroke-N7{stroke:#FFFFFF;} + .d2-3943405684 .stroke-B1{stroke:#0D32B2;} + .d2-3943405684 .stroke-B2{stroke:#0D32B2;} + .d2-3943405684 .stroke-B3{stroke:#E3E9FD;} + .d2-3943405684 .stroke-B4{stroke:#E3E9FD;} + .d2-3943405684 .stroke-B5{stroke:#EDF0FD;} + .d2-3943405684 .stroke-B6{stroke:#F7F8FE;} + .d2-3943405684 .stroke-AA2{stroke:#4A6FF3;} + .d2-3943405684 .stroke-AA4{stroke:#EDF0FD;} + .d2-3943405684 .stroke-AA5{stroke:#F7F8FE;} + .d2-3943405684 .stroke-AB4{stroke:#EDF0FD;} + .d2-3943405684 .stroke-AB5{stroke:#F7F8FE;} + .d2-3943405684 .background-color-N1{background-color:#0A0F25;} + .d2-3943405684 .background-color-N2{background-color:#676C7E;} + .d2-3943405684 .background-color-N3{background-color:#9499AB;} + .d2-3943405684 .background-color-N4{background-color:#CFD2DD;} + .d2-3943405684 .background-color-N5{background-color:#DEE1EB;} + .d2-3943405684 .background-color-N6{background-color:#EEF1F8;} + .d2-3943405684 .background-color-N7{background-color:#FFFFFF;} + .d2-3943405684 .background-color-B1{background-color:#0D32B2;} + .d2-3943405684 .background-color-B2{background-color:#0D32B2;} + .d2-3943405684 .background-color-B3{background-color:#E3E9FD;} + .d2-3943405684 .background-color-B4{background-color:#E3E9FD;} + .d2-3943405684 .background-color-B5{background-color:#EDF0FD;} + .d2-3943405684 .background-color-B6{background-color:#F7F8FE;} + .d2-3943405684 .background-color-AA2{background-color:#4A6FF3;} + .d2-3943405684 .background-color-AA4{background-color:#EDF0FD;} + .d2-3943405684 .background-color-AA5{background-color:#F7F8FE;} + .d2-3943405684 .background-color-AB4{background-color:#EDF0FD;} + .d2-3943405684 .background-color-AB5{background-color:#F7F8FE;} + .d2-3943405684 .color-N1{color:#0A0F25;} + .d2-3943405684 .color-N2{color:#676C7E;} + .d2-3943405684 .color-N3{color:#9499AB;} + .d2-3943405684 .color-N4{color:#CFD2DD;} + .d2-3943405684 .color-N5{color:#DEE1EB;} + .d2-3943405684 .color-N6{color:#EEF1F8;} + .d2-3943405684 .color-N7{color:#FFFFFF;} + .d2-3943405684 .color-B1{color:#0D32B2;} + .d2-3943405684 .color-B2{color:#0D32B2;} + .d2-3943405684 .color-B3{color:#E3E9FD;} + .d2-3943405684 .color-B4{color:#E3E9FD;} + .d2-3943405684 .color-B5{color:#EDF0FD;} + .d2-3943405684 .color-B6{color:#F7F8FE;} + .d2-3943405684 .color-AA2{color:#4A6FF3;} + .d2-3943405684 .color-AA4{color:#EDF0FD;} + .d2-3943405684 .color-AA5{color:#F7F8FE;} + .d2-3943405684 .color-AB4{color:#EDF0FD;} + .d2-3943405684 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3943405684);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3943405684);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3943405684);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3943405684);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3943405684);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3943405684);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3943405684);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3943405684);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3943405684);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3943405684);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3943405684);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3943405684);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3943405684);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3943405684);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3943405684);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3943405684);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3943405684);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3943405684);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>scoreritemResponseitemessayRubricconceptitemOutcome getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_span/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagram_span/elk/board.exp.json index 9d2501234..a954b3bb3 100644 --- a/e2etests/testdata/stable/sequence_diagram_span/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagram_span/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -140,6 +151,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -180,6 +192,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -221,6 +234,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -261,6 +275,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -302,6 +317,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -342,6 +358,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -382,6 +399,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -423,6 +441,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -463,6 +482,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -504,6 +524,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -544,6 +565,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -584,6 +606,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -624,6 +647,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -664,6 +688,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -714,6 +739,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -752,6 +778,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -790,6 +817,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -828,6 +856,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -866,6 +895,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -904,6 +934,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 222, @@ -942,6 +973,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 535, @@ -980,6 +1012,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -1018,6 +1051,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -1056,6 +1090,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -1094,6 +1129,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -1132,6 +1168,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -1170,6 +1207,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -1208,6 +1246,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -1246,6 +1285,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 222, @@ -1284,6 +1324,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 372, @@ -1322,6 +1363,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 525, @@ -1360,6 +1402,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 735, @@ -1398,6 +1441,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 893.5, @@ -1429,6 +1473,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/sequence_diagram_span/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_span/elk/sketch.exp.svg index ff5f44f98..11886cc95 100644 --- a/e2etests/testdata/stable/sequence_diagram_span/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_span/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -scoreritemResponseitemessayRubricconceptitemOutcome getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) + .d2-3943405684 .fill-N1{fill:#0A0F25;} + .d2-3943405684 .fill-N2{fill:#676C7E;} + .d2-3943405684 .fill-N3{fill:#9499AB;} + .d2-3943405684 .fill-N4{fill:#CFD2DD;} + .d2-3943405684 .fill-N5{fill:#DEE1EB;} + .d2-3943405684 .fill-N6{fill:#EEF1F8;} + .d2-3943405684 .fill-N7{fill:#FFFFFF;} + .d2-3943405684 .fill-B1{fill:#0D32B2;} + .d2-3943405684 .fill-B2{fill:#0D32B2;} + .d2-3943405684 .fill-B3{fill:#E3E9FD;} + .d2-3943405684 .fill-B4{fill:#E3E9FD;} + .d2-3943405684 .fill-B5{fill:#EDF0FD;} + .d2-3943405684 .fill-B6{fill:#F7F8FE;} + .d2-3943405684 .fill-AA2{fill:#4A6FF3;} + .d2-3943405684 .fill-AA4{fill:#EDF0FD;} + .d2-3943405684 .fill-AA5{fill:#F7F8FE;} + .d2-3943405684 .fill-AB4{fill:#EDF0FD;} + .d2-3943405684 .fill-AB5{fill:#F7F8FE;} + .d2-3943405684 .stroke-N1{stroke:#0A0F25;} + .d2-3943405684 .stroke-N2{stroke:#676C7E;} + .d2-3943405684 .stroke-N3{stroke:#9499AB;} + .d2-3943405684 .stroke-N4{stroke:#CFD2DD;} + .d2-3943405684 .stroke-N5{stroke:#DEE1EB;} + .d2-3943405684 .stroke-N6{stroke:#EEF1F8;} + .d2-3943405684 .stroke-N7{stroke:#FFFFFF;} + .d2-3943405684 .stroke-B1{stroke:#0D32B2;} + .d2-3943405684 .stroke-B2{stroke:#0D32B2;} + .d2-3943405684 .stroke-B3{stroke:#E3E9FD;} + .d2-3943405684 .stroke-B4{stroke:#E3E9FD;} + .d2-3943405684 .stroke-B5{stroke:#EDF0FD;} + .d2-3943405684 .stroke-B6{stroke:#F7F8FE;} + .d2-3943405684 .stroke-AA2{stroke:#4A6FF3;} + .d2-3943405684 .stroke-AA4{stroke:#EDF0FD;} + .d2-3943405684 .stroke-AA5{stroke:#F7F8FE;} + .d2-3943405684 .stroke-AB4{stroke:#EDF0FD;} + .d2-3943405684 .stroke-AB5{stroke:#F7F8FE;} + .d2-3943405684 .background-color-N1{background-color:#0A0F25;} + .d2-3943405684 .background-color-N2{background-color:#676C7E;} + .d2-3943405684 .background-color-N3{background-color:#9499AB;} + .d2-3943405684 .background-color-N4{background-color:#CFD2DD;} + .d2-3943405684 .background-color-N5{background-color:#DEE1EB;} + .d2-3943405684 .background-color-N6{background-color:#EEF1F8;} + .d2-3943405684 .background-color-N7{background-color:#FFFFFF;} + .d2-3943405684 .background-color-B1{background-color:#0D32B2;} + .d2-3943405684 .background-color-B2{background-color:#0D32B2;} + .d2-3943405684 .background-color-B3{background-color:#E3E9FD;} + .d2-3943405684 .background-color-B4{background-color:#E3E9FD;} + .d2-3943405684 .background-color-B5{background-color:#EDF0FD;} + .d2-3943405684 .background-color-B6{background-color:#F7F8FE;} + .d2-3943405684 .background-color-AA2{background-color:#4A6FF3;} + .d2-3943405684 .background-color-AA4{background-color:#EDF0FD;} + .d2-3943405684 .background-color-AA5{background-color:#F7F8FE;} + .d2-3943405684 .background-color-AB4{background-color:#EDF0FD;} + .d2-3943405684 .background-color-AB5{background-color:#F7F8FE;} + .d2-3943405684 .color-N1{color:#0A0F25;} + .d2-3943405684 .color-N2{color:#676C7E;} + .d2-3943405684 .color-N3{color:#9499AB;} + .d2-3943405684 .color-N4{color:#CFD2DD;} + .d2-3943405684 .color-N5{color:#DEE1EB;} + .d2-3943405684 .color-N6{color:#EEF1F8;} + .d2-3943405684 .color-N7{color:#FFFFFF;} + .d2-3943405684 .color-B1{color:#0D32B2;} + .d2-3943405684 .color-B2{color:#0D32B2;} + .d2-3943405684 .color-B3{color:#E3E9FD;} + .d2-3943405684 .color-B4{color:#E3E9FD;} + .d2-3943405684 .color-B5{color:#EDF0FD;} + .d2-3943405684 .color-B6{color:#F7F8FE;} + .d2-3943405684 .color-AA2{color:#4A6FF3;} + .d2-3943405684 .color-AA4{color:#EDF0FD;} + .d2-3943405684 .color-AA5{color:#F7F8FE;} + .d2-3943405684 .color-AB4{color:#EDF0FD;} + .d2-3943405684 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3943405684);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3943405684);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3943405684);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3943405684);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3943405684);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3943405684);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3943405684);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3943405684);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3943405684);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3943405684);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3943405684);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3943405684);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3943405684);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3943405684);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3943405684);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3943405684);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3943405684);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3943405684);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>scoreritemResponseitemessayRubricconceptitemOutcome getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json b/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json index aa1bdaf76..57cc81e10 100644 --- a/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagrams/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -181,6 +193,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -222,6 +235,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -262,6 +276,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -303,6 +318,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -343,6 +359,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -384,6 +401,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -424,6 +442,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -464,6 +483,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -505,6 +525,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -545,6 +566,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -586,6 +608,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -626,6 +649,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -666,6 +690,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -706,6 +731,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -746,6 +772,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -786,6 +813,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -827,6 +855,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -868,6 +897,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -909,6 +939,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -949,6 +980,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -990,6 +1022,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1030,6 +1063,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1071,6 +1105,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1111,6 +1146,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1152,6 +1188,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1192,6 +1229,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1232,6 +1270,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1273,6 +1312,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1313,6 +1353,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1354,6 +1395,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1394,6 +1436,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1434,6 +1477,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1474,6 +1518,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1514,6 +1559,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1554,6 +1600,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1595,6 +1642,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1636,6 +1684,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1677,6 +1726,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "red", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1718,6 +1768,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1759,6 +1810,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1800,6 +1852,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1841,6 +1894,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1882,6 +1936,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1923,6 +1978,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1963,6 +2019,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2003,6 +2060,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2043,6 +2101,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2083,6 +2142,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2123,6 +2183,7 @@ "borderRadius": 0, "fill": "N6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2163,6 +2224,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2203,6 +2265,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2243,6 +2306,7 @@ "borderRadius": 0, "fill": "N6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2283,6 +2347,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2323,6 +2388,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2363,6 +2429,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2403,6 +2470,7 @@ "borderRadius": 0, "fill": "N6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2443,6 +2511,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2483,6 +2552,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2523,6 +2593,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2563,6 +2634,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2613,6 +2685,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -2651,6 +2724,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -2689,6 +2763,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -2727,6 +2802,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -2765,6 +2841,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -2803,6 +2880,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 222, @@ -2841,6 +2919,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 535, @@ -2879,6 +2958,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -2917,6 +2997,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -2955,6 +3036,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -2993,6 +3075,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -3031,6 +3114,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -3069,6 +3153,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -3107,6 +3192,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1122, @@ -3145,6 +3231,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1122, @@ -3183,6 +3270,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1122, @@ -3221,6 +3309,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1122, @@ -3259,6 +3348,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1122, @@ -3297,6 +3387,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1276, @@ -3335,6 +3426,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1589, @@ -3373,6 +3465,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1116, @@ -3411,6 +3504,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1122, @@ -3449,6 +3543,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1122, @@ -3487,6 +3582,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1122, @@ -3525,6 +3621,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1122, @@ -3563,6 +3660,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1122, @@ -3601,6 +3699,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1476, @@ -3648,6 +3747,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1541, @@ -3695,6 +3795,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 487, @@ -3754,6 +3855,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1541, @@ -3813,6 +3915,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1606, @@ -3896,6 +3999,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2194, @@ -3934,6 +4038,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1853, @@ -3972,6 +4077,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1699, @@ -4010,6 +4116,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1857, @@ -4048,6 +4155,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1578, @@ -4086,6 +4194,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1416, @@ -4124,6 +4233,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1999.5, @@ -4162,6 +4272,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1410, @@ -4200,6 +4311,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -4238,6 +4350,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 222, @@ -4276,6 +4389,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 372, @@ -4314,6 +4428,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 525, @@ -4352,6 +4467,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 735, @@ -4390,6 +4506,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 893.5, @@ -4428,6 +4545,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1116, @@ -4466,6 +4584,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1276, @@ -4504,6 +4623,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1426, @@ -4542,6 +4662,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1579, @@ -4580,6 +4701,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1789, @@ -4618,6 +4740,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1947.5, @@ -4656,6 +4779,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1410, @@ -4694,6 +4818,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1560, @@ -4732,6 +4857,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1713, @@ -4770,6 +4896,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1863, @@ -4808,6 +4935,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2021.5, @@ -4846,6 +4974,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2200, @@ -4877,6 +5006,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg index 9789f2ffd..724ffa309 100644 --- a/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -a_shapea_sequenceanothersequencefinallyscoreritemResponseitemessayRubricconceptitemOutcomesequencesequencescoreritemResponseitemessayRubricconceptitemOutcomescorerconceptessayRubricitemitemOutcomeitemResponse getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts)getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) + .d2-737998601 .fill-N1{fill:#0A0F25;} + .d2-737998601 .fill-N2{fill:#676C7E;} + .d2-737998601 .fill-N3{fill:#9499AB;} + .d2-737998601 .fill-N4{fill:#CFD2DD;} + .d2-737998601 .fill-N5{fill:#DEE1EB;} + .d2-737998601 .fill-N6{fill:#EEF1F8;} + .d2-737998601 .fill-N7{fill:#FFFFFF;} + .d2-737998601 .fill-B1{fill:#0D32B2;} + .d2-737998601 .fill-B2{fill:#0D32B2;} + .d2-737998601 .fill-B3{fill:#E3E9FD;} + .d2-737998601 .fill-B4{fill:#E3E9FD;} + .d2-737998601 .fill-B5{fill:#EDF0FD;} + .d2-737998601 .fill-B6{fill:#F7F8FE;} + .d2-737998601 .fill-AA2{fill:#4A6FF3;} + .d2-737998601 .fill-AA4{fill:#EDF0FD;} + .d2-737998601 .fill-AA5{fill:#F7F8FE;} + .d2-737998601 .fill-AB4{fill:#EDF0FD;} + .d2-737998601 .fill-AB5{fill:#F7F8FE;} + .d2-737998601 .stroke-N1{stroke:#0A0F25;} + .d2-737998601 .stroke-N2{stroke:#676C7E;} + .d2-737998601 .stroke-N3{stroke:#9499AB;} + .d2-737998601 .stroke-N4{stroke:#CFD2DD;} + .d2-737998601 .stroke-N5{stroke:#DEE1EB;} + .d2-737998601 .stroke-N6{stroke:#EEF1F8;} + .d2-737998601 .stroke-N7{stroke:#FFFFFF;} + .d2-737998601 .stroke-B1{stroke:#0D32B2;} + .d2-737998601 .stroke-B2{stroke:#0D32B2;} + .d2-737998601 .stroke-B3{stroke:#E3E9FD;} + .d2-737998601 .stroke-B4{stroke:#E3E9FD;} + .d2-737998601 .stroke-B5{stroke:#EDF0FD;} + .d2-737998601 .stroke-B6{stroke:#F7F8FE;} + .d2-737998601 .stroke-AA2{stroke:#4A6FF3;} + .d2-737998601 .stroke-AA4{stroke:#EDF0FD;} + .d2-737998601 .stroke-AA5{stroke:#F7F8FE;} + .d2-737998601 .stroke-AB4{stroke:#EDF0FD;} + .d2-737998601 .stroke-AB5{stroke:#F7F8FE;} + .d2-737998601 .background-color-N1{background-color:#0A0F25;} + .d2-737998601 .background-color-N2{background-color:#676C7E;} + .d2-737998601 .background-color-N3{background-color:#9499AB;} + .d2-737998601 .background-color-N4{background-color:#CFD2DD;} + .d2-737998601 .background-color-N5{background-color:#DEE1EB;} + .d2-737998601 .background-color-N6{background-color:#EEF1F8;} + .d2-737998601 .background-color-N7{background-color:#FFFFFF;} + .d2-737998601 .background-color-B1{background-color:#0D32B2;} + .d2-737998601 .background-color-B2{background-color:#0D32B2;} + .d2-737998601 .background-color-B3{background-color:#E3E9FD;} + .d2-737998601 .background-color-B4{background-color:#E3E9FD;} + .d2-737998601 .background-color-B5{background-color:#EDF0FD;} + .d2-737998601 .background-color-B6{background-color:#F7F8FE;} + .d2-737998601 .background-color-AA2{background-color:#4A6FF3;} + .d2-737998601 .background-color-AA4{background-color:#EDF0FD;} + .d2-737998601 .background-color-AA5{background-color:#F7F8FE;} + .d2-737998601 .background-color-AB4{background-color:#EDF0FD;} + .d2-737998601 .background-color-AB5{background-color:#F7F8FE;} + .d2-737998601 .color-N1{color:#0A0F25;} + .d2-737998601 .color-N2{color:#676C7E;} + .d2-737998601 .color-N3{color:#9499AB;} + .d2-737998601 .color-N4{color:#CFD2DD;} + .d2-737998601 .color-N5{color:#DEE1EB;} + .d2-737998601 .color-N6{color:#EEF1F8;} + .d2-737998601 .color-N7{color:#FFFFFF;} + .d2-737998601 .color-B1{color:#0D32B2;} + .d2-737998601 .color-B2{color:#0D32B2;} + .d2-737998601 .color-B3{color:#E3E9FD;} + .d2-737998601 .color-B4{color:#E3E9FD;} + .d2-737998601 .color-B5{color:#EDF0FD;} + .d2-737998601 .color-B6{color:#F7F8FE;} + .d2-737998601 .color-AA2{color:#4A6FF3;} + .d2-737998601 .color-AA4{color:#EDF0FD;} + .d2-737998601 .color-AA5{color:#F7F8FE;} + .d2-737998601 .color-AB4{color:#EDF0FD;} + .d2-737998601 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-737998601);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-737998601);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-737998601);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-737998601);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-737998601);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-737998601);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-737998601);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-737998601);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-737998601);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-737998601);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-737998601);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-737998601);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-737998601);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-737998601);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-737998601);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-737998601);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-737998601);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-737998601);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>a_shapea_sequenceanothersequencefinallyscoreritemResponseitemessayRubricconceptitemOutcomesequencesequencescoreritemResponseitemessayRubricconceptitemOutcomescorerconceptessayRubricitemitemOutcomeitemResponse getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts)getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json b/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json index 08adb7803..22e49394c 100644 --- a/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json +++ b/e2etests/testdata/stable/sequence_diagrams/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -181,6 +193,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -222,6 +235,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -262,6 +276,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -303,6 +318,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -343,6 +359,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -384,6 +401,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -424,6 +442,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -464,6 +483,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -505,6 +525,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -545,6 +566,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -586,6 +608,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -626,6 +649,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -666,6 +690,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -706,6 +731,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -746,6 +772,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -786,6 +813,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -827,6 +855,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -868,6 +897,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -909,6 +939,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -949,6 +980,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -990,6 +1022,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1030,6 +1063,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1071,6 +1105,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1111,6 +1146,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1152,6 +1188,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1192,6 +1229,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1232,6 +1270,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1273,6 +1312,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1313,6 +1353,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1354,6 +1395,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1394,6 +1436,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1434,6 +1477,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1474,6 +1518,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1514,6 +1559,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1554,6 +1600,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1595,6 +1642,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1636,6 +1684,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1677,6 +1726,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "red", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1718,6 +1768,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1759,6 +1810,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1800,6 +1852,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1841,6 +1894,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1882,6 +1936,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1923,6 +1978,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1963,6 +2019,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2003,6 +2060,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2043,6 +2101,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2083,6 +2142,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2123,6 +2183,7 @@ "borderRadius": 0, "fill": "N6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2163,6 +2224,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2203,6 +2265,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2243,6 +2306,7 @@ "borderRadius": 0, "fill": "N6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2283,6 +2347,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2323,6 +2388,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2363,6 +2429,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2403,6 +2470,7 @@ "borderRadius": 0, "fill": "N6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2443,6 +2511,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2483,6 +2552,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2523,6 +2593,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2563,6 +2634,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2613,6 +2685,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 80, @@ -2651,6 +2724,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 80, @@ -2689,6 +2763,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 80, @@ -2727,6 +2802,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 80, @@ -2765,6 +2841,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 80, @@ -2803,6 +2880,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 234, @@ -2841,6 +2919,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 547, @@ -2879,6 +2958,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 74, @@ -2917,6 +2997,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 80, @@ -2955,6 +3036,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 80, @@ -2993,6 +3075,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 80, @@ -3031,6 +3114,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 80, @@ -3069,6 +3153,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 80, @@ -3107,6 +3192,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1124, @@ -3145,6 +3231,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1124, @@ -3183,6 +3270,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1124, @@ -3221,6 +3309,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1124, @@ -3259,6 +3348,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1124, @@ -3297,6 +3387,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1278, @@ -3335,6 +3426,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1591, @@ -3373,6 +3465,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1118, @@ -3411,6 +3504,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1124, @@ -3449,6 +3543,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1124, @@ -3487,6 +3582,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1124, @@ -3525,6 +3621,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1124, @@ -3563,6 +3660,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1124, @@ -3601,6 +3699,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1510, @@ -3647,6 +3746,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1543, @@ -3685,6 +3785,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 499, @@ -3723,6 +3824,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1826.5, @@ -3761,6 +3863,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1576, @@ -3807,6 +3910,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2205.5, @@ -3845,6 +3949,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1864.5, @@ -3883,6 +3988,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1710.5, @@ -3921,6 +4027,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1868.5, @@ -3959,6 +4066,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1589.5, @@ -3997,6 +4105,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1427.5, @@ -4035,6 +4144,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2011, @@ -4073,6 +4183,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1421.5, @@ -4111,6 +4222,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 74, @@ -4149,6 +4261,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 234, @@ -4187,6 +4300,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 384, @@ -4225,6 +4339,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 537, @@ -4263,6 +4378,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 747, @@ -4301,6 +4417,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 905.5, @@ -4339,6 +4456,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1118, @@ -4377,6 +4495,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1278, @@ -4415,6 +4534,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1428, @@ -4453,6 +4573,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1581, @@ -4491,6 +4612,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1791, @@ -4529,6 +4651,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1949.5, @@ -4567,6 +4690,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1421.5, @@ -4605,6 +4729,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1571.5, @@ -4643,6 +4768,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1724.5, @@ -4681,6 +4807,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1874.5, @@ -4719,6 +4846,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2033, @@ -4757,6 +4885,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2211.5, @@ -4788,6 +4917,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg index cc2ea77db..c7561be5b 100644 --- a/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -a_shapea_sequenceanothersequencefinallyscoreritemResponseitemessayRubricconceptitemOutcomesequencesequencescoreritemResponseitemessayRubricconceptitemOutcomescorerconceptessayRubricitemitemOutcomeitemResponse getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts)getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) + .d2-1902159983 .fill-N1{fill:#0A0F25;} + .d2-1902159983 .fill-N2{fill:#676C7E;} + .d2-1902159983 .fill-N3{fill:#9499AB;} + .d2-1902159983 .fill-N4{fill:#CFD2DD;} + .d2-1902159983 .fill-N5{fill:#DEE1EB;} + .d2-1902159983 .fill-N6{fill:#EEF1F8;} + .d2-1902159983 .fill-N7{fill:#FFFFFF;} + .d2-1902159983 .fill-B1{fill:#0D32B2;} + .d2-1902159983 .fill-B2{fill:#0D32B2;} + .d2-1902159983 .fill-B3{fill:#E3E9FD;} + .d2-1902159983 .fill-B4{fill:#E3E9FD;} + .d2-1902159983 .fill-B5{fill:#EDF0FD;} + .d2-1902159983 .fill-B6{fill:#F7F8FE;} + .d2-1902159983 .fill-AA2{fill:#4A6FF3;} + .d2-1902159983 .fill-AA4{fill:#EDF0FD;} + .d2-1902159983 .fill-AA5{fill:#F7F8FE;} + .d2-1902159983 .fill-AB4{fill:#EDF0FD;} + .d2-1902159983 .fill-AB5{fill:#F7F8FE;} + .d2-1902159983 .stroke-N1{stroke:#0A0F25;} + .d2-1902159983 .stroke-N2{stroke:#676C7E;} + .d2-1902159983 .stroke-N3{stroke:#9499AB;} + .d2-1902159983 .stroke-N4{stroke:#CFD2DD;} + .d2-1902159983 .stroke-N5{stroke:#DEE1EB;} + .d2-1902159983 .stroke-N6{stroke:#EEF1F8;} + .d2-1902159983 .stroke-N7{stroke:#FFFFFF;} + .d2-1902159983 .stroke-B1{stroke:#0D32B2;} + .d2-1902159983 .stroke-B2{stroke:#0D32B2;} + .d2-1902159983 .stroke-B3{stroke:#E3E9FD;} + .d2-1902159983 .stroke-B4{stroke:#E3E9FD;} + .d2-1902159983 .stroke-B5{stroke:#EDF0FD;} + .d2-1902159983 .stroke-B6{stroke:#F7F8FE;} + .d2-1902159983 .stroke-AA2{stroke:#4A6FF3;} + .d2-1902159983 .stroke-AA4{stroke:#EDF0FD;} + .d2-1902159983 .stroke-AA5{stroke:#F7F8FE;} + .d2-1902159983 .stroke-AB4{stroke:#EDF0FD;} + .d2-1902159983 .stroke-AB5{stroke:#F7F8FE;} + .d2-1902159983 .background-color-N1{background-color:#0A0F25;} + .d2-1902159983 .background-color-N2{background-color:#676C7E;} + .d2-1902159983 .background-color-N3{background-color:#9499AB;} + .d2-1902159983 .background-color-N4{background-color:#CFD2DD;} + .d2-1902159983 .background-color-N5{background-color:#DEE1EB;} + .d2-1902159983 .background-color-N6{background-color:#EEF1F8;} + .d2-1902159983 .background-color-N7{background-color:#FFFFFF;} + .d2-1902159983 .background-color-B1{background-color:#0D32B2;} + .d2-1902159983 .background-color-B2{background-color:#0D32B2;} + .d2-1902159983 .background-color-B3{background-color:#E3E9FD;} + .d2-1902159983 .background-color-B4{background-color:#E3E9FD;} + .d2-1902159983 .background-color-B5{background-color:#EDF0FD;} + .d2-1902159983 .background-color-B6{background-color:#F7F8FE;} + .d2-1902159983 .background-color-AA2{background-color:#4A6FF3;} + .d2-1902159983 .background-color-AA4{background-color:#EDF0FD;} + .d2-1902159983 .background-color-AA5{background-color:#F7F8FE;} + .d2-1902159983 .background-color-AB4{background-color:#EDF0FD;} + .d2-1902159983 .background-color-AB5{background-color:#F7F8FE;} + .d2-1902159983 .color-N1{color:#0A0F25;} + .d2-1902159983 .color-N2{color:#676C7E;} + .d2-1902159983 .color-N3{color:#9499AB;} + .d2-1902159983 .color-N4{color:#CFD2DD;} + .d2-1902159983 .color-N5{color:#DEE1EB;} + .d2-1902159983 .color-N6{color:#EEF1F8;} + .d2-1902159983 .color-N7{color:#FFFFFF;} + .d2-1902159983 .color-B1{color:#0D32B2;} + .d2-1902159983 .color-B2{color:#0D32B2;} + .d2-1902159983 .color-B3{color:#E3E9FD;} + .d2-1902159983 .color-B4{color:#E3E9FD;} + .d2-1902159983 .color-B5{color:#EDF0FD;} + .d2-1902159983 .color-B6{color:#F7F8FE;} + .d2-1902159983 .color-AA2{color:#4A6FF3;} + .d2-1902159983 .color-AA4{color:#EDF0FD;} + .d2-1902159983 .color-AA5{color:#F7F8FE;} + .d2-1902159983 .color-AB4{color:#EDF0FD;} + .d2-1902159983 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1902159983);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1902159983);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1902159983);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1902159983);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1902159983);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1902159983);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1902159983);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1902159983);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1902159983);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1902159983);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1902159983);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1902159983);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1902159983);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1902159983);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1902159983);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1902159983);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1902159983);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1902159983);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>a_shapea_sequenceanothersequencefinallyscoreritemResponseitemessayRubricconceptitemOutcomesequencesequencescoreritemResponseitemessayRubricconceptitemOutcomescorerconceptessayRubricitemitemOutcomeitemResponse getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts)getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/shebang-codeblock/dagre/board.exp.json b/e2etests/testdata/stable/shebang-codeblock/dagre/board.exp.json index fd5d32f71..d267b780b 100644 --- a/e2etests/testdata/stable/shebang-codeblock/dagre/board.exp.json +++ b/e2etests/testdata/stable/shebang-codeblock/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -101,6 +111,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/shebang-codeblock/dagre/sketch.exp.svg b/e2etests/testdata/stable/shebang-codeblock/dagre/sketch.exp.svg index e66bff784..df00a59b8 100644 --- a/e2etests/testdata/stable/shebang-codeblock/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/shebang-codeblock/dagre/sketch.exp.svg @@ -1,30 +1,30 @@ -test.sh#!/usr/bin/env bash + .d2-2260428214 .fill-N1{fill:#0A0F25;} + .d2-2260428214 .fill-N2{fill:#676C7E;} + .d2-2260428214 .fill-N3{fill:#9499AB;} + .d2-2260428214 .fill-N4{fill:#CFD2DD;} + .d2-2260428214 .fill-N5{fill:#DEE1EB;} + .d2-2260428214 .fill-N6{fill:#EEF1F8;} + .d2-2260428214 .fill-N7{fill:#FFFFFF;} + .d2-2260428214 .fill-B1{fill:#0D32B2;} + .d2-2260428214 .fill-B2{fill:#0D32B2;} + .d2-2260428214 .fill-B3{fill:#E3E9FD;} + .d2-2260428214 .fill-B4{fill:#E3E9FD;} + .d2-2260428214 .fill-B5{fill:#EDF0FD;} + .d2-2260428214 .fill-B6{fill:#F7F8FE;} + .d2-2260428214 .fill-AA2{fill:#4A6FF3;} + .d2-2260428214 .fill-AA4{fill:#EDF0FD;} + .d2-2260428214 .fill-AA5{fill:#F7F8FE;} + .d2-2260428214 .fill-AB4{fill:#EDF0FD;} + .d2-2260428214 .fill-AB5{fill:#F7F8FE;} + .d2-2260428214 .stroke-N1{stroke:#0A0F25;} + .d2-2260428214 .stroke-N2{stroke:#676C7E;} + .d2-2260428214 .stroke-N3{stroke:#9499AB;} + .d2-2260428214 .stroke-N4{stroke:#CFD2DD;} + .d2-2260428214 .stroke-N5{stroke:#DEE1EB;} + .d2-2260428214 .stroke-N6{stroke:#EEF1F8;} + .d2-2260428214 .stroke-N7{stroke:#FFFFFF;} + .d2-2260428214 .stroke-B1{stroke:#0D32B2;} + .d2-2260428214 .stroke-B2{stroke:#0D32B2;} + .d2-2260428214 .stroke-B3{stroke:#E3E9FD;} + .d2-2260428214 .stroke-B4{stroke:#E3E9FD;} + .d2-2260428214 .stroke-B5{stroke:#EDF0FD;} + .d2-2260428214 .stroke-B6{stroke:#F7F8FE;} + .d2-2260428214 .stroke-AA2{stroke:#4A6FF3;} + .d2-2260428214 .stroke-AA4{stroke:#EDF0FD;} + .d2-2260428214 .stroke-AA5{stroke:#F7F8FE;} + .d2-2260428214 .stroke-AB4{stroke:#EDF0FD;} + .d2-2260428214 .stroke-AB5{stroke:#F7F8FE;} + .d2-2260428214 .background-color-N1{background-color:#0A0F25;} + .d2-2260428214 .background-color-N2{background-color:#676C7E;} + .d2-2260428214 .background-color-N3{background-color:#9499AB;} + .d2-2260428214 .background-color-N4{background-color:#CFD2DD;} + .d2-2260428214 .background-color-N5{background-color:#DEE1EB;} + .d2-2260428214 .background-color-N6{background-color:#EEF1F8;} + .d2-2260428214 .background-color-N7{background-color:#FFFFFF;} + .d2-2260428214 .background-color-B1{background-color:#0D32B2;} + .d2-2260428214 .background-color-B2{background-color:#0D32B2;} + .d2-2260428214 .background-color-B3{background-color:#E3E9FD;} + .d2-2260428214 .background-color-B4{background-color:#E3E9FD;} + .d2-2260428214 .background-color-B5{background-color:#EDF0FD;} + .d2-2260428214 .background-color-B6{background-color:#F7F8FE;} + .d2-2260428214 .background-color-AA2{background-color:#4A6FF3;} + .d2-2260428214 .background-color-AA4{background-color:#EDF0FD;} + .d2-2260428214 .background-color-AA5{background-color:#F7F8FE;} + .d2-2260428214 .background-color-AB4{background-color:#EDF0FD;} + .d2-2260428214 .background-color-AB5{background-color:#F7F8FE;} + .d2-2260428214 .color-N1{color:#0A0F25;} + .d2-2260428214 .color-N2{color:#676C7E;} + .d2-2260428214 .color-N3{color:#9499AB;} + .d2-2260428214 .color-N4{color:#CFD2DD;} + .d2-2260428214 .color-N5{color:#DEE1EB;} + .d2-2260428214 .color-N6{color:#EEF1F8;} + .d2-2260428214 .color-N7{color:#FFFFFF;} + .d2-2260428214 .color-B1{color:#0D32B2;} + .d2-2260428214 .color-B2{color:#0D32B2;} + .d2-2260428214 .color-B3{color:#E3E9FD;} + .d2-2260428214 .color-B4{color:#E3E9FD;} + .d2-2260428214 .color-B5{color:#EDF0FD;} + .d2-2260428214 .color-B6{color:#F7F8FE;} + .d2-2260428214 .color-AA2{color:#4A6FF3;} + .d2-2260428214 .color-AA4{color:#EDF0FD;} + .d2-2260428214 .color-AA5{color:#F7F8FE;} + .d2-2260428214 .color-AB4{color:#EDF0FD;} + .d2-2260428214 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2260428214);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2260428214);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2260428214);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2260428214);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2260428214);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2260428214);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2260428214);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2260428214);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2260428214);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2260428214);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2260428214);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2260428214);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2260428214);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2260428214);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2260428214);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2260428214);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2260428214);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2260428214);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>test.sh#!/usr/bin/env bash echo testing#!/usr/bin/env bash -echo testing +echo testing - - + + \ No newline at end of file diff --git a/e2etests/testdata/stable/shebang-codeblock/elk/board.exp.json b/e2etests/testdata/stable/shebang-codeblock/elk/board.exp.json index 094f273f6..056fdf1aa 100644 --- a/e2etests/testdata/stable/shebang-codeblock/elk/board.exp.json +++ b/e2etests/testdata/stable/shebang-codeblock/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -101,6 +111,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/shebang-codeblock/elk/sketch.exp.svg b/e2etests/testdata/stable/shebang-codeblock/elk/sketch.exp.svg index 79094d908..4168e40f1 100644 --- a/e2etests/testdata/stable/shebang-codeblock/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/shebang-codeblock/elk/sketch.exp.svg @@ -1,30 +1,30 @@ -test.sh#!/usr/bin/env bash + .d2-4205360575 .fill-N1{fill:#0A0F25;} + .d2-4205360575 .fill-N2{fill:#676C7E;} + .d2-4205360575 .fill-N3{fill:#9499AB;} + .d2-4205360575 .fill-N4{fill:#CFD2DD;} + .d2-4205360575 .fill-N5{fill:#DEE1EB;} + .d2-4205360575 .fill-N6{fill:#EEF1F8;} + .d2-4205360575 .fill-N7{fill:#FFFFFF;} + .d2-4205360575 .fill-B1{fill:#0D32B2;} + .d2-4205360575 .fill-B2{fill:#0D32B2;} + .d2-4205360575 .fill-B3{fill:#E3E9FD;} + .d2-4205360575 .fill-B4{fill:#E3E9FD;} + .d2-4205360575 .fill-B5{fill:#EDF0FD;} + .d2-4205360575 .fill-B6{fill:#F7F8FE;} + .d2-4205360575 .fill-AA2{fill:#4A6FF3;} + .d2-4205360575 .fill-AA4{fill:#EDF0FD;} + .d2-4205360575 .fill-AA5{fill:#F7F8FE;} + .d2-4205360575 .fill-AB4{fill:#EDF0FD;} + .d2-4205360575 .fill-AB5{fill:#F7F8FE;} + .d2-4205360575 .stroke-N1{stroke:#0A0F25;} + .d2-4205360575 .stroke-N2{stroke:#676C7E;} + .d2-4205360575 .stroke-N3{stroke:#9499AB;} + .d2-4205360575 .stroke-N4{stroke:#CFD2DD;} + .d2-4205360575 .stroke-N5{stroke:#DEE1EB;} + .d2-4205360575 .stroke-N6{stroke:#EEF1F8;} + .d2-4205360575 .stroke-N7{stroke:#FFFFFF;} + .d2-4205360575 .stroke-B1{stroke:#0D32B2;} + .d2-4205360575 .stroke-B2{stroke:#0D32B2;} + .d2-4205360575 .stroke-B3{stroke:#E3E9FD;} + .d2-4205360575 .stroke-B4{stroke:#E3E9FD;} + .d2-4205360575 .stroke-B5{stroke:#EDF0FD;} + .d2-4205360575 .stroke-B6{stroke:#F7F8FE;} + .d2-4205360575 .stroke-AA2{stroke:#4A6FF3;} + .d2-4205360575 .stroke-AA4{stroke:#EDF0FD;} + .d2-4205360575 .stroke-AA5{stroke:#F7F8FE;} + .d2-4205360575 .stroke-AB4{stroke:#EDF0FD;} + .d2-4205360575 .stroke-AB5{stroke:#F7F8FE;} + .d2-4205360575 .background-color-N1{background-color:#0A0F25;} + .d2-4205360575 .background-color-N2{background-color:#676C7E;} + .d2-4205360575 .background-color-N3{background-color:#9499AB;} + .d2-4205360575 .background-color-N4{background-color:#CFD2DD;} + .d2-4205360575 .background-color-N5{background-color:#DEE1EB;} + .d2-4205360575 .background-color-N6{background-color:#EEF1F8;} + .d2-4205360575 .background-color-N7{background-color:#FFFFFF;} + .d2-4205360575 .background-color-B1{background-color:#0D32B2;} + .d2-4205360575 .background-color-B2{background-color:#0D32B2;} + .d2-4205360575 .background-color-B3{background-color:#E3E9FD;} + .d2-4205360575 .background-color-B4{background-color:#E3E9FD;} + .d2-4205360575 .background-color-B5{background-color:#EDF0FD;} + .d2-4205360575 .background-color-B6{background-color:#F7F8FE;} + .d2-4205360575 .background-color-AA2{background-color:#4A6FF3;} + .d2-4205360575 .background-color-AA4{background-color:#EDF0FD;} + .d2-4205360575 .background-color-AA5{background-color:#F7F8FE;} + .d2-4205360575 .background-color-AB4{background-color:#EDF0FD;} + .d2-4205360575 .background-color-AB5{background-color:#F7F8FE;} + .d2-4205360575 .color-N1{color:#0A0F25;} + .d2-4205360575 .color-N2{color:#676C7E;} + .d2-4205360575 .color-N3{color:#9499AB;} + .d2-4205360575 .color-N4{color:#CFD2DD;} + .d2-4205360575 .color-N5{color:#DEE1EB;} + .d2-4205360575 .color-N6{color:#EEF1F8;} + .d2-4205360575 .color-N7{color:#FFFFFF;} + .d2-4205360575 .color-B1{color:#0D32B2;} + .d2-4205360575 .color-B2{color:#0D32B2;} + .d2-4205360575 .color-B3{color:#E3E9FD;} + .d2-4205360575 .color-B4{color:#E3E9FD;} + .d2-4205360575 .color-B5{color:#EDF0FD;} + .d2-4205360575 .color-B6{color:#F7F8FE;} + .d2-4205360575 .color-AA2{color:#4A6FF3;} + .d2-4205360575 .color-AA4{color:#EDF0FD;} + .d2-4205360575 .color-AA5{color:#F7F8FE;} + .d2-4205360575 .color-AB4{color:#EDF0FD;} + .d2-4205360575 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4205360575);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4205360575);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4205360575);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4205360575);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4205360575);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4205360575);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4205360575);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4205360575);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4205360575);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4205360575);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4205360575);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4205360575);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4205360575);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4205360575);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4205360575);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4205360575);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4205360575);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4205360575);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>test.sh#!/usr/bin/env bash echo testing#!/usr/bin/env bash -echo testing +echo testing - - + + \ No newline at end of file diff --git a/e2etests/testdata/stable/simple_grid_edges/dagre/board.exp.json b/e2etests/testdata/stable/simple_grid_edges/dagre/board.exp.json index 52e639ce5..dcbac7d89 100644 --- a/e2etests/testdata/stable/simple_grid_edges/dagre/board.exp.json +++ b/e2etests/testdata/stable/simple_grid_edges/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -22,6 +30,7 @@ "borderRadius": 10, "fill": "#30304c", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -67,6 +76,7 @@ "borderRadius": 10, "fill": "#cecece", "stroke": "#cecece", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -111,6 +121,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -155,6 +166,7 @@ "borderRadius": 10, "fill": "#cecece", "stroke": "#cecece", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -200,6 +212,7 @@ "borderRadius": 10, "fill": "#0033cc", "stroke": "#0033cc", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -244,6 +257,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -287,6 +301,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -330,6 +345,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -373,6 +389,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -416,6 +433,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -460,6 +478,7 @@ "borderRadius": 10, "fill": "#0033cc", "stroke": "#0033cc", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -505,6 +524,7 @@ "borderRadius": 10, "fill": "#0033cc", "stroke": "#0033cc", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -550,6 +570,7 @@ "borderRadius": 10, "fill": "#0033cc", "stroke": "#0033cc", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -595,6 +616,7 @@ "borderRadius": 10, "fill": "#0033cc", "stroke": "#0033cc", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -640,6 +662,7 @@ "borderRadius": 10, "fill": "#cecece", "stroke": "#cecece", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -684,6 +707,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -728,6 +752,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -772,6 +797,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -816,6 +842,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -860,6 +887,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -900,6 +928,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -940,6 +969,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -981,6 +1011,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1022,6 +1053,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1066,6 +1098,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1109,6 +1142,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1152,6 +1186,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1196,6 +1231,7 @@ "borderRadius": 10, "fill": "#0033cc", "stroke": "#0033cc", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1250,6 +1286,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 50, @@ -1291,6 +1328,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 100, @@ -1332,6 +1370,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 220, @@ -1373,6 +1412,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 340, @@ -1414,6 +1454,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 460, @@ -1455,6 +1496,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 170, @@ -1496,6 +1538,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 410, @@ -1537,6 +1580,7 @@ "labelHeight": 13, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 530, @@ -1578,6 +1622,7 @@ "labelHeight": 13, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 530, @@ -1609,6 +1654,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/simple_grid_edges/dagre/sketch.exp.svg b/e2etests/testdata/stable/simple_grid_edges/dagre/sketch.exp.svg index 7ab9f5ee2..42dc5e59c 100644 --- a/e2etests/testdata/stable/simple_grid_edges/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/simple_grid_edges/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -npm i -g@forge/cliSet up anAtlassian siteView the helloworld appforgetunnelforgeloginforgecreateforgedeployforgeinstallHot reloadchanges?Step 1Step 2Step 3Step 4forgedeploy⬤ Forge CLI⬤ Required⬤ Optional YesNo + .d2-2435948186 .fill-N1{fill:#0A0F25;} + .d2-2435948186 .fill-N2{fill:#676C7E;} + .d2-2435948186 .fill-N3{fill:#9499AB;} + .d2-2435948186 .fill-N4{fill:#CFD2DD;} + .d2-2435948186 .fill-N5{fill:#DEE1EB;} + .d2-2435948186 .fill-N6{fill:#EEF1F8;} + .d2-2435948186 .fill-N7{fill:#FFFFFF;} + .d2-2435948186 .fill-B1{fill:#0D32B2;} + .d2-2435948186 .fill-B2{fill:#0D32B2;} + .d2-2435948186 .fill-B3{fill:#E3E9FD;} + .d2-2435948186 .fill-B4{fill:#E3E9FD;} + .d2-2435948186 .fill-B5{fill:#EDF0FD;} + .d2-2435948186 .fill-B6{fill:#F7F8FE;} + .d2-2435948186 .fill-AA2{fill:#4A6FF3;} + .d2-2435948186 .fill-AA4{fill:#EDF0FD;} + .d2-2435948186 .fill-AA5{fill:#F7F8FE;} + .d2-2435948186 .fill-AB4{fill:#EDF0FD;} + .d2-2435948186 .fill-AB5{fill:#F7F8FE;} + .d2-2435948186 .stroke-N1{stroke:#0A0F25;} + .d2-2435948186 .stroke-N2{stroke:#676C7E;} + .d2-2435948186 .stroke-N3{stroke:#9499AB;} + .d2-2435948186 .stroke-N4{stroke:#CFD2DD;} + .d2-2435948186 .stroke-N5{stroke:#DEE1EB;} + .d2-2435948186 .stroke-N6{stroke:#EEF1F8;} + .d2-2435948186 .stroke-N7{stroke:#FFFFFF;} + .d2-2435948186 .stroke-B1{stroke:#0D32B2;} + .d2-2435948186 .stroke-B2{stroke:#0D32B2;} + .d2-2435948186 .stroke-B3{stroke:#E3E9FD;} + .d2-2435948186 .stroke-B4{stroke:#E3E9FD;} + .d2-2435948186 .stroke-B5{stroke:#EDF0FD;} + .d2-2435948186 .stroke-B6{stroke:#F7F8FE;} + .d2-2435948186 .stroke-AA2{stroke:#4A6FF3;} + .d2-2435948186 .stroke-AA4{stroke:#EDF0FD;} + .d2-2435948186 .stroke-AA5{stroke:#F7F8FE;} + .d2-2435948186 .stroke-AB4{stroke:#EDF0FD;} + .d2-2435948186 .stroke-AB5{stroke:#F7F8FE;} + .d2-2435948186 .background-color-N1{background-color:#0A0F25;} + .d2-2435948186 .background-color-N2{background-color:#676C7E;} + .d2-2435948186 .background-color-N3{background-color:#9499AB;} + .d2-2435948186 .background-color-N4{background-color:#CFD2DD;} + .d2-2435948186 .background-color-N5{background-color:#DEE1EB;} + .d2-2435948186 .background-color-N6{background-color:#EEF1F8;} + .d2-2435948186 .background-color-N7{background-color:#FFFFFF;} + .d2-2435948186 .background-color-B1{background-color:#0D32B2;} + .d2-2435948186 .background-color-B2{background-color:#0D32B2;} + .d2-2435948186 .background-color-B3{background-color:#E3E9FD;} + .d2-2435948186 .background-color-B4{background-color:#E3E9FD;} + .d2-2435948186 .background-color-B5{background-color:#EDF0FD;} + .d2-2435948186 .background-color-B6{background-color:#F7F8FE;} + .d2-2435948186 .background-color-AA2{background-color:#4A6FF3;} + .d2-2435948186 .background-color-AA4{background-color:#EDF0FD;} + .d2-2435948186 .background-color-AA5{background-color:#F7F8FE;} + .d2-2435948186 .background-color-AB4{background-color:#EDF0FD;} + .d2-2435948186 .background-color-AB5{background-color:#F7F8FE;} + .d2-2435948186 .color-N1{color:#0A0F25;} + .d2-2435948186 .color-N2{color:#676C7E;} + .d2-2435948186 .color-N3{color:#9499AB;} + .d2-2435948186 .color-N4{color:#CFD2DD;} + .d2-2435948186 .color-N5{color:#DEE1EB;} + .d2-2435948186 .color-N6{color:#EEF1F8;} + .d2-2435948186 .color-N7{color:#FFFFFF;} + .d2-2435948186 .color-B1{color:#0D32B2;} + .d2-2435948186 .color-B2{color:#0D32B2;} + .d2-2435948186 .color-B3{color:#E3E9FD;} + .d2-2435948186 .color-B4{color:#E3E9FD;} + .d2-2435948186 .color-B5{color:#EDF0FD;} + .d2-2435948186 .color-B6{color:#F7F8FE;} + .d2-2435948186 .color-AA2{color:#4A6FF3;} + .d2-2435948186 .color-AA4{color:#EDF0FD;} + .d2-2435948186 .color-AA5{color:#F7F8FE;} + .d2-2435948186 .color-AB4{color:#EDF0FD;} + .d2-2435948186 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2435948186);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2435948186);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2435948186);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2435948186);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2435948186);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2435948186);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2435948186);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2435948186);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2435948186);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2435948186);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2435948186);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2435948186);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2435948186);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2435948186);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2435948186);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2435948186);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2435948186);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2435948186);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>npm i -g@forge/cliSet up anAtlassian siteView the helloworld appforgetunnelforgeloginforgecreateforgedeployforgeinstallHot reloadchanges?Step 1Step 2Step 3Step 4forgedeploy⬤ Forge CLI⬤ Required⬤ Optional YesNo - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/simple_grid_edges/elk/board.exp.json b/e2etests/testdata/stable/simple_grid_edges/elk/board.exp.json index 52e639ce5..dcbac7d89 100644 --- a/e2etests/testdata/stable/simple_grid_edges/elk/board.exp.json +++ b/e2etests/testdata/stable/simple_grid_edges/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -22,6 +30,7 @@ "borderRadius": 10, "fill": "#30304c", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -67,6 +76,7 @@ "borderRadius": 10, "fill": "#cecece", "stroke": "#cecece", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -111,6 +121,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -155,6 +166,7 @@ "borderRadius": 10, "fill": "#cecece", "stroke": "#cecece", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -200,6 +212,7 @@ "borderRadius": 10, "fill": "#0033cc", "stroke": "#0033cc", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -244,6 +257,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -287,6 +301,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -330,6 +345,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -373,6 +389,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -416,6 +433,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -460,6 +478,7 @@ "borderRadius": 10, "fill": "#0033cc", "stroke": "#0033cc", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -505,6 +524,7 @@ "borderRadius": 10, "fill": "#0033cc", "stroke": "#0033cc", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -550,6 +570,7 @@ "borderRadius": 10, "fill": "#0033cc", "stroke": "#0033cc", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -595,6 +616,7 @@ "borderRadius": 10, "fill": "#0033cc", "stroke": "#0033cc", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -640,6 +662,7 @@ "borderRadius": 10, "fill": "#cecece", "stroke": "#cecece", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -684,6 +707,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -728,6 +752,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -772,6 +797,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -816,6 +842,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -860,6 +887,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -900,6 +928,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -940,6 +969,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -981,6 +1011,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1022,6 +1053,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1066,6 +1098,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1109,6 +1142,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1152,6 +1186,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "transparent", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1196,6 +1231,7 @@ "borderRadius": 10, "fill": "#0033cc", "stroke": "#0033cc", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1250,6 +1286,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 50, @@ -1291,6 +1328,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 100, @@ -1332,6 +1370,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 220, @@ -1373,6 +1412,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 340, @@ -1414,6 +1454,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 460, @@ -1455,6 +1496,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 170, @@ -1496,6 +1538,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 410, @@ -1537,6 +1580,7 @@ "labelHeight": 13, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 530, @@ -1578,6 +1622,7 @@ "labelHeight": 13, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 530, @@ -1609,6 +1654,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/simple_grid_edges/elk/sketch.exp.svg b/e2etests/testdata/stable/simple_grid_edges/elk/sketch.exp.svg index 7ab9f5ee2..42dc5e59c 100644 --- a/e2etests/testdata/stable/simple_grid_edges/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/simple_grid_edges/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -npm i -g@forge/cliSet up anAtlassian siteView the helloworld appforgetunnelforgeloginforgecreateforgedeployforgeinstallHot reloadchanges?Step 1Step 2Step 3Step 4forgedeploy⬤ Forge CLI⬤ Required⬤ Optional YesNo + .d2-2435948186 .fill-N1{fill:#0A0F25;} + .d2-2435948186 .fill-N2{fill:#676C7E;} + .d2-2435948186 .fill-N3{fill:#9499AB;} + .d2-2435948186 .fill-N4{fill:#CFD2DD;} + .d2-2435948186 .fill-N5{fill:#DEE1EB;} + .d2-2435948186 .fill-N6{fill:#EEF1F8;} + .d2-2435948186 .fill-N7{fill:#FFFFFF;} + .d2-2435948186 .fill-B1{fill:#0D32B2;} + .d2-2435948186 .fill-B2{fill:#0D32B2;} + .d2-2435948186 .fill-B3{fill:#E3E9FD;} + .d2-2435948186 .fill-B4{fill:#E3E9FD;} + .d2-2435948186 .fill-B5{fill:#EDF0FD;} + .d2-2435948186 .fill-B6{fill:#F7F8FE;} + .d2-2435948186 .fill-AA2{fill:#4A6FF3;} + .d2-2435948186 .fill-AA4{fill:#EDF0FD;} + .d2-2435948186 .fill-AA5{fill:#F7F8FE;} + .d2-2435948186 .fill-AB4{fill:#EDF0FD;} + .d2-2435948186 .fill-AB5{fill:#F7F8FE;} + .d2-2435948186 .stroke-N1{stroke:#0A0F25;} + .d2-2435948186 .stroke-N2{stroke:#676C7E;} + .d2-2435948186 .stroke-N3{stroke:#9499AB;} + .d2-2435948186 .stroke-N4{stroke:#CFD2DD;} + .d2-2435948186 .stroke-N5{stroke:#DEE1EB;} + .d2-2435948186 .stroke-N6{stroke:#EEF1F8;} + .d2-2435948186 .stroke-N7{stroke:#FFFFFF;} + .d2-2435948186 .stroke-B1{stroke:#0D32B2;} + .d2-2435948186 .stroke-B2{stroke:#0D32B2;} + .d2-2435948186 .stroke-B3{stroke:#E3E9FD;} + .d2-2435948186 .stroke-B4{stroke:#E3E9FD;} + .d2-2435948186 .stroke-B5{stroke:#EDF0FD;} + .d2-2435948186 .stroke-B6{stroke:#F7F8FE;} + .d2-2435948186 .stroke-AA2{stroke:#4A6FF3;} + .d2-2435948186 .stroke-AA4{stroke:#EDF0FD;} + .d2-2435948186 .stroke-AA5{stroke:#F7F8FE;} + .d2-2435948186 .stroke-AB4{stroke:#EDF0FD;} + .d2-2435948186 .stroke-AB5{stroke:#F7F8FE;} + .d2-2435948186 .background-color-N1{background-color:#0A0F25;} + .d2-2435948186 .background-color-N2{background-color:#676C7E;} + .d2-2435948186 .background-color-N3{background-color:#9499AB;} + .d2-2435948186 .background-color-N4{background-color:#CFD2DD;} + .d2-2435948186 .background-color-N5{background-color:#DEE1EB;} + .d2-2435948186 .background-color-N6{background-color:#EEF1F8;} + .d2-2435948186 .background-color-N7{background-color:#FFFFFF;} + .d2-2435948186 .background-color-B1{background-color:#0D32B2;} + .d2-2435948186 .background-color-B2{background-color:#0D32B2;} + .d2-2435948186 .background-color-B3{background-color:#E3E9FD;} + .d2-2435948186 .background-color-B4{background-color:#E3E9FD;} + .d2-2435948186 .background-color-B5{background-color:#EDF0FD;} + .d2-2435948186 .background-color-B6{background-color:#F7F8FE;} + .d2-2435948186 .background-color-AA2{background-color:#4A6FF3;} + .d2-2435948186 .background-color-AA4{background-color:#EDF0FD;} + .d2-2435948186 .background-color-AA5{background-color:#F7F8FE;} + .d2-2435948186 .background-color-AB4{background-color:#EDF0FD;} + .d2-2435948186 .background-color-AB5{background-color:#F7F8FE;} + .d2-2435948186 .color-N1{color:#0A0F25;} + .d2-2435948186 .color-N2{color:#676C7E;} + .d2-2435948186 .color-N3{color:#9499AB;} + .d2-2435948186 .color-N4{color:#CFD2DD;} + .d2-2435948186 .color-N5{color:#DEE1EB;} + .d2-2435948186 .color-N6{color:#EEF1F8;} + .d2-2435948186 .color-N7{color:#FFFFFF;} + .d2-2435948186 .color-B1{color:#0D32B2;} + .d2-2435948186 .color-B2{color:#0D32B2;} + .d2-2435948186 .color-B3{color:#E3E9FD;} + .d2-2435948186 .color-B4{color:#E3E9FD;} + .d2-2435948186 .color-B5{color:#EDF0FD;} + .d2-2435948186 .color-B6{color:#F7F8FE;} + .d2-2435948186 .color-AA2{color:#4A6FF3;} + .d2-2435948186 .color-AA4{color:#EDF0FD;} + .d2-2435948186 .color-AA5{color:#F7F8FE;} + .d2-2435948186 .color-AB4{color:#EDF0FD;} + .d2-2435948186 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2435948186);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2435948186);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2435948186);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2435948186);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2435948186);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2435948186);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2435948186);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2435948186);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2435948186);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2435948186);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2435948186);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2435948186);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2435948186);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2435948186);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2435948186);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2435948186);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2435948186);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2435948186);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>npm i -g@forge/cliSet up anAtlassian siteView the helloworld appforgetunnelforgeloginforgecreateforgedeployforgeinstallHot reloadchanges?Step 1Step 2Step 3Step 4forgedeploy⬤ Forge CLI⬤ Required⬤ Optional YesNo - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_table_column_styles/dagre/board.exp.json b/e2etests/testdata/stable/sql_table_column_styles/dagre/board.exp.json index 24dffe9d7..7f6727f2a 100644 --- a/e2etests/testdata/stable/sql_table_column_styles/dagre/board.exp.json +++ b/e2etests/testdata/stable/sql_table_column_styles/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "red", "stroke": "lightgray", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -118,6 +127,7 @@ "borderRadius": 0, "fill": "red", "stroke": "lightgray", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -218,6 +228,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -293,6 +304,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -370,6 +382,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/sql_table_column_styles/dagre/sketch.exp.svg b/e2etests/testdata/stable/sql_table_column_styles/dagre/sketch.exp.svg index b7d9aed64..9b2de2440 100644 --- a/e2etests/testdata/stable/sql_table_column_styles/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_table_column_styles/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -Humor in the CourtCould you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.Humor in the Court2Could you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidBatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void + .d2-4228642642 .fill-N1{fill:#0A0F25;} + .d2-4228642642 .fill-N2{fill:#676C7E;} + .d2-4228642642 .fill-N3{fill:#9499AB;} + .d2-4228642642 .fill-N4{fill:#CFD2DD;} + .d2-4228642642 .fill-N5{fill:#DEE1EB;} + .d2-4228642642 .fill-N6{fill:#EEF1F8;} + .d2-4228642642 .fill-N7{fill:#FFFFFF;} + .d2-4228642642 .fill-B1{fill:#0D32B2;} + .d2-4228642642 .fill-B2{fill:#0D32B2;} + .d2-4228642642 .fill-B3{fill:#E3E9FD;} + .d2-4228642642 .fill-B4{fill:#E3E9FD;} + .d2-4228642642 .fill-B5{fill:#EDF0FD;} + .d2-4228642642 .fill-B6{fill:#F7F8FE;} + .d2-4228642642 .fill-AA2{fill:#4A6FF3;} + .d2-4228642642 .fill-AA4{fill:#EDF0FD;} + .d2-4228642642 .fill-AA5{fill:#F7F8FE;} + .d2-4228642642 .fill-AB4{fill:#EDF0FD;} + .d2-4228642642 .fill-AB5{fill:#F7F8FE;} + .d2-4228642642 .stroke-N1{stroke:#0A0F25;} + .d2-4228642642 .stroke-N2{stroke:#676C7E;} + .d2-4228642642 .stroke-N3{stroke:#9499AB;} + .d2-4228642642 .stroke-N4{stroke:#CFD2DD;} + .d2-4228642642 .stroke-N5{stroke:#DEE1EB;} + .d2-4228642642 .stroke-N6{stroke:#EEF1F8;} + .d2-4228642642 .stroke-N7{stroke:#FFFFFF;} + .d2-4228642642 .stroke-B1{stroke:#0D32B2;} + .d2-4228642642 .stroke-B2{stroke:#0D32B2;} + .d2-4228642642 .stroke-B3{stroke:#E3E9FD;} + .d2-4228642642 .stroke-B4{stroke:#E3E9FD;} + .d2-4228642642 .stroke-B5{stroke:#EDF0FD;} + .d2-4228642642 .stroke-B6{stroke:#F7F8FE;} + .d2-4228642642 .stroke-AA2{stroke:#4A6FF3;} + .d2-4228642642 .stroke-AA4{stroke:#EDF0FD;} + .d2-4228642642 .stroke-AA5{stroke:#F7F8FE;} + .d2-4228642642 .stroke-AB4{stroke:#EDF0FD;} + .d2-4228642642 .stroke-AB5{stroke:#F7F8FE;} + .d2-4228642642 .background-color-N1{background-color:#0A0F25;} + .d2-4228642642 .background-color-N2{background-color:#676C7E;} + .d2-4228642642 .background-color-N3{background-color:#9499AB;} + .d2-4228642642 .background-color-N4{background-color:#CFD2DD;} + .d2-4228642642 .background-color-N5{background-color:#DEE1EB;} + .d2-4228642642 .background-color-N6{background-color:#EEF1F8;} + .d2-4228642642 .background-color-N7{background-color:#FFFFFF;} + .d2-4228642642 .background-color-B1{background-color:#0D32B2;} + .d2-4228642642 .background-color-B2{background-color:#0D32B2;} + .d2-4228642642 .background-color-B3{background-color:#E3E9FD;} + .d2-4228642642 .background-color-B4{background-color:#E3E9FD;} + .d2-4228642642 .background-color-B5{background-color:#EDF0FD;} + .d2-4228642642 .background-color-B6{background-color:#F7F8FE;} + .d2-4228642642 .background-color-AA2{background-color:#4A6FF3;} + .d2-4228642642 .background-color-AA4{background-color:#EDF0FD;} + .d2-4228642642 .background-color-AA5{background-color:#F7F8FE;} + .d2-4228642642 .background-color-AB4{background-color:#EDF0FD;} + .d2-4228642642 .background-color-AB5{background-color:#F7F8FE;} + .d2-4228642642 .color-N1{color:#0A0F25;} + .d2-4228642642 .color-N2{color:#676C7E;} + .d2-4228642642 .color-N3{color:#9499AB;} + .d2-4228642642 .color-N4{color:#CFD2DD;} + .d2-4228642642 .color-N5{color:#DEE1EB;} + .d2-4228642642 .color-N6{color:#EEF1F8;} + .d2-4228642642 .color-N7{color:#FFFFFF;} + .d2-4228642642 .color-B1{color:#0D32B2;} + .d2-4228642642 .color-B2{color:#0D32B2;} + .d2-4228642642 .color-B3{color:#E3E9FD;} + .d2-4228642642 .color-B4{color:#E3E9FD;} + .d2-4228642642 .color-B5{color:#EDF0FD;} + .d2-4228642642 .color-B6{color:#F7F8FE;} + .d2-4228642642 .color-AA2{color:#4A6FF3;} + .d2-4228642642 .color-AA4{color:#EDF0FD;} + .d2-4228642642 .color-AA5{color:#F7F8FE;} + .d2-4228642642 .color-AB4{color:#EDF0FD;} + .d2-4228642642 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4228642642);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4228642642);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4228642642);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4228642642);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4228642642);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4228642642);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4228642642);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4228642642);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4228642642);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4228642642);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4228642642);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4228642642);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4228642642);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4228642642);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4228642642);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4228642642);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4228642642);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4228642642);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>Humor in the CourtCould you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.Humor in the Court2Could you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidBatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_table_column_styles/elk/board.exp.json b/e2etests/testdata/stable/sql_table_column_styles/elk/board.exp.json index 220d7395f..f138f6766 100644 --- a/e2etests/testdata/stable/sql_table_column_styles/elk/board.exp.json +++ b/e2etests/testdata/stable/sql_table_column_styles/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "red", "stroke": "lightgray", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -118,6 +127,7 @@ "borderRadius": 0, "fill": "red", "stroke": "lightgray", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -218,6 +228,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -293,6 +304,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -370,6 +382,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/sql_table_column_styles/elk/sketch.exp.svg b/e2etests/testdata/stable/sql_table_column_styles/elk/sketch.exp.svg index 7e19a3ea8..d63e9bac2 100644 --- a/e2etests/testdata/stable/sql_table_column_styles/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_table_column_styles/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -Humor in the CourtCould you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.Humor in the Court2Could you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidBatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void + .d2-1137145508 .fill-N1{fill:#0A0F25;} + .d2-1137145508 .fill-N2{fill:#676C7E;} + .d2-1137145508 .fill-N3{fill:#9499AB;} + .d2-1137145508 .fill-N4{fill:#CFD2DD;} + .d2-1137145508 .fill-N5{fill:#DEE1EB;} + .d2-1137145508 .fill-N6{fill:#EEF1F8;} + .d2-1137145508 .fill-N7{fill:#FFFFFF;} + .d2-1137145508 .fill-B1{fill:#0D32B2;} + .d2-1137145508 .fill-B2{fill:#0D32B2;} + .d2-1137145508 .fill-B3{fill:#E3E9FD;} + .d2-1137145508 .fill-B4{fill:#E3E9FD;} + .d2-1137145508 .fill-B5{fill:#EDF0FD;} + .d2-1137145508 .fill-B6{fill:#F7F8FE;} + .d2-1137145508 .fill-AA2{fill:#4A6FF3;} + .d2-1137145508 .fill-AA4{fill:#EDF0FD;} + .d2-1137145508 .fill-AA5{fill:#F7F8FE;} + .d2-1137145508 .fill-AB4{fill:#EDF0FD;} + .d2-1137145508 .fill-AB5{fill:#F7F8FE;} + .d2-1137145508 .stroke-N1{stroke:#0A0F25;} + .d2-1137145508 .stroke-N2{stroke:#676C7E;} + .d2-1137145508 .stroke-N3{stroke:#9499AB;} + .d2-1137145508 .stroke-N4{stroke:#CFD2DD;} + .d2-1137145508 .stroke-N5{stroke:#DEE1EB;} + .d2-1137145508 .stroke-N6{stroke:#EEF1F8;} + .d2-1137145508 .stroke-N7{stroke:#FFFFFF;} + .d2-1137145508 .stroke-B1{stroke:#0D32B2;} + .d2-1137145508 .stroke-B2{stroke:#0D32B2;} + .d2-1137145508 .stroke-B3{stroke:#E3E9FD;} + .d2-1137145508 .stroke-B4{stroke:#E3E9FD;} + .d2-1137145508 .stroke-B5{stroke:#EDF0FD;} + .d2-1137145508 .stroke-B6{stroke:#F7F8FE;} + .d2-1137145508 .stroke-AA2{stroke:#4A6FF3;} + .d2-1137145508 .stroke-AA4{stroke:#EDF0FD;} + .d2-1137145508 .stroke-AA5{stroke:#F7F8FE;} + .d2-1137145508 .stroke-AB4{stroke:#EDF0FD;} + .d2-1137145508 .stroke-AB5{stroke:#F7F8FE;} + .d2-1137145508 .background-color-N1{background-color:#0A0F25;} + .d2-1137145508 .background-color-N2{background-color:#676C7E;} + .d2-1137145508 .background-color-N3{background-color:#9499AB;} + .d2-1137145508 .background-color-N4{background-color:#CFD2DD;} + .d2-1137145508 .background-color-N5{background-color:#DEE1EB;} + .d2-1137145508 .background-color-N6{background-color:#EEF1F8;} + .d2-1137145508 .background-color-N7{background-color:#FFFFFF;} + .d2-1137145508 .background-color-B1{background-color:#0D32B2;} + .d2-1137145508 .background-color-B2{background-color:#0D32B2;} + .d2-1137145508 .background-color-B3{background-color:#E3E9FD;} + .d2-1137145508 .background-color-B4{background-color:#E3E9FD;} + .d2-1137145508 .background-color-B5{background-color:#EDF0FD;} + .d2-1137145508 .background-color-B6{background-color:#F7F8FE;} + .d2-1137145508 .background-color-AA2{background-color:#4A6FF3;} + .d2-1137145508 .background-color-AA4{background-color:#EDF0FD;} + .d2-1137145508 .background-color-AA5{background-color:#F7F8FE;} + .d2-1137145508 .background-color-AB4{background-color:#EDF0FD;} + .d2-1137145508 .background-color-AB5{background-color:#F7F8FE;} + .d2-1137145508 .color-N1{color:#0A0F25;} + .d2-1137145508 .color-N2{color:#676C7E;} + .d2-1137145508 .color-N3{color:#9499AB;} + .d2-1137145508 .color-N4{color:#CFD2DD;} + .d2-1137145508 .color-N5{color:#DEE1EB;} + .d2-1137145508 .color-N6{color:#EEF1F8;} + .d2-1137145508 .color-N7{color:#FFFFFF;} + .d2-1137145508 .color-B1{color:#0D32B2;} + .d2-1137145508 .color-B2{color:#0D32B2;} + .d2-1137145508 .color-B3{color:#E3E9FD;} + .d2-1137145508 .color-B4{color:#E3E9FD;} + .d2-1137145508 .color-B5{color:#EDF0FD;} + .d2-1137145508 .color-B6{color:#F7F8FE;} + .d2-1137145508 .color-AA2{color:#4A6FF3;} + .d2-1137145508 .color-AA4{color:#EDF0FD;} + .d2-1137145508 .color-AA5{color:#F7F8FE;} + .d2-1137145508 .color-AB4{color:#EDF0FD;} + .d2-1137145508 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1137145508);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1137145508);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1137145508);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1137145508);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1137145508);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1137145508);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1137145508);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1137145508);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1137145508);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1137145508);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1137145508);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1137145508);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1137145508);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1137145508);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1137145508);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1137145508);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1137145508);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1137145508);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>Humor in the CourtCould you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.Humor in the Court2Could you see him from where you were standing?I could see his head.And where was his head?Just above his shoulders.BatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidBatchManager-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)void \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_table_constraints_width/dagre/board.exp.json b/e2etests/testdata/stable/sql_table_constraints_width/dagre/board.exp.json index b407c93a4..456fb9ecd 100644 --- a/e2etests/testdata/stable/sql_table_constraints_width/dagre/board.exp.json +++ b/e2etests/testdata/stable/sql_table_constraints_width/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -92,6 +101,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -167,6 +177,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -242,6 +253,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -318,6 +330,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -452,6 +465,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -526,6 +540,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/sql_table_constraints_width/dagre/sketch.exp.svg b/e2etests/testdata/stable/sql_table_constraints_width/dagre/sketch.exp.svg index a254abc00..28a66764a 100644 --- a/e2etests/testdata/stable/sql_table_constraints_width/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_table_constraints_width/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -axINTUNQbxINTPK, FKcxINTFK, UNQdxINTPK, FK, UNQexINTno_abbrev, FK, helloystringzSTRINGyofxINT + .d2-3757067399 .fill-N1{fill:#0A0F25;} + .d2-3757067399 .fill-N2{fill:#676C7E;} + .d2-3757067399 .fill-N3{fill:#9499AB;} + .d2-3757067399 .fill-N4{fill:#CFD2DD;} + .d2-3757067399 .fill-N5{fill:#DEE1EB;} + .d2-3757067399 .fill-N6{fill:#EEF1F8;} + .d2-3757067399 .fill-N7{fill:#FFFFFF;} + .d2-3757067399 .fill-B1{fill:#0D32B2;} + .d2-3757067399 .fill-B2{fill:#0D32B2;} + .d2-3757067399 .fill-B3{fill:#E3E9FD;} + .d2-3757067399 .fill-B4{fill:#E3E9FD;} + .d2-3757067399 .fill-B5{fill:#EDF0FD;} + .d2-3757067399 .fill-B6{fill:#F7F8FE;} + .d2-3757067399 .fill-AA2{fill:#4A6FF3;} + .d2-3757067399 .fill-AA4{fill:#EDF0FD;} + .d2-3757067399 .fill-AA5{fill:#F7F8FE;} + .d2-3757067399 .fill-AB4{fill:#EDF0FD;} + .d2-3757067399 .fill-AB5{fill:#F7F8FE;} + .d2-3757067399 .stroke-N1{stroke:#0A0F25;} + .d2-3757067399 .stroke-N2{stroke:#676C7E;} + .d2-3757067399 .stroke-N3{stroke:#9499AB;} + .d2-3757067399 .stroke-N4{stroke:#CFD2DD;} + .d2-3757067399 .stroke-N5{stroke:#DEE1EB;} + .d2-3757067399 .stroke-N6{stroke:#EEF1F8;} + .d2-3757067399 .stroke-N7{stroke:#FFFFFF;} + .d2-3757067399 .stroke-B1{stroke:#0D32B2;} + .d2-3757067399 .stroke-B2{stroke:#0D32B2;} + .d2-3757067399 .stroke-B3{stroke:#E3E9FD;} + .d2-3757067399 .stroke-B4{stroke:#E3E9FD;} + .d2-3757067399 .stroke-B5{stroke:#EDF0FD;} + .d2-3757067399 .stroke-B6{stroke:#F7F8FE;} + .d2-3757067399 .stroke-AA2{stroke:#4A6FF3;} + .d2-3757067399 .stroke-AA4{stroke:#EDF0FD;} + .d2-3757067399 .stroke-AA5{stroke:#F7F8FE;} + .d2-3757067399 .stroke-AB4{stroke:#EDF0FD;} + .d2-3757067399 .stroke-AB5{stroke:#F7F8FE;} + .d2-3757067399 .background-color-N1{background-color:#0A0F25;} + .d2-3757067399 .background-color-N2{background-color:#676C7E;} + .d2-3757067399 .background-color-N3{background-color:#9499AB;} + .d2-3757067399 .background-color-N4{background-color:#CFD2DD;} + .d2-3757067399 .background-color-N5{background-color:#DEE1EB;} + .d2-3757067399 .background-color-N6{background-color:#EEF1F8;} + .d2-3757067399 .background-color-N7{background-color:#FFFFFF;} + .d2-3757067399 .background-color-B1{background-color:#0D32B2;} + .d2-3757067399 .background-color-B2{background-color:#0D32B2;} + .d2-3757067399 .background-color-B3{background-color:#E3E9FD;} + .d2-3757067399 .background-color-B4{background-color:#E3E9FD;} + .d2-3757067399 .background-color-B5{background-color:#EDF0FD;} + .d2-3757067399 .background-color-B6{background-color:#F7F8FE;} + .d2-3757067399 .background-color-AA2{background-color:#4A6FF3;} + .d2-3757067399 .background-color-AA4{background-color:#EDF0FD;} + .d2-3757067399 .background-color-AA5{background-color:#F7F8FE;} + .d2-3757067399 .background-color-AB4{background-color:#EDF0FD;} + .d2-3757067399 .background-color-AB5{background-color:#F7F8FE;} + .d2-3757067399 .color-N1{color:#0A0F25;} + .d2-3757067399 .color-N2{color:#676C7E;} + .d2-3757067399 .color-N3{color:#9499AB;} + .d2-3757067399 .color-N4{color:#CFD2DD;} + .d2-3757067399 .color-N5{color:#DEE1EB;} + .d2-3757067399 .color-N6{color:#EEF1F8;} + .d2-3757067399 .color-N7{color:#FFFFFF;} + .d2-3757067399 .color-B1{color:#0D32B2;} + .d2-3757067399 .color-B2{color:#0D32B2;} + .d2-3757067399 .color-B3{color:#E3E9FD;} + .d2-3757067399 .color-B4{color:#E3E9FD;} + .d2-3757067399 .color-B5{color:#EDF0FD;} + .d2-3757067399 .color-B6{color:#F7F8FE;} + .d2-3757067399 .color-AA2{color:#4A6FF3;} + .d2-3757067399 .color-AA4{color:#EDF0FD;} + .d2-3757067399 .color-AA5{color:#F7F8FE;} + .d2-3757067399 .color-AB4{color:#EDF0FD;} + .d2-3757067399 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3757067399);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3757067399);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3757067399);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3757067399);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3757067399);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3757067399);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3757067399);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3757067399);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3757067399);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3757067399);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3757067399);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3757067399);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3757067399);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3757067399);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3757067399);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3757067399);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3757067399);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3757067399);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>axINTUNQbxINTPK, FKcxINTFK, UNQdxINTPK, FK, UNQexINTno_abbrev, FK, helloystringzSTRINGyofxINT \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_table_constraints_width/elk/board.exp.json b/e2etests/testdata/stable/sql_table_constraints_width/elk/board.exp.json index 5717ef2fb..916aca847 100644 --- a/e2etests/testdata/stable/sql_table_constraints_width/elk/board.exp.json +++ b/e2etests/testdata/stable/sql_table_constraints_width/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -92,6 +101,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -167,6 +177,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -242,6 +253,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -318,6 +330,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -452,6 +465,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -526,6 +540,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/sql_table_constraints_width/elk/sketch.exp.svg b/e2etests/testdata/stable/sql_table_constraints_width/elk/sketch.exp.svg index 1a620ebcd..5b1c809f2 100644 --- a/e2etests/testdata/stable/sql_table_constraints_width/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_table_constraints_width/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -axINTUNQbxINTPK, FKcxINTFK, UNQdxINTPK, FK, UNQexINTno_abbrev, FK, helloystringzSTRINGyofxINT + .d2-4277127988 .fill-N1{fill:#0A0F25;} + .d2-4277127988 .fill-N2{fill:#676C7E;} + .d2-4277127988 .fill-N3{fill:#9499AB;} + .d2-4277127988 .fill-N4{fill:#CFD2DD;} + .d2-4277127988 .fill-N5{fill:#DEE1EB;} + .d2-4277127988 .fill-N6{fill:#EEF1F8;} + .d2-4277127988 .fill-N7{fill:#FFFFFF;} + .d2-4277127988 .fill-B1{fill:#0D32B2;} + .d2-4277127988 .fill-B2{fill:#0D32B2;} + .d2-4277127988 .fill-B3{fill:#E3E9FD;} + .d2-4277127988 .fill-B4{fill:#E3E9FD;} + .d2-4277127988 .fill-B5{fill:#EDF0FD;} + .d2-4277127988 .fill-B6{fill:#F7F8FE;} + .d2-4277127988 .fill-AA2{fill:#4A6FF3;} + .d2-4277127988 .fill-AA4{fill:#EDF0FD;} + .d2-4277127988 .fill-AA5{fill:#F7F8FE;} + .d2-4277127988 .fill-AB4{fill:#EDF0FD;} + .d2-4277127988 .fill-AB5{fill:#F7F8FE;} + .d2-4277127988 .stroke-N1{stroke:#0A0F25;} + .d2-4277127988 .stroke-N2{stroke:#676C7E;} + .d2-4277127988 .stroke-N3{stroke:#9499AB;} + .d2-4277127988 .stroke-N4{stroke:#CFD2DD;} + .d2-4277127988 .stroke-N5{stroke:#DEE1EB;} + .d2-4277127988 .stroke-N6{stroke:#EEF1F8;} + .d2-4277127988 .stroke-N7{stroke:#FFFFFF;} + .d2-4277127988 .stroke-B1{stroke:#0D32B2;} + .d2-4277127988 .stroke-B2{stroke:#0D32B2;} + .d2-4277127988 .stroke-B3{stroke:#E3E9FD;} + .d2-4277127988 .stroke-B4{stroke:#E3E9FD;} + .d2-4277127988 .stroke-B5{stroke:#EDF0FD;} + .d2-4277127988 .stroke-B6{stroke:#F7F8FE;} + .d2-4277127988 .stroke-AA2{stroke:#4A6FF3;} + .d2-4277127988 .stroke-AA4{stroke:#EDF0FD;} + .d2-4277127988 .stroke-AA5{stroke:#F7F8FE;} + .d2-4277127988 .stroke-AB4{stroke:#EDF0FD;} + .d2-4277127988 .stroke-AB5{stroke:#F7F8FE;} + .d2-4277127988 .background-color-N1{background-color:#0A0F25;} + .d2-4277127988 .background-color-N2{background-color:#676C7E;} + .d2-4277127988 .background-color-N3{background-color:#9499AB;} + .d2-4277127988 .background-color-N4{background-color:#CFD2DD;} + .d2-4277127988 .background-color-N5{background-color:#DEE1EB;} + .d2-4277127988 .background-color-N6{background-color:#EEF1F8;} + .d2-4277127988 .background-color-N7{background-color:#FFFFFF;} + .d2-4277127988 .background-color-B1{background-color:#0D32B2;} + .d2-4277127988 .background-color-B2{background-color:#0D32B2;} + .d2-4277127988 .background-color-B3{background-color:#E3E9FD;} + .d2-4277127988 .background-color-B4{background-color:#E3E9FD;} + .d2-4277127988 .background-color-B5{background-color:#EDF0FD;} + .d2-4277127988 .background-color-B6{background-color:#F7F8FE;} + .d2-4277127988 .background-color-AA2{background-color:#4A6FF3;} + .d2-4277127988 .background-color-AA4{background-color:#EDF0FD;} + .d2-4277127988 .background-color-AA5{background-color:#F7F8FE;} + .d2-4277127988 .background-color-AB4{background-color:#EDF0FD;} + .d2-4277127988 .background-color-AB5{background-color:#F7F8FE;} + .d2-4277127988 .color-N1{color:#0A0F25;} + .d2-4277127988 .color-N2{color:#676C7E;} + .d2-4277127988 .color-N3{color:#9499AB;} + .d2-4277127988 .color-N4{color:#CFD2DD;} + .d2-4277127988 .color-N5{color:#DEE1EB;} + .d2-4277127988 .color-N6{color:#EEF1F8;} + .d2-4277127988 .color-N7{color:#FFFFFF;} + .d2-4277127988 .color-B1{color:#0D32B2;} + .d2-4277127988 .color-B2{color:#0D32B2;} + .d2-4277127988 .color-B3{color:#E3E9FD;} + .d2-4277127988 .color-B4{color:#E3E9FD;} + .d2-4277127988 .color-B5{color:#EDF0FD;} + .d2-4277127988 .color-B6{color:#F7F8FE;} + .d2-4277127988 .color-AA2{color:#4A6FF3;} + .d2-4277127988 .color-AA4{color:#EDF0FD;} + .d2-4277127988 .color-AA5{color:#F7F8FE;} + .d2-4277127988 .color-AB4{color:#EDF0FD;} + .d2-4277127988 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4277127988);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4277127988);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4277127988);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4277127988);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4277127988);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4277127988);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4277127988);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4277127988);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4277127988);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4277127988);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4277127988);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4277127988);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4277127988);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4277127988);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4277127988);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4277127988);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4277127988);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4277127988);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>axINTUNQbxINTPK, FKcxINTFK, UNQdxINTPK, FK, UNQexINTno_abbrev, FK, helloystringzSTRINGyofxINT \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_table_row_connections/dagre/board.exp.json b/e2etests/testdata/stable/sql_table_row_connections/dagre/board.exp.json index e9050aa8e..8e4ab24e2 100644 --- a/e2etests/testdata/stable/sql_table_row_connections/dagre/board.exp.json +++ b/e2etests/testdata/stable/sql_table_row_connections/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -92,6 +101,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -236,6 +246,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 231, @@ -283,6 +294,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 231, @@ -323,6 +335,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/sql_table_row_connections/dagre/sketch.exp.svg b/e2etests/testdata/stable/sql_table_row_connections/dagre/sketch.exp.svg index 1829c4a97..fbb033d91 100644 --- a/e2etests/testdata/stable/sql_table_row_connections/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_table_row_connections/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -aidintPKbidintPKa_1intFKa_2intFK + .d2-2091207696 .fill-N1{fill:#0A0F25;} + .d2-2091207696 .fill-N2{fill:#676C7E;} + .d2-2091207696 .fill-N3{fill:#9499AB;} + .d2-2091207696 .fill-N4{fill:#CFD2DD;} + .d2-2091207696 .fill-N5{fill:#DEE1EB;} + .d2-2091207696 .fill-N6{fill:#EEF1F8;} + .d2-2091207696 .fill-N7{fill:#FFFFFF;} + .d2-2091207696 .fill-B1{fill:#0D32B2;} + .d2-2091207696 .fill-B2{fill:#0D32B2;} + .d2-2091207696 .fill-B3{fill:#E3E9FD;} + .d2-2091207696 .fill-B4{fill:#E3E9FD;} + .d2-2091207696 .fill-B5{fill:#EDF0FD;} + .d2-2091207696 .fill-B6{fill:#F7F8FE;} + .d2-2091207696 .fill-AA2{fill:#4A6FF3;} + .d2-2091207696 .fill-AA4{fill:#EDF0FD;} + .d2-2091207696 .fill-AA5{fill:#F7F8FE;} + .d2-2091207696 .fill-AB4{fill:#EDF0FD;} + .d2-2091207696 .fill-AB5{fill:#F7F8FE;} + .d2-2091207696 .stroke-N1{stroke:#0A0F25;} + .d2-2091207696 .stroke-N2{stroke:#676C7E;} + .d2-2091207696 .stroke-N3{stroke:#9499AB;} + .d2-2091207696 .stroke-N4{stroke:#CFD2DD;} + .d2-2091207696 .stroke-N5{stroke:#DEE1EB;} + .d2-2091207696 .stroke-N6{stroke:#EEF1F8;} + .d2-2091207696 .stroke-N7{stroke:#FFFFFF;} + .d2-2091207696 .stroke-B1{stroke:#0D32B2;} + .d2-2091207696 .stroke-B2{stroke:#0D32B2;} + .d2-2091207696 .stroke-B3{stroke:#E3E9FD;} + .d2-2091207696 .stroke-B4{stroke:#E3E9FD;} + .d2-2091207696 .stroke-B5{stroke:#EDF0FD;} + .d2-2091207696 .stroke-B6{stroke:#F7F8FE;} + .d2-2091207696 .stroke-AA2{stroke:#4A6FF3;} + .d2-2091207696 .stroke-AA4{stroke:#EDF0FD;} + .d2-2091207696 .stroke-AA5{stroke:#F7F8FE;} + .d2-2091207696 .stroke-AB4{stroke:#EDF0FD;} + .d2-2091207696 .stroke-AB5{stroke:#F7F8FE;} + .d2-2091207696 .background-color-N1{background-color:#0A0F25;} + .d2-2091207696 .background-color-N2{background-color:#676C7E;} + .d2-2091207696 .background-color-N3{background-color:#9499AB;} + .d2-2091207696 .background-color-N4{background-color:#CFD2DD;} + .d2-2091207696 .background-color-N5{background-color:#DEE1EB;} + .d2-2091207696 .background-color-N6{background-color:#EEF1F8;} + .d2-2091207696 .background-color-N7{background-color:#FFFFFF;} + .d2-2091207696 .background-color-B1{background-color:#0D32B2;} + .d2-2091207696 .background-color-B2{background-color:#0D32B2;} + .d2-2091207696 .background-color-B3{background-color:#E3E9FD;} + .d2-2091207696 .background-color-B4{background-color:#E3E9FD;} + .d2-2091207696 .background-color-B5{background-color:#EDF0FD;} + .d2-2091207696 .background-color-B6{background-color:#F7F8FE;} + .d2-2091207696 .background-color-AA2{background-color:#4A6FF3;} + .d2-2091207696 .background-color-AA4{background-color:#EDF0FD;} + .d2-2091207696 .background-color-AA5{background-color:#F7F8FE;} + .d2-2091207696 .background-color-AB4{background-color:#EDF0FD;} + .d2-2091207696 .background-color-AB5{background-color:#F7F8FE;} + .d2-2091207696 .color-N1{color:#0A0F25;} + .d2-2091207696 .color-N2{color:#676C7E;} + .d2-2091207696 .color-N3{color:#9499AB;} + .d2-2091207696 .color-N4{color:#CFD2DD;} + .d2-2091207696 .color-N5{color:#DEE1EB;} + .d2-2091207696 .color-N6{color:#EEF1F8;} + .d2-2091207696 .color-N7{color:#FFFFFF;} + .d2-2091207696 .color-B1{color:#0D32B2;} + .d2-2091207696 .color-B2{color:#0D32B2;} + .d2-2091207696 .color-B3{color:#E3E9FD;} + .d2-2091207696 .color-B4{color:#E3E9FD;} + .d2-2091207696 .color-B5{color:#EDF0FD;} + .d2-2091207696 .color-B6{color:#F7F8FE;} + .d2-2091207696 .color-AA2{color:#4A6FF3;} + .d2-2091207696 .color-AA4{color:#EDF0FD;} + .d2-2091207696 .color-AA5{color:#F7F8FE;} + .d2-2091207696 .color-AB4{color:#EDF0FD;} + .d2-2091207696 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2091207696);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2091207696);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2091207696);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2091207696);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2091207696);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2091207696);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2091207696);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2091207696);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2091207696);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2091207696);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2091207696);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2091207696);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2091207696);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2091207696);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2091207696);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2091207696);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2091207696);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2091207696);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>aidintPKbidintPKa_1intFKa_2intFK \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_table_row_connections/elk/board.exp.json b/e2etests/testdata/stable/sql_table_row_connections/elk/board.exp.json index d6757f931..a3f8ce7ad 100644 --- a/e2etests/testdata/stable/sql_table_row_connections/elk/board.exp.json +++ b/e2etests/testdata/stable/sql_table_row_connections/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -92,6 +101,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -236,6 +246,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 223, @@ -274,6 +285,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 223, @@ -313,6 +325,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/sql_table_row_connections/elk/sketch.exp.svg b/e2etests/testdata/stable/sql_table_row_connections/elk/sketch.exp.svg index 426e93362..830640640 100644 --- a/e2etests/testdata/stable/sql_table_row_connections/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_table_row_connections/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -aidintPKbidintPKa_1intFKa_2intFK + .d2-750694231 .fill-N1{fill:#0A0F25;} + .d2-750694231 .fill-N2{fill:#676C7E;} + .d2-750694231 .fill-N3{fill:#9499AB;} + .d2-750694231 .fill-N4{fill:#CFD2DD;} + .d2-750694231 .fill-N5{fill:#DEE1EB;} + .d2-750694231 .fill-N6{fill:#EEF1F8;} + .d2-750694231 .fill-N7{fill:#FFFFFF;} + .d2-750694231 .fill-B1{fill:#0D32B2;} + .d2-750694231 .fill-B2{fill:#0D32B2;} + .d2-750694231 .fill-B3{fill:#E3E9FD;} + .d2-750694231 .fill-B4{fill:#E3E9FD;} + .d2-750694231 .fill-B5{fill:#EDF0FD;} + .d2-750694231 .fill-B6{fill:#F7F8FE;} + .d2-750694231 .fill-AA2{fill:#4A6FF3;} + .d2-750694231 .fill-AA4{fill:#EDF0FD;} + .d2-750694231 .fill-AA5{fill:#F7F8FE;} + .d2-750694231 .fill-AB4{fill:#EDF0FD;} + .d2-750694231 .fill-AB5{fill:#F7F8FE;} + .d2-750694231 .stroke-N1{stroke:#0A0F25;} + .d2-750694231 .stroke-N2{stroke:#676C7E;} + .d2-750694231 .stroke-N3{stroke:#9499AB;} + .d2-750694231 .stroke-N4{stroke:#CFD2DD;} + .d2-750694231 .stroke-N5{stroke:#DEE1EB;} + .d2-750694231 .stroke-N6{stroke:#EEF1F8;} + .d2-750694231 .stroke-N7{stroke:#FFFFFF;} + .d2-750694231 .stroke-B1{stroke:#0D32B2;} + .d2-750694231 .stroke-B2{stroke:#0D32B2;} + .d2-750694231 .stroke-B3{stroke:#E3E9FD;} + .d2-750694231 .stroke-B4{stroke:#E3E9FD;} + .d2-750694231 .stroke-B5{stroke:#EDF0FD;} + .d2-750694231 .stroke-B6{stroke:#F7F8FE;} + .d2-750694231 .stroke-AA2{stroke:#4A6FF3;} + .d2-750694231 .stroke-AA4{stroke:#EDF0FD;} + .d2-750694231 .stroke-AA5{stroke:#F7F8FE;} + .d2-750694231 .stroke-AB4{stroke:#EDF0FD;} + .d2-750694231 .stroke-AB5{stroke:#F7F8FE;} + .d2-750694231 .background-color-N1{background-color:#0A0F25;} + .d2-750694231 .background-color-N2{background-color:#676C7E;} + .d2-750694231 .background-color-N3{background-color:#9499AB;} + .d2-750694231 .background-color-N4{background-color:#CFD2DD;} + .d2-750694231 .background-color-N5{background-color:#DEE1EB;} + .d2-750694231 .background-color-N6{background-color:#EEF1F8;} + .d2-750694231 .background-color-N7{background-color:#FFFFFF;} + .d2-750694231 .background-color-B1{background-color:#0D32B2;} + .d2-750694231 .background-color-B2{background-color:#0D32B2;} + .d2-750694231 .background-color-B3{background-color:#E3E9FD;} + .d2-750694231 .background-color-B4{background-color:#E3E9FD;} + .d2-750694231 .background-color-B5{background-color:#EDF0FD;} + .d2-750694231 .background-color-B6{background-color:#F7F8FE;} + .d2-750694231 .background-color-AA2{background-color:#4A6FF3;} + .d2-750694231 .background-color-AA4{background-color:#EDF0FD;} + .d2-750694231 .background-color-AA5{background-color:#F7F8FE;} + .d2-750694231 .background-color-AB4{background-color:#EDF0FD;} + .d2-750694231 .background-color-AB5{background-color:#F7F8FE;} + .d2-750694231 .color-N1{color:#0A0F25;} + .d2-750694231 .color-N2{color:#676C7E;} + .d2-750694231 .color-N3{color:#9499AB;} + .d2-750694231 .color-N4{color:#CFD2DD;} + .d2-750694231 .color-N5{color:#DEE1EB;} + .d2-750694231 .color-N6{color:#EEF1F8;} + .d2-750694231 .color-N7{color:#FFFFFF;} + .d2-750694231 .color-B1{color:#0D32B2;} + .d2-750694231 .color-B2{color:#0D32B2;} + .d2-750694231 .color-B3{color:#E3E9FD;} + .d2-750694231 .color-B4{color:#E3E9FD;} + .d2-750694231 .color-B5{color:#EDF0FD;} + .d2-750694231 .color-B6{color:#F7F8FE;} + .d2-750694231 .color-AA2{color:#4A6FF3;} + .d2-750694231 .color-AA4{color:#EDF0FD;} + .d2-750694231 .color-AA5{color:#F7F8FE;} + .d2-750694231 .color-AB4{color:#EDF0FD;} + .d2-750694231 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-750694231);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-750694231);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-750694231);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-750694231);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-750694231);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-750694231);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-750694231);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-750694231);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-750694231);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-750694231);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-750694231);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-750694231);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-750694231);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-750694231);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-750694231);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-750694231);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-750694231);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-750694231);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>aidintPKbidintPKa_1intFKa_2intFK \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/board.exp.json b/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/board.exp.json index f64da567a..8ef4ea708 100644 --- a/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/board.exp.json +++ b/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -92,6 +101,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -176,6 +186,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 203, @@ -216,6 +227,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/sketch.exp.svg b/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/sketch.exp.svg index 3de1aa580..c02f27dbd 100644 --- a/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -xyPKabFK I like turtles - + .d2-2529204874 .fill-N1{fill:#0A0F25;} + .d2-2529204874 .fill-N2{fill:#676C7E;} + .d2-2529204874 .fill-N3{fill:#9499AB;} + .d2-2529204874 .fill-N4{fill:#CFD2DD;} + .d2-2529204874 .fill-N5{fill:#DEE1EB;} + .d2-2529204874 .fill-N6{fill:#EEF1F8;} + .d2-2529204874 .fill-N7{fill:#FFFFFF;} + .d2-2529204874 .fill-B1{fill:#0D32B2;} + .d2-2529204874 .fill-B2{fill:#0D32B2;} + .d2-2529204874 .fill-B3{fill:#E3E9FD;} + .d2-2529204874 .fill-B4{fill:#E3E9FD;} + .d2-2529204874 .fill-B5{fill:#EDF0FD;} + .d2-2529204874 .fill-B6{fill:#F7F8FE;} + .d2-2529204874 .fill-AA2{fill:#4A6FF3;} + .d2-2529204874 .fill-AA4{fill:#EDF0FD;} + .d2-2529204874 .fill-AA5{fill:#F7F8FE;} + .d2-2529204874 .fill-AB4{fill:#EDF0FD;} + .d2-2529204874 .fill-AB5{fill:#F7F8FE;} + .d2-2529204874 .stroke-N1{stroke:#0A0F25;} + .d2-2529204874 .stroke-N2{stroke:#676C7E;} + .d2-2529204874 .stroke-N3{stroke:#9499AB;} + .d2-2529204874 .stroke-N4{stroke:#CFD2DD;} + .d2-2529204874 .stroke-N5{stroke:#DEE1EB;} + .d2-2529204874 .stroke-N6{stroke:#EEF1F8;} + .d2-2529204874 .stroke-N7{stroke:#FFFFFF;} + .d2-2529204874 .stroke-B1{stroke:#0D32B2;} + .d2-2529204874 .stroke-B2{stroke:#0D32B2;} + .d2-2529204874 .stroke-B3{stroke:#E3E9FD;} + .d2-2529204874 .stroke-B4{stroke:#E3E9FD;} + .d2-2529204874 .stroke-B5{stroke:#EDF0FD;} + .d2-2529204874 .stroke-B6{stroke:#F7F8FE;} + .d2-2529204874 .stroke-AA2{stroke:#4A6FF3;} + .d2-2529204874 .stroke-AA4{stroke:#EDF0FD;} + .d2-2529204874 .stroke-AA5{stroke:#F7F8FE;} + .d2-2529204874 .stroke-AB4{stroke:#EDF0FD;} + .d2-2529204874 .stroke-AB5{stroke:#F7F8FE;} + .d2-2529204874 .background-color-N1{background-color:#0A0F25;} + .d2-2529204874 .background-color-N2{background-color:#676C7E;} + .d2-2529204874 .background-color-N3{background-color:#9499AB;} + .d2-2529204874 .background-color-N4{background-color:#CFD2DD;} + .d2-2529204874 .background-color-N5{background-color:#DEE1EB;} + .d2-2529204874 .background-color-N6{background-color:#EEF1F8;} + .d2-2529204874 .background-color-N7{background-color:#FFFFFF;} + .d2-2529204874 .background-color-B1{background-color:#0D32B2;} + .d2-2529204874 .background-color-B2{background-color:#0D32B2;} + .d2-2529204874 .background-color-B3{background-color:#E3E9FD;} + .d2-2529204874 .background-color-B4{background-color:#E3E9FD;} + .d2-2529204874 .background-color-B5{background-color:#EDF0FD;} + .d2-2529204874 .background-color-B6{background-color:#F7F8FE;} + .d2-2529204874 .background-color-AA2{background-color:#4A6FF3;} + .d2-2529204874 .background-color-AA4{background-color:#EDF0FD;} + .d2-2529204874 .background-color-AA5{background-color:#F7F8FE;} + .d2-2529204874 .background-color-AB4{background-color:#EDF0FD;} + .d2-2529204874 .background-color-AB5{background-color:#F7F8FE;} + .d2-2529204874 .color-N1{color:#0A0F25;} + .d2-2529204874 .color-N2{color:#676C7E;} + .d2-2529204874 .color-N3{color:#9499AB;} + .d2-2529204874 .color-N4{color:#CFD2DD;} + .d2-2529204874 .color-N5{color:#DEE1EB;} + .d2-2529204874 .color-N6{color:#EEF1F8;} + .d2-2529204874 .color-N7{color:#FFFFFF;} + .d2-2529204874 .color-B1{color:#0D32B2;} + .d2-2529204874 .color-B2{color:#0D32B2;} + .d2-2529204874 .color-B3{color:#E3E9FD;} + .d2-2529204874 .color-B4{color:#E3E9FD;} + .d2-2529204874 .color-B5{color:#EDF0FD;} + .d2-2529204874 .color-B6{color:#F7F8FE;} + .d2-2529204874 .color-AA2{color:#4A6FF3;} + .d2-2529204874 .color-AA4{color:#EDF0FD;} + .d2-2529204874 .color-AA5{color:#F7F8FE;} + .d2-2529204874 .color-AB4{color:#EDF0FD;} + .d2-2529204874 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2529204874);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2529204874);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2529204874);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2529204874);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2529204874);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2529204874);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2529204874);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2529204874);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2529204874);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2529204874);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2529204874);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2529204874);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2529204874);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2529204874);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2529204874);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2529204874);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2529204874);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2529204874);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xyPKabFK I like turtles + - + - + \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_table_tooltip_animated/elk/board.exp.json b/e2etests/testdata/stable/sql_table_tooltip_animated/elk/board.exp.json index 17929a530..f4b2052e9 100644 --- a/e2etests/testdata/stable/sql_table_tooltip_animated/elk/board.exp.json +++ b/e2etests/testdata/stable/sql_table_tooltip_animated/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -92,6 +101,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -176,6 +186,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 185, @@ -207,6 +218,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/sql_table_tooltip_animated/elk/sketch.exp.svg b/e2etests/testdata/stable/sql_table_tooltip_animated/elk/sketch.exp.svg index 70d298c2f..ea1939bb0 100644 --- a/e2etests/testdata/stable/sql_table_tooltip_animated/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_table_tooltip_animated/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -xyPKabFK I like turtles - + .d2-2866010181 .fill-N1{fill:#0A0F25;} + .d2-2866010181 .fill-N2{fill:#676C7E;} + .d2-2866010181 .fill-N3{fill:#9499AB;} + .d2-2866010181 .fill-N4{fill:#CFD2DD;} + .d2-2866010181 .fill-N5{fill:#DEE1EB;} + .d2-2866010181 .fill-N6{fill:#EEF1F8;} + .d2-2866010181 .fill-N7{fill:#FFFFFF;} + .d2-2866010181 .fill-B1{fill:#0D32B2;} + .d2-2866010181 .fill-B2{fill:#0D32B2;} + .d2-2866010181 .fill-B3{fill:#E3E9FD;} + .d2-2866010181 .fill-B4{fill:#E3E9FD;} + .d2-2866010181 .fill-B5{fill:#EDF0FD;} + .d2-2866010181 .fill-B6{fill:#F7F8FE;} + .d2-2866010181 .fill-AA2{fill:#4A6FF3;} + .d2-2866010181 .fill-AA4{fill:#EDF0FD;} + .d2-2866010181 .fill-AA5{fill:#F7F8FE;} + .d2-2866010181 .fill-AB4{fill:#EDF0FD;} + .d2-2866010181 .fill-AB5{fill:#F7F8FE;} + .d2-2866010181 .stroke-N1{stroke:#0A0F25;} + .d2-2866010181 .stroke-N2{stroke:#676C7E;} + .d2-2866010181 .stroke-N3{stroke:#9499AB;} + .d2-2866010181 .stroke-N4{stroke:#CFD2DD;} + .d2-2866010181 .stroke-N5{stroke:#DEE1EB;} + .d2-2866010181 .stroke-N6{stroke:#EEF1F8;} + .d2-2866010181 .stroke-N7{stroke:#FFFFFF;} + .d2-2866010181 .stroke-B1{stroke:#0D32B2;} + .d2-2866010181 .stroke-B2{stroke:#0D32B2;} + .d2-2866010181 .stroke-B3{stroke:#E3E9FD;} + .d2-2866010181 .stroke-B4{stroke:#E3E9FD;} + .d2-2866010181 .stroke-B5{stroke:#EDF0FD;} + .d2-2866010181 .stroke-B6{stroke:#F7F8FE;} + .d2-2866010181 .stroke-AA2{stroke:#4A6FF3;} + .d2-2866010181 .stroke-AA4{stroke:#EDF0FD;} + .d2-2866010181 .stroke-AA5{stroke:#F7F8FE;} + .d2-2866010181 .stroke-AB4{stroke:#EDF0FD;} + .d2-2866010181 .stroke-AB5{stroke:#F7F8FE;} + .d2-2866010181 .background-color-N1{background-color:#0A0F25;} + .d2-2866010181 .background-color-N2{background-color:#676C7E;} + .d2-2866010181 .background-color-N3{background-color:#9499AB;} + .d2-2866010181 .background-color-N4{background-color:#CFD2DD;} + .d2-2866010181 .background-color-N5{background-color:#DEE1EB;} + .d2-2866010181 .background-color-N6{background-color:#EEF1F8;} + .d2-2866010181 .background-color-N7{background-color:#FFFFFF;} + .d2-2866010181 .background-color-B1{background-color:#0D32B2;} + .d2-2866010181 .background-color-B2{background-color:#0D32B2;} + .d2-2866010181 .background-color-B3{background-color:#E3E9FD;} + .d2-2866010181 .background-color-B4{background-color:#E3E9FD;} + .d2-2866010181 .background-color-B5{background-color:#EDF0FD;} + .d2-2866010181 .background-color-B6{background-color:#F7F8FE;} + .d2-2866010181 .background-color-AA2{background-color:#4A6FF3;} + .d2-2866010181 .background-color-AA4{background-color:#EDF0FD;} + .d2-2866010181 .background-color-AA5{background-color:#F7F8FE;} + .d2-2866010181 .background-color-AB4{background-color:#EDF0FD;} + .d2-2866010181 .background-color-AB5{background-color:#F7F8FE;} + .d2-2866010181 .color-N1{color:#0A0F25;} + .d2-2866010181 .color-N2{color:#676C7E;} + .d2-2866010181 .color-N3{color:#9499AB;} + .d2-2866010181 .color-N4{color:#CFD2DD;} + .d2-2866010181 .color-N5{color:#DEE1EB;} + .d2-2866010181 .color-N6{color:#EEF1F8;} + .d2-2866010181 .color-N7{color:#FFFFFF;} + .d2-2866010181 .color-B1{color:#0D32B2;} + .d2-2866010181 .color-B2{color:#0D32B2;} + .d2-2866010181 .color-B3{color:#E3E9FD;} + .d2-2866010181 .color-B4{color:#E3E9FD;} + .d2-2866010181 .color-B5{color:#EDF0FD;} + .d2-2866010181 .color-B6{color:#F7F8FE;} + .d2-2866010181 .color-AA2{color:#4A6FF3;} + .d2-2866010181 .color-AA4{color:#EDF0FD;} + .d2-2866010181 .color-AA5{color:#F7F8FE;} + .d2-2866010181 .color-AB4{color:#EDF0FD;} + .d2-2866010181 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2866010181);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2866010181);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2866010181);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2866010181);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2866010181);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2866010181);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2866010181);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2866010181);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2866010181);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2866010181);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2866010181);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2866010181);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2866010181);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2866010181);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2866010181);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2866010181);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2866010181);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2866010181);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xyPKabFK I like turtles + - + - + \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_tables/dagre/board.exp.json b/e2etests/testdata/stable/sql_tables/dagre/board.exp.json index 51aa78d86..4bd152e55 100644 --- a/e2etests/testdata/stable/sql_tables/dagre/board.exp.json +++ b/e2etests/testdata/stable/sql_tables/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -204,6 +213,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -362,6 +372,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -496,6 +507,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -666,6 +678,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 369, @@ -713,6 +726,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 369, @@ -760,6 +774,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 658, @@ -800,6 +815,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg b/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg index 52b45b18d..5eecd3a9f 100644 --- a/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -usersidintPKnamestringemailstringpasswordstringlast_logindatetimeproductsidintPKpricedecimalskustringnamestringordersidintPKuser_idintFKproduct_idintFKshipmentsidintPKorder_idintFKtracking_numberstringstatusstring + .d2-1879882271 .fill-N1{fill:#0A0F25;} + .d2-1879882271 .fill-N2{fill:#676C7E;} + .d2-1879882271 .fill-N3{fill:#9499AB;} + .d2-1879882271 .fill-N4{fill:#CFD2DD;} + .d2-1879882271 .fill-N5{fill:#DEE1EB;} + .d2-1879882271 .fill-N6{fill:#EEF1F8;} + .d2-1879882271 .fill-N7{fill:#FFFFFF;} + .d2-1879882271 .fill-B1{fill:#0D32B2;} + .d2-1879882271 .fill-B2{fill:#0D32B2;} + .d2-1879882271 .fill-B3{fill:#E3E9FD;} + .d2-1879882271 .fill-B4{fill:#E3E9FD;} + .d2-1879882271 .fill-B5{fill:#EDF0FD;} + .d2-1879882271 .fill-B6{fill:#F7F8FE;} + .d2-1879882271 .fill-AA2{fill:#4A6FF3;} + .d2-1879882271 .fill-AA4{fill:#EDF0FD;} + .d2-1879882271 .fill-AA5{fill:#F7F8FE;} + .d2-1879882271 .fill-AB4{fill:#EDF0FD;} + .d2-1879882271 .fill-AB5{fill:#F7F8FE;} + .d2-1879882271 .stroke-N1{stroke:#0A0F25;} + .d2-1879882271 .stroke-N2{stroke:#676C7E;} + .d2-1879882271 .stroke-N3{stroke:#9499AB;} + .d2-1879882271 .stroke-N4{stroke:#CFD2DD;} + .d2-1879882271 .stroke-N5{stroke:#DEE1EB;} + .d2-1879882271 .stroke-N6{stroke:#EEF1F8;} + .d2-1879882271 .stroke-N7{stroke:#FFFFFF;} + .d2-1879882271 .stroke-B1{stroke:#0D32B2;} + .d2-1879882271 .stroke-B2{stroke:#0D32B2;} + .d2-1879882271 .stroke-B3{stroke:#E3E9FD;} + .d2-1879882271 .stroke-B4{stroke:#E3E9FD;} + .d2-1879882271 .stroke-B5{stroke:#EDF0FD;} + .d2-1879882271 .stroke-B6{stroke:#F7F8FE;} + .d2-1879882271 .stroke-AA2{stroke:#4A6FF3;} + .d2-1879882271 .stroke-AA4{stroke:#EDF0FD;} + .d2-1879882271 .stroke-AA5{stroke:#F7F8FE;} + .d2-1879882271 .stroke-AB4{stroke:#EDF0FD;} + .d2-1879882271 .stroke-AB5{stroke:#F7F8FE;} + .d2-1879882271 .background-color-N1{background-color:#0A0F25;} + .d2-1879882271 .background-color-N2{background-color:#676C7E;} + .d2-1879882271 .background-color-N3{background-color:#9499AB;} + .d2-1879882271 .background-color-N4{background-color:#CFD2DD;} + .d2-1879882271 .background-color-N5{background-color:#DEE1EB;} + .d2-1879882271 .background-color-N6{background-color:#EEF1F8;} + .d2-1879882271 .background-color-N7{background-color:#FFFFFF;} + .d2-1879882271 .background-color-B1{background-color:#0D32B2;} + .d2-1879882271 .background-color-B2{background-color:#0D32B2;} + .d2-1879882271 .background-color-B3{background-color:#E3E9FD;} + .d2-1879882271 .background-color-B4{background-color:#E3E9FD;} + .d2-1879882271 .background-color-B5{background-color:#EDF0FD;} + .d2-1879882271 .background-color-B6{background-color:#F7F8FE;} + .d2-1879882271 .background-color-AA2{background-color:#4A6FF3;} + .d2-1879882271 .background-color-AA4{background-color:#EDF0FD;} + .d2-1879882271 .background-color-AA5{background-color:#F7F8FE;} + .d2-1879882271 .background-color-AB4{background-color:#EDF0FD;} + .d2-1879882271 .background-color-AB5{background-color:#F7F8FE;} + .d2-1879882271 .color-N1{color:#0A0F25;} + .d2-1879882271 .color-N2{color:#676C7E;} + .d2-1879882271 .color-N3{color:#9499AB;} + .d2-1879882271 .color-N4{color:#CFD2DD;} + .d2-1879882271 .color-N5{color:#DEE1EB;} + .d2-1879882271 .color-N6{color:#EEF1F8;} + .d2-1879882271 .color-N7{color:#FFFFFF;} + .d2-1879882271 .color-B1{color:#0D32B2;} + .d2-1879882271 .color-B2{color:#0D32B2;} + .d2-1879882271 .color-B3{color:#E3E9FD;} + .d2-1879882271 .color-B4{color:#E3E9FD;} + .d2-1879882271 .color-B5{color:#EDF0FD;} + .d2-1879882271 .color-B6{color:#F7F8FE;} + .d2-1879882271 .color-AA2{color:#4A6FF3;} + .d2-1879882271 .color-AA4{color:#EDF0FD;} + .d2-1879882271 .color-AA5{color:#F7F8FE;} + .d2-1879882271 .color-AB4{color:#EDF0FD;} + .d2-1879882271 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1879882271);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1879882271);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1879882271);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1879882271);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1879882271);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1879882271);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1879882271);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1879882271);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1879882271);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1879882271);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1879882271);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1879882271);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1879882271);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1879882271);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1879882271);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1879882271);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1879882271);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1879882271);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>usersidintPKnamestringemailstringpasswordstringlast_logindatetimeproductsidintPKpricedecimalskustringnamestringordersidintPKuser_idintFKproduct_idintFKshipmentsidintPKorder_idintFKtracking_numberstringstatusstring \ 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 index 6592421bd..6193d4e97 100644 --- a/e2etests/testdata/stable/sql_tables/elk/board.exp.json +++ b/e2etests/testdata/stable/sql_tables/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -204,6 +213,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -362,6 +372,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -496,6 +507,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -666,6 +678,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 343, @@ -712,6 +725,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 343, @@ -758,6 +772,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 620, @@ -789,6 +804,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg b/e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg index 19d1e104c..3c9d19633 100644 --- a/e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -usersidintPKnamestringemailstringpasswordstringlast_logindatetimeproductsidintPKpricedecimalskustringnamestringordersidintPKuser_idintFKproduct_idintFKshipmentsidintPKorder_idintFKtracking_numberstringstatusstring + .d2-520154720 .fill-N1{fill:#0A0F25;} + .d2-520154720 .fill-N2{fill:#676C7E;} + .d2-520154720 .fill-N3{fill:#9499AB;} + .d2-520154720 .fill-N4{fill:#CFD2DD;} + .d2-520154720 .fill-N5{fill:#DEE1EB;} + .d2-520154720 .fill-N6{fill:#EEF1F8;} + .d2-520154720 .fill-N7{fill:#FFFFFF;} + .d2-520154720 .fill-B1{fill:#0D32B2;} + .d2-520154720 .fill-B2{fill:#0D32B2;} + .d2-520154720 .fill-B3{fill:#E3E9FD;} + .d2-520154720 .fill-B4{fill:#E3E9FD;} + .d2-520154720 .fill-B5{fill:#EDF0FD;} + .d2-520154720 .fill-B6{fill:#F7F8FE;} + .d2-520154720 .fill-AA2{fill:#4A6FF3;} + .d2-520154720 .fill-AA4{fill:#EDF0FD;} + .d2-520154720 .fill-AA5{fill:#F7F8FE;} + .d2-520154720 .fill-AB4{fill:#EDF0FD;} + .d2-520154720 .fill-AB5{fill:#F7F8FE;} + .d2-520154720 .stroke-N1{stroke:#0A0F25;} + .d2-520154720 .stroke-N2{stroke:#676C7E;} + .d2-520154720 .stroke-N3{stroke:#9499AB;} + .d2-520154720 .stroke-N4{stroke:#CFD2DD;} + .d2-520154720 .stroke-N5{stroke:#DEE1EB;} + .d2-520154720 .stroke-N6{stroke:#EEF1F8;} + .d2-520154720 .stroke-N7{stroke:#FFFFFF;} + .d2-520154720 .stroke-B1{stroke:#0D32B2;} + .d2-520154720 .stroke-B2{stroke:#0D32B2;} + .d2-520154720 .stroke-B3{stroke:#E3E9FD;} + .d2-520154720 .stroke-B4{stroke:#E3E9FD;} + .d2-520154720 .stroke-B5{stroke:#EDF0FD;} + .d2-520154720 .stroke-B6{stroke:#F7F8FE;} + .d2-520154720 .stroke-AA2{stroke:#4A6FF3;} + .d2-520154720 .stroke-AA4{stroke:#EDF0FD;} + .d2-520154720 .stroke-AA5{stroke:#F7F8FE;} + .d2-520154720 .stroke-AB4{stroke:#EDF0FD;} + .d2-520154720 .stroke-AB5{stroke:#F7F8FE;} + .d2-520154720 .background-color-N1{background-color:#0A0F25;} + .d2-520154720 .background-color-N2{background-color:#676C7E;} + .d2-520154720 .background-color-N3{background-color:#9499AB;} + .d2-520154720 .background-color-N4{background-color:#CFD2DD;} + .d2-520154720 .background-color-N5{background-color:#DEE1EB;} + .d2-520154720 .background-color-N6{background-color:#EEF1F8;} + .d2-520154720 .background-color-N7{background-color:#FFFFFF;} + .d2-520154720 .background-color-B1{background-color:#0D32B2;} + .d2-520154720 .background-color-B2{background-color:#0D32B2;} + .d2-520154720 .background-color-B3{background-color:#E3E9FD;} + .d2-520154720 .background-color-B4{background-color:#E3E9FD;} + .d2-520154720 .background-color-B5{background-color:#EDF0FD;} + .d2-520154720 .background-color-B6{background-color:#F7F8FE;} + .d2-520154720 .background-color-AA2{background-color:#4A6FF3;} + .d2-520154720 .background-color-AA4{background-color:#EDF0FD;} + .d2-520154720 .background-color-AA5{background-color:#F7F8FE;} + .d2-520154720 .background-color-AB4{background-color:#EDF0FD;} + .d2-520154720 .background-color-AB5{background-color:#F7F8FE;} + .d2-520154720 .color-N1{color:#0A0F25;} + .d2-520154720 .color-N2{color:#676C7E;} + .d2-520154720 .color-N3{color:#9499AB;} + .d2-520154720 .color-N4{color:#CFD2DD;} + .d2-520154720 .color-N5{color:#DEE1EB;} + .d2-520154720 .color-N6{color:#EEF1F8;} + .d2-520154720 .color-N7{color:#FFFFFF;} + .d2-520154720 .color-B1{color:#0D32B2;} + .d2-520154720 .color-B2{color:#0D32B2;} + .d2-520154720 .color-B3{color:#E3E9FD;} + .d2-520154720 .color-B4{color:#E3E9FD;} + .d2-520154720 .color-B5{color:#EDF0FD;} + .d2-520154720 .color-B6{color:#F7F8FE;} + .d2-520154720 .color-AA2{color:#4A6FF3;} + .d2-520154720 .color-AA4{color:#EDF0FD;} + .d2-520154720 .color-AA5{color:#F7F8FE;} + .d2-520154720 .color-AB4{color:#EDF0FD;} + .d2-520154720 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-520154720);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-520154720);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-520154720);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-520154720);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-520154720);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-520154720);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-520154720);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-520154720);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-520154720);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-520154720);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-520154720);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-520154720);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-520154720);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-520154720);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-520154720);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-520154720);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-520154720);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-520154720);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>usersidintPKnamestringemailstringpasswordstringlast_logindatetimeproductsidintPKpricedecimalskustringnamestringordersidintPKuser_idintFKproduct_idintFKshipmentsidintPKorder_idintFKtracking_numberstringstatusstring \ No newline at end of file diff --git a/e2etests/testdata/stable/square_3d/dagre/board.exp.json b/e2etests/testdata/stable/square_3d/dagre/board.exp.json index d5c0c9def..8091f63a6 100644 --- a/e2etests/testdata/stable/square_3d/dagre/board.exp.json +++ b/e2etests/testdata/stable/square_3d/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -110,6 +120,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 55.5, @@ -150,6 +161,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/square_3d/dagre/sketch.exp.svg b/e2etests/testdata/stable/square_3d/dagre/sketch.exp.svg index 36df1b3eb..42e2dcaef 100644 --- a/e2etests/testdata/stable/square_3d/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/square_3d/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-549109552 .fill-N1{fill:#0A0F25;} + .d2-549109552 .fill-N2{fill:#676C7E;} + .d2-549109552 .fill-N3{fill:#9499AB;} + .d2-549109552 .fill-N4{fill:#CFD2DD;} + .d2-549109552 .fill-N5{fill:#DEE1EB;} + .d2-549109552 .fill-N6{fill:#EEF1F8;} + .d2-549109552 .fill-N7{fill:#FFFFFF;} + .d2-549109552 .fill-B1{fill:#0D32B2;} + .d2-549109552 .fill-B2{fill:#0D32B2;} + .d2-549109552 .fill-B3{fill:#E3E9FD;} + .d2-549109552 .fill-B4{fill:#E3E9FD;} + .d2-549109552 .fill-B5{fill:#EDF0FD;} + .d2-549109552 .fill-B6{fill:#F7F8FE;} + .d2-549109552 .fill-AA2{fill:#4A6FF3;} + .d2-549109552 .fill-AA4{fill:#EDF0FD;} + .d2-549109552 .fill-AA5{fill:#F7F8FE;} + .d2-549109552 .fill-AB4{fill:#EDF0FD;} + .d2-549109552 .fill-AB5{fill:#F7F8FE;} + .d2-549109552 .stroke-N1{stroke:#0A0F25;} + .d2-549109552 .stroke-N2{stroke:#676C7E;} + .d2-549109552 .stroke-N3{stroke:#9499AB;} + .d2-549109552 .stroke-N4{stroke:#CFD2DD;} + .d2-549109552 .stroke-N5{stroke:#DEE1EB;} + .d2-549109552 .stroke-N6{stroke:#EEF1F8;} + .d2-549109552 .stroke-N7{stroke:#FFFFFF;} + .d2-549109552 .stroke-B1{stroke:#0D32B2;} + .d2-549109552 .stroke-B2{stroke:#0D32B2;} + .d2-549109552 .stroke-B3{stroke:#E3E9FD;} + .d2-549109552 .stroke-B4{stroke:#E3E9FD;} + .d2-549109552 .stroke-B5{stroke:#EDF0FD;} + .d2-549109552 .stroke-B6{stroke:#F7F8FE;} + .d2-549109552 .stroke-AA2{stroke:#4A6FF3;} + .d2-549109552 .stroke-AA4{stroke:#EDF0FD;} + .d2-549109552 .stroke-AA5{stroke:#F7F8FE;} + .d2-549109552 .stroke-AB4{stroke:#EDF0FD;} + .d2-549109552 .stroke-AB5{stroke:#F7F8FE;} + .d2-549109552 .background-color-N1{background-color:#0A0F25;} + .d2-549109552 .background-color-N2{background-color:#676C7E;} + .d2-549109552 .background-color-N3{background-color:#9499AB;} + .d2-549109552 .background-color-N4{background-color:#CFD2DD;} + .d2-549109552 .background-color-N5{background-color:#DEE1EB;} + .d2-549109552 .background-color-N6{background-color:#EEF1F8;} + .d2-549109552 .background-color-N7{background-color:#FFFFFF;} + .d2-549109552 .background-color-B1{background-color:#0D32B2;} + .d2-549109552 .background-color-B2{background-color:#0D32B2;} + .d2-549109552 .background-color-B3{background-color:#E3E9FD;} + .d2-549109552 .background-color-B4{background-color:#E3E9FD;} + .d2-549109552 .background-color-B5{background-color:#EDF0FD;} + .d2-549109552 .background-color-B6{background-color:#F7F8FE;} + .d2-549109552 .background-color-AA2{background-color:#4A6FF3;} + .d2-549109552 .background-color-AA4{background-color:#EDF0FD;} + .d2-549109552 .background-color-AA5{background-color:#F7F8FE;} + .d2-549109552 .background-color-AB4{background-color:#EDF0FD;} + .d2-549109552 .background-color-AB5{background-color:#F7F8FE;} + .d2-549109552 .color-N1{color:#0A0F25;} + .d2-549109552 .color-N2{color:#676C7E;} + .d2-549109552 .color-N3{color:#9499AB;} + .d2-549109552 .color-N4{color:#CFD2DD;} + .d2-549109552 .color-N5{color:#DEE1EB;} + .d2-549109552 .color-N6{color:#EEF1F8;} + .d2-549109552 .color-N7{color:#FFFFFF;} + .d2-549109552 .color-B1{color:#0D32B2;} + .d2-549109552 .color-B2{color:#0D32B2;} + .d2-549109552 .color-B3{color:#E3E9FD;} + .d2-549109552 .color-B4{color:#E3E9FD;} + .d2-549109552 .color-B5{color:#EDF0FD;} + .d2-549109552 .color-B6{color:#F7F8FE;} + .d2-549109552 .color-AA2{color:#4A6FF3;} + .d2-549109552 .color-AA4{color:#EDF0FD;} + .d2-549109552 .color-AA5{color:#F7F8FE;} + .d2-549109552 .color-AB4{color:#EDF0FD;} + .d2-549109552 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-549109552);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-549109552);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-549109552);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-549109552);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-549109552);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-549109552);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-549109552);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-549109552);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-549109552);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-549109552);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-549109552);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-549109552);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-549109552);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-549109552);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-549109552);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-549109552);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-549109552);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-549109552);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> -rectangle +rectangle -square +square - - + + \ No newline at end of file diff --git a/e2etests/testdata/stable/square_3d/elk/board.exp.json b/e2etests/testdata/stable/square_3d/elk/board.exp.json index f8b32dd55..0a2f8af56 100644 --- a/e2etests/testdata/stable/square_3d/elk/board.exp.json +++ b/e2etests/testdata/stable/square_3d/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -110,6 +120,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 75, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/square_3d/elk/sketch.exp.svg b/e2etests/testdata/stable/square_3d/elk/sketch.exp.svg index d2c6b6483..7d7a09880 100644 --- a/e2etests/testdata/stable/square_3d/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/square_3d/elk/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-1486934559 .fill-N1{fill:#0A0F25;} + .d2-1486934559 .fill-N2{fill:#676C7E;} + .d2-1486934559 .fill-N3{fill:#9499AB;} + .d2-1486934559 .fill-N4{fill:#CFD2DD;} + .d2-1486934559 .fill-N5{fill:#DEE1EB;} + .d2-1486934559 .fill-N6{fill:#EEF1F8;} + .d2-1486934559 .fill-N7{fill:#FFFFFF;} + .d2-1486934559 .fill-B1{fill:#0D32B2;} + .d2-1486934559 .fill-B2{fill:#0D32B2;} + .d2-1486934559 .fill-B3{fill:#E3E9FD;} + .d2-1486934559 .fill-B4{fill:#E3E9FD;} + .d2-1486934559 .fill-B5{fill:#EDF0FD;} + .d2-1486934559 .fill-B6{fill:#F7F8FE;} + .d2-1486934559 .fill-AA2{fill:#4A6FF3;} + .d2-1486934559 .fill-AA4{fill:#EDF0FD;} + .d2-1486934559 .fill-AA5{fill:#F7F8FE;} + .d2-1486934559 .fill-AB4{fill:#EDF0FD;} + .d2-1486934559 .fill-AB5{fill:#F7F8FE;} + .d2-1486934559 .stroke-N1{stroke:#0A0F25;} + .d2-1486934559 .stroke-N2{stroke:#676C7E;} + .d2-1486934559 .stroke-N3{stroke:#9499AB;} + .d2-1486934559 .stroke-N4{stroke:#CFD2DD;} + .d2-1486934559 .stroke-N5{stroke:#DEE1EB;} + .d2-1486934559 .stroke-N6{stroke:#EEF1F8;} + .d2-1486934559 .stroke-N7{stroke:#FFFFFF;} + .d2-1486934559 .stroke-B1{stroke:#0D32B2;} + .d2-1486934559 .stroke-B2{stroke:#0D32B2;} + .d2-1486934559 .stroke-B3{stroke:#E3E9FD;} + .d2-1486934559 .stroke-B4{stroke:#E3E9FD;} + .d2-1486934559 .stroke-B5{stroke:#EDF0FD;} + .d2-1486934559 .stroke-B6{stroke:#F7F8FE;} + .d2-1486934559 .stroke-AA2{stroke:#4A6FF3;} + .d2-1486934559 .stroke-AA4{stroke:#EDF0FD;} + .d2-1486934559 .stroke-AA5{stroke:#F7F8FE;} + .d2-1486934559 .stroke-AB4{stroke:#EDF0FD;} + .d2-1486934559 .stroke-AB5{stroke:#F7F8FE;} + .d2-1486934559 .background-color-N1{background-color:#0A0F25;} + .d2-1486934559 .background-color-N2{background-color:#676C7E;} + .d2-1486934559 .background-color-N3{background-color:#9499AB;} + .d2-1486934559 .background-color-N4{background-color:#CFD2DD;} + .d2-1486934559 .background-color-N5{background-color:#DEE1EB;} + .d2-1486934559 .background-color-N6{background-color:#EEF1F8;} + .d2-1486934559 .background-color-N7{background-color:#FFFFFF;} + .d2-1486934559 .background-color-B1{background-color:#0D32B2;} + .d2-1486934559 .background-color-B2{background-color:#0D32B2;} + .d2-1486934559 .background-color-B3{background-color:#E3E9FD;} + .d2-1486934559 .background-color-B4{background-color:#E3E9FD;} + .d2-1486934559 .background-color-B5{background-color:#EDF0FD;} + .d2-1486934559 .background-color-B6{background-color:#F7F8FE;} + .d2-1486934559 .background-color-AA2{background-color:#4A6FF3;} + .d2-1486934559 .background-color-AA4{background-color:#EDF0FD;} + .d2-1486934559 .background-color-AA5{background-color:#F7F8FE;} + .d2-1486934559 .background-color-AB4{background-color:#EDF0FD;} + .d2-1486934559 .background-color-AB5{background-color:#F7F8FE;} + .d2-1486934559 .color-N1{color:#0A0F25;} + .d2-1486934559 .color-N2{color:#676C7E;} + .d2-1486934559 .color-N3{color:#9499AB;} + .d2-1486934559 .color-N4{color:#CFD2DD;} + .d2-1486934559 .color-N5{color:#DEE1EB;} + .d2-1486934559 .color-N6{color:#EEF1F8;} + .d2-1486934559 .color-N7{color:#FFFFFF;} + .d2-1486934559 .color-B1{color:#0D32B2;} + .d2-1486934559 .color-B2{color:#0D32B2;} + .d2-1486934559 .color-B3{color:#E3E9FD;} + .d2-1486934559 .color-B4{color:#E3E9FD;} + .d2-1486934559 .color-B5{color:#EDF0FD;} + .d2-1486934559 .color-B6{color:#F7F8FE;} + .d2-1486934559 .color-AA2{color:#4A6FF3;} + .d2-1486934559 .color-AA4{color:#EDF0FD;} + .d2-1486934559 .color-AA5{color:#F7F8FE;} + .d2-1486934559 .color-AB4{color:#EDF0FD;} + .d2-1486934559 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1486934559);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1486934559);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1486934559);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1486934559);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1486934559);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1486934559);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1486934559);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1486934559);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1486934559);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1486934559);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1486934559);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1486934559);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1486934559);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1486934559);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1486934559);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1486934559);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1486934559);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1486934559);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> -rectangle +rectangle -square +square - - + + \ No newline at end of file diff --git a/e2etests/testdata/stable/straight_hierarchy_container/dagre/board.exp.json b/e2etests/testdata/stable/straight_hierarchy_container/dagre/board.exp.json index 2589ae801..0768135c1 100644 --- a/e2etests/testdata/stable/straight_hierarchy_container/dagre/board.exp.json +++ b/e2etests/testdata/stable/straight_hierarchy_container/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -715,6 +740,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -756,6 +782,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -797,6 +824,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -838,6 +866,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -879,6 +908,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -920,6 +950,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -961,6 +992,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1002,6 +1034,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1053,6 +1086,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 239.5, @@ -1100,6 +1134,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 86.5, @@ -1147,6 +1182,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 392.5, @@ -1194,6 +1230,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 86.5, @@ -1253,6 +1290,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 392.5, @@ -1312,6 +1350,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 239.5, @@ -1371,6 +1410,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 86.5, @@ -1430,6 +1470,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 239.5, @@ -1489,6 +1530,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 392.5, @@ -1548,6 +1590,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 86.5, @@ -1619,6 +1662,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 239.5, @@ -1690,6 +1734,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 392.5, @@ -1754,6 +1799,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/straight_hierarchy_container/dagre/sketch.exp.svg b/e2etests/testdata/stable/straight_hierarchy_container/dagre/sketch.exp.svg index 59d19c00c..edad93a0c 100644 --- a/e2etests/testdata/stable/straight_hierarchy_container/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/straight_hierarchy_container/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc + .d2-2751386371 .fill-N1{fill:#0A0F25;} + .d2-2751386371 .fill-N2{fill:#676C7E;} + .d2-2751386371 .fill-N3{fill:#9499AB;} + .d2-2751386371 .fill-N4{fill:#CFD2DD;} + .d2-2751386371 .fill-N5{fill:#DEE1EB;} + .d2-2751386371 .fill-N6{fill:#EEF1F8;} + .d2-2751386371 .fill-N7{fill:#FFFFFF;} + .d2-2751386371 .fill-B1{fill:#0D32B2;} + .d2-2751386371 .fill-B2{fill:#0D32B2;} + .d2-2751386371 .fill-B3{fill:#E3E9FD;} + .d2-2751386371 .fill-B4{fill:#E3E9FD;} + .d2-2751386371 .fill-B5{fill:#EDF0FD;} + .d2-2751386371 .fill-B6{fill:#F7F8FE;} + .d2-2751386371 .fill-AA2{fill:#4A6FF3;} + .d2-2751386371 .fill-AA4{fill:#EDF0FD;} + .d2-2751386371 .fill-AA5{fill:#F7F8FE;} + .d2-2751386371 .fill-AB4{fill:#EDF0FD;} + .d2-2751386371 .fill-AB5{fill:#F7F8FE;} + .d2-2751386371 .stroke-N1{stroke:#0A0F25;} + .d2-2751386371 .stroke-N2{stroke:#676C7E;} + .d2-2751386371 .stroke-N3{stroke:#9499AB;} + .d2-2751386371 .stroke-N4{stroke:#CFD2DD;} + .d2-2751386371 .stroke-N5{stroke:#DEE1EB;} + .d2-2751386371 .stroke-N6{stroke:#EEF1F8;} + .d2-2751386371 .stroke-N7{stroke:#FFFFFF;} + .d2-2751386371 .stroke-B1{stroke:#0D32B2;} + .d2-2751386371 .stroke-B2{stroke:#0D32B2;} + .d2-2751386371 .stroke-B3{stroke:#E3E9FD;} + .d2-2751386371 .stroke-B4{stroke:#E3E9FD;} + .d2-2751386371 .stroke-B5{stroke:#EDF0FD;} + .d2-2751386371 .stroke-B6{stroke:#F7F8FE;} + .d2-2751386371 .stroke-AA2{stroke:#4A6FF3;} + .d2-2751386371 .stroke-AA4{stroke:#EDF0FD;} + .d2-2751386371 .stroke-AA5{stroke:#F7F8FE;} + .d2-2751386371 .stroke-AB4{stroke:#EDF0FD;} + .d2-2751386371 .stroke-AB5{stroke:#F7F8FE;} + .d2-2751386371 .background-color-N1{background-color:#0A0F25;} + .d2-2751386371 .background-color-N2{background-color:#676C7E;} + .d2-2751386371 .background-color-N3{background-color:#9499AB;} + .d2-2751386371 .background-color-N4{background-color:#CFD2DD;} + .d2-2751386371 .background-color-N5{background-color:#DEE1EB;} + .d2-2751386371 .background-color-N6{background-color:#EEF1F8;} + .d2-2751386371 .background-color-N7{background-color:#FFFFFF;} + .d2-2751386371 .background-color-B1{background-color:#0D32B2;} + .d2-2751386371 .background-color-B2{background-color:#0D32B2;} + .d2-2751386371 .background-color-B3{background-color:#E3E9FD;} + .d2-2751386371 .background-color-B4{background-color:#E3E9FD;} + .d2-2751386371 .background-color-B5{background-color:#EDF0FD;} + .d2-2751386371 .background-color-B6{background-color:#F7F8FE;} + .d2-2751386371 .background-color-AA2{background-color:#4A6FF3;} + .d2-2751386371 .background-color-AA4{background-color:#EDF0FD;} + .d2-2751386371 .background-color-AA5{background-color:#F7F8FE;} + .d2-2751386371 .background-color-AB4{background-color:#EDF0FD;} + .d2-2751386371 .background-color-AB5{background-color:#F7F8FE;} + .d2-2751386371 .color-N1{color:#0A0F25;} + .d2-2751386371 .color-N2{color:#676C7E;} + .d2-2751386371 .color-N3{color:#9499AB;} + .d2-2751386371 .color-N4{color:#CFD2DD;} + .d2-2751386371 .color-N5{color:#DEE1EB;} + .d2-2751386371 .color-N6{color:#EEF1F8;} + .d2-2751386371 .color-N7{color:#FFFFFF;} + .d2-2751386371 .color-B1{color:#0D32B2;} + .d2-2751386371 .color-B2{color:#0D32B2;} + .d2-2751386371 .color-B3{color:#E3E9FD;} + .d2-2751386371 .color-B4{color:#E3E9FD;} + .d2-2751386371 .color-B5{color:#EDF0FD;} + .d2-2751386371 .color-B6{color:#F7F8FE;} + .d2-2751386371 .color-AA2{color:#4A6FF3;} + .d2-2751386371 .color-AA4{color:#EDF0FD;} + .d2-2751386371 .color-AA5{color:#F7F8FE;} + .d2-2751386371 .color-AB4{color:#EDF0FD;} + .d2-2751386371 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2751386371);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2751386371);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2751386371);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2751386371);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2751386371);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2751386371);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2751386371);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2751386371);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2751386371);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2751386371);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2751386371);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2751386371);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2751386371);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2751386371);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2751386371);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2751386371);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2751386371);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2751386371);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/straight_hierarchy_container/elk/board.exp.json b/e2etests/testdata/stable/straight_hierarchy_container/elk/board.exp.json index 9818a0916..73bdb8fb9 100644 --- a/e2etests/testdata/stable/straight_hierarchy_container/elk/board.exp.json +++ b/e2etests/testdata/stable/straight_hierarchy_container/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -715,6 +740,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -756,6 +782,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -797,6 +824,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -838,6 +866,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -879,6 +908,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -920,6 +950,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -961,6 +992,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1002,6 +1034,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1053,6 +1086,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 204.25, @@ -1091,6 +1125,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 277.25, @@ -1129,6 +1164,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 350.25, @@ -1167,6 +1203,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 277.25, @@ -1213,6 +1250,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 350.25, @@ -1259,6 +1297,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 204.25, @@ -1305,6 +1344,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 88.5, @@ -1351,6 +1391,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 261.5, @@ -1397,6 +1438,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 484.5, @@ -1435,6 +1477,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 138.5, @@ -1473,6 +1516,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 211.5, @@ -1519,6 +1563,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 484.5, @@ -1550,6 +1595,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/straight_hierarchy_container/elk/sketch.exp.svg b/e2etests/testdata/stable/straight_hierarchy_container/elk/sketch.exp.svg index 9d128cea3..4d61f6b51 100644 --- a/e2etests/testdata/stable/straight_hierarchy_container/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/straight_hierarchy_container/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc + .d2-401741027 .fill-N1{fill:#0A0F25;} + .d2-401741027 .fill-N2{fill:#676C7E;} + .d2-401741027 .fill-N3{fill:#9499AB;} + .d2-401741027 .fill-N4{fill:#CFD2DD;} + .d2-401741027 .fill-N5{fill:#DEE1EB;} + .d2-401741027 .fill-N6{fill:#EEF1F8;} + .d2-401741027 .fill-N7{fill:#FFFFFF;} + .d2-401741027 .fill-B1{fill:#0D32B2;} + .d2-401741027 .fill-B2{fill:#0D32B2;} + .d2-401741027 .fill-B3{fill:#E3E9FD;} + .d2-401741027 .fill-B4{fill:#E3E9FD;} + .d2-401741027 .fill-B5{fill:#EDF0FD;} + .d2-401741027 .fill-B6{fill:#F7F8FE;} + .d2-401741027 .fill-AA2{fill:#4A6FF3;} + .d2-401741027 .fill-AA4{fill:#EDF0FD;} + .d2-401741027 .fill-AA5{fill:#F7F8FE;} + .d2-401741027 .fill-AB4{fill:#EDF0FD;} + .d2-401741027 .fill-AB5{fill:#F7F8FE;} + .d2-401741027 .stroke-N1{stroke:#0A0F25;} + .d2-401741027 .stroke-N2{stroke:#676C7E;} + .d2-401741027 .stroke-N3{stroke:#9499AB;} + .d2-401741027 .stroke-N4{stroke:#CFD2DD;} + .d2-401741027 .stroke-N5{stroke:#DEE1EB;} + .d2-401741027 .stroke-N6{stroke:#EEF1F8;} + .d2-401741027 .stroke-N7{stroke:#FFFFFF;} + .d2-401741027 .stroke-B1{stroke:#0D32B2;} + .d2-401741027 .stroke-B2{stroke:#0D32B2;} + .d2-401741027 .stroke-B3{stroke:#E3E9FD;} + .d2-401741027 .stroke-B4{stroke:#E3E9FD;} + .d2-401741027 .stroke-B5{stroke:#EDF0FD;} + .d2-401741027 .stroke-B6{stroke:#F7F8FE;} + .d2-401741027 .stroke-AA2{stroke:#4A6FF3;} + .d2-401741027 .stroke-AA4{stroke:#EDF0FD;} + .d2-401741027 .stroke-AA5{stroke:#F7F8FE;} + .d2-401741027 .stroke-AB4{stroke:#EDF0FD;} + .d2-401741027 .stroke-AB5{stroke:#F7F8FE;} + .d2-401741027 .background-color-N1{background-color:#0A0F25;} + .d2-401741027 .background-color-N2{background-color:#676C7E;} + .d2-401741027 .background-color-N3{background-color:#9499AB;} + .d2-401741027 .background-color-N4{background-color:#CFD2DD;} + .d2-401741027 .background-color-N5{background-color:#DEE1EB;} + .d2-401741027 .background-color-N6{background-color:#EEF1F8;} + .d2-401741027 .background-color-N7{background-color:#FFFFFF;} + .d2-401741027 .background-color-B1{background-color:#0D32B2;} + .d2-401741027 .background-color-B2{background-color:#0D32B2;} + .d2-401741027 .background-color-B3{background-color:#E3E9FD;} + .d2-401741027 .background-color-B4{background-color:#E3E9FD;} + .d2-401741027 .background-color-B5{background-color:#EDF0FD;} + .d2-401741027 .background-color-B6{background-color:#F7F8FE;} + .d2-401741027 .background-color-AA2{background-color:#4A6FF3;} + .d2-401741027 .background-color-AA4{background-color:#EDF0FD;} + .d2-401741027 .background-color-AA5{background-color:#F7F8FE;} + .d2-401741027 .background-color-AB4{background-color:#EDF0FD;} + .d2-401741027 .background-color-AB5{background-color:#F7F8FE;} + .d2-401741027 .color-N1{color:#0A0F25;} + .d2-401741027 .color-N2{color:#676C7E;} + .d2-401741027 .color-N3{color:#9499AB;} + .d2-401741027 .color-N4{color:#CFD2DD;} + .d2-401741027 .color-N5{color:#DEE1EB;} + .d2-401741027 .color-N6{color:#EEF1F8;} + .d2-401741027 .color-N7{color:#FFFFFF;} + .d2-401741027 .color-B1{color:#0D32B2;} + .d2-401741027 .color-B2{color:#0D32B2;} + .d2-401741027 .color-B3{color:#E3E9FD;} + .d2-401741027 .color-B4{color:#E3E9FD;} + .d2-401741027 .color-B5{color:#EDF0FD;} + .d2-401741027 .color-B6{color:#F7F8FE;} + .d2-401741027 .color-AA2{color:#4A6FF3;} + .d2-401741027 .color-AA4{color:#EDF0FD;} + .d2-401741027 .color-AA5{color:#F7F8FE;} + .d2-401741027 .color-AB4{color:#EDF0FD;} + .d2-401741027 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-401741027);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-401741027);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-401741027);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-401741027);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-401741027);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-401741027);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-401741027);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-401741027);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-401741027);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-401741027);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-401741027);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-401741027);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-401741027);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-401741027);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-401741027);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-401741027);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-401741027);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-401741027);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/stylish/dagre/board.exp.json b/e2etests/testdata/stable/stylish/dagre/board.exp.json index 49405db61..3f01dbe73 100644 --- a/e2etests/testdata/stable/stylish/dagre/board.exp.json +++ b/e2etests/testdata/stable/stylish/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "orange", "stroke": "#53C0D8", + "animated": false, "shadow": true, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "red", "stroke": "black", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -111,6 +121,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 27, @@ -151,6 +162,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/stylish/dagre/sketch.exp.svg b/e2etests/testdata/stable/stylish/dagre/sketch.exp.svg index 57f91f360..29a50ae31 100644 --- a/e2etests/testdata/stable/stylish/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/stylish/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-2711636613 .fill-N1{fill:#0A0F25;} + .d2-2711636613 .fill-N2{fill:#676C7E;} + .d2-2711636613 .fill-N3{fill:#9499AB;} + .d2-2711636613 .fill-N4{fill:#CFD2DD;} + .d2-2711636613 .fill-N5{fill:#DEE1EB;} + .d2-2711636613 .fill-N6{fill:#EEF1F8;} + .d2-2711636613 .fill-N7{fill:#FFFFFF;} + .d2-2711636613 .fill-B1{fill:#0D32B2;} + .d2-2711636613 .fill-B2{fill:#0D32B2;} + .d2-2711636613 .fill-B3{fill:#E3E9FD;} + .d2-2711636613 .fill-B4{fill:#E3E9FD;} + .d2-2711636613 .fill-B5{fill:#EDF0FD;} + .d2-2711636613 .fill-B6{fill:#F7F8FE;} + .d2-2711636613 .fill-AA2{fill:#4A6FF3;} + .d2-2711636613 .fill-AA4{fill:#EDF0FD;} + .d2-2711636613 .fill-AA5{fill:#F7F8FE;} + .d2-2711636613 .fill-AB4{fill:#EDF0FD;} + .d2-2711636613 .fill-AB5{fill:#F7F8FE;} + .d2-2711636613 .stroke-N1{stroke:#0A0F25;} + .d2-2711636613 .stroke-N2{stroke:#676C7E;} + .d2-2711636613 .stroke-N3{stroke:#9499AB;} + .d2-2711636613 .stroke-N4{stroke:#CFD2DD;} + .d2-2711636613 .stroke-N5{stroke:#DEE1EB;} + .d2-2711636613 .stroke-N6{stroke:#EEF1F8;} + .d2-2711636613 .stroke-N7{stroke:#FFFFFF;} + .d2-2711636613 .stroke-B1{stroke:#0D32B2;} + .d2-2711636613 .stroke-B2{stroke:#0D32B2;} + .d2-2711636613 .stroke-B3{stroke:#E3E9FD;} + .d2-2711636613 .stroke-B4{stroke:#E3E9FD;} + .d2-2711636613 .stroke-B5{stroke:#EDF0FD;} + .d2-2711636613 .stroke-B6{stroke:#F7F8FE;} + .d2-2711636613 .stroke-AA2{stroke:#4A6FF3;} + .d2-2711636613 .stroke-AA4{stroke:#EDF0FD;} + .d2-2711636613 .stroke-AA5{stroke:#F7F8FE;} + .d2-2711636613 .stroke-AB4{stroke:#EDF0FD;} + .d2-2711636613 .stroke-AB5{stroke:#F7F8FE;} + .d2-2711636613 .background-color-N1{background-color:#0A0F25;} + .d2-2711636613 .background-color-N2{background-color:#676C7E;} + .d2-2711636613 .background-color-N3{background-color:#9499AB;} + .d2-2711636613 .background-color-N4{background-color:#CFD2DD;} + .d2-2711636613 .background-color-N5{background-color:#DEE1EB;} + .d2-2711636613 .background-color-N6{background-color:#EEF1F8;} + .d2-2711636613 .background-color-N7{background-color:#FFFFFF;} + .d2-2711636613 .background-color-B1{background-color:#0D32B2;} + .d2-2711636613 .background-color-B2{background-color:#0D32B2;} + .d2-2711636613 .background-color-B3{background-color:#E3E9FD;} + .d2-2711636613 .background-color-B4{background-color:#E3E9FD;} + .d2-2711636613 .background-color-B5{background-color:#EDF0FD;} + .d2-2711636613 .background-color-B6{background-color:#F7F8FE;} + .d2-2711636613 .background-color-AA2{background-color:#4A6FF3;} + .d2-2711636613 .background-color-AA4{background-color:#EDF0FD;} + .d2-2711636613 .background-color-AA5{background-color:#F7F8FE;} + .d2-2711636613 .background-color-AB4{background-color:#EDF0FD;} + .d2-2711636613 .background-color-AB5{background-color:#F7F8FE;} + .d2-2711636613 .color-N1{color:#0A0F25;} + .d2-2711636613 .color-N2{color:#676C7E;} + .d2-2711636613 .color-N3{color:#9499AB;} + .d2-2711636613 .color-N4{color:#CFD2DD;} + .d2-2711636613 .color-N5{color:#DEE1EB;} + .d2-2711636613 .color-N6{color:#EEF1F8;} + .d2-2711636613 .color-N7{color:#FFFFFF;} + .d2-2711636613 .color-B1{color:#0D32B2;} + .d2-2711636613 .color-B2{color:#0D32B2;} + .d2-2711636613 .color-B3{color:#E3E9FD;} + .d2-2711636613 .color-B4{color:#E3E9FD;} + .d2-2711636613 .color-B5{color:#EDF0FD;} + .d2-2711636613 .color-B6{color:#F7F8FE;} + .d2-2711636613 .color-AA2{color:#4A6FF3;} + .d2-2711636613 .color-AA4{color:#EDF0FD;} + .d2-2711636613 .color-AA5{color:#F7F8FE;} + .d2-2711636613 .color-AB4{color:#EDF0FD;} + .d2-2711636613 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2711636613);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2711636613);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2711636613);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2711636613);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2711636613);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2711636613);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2711636613);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2711636613);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2711636613);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2711636613);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2711636613);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2711636613);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2711636613);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2711636613);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2711636613);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2711636613);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2711636613);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2711636613);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> @@ -104,11 +104,11 @@ -x +x -y in style +y in style - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/stylish/elk/board.exp.json b/e2etests/testdata/stable/stylish/elk/board.exp.json index fd54b847b..def47e436 100644 --- a/e2etests/testdata/stable/stylish/elk/board.exp.json +++ b/e2etests/testdata/stable/stylish/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "orange", "stroke": "#53C0D8", + "animated": false, "shadow": true, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "red", "stroke": "black", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -111,6 +121,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 46.5, @@ -142,6 +153,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/stylish/elk/sketch.exp.svg b/e2etests/testdata/stable/stylish/elk/sketch.exp.svg index a55e85089..0360882d1 100644 --- a/e2etests/testdata/stable/stylish/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/stylish/elk/sketch.exp.svg @@ -1,16 +1,16 @@ - + .d2-2373291838 .fill-N1{fill:#0A0F25;} + .d2-2373291838 .fill-N2{fill:#676C7E;} + .d2-2373291838 .fill-N3{fill:#9499AB;} + .d2-2373291838 .fill-N4{fill:#CFD2DD;} + .d2-2373291838 .fill-N5{fill:#DEE1EB;} + .d2-2373291838 .fill-N6{fill:#EEF1F8;} + .d2-2373291838 .fill-N7{fill:#FFFFFF;} + .d2-2373291838 .fill-B1{fill:#0D32B2;} + .d2-2373291838 .fill-B2{fill:#0D32B2;} + .d2-2373291838 .fill-B3{fill:#E3E9FD;} + .d2-2373291838 .fill-B4{fill:#E3E9FD;} + .d2-2373291838 .fill-B5{fill:#EDF0FD;} + .d2-2373291838 .fill-B6{fill:#F7F8FE;} + .d2-2373291838 .fill-AA2{fill:#4A6FF3;} + .d2-2373291838 .fill-AA4{fill:#EDF0FD;} + .d2-2373291838 .fill-AA5{fill:#F7F8FE;} + .d2-2373291838 .fill-AB4{fill:#EDF0FD;} + .d2-2373291838 .fill-AB5{fill:#F7F8FE;} + .d2-2373291838 .stroke-N1{stroke:#0A0F25;} + .d2-2373291838 .stroke-N2{stroke:#676C7E;} + .d2-2373291838 .stroke-N3{stroke:#9499AB;} + .d2-2373291838 .stroke-N4{stroke:#CFD2DD;} + .d2-2373291838 .stroke-N5{stroke:#DEE1EB;} + .d2-2373291838 .stroke-N6{stroke:#EEF1F8;} + .d2-2373291838 .stroke-N7{stroke:#FFFFFF;} + .d2-2373291838 .stroke-B1{stroke:#0D32B2;} + .d2-2373291838 .stroke-B2{stroke:#0D32B2;} + .d2-2373291838 .stroke-B3{stroke:#E3E9FD;} + .d2-2373291838 .stroke-B4{stroke:#E3E9FD;} + .d2-2373291838 .stroke-B5{stroke:#EDF0FD;} + .d2-2373291838 .stroke-B6{stroke:#F7F8FE;} + .d2-2373291838 .stroke-AA2{stroke:#4A6FF3;} + .d2-2373291838 .stroke-AA4{stroke:#EDF0FD;} + .d2-2373291838 .stroke-AA5{stroke:#F7F8FE;} + .d2-2373291838 .stroke-AB4{stroke:#EDF0FD;} + .d2-2373291838 .stroke-AB5{stroke:#F7F8FE;} + .d2-2373291838 .background-color-N1{background-color:#0A0F25;} + .d2-2373291838 .background-color-N2{background-color:#676C7E;} + .d2-2373291838 .background-color-N3{background-color:#9499AB;} + .d2-2373291838 .background-color-N4{background-color:#CFD2DD;} + .d2-2373291838 .background-color-N5{background-color:#DEE1EB;} + .d2-2373291838 .background-color-N6{background-color:#EEF1F8;} + .d2-2373291838 .background-color-N7{background-color:#FFFFFF;} + .d2-2373291838 .background-color-B1{background-color:#0D32B2;} + .d2-2373291838 .background-color-B2{background-color:#0D32B2;} + .d2-2373291838 .background-color-B3{background-color:#E3E9FD;} + .d2-2373291838 .background-color-B4{background-color:#E3E9FD;} + .d2-2373291838 .background-color-B5{background-color:#EDF0FD;} + .d2-2373291838 .background-color-B6{background-color:#F7F8FE;} + .d2-2373291838 .background-color-AA2{background-color:#4A6FF3;} + .d2-2373291838 .background-color-AA4{background-color:#EDF0FD;} + .d2-2373291838 .background-color-AA5{background-color:#F7F8FE;} + .d2-2373291838 .background-color-AB4{background-color:#EDF0FD;} + .d2-2373291838 .background-color-AB5{background-color:#F7F8FE;} + .d2-2373291838 .color-N1{color:#0A0F25;} + .d2-2373291838 .color-N2{color:#676C7E;} + .d2-2373291838 .color-N3{color:#9499AB;} + .d2-2373291838 .color-N4{color:#CFD2DD;} + .d2-2373291838 .color-N5{color:#DEE1EB;} + .d2-2373291838 .color-N6{color:#EEF1F8;} + .d2-2373291838 .color-N7{color:#FFFFFF;} + .d2-2373291838 .color-B1{color:#0D32B2;} + .d2-2373291838 .color-B2{color:#0D32B2;} + .d2-2373291838 .color-B3{color:#E3E9FD;} + .d2-2373291838 .color-B4{color:#E3E9FD;} + .d2-2373291838 .color-B5{color:#EDF0FD;} + .d2-2373291838 .color-B6{color:#F7F8FE;} + .d2-2373291838 .color-AA2{color:#4A6FF3;} + .d2-2373291838 .color-AA4{color:#EDF0FD;} + .d2-2373291838 .color-AA5{color:#F7F8FE;} + .d2-2373291838 .color-AB4{color:#EDF0FD;} + .d2-2373291838 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2373291838);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2373291838);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2373291838);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2373291838);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2373291838);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2373291838);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2373291838);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2373291838);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2373291838);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2373291838);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2373291838);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2373291838);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2373291838);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2373291838);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2373291838);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2373291838);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2373291838);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2373291838);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> @@ -104,11 +104,11 @@ -x +x -y in style +y in style - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/teleport_grid/dagre/board.exp.json b/e2etests/testdata/stable/teleport_grid/dagre/board.exp.json index eb7a994e1..3619f3b83 100644 --- a/e2etests/testdata/stable/teleport_grid/dagre/board.exp.json +++ b/e2etests/testdata/stable/teleport_grid/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -98,6 +108,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -139,6 +150,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -180,6 +192,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -221,6 +234,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -274,6 +288,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -327,6 +342,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -380,6 +396,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -421,6 +438,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -462,6 +480,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -503,6 +522,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -544,6 +564,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -585,6 +606,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -625,6 +647,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -678,6 +701,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -731,6 +755,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -784,6 +809,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -825,6 +851,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -866,6 +893,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -907,6 +935,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -960,6 +989,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1013,6 +1043,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1066,6 +1097,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1119,6 +1151,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1172,6 +1205,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1225,6 +1259,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1288,6 +1323,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 301.5, @@ -1335,6 +1371,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 808.5, @@ -1382,6 +1419,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1528.72998046875, @@ -1429,6 +1467,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1553, @@ -1476,6 +1515,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1553, @@ -1523,6 +1563,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1553, @@ -1563,6 +1604,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/teleport_grid/dagre/sketch.exp.svg b/e2etests/testdata/stable/teleport_grid/dagre/sketch.exp.svg index 6b5beecbb..9d89e1876 100644 --- a/e2etests/testdata/stable/teleport_grid/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/teleport_grid/dagre/sketch.exp.svg @@ -1,27 +1,27 @@ -TeleportJust-in-time Access viaInfrastructureIndentity ProviderEngineersMachinesHTTPS://> kubectl> tsh> apiDB Clients

    Identity Native Proxy

    -
    Audit LogCert AuthoritySlackMattermostJiraPagerdutyEmailsshKubernetesMy SQLMongoDBPSQLWindows all connections audited and logged +TeleportJust-in-time Access viaInfrastructureIndentity ProviderEngineersMachinesHTTPS://> kubectl> tsh> apiDB Clients

    Identity Native Proxy

    +
    Audit LogCert AuthoritySlackMattermostJiraPagerdutyEmailsshKubernetesMy SQLMongoDBPSQLWindows all connections audited and logged - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/teleport_grid/elk/board.exp.json b/e2etests/testdata/stable/teleport_grid/elk/board.exp.json index 45520c576..9d684c6e4 100644 --- a/e2etests/testdata/stable/teleport_grid/elk/board.exp.json +++ b/e2etests/testdata/stable/teleport_grid/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -98,6 +108,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -139,6 +150,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -180,6 +192,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -221,6 +234,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -274,6 +288,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -327,6 +342,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -380,6 +396,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -421,6 +438,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -462,6 +480,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -503,6 +522,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -544,6 +564,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -585,6 +606,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -625,6 +647,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -678,6 +701,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -731,6 +755,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -784,6 +809,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -825,6 +851,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -866,6 +893,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -907,6 +935,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -960,6 +989,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1013,6 +1043,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1066,6 +1097,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1119,6 +1151,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1172,6 +1205,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1225,6 +1259,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1288,6 +1323,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 314, @@ -1326,6 +1362,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 620, @@ -1364,6 +1401,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1163, @@ -1410,6 +1448,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1163, @@ -1448,6 +1487,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1163, @@ -1494,6 +1534,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1163, @@ -1533,6 +1574,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/teleport_grid/elk/sketch.exp.svg b/e2etests/testdata/stable/teleport_grid/elk/sketch.exp.svg index 4692466f4..576b18fb6 100644 --- a/e2etests/testdata/stable/teleport_grid/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/teleport_grid/elk/sketch.exp.svg @@ -1,27 +1,27 @@ -TeleportJust-in-time Access viaInfrastructureIndentity ProviderEngineersMachinesHTTPS://> kubectl> tsh> apiDB Clients

    Identity Native Proxy

    -
    Audit LogCert AuthoritySlackMattermostJiraPagerdutyEmailsshKubernetesMy SQLMongoDBPSQLWindows all connections audited and logged +TeleportJust-in-time Access viaInfrastructureIndentity ProviderEngineersMachinesHTTPS://> kubectl> tsh> apiDB Clients

    Identity Native Proxy

    +
    Audit LogCert AuthoritySlackMattermostJiraPagerdutyEmailsshKubernetesMy SQLMongoDBPSQLWindows all connections audited and logged - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + +     \ No newline at end of file diff --git a/e2etests/testdata/stable/text_font_sizes/dagre/board.exp.json b/e2etests/testdata/stable/text_font_sizes/dagre/board.exp.json index 2f358182b..e1e7a361e 100644 --- a/e2etests/testdata/stable/text_font_sizes/dagre/board.exp.json +++ b/e2etests/testdata/stable/text_font_sizes/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -98,6 +108,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -148,6 +159,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 67.5, @@ -195,6 +207,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 262, @@ -235,6 +248,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/text_font_sizes/dagre/sketch.exp.svg b/e2etests/testdata/stable/text_font_sizes/dagre/sketch.exp.svg index 80e8a553a..2af4cc903 100644 --- a/e2etests/testdata/stable/text_font_sizes/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/text_font_sizes/dagre/sketch.exp.svg @@ -1,26 +1,26 @@ -bearmama bearpapa bear + .d2-2865751059 .fill-N1{fill:#0A0F25;} + .d2-2865751059 .fill-N2{fill:#676C7E;} + .d2-2865751059 .fill-N3{fill:#9499AB;} + .d2-2865751059 .fill-N4{fill:#CFD2DD;} + .d2-2865751059 .fill-N5{fill:#DEE1EB;} + .d2-2865751059 .fill-N6{fill:#EEF1F8;} + .d2-2865751059 .fill-N7{fill:#FFFFFF;} + .d2-2865751059 .fill-B1{fill:#0D32B2;} + .d2-2865751059 .fill-B2{fill:#0D32B2;} + .d2-2865751059 .fill-B3{fill:#E3E9FD;} + .d2-2865751059 .fill-B4{fill:#E3E9FD;} + .d2-2865751059 .fill-B5{fill:#EDF0FD;} + .d2-2865751059 .fill-B6{fill:#F7F8FE;} + .d2-2865751059 .fill-AA2{fill:#4A6FF3;} + .d2-2865751059 .fill-AA4{fill:#EDF0FD;} + .d2-2865751059 .fill-AA5{fill:#F7F8FE;} + .d2-2865751059 .fill-AB4{fill:#EDF0FD;} + .d2-2865751059 .fill-AB5{fill:#F7F8FE;} + .d2-2865751059 .stroke-N1{stroke:#0A0F25;} + .d2-2865751059 .stroke-N2{stroke:#676C7E;} + .d2-2865751059 .stroke-N3{stroke:#9499AB;} + .d2-2865751059 .stroke-N4{stroke:#CFD2DD;} + .d2-2865751059 .stroke-N5{stroke:#DEE1EB;} + .d2-2865751059 .stroke-N6{stroke:#EEF1F8;} + .d2-2865751059 .stroke-N7{stroke:#FFFFFF;} + .d2-2865751059 .stroke-B1{stroke:#0D32B2;} + .d2-2865751059 .stroke-B2{stroke:#0D32B2;} + .d2-2865751059 .stroke-B3{stroke:#E3E9FD;} + .d2-2865751059 .stroke-B4{stroke:#E3E9FD;} + .d2-2865751059 .stroke-B5{stroke:#EDF0FD;} + .d2-2865751059 .stroke-B6{stroke:#F7F8FE;} + .d2-2865751059 .stroke-AA2{stroke:#4A6FF3;} + .d2-2865751059 .stroke-AA4{stroke:#EDF0FD;} + .d2-2865751059 .stroke-AA5{stroke:#F7F8FE;} + .d2-2865751059 .stroke-AB4{stroke:#EDF0FD;} + .d2-2865751059 .stroke-AB5{stroke:#F7F8FE;} + .d2-2865751059 .background-color-N1{background-color:#0A0F25;} + .d2-2865751059 .background-color-N2{background-color:#676C7E;} + .d2-2865751059 .background-color-N3{background-color:#9499AB;} + .d2-2865751059 .background-color-N4{background-color:#CFD2DD;} + .d2-2865751059 .background-color-N5{background-color:#DEE1EB;} + .d2-2865751059 .background-color-N6{background-color:#EEF1F8;} + .d2-2865751059 .background-color-N7{background-color:#FFFFFF;} + .d2-2865751059 .background-color-B1{background-color:#0D32B2;} + .d2-2865751059 .background-color-B2{background-color:#0D32B2;} + .d2-2865751059 .background-color-B3{background-color:#E3E9FD;} + .d2-2865751059 .background-color-B4{background-color:#E3E9FD;} + .d2-2865751059 .background-color-B5{background-color:#EDF0FD;} + .d2-2865751059 .background-color-B6{background-color:#F7F8FE;} + .d2-2865751059 .background-color-AA2{background-color:#4A6FF3;} + .d2-2865751059 .background-color-AA4{background-color:#EDF0FD;} + .d2-2865751059 .background-color-AA5{background-color:#F7F8FE;} + .d2-2865751059 .background-color-AB4{background-color:#EDF0FD;} + .d2-2865751059 .background-color-AB5{background-color:#F7F8FE;} + .d2-2865751059 .color-N1{color:#0A0F25;} + .d2-2865751059 .color-N2{color:#676C7E;} + .d2-2865751059 .color-N3{color:#9499AB;} + .d2-2865751059 .color-N4{color:#CFD2DD;} + .d2-2865751059 .color-N5{color:#DEE1EB;} + .d2-2865751059 .color-N6{color:#EEF1F8;} + .d2-2865751059 .color-N7{color:#FFFFFF;} + .d2-2865751059 .color-B1{color:#0D32B2;} + .d2-2865751059 .color-B2{color:#0D32B2;} + .d2-2865751059 .color-B3{color:#E3E9FD;} + .d2-2865751059 .color-B4{color:#E3E9FD;} + .d2-2865751059 .color-B5{color:#EDF0FD;} + .d2-2865751059 .color-B6{color:#F7F8FE;} + .d2-2865751059 .color-AA2{color:#4A6FF3;} + .d2-2865751059 .color-AA4{color:#EDF0FD;} + .d2-2865751059 .color-AA5{color:#F7F8FE;} + .d2-2865751059 .color-AB4{color:#EDF0FD;} + .d2-2865751059 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2865751059);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2865751059);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2865751059);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2865751059);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2865751059);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2865751059);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2865751059);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2865751059);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2865751059);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2865751059);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2865751059);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2865751059);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2865751059);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2865751059);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2865751059);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2865751059);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2865751059);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2865751059);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>bearmama bearpapa bear - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/text_font_sizes/elk/board.exp.json b/e2etests/testdata/stable/text_font_sizes/elk/board.exp.json index 9c0d32fe8..3d624e683 100644 --- a/e2etests/testdata/stable/text_font_sizes/elk/board.exp.json +++ b/e2etests/testdata/stable/text_font_sizes/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -98,6 +108,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -148,6 +159,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 79.5, @@ -194,6 +206,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 234, @@ -233,6 +246,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/text_font_sizes/elk/sketch.exp.svg b/e2etests/testdata/stable/text_font_sizes/elk/sketch.exp.svg index e4d7bab86..75e2dfd60 100644 --- a/e2etests/testdata/stable/text_font_sizes/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/text_font_sizes/elk/sketch.exp.svg @@ -1,26 +1,26 @@ -bearmama bearpapa bear + .d2-2699761263 .fill-N1{fill:#0A0F25;} + .d2-2699761263 .fill-N2{fill:#676C7E;} + .d2-2699761263 .fill-N3{fill:#9499AB;} + .d2-2699761263 .fill-N4{fill:#CFD2DD;} + .d2-2699761263 .fill-N5{fill:#DEE1EB;} + .d2-2699761263 .fill-N6{fill:#EEF1F8;} + .d2-2699761263 .fill-N7{fill:#FFFFFF;} + .d2-2699761263 .fill-B1{fill:#0D32B2;} + .d2-2699761263 .fill-B2{fill:#0D32B2;} + .d2-2699761263 .fill-B3{fill:#E3E9FD;} + .d2-2699761263 .fill-B4{fill:#E3E9FD;} + .d2-2699761263 .fill-B5{fill:#EDF0FD;} + .d2-2699761263 .fill-B6{fill:#F7F8FE;} + .d2-2699761263 .fill-AA2{fill:#4A6FF3;} + .d2-2699761263 .fill-AA4{fill:#EDF0FD;} + .d2-2699761263 .fill-AA5{fill:#F7F8FE;} + .d2-2699761263 .fill-AB4{fill:#EDF0FD;} + .d2-2699761263 .fill-AB5{fill:#F7F8FE;} + .d2-2699761263 .stroke-N1{stroke:#0A0F25;} + .d2-2699761263 .stroke-N2{stroke:#676C7E;} + .d2-2699761263 .stroke-N3{stroke:#9499AB;} + .d2-2699761263 .stroke-N4{stroke:#CFD2DD;} + .d2-2699761263 .stroke-N5{stroke:#DEE1EB;} + .d2-2699761263 .stroke-N6{stroke:#EEF1F8;} + .d2-2699761263 .stroke-N7{stroke:#FFFFFF;} + .d2-2699761263 .stroke-B1{stroke:#0D32B2;} + .d2-2699761263 .stroke-B2{stroke:#0D32B2;} + .d2-2699761263 .stroke-B3{stroke:#E3E9FD;} + .d2-2699761263 .stroke-B4{stroke:#E3E9FD;} + .d2-2699761263 .stroke-B5{stroke:#EDF0FD;} + .d2-2699761263 .stroke-B6{stroke:#F7F8FE;} + .d2-2699761263 .stroke-AA2{stroke:#4A6FF3;} + .d2-2699761263 .stroke-AA4{stroke:#EDF0FD;} + .d2-2699761263 .stroke-AA5{stroke:#F7F8FE;} + .d2-2699761263 .stroke-AB4{stroke:#EDF0FD;} + .d2-2699761263 .stroke-AB5{stroke:#F7F8FE;} + .d2-2699761263 .background-color-N1{background-color:#0A0F25;} + .d2-2699761263 .background-color-N2{background-color:#676C7E;} + .d2-2699761263 .background-color-N3{background-color:#9499AB;} + .d2-2699761263 .background-color-N4{background-color:#CFD2DD;} + .d2-2699761263 .background-color-N5{background-color:#DEE1EB;} + .d2-2699761263 .background-color-N6{background-color:#EEF1F8;} + .d2-2699761263 .background-color-N7{background-color:#FFFFFF;} + .d2-2699761263 .background-color-B1{background-color:#0D32B2;} + .d2-2699761263 .background-color-B2{background-color:#0D32B2;} + .d2-2699761263 .background-color-B3{background-color:#E3E9FD;} + .d2-2699761263 .background-color-B4{background-color:#E3E9FD;} + .d2-2699761263 .background-color-B5{background-color:#EDF0FD;} + .d2-2699761263 .background-color-B6{background-color:#F7F8FE;} + .d2-2699761263 .background-color-AA2{background-color:#4A6FF3;} + .d2-2699761263 .background-color-AA4{background-color:#EDF0FD;} + .d2-2699761263 .background-color-AA5{background-color:#F7F8FE;} + .d2-2699761263 .background-color-AB4{background-color:#EDF0FD;} + .d2-2699761263 .background-color-AB5{background-color:#F7F8FE;} + .d2-2699761263 .color-N1{color:#0A0F25;} + .d2-2699761263 .color-N2{color:#676C7E;} + .d2-2699761263 .color-N3{color:#9499AB;} + .d2-2699761263 .color-N4{color:#CFD2DD;} + .d2-2699761263 .color-N5{color:#DEE1EB;} + .d2-2699761263 .color-N6{color:#EEF1F8;} + .d2-2699761263 .color-N7{color:#FFFFFF;} + .d2-2699761263 .color-B1{color:#0D32B2;} + .d2-2699761263 .color-B2{color:#0D32B2;} + .d2-2699761263 .color-B3{color:#E3E9FD;} + .d2-2699761263 .color-B4{color:#E3E9FD;} + .d2-2699761263 .color-B5{color:#EDF0FD;} + .d2-2699761263 .color-B6{color:#F7F8FE;} + .d2-2699761263 .color-AA2{color:#4A6FF3;} + .d2-2699761263 .color-AA4{color:#EDF0FD;} + .d2-2699761263 .color-AA5{color:#F7F8FE;} + .d2-2699761263 .color-AB4{color:#EDF0FD;} + .d2-2699761263 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2699761263);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2699761263);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2699761263);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2699761263);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2699761263);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2699761263);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2699761263);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2699761263);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2699761263);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2699761263);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2699761263);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2699761263);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2699761263);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2699761263);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2699761263);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2699761263);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2699761263);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2699761263);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>bearmama bearpapa bear - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/transparent_3d/dagre/board.exp.json b/e2etests/testdata/stable/transparent_3d/dagre/board.exp.json index 9610888ec..f87b172a1 100644 --- a/e2etests/testdata/stable/transparent_3d/dagre/board.exp.json +++ b/e2etests/testdata/stable/transparent_3d/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "orange", "stroke": "#53C0D8", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -61,6 +70,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/transparent_3d/dagre/sketch.exp.svg b/e2etests/testdata/stable/transparent_3d/dagre/sketch.exp.svg index 8e2ff0a82..485de7222 100644 --- a/e2etests/testdata/stable/transparent_3d/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/transparent_3d/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-3650778271 .fill-N1{fill:#0A0F25;} + .d2-3650778271 .fill-N2{fill:#676C7E;} + .d2-3650778271 .fill-N3{fill:#9499AB;} + .d2-3650778271 .fill-N4{fill:#CFD2DD;} + .d2-3650778271 .fill-N5{fill:#DEE1EB;} + .d2-3650778271 .fill-N6{fill:#EEF1F8;} + .d2-3650778271 .fill-N7{fill:#FFFFFF;} + .d2-3650778271 .fill-B1{fill:#0D32B2;} + .d2-3650778271 .fill-B2{fill:#0D32B2;} + .d2-3650778271 .fill-B3{fill:#E3E9FD;} + .d2-3650778271 .fill-B4{fill:#E3E9FD;} + .d2-3650778271 .fill-B5{fill:#EDF0FD;} + .d2-3650778271 .fill-B6{fill:#F7F8FE;} + .d2-3650778271 .fill-AA2{fill:#4A6FF3;} + .d2-3650778271 .fill-AA4{fill:#EDF0FD;} + .d2-3650778271 .fill-AA5{fill:#F7F8FE;} + .d2-3650778271 .fill-AB4{fill:#EDF0FD;} + .d2-3650778271 .fill-AB5{fill:#F7F8FE;} + .d2-3650778271 .stroke-N1{stroke:#0A0F25;} + .d2-3650778271 .stroke-N2{stroke:#676C7E;} + .d2-3650778271 .stroke-N3{stroke:#9499AB;} + .d2-3650778271 .stroke-N4{stroke:#CFD2DD;} + .d2-3650778271 .stroke-N5{stroke:#DEE1EB;} + .d2-3650778271 .stroke-N6{stroke:#EEF1F8;} + .d2-3650778271 .stroke-N7{stroke:#FFFFFF;} + .d2-3650778271 .stroke-B1{stroke:#0D32B2;} + .d2-3650778271 .stroke-B2{stroke:#0D32B2;} + .d2-3650778271 .stroke-B3{stroke:#E3E9FD;} + .d2-3650778271 .stroke-B4{stroke:#E3E9FD;} + .d2-3650778271 .stroke-B5{stroke:#EDF0FD;} + .d2-3650778271 .stroke-B6{stroke:#F7F8FE;} + .d2-3650778271 .stroke-AA2{stroke:#4A6FF3;} + .d2-3650778271 .stroke-AA4{stroke:#EDF0FD;} + .d2-3650778271 .stroke-AA5{stroke:#F7F8FE;} + .d2-3650778271 .stroke-AB4{stroke:#EDF0FD;} + .d2-3650778271 .stroke-AB5{stroke:#F7F8FE;} + .d2-3650778271 .background-color-N1{background-color:#0A0F25;} + .d2-3650778271 .background-color-N2{background-color:#676C7E;} + .d2-3650778271 .background-color-N3{background-color:#9499AB;} + .d2-3650778271 .background-color-N4{background-color:#CFD2DD;} + .d2-3650778271 .background-color-N5{background-color:#DEE1EB;} + .d2-3650778271 .background-color-N6{background-color:#EEF1F8;} + .d2-3650778271 .background-color-N7{background-color:#FFFFFF;} + .d2-3650778271 .background-color-B1{background-color:#0D32B2;} + .d2-3650778271 .background-color-B2{background-color:#0D32B2;} + .d2-3650778271 .background-color-B3{background-color:#E3E9FD;} + .d2-3650778271 .background-color-B4{background-color:#E3E9FD;} + .d2-3650778271 .background-color-B5{background-color:#EDF0FD;} + .d2-3650778271 .background-color-B6{background-color:#F7F8FE;} + .d2-3650778271 .background-color-AA2{background-color:#4A6FF3;} + .d2-3650778271 .background-color-AA4{background-color:#EDF0FD;} + .d2-3650778271 .background-color-AA5{background-color:#F7F8FE;} + .d2-3650778271 .background-color-AB4{background-color:#EDF0FD;} + .d2-3650778271 .background-color-AB5{background-color:#F7F8FE;} + .d2-3650778271 .color-N1{color:#0A0F25;} + .d2-3650778271 .color-N2{color:#676C7E;} + .d2-3650778271 .color-N3{color:#9499AB;} + .d2-3650778271 .color-N4{color:#CFD2DD;} + .d2-3650778271 .color-N5{color:#DEE1EB;} + .d2-3650778271 .color-N6{color:#EEF1F8;} + .d2-3650778271 .color-N7{color:#FFFFFF;} + .d2-3650778271 .color-B1{color:#0D32B2;} + .d2-3650778271 .color-B2{color:#0D32B2;} + .d2-3650778271 .color-B3{color:#E3E9FD;} + .d2-3650778271 .color-B4{color:#E3E9FD;} + .d2-3650778271 .color-B5{color:#EDF0FD;} + .d2-3650778271 .color-B6{color:#F7F8FE;} + .d2-3650778271 .color-AA2{color:#4A6FF3;} + .d2-3650778271 .color-AA4{color:#EDF0FD;} + .d2-3650778271 .color-AA5{color:#F7F8FE;} + .d2-3650778271 .color-AB4{color:#EDF0FD;} + .d2-3650778271 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3650778271);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3650778271);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3650778271);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3650778271);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3650778271);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3650778271);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3650778271);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3650778271);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3650778271);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3650778271);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3650778271);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3650778271);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3650778271);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3650778271);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3650778271);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3650778271);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3650778271);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3650778271);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> -cube +cube - + \ No newline at end of file diff --git a/e2etests/testdata/stable/transparent_3d/elk/board.exp.json b/e2etests/testdata/stable/transparent_3d/elk/board.exp.json index 217bcd057..26860cc16 100644 --- a/e2etests/testdata/stable/transparent_3d/elk/board.exp.json +++ b/e2etests/testdata/stable/transparent_3d/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "orange", "stroke": "#53C0D8", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -61,6 +70,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/transparent_3d/elk/sketch.exp.svg b/e2etests/testdata/stable/transparent_3d/elk/sketch.exp.svg index 5776696eb..7ecb311a6 100644 --- a/e2etests/testdata/stable/transparent_3d/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/transparent_3d/elk/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-813443583 .fill-N1{fill:#0A0F25;} + .d2-813443583 .fill-N2{fill:#676C7E;} + .d2-813443583 .fill-N3{fill:#9499AB;} + .d2-813443583 .fill-N4{fill:#CFD2DD;} + .d2-813443583 .fill-N5{fill:#DEE1EB;} + .d2-813443583 .fill-N6{fill:#EEF1F8;} + .d2-813443583 .fill-N7{fill:#FFFFFF;} + .d2-813443583 .fill-B1{fill:#0D32B2;} + .d2-813443583 .fill-B2{fill:#0D32B2;} + .d2-813443583 .fill-B3{fill:#E3E9FD;} + .d2-813443583 .fill-B4{fill:#E3E9FD;} + .d2-813443583 .fill-B5{fill:#EDF0FD;} + .d2-813443583 .fill-B6{fill:#F7F8FE;} + .d2-813443583 .fill-AA2{fill:#4A6FF3;} + .d2-813443583 .fill-AA4{fill:#EDF0FD;} + .d2-813443583 .fill-AA5{fill:#F7F8FE;} + .d2-813443583 .fill-AB4{fill:#EDF0FD;} + .d2-813443583 .fill-AB5{fill:#F7F8FE;} + .d2-813443583 .stroke-N1{stroke:#0A0F25;} + .d2-813443583 .stroke-N2{stroke:#676C7E;} + .d2-813443583 .stroke-N3{stroke:#9499AB;} + .d2-813443583 .stroke-N4{stroke:#CFD2DD;} + .d2-813443583 .stroke-N5{stroke:#DEE1EB;} + .d2-813443583 .stroke-N6{stroke:#EEF1F8;} + .d2-813443583 .stroke-N7{stroke:#FFFFFF;} + .d2-813443583 .stroke-B1{stroke:#0D32B2;} + .d2-813443583 .stroke-B2{stroke:#0D32B2;} + .d2-813443583 .stroke-B3{stroke:#E3E9FD;} + .d2-813443583 .stroke-B4{stroke:#E3E9FD;} + .d2-813443583 .stroke-B5{stroke:#EDF0FD;} + .d2-813443583 .stroke-B6{stroke:#F7F8FE;} + .d2-813443583 .stroke-AA2{stroke:#4A6FF3;} + .d2-813443583 .stroke-AA4{stroke:#EDF0FD;} + .d2-813443583 .stroke-AA5{stroke:#F7F8FE;} + .d2-813443583 .stroke-AB4{stroke:#EDF0FD;} + .d2-813443583 .stroke-AB5{stroke:#F7F8FE;} + .d2-813443583 .background-color-N1{background-color:#0A0F25;} + .d2-813443583 .background-color-N2{background-color:#676C7E;} + .d2-813443583 .background-color-N3{background-color:#9499AB;} + .d2-813443583 .background-color-N4{background-color:#CFD2DD;} + .d2-813443583 .background-color-N5{background-color:#DEE1EB;} + .d2-813443583 .background-color-N6{background-color:#EEF1F8;} + .d2-813443583 .background-color-N7{background-color:#FFFFFF;} + .d2-813443583 .background-color-B1{background-color:#0D32B2;} + .d2-813443583 .background-color-B2{background-color:#0D32B2;} + .d2-813443583 .background-color-B3{background-color:#E3E9FD;} + .d2-813443583 .background-color-B4{background-color:#E3E9FD;} + .d2-813443583 .background-color-B5{background-color:#EDF0FD;} + .d2-813443583 .background-color-B6{background-color:#F7F8FE;} + .d2-813443583 .background-color-AA2{background-color:#4A6FF3;} + .d2-813443583 .background-color-AA4{background-color:#EDF0FD;} + .d2-813443583 .background-color-AA5{background-color:#F7F8FE;} + .d2-813443583 .background-color-AB4{background-color:#EDF0FD;} + .d2-813443583 .background-color-AB5{background-color:#F7F8FE;} + .d2-813443583 .color-N1{color:#0A0F25;} + .d2-813443583 .color-N2{color:#676C7E;} + .d2-813443583 .color-N3{color:#9499AB;} + .d2-813443583 .color-N4{color:#CFD2DD;} + .d2-813443583 .color-N5{color:#DEE1EB;} + .d2-813443583 .color-N6{color:#EEF1F8;} + .d2-813443583 .color-N7{color:#FFFFFF;} + .d2-813443583 .color-B1{color:#0D32B2;} + .d2-813443583 .color-B2{color:#0D32B2;} + .d2-813443583 .color-B3{color:#E3E9FD;} + .d2-813443583 .color-B4{color:#E3E9FD;} + .d2-813443583 .color-B5{color:#EDF0FD;} + .d2-813443583 .color-B6{color:#F7F8FE;} + .d2-813443583 .color-AA2{color:#4A6FF3;} + .d2-813443583 .color-AA4{color:#EDF0FD;} + .d2-813443583 .color-AA5{color:#F7F8FE;} + .d2-813443583 .color-AB4{color:#EDF0FD;} + .d2-813443583 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-813443583);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-813443583);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-813443583);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-813443583);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-813443583);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-813443583);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-813443583);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-813443583);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-813443583);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-813443583);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-813443583);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-813443583);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-813443583);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-813443583);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-813443583);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-813443583);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-813443583);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-813443583);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> -cube +cube - + \ No newline at end of file diff --git a/e2etests/testdata/stable/unfilled_triangle/dagre/board.exp.json b/e2etests/testdata/stable/unfilled_triangle/dagre/board.exp.json index 52742a5c9..66af4e320 100644 --- a/e2etests/testdata/stable/unfilled_triangle/dagre/board.exp.json +++ b/e2etests/testdata/stable/unfilled_triangle/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -192,6 +204,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 56, @@ -239,6 +252,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 55, @@ -279,6 +293,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/unfilled_triangle/dagre/sketch.exp.svg b/e2etests/testdata/stable/unfilled_triangle/dagre/sketch.exp.svg index 3bfadeded..e0da26c94 100644 --- a/e2etests/testdata/stable/unfilled_triangle/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/unfilled_triangle/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -ABCD defaulttriangle + .d2-3344043497 .fill-N1{fill:#0A0F25;} + .d2-3344043497 .fill-N2{fill:#676C7E;} + .d2-3344043497 .fill-N3{fill:#9499AB;} + .d2-3344043497 .fill-N4{fill:#CFD2DD;} + .d2-3344043497 .fill-N5{fill:#DEE1EB;} + .d2-3344043497 .fill-N6{fill:#EEF1F8;} + .d2-3344043497 .fill-N7{fill:#FFFFFF;} + .d2-3344043497 .fill-B1{fill:#0D32B2;} + .d2-3344043497 .fill-B2{fill:#0D32B2;} + .d2-3344043497 .fill-B3{fill:#E3E9FD;} + .d2-3344043497 .fill-B4{fill:#E3E9FD;} + .d2-3344043497 .fill-B5{fill:#EDF0FD;} + .d2-3344043497 .fill-B6{fill:#F7F8FE;} + .d2-3344043497 .fill-AA2{fill:#4A6FF3;} + .d2-3344043497 .fill-AA4{fill:#EDF0FD;} + .d2-3344043497 .fill-AA5{fill:#F7F8FE;} + .d2-3344043497 .fill-AB4{fill:#EDF0FD;} + .d2-3344043497 .fill-AB5{fill:#F7F8FE;} + .d2-3344043497 .stroke-N1{stroke:#0A0F25;} + .d2-3344043497 .stroke-N2{stroke:#676C7E;} + .d2-3344043497 .stroke-N3{stroke:#9499AB;} + .d2-3344043497 .stroke-N4{stroke:#CFD2DD;} + .d2-3344043497 .stroke-N5{stroke:#DEE1EB;} + .d2-3344043497 .stroke-N6{stroke:#EEF1F8;} + .d2-3344043497 .stroke-N7{stroke:#FFFFFF;} + .d2-3344043497 .stroke-B1{stroke:#0D32B2;} + .d2-3344043497 .stroke-B2{stroke:#0D32B2;} + .d2-3344043497 .stroke-B3{stroke:#E3E9FD;} + .d2-3344043497 .stroke-B4{stroke:#E3E9FD;} + .d2-3344043497 .stroke-B5{stroke:#EDF0FD;} + .d2-3344043497 .stroke-B6{stroke:#F7F8FE;} + .d2-3344043497 .stroke-AA2{stroke:#4A6FF3;} + .d2-3344043497 .stroke-AA4{stroke:#EDF0FD;} + .d2-3344043497 .stroke-AA5{stroke:#F7F8FE;} + .d2-3344043497 .stroke-AB4{stroke:#EDF0FD;} + .d2-3344043497 .stroke-AB5{stroke:#F7F8FE;} + .d2-3344043497 .background-color-N1{background-color:#0A0F25;} + .d2-3344043497 .background-color-N2{background-color:#676C7E;} + .d2-3344043497 .background-color-N3{background-color:#9499AB;} + .d2-3344043497 .background-color-N4{background-color:#CFD2DD;} + .d2-3344043497 .background-color-N5{background-color:#DEE1EB;} + .d2-3344043497 .background-color-N6{background-color:#EEF1F8;} + .d2-3344043497 .background-color-N7{background-color:#FFFFFF;} + .d2-3344043497 .background-color-B1{background-color:#0D32B2;} + .d2-3344043497 .background-color-B2{background-color:#0D32B2;} + .d2-3344043497 .background-color-B3{background-color:#E3E9FD;} + .d2-3344043497 .background-color-B4{background-color:#E3E9FD;} + .d2-3344043497 .background-color-B5{background-color:#EDF0FD;} + .d2-3344043497 .background-color-B6{background-color:#F7F8FE;} + .d2-3344043497 .background-color-AA2{background-color:#4A6FF3;} + .d2-3344043497 .background-color-AA4{background-color:#EDF0FD;} + .d2-3344043497 .background-color-AA5{background-color:#F7F8FE;} + .d2-3344043497 .background-color-AB4{background-color:#EDF0FD;} + .d2-3344043497 .background-color-AB5{background-color:#F7F8FE;} + .d2-3344043497 .color-N1{color:#0A0F25;} + .d2-3344043497 .color-N2{color:#676C7E;} + .d2-3344043497 .color-N3{color:#9499AB;} + .d2-3344043497 .color-N4{color:#CFD2DD;} + .d2-3344043497 .color-N5{color:#DEE1EB;} + .d2-3344043497 .color-N6{color:#EEF1F8;} + .d2-3344043497 .color-N7{color:#FFFFFF;} + .d2-3344043497 .color-B1{color:#0D32B2;} + .d2-3344043497 .color-B2{color:#0D32B2;} + .d2-3344043497 .color-B3{color:#E3E9FD;} + .d2-3344043497 .color-B4{color:#E3E9FD;} + .d2-3344043497 .color-B5{color:#EDF0FD;} + .d2-3344043497 .color-B6{color:#F7F8FE;} + .d2-3344043497 .color-AA2{color:#4A6FF3;} + .d2-3344043497 .color-AA4{color:#EDF0FD;} + .d2-3344043497 .color-AA5{color:#F7F8FE;} + .d2-3344043497 .color-AB4{color:#EDF0FD;} + .d2-3344043497 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3344043497);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3344043497);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3344043497);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3344043497);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3344043497);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3344043497);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3344043497);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3344043497);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3344043497);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3344043497);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3344043497);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3344043497);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3344043497);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3344043497);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3344043497);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3344043497);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3344043497);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3344043497);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ABCD defaulttriangle - - - - - - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/unfilled_triangle/elk/board.exp.json b/e2etests/testdata/stable/unfilled_triangle/elk/board.exp.json index d9d7fbb48..2323b2319 100644 --- a/e2etests/testdata/stable/unfilled_triangle/elk/board.exp.json +++ b/e2etests/testdata/stable/unfilled_triangle/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -192,6 +204,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -230,6 +243,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -261,6 +275,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/unfilled_triangle/elk/sketch.exp.svg b/e2etests/testdata/stable/unfilled_triangle/elk/sketch.exp.svg index e74b1d111..0a8d43e08 100644 --- a/e2etests/testdata/stable/unfilled_triangle/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/unfilled_triangle/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -ABCD defaulttriangle + .d2-3526682853 .fill-N1{fill:#0A0F25;} + .d2-3526682853 .fill-N2{fill:#676C7E;} + .d2-3526682853 .fill-N3{fill:#9499AB;} + .d2-3526682853 .fill-N4{fill:#CFD2DD;} + .d2-3526682853 .fill-N5{fill:#DEE1EB;} + .d2-3526682853 .fill-N6{fill:#EEF1F8;} + .d2-3526682853 .fill-N7{fill:#FFFFFF;} + .d2-3526682853 .fill-B1{fill:#0D32B2;} + .d2-3526682853 .fill-B2{fill:#0D32B2;} + .d2-3526682853 .fill-B3{fill:#E3E9FD;} + .d2-3526682853 .fill-B4{fill:#E3E9FD;} + .d2-3526682853 .fill-B5{fill:#EDF0FD;} + .d2-3526682853 .fill-B6{fill:#F7F8FE;} + .d2-3526682853 .fill-AA2{fill:#4A6FF3;} + .d2-3526682853 .fill-AA4{fill:#EDF0FD;} + .d2-3526682853 .fill-AA5{fill:#F7F8FE;} + .d2-3526682853 .fill-AB4{fill:#EDF0FD;} + .d2-3526682853 .fill-AB5{fill:#F7F8FE;} + .d2-3526682853 .stroke-N1{stroke:#0A0F25;} + .d2-3526682853 .stroke-N2{stroke:#676C7E;} + .d2-3526682853 .stroke-N3{stroke:#9499AB;} + .d2-3526682853 .stroke-N4{stroke:#CFD2DD;} + .d2-3526682853 .stroke-N5{stroke:#DEE1EB;} + .d2-3526682853 .stroke-N6{stroke:#EEF1F8;} + .d2-3526682853 .stroke-N7{stroke:#FFFFFF;} + .d2-3526682853 .stroke-B1{stroke:#0D32B2;} + .d2-3526682853 .stroke-B2{stroke:#0D32B2;} + .d2-3526682853 .stroke-B3{stroke:#E3E9FD;} + .d2-3526682853 .stroke-B4{stroke:#E3E9FD;} + .d2-3526682853 .stroke-B5{stroke:#EDF0FD;} + .d2-3526682853 .stroke-B6{stroke:#F7F8FE;} + .d2-3526682853 .stroke-AA2{stroke:#4A6FF3;} + .d2-3526682853 .stroke-AA4{stroke:#EDF0FD;} + .d2-3526682853 .stroke-AA5{stroke:#F7F8FE;} + .d2-3526682853 .stroke-AB4{stroke:#EDF0FD;} + .d2-3526682853 .stroke-AB5{stroke:#F7F8FE;} + .d2-3526682853 .background-color-N1{background-color:#0A0F25;} + .d2-3526682853 .background-color-N2{background-color:#676C7E;} + .d2-3526682853 .background-color-N3{background-color:#9499AB;} + .d2-3526682853 .background-color-N4{background-color:#CFD2DD;} + .d2-3526682853 .background-color-N5{background-color:#DEE1EB;} + .d2-3526682853 .background-color-N6{background-color:#EEF1F8;} + .d2-3526682853 .background-color-N7{background-color:#FFFFFF;} + .d2-3526682853 .background-color-B1{background-color:#0D32B2;} + .d2-3526682853 .background-color-B2{background-color:#0D32B2;} + .d2-3526682853 .background-color-B3{background-color:#E3E9FD;} + .d2-3526682853 .background-color-B4{background-color:#E3E9FD;} + .d2-3526682853 .background-color-B5{background-color:#EDF0FD;} + .d2-3526682853 .background-color-B6{background-color:#F7F8FE;} + .d2-3526682853 .background-color-AA2{background-color:#4A6FF3;} + .d2-3526682853 .background-color-AA4{background-color:#EDF0FD;} + .d2-3526682853 .background-color-AA5{background-color:#F7F8FE;} + .d2-3526682853 .background-color-AB4{background-color:#EDF0FD;} + .d2-3526682853 .background-color-AB5{background-color:#F7F8FE;} + .d2-3526682853 .color-N1{color:#0A0F25;} + .d2-3526682853 .color-N2{color:#676C7E;} + .d2-3526682853 .color-N3{color:#9499AB;} + .d2-3526682853 .color-N4{color:#CFD2DD;} + .d2-3526682853 .color-N5{color:#DEE1EB;} + .d2-3526682853 .color-N6{color:#EEF1F8;} + .d2-3526682853 .color-N7{color:#FFFFFF;} + .d2-3526682853 .color-B1{color:#0D32B2;} + .d2-3526682853 .color-B2{color:#0D32B2;} + .d2-3526682853 .color-B3{color:#E3E9FD;} + .d2-3526682853 .color-B4{color:#E3E9FD;} + .d2-3526682853 .color-B5{color:#EDF0FD;} + .d2-3526682853 .color-B6{color:#F7F8FE;} + .d2-3526682853 .color-AA2{color:#4A6FF3;} + .d2-3526682853 .color-AA4{color:#EDF0FD;} + .d2-3526682853 .color-AA5{color:#F7F8FE;} + .d2-3526682853 .color-AB4{color:#EDF0FD;} + .d2-3526682853 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3526682853);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3526682853);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3526682853);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3526682853);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3526682853);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3526682853);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3526682853);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3526682853);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3526682853);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3526682853);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3526682853);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3526682853);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3526682853);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3526682853);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3526682853);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3526682853);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3526682853);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3526682853);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ABCD defaulttriangle - - - - - - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/unnamed_only_height/dagre/board.exp.json b/e2etests/testdata/stable/unnamed_only_height/dagre/board.exp.json index 69bcf9374..8bff5417f 100644 --- a/e2etests/testdata/stable/unnamed_only_height/dagre/board.exp.json +++ b/e2etests/testdata/stable/unnamed_only_height/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -93,6 +102,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -277,6 +287,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -317,6 +328,7 @@ "borderRadius": 0, "fill": "AA4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -357,6 +369,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -407,6 +420,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 211, @@ -454,6 +468,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 211, @@ -501,6 +516,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 211, @@ -548,6 +564,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 211, @@ -588,6 +605,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/unnamed_only_height/dagre/sketch.exp.svg b/e2etests/testdata/stable/unnamed_only_height/dagre/sketch.exp.svg index d08130da3..1e05d8dc6 100644 --- a/e2etests/testdata/stable/unnamed_only_height/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/unnamed_only_height/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ --numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 + .d2-1095064713 .fill-N1{fill:#0A0F25;} + .d2-1095064713 .fill-N2{fill:#676C7E;} + .d2-1095064713 .fill-N3{fill:#9499AB;} + .d2-1095064713 .fill-N4{fill:#CFD2DD;} + .d2-1095064713 .fill-N5{fill:#DEE1EB;} + .d2-1095064713 .fill-N6{fill:#EEF1F8;} + .d2-1095064713 .fill-N7{fill:#FFFFFF;} + .d2-1095064713 .fill-B1{fill:#0D32B2;} + .d2-1095064713 .fill-B2{fill:#0D32B2;} + .d2-1095064713 .fill-B3{fill:#E3E9FD;} + .d2-1095064713 .fill-B4{fill:#E3E9FD;} + .d2-1095064713 .fill-B5{fill:#EDF0FD;} + .d2-1095064713 .fill-B6{fill:#F7F8FE;} + .d2-1095064713 .fill-AA2{fill:#4A6FF3;} + .d2-1095064713 .fill-AA4{fill:#EDF0FD;} + .d2-1095064713 .fill-AA5{fill:#F7F8FE;} + .d2-1095064713 .fill-AB4{fill:#EDF0FD;} + .d2-1095064713 .fill-AB5{fill:#F7F8FE;} + .d2-1095064713 .stroke-N1{stroke:#0A0F25;} + .d2-1095064713 .stroke-N2{stroke:#676C7E;} + .d2-1095064713 .stroke-N3{stroke:#9499AB;} + .d2-1095064713 .stroke-N4{stroke:#CFD2DD;} + .d2-1095064713 .stroke-N5{stroke:#DEE1EB;} + .d2-1095064713 .stroke-N6{stroke:#EEF1F8;} + .d2-1095064713 .stroke-N7{stroke:#FFFFFF;} + .d2-1095064713 .stroke-B1{stroke:#0D32B2;} + .d2-1095064713 .stroke-B2{stroke:#0D32B2;} + .d2-1095064713 .stroke-B3{stroke:#E3E9FD;} + .d2-1095064713 .stroke-B4{stroke:#E3E9FD;} + .d2-1095064713 .stroke-B5{stroke:#EDF0FD;} + .d2-1095064713 .stroke-B6{stroke:#F7F8FE;} + .d2-1095064713 .stroke-AA2{stroke:#4A6FF3;} + .d2-1095064713 .stroke-AA4{stroke:#EDF0FD;} + .d2-1095064713 .stroke-AA5{stroke:#F7F8FE;} + .d2-1095064713 .stroke-AB4{stroke:#EDF0FD;} + .d2-1095064713 .stroke-AB5{stroke:#F7F8FE;} + .d2-1095064713 .background-color-N1{background-color:#0A0F25;} + .d2-1095064713 .background-color-N2{background-color:#676C7E;} + .d2-1095064713 .background-color-N3{background-color:#9499AB;} + .d2-1095064713 .background-color-N4{background-color:#CFD2DD;} + .d2-1095064713 .background-color-N5{background-color:#DEE1EB;} + .d2-1095064713 .background-color-N6{background-color:#EEF1F8;} + .d2-1095064713 .background-color-N7{background-color:#FFFFFF;} + .d2-1095064713 .background-color-B1{background-color:#0D32B2;} + .d2-1095064713 .background-color-B2{background-color:#0D32B2;} + .d2-1095064713 .background-color-B3{background-color:#E3E9FD;} + .d2-1095064713 .background-color-B4{background-color:#E3E9FD;} + .d2-1095064713 .background-color-B5{background-color:#EDF0FD;} + .d2-1095064713 .background-color-B6{background-color:#F7F8FE;} + .d2-1095064713 .background-color-AA2{background-color:#4A6FF3;} + .d2-1095064713 .background-color-AA4{background-color:#EDF0FD;} + .d2-1095064713 .background-color-AA5{background-color:#F7F8FE;} + .d2-1095064713 .background-color-AB4{background-color:#EDF0FD;} + .d2-1095064713 .background-color-AB5{background-color:#F7F8FE;} + .d2-1095064713 .color-N1{color:#0A0F25;} + .d2-1095064713 .color-N2{color:#676C7E;} + .d2-1095064713 .color-N3{color:#9499AB;} + .d2-1095064713 .color-N4{color:#CFD2DD;} + .d2-1095064713 .color-N5{color:#DEE1EB;} + .d2-1095064713 .color-N6{color:#EEF1F8;} + .d2-1095064713 .color-N7{color:#FFFFFF;} + .d2-1095064713 .color-B1{color:#0D32B2;} + .d2-1095064713 .color-B2{color:#0D32B2;} + .d2-1095064713 .color-B3{color:#E3E9FD;} + .d2-1095064713 .color-B4{color:#E3E9FD;} + .d2-1095064713 .color-B5{color:#EDF0FD;} + .d2-1095064713 .color-B6{color:#F7F8FE;} + .d2-1095064713 .color-AA2{color:#4A6FF3;} + .d2-1095064713 .color-AA4{color:#EDF0FD;} + .d2-1095064713 .color-AA5{color:#F7F8FE;} + .d2-1095064713 .color-AB4{color:#EDF0FD;} + .d2-1095064713 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1095064713);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1095064713);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1095064713);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1095064713);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1095064713);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1095064713);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1095064713);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1095064713);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1095064713);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1095064713);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1095064713);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1095064713);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1095064713);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1095064713);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1095064713);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1095064713);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1095064713);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1095064713);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b) +fmt.Printf("%d", b) - + \ No newline at end of file diff --git a/e2etests/testdata/stable/unnamed_only_height/elk/board.exp.json b/e2etests/testdata/stable/unnamed_only_height/elk/board.exp.json index 8aae100af..bfba54215 100644 --- a/e2etests/testdata/stable/unnamed_only_height/elk/board.exp.json +++ b/e2etests/testdata/stable/unnamed_only_height/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -93,6 +102,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -277,6 +287,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -317,6 +328,7 @@ "borderRadius": 0, "fill": "AA4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -357,6 +369,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -407,6 +420,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 223, @@ -445,6 +459,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 223, @@ -483,6 +498,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 223, @@ -521,6 +537,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 223, @@ -552,6 +569,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/unnamed_only_height/elk/sketch.exp.svg b/e2etests/testdata/stable/unnamed_only_height/elk/sketch.exp.svg index c79613a08..7a0accf2e 100644 --- a/e2etests/testdata/stable/unnamed_only_height/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/unnamed_only_height/elk/sketch.exp.svg @@ -1,23 +1,23 @@ --numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 + .d2-576205628 .fill-N1{fill:#0A0F25;} + .d2-576205628 .fill-N2{fill:#676C7E;} + .d2-576205628 .fill-N3{fill:#9499AB;} + .d2-576205628 .fill-N4{fill:#CFD2DD;} + .d2-576205628 .fill-N5{fill:#DEE1EB;} + .d2-576205628 .fill-N6{fill:#EEF1F8;} + .d2-576205628 .fill-N7{fill:#FFFFFF;} + .d2-576205628 .fill-B1{fill:#0D32B2;} + .d2-576205628 .fill-B2{fill:#0D32B2;} + .d2-576205628 .fill-B3{fill:#E3E9FD;} + .d2-576205628 .fill-B4{fill:#E3E9FD;} + .d2-576205628 .fill-B5{fill:#EDF0FD;} + .d2-576205628 .fill-B6{fill:#F7F8FE;} + .d2-576205628 .fill-AA2{fill:#4A6FF3;} + .d2-576205628 .fill-AA4{fill:#EDF0FD;} + .d2-576205628 .fill-AA5{fill:#F7F8FE;} + .d2-576205628 .fill-AB4{fill:#EDF0FD;} + .d2-576205628 .fill-AB5{fill:#F7F8FE;} + .d2-576205628 .stroke-N1{stroke:#0A0F25;} + .d2-576205628 .stroke-N2{stroke:#676C7E;} + .d2-576205628 .stroke-N3{stroke:#9499AB;} + .d2-576205628 .stroke-N4{stroke:#CFD2DD;} + .d2-576205628 .stroke-N5{stroke:#DEE1EB;} + .d2-576205628 .stroke-N6{stroke:#EEF1F8;} + .d2-576205628 .stroke-N7{stroke:#FFFFFF;} + .d2-576205628 .stroke-B1{stroke:#0D32B2;} + .d2-576205628 .stroke-B2{stroke:#0D32B2;} + .d2-576205628 .stroke-B3{stroke:#E3E9FD;} + .d2-576205628 .stroke-B4{stroke:#E3E9FD;} + .d2-576205628 .stroke-B5{stroke:#EDF0FD;} + .d2-576205628 .stroke-B6{stroke:#F7F8FE;} + .d2-576205628 .stroke-AA2{stroke:#4A6FF3;} + .d2-576205628 .stroke-AA4{stroke:#EDF0FD;} + .d2-576205628 .stroke-AA5{stroke:#F7F8FE;} + .d2-576205628 .stroke-AB4{stroke:#EDF0FD;} + .d2-576205628 .stroke-AB5{stroke:#F7F8FE;} + .d2-576205628 .background-color-N1{background-color:#0A0F25;} + .d2-576205628 .background-color-N2{background-color:#676C7E;} + .d2-576205628 .background-color-N3{background-color:#9499AB;} + .d2-576205628 .background-color-N4{background-color:#CFD2DD;} + .d2-576205628 .background-color-N5{background-color:#DEE1EB;} + .d2-576205628 .background-color-N6{background-color:#EEF1F8;} + .d2-576205628 .background-color-N7{background-color:#FFFFFF;} + .d2-576205628 .background-color-B1{background-color:#0D32B2;} + .d2-576205628 .background-color-B2{background-color:#0D32B2;} + .d2-576205628 .background-color-B3{background-color:#E3E9FD;} + .d2-576205628 .background-color-B4{background-color:#E3E9FD;} + .d2-576205628 .background-color-B5{background-color:#EDF0FD;} + .d2-576205628 .background-color-B6{background-color:#F7F8FE;} + .d2-576205628 .background-color-AA2{background-color:#4A6FF3;} + .d2-576205628 .background-color-AA4{background-color:#EDF0FD;} + .d2-576205628 .background-color-AA5{background-color:#F7F8FE;} + .d2-576205628 .background-color-AB4{background-color:#EDF0FD;} + .d2-576205628 .background-color-AB5{background-color:#F7F8FE;} + .d2-576205628 .color-N1{color:#0A0F25;} + .d2-576205628 .color-N2{color:#676C7E;} + .d2-576205628 .color-N3{color:#9499AB;} + .d2-576205628 .color-N4{color:#CFD2DD;} + .d2-576205628 .color-N5{color:#DEE1EB;} + .d2-576205628 .color-N6{color:#EEF1F8;} + .d2-576205628 .color-N7{color:#FFFFFF;} + .d2-576205628 .color-B1{color:#0D32B2;} + .d2-576205628 .color-B2{color:#0D32B2;} + .d2-576205628 .color-B3{color:#E3E9FD;} + .d2-576205628 .color-B4{color:#E3E9FD;} + .d2-576205628 .color-B5{color:#EDF0FD;} + .d2-576205628 .color-B6{color:#F7F8FE;} + .d2-576205628 .color-AA2{color:#4A6FF3;} + .d2-576205628 .color-AA4{color:#EDF0FD;} + .d2-576205628 .color-AA5{color:#F7F8FE;} + .d2-576205628 .color-AB4{color:#EDF0FD;} + .d2-576205628 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-576205628);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-576205628);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-576205628);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-576205628);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-576205628);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-576205628);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-576205628);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-576205628);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-576205628);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-576205628);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-576205628);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-576205628);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-576205628);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-576205628);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-576205628);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-576205628);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-576205628);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-576205628);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b) +fmt.Printf("%d", b) - + \ No newline at end of file diff --git a/e2etests/testdata/stable/unnamed_only_width/dagre/board.exp.json b/e2etests/testdata/stable/unnamed_only_width/dagre/board.exp.json index b5b4b51e9..128916297 100644 --- a/e2etests/testdata/stable/unnamed_only_width/dagre/board.exp.json +++ b/e2etests/testdata/stable/unnamed_only_width/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -93,6 +102,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -277,6 +287,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -317,6 +328,7 @@ "borderRadius": 0, "fill": "AA4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -357,6 +369,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -407,6 +420,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 256, @@ -454,6 +468,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 256, @@ -501,6 +516,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 256, @@ -548,6 +564,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 256, @@ -588,6 +605,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/unnamed_only_width/dagre/sketch.exp.svg b/e2etests/testdata/stable/unnamed_only_width/dagre/sketch.exp.svg index e73ffbf84..bf34aa764 100644 --- a/e2etests/testdata/stable/unnamed_only_width/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/unnamed_only_width/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ --numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 + .d2-698029255 .fill-N1{fill:#0A0F25;} + .d2-698029255 .fill-N2{fill:#676C7E;} + .d2-698029255 .fill-N3{fill:#9499AB;} + .d2-698029255 .fill-N4{fill:#CFD2DD;} + .d2-698029255 .fill-N5{fill:#DEE1EB;} + .d2-698029255 .fill-N6{fill:#EEF1F8;} + .d2-698029255 .fill-N7{fill:#FFFFFF;} + .d2-698029255 .fill-B1{fill:#0D32B2;} + .d2-698029255 .fill-B2{fill:#0D32B2;} + .d2-698029255 .fill-B3{fill:#E3E9FD;} + .d2-698029255 .fill-B4{fill:#E3E9FD;} + .d2-698029255 .fill-B5{fill:#EDF0FD;} + .d2-698029255 .fill-B6{fill:#F7F8FE;} + .d2-698029255 .fill-AA2{fill:#4A6FF3;} + .d2-698029255 .fill-AA4{fill:#EDF0FD;} + .d2-698029255 .fill-AA5{fill:#F7F8FE;} + .d2-698029255 .fill-AB4{fill:#EDF0FD;} + .d2-698029255 .fill-AB5{fill:#F7F8FE;} + .d2-698029255 .stroke-N1{stroke:#0A0F25;} + .d2-698029255 .stroke-N2{stroke:#676C7E;} + .d2-698029255 .stroke-N3{stroke:#9499AB;} + .d2-698029255 .stroke-N4{stroke:#CFD2DD;} + .d2-698029255 .stroke-N5{stroke:#DEE1EB;} + .d2-698029255 .stroke-N6{stroke:#EEF1F8;} + .d2-698029255 .stroke-N7{stroke:#FFFFFF;} + .d2-698029255 .stroke-B1{stroke:#0D32B2;} + .d2-698029255 .stroke-B2{stroke:#0D32B2;} + .d2-698029255 .stroke-B3{stroke:#E3E9FD;} + .d2-698029255 .stroke-B4{stroke:#E3E9FD;} + .d2-698029255 .stroke-B5{stroke:#EDF0FD;} + .d2-698029255 .stroke-B6{stroke:#F7F8FE;} + .d2-698029255 .stroke-AA2{stroke:#4A6FF3;} + .d2-698029255 .stroke-AA4{stroke:#EDF0FD;} + .d2-698029255 .stroke-AA5{stroke:#F7F8FE;} + .d2-698029255 .stroke-AB4{stroke:#EDF0FD;} + .d2-698029255 .stroke-AB5{stroke:#F7F8FE;} + .d2-698029255 .background-color-N1{background-color:#0A0F25;} + .d2-698029255 .background-color-N2{background-color:#676C7E;} + .d2-698029255 .background-color-N3{background-color:#9499AB;} + .d2-698029255 .background-color-N4{background-color:#CFD2DD;} + .d2-698029255 .background-color-N5{background-color:#DEE1EB;} + .d2-698029255 .background-color-N6{background-color:#EEF1F8;} + .d2-698029255 .background-color-N7{background-color:#FFFFFF;} + .d2-698029255 .background-color-B1{background-color:#0D32B2;} + .d2-698029255 .background-color-B2{background-color:#0D32B2;} + .d2-698029255 .background-color-B3{background-color:#E3E9FD;} + .d2-698029255 .background-color-B4{background-color:#E3E9FD;} + .d2-698029255 .background-color-B5{background-color:#EDF0FD;} + .d2-698029255 .background-color-B6{background-color:#F7F8FE;} + .d2-698029255 .background-color-AA2{background-color:#4A6FF3;} + .d2-698029255 .background-color-AA4{background-color:#EDF0FD;} + .d2-698029255 .background-color-AA5{background-color:#F7F8FE;} + .d2-698029255 .background-color-AB4{background-color:#EDF0FD;} + .d2-698029255 .background-color-AB5{background-color:#F7F8FE;} + .d2-698029255 .color-N1{color:#0A0F25;} + .d2-698029255 .color-N2{color:#676C7E;} + .d2-698029255 .color-N3{color:#9499AB;} + .d2-698029255 .color-N4{color:#CFD2DD;} + .d2-698029255 .color-N5{color:#DEE1EB;} + .d2-698029255 .color-N6{color:#EEF1F8;} + .d2-698029255 .color-N7{color:#FFFFFF;} + .d2-698029255 .color-B1{color:#0D32B2;} + .d2-698029255 .color-B2{color:#0D32B2;} + .d2-698029255 .color-B3{color:#E3E9FD;} + .d2-698029255 .color-B4{color:#E3E9FD;} + .d2-698029255 .color-B5{color:#EDF0FD;} + .d2-698029255 .color-B6{color:#F7F8FE;} + .d2-698029255 .color-AA2{color:#4A6FF3;} + .d2-698029255 .color-AA4{color:#EDF0FD;} + .d2-698029255 .color-AA5{color:#F7F8FE;} + .d2-698029255 .color-AB4{color:#EDF0FD;} + .d2-698029255 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-698029255);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-698029255);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-698029255);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-698029255);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-698029255);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-698029255);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-698029255);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-698029255);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-698029255);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-698029255);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-698029255);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-698029255);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-698029255);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-698029255);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-698029255);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-698029255);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-698029255);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-698029255);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b) +fmt.Printf("%d", b) - + \ No newline at end of file diff --git a/e2etests/testdata/stable/unnamed_only_width/elk/board.exp.json b/e2etests/testdata/stable/unnamed_only_width/elk/board.exp.json index 113d04be0..b811708b0 100644 --- a/e2etests/testdata/stable/unnamed_only_width/elk/board.exp.json +++ b/e2etests/testdata/stable/unnamed_only_width/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -93,6 +102,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -277,6 +287,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -317,6 +328,7 @@ "borderRadius": 0, "fill": "AA4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -357,6 +369,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -407,6 +420,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 268, @@ -445,6 +459,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 268, @@ -483,6 +498,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 268, @@ -521,6 +537,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 268, @@ -552,6 +569,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/unnamed_only_width/elk/sketch.exp.svg b/e2etests/testdata/stable/unnamed_only_width/elk/sketch.exp.svg index ed1678aa5..a8b887bdb 100644 --- a/e2etests/testdata/stable/unnamed_only_width/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/unnamed_only_width/elk/sketch.exp.svg @@ -1,23 +1,23 @@ --numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 + .d2-2634931202 .fill-N1{fill:#0A0F25;} + .d2-2634931202 .fill-N2{fill:#676C7E;} + .d2-2634931202 .fill-N3{fill:#9499AB;} + .d2-2634931202 .fill-N4{fill:#CFD2DD;} + .d2-2634931202 .fill-N5{fill:#DEE1EB;} + .d2-2634931202 .fill-N6{fill:#EEF1F8;} + .d2-2634931202 .fill-N7{fill:#FFFFFF;} + .d2-2634931202 .fill-B1{fill:#0D32B2;} + .d2-2634931202 .fill-B2{fill:#0D32B2;} + .d2-2634931202 .fill-B3{fill:#E3E9FD;} + .d2-2634931202 .fill-B4{fill:#E3E9FD;} + .d2-2634931202 .fill-B5{fill:#EDF0FD;} + .d2-2634931202 .fill-B6{fill:#F7F8FE;} + .d2-2634931202 .fill-AA2{fill:#4A6FF3;} + .d2-2634931202 .fill-AA4{fill:#EDF0FD;} + .d2-2634931202 .fill-AA5{fill:#F7F8FE;} + .d2-2634931202 .fill-AB4{fill:#EDF0FD;} + .d2-2634931202 .fill-AB5{fill:#F7F8FE;} + .d2-2634931202 .stroke-N1{stroke:#0A0F25;} + .d2-2634931202 .stroke-N2{stroke:#676C7E;} + .d2-2634931202 .stroke-N3{stroke:#9499AB;} + .d2-2634931202 .stroke-N4{stroke:#CFD2DD;} + .d2-2634931202 .stroke-N5{stroke:#DEE1EB;} + .d2-2634931202 .stroke-N6{stroke:#EEF1F8;} + .d2-2634931202 .stroke-N7{stroke:#FFFFFF;} + .d2-2634931202 .stroke-B1{stroke:#0D32B2;} + .d2-2634931202 .stroke-B2{stroke:#0D32B2;} + .d2-2634931202 .stroke-B3{stroke:#E3E9FD;} + .d2-2634931202 .stroke-B4{stroke:#E3E9FD;} + .d2-2634931202 .stroke-B5{stroke:#EDF0FD;} + .d2-2634931202 .stroke-B6{stroke:#F7F8FE;} + .d2-2634931202 .stroke-AA2{stroke:#4A6FF3;} + .d2-2634931202 .stroke-AA4{stroke:#EDF0FD;} + .d2-2634931202 .stroke-AA5{stroke:#F7F8FE;} + .d2-2634931202 .stroke-AB4{stroke:#EDF0FD;} + .d2-2634931202 .stroke-AB5{stroke:#F7F8FE;} + .d2-2634931202 .background-color-N1{background-color:#0A0F25;} + .d2-2634931202 .background-color-N2{background-color:#676C7E;} + .d2-2634931202 .background-color-N3{background-color:#9499AB;} + .d2-2634931202 .background-color-N4{background-color:#CFD2DD;} + .d2-2634931202 .background-color-N5{background-color:#DEE1EB;} + .d2-2634931202 .background-color-N6{background-color:#EEF1F8;} + .d2-2634931202 .background-color-N7{background-color:#FFFFFF;} + .d2-2634931202 .background-color-B1{background-color:#0D32B2;} + .d2-2634931202 .background-color-B2{background-color:#0D32B2;} + .d2-2634931202 .background-color-B3{background-color:#E3E9FD;} + .d2-2634931202 .background-color-B4{background-color:#E3E9FD;} + .d2-2634931202 .background-color-B5{background-color:#EDF0FD;} + .d2-2634931202 .background-color-B6{background-color:#F7F8FE;} + .d2-2634931202 .background-color-AA2{background-color:#4A6FF3;} + .d2-2634931202 .background-color-AA4{background-color:#EDF0FD;} + .d2-2634931202 .background-color-AA5{background-color:#F7F8FE;} + .d2-2634931202 .background-color-AB4{background-color:#EDF0FD;} + .d2-2634931202 .background-color-AB5{background-color:#F7F8FE;} + .d2-2634931202 .color-N1{color:#0A0F25;} + .d2-2634931202 .color-N2{color:#676C7E;} + .d2-2634931202 .color-N3{color:#9499AB;} + .d2-2634931202 .color-N4{color:#CFD2DD;} + .d2-2634931202 .color-N5{color:#DEE1EB;} + .d2-2634931202 .color-N6{color:#EEF1F8;} + .d2-2634931202 .color-N7{color:#FFFFFF;} + .d2-2634931202 .color-B1{color:#0D32B2;} + .d2-2634931202 .color-B2{color:#0D32B2;} + .d2-2634931202 .color-B3{color:#E3E9FD;} + .d2-2634931202 .color-B4{color:#E3E9FD;} + .d2-2634931202 .color-B5{color:#EDF0FD;} + .d2-2634931202 .color-B6{color:#F7F8FE;} + .d2-2634931202 .color-AA2{color:#4A6FF3;} + .d2-2634931202 .color-AA4{color:#EDF0FD;} + .d2-2634931202 .color-AA5{color:#F7F8FE;} + .d2-2634931202 .color-AB4{color:#EDF0FD;} + .d2-2634931202 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2634931202);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2634931202);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2634931202);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2634931202);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2634931202);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2634931202);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2634931202);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2634931202);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2634931202);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2634931202);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2634931202);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2634931202);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2634931202);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2634931202);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2634931202);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2634931202);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2634931202);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2634931202);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetimea := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b) +fmt.Printf("%d", b) - + \ No newline at end of file diff --git a/e2etests/testdata/stable/us_map/dagre/board.exp.json b/e2etests/testdata/stable/us_map/dagre/board.exp.json index 3526ab0f8..a2e9e19b3 100644 --- a/e2etests/testdata/stable/us_map/dagre/board.exp.json +++ b/e2etests/testdata/stable/us_map/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -715,6 +740,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -756,6 +782,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -797,6 +824,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -838,6 +866,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -879,6 +908,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -920,6 +950,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -961,6 +992,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1002,6 +1034,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1043,6 +1076,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1084,6 +1118,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1125,6 +1160,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1166,6 +1202,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1207,6 +1244,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1248,6 +1286,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1289,6 +1328,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1330,6 +1370,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1371,6 +1412,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1412,6 +1454,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1453,6 +1496,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1494,6 +1538,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1535,6 +1580,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1576,6 +1622,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1617,6 +1664,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1658,6 +1706,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1699,6 +1748,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1740,6 +1790,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1781,6 +1832,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1822,6 +1874,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1863,6 +1916,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1904,6 +1958,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1945,6 +2000,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1986,6 +2042,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2027,6 +2084,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2078,6 +2136,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 33, @@ -2125,6 +2184,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 29, @@ -2172,6 +2232,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 29, @@ -2219,6 +2280,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1025.25, @@ -2350,6 +2412,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 293.5, @@ -2397,6 +2460,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 261.25, @@ -2444,6 +2508,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 386, @@ -2491,6 +2556,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 863.5, @@ -2550,6 +2616,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1061.25, @@ -2597,6 +2664,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1040.75, @@ -2644,6 +2712,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1034.5, @@ -2691,6 +2760,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1457.5, @@ -2774,6 +2844,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1296.75, @@ -2821,6 +2892,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 945, @@ -2868,6 +2940,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 325.75, @@ -2915,6 +2988,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 386, @@ -2974,6 +3048,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1326.5, @@ -3021,6 +3096,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1298, @@ -3080,6 +3156,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1400, @@ -3127,6 +3204,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 878, @@ -3174,6 +3252,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1296.75, @@ -3221,6 +3300,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 476, @@ -3280,6 +3360,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 418, @@ -3327,6 +3408,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 215.5, @@ -3386,6 +3468,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 371.25, @@ -3445,6 +3528,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 786.75, @@ -3492,6 +3576,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 758.25, @@ -3539,6 +3624,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 703.75, @@ -3598,6 +3684,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 64.5, @@ -3645,6 +3732,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 37, @@ -3752,6 +3840,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 39, @@ -3799,6 +3888,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 39, @@ -3846,6 +3936,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1173.75, @@ -3893,6 +3984,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1150.75, @@ -3940,6 +4032,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 406, @@ -3999,6 +4092,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 233.75, @@ -4046,6 +4140,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 500.75, @@ -4093,6 +4188,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 319.25, @@ -4140,6 +4236,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1843.25, @@ -4187,6 +4284,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1829.5, @@ -4234,6 +4332,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1781.5, @@ -4281,6 +4380,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1709.25, @@ -4328,6 +4428,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1779.5, @@ -4375,6 +4476,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1457.5, @@ -4458,6 +4560,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1873, @@ -4541,6 +4644,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1818.75, @@ -4588,6 +4692,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1725.75, @@ -4695,6 +4800,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1838.25, @@ -4754,6 +4860,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1900.5, @@ -4801,6 +4908,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1457.5, @@ -4848,6 +4956,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1408, @@ -4895,6 +5004,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1539.75, @@ -4942,6 +5052,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1357.75, @@ -4989,6 +5100,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1501.25, @@ -5036,6 +5148,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1417.75, @@ -5095,6 +5208,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1816.5, @@ -5142,6 +5256,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1526.5, @@ -5201,6 +5316,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1759.75, @@ -5260,6 +5376,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 950, @@ -5307,6 +5424,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 882.75, @@ -5354,6 +5472,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1093.25, @@ -5401,6 +5520,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1050.25, @@ -5556,6 +5676,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 912.75, @@ -5603,6 +5724,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 794, @@ -5686,6 +5808,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 717.75, @@ -5733,6 +5856,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 915.25, @@ -5780,6 +5904,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 261, @@ -5827,6 +5952,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 535, @@ -5874,6 +6000,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 379.25, @@ -5933,6 +6060,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 498.5, @@ -5980,6 +6108,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1768, @@ -6027,6 +6156,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1925, @@ -6110,6 +6240,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1790.5, @@ -6157,6 +6288,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1933, @@ -6216,6 +6348,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1552.25, @@ -6263,6 +6396,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1554, @@ -6310,6 +6444,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1058.25, @@ -6441,6 +6576,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1526.5, @@ -6488,6 +6624,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1425.75, @@ -6547,6 +6684,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1329.75, @@ -6594,6 +6732,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1187.5, @@ -6641,6 +6780,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1560.25, @@ -6688,6 +6828,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1571.75, @@ -6795,6 +6936,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1443.75, @@ -6842,6 +6984,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1588.25, @@ -6949,6 +7092,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 451.25, @@ -7008,6 +7152,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 266.75, @@ -7055,6 +7200,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 571, @@ -7162,6 +7308,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 732.5, @@ -7209,6 +7356,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 424.25, @@ -7256,6 +7404,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 892.5, @@ -7303,6 +7452,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1362.75, @@ -7362,6 +7512,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 424.25, @@ -7409,6 +7560,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 717.75, @@ -7456,6 +7608,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 517.5, @@ -7503,6 +7656,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 74.5, @@ -7550,6 +7704,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 60.25, @@ -7597,6 +7752,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 983.25, @@ -7644,6 +7800,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1588.25, @@ -7691,6 +7848,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1800.75, @@ -7750,6 +7908,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 753.75, @@ -7809,6 +7968,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1362.75, @@ -7868,6 +8028,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 287.25, @@ -7927,6 +8088,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 761.75, @@ -7986,6 +8148,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1596.25, @@ -8093,6 +8256,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 991.25, @@ -8140,6 +8304,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 531, @@ -8199,6 +8364,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 948.25, @@ -8239,6 +8405,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/us_map/dagre/sketch.exp.svg b/e2etests/testdata/stable/us_map/dagre/sketch.exp.svg index 4a8462327..fa7733232 100644 --- a/e2etests/testdata/stable/us_map/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/us_map/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -ALFLGAMSTNAKAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCHIIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTND + .d2-933147596 .fill-N1{fill:#0A0F25;} + .d2-933147596 .fill-N2{fill:#676C7E;} + .d2-933147596 .fill-N3{fill:#9499AB;} + .d2-933147596 .fill-N4{fill:#CFD2DD;} + .d2-933147596 .fill-N5{fill:#DEE1EB;} + .d2-933147596 .fill-N6{fill:#EEF1F8;} + .d2-933147596 .fill-N7{fill:#FFFFFF;} + .d2-933147596 .fill-B1{fill:#0D32B2;} + .d2-933147596 .fill-B2{fill:#0D32B2;} + .d2-933147596 .fill-B3{fill:#E3E9FD;} + .d2-933147596 .fill-B4{fill:#E3E9FD;} + .d2-933147596 .fill-B5{fill:#EDF0FD;} + .d2-933147596 .fill-B6{fill:#F7F8FE;} + .d2-933147596 .fill-AA2{fill:#4A6FF3;} + .d2-933147596 .fill-AA4{fill:#EDF0FD;} + .d2-933147596 .fill-AA5{fill:#F7F8FE;} + .d2-933147596 .fill-AB4{fill:#EDF0FD;} + .d2-933147596 .fill-AB5{fill:#F7F8FE;} + .d2-933147596 .stroke-N1{stroke:#0A0F25;} + .d2-933147596 .stroke-N2{stroke:#676C7E;} + .d2-933147596 .stroke-N3{stroke:#9499AB;} + .d2-933147596 .stroke-N4{stroke:#CFD2DD;} + .d2-933147596 .stroke-N5{stroke:#DEE1EB;} + .d2-933147596 .stroke-N6{stroke:#EEF1F8;} + .d2-933147596 .stroke-N7{stroke:#FFFFFF;} + .d2-933147596 .stroke-B1{stroke:#0D32B2;} + .d2-933147596 .stroke-B2{stroke:#0D32B2;} + .d2-933147596 .stroke-B3{stroke:#E3E9FD;} + .d2-933147596 .stroke-B4{stroke:#E3E9FD;} + .d2-933147596 .stroke-B5{stroke:#EDF0FD;} + .d2-933147596 .stroke-B6{stroke:#F7F8FE;} + .d2-933147596 .stroke-AA2{stroke:#4A6FF3;} + .d2-933147596 .stroke-AA4{stroke:#EDF0FD;} + .d2-933147596 .stroke-AA5{stroke:#F7F8FE;} + .d2-933147596 .stroke-AB4{stroke:#EDF0FD;} + .d2-933147596 .stroke-AB5{stroke:#F7F8FE;} + .d2-933147596 .background-color-N1{background-color:#0A0F25;} + .d2-933147596 .background-color-N2{background-color:#676C7E;} + .d2-933147596 .background-color-N3{background-color:#9499AB;} + .d2-933147596 .background-color-N4{background-color:#CFD2DD;} + .d2-933147596 .background-color-N5{background-color:#DEE1EB;} + .d2-933147596 .background-color-N6{background-color:#EEF1F8;} + .d2-933147596 .background-color-N7{background-color:#FFFFFF;} + .d2-933147596 .background-color-B1{background-color:#0D32B2;} + .d2-933147596 .background-color-B2{background-color:#0D32B2;} + .d2-933147596 .background-color-B3{background-color:#E3E9FD;} + .d2-933147596 .background-color-B4{background-color:#E3E9FD;} + .d2-933147596 .background-color-B5{background-color:#EDF0FD;} + .d2-933147596 .background-color-B6{background-color:#F7F8FE;} + .d2-933147596 .background-color-AA2{background-color:#4A6FF3;} + .d2-933147596 .background-color-AA4{background-color:#EDF0FD;} + .d2-933147596 .background-color-AA5{background-color:#F7F8FE;} + .d2-933147596 .background-color-AB4{background-color:#EDF0FD;} + .d2-933147596 .background-color-AB5{background-color:#F7F8FE;} + .d2-933147596 .color-N1{color:#0A0F25;} + .d2-933147596 .color-N2{color:#676C7E;} + .d2-933147596 .color-N3{color:#9499AB;} + .d2-933147596 .color-N4{color:#CFD2DD;} + .d2-933147596 .color-N5{color:#DEE1EB;} + .d2-933147596 .color-N6{color:#EEF1F8;} + .d2-933147596 .color-N7{color:#FFFFFF;} + .d2-933147596 .color-B1{color:#0D32B2;} + .d2-933147596 .color-B2{color:#0D32B2;} + .d2-933147596 .color-B3{color:#E3E9FD;} + .d2-933147596 .color-B4{color:#E3E9FD;} + .d2-933147596 .color-B5{color:#EDF0FD;} + .d2-933147596 .color-B6{color:#F7F8FE;} + .d2-933147596 .color-AA2{color:#4A6FF3;} + .d2-933147596 .color-AA4{color:#EDF0FD;} + .d2-933147596 .color-AA5{color:#F7F8FE;} + .d2-933147596 .color-AB4{color:#EDF0FD;} + .d2-933147596 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-933147596);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-933147596);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-933147596);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-933147596);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-933147596);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-933147596);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-933147596);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-933147596);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-933147596);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-933147596);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-933147596);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-933147596);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-933147596);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-933147596);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-933147596);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-933147596);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-933147596);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-933147596);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ALFLGAMSTNAKAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCHIIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTND - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/us_map/elk/board.exp.json b/e2etests/testdata/stable/us_map/elk/board.exp.json index 3bd2d2ce9..33ebdd5a5 100644 --- a/e2etests/testdata/stable/us_map/elk/board.exp.json +++ b/e2etests/testdata/stable/us_map/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -715,6 +740,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -756,6 +782,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -797,6 +824,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -838,6 +866,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -879,6 +908,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -920,6 +950,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -961,6 +992,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1002,6 +1034,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1043,6 +1076,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1084,6 +1118,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1125,6 +1160,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1166,6 +1202,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1207,6 +1244,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1248,6 +1286,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1289,6 +1328,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1330,6 +1370,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1371,6 +1412,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1412,6 +1454,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1453,6 +1496,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1494,6 +1538,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1535,6 +1580,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1576,6 +1622,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1617,6 +1664,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1658,6 +1706,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1699,6 +1748,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1740,6 +1790,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1781,6 +1832,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1822,6 +1874,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1863,6 +1916,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1904,6 +1958,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1945,6 +2000,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -1986,6 +2042,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2027,6 +2084,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -2078,6 +2136,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1319.654052734375, @@ -2116,6 +2175,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1306.321044921875, @@ -2154,6 +2214,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1332.988037109375, @@ -2200,6 +2261,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1497.5469970703125, @@ -2246,6 +2308,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 113.90399932861328, @@ -2284,6 +2347,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 100.57099914550781, @@ -2322,6 +2386,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 188.5709991455078, @@ -2368,6 +2433,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 236.46400451660156, @@ -2422,6 +2488,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1512.0469970703125, @@ -2460,6 +2527,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1492.0469970703125, @@ -2498,6 +2566,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1444.0469970703125, @@ -2544,6 +2613,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 699.6300048828125, @@ -2598,6 +2668,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 466.9639892578125, @@ -2644,6 +2715,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1146.154052734375, @@ -2690,6 +2762,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 140.5709991455078, @@ -2728,6 +2801,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 92.57099914550781, @@ -2774,6 +2848,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 320.0710144042969, @@ -2812,6 +2887,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 306.7380065917969, @@ -2858,6 +2934,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 378.6300048828125, @@ -2904,6 +2981,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 266.4639892578125, @@ -2950,6 +3028,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 366.9639892578125, @@ -2996,6 +3075,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 52, @@ -3042,6 +3122,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1701.8800048828125, @@ -3080,6 +3161,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1688.5469970703125, @@ -3134,6 +3216,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1760.321044921875, @@ -3180,6 +3263,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1801.8800048828125, @@ -3218,6 +3302,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1788.5469970703125, @@ -3264,6 +3349,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1706.5469970703125, @@ -3310,6 +3396,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1332.988037109375, @@ -3348,6 +3435,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1306.321044921875, @@ -3386,6 +3474,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1292.988037109375, @@ -3424,6 +3513,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1292.988037109375, @@ -3470,6 +3560,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 502.4880065917969, @@ -3508,6 +3599,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 489.15399169921875, @@ -3554,6 +3646,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 124.57099914550781, @@ -3600,6 +3693,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 65.57099914550781, @@ -3646,6 +3740,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 92, @@ -3692,6 +3787,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 209.23800659179688, @@ -3738,6 +3834,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 791.5469970703125, @@ -3776,6 +3873,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 804.8800048828125, @@ -3822,6 +3920,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 877.5469970703125, @@ -3868,6 +3967,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 735.2139892578125, @@ -3914,6 +4014,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 642.4879760742188, @@ -3952,6 +4053,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 733.916015625, @@ -3998,6 +4100,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 778.2139892578125, @@ -4044,6 +4147,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 692.4879760742188, @@ -4090,6 +4194,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 783.2139892578125, @@ -4144,6 +4249,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 904.2139892578125, @@ -4190,6 +4296,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 913.4879760742188, @@ -4236,6 +4343,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 596.7730102539062, @@ -4282,6 +4390,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 478.6300048828125, @@ -4328,6 +4437,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 732.9879760742188, @@ -4374,6 +4484,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 333.40399169921875, @@ -4420,6 +4531,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 631.0590209960938, @@ -4466,6 +4578,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 411.9639892578125, @@ -4520,6 +4633,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 682.4879760742188, @@ -4558,6 +4672,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 768.2020263671875, @@ -4604,6 +4719,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1151.821044921875, @@ -4650,6 +4766,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1212.654052734375, @@ -4688,6 +4805,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1227.321044921875, @@ -4726,6 +4844,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1532.0469970703125, @@ -4764,6 +4883,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1476.0469970703125, @@ -4810,6 +4930,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1911.8800048828125, @@ -4848,6 +4969,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1815.2139892578125, @@ -4902,6 +5024,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1581.2139892578125, @@ -4948,6 +5071,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1260.654052734375, @@ -4986,6 +5110,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1715.2139892578125, @@ -5032,6 +5157,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1885.2139892578125, @@ -5078,6 +5204,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1813.2139892578125, @@ -5116,6 +5243,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1763.2139892578125, @@ -5162,6 +5290,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 807.2139892578125, @@ -5208,6 +5337,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 973.4879760742188, @@ -5262,6 +5392,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1120.321044921875, @@ -5308,6 +5439,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 943.4879760742188, @@ -5354,6 +5486,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 699.6539916992188, @@ -5392,6 +5525,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 766.3209838867188, @@ -5438,6 +5572,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1519.0469970703125, @@ -5484,6 +5619,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 665.344970703125, @@ -5530,6 +5666,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 445.2969970703125, @@ -5576,6 +5713,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 500.2969970703125, @@ -5622,6 +5760,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 515.8209838867188, @@ -5668,6 +5807,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 732.9879760742188, @@ -5706,6 +5846,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 632.9879760742188, @@ -5760,6 +5901,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 511.9639892578125, @@ -5806,6 +5948,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 666.3209838867188, @@ -5860,6 +6003,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 156.5709991455078, @@ -5906,6 +6050,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 95.57099914550781, @@ -5952,6 +6097,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1911.8800048828125, @@ -5998,6 +6144,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1744.321044921875, @@ -6036,6 +6183,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1696.321044921875, @@ -6082,6 +6230,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 296.4639892578125, @@ -6128,6 +6277,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 400.2969970703125, @@ -6174,6 +6324,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1728.321044921875, @@ -6220,6 +6371,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1701.2139892578125, @@ -6266,6 +6418,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1813.321044921875, @@ -6304,6 +6457,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1319.654052734375, @@ -6342,6 +6496,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1319.654052734375, @@ -6388,6 +6543,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1244.654052734375, @@ -6426,6 +6582,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 766.3209838867188, @@ -6464,6 +6621,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1180.321044921875, @@ -6510,6 +6668,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1624.5469970703125, @@ -6556,6 +6715,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 433.6300048828125, @@ -6602,6 +6762,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 125.57099914550781, @@ -6656,6 +6817,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1646.7139892578125, @@ -6702,6 +6864,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 699.6539916992188, @@ -6756,6 +6919,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1276.654052734375, @@ -6794,6 +6958,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 132, @@ -6840,6 +7005,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1293.988037109375, @@ -6871,6 +7037,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/stable/us_map/elk/sketch.exp.svg b/e2etests/testdata/stable/us_map/elk/sketch.exp.svg index e75027087..d2b44dea5 100644 --- a/e2etests/testdata/stable/us_map/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/us_map/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -ALFLGAMSTNAKAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCHIIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTND + .d2-573286266 .fill-N1{fill:#0A0F25;} + .d2-573286266 .fill-N2{fill:#676C7E;} + .d2-573286266 .fill-N3{fill:#9499AB;} + .d2-573286266 .fill-N4{fill:#CFD2DD;} + .d2-573286266 .fill-N5{fill:#DEE1EB;} + .d2-573286266 .fill-N6{fill:#EEF1F8;} + .d2-573286266 .fill-N7{fill:#FFFFFF;} + .d2-573286266 .fill-B1{fill:#0D32B2;} + .d2-573286266 .fill-B2{fill:#0D32B2;} + .d2-573286266 .fill-B3{fill:#E3E9FD;} + .d2-573286266 .fill-B4{fill:#E3E9FD;} + .d2-573286266 .fill-B5{fill:#EDF0FD;} + .d2-573286266 .fill-B6{fill:#F7F8FE;} + .d2-573286266 .fill-AA2{fill:#4A6FF3;} + .d2-573286266 .fill-AA4{fill:#EDF0FD;} + .d2-573286266 .fill-AA5{fill:#F7F8FE;} + .d2-573286266 .fill-AB4{fill:#EDF0FD;} + .d2-573286266 .fill-AB5{fill:#F7F8FE;} + .d2-573286266 .stroke-N1{stroke:#0A0F25;} + .d2-573286266 .stroke-N2{stroke:#676C7E;} + .d2-573286266 .stroke-N3{stroke:#9499AB;} + .d2-573286266 .stroke-N4{stroke:#CFD2DD;} + .d2-573286266 .stroke-N5{stroke:#DEE1EB;} + .d2-573286266 .stroke-N6{stroke:#EEF1F8;} + .d2-573286266 .stroke-N7{stroke:#FFFFFF;} + .d2-573286266 .stroke-B1{stroke:#0D32B2;} + .d2-573286266 .stroke-B2{stroke:#0D32B2;} + .d2-573286266 .stroke-B3{stroke:#E3E9FD;} + .d2-573286266 .stroke-B4{stroke:#E3E9FD;} + .d2-573286266 .stroke-B5{stroke:#EDF0FD;} + .d2-573286266 .stroke-B6{stroke:#F7F8FE;} + .d2-573286266 .stroke-AA2{stroke:#4A6FF3;} + .d2-573286266 .stroke-AA4{stroke:#EDF0FD;} + .d2-573286266 .stroke-AA5{stroke:#F7F8FE;} + .d2-573286266 .stroke-AB4{stroke:#EDF0FD;} + .d2-573286266 .stroke-AB5{stroke:#F7F8FE;} + .d2-573286266 .background-color-N1{background-color:#0A0F25;} + .d2-573286266 .background-color-N2{background-color:#676C7E;} + .d2-573286266 .background-color-N3{background-color:#9499AB;} + .d2-573286266 .background-color-N4{background-color:#CFD2DD;} + .d2-573286266 .background-color-N5{background-color:#DEE1EB;} + .d2-573286266 .background-color-N6{background-color:#EEF1F8;} + .d2-573286266 .background-color-N7{background-color:#FFFFFF;} + .d2-573286266 .background-color-B1{background-color:#0D32B2;} + .d2-573286266 .background-color-B2{background-color:#0D32B2;} + .d2-573286266 .background-color-B3{background-color:#E3E9FD;} + .d2-573286266 .background-color-B4{background-color:#E3E9FD;} + .d2-573286266 .background-color-B5{background-color:#EDF0FD;} + .d2-573286266 .background-color-B6{background-color:#F7F8FE;} + .d2-573286266 .background-color-AA2{background-color:#4A6FF3;} + .d2-573286266 .background-color-AA4{background-color:#EDF0FD;} + .d2-573286266 .background-color-AA5{background-color:#F7F8FE;} + .d2-573286266 .background-color-AB4{background-color:#EDF0FD;} + .d2-573286266 .background-color-AB5{background-color:#F7F8FE;} + .d2-573286266 .color-N1{color:#0A0F25;} + .d2-573286266 .color-N2{color:#676C7E;} + .d2-573286266 .color-N3{color:#9499AB;} + .d2-573286266 .color-N4{color:#CFD2DD;} + .d2-573286266 .color-N5{color:#DEE1EB;} + .d2-573286266 .color-N6{color:#EEF1F8;} + .d2-573286266 .color-N7{color:#FFFFFF;} + .d2-573286266 .color-B1{color:#0D32B2;} + .d2-573286266 .color-B2{color:#0D32B2;} + .d2-573286266 .color-B3{color:#E3E9FD;} + .d2-573286266 .color-B4{color:#E3E9FD;} + .d2-573286266 .color-B5{color:#EDF0FD;} + .d2-573286266 .color-B6{color:#F7F8FE;} + .d2-573286266 .color-AA2{color:#4A6FF3;} + .d2-573286266 .color-AA4{color:#EDF0FD;} + .d2-573286266 .color-AA5{color:#F7F8FE;} + .d2-573286266 .color-AB4{color:#EDF0FD;} + .d2-573286266 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-573286266);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-573286266);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-573286266);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-573286266);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-573286266);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-573286266);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-573286266);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-573286266);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-573286266);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-573286266);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-573286266);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-573286266);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-573286266);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-573286266);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-573286266);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-573286266);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-573286266);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-573286266);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ALFLGAMSTNAKAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCHIIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTND - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/themes/3d-sides/dagre/board.exp.json b/e2etests/testdata/themes/3d-sides/dagre/board.exp.json index 188f34ea6..0dda655de 100644 --- a/e2etests/testdata/themes/3d-sides/dagre/board.exp.json +++ b/e2etests/testdata/themes/3d-sides/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 300, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceCodePro", "shapes": [ @@ -19,6 +27,7 @@ "fill": "B4", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -61,6 +70,7 @@ "fill": "B5", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -102,6 +112,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -156,6 +167,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/themes/3d-sides/dagre/sketch.exp.svg b/e2etests/testdata/themes/3d-sides/dagre/sketch.exp.svg index 2c5427b77..5851fbc15 100644 --- a/e2etests/testdata/themes/3d-sides/dagre/sketch.exp.svg +++ b/e2etests/testdata/themes/3d-sides/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ - +}]]> @@ -122,10 +122,10 @@ - + -BEATSBEATS IS A FAMILY OF "DATA SHIPPERS," DISTINCT SERVICES THAT SEND A SINGLE TYPE OF DATA FROM MACHINES +BEATSBEATS IS A FAMILY OF "DATA SHIPPERS," DISTINCT SERVICES THAT SEND A SINGLE TYPE OF DATA FROM MACHINES - - + + \ No newline at end of file diff --git a/e2etests/testdata/themes/3d-sides/elk/board.exp.json b/e2etests/testdata/themes/3d-sides/elk/board.exp.json index ff8b25c2d..2232dea08 100644 --- a/e2etests/testdata/themes/3d-sides/elk/board.exp.json +++ b/e2etests/testdata/themes/3d-sides/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 300, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceCodePro", "shapes": [ @@ -19,6 +27,7 @@ "fill": "B4", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": true, "multiple": false, @@ -61,6 +70,7 @@ "fill": "B5", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -102,6 +112,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -156,6 +167,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/themes/3d-sides/elk/sketch.exp.svg b/e2etests/testdata/themes/3d-sides/elk/sketch.exp.svg index 502295e5d..7ce9d851a 100644 --- a/e2etests/testdata/themes/3d-sides/elk/sketch.exp.svg +++ b/e2etests/testdata/themes/3d-sides/elk/sketch.exp.svg @@ -1,9 +1,9 @@ - +}]]> @@ -122,10 +122,10 @@ - + -BEATSBEATS IS A FAMILY OF "DATA SHIPPERS," DISTINCT SERVICES THAT SEND A SINGLE TYPE OF DATA FROM MACHINES +BEATSBEATS IS A FAMILY OF "DATA SHIPPERS," DISTINCT SERVICES THAT SEND A SINGLE TYPE OF DATA FROM MACHINES - - + + \ No newline at end of file diff --git a/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/board.exp.json b/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/board.exp.json index 4945204b4..04b6f024b 100644 --- a/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/board.exp.json +++ b/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 201, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "AB4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -653,6 +673,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -717,6 +738,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -757,6 +779,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -797,6 +820,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -809,7 +833,7 @@ "fields": null, "methods": null, "columns": null, - "label": "\\\\displaylines{x = a + b \\\\\\\\ y = b + c}\n\\\\sum_{k=1}^{n} h_{k} \\\\int_{0}^{1} \\\\bigl(\\\\partial_{k} f(x_{k-1}+t h_{k} e_{k}) -\\\\partial_{k} f(a)\\\\bigr) \\\\,dt", + "label": "\\displaylines{x = a + b \\\\ y = b + c}\n\\sum_{k=1}^{n} h_{k} \\int_{0}^{1} \\bigl(\\partial_{k} f(x_{k-1}+t h_{k} e_{k}) -\\partial_{k} f(a)\\bigr) \\,dt", "fontSize": 16, "fontFamily": "DEFAULT", "language": "latex", @@ -847,6 +871,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 203, @@ -894,6 +919,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 211, @@ -941,6 +967,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 221, @@ -988,6 +1015,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 275.5, @@ -1047,6 +1075,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 166, @@ -1094,6 +1123,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 123.75, @@ -1297,6 +1327,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 507.5, @@ -1344,6 +1375,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 565.5, @@ -1391,6 +1423,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 285.5, @@ -1438,6 +1471,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 942.5, @@ -1497,6 +1531,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 942.5, @@ -1537,6 +1572,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/sketch.exp.svg b/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/sketch.exp.svg index 09257b89d..4b55d19c8 100644 --- a/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/sketch.exp.svg +++ b/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/sketch.exp.svg @@ -1,41 +1,41 @@ -networkuserapi serverlogsusersidintnamestringemailstringpasswordstringlast_logindatetimeproducts+idint+pricedecimal+skustring+namestring

    A tale

    +networkuserapi serverlogsusersidintnamestringemailstringpasswordstringlast_logindatetimeproducts+idint+pricedecimal+skustring+namestring

    A tale

    • of
    • two cities
    -
    package main +
    package main import (     "fmt" @@ -908,28 +907,28 @@     city2 := City{Name: "CityB", Population: 1200000}     tellTale(city1, city2) -}Cell Toweronline portaldata processorsatellitesTRANSMITTERuistorage sendsendsendphone logsmake call accessdisplaypersist +}Cell Toweronline portaldata processorsatellitesTRANSMITTERuistorage sendsendsendphone logsmake call accessdisplaypersist - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + +     \ No newline at end of file diff --git a/e2etests/testdata/themes/dark_terrastruct_flagship/elk/board.exp.json b/e2etests/testdata/themes/dark_terrastruct_flagship/elk/board.exp.json index 1325c8be1..8069b068f 100644 --- a/e2etests/testdata/themes/dark_terrastruct_flagship/elk/board.exp.json +++ b/e2etests/testdata/themes/dark_terrastruct_flagship/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 201, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "AB4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -653,6 +673,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -717,6 +738,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -757,6 +779,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -797,6 +820,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -809,7 +833,7 @@ "fields": null, "methods": null, "columns": null, - "label": "\\\\displaylines{x = a + b \\\\\\\\ y = b + c}\n\\\\sum_{k=1}^{n} h_{k} \\\\int_{0}^{1} \\\\bigl(\\\\partial_{k} f(x_{k-1}+t h_{k} e_{k}) -\\\\partial_{k} f(a)\\\\bigr) \\\\,dt", + "label": "\\displaylines{x = a + b \\\\ y = b + c}\n\\sum_{k=1}^{n} h_{k} \\int_{0}^{1} \\bigl(\\partial_{k} f(x_{k-1}+t h_{k} e_{k}) -\\partial_{k} f(a)\\bigr) \\,dt", "fontSize": 16, "fontFamily": "DEFAULT", "language": "latex", @@ -847,6 +871,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 141, @@ -885,6 +910,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 185, @@ -923,6 +949,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 229, @@ -961,6 +988,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 185, @@ -999,6 +1027,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 237, @@ -1045,6 +1074,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 280, @@ -1091,6 +1121,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 464.3330078125, @@ -1145,6 +1176,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 445, @@ -1183,6 +1215,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 130.5, @@ -1229,6 +1262,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 927.75, @@ -1267,6 +1301,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 927.75, @@ -1298,6 +1333,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/themes/dark_terrastruct_flagship/elk/sketch.exp.svg b/e2etests/testdata/themes/dark_terrastruct_flagship/elk/sketch.exp.svg index ffa5431ea..d7227024a 100644 --- a/e2etests/testdata/themes/dark_terrastruct_flagship/elk/sketch.exp.svg +++ b/e2etests/testdata/themes/dark_terrastruct_flagship/elk/sketch.exp.svg @@ -1,41 +1,41 @@ -networkuserapi serverlogsusersidintnamestringemailstringpasswordstringlast_logindatetimeproducts+idint+pricedecimal+skustring+namestring

    A tale

    +networkuserapi serverlogsusersidintnamestringemailstringpasswordstringlast_logindatetimeproducts+idint+pricedecimal+skustring+namestring

    A tale

    • of
    • two cities
    -
    package main +
    package main import (     "fmt" @@ -908,28 +907,28 @@     city2 := City{Name: "CityB", Population: 1200000}     tellTale(city1, city2) -}Cell Toweronline portaldata processorsatellitesTRANSMITTERuistorage sendsendsendphone logsmake call accessdisplaypersist +}Cell Toweronline portaldata processorsatellitesTRANSMITTERuistorage sendsendsendphone logsmake call accessdisplaypersist - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + +     \ No newline at end of file diff --git a/e2etests/testdata/themes/origami/dagre/board.exp.json b/e2etests/testdata/themes/origami/dagre/board.exp.json index 0112af344..4afc3f6c0 100644 --- a/e2etests/testdata/themes/origami/dagre/board.exp.json +++ b/e2etests/testdata/themes/origami/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 302, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -19,6 +27,7 @@ "fill": "B4", "fillPattern": "paper", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -61,6 +70,7 @@ "fill": "B5", "fillPattern": "paper", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -103,6 +113,7 @@ "fill": "AA5", "fillPattern": "paper", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -145,6 +156,7 @@ "fill": "B6", "fillPattern": "paper", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -187,6 +199,7 @@ "fill": "B5", "fillPattern": "paper", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -229,6 +242,7 @@ "fill": "N5", "fillPattern": "paper", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -271,6 +285,7 @@ "fill": "B5", "fillPattern": "paper", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -313,6 +328,7 @@ "fill": "AA5", "fillPattern": "paper", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -355,6 +371,7 @@ "fill": "B3", "fillPattern": "paper", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -397,6 +414,7 @@ "fill": "B3", "fillPattern": "paper", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -439,6 +457,7 @@ "fill": "B6", "fillPattern": "paper", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -481,6 +500,7 @@ "fill": "AB4", "fillPattern": "paper", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -531,6 +551,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 213, @@ -577,6 +598,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 239, @@ -623,6 +645,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 265, @@ -669,6 +692,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 239, @@ -727,6 +751,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 190, @@ -773,6 +798,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 101.75, @@ -975,6 +1001,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 463.25, @@ -1021,6 +1048,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 538.75, @@ -1067,6 +1095,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 239, @@ -1107,6 +1136,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/themes/origami/dagre/sketch.exp.svg b/e2etests/testdata/themes/origami/dagre/sketch.exp.svg index 844e27ecf..a0e043c66 100644 --- a/e2etests/testdata/themes/origami/dagre/sketch.exp.svg +++ b/e2etests/testdata/themes/origami/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ - +}]]> - - + + - + @@ -1160,33 +1160,33 @@ - + -通信網ユーザーOTHER-USERapi サーバーログCell Towerオンラインポータルデータプロセッサ衛星送信機ui保管所 sendSENDsend電話ログ電話をかける アクセス画面持続する +通信網ユーザーOTHER-USERapi サーバーログCell Towerオンラインポータルデータプロセッサ衛星送信機ui保管所 sendSENDsend電話ログ電話をかける アクセス画面持続する - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/themes/origami/elk/board.exp.json b/e2etests/testdata/themes/origami/elk/board.exp.json index afc225702..faa09e6ab 100644 --- a/e2etests/testdata/themes/origami/elk/board.exp.json +++ b/e2etests/testdata/themes/origami/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 302, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -19,6 +27,7 @@ "fill": "B4", "fillPattern": "paper", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -61,6 +70,7 @@ "fill": "B5", "fillPattern": "paper", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -103,6 +113,7 @@ "fill": "AA5", "fillPattern": "paper", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -145,6 +156,7 @@ "fill": "B6", "fillPattern": "paper", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -187,6 +199,7 @@ "fill": "B5", "fillPattern": "paper", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -229,6 +242,7 @@ "fill": "N5", "fillPattern": "paper", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -271,6 +285,7 @@ "fill": "B5", "fillPattern": "paper", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -313,6 +328,7 @@ "fill": "AA5", "fillPattern": "paper", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -355,6 +371,7 @@ "fill": "B3", "fillPattern": "paper", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -397,6 +414,7 @@ "fill": "B3", "fillPattern": "paper", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -439,6 +457,7 @@ "fill": "B6", "fillPattern": "paper", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -481,6 +500,7 @@ "fill": "AB4", "fillPattern": "paper", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -531,6 +551,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 159, @@ -568,6 +589,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 205, @@ -605,6 +627,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 251, @@ -642,6 +665,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 205, @@ -679,6 +703,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 290.6659851074219, @@ -724,6 +749,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 334, @@ -769,6 +795,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 471.9159851074219, @@ -822,6 +849,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 446.75, @@ -859,6 +887,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 148, @@ -898,6 +927,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/themes/origami/elk/sketch.exp.svg b/e2etests/testdata/themes/origami/elk/sketch.exp.svg index 25defb078..35c7ba950 100644 --- a/e2etests/testdata/themes/origami/elk/sketch.exp.svg +++ b/e2etests/testdata/themes/origami/elk/sketch.exp.svg @@ -1,23 +1,23 @@ - +}]]> - - + + - + @@ -1160,33 +1160,33 @@ - + -通信網ユーザーOTHER-USERapi サーバーログCell Towerオンラインポータルデータプロセッサ衛星送信機ui保管所 sendSENDsend電話ログ電話をかける アクセス画面持続する +通信網ユーザーOTHER-USERapi サーバーログCell Towerオンラインポータルデータプロセッサ衛星送信機ui保管所 sendSENDsend電話ログ電話をかける アクセス画面持続する - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/themes/terminal/dagre/board.exp.json b/e2etests/testdata/themes/terminal/dagre/board.exp.json index d270b41c9..4f9c2a720 100644 --- a/e2etests/testdata/themes/terminal/dagre/board.exp.json +++ b/e2etests/testdata/themes/terminal/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 300, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceCodePro", "shapes": [ @@ -19,6 +27,7 @@ "fill": "B4", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -61,6 +70,7 @@ "fill": "B5", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -102,6 +112,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -143,6 +154,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -185,6 +197,7 @@ "fill": "B5", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -226,6 +239,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -268,6 +282,7 @@ "fill": "B5", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -309,6 +324,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -350,6 +366,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -391,6 +408,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -432,6 +450,7 @@ "borderRadius": 0, "fill": "AB4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -473,6 +492,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -657,6 +677,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -721,6 +742,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -761,6 +783,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -801,6 +824,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -813,7 +837,7 @@ "fields": null, "methods": null, "columns": null, - "label": "\\\\displaylines{x = a + b \\\\\\\\ y = b + c}\n\\\\sum_{k=1}^{n} h_{k} \\\\int_{0}^{1} \\\\bigl(\\\\partial_{k} f(x_{k-1}+t h_{k} e_{k}) -\\\\partial_{k} f(a)\\\\bigr) \\\\,dt", + "label": "\\displaylines{x = a + b \\\\ y = b + c}\n\\sum_{k=1}^{n} h_{k} \\int_{0}^{1} \\bigl(\\partial_{k} f(x_{k-1}+t h_{k} e_{k}) -\\partial_{k} f(a)\\bigr) \\,dt", "fontSize": 16, "fontFamily": "mono", "language": "latex", @@ -850,6 +874,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 216, @@ -896,6 +921,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 224, @@ -942,6 +968,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 239, @@ -988,6 +1015,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 316, @@ -1046,6 +1074,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 173.5, @@ -1092,6 +1121,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 126.25, @@ -1294,6 +1324,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 559.75, @@ -1340,6 +1371,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 630.75, @@ -1386,6 +1418,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 326, @@ -1432,6 +1465,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 994.75, @@ -1490,6 +1524,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 994.75, @@ -1530,6 +1565,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/themes/terminal/dagre/sketch.exp.svg b/e2etests/testdata/themes/terminal/dagre/sketch.exp.svg index ca989b1fa..6d4f04257 100644 --- a/e2etests/testdata/themes/terminal/dagre/sketch.exp.svg +++ b/e2etests/testdata/themes/terminal/dagre/sketch.exp.svg @@ -1,34 +1,34 @@ - +}]]> @@ -883,12 +882,12 @@ -NETWORKUSERAPI SERVERLOGSUSERSidintnamestringemailstringpasswordstringlast_logindatetimePRODUCTS+idint+pricedecimal+skustring+namestring

    A TALE

    +NETWORKUSERAPI SERVERLOGSUSERSidintnamestringemailstringpasswordstringlast_logindatetimePRODUCTS+idint+pricedecimal+skustring+namestring

    A TALE

    • OF
    • TWO CITIES
    -
    package main +
    package main import (     "fmt" @@ -934,28 +933,28 @@     city2 := City{Name: "CityB", Population: 1200000}     tellTale(city1, city2) -}Cell TowerONLINE PORTALDATA PROCESSORSATELLITESTRANSMITTERUISTORAGE sendSENDSENDPHONE LOGSMAKE CALL ACCESSDISPLAYPERSIST +}Cell TowerONLINE PORTALDATA PROCESSORSATELLITESTRANSMITTERUISTORAGE sendSENDSENDPHONE LOGSMAKE CALL ACCESSDISPLAYPERSIST - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + +     \ No newline at end of file diff --git a/e2etests/testdata/themes/terminal/elk/board.exp.json b/e2etests/testdata/themes/terminal/elk/board.exp.json index 917f3583b..df77a6d2b 100644 --- a/e2etests/testdata/themes/terminal/elk/board.exp.json +++ b/e2etests/testdata/themes/terminal/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 300, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceCodePro", "shapes": [ @@ -19,6 +27,7 @@ "fill": "B4", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -61,6 +70,7 @@ "fill": "B5", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -102,6 +112,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -143,6 +154,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -185,6 +197,7 @@ "fill": "B5", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -226,6 +239,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -268,6 +282,7 @@ "fill": "B5", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -309,6 +324,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -350,6 +366,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -391,6 +408,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -432,6 +450,7 @@ "borderRadius": 0, "fill": "AB4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -473,6 +492,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -657,6 +677,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -721,6 +742,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -761,6 +783,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -801,6 +824,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -813,7 +837,7 @@ "fields": null, "methods": null, "columns": null, - "label": "\\\\displaylines{x = a + b \\\\\\\\ y = b + c}\n\\\\sum_{k=1}^{n} h_{k} \\\\int_{0}^{1} \\\\bigl(\\\\partial_{k} f(x_{k-1}+t h_{k} e_{k}) -\\\\partial_{k} f(a)\\\\bigr) \\\\,dt", + "label": "\\displaylines{x = a + b \\\\ y = b + c}\n\\sum_{k=1}^{n} h_{k} \\int_{0}^{1} \\bigl(\\partial_{k} f(x_{k-1}+t h_{k} e_{k}) -\\partial_{k} f(a)\\bigr) \\,dt", "fontSize": 16, "fontFamily": "mono", "language": "latex", @@ -850,6 +874,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 148, @@ -887,6 +912,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 198, @@ -924,6 +950,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 247, @@ -961,6 +988,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 197.75, @@ -998,6 +1026,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 261.6659851074219, @@ -1043,6 +1072,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 305, @@ -1088,6 +1118,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 526.291015625, @@ -1141,6 +1172,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 502.625, @@ -1178,6 +1210,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 136.75, @@ -1223,6 +1256,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1035.5, @@ -1260,6 +1294,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1035.5, @@ -1291,6 +1326,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/themes/terminal/elk/sketch.exp.svg b/e2etests/testdata/themes/terminal/elk/sketch.exp.svg index e506008af..580cca876 100644 --- a/e2etests/testdata/themes/terminal/elk/sketch.exp.svg +++ b/e2etests/testdata/themes/terminal/elk/sketch.exp.svg @@ -1,34 +1,34 @@ - +}]]> @@ -883,12 +882,12 @@ -NETWORKUSERAPI SERVERLOGSUSERSidintnamestringemailstringpasswordstringlast_logindatetimePRODUCTS+idint+pricedecimal+skustring+namestring

    A TALE

    +NETWORKUSERAPI SERVERLOGSUSERSidintnamestringemailstringpasswordstringlast_logindatetimePRODUCTS+idint+pricedecimal+skustring+namestring

    A TALE

    • OF
    • TWO CITIES
    -
    package main +
    package main import (     "fmt" @@ -934,28 +933,28 @@     city2 := City{Name: "CityB", Population: 1200000}     tellTale(city1, city2) -}Cell TowerONLINE PORTALDATA PROCESSORSATELLITESTRANSMITTERUISTORAGE sendSENDSENDPHONE LOGSMAKE CALL ACCESSDISPLAYPERSIST +}Cell TowerONLINE PORTALDATA PROCESSORSATELLITESTRANSMITTERUISTORAGE sendSENDSENDPHONE LOGSMAKE CALL ACCESSDISPLAYPERSIST - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + +     \ No newline at end of file diff --git a/e2etests/testdata/themes/terminal_grayscale/dagre/board.exp.json b/e2etests/testdata/themes/terminal_grayscale/dagre/board.exp.json index 64fd3c9ef..006754dd5 100644 --- a/e2etests/testdata/themes/terminal_grayscale/dagre/board.exp.json +++ b/e2etests/testdata/themes/terminal_grayscale/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 301, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceCodePro", "shapes": [ @@ -19,6 +27,7 @@ "fill": "B4", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -61,6 +70,7 @@ "fill": "B5", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -102,6 +112,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -143,6 +154,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -185,6 +197,7 @@ "fill": "B5", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -226,6 +239,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -268,6 +282,7 @@ "fill": "B5", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -309,6 +324,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -350,6 +366,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -391,6 +408,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -432,6 +450,7 @@ "borderRadius": 0, "fill": "AB4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -482,6 +501,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 229, @@ -528,6 +548,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 257, @@ -574,6 +595,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 285, @@ -620,6 +642,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 257, @@ -678,6 +701,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 196, @@ -724,6 +748,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 119, @@ -926,6 +951,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 497.5, @@ -972,6 +998,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 568.5, @@ -1018,6 +1045,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 257, @@ -1058,6 +1086,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/themes/terminal_grayscale/dagre/sketch.exp.svg b/e2etests/testdata/themes/terminal_grayscale/dagre/sketch.exp.svg index 920ff64a6..176d18b51 100644 --- a/e2etests/testdata/themes/terminal_grayscale/dagre/sketch.exp.svg +++ b/e2etests/testdata/themes/terminal_grayscale/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ - +}]]> @@ -136,25 +136,25 @@ -NETWORKUSERAPI SERVERLOGSCell TowerONLINE PORTALDATA PROCESSORSATELLITESTRANSMITTERUISTORAGE sendSENDSENDphone logsMAKE CALL ACCESSDISPLAYPERSIST +NETWORKUSERAPI SERVERLOGSCell TowerONLINE PORTALDATA PROCESSORSATELLITESTRANSMITTERUISTORAGE sendSENDSENDphone logsMAKE CALL ACCESSDISPLAYPERSIST - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/themes/terminal_grayscale/elk/board.exp.json b/e2etests/testdata/themes/terminal_grayscale/elk/board.exp.json index 3ef6b1667..cfb29ea83 100644 --- a/e2etests/testdata/themes/terminal_grayscale/elk/board.exp.json +++ b/e2etests/testdata/themes/terminal_grayscale/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 301, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceCodePro", "shapes": [ @@ -19,6 +27,7 @@ "fill": "B4", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -61,6 +70,7 @@ "fill": "B5", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -102,6 +112,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -143,6 +154,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -185,6 +197,7 @@ "fill": "B5", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -226,6 +239,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -268,6 +282,7 @@ "fill": "B5", "fillPattern": "dots", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -309,6 +324,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -350,6 +366,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -391,6 +408,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -432,6 +450,7 @@ "borderRadius": 0, "fill": "AB4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -482,6 +501,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 148, @@ -519,6 +539,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 198, @@ -556,6 +577,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 247, @@ -593,6 +615,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 197.75, @@ -630,6 +653,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 261.6659851074219, @@ -675,6 +699,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 305, @@ -720,6 +745,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 435.7909851074219, @@ -773,6 +799,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 412.125, @@ -810,6 +837,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 136.75, @@ -849,6 +877,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/themes/terminal_grayscale/elk/sketch.exp.svg b/e2etests/testdata/themes/terminal_grayscale/elk/sketch.exp.svg index 780a29f16..ab6815b16 100644 --- a/e2etests/testdata/themes/terminal_grayscale/elk/sketch.exp.svg +++ b/e2etests/testdata/themes/terminal_grayscale/elk/sketch.exp.svg @@ -1,23 +1,23 @@ - +}]]> @@ -136,25 +136,25 @@ -NETWORKUSERAPI SERVERLOGSCell TowerONLINE PORTALDATA PROCESSORSATELLITESTRANSMITTERUISTORAGE sendSENDSENDphone logsMAKE CALL ACCESSDISPLAYPERSIST +NETWORKUSERAPI SERVERLOGSCell TowerONLINE PORTALDATA PROCESSORSATELLITESTRANSMITTERUISTORAGE sendSENDSENDphone logsMAKE CALL ACCESSDISPLAYPERSIST - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/todo/container_icon_label/dagre/board.exp.json b/e2etests/testdata/todo/container_icon_label/dagre/board.exp.json index ff2afb5d8..26491f989 100644 --- a/e2etests/testdata/todo/container_icon_label/dagre/board.exp.json +++ b/e2etests/testdata/todo/container_icon_label/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -71,6 +80,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -112,6 +122,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -153,6 +164,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -194,6 +206,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -245,6 +258,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 86.5, @@ -292,6 +306,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 86.5, @@ -332,6 +347,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/todo/container_icon_label/dagre/sketch.exp.svg b/e2etests/testdata/todo/container_icon_label/dagre/sketch.exp.svg index 60a554170..0740a90ad 100644 --- a/e2etests/testdata/todo/container_icon_label/dagre/sketch.exp.svg +++ b/e2etests/testdata/todo/container_icon_label/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -Big fontabca + .d2-3892451252 .fill-N1{fill:#0A0F25;} + .d2-3892451252 .fill-N2{fill:#676C7E;} + .d2-3892451252 .fill-N3{fill:#9499AB;} + .d2-3892451252 .fill-N4{fill:#CFD2DD;} + .d2-3892451252 .fill-N5{fill:#DEE1EB;} + .d2-3892451252 .fill-N6{fill:#EEF1F8;} + .d2-3892451252 .fill-N7{fill:#FFFFFF;} + .d2-3892451252 .fill-B1{fill:#0D32B2;} + .d2-3892451252 .fill-B2{fill:#0D32B2;} + .d2-3892451252 .fill-B3{fill:#E3E9FD;} + .d2-3892451252 .fill-B4{fill:#E3E9FD;} + .d2-3892451252 .fill-B5{fill:#EDF0FD;} + .d2-3892451252 .fill-B6{fill:#F7F8FE;} + .d2-3892451252 .fill-AA2{fill:#4A6FF3;} + .d2-3892451252 .fill-AA4{fill:#EDF0FD;} + .d2-3892451252 .fill-AA5{fill:#F7F8FE;} + .d2-3892451252 .fill-AB4{fill:#EDF0FD;} + .d2-3892451252 .fill-AB5{fill:#F7F8FE;} + .d2-3892451252 .stroke-N1{stroke:#0A0F25;} + .d2-3892451252 .stroke-N2{stroke:#676C7E;} + .d2-3892451252 .stroke-N3{stroke:#9499AB;} + .d2-3892451252 .stroke-N4{stroke:#CFD2DD;} + .d2-3892451252 .stroke-N5{stroke:#DEE1EB;} + .d2-3892451252 .stroke-N6{stroke:#EEF1F8;} + .d2-3892451252 .stroke-N7{stroke:#FFFFFF;} + .d2-3892451252 .stroke-B1{stroke:#0D32B2;} + .d2-3892451252 .stroke-B2{stroke:#0D32B2;} + .d2-3892451252 .stroke-B3{stroke:#E3E9FD;} + .d2-3892451252 .stroke-B4{stroke:#E3E9FD;} + .d2-3892451252 .stroke-B5{stroke:#EDF0FD;} + .d2-3892451252 .stroke-B6{stroke:#F7F8FE;} + .d2-3892451252 .stroke-AA2{stroke:#4A6FF3;} + .d2-3892451252 .stroke-AA4{stroke:#EDF0FD;} + .d2-3892451252 .stroke-AA5{stroke:#F7F8FE;} + .d2-3892451252 .stroke-AB4{stroke:#EDF0FD;} + .d2-3892451252 .stroke-AB5{stroke:#F7F8FE;} + .d2-3892451252 .background-color-N1{background-color:#0A0F25;} + .d2-3892451252 .background-color-N2{background-color:#676C7E;} + .d2-3892451252 .background-color-N3{background-color:#9499AB;} + .d2-3892451252 .background-color-N4{background-color:#CFD2DD;} + .d2-3892451252 .background-color-N5{background-color:#DEE1EB;} + .d2-3892451252 .background-color-N6{background-color:#EEF1F8;} + .d2-3892451252 .background-color-N7{background-color:#FFFFFF;} + .d2-3892451252 .background-color-B1{background-color:#0D32B2;} + .d2-3892451252 .background-color-B2{background-color:#0D32B2;} + .d2-3892451252 .background-color-B3{background-color:#E3E9FD;} + .d2-3892451252 .background-color-B4{background-color:#E3E9FD;} + .d2-3892451252 .background-color-B5{background-color:#EDF0FD;} + .d2-3892451252 .background-color-B6{background-color:#F7F8FE;} + .d2-3892451252 .background-color-AA2{background-color:#4A6FF3;} + .d2-3892451252 .background-color-AA4{background-color:#EDF0FD;} + .d2-3892451252 .background-color-AA5{background-color:#F7F8FE;} + .d2-3892451252 .background-color-AB4{background-color:#EDF0FD;} + .d2-3892451252 .background-color-AB5{background-color:#F7F8FE;} + .d2-3892451252 .color-N1{color:#0A0F25;} + .d2-3892451252 .color-N2{color:#676C7E;} + .d2-3892451252 .color-N3{color:#9499AB;} + .d2-3892451252 .color-N4{color:#CFD2DD;} + .d2-3892451252 .color-N5{color:#DEE1EB;} + .d2-3892451252 .color-N6{color:#EEF1F8;} + .d2-3892451252 .color-N7{color:#FFFFFF;} + .d2-3892451252 .color-B1{color:#0D32B2;} + .d2-3892451252 .color-B2{color:#0D32B2;} + .d2-3892451252 .color-B3{color:#E3E9FD;} + .d2-3892451252 .color-B4{color:#E3E9FD;} + .d2-3892451252 .color-B5{color:#EDF0FD;} + .d2-3892451252 .color-B6{color:#F7F8FE;} + .d2-3892451252 .color-AA2{color:#4A6FF3;} + .d2-3892451252 .color-AA4{color:#EDF0FD;} + .d2-3892451252 .color-AA5{color:#F7F8FE;} + .d2-3892451252 .color-AB4{color:#EDF0FD;} + .d2-3892451252 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3892451252);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3892451252);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3892451252);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3892451252);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3892451252);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3892451252);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3892451252);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3892451252);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3892451252);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3892451252);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3892451252);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3892451252);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3892451252);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3892451252);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3892451252);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3892451252);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3892451252);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3892451252);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>Big fontabca - - - - - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/todo/container_icon_label/elk/board.exp.json b/e2etests/testdata/todo/container_icon_label/elk/board.exp.json index 3d510ee0d..f226ca87c 100644 --- a/e2etests/testdata/todo/container_icon_label/elk/board.exp.json +++ b/e2etests/testdata/todo/container_icon_label/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -71,6 +80,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -112,6 +122,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -153,6 +164,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -194,6 +206,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -245,6 +258,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 138.5, @@ -283,6 +297,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 138.5, @@ -314,6 +329,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/todo/container_icon_label/elk/sketch.exp.svg b/e2etests/testdata/todo/container_icon_label/elk/sketch.exp.svg index 7b458289e..4eba7f260 100644 --- a/e2etests/testdata/todo/container_icon_label/elk/sketch.exp.svg +++ b/e2etests/testdata/todo/container_icon_label/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -Big fontabca + .d2-3155979488 .fill-N1{fill:#0A0F25;} + .d2-3155979488 .fill-N2{fill:#676C7E;} + .d2-3155979488 .fill-N3{fill:#9499AB;} + .d2-3155979488 .fill-N4{fill:#CFD2DD;} + .d2-3155979488 .fill-N5{fill:#DEE1EB;} + .d2-3155979488 .fill-N6{fill:#EEF1F8;} + .d2-3155979488 .fill-N7{fill:#FFFFFF;} + .d2-3155979488 .fill-B1{fill:#0D32B2;} + .d2-3155979488 .fill-B2{fill:#0D32B2;} + .d2-3155979488 .fill-B3{fill:#E3E9FD;} + .d2-3155979488 .fill-B4{fill:#E3E9FD;} + .d2-3155979488 .fill-B5{fill:#EDF0FD;} + .d2-3155979488 .fill-B6{fill:#F7F8FE;} + .d2-3155979488 .fill-AA2{fill:#4A6FF3;} + .d2-3155979488 .fill-AA4{fill:#EDF0FD;} + .d2-3155979488 .fill-AA5{fill:#F7F8FE;} + .d2-3155979488 .fill-AB4{fill:#EDF0FD;} + .d2-3155979488 .fill-AB5{fill:#F7F8FE;} + .d2-3155979488 .stroke-N1{stroke:#0A0F25;} + .d2-3155979488 .stroke-N2{stroke:#676C7E;} + .d2-3155979488 .stroke-N3{stroke:#9499AB;} + .d2-3155979488 .stroke-N4{stroke:#CFD2DD;} + .d2-3155979488 .stroke-N5{stroke:#DEE1EB;} + .d2-3155979488 .stroke-N6{stroke:#EEF1F8;} + .d2-3155979488 .stroke-N7{stroke:#FFFFFF;} + .d2-3155979488 .stroke-B1{stroke:#0D32B2;} + .d2-3155979488 .stroke-B2{stroke:#0D32B2;} + .d2-3155979488 .stroke-B3{stroke:#E3E9FD;} + .d2-3155979488 .stroke-B4{stroke:#E3E9FD;} + .d2-3155979488 .stroke-B5{stroke:#EDF0FD;} + .d2-3155979488 .stroke-B6{stroke:#F7F8FE;} + .d2-3155979488 .stroke-AA2{stroke:#4A6FF3;} + .d2-3155979488 .stroke-AA4{stroke:#EDF0FD;} + .d2-3155979488 .stroke-AA5{stroke:#F7F8FE;} + .d2-3155979488 .stroke-AB4{stroke:#EDF0FD;} + .d2-3155979488 .stroke-AB5{stroke:#F7F8FE;} + .d2-3155979488 .background-color-N1{background-color:#0A0F25;} + .d2-3155979488 .background-color-N2{background-color:#676C7E;} + .d2-3155979488 .background-color-N3{background-color:#9499AB;} + .d2-3155979488 .background-color-N4{background-color:#CFD2DD;} + .d2-3155979488 .background-color-N5{background-color:#DEE1EB;} + .d2-3155979488 .background-color-N6{background-color:#EEF1F8;} + .d2-3155979488 .background-color-N7{background-color:#FFFFFF;} + .d2-3155979488 .background-color-B1{background-color:#0D32B2;} + .d2-3155979488 .background-color-B2{background-color:#0D32B2;} + .d2-3155979488 .background-color-B3{background-color:#E3E9FD;} + .d2-3155979488 .background-color-B4{background-color:#E3E9FD;} + .d2-3155979488 .background-color-B5{background-color:#EDF0FD;} + .d2-3155979488 .background-color-B6{background-color:#F7F8FE;} + .d2-3155979488 .background-color-AA2{background-color:#4A6FF3;} + .d2-3155979488 .background-color-AA4{background-color:#EDF0FD;} + .d2-3155979488 .background-color-AA5{background-color:#F7F8FE;} + .d2-3155979488 .background-color-AB4{background-color:#EDF0FD;} + .d2-3155979488 .background-color-AB5{background-color:#F7F8FE;} + .d2-3155979488 .color-N1{color:#0A0F25;} + .d2-3155979488 .color-N2{color:#676C7E;} + .d2-3155979488 .color-N3{color:#9499AB;} + .d2-3155979488 .color-N4{color:#CFD2DD;} + .d2-3155979488 .color-N5{color:#DEE1EB;} + .d2-3155979488 .color-N6{color:#EEF1F8;} + .d2-3155979488 .color-N7{color:#FFFFFF;} + .d2-3155979488 .color-B1{color:#0D32B2;} + .d2-3155979488 .color-B2{color:#0D32B2;} + .d2-3155979488 .color-B3{color:#E3E9FD;} + .d2-3155979488 .color-B4{color:#E3E9FD;} + .d2-3155979488 .color-B5{color:#EDF0FD;} + .d2-3155979488 .color-B6{color:#F7F8FE;} + .d2-3155979488 .color-AA2{color:#4A6FF3;} + .d2-3155979488 .color-AA4{color:#EDF0FD;} + .d2-3155979488 .color-AA5{color:#F7F8FE;} + .d2-3155979488 .color-AB4{color:#EDF0FD;} + .d2-3155979488 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3155979488);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3155979488);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3155979488);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3155979488);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3155979488);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3155979488);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3155979488);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3155979488);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3155979488);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3155979488);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3155979488);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3155979488);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3155979488);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3155979488);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3155979488);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3155979488);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3155979488);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3155979488);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>Big fontabca - - - - - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/todo/container_label_edge_adjustment/dagre/board.exp.json b/e2etests/testdata/todo/container_label_edge_adjustment/dagre/board.exp.json index 909eb92e7..0b5a2ae25 100644 --- a/e2etests/testdata/todo/container_label_edge_adjustment/dagre/board.exp.json +++ b/e2etests/testdata/todo/container_label_edge_adjustment/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -101,6 +111,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -142,6 +153,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -183,6 +195,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -224,6 +237,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -265,6 +279,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -316,6 +331,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 40, @@ -363,6 +379,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 209, @@ -410,6 +427,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 153, @@ -457,6 +475,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 265, @@ -495,6 +514,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 377.5, @@ -535,6 +555,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/todo/container_label_edge_adjustment/dagre/sketch.exp.svg b/e2etests/testdata/todo/container_label_edge_adjustment/dagre/sketch.exp.svg index bd7a1f7f1..bbb1e81d4 100644 --- a/e2etests/testdata/todo/container_label_edge_adjustment/dagre/sketch.exp.svg +++ b/e2etests/testdata/todo/container_label_edge_adjustment/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -aa container labeldefgc + .d2-4073068003 .fill-N1{fill:#0A0F25;} + .d2-4073068003 .fill-N2{fill:#676C7E;} + .d2-4073068003 .fill-N3{fill:#9499AB;} + .d2-4073068003 .fill-N4{fill:#CFD2DD;} + .d2-4073068003 .fill-N5{fill:#DEE1EB;} + .d2-4073068003 .fill-N6{fill:#EEF1F8;} + .d2-4073068003 .fill-N7{fill:#FFFFFF;} + .d2-4073068003 .fill-B1{fill:#0D32B2;} + .d2-4073068003 .fill-B2{fill:#0D32B2;} + .d2-4073068003 .fill-B3{fill:#E3E9FD;} + .d2-4073068003 .fill-B4{fill:#E3E9FD;} + .d2-4073068003 .fill-B5{fill:#EDF0FD;} + .d2-4073068003 .fill-B6{fill:#F7F8FE;} + .d2-4073068003 .fill-AA2{fill:#4A6FF3;} + .d2-4073068003 .fill-AA4{fill:#EDF0FD;} + .d2-4073068003 .fill-AA5{fill:#F7F8FE;} + .d2-4073068003 .fill-AB4{fill:#EDF0FD;} + .d2-4073068003 .fill-AB5{fill:#F7F8FE;} + .d2-4073068003 .stroke-N1{stroke:#0A0F25;} + .d2-4073068003 .stroke-N2{stroke:#676C7E;} + .d2-4073068003 .stroke-N3{stroke:#9499AB;} + .d2-4073068003 .stroke-N4{stroke:#CFD2DD;} + .d2-4073068003 .stroke-N5{stroke:#DEE1EB;} + .d2-4073068003 .stroke-N6{stroke:#EEF1F8;} + .d2-4073068003 .stroke-N7{stroke:#FFFFFF;} + .d2-4073068003 .stroke-B1{stroke:#0D32B2;} + .d2-4073068003 .stroke-B2{stroke:#0D32B2;} + .d2-4073068003 .stroke-B3{stroke:#E3E9FD;} + .d2-4073068003 .stroke-B4{stroke:#E3E9FD;} + .d2-4073068003 .stroke-B5{stroke:#EDF0FD;} + .d2-4073068003 .stroke-B6{stroke:#F7F8FE;} + .d2-4073068003 .stroke-AA2{stroke:#4A6FF3;} + .d2-4073068003 .stroke-AA4{stroke:#EDF0FD;} + .d2-4073068003 .stroke-AA5{stroke:#F7F8FE;} + .d2-4073068003 .stroke-AB4{stroke:#EDF0FD;} + .d2-4073068003 .stroke-AB5{stroke:#F7F8FE;} + .d2-4073068003 .background-color-N1{background-color:#0A0F25;} + .d2-4073068003 .background-color-N2{background-color:#676C7E;} + .d2-4073068003 .background-color-N3{background-color:#9499AB;} + .d2-4073068003 .background-color-N4{background-color:#CFD2DD;} + .d2-4073068003 .background-color-N5{background-color:#DEE1EB;} + .d2-4073068003 .background-color-N6{background-color:#EEF1F8;} + .d2-4073068003 .background-color-N7{background-color:#FFFFFF;} + .d2-4073068003 .background-color-B1{background-color:#0D32B2;} + .d2-4073068003 .background-color-B2{background-color:#0D32B2;} + .d2-4073068003 .background-color-B3{background-color:#E3E9FD;} + .d2-4073068003 .background-color-B4{background-color:#E3E9FD;} + .d2-4073068003 .background-color-B5{background-color:#EDF0FD;} + .d2-4073068003 .background-color-B6{background-color:#F7F8FE;} + .d2-4073068003 .background-color-AA2{background-color:#4A6FF3;} + .d2-4073068003 .background-color-AA4{background-color:#EDF0FD;} + .d2-4073068003 .background-color-AA5{background-color:#F7F8FE;} + .d2-4073068003 .background-color-AB4{background-color:#EDF0FD;} + .d2-4073068003 .background-color-AB5{background-color:#F7F8FE;} + .d2-4073068003 .color-N1{color:#0A0F25;} + .d2-4073068003 .color-N2{color:#676C7E;} + .d2-4073068003 .color-N3{color:#9499AB;} + .d2-4073068003 .color-N4{color:#CFD2DD;} + .d2-4073068003 .color-N5{color:#DEE1EB;} + .d2-4073068003 .color-N6{color:#EEF1F8;} + .d2-4073068003 .color-N7{color:#FFFFFF;} + .d2-4073068003 .color-B1{color:#0D32B2;} + .d2-4073068003 .color-B2{color:#0D32B2;} + .d2-4073068003 .color-B3{color:#E3E9FD;} + .d2-4073068003 .color-B4{color:#E3E9FD;} + .d2-4073068003 .color-B5{color:#EDF0FD;} + .d2-4073068003 .color-B6{color:#F7F8FE;} + .d2-4073068003 .color-AA2{color:#4A6FF3;} + .d2-4073068003 .color-AA4{color:#EDF0FD;} + .d2-4073068003 .color-AA5{color:#F7F8FE;} + .d2-4073068003 .color-AB4{color:#EDF0FD;} + .d2-4073068003 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4073068003);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4073068003);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4073068003);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4073068003);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4073068003);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4073068003);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4073068003);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4073068003);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4073068003);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4073068003);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4073068003);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4073068003);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4073068003);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4073068003);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4073068003);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4073068003);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4073068003);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4073068003);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>aa container labeldefgc - - - - - - - + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/todo/container_label_edge_adjustment/elk/board.exp.json b/e2etests/testdata/todo/container_label_edge_adjustment/elk/board.exp.json index a35a89c9d..f8f607e61 100644 --- a/e2etests/testdata/todo/container_label_edge_adjustment/elk/board.exp.json +++ b/e2etests/testdata/todo/container_label_edge_adjustment/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -101,6 +111,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -142,6 +153,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -183,6 +195,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -224,6 +237,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -265,6 +279,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -316,6 +331,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 68.33300018310547, @@ -362,6 +378,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 159, @@ -400,6 +417,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 141.33299255371094, @@ -446,6 +464,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 213.33299255371094, @@ -492,6 +511,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 285.8330078125, @@ -523,6 +543,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/todo/container_label_edge_adjustment/elk/sketch.exp.svg b/e2etests/testdata/todo/container_label_edge_adjustment/elk/sketch.exp.svg index b1773d50d..bdcd08012 100644 --- a/e2etests/testdata/todo/container_label_edge_adjustment/elk/sketch.exp.svg +++ b/e2etests/testdata/todo/container_label_edge_adjustment/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -aa container labeldefgc + .d2-451541651 .fill-N1{fill:#0A0F25;} + .d2-451541651 .fill-N2{fill:#676C7E;} + .d2-451541651 .fill-N3{fill:#9499AB;} + .d2-451541651 .fill-N4{fill:#CFD2DD;} + .d2-451541651 .fill-N5{fill:#DEE1EB;} + .d2-451541651 .fill-N6{fill:#EEF1F8;} + .d2-451541651 .fill-N7{fill:#FFFFFF;} + .d2-451541651 .fill-B1{fill:#0D32B2;} + .d2-451541651 .fill-B2{fill:#0D32B2;} + .d2-451541651 .fill-B3{fill:#E3E9FD;} + .d2-451541651 .fill-B4{fill:#E3E9FD;} + .d2-451541651 .fill-B5{fill:#EDF0FD;} + .d2-451541651 .fill-B6{fill:#F7F8FE;} + .d2-451541651 .fill-AA2{fill:#4A6FF3;} + .d2-451541651 .fill-AA4{fill:#EDF0FD;} + .d2-451541651 .fill-AA5{fill:#F7F8FE;} + .d2-451541651 .fill-AB4{fill:#EDF0FD;} + .d2-451541651 .fill-AB5{fill:#F7F8FE;} + .d2-451541651 .stroke-N1{stroke:#0A0F25;} + .d2-451541651 .stroke-N2{stroke:#676C7E;} + .d2-451541651 .stroke-N3{stroke:#9499AB;} + .d2-451541651 .stroke-N4{stroke:#CFD2DD;} + .d2-451541651 .stroke-N5{stroke:#DEE1EB;} + .d2-451541651 .stroke-N6{stroke:#EEF1F8;} + .d2-451541651 .stroke-N7{stroke:#FFFFFF;} + .d2-451541651 .stroke-B1{stroke:#0D32B2;} + .d2-451541651 .stroke-B2{stroke:#0D32B2;} + .d2-451541651 .stroke-B3{stroke:#E3E9FD;} + .d2-451541651 .stroke-B4{stroke:#E3E9FD;} + .d2-451541651 .stroke-B5{stroke:#EDF0FD;} + .d2-451541651 .stroke-B6{stroke:#F7F8FE;} + .d2-451541651 .stroke-AA2{stroke:#4A6FF3;} + .d2-451541651 .stroke-AA4{stroke:#EDF0FD;} + .d2-451541651 .stroke-AA5{stroke:#F7F8FE;} + .d2-451541651 .stroke-AB4{stroke:#EDF0FD;} + .d2-451541651 .stroke-AB5{stroke:#F7F8FE;} + .d2-451541651 .background-color-N1{background-color:#0A0F25;} + .d2-451541651 .background-color-N2{background-color:#676C7E;} + .d2-451541651 .background-color-N3{background-color:#9499AB;} + .d2-451541651 .background-color-N4{background-color:#CFD2DD;} + .d2-451541651 .background-color-N5{background-color:#DEE1EB;} + .d2-451541651 .background-color-N6{background-color:#EEF1F8;} + .d2-451541651 .background-color-N7{background-color:#FFFFFF;} + .d2-451541651 .background-color-B1{background-color:#0D32B2;} + .d2-451541651 .background-color-B2{background-color:#0D32B2;} + .d2-451541651 .background-color-B3{background-color:#E3E9FD;} + .d2-451541651 .background-color-B4{background-color:#E3E9FD;} + .d2-451541651 .background-color-B5{background-color:#EDF0FD;} + .d2-451541651 .background-color-B6{background-color:#F7F8FE;} + .d2-451541651 .background-color-AA2{background-color:#4A6FF3;} + .d2-451541651 .background-color-AA4{background-color:#EDF0FD;} + .d2-451541651 .background-color-AA5{background-color:#F7F8FE;} + .d2-451541651 .background-color-AB4{background-color:#EDF0FD;} + .d2-451541651 .background-color-AB5{background-color:#F7F8FE;} + .d2-451541651 .color-N1{color:#0A0F25;} + .d2-451541651 .color-N2{color:#676C7E;} + .d2-451541651 .color-N3{color:#9499AB;} + .d2-451541651 .color-N4{color:#CFD2DD;} + .d2-451541651 .color-N5{color:#DEE1EB;} + .d2-451541651 .color-N6{color:#EEF1F8;} + .d2-451541651 .color-N7{color:#FFFFFF;} + .d2-451541651 .color-B1{color:#0D32B2;} + .d2-451541651 .color-B2{color:#0D32B2;} + .d2-451541651 .color-B3{color:#E3E9FD;} + .d2-451541651 .color-B4{color:#E3E9FD;} + .d2-451541651 .color-B5{color:#EDF0FD;} + .d2-451541651 .color-B6{color:#F7F8FE;} + .d2-451541651 .color-AA2{color:#4A6FF3;} + .d2-451541651 .color-AA4{color:#EDF0FD;} + .d2-451541651 .color-AA5{color:#F7F8FE;} + .d2-451541651 .color-AB4{color:#EDF0FD;} + .d2-451541651 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-451541651);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-451541651);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-451541651);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-451541651);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-451541651);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-451541651);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-451541651);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-451541651);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-451541651);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-451541651);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-451541651);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-451541651);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-451541651);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-451541651);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-451541651);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-451541651);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-451541651);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-451541651);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>aa container labeldefgc - - - - - - - + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/todo/container_label_edge_adjustment2/dagre/board.exp.json b/e2etests/testdata/todo/container_label_edge_adjustment2/dagre/board.exp.json index d503bd825..f112121ff 100644 --- a/e2etests/testdata/todo/container_label_edge_adjustment2/dagre/board.exp.json +++ b/e2etests/testdata/todo/container_label_edge_adjustment2/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -163,6 +174,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 66, @@ -203,6 +215,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/todo/container_label_edge_adjustment2/dagre/sketch.exp.svg b/e2etests/testdata/todo/container_label_edge_adjustment2/dagre/sketch.exp.svg index 39aa01dfb..629339690 100644 --- a/e2etests/testdata/todo/container_label_edge_adjustment2/dagre/sketch.exp.svg +++ b/e2etests/testdata/todo/container_label_edge_adjustment2/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -xbarz foo + .d2-831122201 .fill-N1{fill:#0A0F25;} + .d2-831122201 .fill-N2{fill:#676C7E;} + .d2-831122201 .fill-N3{fill:#9499AB;} + .d2-831122201 .fill-N4{fill:#CFD2DD;} + .d2-831122201 .fill-N5{fill:#DEE1EB;} + .d2-831122201 .fill-N6{fill:#EEF1F8;} + .d2-831122201 .fill-N7{fill:#FFFFFF;} + .d2-831122201 .fill-B1{fill:#0D32B2;} + .d2-831122201 .fill-B2{fill:#0D32B2;} + .d2-831122201 .fill-B3{fill:#E3E9FD;} + .d2-831122201 .fill-B4{fill:#E3E9FD;} + .d2-831122201 .fill-B5{fill:#EDF0FD;} + .d2-831122201 .fill-B6{fill:#F7F8FE;} + .d2-831122201 .fill-AA2{fill:#4A6FF3;} + .d2-831122201 .fill-AA4{fill:#EDF0FD;} + .d2-831122201 .fill-AA5{fill:#F7F8FE;} + .d2-831122201 .fill-AB4{fill:#EDF0FD;} + .d2-831122201 .fill-AB5{fill:#F7F8FE;} + .d2-831122201 .stroke-N1{stroke:#0A0F25;} + .d2-831122201 .stroke-N2{stroke:#676C7E;} + .d2-831122201 .stroke-N3{stroke:#9499AB;} + .d2-831122201 .stroke-N4{stroke:#CFD2DD;} + .d2-831122201 .stroke-N5{stroke:#DEE1EB;} + .d2-831122201 .stroke-N6{stroke:#EEF1F8;} + .d2-831122201 .stroke-N7{stroke:#FFFFFF;} + .d2-831122201 .stroke-B1{stroke:#0D32B2;} + .d2-831122201 .stroke-B2{stroke:#0D32B2;} + .d2-831122201 .stroke-B3{stroke:#E3E9FD;} + .d2-831122201 .stroke-B4{stroke:#E3E9FD;} + .d2-831122201 .stroke-B5{stroke:#EDF0FD;} + .d2-831122201 .stroke-B6{stroke:#F7F8FE;} + .d2-831122201 .stroke-AA2{stroke:#4A6FF3;} + .d2-831122201 .stroke-AA4{stroke:#EDF0FD;} + .d2-831122201 .stroke-AA5{stroke:#F7F8FE;} + .d2-831122201 .stroke-AB4{stroke:#EDF0FD;} + .d2-831122201 .stroke-AB5{stroke:#F7F8FE;} + .d2-831122201 .background-color-N1{background-color:#0A0F25;} + .d2-831122201 .background-color-N2{background-color:#676C7E;} + .d2-831122201 .background-color-N3{background-color:#9499AB;} + .d2-831122201 .background-color-N4{background-color:#CFD2DD;} + .d2-831122201 .background-color-N5{background-color:#DEE1EB;} + .d2-831122201 .background-color-N6{background-color:#EEF1F8;} + .d2-831122201 .background-color-N7{background-color:#FFFFFF;} + .d2-831122201 .background-color-B1{background-color:#0D32B2;} + .d2-831122201 .background-color-B2{background-color:#0D32B2;} + .d2-831122201 .background-color-B3{background-color:#E3E9FD;} + .d2-831122201 .background-color-B4{background-color:#E3E9FD;} + .d2-831122201 .background-color-B5{background-color:#EDF0FD;} + .d2-831122201 .background-color-B6{background-color:#F7F8FE;} + .d2-831122201 .background-color-AA2{background-color:#4A6FF3;} + .d2-831122201 .background-color-AA4{background-color:#EDF0FD;} + .d2-831122201 .background-color-AA5{background-color:#F7F8FE;} + .d2-831122201 .background-color-AB4{background-color:#EDF0FD;} + .d2-831122201 .background-color-AB5{background-color:#F7F8FE;} + .d2-831122201 .color-N1{color:#0A0F25;} + .d2-831122201 .color-N2{color:#676C7E;} + .d2-831122201 .color-N3{color:#9499AB;} + .d2-831122201 .color-N4{color:#CFD2DD;} + .d2-831122201 .color-N5{color:#DEE1EB;} + .d2-831122201 .color-N6{color:#EEF1F8;} + .d2-831122201 .color-N7{color:#FFFFFF;} + .d2-831122201 .color-B1{color:#0D32B2;} + .d2-831122201 .color-B2{color:#0D32B2;} + .d2-831122201 .color-B3{color:#E3E9FD;} + .d2-831122201 .color-B4{color:#E3E9FD;} + .d2-831122201 .color-B5{color:#EDF0FD;} + .d2-831122201 .color-B6{color:#F7F8FE;} + .d2-831122201 .color-AA2{color:#4A6FF3;} + .d2-831122201 .color-AA4{color:#EDF0FD;} + .d2-831122201 .color-AA5{color:#F7F8FE;} + .d2-831122201 .color-AB4{color:#EDF0FD;} + .d2-831122201 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-831122201);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-831122201);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-831122201);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-831122201);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-831122201);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-831122201);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-831122201);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-831122201);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-831122201);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-831122201);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-831122201);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-831122201);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-831122201);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-831122201);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-831122201);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-831122201);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-831122201);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-831122201);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xbarz foo - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/todo/container_label_edge_adjustment2/elk/board.exp.json b/e2etests/testdata/todo/container_label_edge_adjustment2/elk/board.exp.json index 8afd69d28..8b773451a 100644 --- a/e2etests/testdata/todo/container_label_edge_adjustment2/elk/board.exp.json +++ b/e2etests/testdata/todo/container_label_edge_adjustment2/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -163,6 +174,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 88, @@ -194,6 +206,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/todo/container_label_edge_adjustment2/elk/sketch.exp.svg b/e2etests/testdata/todo/container_label_edge_adjustment2/elk/sketch.exp.svg index 058303b13..8a5e2786d 100644 --- a/e2etests/testdata/todo/container_label_edge_adjustment2/elk/sketch.exp.svg +++ b/e2etests/testdata/todo/container_label_edge_adjustment2/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -xbarz foo + .d2-748149384 .fill-N1{fill:#0A0F25;} + .d2-748149384 .fill-N2{fill:#676C7E;} + .d2-748149384 .fill-N3{fill:#9499AB;} + .d2-748149384 .fill-N4{fill:#CFD2DD;} + .d2-748149384 .fill-N5{fill:#DEE1EB;} + .d2-748149384 .fill-N6{fill:#EEF1F8;} + .d2-748149384 .fill-N7{fill:#FFFFFF;} + .d2-748149384 .fill-B1{fill:#0D32B2;} + .d2-748149384 .fill-B2{fill:#0D32B2;} + .d2-748149384 .fill-B3{fill:#E3E9FD;} + .d2-748149384 .fill-B4{fill:#E3E9FD;} + .d2-748149384 .fill-B5{fill:#EDF0FD;} + .d2-748149384 .fill-B6{fill:#F7F8FE;} + .d2-748149384 .fill-AA2{fill:#4A6FF3;} + .d2-748149384 .fill-AA4{fill:#EDF0FD;} + .d2-748149384 .fill-AA5{fill:#F7F8FE;} + .d2-748149384 .fill-AB4{fill:#EDF0FD;} + .d2-748149384 .fill-AB5{fill:#F7F8FE;} + .d2-748149384 .stroke-N1{stroke:#0A0F25;} + .d2-748149384 .stroke-N2{stroke:#676C7E;} + .d2-748149384 .stroke-N3{stroke:#9499AB;} + .d2-748149384 .stroke-N4{stroke:#CFD2DD;} + .d2-748149384 .stroke-N5{stroke:#DEE1EB;} + .d2-748149384 .stroke-N6{stroke:#EEF1F8;} + .d2-748149384 .stroke-N7{stroke:#FFFFFF;} + .d2-748149384 .stroke-B1{stroke:#0D32B2;} + .d2-748149384 .stroke-B2{stroke:#0D32B2;} + .d2-748149384 .stroke-B3{stroke:#E3E9FD;} + .d2-748149384 .stroke-B4{stroke:#E3E9FD;} + .d2-748149384 .stroke-B5{stroke:#EDF0FD;} + .d2-748149384 .stroke-B6{stroke:#F7F8FE;} + .d2-748149384 .stroke-AA2{stroke:#4A6FF3;} + .d2-748149384 .stroke-AA4{stroke:#EDF0FD;} + .d2-748149384 .stroke-AA5{stroke:#F7F8FE;} + .d2-748149384 .stroke-AB4{stroke:#EDF0FD;} + .d2-748149384 .stroke-AB5{stroke:#F7F8FE;} + .d2-748149384 .background-color-N1{background-color:#0A0F25;} + .d2-748149384 .background-color-N2{background-color:#676C7E;} + .d2-748149384 .background-color-N3{background-color:#9499AB;} + .d2-748149384 .background-color-N4{background-color:#CFD2DD;} + .d2-748149384 .background-color-N5{background-color:#DEE1EB;} + .d2-748149384 .background-color-N6{background-color:#EEF1F8;} + .d2-748149384 .background-color-N7{background-color:#FFFFFF;} + .d2-748149384 .background-color-B1{background-color:#0D32B2;} + .d2-748149384 .background-color-B2{background-color:#0D32B2;} + .d2-748149384 .background-color-B3{background-color:#E3E9FD;} + .d2-748149384 .background-color-B4{background-color:#E3E9FD;} + .d2-748149384 .background-color-B5{background-color:#EDF0FD;} + .d2-748149384 .background-color-B6{background-color:#F7F8FE;} + .d2-748149384 .background-color-AA2{background-color:#4A6FF3;} + .d2-748149384 .background-color-AA4{background-color:#EDF0FD;} + .d2-748149384 .background-color-AA5{background-color:#F7F8FE;} + .d2-748149384 .background-color-AB4{background-color:#EDF0FD;} + .d2-748149384 .background-color-AB5{background-color:#F7F8FE;} + .d2-748149384 .color-N1{color:#0A0F25;} + .d2-748149384 .color-N2{color:#676C7E;} + .d2-748149384 .color-N3{color:#9499AB;} + .d2-748149384 .color-N4{color:#CFD2DD;} + .d2-748149384 .color-N5{color:#DEE1EB;} + .d2-748149384 .color-N6{color:#EEF1F8;} + .d2-748149384 .color-N7{color:#FFFFFF;} + .d2-748149384 .color-B1{color:#0D32B2;} + .d2-748149384 .color-B2{color:#0D32B2;} + .d2-748149384 .color-B3{color:#E3E9FD;} + .d2-748149384 .color-B4{color:#E3E9FD;} + .d2-748149384 .color-B5{color:#EDF0FD;} + .d2-748149384 .color-B6{color:#F7F8FE;} + .d2-748149384 .color-AA2{color:#4A6FF3;} + .d2-748149384 .color-AA4{color:#EDF0FD;} + .d2-748149384 .color-AA5{color:#F7F8FE;} + .d2-748149384 .color-AB4{color:#EDF0FD;} + .d2-748149384 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-748149384);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-748149384);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-748149384);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-748149384);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-748149384);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-748149384);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-748149384);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-748149384);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-748149384);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-748149384);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-748149384);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-748149384);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-748149384);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-748149384);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-748149384);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-748149384);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-748149384);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-748149384);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xbarz foo - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/todo/dagre_container_md_label_panic/dagre/board.exp.json b/e2etests/testdata/todo/dagre_container_md_label_panic/dagre/board.exp.json index c2a5b5cf4..ac84d59af 100644 --- a/e2etests/testdata/todo/dagre_container_md_label_panic/dagre/board.exp.json +++ b/e2etests/testdata/todo/dagre_container_md_label_panic/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -140,6 +151,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -181,6 +193,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -222,6 +235,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -273,6 +287,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 144, @@ -320,6 +335,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 187.5, @@ -367,6 +383,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 141.5, @@ -426,6 +443,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 108.5, @@ -509,6 +527,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 233.5, @@ -556,6 +575,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 153.5, @@ -603,6 +623,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 209.5, @@ -655,6 +676,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/todo/dagre_container_md_label_panic/dagre/sketch.exp.svg b/e2etests/testdata/todo/dagre_container_md_label_panic/dagre/sketch.exp.svg index 08bca697f..932e40fbd 100644 --- a/e2etests/testdata/todo/dagre_container_md_label_panic/dagre/sketch.exp.svg +++ b/e2etests/testdata/todo/dagre_container_md_label_panic/dagre/sketch.exp.svg @@ -1,20 +1,20 @@ -OEM Factory

    company Warehouse

    +OEM Factory

    company Warehouse

    • Asset Tagging
    • Inventory
    • Staging
    • Dispatch to Site
    -
    MasterRegional-1Regional-2Regional-N +
    MasterRegional-1Regional-2Regional-N - - - - - - + + + + + +     \ No newline at end of file diff --git a/e2etests/testdata/todo/dagre_container_md_label_panic/elk/board.exp.json b/e2etests/testdata/todo/dagre_container_md_label_panic/elk/board.exp.json index 3f4723904..d58c05ab5 100644 --- a/e2etests/testdata/todo/dagre_container_md_label_panic/elk/board.exp.json +++ b/e2etests/testdata/todo/dagre_container_md_label_panic/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -99,6 +109,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -140,6 +151,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -181,6 +193,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -222,6 +235,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -273,6 +287,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 183, @@ -311,6 +326,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 192.75, @@ -357,6 +373,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 223, @@ -395,6 +412,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 252.75, @@ -449,6 +467,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 142, @@ -495,6 +514,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 203, @@ -533,6 +553,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 172.5, @@ -572,6 +593,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/todo/dagre_container_md_label_panic/elk/sketch.exp.svg b/e2etests/testdata/todo/dagre_container_md_label_panic/elk/sketch.exp.svg index 428e0b77b..d74bac65a 100644 --- a/e2etests/testdata/todo/dagre_container_md_label_panic/elk/sketch.exp.svg +++ b/e2etests/testdata/todo/dagre_container_md_label_panic/elk/sketch.exp.svg @@ -1,20 +1,20 @@ -OEM Factory

    company Warehouse

    +OEM Factory

    company Warehouse

    • Asset Tagging
    • Inventory
    • Staging
    • Dispatch to Site
    -
    MasterRegional-1Regional-2Regional-N +
    MasterRegional-1Regional-2Regional-N - - - - - - + + + + + +     \ No newline at end of file diff --git a/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/dagre/board.exp.json b/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/dagre/board.exp.json index 62a8a97dc..9069d4b61 100644 --- a/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/dagre/board.exp.json +++ b/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -183,6 +195,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -225,6 +238,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -267,6 +281,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -309,6 +324,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -361,6 +377,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -399,6 +416,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -437,6 +455,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -475,6 +494,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -513,6 +533,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -551,6 +572,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -589,6 +611,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -627,6 +650,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -665,6 +689,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 362, @@ -696,6 +721,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/dagre/sketch.exp.svg b/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/dagre/sketch.exp.svg index 1f93cfc85..8e76c6408 100644 --- a/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/dagre/sketch.exp.svg +++ b/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -bacthis is a message groupand this is a nested message groupwhat about more nestingyoyo + .d2-4023969665 .fill-N1{fill:#0A0F25;} + .d2-4023969665 .fill-N2{fill:#676C7E;} + .d2-4023969665 .fill-N3{fill:#9499AB;} + .d2-4023969665 .fill-N4{fill:#CFD2DD;} + .d2-4023969665 .fill-N5{fill:#DEE1EB;} + .d2-4023969665 .fill-N6{fill:#EEF1F8;} + .d2-4023969665 .fill-N7{fill:#FFFFFF;} + .d2-4023969665 .fill-B1{fill:#0D32B2;} + .d2-4023969665 .fill-B2{fill:#0D32B2;} + .d2-4023969665 .fill-B3{fill:#E3E9FD;} + .d2-4023969665 .fill-B4{fill:#E3E9FD;} + .d2-4023969665 .fill-B5{fill:#EDF0FD;} + .d2-4023969665 .fill-B6{fill:#F7F8FE;} + .d2-4023969665 .fill-AA2{fill:#4A6FF3;} + .d2-4023969665 .fill-AA4{fill:#EDF0FD;} + .d2-4023969665 .fill-AA5{fill:#F7F8FE;} + .d2-4023969665 .fill-AB4{fill:#EDF0FD;} + .d2-4023969665 .fill-AB5{fill:#F7F8FE;} + .d2-4023969665 .stroke-N1{stroke:#0A0F25;} + .d2-4023969665 .stroke-N2{stroke:#676C7E;} + .d2-4023969665 .stroke-N3{stroke:#9499AB;} + .d2-4023969665 .stroke-N4{stroke:#CFD2DD;} + .d2-4023969665 .stroke-N5{stroke:#DEE1EB;} + .d2-4023969665 .stroke-N6{stroke:#EEF1F8;} + .d2-4023969665 .stroke-N7{stroke:#FFFFFF;} + .d2-4023969665 .stroke-B1{stroke:#0D32B2;} + .d2-4023969665 .stroke-B2{stroke:#0D32B2;} + .d2-4023969665 .stroke-B3{stroke:#E3E9FD;} + .d2-4023969665 .stroke-B4{stroke:#E3E9FD;} + .d2-4023969665 .stroke-B5{stroke:#EDF0FD;} + .d2-4023969665 .stroke-B6{stroke:#F7F8FE;} + .d2-4023969665 .stroke-AA2{stroke:#4A6FF3;} + .d2-4023969665 .stroke-AA4{stroke:#EDF0FD;} + .d2-4023969665 .stroke-AA5{stroke:#F7F8FE;} + .d2-4023969665 .stroke-AB4{stroke:#EDF0FD;} + .d2-4023969665 .stroke-AB5{stroke:#F7F8FE;} + .d2-4023969665 .background-color-N1{background-color:#0A0F25;} + .d2-4023969665 .background-color-N2{background-color:#676C7E;} + .d2-4023969665 .background-color-N3{background-color:#9499AB;} + .d2-4023969665 .background-color-N4{background-color:#CFD2DD;} + .d2-4023969665 .background-color-N5{background-color:#DEE1EB;} + .d2-4023969665 .background-color-N6{background-color:#EEF1F8;} + .d2-4023969665 .background-color-N7{background-color:#FFFFFF;} + .d2-4023969665 .background-color-B1{background-color:#0D32B2;} + .d2-4023969665 .background-color-B2{background-color:#0D32B2;} + .d2-4023969665 .background-color-B3{background-color:#E3E9FD;} + .d2-4023969665 .background-color-B4{background-color:#E3E9FD;} + .d2-4023969665 .background-color-B5{background-color:#EDF0FD;} + .d2-4023969665 .background-color-B6{background-color:#F7F8FE;} + .d2-4023969665 .background-color-AA2{background-color:#4A6FF3;} + .d2-4023969665 .background-color-AA4{background-color:#EDF0FD;} + .d2-4023969665 .background-color-AA5{background-color:#F7F8FE;} + .d2-4023969665 .background-color-AB4{background-color:#EDF0FD;} + .d2-4023969665 .background-color-AB5{background-color:#F7F8FE;} + .d2-4023969665 .color-N1{color:#0A0F25;} + .d2-4023969665 .color-N2{color:#676C7E;} + .d2-4023969665 .color-N3{color:#9499AB;} + .d2-4023969665 .color-N4{color:#CFD2DD;} + .d2-4023969665 .color-N5{color:#DEE1EB;} + .d2-4023969665 .color-N6{color:#EEF1F8;} + .d2-4023969665 .color-N7{color:#FFFFFF;} + .d2-4023969665 .color-B1{color:#0D32B2;} + .d2-4023969665 .color-B2{color:#0D32B2;} + .d2-4023969665 .color-B3{color:#E3E9FD;} + .d2-4023969665 .color-B4{color:#E3E9FD;} + .d2-4023969665 .color-B5{color:#EDF0FD;} + .d2-4023969665 .color-B6{color:#F7F8FE;} + .d2-4023969665 .color-AA2{color:#4A6FF3;} + .d2-4023969665 .color-AA4{color:#EDF0FD;} + .d2-4023969665 .color-AA5{color:#F7F8FE;} + .d2-4023969665 .color-AB4{color:#EDF0FD;} + .d2-4023969665 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4023969665);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4023969665);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4023969665);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4023969665);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4023969665);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4023969665);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4023969665);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4023969665);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4023969665);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4023969665);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4023969665);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4023969665);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4023969665);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4023969665);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4023969665);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4023969665);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4023969665);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4023969665);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>bacthis is a message groupand this is a nested message groupwhat about more nestingyoyo - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/elk/board.exp.json b/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/elk/board.exp.json index 62a8a97dc..9069d4b61 100644 --- a/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/elk/board.exp.json +++ b/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -183,6 +195,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -225,6 +238,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -267,6 +281,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -309,6 +324,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -361,6 +377,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -399,6 +416,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -437,6 +455,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -475,6 +494,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -513,6 +533,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -551,6 +572,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -589,6 +611,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -627,6 +650,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -665,6 +689,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 362, @@ -696,6 +721,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/elk/sketch.exp.svg b/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/elk/sketch.exp.svg index 1f93cfc85..8e76c6408 100644 --- a/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/elk/sketch.exp.svg +++ b/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -bacthis is a message groupand this is a nested message groupwhat about more nestingyoyo + .d2-4023969665 .fill-N1{fill:#0A0F25;} + .d2-4023969665 .fill-N2{fill:#676C7E;} + .d2-4023969665 .fill-N3{fill:#9499AB;} + .d2-4023969665 .fill-N4{fill:#CFD2DD;} + .d2-4023969665 .fill-N5{fill:#DEE1EB;} + .d2-4023969665 .fill-N6{fill:#EEF1F8;} + .d2-4023969665 .fill-N7{fill:#FFFFFF;} + .d2-4023969665 .fill-B1{fill:#0D32B2;} + .d2-4023969665 .fill-B2{fill:#0D32B2;} + .d2-4023969665 .fill-B3{fill:#E3E9FD;} + .d2-4023969665 .fill-B4{fill:#E3E9FD;} + .d2-4023969665 .fill-B5{fill:#EDF0FD;} + .d2-4023969665 .fill-B6{fill:#F7F8FE;} + .d2-4023969665 .fill-AA2{fill:#4A6FF3;} + .d2-4023969665 .fill-AA4{fill:#EDF0FD;} + .d2-4023969665 .fill-AA5{fill:#F7F8FE;} + .d2-4023969665 .fill-AB4{fill:#EDF0FD;} + .d2-4023969665 .fill-AB5{fill:#F7F8FE;} + .d2-4023969665 .stroke-N1{stroke:#0A0F25;} + .d2-4023969665 .stroke-N2{stroke:#676C7E;} + .d2-4023969665 .stroke-N3{stroke:#9499AB;} + .d2-4023969665 .stroke-N4{stroke:#CFD2DD;} + .d2-4023969665 .stroke-N5{stroke:#DEE1EB;} + .d2-4023969665 .stroke-N6{stroke:#EEF1F8;} + .d2-4023969665 .stroke-N7{stroke:#FFFFFF;} + .d2-4023969665 .stroke-B1{stroke:#0D32B2;} + .d2-4023969665 .stroke-B2{stroke:#0D32B2;} + .d2-4023969665 .stroke-B3{stroke:#E3E9FD;} + .d2-4023969665 .stroke-B4{stroke:#E3E9FD;} + .d2-4023969665 .stroke-B5{stroke:#EDF0FD;} + .d2-4023969665 .stroke-B6{stroke:#F7F8FE;} + .d2-4023969665 .stroke-AA2{stroke:#4A6FF3;} + .d2-4023969665 .stroke-AA4{stroke:#EDF0FD;} + .d2-4023969665 .stroke-AA5{stroke:#F7F8FE;} + .d2-4023969665 .stroke-AB4{stroke:#EDF0FD;} + .d2-4023969665 .stroke-AB5{stroke:#F7F8FE;} + .d2-4023969665 .background-color-N1{background-color:#0A0F25;} + .d2-4023969665 .background-color-N2{background-color:#676C7E;} + .d2-4023969665 .background-color-N3{background-color:#9499AB;} + .d2-4023969665 .background-color-N4{background-color:#CFD2DD;} + .d2-4023969665 .background-color-N5{background-color:#DEE1EB;} + .d2-4023969665 .background-color-N6{background-color:#EEF1F8;} + .d2-4023969665 .background-color-N7{background-color:#FFFFFF;} + .d2-4023969665 .background-color-B1{background-color:#0D32B2;} + .d2-4023969665 .background-color-B2{background-color:#0D32B2;} + .d2-4023969665 .background-color-B3{background-color:#E3E9FD;} + .d2-4023969665 .background-color-B4{background-color:#E3E9FD;} + .d2-4023969665 .background-color-B5{background-color:#EDF0FD;} + .d2-4023969665 .background-color-B6{background-color:#F7F8FE;} + .d2-4023969665 .background-color-AA2{background-color:#4A6FF3;} + .d2-4023969665 .background-color-AA4{background-color:#EDF0FD;} + .d2-4023969665 .background-color-AA5{background-color:#F7F8FE;} + .d2-4023969665 .background-color-AB4{background-color:#EDF0FD;} + .d2-4023969665 .background-color-AB5{background-color:#F7F8FE;} + .d2-4023969665 .color-N1{color:#0A0F25;} + .d2-4023969665 .color-N2{color:#676C7E;} + .d2-4023969665 .color-N3{color:#9499AB;} + .d2-4023969665 .color-N4{color:#CFD2DD;} + .d2-4023969665 .color-N5{color:#DEE1EB;} + .d2-4023969665 .color-N6{color:#EEF1F8;} + .d2-4023969665 .color-N7{color:#FFFFFF;} + .d2-4023969665 .color-B1{color:#0D32B2;} + .d2-4023969665 .color-B2{color:#0D32B2;} + .d2-4023969665 .color-B3{color:#E3E9FD;} + .d2-4023969665 .color-B4{color:#E3E9FD;} + .d2-4023969665 .color-B5{color:#EDF0FD;} + .d2-4023969665 .color-B6{color:#F7F8FE;} + .d2-4023969665 .color-AA2{color:#4A6FF3;} + .d2-4023969665 .color-AA4{color:#EDF0FD;} + .d2-4023969665 .color-AA5{color:#F7F8FE;} + .d2-4023969665 .color-AB4{color:#EDF0FD;} + .d2-4023969665 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4023969665);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4023969665);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4023969665);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4023969665);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4023969665);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4023969665);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4023969665);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4023969665);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4023969665);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4023969665);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4023969665);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4023969665);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4023969665);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4023969665);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4023969665);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4023969665);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4023969665);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4023969665);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>bacthis is a message groupand this is a nested message groupwhat about more nestingyoyo - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/dagre/board.exp.json b/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/dagre/board.exp.json index a92c29768..e9be85257 100644 --- a/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/dagre/board.exp.json +++ b/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -181,6 +193,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -265,6 +279,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -307,6 +322,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -357,6 +373,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -395,6 +412,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 309, @@ -433,6 +451,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -471,6 +490,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 303, @@ -509,6 +529,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -547,6 +568,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 309, @@ -578,6 +600,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/dagre/sketch.exp.svg b/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/dagre/sketch.exp.svg index 4c80405f9..78ec6a625 100644 --- a/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/dagre/sketch.exp.svg +++ b/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -Office chatterAliceBobbyawkward small talkicebreaker attemptunfortunate outcome uhm, hioh, hellowhat did you have for lunch?that's personal + .d2-2175854958 .fill-N1{fill:#0A0F25;} + .d2-2175854958 .fill-N2{fill:#676C7E;} + .d2-2175854958 .fill-N3{fill:#9499AB;} + .d2-2175854958 .fill-N4{fill:#CFD2DD;} + .d2-2175854958 .fill-N5{fill:#DEE1EB;} + .d2-2175854958 .fill-N6{fill:#EEF1F8;} + .d2-2175854958 .fill-N7{fill:#FFFFFF;} + .d2-2175854958 .fill-B1{fill:#0D32B2;} + .d2-2175854958 .fill-B2{fill:#0D32B2;} + .d2-2175854958 .fill-B3{fill:#E3E9FD;} + .d2-2175854958 .fill-B4{fill:#E3E9FD;} + .d2-2175854958 .fill-B5{fill:#EDF0FD;} + .d2-2175854958 .fill-B6{fill:#F7F8FE;} + .d2-2175854958 .fill-AA2{fill:#4A6FF3;} + .d2-2175854958 .fill-AA4{fill:#EDF0FD;} + .d2-2175854958 .fill-AA5{fill:#F7F8FE;} + .d2-2175854958 .fill-AB4{fill:#EDF0FD;} + .d2-2175854958 .fill-AB5{fill:#F7F8FE;} + .d2-2175854958 .stroke-N1{stroke:#0A0F25;} + .d2-2175854958 .stroke-N2{stroke:#676C7E;} + .d2-2175854958 .stroke-N3{stroke:#9499AB;} + .d2-2175854958 .stroke-N4{stroke:#CFD2DD;} + .d2-2175854958 .stroke-N5{stroke:#DEE1EB;} + .d2-2175854958 .stroke-N6{stroke:#EEF1F8;} + .d2-2175854958 .stroke-N7{stroke:#FFFFFF;} + .d2-2175854958 .stroke-B1{stroke:#0D32B2;} + .d2-2175854958 .stroke-B2{stroke:#0D32B2;} + .d2-2175854958 .stroke-B3{stroke:#E3E9FD;} + .d2-2175854958 .stroke-B4{stroke:#E3E9FD;} + .d2-2175854958 .stroke-B5{stroke:#EDF0FD;} + .d2-2175854958 .stroke-B6{stroke:#F7F8FE;} + .d2-2175854958 .stroke-AA2{stroke:#4A6FF3;} + .d2-2175854958 .stroke-AA4{stroke:#EDF0FD;} + .d2-2175854958 .stroke-AA5{stroke:#F7F8FE;} + .d2-2175854958 .stroke-AB4{stroke:#EDF0FD;} + .d2-2175854958 .stroke-AB5{stroke:#F7F8FE;} + .d2-2175854958 .background-color-N1{background-color:#0A0F25;} + .d2-2175854958 .background-color-N2{background-color:#676C7E;} + .d2-2175854958 .background-color-N3{background-color:#9499AB;} + .d2-2175854958 .background-color-N4{background-color:#CFD2DD;} + .d2-2175854958 .background-color-N5{background-color:#DEE1EB;} + .d2-2175854958 .background-color-N6{background-color:#EEF1F8;} + .d2-2175854958 .background-color-N7{background-color:#FFFFFF;} + .d2-2175854958 .background-color-B1{background-color:#0D32B2;} + .d2-2175854958 .background-color-B2{background-color:#0D32B2;} + .d2-2175854958 .background-color-B3{background-color:#E3E9FD;} + .d2-2175854958 .background-color-B4{background-color:#E3E9FD;} + .d2-2175854958 .background-color-B5{background-color:#EDF0FD;} + .d2-2175854958 .background-color-B6{background-color:#F7F8FE;} + .d2-2175854958 .background-color-AA2{background-color:#4A6FF3;} + .d2-2175854958 .background-color-AA4{background-color:#EDF0FD;} + .d2-2175854958 .background-color-AA5{background-color:#F7F8FE;} + .d2-2175854958 .background-color-AB4{background-color:#EDF0FD;} + .d2-2175854958 .background-color-AB5{background-color:#F7F8FE;} + .d2-2175854958 .color-N1{color:#0A0F25;} + .d2-2175854958 .color-N2{color:#676C7E;} + .d2-2175854958 .color-N3{color:#9499AB;} + .d2-2175854958 .color-N4{color:#CFD2DD;} + .d2-2175854958 .color-N5{color:#DEE1EB;} + .d2-2175854958 .color-N6{color:#EEF1F8;} + .d2-2175854958 .color-N7{color:#FFFFFF;} + .d2-2175854958 .color-B1{color:#0D32B2;} + .d2-2175854958 .color-B2{color:#0D32B2;} + .d2-2175854958 .color-B3{color:#E3E9FD;} + .d2-2175854958 .color-B4{color:#E3E9FD;} + .d2-2175854958 .color-B5{color:#EDF0FD;} + .d2-2175854958 .color-B6{color:#F7F8FE;} + .d2-2175854958 .color-AA2{color:#4A6FF3;} + .d2-2175854958 .color-AA4{color:#EDF0FD;} + .d2-2175854958 .color-AA5{color:#F7F8FE;} + .d2-2175854958 .color-AB4{color:#EDF0FD;} + .d2-2175854958 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2175854958);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2175854958);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2175854958);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2175854958);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2175854958);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2175854958);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2175854958);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2175854958);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2175854958);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2175854958);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2175854958);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2175854958);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2175854958);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2175854958);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2175854958);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2175854958);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2175854958);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2175854958);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>Office chatterAliceBobbyawkward small talkicebreaker attemptunfortunate outcome uhm, hioh, hellowhat did you have for lunch?that's personal - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/elk/board.exp.json b/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/elk/board.exp.json index 92d718973..38552f393 100644 --- a/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/elk/board.exp.json +++ b/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -181,6 +193,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -265,6 +279,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -307,6 +322,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -357,6 +373,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 74, @@ -395,6 +412,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 321, @@ -433,6 +451,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 74, @@ -471,6 +490,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 315, @@ -509,6 +529,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 74, @@ -547,6 +568,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 321, @@ -578,6 +600,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/elk/sketch.exp.svg b/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/elk/sketch.exp.svg index d2063b98b..9dec25a1c 100644 --- a/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/elk/sketch.exp.svg +++ b/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -Office chatterAliceBobbyawkward small talkicebreaker attemptunfortunate outcome uhm, hioh, hellowhat did you have for lunch?that's personal + .d2-3303839246 .fill-N1{fill:#0A0F25;} + .d2-3303839246 .fill-N2{fill:#676C7E;} + .d2-3303839246 .fill-N3{fill:#9499AB;} + .d2-3303839246 .fill-N4{fill:#CFD2DD;} + .d2-3303839246 .fill-N5{fill:#DEE1EB;} + .d2-3303839246 .fill-N6{fill:#EEF1F8;} + .d2-3303839246 .fill-N7{fill:#FFFFFF;} + .d2-3303839246 .fill-B1{fill:#0D32B2;} + .d2-3303839246 .fill-B2{fill:#0D32B2;} + .d2-3303839246 .fill-B3{fill:#E3E9FD;} + .d2-3303839246 .fill-B4{fill:#E3E9FD;} + .d2-3303839246 .fill-B5{fill:#EDF0FD;} + .d2-3303839246 .fill-B6{fill:#F7F8FE;} + .d2-3303839246 .fill-AA2{fill:#4A6FF3;} + .d2-3303839246 .fill-AA4{fill:#EDF0FD;} + .d2-3303839246 .fill-AA5{fill:#F7F8FE;} + .d2-3303839246 .fill-AB4{fill:#EDF0FD;} + .d2-3303839246 .fill-AB5{fill:#F7F8FE;} + .d2-3303839246 .stroke-N1{stroke:#0A0F25;} + .d2-3303839246 .stroke-N2{stroke:#676C7E;} + .d2-3303839246 .stroke-N3{stroke:#9499AB;} + .d2-3303839246 .stroke-N4{stroke:#CFD2DD;} + .d2-3303839246 .stroke-N5{stroke:#DEE1EB;} + .d2-3303839246 .stroke-N6{stroke:#EEF1F8;} + .d2-3303839246 .stroke-N7{stroke:#FFFFFF;} + .d2-3303839246 .stroke-B1{stroke:#0D32B2;} + .d2-3303839246 .stroke-B2{stroke:#0D32B2;} + .d2-3303839246 .stroke-B3{stroke:#E3E9FD;} + .d2-3303839246 .stroke-B4{stroke:#E3E9FD;} + .d2-3303839246 .stroke-B5{stroke:#EDF0FD;} + .d2-3303839246 .stroke-B6{stroke:#F7F8FE;} + .d2-3303839246 .stroke-AA2{stroke:#4A6FF3;} + .d2-3303839246 .stroke-AA4{stroke:#EDF0FD;} + .d2-3303839246 .stroke-AA5{stroke:#F7F8FE;} + .d2-3303839246 .stroke-AB4{stroke:#EDF0FD;} + .d2-3303839246 .stroke-AB5{stroke:#F7F8FE;} + .d2-3303839246 .background-color-N1{background-color:#0A0F25;} + .d2-3303839246 .background-color-N2{background-color:#676C7E;} + .d2-3303839246 .background-color-N3{background-color:#9499AB;} + .d2-3303839246 .background-color-N4{background-color:#CFD2DD;} + .d2-3303839246 .background-color-N5{background-color:#DEE1EB;} + .d2-3303839246 .background-color-N6{background-color:#EEF1F8;} + .d2-3303839246 .background-color-N7{background-color:#FFFFFF;} + .d2-3303839246 .background-color-B1{background-color:#0D32B2;} + .d2-3303839246 .background-color-B2{background-color:#0D32B2;} + .d2-3303839246 .background-color-B3{background-color:#E3E9FD;} + .d2-3303839246 .background-color-B4{background-color:#E3E9FD;} + .d2-3303839246 .background-color-B5{background-color:#EDF0FD;} + .d2-3303839246 .background-color-B6{background-color:#F7F8FE;} + .d2-3303839246 .background-color-AA2{background-color:#4A6FF3;} + .d2-3303839246 .background-color-AA4{background-color:#EDF0FD;} + .d2-3303839246 .background-color-AA5{background-color:#F7F8FE;} + .d2-3303839246 .background-color-AB4{background-color:#EDF0FD;} + .d2-3303839246 .background-color-AB5{background-color:#F7F8FE;} + .d2-3303839246 .color-N1{color:#0A0F25;} + .d2-3303839246 .color-N2{color:#676C7E;} + .d2-3303839246 .color-N3{color:#9499AB;} + .d2-3303839246 .color-N4{color:#CFD2DD;} + .d2-3303839246 .color-N5{color:#DEE1EB;} + .d2-3303839246 .color-N6{color:#EEF1F8;} + .d2-3303839246 .color-N7{color:#FFFFFF;} + .d2-3303839246 .color-B1{color:#0D32B2;} + .d2-3303839246 .color-B2{color:#0D32B2;} + .d2-3303839246 .color-B3{color:#E3E9FD;} + .d2-3303839246 .color-B4{color:#E3E9FD;} + .d2-3303839246 .color-B5{color:#EDF0FD;} + .d2-3303839246 .color-B6{color:#F7F8FE;} + .d2-3303839246 .color-AA2{color:#4A6FF3;} + .d2-3303839246 .color-AA4{color:#EDF0FD;} + .d2-3303839246 .color-AA5{color:#F7F8FE;} + .d2-3303839246 .color-AB4{color:#EDF0FD;} + .d2-3303839246 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3303839246);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3303839246);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3303839246);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3303839246);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3303839246);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3303839246);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3303839246);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3303839246);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3303839246);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3303839246);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3303839246);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3303839246);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3303839246);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3303839246);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3303839246);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3303839246);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3303839246);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3303839246);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>Office chatterAliceBobbyawkward small talkicebreaker attemptunfortunate outcome uhm, hioh, hellowhat did you have for lunch?that's personal - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/todo/shape_set_width_height/dagre/board.exp.json b/e2etests/testdata/todo/shape_set_width_height/dagre/board.exp.json index 8003466c4..adf72d929 100644 --- a/e2etests/testdata/todo/shape_set_width_height/dagre/board.exp.json +++ b/e2etests/testdata/todo/shape_set_width_height/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "N4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "N4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -429,6 +447,7 @@ "borderRadius": 0, "fill": "AA4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -470,6 +489,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -545,6 +565,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -729,6 +750,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -770,6 +792,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -810,6 +833,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -850,6 +874,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -900,6 +925,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1228, @@ -959,6 +985,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1228, @@ -1006,6 +1033,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1228, @@ -1053,6 +1081,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1888, @@ -1112,6 +1141,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1888, @@ -1159,6 +1189,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1888, @@ -1199,6 +1230,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/todo/shape_set_width_height/dagre/sketch.exp.svg b/e2etests/testdata/todo/shape_set_width_height/dagre/sketch.exp.svg index 3968eb8fd..47b906f59 100644 --- a/e2etests/testdata/todo/shape_set_width_height/dagre/sketch.exp.svg +++ b/e2etests/testdata/todo/shape_set_width_height/dagre/sketch.exp.svg @@ -1,34 +1,34 @@ -containerscloudtall cylinderclass2-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidusersidintnamestringemailstringpasswordstringlast_logindatetimecontainer

    markdown text expanded to 800x400

    -
    a := 5 +containerscloudtall cylinderclass2-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidusersidintnamestringemailstringpasswordstringlast_logindatetimecontainer

    markdown text expanded to 800x400

    +
    a := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b)a := 5 +fmt.Printf("%d", b)a := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b)circle containerdiamond containeroval containerhexagon containerdiamondcirclehexagonoval +    fmt.Printf("%d", b)    circle containerdiamond containeroval containerhexagon containerdiamondcirclehexagonoval - - - - - - - - - - - - - - - + + + + + + + + + + + + + + +     \ No newline at end of file diff --git a/e2etests/testdata/todo/shape_set_width_height/elk/board.exp.json b/e2etests/testdata/todo/shape_set_width_height/elk/board.exp.json index 58763e1ec..77fb3fece 100644 --- a/e2etests/testdata/todo/shape_set_width_height/elk/board.exp.json +++ b/e2etests/testdata/todo/shape_set_width_height/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "N4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "N4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -429,6 +447,7 @@ "borderRadius": 0, "fill": "AA4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -470,6 +489,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -545,6 +565,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -729,6 +750,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -770,6 +792,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -810,6 +833,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -850,6 +874,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -900,6 +925,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1716, @@ -938,6 +964,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1716, @@ -976,6 +1003,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1716, @@ -1014,6 +1042,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2336, @@ -1052,6 +1081,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2336, @@ -1090,6 +1120,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2336, @@ -1121,6 +1152,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg b/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg index fac4f6fdc..db8a4d225 100644 --- a/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg +++ b/e2etests/testdata/todo/shape_set_width_height/elk/sketch.exp.svg @@ -1,34 +1,34 @@ -containerscloudtall cylinderclass2-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidusersidintnamestringemailstringpasswordstringlast_logindatetimecontainer

    markdown text expanded to 800x400

    -
    a := 5 +containerscloudtall cylinderclass2-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voidusersidintnamestringemailstringpasswordstringlast_logindatetimecontainer

    markdown text expanded to 800x400

    +
    a := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b)a := 5 +fmt.Printf("%d", b)a := 5 b := a + 7 fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b)circle containerdiamond containeroval containerhexagon containerdiamondcirclehexagonoval +    fmt.Printf("%d", b)    circle containerdiamond containeroval containerhexagon containerdiamondcirclehexagonoval - - - - - - - - - - - - - - - + + + + + + + + + + + + + + +     \ No newline at end of file diff --git a/e2etests/testdata/txtar/bidirectional-connection-animation/dagre/board.exp.json b/e2etests/testdata/txtar/bidirectional-connection-animation/dagre/board.exp.json index 16c3d88b9..5bce0bfd5 100644 --- a/e2etests/testdata/txtar/bidirectional-connection-animation/dagre/board.exp.json +++ b/e2etests/testdata/txtar/bidirectional-connection-animation/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -356,6 +372,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 169.75, @@ -403,6 +420,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 173.5, @@ -450,6 +468,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 219, @@ -497,6 +516,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 222.5, @@ -544,6 +564,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 480, @@ -591,6 +612,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 619.166015625, @@ -667,6 +689,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/txtar/bidirectional-connection-animation/dagre/sketch.exp.svg b/e2etests/testdata/txtar/bidirectional-connection-animation/dagre/sketch.exp.svg index 75b7f1aaa..8bf2657a1 100644 --- a/e2etests/testdata/txtar/bidirectional-connection-animation/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/bidirectional-connection-animation/dagre/sketch.exp.svg @@ -1,15 +1,15 @@ -abcdefgx + .d2-2298073951 .fill-N1{fill:#0A0F25;} + .d2-2298073951 .fill-N2{fill:#676C7E;} + .d2-2298073951 .fill-N3{fill:#9499AB;} + .d2-2298073951 .fill-N4{fill:#CFD2DD;} + .d2-2298073951 .fill-N5{fill:#DEE1EB;} + .d2-2298073951 .fill-N6{fill:#EEF1F8;} + .d2-2298073951 .fill-N7{fill:#FFFFFF;} + .d2-2298073951 .fill-B1{fill:#0D32B2;} + .d2-2298073951 .fill-B2{fill:#0D32B2;} + .d2-2298073951 .fill-B3{fill:#E3E9FD;} + .d2-2298073951 .fill-B4{fill:#E3E9FD;} + .d2-2298073951 .fill-B5{fill:#EDF0FD;} + .d2-2298073951 .fill-B6{fill:#F7F8FE;} + .d2-2298073951 .fill-AA2{fill:#4A6FF3;} + .d2-2298073951 .fill-AA4{fill:#EDF0FD;} + .d2-2298073951 .fill-AA5{fill:#F7F8FE;} + .d2-2298073951 .fill-AB4{fill:#EDF0FD;} + .d2-2298073951 .fill-AB5{fill:#F7F8FE;} + .d2-2298073951 .stroke-N1{stroke:#0A0F25;} + .d2-2298073951 .stroke-N2{stroke:#676C7E;} + .d2-2298073951 .stroke-N3{stroke:#9499AB;} + .d2-2298073951 .stroke-N4{stroke:#CFD2DD;} + .d2-2298073951 .stroke-N5{stroke:#DEE1EB;} + .d2-2298073951 .stroke-N6{stroke:#EEF1F8;} + .d2-2298073951 .stroke-N7{stroke:#FFFFFF;} + .d2-2298073951 .stroke-B1{stroke:#0D32B2;} + .d2-2298073951 .stroke-B2{stroke:#0D32B2;} + .d2-2298073951 .stroke-B3{stroke:#E3E9FD;} + .d2-2298073951 .stroke-B4{stroke:#E3E9FD;} + .d2-2298073951 .stroke-B5{stroke:#EDF0FD;} + .d2-2298073951 .stroke-B6{stroke:#F7F8FE;} + .d2-2298073951 .stroke-AA2{stroke:#4A6FF3;} + .d2-2298073951 .stroke-AA4{stroke:#EDF0FD;} + .d2-2298073951 .stroke-AA5{stroke:#F7F8FE;} + .d2-2298073951 .stroke-AB4{stroke:#EDF0FD;} + .d2-2298073951 .stroke-AB5{stroke:#F7F8FE;} + .d2-2298073951 .background-color-N1{background-color:#0A0F25;} + .d2-2298073951 .background-color-N2{background-color:#676C7E;} + .d2-2298073951 .background-color-N3{background-color:#9499AB;} + .d2-2298073951 .background-color-N4{background-color:#CFD2DD;} + .d2-2298073951 .background-color-N5{background-color:#DEE1EB;} + .d2-2298073951 .background-color-N6{background-color:#EEF1F8;} + .d2-2298073951 .background-color-N7{background-color:#FFFFFF;} + .d2-2298073951 .background-color-B1{background-color:#0D32B2;} + .d2-2298073951 .background-color-B2{background-color:#0D32B2;} + .d2-2298073951 .background-color-B3{background-color:#E3E9FD;} + .d2-2298073951 .background-color-B4{background-color:#E3E9FD;} + .d2-2298073951 .background-color-B5{background-color:#EDF0FD;} + .d2-2298073951 .background-color-B6{background-color:#F7F8FE;} + .d2-2298073951 .background-color-AA2{background-color:#4A6FF3;} + .d2-2298073951 .background-color-AA4{background-color:#EDF0FD;} + .d2-2298073951 .background-color-AA5{background-color:#F7F8FE;} + .d2-2298073951 .background-color-AB4{background-color:#EDF0FD;} + .d2-2298073951 .background-color-AB5{background-color:#F7F8FE;} + .d2-2298073951 .color-N1{color:#0A0F25;} + .d2-2298073951 .color-N2{color:#676C7E;} + .d2-2298073951 .color-N3{color:#9499AB;} + .d2-2298073951 .color-N4{color:#CFD2DD;} + .d2-2298073951 .color-N5{color:#DEE1EB;} + .d2-2298073951 .color-N6{color:#EEF1F8;} + .d2-2298073951 .color-N7{color:#FFFFFF;} + .d2-2298073951 .color-B1{color:#0D32B2;} + .d2-2298073951 .color-B2{color:#0D32B2;} + .d2-2298073951 .color-B3{color:#E3E9FD;} + .d2-2298073951 .color-B4{color:#E3E9FD;} + .d2-2298073951 .color-B5{color:#EDF0FD;} + .d2-2298073951 .color-B6{color:#F7F8FE;} + .d2-2298073951 .color-AA2{color:#4A6FF3;} + .d2-2298073951 .color-AA4{color:#EDF0FD;} + .d2-2298073951 .color-AA5{color:#F7F8FE;} + .d2-2298073951 .color-AB4{color:#EDF0FD;} + .d2-2298073951 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2298073951);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2298073951);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2298073951);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2298073951);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2298073951);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2298073951);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2298073951);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2298073951);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2298073951);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2298073951);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2298073951);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2298073951);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2298073951);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2298073951);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2298073951);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2298073951);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2298073951);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2298073951);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdefgx - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/bidirectional-connection-animation/elk/board.exp.json b/e2etests/testdata/txtar/bidirectional-connection-animation/elk/board.exp.json index 85d12fc27..497dfb494 100644 --- a/e2etests/testdata/txtar/bidirectional-connection-animation/elk/board.exp.json +++ b/e2etests/testdata/txtar/bidirectional-connection-animation/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -356,6 +372,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 100.25, @@ -402,6 +419,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 132.25, @@ -448,6 +466,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 164.25, @@ -494,6 +513,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 196.25, @@ -540,6 +560,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 332, @@ -578,6 +599,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 427.5, @@ -617,6 +639,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/txtar/bidirectional-connection-animation/elk/sketch.exp.svg b/e2etests/testdata/txtar/bidirectional-connection-animation/elk/sketch.exp.svg index bc1b49046..856661936 100644 --- a/e2etests/testdata/txtar/bidirectional-connection-animation/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/bidirectional-connection-animation/elk/sketch.exp.svg @@ -1,15 +1,15 @@ -abcdefgx + .d2-1741909553 .fill-N1{fill:#0A0F25;} + .d2-1741909553 .fill-N2{fill:#676C7E;} + .d2-1741909553 .fill-N3{fill:#9499AB;} + .d2-1741909553 .fill-N4{fill:#CFD2DD;} + .d2-1741909553 .fill-N5{fill:#DEE1EB;} + .d2-1741909553 .fill-N6{fill:#EEF1F8;} + .d2-1741909553 .fill-N7{fill:#FFFFFF;} + .d2-1741909553 .fill-B1{fill:#0D32B2;} + .d2-1741909553 .fill-B2{fill:#0D32B2;} + .d2-1741909553 .fill-B3{fill:#E3E9FD;} + .d2-1741909553 .fill-B4{fill:#E3E9FD;} + .d2-1741909553 .fill-B5{fill:#EDF0FD;} + .d2-1741909553 .fill-B6{fill:#F7F8FE;} + .d2-1741909553 .fill-AA2{fill:#4A6FF3;} + .d2-1741909553 .fill-AA4{fill:#EDF0FD;} + .d2-1741909553 .fill-AA5{fill:#F7F8FE;} + .d2-1741909553 .fill-AB4{fill:#EDF0FD;} + .d2-1741909553 .fill-AB5{fill:#F7F8FE;} + .d2-1741909553 .stroke-N1{stroke:#0A0F25;} + .d2-1741909553 .stroke-N2{stroke:#676C7E;} + .d2-1741909553 .stroke-N3{stroke:#9499AB;} + .d2-1741909553 .stroke-N4{stroke:#CFD2DD;} + .d2-1741909553 .stroke-N5{stroke:#DEE1EB;} + .d2-1741909553 .stroke-N6{stroke:#EEF1F8;} + .d2-1741909553 .stroke-N7{stroke:#FFFFFF;} + .d2-1741909553 .stroke-B1{stroke:#0D32B2;} + .d2-1741909553 .stroke-B2{stroke:#0D32B2;} + .d2-1741909553 .stroke-B3{stroke:#E3E9FD;} + .d2-1741909553 .stroke-B4{stroke:#E3E9FD;} + .d2-1741909553 .stroke-B5{stroke:#EDF0FD;} + .d2-1741909553 .stroke-B6{stroke:#F7F8FE;} + .d2-1741909553 .stroke-AA2{stroke:#4A6FF3;} + .d2-1741909553 .stroke-AA4{stroke:#EDF0FD;} + .d2-1741909553 .stroke-AA5{stroke:#F7F8FE;} + .d2-1741909553 .stroke-AB4{stroke:#EDF0FD;} + .d2-1741909553 .stroke-AB5{stroke:#F7F8FE;} + .d2-1741909553 .background-color-N1{background-color:#0A0F25;} + .d2-1741909553 .background-color-N2{background-color:#676C7E;} + .d2-1741909553 .background-color-N3{background-color:#9499AB;} + .d2-1741909553 .background-color-N4{background-color:#CFD2DD;} + .d2-1741909553 .background-color-N5{background-color:#DEE1EB;} + .d2-1741909553 .background-color-N6{background-color:#EEF1F8;} + .d2-1741909553 .background-color-N7{background-color:#FFFFFF;} + .d2-1741909553 .background-color-B1{background-color:#0D32B2;} + .d2-1741909553 .background-color-B2{background-color:#0D32B2;} + .d2-1741909553 .background-color-B3{background-color:#E3E9FD;} + .d2-1741909553 .background-color-B4{background-color:#E3E9FD;} + .d2-1741909553 .background-color-B5{background-color:#EDF0FD;} + .d2-1741909553 .background-color-B6{background-color:#F7F8FE;} + .d2-1741909553 .background-color-AA2{background-color:#4A6FF3;} + .d2-1741909553 .background-color-AA4{background-color:#EDF0FD;} + .d2-1741909553 .background-color-AA5{background-color:#F7F8FE;} + .d2-1741909553 .background-color-AB4{background-color:#EDF0FD;} + .d2-1741909553 .background-color-AB5{background-color:#F7F8FE;} + .d2-1741909553 .color-N1{color:#0A0F25;} + .d2-1741909553 .color-N2{color:#676C7E;} + .d2-1741909553 .color-N3{color:#9499AB;} + .d2-1741909553 .color-N4{color:#CFD2DD;} + .d2-1741909553 .color-N5{color:#DEE1EB;} + .d2-1741909553 .color-N6{color:#EEF1F8;} + .d2-1741909553 .color-N7{color:#FFFFFF;} + .d2-1741909553 .color-B1{color:#0D32B2;} + .d2-1741909553 .color-B2{color:#0D32B2;} + .d2-1741909553 .color-B3{color:#E3E9FD;} + .d2-1741909553 .color-B4{color:#E3E9FD;} + .d2-1741909553 .color-B5{color:#EDF0FD;} + .d2-1741909553 .color-B6{color:#F7F8FE;} + .d2-1741909553 .color-AA2{color:#4A6FF3;} + .d2-1741909553 .color-AA4{color:#EDF0FD;} + .d2-1741909553 .color-AA5{color:#F7F8FE;} + .d2-1741909553 .color-AB4{color:#EDF0FD;} + .d2-1741909553 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1741909553);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1741909553);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1741909553);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1741909553);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1741909553);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1741909553);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1741909553);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1741909553);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1741909553);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1741909553);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1741909553);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1741909553);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1741909553);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1741909553);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1741909553);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1741909553);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1741909553);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1741909553);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdefgx - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/c4-person-label/dagre/board.exp.json b/e2etests/testdata/txtar/c4-person-label/dagre/board.exp.json new file mode 100644 index 000000000..2c7e30d13 --- /dev/null +++ b/e2etests/testdata/txtar/c4-person-label/dagre/board.exp.json @@ -0,0 +1,351 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "c4mdperson", + "type": "c4-person", + "pos": { + "x": 0, + "y": 32 + }, + "width": 410, + "height": 390, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B3", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "## Personal Banking Customer\n\n[person]\n\nA customer of the bank, with personal bank accounts", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 354, + "labelHeight": 119, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "c4mdperson2", + "type": "c4-person", + "pos": { + "x": 470, + "y": 32 + }, + "width": 410, + "height": 390, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B3", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "## Personal Banking Customer\n\n[person]\n\nA customer of the bank, with personal bank accounts", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 354, + "labelHeight": 119, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "c4mdperson3", + "type": "c4-person", + "pos": { + "x": 940, + "y": 32 + }, + "width": 410, + "height": 390, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B3", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "## Personal Banking Customer\n\n[person]\n\nA customer of the bank, with personal bank accounts", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 354, + "labelHeight": 119, + "labelPosition": "INSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "customer1", + "type": "c4-person", + "pos": { + "x": 1410, + "y": 14 + }, + "width": 448, + "height": 426, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B3", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "## Personal Banking Customer\n[person]\n\nA customer of the bank, with pekkrsonal bank ccountskks.", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 388, + "labelHeight": 119, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "customer2", + "type": "c4-person", + "pos": { + "x": 1918, + "y": 0 + }, + "width": 457, + "height": 453, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B3", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "## Personal Banking Customerk\n[person]\n\nA customer of the bank, with pekkrsonal bank accountskks.\n\nA customer of the bank, with pekkrsonal bank accountskks.\n\nA customer of the bank, with pekkrsonal bank accountskks.", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 396, + "labelHeight": 199, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "customer3", + "type": "c4-person", + "pos": { + "x": 2435, + "y": 10 + }, + "width": 457, + "height": 434, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B3", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "## Personal Banking Customer\n[person]\n\nA customer of the bank, with pekkrsonal bank accountskks.", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 396, + "labelHeight": 119, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "customer4", + "type": "c4-person", + "pos": { + "x": 2952, + "y": 10 + }, + "width": 457, + "height": 434, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B3", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "## Personal Banking Customer\n[person]\n\nA customer of the bank, with pekkrsonal bank accountskks.", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 396, + "labelHeight": 119, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/c4-person-label/dagre/sketch.exp.svg b/e2etests/testdata/txtar/c4-person-label/dagre/sketch.exp.svg new file mode 100644 index 000000000..5f31ea51c --- /dev/null +++ b/e2etests/testdata/txtar/c4-person-label/dagre/sketch.exp.svg @@ -0,0 +1,863 @@ +

    Personal Banking Customer

    +

    [person]

    +

    A customer of the bank, with personal bank accounts

    +

    Personal Banking Customer

    +

    [person]

    +

    A customer of the bank, with personal bank accounts

    +

    Personal Banking Customer

    +

    [person]

    +

    A customer of the bank, with personal bank accounts

    +

    Personal Banking Customer

    +

    [person]

    +

    A customer of the bank, with pekkrsonal bank ccountskks.

    +

    Personal Banking Customerk

    +

    [person]

    +

    A customer of the bank, with pekkrsonal bank accountskks.

    +

    A customer of the bank, with pekkrsonal bank accountskks.

    +

    A customer of the bank, with pekkrsonal bank accountskks.

    +

    Personal Banking Customer

    +

    [person]

    +

    A customer of the bank, with pekkrsonal bank accountskks.

    +

    Personal Banking Customer

    +

    [person]

    +

    A customer of the bank, with pekkrsonal bank accountskks.

    +
     + + + + + + + + +     \ No newline at end of file diff --git a/e2etests/testdata/txtar/c4-person-label/elk/board.exp.json b/e2etests/testdata/txtar/c4-person-label/elk/board.exp.json new file mode 100644 index 000000000..ecf5fb0fd --- /dev/null +++ b/e2etests/testdata/txtar/c4-person-label/elk/board.exp.json @@ -0,0 +1,351 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "c4mdperson", + "type": "c4-person", + "pos": { + "x": 12, + "y": 43 + }, + "width": 410, + "height": 390, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B3", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "## Personal Banking Customer\n\n[person]\n\nA customer of the bank, with personal bank accounts", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 354, + "labelHeight": 119, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "c4mdperson2", + "type": "c4-person", + "pos": { + "x": 442, + "y": 43 + }, + "width": 410, + "height": 390, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B3", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "## Personal Banking Customer\n\n[person]\n\nA customer of the bank, with personal bank accounts", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 354, + "labelHeight": 119, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "c4mdperson3", + "type": "c4-person", + "pos": { + "x": 872, + "y": 43 + }, + "width": 410, + "height": 390, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B3", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "## Personal Banking Customer\n\n[person]\n\nA customer of the bank, with personal bank accounts", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 354, + "labelHeight": 119, + "labelPosition": "INSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "customer1", + "type": "c4-person", + "pos": { + "x": 1302, + "y": 25 + }, + "width": 448, + "height": 426, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B3", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "## Personal Banking Customer\n[person]\n\nA customer of the bank, with pekkrsonal bank ccountskks.", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 388, + "labelHeight": 119, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "customer2", + "type": "c4-person", + "pos": { + "x": 1770, + "y": 12 + }, + "width": 457, + "height": 453, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B3", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "## Personal Banking Customerk\n[person]\n\nA customer of the bank, with pekkrsonal bank accountskks.\n\nA customer of the bank, with pekkrsonal bank accountskks.\n\nA customer of the bank, with pekkrsonal bank accountskks.", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 396, + "labelHeight": 199, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "customer3", + "type": "c4-person", + "pos": { + "x": 2247, + "y": 21 + }, + "width": 457, + "height": 434, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B3", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "## Personal Banking Customer\n[person]\n\nA customer of the bank, with pekkrsonal bank accountskks.", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 396, + "labelHeight": 119, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "customer4", + "type": "c4-person", + "pos": { + "x": 2724, + "y": 21 + }, + "width": 457, + "height": 434, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B3", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "## Personal Banking Customer\n[person]\n\nA customer of the bank, with pekkrsonal bank accountskks.", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 396, + "labelHeight": 119, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/c4-person-label/elk/sketch.exp.svg b/e2etests/testdata/txtar/c4-person-label/elk/sketch.exp.svg new file mode 100644 index 000000000..8f6b735b7 --- /dev/null +++ b/e2etests/testdata/txtar/c4-person-label/elk/sketch.exp.svg @@ -0,0 +1,863 @@ +

    Personal Banking Customer

    +

    [person]

    +

    A customer of the bank, with personal bank accounts

    +

    Personal Banking Customer

    +

    [person]

    +

    A customer of the bank, with personal bank accounts

    +

    Personal Banking Customer

    +

    [person]

    +

    A customer of the bank, with personal bank accounts

    +

    Personal Banking Customer

    +

    [person]

    +

    A customer of the bank, with pekkrsonal bank ccountskks.

    +

    Personal Banking Customerk

    +

    [person]

    +

    A customer of the bank, with pekkrsonal bank accountskks.

    +

    A customer of the bank, with pekkrsonal bank accountskks.

    +

    A customer of the bank, with pekkrsonal bank accountskks.

    +

    Personal Banking Customer

    +

    [person]

    +

    A customer of the bank, with pekkrsonal bank accountskks.

    +

    Personal Banking Customer

    +

    [person]

    +

    A customer of the bank, with pekkrsonal bank accountskks.

    +
     + + + + + + + + +     \ No newline at end of file diff --git a/e2etests/testdata/txtar/c4-person-shape/dagre/board.exp.json b/e2etests/testdata/txtar/c4-person-shape/dagre/board.exp.json new file mode 100644 index 000000000..bd1bb8ae3 --- /dev/null +++ b/e2etests/testdata/txtar/c4-person-shape/dagre/board.exp.json @@ -0,0 +1,502 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "c4mdperson", + "type": "c4-person", + "pos": { + "x": 0, + "y": 507 + }, + "width": 336, + "height": 342, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 1, + "borderRadius": 0, + "fill": "#08427b", + "stroke": "black", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "## Personal Banking Customer\n\n[person]\n\nA customer of the bank, with\\\npersonal bank accounts", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "white", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 287, + "labelHeight": 143, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "c4person", + "type": "c4-person", + "pos": { + "x": 260, + "y": 0 + }, + "width": 139, + "height": 132, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 1, + "borderRadius": 0, + "fill": "#08427b", + "stroke": "black", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "C4 Style Person", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "white", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 110, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "regular_person", + "type": "person", + "pos": { + "x": 101, + "y": 311 + }, + "width": 134, + "height": 89, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B3", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Standard Person", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 119, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "styling", + "type": "rectangle", + "pos": { + "x": 386, + "y": 273 + }, + "width": 210, + "height": 525, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "styling", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 78, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "styling.c4styled", + "type": "c4-person", + "pos": { + "x": 449, + "y": 303 + }, + "width": 84, + "height": 104, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 1, + "borderRadius": 0, + "fill": "#08427b", + "stroke": "black", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "c4styled", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "white", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 60, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "styling.c4sized", + "type": "c4-person", + "pos": { + "x": 416, + "y": 588 + }, + "width": 150, + "height": 180, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 1, + "borderRadius": 0, + "fill": "#08427b", + "stroke": "black", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Custom Size", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "white", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 87, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + } + ], + "connections": [ + { + "id": "(regular_person -> c4mdperson)[0]", + "src": "regular_person", + "srcArrow": "none", + "dst": "c4mdperson", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 168, + "y": 426 + }, + { + "x": 168, + "y": 450.79998779296875 + }, + { + "x": 168, + "y": 467 + }, + { + "x": 168, + "y": 507 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(c4person -> regular_person)[0]", + "src": "c4person", + "srcArrow": "none", + "dst": "regular_person", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "Compare shapes", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 111, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 262, + "y": 119 + }, + { + "x": 186.8000030517578, + "y": 177.8000030517578 + }, + { + "x": 168, + "y": 264.6000061035156 + }, + { + "x": 168, + "y": 311 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(c4person -> styling.c4styled)[0]", + "src": "c4person", + "srcArrow": "none", + "dst": "styling.c4styled", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 397, + "y": 119 + }, + { + "x": 472.20001220703125, + "y": 177.8000030517578 + }, + { + "x": 491, + "y": 263 + }, + { + "x": 491, + "y": 303 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "styling.(c4styled -> c4sized)[0]", + "src": "styling.c4styled", + "srcArrow": "none", + "dst": "styling.c4sized", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 491, + "y": 407 + }, + { + "x": 491, + "y": 447 + }, + { + "x": 491, + "y": 483.20001220703125 + }, + { + "x": 491, + "y": 588 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/c4-person-shape/dagre/sketch.exp.svg b/e2etests/testdata/txtar/c4-person-shape/dagre/sketch.exp.svg new file mode 100644 index 000000000..0c3444095 --- /dev/null +++ b/e2etests/testdata/txtar/c4-person-shape/dagre/sketch.exp.svg @@ -0,0 +1,858 @@ +

    Personal Banking Customer

    +

    [person]

    +

    A customer of the bank, with
    +personal bank accounts

    +
    C4 Style PersonStandard Personstylingc4styledCustom Size Compare shapes + + + + + + + + +     \ No newline at end of file diff --git a/e2etests/testdata/txtar/c4-person-shape/elk/board.exp.json b/e2etests/testdata/txtar/c4-person-shape/elk/board.exp.json new file mode 100644 index 000000000..52e292df6 --- /dev/null +++ b/e2etests/testdata/txtar/c4-person-shape/elk/board.exp.json @@ -0,0 +1,482 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "c4mdperson", + "type": "c4-person", + "pos": { + "x": 12, + "y": 938 + }, + "width": 336, + "height": 342, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 1, + "borderRadius": 0, + "fill": "#08427b", + "stroke": "black", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "## Personal Banking Customer\n\n[person]\n\nA customer of the bank, with\\\npersonal bank accounts", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "white", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 287, + "labelHeight": 143, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "c4person", + "type": "c4-person", + "pos": { + "x": 211, + "y": 12 + }, + "width": 139, + "height": 132, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 1, + "borderRadius": 0, + "fill": "#08427b", + "stroke": "black", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "C4 Style Person", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "white", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 110, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "regular_person", + "type": "person", + "pos": { + "x": 113, + "y": 753 + }, + "width": 134, + "height": 89, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B3", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Standard Person", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 119, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "styling", + "type": "rectangle", + "pos": { + "x": 256, + "y": 229 + }, + "width": 250, + "height": 454, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "styling", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 78, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "styling.c4styled", + "type": "c4-person", + "pos": { + "x": 339, + "y": 279 + }, + "width": 84, + "height": 104, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 1, + "borderRadius": 0, + "fill": "#08427b", + "stroke": "black", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "c4styled", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "white", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 60, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "styling.c4sized", + "type": "c4-person", + "pos": { + "x": 306, + "y": 453 + }, + "width": 150, + "height": 180, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 1, + "borderRadius": 0, + "fill": "#08427b", + "stroke": "black", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Custom Size", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "white", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 87, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + } + ], + "connections": [ + { + "id": "(regular_person -> c4mdperson)[0]", + "src": "regular_person", + "srcArrow": "none", + "dst": "c4mdperson", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 180, + "y": 868 + }, + { + "x": 180, + "y": 938 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(c4person -> regular_person)[0]", + "src": "c4person", + "srcArrow": "none", + "dst": "regular_person", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "Compare shapes", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 111, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 258, + "y": 143 + }, + { + "x": 257.5830078125, + "y": 184 + }, + { + "x": 180, + "y": 184 + }, + { + "x": 180, + "y": 753 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(c4person -> styling.c4styled)[0]", + "src": "c4person", + "srcArrow": "none", + "dst": "styling.c4styled", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 304, + "y": 143 + }, + { + "x": 303.9159851074219, + "y": 184 + }, + { + "x": 381.5, + "y": 184 + }, + { + "x": 382, + "y": 279 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "styling.(c4styled -> c4sized)[0]", + "src": "styling.c4styled", + "srcArrow": "none", + "dst": "styling.c4sized", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 381, + "y": 383 + }, + { + "x": 382, + "y": 453 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/c4-person-shape/elk/sketch.exp.svg b/e2etests/testdata/txtar/c4-person-shape/elk/sketch.exp.svg new file mode 100644 index 000000000..285f618d4 --- /dev/null +++ b/e2etests/testdata/txtar/c4-person-shape/elk/sketch.exp.svg @@ -0,0 +1,858 @@ +

    Personal Banking Customer

    +

    [person]

    +

    A customer of the bank, with
    +personal bank accounts

    +
    C4 Style PersonStandard Personstylingc4styledCustom Size Compare shapes + + + + + + + + +     \ No newline at end of file diff --git a/e2etests/testdata/txtar/c4-theme/dagre/board.exp.json b/e2etests/testdata/txtar/c4-theme/dagre/board.exp.json new file mode 100644 index 000000000..4b80ded31 --- /dev/null +++ b/e2etests/testdata/txtar/c4-theme/dagre/board.exp.json @@ -0,0 +1,1048 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 303, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "customer", + "type": "c4-person", + "pos": { + "x": 1089, + "y": 0 + }, + "width": 415, + "height": 394, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B2", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "## Personal Banking Customer\n[person]\n\nA customer of the bank, with personal bank accounts.", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N7", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 358, + "labelHeight": 119, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "internet_banking_system", + "type": "rectangle", + "pos": { + "x": 147, + "y": 551 + }, + "width": 2407, + "height": 915, + "opacity": 1, + "strokeDash": 5, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "AA2", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "## Internet Banking System\n[Software System]", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 447, + "labelHeight": 125, + "labelPosition": "INSIDE_BOTTOM_LEFT", + "zIndex": 0, + "level": 1 + }, + { + "id": "internet_banking_system.web_app", + "type": "rectangle", + "pos": { + "x": 177, + "y": 581 + }, + "width": 550, + "height": 164, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B3", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "## Web Application\n[Container: Java and Spring MVC]\n\nDelivers the static content and the Internet banking single page application.", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N7", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 505, + "labelHeight": 119, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "internet_banking_system.spa", + "type": "rectangle", + "pos": { + "x": 390, + "y": 866 + }, + "width": 609, + "height": 164, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B3", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "## Single-Page Application\n[Container: JavaScript and Angular]\n\nProvides all of the Internet banking functionality to customers via their web browser.", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N7", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 564, + "labelHeight": 119, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "internet_banking_system.mobile_app", + "type": "rectangle", + "pos": { + "x": 1123, + "y": 866 + }, + "width": 707, + "height": 164, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B3", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "## Mobile App\n[Container: Xamarin]\n\nProvides a limited subset of the Internet banking functionality to customers via their mobile device.", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N7", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 662, + "labelHeight": 119, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "internet_banking_system.api_app", + "type": "rectangle", + "pos": { + "x": 1246, + "y": 1167 + }, + "width": 461, + "height": 164, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B3", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "## API Application\n[Container: Java and Spring MVC]\n\nProvides Internet banking functionality via a JSON/HTTPS API.", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N7", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 416, + "labelHeight": 119, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "internet_banking_system.database", + "type": "rectangle", + "pos": { + "x": 1890, + "y": 866 + }, + "width": 634, + "height": 164, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B3", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "## Database\n[Container: Oracle Database Schema]\n\nStores user registration information, hashed authentication credentials, access logs, etc.", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N7", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 589, + "labelHeight": 119, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "email_system", + "type": "rectangle", + "pos": { + "x": 2410, + "y": 1603 + }, + "width": 360, + "height": 164, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B5", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "## E-mail System\n[Software System]\n\nThe internal Microsoft Exchange e-mail system.", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N7", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 315, + "labelHeight": 119, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "mainframe", + "type": "rectangle", + "pos": { + "x": 0, + "y": 1603 + }, + "width": 629, + "height": 164, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B5", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "## Mainframe Banking System\n[Software System]\n\nStores all of the core banking information about customers, accounts, transactions, etc.", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N7", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 584, + "labelHeight": 119, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [ + { + "id": "(customer -> internet_banking_system.web_app)[0]", + "src": "customer", + "srcArrow": "none", + "dst": "internet_banking_system.web_app", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 5, + "strokeWidth": 2, + "stroke": "AA4", + "borderRadius": 10, + "label": "Visits bigbank.com/ib using\n[HTTPS]", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 179, + "labelHeight": 37, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 1089, + "y": 262 + }, + { + "x": 579.4000244140625, + "y": 422.3999938964844 + }, + { + "x": 452, + "y": 541 + }, + { + "x": 452, + "y": 581 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "internet_banking_system.(web_app -> spa)[0]", + "src": "internet_banking_system.web_app", + "srcArrow": "none", + "dst": "internet_banking_system.spa", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 5, + "strokeWidth": 2, + "stroke": "AA4", + "borderRadius": 10, + "label": "Delivers to the customer's web browser", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 257, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 452, + "y": 744.5 + }, + { + "x": 452, + "y": 793.2999877929688 + }, + { + "x": 472.3999938964844, + "y": 817.7000122070312 + }, + { + "x": 554, + "y": 866.5 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(customer -> internet_banking_system.spa)[0]", + "src": "customer", + "srcArrow": "none", + "dst": "internet_banking_system.spa", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 5, + "strokeWidth": 2, + "stroke": "AA4", + "borderRadius": 10, + "label": "Views account balances, and makes payments using", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 340, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 1091, + "y": 349 + }, + { + "x": 967.7999877929688, + "y": 439.79998779296875 + }, + { + "x": 937, + "y": 476.20001220703125 + }, + { + "x": 937, + "y": 496.75 + }, + { + "x": 937, + "y": 517.2990112304688 + }, + { + "x": 937, + "y": 557.4000244140625 + }, + { + "x": 937, + "y": 597 + }, + { + "x": 937, + "y": 636.5999755859375 + }, + { + "x": 916.5999755859375, + "y": 817.7000122070312 + }, + { + "x": 835, + "y": 866.5 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(customer -> internet_banking_system.mobile_app)[0]", + "src": "customer", + "srcArrow": "none", + "dst": "internet_banking_system.mobile_app", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 5, + "strokeWidth": 2, + "stroke": "AA4", + "borderRadius": 10, + "label": "Views account balances, and makes payments using", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 340, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 1430, + "y": 394 + }, + { + "x": 1466.800048828125, + "y": 448.79998779296875 + }, + { + "x": 1476, + "y": 476.20001220703125 + }, + { + "x": 1476, + "y": 496.75 + }, + { + "x": 1476, + "y": 517.2990112304688 + }, + { + "x": 1476, + "y": 557.4000244140625 + }, + { + "x": 1476, + "y": 597 + }, + { + "x": 1476, + "y": 636.5999755859375 + }, + { + "x": 1476, + "y": 817.7000122070312 + }, + { + "x": 1476, + "y": 866.5 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "internet_banking_system.(spa -> api_app)[0]", + "src": "internet_banking_system.spa", + "srcArrow": "none", + "dst": "internet_banking_system.api_app", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 5, + "strokeWidth": 2, + "stroke": "AA4", + "borderRadius": 10, + "label": "Makes API calls to\n[JSON/HTTPS]", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 116, + "labelHeight": 37, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 694.5, + "y": 1029.5 + }, + { + "x": 694.5, + "y": 1084.699951171875 + }, + { + "x": 804.7000122070312, + "y": 1119.7220458984375 + }, + { + "x": 1245.5, + "y": 1204.6099853515625 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "internet_banking_system.(mobile_app -> api_app)[0]", + "src": "internet_banking_system.mobile_app", + "srcArrow": "none", + "dst": "internet_banking_system.api_app", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 5, + "strokeWidth": 2, + "stroke": "AA4", + "borderRadius": 10, + "label": "Makes API calls to\n[JSON/HTTPS]", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 116, + "labelHeight": 37, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 1476, + "y": 1029.5 + }, + { + "x": 1476, + "y": 1084.699951171875 + }, + { + "x": 1476, + "y": 1112.300048828125 + }, + { + "x": 1476, + "y": 1167.5 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(internet_banking_system.api_app -> mainframe)[0]", + "src": "internet_banking_system.api_app", + "srcArrow": "none", + "dst": "mainframe", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 5, + "strokeWidth": 2, + "stroke": "AA4", + "borderRadius": 10, + "label": "Makes API calls to\n[XML/HTTPS]", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 116, + "labelHeight": 37, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 1245.5, + "y": 1275.1949462890625 + }, + { + "x": 500.6990051269531, + "y": 1427.8389892578125 + }, + { + "x": 314.5, + "y": 1548.300048828125 + }, + { + "x": 314.5, + "y": 1603.5 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(customer -> email_system)[0]", + "src": "customer", + "srcArrow": "none", + "dst": "email_system", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 5, + "strokeWidth": 2, + "stroke": "AA4", + "borderRadius": 10, + "label": "Sends e-mails to", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 107, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 1503, + "y": 238 + }, + { + "x": 2410.199951171875, + "y": 417.6000061035156 + }, + { + "x": 2637, + "y": 476.20001220703125 + }, + { + "x": 2637, + "y": 496.75 + }, + { + "x": 2637, + "y": 517.2990112304688 + }, + { + "x": 2637, + "y": 557.4000244140625 + }, + { + "x": 2637, + "y": 597 + }, + { + "x": 2637, + "y": 636.5999755859375 + }, + { + "x": 2637, + "y": 691.5 + }, + { + "x": 2637, + "y": 734.25 + }, + { + "x": 2637, + "y": 777 + }, + { + "x": 2637, + "y": 834 + }, + { + "x": 2637, + "y": 876.75 + }, + { + "x": 2637, + "y": 919.5 + }, + { + "x": 2637, + "y": 978.0999755859375 + }, + { + "x": 2637, + "y": 1023.25 + }, + { + "x": 2637, + "y": 1068.4000244140625 + }, + { + "x": 2637, + "y": 1128.5999755859375 + }, + { + "x": 2637, + "y": 1173.75 + }, + { + "x": 2637, + "y": 1218.9000244140625 + }, + { + "x": 2637, + "y": 1292.4000244140625 + }, + { + "x": 2637, + "y": 1357.5 + }, + { + "x": 2637, + "y": 1422.5999755859375 + }, + { + "x": 2632.800048828125, + "y": 1548.300048828125 + }, + { + "x": 2616, + "y": 1603.5 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(internet_banking_system.api_app -> email_system)[0]", + "src": "internet_banking_system.api_app", + "srcArrow": "none", + "dst": "email_system", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 5, + "strokeWidth": 2, + "stroke": "AA4", + "borderRadius": 10, + "label": "Sends e-mail using", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 123, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 1707.5, + "y": 1282.843994140625 + }, + { + "x": 2241.5, + "y": 1429.3680419921875 + }, + { + "x": 2394.39990234375, + "y": 1548.300048828125 + }, + { + "x": 2472, + "y": 1603.5 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "internet_banking_system.(database <-> api_app)[0]", + "src": "internet_banking_system.database", + "srcArrow": "triangle", + "dst": "internet_banking_system.api_app", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 5, + "strokeWidth": 2, + "stroke": "AA4", + "borderRadius": 10, + "label": "Reads from and writes to\n[SQL/TCP]", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 163, + "labelHeight": 37, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 2206.5, + "y": 1029.5 + }, + { + "x": 2206.5, + "y": 1084.699951171875 + }, + { + "x": 2106.5, + "y": 1119.0999755859375 + }, + { + "x": 1706.5, + "y": 1201.5 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/c4-theme/dagre/sketch.exp.svg b/e2etests/testdata/txtar/c4-theme/dagre/sketch.exp.svg new file mode 100644 index 000000000..fb2279b45 --- /dev/null +++ b/e2etests/testdata/txtar/c4-theme/dagre/sketch.exp.svg @@ -0,0 +1,886 @@ +

    Personal Banking Customer

    +

    [person]

    +

    A customer of the bank, with personal bank accounts.

    +

    Internet Banking System

    +

    [Software System]

    +

    E-mail System

    +

    [Software System]

    +

    The internal Microsoft Exchange e-mail system.

    +

    Mainframe Banking System

    +

    [Software System]

    +

    Stores all of the core banking information about customers, accounts, transactions, etc.

    +

    Web Application

    +

    [Container: Java and Spring MVC]

    +

    Delivers the static content and the Internet banking single page application.

    +

    Single-Page Application

    +

    [Container: JavaScript and Angular]

    +

    Provides all of the Internet banking functionality to customers via their web browser.

    +

    Mobile App

    +

    [Container: Xamarin]

    +

    Provides a limited subset of the Internet banking functionality to customers via their mobile device.

    +

    API Application

    +

    [Container: Java and Spring MVC]

    +

    Provides Internet banking functionality via a JSON/HTTPS API.

    +

    Database

    +

    [Container: Oracle Database Schema]

    +

    Stores user registration information, hashed authentication credentials, access logs, etc.

    +
     Visits bigbank.com/ib using[HTTPS]Delivers to the customer's web browserViews account balances, and makes payments usingViews account balances, and makes payments usingMakes API calls to[JSON/HTTPS]Makes API calls to[JSON/HTTPS]Makes API calls to[XML/HTTPS]Sends e-mails toSends e-mail using Reads from and writes to[SQL/TCP] + + + + + + + + + + + + + + + + + + + + +     \ No newline at end of file diff --git a/e2etests/testdata/txtar/c4-theme/elk/board.exp.json b/e2etests/testdata/txtar/c4-theme/elk/board.exp.json new file mode 100644 index 000000000..4d6d3ccd8 --- /dev/null +++ b/e2etests/testdata/txtar/c4-theme/elk/board.exp.json @@ -0,0 +1,882 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 303, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "customer", + "type": "c4-person", + "pos": { + "x": 704, + "y": 12 + }, + "width": 415, + "height": 394, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B2", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "## Personal Banking Customer\n[person]\n\nA customer of the bank, with personal bank accounts.", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N7", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 358, + "labelHeight": 119, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "internet_banking_system", + "type": "rectangle", + "pos": { + "x": 12, + "y": 658 + }, + "width": 2218, + "height": 1035, + "opacity": 1, + "strokeDash": 5, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "AA2", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "## Internet Banking System\n[Software System]", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 447, + "labelHeight": 125, + "labelPosition": "INSIDE_BOTTOM_LEFT", + "zIndex": 0, + "level": 1 + }, + { + "id": "internet_banking_system.web_app", + "type": "rectangle", + "pos": { + "x": 62, + "y": 708 + }, + "width": 550, + "height": 164, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B3", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "## Web Application\n[Container: Java and Spring MVC]\n\nDelivers the static content and the Internet banking single page application.", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N7", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 505, + "labelHeight": 119, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "internet_banking_system.spa", + "type": "rectangle", + "pos": { + "x": 190, + "y": 1043 + }, + "width": 609, + "height": 164, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B3", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "## Single-Page Application\n[Container: JavaScript and Angular]\n\nProvides all of the Internet banking functionality to customers via their web browser.", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N7", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 564, + "labelHeight": 119, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "internet_banking_system.mobile_app", + "type": "rectangle", + "pos": { + "x": 819, + "y": 1043 + }, + "width": 707, + "height": 164, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B3", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "## Mobile App\n[Container: Xamarin]\n\nProvides a limited subset of the Internet banking functionality to customers via their mobile device.", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N7", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 662, + "labelHeight": 119, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "internet_banking_system.api_app", + "type": "rectangle", + "pos": { + "x": 942, + "y": 1394 + }, + "width": 461, + "height": 164, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B3", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "## API Application\n[Container: Java and Spring MVC]\n\nProvides Internet banking functionality via a JSON/HTTPS API.", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N7", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 416, + "labelHeight": 119, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "internet_banking_system.database", + "type": "rectangle", + "pos": { + "x": 1546, + "y": 1043 + }, + "width": 634, + "height": 164, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B3", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "## Database\n[Container: Oracle Database Schema]\n\nStores user registration information, hashed authentication credentials, access logs, etc.", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N7", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 589, + "labelHeight": 119, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "email_system", + "type": "rectangle", + "pos": { + "x": 1746, + "y": 1895 + }, + "width": 360, + "height": 164, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B5", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "## E-mail System\n[Software System]\n\nThe internal Microsoft Exchange e-mail system.", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N7", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 315, + "labelHeight": 119, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "mainframe", + "type": "rectangle", + "pos": { + "x": 781, + "y": 1895 + }, + "width": 629, + "height": 164, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B5", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "## Mainframe Banking System\n[Software System]\n\nStores all of the core banking information about customers, accounts, transactions, etc.", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N7", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 584, + "labelHeight": 119, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [ + { + "id": "(customer -> internet_banking_system.web_app)[0]", + "src": "customer", + "srcArrow": "none", + "dst": "internet_banking_system.web_app", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 5, + "strokeWidth": 2, + "stroke": "AA4", + "borderRadius": 10, + "label": "Visits bigbank.com/ib using\n[HTTPS]", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 179, + "labelHeight": 37, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 788, + "y": 406 + }, + { + "x": 787.75, + "y": 446 + }, + { + "x": 359.25, + "y": 446 + }, + { + "x": 359.25, + "y": 708 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "internet_banking_system.(web_app -> spa)[0]", + "src": "internet_banking_system.web_app", + "srcArrow": "none", + "dst": "internet_banking_system.spa", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 5, + "strokeWidth": 2, + "stroke": "AA4", + "borderRadius": 10, + "label": "Delivers to the customer's web browser", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 257, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 393, + "y": 872 + }, + { + "x": 393, + "y": 1043 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(customer -> internet_banking_system.spa)[0]", + "src": "customer", + "srcArrow": "none", + "dst": "internet_banking_system.spa", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 5, + "strokeWidth": 2, + "stroke": "AA4", + "borderRadius": 10, + "label": "Views account balances, and makes payments using", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 340, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 871, + "y": 406 + }, + { + "x": 870.75, + "y": 496 + }, + { + "x": 652, + "y": 496 + }, + { + "x": 652, + "y": 1043 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(customer -> internet_banking_system.mobile_app)[0]", + "src": "customer", + "srcArrow": "none", + "dst": "internet_banking_system.mobile_app", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 5, + "strokeWidth": 2, + "stroke": "AA4", + "borderRadius": 10, + "label": "Views account balances, and makes payments using", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 340, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 954, + "y": 406 + }, + { + "x": 953.75, + "y": 1043 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "internet_banking_system.(spa -> api_app)[0]", + "src": "internet_banking_system.spa", + "srcArrow": "none", + "dst": "internet_banking_system.api_app", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 5, + "strokeWidth": 2, + "stroke": "AA4", + "borderRadius": 10, + "label": "Makes API calls to\n[JSON/HTTPS]", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 116, + "labelHeight": 37, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 494.5, + "y": 1207 + }, + { + "x": 494.5, + "y": 1354 + }, + { + "x": 1057.25, + "y": 1354 + }, + { + "x": 1057.25, + "y": 1394 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "internet_banking_system.(mobile_app -> api_app)[0]", + "src": "internet_banking_system.mobile_app", + "srcArrow": "none", + "dst": "internet_banking_system.api_app", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 5, + "strokeWidth": 2, + "stroke": "AA4", + "borderRadius": 10, + "label": "Makes API calls to\n[JSON/HTTPS]", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 116, + "labelHeight": 37, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 1172.5, + "y": 1207 + }, + { + "x": 1172.5, + "y": 1394 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(internet_banking_system.api_app -> mainframe)[0]", + "src": "internet_banking_system.api_app", + "srcArrow": "none", + "dst": "mainframe", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 5, + "strokeWidth": 2, + "stroke": "AA4", + "borderRadius": 10, + "label": "Makes API calls to\n[XML/HTTPS]", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 116, + "labelHeight": 37, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 1095.666015625, + "y": 1558 + }, + { + "x": 1095.666015625, + "y": 1895 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(customer -> email_system)[0]", + "src": "customer", + "srcArrow": "none", + "dst": "email_system", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 5, + "strokeWidth": 2, + "stroke": "AA4", + "borderRadius": 10, + "label": "Sends e-mails to", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 107, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 1037, + "y": 406 + }, + { + "x": 1036.75, + "y": 446 + }, + { + "x": 2303.5, + "y": 446 + }, + { + "x": 2303.5, + "y": 1855 + }, + { + "x": 1986.8330078125, + "y": 1855 + }, + { + "x": 1986.8330078125, + "y": 1895 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(internet_banking_system.api_app -> email_system)[0]", + "src": "internet_banking_system.api_app", + "srcArrow": "none", + "dst": "email_system", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 5, + "strokeWidth": 2, + "stroke": "AA4", + "borderRadius": 10, + "label": "Sends e-mail using", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 123, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 1249.3330078125, + "y": 1558 + }, + { + "x": 1249.3330078125, + "y": 1855 + }, + { + "x": 1866.8330078125, + "y": 1855 + }, + { + "x": 1866.8330078125, + "y": 1895 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "internet_banking_system.(database <-> api_app)[0]", + "src": "internet_banking_system.database", + "srcArrow": "triangle", + "dst": "internet_banking_system.api_app", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 5, + "strokeWidth": 2, + "stroke": "AA4", + "borderRadius": 10, + "label": "Reads from and writes to\n[SQL/TCP]", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 163, + "labelHeight": 37, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 1863, + "y": 1207 + }, + { + "x": 1863, + "y": 1354 + }, + { + "x": 1287.75, + "y": 1354 + }, + { + "x": 1287.75, + "y": 1394 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/c4-theme/elk/sketch.exp.svg b/e2etests/testdata/txtar/c4-theme/elk/sketch.exp.svg new file mode 100644 index 000000000..46f088711 --- /dev/null +++ b/e2etests/testdata/txtar/c4-theme/elk/sketch.exp.svg @@ -0,0 +1,886 @@ +

    Personal Banking Customer

    +

    [person]

    +

    A customer of the bank, with personal bank accounts.

    +

    Internet Banking System

    +

    [Software System]

    +

    E-mail System

    +

    [Software System]

    +

    The internal Microsoft Exchange e-mail system.

    +

    Mainframe Banking System

    +

    [Software System]

    +

    Stores all of the core banking information about customers, accounts, transactions, etc.

    +

    Web Application

    +

    [Container: Java and Spring MVC]

    +

    Delivers the static content and the Internet banking single page application.

    +

    Single-Page Application

    +

    [Container: JavaScript and Angular]

    +

    Provides all of the Internet banking functionality to customers via their web browser.

    +

    Mobile App

    +

    [Container: Xamarin]

    +

    Provides a limited subset of the Internet banking functionality to customers via their mobile device.

    +

    API Application

    +

    [Container: Java and Spring MVC]

    +

    Provides Internet banking functionality via a JSON/HTTPS API.

    +

    Database

    +

    [Container: Oracle Database Schema]

    +

    Stores user registration information, hashed authentication credentials, access logs, etc.

    +
     Visits bigbank.com/ib using[HTTPS]Delivers to the customer's web browserViews account balances, and makes payments usingViews account balances, and makes payments usingMakes API calls to[JSON/HTTPS]Makes API calls to[JSON/HTTPS]Makes API calls to[XML/HTTPS]Sends e-mails toSends e-mail using Reads from and writes to[SQL/TCP] + + + + + + + + + + + + + + + + + + + + +     \ No newline at end of file diff --git a/e2etests/testdata/txtar/connection-icons/dagre/board.exp.json b/e2etests/testdata/txtar/connection-icons/dagre/board.exp.json new file mode 100644 index 000000000..b6316b897 --- /dev/null +++ b/e2etests/testdata/txtar/connection-icons/dagre/board.exp.json @@ -0,0 +1,452 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "a", + "type": "rectangle", + "pos": { + "x": 29, + "y": 0 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "b", + "type": "rectangle", + "pos": { + "x": 275, + "y": 0 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "c", + "type": "rectangle", + "pos": { + "x": 459, + "y": 0 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "c", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "producer", + "type": "rectangle", + "pos": { + "x": 0, + "y": 126 + }, + "width": 110, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "producer", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 65, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "consumer", + "type": "rectangle", + "pos": { + "x": 243, + "y": 126 + }, + "width": 116, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "consumer", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 71, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [ + { + "id": "(a -> b)[0]", + "src": "a", + "srcArrow": "none", + "dst": "b", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "hello", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 33, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 82.5, + "y": 33 + }, + { + "x": 157.6999969482422, + "y": 33 + }, + { + "x": 196.10000610351562, + "y": 33 + }, + { + "x": 274.5, + "y": 33 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/213-alarm.svg", + "RawPath": "/essentials%2F213-alarm.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0 + }, + { + "id": "(b -> c)[0]", + "src": "b", + "srcArrow": "none", + "dst": "c", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 328.5, + "y": 33 + }, + { + "x": 392.8999938964844, + "y": 33 + }, + { + "x": 419, + "y": 33 + }, + { + "x": 459, + "y": 33 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/213-alarm.svg", + "RawPath": "/essentials%2F213-alarm.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0 + }, + { + "id": "(producer -> consumer)[0]", + "src": "producer", + "srcArrow": "none", + "dst": "consumer", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 109.5, + "y": 159 + }, + { + "x": 163.10000610351562, + "y": 159 + }, + { + "x": 189.89999389648438, + "y": 159 + }, + { + "x": 243.5, + "y": 159 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/aws/Application Integration/Amazon-Simple-Queue-Service-SQS.svg", + "RawPath": "/aws%2FApplication%20Integration%2FAmazon-Simple-Queue-Service-SQS.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "iconBorderRadius": 20, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/connection-icons/dagre/sketch.exp.svg b/e2etests/testdata/txtar/connection-icons/dagre/sketch.exp.svg new file mode 100644 index 000000000..2240808f5 --- /dev/null +++ b/e2etests/testdata/txtar/connection-icons/dagre/sketch.exp.svg @@ -0,0 +1,109 @@ +abcproducerconsumer hello + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/connection-icons/elk/board.exp.json b/e2etests/testdata/txtar/connection-icons/elk/board.exp.json new file mode 100644 index 000000000..d47b16302 --- /dev/null +++ b/e2etests/testdata/txtar/connection-icons/elk/board.exp.json @@ -0,0 +1,425 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "a", + "type": "rectangle", + "pos": { + "x": 69, + "y": 12 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "b", + "type": "rectangle", + "pos": { + "x": 378, + "y": 12 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "c", + "type": "rectangle", + "pos": { + "x": 501, + "y": 12 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "c", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "producer", + "type": "rectangle", + "pos": { + "x": 12, + "y": 98 + }, + "width": 110, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "producer", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 65, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "consumer", + "type": "rectangle", + "pos": { + "x": 192, + "y": 98 + }, + "width": 116, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "consumer", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 71, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [ + { + "id": "(a -> b)[0]", + "src": "a", + "srcArrow": "none", + "dst": "b", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "hello", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 33, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 122, + "y": 45 + }, + { + "x": 378, + "y": 45 + } + ], + "animated": false, + "tooltip": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/213-alarm.svg", + "RawPath": "/essentials%2F213-alarm.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0 + }, + { + "id": "(b -> c)[0]", + "src": "b", + "srcArrow": "none", + "dst": "c", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 431, + "y": 45 + }, + { + "x": 501, + "y": 45 + } + ], + "animated": false, + "tooltip": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/213-alarm.svg", + "RawPath": "/essentials%2F213-alarm.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0 + }, + { + "id": "(producer -> consumer)[0]", + "src": "producer", + "srcArrow": "none", + "dst": "consumer", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 122, + "y": 131 + }, + { + "x": 192, + "y": 131 + } + ], + "animated": false, + "tooltip": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/aws/Application Integration/Amazon-Simple-Queue-Service-SQS.svg", + "RawPath": "/aws%2FApplication%20Integration%2FAmazon-Simple-Queue-Service-SQS.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "iconBorderRadius": 20, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/connection-icons/elk/sketch.exp.svg b/e2etests/testdata/txtar/connection-icons/elk/sketch.exp.svg new file mode 100644 index 000000000..827a64cc3 --- /dev/null +++ b/e2etests/testdata/txtar/connection-icons/elk/sketch.exp.svg @@ -0,0 +1,109 @@ +abcproducerconsumer hello + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/connection-style-fill/dagre/board.exp.json b/e2etests/testdata/txtar/connection-style-fill/dagre/board.exp.json index c9a07c69a..2e03cdb95 100644 --- a/e2etests/testdata/txtar/connection-style-fill/dagre/board.exp.json +++ b/e2etests/testdata/txtar/connection-style-fill/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -275,6 +289,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 66.5, @@ -314,6 +329,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 217, @@ -353,6 +369,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 367, @@ -392,6 +409,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 217, @@ -431,6 +449,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 367, @@ -470,6 +489,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 517, @@ -509,6 +529,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 66.5, @@ -548,6 +569,7 @@ "labelHeight": 37, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 667, @@ -587,6 +609,7 @@ "labelHeight": 37, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 908, @@ -625,6 +648,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 66.5, @@ -663,6 +687,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 217, @@ -701,6 +726,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 367, @@ -739,6 +765,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 517, @@ -777,6 +804,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 667, @@ -815,6 +843,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 908, @@ -846,6 +875,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/txtar/connection-style-fill/dagre/sketch.exp.svg b/e2etests/testdata/txtar/connection-style-fill/dagre/sketch.exp.svg index 5183fae3a..3dce72284 100644 --- a/e2etests/testdata/txtar/connection-style-fill/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/connection-style-fill/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -customeremployeerentalitemalicebob rent(this, i, p)new(this, i, p)isValid()isRentable(c)is(Adult)trueWhat does it meanto be well-adjusted?The ability to play bridge orgolf as if they were games. + .d2-1824732527 .fill-N1{fill:#0A0F25;} + .d2-1824732527 .fill-N2{fill:#676C7E;} + .d2-1824732527 .fill-N3{fill:#9499AB;} + .d2-1824732527 .fill-N4{fill:#CFD2DD;} + .d2-1824732527 .fill-N5{fill:#DEE1EB;} + .d2-1824732527 .fill-N6{fill:#EEF1F8;} + .d2-1824732527 .fill-N7{fill:#FFFFFF;} + .d2-1824732527 .fill-B1{fill:#0D32B2;} + .d2-1824732527 .fill-B2{fill:#0D32B2;} + .d2-1824732527 .fill-B3{fill:#E3E9FD;} + .d2-1824732527 .fill-B4{fill:#E3E9FD;} + .d2-1824732527 .fill-B5{fill:#EDF0FD;} + .d2-1824732527 .fill-B6{fill:#F7F8FE;} + .d2-1824732527 .fill-AA2{fill:#4A6FF3;} + .d2-1824732527 .fill-AA4{fill:#EDF0FD;} + .d2-1824732527 .fill-AA5{fill:#F7F8FE;} + .d2-1824732527 .fill-AB4{fill:#EDF0FD;} + .d2-1824732527 .fill-AB5{fill:#F7F8FE;} + .d2-1824732527 .stroke-N1{stroke:#0A0F25;} + .d2-1824732527 .stroke-N2{stroke:#676C7E;} + .d2-1824732527 .stroke-N3{stroke:#9499AB;} + .d2-1824732527 .stroke-N4{stroke:#CFD2DD;} + .d2-1824732527 .stroke-N5{stroke:#DEE1EB;} + .d2-1824732527 .stroke-N6{stroke:#EEF1F8;} + .d2-1824732527 .stroke-N7{stroke:#FFFFFF;} + .d2-1824732527 .stroke-B1{stroke:#0D32B2;} + .d2-1824732527 .stroke-B2{stroke:#0D32B2;} + .d2-1824732527 .stroke-B3{stroke:#E3E9FD;} + .d2-1824732527 .stroke-B4{stroke:#E3E9FD;} + .d2-1824732527 .stroke-B5{stroke:#EDF0FD;} + .d2-1824732527 .stroke-B6{stroke:#F7F8FE;} + .d2-1824732527 .stroke-AA2{stroke:#4A6FF3;} + .d2-1824732527 .stroke-AA4{stroke:#EDF0FD;} + .d2-1824732527 .stroke-AA5{stroke:#F7F8FE;} + .d2-1824732527 .stroke-AB4{stroke:#EDF0FD;} + .d2-1824732527 .stroke-AB5{stroke:#F7F8FE;} + .d2-1824732527 .background-color-N1{background-color:#0A0F25;} + .d2-1824732527 .background-color-N2{background-color:#676C7E;} + .d2-1824732527 .background-color-N3{background-color:#9499AB;} + .d2-1824732527 .background-color-N4{background-color:#CFD2DD;} + .d2-1824732527 .background-color-N5{background-color:#DEE1EB;} + .d2-1824732527 .background-color-N6{background-color:#EEF1F8;} + .d2-1824732527 .background-color-N7{background-color:#FFFFFF;} + .d2-1824732527 .background-color-B1{background-color:#0D32B2;} + .d2-1824732527 .background-color-B2{background-color:#0D32B2;} + .d2-1824732527 .background-color-B3{background-color:#E3E9FD;} + .d2-1824732527 .background-color-B4{background-color:#E3E9FD;} + .d2-1824732527 .background-color-B5{background-color:#EDF0FD;} + .d2-1824732527 .background-color-B6{background-color:#F7F8FE;} + .d2-1824732527 .background-color-AA2{background-color:#4A6FF3;} + .d2-1824732527 .background-color-AA4{background-color:#EDF0FD;} + .d2-1824732527 .background-color-AA5{background-color:#F7F8FE;} + .d2-1824732527 .background-color-AB4{background-color:#EDF0FD;} + .d2-1824732527 .background-color-AB5{background-color:#F7F8FE;} + .d2-1824732527 .color-N1{color:#0A0F25;} + .d2-1824732527 .color-N2{color:#676C7E;} + .d2-1824732527 .color-N3{color:#9499AB;} + .d2-1824732527 .color-N4{color:#CFD2DD;} + .d2-1824732527 .color-N5{color:#DEE1EB;} + .d2-1824732527 .color-N6{color:#EEF1F8;} + .d2-1824732527 .color-N7{color:#FFFFFF;} + .d2-1824732527 .color-B1{color:#0D32B2;} + .d2-1824732527 .color-B2{color:#0D32B2;} + .d2-1824732527 .color-B3{color:#E3E9FD;} + .d2-1824732527 .color-B4{color:#E3E9FD;} + .d2-1824732527 .color-B5{color:#EDF0FD;} + .d2-1824732527 .color-B6{color:#F7F8FE;} + .d2-1824732527 .color-AA2{color:#4A6FF3;} + .d2-1824732527 .color-AA4{color:#EDF0FD;} + .d2-1824732527 .color-AA5{color:#F7F8FE;} + .d2-1824732527 .color-AB4{color:#EDF0FD;} + .d2-1824732527 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1824732527);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1824732527);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1824732527);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1824732527);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1824732527);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1824732527);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1824732527);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1824732527);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1824732527);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1824732527);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1824732527);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1824732527);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1824732527);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1824732527);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1824732527);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1824732527);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1824732527);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1824732527);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>customeremployeerentalitemalicebob rent(this, i, p)new(this, i, p)isValid()isRentable(c)is(Adult)trueWhat does it meanto be well-adjusted?The ability to play bridge orgolf as if they were games. - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/connection-style-fill/elk/board.exp.json b/e2etests/testdata/txtar/connection-style-fill/elk/board.exp.json index c9a07c69a..2e03cdb95 100644 --- a/e2etests/testdata/txtar/connection-style-fill/elk/board.exp.json +++ b/e2etests/testdata/txtar/connection-style-fill/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -275,6 +289,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 66.5, @@ -314,6 +329,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 217, @@ -353,6 +369,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 367, @@ -392,6 +409,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 217, @@ -431,6 +449,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 367, @@ -470,6 +489,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 517, @@ -509,6 +529,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 66.5, @@ -548,6 +569,7 @@ "labelHeight": 37, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 667, @@ -587,6 +609,7 @@ "labelHeight": 37, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 908, @@ -625,6 +648,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 66.5, @@ -663,6 +687,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 217, @@ -701,6 +726,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 367, @@ -739,6 +765,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 517, @@ -777,6 +804,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 667, @@ -815,6 +843,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 908, @@ -846,6 +875,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/txtar/connection-style-fill/elk/sketch.exp.svg b/e2etests/testdata/txtar/connection-style-fill/elk/sketch.exp.svg index 5183fae3a..3dce72284 100644 --- a/e2etests/testdata/txtar/connection-style-fill/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/connection-style-fill/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -customeremployeerentalitemalicebob rent(this, i, p)new(this, i, p)isValid()isRentable(c)is(Adult)trueWhat does it meanto be well-adjusted?The ability to play bridge orgolf as if they were games. + .d2-1824732527 .fill-N1{fill:#0A0F25;} + .d2-1824732527 .fill-N2{fill:#676C7E;} + .d2-1824732527 .fill-N3{fill:#9499AB;} + .d2-1824732527 .fill-N4{fill:#CFD2DD;} + .d2-1824732527 .fill-N5{fill:#DEE1EB;} + .d2-1824732527 .fill-N6{fill:#EEF1F8;} + .d2-1824732527 .fill-N7{fill:#FFFFFF;} + .d2-1824732527 .fill-B1{fill:#0D32B2;} + .d2-1824732527 .fill-B2{fill:#0D32B2;} + .d2-1824732527 .fill-B3{fill:#E3E9FD;} + .d2-1824732527 .fill-B4{fill:#E3E9FD;} + .d2-1824732527 .fill-B5{fill:#EDF0FD;} + .d2-1824732527 .fill-B6{fill:#F7F8FE;} + .d2-1824732527 .fill-AA2{fill:#4A6FF3;} + .d2-1824732527 .fill-AA4{fill:#EDF0FD;} + .d2-1824732527 .fill-AA5{fill:#F7F8FE;} + .d2-1824732527 .fill-AB4{fill:#EDF0FD;} + .d2-1824732527 .fill-AB5{fill:#F7F8FE;} + .d2-1824732527 .stroke-N1{stroke:#0A0F25;} + .d2-1824732527 .stroke-N2{stroke:#676C7E;} + .d2-1824732527 .stroke-N3{stroke:#9499AB;} + .d2-1824732527 .stroke-N4{stroke:#CFD2DD;} + .d2-1824732527 .stroke-N5{stroke:#DEE1EB;} + .d2-1824732527 .stroke-N6{stroke:#EEF1F8;} + .d2-1824732527 .stroke-N7{stroke:#FFFFFF;} + .d2-1824732527 .stroke-B1{stroke:#0D32B2;} + .d2-1824732527 .stroke-B2{stroke:#0D32B2;} + .d2-1824732527 .stroke-B3{stroke:#E3E9FD;} + .d2-1824732527 .stroke-B4{stroke:#E3E9FD;} + .d2-1824732527 .stroke-B5{stroke:#EDF0FD;} + .d2-1824732527 .stroke-B6{stroke:#F7F8FE;} + .d2-1824732527 .stroke-AA2{stroke:#4A6FF3;} + .d2-1824732527 .stroke-AA4{stroke:#EDF0FD;} + .d2-1824732527 .stroke-AA5{stroke:#F7F8FE;} + .d2-1824732527 .stroke-AB4{stroke:#EDF0FD;} + .d2-1824732527 .stroke-AB5{stroke:#F7F8FE;} + .d2-1824732527 .background-color-N1{background-color:#0A0F25;} + .d2-1824732527 .background-color-N2{background-color:#676C7E;} + .d2-1824732527 .background-color-N3{background-color:#9499AB;} + .d2-1824732527 .background-color-N4{background-color:#CFD2DD;} + .d2-1824732527 .background-color-N5{background-color:#DEE1EB;} + .d2-1824732527 .background-color-N6{background-color:#EEF1F8;} + .d2-1824732527 .background-color-N7{background-color:#FFFFFF;} + .d2-1824732527 .background-color-B1{background-color:#0D32B2;} + .d2-1824732527 .background-color-B2{background-color:#0D32B2;} + .d2-1824732527 .background-color-B3{background-color:#E3E9FD;} + .d2-1824732527 .background-color-B4{background-color:#E3E9FD;} + .d2-1824732527 .background-color-B5{background-color:#EDF0FD;} + .d2-1824732527 .background-color-B6{background-color:#F7F8FE;} + .d2-1824732527 .background-color-AA2{background-color:#4A6FF3;} + .d2-1824732527 .background-color-AA4{background-color:#EDF0FD;} + .d2-1824732527 .background-color-AA5{background-color:#F7F8FE;} + .d2-1824732527 .background-color-AB4{background-color:#EDF0FD;} + .d2-1824732527 .background-color-AB5{background-color:#F7F8FE;} + .d2-1824732527 .color-N1{color:#0A0F25;} + .d2-1824732527 .color-N2{color:#676C7E;} + .d2-1824732527 .color-N3{color:#9499AB;} + .d2-1824732527 .color-N4{color:#CFD2DD;} + .d2-1824732527 .color-N5{color:#DEE1EB;} + .d2-1824732527 .color-N6{color:#EEF1F8;} + .d2-1824732527 .color-N7{color:#FFFFFF;} + .d2-1824732527 .color-B1{color:#0D32B2;} + .d2-1824732527 .color-B2{color:#0D32B2;} + .d2-1824732527 .color-B3{color:#E3E9FD;} + .d2-1824732527 .color-B4{color:#E3E9FD;} + .d2-1824732527 .color-B5{color:#EDF0FD;} + .d2-1824732527 .color-B6{color:#F7F8FE;} + .d2-1824732527 .color-AA2{color:#4A6FF3;} + .d2-1824732527 .color-AA4{color:#EDF0FD;} + .d2-1824732527 .color-AA5{color:#F7F8FE;} + .d2-1824732527 .color-AB4{color:#EDF0FD;} + .d2-1824732527 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1824732527);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1824732527);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1824732527);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1824732527);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1824732527);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1824732527);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1824732527);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1824732527);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1824732527);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1824732527);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1824732527);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1824732527);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1824732527);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1824732527);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1824732527);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1824732527);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1824732527);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1824732527);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>customeremployeerentalitemalicebob rent(this, i, p)new(this, i, p)isValid()isRentable(c)is(Adult)trueWhat does it meanto be well-adjusted?The ability to play bridge orgolf as if they were games. - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/connection-underline/dagre/board.exp.json b/e2etests/testdata/txtar/connection-underline/dagre/board.exp.json index 93d7d24b3..518f0bf11 100644 --- a/e2etests/testdata/txtar/connection-underline/dagre/board.exp.json +++ b/e2etests/testdata/txtar/connection-underline/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -110,6 +120,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 26.5, @@ -150,6 +161,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/txtar/connection-underline/dagre/sketch.exp.svg b/e2etests/testdata/txtar/connection-underline/dagre/sketch.exp.svg index be5bd6167..c09de3f72 100644 --- a/e2etests/testdata/txtar/connection-underline/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/connection-underline/dagre/sketch.exp.svg @@ -1,19 +1,19 @@ -ab hi + .d2-213667791 .fill-N1{fill:#0A0F25;} + .d2-213667791 .fill-N2{fill:#676C7E;} + .d2-213667791 .fill-N3{fill:#9499AB;} + .d2-213667791 .fill-N4{fill:#CFD2DD;} + .d2-213667791 .fill-N5{fill:#DEE1EB;} + .d2-213667791 .fill-N6{fill:#EEF1F8;} + .d2-213667791 .fill-N7{fill:#FFFFFF;} + .d2-213667791 .fill-B1{fill:#0D32B2;} + .d2-213667791 .fill-B2{fill:#0D32B2;} + .d2-213667791 .fill-B3{fill:#E3E9FD;} + .d2-213667791 .fill-B4{fill:#E3E9FD;} + .d2-213667791 .fill-B5{fill:#EDF0FD;} + .d2-213667791 .fill-B6{fill:#F7F8FE;} + .d2-213667791 .fill-AA2{fill:#4A6FF3;} + .d2-213667791 .fill-AA4{fill:#EDF0FD;} + .d2-213667791 .fill-AA5{fill:#F7F8FE;} + .d2-213667791 .fill-AB4{fill:#EDF0FD;} + .d2-213667791 .fill-AB5{fill:#F7F8FE;} + .d2-213667791 .stroke-N1{stroke:#0A0F25;} + .d2-213667791 .stroke-N2{stroke:#676C7E;} + .d2-213667791 .stroke-N3{stroke:#9499AB;} + .d2-213667791 .stroke-N4{stroke:#CFD2DD;} + .d2-213667791 .stroke-N5{stroke:#DEE1EB;} + .d2-213667791 .stroke-N6{stroke:#EEF1F8;} + .d2-213667791 .stroke-N7{stroke:#FFFFFF;} + .d2-213667791 .stroke-B1{stroke:#0D32B2;} + .d2-213667791 .stroke-B2{stroke:#0D32B2;} + .d2-213667791 .stroke-B3{stroke:#E3E9FD;} + .d2-213667791 .stroke-B4{stroke:#E3E9FD;} + .d2-213667791 .stroke-B5{stroke:#EDF0FD;} + .d2-213667791 .stroke-B6{stroke:#F7F8FE;} + .d2-213667791 .stroke-AA2{stroke:#4A6FF3;} + .d2-213667791 .stroke-AA4{stroke:#EDF0FD;} + .d2-213667791 .stroke-AA5{stroke:#F7F8FE;} + .d2-213667791 .stroke-AB4{stroke:#EDF0FD;} + .d2-213667791 .stroke-AB5{stroke:#F7F8FE;} + .d2-213667791 .background-color-N1{background-color:#0A0F25;} + .d2-213667791 .background-color-N2{background-color:#676C7E;} + .d2-213667791 .background-color-N3{background-color:#9499AB;} + .d2-213667791 .background-color-N4{background-color:#CFD2DD;} + .d2-213667791 .background-color-N5{background-color:#DEE1EB;} + .d2-213667791 .background-color-N6{background-color:#EEF1F8;} + .d2-213667791 .background-color-N7{background-color:#FFFFFF;} + .d2-213667791 .background-color-B1{background-color:#0D32B2;} + .d2-213667791 .background-color-B2{background-color:#0D32B2;} + .d2-213667791 .background-color-B3{background-color:#E3E9FD;} + .d2-213667791 .background-color-B4{background-color:#E3E9FD;} + .d2-213667791 .background-color-B5{background-color:#EDF0FD;} + .d2-213667791 .background-color-B6{background-color:#F7F8FE;} + .d2-213667791 .background-color-AA2{background-color:#4A6FF3;} + .d2-213667791 .background-color-AA4{background-color:#EDF0FD;} + .d2-213667791 .background-color-AA5{background-color:#F7F8FE;} + .d2-213667791 .background-color-AB4{background-color:#EDF0FD;} + .d2-213667791 .background-color-AB5{background-color:#F7F8FE;} + .d2-213667791 .color-N1{color:#0A0F25;} + .d2-213667791 .color-N2{color:#676C7E;} + .d2-213667791 .color-N3{color:#9499AB;} + .d2-213667791 .color-N4{color:#CFD2DD;} + .d2-213667791 .color-N5{color:#DEE1EB;} + .d2-213667791 .color-N6{color:#EEF1F8;} + .d2-213667791 .color-N7{color:#FFFFFF;} + .d2-213667791 .color-B1{color:#0D32B2;} + .d2-213667791 .color-B2{color:#0D32B2;} + .d2-213667791 .color-B3{color:#E3E9FD;} + .d2-213667791 .color-B4{color:#E3E9FD;} + .d2-213667791 .color-B5{color:#EDF0FD;} + .d2-213667791 .color-B6{color:#F7F8FE;} + .d2-213667791 .color-AA2{color:#4A6FF3;} + .d2-213667791 .color-AA4{color:#EDF0FD;} + .d2-213667791 .color-AA5{color:#F7F8FE;} + .d2-213667791 .color-AB4{color:#EDF0FD;} + .d2-213667791 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-213667791);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-213667791);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-213667791);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-213667791);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-213667791);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-213667791);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-213667791);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-213667791);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-213667791);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-213667791);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-213667791);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-213667791);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-213667791);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-213667791);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-213667791);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-213667791);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-213667791);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-213667791);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ab hi - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/connection-underline/elk/board.exp.json b/e2etests/testdata/txtar/connection-underline/elk/board.exp.json index a1cde3b44..fadc68fe6 100644 --- a/e2etests/testdata/txtar/connection-underline/elk/board.exp.json +++ b/e2etests/testdata/txtar/connection-underline/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -110,6 +120,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 38.5, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/txtar/connection-underline/elk/sketch.exp.svg b/e2etests/testdata/txtar/connection-underline/elk/sketch.exp.svg index 71936ca0c..6b4fadf64 100644 --- a/e2etests/testdata/txtar/connection-underline/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/connection-underline/elk/sketch.exp.svg @@ -1,19 +1,19 @@ -ab hi + .d2-921914266 .fill-N1{fill:#0A0F25;} + .d2-921914266 .fill-N2{fill:#676C7E;} + .d2-921914266 .fill-N3{fill:#9499AB;} + .d2-921914266 .fill-N4{fill:#CFD2DD;} + .d2-921914266 .fill-N5{fill:#DEE1EB;} + .d2-921914266 .fill-N6{fill:#EEF1F8;} + .d2-921914266 .fill-N7{fill:#FFFFFF;} + .d2-921914266 .fill-B1{fill:#0D32B2;} + .d2-921914266 .fill-B2{fill:#0D32B2;} + .d2-921914266 .fill-B3{fill:#E3E9FD;} + .d2-921914266 .fill-B4{fill:#E3E9FD;} + .d2-921914266 .fill-B5{fill:#EDF0FD;} + .d2-921914266 .fill-B6{fill:#F7F8FE;} + .d2-921914266 .fill-AA2{fill:#4A6FF3;} + .d2-921914266 .fill-AA4{fill:#EDF0FD;} + .d2-921914266 .fill-AA5{fill:#F7F8FE;} + .d2-921914266 .fill-AB4{fill:#EDF0FD;} + .d2-921914266 .fill-AB5{fill:#F7F8FE;} + .d2-921914266 .stroke-N1{stroke:#0A0F25;} + .d2-921914266 .stroke-N2{stroke:#676C7E;} + .d2-921914266 .stroke-N3{stroke:#9499AB;} + .d2-921914266 .stroke-N4{stroke:#CFD2DD;} + .d2-921914266 .stroke-N5{stroke:#DEE1EB;} + .d2-921914266 .stroke-N6{stroke:#EEF1F8;} + .d2-921914266 .stroke-N7{stroke:#FFFFFF;} + .d2-921914266 .stroke-B1{stroke:#0D32B2;} + .d2-921914266 .stroke-B2{stroke:#0D32B2;} + .d2-921914266 .stroke-B3{stroke:#E3E9FD;} + .d2-921914266 .stroke-B4{stroke:#E3E9FD;} + .d2-921914266 .stroke-B5{stroke:#EDF0FD;} + .d2-921914266 .stroke-B6{stroke:#F7F8FE;} + .d2-921914266 .stroke-AA2{stroke:#4A6FF3;} + .d2-921914266 .stroke-AA4{stroke:#EDF0FD;} + .d2-921914266 .stroke-AA5{stroke:#F7F8FE;} + .d2-921914266 .stroke-AB4{stroke:#EDF0FD;} + .d2-921914266 .stroke-AB5{stroke:#F7F8FE;} + .d2-921914266 .background-color-N1{background-color:#0A0F25;} + .d2-921914266 .background-color-N2{background-color:#676C7E;} + .d2-921914266 .background-color-N3{background-color:#9499AB;} + .d2-921914266 .background-color-N4{background-color:#CFD2DD;} + .d2-921914266 .background-color-N5{background-color:#DEE1EB;} + .d2-921914266 .background-color-N6{background-color:#EEF1F8;} + .d2-921914266 .background-color-N7{background-color:#FFFFFF;} + .d2-921914266 .background-color-B1{background-color:#0D32B2;} + .d2-921914266 .background-color-B2{background-color:#0D32B2;} + .d2-921914266 .background-color-B3{background-color:#E3E9FD;} + .d2-921914266 .background-color-B4{background-color:#E3E9FD;} + .d2-921914266 .background-color-B5{background-color:#EDF0FD;} + .d2-921914266 .background-color-B6{background-color:#F7F8FE;} + .d2-921914266 .background-color-AA2{background-color:#4A6FF3;} + .d2-921914266 .background-color-AA4{background-color:#EDF0FD;} + .d2-921914266 .background-color-AA5{background-color:#F7F8FE;} + .d2-921914266 .background-color-AB4{background-color:#EDF0FD;} + .d2-921914266 .background-color-AB5{background-color:#F7F8FE;} + .d2-921914266 .color-N1{color:#0A0F25;} + .d2-921914266 .color-N2{color:#676C7E;} + .d2-921914266 .color-N3{color:#9499AB;} + .d2-921914266 .color-N4{color:#CFD2DD;} + .d2-921914266 .color-N5{color:#DEE1EB;} + .d2-921914266 .color-N6{color:#EEF1F8;} + .d2-921914266 .color-N7{color:#FFFFFF;} + .d2-921914266 .color-B1{color:#0D32B2;} + .d2-921914266 .color-B2{color:#0D32B2;} + .d2-921914266 .color-B3{color:#E3E9FD;} + .d2-921914266 .color-B4{color:#E3E9FD;} + .d2-921914266 .color-B5{color:#EDF0FD;} + .d2-921914266 .color-B6{color:#F7F8FE;} + .d2-921914266 .color-AA2{color:#4A6FF3;} + .d2-921914266 .color-AA4{color:#EDF0FD;} + .d2-921914266 .color-AA5{color:#F7F8FE;} + .d2-921914266 .color-AB4{color:#EDF0FD;} + .d2-921914266 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-921914266);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-921914266);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-921914266);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-921914266);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-921914266);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-921914266);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-921914266);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-921914266);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-921914266);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-921914266);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-921914266);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-921914266);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-921914266);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-921914266);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-921914266);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-921914266);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-921914266);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-921914266);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ab hi - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/dark-theme-md/dagre/board.exp.json b/e2etests/testdata/txtar/dark-theme-md/dagre/board.exp.json new file mode 100644 index 000000000..f3333ec26 --- /dev/null +++ b/e2etests/testdata/txtar/dark-theme-md/dagre/board.exp.json @@ -0,0 +1,99 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": 200, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "a", + "type": "rectangle", + "pos": { + "x": 0, + "y": 0 + }, + "width": 96, + "height": 96, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "# hey", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 51, + "labelHeight": 51, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/dark-theme-md/dagre/sketch.exp.svg b/e2etests/testdata/txtar/dark-theme-md/dagre/sketch.exp.svg new file mode 100644 index 000000000..ea2d9494f --- /dev/null +++ b/e2etests/testdata/txtar/dark-theme-md/dagre/sketch.exp.svg @@ -0,0 +1,907 @@ +

    hey

    +
     + + +     \ No newline at end of file diff --git a/e2etests/testdata/txtar/dark-theme-md/elk/board.exp.json b/e2etests/testdata/txtar/dark-theme-md/elk/board.exp.json new file mode 100644 index 000000000..c467d88ac --- /dev/null +++ b/e2etests/testdata/txtar/dark-theme-md/elk/board.exp.json @@ -0,0 +1,99 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": 200, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "a", + "type": "rectangle", + "pos": { + "x": 12, + "y": 12 + }, + "width": 96, + "height": 96, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "# hey", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 51, + "labelHeight": 51, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/dark-theme-md/elk/sketch.exp.svg b/e2etests/testdata/txtar/dark-theme-md/elk/sketch.exp.svg new file mode 100644 index 000000000..b88852850 --- /dev/null +++ b/e2etests/testdata/txtar/dark-theme-md/elk/sketch.exp.svg @@ -0,0 +1,907 @@ +

    hey

    +
     + + +     \ No newline at end of file diff --git a/e2etests/testdata/txtar/dark-theme-shape/dagre/board.exp.json b/e2etests/testdata/txtar/dark-theme-shape/dagre/board.exp.json new file mode 100644 index 000000000..f3333ec26 --- /dev/null +++ b/e2etests/testdata/txtar/dark-theme-shape/dagre/board.exp.json @@ -0,0 +1,99 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": 200, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "a", + "type": "rectangle", + "pos": { + "x": 0, + "y": 0 + }, + "width": 96, + "height": 96, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "# hey", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 51, + "labelHeight": 51, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/dark-theme-shape/dagre/sketch.exp.svg b/e2etests/testdata/txtar/dark-theme-shape/dagre/sketch.exp.svg new file mode 100644 index 000000000..a297d152f --- /dev/null +++ b/e2etests/testdata/txtar/dark-theme-shape/dagre/sketch.exp.svg @@ -0,0 +1,908 @@ +

    hey

    +
     + + +     \ No newline at end of file diff --git a/e2etests/testdata/txtar/dark-theme-shape/elk/board.exp.json b/e2etests/testdata/txtar/dark-theme-shape/elk/board.exp.json new file mode 100644 index 000000000..c467d88ac --- /dev/null +++ b/e2etests/testdata/txtar/dark-theme-shape/elk/board.exp.json @@ -0,0 +1,99 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": 200, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "a", + "type": "rectangle", + "pos": { + "x": 12, + "y": 12 + }, + "width": 96, + "height": 96, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "# hey", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 51, + "labelHeight": 51, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/dark-theme-shape/elk/sketch.exp.svg b/e2etests/testdata/txtar/dark-theme-shape/elk/sketch.exp.svg new file mode 100644 index 000000000..6409b8037 --- /dev/null +++ b/e2etests/testdata/txtar/dark-theme-shape/elk/sketch.exp.svg @@ -0,0 +1,908 @@ +

    hey

    +
     + + +     \ No newline at end of file diff --git a/e2etests/testdata/txtar/elk-title-near/dagre/board.exp.json b/e2etests/testdata/txtar/elk-title-near/dagre/board.exp.json new file mode 100644 index 000000000..ba19475f6 --- /dev/null +++ b/e2etests/testdata/txtar/elk-title-near/dagre/board.exp.json @@ -0,0 +1,503 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "title", + "type": "rectangle", + "pos": { + "x": -121, + "y": -107 + }, + "width": 408, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "diagram title : Red-line hits 'near: top-center' in elk", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 363, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "a", + "type": "rectangle", + "pos": { + "x": 10, + "y": 20 + }, + "width": 146, + "height": 292, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 12, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "a.a", + "type": "rectangle", + "pos": { + "x": 73, + "y": 50 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "a.b", + "type": "rectangle", + "pos": { + "x": 40, + "y": 216 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "b", + "type": "rectangle", + "pos": { + "x": 43, + "y": 452 + }, + "width": 113, + "height": 126, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 13, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "b.c", + "type": "rectangle", + "pos": { + "x": 73, + "y": 482 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "c", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + } + ], + "connections": [ + { + "id": "a.(a -> b)[0]", + "src": "a.a", + "srcArrow": "none", + "dst": "a.b", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 86.5, + "y": 116 + }, + { + "x": 70.5, + "y": 156 + }, + { + "x": 66.5, + "y": 176 + }, + { + "x": 66.5, + "y": 216 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(a.b -> b.c)[0]", + "src": "a.b", + "srcArrow": "none", + "dst": "b.c", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 66.5, + "y": 282 + }, + { + "x": 66.5, + "y": 322 + }, + { + "x": 66.5, + "y": 342 + }, + { + "x": 66.5, + "y": 357 + }, + { + "x": 66.5, + "y": 372 + }, + { + "x": 70.5, + "y": 442 + }, + { + "x": 86.5, + "y": 482 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(b.c -> a.a)[0]", + "src": "b.c", + "srcArrow": "none", + "dst": "a.a", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "red", + "fill": "mistyrose", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "red", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 113, + "y": 482 + }, + { + "x": 129, + "y": 442 + }, + { + "x": 133, + "y": 422 + }, + { + "x": 133, + "y": 407 + }, + { + "x": 133, + "y": 392 + }, + { + "x": 133, + "y": 372 + }, + { + "x": 133, + "y": 357 + }, + { + "x": 133, + "y": 342 + }, + { + "x": 133, + "y": 315.3999938964844 + }, + { + "x": 133, + "y": 290.5 + }, + { + "x": 133, + "y": 265.6000061035156 + }, + { + "x": 129, + "y": 156 + }, + { + "x": 113, + "y": 116 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/elk-title-near/dagre/sketch.exp.svg b/e2etests/testdata/txtar/elk-title-near/dagre/sketch.exp.svg new file mode 100644 index 000000000..96b2f0c51 --- /dev/null +++ b/e2etests/testdata/txtar/elk-title-near/dagre/sketch.exp.svg @@ -0,0 +1,107 @@ +diagram title : Red-line hits 'near: top-center' in elkababc + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/elk-title-near/elk/board.exp.json b/e2etests/testdata/txtar/elk-title-near/elk/board.exp.json new file mode 100644 index 000000000..bcfd342a9 --- /dev/null +++ b/e2etests/testdata/txtar/elk-title-near/elk/board.exp.json @@ -0,0 +1,444 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "title", + "type": "rectangle", + "pos": { + "x": -95, + "y": -74 + }, + "width": 408, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "diagram title : Red-line hits 'near: top-center' in elk", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 363, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "a", + "type": "rectangle", + "pos": { + "x": 52, + "y": 57 + }, + "width": 153, + "height": 302, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 12, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "a.a", + "type": "rectangle", + "pos": { + "x": 102, + "y": 107 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "a.b", + "type": "rectangle", + "pos": { + "x": 102, + "y": 243 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "b", + "type": "rectangle", + "pos": { + "x": 52, + "y": 439 + }, + "width": 153, + "height": 166, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 13, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "b.c", + "type": "rectangle", + "pos": { + "x": 102, + "y": 489 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "c", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + } + ], + "connections": [ + { + "id": "a.(a -> b)[0]", + "src": "a.a", + "srcArrow": "none", + "dst": "a.b", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 128.5, + "y": 173 + }, + { + "x": 128.5, + "y": 243 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(a.b -> b.c)[0]", + "src": "a.b", + "srcArrow": "none", + "dst": "b.c", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 128.5, + "y": 309 + }, + { + "x": 128.5, + "y": 489 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(b.c -> a.a)[0]", + "src": "b.c", + "srcArrow": "none", + "dst": "a.a", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "red", + "fill": "mistyrose", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "red", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 128.5, + "y": 555 + }, + { + "x": 128.5, + "y": 650 + }, + { + "x": 12, + "y": 650 + }, + { + "x": 12, + "y": 12 + }, + { + "x": 128.5, + "y": 12 + }, + { + "x": 128.5, + "y": 107 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/elk-title-near/elk/sketch.exp.svg b/e2etests/testdata/txtar/elk-title-near/elk/sketch.exp.svg new file mode 100644 index 000000000..03b1f1a0f --- /dev/null +++ b/e2etests/testdata/txtar/elk-title-near/elk/sketch.exp.svg @@ -0,0 +1,107 @@ +diagram title : Red-line hits 'near: top-center' in elkababc + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/extended-ascii/dagre/board.exp.json b/e2etests/testdata/txtar/extended-ascii/dagre/board.exp.json index f9ec46312..e631932f5 100644 --- a/e2etests/testdata/txtar/extended-ascii/dagre/board.exp.json +++ b/e2etests/testdata/txtar/extended-ascii/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -98,6 +108,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -138,6 +149,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -188,6 +200,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 75, @@ -235,6 +248,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 42, @@ -282,6 +296,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 42, @@ -329,6 +344,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 91, @@ -405,6 +421,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/txtar/extended-ascii/dagre/sketch.exp.svg b/e2etests/testdata/txtar/extended-ascii/dagre/sketch.exp.svg index 1159e307a..b00728a4f 100644 --- a/e2etests/testdata/txtar/extended-ascii/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/extended-ascii/dagre/sketch.exp.svg @@ -1,13 +1,13 @@ -

    ÇéþüðæØÅßñò

    -

    òØõùßÍÿåÆ

    -

    çÆÐÞ©ßþúí

    -

    ÉáøÿÑö

    -
     +

    ÇéþüðæØÅßñò

    +

    òØõùßÍÿåÆ

    +

    çÆÐÞ©ßþúí

    +

    ÉáøÿÑö

    +
     - - - - + + + +     \ No newline at end of file diff --git a/e2etests/testdata/txtar/extended-ascii/elk/board.exp.json b/e2etests/testdata/txtar/extended-ascii/elk/board.exp.json index 8c98196d6..ac4f0c661 100644 --- a/e2etests/testdata/txtar/extended-ascii/elk/board.exp.json +++ b/e2etests/testdata/txtar/extended-ascii/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -98,6 +108,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -138,6 +149,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -188,6 +200,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 78, @@ -226,6 +239,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 54, @@ -264,6 +278,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 54, @@ -310,6 +325,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 103.66600036621094, @@ -357,6 +373,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/txtar/extended-ascii/elk/sketch.exp.svg b/e2etests/testdata/txtar/extended-ascii/elk/sketch.exp.svg index e1eb6a55e..d3ae81846 100644 --- a/e2etests/testdata/txtar/extended-ascii/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/extended-ascii/elk/sketch.exp.svg @@ -1,13 +1,13 @@ -

    ÇéþüðæØÅßñò

    -

    òØõùßÍÿåÆ

    -

    çÆÐÞ©ßþúí

    -

    ÉáøÿÑö

    -
     +

    ÇéþüðæØÅßñò

    +

    òØõùßÍÿåÆ

    +

    çÆÐÞ©ßþúí

    +

    ÉáøÿÑö

    +
     - - - - + + + +     \ No newline at end of file diff --git a/e2etests/testdata/txtar/gradient/dagre/board.exp.json b/e2etests/testdata/txtar/gradient/dagre/board.exp.json index acf4fd6f6..35b556c52 100644 --- a/e2etests/testdata/txtar/gradient/dagre/board.exp.json +++ b/e2etests/testdata/txtar/gradient/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "linear-gradient(#f69d3c, #3f87a6)", "stroke": "linear-gradient(to top right, red, blue)", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -49,7 +58,7 @@ "type": "rectangle", "pos": { "x": 9, - "y": 166 + "y": 187 }, "width": 89, "height": 66, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "linear-gradient(45deg, rgba(255,0,0,0.5) 0%, rgba(0,0,255,0.5) 100%)", "stroke": "linear-gradient(to right, red, blue, green)", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -96,36 +106,38 @@ "opacity": 1, "strokeDash": 0, "strokeWidth": 2, - "stroke": "B1", + "stroke": "red", + "fill": "radial-gradient(#ffffff, #000000)", "borderRadius": 10, - "label": "", + "label": "foobar", "fontSize": 16, "fontFamily": "DEFAULT", "language": "", - "color": "N2", + "color": "red", "italic": true, "bold": false, "underline": false, - "labelWidth": 0, - "labelHeight": 0, - "labelPosition": "", + "labelWidth": 46, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 53, - "y": 66 + "y": 65.5 }, { "x": 53, - "y": 106 + "y": 114.30000305175781 }, { "x": 53, - "y": 126 + "y": 138.6999969482422 }, { "x": 53, - "y": 166 + "y": 187.5 } ], "isCurve": true, @@ -150,6 +162,7 @@ "borderRadius": 0, "fill": "radial-gradient(circle, white 0%, #8A2BE2 60%, #4B0082 100%)", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/txtar/gradient/dagre/sketch.exp.svg b/e2etests/testdata/txtar/gradient/dagre/sketch.exp.svg index abe1bc642..3e33a4cf0 100644 --- a/e2etests/testdata/txtar/gradient/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/gradient/dagre/sketch.exp.svg @@ -1,10 +1,17 @@ - + .d2-1069291522 .fill-N1{fill:#0A0F25;} + .d2-1069291522 .fill-N2{fill:#676C7E;} + .d2-1069291522 .fill-N3{fill:#9499AB;} + .d2-1069291522 .fill-N4{fill:#CFD2DD;} + .d2-1069291522 .fill-N5{fill:#DEE1EB;} + .d2-1069291522 .fill-N6{fill:#EEF1F8;} + .d2-1069291522 .fill-N7{fill:#FFFFFF;} + .d2-1069291522 .fill-B1{fill:#0D32B2;} + .d2-1069291522 .fill-B2{fill:#0D32B2;} + .d2-1069291522 .fill-B3{fill:#E3E9FD;} + .d2-1069291522 .fill-B4{fill:#E3E9FD;} + .d2-1069291522 .fill-B5{fill:#EDF0FD;} + .d2-1069291522 .fill-B6{fill:#F7F8FE;} + .d2-1069291522 .fill-AA2{fill:#4A6FF3;} + .d2-1069291522 .fill-AA4{fill:#EDF0FD;} + .d2-1069291522 .fill-AA5{fill:#F7F8FE;} + .d2-1069291522 .fill-AB4{fill:#EDF0FD;} + .d2-1069291522 .fill-AB5{fill:#F7F8FE;} + .d2-1069291522 .stroke-N1{stroke:#0A0F25;} + .d2-1069291522 .stroke-N2{stroke:#676C7E;} + .d2-1069291522 .stroke-N3{stroke:#9499AB;} + .d2-1069291522 .stroke-N4{stroke:#CFD2DD;} + .d2-1069291522 .stroke-N5{stroke:#DEE1EB;} + .d2-1069291522 .stroke-N6{stroke:#EEF1F8;} + .d2-1069291522 .stroke-N7{stroke:#FFFFFF;} + .d2-1069291522 .stroke-B1{stroke:#0D32B2;} + .d2-1069291522 .stroke-B2{stroke:#0D32B2;} + .d2-1069291522 .stroke-B3{stroke:#E3E9FD;} + .d2-1069291522 .stroke-B4{stroke:#E3E9FD;} + .d2-1069291522 .stroke-B5{stroke:#EDF0FD;} + .d2-1069291522 .stroke-B6{stroke:#F7F8FE;} + .d2-1069291522 .stroke-AA2{stroke:#4A6FF3;} + .d2-1069291522 .stroke-AA4{stroke:#EDF0FD;} + .d2-1069291522 .stroke-AA5{stroke:#F7F8FE;} + .d2-1069291522 .stroke-AB4{stroke:#EDF0FD;} + .d2-1069291522 .stroke-AB5{stroke:#F7F8FE;} + .d2-1069291522 .background-color-N1{background-color:#0A0F25;} + .d2-1069291522 .background-color-N2{background-color:#676C7E;} + .d2-1069291522 .background-color-N3{background-color:#9499AB;} + .d2-1069291522 .background-color-N4{background-color:#CFD2DD;} + .d2-1069291522 .background-color-N5{background-color:#DEE1EB;} + .d2-1069291522 .background-color-N6{background-color:#EEF1F8;} + .d2-1069291522 .background-color-N7{background-color:#FFFFFF;} + .d2-1069291522 .background-color-B1{background-color:#0D32B2;} + .d2-1069291522 .background-color-B2{background-color:#0D32B2;} + .d2-1069291522 .background-color-B3{background-color:#E3E9FD;} + .d2-1069291522 .background-color-B4{background-color:#E3E9FD;} + .d2-1069291522 .background-color-B5{background-color:#EDF0FD;} + .d2-1069291522 .background-color-B6{background-color:#F7F8FE;} + .d2-1069291522 .background-color-AA2{background-color:#4A6FF3;} + .d2-1069291522 .background-color-AA4{background-color:#EDF0FD;} + .d2-1069291522 .background-color-AA5{background-color:#F7F8FE;} + .d2-1069291522 .background-color-AB4{background-color:#EDF0FD;} + .d2-1069291522 .background-color-AB5{background-color:#F7F8FE;} + .d2-1069291522 .color-N1{color:#0A0F25;} + .d2-1069291522 .color-N2{color:#676C7E;} + .d2-1069291522 .color-N3{color:#9499AB;} + .d2-1069291522 .color-N4{color:#CFD2DD;} + .d2-1069291522 .color-N5{color:#DEE1EB;} + .d2-1069291522 .color-N6{color:#EEF1F8;} + .d2-1069291522 .color-N7{color:#FFFFFF;} + .d2-1069291522 .color-B1{color:#0D32B2;} + .d2-1069291522 .color-B2{color:#0D32B2;} + .d2-1069291522 .color-B3{color:#E3E9FD;} + .d2-1069291522 .color-B4{color:#E3E9FD;} + .d2-1069291522 .color-B5{color:#EDF0FD;} + .d2-1069291522 .color-B6{color:#F7F8FE;} + .d2-1069291522 .color-AA2{color:#4A6FF3;} + .d2-1069291522 .color-AA4{color:#EDF0FD;} + .d2-1069291522 .color-AA5{color:#F7F8FE;} + .d2-1069291522 .color-AB4{color:#EDF0FD;} + .d2-1069291522 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1069291522);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1069291522);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1069291522);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1069291522);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1069291522);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1069291522);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1069291522);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1069291522);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1069291522);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1069291522);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1069291522);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1069291522);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1069291522);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1069291522);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1069291522);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1069291522);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1069291522);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1069291522);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> @@ -118,8 +125,12 @@ -gradientcolors - - - + + + +gradientcolors foobar + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/gradient/elk/board.exp.json b/e2etests/testdata/txtar/gradient/elk/board.exp.json index 7803d98f0..cfeb60cb8 100644 --- a/e2etests/testdata/txtar/gradient/elk/board.exp.json +++ b/e2etests/testdata/txtar/gradient/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "linear-gradient(#f69d3c, #3f87a6)", "stroke": "linear-gradient(to top right, red, blue)", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -49,7 +58,7 @@ "type": "rectangle", "pos": { "x": 20, - "y": 148 + "y": 239 }, "width": 89, "height": 66, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "linear-gradient(45deg, rgba(255,0,0,0.5) 0%, rgba(0,0,255,0.5) 100%)", "stroke": "linear-gradient(to right, red, blue, green)", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -96,20 +106,22 @@ "opacity": 1, "strokeDash": 0, "strokeWidth": 2, - "stroke": "B1", + "stroke": "red", + "fill": "radial-gradient(#ffffff, #000000)", "borderRadius": 10, - "label": "", + "label": "foobar", "fontSize": 16, "fontFamily": "DEFAULT", "language": "", - "color": "N2", + "color": "red", "italic": true, "bold": false, "underline": false, - "labelWidth": 0, - "labelHeight": 0, - "labelPosition": "", + "labelWidth": 46, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 65, @@ -117,7 +129,7 @@ }, { "x": 65, - "y": 148 + "y": 239 } ], "animated": false, @@ -141,6 +153,7 @@ "borderRadius": 0, "fill": "radial-gradient(circle, white 0%, #8A2BE2 60%, #4B0082 100%)", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/txtar/gradient/elk/sketch.exp.svg b/e2etests/testdata/txtar/gradient/elk/sketch.exp.svg index a69cc3c9d..fa80d2c26 100644 --- a/e2etests/testdata/txtar/gradient/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/gradient/elk/sketch.exp.svg @@ -1,10 +1,17 @@ - + .d2-2458666147 .fill-N1{fill:#0A0F25;} + .d2-2458666147 .fill-N2{fill:#676C7E;} + .d2-2458666147 .fill-N3{fill:#9499AB;} + .d2-2458666147 .fill-N4{fill:#CFD2DD;} + .d2-2458666147 .fill-N5{fill:#DEE1EB;} + .d2-2458666147 .fill-N6{fill:#EEF1F8;} + .d2-2458666147 .fill-N7{fill:#FFFFFF;} + .d2-2458666147 .fill-B1{fill:#0D32B2;} + .d2-2458666147 .fill-B2{fill:#0D32B2;} + .d2-2458666147 .fill-B3{fill:#E3E9FD;} + .d2-2458666147 .fill-B4{fill:#E3E9FD;} + .d2-2458666147 .fill-B5{fill:#EDF0FD;} + .d2-2458666147 .fill-B6{fill:#F7F8FE;} + .d2-2458666147 .fill-AA2{fill:#4A6FF3;} + .d2-2458666147 .fill-AA4{fill:#EDF0FD;} + .d2-2458666147 .fill-AA5{fill:#F7F8FE;} + .d2-2458666147 .fill-AB4{fill:#EDF0FD;} + .d2-2458666147 .fill-AB5{fill:#F7F8FE;} + .d2-2458666147 .stroke-N1{stroke:#0A0F25;} + .d2-2458666147 .stroke-N2{stroke:#676C7E;} + .d2-2458666147 .stroke-N3{stroke:#9499AB;} + .d2-2458666147 .stroke-N4{stroke:#CFD2DD;} + .d2-2458666147 .stroke-N5{stroke:#DEE1EB;} + .d2-2458666147 .stroke-N6{stroke:#EEF1F8;} + .d2-2458666147 .stroke-N7{stroke:#FFFFFF;} + .d2-2458666147 .stroke-B1{stroke:#0D32B2;} + .d2-2458666147 .stroke-B2{stroke:#0D32B2;} + .d2-2458666147 .stroke-B3{stroke:#E3E9FD;} + .d2-2458666147 .stroke-B4{stroke:#E3E9FD;} + .d2-2458666147 .stroke-B5{stroke:#EDF0FD;} + .d2-2458666147 .stroke-B6{stroke:#F7F8FE;} + .d2-2458666147 .stroke-AA2{stroke:#4A6FF3;} + .d2-2458666147 .stroke-AA4{stroke:#EDF0FD;} + .d2-2458666147 .stroke-AA5{stroke:#F7F8FE;} + .d2-2458666147 .stroke-AB4{stroke:#EDF0FD;} + .d2-2458666147 .stroke-AB5{stroke:#F7F8FE;} + .d2-2458666147 .background-color-N1{background-color:#0A0F25;} + .d2-2458666147 .background-color-N2{background-color:#676C7E;} + .d2-2458666147 .background-color-N3{background-color:#9499AB;} + .d2-2458666147 .background-color-N4{background-color:#CFD2DD;} + .d2-2458666147 .background-color-N5{background-color:#DEE1EB;} + .d2-2458666147 .background-color-N6{background-color:#EEF1F8;} + .d2-2458666147 .background-color-N7{background-color:#FFFFFF;} + .d2-2458666147 .background-color-B1{background-color:#0D32B2;} + .d2-2458666147 .background-color-B2{background-color:#0D32B2;} + .d2-2458666147 .background-color-B3{background-color:#E3E9FD;} + .d2-2458666147 .background-color-B4{background-color:#E3E9FD;} + .d2-2458666147 .background-color-B5{background-color:#EDF0FD;} + .d2-2458666147 .background-color-B6{background-color:#F7F8FE;} + .d2-2458666147 .background-color-AA2{background-color:#4A6FF3;} + .d2-2458666147 .background-color-AA4{background-color:#EDF0FD;} + .d2-2458666147 .background-color-AA5{background-color:#F7F8FE;} + .d2-2458666147 .background-color-AB4{background-color:#EDF0FD;} + .d2-2458666147 .background-color-AB5{background-color:#F7F8FE;} + .d2-2458666147 .color-N1{color:#0A0F25;} + .d2-2458666147 .color-N2{color:#676C7E;} + .d2-2458666147 .color-N3{color:#9499AB;} + .d2-2458666147 .color-N4{color:#CFD2DD;} + .d2-2458666147 .color-N5{color:#DEE1EB;} + .d2-2458666147 .color-N6{color:#EEF1F8;} + .d2-2458666147 .color-N7{color:#FFFFFF;} + .d2-2458666147 .color-B1{color:#0D32B2;} + .d2-2458666147 .color-B2{color:#0D32B2;} + .d2-2458666147 .color-B3{color:#E3E9FD;} + .d2-2458666147 .color-B4{color:#E3E9FD;} + .d2-2458666147 .color-B5{color:#EDF0FD;} + .d2-2458666147 .color-B6{color:#F7F8FE;} + .d2-2458666147 .color-AA2{color:#4A6FF3;} + .d2-2458666147 .color-AA4{color:#EDF0FD;} + .d2-2458666147 .color-AA5{color:#F7F8FE;} + .d2-2458666147 .color-AB4{color:#EDF0FD;} + .d2-2458666147 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2458666147);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2458666147);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2458666147);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2458666147);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2458666147);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2458666147);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2458666147);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2458666147);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2458666147);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2458666147);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2458666147);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2458666147);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2458666147);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2458666147);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2458666147);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2458666147);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2458666147);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2458666147);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> @@ -118,8 +125,12 @@ -gradientcolors - - - + + + +gradientcolors foobar + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/icon-style/dagre/board.exp.json b/e2etests/testdata/txtar/icon-style/dagre/board.exp.json new file mode 100644 index 000000000..23ec2f964 --- /dev/null +++ b/e2etests/testdata/txtar/icon-style/dagre/board.exp.json @@ -0,0 +1,276 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "AWS Firewall Manager", + "type": "rectangle", + "pos": { + "x": 0, + "y": 18 + }, + "width": 230, + "height": 92, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/aws/Security, Identity, & Compliance/AWS-Firewall-Manager.svg", + "RawPath": "/aws%2FSecurity%2C%20Identity%2C%20&%20Compliance%2FAWS-Firewall-Manager.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconBorderRadius": 5, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "AWS Firewall Manager", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 159, + "labelHeight": 21, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "lambda", + "type": "image", + "pos": { + "x": 290, + "y": 0 + }, + "width": 128, + "height": 128, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/aws/Compute/AWS-Lambda.svg", + "RawPath": "/aws%2FCompute%2FAWS-Lambda.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconBorderRadius": 20, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "lambda", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 53, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "AWS Cloud", + "type": "rectangle", + "pos": { + "x": 478, + "y": 18 + }, + "width": 148, + "height": 92, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/aws/_Group Icons/AWS-Cloud_light-bg.svg", + "RawPath": "/aws%2F_Group%20Icons%2FAWS-Cloud_light-bg.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "AWS Cloud", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 77, + "labelHeight": 21, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "Mesh", + "type": "rectangle", + "pos": { + "x": 686, + "y": 18 + }, + "width": 107, + "height": 92, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/aws/Networking & Content Delivery/AWS-App-Mesh.svg", + "RawPath": "/aws%2FNetworking%20&%20Content%20Delivery%2FAWS-App-Mesh.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconBorderRadius": 999, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Mesh", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 36, + "labelHeight": 21, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/icon-style/dagre/sketch.exp.svg b/e2etests/testdata/txtar/icon-style/dagre/sketch.exp.svg new file mode 100644 index 000000000..9661fefb7 --- /dev/null +++ b/e2etests/testdata/txtar/icon-style/dagre/sketch.exp.svg @@ -0,0 +1,98 @@ +AWS Firewall Manager lambdaAWS CloudMesh + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/icon-style/elk/board.exp.json b/e2etests/testdata/txtar/icon-style/elk/board.exp.json new file mode 100644 index 000000000..03d5592c5 --- /dev/null +++ b/e2etests/testdata/txtar/icon-style/elk/board.exp.json @@ -0,0 +1,276 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "AWS Firewall Manager", + "type": "rectangle", + "pos": { + "x": 12, + "y": 30 + }, + "width": 230, + "height": 118, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/aws/Security, Identity, & Compliance/AWS-Firewall-Manager.svg", + "RawPath": "/aws%2FSecurity%2C%20Identity%2C%20&%20Compliance%2FAWS-Firewall-Manager.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconBorderRadius": 5, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "AWS Firewall Manager", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 159, + "labelHeight": 21, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "lambda", + "type": "image", + "pos": { + "x": 262, + "y": 12 + }, + "width": 128, + "height": 128, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/aws/Compute/AWS-Lambda.svg", + "RawPath": "/aws%2FCompute%2FAWS-Lambda.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconBorderRadius": 20, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "lambda", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 53, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "AWS Cloud", + "type": "rectangle", + "pos": { + "x": 410, + "y": 30 + }, + "width": 148, + "height": 118, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/aws/_Group Icons/AWS-Cloud_light-bg.svg", + "RawPath": "/aws%2F_Group%20Icons%2FAWS-Cloud_light-bg.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "AWS Cloud", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 77, + "labelHeight": 21, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "Mesh", + "type": "rectangle", + "pos": { + "x": 578, + "y": 30 + }, + "width": 107, + "height": 118, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/aws/Networking & Content Delivery/AWS-App-Mesh.svg", + "RawPath": "/aws%2FNetworking%20&%20Content%20Delivery%2FAWS-App-Mesh.svg", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconBorderRadius": 999, + "iconPosition": "INSIDE_MIDDLE_CENTER", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Mesh", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 36, + "labelHeight": 21, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/icon-style/elk/sketch.exp.svg b/e2etests/testdata/txtar/icon-style/elk/sketch.exp.svg new file mode 100644 index 000000000..7d2794cc8 --- /dev/null +++ b/e2etests/testdata/txtar/icon-style/elk/sketch.exp.svg @@ -0,0 +1,98 @@ +AWS Firewall Manager lambdaAWS CloudMesh + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/legend/dagre/board.exp.json b/e2etests/testdata/txtar/legend/dagre/board.exp.json new file mode 100644 index 000000000..838cefcc8 --- /dev/null +++ b/e2etests/testdata/txtar/legend/dagre/board.exp.json @@ -0,0 +1,725 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "api-1", + "type": "rectangle", + "pos": { + "x": 0, + "y": 0 + }, + "width": 81, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "api-1", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 36, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "api-2", + "type": "rectangle", + "pos": { + "x": 141, + "y": 166 + }, + "width": 81, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "api-2", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 36, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "postgres", + "type": "cylinder", + "pos": { + "x": 18, + "y": 332 + }, + "width": 106, + "height": 118, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "AA4", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "postgres", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 61, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "external", + "type": "rectangle", + "pos": { + "x": 18, + "y": 550 + }, + "width": 105, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "external", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 60, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "api-3", + "type": "rectangle", + "pos": { + "x": 0, + "y": 166 + }, + "width": 81, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "api-3", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 36, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [ + { + "id": "(api-1 -> postgres)[0]", + "src": "api-1", + "srcArrow": "none", + "dst": "postgres", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 8, + "y": 66 + }, + { + "x": -30.399999618530273, + "y": 106 + }, + { + "x": -40, + "y": 132.60000610351562 + }, + { + "x": -40, + "y": 157.5 + }, + { + "x": -40, + "y": 182.39999389648438 + }, + { + "x": -27.399999618530273, + "y": 294.3999938964844 + }, + { + "x": 23, + "y": 344 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(api-2 -> postgres)[0]", + "src": "api-2", + "srcArrow": "none", + "dst": "postgres", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 181.5, + "y": 232 + }, + { + "x": 181.5, + "y": 272 + }, + { + "x": 169, + "y": 294.3999938964844 + }, + { + "x": 119, + "y": 344 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(postgres -> external)[0]", + "src": "postgres", + "srcArrow": "none", + "dst": "external", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "black", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 71, + "y": 450 + }, + { + "x": 70.80000305175781, + "y": 490 + }, + { + "x": 70.75, + "y": 510 + }, + { + "x": 70.75, + "y": 550 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(api-1 <-> api-2)[0]", + "src": "api-1", + "srcArrow": "triangle", + "dst": "api-2", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 2, + "strokeWidth": 2, + "stroke": "red", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 80.5, + "y": 57 + }, + { + "x": 161.3000030517578, + "y": 104.19999694824219 + }, + { + "x": 181.5, + "y": 126 + }, + { + "x": 181.5, + "y": 166 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(api-1 -> api-3)[0]", + "src": "api-1", + "srcArrow": "none", + "dst": "api-3", + "dstArrow": "circle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 40.5, + "y": 66 + }, + { + "x": 40.5, + "y": 106 + }, + { + "x": 40.5, + "y": 126 + }, + { + "x": 40.5, + "y": 166 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + }, + "legend": { + "shapes": [ + { + "id": "a", + "type": "rectangle", + "pos": { + "x": 10, + "y": 10 + }, + "width": 100, + "height": 100, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Microservice", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 1 + }, + { + "id": "b", + "type": "cylinder", + "pos": { + "x": 10, + "y": 10 + }, + "width": 100, + "height": 100, + "opacity": 1, + "strokeDash": 2, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "AA4", + "stroke": "B2", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Database", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 1 + } + ], + "connections": [ + { + "id": "(a <-> b)[0]", + "src": "a", + "srcArrow": "triangle", + "dst": "b", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 2, + "strokeWidth": 1, + "stroke": "red", + "borderRadius": 10, + "label": "Good relationship", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 10, + "y": 10 + }, + { + "x": 110, + "y": 10 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(a -> b)[0]", + "src": "a", + "srcArrow": "none", + "dst": "b", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "Bad relationship", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 10, + "y": 10 + }, + { + "x": 110, + "y": 10 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(a -> b)[1]", + "src": "a", + "srcArrow": "none", + "dst": "b", + "dstArrow": "circle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "Tenuous", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 10, + "y": 10 + }, + { + "x": 110, + "y": 10 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ] + } +} diff --git a/e2etests/testdata/txtar/legend/dagre/sketch.exp.svg b/e2etests/testdata/txtar/legend/dagre/sketch.exp.svg new file mode 100644 index 000000000..964b55782 --- /dev/null +++ b/e2etests/testdata/txtar/legend/dagre/sketch.exp.svg @@ -0,0 +1,106 @@ +api-1api-2postgresexternalapi-3 LegendMicroserviceDatabase Good relationship Bad relationship Tenuous + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/legend/elk/board.exp.json b/e2etests/testdata/txtar/legend/elk/board.exp.json new file mode 100644 index 000000000..5376eae0a --- /dev/null +++ b/e2etests/testdata/txtar/legend/elk/board.exp.json @@ -0,0 +1,684 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "api-1", + "type": "rectangle", + "pos": { + "x": 45, + "y": 12 + }, + "width": 120, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "api-1", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 36, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "api-2", + "type": "rectangle", + "pos": { + "x": 65, + "y": 158 + }, + "width": 81, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "api-2", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 36, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "postgres", + "type": "cylinder", + "pos": { + "x": 12, + "y": 304 + }, + "width": 106, + "height": 118, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "AA4", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "postgres", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 61, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "external", + "type": "rectangle", + "pos": { + "x": 12, + "y": 492 + }, + "width": 105, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "external", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 60, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "api-3", + "type": "rectangle", + "pos": { + "x": 166, + "y": 158 + }, + "width": 81, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "api-3", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 36, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [ + { + "id": "(api-1 -> postgres)[0]", + "src": "api-1", + "srcArrow": "none", + "dst": "postgres", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 75.75, + "y": 78 + }, + { + "x": 75.75, + "y": 118 + }, + { + "x": 24.249000549316406, + "y": 118 + }, + { + "x": 24, + "y": 311 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(api-2 -> postgres)[0]", + "src": "api-2", + "srcArrow": "none", + "dst": "postgres", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 82.66600036621094, + "y": 224 + }, + { + "x": 83, + "y": 305 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(postgres -> external)[0]", + "src": "postgres", + "srcArrow": "none", + "dst": "external", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "black", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 65, + "y": 422 + }, + { + "x": 65, + "y": 492 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(api-1 <-> api-2)[0]", + "src": "api-1", + "srcArrow": "triangle", + "dst": "api-2", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 2, + "strokeWidth": 2, + "stroke": "red", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 105.75, + "y": 78 + }, + { + "x": 105.75, + "y": 158 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(api-1 -> api-3)[0]", + "src": "api-1", + "srcArrow": "none", + "dst": "api-3", + "dstArrow": "circle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 135.75, + "y": 78 + }, + { + "x": 135.75, + "y": 118 + }, + { + "x": 206.75, + "y": 118 + }, + { + "x": 206.75, + "y": 158 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + }, + "legend": { + "shapes": [ + { + "id": "a", + "type": "rectangle", + "pos": { + "x": 10, + "y": 10 + }, + "width": 100, + "height": 100, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Microservice", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 1 + }, + { + "id": "b", + "type": "cylinder", + "pos": { + "x": 10, + "y": 10 + }, + "width": 100, + "height": 100, + "opacity": 1, + "strokeDash": 2, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "AA4", + "stroke": "B2", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Database", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 1 + } + ], + "connections": [ + { + "id": "(a <-> b)[0]", + "src": "a", + "srcArrow": "triangle", + "dst": "b", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 2, + "strokeWidth": 1, + "stroke": "red", + "borderRadius": 10, + "label": "Good relationship", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 10, + "y": 10 + }, + { + "x": 110, + "y": 10 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(a -> b)[0]", + "src": "a", + "srcArrow": "none", + "dst": "b", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "Bad relationship", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 10, + "y": 10 + }, + { + "x": 110, + "y": 10 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(a -> b)[1]", + "src": "a", + "srcArrow": "none", + "dst": "b", + "dstArrow": "circle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "Tenuous", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 10, + "y": 10 + }, + { + "x": 110, + "y": 10 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ] + } +} diff --git a/e2etests/testdata/txtar/legend/elk/sketch.exp.svg b/e2etests/testdata/txtar/legend/elk/sketch.exp.svg new file mode 100644 index 000000000..d3089d963 --- /dev/null +++ b/e2etests/testdata/txtar/legend/elk/sketch.exp.svg @@ -0,0 +1,106 @@ +api-1api-2postgresexternalapi-3 LegendMicroserviceDatabase Good relationship Bad relationship Tenuous + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/link-on-connections/dagre/board.exp.json b/e2etests/testdata/txtar/link-on-connections/dagre/board.exp.json new file mode 100644 index 000000000..ddf8bba88 --- /dev/null +++ b/e2etests/testdata/txtar/link-on-connections/dagre/board.exp.json @@ -0,0 +1,373 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "a", + "type": "rectangle", + "pos": { + "x": 0, + "y": 0 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "b", + "type": "rectangle", + "pos": { + "x": 0, + "y": 166 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "c", + "type": "rectangle", + "pos": { + "x": 0, + "y": 353 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "c", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [ + { + "id": "(a <-> b)[0]", + "src": "a", + "srcArrow": "triangle", + "dst": "b", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "https://google.com/", + "route": [ + { + "x": 26.5, + "y": 66 + }, + { + "x": 26.5, + "y": 106 + }, + { + "x": 26.5, + "y": 126 + }, + { + "x": 26.5, + "y": 166 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(b -> c)[0]", + "src": "b", + "srcArrow": "none", + "dst": "c", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "test", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 26, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "root.layers.d", + "route": [ + { + "x": 26.5, + "y": 231.5 + }, + { + "x": 26.5, + "y": 280.29998779296875 + }, + { + "x": 26.5, + "y": 304.70001220703125 + }, + { + "x": 26.5, + "y": 353.5 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + }, + "layers": [ + { + "name": "d", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "d", + "type": "rectangle", + "pos": { + "x": 0, + "y": 0 + }, + "width": 54, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "d", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "d", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } + } + ] +} diff --git a/e2etests/testdata/txtar/link-on-connections/dagre/sketch.exp.svg b/e2etests/testdata/txtar/link-on-connections/dagre/sketch.exp.svg new file mode 100644 index 000000000..5d13768c0 --- /dev/null +++ b/e2etests/testdata/txtar/link-on-connections/dagre/sketch.exp.svg @@ -0,0 +1,135 @@ +abc test + + + + + +d + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/link-on-connections/elk/board.exp.json b/e2etests/testdata/txtar/link-on-connections/elk/board.exp.json new file mode 100644 index 000000000..862a1e42e --- /dev/null +++ b/e2etests/testdata/txtar/link-on-connections/elk/board.exp.json @@ -0,0 +1,355 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "a", + "type": "rectangle", + "pos": { + "x": 12, + "y": 12 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "b", + "type": "rectangle", + "pos": { + "x": 12, + "y": 148 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "c", + "type": "rectangle", + "pos": { + "x": 12, + "y": 375 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "c", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [ + { + "id": "(a <-> b)[0]", + "src": "a", + "srcArrow": "triangle", + "dst": "b", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "https://google.com/", + "route": [ + { + "x": 38.5, + "y": 78 + }, + { + "x": 38.5, + "y": 148 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(b -> c)[0]", + "src": "b", + "srcArrow": "none", + "dst": "c", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "test", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 26, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "root.layers.d", + "route": [ + { + "x": 38.5, + "y": 214 + }, + { + "x": 38.5, + "y": 375 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + }, + "layers": [ + { + "name": "d", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "d", + "type": "rectangle", + "pos": { + "x": 12, + "y": 12 + }, + "width": 54, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "d", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "d", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } + } + ] +} diff --git a/e2etests/testdata/txtar/link-on-connections/elk/sketch.exp.svg b/e2etests/testdata/txtar/link-on-connections/elk/sketch.exp.svg new file mode 100644 index 000000000..8afabece6 --- /dev/null +++ b/e2etests/testdata/txtar/link-on-connections/elk/sketch.exp.svg @@ -0,0 +1,135 @@ +abc test + + + + + +d + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/md-label/dagre/board.exp.json b/e2etests/testdata/txtar/md-label/dagre/board.exp.json new file mode 100644 index 000000000..424408a9d --- /dev/null +++ b/e2etests/testdata/txtar/md-label/dagre/board.exp.json @@ -0,0 +1,772 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "rectangle", + "type": "rectangle", + "pos": { + "x": 0, + "y": 68 + }, + "width": 116, + "height": 176, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "# hello\n\n- world\n\nblah blah", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 71, + "labelHeight": 131, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "square", + "type": "rectangle", + "pos": { + "x": 176, + "y": 68 + }, + "width": 176, + "height": 176, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "# hello\n\n- world\n\nblah blah", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 71, + "labelHeight": 131, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "page", + "type": "page", + "pos": { + "x": 412, + "y": 58 + }, + "width": 116, + "height": 197, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "AB4", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "# hello\n\n- world\n\nblah blah", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 71, + "labelHeight": 131, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "parallelogram", + "type": "parallelogram", + "pos": { + "x": 588, + "y": 68 + }, + "width": 168, + "height": 176, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "# hello\n\n- world\n\nblah blah", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 71, + "labelHeight": 131, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "document", + "type": "document", + "pos": { + "x": 816, + "y": 44 + }, + "width": 116, + "height": 224, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "AB4", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "# hello\n\n- world\n\nblah blah", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 71, + "labelHeight": 131, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "cylinder", + "type": "cylinder", + "pos": { + "x": 992, + "y": 42 + }, + "width": 116, + "height": 228, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "AA4", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "# hello\n\n- world\n\nblah blah", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 71, + "labelHeight": 131, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "queue", + "type": "queue", + "pos": { + "x": 1168, + "y": 68 + }, + "width": 168, + "height": 176, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "# hello\n\n- world\n\nblah blah", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 71, + "labelHeight": 131, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "package", + "type": "package", + "pos": { + "x": 1396, + "y": 51 + }, + "width": 116, + "height": 210, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "AA4", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "# hello\n\n- world\n\nblah blah", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 71, + "labelHeight": 131, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "step", + "type": "step", + "pos": { + "x": 1572, + "y": 51 + }, + "width": 156, + "height": 211, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "AB4", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "# hello\n\n- world\n\nblah blah", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 71, + "labelHeight": 131, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "callout", + "type": "callout", + "pos": { + "x": 1788, + "y": 56 + }, + "width": 116, + "height": 201, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "# hello\n\n- world\n\nblah blah", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 71, + "labelHeight": 131, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "stored_data", + "type": "stored_data", + "pos": { + "x": 1964, + "y": 68 + }, + "width": 136, + "height": 176, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "AA4", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "# hello\n\n- world\n\nblah blah", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 71, + "labelHeight": 131, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "person", + "type": "person", + "pos": { + "x": 2160, + "y": 68 + }, + "width": 117, + "height": 176, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B3", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "# hello\n\n- world\n\nblah blah", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 71, + "labelHeight": 131, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "diamond", + "type": "diamond", + "pos": { + "x": 2337, + "y": 0 + }, + "width": 172, + "height": 312, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N4", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "# hello\n\n- world\n\nblah blah", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 71, + "labelHeight": 131, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "oval", + "type": "oval", + "pos": { + "x": 2569, + "y": 35 + }, + "width": 136, + "height": 242, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "# hello\n\n- world\n\nblah blah", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 71, + "labelHeight": 131, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "circle", + "type": "oval", + "pos": { + "x": 2765, + "y": 40 + }, + "width": 233, + "height": 233, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "# hello\n\n- world\n\nblah blah", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 71, + "labelHeight": 131, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "hexagon", + "type": "hexagon", + "pos": { + "x": 3058, + "y": 39 + }, + "width": 144, + "height": 234, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "# hello\n\n- world\n\nblah blah", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 71, + "labelHeight": 131, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "cloud", + "type": "cloud", + "pos": { + "x": 3262, + "y": 61 + }, + "width": 212, + "height": 191, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "contentAspectRatio": 0.3741391678622669, + "label": "# hello\n\n- world\n\nblah blah", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 71, + "labelHeight": 131, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/md-label/dagre/sketch.exp.svg b/e2etests/testdata/txtar/md-label/dagre/sketch.exp.svg new file mode 100644 index 000000000..f09d5530a --- /dev/null +++ b/e2etests/testdata/txtar/md-label/dagre/sketch.exp.svg @@ -0,0 +1,935 @@ +

    hello

    +
      +
    • world
      • +
    +

    blah blah

    +

    hello

    +
      +
    • world
      • +
    +

    blah blah

    +

    hello

    +
      +
    • world
      • +
    +

    blah blah

    +

    hello

    +
      +
    • world
      • +
    +

    blah blah

    +

    hello

    +
      +
    • world
      • +
    +

    blah blah

    +

    hello

    +
      +
    • world
      • +
    +

    blah blah

    +

    hello

    +
      +
    • world
      • +
    +

    blah blah

    +

    hello

    +
      +
    • world
      • +
    +

    blah blah

    +

    hello

    +
      +
    • world
      • +
    +

    blah blah

    +

    hello

    +
      +
    • world
      • +
    +

    blah blah

    +

    hello

    +
      +
    • world
      • +
    +

    blah blah

    +

    hello

    +
      +
    • world
      • +
    +

    blah blah

    +

    hello

    +
      +
    • world
      • +
    +

    blah blah

    +

    hello

    +
      +
    • world
      • +
    +

    blah blah

    +

    hello

    +
      +
    • world
      • +
    +

    blah blah

    +

    hello

    +
      +
    • world
      • +
    +

    blah blah

    +

    hello

    +
      +
    • world
      • +
    +

    blah blah

    +
     + + + + + + + + + + + + + + + + + + +     \ No newline at end of file diff --git a/e2etests/testdata/txtar/md-label/elk/board.exp.json b/e2etests/testdata/txtar/md-label/elk/board.exp.json new file mode 100644 index 000000000..221922f89 --- /dev/null +++ b/e2etests/testdata/txtar/md-label/elk/board.exp.json @@ -0,0 +1,772 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "rectangle", + "type": "rectangle", + "pos": { + "x": 12, + "y": 80 + }, + "width": 116, + "height": 176, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "# hello\n\n- world\n\nblah blah", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 71, + "labelHeight": 131, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "square", + "type": "rectangle", + "pos": { + "x": 148, + "y": 80 + }, + "width": 176, + "height": 176, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "# hello\n\n- world\n\nblah blah", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 71, + "labelHeight": 131, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "page", + "type": "page", + "pos": { + "x": 344, + "y": 69 + }, + "width": 116, + "height": 197, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "AB4", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "# hello\n\n- world\n\nblah blah", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 71, + "labelHeight": 131, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "parallelogram", + "type": "parallelogram", + "pos": { + "x": 480, + "y": 80 + }, + "width": 168, + "height": 176, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "# hello\n\n- world\n\nblah blah", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 71, + "labelHeight": 131, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "document", + "type": "document", + "pos": { + "x": 668, + "y": 56 + }, + "width": 116, + "height": 224, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "AB4", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "# hello\n\n- world\n\nblah blah", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 71, + "labelHeight": 131, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "cylinder", + "type": "cylinder", + "pos": { + "x": 804, + "y": 54 + }, + "width": 116, + "height": 228, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "AA4", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "# hello\n\n- world\n\nblah blah", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 71, + "labelHeight": 131, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "queue", + "type": "queue", + "pos": { + "x": 940, + "y": 80 + }, + "width": 168, + "height": 176, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "# hello\n\n- world\n\nblah blah", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 71, + "labelHeight": 131, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "package", + "type": "package", + "pos": { + "x": 1128, + "y": 63 + }, + "width": 116, + "height": 210, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "AA4", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "# hello\n\n- world\n\nblah blah", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 71, + "labelHeight": 131, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "step", + "type": "step", + "pos": { + "x": 1264, + "y": 62 + }, + "width": 156, + "height": 211, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "AB4", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "# hello\n\n- world\n\nblah blah", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 71, + "labelHeight": 131, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "callout", + "type": "callout", + "pos": { + "x": 1440, + "y": 67 + }, + "width": 116, + "height": 201, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "# hello\n\n- world\n\nblah blah", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 71, + "labelHeight": 131, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "stored_data", + "type": "stored_data", + "pos": { + "x": 1576, + "y": 80 + }, + "width": 136, + "height": 176, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "AA4", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "# hello\n\n- world\n\nblah blah", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 71, + "labelHeight": 131, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "person", + "type": "person", + "pos": { + "x": 1732, + "y": 12 + }, + "width": 117, + "height": 176, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B3", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "# hello\n\n- world\n\nblah blah", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 71, + "labelHeight": 131, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "diamond", + "type": "diamond", + "pos": { + "x": 1869, + "y": 12 + }, + "width": 172, + "height": 312, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N4", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "# hello\n\n- world\n\nblah blah", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 71, + "labelHeight": 131, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "oval", + "type": "oval", + "pos": { + "x": 2061, + "y": 47 + }, + "width": 136, + "height": 242, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "# hello\n\n- world\n\nblah blah", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 71, + "labelHeight": 131, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "circle", + "type": "oval", + "pos": { + "x": 2217, + "y": 51 + }, + "width": 233, + "height": 233, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "# hello\n\n- world\n\nblah blah", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 71, + "labelHeight": 131, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "hexagon", + "type": "hexagon", + "pos": { + "x": 2470, + "y": 51 + }, + "width": 144, + "height": 234, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "# hello\n\n- world\n\nblah blah", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 71, + "labelHeight": 131, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "cloud", + "type": "cloud", + "pos": { + "x": 2634, + "y": 72 + }, + "width": 212, + "height": 191, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "contentAspectRatio": 0.3741391678622669, + "label": "# hello\n\n- world\n\nblah blah", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 71, + "labelHeight": 131, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/md-label/elk/sketch.exp.svg b/e2etests/testdata/txtar/md-label/elk/sketch.exp.svg new file mode 100644 index 000000000..ce036793c --- /dev/null +++ b/e2etests/testdata/txtar/md-label/elk/sketch.exp.svg @@ -0,0 +1,935 @@ +

    hello

    +
      +
    • world
      • +
    +

    blah blah

    +

    hello

    +
      +
    • world
      • +
    +

    blah blah

    +

    hello

    +
      +
    • world
      • +
    +

    blah blah

    +

    hello

    +
      +
    • world
      • +
    +

    blah blah

    +

    hello

    +
      +
    • world
      • +
    +

    blah blah

    +

    hello

    +
      +
    • world
      • +
    +

    blah blah

    +

    hello

    +
      +
    • world
      • +
    +

    blah blah

    +

    hello

    +
      +
    • world
      • +
    +

    blah blah

    +

    hello

    +
      +
    • world
      • +
    +

    blah blah

    +

    hello

    +
      +
    • world
      • +
    +

    blah blah

    +

    hello

    +
      +
    • world
      • +
    +

    blah blah

    +

    hello

    +
      +
    • world
      • +
    +

    blah blah

    +

    hello

    +
      +
    • world
      • +
    +

    blah blah

    +

    hello

    +
      +
    • world
      • +
    +

    blah blah

    +

    hello

    +
      +
    • world
      • +
    +

    blah blah

    +

    hello

    +
      +
    • world
      • +
    +

    blah blah

    +

    hello

    +
      +
    • world
      • +
    +

    blah blah

    +
     + + + + + + + + + + + + + + + + + + +     \ No newline at end of file diff --git a/e2etests/testdata/txtar/md-tables/dagre/board.exp.json b/e2etests/testdata/txtar/md-tables/dagre/board.exp.json new file mode 100644 index 000000000..4cfc70ce2 --- /dev/null +++ b/e2etests/testdata/txtar/md-tables/dagre/board.exp.json @@ -0,0 +1,984 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "savings", + "type": "text", + "pos": { + "x": 169, + "y": 50 + }, + "width": 343, + "height": 150, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#e8f4f8", + "stroke": "#4a90e2", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "| Month | Savings | Expenses | Balance |\n| -------- | ------- | -------- | ------- |\n| January | $250 | $150 | $100 |\n| February | $80 | $200 | -$120 |\n| March | $420 | $180 | $240 |", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 343, + "labelHeight": 150, + "zIndex": 0, + "level": 1 + }, + { + "id": "status", + "type": "text", + "pos": { + "x": 270, + "y": 321 + }, + "width": 142, + "height": 113, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#f8e8e8", + "stroke": "#e24a4a", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "| Status | Count |\n| ------ | ----- |\n| Done | 42 |\n| Todo | 17 |", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 142, + "labelHeight": 113, + "zIndex": 0, + "level": 1 + }, + { + "id": "metrics", + "type": "text", + "pos": { + "x": 254, + "y": 655 + }, + "width": 173, + "height": 335, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#f0f8e8", + "stroke": "#82e24a", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "| Metric | Value |\n| --------- | ------- |\n| Uptime | 99.9% |\n| Latency | 150ms |\n| Errors | 0.01% |\n| Requests | 15k/min |\n| CPU | 45% |\n| Memory | 68% |\n| Disk | 72% |\n| Network | 33% |", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 173, + "labelHeight": 335, + "zIndex": 0, + "level": 1 + }, + { + "id": "financial", + "type": "rectangle", + "pos": { + "x": 562, + "y": 20 + }, + "width": 389, + "height": 444, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#e8f4f8", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Financial Overview", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 220, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "financial.monthly", + "type": "text", + "pos": { + "x": 592, + "y": 50 + }, + "width": 329, + "height": 150, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "N1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "| Month | Revenue | Costs | Margin |\n| --------- | -------- | -------- | ------ |\n| January | $25,000 | $18,000 | 28% |\n| February | $28,500 | $19,200 | 33% |\n| March | $31,200 | $21,500 | 31% |", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 329, + "labelHeight": 150, + "zIndex": 0, + "level": 2 + }, + { + "id": "financial.quarterly", + "type": "text", + "pos": { + "x": 599, + "y": 321 + }, + "width": 315, + "height": 113, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "N1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "| Quarter | Target | Actual | Variance |\n|:--------|-------:|:------:|:---------|\n| Q1 2024 | $75K | $84.7K | +12.9% |\n| Q2 2024 | $82K | - | - |", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 315, + "labelHeight": 113, + "zIndex": 0, + "level": 2 + }, + { + "id": "monitoring", + "type": "rectangle", + "pos": { + "x": 548, + "y": 718 + }, + "width": 417, + "height": 573, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#f8e8e8", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": true, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "System Health", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 168, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "monitoring.availability", + "type": "text", + "pos": { + "x": 578, + "y": 748 + }, + "width": 357, + "height": 150, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "N1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "| Service | Status | Uptime | Last Incident |\n|:-----------|:------:|:------:|:--------------|\n| API | ✅ | 99.9% | 15 days ago |\n| Database | ✅ | 99.8% | 3 days ago |\n| Cache | ⚠️ | 98.5% | 1 hour ago |", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 357, + "labelHeight": 150, + "zIndex": 0, + "level": 2 + }, + { + "id": "monitoring.performance", + "type": "text", + "pos": { + "x": 585, + "y": 1111 + }, + "width": 344, + "height": 150, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "N1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "| Metric | P50 | P90 | P99 |\n|:----------------|:-----:|:-----:|:-----:|\n| Response Time | 120ms | 350ms | 750ms |\n| DB Query Time | 45ms | 180ms | 450ms |\n| Cache Latency | 5ms | 12ms | 30ms |", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 344, + "labelHeight": 150, + "zIndex": 0, + "level": 2 + }, + { + "id": "projects", + "type": "rectangle", + "pos": { + "x": 10, + "y": 1452 + }, + "width": 1008, + "height": 210, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#e8f8e8", + "stroke": "#4a90e2", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": true, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Project Tracking", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 190, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "projects.status", + "type": "text", + "pos": { + "x": 40, + "y": 1482 + }, + "width": 425, + "height": 150, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "N1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "| Project | Priority | Progress | Due Date | Owner |\n|---------|:--------:|:--------:|:---------|:------|\n| Alpha | HIGH | ![p](https://progress.com/80) 80% | 2024-04-01 | Alice |\n| Beta | MEDIUM | ![p](https://progress.com/45) 45% | 2024-05-15 | Bob |\n| Gamma | LOW | ![p](https://progress.com/20) 20% | 2024-06-30 | Carol |", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 425, + "labelHeight": 150, + "zIndex": 0, + "level": 2 + }, + { + "id": "projects.risks", + "type": "text", + "pos": { + "x": 525, + "y": 1482 + }, + "width": 463, + "height": 150, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "N1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "| Risk ID | Description | Impact | Mitigation |\n|:-------:|:------------|:------:|:-----------|\n| R1 | Resource shortage | 🔴 High | Hire contractors |\n| R2 | Technical debt | 🟡 Med | Code review |\n| R3 | Scope creep | 🟢 Low | Clear requirements |", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 463, + "labelHeight": 150, + "zIndex": 0, + "level": 2 + }, + { + "id": "team", + "type": "rectangle", + "pos": { + "x": 551, + "y": 1823 + }, + "width": 411, + "height": 247, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#f8f0e8", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Team Analytics", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 177, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "team.velocity", + "type": "text", + "pos": { + "x": 581, + "y": 1853 + }, + "width": 351, + "height": 187, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "N1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "| Sprint | Points | Completed | Carryover |\n|:-------|:------:|:---------:|:---------:|\n| SP-1 | 34 | 30 | 4 |\n| SP-2 | 38 | 35 | 3 |\n| SP-3 | 42 | 40 | 2 |\n| Average| 38 | 35 | 3 |", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 351, + "labelHeight": 187, + "zIndex": 0, + "level": 2 + } + ], + "connections": [ + { + "id": "(savings -> status)[0]", + "src": "savings", + "srcArrow": "none", + "dst": "status", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 5, + "strokeWidth": 2, + "stroke": "B2", + "borderRadius": 10, + "label": "Triggers", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 54, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 340.5, + "y": 199.5 + }, + { + "x": 340.5, + "y": 248.3000030517578 + }, + { + "x": 340.5, + "y": 272.70001220703125 + }, + { + "x": 340.5, + "y": 321.5 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(status -> metrics)[0]", + "src": "status", + "srcArrow": "none", + "dst": "metrics", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "Monitors", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 58, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 340.5, + "y": 434 + }, + { + "x": 340.5, + "y": 474 + }, + { + "x": 340.5, + "y": 496.1000061035156 + }, + { + "x": 340.5, + "y": 514.25 + }, + { + "x": 340.5, + "y": 532.4000244140625 + }, + { + "x": 340.5, + "y": 615 + }, + { + "x": 340.5, + "y": 655 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "financial.(monthly -> quarterly)[0]", + "src": "financial.monthly", + "srcArrow": "none", + "dst": "financial.quarterly", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "Aggregates", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 77, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 756.5, + "y": 199.5 + }, + { + "x": 756.5, + "y": 248.3000030517578 + }, + { + "x": 756.5, + "y": 272.70001220703125 + }, + { + "x": 756.5, + "y": 321.5 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "monitoring.(availability -> performance)[0]", + "src": "monitoring.availability", + "srcArrow": "none", + "dst": "monitoring.performance", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "Affects", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 46, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 756.5, + "y": 898.5 + }, + { + "x": 756.5, + "y": 1020.0999755859375 + }, + { + "x": 756.5, + "y": 1062.699951171875 + }, + { + "x": 756.5, + "y": 1111.5 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(financial -> monitoring)[0]", + "src": "financial", + "srcArrow": "none", + "dst": "monitoring", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "Impacts", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 54, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 756.5, + "y": 463.5 + }, + { + "x": 756.5, + "y": 528.2999877929688 + }, + { + "x": 756.5, + "y": 568.0999755859375 + }, + { + "x": 756.5, + "y": 662.5 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(monitoring -> projects)[0]", + "src": "monitoring", + "srcArrow": "none", + "dst": "projects", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 5, + "strokeWidth": 2, + "stroke": "B2", + "borderRadius": 10, + "label": "Informs", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 51, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 756.5, + "y": 1290.5 + }, + { + "x": 756.5, + "y": 1355.300048828125 + }, + { + "x": 756.5, + "y": 1387.699951171875 + }, + { + "x": 756.5, + "y": 1452.5 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(projects -> team)[0]", + "src": "projects", + "srcArrow": "none", + "dst": "team", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "Assigns", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 50, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 756.5, + "y": 1661.5 + }, + { + "x": 756.5, + "y": 1726.300048828125 + }, + { + "x": 756.5, + "y": 1750.5 + }, + { + "x": 756.5, + "y": 1782.5 + } + ], + "isCurve": true, + "animated": true, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/md-tables/dagre/sketch.exp.svg b/e2etests/testdata/txtar/md-tables/dagre/sketch.exp.svg new file mode 100644 index 000000000..9d6316f63 --- /dev/null +++ b/e2etests/testdata/txtar/md-tables/dagre/sketch.exp.svg @@ -0,0 +1,1173 @@ +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    MonthSavingsExpensesBalance
    January$250$150$100
    February$80$200-$120
    March$420$180$240
    +
    + + + + + + + + + + + + + + + + +
    StatusCount
    Done42
    Todo17
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    MetricValue
    Uptime99.9%
    Latency150ms
    Errors0.01%
    Requests15k/min
    CPU45%
    Memory68%
    Disk72%
    Network33%
    +
    Financial Overview + +System HealthProject TrackingTeam Analytics
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    MonthRevenueCostsMargin
    January$25,000$18,00028%
    February$28,500$19,20033%
    March$31,200$21,50031%
    +
    + + + + + + + + + + + + + + + + + + + + + + +
    QuarterTargetActualVariance
    Q1 2024$75K$84.7K+12.9%
    Q2 2024$82K--
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    ServiceStatusUptimeLast Incident
    API✅99.9%15 days ago
    Database✅99.8%3 days ago
    Cache⚠️98.5%1 hour ago
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    MetricP50P90P99
    Response Time120ms350ms750ms
    DB Query Time45ms180ms450ms
    Cache Latency5ms12ms30ms
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    ProjectPriorityProgressDue DateOwner
    AlphaHIGHp 80%2024-04-01Alice
    BetaMEDIUMp 45%2024-05-15Bob
    GammaLOWp 20%2024-06-30Carol
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Risk IDDescriptionImpactMitigation
    R1Resource shortage🔴 HighHire contractors
    R2Technical debt🟡 MedCode review
    R3Scope creep🟢 LowClear requirements
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SprintPointsCompletedCarryover
    SP-134304
    SP-238353
    SP-342402
    Average38353
    +
     Triggers MonitorsAggregatesAffectsImpactsInformsAssigns + + + + + + + + + + + + + + + + + + + + + + +     \ No newline at end of file diff --git a/e2etests/testdata/txtar/md-tables/elk/board.exp.json b/e2etests/testdata/txtar/md-tables/elk/board.exp.json new file mode 100644 index 000000000..04990fa5e --- /dev/null +++ b/e2etests/testdata/txtar/md-tables/elk/board.exp.json @@ -0,0 +1,909 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "savings", + "type": "text", + "pos": { + "x": 12, + "y": 386 + }, + "width": 343, + "height": 150, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#e8f4f8", + "stroke": "#4a90e2", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "| Month | Savings | Expenses | Balance |\n| -------- | ------- | -------- | ------- |\n| January | $250 | $150 | $100 |\n| February | $80 | $200 | -$120 |\n| March | $420 | $180 | $240 |", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 343, + "labelHeight": 150, + "zIndex": 0, + "level": 1 + }, + { + "id": "status", + "type": "text", + "pos": { + "x": 112, + "y": 921 + }, + "width": 142, + "height": 113, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#f8e8e8", + "stroke": "#e24a4a", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "| Status | Count |\n| ------ | ----- |\n| Done | 42 |\n| Todo | 17 |", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 142, + "labelHeight": 113, + "zIndex": 0, + "level": 1 + }, + { + "id": "metrics", + "type": "text", + "pos": { + "x": 97, + "y": 1419 + }, + "width": 173, + "height": 335, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#f0f8e8", + "stroke": "#82e24a", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "| Metric | Value |\n| --------- | ------- |\n| Uptime | 99.9% |\n| Latency | 150ms |\n| Errors | 0.01% |\n| Requests | 15k/min |\n| CPU | 45% |\n| Memory | 68% |\n| Disk | 72% |\n| Network | 33% |", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 173, + "labelHeight": 335, + "zIndex": 0, + "level": 1 + }, + { + "id": "financial", + "type": "rectangle", + "pos": { + "x": 579, + "y": 12 + }, + "width": 429, + "height": 524, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#e8f4f8", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Financial Overview", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 220, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "financial.monthly", + "type": "text", + "pos": { + "x": 629, + "y": 62 + }, + "width": 329, + "height": 150, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "N1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "| Month | Revenue | Costs | Margin |\n| --------- | -------- | -------- | ------ |\n| January | $25,000 | $18,000 | 28% |\n| February | $28,500 | $19,200 | 33% |\n| March | $31,200 | $21,500 | 31% |", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 329, + "labelHeight": 150, + "zIndex": 0, + "level": 2 + }, + { + "id": "financial.quarterly", + "type": "text", + "pos": { + "x": 636, + "y": 373 + }, + "width": 315, + "height": 113, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "N1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "| Quarter | Target | Actual | Variance |\n|:--------|-------:|:------:|:---------|\n| Q1 2024 | $75K | $84.7K | +12.9% |\n| Q2 2024 | $82K | - | - |", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 315, + "labelHeight": 113, + "zIndex": 0, + "level": 2 + }, + { + "id": "monitoring", + "type": "rectangle", + "pos": { + "x": 565, + "y": 712 + }, + "width": 442, + "height": 546, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#f8e8e8", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": true, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "System Health", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 168, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "monitoring.availability", + "type": "text", + "pos": { + "x": 608, + "y": 754 + }, + "width": 357, + "height": 150, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "N1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "| Service | Status | Uptime | Last Incident |\n|:-----------|:------:|:------:|:--------------|\n| API | ✅ | 99.9% | 15 days ago |\n| Database | ✅ | 99.8% | 3 days ago |\n| Cache | ⚠️ | 98.5% | 1 hour ago |", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 357, + "labelHeight": 150, + "zIndex": 0, + "level": 2 + }, + { + "id": "monitoring.performance", + "type": "text", + "pos": { + "x": 614, + "y": 1065 + }, + "width": 344, + "height": 150, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "N1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "| Metric | P50 | P90 | P99 |\n|:----------------|:-----:|:-----:|:-----:|\n| Response Time | 120ms | 350ms | 750ms |\n| DB Query Time | 45ms | 180ms | 450ms |\n| Cache Latency | 5ms | 12ms | 30ms |", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 344, + "labelHeight": 150, + "zIndex": 0, + "level": 2 + }, + { + "id": "projects", + "type": "rectangle", + "pos": { + "x": 290, + "y": 1461 + }, + "width": 1008, + "height": 250, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#e8f8e8", + "stroke": "#4a90e2", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": true, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Project Tracking", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 190, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "projects.status", + "type": "text", + "pos": { + "x": 340, + "y": 1511 + }, + "width": 425, + "height": 150, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "N1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "| Project | Priority | Progress | Due Date | Owner |\n|---------|:--------:|:--------:|:---------|:------|\n| Alpha | HIGH | ![p](https://progress.com/80) 80% | 2024-04-01 | Alice |\n| Beta | MEDIUM | ![p](https://progress.com/45) 45% | 2024-05-15 | Bob |\n| Gamma | LOW | ![p](https://progress.com/20) 20% | 2024-06-30 | Carol |", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 425, + "labelHeight": 150, + "zIndex": 0, + "level": 2 + }, + { + "id": "projects.risks", + "type": "text", + "pos": { + "x": 785, + "y": 1511 + }, + "width": 463, + "height": 150, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "N1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "| Risk ID | Description | Impact | Mitigation |\n|:-------:|:------------|:------:|:-----------|\n| R1 | Resource shortage | 🔴 High | Hire contractors |\n| R2 | Technical debt | 🟡 Med | Code review |\n| R3 | Scope creep | 🟢 Low | Clear requirements |", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 463, + "labelHeight": 150, + "zIndex": 0, + "level": 2 + }, + { + "id": "team", + "type": "rectangle", + "pos": { + "x": 568, + "y": 1915 + }, + "width": 451, + "height": 287, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#f8f0e8", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Team Analytics", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 177, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "team.velocity", + "type": "text", + "pos": { + "x": 618, + "y": 1965 + }, + "width": 351, + "height": 187, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "N1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "| Sprint | Points | Completed | Carryover |\n|:-------|:------:|:---------:|:---------:|\n| SP-1 | 34 | 30 | 4 |\n| SP-2 | 38 | 35 | 3 |\n| SP-3 | 42 | 40 | 2 |\n| Average| 38 | 35 | 3 |", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 351, + "labelHeight": 187, + "zIndex": 0, + "level": 2 + } + ], + "connections": [ + { + "id": "(savings -> status)[0]", + "src": "savings", + "srcArrow": "none", + "dst": "status", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 5, + "strokeWidth": 2, + "stroke": "B2", + "borderRadius": 10, + "label": "Triggers", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 54, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 183.5, + "y": 536 + }, + { + "x": 183.5, + "y": 921 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(status -> metrics)[0]", + "src": "status", + "srcArrow": "none", + "dst": "metrics", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "Monitors", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 58, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 183.5, + "y": 1034 + }, + { + "x": 183.5, + "y": 1419 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "financial.(monthly -> quarterly)[0]", + "src": "financial.monthly", + "srcArrow": "none", + "dst": "financial.quarterly", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "Aggregates", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 77, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 794, + "y": 212 + }, + { + "x": 794, + "y": 373 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "monitoring.(availability -> performance)[0]", + "src": "monitoring.availability", + "srcArrow": "none", + "dst": "monitoring.performance", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "Affects", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 46, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 786.5, + "y": 904.5 + }, + { + "x": 786.5, + "y": 1065.5 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(financial -> monitoring)[0]", + "src": "financial", + "srcArrow": "none", + "dst": "monitoring", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "Impacts", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 54, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 794, + "y": 536 + }, + { + "x": 794, + "y": 697 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(monitoring -> projects)[0]", + "src": "monitoring", + "srcArrow": "none", + "dst": "projects", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 5, + "strokeWidth": 2, + "stroke": "B2", + "borderRadius": 10, + "label": "Informs", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 51, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 794, + "y": 1257.5 + }, + { + "x": 794, + "y": 1461.5 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(projects -> team)[0]", + "src": "projects", + "srcArrow": "none", + "dst": "team", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "Assigns", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 50, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 794, + "y": 1711 + }, + { + "x": 794, + "y": 1915 + } + ], + "animated": true, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/md-tables/elk/sketch.exp.svg b/e2etests/testdata/txtar/md-tables/elk/sketch.exp.svg new file mode 100644 index 000000000..3ea531545 --- /dev/null +++ b/e2etests/testdata/txtar/md-tables/elk/sketch.exp.svg @@ -0,0 +1,1173 @@ +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    MonthSavingsExpensesBalance
    January$250$150$100
    February$80$200-$120
    March$420$180$240
    +
    + + + + + + + + + + + + + + + + +
    StatusCount
    Done42
    Todo17
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    MetricValue
    Uptime99.9%
    Latency150ms
    Errors0.01%
    Requests15k/min
    CPU45%
    Memory68%
    Disk72%
    Network33%
    +
    Financial Overview + +System HealthProject TrackingTeam Analytics
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    MonthRevenueCostsMargin
    January$25,000$18,00028%
    February$28,500$19,20033%
    March$31,200$21,50031%
    +
    + + + + + + + + + + + + + + + + + + + + + + +
    QuarterTargetActualVariance
    Q1 2024$75K$84.7K+12.9%
    Q2 2024$82K--
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    ServiceStatusUptimeLast Incident
    API✅99.9%15 days ago
    Database✅99.8%3 days ago
    Cache⚠️98.5%1 hour ago
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    MetricP50P90P99
    Response Time120ms350ms750ms
    DB Query Time45ms180ms450ms
    Cache Latency5ms12ms30ms
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    ProjectPriorityProgressDue DateOwner
    AlphaHIGHp 80%2024-04-01Alice
    BetaMEDIUMp 45%2024-05-15Bob
    GammaLOWp 20%2024-06-30Carol
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Risk IDDescriptionImpactMitigation
    R1Resource shortage🔴 HighHire contractors
    R2Technical debt🟡 MedCode review
    R3Scope creep🟢 LowClear requirements
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    SprintPointsCompletedCarryover
    SP-134304
    SP-238353
    SP-342402
    Average38353
    +
     Triggers MonitorsAggregatesAffectsImpactsInformsAssigns + + + + + + + + + + + + + + + + + + + + + + +     \ No newline at end of file diff --git a/e2etests/testdata/txtar/model-view/dagre/board.exp.json b/e2etests/testdata/txtar/model-view/dagre/board.exp.json new file mode 100644 index 000000000..901a987f6 --- /dev/null +++ b/e2etests/testdata/txtar/model-view/dagre/board.exp.json @@ -0,0 +1,322 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "user", + "type": "rectangle", + "pos": { + "x": 0, + "y": 50 + }, + "width": 77, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "blue", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "user", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 32, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "softwareSystem", + "type": "rectangle", + "pos": { + "x": 127, + "y": 20 + }, + "width": 331, + "height": 126, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "softwareSystem", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 188, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "softwareSystem.serviceA", + "type": "rectangle", + "classes": [ + "ok" + ], + "pos": { + "x": 157, + "y": 50 + }, + "width": 106, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "serviceA", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 61, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "softwareSystem.serviceC", + "type": "rectangle", + "classes": [ + "ok" + ], + "pos": { + "x": 323, + "y": 50 + }, + "width": 105, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "serviceC", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 60, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "externalSystem", + "type": "rectangle", + "pos": { + "x": 297, + "y": 266 + }, + "width": 157, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "externalSystem", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 112, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [ + { + "id": "(softwareSystem -> externalSystem)[0]", + "src": "softwareSystem", + "srcArrow": "none", + "dst": "externalSystem", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 375.5, + "y": 146 + }, + { + "x": 375.5, + "y": 202 + }, + { + "x": 375.5, + "y": 226 + }, + { + "x": 375.5, + "y": 266 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/model-view/dagre/sketch.exp.svg b/e2etests/testdata/txtar/model-view/dagre/sketch.exp.svg new file mode 100644 index 000000000..066380028 --- /dev/null +++ b/e2etests/testdata/txtar/model-view/dagre/sketch.exp.svg @@ -0,0 +1,106 @@ +usersoftwareSystemexternalSystemserviceAserviceC + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/model-view/elk/board.exp.json b/e2etests/testdata/txtar/model-view/elk/board.exp.json new file mode 100644 index 000000000..7a2d1c3a2 --- /dev/null +++ b/e2etests/testdata/txtar/model-view/elk/board.exp.json @@ -0,0 +1,313 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "user", + "type": "rectangle", + "pos": { + "x": 12, + "y": 62 + }, + "width": 77, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "blue", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "user", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 32, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "softwareSystem", + "type": "rectangle", + "pos": { + "x": 109, + "y": 12 + }, + "width": 331, + "height": 166, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "softwareSystem", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 188, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "softwareSystem.serviceA", + "type": "rectangle", + "classes": [ + "ok" + ], + "pos": { + "x": 159, + "y": 62 + }, + "width": 106, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "serviceA", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 61, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "softwareSystem.serviceC", + "type": "rectangle", + "classes": [ + "ok" + ], + "pos": { + "x": 285, + "y": 62 + }, + "width": 105, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "serviceC", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 60, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "externalSystem", + "type": "rectangle", + "pos": { + "x": 196, + "y": 248 + }, + "width": 157, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "externalSystem", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 112, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [ + { + "id": "(softwareSystem -> externalSystem)[0]", + "src": "softwareSystem", + "srcArrow": "none", + "dst": "externalSystem", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 274.5, + "y": 178 + }, + { + "x": 274.5, + "y": 248 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/model-view/elk/sketch.exp.svg b/e2etests/testdata/txtar/model-view/elk/sketch.exp.svg new file mode 100644 index 000000000..53637e4f7 --- /dev/null +++ b/e2etests/testdata/txtar/model-view/elk/sketch.exp.svg @@ -0,0 +1,106 @@ +usersoftwareSystemexternalSystemserviceAserviceC + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/multiline-class-headers/dagre/board.exp.json b/e2etests/testdata/txtar/multiline-class-headers/dagre/board.exp.json index 7d93c2f35..c72dfa801 100644 --- a/e2etests/testdata/txtar/multiline-class-headers/dagre/board.exp.json +++ b/e2etests/testdata/txtar/multiline-class-headers/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -82,6 +91,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -146,6 +156,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -212,6 +223,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/txtar/multiline-class-headers/dagre/sketch.exp.svg b/e2etests/testdata/txtar/multiline-class-headers/dagre/sketch.exp.svg index c8c4fbdeb..8f73d723c 100644 --- a/e2etests/testdata/txtar/multiline-class-headers/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/multiline-class-headers/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -<<enumeration>>Alignment+LeftAligned+CenterAligned+RightAligned+JustifiedAlignment+LeftAligned+CenterAligned+RightAligned+JustifiedAlignmentOfAlignmentOf+LeftAligned+CenterAligned+RightAligned+Justified + .d2-4137933028 .fill-N1{fill:#0A0F25;} + .d2-4137933028 .fill-N2{fill:#676C7E;} + .d2-4137933028 .fill-N3{fill:#9499AB;} + .d2-4137933028 .fill-N4{fill:#CFD2DD;} + .d2-4137933028 .fill-N5{fill:#DEE1EB;} + .d2-4137933028 .fill-N6{fill:#EEF1F8;} + .d2-4137933028 .fill-N7{fill:#FFFFFF;} + .d2-4137933028 .fill-B1{fill:#0D32B2;} + .d2-4137933028 .fill-B2{fill:#0D32B2;} + .d2-4137933028 .fill-B3{fill:#E3E9FD;} + .d2-4137933028 .fill-B4{fill:#E3E9FD;} + .d2-4137933028 .fill-B5{fill:#EDF0FD;} + .d2-4137933028 .fill-B6{fill:#F7F8FE;} + .d2-4137933028 .fill-AA2{fill:#4A6FF3;} + .d2-4137933028 .fill-AA4{fill:#EDF0FD;} + .d2-4137933028 .fill-AA5{fill:#F7F8FE;} + .d2-4137933028 .fill-AB4{fill:#EDF0FD;} + .d2-4137933028 .fill-AB5{fill:#F7F8FE;} + .d2-4137933028 .stroke-N1{stroke:#0A0F25;} + .d2-4137933028 .stroke-N2{stroke:#676C7E;} + .d2-4137933028 .stroke-N3{stroke:#9499AB;} + .d2-4137933028 .stroke-N4{stroke:#CFD2DD;} + .d2-4137933028 .stroke-N5{stroke:#DEE1EB;} + .d2-4137933028 .stroke-N6{stroke:#EEF1F8;} + .d2-4137933028 .stroke-N7{stroke:#FFFFFF;} + .d2-4137933028 .stroke-B1{stroke:#0D32B2;} + .d2-4137933028 .stroke-B2{stroke:#0D32B2;} + .d2-4137933028 .stroke-B3{stroke:#E3E9FD;} + .d2-4137933028 .stroke-B4{stroke:#E3E9FD;} + .d2-4137933028 .stroke-B5{stroke:#EDF0FD;} + .d2-4137933028 .stroke-B6{stroke:#F7F8FE;} + .d2-4137933028 .stroke-AA2{stroke:#4A6FF3;} + .d2-4137933028 .stroke-AA4{stroke:#EDF0FD;} + .d2-4137933028 .stroke-AA5{stroke:#F7F8FE;} + .d2-4137933028 .stroke-AB4{stroke:#EDF0FD;} + .d2-4137933028 .stroke-AB5{stroke:#F7F8FE;} + .d2-4137933028 .background-color-N1{background-color:#0A0F25;} + .d2-4137933028 .background-color-N2{background-color:#676C7E;} + .d2-4137933028 .background-color-N3{background-color:#9499AB;} + .d2-4137933028 .background-color-N4{background-color:#CFD2DD;} + .d2-4137933028 .background-color-N5{background-color:#DEE1EB;} + .d2-4137933028 .background-color-N6{background-color:#EEF1F8;} + .d2-4137933028 .background-color-N7{background-color:#FFFFFF;} + .d2-4137933028 .background-color-B1{background-color:#0D32B2;} + .d2-4137933028 .background-color-B2{background-color:#0D32B2;} + .d2-4137933028 .background-color-B3{background-color:#E3E9FD;} + .d2-4137933028 .background-color-B4{background-color:#E3E9FD;} + .d2-4137933028 .background-color-B5{background-color:#EDF0FD;} + .d2-4137933028 .background-color-B6{background-color:#F7F8FE;} + .d2-4137933028 .background-color-AA2{background-color:#4A6FF3;} + .d2-4137933028 .background-color-AA4{background-color:#EDF0FD;} + .d2-4137933028 .background-color-AA5{background-color:#F7F8FE;} + .d2-4137933028 .background-color-AB4{background-color:#EDF0FD;} + .d2-4137933028 .background-color-AB5{background-color:#F7F8FE;} + .d2-4137933028 .color-N1{color:#0A0F25;} + .d2-4137933028 .color-N2{color:#676C7E;} + .d2-4137933028 .color-N3{color:#9499AB;} + .d2-4137933028 .color-N4{color:#CFD2DD;} + .d2-4137933028 .color-N5{color:#DEE1EB;} + .d2-4137933028 .color-N6{color:#EEF1F8;} + .d2-4137933028 .color-N7{color:#FFFFFF;} + .d2-4137933028 .color-B1{color:#0D32B2;} + .d2-4137933028 .color-B2{color:#0D32B2;} + .d2-4137933028 .color-B3{color:#E3E9FD;} + .d2-4137933028 .color-B4{color:#E3E9FD;} + .d2-4137933028 .color-B5{color:#EDF0FD;} + .d2-4137933028 .color-B6{color:#F7F8FE;} + .d2-4137933028 .color-AA2{color:#4A6FF3;} + .d2-4137933028 .color-AA4{color:#EDF0FD;} + .d2-4137933028 .color-AA5{color:#F7F8FE;} + .d2-4137933028 .color-AB4{color:#EDF0FD;} + .d2-4137933028 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4137933028);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4137933028);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4137933028);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4137933028);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4137933028);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4137933028);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4137933028);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4137933028);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4137933028);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4137933028);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4137933028);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4137933028);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4137933028);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4137933028);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4137933028);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4137933028);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4137933028);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4137933028);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]><<enumeration>>Alignment+LeftAligned+CenterAligned+RightAligned+JustifiedAlignment+LeftAligned+CenterAligned+RightAligned+JustifiedAlignmentOfAlignmentOf+LeftAligned+CenterAligned+RightAligned+Justified \ No newline at end of file diff --git a/e2etests/testdata/txtar/multiline-class-headers/elk/board.exp.json b/e2etests/testdata/txtar/multiline-class-headers/elk/board.exp.json index 48f7f6976..f0a4c88cd 100644 --- a/e2etests/testdata/txtar/multiline-class-headers/elk/board.exp.json +++ b/e2etests/testdata/txtar/multiline-class-headers/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -82,6 +91,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -146,6 +156,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -212,6 +223,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/txtar/multiline-class-headers/elk/sketch.exp.svg b/e2etests/testdata/txtar/multiline-class-headers/elk/sketch.exp.svg index d8ab1fdf4..447155106 100644 --- a/e2etests/testdata/txtar/multiline-class-headers/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/multiline-class-headers/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -<<enumeration>>Alignment+LeftAligned+CenterAligned+RightAligned+JustifiedAlignment+LeftAligned+CenterAligned+RightAligned+JustifiedAlignmentOfAlignmentOf+LeftAligned+CenterAligned+RightAligned+Justified + .d2-4231965157 .fill-N1{fill:#0A0F25;} + .d2-4231965157 .fill-N2{fill:#676C7E;} + .d2-4231965157 .fill-N3{fill:#9499AB;} + .d2-4231965157 .fill-N4{fill:#CFD2DD;} + .d2-4231965157 .fill-N5{fill:#DEE1EB;} + .d2-4231965157 .fill-N6{fill:#EEF1F8;} + .d2-4231965157 .fill-N7{fill:#FFFFFF;} + .d2-4231965157 .fill-B1{fill:#0D32B2;} + .d2-4231965157 .fill-B2{fill:#0D32B2;} + .d2-4231965157 .fill-B3{fill:#E3E9FD;} + .d2-4231965157 .fill-B4{fill:#E3E9FD;} + .d2-4231965157 .fill-B5{fill:#EDF0FD;} + .d2-4231965157 .fill-B6{fill:#F7F8FE;} + .d2-4231965157 .fill-AA2{fill:#4A6FF3;} + .d2-4231965157 .fill-AA4{fill:#EDF0FD;} + .d2-4231965157 .fill-AA5{fill:#F7F8FE;} + .d2-4231965157 .fill-AB4{fill:#EDF0FD;} + .d2-4231965157 .fill-AB5{fill:#F7F8FE;} + .d2-4231965157 .stroke-N1{stroke:#0A0F25;} + .d2-4231965157 .stroke-N2{stroke:#676C7E;} + .d2-4231965157 .stroke-N3{stroke:#9499AB;} + .d2-4231965157 .stroke-N4{stroke:#CFD2DD;} + .d2-4231965157 .stroke-N5{stroke:#DEE1EB;} + .d2-4231965157 .stroke-N6{stroke:#EEF1F8;} + .d2-4231965157 .stroke-N7{stroke:#FFFFFF;} + .d2-4231965157 .stroke-B1{stroke:#0D32B2;} + .d2-4231965157 .stroke-B2{stroke:#0D32B2;} + .d2-4231965157 .stroke-B3{stroke:#E3E9FD;} + .d2-4231965157 .stroke-B4{stroke:#E3E9FD;} + .d2-4231965157 .stroke-B5{stroke:#EDF0FD;} + .d2-4231965157 .stroke-B6{stroke:#F7F8FE;} + .d2-4231965157 .stroke-AA2{stroke:#4A6FF3;} + .d2-4231965157 .stroke-AA4{stroke:#EDF0FD;} + .d2-4231965157 .stroke-AA5{stroke:#F7F8FE;} + .d2-4231965157 .stroke-AB4{stroke:#EDF0FD;} + .d2-4231965157 .stroke-AB5{stroke:#F7F8FE;} + .d2-4231965157 .background-color-N1{background-color:#0A0F25;} + .d2-4231965157 .background-color-N2{background-color:#676C7E;} + .d2-4231965157 .background-color-N3{background-color:#9499AB;} + .d2-4231965157 .background-color-N4{background-color:#CFD2DD;} + .d2-4231965157 .background-color-N5{background-color:#DEE1EB;} + .d2-4231965157 .background-color-N6{background-color:#EEF1F8;} + .d2-4231965157 .background-color-N7{background-color:#FFFFFF;} + .d2-4231965157 .background-color-B1{background-color:#0D32B2;} + .d2-4231965157 .background-color-B2{background-color:#0D32B2;} + .d2-4231965157 .background-color-B3{background-color:#E3E9FD;} + .d2-4231965157 .background-color-B4{background-color:#E3E9FD;} + .d2-4231965157 .background-color-B5{background-color:#EDF0FD;} + .d2-4231965157 .background-color-B6{background-color:#F7F8FE;} + .d2-4231965157 .background-color-AA2{background-color:#4A6FF3;} + .d2-4231965157 .background-color-AA4{background-color:#EDF0FD;} + .d2-4231965157 .background-color-AA5{background-color:#F7F8FE;} + .d2-4231965157 .background-color-AB4{background-color:#EDF0FD;} + .d2-4231965157 .background-color-AB5{background-color:#F7F8FE;} + .d2-4231965157 .color-N1{color:#0A0F25;} + .d2-4231965157 .color-N2{color:#676C7E;} + .d2-4231965157 .color-N3{color:#9499AB;} + .d2-4231965157 .color-N4{color:#CFD2DD;} + .d2-4231965157 .color-N5{color:#DEE1EB;} + .d2-4231965157 .color-N6{color:#EEF1F8;} + .d2-4231965157 .color-N7{color:#FFFFFF;} + .d2-4231965157 .color-B1{color:#0D32B2;} + .d2-4231965157 .color-B2{color:#0D32B2;} + .d2-4231965157 .color-B3{color:#E3E9FD;} + .d2-4231965157 .color-B4{color:#E3E9FD;} + .d2-4231965157 .color-B5{color:#EDF0FD;} + .d2-4231965157 .color-B6{color:#F7F8FE;} + .d2-4231965157 .color-AA2{color:#4A6FF3;} + .d2-4231965157 .color-AA4{color:#EDF0FD;} + .d2-4231965157 .color-AA5{color:#F7F8FE;} + .d2-4231965157 .color-AB4{color:#EDF0FD;} + .d2-4231965157 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4231965157);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4231965157);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4231965157);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4231965157);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4231965157);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4231965157);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4231965157);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4231965157);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4231965157);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4231965157);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4231965157);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4231965157);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4231965157);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4231965157);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4231965157);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4231965157);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4231965157);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4231965157);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]><<enumeration>>Alignment+LeftAligned+CenterAligned+RightAligned+JustifiedAlignment+LeftAligned+CenterAligned+RightAligned+JustifiedAlignmentOfAlignmentOf+LeftAligned+CenterAligned+RightAligned+Justified \ No newline at end of file diff --git a/e2etests/testdata/txtar/nested-spread-substitutions-regression/dagre/board.exp.json b/e2etests/testdata/txtar/nested-spread-substitutions-regression/dagre/board.exp.json index 648e0b3f2..cdfbf38ca 100644 --- a/e2etests/testdata/txtar/nested-spread-substitutions-regression/dagre/board.exp.json +++ b/e2etests/testdata/txtar/nested-spread-substitutions-regression/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -151,6 +162,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 89, @@ -191,6 +203,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/txtar/nested-spread-substitutions-regression/dagre/sketch.exp.svg b/e2etests/testdata/txtar/nested-spread-substitutions-regression/dagre/sketch.exp.svg index 0c5df9f73..135c6b596 100644 --- a/e2etests/testdata/txtar/nested-spread-substitutions-regression/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/nested-spread-substitutions-regression/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -Homedog1dog3 + .d2-4067094347 .fill-N1{fill:#0A0F25;} + .d2-4067094347 .fill-N2{fill:#676C7E;} + .d2-4067094347 .fill-N3{fill:#9499AB;} + .d2-4067094347 .fill-N4{fill:#CFD2DD;} + .d2-4067094347 .fill-N5{fill:#DEE1EB;} + .d2-4067094347 .fill-N6{fill:#EEF1F8;} + .d2-4067094347 .fill-N7{fill:#FFFFFF;} + .d2-4067094347 .fill-B1{fill:#0D32B2;} + .d2-4067094347 .fill-B2{fill:#0D32B2;} + .d2-4067094347 .fill-B3{fill:#E3E9FD;} + .d2-4067094347 .fill-B4{fill:#E3E9FD;} + .d2-4067094347 .fill-B5{fill:#EDF0FD;} + .d2-4067094347 .fill-B6{fill:#F7F8FE;} + .d2-4067094347 .fill-AA2{fill:#4A6FF3;} + .d2-4067094347 .fill-AA4{fill:#EDF0FD;} + .d2-4067094347 .fill-AA5{fill:#F7F8FE;} + .d2-4067094347 .fill-AB4{fill:#EDF0FD;} + .d2-4067094347 .fill-AB5{fill:#F7F8FE;} + .d2-4067094347 .stroke-N1{stroke:#0A0F25;} + .d2-4067094347 .stroke-N2{stroke:#676C7E;} + .d2-4067094347 .stroke-N3{stroke:#9499AB;} + .d2-4067094347 .stroke-N4{stroke:#CFD2DD;} + .d2-4067094347 .stroke-N5{stroke:#DEE1EB;} + .d2-4067094347 .stroke-N6{stroke:#EEF1F8;} + .d2-4067094347 .stroke-N7{stroke:#FFFFFF;} + .d2-4067094347 .stroke-B1{stroke:#0D32B2;} + .d2-4067094347 .stroke-B2{stroke:#0D32B2;} + .d2-4067094347 .stroke-B3{stroke:#E3E9FD;} + .d2-4067094347 .stroke-B4{stroke:#E3E9FD;} + .d2-4067094347 .stroke-B5{stroke:#EDF0FD;} + .d2-4067094347 .stroke-B6{stroke:#F7F8FE;} + .d2-4067094347 .stroke-AA2{stroke:#4A6FF3;} + .d2-4067094347 .stroke-AA4{stroke:#EDF0FD;} + .d2-4067094347 .stroke-AA5{stroke:#F7F8FE;} + .d2-4067094347 .stroke-AB4{stroke:#EDF0FD;} + .d2-4067094347 .stroke-AB5{stroke:#F7F8FE;} + .d2-4067094347 .background-color-N1{background-color:#0A0F25;} + .d2-4067094347 .background-color-N2{background-color:#676C7E;} + .d2-4067094347 .background-color-N3{background-color:#9499AB;} + .d2-4067094347 .background-color-N4{background-color:#CFD2DD;} + .d2-4067094347 .background-color-N5{background-color:#DEE1EB;} + .d2-4067094347 .background-color-N6{background-color:#EEF1F8;} + .d2-4067094347 .background-color-N7{background-color:#FFFFFF;} + .d2-4067094347 .background-color-B1{background-color:#0D32B2;} + .d2-4067094347 .background-color-B2{background-color:#0D32B2;} + .d2-4067094347 .background-color-B3{background-color:#E3E9FD;} + .d2-4067094347 .background-color-B4{background-color:#E3E9FD;} + .d2-4067094347 .background-color-B5{background-color:#EDF0FD;} + .d2-4067094347 .background-color-B6{background-color:#F7F8FE;} + .d2-4067094347 .background-color-AA2{background-color:#4A6FF3;} + .d2-4067094347 .background-color-AA4{background-color:#EDF0FD;} + .d2-4067094347 .background-color-AA5{background-color:#F7F8FE;} + .d2-4067094347 .background-color-AB4{background-color:#EDF0FD;} + .d2-4067094347 .background-color-AB5{background-color:#F7F8FE;} + .d2-4067094347 .color-N1{color:#0A0F25;} + .d2-4067094347 .color-N2{color:#676C7E;} + .d2-4067094347 .color-N3{color:#9499AB;} + .d2-4067094347 .color-N4{color:#CFD2DD;} + .d2-4067094347 .color-N5{color:#DEE1EB;} + .d2-4067094347 .color-N6{color:#EEF1F8;} + .d2-4067094347 .color-N7{color:#FFFFFF;} + .d2-4067094347 .color-B1{color:#0D32B2;} + .d2-4067094347 .color-B2{color:#0D32B2;} + .d2-4067094347 .color-B3{color:#E3E9FD;} + .d2-4067094347 .color-B4{color:#E3E9FD;} + .d2-4067094347 .color-B5{color:#EDF0FD;} + .d2-4067094347 .color-B6{color:#F7F8FE;} + .d2-4067094347 .color-AA2{color:#4A6FF3;} + .d2-4067094347 .color-AA4{color:#EDF0FD;} + .d2-4067094347 .color-AA5{color:#F7F8FE;} + .d2-4067094347 .color-AB4{color:#EDF0FD;} + .d2-4067094347 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4067094347);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4067094347);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4067094347);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4067094347);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4067094347);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4067094347);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4067094347);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4067094347);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4067094347);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4067094347);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4067094347);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4067094347);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4067094347);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4067094347);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4067094347);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4067094347);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4067094347);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4067094347);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>Homedog1dog3 - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/nested-spread-substitutions-regression/elk/board.exp.json b/e2etests/testdata/txtar/nested-spread-substitutions-regression/elk/board.exp.json index 6505afcec..bc9764737 100644 --- a/e2etests/testdata/txtar/nested-spread-substitutions-regression/elk/board.exp.json +++ b/e2etests/testdata/txtar/nested-spread-substitutions-regression/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -151,6 +162,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 111, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/txtar/nested-spread-substitutions-regression/elk/sketch.exp.svg b/e2etests/testdata/txtar/nested-spread-substitutions-regression/elk/sketch.exp.svg index dddbe0368..b8992f234 100644 --- a/e2etests/testdata/txtar/nested-spread-substitutions-regression/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/nested-spread-substitutions-regression/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -Homedog1dog3 + .d2-1930935715 .fill-N1{fill:#0A0F25;} + .d2-1930935715 .fill-N2{fill:#676C7E;} + .d2-1930935715 .fill-N3{fill:#9499AB;} + .d2-1930935715 .fill-N4{fill:#CFD2DD;} + .d2-1930935715 .fill-N5{fill:#DEE1EB;} + .d2-1930935715 .fill-N6{fill:#EEF1F8;} + .d2-1930935715 .fill-N7{fill:#FFFFFF;} + .d2-1930935715 .fill-B1{fill:#0D32B2;} + .d2-1930935715 .fill-B2{fill:#0D32B2;} + .d2-1930935715 .fill-B3{fill:#E3E9FD;} + .d2-1930935715 .fill-B4{fill:#E3E9FD;} + .d2-1930935715 .fill-B5{fill:#EDF0FD;} + .d2-1930935715 .fill-B6{fill:#F7F8FE;} + .d2-1930935715 .fill-AA2{fill:#4A6FF3;} + .d2-1930935715 .fill-AA4{fill:#EDF0FD;} + .d2-1930935715 .fill-AA5{fill:#F7F8FE;} + .d2-1930935715 .fill-AB4{fill:#EDF0FD;} + .d2-1930935715 .fill-AB5{fill:#F7F8FE;} + .d2-1930935715 .stroke-N1{stroke:#0A0F25;} + .d2-1930935715 .stroke-N2{stroke:#676C7E;} + .d2-1930935715 .stroke-N3{stroke:#9499AB;} + .d2-1930935715 .stroke-N4{stroke:#CFD2DD;} + .d2-1930935715 .stroke-N5{stroke:#DEE1EB;} + .d2-1930935715 .stroke-N6{stroke:#EEF1F8;} + .d2-1930935715 .stroke-N7{stroke:#FFFFFF;} + .d2-1930935715 .stroke-B1{stroke:#0D32B2;} + .d2-1930935715 .stroke-B2{stroke:#0D32B2;} + .d2-1930935715 .stroke-B3{stroke:#E3E9FD;} + .d2-1930935715 .stroke-B4{stroke:#E3E9FD;} + .d2-1930935715 .stroke-B5{stroke:#EDF0FD;} + .d2-1930935715 .stroke-B6{stroke:#F7F8FE;} + .d2-1930935715 .stroke-AA2{stroke:#4A6FF3;} + .d2-1930935715 .stroke-AA4{stroke:#EDF0FD;} + .d2-1930935715 .stroke-AA5{stroke:#F7F8FE;} + .d2-1930935715 .stroke-AB4{stroke:#EDF0FD;} + .d2-1930935715 .stroke-AB5{stroke:#F7F8FE;} + .d2-1930935715 .background-color-N1{background-color:#0A0F25;} + .d2-1930935715 .background-color-N2{background-color:#676C7E;} + .d2-1930935715 .background-color-N3{background-color:#9499AB;} + .d2-1930935715 .background-color-N4{background-color:#CFD2DD;} + .d2-1930935715 .background-color-N5{background-color:#DEE1EB;} + .d2-1930935715 .background-color-N6{background-color:#EEF1F8;} + .d2-1930935715 .background-color-N7{background-color:#FFFFFF;} + .d2-1930935715 .background-color-B1{background-color:#0D32B2;} + .d2-1930935715 .background-color-B2{background-color:#0D32B2;} + .d2-1930935715 .background-color-B3{background-color:#E3E9FD;} + .d2-1930935715 .background-color-B4{background-color:#E3E9FD;} + .d2-1930935715 .background-color-B5{background-color:#EDF0FD;} + .d2-1930935715 .background-color-B6{background-color:#F7F8FE;} + .d2-1930935715 .background-color-AA2{background-color:#4A6FF3;} + .d2-1930935715 .background-color-AA4{background-color:#EDF0FD;} + .d2-1930935715 .background-color-AA5{background-color:#F7F8FE;} + .d2-1930935715 .background-color-AB4{background-color:#EDF0FD;} + .d2-1930935715 .background-color-AB5{background-color:#F7F8FE;} + .d2-1930935715 .color-N1{color:#0A0F25;} + .d2-1930935715 .color-N2{color:#676C7E;} + .d2-1930935715 .color-N3{color:#9499AB;} + .d2-1930935715 .color-N4{color:#CFD2DD;} + .d2-1930935715 .color-N5{color:#DEE1EB;} + .d2-1930935715 .color-N6{color:#EEF1F8;} + .d2-1930935715 .color-N7{color:#FFFFFF;} + .d2-1930935715 .color-B1{color:#0D32B2;} + .d2-1930935715 .color-B2{color:#0D32B2;} + .d2-1930935715 .color-B3{color:#E3E9FD;} + .d2-1930935715 .color-B4{color:#E3E9FD;} + .d2-1930935715 .color-B5{color:#EDF0FD;} + .d2-1930935715 .color-B6{color:#F7F8FE;} + .d2-1930935715 .color-AA2{color:#4A6FF3;} + .d2-1930935715 .color-AA4{color:#EDF0FD;} + .d2-1930935715 .color-AA5{color:#F7F8FE;} + .d2-1930935715 .color-AB4{color:#EDF0FD;} + .d2-1930935715 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1930935715);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1930935715);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1930935715);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1930935715);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1930935715);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1930935715);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1930935715);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1930935715);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1930935715);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1930935715);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1930935715);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1930935715);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1930935715);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1930935715);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1930935715);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1930935715);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1930935715);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1930935715);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>Homedog1dog3 - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/none-fill/dagre/board.exp.json b/e2etests/testdata/txtar/none-fill/dagre/board.exp.json index af4ed577d..67aa8b4eb 100644 --- a/e2etests/testdata/txtar/none-fill/dagre/board.exp.json +++ b/e2etests/testdata/txtar/none-fill/dagre/board.exp.json @@ -1,7 +1,7 @@ { "name": "", "config": { - "sketch": null, + "sketch": false, "themeID": 302, "darkThemeID": null, "pad": null, @@ -27,6 +27,7 @@ "fill": "B6", "fillPattern": "none", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -69,6 +70,7 @@ "fill": "B6", "fillPattern": "paper", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -112,6 +114,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/txtar/none-fill/dagre/sketch.exp.svg b/e2etests/testdata/txtar/none-fill/dagre/sketch.exp.svg index 569a41c23..3b14aa34a 100644 --- a/e2etests/testdata/txtar/none-fill/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/none-fill/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ - +}]]> - - + + - + @@ -1146,15 +1146,15 @@ - + -ab +ab - - + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/none-fill/elk/board.exp.json b/e2etests/testdata/txtar/none-fill/elk/board.exp.json index 444981e85..fe7988212 100644 --- a/e2etests/testdata/txtar/none-fill/elk/board.exp.json +++ b/e2etests/testdata/txtar/none-fill/elk/board.exp.json @@ -1,7 +1,7 @@ { "name": "", "config": { - "sketch": null, + "sketch": false, "themeID": 302, "darkThemeID": null, "pad": null, @@ -27,6 +27,7 @@ "fill": "B6", "fillPattern": "none", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -69,6 +70,7 @@ "fill": "B6", "fillPattern": "paper", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -112,6 +114,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/txtar/none-fill/elk/sketch.exp.svg b/e2etests/testdata/txtar/none-fill/elk/sketch.exp.svg index 1b54e3af8..1320cec85 100644 --- a/e2etests/testdata/txtar/none-fill/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/none-fill/elk/sketch.exp.svg @@ -1,9 +1,9 @@ - +}]]> - - + + - + @@ -1146,15 +1146,15 @@ - + -ab +ab - - + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/note-overlap/dagre/board.exp.json b/e2etests/testdata/txtar/note-overlap/dagre/board.exp.json new file mode 100644 index 000000000..39fe867ee --- /dev/null +++ b/e2etests/testdata/txtar/note-overlap/dagre/board.exp.json @@ -0,0 +1,489 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "alice", + "type": "rectangle", + "pos": { + "x": 12, + "y": 52 + }, + "width": 100, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "alice", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 32, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "bob", + "type": "rectangle", + "pos": { + "x": 162, + "y": 52 + }, + "width": 100, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "bob", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 26, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "bob.\"In the eyes of my dog, I'm a man.\"", + "type": "page", + "pos": { + "x": 81, + "y": 718 + }, + "width": 261, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "In the eyes of my dog, I'm a man.", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 216, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 5, + "level": 2 + } + ], + "connections": [ + { + "id": "(alice -> bob)[0]", + "src": "alice", + "srcArrow": "none", + "dst": "bob", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 62, + "y": 188 + }, + { + "x": 212, + "y": 188 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "id": "(alice -> alice)[0]", + "src": "alice", + "srcArrow": "none", + "dst": "alice", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "Self-messages", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 95, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 62, + "y": 258 + }, + { + "x": 142, + "y": 258 + }, + { + "x": 142, + "y": 303 + }, + { + "x": 62, + "y": 303 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "id": "(alice -> alice)[1]", + "src": "alice", + "srcArrow": "none", + "dst": "alice", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "Self-messages", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 95, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 62, + "y": 373 + }, + { + "x": 142, + "y": 373 + }, + { + "x": 142, + "y": 418 + }, + { + "x": 62, + "y": 418 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "id": "(alice -> alice)[2]", + "src": "alice", + "srcArrow": "none", + "dst": "alice", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "Self-messages", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 95, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 62, + "y": 488 + }, + { + "x": 142, + "y": 488 + }, + { + "x": 142, + "y": 533 + }, + { + "x": 62, + "y": 533 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "id": "(alice -> alice)[3]", + "src": "alice", + "srcArrow": "none", + "dst": "alice", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "Self-messages", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 95, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 62, + "y": 603 + }, + { + "x": 142, + "y": 603 + }, + { + "x": 142, + "y": 648 + }, + { + "x": 62, + "y": 648 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "id": "(alice -- )[0]", + "src": "alice", + "srcArrow": "none", + "dst": "alice-lifeline-end-3851299086", + "dstArrow": "none", + "opacity": 1, + "strokeDash": 6, + "strokeWidth": 2, + "stroke": "B2", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 62, + "y": 118 + }, + { + "x": 62, + "y": 854 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 1 + }, + { + "id": "(bob -- )[0]", + "src": "bob", + "srcArrow": "none", + "dst": "bob-lifeline-end-3036726343", + "dstArrow": "none", + "opacity": 1, + "strokeDash": 6, + "strokeWidth": 2, + "stroke": "B2", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 212, + "y": 118 + }, + { + "x": 212, + "y": 854 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 1 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/note-overlap/dagre/sketch.exp.svg b/e2etests/testdata/txtar/note-overlap/dagre/sketch.exp.svg new file mode 100644 index 000000000..33712d909 --- /dev/null +++ b/e2etests/testdata/txtar/note-overlap/dagre/sketch.exp.svg @@ -0,0 +1,108 @@ +alicebob Self-messagesSelf-messagesSelf-messagesSelf-messagesIn the eyes of my dog, I'm a man. + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/note-overlap/elk/board.exp.json b/e2etests/testdata/txtar/note-overlap/elk/board.exp.json new file mode 100644 index 000000000..39fe867ee --- /dev/null +++ b/e2etests/testdata/txtar/note-overlap/elk/board.exp.json @@ -0,0 +1,489 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "alice", + "type": "rectangle", + "pos": { + "x": 12, + "y": 52 + }, + "width": 100, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "alice", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 32, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "bob", + "type": "rectangle", + "pos": { + "x": 162, + "y": 52 + }, + "width": 100, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "bob", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 26, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "bob.\"In the eyes of my dog, I'm a man.\"", + "type": "page", + "pos": { + "x": 81, + "y": 718 + }, + "width": 261, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "In the eyes of my dog, I'm a man.", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 216, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 5, + "level": 2 + } + ], + "connections": [ + { + "id": "(alice -> bob)[0]", + "src": "alice", + "srcArrow": "none", + "dst": "bob", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 62, + "y": 188 + }, + { + "x": 212, + "y": 188 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "id": "(alice -> alice)[0]", + "src": "alice", + "srcArrow": "none", + "dst": "alice", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "Self-messages", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 95, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 62, + "y": 258 + }, + { + "x": 142, + "y": 258 + }, + { + "x": 142, + "y": 303 + }, + { + "x": 62, + "y": 303 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "id": "(alice -> alice)[1]", + "src": "alice", + "srcArrow": "none", + "dst": "alice", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "Self-messages", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 95, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 62, + "y": 373 + }, + { + "x": 142, + "y": 373 + }, + { + "x": 142, + "y": 418 + }, + { + "x": 62, + "y": 418 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "id": "(alice -> alice)[2]", + "src": "alice", + "srcArrow": "none", + "dst": "alice", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "Self-messages", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 95, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 62, + "y": 488 + }, + { + "x": 142, + "y": 488 + }, + { + "x": 142, + "y": 533 + }, + { + "x": 62, + "y": 533 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "id": "(alice -> alice)[3]", + "src": "alice", + "srcArrow": "none", + "dst": "alice", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "Self-messages", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 95, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 62, + "y": 603 + }, + { + "x": 142, + "y": 603 + }, + { + "x": 142, + "y": 648 + }, + { + "x": 62, + "y": 648 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "id": "(alice -- )[0]", + "src": "alice", + "srcArrow": "none", + "dst": "alice-lifeline-end-3851299086", + "dstArrow": "none", + "opacity": 1, + "strokeDash": 6, + "strokeWidth": 2, + "stroke": "B2", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 62, + "y": 118 + }, + { + "x": 62, + "y": 854 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 1 + }, + { + "id": "(bob -- )[0]", + "src": "bob", + "srcArrow": "none", + "dst": "bob-lifeline-end-3036726343", + "dstArrow": "none", + "opacity": 1, + "strokeDash": 6, + "strokeWidth": 2, + "stroke": "B2", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 212, + "y": 118 + }, + { + "x": 212, + "y": 854 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 1 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/note-overlap/elk/sketch.exp.svg b/e2etests/testdata/txtar/note-overlap/elk/sketch.exp.svg new file mode 100644 index 000000000..33712d909 --- /dev/null +++ b/e2etests/testdata/txtar/note-overlap/elk/sketch.exp.svg @@ -0,0 +1,108 @@ +alicebob Self-messagesSelf-messagesSelf-messagesSelf-messagesIn the eyes of my dog, I'm a man. + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/opacity-zero-route/dagre/board.exp.json b/e2etests/testdata/txtar/opacity-zero-route/dagre/board.exp.json index c4f256797..36d35d3bb 100644 --- a/e2etests/testdata/txtar/opacity-zero-route/dagre/board.exp.json +++ b/e2etests/testdata/txtar/opacity-zero-route/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -438,6 +456,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 421, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/txtar/opacity-zero-route/dagre/sketch.exp.svg b/e2etests/testdata/txtar/opacity-zero-route/dagre/sketch.exp.svg index 8f1e6b22c..72141501b 100644 --- a/e2etests/testdata/txtar/opacity-zero-route/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/opacity-zero-route/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -gridoutd + .d2-1453399400 .fill-N1{fill:#0A0F25;} + .d2-1453399400 .fill-N2{fill:#676C7E;} + .d2-1453399400 .fill-N3{fill:#9499AB;} + .d2-1453399400 .fill-N4{fill:#CFD2DD;} + .d2-1453399400 .fill-N5{fill:#DEE1EB;} + .d2-1453399400 .fill-N6{fill:#EEF1F8;} + .d2-1453399400 .fill-N7{fill:#FFFFFF;} + .d2-1453399400 .fill-B1{fill:#0D32B2;} + .d2-1453399400 .fill-B2{fill:#0D32B2;} + .d2-1453399400 .fill-B3{fill:#E3E9FD;} + .d2-1453399400 .fill-B4{fill:#E3E9FD;} + .d2-1453399400 .fill-B5{fill:#EDF0FD;} + .d2-1453399400 .fill-B6{fill:#F7F8FE;} + .d2-1453399400 .fill-AA2{fill:#4A6FF3;} + .d2-1453399400 .fill-AA4{fill:#EDF0FD;} + .d2-1453399400 .fill-AA5{fill:#F7F8FE;} + .d2-1453399400 .fill-AB4{fill:#EDF0FD;} + .d2-1453399400 .fill-AB5{fill:#F7F8FE;} + .d2-1453399400 .stroke-N1{stroke:#0A0F25;} + .d2-1453399400 .stroke-N2{stroke:#676C7E;} + .d2-1453399400 .stroke-N3{stroke:#9499AB;} + .d2-1453399400 .stroke-N4{stroke:#CFD2DD;} + .d2-1453399400 .stroke-N5{stroke:#DEE1EB;} + .d2-1453399400 .stroke-N6{stroke:#EEF1F8;} + .d2-1453399400 .stroke-N7{stroke:#FFFFFF;} + .d2-1453399400 .stroke-B1{stroke:#0D32B2;} + .d2-1453399400 .stroke-B2{stroke:#0D32B2;} + .d2-1453399400 .stroke-B3{stroke:#E3E9FD;} + .d2-1453399400 .stroke-B4{stroke:#E3E9FD;} + .d2-1453399400 .stroke-B5{stroke:#EDF0FD;} + .d2-1453399400 .stroke-B6{stroke:#F7F8FE;} + .d2-1453399400 .stroke-AA2{stroke:#4A6FF3;} + .d2-1453399400 .stroke-AA4{stroke:#EDF0FD;} + .d2-1453399400 .stroke-AA5{stroke:#F7F8FE;} + .d2-1453399400 .stroke-AB4{stroke:#EDF0FD;} + .d2-1453399400 .stroke-AB5{stroke:#F7F8FE;} + .d2-1453399400 .background-color-N1{background-color:#0A0F25;} + .d2-1453399400 .background-color-N2{background-color:#676C7E;} + .d2-1453399400 .background-color-N3{background-color:#9499AB;} + .d2-1453399400 .background-color-N4{background-color:#CFD2DD;} + .d2-1453399400 .background-color-N5{background-color:#DEE1EB;} + .d2-1453399400 .background-color-N6{background-color:#EEF1F8;} + .d2-1453399400 .background-color-N7{background-color:#FFFFFF;} + .d2-1453399400 .background-color-B1{background-color:#0D32B2;} + .d2-1453399400 .background-color-B2{background-color:#0D32B2;} + .d2-1453399400 .background-color-B3{background-color:#E3E9FD;} + .d2-1453399400 .background-color-B4{background-color:#E3E9FD;} + .d2-1453399400 .background-color-B5{background-color:#EDF0FD;} + .d2-1453399400 .background-color-B6{background-color:#F7F8FE;} + .d2-1453399400 .background-color-AA2{background-color:#4A6FF3;} + .d2-1453399400 .background-color-AA4{background-color:#EDF0FD;} + .d2-1453399400 .background-color-AA5{background-color:#F7F8FE;} + .d2-1453399400 .background-color-AB4{background-color:#EDF0FD;} + .d2-1453399400 .background-color-AB5{background-color:#F7F8FE;} + .d2-1453399400 .color-N1{color:#0A0F25;} + .d2-1453399400 .color-N2{color:#676C7E;} + .d2-1453399400 .color-N3{color:#9499AB;} + .d2-1453399400 .color-N4{color:#CFD2DD;} + .d2-1453399400 .color-N5{color:#DEE1EB;} + .d2-1453399400 .color-N6{color:#EEF1F8;} + .d2-1453399400 .color-N7{color:#FFFFFF;} + .d2-1453399400 .color-B1{color:#0D32B2;} + .d2-1453399400 .color-B2{color:#0D32B2;} + .d2-1453399400 .color-B3{color:#E3E9FD;} + .d2-1453399400 .color-B4{color:#E3E9FD;} + .d2-1453399400 .color-B5{color:#EDF0FD;} + .d2-1453399400 .color-B6{color:#F7F8FE;} + .d2-1453399400 .color-AA2{color:#4A6FF3;} + .d2-1453399400 .color-AA4{color:#EDF0FD;} + .d2-1453399400 .color-AA5{color:#F7F8FE;} + .d2-1453399400 .color-AB4{color:#EDF0FD;} + .d2-1453399400 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1453399400);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1453399400);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1453399400);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1453399400);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1453399400);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1453399400);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1453399400);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1453399400);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1453399400);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1453399400);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1453399400);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1453399400);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1453399400);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1453399400);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1453399400);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1453399400);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1453399400);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1453399400);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>gridoutd - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/opacity-zero-route/elk/board.exp.json b/e2etests/testdata/txtar/opacity-zero-route/elk/board.exp.json index 583020b29..3173d307d 100644 --- a/e2etests/testdata/txtar/opacity-zero-route/elk/board.exp.json +++ b/e2etests/testdata/txtar/opacity-zero-route/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -438,6 +456,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 393, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/txtar/opacity-zero-route/elk/sketch.exp.svg b/e2etests/testdata/txtar/opacity-zero-route/elk/sketch.exp.svg index 96c1606e1..f219461bc 100644 --- a/e2etests/testdata/txtar/opacity-zero-route/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/opacity-zero-route/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -gridoutd + .d2-1747554936 .fill-N1{fill:#0A0F25;} + .d2-1747554936 .fill-N2{fill:#676C7E;} + .d2-1747554936 .fill-N3{fill:#9499AB;} + .d2-1747554936 .fill-N4{fill:#CFD2DD;} + .d2-1747554936 .fill-N5{fill:#DEE1EB;} + .d2-1747554936 .fill-N6{fill:#EEF1F8;} + .d2-1747554936 .fill-N7{fill:#FFFFFF;} + .d2-1747554936 .fill-B1{fill:#0D32B2;} + .d2-1747554936 .fill-B2{fill:#0D32B2;} + .d2-1747554936 .fill-B3{fill:#E3E9FD;} + .d2-1747554936 .fill-B4{fill:#E3E9FD;} + .d2-1747554936 .fill-B5{fill:#EDF0FD;} + .d2-1747554936 .fill-B6{fill:#F7F8FE;} + .d2-1747554936 .fill-AA2{fill:#4A6FF3;} + .d2-1747554936 .fill-AA4{fill:#EDF0FD;} + .d2-1747554936 .fill-AA5{fill:#F7F8FE;} + .d2-1747554936 .fill-AB4{fill:#EDF0FD;} + .d2-1747554936 .fill-AB5{fill:#F7F8FE;} + .d2-1747554936 .stroke-N1{stroke:#0A0F25;} + .d2-1747554936 .stroke-N2{stroke:#676C7E;} + .d2-1747554936 .stroke-N3{stroke:#9499AB;} + .d2-1747554936 .stroke-N4{stroke:#CFD2DD;} + .d2-1747554936 .stroke-N5{stroke:#DEE1EB;} + .d2-1747554936 .stroke-N6{stroke:#EEF1F8;} + .d2-1747554936 .stroke-N7{stroke:#FFFFFF;} + .d2-1747554936 .stroke-B1{stroke:#0D32B2;} + .d2-1747554936 .stroke-B2{stroke:#0D32B2;} + .d2-1747554936 .stroke-B3{stroke:#E3E9FD;} + .d2-1747554936 .stroke-B4{stroke:#E3E9FD;} + .d2-1747554936 .stroke-B5{stroke:#EDF0FD;} + .d2-1747554936 .stroke-B6{stroke:#F7F8FE;} + .d2-1747554936 .stroke-AA2{stroke:#4A6FF3;} + .d2-1747554936 .stroke-AA4{stroke:#EDF0FD;} + .d2-1747554936 .stroke-AA5{stroke:#F7F8FE;} + .d2-1747554936 .stroke-AB4{stroke:#EDF0FD;} + .d2-1747554936 .stroke-AB5{stroke:#F7F8FE;} + .d2-1747554936 .background-color-N1{background-color:#0A0F25;} + .d2-1747554936 .background-color-N2{background-color:#676C7E;} + .d2-1747554936 .background-color-N3{background-color:#9499AB;} + .d2-1747554936 .background-color-N4{background-color:#CFD2DD;} + .d2-1747554936 .background-color-N5{background-color:#DEE1EB;} + .d2-1747554936 .background-color-N6{background-color:#EEF1F8;} + .d2-1747554936 .background-color-N7{background-color:#FFFFFF;} + .d2-1747554936 .background-color-B1{background-color:#0D32B2;} + .d2-1747554936 .background-color-B2{background-color:#0D32B2;} + .d2-1747554936 .background-color-B3{background-color:#E3E9FD;} + .d2-1747554936 .background-color-B4{background-color:#E3E9FD;} + .d2-1747554936 .background-color-B5{background-color:#EDF0FD;} + .d2-1747554936 .background-color-B6{background-color:#F7F8FE;} + .d2-1747554936 .background-color-AA2{background-color:#4A6FF3;} + .d2-1747554936 .background-color-AA4{background-color:#EDF0FD;} + .d2-1747554936 .background-color-AA5{background-color:#F7F8FE;} + .d2-1747554936 .background-color-AB4{background-color:#EDF0FD;} + .d2-1747554936 .background-color-AB5{background-color:#F7F8FE;} + .d2-1747554936 .color-N1{color:#0A0F25;} + .d2-1747554936 .color-N2{color:#676C7E;} + .d2-1747554936 .color-N3{color:#9499AB;} + .d2-1747554936 .color-N4{color:#CFD2DD;} + .d2-1747554936 .color-N5{color:#DEE1EB;} + .d2-1747554936 .color-N6{color:#EEF1F8;} + .d2-1747554936 .color-N7{color:#FFFFFF;} + .d2-1747554936 .color-B1{color:#0D32B2;} + .d2-1747554936 .color-B2{color:#0D32B2;} + .d2-1747554936 .color-B3{color:#E3E9FD;} + .d2-1747554936 .color-B4{color:#E3E9FD;} + .d2-1747554936 .color-B5{color:#EDF0FD;} + .d2-1747554936 .color-B6{color:#F7F8FE;} + .d2-1747554936 .color-AA2{color:#4A6FF3;} + .d2-1747554936 .color-AA4{color:#EDF0FD;} + .d2-1747554936 .color-AA5{color:#F7F8FE;} + .d2-1747554936 .color-AB4{color:#EDF0FD;} + .d2-1747554936 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1747554936);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1747554936);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1747554936);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1747554936);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1747554936);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1747554936);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1747554936);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1747554936);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1747554936);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1747554936);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1747554936);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1747554936);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1747554936);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1747554936);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1747554936);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1747554936);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1747554936);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1747554936);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>gridoutd - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/sequence-bounding-box/dagre/board.exp.json b/e2etests/testdata/txtar/sequence-bounding-box/dagre/board.exp.json index 93cc3aba2..959a0a407 100644 --- a/e2etests/testdata/txtar/sequence-bounding-box/dagre/board.exp.json +++ b/e2etests/testdata/txtar/sequence-bounding-box/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -151,6 +162,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 102, @@ -197,6 +209,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 102, @@ -228,6 +241,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/txtar/sequence-bounding-box/dagre/sketch.exp.svg b/e2etests/testdata/txtar/sequence-bounding-box/dagre/sketch.exp.svg index 7ac3cd8ee..60662093b 100644 --- a/e2etests/testdata/txtar/sequence-bounding-box/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/sequence-bounding-box/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -backendclientclient BO_ID -> D2_ID + .d2-3619366828 .fill-N1{fill:#0A0F25;} + .d2-3619366828 .fill-N2{fill:#676C7E;} + .d2-3619366828 .fill-N3{fill:#9499AB;} + .d2-3619366828 .fill-N4{fill:#CFD2DD;} + .d2-3619366828 .fill-N5{fill:#DEE1EB;} + .d2-3619366828 .fill-N6{fill:#EEF1F8;} + .d2-3619366828 .fill-N7{fill:#FFFFFF;} + .d2-3619366828 .fill-B1{fill:#0D32B2;} + .d2-3619366828 .fill-B2{fill:#0D32B2;} + .d2-3619366828 .fill-B3{fill:#E3E9FD;} + .d2-3619366828 .fill-B4{fill:#E3E9FD;} + .d2-3619366828 .fill-B5{fill:#EDF0FD;} + .d2-3619366828 .fill-B6{fill:#F7F8FE;} + .d2-3619366828 .fill-AA2{fill:#4A6FF3;} + .d2-3619366828 .fill-AA4{fill:#EDF0FD;} + .d2-3619366828 .fill-AA5{fill:#F7F8FE;} + .d2-3619366828 .fill-AB4{fill:#EDF0FD;} + .d2-3619366828 .fill-AB5{fill:#F7F8FE;} + .d2-3619366828 .stroke-N1{stroke:#0A0F25;} + .d2-3619366828 .stroke-N2{stroke:#676C7E;} + .d2-3619366828 .stroke-N3{stroke:#9499AB;} + .d2-3619366828 .stroke-N4{stroke:#CFD2DD;} + .d2-3619366828 .stroke-N5{stroke:#DEE1EB;} + .d2-3619366828 .stroke-N6{stroke:#EEF1F8;} + .d2-3619366828 .stroke-N7{stroke:#FFFFFF;} + .d2-3619366828 .stroke-B1{stroke:#0D32B2;} + .d2-3619366828 .stroke-B2{stroke:#0D32B2;} + .d2-3619366828 .stroke-B3{stroke:#E3E9FD;} + .d2-3619366828 .stroke-B4{stroke:#E3E9FD;} + .d2-3619366828 .stroke-B5{stroke:#EDF0FD;} + .d2-3619366828 .stroke-B6{stroke:#F7F8FE;} + .d2-3619366828 .stroke-AA2{stroke:#4A6FF3;} + .d2-3619366828 .stroke-AA4{stroke:#EDF0FD;} + .d2-3619366828 .stroke-AA5{stroke:#F7F8FE;} + .d2-3619366828 .stroke-AB4{stroke:#EDF0FD;} + .d2-3619366828 .stroke-AB5{stroke:#F7F8FE;} + .d2-3619366828 .background-color-N1{background-color:#0A0F25;} + .d2-3619366828 .background-color-N2{background-color:#676C7E;} + .d2-3619366828 .background-color-N3{background-color:#9499AB;} + .d2-3619366828 .background-color-N4{background-color:#CFD2DD;} + .d2-3619366828 .background-color-N5{background-color:#DEE1EB;} + .d2-3619366828 .background-color-N6{background-color:#EEF1F8;} + .d2-3619366828 .background-color-N7{background-color:#FFFFFF;} + .d2-3619366828 .background-color-B1{background-color:#0D32B2;} + .d2-3619366828 .background-color-B2{background-color:#0D32B2;} + .d2-3619366828 .background-color-B3{background-color:#E3E9FD;} + .d2-3619366828 .background-color-B4{background-color:#E3E9FD;} + .d2-3619366828 .background-color-B5{background-color:#EDF0FD;} + .d2-3619366828 .background-color-B6{background-color:#F7F8FE;} + .d2-3619366828 .background-color-AA2{background-color:#4A6FF3;} + .d2-3619366828 .background-color-AA4{background-color:#EDF0FD;} + .d2-3619366828 .background-color-AA5{background-color:#F7F8FE;} + .d2-3619366828 .background-color-AB4{background-color:#EDF0FD;} + .d2-3619366828 .background-color-AB5{background-color:#F7F8FE;} + .d2-3619366828 .color-N1{color:#0A0F25;} + .d2-3619366828 .color-N2{color:#676C7E;} + .d2-3619366828 .color-N3{color:#9499AB;} + .d2-3619366828 .color-N4{color:#CFD2DD;} + .d2-3619366828 .color-N5{color:#DEE1EB;} + .d2-3619366828 .color-N6{color:#EEF1F8;} + .d2-3619366828 .color-N7{color:#FFFFFF;} + .d2-3619366828 .color-B1{color:#0D32B2;} + .d2-3619366828 .color-B2{color:#0D32B2;} + .d2-3619366828 .color-B3{color:#E3E9FD;} + .d2-3619366828 .color-B4{color:#E3E9FD;} + .d2-3619366828 .color-B5{color:#EDF0FD;} + .d2-3619366828 .color-B6{color:#F7F8FE;} + .d2-3619366828 .color-AA2{color:#4A6FF3;} + .d2-3619366828 .color-AA4{color:#EDF0FD;} + .d2-3619366828 .color-AA5{color:#F7F8FE;} + .d2-3619366828 .color-AB4{color:#EDF0FD;} + .d2-3619366828 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3619366828);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3619366828);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3619366828);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3619366828);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3619366828);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3619366828);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3619366828);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3619366828);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3619366828);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3619366828);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3619366828);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3619366828);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3619366828);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3619366828);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3619366828);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3619366828);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3619366828);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3619366828);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>backendclientclient BO_ID -> D2_ID - - - - + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/sequence-bounding-box/elk/board.exp.json b/e2etests/testdata/txtar/sequence-bounding-box/elk/board.exp.json index 11e468f6d..cb27c5f5e 100644 --- a/e2etests/testdata/txtar/sequence-bounding-box/elk/board.exp.json +++ b/e2etests/testdata/txtar/sequence-bounding-box/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -151,6 +162,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 124, @@ -197,6 +209,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 124, @@ -228,6 +241,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/txtar/sequence-bounding-box/elk/sketch.exp.svg b/e2etests/testdata/txtar/sequence-bounding-box/elk/sketch.exp.svg index 5c1df02c2..b004111a1 100644 --- a/e2etests/testdata/txtar/sequence-bounding-box/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/sequence-bounding-box/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -backendclientclient BO_ID -> D2_ID + .d2-3780613573 .fill-N1{fill:#0A0F25;} + .d2-3780613573 .fill-N2{fill:#676C7E;} + .d2-3780613573 .fill-N3{fill:#9499AB;} + .d2-3780613573 .fill-N4{fill:#CFD2DD;} + .d2-3780613573 .fill-N5{fill:#DEE1EB;} + .d2-3780613573 .fill-N6{fill:#EEF1F8;} + .d2-3780613573 .fill-N7{fill:#FFFFFF;} + .d2-3780613573 .fill-B1{fill:#0D32B2;} + .d2-3780613573 .fill-B2{fill:#0D32B2;} + .d2-3780613573 .fill-B3{fill:#E3E9FD;} + .d2-3780613573 .fill-B4{fill:#E3E9FD;} + .d2-3780613573 .fill-B5{fill:#EDF0FD;} + .d2-3780613573 .fill-B6{fill:#F7F8FE;} + .d2-3780613573 .fill-AA2{fill:#4A6FF3;} + .d2-3780613573 .fill-AA4{fill:#EDF0FD;} + .d2-3780613573 .fill-AA5{fill:#F7F8FE;} + .d2-3780613573 .fill-AB4{fill:#EDF0FD;} + .d2-3780613573 .fill-AB5{fill:#F7F8FE;} + .d2-3780613573 .stroke-N1{stroke:#0A0F25;} + .d2-3780613573 .stroke-N2{stroke:#676C7E;} + .d2-3780613573 .stroke-N3{stroke:#9499AB;} + .d2-3780613573 .stroke-N4{stroke:#CFD2DD;} + .d2-3780613573 .stroke-N5{stroke:#DEE1EB;} + .d2-3780613573 .stroke-N6{stroke:#EEF1F8;} + .d2-3780613573 .stroke-N7{stroke:#FFFFFF;} + .d2-3780613573 .stroke-B1{stroke:#0D32B2;} + .d2-3780613573 .stroke-B2{stroke:#0D32B2;} + .d2-3780613573 .stroke-B3{stroke:#E3E9FD;} + .d2-3780613573 .stroke-B4{stroke:#E3E9FD;} + .d2-3780613573 .stroke-B5{stroke:#EDF0FD;} + .d2-3780613573 .stroke-B6{stroke:#F7F8FE;} + .d2-3780613573 .stroke-AA2{stroke:#4A6FF3;} + .d2-3780613573 .stroke-AA4{stroke:#EDF0FD;} + .d2-3780613573 .stroke-AA5{stroke:#F7F8FE;} + .d2-3780613573 .stroke-AB4{stroke:#EDF0FD;} + .d2-3780613573 .stroke-AB5{stroke:#F7F8FE;} + .d2-3780613573 .background-color-N1{background-color:#0A0F25;} + .d2-3780613573 .background-color-N2{background-color:#676C7E;} + .d2-3780613573 .background-color-N3{background-color:#9499AB;} + .d2-3780613573 .background-color-N4{background-color:#CFD2DD;} + .d2-3780613573 .background-color-N5{background-color:#DEE1EB;} + .d2-3780613573 .background-color-N6{background-color:#EEF1F8;} + .d2-3780613573 .background-color-N7{background-color:#FFFFFF;} + .d2-3780613573 .background-color-B1{background-color:#0D32B2;} + .d2-3780613573 .background-color-B2{background-color:#0D32B2;} + .d2-3780613573 .background-color-B3{background-color:#E3E9FD;} + .d2-3780613573 .background-color-B4{background-color:#E3E9FD;} + .d2-3780613573 .background-color-B5{background-color:#EDF0FD;} + .d2-3780613573 .background-color-B6{background-color:#F7F8FE;} + .d2-3780613573 .background-color-AA2{background-color:#4A6FF3;} + .d2-3780613573 .background-color-AA4{background-color:#EDF0FD;} + .d2-3780613573 .background-color-AA5{background-color:#F7F8FE;} + .d2-3780613573 .background-color-AB4{background-color:#EDF0FD;} + .d2-3780613573 .background-color-AB5{background-color:#F7F8FE;} + .d2-3780613573 .color-N1{color:#0A0F25;} + .d2-3780613573 .color-N2{color:#676C7E;} + .d2-3780613573 .color-N3{color:#9499AB;} + .d2-3780613573 .color-N4{color:#CFD2DD;} + .d2-3780613573 .color-N5{color:#DEE1EB;} + .d2-3780613573 .color-N6{color:#EEF1F8;} + .d2-3780613573 .color-N7{color:#FFFFFF;} + .d2-3780613573 .color-B1{color:#0D32B2;} + .d2-3780613573 .color-B2{color:#0D32B2;} + .d2-3780613573 .color-B3{color:#E3E9FD;} + .d2-3780613573 .color-B4{color:#E3E9FD;} + .d2-3780613573 .color-B5{color:#EDF0FD;} + .d2-3780613573 .color-B6{color:#F7F8FE;} + .d2-3780613573 .color-AA2{color:#4A6FF3;} + .d2-3780613573 .color-AA4{color:#EDF0FD;} + .d2-3780613573 .color-AA5{color:#F7F8FE;} + .d2-3780613573 .color-AB4{color:#EDF0FD;} + .d2-3780613573 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3780613573);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3780613573);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3780613573);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3780613573);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3780613573);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3780613573);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3780613573);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3780613573);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3780613573);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3780613573);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3780613573);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3780613573);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3780613573);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3780613573);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3780613573);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3780613573);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3780613573);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3780613573);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>backendclientclient BO_ID -> D2_ID - - - - + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/sequence-diagram-note-md/dagre/board.exp.json b/e2etests/testdata/txtar/sequence-diagram-note-md/dagre/board.exp.json new file mode 100644 index 000000000..d067a7fab --- /dev/null +++ b/e2etests/testdata/txtar/sequence-diagram-note-md/dagre/board.exp.json @@ -0,0 +1,385 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "x", + "type": "rectangle", + "pos": { + "x": 12, + "y": 52 + }, + "width": 100, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "x", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 7, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "y", + "type": "rectangle", + "pos": { + "x": 265, + "y": 52 + }, + "width": 100, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "y", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "x.x", + "type": "page", + "pos": { + "x": -150, + "y": 279 + }, + "width": 425, + "height": 164, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "## A man who fishes for marlin in ponds\n\n- ...dramatic pause\n\nwill put his money in Etruscan bonds.", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 380, + "labelHeight": 119, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 5, + "level": 2 + }, + { + "id": "y.z", + "type": "page", + "pos": { + "x": 155, + "y": 513 + }, + "width": 320, + "height": 64, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "\\\\lim_{h \\\\rightarrow 0 } \\\\frac{f(x+h)-f(x)}{h}", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "latex", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 275, + "labelHeight": 19, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 5, + "level": 2 + }, + { + "id": "x.z", + "type": "page", + "pos": { + "x": 13, + "y": 647 + }, + "width": 98, + "height": 69, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "1 + 1 = 2", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "python", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 53, + "labelHeight": 24, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 5, + "level": 2 + } + ], + "connections": [ + { + "id": "(x -> y)[0]", + "src": "x", + "srcArrow": "none", + "dst": "y", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "hello", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 33, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 62, + "y": 198 + }, + { + "x": 315, + "y": 198 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "id": "(x -- )[0]", + "src": "x", + "srcArrow": "none", + "dst": "x-lifeline-end-1678191278", + "dstArrow": "none", + "opacity": 1, + "strokeDash": 6, + "strokeWidth": 2, + "stroke": "B2", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 62, + "y": 118 + }, + { + "x": 62, + "y": 786 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 1 + }, + { + "id": "(y -- )[0]", + "src": "y", + "srcArrow": "none", + "dst": "y-lifeline-end-35261543", + "dstArrow": "none", + "opacity": 1, + "strokeDash": 6, + "strokeWidth": 2, + "stroke": "B2", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 315, + "y": 118 + }, + { + "x": 315, + "y": 786 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 1 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/sequence-diagram-note-md/dagre/sketch.exp.svg b/e2etests/testdata/txtar/sequence-diagram-note-md/dagre/sketch.exp.svg new file mode 100644 index 000000000..c42232970 --- /dev/null +++ b/e2etests/testdata/txtar/sequence-diagram-note-md/dagre/sketch.exp.svg @@ -0,0 +1,865 @@ +xy hello

    A man who fishes for marlin in ponds

    +
      +
    • ...dramatic pause
      • +
    +

    will put his money in Etruscan bonds.

    +
    1 + 1 = 21 + 1 = 2 + + + + + + + +     \ No newline at end of file diff --git a/e2etests/testdata/txtar/sequence-diagram-note-md/elk/board.exp.json b/e2etests/testdata/txtar/sequence-diagram-note-md/elk/board.exp.json new file mode 100644 index 000000000..d067a7fab --- /dev/null +++ b/e2etests/testdata/txtar/sequence-diagram-note-md/elk/board.exp.json @@ -0,0 +1,385 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "x", + "type": "rectangle", + "pos": { + "x": 12, + "y": 52 + }, + "width": 100, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "x", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 7, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "y", + "type": "rectangle", + "pos": { + "x": 265, + "y": 52 + }, + "width": 100, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "y", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "x.x", + "type": "page", + "pos": { + "x": -150, + "y": 279 + }, + "width": 425, + "height": 164, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "## A man who fishes for marlin in ponds\n\n- ...dramatic pause\n\nwill put his money in Etruscan bonds.", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 380, + "labelHeight": 119, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 5, + "level": 2 + }, + { + "id": "y.z", + "type": "page", + "pos": { + "x": 155, + "y": 513 + }, + "width": 320, + "height": 64, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "\\\\lim_{h \\\\rightarrow 0 } \\\\frac{f(x+h)-f(x)}{h}", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "latex", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 275, + "labelHeight": 19, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 5, + "level": 2 + }, + { + "id": "x.z", + "type": "page", + "pos": { + "x": 13, + "y": 647 + }, + "width": 98, + "height": 69, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N7", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "1 + 1 = 2", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "python", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 53, + "labelHeight": 24, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 5, + "level": 2 + } + ], + "connections": [ + { + "id": "(x -> y)[0]", + "src": "x", + "srcArrow": "none", + "dst": "y", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "hello", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 33, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 62, + "y": 198 + }, + { + "x": 315, + "y": 198 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 4 + }, + { + "id": "(x -- )[0]", + "src": "x", + "srcArrow": "none", + "dst": "x-lifeline-end-1678191278", + "dstArrow": "none", + "opacity": 1, + "strokeDash": 6, + "strokeWidth": 2, + "stroke": "B2", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 62, + "y": 118 + }, + { + "x": 62, + "y": 786 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 1 + }, + { + "id": "(y -- )[0]", + "src": "y", + "srcArrow": "none", + "dst": "y-lifeline-end-35261543", + "dstArrow": "none", + "opacity": 1, + "strokeDash": 6, + "strokeWidth": 2, + "stroke": "B2", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 315, + "y": 118 + }, + { + "x": 315, + "y": 786 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 1 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/sequence-diagram-note-md/elk/sketch.exp.svg b/e2etests/testdata/txtar/sequence-diagram-note-md/elk/sketch.exp.svg new file mode 100644 index 000000000..c42232970 --- /dev/null +++ b/e2etests/testdata/txtar/sequence-diagram-note-md/elk/sketch.exp.svg @@ -0,0 +1,865 @@ +xy hello

    A man who fishes for marlin in ponds

    +
      +
    • ...dramatic pause
      • +
    +

    will put his money in Etruscan bonds.

    +
    1 + 1 = 21 + 1 = 2 + + + + + + + +     \ No newline at end of file diff --git a/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/dagre/board.exp.json b/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/dagre/board.exp.json index ac53c8663..599a1e5d5 100644 --- a/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/dagre/board.exp.json +++ b/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -224,6 +237,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -266,6 +280,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -318,6 +333,7 @@ "labelHeight": 101, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -356,6 +372,7 @@ "labelHeight": 101, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -394,6 +411,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -432,6 +450,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -470,6 +489,7 @@ "labelHeight": 101, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -508,6 +528,7 @@ "labelHeight": 101, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -546,6 +567,7 @@ "labelHeight": 101, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 362, @@ -584,6 +606,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -622,6 +645,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -660,6 +684,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 362, @@ -691,6 +716,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/dagre/sketch.exp.svg b/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/dagre/sketch.exp.svg index 2922923b4..17c3846c8 100644 --- a/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -SequenceSystemFileASystem StartsOkayAlright OneTwoThreeFourFiveSix OneTwoThreeFourFiveSixOneTwoOneTwoThreeFourFiveSixOneTwoThreeFourFiveSixOneTwoThreeFourFiveSix + .d2-3353682460 .fill-N1{fill:#0A0F25;} + .d2-3353682460 .fill-N2{fill:#676C7E;} + .d2-3353682460 .fill-N3{fill:#9499AB;} + .d2-3353682460 .fill-N4{fill:#CFD2DD;} + .d2-3353682460 .fill-N5{fill:#DEE1EB;} + .d2-3353682460 .fill-N6{fill:#EEF1F8;} + .d2-3353682460 .fill-N7{fill:#FFFFFF;} + .d2-3353682460 .fill-B1{fill:#0D32B2;} + .d2-3353682460 .fill-B2{fill:#0D32B2;} + .d2-3353682460 .fill-B3{fill:#E3E9FD;} + .d2-3353682460 .fill-B4{fill:#E3E9FD;} + .d2-3353682460 .fill-B5{fill:#EDF0FD;} + .d2-3353682460 .fill-B6{fill:#F7F8FE;} + .d2-3353682460 .fill-AA2{fill:#4A6FF3;} + .d2-3353682460 .fill-AA4{fill:#EDF0FD;} + .d2-3353682460 .fill-AA5{fill:#F7F8FE;} + .d2-3353682460 .fill-AB4{fill:#EDF0FD;} + .d2-3353682460 .fill-AB5{fill:#F7F8FE;} + .d2-3353682460 .stroke-N1{stroke:#0A0F25;} + .d2-3353682460 .stroke-N2{stroke:#676C7E;} + .d2-3353682460 .stroke-N3{stroke:#9499AB;} + .d2-3353682460 .stroke-N4{stroke:#CFD2DD;} + .d2-3353682460 .stroke-N5{stroke:#DEE1EB;} + .d2-3353682460 .stroke-N6{stroke:#EEF1F8;} + .d2-3353682460 .stroke-N7{stroke:#FFFFFF;} + .d2-3353682460 .stroke-B1{stroke:#0D32B2;} + .d2-3353682460 .stroke-B2{stroke:#0D32B2;} + .d2-3353682460 .stroke-B3{stroke:#E3E9FD;} + .d2-3353682460 .stroke-B4{stroke:#E3E9FD;} + .d2-3353682460 .stroke-B5{stroke:#EDF0FD;} + .d2-3353682460 .stroke-B6{stroke:#F7F8FE;} + .d2-3353682460 .stroke-AA2{stroke:#4A6FF3;} + .d2-3353682460 .stroke-AA4{stroke:#EDF0FD;} + .d2-3353682460 .stroke-AA5{stroke:#F7F8FE;} + .d2-3353682460 .stroke-AB4{stroke:#EDF0FD;} + .d2-3353682460 .stroke-AB5{stroke:#F7F8FE;} + .d2-3353682460 .background-color-N1{background-color:#0A0F25;} + .d2-3353682460 .background-color-N2{background-color:#676C7E;} + .d2-3353682460 .background-color-N3{background-color:#9499AB;} + .d2-3353682460 .background-color-N4{background-color:#CFD2DD;} + .d2-3353682460 .background-color-N5{background-color:#DEE1EB;} + .d2-3353682460 .background-color-N6{background-color:#EEF1F8;} + .d2-3353682460 .background-color-N7{background-color:#FFFFFF;} + .d2-3353682460 .background-color-B1{background-color:#0D32B2;} + .d2-3353682460 .background-color-B2{background-color:#0D32B2;} + .d2-3353682460 .background-color-B3{background-color:#E3E9FD;} + .d2-3353682460 .background-color-B4{background-color:#E3E9FD;} + .d2-3353682460 .background-color-B5{background-color:#EDF0FD;} + .d2-3353682460 .background-color-B6{background-color:#F7F8FE;} + .d2-3353682460 .background-color-AA2{background-color:#4A6FF3;} + .d2-3353682460 .background-color-AA4{background-color:#EDF0FD;} + .d2-3353682460 .background-color-AA5{background-color:#F7F8FE;} + .d2-3353682460 .background-color-AB4{background-color:#EDF0FD;} + .d2-3353682460 .background-color-AB5{background-color:#F7F8FE;} + .d2-3353682460 .color-N1{color:#0A0F25;} + .d2-3353682460 .color-N2{color:#676C7E;} + .d2-3353682460 .color-N3{color:#9499AB;} + .d2-3353682460 .color-N4{color:#CFD2DD;} + .d2-3353682460 .color-N5{color:#DEE1EB;} + .d2-3353682460 .color-N6{color:#EEF1F8;} + .d2-3353682460 .color-N7{color:#FFFFFF;} + .d2-3353682460 .color-B1{color:#0D32B2;} + .d2-3353682460 .color-B2{color:#0D32B2;} + .d2-3353682460 .color-B3{color:#E3E9FD;} + .d2-3353682460 .color-B4{color:#E3E9FD;} + .d2-3353682460 .color-B5{color:#EDF0FD;} + .d2-3353682460 .color-B6{color:#F7F8FE;} + .d2-3353682460 .color-AA2{color:#4A6FF3;} + .d2-3353682460 .color-AA4{color:#EDF0FD;} + .d2-3353682460 .color-AA5{color:#F7F8FE;} + .d2-3353682460 .color-AB4{color:#EDF0FD;} + .d2-3353682460 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3353682460);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3353682460);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3353682460);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3353682460);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3353682460);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3353682460);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3353682460);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3353682460);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3353682460);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3353682460);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3353682460);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3353682460);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3353682460);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3353682460);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3353682460);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3353682460);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3353682460);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3353682460);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>SequenceSystemFileASystem StartsOkayAlright OneTwoThreeFourFiveSix OneTwoThreeFourFiveSixOneTwoOneTwoThreeFourFiveSixOneTwoThreeFourFiveSixOneTwoThreeFourFiveSix - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/elk/board.exp.json b/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/elk/board.exp.json index b944f929b..c3d0cd94b 100644 --- a/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/elk/board.exp.json +++ b/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -224,6 +237,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -266,6 +280,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -318,6 +333,7 @@ "labelHeight": 101, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 74, @@ -356,6 +372,7 @@ "labelHeight": 101, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 74, @@ -394,6 +411,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 74, @@ -432,6 +450,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 74, @@ -470,6 +489,7 @@ "labelHeight": 101, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 74, @@ -508,6 +528,7 @@ "labelHeight": 101, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 74, @@ -546,6 +567,7 @@ "labelHeight": 101, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 374, @@ -584,6 +606,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 74, @@ -622,6 +645,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 224, @@ -660,6 +684,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 374, @@ -691,6 +716,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/elk/sketch.exp.svg b/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/elk/sketch.exp.svg index 7a5cf479a..dde83edd6 100644 --- a/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -SequenceSystemFileASystem StartsOkayAlright OneTwoThreeFourFiveSix OneTwoThreeFourFiveSixOneTwoOneTwoThreeFourFiveSixOneTwoThreeFourFiveSixOneTwoThreeFourFiveSix + .d2-1338669961 .fill-N1{fill:#0A0F25;} + .d2-1338669961 .fill-N2{fill:#676C7E;} + .d2-1338669961 .fill-N3{fill:#9499AB;} + .d2-1338669961 .fill-N4{fill:#CFD2DD;} + .d2-1338669961 .fill-N5{fill:#DEE1EB;} + .d2-1338669961 .fill-N6{fill:#EEF1F8;} + .d2-1338669961 .fill-N7{fill:#FFFFFF;} + .d2-1338669961 .fill-B1{fill:#0D32B2;} + .d2-1338669961 .fill-B2{fill:#0D32B2;} + .d2-1338669961 .fill-B3{fill:#E3E9FD;} + .d2-1338669961 .fill-B4{fill:#E3E9FD;} + .d2-1338669961 .fill-B5{fill:#EDF0FD;} + .d2-1338669961 .fill-B6{fill:#F7F8FE;} + .d2-1338669961 .fill-AA2{fill:#4A6FF3;} + .d2-1338669961 .fill-AA4{fill:#EDF0FD;} + .d2-1338669961 .fill-AA5{fill:#F7F8FE;} + .d2-1338669961 .fill-AB4{fill:#EDF0FD;} + .d2-1338669961 .fill-AB5{fill:#F7F8FE;} + .d2-1338669961 .stroke-N1{stroke:#0A0F25;} + .d2-1338669961 .stroke-N2{stroke:#676C7E;} + .d2-1338669961 .stroke-N3{stroke:#9499AB;} + .d2-1338669961 .stroke-N4{stroke:#CFD2DD;} + .d2-1338669961 .stroke-N5{stroke:#DEE1EB;} + .d2-1338669961 .stroke-N6{stroke:#EEF1F8;} + .d2-1338669961 .stroke-N7{stroke:#FFFFFF;} + .d2-1338669961 .stroke-B1{stroke:#0D32B2;} + .d2-1338669961 .stroke-B2{stroke:#0D32B2;} + .d2-1338669961 .stroke-B3{stroke:#E3E9FD;} + .d2-1338669961 .stroke-B4{stroke:#E3E9FD;} + .d2-1338669961 .stroke-B5{stroke:#EDF0FD;} + .d2-1338669961 .stroke-B6{stroke:#F7F8FE;} + .d2-1338669961 .stroke-AA2{stroke:#4A6FF3;} + .d2-1338669961 .stroke-AA4{stroke:#EDF0FD;} + .d2-1338669961 .stroke-AA5{stroke:#F7F8FE;} + .d2-1338669961 .stroke-AB4{stroke:#EDF0FD;} + .d2-1338669961 .stroke-AB5{stroke:#F7F8FE;} + .d2-1338669961 .background-color-N1{background-color:#0A0F25;} + .d2-1338669961 .background-color-N2{background-color:#676C7E;} + .d2-1338669961 .background-color-N3{background-color:#9499AB;} + .d2-1338669961 .background-color-N4{background-color:#CFD2DD;} + .d2-1338669961 .background-color-N5{background-color:#DEE1EB;} + .d2-1338669961 .background-color-N6{background-color:#EEF1F8;} + .d2-1338669961 .background-color-N7{background-color:#FFFFFF;} + .d2-1338669961 .background-color-B1{background-color:#0D32B2;} + .d2-1338669961 .background-color-B2{background-color:#0D32B2;} + .d2-1338669961 .background-color-B3{background-color:#E3E9FD;} + .d2-1338669961 .background-color-B4{background-color:#E3E9FD;} + .d2-1338669961 .background-color-B5{background-color:#EDF0FD;} + .d2-1338669961 .background-color-B6{background-color:#F7F8FE;} + .d2-1338669961 .background-color-AA2{background-color:#4A6FF3;} + .d2-1338669961 .background-color-AA4{background-color:#EDF0FD;} + .d2-1338669961 .background-color-AA5{background-color:#F7F8FE;} + .d2-1338669961 .background-color-AB4{background-color:#EDF0FD;} + .d2-1338669961 .background-color-AB5{background-color:#F7F8FE;} + .d2-1338669961 .color-N1{color:#0A0F25;} + .d2-1338669961 .color-N2{color:#676C7E;} + .d2-1338669961 .color-N3{color:#9499AB;} + .d2-1338669961 .color-N4{color:#CFD2DD;} + .d2-1338669961 .color-N5{color:#DEE1EB;} + .d2-1338669961 .color-N6{color:#EEF1F8;} + .d2-1338669961 .color-N7{color:#FFFFFF;} + .d2-1338669961 .color-B1{color:#0D32B2;} + .d2-1338669961 .color-B2{color:#0D32B2;} + .d2-1338669961 .color-B3{color:#E3E9FD;} + .d2-1338669961 .color-B4{color:#E3E9FD;} + .d2-1338669961 .color-B5{color:#EDF0FD;} + .d2-1338669961 .color-B6{color:#F7F8FE;} + .d2-1338669961 .color-AA2{color:#4A6FF3;} + .d2-1338669961 .color-AA4{color:#EDF0FD;} + .d2-1338669961 .color-AA5{color:#F7F8FE;} + .d2-1338669961 .color-AB4{color:#EDF0FD;} + .d2-1338669961 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1338669961);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1338669961);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1338669961);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1338669961);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1338669961);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1338669961);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1338669961);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1338669961);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1338669961);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1338669961);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1338669961);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1338669961);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1338669961);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1338669961);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1338669961);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1338669961);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1338669961);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1338669961);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>SequenceSystemFileASystem StartsOkayAlright OneTwoThreeFourFiveSix OneTwoThreeFourFiveSixOneTwoOneTwoThreeFourFiveSixOneTwoThreeFourFiveSixOneTwoThreeFourFiveSix - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/sequence-fontsize/dagre/board.exp.json b/e2etests/testdata/txtar/sequence-fontsize/dagre/board.exp.json index f0a400628..3d2550fdb 100644 --- a/e2etests/testdata/txtar/sequence-fontsize/dagre/board.exp.json +++ b/e2etests/testdata/txtar/sequence-fontsize/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -181,6 +193,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -231,6 +244,7 @@ "labelHeight": 31, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 73.5, @@ -269,6 +283,7 @@ "labelHeight": 55, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 443, @@ -315,6 +330,7 @@ "labelHeight": 31, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 431, @@ -353,6 +369,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 67.5, @@ -391,6 +408,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 437, @@ -429,6 +447,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1319, @@ -460,6 +479,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/txtar/sequence-fontsize/dagre/sketch.exp.svg b/e2etests/testdata/txtar/sequence-fontsize/dagre/sketch.exp.svg index a21988f73..462e3000d 100644 --- a/e2etests/testdata/txtar/sequence-fontsize/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/sequence-fontsize/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -Front-EndLibreriaCD generatePresentationPayload()Generar y FirmarPrueba de TitularidadPrueba de TitularidadPrueba de TitularidadPrueba de TitularidadPresentacion Firmada + .d2-57674628 .fill-N1{fill:#0A0F25;} + .d2-57674628 .fill-N2{fill:#676C7E;} + .d2-57674628 .fill-N3{fill:#9499AB;} + .d2-57674628 .fill-N4{fill:#CFD2DD;} + .d2-57674628 .fill-N5{fill:#DEE1EB;} + .d2-57674628 .fill-N6{fill:#EEF1F8;} + .d2-57674628 .fill-N7{fill:#FFFFFF;} + .d2-57674628 .fill-B1{fill:#0D32B2;} + .d2-57674628 .fill-B2{fill:#0D32B2;} + .d2-57674628 .fill-B3{fill:#E3E9FD;} + .d2-57674628 .fill-B4{fill:#E3E9FD;} + .d2-57674628 .fill-B5{fill:#EDF0FD;} + .d2-57674628 .fill-B6{fill:#F7F8FE;} + .d2-57674628 .fill-AA2{fill:#4A6FF3;} + .d2-57674628 .fill-AA4{fill:#EDF0FD;} + .d2-57674628 .fill-AA5{fill:#F7F8FE;} + .d2-57674628 .fill-AB4{fill:#EDF0FD;} + .d2-57674628 .fill-AB5{fill:#F7F8FE;} + .d2-57674628 .stroke-N1{stroke:#0A0F25;} + .d2-57674628 .stroke-N2{stroke:#676C7E;} + .d2-57674628 .stroke-N3{stroke:#9499AB;} + .d2-57674628 .stroke-N4{stroke:#CFD2DD;} + .d2-57674628 .stroke-N5{stroke:#DEE1EB;} + .d2-57674628 .stroke-N6{stroke:#EEF1F8;} + .d2-57674628 .stroke-N7{stroke:#FFFFFF;} + .d2-57674628 .stroke-B1{stroke:#0D32B2;} + .d2-57674628 .stroke-B2{stroke:#0D32B2;} + .d2-57674628 .stroke-B3{stroke:#E3E9FD;} + .d2-57674628 .stroke-B4{stroke:#E3E9FD;} + .d2-57674628 .stroke-B5{stroke:#EDF0FD;} + .d2-57674628 .stroke-B6{stroke:#F7F8FE;} + .d2-57674628 .stroke-AA2{stroke:#4A6FF3;} + .d2-57674628 .stroke-AA4{stroke:#EDF0FD;} + .d2-57674628 .stroke-AA5{stroke:#F7F8FE;} + .d2-57674628 .stroke-AB4{stroke:#EDF0FD;} + .d2-57674628 .stroke-AB5{stroke:#F7F8FE;} + .d2-57674628 .background-color-N1{background-color:#0A0F25;} + .d2-57674628 .background-color-N2{background-color:#676C7E;} + .d2-57674628 .background-color-N3{background-color:#9499AB;} + .d2-57674628 .background-color-N4{background-color:#CFD2DD;} + .d2-57674628 .background-color-N5{background-color:#DEE1EB;} + .d2-57674628 .background-color-N6{background-color:#EEF1F8;} + .d2-57674628 .background-color-N7{background-color:#FFFFFF;} + .d2-57674628 .background-color-B1{background-color:#0D32B2;} + .d2-57674628 .background-color-B2{background-color:#0D32B2;} + .d2-57674628 .background-color-B3{background-color:#E3E9FD;} + .d2-57674628 .background-color-B4{background-color:#E3E9FD;} + .d2-57674628 .background-color-B5{background-color:#EDF0FD;} + .d2-57674628 .background-color-B6{background-color:#F7F8FE;} + .d2-57674628 .background-color-AA2{background-color:#4A6FF3;} + .d2-57674628 .background-color-AA4{background-color:#EDF0FD;} + .d2-57674628 .background-color-AA5{background-color:#F7F8FE;} + .d2-57674628 .background-color-AB4{background-color:#EDF0FD;} + .d2-57674628 .background-color-AB5{background-color:#F7F8FE;} + .d2-57674628 .color-N1{color:#0A0F25;} + .d2-57674628 .color-N2{color:#676C7E;} + .d2-57674628 .color-N3{color:#9499AB;} + .d2-57674628 .color-N4{color:#CFD2DD;} + .d2-57674628 .color-N5{color:#DEE1EB;} + .d2-57674628 .color-N6{color:#EEF1F8;} + .d2-57674628 .color-N7{color:#FFFFFF;} + .d2-57674628 .color-B1{color:#0D32B2;} + .d2-57674628 .color-B2{color:#0D32B2;} + .d2-57674628 .color-B3{color:#E3E9FD;} + .d2-57674628 .color-B4{color:#E3E9FD;} + .d2-57674628 .color-B5{color:#EDF0FD;} + .d2-57674628 .color-B6{color:#F7F8FE;} + .d2-57674628 .color-AA2{color:#4A6FF3;} + .d2-57674628 .color-AA4{color:#EDF0FD;} + .d2-57674628 .color-AA5{color:#F7F8FE;} + .d2-57674628 .color-AB4{color:#EDF0FD;} + .d2-57674628 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-57674628);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-57674628);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-57674628);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-57674628);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-57674628);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-57674628);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-57674628);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-57674628);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-57674628);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-57674628);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-57674628);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-57674628);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-57674628);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-57674628);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-57674628);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-57674628);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-57674628);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-57674628);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>Front-EndLibreriaCD generatePresentationPayload()Generar y FirmarPrueba de TitularidadPrueba de TitularidadPrueba de TitularidadPrueba de TitularidadPresentacion Firmada - - - - - - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/sequence-fontsize/elk/board.exp.json b/e2etests/testdata/txtar/sequence-fontsize/elk/board.exp.json index f0a400628..3d2550fdb 100644 --- a/e2etests/testdata/txtar/sequence-fontsize/elk/board.exp.json +++ b/e2etests/testdata/txtar/sequence-fontsize/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -181,6 +193,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -231,6 +244,7 @@ "labelHeight": 31, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 73.5, @@ -269,6 +283,7 @@ "labelHeight": 55, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 443, @@ -315,6 +330,7 @@ "labelHeight": 31, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 431, @@ -353,6 +369,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 67.5, @@ -391,6 +408,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 437, @@ -429,6 +447,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1319, @@ -460,6 +479,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/txtar/sequence-fontsize/elk/sketch.exp.svg b/e2etests/testdata/txtar/sequence-fontsize/elk/sketch.exp.svg index a21988f73..462e3000d 100644 --- a/e2etests/testdata/txtar/sequence-fontsize/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/sequence-fontsize/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -Front-EndLibreriaCD generatePresentationPayload()Generar y FirmarPrueba de TitularidadPrueba de TitularidadPrueba de TitularidadPrueba de TitularidadPresentacion Firmada + .d2-57674628 .fill-N1{fill:#0A0F25;} + .d2-57674628 .fill-N2{fill:#676C7E;} + .d2-57674628 .fill-N3{fill:#9499AB;} + .d2-57674628 .fill-N4{fill:#CFD2DD;} + .d2-57674628 .fill-N5{fill:#DEE1EB;} + .d2-57674628 .fill-N6{fill:#EEF1F8;} + .d2-57674628 .fill-N7{fill:#FFFFFF;} + .d2-57674628 .fill-B1{fill:#0D32B2;} + .d2-57674628 .fill-B2{fill:#0D32B2;} + .d2-57674628 .fill-B3{fill:#E3E9FD;} + .d2-57674628 .fill-B4{fill:#E3E9FD;} + .d2-57674628 .fill-B5{fill:#EDF0FD;} + .d2-57674628 .fill-B6{fill:#F7F8FE;} + .d2-57674628 .fill-AA2{fill:#4A6FF3;} + .d2-57674628 .fill-AA4{fill:#EDF0FD;} + .d2-57674628 .fill-AA5{fill:#F7F8FE;} + .d2-57674628 .fill-AB4{fill:#EDF0FD;} + .d2-57674628 .fill-AB5{fill:#F7F8FE;} + .d2-57674628 .stroke-N1{stroke:#0A0F25;} + .d2-57674628 .stroke-N2{stroke:#676C7E;} + .d2-57674628 .stroke-N3{stroke:#9499AB;} + .d2-57674628 .stroke-N4{stroke:#CFD2DD;} + .d2-57674628 .stroke-N5{stroke:#DEE1EB;} + .d2-57674628 .stroke-N6{stroke:#EEF1F8;} + .d2-57674628 .stroke-N7{stroke:#FFFFFF;} + .d2-57674628 .stroke-B1{stroke:#0D32B2;} + .d2-57674628 .stroke-B2{stroke:#0D32B2;} + .d2-57674628 .stroke-B3{stroke:#E3E9FD;} + .d2-57674628 .stroke-B4{stroke:#E3E9FD;} + .d2-57674628 .stroke-B5{stroke:#EDF0FD;} + .d2-57674628 .stroke-B6{stroke:#F7F8FE;} + .d2-57674628 .stroke-AA2{stroke:#4A6FF3;} + .d2-57674628 .stroke-AA4{stroke:#EDF0FD;} + .d2-57674628 .stroke-AA5{stroke:#F7F8FE;} + .d2-57674628 .stroke-AB4{stroke:#EDF0FD;} + .d2-57674628 .stroke-AB5{stroke:#F7F8FE;} + .d2-57674628 .background-color-N1{background-color:#0A0F25;} + .d2-57674628 .background-color-N2{background-color:#676C7E;} + .d2-57674628 .background-color-N3{background-color:#9499AB;} + .d2-57674628 .background-color-N4{background-color:#CFD2DD;} + .d2-57674628 .background-color-N5{background-color:#DEE1EB;} + .d2-57674628 .background-color-N6{background-color:#EEF1F8;} + .d2-57674628 .background-color-N7{background-color:#FFFFFF;} + .d2-57674628 .background-color-B1{background-color:#0D32B2;} + .d2-57674628 .background-color-B2{background-color:#0D32B2;} + .d2-57674628 .background-color-B3{background-color:#E3E9FD;} + .d2-57674628 .background-color-B4{background-color:#E3E9FD;} + .d2-57674628 .background-color-B5{background-color:#EDF0FD;} + .d2-57674628 .background-color-B6{background-color:#F7F8FE;} + .d2-57674628 .background-color-AA2{background-color:#4A6FF3;} + .d2-57674628 .background-color-AA4{background-color:#EDF0FD;} + .d2-57674628 .background-color-AA5{background-color:#F7F8FE;} + .d2-57674628 .background-color-AB4{background-color:#EDF0FD;} + .d2-57674628 .background-color-AB5{background-color:#F7F8FE;} + .d2-57674628 .color-N1{color:#0A0F25;} + .d2-57674628 .color-N2{color:#676C7E;} + .d2-57674628 .color-N3{color:#9499AB;} + .d2-57674628 .color-N4{color:#CFD2DD;} + .d2-57674628 .color-N5{color:#DEE1EB;} + .d2-57674628 .color-N6{color:#EEF1F8;} + .d2-57674628 .color-N7{color:#FFFFFF;} + .d2-57674628 .color-B1{color:#0D32B2;} + .d2-57674628 .color-B2{color:#0D32B2;} + .d2-57674628 .color-B3{color:#E3E9FD;} + .d2-57674628 .color-B4{color:#E3E9FD;} + .d2-57674628 .color-B5{color:#EDF0FD;} + .d2-57674628 .color-B6{color:#F7F8FE;} + .d2-57674628 .color-AA2{color:#4A6FF3;} + .d2-57674628 .color-AA4{color:#EDF0FD;} + .d2-57674628 .color-AA5{color:#F7F8FE;} + .d2-57674628 .color-AB4{color:#EDF0FD;} + .d2-57674628 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-57674628);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-57674628);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-57674628);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-57674628);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-57674628);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-57674628);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-57674628);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-57674628);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-57674628);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-57674628);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-57674628);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-57674628);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-57674628);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-57674628);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-57674628);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-57674628);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-57674628);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-57674628);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>Front-EndLibreriaCD generatePresentationPayload()Generar y FirmarPrueba de TitularidadPrueba de TitularidadPrueba de TitularidadPrueba de TitularidadPresentacion Firmada - - - - - - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/sequence-multiline-alignment/dagre/board.exp.json b/e2etests/testdata/txtar/sequence-multiline-alignment/dagre/board.exp.json index cbedac69f..2de7aa76d 100644 --- a/e2etests/testdata/txtar/sequence-multiline-alignment/dagre/board.exp.json +++ b/e2etests/testdata/txtar/sequence-multiline-alignment/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -150,6 +161,7 @@ "labelHeight": 85, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -196,6 +208,7 @@ "labelHeight": 85, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -242,6 +255,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -280,6 +294,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -318,6 +333,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -349,6 +365,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/txtar/sequence-multiline-alignment/dagre/sketch.exp.svg b/e2etests/testdata/txtar/sequence-multiline-alignment/dagre/sketch.exp.svg index 980d3f1ea..36472a761 100644 --- a/e2etests/testdata/txtar/sequence-multiline-alignment/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/sequence-multiline-alignment/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -ab onetwothreefourfiveonetwothreefourfiveokay then + .d2-2062901114 .fill-N1{fill:#0A0F25;} + .d2-2062901114 .fill-N2{fill:#676C7E;} + .d2-2062901114 .fill-N3{fill:#9499AB;} + .d2-2062901114 .fill-N4{fill:#CFD2DD;} + .d2-2062901114 .fill-N5{fill:#DEE1EB;} + .d2-2062901114 .fill-N6{fill:#EEF1F8;} + .d2-2062901114 .fill-N7{fill:#FFFFFF;} + .d2-2062901114 .fill-B1{fill:#0D32B2;} + .d2-2062901114 .fill-B2{fill:#0D32B2;} + .d2-2062901114 .fill-B3{fill:#E3E9FD;} + .d2-2062901114 .fill-B4{fill:#E3E9FD;} + .d2-2062901114 .fill-B5{fill:#EDF0FD;} + .d2-2062901114 .fill-B6{fill:#F7F8FE;} + .d2-2062901114 .fill-AA2{fill:#4A6FF3;} + .d2-2062901114 .fill-AA4{fill:#EDF0FD;} + .d2-2062901114 .fill-AA5{fill:#F7F8FE;} + .d2-2062901114 .fill-AB4{fill:#EDF0FD;} + .d2-2062901114 .fill-AB5{fill:#F7F8FE;} + .d2-2062901114 .stroke-N1{stroke:#0A0F25;} + .d2-2062901114 .stroke-N2{stroke:#676C7E;} + .d2-2062901114 .stroke-N3{stroke:#9499AB;} + .d2-2062901114 .stroke-N4{stroke:#CFD2DD;} + .d2-2062901114 .stroke-N5{stroke:#DEE1EB;} + .d2-2062901114 .stroke-N6{stroke:#EEF1F8;} + .d2-2062901114 .stroke-N7{stroke:#FFFFFF;} + .d2-2062901114 .stroke-B1{stroke:#0D32B2;} + .d2-2062901114 .stroke-B2{stroke:#0D32B2;} + .d2-2062901114 .stroke-B3{stroke:#E3E9FD;} + .d2-2062901114 .stroke-B4{stroke:#E3E9FD;} + .d2-2062901114 .stroke-B5{stroke:#EDF0FD;} + .d2-2062901114 .stroke-B6{stroke:#F7F8FE;} + .d2-2062901114 .stroke-AA2{stroke:#4A6FF3;} + .d2-2062901114 .stroke-AA4{stroke:#EDF0FD;} + .d2-2062901114 .stroke-AA5{stroke:#F7F8FE;} + .d2-2062901114 .stroke-AB4{stroke:#EDF0FD;} + .d2-2062901114 .stroke-AB5{stroke:#F7F8FE;} + .d2-2062901114 .background-color-N1{background-color:#0A0F25;} + .d2-2062901114 .background-color-N2{background-color:#676C7E;} + .d2-2062901114 .background-color-N3{background-color:#9499AB;} + .d2-2062901114 .background-color-N4{background-color:#CFD2DD;} + .d2-2062901114 .background-color-N5{background-color:#DEE1EB;} + .d2-2062901114 .background-color-N6{background-color:#EEF1F8;} + .d2-2062901114 .background-color-N7{background-color:#FFFFFF;} + .d2-2062901114 .background-color-B1{background-color:#0D32B2;} + .d2-2062901114 .background-color-B2{background-color:#0D32B2;} + .d2-2062901114 .background-color-B3{background-color:#E3E9FD;} + .d2-2062901114 .background-color-B4{background-color:#E3E9FD;} + .d2-2062901114 .background-color-B5{background-color:#EDF0FD;} + .d2-2062901114 .background-color-B6{background-color:#F7F8FE;} + .d2-2062901114 .background-color-AA2{background-color:#4A6FF3;} + .d2-2062901114 .background-color-AA4{background-color:#EDF0FD;} + .d2-2062901114 .background-color-AA5{background-color:#F7F8FE;} + .d2-2062901114 .background-color-AB4{background-color:#EDF0FD;} + .d2-2062901114 .background-color-AB5{background-color:#F7F8FE;} + .d2-2062901114 .color-N1{color:#0A0F25;} + .d2-2062901114 .color-N2{color:#676C7E;} + .d2-2062901114 .color-N3{color:#9499AB;} + .d2-2062901114 .color-N4{color:#CFD2DD;} + .d2-2062901114 .color-N5{color:#DEE1EB;} + .d2-2062901114 .color-N6{color:#EEF1F8;} + .d2-2062901114 .color-N7{color:#FFFFFF;} + .d2-2062901114 .color-B1{color:#0D32B2;} + .d2-2062901114 .color-B2{color:#0D32B2;} + .d2-2062901114 .color-B3{color:#E3E9FD;} + .d2-2062901114 .color-B4{color:#E3E9FD;} + .d2-2062901114 .color-B5{color:#EDF0FD;} + .d2-2062901114 .color-B6{color:#F7F8FE;} + .d2-2062901114 .color-AA2{color:#4A6FF3;} + .d2-2062901114 .color-AA4{color:#EDF0FD;} + .d2-2062901114 .color-AA5{color:#F7F8FE;} + .d2-2062901114 .color-AB4{color:#EDF0FD;} + .d2-2062901114 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2062901114);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2062901114);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2062901114);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2062901114);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2062901114);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2062901114);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2062901114);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2062901114);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2062901114);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2062901114);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2062901114);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2062901114);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2062901114);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2062901114);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2062901114);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2062901114);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2062901114);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2062901114);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ab onetwothreefourfiveonetwothreefourfiveokay then - - - - - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/sequence-multiline-alignment/elk/board.exp.json b/e2etests/testdata/txtar/sequence-multiline-alignment/elk/board.exp.json index cbedac69f..2de7aa76d 100644 --- a/e2etests/testdata/txtar/sequence-multiline-alignment/elk/board.exp.json +++ b/e2etests/testdata/txtar/sequence-multiline-alignment/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -150,6 +161,7 @@ "labelHeight": 85, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -196,6 +208,7 @@ "labelHeight": 85, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -242,6 +255,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -280,6 +294,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -318,6 +333,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -349,6 +365,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/txtar/sequence-multiline-alignment/elk/sketch.exp.svg b/e2etests/testdata/txtar/sequence-multiline-alignment/elk/sketch.exp.svg index 980d3f1ea..36472a761 100644 --- a/e2etests/testdata/txtar/sequence-multiline-alignment/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/sequence-multiline-alignment/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -ab onetwothreefourfiveonetwothreefourfiveokay then + .d2-2062901114 .fill-N1{fill:#0A0F25;} + .d2-2062901114 .fill-N2{fill:#676C7E;} + .d2-2062901114 .fill-N3{fill:#9499AB;} + .d2-2062901114 .fill-N4{fill:#CFD2DD;} + .d2-2062901114 .fill-N5{fill:#DEE1EB;} + .d2-2062901114 .fill-N6{fill:#EEF1F8;} + .d2-2062901114 .fill-N7{fill:#FFFFFF;} + .d2-2062901114 .fill-B1{fill:#0D32B2;} + .d2-2062901114 .fill-B2{fill:#0D32B2;} + .d2-2062901114 .fill-B3{fill:#E3E9FD;} + .d2-2062901114 .fill-B4{fill:#E3E9FD;} + .d2-2062901114 .fill-B5{fill:#EDF0FD;} + .d2-2062901114 .fill-B6{fill:#F7F8FE;} + .d2-2062901114 .fill-AA2{fill:#4A6FF3;} + .d2-2062901114 .fill-AA4{fill:#EDF0FD;} + .d2-2062901114 .fill-AA5{fill:#F7F8FE;} + .d2-2062901114 .fill-AB4{fill:#EDF0FD;} + .d2-2062901114 .fill-AB5{fill:#F7F8FE;} + .d2-2062901114 .stroke-N1{stroke:#0A0F25;} + .d2-2062901114 .stroke-N2{stroke:#676C7E;} + .d2-2062901114 .stroke-N3{stroke:#9499AB;} + .d2-2062901114 .stroke-N4{stroke:#CFD2DD;} + .d2-2062901114 .stroke-N5{stroke:#DEE1EB;} + .d2-2062901114 .stroke-N6{stroke:#EEF1F8;} + .d2-2062901114 .stroke-N7{stroke:#FFFFFF;} + .d2-2062901114 .stroke-B1{stroke:#0D32B2;} + .d2-2062901114 .stroke-B2{stroke:#0D32B2;} + .d2-2062901114 .stroke-B3{stroke:#E3E9FD;} + .d2-2062901114 .stroke-B4{stroke:#E3E9FD;} + .d2-2062901114 .stroke-B5{stroke:#EDF0FD;} + .d2-2062901114 .stroke-B6{stroke:#F7F8FE;} + .d2-2062901114 .stroke-AA2{stroke:#4A6FF3;} + .d2-2062901114 .stroke-AA4{stroke:#EDF0FD;} + .d2-2062901114 .stroke-AA5{stroke:#F7F8FE;} + .d2-2062901114 .stroke-AB4{stroke:#EDF0FD;} + .d2-2062901114 .stroke-AB5{stroke:#F7F8FE;} + .d2-2062901114 .background-color-N1{background-color:#0A0F25;} + .d2-2062901114 .background-color-N2{background-color:#676C7E;} + .d2-2062901114 .background-color-N3{background-color:#9499AB;} + .d2-2062901114 .background-color-N4{background-color:#CFD2DD;} + .d2-2062901114 .background-color-N5{background-color:#DEE1EB;} + .d2-2062901114 .background-color-N6{background-color:#EEF1F8;} + .d2-2062901114 .background-color-N7{background-color:#FFFFFF;} + .d2-2062901114 .background-color-B1{background-color:#0D32B2;} + .d2-2062901114 .background-color-B2{background-color:#0D32B2;} + .d2-2062901114 .background-color-B3{background-color:#E3E9FD;} + .d2-2062901114 .background-color-B4{background-color:#E3E9FD;} + .d2-2062901114 .background-color-B5{background-color:#EDF0FD;} + .d2-2062901114 .background-color-B6{background-color:#F7F8FE;} + .d2-2062901114 .background-color-AA2{background-color:#4A6FF3;} + .d2-2062901114 .background-color-AA4{background-color:#EDF0FD;} + .d2-2062901114 .background-color-AA5{background-color:#F7F8FE;} + .d2-2062901114 .background-color-AB4{background-color:#EDF0FD;} + .d2-2062901114 .background-color-AB5{background-color:#F7F8FE;} + .d2-2062901114 .color-N1{color:#0A0F25;} + .d2-2062901114 .color-N2{color:#676C7E;} + .d2-2062901114 .color-N3{color:#9499AB;} + .d2-2062901114 .color-N4{color:#CFD2DD;} + .d2-2062901114 .color-N5{color:#DEE1EB;} + .d2-2062901114 .color-N6{color:#EEF1F8;} + .d2-2062901114 .color-N7{color:#FFFFFF;} + .d2-2062901114 .color-B1{color:#0D32B2;} + .d2-2062901114 .color-B2{color:#0D32B2;} + .d2-2062901114 .color-B3{color:#E3E9FD;} + .d2-2062901114 .color-B4{color:#E3E9FD;} + .d2-2062901114 .color-B5{color:#EDF0FD;} + .d2-2062901114 .color-B6{color:#F7F8FE;} + .d2-2062901114 .color-AA2{color:#4A6FF3;} + .d2-2062901114 .color-AA4{color:#EDF0FD;} + .d2-2062901114 .color-AA5{color:#F7F8FE;} + .d2-2062901114 .color-AB4{color:#EDF0FD;} + .d2-2062901114 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2062901114);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2062901114);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2062901114);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2062901114);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2062901114);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2062901114);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2062901114);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2062901114);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2062901114);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2062901114);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2062901114);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2062901114);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2062901114);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2062901114);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2062901114);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2062901114);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2062901114);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2062901114);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ab onetwothreefourfiveonetwothreefourfiveokay then - - - - - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/sequence-multiline-label/dagre/board.exp.json b/e2etests/testdata/txtar/sequence-multiline-label/dagre/board.exp.json index 893b593a7..30604a52f 100644 --- a/e2etests/testdata/txtar/sequence-multiline-label/dagre/board.exp.json +++ b/e2etests/testdata/txtar/sequence-multiline-label/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -110,6 +120,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -148,6 +159,7 @@ "labelHeight": 165, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -186,6 +198,7 @@ "labelHeight": 85, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -224,6 +237,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -262,6 +276,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -293,6 +308,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/txtar/sequence-multiline-label/dagre/sketch.exp.svg b/e2etests/testdata/txtar/sequence-multiline-label/dagre/sketch.exp.svg index 0663a148a..bcc905144 100644 --- a/e2etests/testdata/txtar/sequence-multiline-label/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/sequence-multiline-label/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -ab okay thenonetwothreefourfivesixseveneightninetenonetwothreefourfive + .d2-3342678723 .fill-N1{fill:#0A0F25;} + .d2-3342678723 .fill-N2{fill:#676C7E;} + .d2-3342678723 .fill-N3{fill:#9499AB;} + .d2-3342678723 .fill-N4{fill:#CFD2DD;} + .d2-3342678723 .fill-N5{fill:#DEE1EB;} + .d2-3342678723 .fill-N6{fill:#EEF1F8;} + .d2-3342678723 .fill-N7{fill:#FFFFFF;} + .d2-3342678723 .fill-B1{fill:#0D32B2;} + .d2-3342678723 .fill-B2{fill:#0D32B2;} + .d2-3342678723 .fill-B3{fill:#E3E9FD;} + .d2-3342678723 .fill-B4{fill:#E3E9FD;} + .d2-3342678723 .fill-B5{fill:#EDF0FD;} + .d2-3342678723 .fill-B6{fill:#F7F8FE;} + .d2-3342678723 .fill-AA2{fill:#4A6FF3;} + .d2-3342678723 .fill-AA4{fill:#EDF0FD;} + .d2-3342678723 .fill-AA5{fill:#F7F8FE;} + .d2-3342678723 .fill-AB4{fill:#EDF0FD;} + .d2-3342678723 .fill-AB5{fill:#F7F8FE;} + .d2-3342678723 .stroke-N1{stroke:#0A0F25;} + .d2-3342678723 .stroke-N2{stroke:#676C7E;} + .d2-3342678723 .stroke-N3{stroke:#9499AB;} + .d2-3342678723 .stroke-N4{stroke:#CFD2DD;} + .d2-3342678723 .stroke-N5{stroke:#DEE1EB;} + .d2-3342678723 .stroke-N6{stroke:#EEF1F8;} + .d2-3342678723 .stroke-N7{stroke:#FFFFFF;} + .d2-3342678723 .stroke-B1{stroke:#0D32B2;} + .d2-3342678723 .stroke-B2{stroke:#0D32B2;} + .d2-3342678723 .stroke-B3{stroke:#E3E9FD;} + .d2-3342678723 .stroke-B4{stroke:#E3E9FD;} + .d2-3342678723 .stroke-B5{stroke:#EDF0FD;} + .d2-3342678723 .stroke-B6{stroke:#F7F8FE;} + .d2-3342678723 .stroke-AA2{stroke:#4A6FF3;} + .d2-3342678723 .stroke-AA4{stroke:#EDF0FD;} + .d2-3342678723 .stroke-AA5{stroke:#F7F8FE;} + .d2-3342678723 .stroke-AB4{stroke:#EDF0FD;} + .d2-3342678723 .stroke-AB5{stroke:#F7F8FE;} + .d2-3342678723 .background-color-N1{background-color:#0A0F25;} + .d2-3342678723 .background-color-N2{background-color:#676C7E;} + .d2-3342678723 .background-color-N3{background-color:#9499AB;} + .d2-3342678723 .background-color-N4{background-color:#CFD2DD;} + .d2-3342678723 .background-color-N5{background-color:#DEE1EB;} + .d2-3342678723 .background-color-N6{background-color:#EEF1F8;} + .d2-3342678723 .background-color-N7{background-color:#FFFFFF;} + .d2-3342678723 .background-color-B1{background-color:#0D32B2;} + .d2-3342678723 .background-color-B2{background-color:#0D32B2;} + .d2-3342678723 .background-color-B3{background-color:#E3E9FD;} + .d2-3342678723 .background-color-B4{background-color:#E3E9FD;} + .d2-3342678723 .background-color-B5{background-color:#EDF0FD;} + .d2-3342678723 .background-color-B6{background-color:#F7F8FE;} + .d2-3342678723 .background-color-AA2{background-color:#4A6FF3;} + .d2-3342678723 .background-color-AA4{background-color:#EDF0FD;} + .d2-3342678723 .background-color-AA5{background-color:#F7F8FE;} + .d2-3342678723 .background-color-AB4{background-color:#EDF0FD;} + .d2-3342678723 .background-color-AB5{background-color:#F7F8FE;} + .d2-3342678723 .color-N1{color:#0A0F25;} + .d2-3342678723 .color-N2{color:#676C7E;} + .d2-3342678723 .color-N3{color:#9499AB;} + .d2-3342678723 .color-N4{color:#CFD2DD;} + .d2-3342678723 .color-N5{color:#DEE1EB;} + .d2-3342678723 .color-N6{color:#EEF1F8;} + .d2-3342678723 .color-N7{color:#FFFFFF;} + .d2-3342678723 .color-B1{color:#0D32B2;} + .d2-3342678723 .color-B2{color:#0D32B2;} + .d2-3342678723 .color-B3{color:#E3E9FD;} + .d2-3342678723 .color-B4{color:#E3E9FD;} + .d2-3342678723 .color-B5{color:#EDF0FD;} + .d2-3342678723 .color-B6{color:#F7F8FE;} + .d2-3342678723 .color-AA2{color:#4A6FF3;} + .d2-3342678723 .color-AA4{color:#EDF0FD;} + .d2-3342678723 .color-AA5{color:#F7F8FE;} + .d2-3342678723 .color-AB4{color:#EDF0FD;} + .d2-3342678723 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3342678723);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3342678723);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3342678723);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3342678723);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3342678723);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3342678723);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3342678723);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3342678723);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3342678723);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3342678723);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3342678723);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3342678723);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3342678723);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3342678723);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3342678723);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3342678723);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3342678723);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3342678723);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ab okay thenonetwothreefourfivesixseveneightninetenonetwothreefourfive - - - - - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/sequence-multiline-label/elk/board.exp.json b/e2etests/testdata/txtar/sequence-multiline-label/elk/board.exp.json index 893b593a7..30604a52f 100644 --- a/e2etests/testdata/txtar/sequence-multiline-label/elk/board.exp.json +++ b/e2etests/testdata/txtar/sequence-multiline-label/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -110,6 +120,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -148,6 +159,7 @@ "labelHeight": 165, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -186,6 +198,7 @@ "labelHeight": 85, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -224,6 +237,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -262,6 +276,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -293,6 +308,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/txtar/sequence-multiline-label/elk/sketch.exp.svg b/e2etests/testdata/txtar/sequence-multiline-label/elk/sketch.exp.svg index 0663a148a..bcc905144 100644 --- a/e2etests/testdata/txtar/sequence-multiline-label/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/sequence-multiline-label/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -ab okay thenonetwothreefourfivesixseveneightninetenonetwothreefourfive + .d2-3342678723 .fill-N1{fill:#0A0F25;} + .d2-3342678723 .fill-N2{fill:#676C7E;} + .d2-3342678723 .fill-N3{fill:#9499AB;} + .d2-3342678723 .fill-N4{fill:#CFD2DD;} + .d2-3342678723 .fill-N5{fill:#DEE1EB;} + .d2-3342678723 .fill-N6{fill:#EEF1F8;} + .d2-3342678723 .fill-N7{fill:#FFFFFF;} + .d2-3342678723 .fill-B1{fill:#0D32B2;} + .d2-3342678723 .fill-B2{fill:#0D32B2;} + .d2-3342678723 .fill-B3{fill:#E3E9FD;} + .d2-3342678723 .fill-B4{fill:#E3E9FD;} + .d2-3342678723 .fill-B5{fill:#EDF0FD;} + .d2-3342678723 .fill-B6{fill:#F7F8FE;} + .d2-3342678723 .fill-AA2{fill:#4A6FF3;} + .d2-3342678723 .fill-AA4{fill:#EDF0FD;} + .d2-3342678723 .fill-AA5{fill:#F7F8FE;} + .d2-3342678723 .fill-AB4{fill:#EDF0FD;} + .d2-3342678723 .fill-AB5{fill:#F7F8FE;} + .d2-3342678723 .stroke-N1{stroke:#0A0F25;} + .d2-3342678723 .stroke-N2{stroke:#676C7E;} + .d2-3342678723 .stroke-N3{stroke:#9499AB;} + .d2-3342678723 .stroke-N4{stroke:#CFD2DD;} + .d2-3342678723 .stroke-N5{stroke:#DEE1EB;} + .d2-3342678723 .stroke-N6{stroke:#EEF1F8;} + .d2-3342678723 .stroke-N7{stroke:#FFFFFF;} + .d2-3342678723 .stroke-B1{stroke:#0D32B2;} + .d2-3342678723 .stroke-B2{stroke:#0D32B2;} + .d2-3342678723 .stroke-B3{stroke:#E3E9FD;} + .d2-3342678723 .stroke-B4{stroke:#E3E9FD;} + .d2-3342678723 .stroke-B5{stroke:#EDF0FD;} + .d2-3342678723 .stroke-B6{stroke:#F7F8FE;} + .d2-3342678723 .stroke-AA2{stroke:#4A6FF3;} + .d2-3342678723 .stroke-AA4{stroke:#EDF0FD;} + .d2-3342678723 .stroke-AA5{stroke:#F7F8FE;} + .d2-3342678723 .stroke-AB4{stroke:#EDF0FD;} + .d2-3342678723 .stroke-AB5{stroke:#F7F8FE;} + .d2-3342678723 .background-color-N1{background-color:#0A0F25;} + .d2-3342678723 .background-color-N2{background-color:#676C7E;} + .d2-3342678723 .background-color-N3{background-color:#9499AB;} + .d2-3342678723 .background-color-N4{background-color:#CFD2DD;} + .d2-3342678723 .background-color-N5{background-color:#DEE1EB;} + .d2-3342678723 .background-color-N6{background-color:#EEF1F8;} + .d2-3342678723 .background-color-N7{background-color:#FFFFFF;} + .d2-3342678723 .background-color-B1{background-color:#0D32B2;} + .d2-3342678723 .background-color-B2{background-color:#0D32B2;} + .d2-3342678723 .background-color-B3{background-color:#E3E9FD;} + .d2-3342678723 .background-color-B4{background-color:#E3E9FD;} + .d2-3342678723 .background-color-B5{background-color:#EDF0FD;} + .d2-3342678723 .background-color-B6{background-color:#F7F8FE;} + .d2-3342678723 .background-color-AA2{background-color:#4A6FF3;} + .d2-3342678723 .background-color-AA4{background-color:#EDF0FD;} + .d2-3342678723 .background-color-AA5{background-color:#F7F8FE;} + .d2-3342678723 .background-color-AB4{background-color:#EDF0FD;} + .d2-3342678723 .background-color-AB5{background-color:#F7F8FE;} + .d2-3342678723 .color-N1{color:#0A0F25;} + .d2-3342678723 .color-N2{color:#676C7E;} + .d2-3342678723 .color-N3{color:#9499AB;} + .d2-3342678723 .color-N4{color:#CFD2DD;} + .d2-3342678723 .color-N5{color:#DEE1EB;} + .d2-3342678723 .color-N6{color:#EEF1F8;} + .d2-3342678723 .color-N7{color:#FFFFFF;} + .d2-3342678723 .color-B1{color:#0D32B2;} + .d2-3342678723 .color-B2{color:#0D32B2;} + .d2-3342678723 .color-B3{color:#E3E9FD;} + .d2-3342678723 .color-B4{color:#E3E9FD;} + .d2-3342678723 .color-B5{color:#EDF0FD;} + .d2-3342678723 .color-B6{color:#F7F8FE;} + .d2-3342678723 .color-AA2{color:#4A6FF3;} + .d2-3342678723 .color-AA4{color:#EDF0FD;} + .d2-3342678723 .color-AA5{color:#F7F8FE;} + .d2-3342678723 .color-AB4{color:#EDF0FD;} + .d2-3342678723 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3342678723);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3342678723);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3342678723);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3342678723);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3342678723);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3342678723);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3342678723);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3342678723);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3342678723);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3342678723);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3342678723);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3342678723);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3342678723);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3342678723);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3342678723);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3342678723);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3342678723);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3342678723);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ab okay thenonetwothreefourfivesixseveneightninetenonetwothreefourfive - - - - - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/sequence-multiline-self-reference/dagre/board.exp.json b/e2etests/testdata/txtar/sequence-multiline-self-reference/dagre/board.exp.json index 4e415a14b..a04adc74d 100644 --- a/e2etests/testdata/txtar/sequence-multiline-self-reference/dagre/board.exp.json +++ b/e2etests/testdata/txtar/sequence-multiline-self-reference/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -110,6 +120,7 @@ "labelHeight": 53, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -156,6 +167,7 @@ "labelHeight": 37, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -202,6 +214,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -240,6 +253,7 @@ "labelHeight": 53, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 343, @@ -286,6 +300,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -324,6 +339,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 343, @@ -355,6 +371,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/txtar/sequence-multiline-self-reference/dagre/sketch.exp.svg b/e2etests/testdata/txtar/sequence-multiline-self-reference/dagre/sketch.exp.svg index e5fd5df8f..d1d5bf46f 100644 --- a/e2etests/testdata/txtar/sequence-multiline-self-reference/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/sequence-multiline-self-reference/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -xy self referential long description which ismultirow3 rowsself referential long description which ismultirownormalself referential long description which ismultirow3 rows + .d2-56193913 .fill-N1{fill:#0A0F25;} + .d2-56193913 .fill-N2{fill:#676C7E;} + .d2-56193913 .fill-N3{fill:#9499AB;} + .d2-56193913 .fill-N4{fill:#CFD2DD;} + .d2-56193913 .fill-N5{fill:#DEE1EB;} + .d2-56193913 .fill-N6{fill:#EEF1F8;} + .d2-56193913 .fill-N7{fill:#FFFFFF;} + .d2-56193913 .fill-B1{fill:#0D32B2;} + .d2-56193913 .fill-B2{fill:#0D32B2;} + .d2-56193913 .fill-B3{fill:#E3E9FD;} + .d2-56193913 .fill-B4{fill:#E3E9FD;} + .d2-56193913 .fill-B5{fill:#EDF0FD;} + .d2-56193913 .fill-B6{fill:#F7F8FE;} + .d2-56193913 .fill-AA2{fill:#4A6FF3;} + .d2-56193913 .fill-AA4{fill:#EDF0FD;} + .d2-56193913 .fill-AA5{fill:#F7F8FE;} + .d2-56193913 .fill-AB4{fill:#EDF0FD;} + .d2-56193913 .fill-AB5{fill:#F7F8FE;} + .d2-56193913 .stroke-N1{stroke:#0A0F25;} + .d2-56193913 .stroke-N2{stroke:#676C7E;} + .d2-56193913 .stroke-N3{stroke:#9499AB;} + .d2-56193913 .stroke-N4{stroke:#CFD2DD;} + .d2-56193913 .stroke-N5{stroke:#DEE1EB;} + .d2-56193913 .stroke-N6{stroke:#EEF1F8;} + .d2-56193913 .stroke-N7{stroke:#FFFFFF;} + .d2-56193913 .stroke-B1{stroke:#0D32B2;} + .d2-56193913 .stroke-B2{stroke:#0D32B2;} + .d2-56193913 .stroke-B3{stroke:#E3E9FD;} + .d2-56193913 .stroke-B4{stroke:#E3E9FD;} + .d2-56193913 .stroke-B5{stroke:#EDF0FD;} + .d2-56193913 .stroke-B6{stroke:#F7F8FE;} + .d2-56193913 .stroke-AA2{stroke:#4A6FF3;} + .d2-56193913 .stroke-AA4{stroke:#EDF0FD;} + .d2-56193913 .stroke-AA5{stroke:#F7F8FE;} + .d2-56193913 .stroke-AB4{stroke:#EDF0FD;} + .d2-56193913 .stroke-AB5{stroke:#F7F8FE;} + .d2-56193913 .background-color-N1{background-color:#0A0F25;} + .d2-56193913 .background-color-N2{background-color:#676C7E;} + .d2-56193913 .background-color-N3{background-color:#9499AB;} + .d2-56193913 .background-color-N4{background-color:#CFD2DD;} + .d2-56193913 .background-color-N5{background-color:#DEE1EB;} + .d2-56193913 .background-color-N6{background-color:#EEF1F8;} + .d2-56193913 .background-color-N7{background-color:#FFFFFF;} + .d2-56193913 .background-color-B1{background-color:#0D32B2;} + .d2-56193913 .background-color-B2{background-color:#0D32B2;} + .d2-56193913 .background-color-B3{background-color:#E3E9FD;} + .d2-56193913 .background-color-B4{background-color:#E3E9FD;} + .d2-56193913 .background-color-B5{background-color:#EDF0FD;} + .d2-56193913 .background-color-B6{background-color:#F7F8FE;} + .d2-56193913 .background-color-AA2{background-color:#4A6FF3;} + .d2-56193913 .background-color-AA4{background-color:#EDF0FD;} + .d2-56193913 .background-color-AA5{background-color:#F7F8FE;} + .d2-56193913 .background-color-AB4{background-color:#EDF0FD;} + .d2-56193913 .background-color-AB5{background-color:#F7F8FE;} + .d2-56193913 .color-N1{color:#0A0F25;} + .d2-56193913 .color-N2{color:#676C7E;} + .d2-56193913 .color-N3{color:#9499AB;} + .d2-56193913 .color-N4{color:#CFD2DD;} + .d2-56193913 .color-N5{color:#DEE1EB;} + .d2-56193913 .color-N6{color:#EEF1F8;} + .d2-56193913 .color-N7{color:#FFFFFF;} + .d2-56193913 .color-B1{color:#0D32B2;} + .d2-56193913 .color-B2{color:#0D32B2;} + .d2-56193913 .color-B3{color:#E3E9FD;} + .d2-56193913 .color-B4{color:#E3E9FD;} + .d2-56193913 .color-B5{color:#EDF0FD;} + .d2-56193913 .color-B6{color:#F7F8FE;} + .d2-56193913 .color-AA2{color:#4A6FF3;} + .d2-56193913 .color-AA4{color:#EDF0FD;} + .d2-56193913 .color-AA5{color:#F7F8FE;} + .d2-56193913 .color-AB4{color:#EDF0FD;} + .d2-56193913 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-56193913);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-56193913);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-56193913);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-56193913);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-56193913);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-56193913);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-56193913);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-56193913);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-56193913);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-56193913);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-56193913);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-56193913);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-56193913);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-56193913);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-56193913);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-56193913);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-56193913);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-56193913);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xy self referential long description which ismultirow3 rowsself referential long description which ismultirownormalself referential long description which ismultirow3 rows - - - - - - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/sequence-multiline-self-reference/elk/board.exp.json b/e2etests/testdata/txtar/sequence-multiline-self-reference/elk/board.exp.json index 4e415a14b..a04adc74d 100644 --- a/e2etests/testdata/txtar/sequence-multiline-self-reference/elk/board.exp.json +++ b/e2etests/testdata/txtar/sequence-multiline-self-reference/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -110,6 +120,7 @@ "labelHeight": 53, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -156,6 +167,7 @@ "labelHeight": 37, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -202,6 +214,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -240,6 +253,7 @@ "labelHeight": 53, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 343, @@ -286,6 +300,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -324,6 +339,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 343, @@ -355,6 +371,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/txtar/sequence-multiline-self-reference/elk/sketch.exp.svg b/e2etests/testdata/txtar/sequence-multiline-self-reference/elk/sketch.exp.svg index e5fd5df8f..d1d5bf46f 100644 --- a/e2etests/testdata/txtar/sequence-multiline-self-reference/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/sequence-multiline-self-reference/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -xy self referential long description which ismultirow3 rowsself referential long description which ismultirownormalself referential long description which ismultirow3 rows + .d2-56193913 .fill-N1{fill:#0A0F25;} + .d2-56193913 .fill-N2{fill:#676C7E;} + .d2-56193913 .fill-N3{fill:#9499AB;} + .d2-56193913 .fill-N4{fill:#CFD2DD;} + .d2-56193913 .fill-N5{fill:#DEE1EB;} + .d2-56193913 .fill-N6{fill:#EEF1F8;} + .d2-56193913 .fill-N7{fill:#FFFFFF;} + .d2-56193913 .fill-B1{fill:#0D32B2;} + .d2-56193913 .fill-B2{fill:#0D32B2;} + .d2-56193913 .fill-B3{fill:#E3E9FD;} + .d2-56193913 .fill-B4{fill:#E3E9FD;} + .d2-56193913 .fill-B5{fill:#EDF0FD;} + .d2-56193913 .fill-B6{fill:#F7F8FE;} + .d2-56193913 .fill-AA2{fill:#4A6FF3;} + .d2-56193913 .fill-AA4{fill:#EDF0FD;} + .d2-56193913 .fill-AA5{fill:#F7F8FE;} + .d2-56193913 .fill-AB4{fill:#EDF0FD;} + .d2-56193913 .fill-AB5{fill:#F7F8FE;} + .d2-56193913 .stroke-N1{stroke:#0A0F25;} + .d2-56193913 .stroke-N2{stroke:#676C7E;} + .d2-56193913 .stroke-N3{stroke:#9499AB;} + .d2-56193913 .stroke-N4{stroke:#CFD2DD;} + .d2-56193913 .stroke-N5{stroke:#DEE1EB;} + .d2-56193913 .stroke-N6{stroke:#EEF1F8;} + .d2-56193913 .stroke-N7{stroke:#FFFFFF;} + .d2-56193913 .stroke-B1{stroke:#0D32B2;} + .d2-56193913 .stroke-B2{stroke:#0D32B2;} + .d2-56193913 .stroke-B3{stroke:#E3E9FD;} + .d2-56193913 .stroke-B4{stroke:#E3E9FD;} + .d2-56193913 .stroke-B5{stroke:#EDF0FD;} + .d2-56193913 .stroke-B6{stroke:#F7F8FE;} + .d2-56193913 .stroke-AA2{stroke:#4A6FF3;} + .d2-56193913 .stroke-AA4{stroke:#EDF0FD;} + .d2-56193913 .stroke-AA5{stroke:#F7F8FE;} + .d2-56193913 .stroke-AB4{stroke:#EDF0FD;} + .d2-56193913 .stroke-AB5{stroke:#F7F8FE;} + .d2-56193913 .background-color-N1{background-color:#0A0F25;} + .d2-56193913 .background-color-N2{background-color:#676C7E;} + .d2-56193913 .background-color-N3{background-color:#9499AB;} + .d2-56193913 .background-color-N4{background-color:#CFD2DD;} + .d2-56193913 .background-color-N5{background-color:#DEE1EB;} + .d2-56193913 .background-color-N6{background-color:#EEF1F8;} + .d2-56193913 .background-color-N7{background-color:#FFFFFF;} + .d2-56193913 .background-color-B1{background-color:#0D32B2;} + .d2-56193913 .background-color-B2{background-color:#0D32B2;} + .d2-56193913 .background-color-B3{background-color:#E3E9FD;} + .d2-56193913 .background-color-B4{background-color:#E3E9FD;} + .d2-56193913 .background-color-B5{background-color:#EDF0FD;} + .d2-56193913 .background-color-B6{background-color:#F7F8FE;} + .d2-56193913 .background-color-AA2{background-color:#4A6FF3;} + .d2-56193913 .background-color-AA4{background-color:#EDF0FD;} + .d2-56193913 .background-color-AA5{background-color:#F7F8FE;} + .d2-56193913 .background-color-AB4{background-color:#EDF0FD;} + .d2-56193913 .background-color-AB5{background-color:#F7F8FE;} + .d2-56193913 .color-N1{color:#0A0F25;} + .d2-56193913 .color-N2{color:#676C7E;} + .d2-56193913 .color-N3{color:#9499AB;} + .d2-56193913 .color-N4{color:#CFD2DD;} + .d2-56193913 .color-N5{color:#DEE1EB;} + .d2-56193913 .color-N6{color:#EEF1F8;} + .d2-56193913 .color-N7{color:#FFFFFF;} + .d2-56193913 .color-B1{color:#0D32B2;} + .d2-56193913 .color-B2{color:#0D32B2;} + .d2-56193913 .color-B3{color:#E3E9FD;} + .d2-56193913 .color-B4{color:#E3E9FD;} + .d2-56193913 .color-B5{color:#EDF0FD;} + .d2-56193913 .color-B6{color:#F7F8FE;} + .d2-56193913 .color-AA2{color:#4A6FF3;} + .d2-56193913 .color-AA4{color:#EDF0FD;} + .d2-56193913 .color-AA5{color:#F7F8FE;} + .d2-56193913 .color-AB4{color:#EDF0FD;} + .d2-56193913 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-56193913);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-56193913);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-56193913);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-56193913);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-56193913);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-56193913);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-56193913);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-56193913);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-56193913);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-56193913);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-56193913);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-56193913);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-56193913);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-56193913);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-56193913);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-56193913);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-56193913);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-56193913);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xy self referential long description which ismultirow3 rowsself referential long description which ismultirownormalself referential long description which ismultirow3 rows - - - - - - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/shape-animate/dagre/board.exp.json b/e2etests/testdata/txtar/shape-animate/dagre/board.exp.json new file mode 100644 index 000000000..8abf52bb1 --- /dev/null +++ b/e2etests/testdata/txtar/shape-animate/dagre/board.exp.json @@ -0,0 +1,1115 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 300, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": "elk" + }, + "isFolderOnly": false, + "fontFamily": "SourceCodePro", + "shapes": [ + { + "id": "network", + "type": "rectangle", + "pos": { + "x": 9, + "y": 227 + }, + "width": 404, + "height": 1198, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "fillPattern": "dots", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": true, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "NETWORK", + "fontSize": 28, + "fontFamily": "mono", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 116, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "network.cell tower", + "type": "rectangle", + "pos": { + "x": 130, + "y": 268 + }, + "width": 253, + "height": 323, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "fillPattern": "dots", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "CELL TOWER", + "fontSize": 24, + "fontFamily": "mono", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 143, + "labelHeight": 31, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "network.cell tower.satellites", + "type": "stored_data", + "pos": { + "x": 176, + "y": 308 + }, + "width": 161, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "AA5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": true, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "SATELLITES", + "fontSize": 16, + "fontFamily": "mono", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 96, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "network.cell tower.transmitter", + "type": "rectangle", + "pos": { + "x": 181, + "y": 495 + }, + "width": 151, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "TRANSMITTER", + "fontSize": 16, + "fontFamily": "mono", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 106, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "network.online portal", + "type": "rectangle", + "pos": { + "x": 39, + "y": 1266 + }, + "width": 125, + "height": 129, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "fillPattern": "dots", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "ONLINE PORTAL", + "fontSize": 24, + "fontFamily": "mono", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 185, + "labelHeight": 31, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "network.online portal.ui", + "type": "hexagon", + "pos": { + "x": 69, + "y": 1296 + }, + "width": 65, + "height": 69, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "UI", + "fontSize": 16, + "fontFamily": "mono", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 18, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "network.data processor", + "type": "rectangle", + "pos": { + "x": 171, + "y": 742 + }, + "width": 182, + "height": 188, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "fillPattern": "dots", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "DATA PROCESSOR", + "fontSize": 24, + "fontFamily": "mono", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 200, + "labelHeight": 31, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "network.data processor.storage", + "type": "cylinder", + "pos": { + "x": 201, + "y": 782 + }, + "width": 112, + "height": 118, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "AA5", + "stroke": "B1", + "animated": true, + "shadow": false, + "3d": false, + "multiple": true, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "STORAGE", + "fontSize": 16, + "fontFamily": "mono", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 67, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "user", + "type": "person", + "pos": { + "x": 85, + "y": 0 + }, + "width": 130, + "height": 87, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B3", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "USER", + "fontSize": 16, + "fontFamily": "mono", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 38, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "api server", + "type": "rectangle", + "pos": { + "x": 497, + "y": 1050 + }, + "width": 142, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "API SERVER", + "fontSize": 16, + "fontFamily": "mono", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 97, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "logs", + "type": "page", + "pos": { + "x": 527, + "y": 1287 + }, + "width": 82, + "height": 87, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "AB4", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": true, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "LOGS", + "fontSize": 16, + "fontFamily": "mono", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 37, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [ + { + "id": "network.cell tower.(satellites -> transmitter)[0]", + "src": "network.cell tower.satellites", + "srcArrow": "none", + "dst": "network.cell tower.transmitter", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "label": "SEND", + "fontSize": 16, + "fontFamily": "mono", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 38, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 228, + "y": 374 + }, + { + "x": 188.39999389648438, + "y": 422.3999938964844 + }, + { + "x": 188.5, + "y": 446.70001220703125 + }, + { + "x": 228.5, + "y": 495.5 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "network.cell tower.(satellites -> transmitter)[1]", + "src": "network.cell tower.satellites", + "srcArrow": "none", + "dst": "network.cell tower.transmitter", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "label": "SEND", + "fontSize": 16, + "fontFamily": "mono", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 38, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 256, + "y": 374 + }, + { + "x": 256.39898681640625, + "y": 422.3999938964844 + }, + { + "x": 256.5, + "y": 446.70001220703125 + }, + { + "x": 256.5, + "y": 495.5 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "network.cell tower.(satellites -> transmitter)[2]", + "src": "network.cell tower.satellites", + "srcArrow": "none", + "dst": "network.cell tower.transmitter", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "label": "SEND", + "fontSize": 16, + "fontFamily": "mono", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 38, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 285, + "y": 374 + }, + { + "x": 324.6000061035156, + "y": 422.3999938964844 + }, + { + "x": 324.5, + "y": 446.70001220703125 + }, + { + "x": 284.5, + "y": 495.5 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "network.(cell tower.transmitter -> data processor.storage)[0]", + "src": "network.cell tower.transmitter", + "srcArrow": "none", + "dst": "network.data processor.storage", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "label": "PHONE LOGS", + "fontSize": 16, + "fontFamily": "mono", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 96, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 256.5, + "y": 561 + }, + { + "x": 256.5, + "y": 601 + }, + { + "x": 256.5, + "y": 623.0999755859375 + }, + { + "x": 256.5, + "y": 641.25 + }, + { + "x": 256.5, + "y": 659.4000244140625 + }, + { + "x": 256.6000061035156, + "y": 740 + }, + { + "x": 257, + "y": 772 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(user -> network.cell tower)[0]", + "src": "user", + "srcArrow": "none", + "dst": "network.cell tower", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "label": "MAKE CALL", + "fontSize": 16, + "fontFamily": "mono", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 86, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 195, + "y": 87 + }, + { + "x": 244.1999969482422, + "y": 135.39999389648438 + }, + { + "x": 256.5, + "y": 212.8000030517578 + }, + { + "x": 256.5, + "y": 232 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(user -> network.online portal.ui)[0]", + "src": "user", + "srcArrow": "none", + "dst": "network.online portal.ui", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 3, + "strokeWidth": 2, + "stroke": "B2", + "label": "ACCESS", + "fontSize": 16, + "fontFamily": "mono", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 58, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 119, + "y": 87 + }, + { + "x": 84.80000305175781, + "y": 135.39999389648438 + }, + { + "x": 76.25, + "y": 159.60000610351562 + }, + { + "x": 76.25, + "y": 177.75 + }, + { + "x": 76.25, + "y": 195.89999389648438 + }, + { + "x": 76.25, + "y": 218 + }, + { + "x": 76.25, + "y": 233 + }, + { + "x": 76.25, + "y": 248 + }, + { + "x": 76.25, + "y": 274.6000061035156 + }, + { + "x": 76.25, + "y": 299.5 + }, + { + "x": 76.25, + "y": 324.3999938964844 + }, + { + "x": 76.25, + "y": 359.70001220703125 + }, + { + "x": 76.25, + "y": 387.75 + }, + { + "x": 76.25, + "y": 415.79998779296875 + }, + { + "x": 76.25, + "y": 453.20001220703125 + }, + { + "x": 76.25, + "y": 481.25 + }, + { + "x": 76.25, + "y": 509.29998779296875 + }, + { + "x": 76.25, + "y": 544.5999755859375 + }, + { + "x": 76.25, + "y": 569.5 + }, + { + "x": 76.25, + "y": 594.4000244140625 + }, + { + "x": 76.25, + "y": 623.0999755859375 + }, + { + "x": 76.25, + "y": 641.25 + }, + { + "x": 76.25, + "y": 659.4000244140625 + }, + { + "x": 76.25, + "y": 683.5999755859375 + }, + { + "x": 76.25, + "y": 701.75 + }, + { + "x": 76.25, + "y": 719.9000244140625 + }, + { + "x": 76.25, + "y": 753.7999877929688 + }, + { + "x": 76.25, + "y": 786.5 + }, + { + "x": 76.25, + "y": 819.2000122070312 + }, + { + "x": 76.25, + "y": 862.7999877929688 + }, + { + "x": 76.25, + "y": 895.5 + }, + { + "x": 76.25, + "y": 928.2000122070312 + }, + { + "x": 76.25, + "y": 960 + }, + { + "x": 76.25, + "y": 975 + }, + { + "x": 76.25, + "y": 990 + }, + { + "x": 76.25, + "y": 1016.5999755859375 + }, + { + "x": 76.25, + "y": 1041.5 + }, + { + "x": 76.25, + "y": 1066.4000244140625 + }, + { + "x": 76.25, + "y": 1101.699951171875 + }, + { + "x": 76.25, + "y": 1129.75 + }, + { + "x": 76.25, + "y": 1157.800048828125 + }, + { + "x": 79.4000015258789, + "y": 1248.800048828125 + }, + { + "x": 92, + "y": 1296 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(api server -> network.online portal.ui)[0]", + "src": "api server", + "srcArrow": "none", + "dst": "network.online portal.ui", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "label": "DISPLAY", + "fontSize": 16, + "fontFamily": "mono", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 69, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 496.75, + "y": 1098.9189453125 + }, + { + "x": 203.9499969482422, + "y": 1160.9830322265625 + }, + { + "x": 127, + "y": 1248.800048828125 + }, + { + "x": 112, + "y": 1296 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(api server -> logs)[0]", + "src": "api server", + "srcArrow": "none", + "dst": "logs", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "label": "PERSIST", + "fontSize": 16, + "fontFamily": "mono", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 68, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 567.75, + "y": 1115.5 + }, + { + "x": 567.75, + "y": 1164.300048828125 + }, + { + "x": 567.7999877929688, + "y": 1245 + }, + { + "x": 568, + "y": 1277 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(network.data processor -> api server)[0]", + "src": "network.data processor", + "srcArrow": "none", + "dst": "api server", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "label": "", + "fontSize": 16, + "fontFamily": "mono", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 256.5, + "y": 930 + }, + { + "x": 256.5, + "y": 986 + }, + { + "x": 304.54998779296875, + "y": 1012.552978515625 + }, + { + "x": 496.75, + "y": 1062.7659912109375 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/shape-animate/dagre/sketch.exp.svg b/e2etests/testdata/txtar/shape-animate/dagre/sketch.exp.svg new file mode 100644 index 000000000..f60d0396f --- /dev/null +++ b/e2etests/testdata/txtar/shape-animate/dagre/sketch.exp.svg @@ -0,0 +1,168 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +NETWORKUSERAPI SERVERLOGSCELL TOWERONLINE PORTALDATA PROCESSORSATELLITESTRANSMITTERUISTORAGE SENDSENDSENDPHONE LOGSMAKE CALL ACCESSDISPLAYPERSIST + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/shape-animate/elk/board.exp.json b/e2etests/testdata/txtar/shape-animate/elk/board.exp.json new file mode 100644 index 000000000..ee390a057 --- /dev/null +++ b/e2etests/testdata/txtar/shape-animate/elk/board.exp.json @@ -0,0 +1,906 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 300, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": "elk" + }, + "isFolderOnly": false, + "fontFamily": "SourceCodePro", + "shapes": [ + { + "id": "network", + "type": "rectangle", + "pos": { + "x": 12, + "y": 311 + }, + "width": 621, + "height": 922, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "fillPattern": "dots", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": true, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "NETWORK", + "fontSize": 28, + "fontFamily": "mono", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 116, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "network.cell tower", + "type": "rectangle", + "pos": { + "x": 62, + "y": 361 + }, + "width": 271, + "height": 423, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "fillPattern": "dots", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "CELL TOWER", + "fontSize": 24, + "fontFamily": "mono", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 143, + "labelHeight": 31, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "network.cell tower.satellites", + "type": "stored_data", + "pos": { + "x": 112, + "y": 421 + }, + "width": 161, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "AA5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": true, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "SATELLITES", + "fontSize": 16, + "fontFamily": "mono", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 96, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "network.cell tower.transmitter", + "type": "rectangle", + "pos": { + "x": 122, + "y": 668 + }, + "width": 151, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "TRANSMITTER", + "fontSize": 16, + "fontFamily": "mono", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 106, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "network.online portal", + "type": "rectangle", + "pos": { + "x": 353, + "y": 366 + }, + "width": 230, + "height": 169, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "fillPattern": "dots", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "ONLINE PORTAL", + "fontSize": 24, + "fontFamily": "mono", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 185, + "labelHeight": 31, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "network.online portal.ui", + "type": "hexagon", + "pos": { + "x": 428, + "y": 416 + }, + "width": 80, + "height": 69, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "UI", + "fontSize": 16, + "fontFamily": "mono", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 18, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "network.data processor", + "type": "rectangle", + "pos": { + "x": 75, + "y": 955 + }, + "width": 245, + "height": 228, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "fillPattern": "dots", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "DATA PROCESSOR", + "fontSize": 24, + "fontFamily": "mono", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 200, + "labelHeight": 31, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 2 + }, + { + "id": "network.data processor.storage", + "type": "cylinder", + "pos": { + "x": 136, + "y": 1015 + }, + "width": 112, + "height": 118, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "AA5", + "stroke": "B1", + "animated": true, + "shadow": false, + "3d": false, + "multiple": true, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "STORAGE", + "fontSize": 16, + "fontFamily": "mono", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 67, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 3 + }, + { + "id": "user", + "type": "person", + "pos": { + "x": 218, + "y": 12 + }, + "width": 130, + "height": 87, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B3", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "USER", + "fontSize": 16, + "fontFamily": "mono", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 38, + "labelHeight": 21, + "labelPosition": "OUTSIDE_BOTTOM_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "api server", + "type": "rectangle", + "pos": { + "x": 341, + "y": 1388 + }, + "width": 142, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "API SERVER", + "fontSize": 16, + "fontFamily": "mono", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 97, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "logs", + "type": "page", + "pos": { + "x": 366, + "y": 1625 + }, + "width": 82, + "height": 87, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "AB4", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": true, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "LOGS", + "fontSize": 16, + "fontFamily": "mono", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 37, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [ + { + "id": "network.cell tower.(satellites -> transmitter)[0]", + "src": "network.cell tower.satellites", + "srcArrow": "none", + "dst": "network.cell tower.transmitter", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "label": "SEND", + "fontSize": 16, + "fontFamily": "mono", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 38, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 148, + "y": 487 + }, + { + "x": 148.5, + "y": 668 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "network.cell tower.(satellites -> transmitter)[1]", + "src": "network.cell tower.satellites", + "srcArrow": "none", + "dst": "network.cell tower.transmitter", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "label": "SEND", + "fontSize": 16, + "fontFamily": "mono", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 38, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 197, + "y": 487 + }, + { + "x": 198, + "y": 668 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "network.cell tower.(satellites -> transmitter)[2]", + "src": "network.cell tower.satellites", + "srcArrow": "none", + "dst": "network.cell tower.transmitter", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "label": "SEND", + "fontSize": 16, + "fontFamily": "mono", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 38, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 246, + "y": 487 + }, + { + "x": 246.5, + "y": 668 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "network.(cell tower.transmitter -> data processor.storage)[0]", + "src": "network.cell tower.transmitter", + "srcArrow": "none", + "dst": "network.data processor.storage", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "label": "PHONE LOGS", + "fontSize": 16, + "fontFamily": "mono", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 96, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 197.5, + "y": 734 + }, + { + "x": 198, + "y": 1005 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(user -> network.cell tower)[0]", + "src": "user", + "srcArrow": "none", + "dst": "network.cell tower", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "label": "MAKE CALL", + "fontSize": 16, + "fontFamily": "mono", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 86, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 261.6659851074219, + "y": 125 + }, + { + "x": 261.6659851074219, + "y": 165 + }, + { + "x": 117.91600036621094, + "y": 165 + }, + { + "x": 117.91600036621094, + "y": 361 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(user -> network.online portal.ui)[0]", + "src": "user", + "srcArrow": "none", + "dst": "network.online portal.ui", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 3, + "strokeWidth": 2, + "stroke": "B2", + "label": "ACCESS", + "fontSize": 16, + "fontFamily": "mono", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 58, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 305, + "y": 125 + }, + { + "x": 305, + "y": 165 + }, + { + "x": 448.75, + "y": 165 + }, + { + "x": 449, + "y": 416 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(api server -> network.online portal.ui)[0]", + "src": "api server", + "srcArrow": "none", + "dst": "network.online portal.ui", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "label": "DISPLAY", + "fontSize": 16, + "fontFamily": "mono", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 69, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 435.6659851074219, + "y": 1388 + }, + { + "x": 435.6659851074219, + "y": 1348 + }, + { + "x": 687.5, + "y": 1348 + }, + { + "x": 687.5, + "y": 266 + }, + { + "x": 481.3330078125, + "y": 266 + }, + { + "x": 481, + "y": 416 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(api server -> logs)[0]", + "src": "api server", + "srcArrow": "none", + "dst": "logs", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "label": "PERSIST", + "fontSize": 16, + "fontFamily": "mono", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 68, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 412, + "y": 1454 + }, + { + "x": 412, + "y": 1615 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(network.data processor -> api server)[0]", + "src": "network.data processor", + "srcArrow": "none", + "dst": "api server", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "label": "", + "fontSize": 16, + "fontFamily": "mono", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 136.5, + "y": 1183 + }, + { + "x": 136.5, + "y": 1348 + }, + { + "x": 388.3330078125, + "y": 1348 + }, + { + "x": 388.3330078125, + "y": 1388 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/shape-animate/elk/sketch.exp.svg b/e2etests/testdata/txtar/shape-animate/elk/sketch.exp.svg new file mode 100644 index 000000000..6b662c119 --- /dev/null +++ b/e2etests/testdata/txtar/shape-animate/elk/sketch.exp.svg @@ -0,0 +1,168 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +NETWORKUSERAPI SERVERLOGSCELL TOWERONLINE PORTALDATA PROCESSORSATELLITESTRANSMITTERUISTORAGE SENDSENDSENDPHONE LOGSMAKE CALL ACCESSDISPLAYPERSIST + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/single-backslash-latex/dagre/board.exp.json b/e2etests/testdata/txtar/single-backslash-latex/dagre/board.exp.json new file mode 100644 index 000000000..ca9c31076 --- /dev/null +++ b/e2etests/testdata/txtar/single-backslash-latex/dagre/board.exp.json @@ -0,0 +1,140 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "formula", + "type": "rectangle", + "pos": { + "x": 10, + "y": 20 + }, + "width": 142, + "height": 142, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "formula", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 92, + "labelHeight": 36, + "labelPosition": "OUTSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "formula.equation", + "type": "text", + "pos": { + "x": 40, + "y": 50 + }, + "width": 82, + "height": 82, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "N1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "\\begin{equation} \\label{eq1}\n\\begin{split}\nA & = \\frac{\\\\pi r^2}{2} \\\\\n & = \\frac{1}{2} \\pi r^2\n\\end{split}\n\\end{equation}", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "latex", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 82, + "labelHeight": 82, + "zIndex": 0, + "level": 2 + } + ], + "connections": [], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/single-backslash-latex/dagre/sketch.exp.svg b/e2etests/testdata/txtar/single-backslash-latex/dagre/sketch.exp.svg new file mode 100644 index 000000000..b0833179b --- /dev/null +++ b/e2etests/testdata/txtar/single-backslash-latex/dagre/sketch.exp.svg @@ -0,0 +1,96 @@ +formula + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/single-backslash-latex/elk/board.exp.json b/e2etests/testdata/txtar/single-backslash-latex/elk/board.exp.json new file mode 100644 index 000000000..56951790c --- /dev/null +++ b/e2etests/testdata/txtar/single-backslash-latex/elk/board.exp.json @@ -0,0 +1,140 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "formula", + "type": "rectangle", + "pos": { + "x": 12, + "y": 12 + }, + "width": 182, + "height": 182, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "formula", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 92, + "labelHeight": 36, + "labelPosition": "INSIDE_TOP_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "formula.equation", + "type": "text", + "pos": { + "x": 62, + "y": 62 + }, + "width": 82, + "height": 82, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "N1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "\\begin{equation} \\label{eq1}\n\\begin{split}\nA & = \\frac{\\\\pi r^2}{2} \\\\\n & = \\frac{1}{2} \\pi r^2\n\\end{split}\n\\end{equation}", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "latex", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 82, + "labelHeight": 82, + "zIndex": 0, + "level": 2 + } + ], + "connections": [], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/single-backslash-latex/elk/sketch.exp.svg b/e2etests/testdata/txtar/single-backslash-latex/elk/sketch.exp.svg new file mode 100644 index 000000000..9eb299df9 --- /dev/null +++ b/e2etests/testdata/txtar/single-backslash-latex/elk/sketch.exp.svg @@ -0,0 +1,96 @@ +formula + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/sketch-bidirectional-connection-animation/dagre/board.exp.json b/e2etests/testdata/txtar/sketch-bidirectional-connection-animation/dagre/board.exp.json index d4be34b71..d58c88759 100644 --- a/e2etests/testdata/txtar/sketch-bidirectional-connection-animation/dagre/board.exp.json +++ b/e2etests/testdata/txtar/sketch-bidirectional-connection-animation/dagre/board.exp.json @@ -2,7 +2,7 @@ "name": "", "config": { "sketch": true, - "themeID": null, + "themeID": 0, "darkThemeID": null, "pad": null, "center": null, @@ -26,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -67,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -108,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -149,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -190,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -231,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -272,6 +278,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -313,6 +320,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -364,6 +372,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 172.5, @@ -411,6 +420,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 176, @@ -458,6 +468,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 222.5, @@ -505,6 +516,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 226.25, @@ -552,6 +564,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 484, @@ -599,6 +612,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 624.666015625, @@ -675,6 +689,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/txtar/sketch-bidirectional-connection-animation/dagre/sketch.exp.svg b/e2etests/testdata/txtar/sketch-bidirectional-connection-animation/dagre/sketch.exp.svg index 5f907a58e..d99fbbdba 100644 --- a/e2etests/testdata/txtar/sketch-bidirectional-connection-animation/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/sketch-bidirectional-connection-animation/dagre/sketch.exp.svg @@ -1,15 +1,15 @@ - + .d2-4260380322 .fill-N1{fill:#0A0F25;} + .d2-4260380322 .fill-N2{fill:#676C7E;} + .d2-4260380322 .fill-N3{fill:#9499AB;} + .d2-4260380322 .fill-N4{fill:#CFD2DD;} + .d2-4260380322 .fill-N5{fill:#DEE1EB;} + .d2-4260380322 .fill-N6{fill:#EEF1F8;} + .d2-4260380322 .fill-N7{fill:#FFFFFF;} + .d2-4260380322 .fill-B1{fill:#0D32B2;} + .d2-4260380322 .fill-B2{fill:#0D32B2;} + .d2-4260380322 .fill-B3{fill:#E3E9FD;} + .d2-4260380322 .fill-B4{fill:#E3E9FD;} + .d2-4260380322 .fill-B5{fill:#EDF0FD;} + .d2-4260380322 .fill-B6{fill:#F7F8FE;} + .d2-4260380322 .fill-AA2{fill:#4A6FF3;} + .d2-4260380322 .fill-AA4{fill:#EDF0FD;} + .d2-4260380322 .fill-AA5{fill:#F7F8FE;} + .d2-4260380322 .fill-AB4{fill:#EDF0FD;} + .d2-4260380322 .fill-AB5{fill:#F7F8FE;} + .d2-4260380322 .stroke-N1{stroke:#0A0F25;} + .d2-4260380322 .stroke-N2{stroke:#676C7E;} + .d2-4260380322 .stroke-N3{stroke:#9499AB;} + .d2-4260380322 .stroke-N4{stroke:#CFD2DD;} + .d2-4260380322 .stroke-N5{stroke:#DEE1EB;} + .d2-4260380322 .stroke-N6{stroke:#EEF1F8;} + .d2-4260380322 .stroke-N7{stroke:#FFFFFF;} + .d2-4260380322 .stroke-B1{stroke:#0D32B2;} + .d2-4260380322 .stroke-B2{stroke:#0D32B2;} + .d2-4260380322 .stroke-B3{stroke:#E3E9FD;} + .d2-4260380322 .stroke-B4{stroke:#E3E9FD;} + .d2-4260380322 .stroke-B5{stroke:#EDF0FD;} + .d2-4260380322 .stroke-B6{stroke:#F7F8FE;} + .d2-4260380322 .stroke-AA2{stroke:#4A6FF3;} + .d2-4260380322 .stroke-AA4{stroke:#EDF0FD;} + .d2-4260380322 .stroke-AA5{stroke:#F7F8FE;} + .d2-4260380322 .stroke-AB4{stroke:#EDF0FD;} + .d2-4260380322 .stroke-AB5{stroke:#F7F8FE;} + .d2-4260380322 .background-color-N1{background-color:#0A0F25;} + .d2-4260380322 .background-color-N2{background-color:#676C7E;} + .d2-4260380322 .background-color-N3{background-color:#9499AB;} + .d2-4260380322 .background-color-N4{background-color:#CFD2DD;} + .d2-4260380322 .background-color-N5{background-color:#DEE1EB;} + .d2-4260380322 .background-color-N6{background-color:#EEF1F8;} + .d2-4260380322 .background-color-N7{background-color:#FFFFFF;} + .d2-4260380322 .background-color-B1{background-color:#0D32B2;} + .d2-4260380322 .background-color-B2{background-color:#0D32B2;} + .d2-4260380322 .background-color-B3{background-color:#E3E9FD;} + .d2-4260380322 .background-color-B4{background-color:#E3E9FD;} + .d2-4260380322 .background-color-B5{background-color:#EDF0FD;} + .d2-4260380322 .background-color-B6{background-color:#F7F8FE;} + .d2-4260380322 .background-color-AA2{background-color:#4A6FF3;} + .d2-4260380322 .background-color-AA4{background-color:#EDF0FD;} + .d2-4260380322 .background-color-AA5{background-color:#F7F8FE;} + .d2-4260380322 .background-color-AB4{background-color:#EDF0FD;} + .d2-4260380322 .background-color-AB5{background-color:#F7F8FE;} + .d2-4260380322 .color-N1{color:#0A0F25;} + .d2-4260380322 .color-N2{color:#676C7E;} + .d2-4260380322 .color-N3{color:#9499AB;} + .d2-4260380322 .color-N4{color:#CFD2DD;} + .d2-4260380322 .color-N5{color:#DEE1EB;} + .d2-4260380322 .color-N6{color:#EEF1F8;} + .d2-4260380322 .color-N7{color:#FFFFFF;} + .d2-4260380322 .color-B1{color:#0D32B2;} + .d2-4260380322 .color-B2{color:#0D32B2;} + .d2-4260380322 .color-B3{color:#E3E9FD;} + .d2-4260380322 .color-B4{color:#E3E9FD;} + .d2-4260380322 .color-B5{color:#EDF0FD;} + .d2-4260380322 .color-B6{color:#F7F8FE;} + .d2-4260380322 .color-AA2{color:#4A6FF3;} + .d2-4260380322 .color-AA4{color:#EDF0FD;} + .d2-4260380322 .color-AA5{color:#F7F8FE;} + .d2-4260380322 .color-AB4{color:#EDF0FD;} + .d2-4260380322 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4260380322);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4260380322);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4260380322);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4260380322);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4260380322);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4260380322);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4260380322);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4260380322);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4260380322);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4260380322);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4260380322);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4260380322);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4260380322);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4260380322);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4260380322);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4260380322);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4260380322);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4260380322);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> - + + - + + - + + -abcdefgx + +abcdefgx - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/sketch-bidirectional-connection-animation/elk/board.exp.json b/e2etests/testdata/txtar/sketch-bidirectional-connection-animation/elk/board.exp.json index 5abaaf205..fd8511c1e 100644 --- a/e2etests/testdata/txtar/sketch-bidirectional-connection-animation/elk/board.exp.json +++ b/e2etests/testdata/txtar/sketch-bidirectional-connection-animation/elk/board.exp.json @@ -2,7 +2,7 @@ "name": "", "config": { "sketch": true, - "themeID": null, + "themeID": 0, "darkThemeID": null, "pad": null, "center": null, @@ -26,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -67,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -108,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -149,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -190,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -231,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -272,6 +278,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -313,6 +320,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -364,6 +372,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 103.25, @@ -410,6 +419,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 135.25, @@ -456,6 +466,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 167.25, @@ -502,6 +513,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 199.25, @@ -548,6 +560,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 336, @@ -586,6 +599,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 433, @@ -625,6 +639,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/txtar/sketch-bidirectional-connection-animation/elk/sketch.exp.svg b/e2etests/testdata/txtar/sketch-bidirectional-connection-animation/elk/sketch.exp.svg index 9ed2de89f..d2c63c65e 100644 --- a/e2etests/testdata/txtar/sketch-bidirectional-connection-animation/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/sketch-bidirectional-connection-animation/elk/sketch.exp.svg @@ -1,15 +1,15 @@ - + .d2-3522249378 .fill-N1{fill:#0A0F25;} + .d2-3522249378 .fill-N2{fill:#676C7E;} + .d2-3522249378 .fill-N3{fill:#9499AB;} + .d2-3522249378 .fill-N4{fill:#CFD2DD;} + .d2-3522249378 .fill-N5{fill:#DEE1EB;} + .d2-3522249378 .fill-N6{fill:#EEF1F8;} + .d2-3522249378 .fill-N7{fill:#FFFFFF;} + .d2-3522249378 .fill-B1{fill:#0D32B2;} + .d2-3522249378 .fill-B2{fill:#0D32B2;} + .d2-3522249378 .fill-B3{fill:#E3E9FD;} + .d2-3522249378 .fill-B4{fill:#E3E9FD;} + .d2-3522249378 .fill-B5{fill:#EDF0FD;} + .d2-3522249378 .fill-B6{fill:#F7F8FE;} + .d2-3522249378 .fill-AA2{fill:#4A6FF3;} + .d2-3522249378 .fill-AA4{fill:#EDF0FD;} + .d2-3522249378 .fill-AA5{fill:#F7F8FE;} + .d2-3522249378 .fill-AB4{fill:#EDF0FD;} + .d2-3522249378 .fill-AB5{fill:#F7F8FE;} + .d2-3522249378 .stroke-N1{stroke:#0A0F25;} + .d2-3522249378 .stroke-N2{stroke:#676C7E;} + .d2-3522249378 .stroke-N3{stroke:#9499AB;} + .d2-3522249378 .stroke-N4{stroke:#CFD2DD;} + .d2-3522249378 .stroke-N5{stroke:#DEE1EB;} + .d2-3522249378 .stroke-N6{stroke:#EEF1F8;} + .d2-3522249378 .stroke-N7{stroke:#FFFFFF;} + .d2-3522249378 .stroke-B1{stroke:#0D32B2;} + .d2-3522249378 .stroke-B2{stroke:#0D32B2;} + .d2-3522249378 .stroke-B3{stroke:#E3E9FD;} + .d2-3522249378 .stroke-B4{stroke:#E3E9FD;} + .d2-3522249378 .stroke-B5{stroke:#EDF0FD;} + .d2-3522249378 .stroke-B6{stroke:#F7F8FE;} + .d2-3522249378 .stroke-AA2{stroke:#4A6FF3;} + .d2-3522249378 .stroke-AA4{stroke:#EDF0FD;} + .d2-3522249378 .stroke-AA5{stroke:#F7F8FE;} + .d2-3522249378 .stroke-AB4{stroke:#EDF0FD;} + .d2-3522249378 .stroke-AB5{stroke:#F7F8FE;} + .d2-3522249378 .background-color-N1{background-color:#0A0F25;} + .d2-3522249378 .background-color-N2{background-color:#676C7E;} + .d2-3522249378 .background-color-N3{background-color:#9499AB;} + .d2-3522249378 .background-color-N4{background-color:#CFD2DD;} + .d2-3522249378 .background-color-N5{background-color:#DEE1EB;} + .d2-3522249378 .background-color-N6{background-color:#EEF1F8;} + .d2-3522249378 .background-color-N7{background-color:#FFFFFF;} + .d2-3522249378 .background-color-B1{background-color:#0D32B2;} + .d2-3522249378 .background-color-B2{background-color:#0D32B2;} + .d2-3522249378 .background-color-B3{background-color:#E3E9FD;} + .d2-3522249378 .background-color-B4{background-color:#E3E9FD;} + .d2-3522249378 .background-color-B5{background-color:#EDF0FD;} + .d2-3522249378 .background-color-B6{background-color:#F7F8FE;} + .d2-3522249378 .background-color-AA2{background-color:#4A6FF3;} + .d2-3522249378 .background-color-AA4{background-color:#EDF0FD;} + .d2-3522249378 .background-color-AA5{background-color:#F7F8FE;} + .d2-3522249378 .background-color-AB4{background-color:#EDF0FD;} + .d2-3522249378 .background-color-AB5{background-color:#F7F8FE;} + .d2-3522249378 .color-N1{color:#0A0F25;} + .d2-3522249378 .color-N2{color:#676C7E;} + .d2-3522249378 .color-N3{color:#9499AB;} + .d2-3522249378 .color-N4{color:#CFD2DD;} + .d2-3522249378 .color-N5{color:#DEE1EB;} + .d2-3522249378 .color-N6{color:#EEF1F8;} + .d2-3522249378 .color-N7{color:#FFFFFF;} + .d2-3522249378 .color-B1{color:#0D32B2;} + .d2-3522249378 .color-B2{color:#0D32B2;} + .d2-3522249378 .color-B3{color:#E3E9FD;} + .d2-3522249378 .color-B4{color:#E3E9FD;} + .d2-3522249378 .color-B5{color:#EDF0FD;} + .d2-3522249378 .color-B6{color:#F7F8FE;} + .d2-3522249378 .color-AA2{color:#4A6FF3;} + .d2-3522249378 .color-AA4{color:#EDF0FD;} + .d2-3522249378 .color-AA5{color:#F7F8FE;} + .d2-3522249378 .color-AB4{color:#EDF0FD;} + .d2-3522249378 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3522249378);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3522249378);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3522249378);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3522249378);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3522249378);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3522249378);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3522249378);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3522249378);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3522249378);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3522249378);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3522249378);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3522249378);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3522249378);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3522249378);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3522249378);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3522249378);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3522249378);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3522249378);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> - + + - + + - + + -abcdefgx + +abcdefgx - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/sketch-mode-circle-arrowhead/dagre/board.exp.json b/e2etests/testdata/txtar/sketch-mode-circle-arrowhead/dagre/board.exp.json index 6e64ad35a..75f24570a 100644 --- a/e2etests/testdata/txtar/sketch-mode-circle-arrowhead/dagre/board.exp.json +++ b/e2etests/testdata/txtar/sketch-mode-circle-arrowhead/dagre/board.exp.json @@ -2,7 +2,7 @@ "name": "", "config": { "sketch": true, - "themeID": null, + "themeID": 0, "darkThemeID": null, "pad": null, "center": null, @@ -26,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -67,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -108,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -149,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -190,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -241,6 +246,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 27.5, @@ -288,6 +294,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 142, @@ -335,6 +342,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 142, @@ -375,6 +383,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/txtar/sketch-mode-circle-arrowhead/dagre/sketch.exp.svg b/e2etests/testdata/txtar/sketch-mode-circle-arrowhead/dagre/sketch.exp.svg index 237d04b11..2db354082 100644 --- a/e2etests/testdata/txtar/sketch-mode-circle-arrowhead/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/sketch-mode-circle-arrowhead/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-668607522 .fill-N1{fill:#0A0F25;} + .d2-668607522 .fill-N2{fill:#676C7E;} + .d2-668607522 .fill-N3{fill:#9499AB;} + .d2-668607522 .fill-N4{fill:#CFD2DD;} + .d2-668607522 .fill-N5{fill:#DEE1EB;} + .d2-668607522 .fill-N6{fill:#EEF1F8;} + .d2-668607522 .fill-N7{fill:#FFFFFF;} + .d2-668607522 .fill-B1{fill:#0D32B2;} + .d2-668607522 .fill-B2{fill:#0D32B2;} + .d2-668607522 .fill-B3{fill:#E3E9FD;} + .d2-668607522 .fill-B4{fill:#E3E9FD;} + .d2-668607522 .fill-B5{fill:#EDF0FD;} + .d2-668607522 .fill-B6{fill:#F7F8FE;} + .d2-668607522 .fill-AA2{fill:#4A6FF3;} + .d2-668607522 .fill-AA4{fill:#EDF0FD;} + .d2-668607522 .fill-AA5{fill:#F7F8FE;} + .d2-668607522 .fill-AB4{fill:#EDF0FD;} + .d2-668607522 .fill-AB5{fill:#F7F8FE;} + .d2-668607522 .stroke-N1{stroke:#0A0F25;} + .d2-668607522 .stroke-N2{stroke:#676C7E;} + .d2-668607522 .stroke-N3{stroke:#9499AB;} + .d2-668607522 .stroke-N4{stroke:#CFD2DD;} + .d2-668607522 .stroke-N5{stroke:#DEE1EB;} + .d2-668607522 .stroke-N6{stroke:#EEF1F8;} + .d2-668607522 .stroke-N7{stroke:#FFFFFF;} + .d2-668607522 .stroke-B1{stroke:#0D32B2;} + .d2-668607522 .stroke-B2{stroke:#0D32B2;} + .d2-668607522 .stroke-B3{stroke:#E3E9FD;} + .d2-668607522 .stroke-B4{stroke:#E3E9FD;} + .d2-668607522 .stroke-B5{stroke:#EDF0FD;} + .d2-668607522 .stroke-B6{stroke:#F7F8FE;} + .d2-668607522 .stroke-AA2{stroke:#4A6FF3;} + .d2-668607522 .stroke-AA4{stroke:#EDF0FD;} + .d2-668607522 .stroke-AA5{stroke:#F7F8FE;} + .d2-668607522 .stroke-AB4{stroke:#EDF0FD;} + .d2-668607522 .stroke-AB5{stroke:#F7F8FE;} + .d2-668607522 .background-color-N1{background-color:#0A0F25;} + .d2-668607522 .background-color-N2{background-color:#676C7E;} + .d2-668607522 .background-color-N3{background-color:#9499AB;} + .d2-668607522 .background-color-N4{background-color:#CFD2DD;} + .d2-668607522 .background-color-N5{background-color:#DEE1EB;} + .d2-668607522 .background-color-N6{background-color:#EEF1F8;} + .d2-668607522 .background-color-N7{background-color:#FFFFFF;} + .d2-668607522 .background-color-B1{background-color:#0D32B2;} + .d2-668607522 .background-color-B2{background-color:#0D32B2;} + .d2-668607522 .background-color-B3{background-color:#E3E9FD;} + .d2-668607522 .background-color-B4{background-color:#E3E9FD;} + .d2-668607522 .background-color-B5{background-color:#EDF0FD;} + .d2-668607522 .background-color-B6{background-color:#F7F8FE;} + .d2-668607522 .background-color-AA2{background-color:#4A6FF3;} + .d2-668607522 .background-color-AA4{background-color:#EDF0FD;} + .d2-668607522 .background-color-AA5{background-color:#F7F8FE;} + .d2-668607522 .background-color-AB4{background-color:#EDF0FD;} + .d2-668607522 .background-color-AB5{background-color:#F7F8FE;} + .d2-668607522 .color-N1{color:#0A0F25;} + .d2-668607522 .color-N2{color:#676C7E;} + .d2-668607522 .color-N3{color:#9499AB;} + .d2-668607522 .color-N4{color:#CFD2DD;} + .d2-668607522 .color-N5{color:#DEE1EB;} + .d2-668607522 .color-N6{color:#EEF1F8;} + .d2-668607522 .color-N7{color:#FFFFFF;} + .d2-668607522 .color-B1{color:#0D32B2;} + .d2-668607522 .color-B2{color:#0D32B2;} + .d2-668607522 .color-B3{color:#E3E9FD;} + .d2-668607522 .color-B4{color:#E3E9FD;} + .d2-668607522 .color-B5{color:#EDF0FD;} + .d2-668607522 .color-B6{color:#F7F8FE;} + .d2-668607522 .color-AA2{color:#4A6FF3;} + .d2-668607522 .color-AA4{color:#EDF0FD;} + .d2-668607522 .color-AA5{color:#F7F8FE;} + .d2-668607522 .color-AB4{color:#EDF0FD;} + .d2-668607522 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-668607522);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-668607522);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-668607522);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-668607522);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-668607522);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-668607522);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-668607522);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-668607522);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-668607522);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-668607522);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-668607522);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-668607522);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-668607522);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-668607522);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-668607522);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-668607522);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-668607522);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-668607522);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> - + + - + + - + + -abxyz + +abxyz - - - - - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/sketch-mode-circle-arrowhead/elk/board.exp.json b/e2etests/testdata/txtar/sketch-mode-circle-arrowhead/elk/board.exp.json index aeccd4631..7941c9b3b 100644 --- a/e2etests/testdata/txtar/sketch-mode-circle-arrowhead/elk/board.exp.json +++ b/e2etests/testdata/txtar/sketch-mode-circle-arrowhead/elk/board.exp.json @@ -2,7 +2,7 @@ "name": "", "config": { "sketch": true, - "themeID": null, + "themeID": 0, "darkThemeID": null, "pad": null, "center": null, @@ -26,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -67,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -108,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -149,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -190,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -241,6 +246,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 39.5, @@ -279,6 +285,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 114, @@ -317,6 +324,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 114, @@ -348,6 +356,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/txtar/sketch-mode-circle-arrowhead/elk/sketch.exp.svg b/e2etests/testdata/txtar/sketch-mode-circle-arrowhead/elk/sketch.exp.svg index 3f84cd160..fb359911c 100644 --- a/e2etests/testdata/txtar/sketch-mode-circle-arrowhead/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/sketch-mode-circle-arrowhead/elk/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-2116289671 .fill-N1{fill:#0A0F25;} + .d2-2116289671 .fill-N2{fill:#676C7E;} + .d2-2116289671 .fill-N3{fill:#9499AB;} + .d2-2116289671 .fill-N4{fill:#CFD2DD;} + .d2-2116289671 .fill-N5{fill:#DEE1EB;} + .d2-2116289671 .fill-N6{fill:#EEF1F8;} + .d2-2116289671 .fill-N7{fill:#FFFFFF;} + .d2-2116289671 .fill-B1{fill:#0D32B2;} + .d2-2116289671 .fill-B2{fill:#0D32B2;} + .d2-2116289671 .fill-B3{fill:#E3E9FD;} + .d2-2116289671 .fill-B4{fill:#E3E9FD;} + .d2-2116289671 .fill-B5{fill:#EDF0FD;} + .d2-2116289671 .fill-B6{fill:#F7F8FE;} + .d2-2116289671 .fill-AA2{fill:#4A6FF3;} + .d2-2116289671 .fill-AA4{fill:#EDF0FD;} + .d2-2116289671 .fill-AA5{fill:#F7F8FE;} + .d2-2116289671 .fill-AB4{fill:#EDF0FD;} + .d2-2116289671 .fill-AB5{fill:#F7F8FE;} + .d2-2116289671 .stroke-N1{stroke:#0A0F25;} + .d2-2116289671 .stroke-N2{stroke:#676C7E;} + .d2-2116289671 .stroke-N3{stroke:#9499AB;} + .d2-2116289671 .stroke-N4{stroke:#CFD2DD;} + .d2-2116289671 .stroke-N5{stroke:#DEE1EB;} + .d2-2116289671 .stroke-N6{stroke:#EEF1F8;} + .d2-2116289671 .stroke-N7{stroke:#FFFFFF;} + .d2-2116289671 .stroke-B1{stroke:#0D32B2;} + .d2-2116289671 .stroke-B2{stroke:#0D32B2;} + .d2-2116289671 .stroke-B3{stroke:#E3E9FD;} + .d2-2116289671 .stroke-B4{stroke:#E3E9FD;} + .d2-2116289671 .stroke-B5{stroke:#EDF0FD;} + .d2-2116289671 .stroke-B6{stroke:#F7F8FE;} + .d2-2116289671 .stroke-AA2{stroke:#4A6FF3;} + .d2-2116289671 .stroke-AA4{stroke:#EDF0FD;} + .d2-2116289671 .stroke-AA5{stroke:#F7F8FE;} + .d2-2116289671 .stroke-AB4{stroke:#EDF0FD;} + .d2-2116289671 .stroke-AB5{stroke:#F7F8FE;} + .d2-2116289671 .background-color-N1{background-color:#0A0F25;} + .d2-2116289671 .background-color-N2{background-color:#676C7E;} + .d2-2116289671 .background-color-N3{background-color:#9499AB;} + .d2-2116289671 .background-color-N4{background-color:#CFD2DD;} + .d2-2116289671 .background-color-N5{background-color:#DEE1EB;} + .d2-2116289671 .background-color-N6{background-color:#EEF1F8;} + .d2-2116289671 .background-color-N7{background-color:#FFFFFF;} + .d2-2116289671 .background-color-B1{background-color:#0D32B2;} + .d2-2116289671 .background-color-B2{background-color:#0D32B2;} + .d2-2116289671 .background-color-B3{background-color:#E3E9FD;} + .d2-2116289671 .background-color-B4{background-color:#E3E9FD;} + .d2-2116289671 .background-color-B5{background-color:#EDF0FD;} + .d2-2116289671 .background-color-B6{background-color:#F7F8FE;} + .d2-2116289671 .background-color-AA2{background-color:#4A6FF3;} + .d2-2116289671 .background-color-AA4{background-color:#EDF0FD;} + .d2-2116289671 .background-color-AA5{background-color:#F7F8FE;} + .d2-2116289671 .background-color-AB4{background-color:#EDF0FD;} + .d2-2116289671 .background-color-AB5{background-color:#F7F8FE;} + .d2-2116289671 .color-N1{color:#0A0F25;} + .d2-2116289671 .color-N2{color:#676C7E;} + .d2-2116289671 .color-N3{color:#9499AB;} + .d2-2116289671 .color-N4{color:#CFD2DD;} + .d2-2116289671 .color-N5{color:#DEE1EB;} + .d2-2116289671 .color-N6{color:#EEF1F8;} + .d2-2116289671 .color-N7{color:#FFFFFF;} + .d2-2116289671 .color-B1{color:#0D32B2;} + .d2-2116289671 .color-B2{color:#0D32B2;} + .d2-2116289671 .color-B3{color:#E3E9FD;} + .d2-2116289671 .color-B4{color:#E3E9FD;} + .d2-2116289671 .color-B5{color:#EDF0FD;} + .d2-2116289671 .color-B6{color:#F7F8FE;} + .d2-2116289671 .color-AA2{color:#4A6FF3;} + .d2-2116289671 .color-AA4{color:#EDF0FD;} + .d2-2116289671 .color-AA5{color:#F7F8FE;} + .d2-2116289671 .color-AB4{color:#EDF0FD;} + .d2-2116289671 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2116289671);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2116289671);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2116289671);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2116289671);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2116289671);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2116289671);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2116289671);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2116289671);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2116289671);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2116289671);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2116289671);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2116289671);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2116289671);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2116289671);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2116289671);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2116289671);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2116289671);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2116289671);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> - + + - + + - + + -abxyz + +abxyz - - - - - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/small-c4-person/dagre/board.exp.json b/e2etests/testdata/txtar/small-c4-person/dagre/board.exp.json new file mode 100644 index 000000000..999037997 --- /dev/null +++ b/e2etests/testdata/txtar/small-c4-person/dagre/board.exp.json @@ -0,0 +1,99 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "a", + "type": "c4-person", + "pos": { + "x": 0, + "y": 0 + }, + "width": 180, + "height": 97, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B3", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "c4-person", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 71, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/small-c4-person/dagre/sketch.exp.svg b/e2etests/testdata/txtar/small-c4-person/dagre/sketch.exp.svg new file mode 100644 index 000000000..79708d3ef --- /dev/null +++ b/e2etests/testdata/txtar/small-c4-person/dagre/sketch.exp.svg @@ -0,0 +1,95 @@ +c4-person + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/small-c4-person/elk/board.exp.json b/e2etests/testdata/txtar/small-c4-person/elk/board.exp.json new file mode 100644 index 000000000..a6f4b3250 --- /dev/null +++ b/e2etests/testdata/txtar/small-c4-person/elk/board.exp.json @@ -0,0 +1,99 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "a", + "type": "c4-person", + "pos": { + "x": 12, + "y": 12 + }, + "width": 180, + "height": 97, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B3", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "c4-person", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 71, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/small-c4-person/elk/sketch.exp.svg b/e2etests/testdata/txtar/small-c4-person/elk/sketch.exp.svg new file mode 100644 index 000000000..dbfa39f8e --- /dev/null +++ b/e2etests/testdata/txtar/small-c4-person/elk/sketch.exp.svg @@ -0,0 +1,95 @@ +c4-person + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/sql-casing-panic/dagre/board.exp.json b/e2etests/testdata/txtar/sql-casing-panic/dagre/board.exp.json new file mode 100644 index 000000000..4832c3200 --- /dev/null +++ b/e2etests/testdata/txtar/sql-casing-panic/dagre/board.exp.json @@ -0,0 +1,130 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "asdf", + "type": "sql_table", + "pos": { + "x": 0, + "y": 0 + }, + "width": 87, + "height": 72, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": [ + { + "name": { + "label": "zxcv", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 37, + "labelHeight": 26 + }, + "type": { + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0 + }, + "constraint": null, + "reference": "" + } + ], + "label": "asdf", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 46, + "labelHeight": 31, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + } + ], + "connections": [], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/sql-casing-panic/dagre/sketch.exp.svg b/e2etests/testdata/txtar/sql-casing-panic/dagre/sketch.exp.svg new file mode 100644 index 000000000..fab493f8e --- /dev/null +++ b/e2etests/testdata/txtar/sql-casing-panic/dagre/sketch.exp.svg @@ -0,0 +1,95 @@ +asdfzxcv + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/sql-casing-panic/elk/board.exp.json b/e2etests/testdata/txtar/sql-casing-panic/elk/board.exp.json new file mode 100644 index 000000000..ea369be7b --- /dev/null +++ b/e2etests/testdata/txtar/sql-casing-panic/elk/board.exp.json @@ -0,0 +1,130 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "asdf", + "type": "sql_table", + "pos": { + "x": 12, + "y": 12 + }, + "width": 87, + "height": 72, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": [ + { + "name": { + "label": "zxcv", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 37, + "labelHeight": 26 + }, + "type": { + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0 + }, + "constraint": null, + "reference": "" + } + ], + "label": "asdf", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 46, + "labelHeight": 31, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + } + ], + "connections": [], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/sql-casing-panic/elk/sketch.exp.svg b/e2etests/testdata/txtar/sql-casing-panic/elk/sketch.exp.svg new file mode 100644 index 000000000..a9bd00688 --- /dev/null +++ b/e2etests/testdata/txtar/sql-casing-panic/elk/sketch.exp.svg @@ -0,0 +1,95 @@ +asdfzxcv + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/sql-icon/dagre/board.exp.json b/e2etests/testdata/txtar/sql-icon/dagre/board.exp.json index d82dbf6e9..405c0757e 100644 --- a/e2etests/testdata/txtar/sql-icon/dagre/board.exp.json +++ b/e2etests/testdata/txtar/sql-icon/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -131,6 +141,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -180,6 +191,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -220,6 +232,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -260,6 +273,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -301,6 +315,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -385,6 +400,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -446,6 +462,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -498,6 +515,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -560,6 +578,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 93, @@ -619,6 +638,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 308, @@ -678,6 +698,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 507, @@ -737,6 +758,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 818, @@ -789,6 +811,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/txtar/sql-icon/dagre/sketch.exp.svg b/e2etests/testdata/txtar/sql-icon/dagre/sketch.exp.svg index b9ecb2ab4..1a6c8e04e 100644 --- a/e2etests/testdata/txtar/sql-icon/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/sql-icon/dagre/sketch.exp.svg @@ -1,27 +1,27 @@ -withoutwithtableExabclassEx+aba := 1a := 1

    This is for all ill-treated fellows

    +withoutwithtableExabclassEx+aba := 1a := 1

    This is for all ill-treated fellows

    You will live a long, healthy, happy life and make bags of money.

    -
    tableExabclassEx+aba := 1a := 1

    This is for all ill-treated fellows

    +
    tableExabclassEx+aba := 1a := 1

    This is for all ill-treated fellows

    You will live a long, healthy, happy life and make bags of money.

    -
     +
     - - - - - - + + + + + +     \ No newline at end of file diff --git a/e2etests/testdata/txtar/sql-icon/elk/board.exp.json b/e2etests/testdata/txtar/sql-icon/elk/board.exp.json index ca4d10f2c..c269cfae1 100644 --- a/e2etests/testdata/txtar/sql-icon/elk/board.exp.json +++ b/e2etests/testdata/txtar/sql-icon/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -131,6 +141,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -180,6 +191,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -220,6 +232,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -260,6 +273,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -301,6 +315,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -385,6 +400,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -446,6 +462,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -498,6 +515,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -560,6 +578,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 115, @@ -598,6 +617,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 290, @@ -636,6 +656,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 449, @@ -674,6 +695,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 720, @@ -705,6 +727,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/txtar/sql-icon/elk/sketch.exp.svg b/e2etests/testdata/txtar/sql-icon/elk/sketch.exp.svg index 7fe909408..66b9dc98e 100644 --- a/e2etests/testdata/txtar/sql-icon/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/sql-icon/elk/sketch.exp.svg @@ -1,27 +1,27 @@ -withoutwithtableExabclassEx+aba := 1a := 1

    This is for all ill-treated fellows

    +withoutwithtableExabclassEx+aba := 1a := 1

    This is for all ill-treated fellows

    You will live a long, healthy, happy life and make bags of money.

    -
    tableExabclassEx+aba := 1a := 1

    This is for all ill-treated fellows

    +
    tableExabclassEx+aba := 1a := 1

    This is for all ill-treated fellows

    You will live a long, healthy, happy life and make bags of money.

    -
     +
     - - - - - - + + + + + +     \ No newline at end of file diff --git a/e2etests/testdata/txtar/sql-table-reserved/dagre/board.exp.json b/e2etests/testdata/txtar/sql-table-reserved/dagre/board.exp.json new file mode 100644 index 000000000..f2b0a7306 --- /dev/null +++ b/e2etests/testdata/txtar/sql-table-reserved/dagre/board.exp.json @@ -0,0 +1,317 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "my_table", + "type": "sql_table", + "pos": { + "x": 0, + "y": 166 + }, + "width": 200, + "height": 200, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "static.wikia.nocookie.net", + "Path": "/tomandjerry/images/4/46/JerryJumbo3-1-.jpg", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "OUTSIDE_TOP_LEFT", + "blend": false, + "fields": null, + "methods": null, + "columns": [ + { + "name": { + "label": "shape", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 51, + "labelHeight": 26 + }, + "type": { + "label": "string", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 48, + "labelHeight": 26 + }, + "constraint": null, + "reference": "" + }, + { + "name": { + "label": "icon", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 35, + "labelHeight": 26 + }, + "type": { + "label": "string", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 48, + "labelHeight": 26 + }, + "constraint": null, + "reference": "" + }, + { + "name": { + "label": "width", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 48, + "labelHeight": 26 + }, + "type": { + "label": "int", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 23, + "labelHeight": 26 + }, + "constraint": null, + "reference": "" + }, + { + "name": { + "label": "height", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 53, + "labelHeight": 26 + }, + "type": { + "label": "int", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 23, + "labelHeight": 26 + }, + "constraint": null, + "reference": "" + } + ], + "label": "my_table", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 99, + "labelHeight": 31, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + }, + { + "id": "x", + "type": "rectangle", + "pos": { + "x": 74, + "y": 0 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "x", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [ + { + "id": "(x -> my_table)[0]", + "src": "x", + "srcArrow": "none", + "dst": "my_table", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 100, + "y": 66 + }, + { + "x": 100, + "y": 106 + }, + { + "x": 100, + "y": 126 + }, + { + "x": 100, + "y": 166 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/sql-table-reserved/dagre/sketch.exp.svg b/e2etests/testdata/txtar/sql-table-reserved/dagre/sketch.exp.svg new file mode 100644 index 000000000..8a1c2dae2 --- /dev/null +++ b/e2etests/testdata/txtar/sql-table-reserved/dagre/sketch.exp.svg @@ -0,0 +1,102 @@ +my_tableshapestringiconstringwidthintheightintx + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/sql-table-reserved/elk/board.exp.json b/e2etests/testdata/txtar/sql-table-reserved/elk/board.exp.json new file mode 100644 index 000000000..009debd19 --- /dev/null +++ b/e2etests/testdata/txtar/sql-table-reserved/elk/board.exp.json @@ -0,0 +1,312 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "my_table", + "type": "sql_table", + "pos": { + "x": 78, + "y": 217 + }, + "width": 200, + "height": 200, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "static.wikia.nocookie.net", + "Path": "/tomandjerry/images/4/46/JerryJumbo3-1-.jpg", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconPosition": "OUTSIDE_TOP_LEFT", + "blend": false, + "fields": null, + "methods": null, + "columns": [ + { + "name": { + "label": "shape", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 51, + "labelHeight": 26 + }, + "type": { + "label": "string", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 48, + "labelHeight": 26 + }, + "constraint": null, + "reference": "" + }, + { + "name": { + "label": "icon", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 35, + "labelHeight": 26 + }, + "type": { + "label": "string", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 48, + "labelHeight": 26 + }, + "constraint": null, + "reference": "" + }, + { + "name": { + "label": "width", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 48, + "labelHeight": 26 + }, + "type": { + "label": "int", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 23, + "labelHeight": 26 + }, + "constraint": null, + "reference": "" + }, + { + "name": { + "label": "height", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 53, + "labelHeight": 26 + }, + "type": { + "label": "int", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 23, + "labelHeight": 26 + }, + "constraint": null, + "reference": "" + } + ], + "label": "my_table", + "fontSize": 20, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 99, + "labelHeight": 31, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + }, + { + "id": "x", + "type": "rectangle", + "pos": { + "x": 12, + "y": 12 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "x", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [ + { + "id": "(x -> my_table)[0]", + "src": "x", + "srcArrow": "none", + "dst": "my_table", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 38.5, + "y": 77.6989974975586 + }, + { + "x": 38.5, + "y": 228.6999969482422 + }, + { + "x": 78.5, + "y": 228.6999969482422 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/sql-table-reserved/elk/sketch.exp.svg b/e2etests/testdata/txtar/sql-table-reserved/elk/sketch.exp.svg new file mode 100644 index 000000000..abfe651e6 --- /dev/null +++ b/e2etests/testdata/txtar/sql-table-reserved/elk/sketch.exp.svg @@ -0,0 +1,102 @@ +my_tableshapestringiconstringwidthintheightintx + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/theme-overrides/dagre/board.exp.json b/e2etests/testdata/txtar/theme-overrides/dagre/board.exp.json index f797e1f2b..4fab206b7 100644 --- a/e2etests/testdata/txtar/theme-overrides/dagre/board.exp.json +++ b/e2etests/testdata/txtar/theme-overrides/dagre/board.exp.json @@ -1,8 +1,8 @@ { "name": "", "config": { - "sketch": null, - "themeID": null, + "sketch": false, + "themeID": 0, "darkThemeID": null, "pad": null, "center": null, @@ -66,6 +66,7 @@ "borderRadius": 0, "fill": "AB4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -107,6 +108,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -148,6 +150,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -189,6 +192,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -230,6 +234,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -271,6 +276,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -312,6 +318,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -353,6 +360,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -394,6 +402,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -435,6 +444,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -476,6 +486,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -517,6 +528,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -675,6 +687,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -843,6 +856,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 791, @@ -890,6 +904,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 792, @@ -937,6 +952,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 797, @@ -984,6 +1000,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1120, @@ -1031,6 +1048,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 163, @@ -1078,6 +1096,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1563, @@ -1125,6 +1144,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1563, @@ -1172,6 +1192,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1563, @@ -1219,6 +1240,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1814, @@ -1266,6 +1288,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1814, @@ -1313,6 +1336,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1814, @@ -1360,6 +1384,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1771, @@ -1407,6 +1432,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 161, @@ -1610,6 +1636,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 294, @@ -1662,6 +1689,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/txtar/theme-overrides/dagre/sketch.exp.svg b/e2etests/testdata/txtar/theme-overrides/dagre/sketch.exp.svg index 6501afd2f..8b110b2a4 100644 --- a/e2etests/testdata/txtar/theme-overrides/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/theme-overrides/dagre/sketch.exp.svg @@ -1,23 +1,23 @@ -logsUserNetworkAPI ServercostumesidintPKsillinessintmonsterintlast_updatedtimestampmonstersidintPKmoviestringweightintlast_updatedtimestampCell TowerData ProcessorOnline PortalsatellitestransmitterStorageUI phone logsMake callpersistdisplay access + .d2-586632521 .fill-N1{fill:#2E2E2E;} + .d2-586632521 .fill-N2{fill:#2E2E2E;} + .d2-586632521 .fill-N3{fill:#595959;} + .d2-586632521 .fill-N4{fill:#858585;} + .d2-586632521 .fill-N5{fill:#B1B1B1;} + .d2-586632521 .fill-N6{fill:#DCDCDC;} + .d2-586632521 .fill-N7{fill:#DCDCDC;} + .d2-586632521 .fill-B1{fill:#2E7D32;} + .d2-586632521 .fill-B2{fill:#66BB6A;} + .d2-586632521 .fill-B3{fill:#A5D6A7;} + .d2-586632521 .fill-B4{fill:#C5E1A5;} + .d2-586632521 .fill-B5{fill:#E6EE9C;} + .d2-586632521 .fill-B6{fill:#FFF59D;} + .d2-586632521 .fill-AA2{fill:#0D47A1;} + .d2-586632521 .fill-AA4{fill:#42A5F5;} + .d2-586632521 .fill-AA5{fill:#90CAF9;} + .d2-586632521 .fill-AB4{fill:#F44336;} + .d2-586632521 .fill-AB5{fill:#FFCDD2;} + .d2-586632521 .stroke-N1{stroke:#2E2E2E;} + .d2-586632521 .stroke-N2{stroke:#2E2E2E;} + .d2-586632521 .stroke-N3{stroke:#595959;} + .d2-586632521 .stroke-N4{stroke:#858585;} + .d2-586632521 .stroke-N5{stroke:#B1B1B1;} + .d2-586632521 .stroke-N6{stroke:#DCDCDC;} + .d2-586632521 .stroke-N7{stroke:#DCDCDC;} + .d2-586632521 .stroke-B1{stroke:#2E7D32;} + .d2-586632521 .stroke-B2{stroke:#66BB6A;} + .d2-586632521 .stroke-B3{stroke:#A5D6A7;} + .d2-586632521 .stroke-B4{stroke:#C5E1A5;} + .d2-586632521 .stroke-B5{stroke:#E6EE9C;} + .d2-586632521 .stroke-B6{stroke:#FFF59D;} + .d2-586632521 .stroke-AA2{stroke:#0D47A1;} + .d2-586632521 .stroke-AA4{stroke:#42A5F5;} + .d2-586632521 .stroke-AA5{stroke:#90CAF9;} + .d2-586632521 .stroke-AB4{stroke:#F44336;} + .d2-586632521 .stroke-AB5{stroke:#FFCDD2;} + .d2-586632521 .background-color-N1{background-color:#2E2E2E;} + .d2-586632521 .background-color-N2{background-color:#2E2E2E;} + .d2-586632521 .background-color-N3{background-color:#595959;} + .d2-586632521 .background-color-N4{background-color:#858585;} + .d2-586632521 .background-color-N5{background-color:#B1B1B1;} + .d2-586632521 .background-color-N6{background-color:#DCDCDC;} + .d2-586632521 .background-color-N7{background-color:#DCDCDC;} + .d2-586632521 .background-color-B1{background-color:#2E7D32;} + .d2-586632521 .background-color-B2{background-color:#66BB6A;} + .d2-586632521 .background-color-B3{background-color:#A5D6A7;} + .d2-586632521 .background-color-B4{background-color:#C5E1A5;} + .d2-586632521 .background-color-B5{background-color:#E6EE9C;} + .d2-586632521 .background-color-B6{background-color:#FFF59D;} + .d2-586632521 .background-color-AA2{background-color:#0D47A1;} + .d2-586632521 .background-color-AA4{background-color:#42A5F5;} + .d2-586632521 .background-color-AA5{background-color:#90CAF9;} + .d2-586632521 .background-color-AB4{background-color:#F44336;} + .d2-586632521 .background-color-AB5{background-color:#FFCDD2;} + .d2-586632521 .color-N1{color:#2E2E2E;} + .d2-586632521 .color-N2{color:#2E2E2E;} + .d2-586632521 .color-N3{color:#595959;} + .d2-586632521 .color-N4{color:#858585;} + .d2-586632521 .color-N5{color:#B1B1B1;} + .d2-586632521 .color-N6{color:#DCDCDC;} + .d2-586632521 .color-N7{color:#DCDCDC;} + .d2-586632521 .color-B1{color:#2E7D32;} + .d2-586632521 .color-B2{color:#66BB6A;} + .d2-586632521 .color-B3{color:#A5D6A7;} + .d2-586632521 .color-B4{color:#C5E1A5;} + .d2-586632521 .color-B5{color:#E6EE9C;} + .d2-586632521 .color-B6{color:#FFF59D;} + .d2-586632521 .color-AA2{color:#0D47A1;} + .d2-586632521 .color-AA4{color:#42A5F5;} + .d2-586632521 .color-AA5{color:#90CAF9;} + .d2-586632521 .color-AB4{color:#F44336;} + .d2-586632521 .color-AB5{color:#FFCDD2;}.appendix text.text{fill:#2E2E2E}.md{--color-fg-default:#2E2E2E;--color-fg-muted:#2E2E2E;--color-fg-subtle:#595959;--color-canvas-default:#DCDCDC;--color-canvas-subtle:#DCDCDC;--color-border-default:#2E7D32;--color-border-muted:#66BB6A;--color-neutral-muted:#DCDCDC;--color-accent-fg:#66BB6A;--color-accent-emphasis:#66BB6A;--color-attention-subtle:#2E2E2E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-dark-d2-586632521);mix-blend-mode:overlay}.sketch-overlay-B2{fill:url(#streaks-normal-d2-586632521);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-normal-d2-586632521);mix-blend-mode:color-burn}.sketch-overlay-B4{fill:url(#streaks-normal-d2-586632521);mix-blend-mode:color-burn}.sketch-overlay-B5{fill:url(#streaks-bright-d2-586632521);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-586632521);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-darker-d2-586632521);mix-blend-mode:lighten}.sketch-overlay-AA4{fill:url(#streaks-normal-d2-586632521);mix-blend-mode:color-burn}.sketch-overlay-AA5{fill:url(#streaks-normal-d2-586632521);mix-blend-mode:color-burn}.sketch-overlay-AB4{fill:url(#streaks-dark-d2-586632521);mix-blend-mode:overlay}.sketch-overlay-AB5{fill:url(#streaks-normal-d2-586632521);mix-blend-mode:color-burn}.sketch-overlay-N1{fill:url(#streaks-darker-d2-586632521);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-darker-d2-586632521);mix-blend-mode:lighten}.sketch-overlay-N3{fill:url(#streaks-dark-d2-586632521);mix-blend-mode:overlay}.sketch-overlay-N4{fill:url(#streaks-dark-d2-586632521);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-normal-d2-586632521);mix-blend-mode:color-burn}.sketch-overlay-N6{fill:url(#streaks-normal-d2-586632521);mix-blend-mode:color-burn}.sketch-overlay-N7{fill:url(#streaks-normal-d2-586632521);mix-blend-mode:color-burn}.light-code{display: block}.dark-code{display: none}]]>logsUserNetworkAPI ServercostumesidintPKsillinessintmonsterintlast_updatedtimestampmonstersidintPKmoviestringweightintlast_updatedtimestampCell TowerData ProcessorOnline PortalsatellitestransmitterStorageUI phone logsMake callpersistdisplay access - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/theme-overrides/elk/board.exp.json b/e2etests/testdata/txtar/theme-overrides/elk/board.exp.json index 44705ad31..40f03cb3c 100644 --- a/e2etests/testdata/txtar/theme-overrides/elk/board.exp.json +++ b/e2etests/testdata/txtar/theme-overrides/elk/board.exp.json @@ -1,8 +1,8 @@ { "name": "", "config": { - "sketch": null, - "themeID": null, + "sketch": false, + "themeID": 0, "darkThemeID": null, "pad": null, "center": null, @@ -66,6 +66,7 @@ "borderRadius": 0, "fill": "AB4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -107,6 +108,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -148,6 +150,7 @@ "borderRadius": 0, "fill": "B4", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -189,6 +192,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -230,6 +234,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -271,6 +276,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -312,6 +318,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -353,6 +360,7 @@ "borderRadius": 0, "fill": "AA5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": true, @@ -394,6 +402,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -435,6 +444,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -476,6 +486,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -517,6 +528,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -675,6 +687,7 @@ "borderRadius": 0, "fill": "N1", "stroke": "N7", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -843,6 +856,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 985, @@ -881,6 +895,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 990, @@ -919,6 +934,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 982, @@ -957,6 +973,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1213, @@ -995,6 +1012,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 299, @@ -1033,6 +1051,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1693, @@ -1079,6 +1098,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1693, @@ -1125,6 +1145,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1693, @@ -1179,6 +1200,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2078, @@ -1225,6 +1247,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 2078, @@ -1263,6 +1286,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 2078, @@ -1309,6 +1333,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 1958, @@ -1363,6 +1388,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 306, @@ -1409,6 +1435,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 306, @@ -1440,6 +1467,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/txtar/theme-overrides/elk/sketch.exp.svg b/e2etests/testdata/txtar/theme-overrides/elk/sketch.exp.svg index bca32f618..a702e2a78 100644 --- a/e2etests/testdata/txtar/theme-overrides/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/theme-overrides/elk/sketch.exp.svg @@ -1,23 +1,23 @@ -logsUserNetworkAPI ServercostumesidintPKsillinessintmonsterintlast_updatedtimestampmonstersidintPKmoviestringweightintlast_updatedtimestampCell TowerData ProcessorOnline PortalsatellitestransmitterStorageUI phone logsMake callpersistdisplay access + .d2-2010673424 .fill-N1{fill:#2E2E2E;} + .d2-2010673424 .fill-N2{fill:#2E2E2E;} + .d2-2010673424 .fill-N3{fill:#595959;} + .d2-2010673424 .fill-N4{fill:#858585;} + .d2-2010673424 .fill-N5{fill:#B1B1B1;} + .d2-2010673424 .fill-N6{fill:#DCDCDC;} + .d2-2010673424 .fill-N7{fill:#DCDCDC;} + .d2-2010673424 .fill-B1{fill:#2E7D32;} + .d2-2010673424 .fill-B2{fill:#66BB6A;} + .d2-2010673424 .fill-B3{fill:#A5D6A7;} + .d2-2010673424 .fill-B4{fill:#C5E1A5;} + .d2-2010673424 .fill-B5{fill:#E6EE9C;} + .d2-2010673424 .fill-B6{fill:#FFF59D;} + .d2-2010673424 .fill-AA2{fill:#0D47A1;} + .d2-2010673424 .fill-AA4{fill:#42A5F5;} + .d2-2010673424 .fill-AA5{fill:#90CAF9;} + .d2-2010673424 .fill-AB4{fill:#F44336;} + .d2-2010673424 .fill-AB5{fill:#FFCDD2;} + .d2-2010673424 .stroke-N1{stroke:#2E2E2E;} + .d2-2010673424 .stroke-N2{stroke:#2E2E2E;} + .d2-2010673424 .stroke-N3{stroke:#595959;} + .d2-2010673424 .stroke-N4{stroke:#858585;} + .d2-2010673424 .stroke-N5{stroke:#B1B1B1;} + .d2-2010673424 .stroke-N6{stroke:#DCDCDC;} + .d2-2010673424 .stroke-N7{stroke:#DCDCDC;} + .d2-2010673424 .stroke-B1{stroke:#2E7D32;} + .d2-2010673424 .stroke-B2{stroke:#66BB6A;} + .d2-2010673424 .stroke-B3{stroke:#A5D6A7;} + .d2-2010673424 .stroke-B4{stroke:#C5E1A5;} + .d2-2010673424 .stroke-B5{stroke:#E6EE9C;} + .d2-2010673424 .stroke-B6{stroke:#FFF59D;} + .d2-2010673424 .stroke-AA2{stroke:#0D47A1;} + .d2-2010673424 .stroke-AA4{stroke:#42A5F5;} + .d2-2010673424 .stroke-AA5{stroke:#90CAF9;} + .d2-2010673424 .stroke-AB4{stroke:#F44336;} + .d2-2010673424 .stroke-AB5{stroke:#FFCDD2;} + .d2-2010673424 .background-color-N1{background-color:#2E2E2E;} + .d2-2010673424 .background-color-N2{background-color:#2E2E2E;} + .d2-2010673424 .background-color-N3{background-color:#595959;} + .d2-2010673424 .background-color-N4{background-color:#858585;} + .d2-2010673424 .background-color-N5{background-color:#B1B1B1;} + .d2-2010673424 .background-color-N6{background-color:#DCDCDC;} + .d2-2010673424 .background-color-N7{background-color:#DCDCDC;} + .d2-2010673424 .background-color-B1{background-color:#2E7D32;} + .d2-2010673424 .background-color-B2{background-color:#66BB6A;} + .d2-2010673424 .background-color-B3{background-color:#A5D6A7;} + .d2-2010673424 .background-color-B4{background-color:#C5E1A5;} + .d2-2010673424 .background-color-B5{background-color:#E6EE9C;} + .d2-2010673424 .background-color-B6{background-color:#FFF59D;} + .d2-2010673424 .background-color-AA2{background-color:#0D47A1;} + .d2-2010673424 .background-color-AA4{background-color:#42A5F5;} + .d2-2010673424 .background-color-AA5{background-color:#90CAF9;} + .d2-2010673424 .background-color-AB4{background-color:#F44336;} + .d2-2010673424 .background-color-AB5{background-color:#FFCDD2;} + .d2-2010673424 .color-N1{color:#2E2E2E;} + .d2-2010673424 .color-N2{color:#2E2E2E;} + .d2-2010673424 .color-N3{color:#595959;} + .d2-2010673424 .color-N4{color:#858585;} + .d2-2010673424 .color-N5{color:#B1B1B1;} + .d2-2010673424 .color-N6{color:#DCDCDC;} + .d2-2010673424 .color-N7{color:#DCDCDC;} + .d2-2010673424 .color-B1{color:#2E7D32;} + .d2-2010673424 .color-B2{color:#66BB6A;} + .d2-2010673424 .color-B3{color:#A5D6A7;} + .d2-2010673424 .color-B4{color:#C5E1A5;} + .d2-2010673424 .color-B5{color:#E6EE9C;} + .d2-2010673424 .color-B6{color:#FFF59D;} + .d2-2010673424 .color-AA2{color:#0D47A1;} + .d2-2010673424 .color-AA4{color:#42A5F5;} + .d2-2010673424 .color-AA5{color:#90CAF9;} + .d2-2010673424 .color-AB4{color:#F44336;} + .d2-2010673424 .color-AB5{color:#FFCDD2;}.appendix text.text{fill:#2E2E2E}.md{--color-fg-default:#2E2E2E;--color-fg-muted:#2E2E2E;--color-fg-subtle:#595959;--color-canvas-default:#DCDCDC;--color-canvas-subtle:#DCDCDC;--color-border-default:#2E7D32;--color-border-muted:#66BB6A;--color-neutral-muted:#DCDCDC;--color-accent-fg:#66BB6A;--color-accent-emphasis:#66BB6A;--color-attention-subtle:#2E2E2E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-dark-d2-2010673424);mix-blend-mode:overlay}.sketch-overlay-B2{fill:url(#streaks-normal-d2-2010673424);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-normal-d2-2010673424);mix-blend-mode:color-burn}.sketch-overlay-B4{fill:url(#streaks-normal-d2-2010673424);mix-blend-mode:color-burn}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2010673424);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2010673424);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-darker-d2-2010673424);mix-blend-mode:lighten}.sketch-overlay-AA4{fill:url(#streaks-normal-d2-2010673424);mix-blend-mode:color-burn}.sketch-overlay-AA5{fill:url(#streaks-normal-d2-2010673424);mix-blend-mode:color-burn}.sketch-overlay-AB4{fill:url(#streaks-dark-d2-2010673424);mix-blend-mode:overlay}.sketch-overlay-AB5{fill:url(#streaks-normal-d2-2010673424);mix-blend-mode:color-burn}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2010673424);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-darker-d2-2010673424);mix-blend-mode:lighten}.sketch-overlay-N3{fill:url(#streaks-dark-d2-2010673424);mix-blend-mode:overlay}.sketch-overlay-N4{fill:url(#streaks-dark-d2-2010673424);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-normal-d2-2010673424);mix-blend-mode:color-burn}.sketch-overlay-N6{fill:url(#streaks-normal-d2-2010673424);mix-blend-mode:color-burn}.sketch-overlay-N7{fill:url(#streaks-normal-d2-2010673424);mix-blend-mode:color-burn}.light-code{display: block}.dark-code{display: none}]]>logsUserNetworkAPI ServercostumesidintPKsillinessintmonsterintlast_updatedtimestampmonstersidintPKmoviestringweightintlast_updatedtimestampCell TowerData ProcessorOnline PortalsatellitestransmitterStorageUI phone logsMake callpersistdisplay access - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/txtar/unicode/dagre/board.exp.json b/e2etests/testdata/txtar/unicode/dagre/board.exp.json index 61339f477..6038b8413 100644 --- a/e2etests/testdata/txtar/unicode/dagre/board.exp.json +++ b/e2etests/testdata/txtar/unicode/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -98,6 +108,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -138,6 +149,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -178,6 +190,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -218,6 +231,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -258,6 +272,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -298,6 +313,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -338,6 +354,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -378,6 +395,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -418,6 +436,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -458,6 +477,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -500,6 +520,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/txtar/unicode/dagre/sketch.exp.svg b/e2etests/testdata/txtar/unicode/dagre/sketch.exp.svg index 6533a9d3e..09c6ed942 100644 --- a/e2etests/testdata/txtar/unicode/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/unicode/dagre/sketch.exp.svg @@ -1,13 +1,13 @@ -

    ■ foo bar

    -

    □ foo bar

    -

    ● foo bar

    -

    ○ foo bar

    -

    ◆ foo bar

    -

    ◇ foo bar

    -

    ▲ foo bar

    -

    △ foo bar

    -

    ▼ foo bar

    -

    ▽ foo bar

    -

    ※ foo bar

    -

    ◎ foo bar

    -
     +

    ■ foo bar

    +

    □ foo bar

    +

    ● foo bar

    +

    ○ foo bar

    +

    ◆ foo bar

    +

    ◇ foo bar

    +

    ▲ foo bar

    +

    △ foo bar

    +

    ▼ foo bar

    +

    ▽ foo bar

    +

    ※ foo bar

    +

    ◎ foo bar

    +
     - - - - - - - - - - - - + + + + + + + + + + + +     \ No newline at end of file diff --git a/e2etests/testdata/txtar/unicode/elk/board.exp.json b/e2etests/testdata/txtar/unicode/elk/board.exp.json index 8dca6ac7a..5610ce4f3 100644 --- a/e2etests/testdata/txtar/unicode/elk/board.exp.json +++ b/e2etests/testdata/txtar/unicode/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -98,6 +108,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -138,6 +149,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -178,6 +190,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -218,6 +231,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -258,6 +272,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -298,6 +313,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -338,6 +354,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -378,6 +395,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -418,6 +436,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -458,6 +477,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -500,6 +520,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/txtar/unicode/elk/sketch.exp.svg b/e2etests/testdata/txtar/unicode/elk/sketch.exp.svg index c0acb4cc4..0920bf434 100644 --- a/e2etests/testdata/txtar/unicode/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/unicode/elk/sketch.exp.svg @@ -1,13 +1,13 @@ -

    ■ foo bar

    -

    □ foo bar

    -

    ● foo bar

    -

    ○ foo bar

    -

    ◆ foo bar

    -

    ◇ foo bar

    -

    ▲ foo bar

    -

    △ foo bar

    -

    ▼ foo bar

    -

    ▽ foo bar

    -

    ※ foo bar

    -

    ◎ foo bar

    -
     +

    ■ foo bar

    +

    □ foo bar

    +

    ● foo bar

    +

    ○ foo bar

    +

    ◆ foo bar

    +

    ◇ foo bar

    +

    ▲ foo bar

    +

    △ foo bar

    +

    ▼ foo bar

    +

    ▽ foo bar

    +

    ※ foo bar

    +

    ◎ foo bar

    +
     - - - - - - - - - - - - + + + + + + + + + + + +     \ No newline at end of file diff --git a/e2etests/testdata/txtar/var_in_markdown/dagre/board.exp.json b/e2etests/testdata/txtar/var_in_markdown/dagre/board.exp.json new file mode 100644 index 000000000..3c905ca2b --- /dev/null +++ b/e2etests/testdata/txtar/var_in_markdown/dagre/board.exp.json @@ -0,0 +1,321 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "x", + "type": "rectangle", + "pos": { + "x": 0, + "y": 0 + }, + "width": 81, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Kube", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 36, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "description", + "type": "text", + "pos": { + "x": 86, + "y": 166 + }, + "width": 163, + "height": 96, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "N1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Kube is a service\n\n```\nLet ${y} be ${x}\n```", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 163, + "labelHeight": 96, + "zIndex": 0, + "level": 1 + }, + { + "id": "b", + "type": "rectangle", + "pos": { + "x": 141, + "y": 0 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "a", + "type": "rectangle", + "pos": { + "x": 141, + "y": 362 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [ + { + "id": "(b -> description)[0]", + "src": "b", + "srcArrow": "none", + "dst": "description", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 167.5, + "y": 66 + }, + { + "x": 167.5, + "y": 106 + }, + { + "x": 167.5, + "y": 126 + }, + { + "x": 167.5, + "y": 166 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(description -> a)[0]", + "src": "description", + "srcArrow": "none", + "dst": "a", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 167.5, + "y": 262 + }, + { + "x": 167.5, + "y": 302 + }, + { + "x": 167.5, + "y": 322 + }, + { + "x": 167.5, + "y": 362 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/var_in_markdown/dagre/sketch.exp.svg b/e2etests/testdata/txtar/var_in_markdown/dagre/sketch.exp.svg new file mode 100644 index 000000000..5ca053464 --- /dev/null +++ b/e2etests/testdata/txtar/var_in_markdown/dagre/sketch.exp.svg @@ -0,0 +1,854 @@ +Kube

    Kube is a service

    +
    Let ${y} be ${x}
+
    +
    ba + + + + + +     \ No newline at end of file diff --git a/e2etests/testdata/txtar/var_in_markdown/elk/board.exp.json b/e2etests/testdata/txtar/var_in_markdown/elk/board.exp.json new file mode 100644 index 000000000..c4b0d4ac0 --- /dev/null +++ b/e2etests/testdata/txtar/var_in_markdown/elk/board.exp.json @@ -0,0 +1,303 @@ +{ + "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "x", + "type": "rectangle", + "pos": { + "x": 12, + "y": 12 + }, + "width": 81, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Kube", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 36, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "description", + "type": "text", + "pos": { + "x": 58, + "y": 148 + }, + "width": 163, + "height": 96, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "N1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Kube is a service\n\n```\nLet ${y} be ${x}\n```", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 163, + "labelHeight": 96, + "zIndex": 0, + "level": 1 + }, + { + "id": "b", + "type": "rectangle", + "pos": { + "x": 113, + "y": 12 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "b", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "a", + "type": "rectangle", + "pos": { + "x": 113, + "y": 314 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "a", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [ + { + "id": "(b -> description)[0]", + "src": "b", + "srcArrow": "none", + "dst": "description", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 139.5, + "y": 78 + }, + { + "x": 139.5, + "y": 148 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + }, + { + "id": "(description -> a)[0]", + "src": "description", + "srcArrow": "none", + "dst": "a", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 139.5, + "y": 244 + }, + { + "x": 139.5, + "y": 314 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/txtar/var_in_markdown/elk/sketch.exp.svg b/e2etests/testdata/txtar/var_in_markdown/elk/sketch.exp.svg new file mode 100644 index 000000000..91a898d32 --- /dev/null +++ b/e2etests/testdata/txtar/var_in_markdown/elk/sketch.exp.svg @@ -0,0 +1,854 @@ +Kube

    Kube is a service

    +
    Let ${y} be ${x}
+
    +
    ba + + + + + +     \ No newline at end of file diff --git a/e2etests/testdata/txtar/width-smaller-than-label-custom-pos/dagre/board.exp.json b/e2etests/testdata/txtar/width-smaller-than-label-custom-pos/dagre/board.exp.json index 469e0f6a0..cec93b725 100644 --- a/e2etests/testdata/txtar/width-smaller-than-label-custom-pos/dagre/board.exp.json +++ b/e2etests/testdata/txtar/width-smaller-than-label-custom-pos/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -61,6 +70,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/txtar/width-smaller-than-label-custom-pos/dagre/sketch.exp.svg b/e2etests/testdata/txtar/width-smaller-than-label-custom-pos/dagre/sketch.exp.svg index 0def0c860..30c74ce34 100644 --- a/e2etests/testdata/txtar/width-smaller-than-label-custom-pos/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/width-smaller-than-label-custom-pos/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -long label + .d2-1508352367 .fill-N1{fill:#0A0F25;} + .d2-1508352367 .fill-N2{fill:#676C7E;} + .d2-1508352367 .fill-N3{fill:#9499AB;} + .d2-1508352367 .fill-N4{fill:#CFD2DD;} + .d2-1508352367 .fill-N5{fill:#DEE1EB;} + .d2-1508352367 .fill-N6{fill:#EEF1F8;} + .d2-1508352367 .fill-N7{fill:#FFFFFF;} + .d2-1508352367 .fill-B1{fill:#0D32B2;} + .d2-1508352367 .fill-B2{fill:#0D32B2;} + .d2-1508352367 .fill-B3{fill:#E3E9FD;} + .d2-1508352367 .fill-B4{fill:#E3E9FD;} + .d2-1508352367 .fill-B5{fill:#EDF0FD;} + .d2-1508352367 .fill-B6{fill:#F7F8FE;} + .d2-1508352367 .fill-AA2{fill:#4A6FF3;} + .d2-1508352367 .fill-AA4{fill:#EDF0FD;} + .d2-1508352367 .fill-AA5{fill:#F7F8FE;} + .d2-1508352367 .fill-AB4{fill:#EDF0FD;} + .d2-1508352367 .fill-AB5{fill:#F7F8FE;} + .d2-1508352367 .stroke-N1{stroke:#0A0F25;} + .d2-1508352367 .stroke-N2{stroke:#676C7E;} + .d2-1508352367 .stroke-N3{stroke:#9499AB;} + .d2-1508352367 .stroke-N4{stroke:#CFD2DD;} + .d2-1508352367 .stroke-N5{stroke:#DEE1EB;} + .d2-1508352367 .stroke-N6{stroke:#EEF1F8;} + .d2-1508352367 .stroke-N7{stroke:#FFFFFF;} + .d2-1508352367 .stroke-B1{stroke:#0D32B2;} + .d2-1508352367 .stroke-B2{stroke:#0D32B2;} + .d2-1508352367 .stroke-B3{stroke:#E3E9FD;} + .d2-1508352367 .stroke-B4{stroke:#E3E9FD;} + .d2-1508352367 .stroke-B5{stroke:#EDF0FD;} + .d2-1508352367 .stroke-B6{stroke:#F7F8FE;} + .d2-1508352367 .stroke-AA2{stroke:#4A6FF3;} + .d2-1508352367 .stroke-AA4{stroke:#EDF0FD;} + .d2-1508352367 .stroke-AA5{stroke:#F7F8FE;} + .d2-1508352367 .stroke-AB4{stroke:#EDF0FD;} + .d2-1508352367 .stroke-AB5{stroke:#F7F8FE;} + .d2-1508352367 .background-color-N1{background-color:#0A0F25;} + .d2-1508352367 .background-color-N2{background-color:#676C7E;} + .d2-1508352367 .background-color-N3{background-color:#9499AB;} + .d2-1508352367 .background-color-N4{background-color:#CFD2DD;} + .d2-1508352367 .background-color-N5{background-color:#DEE1EB;} + .d2-1508352367 .background-color-N6{background-color:#EEF1F8;} + .d2-1508352367 .background-color-N7{background-color:#FFFFFF;} + .d2-1508352367 .background-color-B1{background-color:#0D32B2;} + .d2-1508352367 .background-color-B2{background-color:#0D32B2;} + .d2-1508352367 .background-color-B3{background-color:#E3E9FD;} + .d2-1508352367 .background-color-B4{background-color:#E3E9FD;} + .d2-1508352367 .background-color-B5{background-color:#EDF0FD;} + .d2-1508352367 .background-color-B6{background-color:#F7F8FE;} + .d2-1508352367 .background-color-AA2{background-color:#4A6FF3;} + .d2-1508352367 .background-color-AA4{background-color:#EDF0FD;} + .d2-1508352367 .background-color-AA5{background-color:#F7F8FE;} + .d2-1508352367 .background-color-AB4{background-color:#EDF0FD;} + .d2-1508352367 .background-color-AB5{background-color:#F7F8FE;} + .d2-1508352367 .color-N1{color:#0A0F25;} + .d2-1508352367 .color-N2{color:#676C7E;} + .d2-1508352367 .color-N3{color:#9499AB;} + .d2-1508352367 .color-N4{color:#CFD2DD;} + .d2-1508352367 .color-N5{color:#DEE1EB;} + .d2-1508352367 .color-N6{color:#EEF1F8;} + .d2-1508352367 .color-N7{color:#FFFFFF;} + .d2-1508352367 .color-B1{color:#0D32B2;} + .d2-1508352367 .color-B2{color:#0D32B2;} + .d2-1508352367 .color-B3{color:#E3E9FD;} + .d2-1508352367 .color-B4{color:#E3E9FD;} + .d2-1508352367 .color-B5{color:#EDF0FD;} + .d2-1508352367 .color-B6{color:#F7F8FE;} + .d2-1508352367 .color-AA2{color:#4A6FF3;} + .d2-1508352367 .color-AA4{color:#EDF0FD;} + .d2-1508352367 .color-AA5{color:#F7F8FE;} + .d2-1508352367 .color-AB4{color:#EDF0FD;} + .d2-1508352367 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1508352367);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1508352367);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1508352367);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1508352367);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1508352367);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1508352367);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1508352367);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1508352367);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1508352367);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1508352367);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1508352367);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1508352367);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1508352367);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1508352367);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1508352367);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1508352367);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1508352367);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1508352367);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>long label - + \ No newline at end of file diff --git a/e2etests/testdata/txtar/width-smaller-than-label-custom-pos/elk/board.exp.json b/e2etests/testdata/txtar/width-smaller-than-label-custom-pos/elk/board.exp.json index b9a0cbcde..54d3bdaab 100644 --- a/e2etests/testdata/txtar/width-smaller-than-label-custom-pos/elk/board.exp.json +++ b/e2etests/testdata/txtar/width-smaller-than-label-custom-pos/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -61,6 +70,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/txtar/width-smaller-than-label-custom-pos/elk/sketch.exp.svg b/e2etests/testdata/txtar/width-smaller-than-label-custom-pos/elk/sketch.exp.svg index 3db542a44..36dfaea08 100644 --- a/e2etests/testdata/txtar/width-smaller-than-label-custom-pos/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/width-smaller-than-label-custom-pos/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -long label + .d2-2924700087 .fill-N1{fill:#0A0F25;} + .d2-2924700087 .fill-N2{fill:#676C7E;} + .d2-2924700087 .fill-N3{fill:#9499AB;} + .d2-2924700087 .fill-N4{fill:#CFD2DD;} + .d2-2924700087 .fill-N5{fill:#DEE1EB;} + .d2-2924700087 .fill-N6{fill:#EEF1F8;} + .d2-2924700087 .fill-N7{fill:#FFFFFF;} + .d2-2924700087 .fill-B1{fill:#0D32B2;} + .d2-2924700087 .fill-B2{fill:#0D32B2;} + .d2-2924700087 .fill-B3{fill:#E3E9FD;} + .d2-2924700087 .fill-B4{fill:#E3E9FD;} + .d2-2924700087 .fill-B5{fill:#EDF0FD;} + .d2-2924700087 .fill-B6{fill:#F7F8FE;} + .d2-2924700087 .fill-AA2{fill:#4A6FF3;} + .d2-2924700087 .fill-AA4{fill:#EDF0FD;} + .d2-2924700087 .fill-AA5{fill:#F7F8FE;} + .d2-2924700087 .fill-AB4{fill:#EDF0FD;} + .d2-2924700087 .fill-AB5{fill:#F7F8FE;} + .d2-2924700087 .stroke-N1{stroke:#0A0F25;} + .d2-2924700087 .stroke-N2{stroke:#676C7E;} + .d2-2924700087 .stroke-N3{stroke:#9499AB;} + .d2-2924700087 .stroke-N4{stroke:#CFD2DD;} + .d2-2924700087 .stroke-N5{stroke:#DEE1EB;} + .d2-2924700087 .stroke-N6{stroke:#EEF1F8;} + .d2-2924700087 .stroke-N7{stroke:#FFFFFF;} + .d2-2924700087 .stroke-B1{stroke:#0D32B2;} + .d2-2924700087 .stroke-B2{stroke:#0D32B2;} + .d2-2924700087 .stroke-B3{stroke:#E3E9FD;} + .d2-2924700087 .stroke-B4{stroke:#E3E9FD;} + .d2-2924700087 .stroke-B5{stroke:#EDF0FD;} + .d2-2924700087 .stroke-B6{stroke:#F7F8FE;} + .d2-2924700087 .stroke-AA2{stroke:#4A6FF3;} + .d2-2924700087 .stroke-AA4{stroke:#EDF0FD;} + .d2-2924700087 .stroke-AA5{stroke:#F7F8FE;} + .d2-2924700087 .stroke-AB4{stroke:#EDF0FD;} + .d2-2924700087 .stroke-AB5{stroke:#F7F8FE;} + .d2-2924700087 .background-color-N1{background-color:#0A0F25;} + .d2-2924700087 .background-color-N2{background-color:#676C7E;} + .d2-2924700087 .background-color-N3{background-color:#9499AB;} + .d2-2924700087 .background-color-N4{background-color:#CFD2DD;} + .d2-2924700087 .background-color-N5{background-color:#DEE1EB;} + .d2-2924700087 .background-color-N6{background-color:#EEF1F8;} + .d2-2924700087 .background-color-N7{background-color:#FFFFFF;} + .d2-2924700087 .background-color-B1{background-color:#0D32B2;} + .d2-2924700087 .background-color-B2{background-color:#0D32B2;} + .d2-2924700087 .background-color-B3{background-color:#E3E9FD;} + .d2-2924700087 .background-color-B4{background-color:#E3E9FD;} + .d2-2924700087 .background-color-B5{background-color:#EDF0FD;} + .d2-2924700087 .background-color-B6{background-color:#F7F8FE;} + .d2-2924700087 .background-color-AA2{background-color:#4A6FF3;} + .d2-2924700087 .background-color-AA4{background-color:#EDF0FD;} + .d2-2924700087 .background-color-AA5{background-color:#F7F8FE;} + .d2-2924700087 .background-color-AB4{background-color:#EDF0FD;} + .d2-2924700087 .background-color-AB5{background-color:#F7F8FE;} + .d2-2924700087 .color-N1{color:#0A0F25;} + .d2-2924700087 .color-N2{color:#676C7E;} + .d2-2924700087 .color-N3{color:#9499AB;} + .d2-2924700087 .color-N4{color:#CFD2DD;} + .d2-2924700087 .color-N5{color:#DEE1EB;} + .d2-2924700087 .color-N6{color:#EEF1F8;} + .d2-2924700087 .color-N7{color:#FFFFFF;} + .d2-2924700087 .color-B1{color:#0D32B2;} + .d2-2924700087 .color-B2{color:#0D32B2;} + .d2-2924700087 .color-B3{color:#E3E9FD;} + .d2-2924700087 .color-B4{color:#E3E9FD;} + .d2-2924700087 .color-B5{color:#EDF0FD;} + .d2-2924700087 .color-B6{color:#F7F8FE;} + .d2-2924700087 .color-AA2{color:#4A6FF3;} + .d2-2924700087 .color-AA4{color:#EDF0FD;} + .d2-2924700087 .color-AA5{color:#F7F8FE;} + .d2-2924700087 .color-AB4{color:#EDF0FD;} + .d2-2924700087 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2924700087);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2924700087);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2924700087);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2924700087);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2924700087);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2924700087);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2924700087);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2924700087);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2924700087);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2924700087);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2924700087);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2924700087);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2924700087);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2924700087);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2924700087);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2924700087);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2924700087);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2924700087);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>long label - + \ No newline at end of file diff --git a/e2etests/testdata/txtar/width-smaller-than-label/dagre/board.exp.json b/e2etests/testdata/txtar/width-smaller-than-label/dagre/board.exp.json index e7a9496a4..08d2c9ad8 100644 --- a/e2etests/testdata/txtar/width-smaller-than-label/dagre/board.exp.json +++ b/e2etests/testdata/txtar/width-smaller-than-label/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -61,6 +70,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/txtar/width-smaller-than-label/dagre/sketch.exp.svg b/e2etests/testdata/txtar/width-smaller-than-label/dagre/sketch.exp.svg index 2bb56a5bc..a21306c75 100644 --- a/e2etests/testdata/txtar/width-smaller-than-label/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/width-smaller-than-label/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -hello there cat + .d2-603661733 .fill-N1{fill:#0A0F25;} + .d2-603661733 .fill-N2{fill:#676C7E;} + .d2-603661733 .fill-N3{fill:#9499AB;} + .d2-603661733 .fill-N4{fill:#CFD2DD;} + .d2-603661733 .fill-N5{fill:#DEE1EB;} + .d2-603661733 .fill-N6{fill:#EEF1F8;} + .d2-603661733 .fill-N7{fill:#FFFFFF;} + .d2-603661733 .fill-B1{fill:#0D32B2;} + .d2-603661733 .fill-B2{fill:#0D32B2;} + .d2-603661733 .fill-B3{fill:#E3E9FD;} + .d2-603661733 .fill-B4{fill:#E3E9FD;} + .d2-603661733 .fill-B5{fill:#EDF0FD;} + .d2-603661733 .fill-B6{fill:#F7F8FE;} + .d2-603661733 .fill-AA2{fill:#4A6FF3;} + .d2-603661733 .fill-AA4{fill:#EDF0FD;} + .d2-603661733 .fill-AA5{fill:#F7F8FE;} + .d2-603661733 .fill-AB4{fill:#EDF0FD;} + .d2-603661733 .fill-AB5{fill:#F7F8FE;} + .d2-603661733 .stroke-N1{stroke:#0A0F25;} + .d2-603661733 .stroke-N2{stroke:#676C7E;} + .d2-603661733 .stroke-N3{stroke:#9499AB;} + .d2-603661733 .stroke-N4{stroke:#CFD2DD;} + .d2-603661733 .stroke-N5{stroke:#DEE1EB;} + .d2-603661733 .stroke-N6{stroke:#EEF1F8;} + .d2-603661733 .stroke-N7{stroke:#FFFFFF;} + .d2-603661733 .stroke-B1{stroke:#0D32B2;} + .d2-603661733 .stroke-B2{stroke:#0D32B2;} + .d2-603661733 .stroke-B3{stroke:#E3E9FD;} + .d2-603661733 .stroke-B4{stroke:#E3E9FD;} + .d2-603661733 .stroke-B5{stroke:#EDF0FD;} + .d2-603661733 .stroke-B6{stroke:#F7F8FE;} + .d2-603661733 .stroke-AA2{stroke:#4A6FF3;} + .d2-603661733 .stroke-AA4{stroke:#EDF0FD;} + .d2-603661733 .stroke-AA5{stroke:#F7F8FE;} + .d2-603661733 .stroke-AB4{stroke:#EDF0FD;} + .d2-603661733 .stroke-AB5{stroke:#F7F8FE;} + .d2-603661733 .background-color-N1{background-color:#0A0F25;} + .d2-603661733 .background-color-N2{background-color:#676C7E;} + .d2-603661733 .background-color-N3{background-color:#9499AB;} + .d2-603661733 .background-color-N4{background-color:#CFD2DD;} + .d2-603661733 .background-color-N5{background-color:#DEE1EB;} + .d2-603661733 .background-color-N6{background-color:#EEF1F8;} + .d2-603661733 .background-color-N7{background-color:#FFFFFF;} + .d2-603661733 .background-color-B1{background-color:#0D32B2;} + .d2-603661733 .background-color-B2{background-color:#0D32B2;} + .d2-603661733 .background-color-B3{background-color:#E3E9FD;} + .d2-603661733 .background-color-B4{background-color:#E3E9FD;} + .d2-603661733 .background-color-B5{background-color:#EDF0FD;} + .d2-603661733 .background-color-B6{background-color:#F7F8FE;} + .d2-603661733 .background-color-AA2{background-color:#4A6FF3;} + .d2-603661733 .background-color-AA4{background-color:#EDF0FD;} + .d2-603661733 .background-color-AA5{background-color:#F7F8FE;} + .d2-603661733 .background-color-AB4{background-color:#EDF0FD;} + .d2-603661733 .background-color-AB5{background-color:#F7F8FE;} + .d2-603661733 .color-N1{color:#0A0F25;} + .d2-603661733 .color-N2{color:#676C7E;} + .d2-603661733 .color-N3{color:#9499AB;} + .d2-603661733 .color-N4{color:#CFD2DD;} + .d2-603661733 .color-N5{color:#DEE1EB;} + .d2-603661733 .color-N6{color:#EEF1F8;} + .d2-603661733 .color-N7{color:#FFFFFF;} + .d2-603661733 .color-B1{color:#0D32B2;} + .d2-603661733 .color-B2{color:#0D32B2;} + .d2-603661733 .color-B3{color:#E3E9FD;} + .d2-603661733 .color-B4{color:#E3E9FD;} + .d2-603661733 .color-B5{color:#EDF0FD;} + .d2-603661733 .color-B6{color:#F7F8FE;} + .d2-603661733 .color-AA2{color:#4A6FF3;} + .d2-603661733 .color-AA4{color:#EDF0FD;} + .d2-603661733 .color-AA5{color:#F7F8FE;} + .d2-603661733 .color-AB4{color:#EDF0FD;} + .d2-603661733 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-603661733);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-603661733);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-603661733);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-603661733);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-603661733);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-603661733);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-603661733);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-603661733);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-603661733);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-603661733);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-603661733);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-603661733);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-603661733);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-603661733);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-603661733);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-603661733);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-603661733);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-603661733);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>hello there cat - + \ No newline at end of file diff --git a/e2etests/testdata/txtar/width-smaller-than-label/elk/board.exp.json b/e2etests/testdata/txtar/width-smaller-than-label/elk/board.exp.json index 605a1b81b..2311e910a 100644 --- a/e2etests/testdata/txtar/width-smaller-than-label/elk/board.exp.json +++ b/e2etests/testdata/txtar/width-smaller-than-label/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B3", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -61,6 +70,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/txtar/width-smaller-than-label/elk/sketch.exp.svg b/e2etests/testdata/txtar/width-smaller-than-label/elk/sketch.exp.svg index aeda2ea66..3a4ecd24e 100644 --- a/e2etests/testdata/txtar/width-smaller-than-label/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/width-smaller-than-label/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -hello there cat + .d2-2470178629 .fill-N1{fill:#0A0F25;} + .d2-2470178629 .fill-N2{fill:#676C7E;} + .d2-2470178629 .fill-N3{fill:#9499AB;} + .d2-2470178629 .fill-N4{fill:#CFD2DD;} + .d2-2470178629 .fill-N5{fill:#DEE1EB;} + .d2-2470178629 .fill-N6{fill:#EEF1F8;} + .d2-2470178629 .fill-N7{fill:#FFFFFF;} + .d2-2470178629 .fill-B1{fill:#0D32B2;} + .d2-2470178629 .fill-B2{fill:#0D32B2;} + .d2-2470178629 .fill-B3{fill:#E3E9FD;} + .d2-2470178629 .fill-B4{fill:#E3E9FD;} + .d2-2470178629 .fill-B5{fill:#EDF0FD;} + .d2-2470178629 .fill-B6{fill:#F7F8FE;} + .d2-2470178629 .fill-AA2{fill:#4A6FF3;} + .d2-2470178629 .fill-AA4{fill:#EDF0FD;} + .d2-2470178629 .fill-AA5{fill:#F7F8FE;} + .d2-2470178629 .fill-AB4{fill:#EDF0FD;} + .d2-2470178629 .fill-AB5{fill:#F7F8FE;} + .d2-2470178629 .stroke-N1{stroke:#0A0F25;} + .d2-2470178629 .stroke-N2{stroke:#676C7E;} + .d2-2470178629 .stroke-N3{stroke:#9499AB;} + .d2-2470178629 .stroke-N4{stroke:#CFD2DD;} + .d2-2470178629 .stroke-N5{stroke:#DEE1EB;} + .d2-2470178629 .stroke-N6{stroke:#EEF1F8;} + .d2-2470178629 .stroke-N7{stroke:#FFFFFF;} + .d2-2470178629 .stroke-B1{stroke:#0D32B2;} + .d2-2470178629 .stroke-B2{stroke:#0D32B2;} + .d2-2470178629 .stroke-B3{stroke:#E3E9FD;} + .d2-2470178629 .stroke-B4{stroke:#E3E9FD;} + .d2-2470178629 .stroke-B5{stroke:#EDF0FD;} + .d2-2470178629 .stroke-B6{stroke:#F7F8FE;} + .d2-2470178629 .stroke-AA2{stroke:#4A6FF3;} + .d2-2470178629 .stroke-AA4{stroke:#EDF0FD;} + .d2-2470178629 .stroke-AA5{stroke:#F7F8FE;} + .d2-2470178629 .stroke-AB4{stroke:#EDF0FD;} + .d2-2470178629 .stroke-AB5{stroke:#F7F8FE;} + .d2-2470178629 .background-color-N1{background-color:#0A0F25;} + .d2-2470178629 .background-color-N2{background-color:#676C7E;} + .d2-2470178629 .background-color-N3{background-color:#9499AB;} + .d2-2470178629 .background-color-N4{background-color:#CFD2DD;} + .d2-2470178629 .background-color-N5{background-color:#DEE1EB;} + .d2-2470178629 .background-color-N6{background-color:#EEF1F8;} + .d2-2470178629 .background-color-N7{background-color:#FFFFFF;} + .d2-2470178629 .background-color-B1{background-color:#0D32B2;} + .d2-2470178629 .background-color-B2{background-color:#0D32B2;} + .d2-2470178629 .background-color-B3{background-color:#E3E9FD;} + .d2-2470178629 .background-color-B4{background-color:#E3E9FD;} + .d2-2470178629 .background-color-B5{background-color:#EDF0FD;} + .d2-2470178629 .background-color-B6{background-color:#F7F8FE;} + .d2-2470178629 .background-color-AA2{background-color:#4A6FF3;} + .d2-2470178629 .background-color-AA4{background-color:#EDF0FD;} + .d2-2470178629 .background-color-AA5{background-color:#F7F8FE;} + .d2-2470178629 .background-color-AB4{background-color:#EDF0FD;} + .d2-2470178629 .background-color-AB5{background-color:#F7F8FE;} + .d2-2470178629 .color-N1{color:#0A0F25;} + .d2-2470178629 .color-N2{color:#676C7E;} + .d2-2470178629 .color-N3{color:#9499AB;} + .d2-2470178629 .color-N4{color:#CFD2DD;} + .d2-2470178629 .color-N5{color:#DEE1EB;} + .d2-2470178629 .color-N6{color:#EEF1F8;} + .d2-2470178629 .color-N7{color:#FFFFFF;} + .d2-2470178629 .color-B1{color:#0D32B2;} + .d2-2470178629 .color-B2{color:#0D32B2;} + .d2-2470178629 .color-B3{color:#E3E9FD;} + .d2-2470178629 .color-B4{color:#E3E9FD;} + .d2-2470178629 .color-B5{color:#EDF0FD;} + .d2-2470178629 .color-B6{color:#F7F8FE;} + .d2-2470178629 .color-AA2{color:#4A6FF3;} + .d2-2470178629 .color-AA4{color:#EDF0FD;} + .d2-2470178629 .color-AA5{color:#F7F8FE;} + .d2-2470178629 .color-AB4{color:#EDF0FD;} + .d2-2470178629 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2470178629);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2470178629);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2470178629);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2470178629);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2470178629);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2470178629);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2470178629);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2470178629);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2470178629);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2470178629);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2470178629);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2470178629);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2470178629);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2470178629);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2470178629);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2470178629);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2470178629);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2470178629);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>hello there cat - + \ No newline at end of file diff --git a/e2etests/testdata/unicode/chinese/dagre/board.exp.json b/e2etests/testdata/unicode/chinese/dagre/board.exp.json index bc030e888..8698346a8 100644 --- a/e2etests/testdata/unicode/chinese/dagre/board.exp.json +++ b/e2etests/testdata/unicode/chinese/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -109,6 +119,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 113, @@ -149,6 +160,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/unicode/chinese/dagre/sketch.exp.svg b/e2etests/testdata/unicode/chinese/dagre/sketch.exp.svg index f0a1e7452..fba7414cf 100644 --- a/e2etests/testdata/unicode/chinese/dagre/sketch.exp.svg +++ b/e2etests/testdata/unicode/chinese/dagre/sketch.exp.svg @@ -1,20 +1,20 @@ -

    床前明月光，

    +

    床前明月光，

    疑是地上霜。

    举头望明月，

    低头思故乡。

    -
    所以，即使夏天很热 +
    所以，即使夏天很热 - - + +     \ No newline at end of file diff --git a/e2etests/testdata/unicode/chinese/elk/board.exp.json b/e2etests/testdata/unicode/chinese/elk/board.exp.json index adb895ecf..b4af2f0b7 100644 --- a/e2etests/testdata/unicode/chinese/elk/board.exp.json +++ b/e2etests/testdata/unicode/chinese/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +67,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -109,6 +119,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 125, @@ -140,6 +151,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/unicode/chinese/elk/sketch.exp.svg b/e2etests/testdata/unicode/chinese/elk/sketch.exp.svg index ff9d091f4..04d05e8db 100644 --- a/e2etests/testdata/unicode/chinese/elk/sketch.exp.svg +++ b/e2etests/testdata/unicode/chinese/elk/sketch.exp.svg @@ -1,20 +1,20 @@ -

    床前明月光，

    +

    床前明月光，

    疑是地上霜。

    举头望明月，

    低头思故乡。

    -
    所以，即使夏天很热 +
    所以，即使夏天很热 - - + +     \ No newline at end of file diff --git a/e2etests/testdata/unicode/emojis/dagre/board.exp.json b/e2etests/testdata/unicode/emojis/dagre/board.exp.json index 7bf49961a..67dd3c736 100644 --- a/e2etests/testdata/unicode/emojis/dagre/board.exp.json +++ b/e2etests/testdata/unicode/emojis/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -151,6 +162,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 681.5, @@ -191,6 +203,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/unicode/emojis/dagre/sketch.exp.svg b/e2etests/testdata/unicode/emojis/dagre/sketch.exp.svg index d62b020a3..d8c22b5fd 100644 --- a/e2etests/testdata/unicode/emojis/dagre/sketch.exp.svg +++ b/e2etests/testdata/unicode/emojis/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -🙈🙈🙈🙈🙈🙈🙈🙈✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️ + .d2-17560873 .fill-N1{fill:#0A0F25;} + .d2-17560873 .fill-N2{fill:#676C7E;} + .d2-17560873 .fill-N3{fill:#9499AB;} + .d2-17560873 .fill-N4{fill:#CFD2DD;} + .d2-17560873 .fill-N5{fill:#DEE1EB;} + .d2-17560873 .fill-N6{fill:#EEF1F8;} + .d2-17560873 .fill-N7{fill:#FFFFFF;} + .d2-17560873 .fill-B1{fill:#0D32B2;} + .d2-17560873 .fill-B2{fill:#0D32B2;} + .d2-17560873 .fill-B3{fill:#E3E9FD;} + .d2-17560873 .fill-B4{fill:#E3E9FD;} + .d2-17560873 .fill-B5{fill:#EDF0FD;} + .d2-17560873 .fill-B6{fill:#F7F8FE;} + .d2-17560873 .fill-AA2{fill:#4A6FF3;} + .d2-17560873 .fill-AA4{fill:#EDF0FD;} + .d2-17560873 .fill-AA5{fill:#F7F8FE;} + .d2-17560873 .fill-AB4{fill:#EDF0FD;} + .d2-17560873 .fill-AB5{fill:#F7F8FE;} + .d2-17560873 .stroke-N1{stroke:#0A0F25;} + .d2-17560873 .stroke-N2{stroke:#676C7E;} + .d2-17560873 .stroke-N3{stroke:#9499AB;} + .d2-17560873 .stroke-N4{stroke:#CFD2DD;} + .d2-17560873 .stroke-N5{stroke:#DEE1EB;} + .d2-17560873 .stroke-N6{stroke:#EEF1F8;} + .d2-17560873 .stroke-N7{stroke:#FFFFFF;} + .d2-17560873 .stroke-B1{stroke:#0D32B2;} + .d2-17560873 .stroke-B2{stroke:#0D32B2;} + .d2-17560873 .stroke-B3{stroke:#E3E9FD;} + .d2-17560873 .stroke-B4{stroke:#E3E9FD;} + .d2-17560873 .stroke-B5{stroke:#EDF0FD;} + .d2-17560873 .stroke-B6{stroke:#F7F8FE;} + .d2-17560873 .stroke-AA2{stroke:#4A6FF3;} + .d2-17560873 .stroke-AA4{stroke:#EDF0FD;} + .d2-17560873 .stroke-AA5{stroke:#F7F8FE;} + .d2-17560873 .stroke-AB4{stroke:#EDF0FD;} + .d2-17560873 .stroke-AB5{stroke:#F7F8FE;} + .d2-17560873 .background-color-N1{background-color:#0A0F25;} + .d2-17560873 .background-color-N2{background-color:#676C7E;} + .d2-17560873 .background-color-N3{background-color:#9499AB;} + .d2-17560873 .background-color-N4{background-color:#CFD2DD;} + .d2-17560873 .background-color-N5{background-color:#DEE1EB;} + .d2-17560873 .background-color-N6{background-color:#EEF1F8;} + .d2-17560873 .background-color-N7{background-color:#FFFFFF;} + .d2-17560873 .background-color-B1{background-color:#0D32B2;} + .d2-17560873 .background-color-B2{background-color:#0D32B2;} + .d2-17560873 .background-color-B3{background-color:#E3E9FD;} + .d2-17560873 .background-color-B4{background-color:#E3E9FD;} + .d2-17560873 .background-color-B5{background-color:#EDF0FD;} + .d2-17560873 .background-color-B6{background-color:#F7F8FE;} + .d2-17560873 .background-color-AA2{background-color:#4A6FF3;} + .d2-17560873 .background-color-AA4{background-color:#EDF0FD;} + .d2-17560873 .background-color-AA5{background-color:#F7F8FE;} + .d2-17560873 .background-color-AB4{background-color:#EDF0FD;} + .d2-17560873 .background-color-AB5{background-color:#F7F8FE;} + .d2-17560873 .color-N1{color:#0A0F25;} + .d2-17560873 .color-N2{color:#676C7E;} + .d2-17560873 .color-N3{color:#9499AB;} + .d2-17560873 .color-N4{color:#CFD2DD;} + .d2-17560873 .color-N5{color:#DEE1EB;} + .d2-17560873 .color-N6{color:#EEF1F8;} + .d2-17560873 .color-N7{color:#FFFFFF;} + .d2-17560873 .color-B1{color:#0D32B2;} + .d2-17560873 .color-B2{color:#0D32B2;} + .d2-17560873 .color-B3{color:#E3E9FD;} + .d2-17560873 .color-B4{color:#E3E9FD;} + .d2-17560873 .color-B5{color:#EDF0FD;} + .d2-17560873 .color-B6{color:#F7F8FE;} + .d2-17560873 .color-AA2{color:#4A6FF3;} + .d2-17560873 .color-AA4{color:#EDF0FD;} + .d2-17560873 .color-AA5{color:#F7F8FE;} + .d2-17560873 .color-AB4{color:#EDF0FD;} + .d2-17560873 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-17560873);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-17560873);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-17560873);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-17560873);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-17560873);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-17560873);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-17560873);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-17560873);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-17560873);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-17560873);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-17560873);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-17560873);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-17560873);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-17560873);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-17560873);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-17560873);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-17560873);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-17560873);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>🙈🙈🙈🙈🙈🙈🙈🙈✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️ - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/unicode/emojis/elk/board.exp.json b/e2etests/testdata/unicode/emojis/elk/board.exp.json index ad8d87f70..8dc40bab4 100644 --- a/e2etests/testdata/unicode/emojis/elk/board.exp.json +++ b/e2etests/testdata/unicode/emojis/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -151,6 +162,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 653.5, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/unicode/emojis/elk/sketch.exp.svg b/e2etests/testdata/unicode/emojis/elk/sketch.exp.svg index f77c90550..7c732cf18 100644 --- a/e2etests/testdata/unicode/emojis/elk/sketch.exp.svg +++ b/e2etests/testdata/unicode/emojis/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -🙈🙈🙈🙈🙈🙈🙈🙈✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️ + .d2-238933779 .fill-N1{fill:#0A0F25;} + .d2-238933779 .fill-N2{fill:#676C7E;} + .d2-238933779 .fill-N3{fill:#9499AB;} + .d2-238933779 .fill-N4{fill:#CFD2DD;} + .d2-238933779 .fill-N5{fill:#DEE1EB;} + .d2-238933779 .fill-N6{fill:#EEF1F8;} + .d2-238933779 .fill-N7{fill:#FFFFFF;} + .d2-238933779 .fill-B1{fill:#0D32B2;} + .d2-238933779 .fill-B2{fill:#0D32B2;} + .d2-238933779 .fill-B3{fill:#E3E9FD;} + .d2-238933779 .fill-B4{fill:#E3E9FD;} + .d2-238933779 .fill-B5{fill:#EDF0FD;} + .d2-238933779 .fill-B6{fill:#F7F8FE;} + .d2-238933779 .fill-AA2{fill:#4A6FF3;} + .d2-238933779 .fill-AA4{fill:#EDF0FD;} + .d2-238933779 .fill-AA5{fill:#F7F8FE;} + .d2-238933779 .fill-AB4{fill:#EDF0FD;} + .d2-238933779 .fill-AB5{fill:#F7F8FE;} + .d2-238933779 .stroke-N1{stroke:#0A0F25;} + .d2-238933779 .stroke-N2{stroke:#676C7E;} + .d2-238933779 .stroke-N3{stroke:#9499AB;} + .d2-238933779 .stroke-N4{stroke:#CFD2DD;} + .d2-238933779 .stroke-N5{stroke:#DEE1EB;} + .d2-238933779 .stroke-N6{stroke:#EEF1F8;} + .d2-238933779 .stroke-N7{stroke:#FFFFFF;} + .d2-238933779 .stroke-B1{stroke:#0D32B2;} + .d2-238933779 .stroke-B2{stroke:#0D32B2;} + .d2-238933779 .stroke-B3{stroke:#E3E9FD;} + .d2-238933779 .stroke-B4{stroke:#E3E9FD;} + .d2-238933779 .stroke-B5{stroke:#EDF0FD;} + .d2-238933779 .stroke-B6{stroke:#F7F8FE;} + .d2-238933779 .stroke-AA2{stroke:#4A6FF3;} + .d2-238933779 .stroke-AA4{stroke:#EDF0FD;} + .d2-238933779 .stroke-AA5{stroke:#F7F8FE;} + .d2-238933779 .stroke-AB4{stroke:#EDF0FD;} + .d2-238933779 .stroke-AB5{stroke:#F7F8FE;} + .d2-238933779 .background-color-N1{background-color:#0A0F25;} + .d2-238933779 .background-color-N2{background-color:#676C7E;} + .d2-238933779 .background-color-N3{background-color:#9499AB;} + .d2-238933779 .background-color-N4{background-color:#CFD2DD;} + .d2-238933779 .background-color-N5{background-color:#DEE1EB;} + .d2-238933779 .background-color-N6{background-color:#EEF1F8;} + .d2-238933779 .background-color-N7{background-color:#FFFFFF;} + .d2-238933779 .background-color-B1{background-color:#0D32B2;} + .d2-238933779 .background-color-B2{background-color:#0D32B2;} + .d2-238933779 .background-color-B3{background-color:#E3E9FD;} + .d2-238933779 .background-color-B4{background-color:#E3E9FD;} + .d2-238933779 .background-color-B5{background-color:#EDF0FD;} + .d2-238933779 .background-color-B6{background-color:#F7F8FE;} + .d2-238933779 .background-color-AA2{background-color:#4A6FF3;} + .d2-238933779 .background-color-AA4{background-color:#EDF0FD;} + .d2-238933779 .background-color-AA5{background-color:#F7F8FE;} + .d2-238933779 .background-color-AB4{background-color:#EDF0FD;} + .d2-238933779 .background-color-AB5{background-color:#F7F8FE;} + .d2-238933779 .color-N1{color:#0A0F25;} + .d2-238933779 .color-N2{color:#676C7E;} + .d2-238933779 .color-N3{color:#9499AB;} + .d2-238933779 .color-N4{color:#CFD2DD;} + .d2-238933779 .color-N5{color:#DEE1EB;} + .d2-238933779 .color-N6{color:#EEF1F8;} + .d2-238933779 .color-N7{color:#FFFFFF;} + .d2-238933779 .color-B1{color:#0D32B2;} + .d2-238933779 .color-B2{color:#0D32B2;} + .d2-238933779 .color-B3{color:#E3E9FD;} + .d2-238933779 .color-B4{color:#E3E9FD;} + .d2-238933779 .color-B5{color:#EDF0FD;} + .d2-238933779 .color-B6{color:#F7F8FE;} + .d2-238933779 .color-AA2{color:#4A6FF3;} + .d2-238933779 .color-AA4{color:#EDF0FD;} + .d2-238933779 .color-AA5{color:#F7F8FE;} + .d2-238933779 .color-AB4{color:#EDF0FD;} + .d2-238933779 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-238933779);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-238933779);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-238933779);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-238933779);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-238933779);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-238933779);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-238933779);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-238933779);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-238933779);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-238933779);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-238933779);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-238933779);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-238933779);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-238933779);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-238933779);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-238933779);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-238933779);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-238933779);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>🙈🙈🙈🙈🙈🙈🙈🙈✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️ - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/unicode/japanese-basic/dagre/board.exp.json b/e2etests/testdata/unicode/japanese-basic/dagre/board.exp.json index 7b684dbb7..8b618f853 100644 --- a/e2etests/testdata/unicode/japanese-basic/dagre/board.exp.json +++ b/e2etests/testdata/unicode/japanese-basic/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -61,6 +70,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/unicode/japanese-basic/dagre/sketch.exp.svg b/e2etests/testdata/unicode/japanese-basic/dagre/sketch.exp.svg index f98193015..607404018 100644 --- a/e2etests/testdata/unicode/japanese-basic/dagre/sketch.exp.svg +++ b/e2etests/testdata/unicode/japanese-basic/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -ああああああああああ + .d2-539142469 .fill-N1{fill:#0A0F25;} + .d2-539142469 .fill-N2{fill:#676C7E;} + .d2-539142469 .fill-N3{fill:#9499AB;} + .d2-539142469 .fill-N4{fill:#CFD2DD;} + .d2-539142469 .fill-N5{fill:#DEE1EB;} + .d2-539142469 .fill-N6{fill:#EEF1F8;} + .d2-539142469 .fill-N7{fill:#FFFFFF;} + .d2-539142469 .fill-B1{fill:#0D32B2;} + .d2-539142469 .fill-B2{fill:#0D32B2;} + .d2-539142469 .fill-B3{fill:#E3E9FD;} + .d2-539142469 .fill-B4{fill:#E3E9FD;} + .d2-539142469 .fill-B5{fill:#EDF0FD;} + .d2-539142469 .fill-B6{fill:#F7F8FE;} + .d2-539142469 .fill-AA2{fill:#4A6FF3;} + .d2-539142469 .fill-AA4{fill:#EDF0FD;} + .d2-539142469 .fill-AA5{fill:#F7F8FE;} + .d2-539142469 .fill-AB4{fill:#EDF0FD;} + .d2-539142469 .fill-AB5{fill:#F7F8FE;} + .d2-539142469 .stroke-N1{stroke:#0A0F25;} + .d2-539142469 .stroke-N2{stroke:#676C7E;} + .d2-539142469 .stroke-N3{stroke:#9499AB;} + .d2-539142469 .stroke-N4{stroke:#CFD2DD;} + .d2-539142469 .stroke-N5{stroke:#DEE1EB;} + .d2-539142469 .stroke-N6{stroke:#EEF1F8;} + .d2-539142469 .stroke-N7{stroke:#FFFFFF;} + .d2-539142469 .stroke-B1{stroke:#0D32B2;} + .d2-539142469 .stroke-B2{stroke:#0D32B2;} + .d2-539142469 .stroke-B3{stroke:#E3E9FD;} + .d2-539142469 .stroke-B4{stroke:#E3E9FD;} + .d2-539142469 .stroke-B5{stroke:#EDF0FD;} + .d2-539142469 .stroke-B6{stroke:#F7F8FE;} + .d2-539142469 .stroke-AA2{stroke:#4A6FF3;} + .d2-539142469 .stroke-AA4{stroke:#EDF0FD;} + .d2-539142469 .stroke-AA5{stroke:#F7F8FE;} + .d2-539142469 .stroke-AB4{stroke:#EDF0FD;} + .d2-539142469 .stroke-AB5{stroke:#F7F8FE;} + .d2-539142469 .background-color-N1{background-color:#0A0F25;} + .d2-539142469 .background-color-N2{background-color:#676C7E;} + .d2-539142469 .background-color-N3{background-color:#9499AB;} + .d2-539142469 .background-color-N4{background-color:#CFD2DD;} + .d2-539142469 .background-color-N5{background-color:#DEE1EB;} + .d2-539142469 .background-color-N6{background-color:#EEF1F8;} + .d2-539142469 .background-color-N7{background-color:#FFFFFF;} + .d2-539142469 .background-color-B1{background-color:#0D32B2;} + .d2-539142469 .background-color-B2{background-color:#0D32B2;} + .d2-539142469 .background-color-B3{background-color:#E3E9FD;} + .d2-539142469 .background-color-B4{background-color:#E3E9FD;} + .d2-539142469 .background-color-B5{background-color:#EDF0FD;} + .d2-539142469 .background-color-B6{background-color:#F7F8FE;} + .d2-539142469 .background-color-AA2{background-color:#4A6FF3;} + .d2-539142469 .background-color-AA4{background-color:#EDF0FD;} + .d2-539142469 .background-color-AA5{background-color:#F7F8FE;} + .d2-539142469 .background-color-AB4{background-color:#EDF0FD;} + .d2-539142469 .background-color-AB5{background-color:#F7F8FE;} + .d2-539142469 .color-N1{color:#0A0F25;} + .d2-539142469 .color-N2{color:#676C7E;} + .d2-539142469 .color-N3{color:#9499AB;} + .d2-539142469 .color-N4{color:#CFD2DD;} + .d2-539142469 .color-N5{color:#DEE1EB;} + .d2-539142469 .color-N6{color:#EEF1F8;} + .d2-539142469 .color-N7{color:#FFFFFF;} + .d2-539142469 .color-B1{color:#0D32B2;} + .d2-539142469 .color-B2{color:#0D32B2;} + .d2-539142469 .color-B3{color:#E3E9FD;} + .d2-539142469 .color-B4{color:#E3E9FD;} + .d2-539142469 .color-B5{color:#EDF0FD;} + .d2-539142469 .color-B6{color:#F7F8FE;} + .d2-539142469 .color-AA2{color:#4A6FF3;} + .d2-539142469 .color-AA4{color:#EDF0FD;} + .d2-539142469 .color-AA5{color:#F7F8FE;} + .d2-539142469 .color-AB4{color:#EDF0FD;} + .d2-539142469 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-539142469);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-539142469);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-539142469);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-539142469);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-539142469);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-539142469);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-539142469);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-539142469);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-539142469);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-539142469);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-539142469);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-539142469);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-539142469);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-539142469);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-539142469);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-539142469);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-539142469);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-539142469);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ああああああああああ - + \ No newline at end of file diff --git a/e2etests/testdata/unicode/japanese-basic/elk/board.exp.json b/e2etests/testdata/unicode/japanese-basic/elk/board.exp.json index 57c3f063d..438034ffd 100644 --- a/e2etests/testdata/unicode/japanese-basic/elk/board.exp.json +++ b/e2etests/testdata/unicode/japanese-basic/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -61,6 +70,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/unicode/japanese-basic/elk/sketch.exp.svg b/e2etests/testdata/unicode/japanese-basic/elk/sketch.exp.svg index 80f4c9f53..a9a03ca0f 100644 --- a/e2etests/testdata/unicode/japanese-basic/elk/sketch.exp.svg +++ b/e2etests/testdata/unicode/japanese-basic/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -ああああああああああ + .d2-863727069 .fill-N1{fill:#0A0F25;} + .d2-863727069 .fill-N2{fill:#676C7E;} + .d2-863727069 .fill-N3{fill:#9499AB;} + .d2-863727069 .fill-N4{fill:#CFD2DD;} + .d2-863727069 .fill-N5{fill:#DEE1EB;} + .d2-863727069 .fill-N6{fill:#EEF1F8;} + .d2-863727069 .fill-N7{fill:#FFFFFF;} + .d2-863727069 .fill-B1{fill:#0D32B2;} + .d2-863727069 .fill-B2{fill:#0D32B2;} + .d2-863727069 .fill-B3{fill:#E3E9FD;} + .d2-863727069 .fill-B4{fill:#E3E9FD;} + .d2-863727069 .fill-B5{fill:#EDF0FD;} + .d2-863727069 .fill-B6{fill:#F7F8FE;} + .d2-863727069 .fill-AA2{fill:#4A6FF3;} + .d2-863727069 .fill-AA4{fill:#EDF0FD;} + .d2-863727069 .fill-AA5{fill:#F7F8FE;} + .d2-863727069 .fill-AB4{fill:#EDF0FD;} + .d2-863727069 .fill-AB5{fill:#F7F8FE;} + .d2-863727069 .stroke-N1{stroke:#0A0F25;} + .d2-863727069 .stroke-N2{stroke:#676C7E;} + .d2-863727069 .stroke-N3{stroke:#9499AB;} + .d2-863727069 .stroke-N4{stroke:#CFD2DD;} + .d2-863727069 .stroke-N5{stroke:#DEE1EB;} + .d2-863727069 .stroke-N6{stroke:#EEF1F8;} + .d2-863727069 .stroke-N7{stroke:#FFFFFF;} + .d2-863727069 .stroke-B1{stroke:#0D32B2;} + .d2-863727069 .stroke-B2{stroke:#0D32B2;} + .d2-863727069 .stroke-B3{stroke:#E3E9FD;} + .d2-863727069 .stroke-B4{stroke:#E3E9FD;} + .d2-863727069 .stroke-B5{stroke:#EDF0FD;} + .d2-863727069 .stroke-B6{stroke:#F7F8FE;} + .d2-863727069 .stroke-AA2{stroke:#4A6FF3;} + .d2-863727069 .stroke-AA4{stroke:#EDF0FD;} + .d2-863727069 .stroke-AA5{stroke:#F7F8FE;} + .d2-863727069 .stroke-AB4{stroke:#EDF0FD;} + .d2-863727069 .stroke-AB5{stroke:#F7F8FE;} + .d2-863727069 .background-color-N1{background-color:#0A0F25;} + .d2-863727069 .background-color-N2{background-color:#676C7E;} + .d2-863727069 .background-color-N3{background-color:#9499AB;} + .d2-863727069 .background-color-N4{background-color:#CFD2DD;} + .d2-863727069 .background-color-N5{background-color:#DEE1EB;} + .d2-863727069 .background-color-N6{background-color:#EEF1F8;} + .d2-863727069 .background-color-N7{background-color:#FFFFFF;} + .d2-863727069 .background-color-B1{background-color:#0D32B2;} + .d2-863727069 .background-color-B2{background-color:#0D32B2;} + .d2-863727069 .background-color-B3{background-color:#E3E9FD;} + .d2-863727069 .background-color-B4{background-color:#E3E9FD;} + .d2-863727069 .background-color-B5{background-color:#EDF0FD;} + .d2-863727069 .background-color-B6{background-color:#F7F8FE;} + .d2-863727069 .background-color-AA2{background-color:#4A6FF3;} + .d2-863727069 .background-color-AA4{background-color:#EDF0FD;} + .d2-863727069 .background-color-AA5{background-color:#F7F8FE;} + .d2-863727069 .background-color-AB4{background-color:#EDF0FD;} + .d2-863727069 .background-color-AB5{background-color:#F7F8FE;} + .d2-863727069 .color-N1{color:#0A0F25;} + .d2-863727069 .color-N2{color:#676C7E;} + .d2-863727069 .color-N3{color:#9499AB;} + .d2-863727069 .color-N4{color:#CFD2DD;} + .d2-863727069 .color-N5{color:#DEE1EB;} + .d2-863727069 .color-N6{color:#EEF1F8;} + .d2-863727069 .color-N7{color:#FFFFFF;} + .d2-863727069 .color-B1{color:#0D32B2;} + .d2-863727069 .color-B2{color:#0D32B2;} + .d2-863727069 .color-B3{color:#E3E9FD;} + .d2-863727069 .color-B4{color:#E3E9FD;} + .d2-863727069 .color-B5{color:#EDF0FD;} + .d2-863727069 .color-B6{color:#F7F8FE;} + .d2-863727069 .color-AA2{color:#4A6FF3;} + .d2-863727069 .color-AA4{color:#EDF0FD;} + .d2-863727069 .color-AA5{color:#F7F8FE;} + .d2-863727069 .color-AB4{color:#EDF0FD;} + .d2-863727069 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-863727069);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-863727069);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-863727069);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-863727069);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-863727069);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-863727069);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-863727069);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-863727069);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-863727069);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-863727069);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-863727069);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-863727069);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-863727069);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-863727069);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-863727069);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-863727069);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-863727069);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-863727069);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ああああああああああ - + \ No newline at end of file diff --git a/e2etests/testdata/unicode/japanese-full/dagre/board.exp.json b/e2etests/testdata/unicode/japanese-full/dagre/board.exp.json index e7ba2a978..75ad24233 100644 --- a/e2etests/testdata/unicode/japanese-full/dagre/board.exp.json +++ b/e2etests/testdata/unicode/japanese-full/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -110,6 +120,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 691, @@ -150,6 +161,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/unicode/japanese-full/dagre/sketch.exp.svg b/e2etests/testdata/unicode/japanese-full/dagre/sketch.exp.svg index 280d327df..b269e9a48 100644 --- a/e2etests/testdata/unicode/japanese-full/dagre/sketch.exp.svg +++ b/e2etests/testdata/unicode/japanese-full/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -ある日、トマトが道を歩いていたら、道路の向こうからキュウリがやって来ました。トマトは驚いて尋ねました。「キュウリさん、どうしてあなたはここにいるのですか？」 キュウリは答えました。「あなたと同じ理由でここにいます。サラダになるために。」「バナナは皮を剥いて食べるものです。」 「バカは死ななきゃ治らない。」 + .d2-4237722222 .fill-N1{fill:#0A0F25;} + .d2-4237722222 .fill-N2{fill:#676C7E;} + .d2-4237722222 .fill-N3{fill:#9499AB;} + .d2-4237722222 .fill-N4{fill:#CFD2DD;} + .d2-4237722222 .fill-N5{fill:#DEE1EB;} + .d2-4237722222 .fill-N6{fill:#EEF1F8;} + .d2-4237722222 .fill-N7{fill:#FFFFFF;} + .d2-4237722222 .fill-B1{fill:#0D32B2;} + .d2-4237722222 .fill-B2{fill:#0D32B2;} + .d2-4237722222 .fill-B3{fill:#E3E9FD;} + .d2-4237722222 .fill-B4{fill:#E3E9FD;} + .d2-4237722222 .fill-B5{fill:#EDF0FD;} + .d2-4237722222 .fill-B6{fill:#F7F8FE;} + .d2-4237722222 .fill-AA2{fill:#4A6FF3;} + .d2-4237722222 .fill-AA4{fill:#EDF0FD;} + .d2-4237722222 .fill-AA5{fill:#F7F8FE;} + .d2-4237722222 .fill-AB4{fill:#EDF0FD;} + .d2-4237722222 .fill-AB5{fill:#F7F8FE;} + .d2-4237722222 .stroke-N1{stroke:#0A0F25;} + .d2-4237722222 .stroke-N2{stroke:#676C7E;} + .d2-4237722222 .stroke-N3{stroke:#9499AB;} + .d2-4237722222 .stroke-N4{stroke:#CFD2DD;} + .d2-4237722222 .stroke-N5{stroke:#DEE1EB;} + .d2-4237722222 .stroke-N6{stroke:#EEF1F8;} + .d2-4237722222 .stroke-N7{stroke:#FFFFFF;} + .d2-4237722222 .stroke-B1{stroke:#0D32B2;} + .d2-4237722222 .stroke-B2{stroke:#0D32B2;} + .d2-4237722222 .stroke-B3{stroke:#E3E9FD;} + .d2-4237722222 .stroke-B4{stroke:#E3E9FD;} + .d2-4237722222 .stroke-B5{stroke:#EDF0FD;} + .d2-4237722222 .stroke-B6{stroke:#F7F8FE;} + .d2-4237722222 .stroke-AA2{stroke:#4A6FF3;} + .d2-4237722222 .stroke-AA4{stroke:#EDF0FD;} + .d2-4237722222 .stroke-AA5{stroke:#F7F8FE;} + .d2-4237722222 .stroke-AB4{stroke:#EDF0FD;} + .d2-4237722222 .stroke-AB5{stroke:#F7F8FE;} + .d2-4237722222 .background-color-N1{background-color:#0A0F25;} + .d2-4237722222 .background-color-N2{background-color:#676C7E;} + .d2-4237722222 .background-color-N3{background-color:#9499AB;} + .d2-4237722222 .background-color-N4{background-color:#CFD2DD;} + .d2-4237722222 .background-color-N5{background-color:#DEE1EB;} + .d2-4237722222 .background-color-N6{background-color:#EEF1F8;} + .d2-4237722222 .background-color-N7{background-color:#FFFFFF;} + .d2-4237722222 .background-color-B1{background-color:#0D32B2;} + .d2-4237722222 .background-color-B2{background-color:#0D32B2;} + .d2-4237722222 .background-color-B3{background-color:#E3E9FD;} + .d2-4237722222 .background-color-B4{background-color:#E3E9FD;} + .d2-4237722222 .background-color-B5{background-color:#EDF0FD;} + .d2-4237722222 .background-color-B6{background-color:#F7F8FE;} + .d2-4237722222 .background-color-AA2{background-color:#4A6FF3;} + .d2-4237722222 .background-color-AA4{background-color:#EDF0FD;} + .d2-4237722222 .background-color-AA5{background-color:#F7F8FE;} + .d2-4237722222 .background-color-AB4{background-color:#EDF0FD;} + .d2-4237722222 .background-color-AB5{background-color:#F7F8FE;} + .d2-4237722222 .color-N1{color:#0A0F25;} + .d2-4237722222 .color-N2{color:#676C7E;} + .d2-4237722222 .color-N3{color:#9499AB;} + .d2-4237722222 .color-N4{color:#CFD2DD;} + .d2-4237722222 .color-N5{color:#DEE1EB;} + .d2-4237722222 .color-N6{color:#EEF1F8;} + .d2-4237722222 .color-N7{color:#FFFFFF;} + .d2-4237722222 .color-B1{color:#0D32B2;} + .d2-4237722222 .color-B2{color:#0D32B2;} + .d2-4237722222 .color-B3{color:#E3E9FD;} + .d2-4237722222 .color-B4{color:#E3E9FD;} + .d2-4237722222 .color-B5{color:#EDF0FD;} + .d2-4237722222 .color-B6{color:#F7F8FE;} + .d2-4237722222 .color-AA2{color:#4A6FF3;} + .d2-4237722222 .color-AA4{color:#EDF0FD;} + .d2-4237722222 .color-AA5{color:#F7F8FE;} + .d2-4237722222 .color-AB4{color:#EDF0FD;} + .d2-4237722222 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4237722222);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4237722222);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4237722222);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4237722222);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4237722222);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4237722222);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4237722222);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4237722222);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4237722222);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4237722222);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4237722222);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4237722222);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4237722222);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4237722222);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4237722222);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4237722222);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4237722222);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4237722222);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ある日、トマトが道を歩いていたら、道路の向こうからキュウリがやって来ました。トマトは驚いて尋ねました。「キュウリさん、どうしてあなたはここにいるのですか？」 キュウリは答えました。「あなたと同じ理由でここにいます。サラダになるために。」「バナナは皮を剥いて食べるものです。」 「バカは死ななきゃ治らない。」 - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/unicode/japanese-full/elk/board.exp.json b/e2etests/testdata/unicode/japanese-full/elk/board.exp.json index 73f51d3c6..609c47212 100644 --- a/e2etests/testdata/unicode/japanese-full/elk/board.exp.json +++ b/e2etests/testdata/unicode/japanese-full/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -110,6 +120,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 703, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/unicode/japanese-full/elk/sketch.exp.svg b/e2etests/testdata/unicode/japanese-full/elk/sketch.exp.svg index 89ddacbaf..154edd6b9 100644 --- a/e2etests/testdata/unicode/japanese-full/elk/sketch.exp.svg +++ b/e2etests/testdata/unicode/japanese-full/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -ある日、トマトが道を歩いていたら、道路の向こうからキュウリがやって来ました。トマトは驚いて尋ねました。「キュウリさん、どうしてあなたはここにいるのですか？」 キュウリは答えました。「あなたと同じ理由でここにいます。サラダになるために。」「バナナは皮を剥いて食べるものです。」 「バカは死ななきゃ治らない。」 + .d2-1374398470 .fill-N1{fill:#0A0F25;} + .d2-1374398470 .fill-N2{fill:#676C7E;} + .d2-1374398470 .fill-N3{fill:#9499AB;} + .d2-1374398470 .fill-N4{fill:#CFD2DD;} + .d2-1374398470 .fill-N5{fill:#DEE1EB;} + .d2-1374398470 .fill-N6{fill:#EEF1F8;} + .d2-1374398470 .fill-N7{fill:#FFFFFF;} + .d2-1374398470 .fill-B1{fill:#0D32B2;} + .d2-1374398470 .fill-B2{fill:#0D32B2;} + .d2-1374398470 .fill-B3{fill:#E3E9FD;} + .d2-1374398470 .fill-B4{fill:#E3E9FD;} + .d2-1374398470 .fill-B5{fill:#EDF0FD;} + .d2-1374398470 .fill-B6{fill:#F7F8FE;} + .d2-1374398470 .fill-AA2{fill:#4A6FF3;} + .d2-1374398470 .fill-AA4{fill:#EDF0FD;} + .d2-1374398470 .fill-AA5{fill:#F7F8FE;} + .d2-1374398470 .fill-AB4{fill:#EDF0FD;} + .d2-1374398470 .fill-AB5{fill:#F7F8FE;} + .d2-1374398470 .stroke-N1{stroke:#0A0F25;} + .d2-1374398470 .stroke-N2{stroke:#676C7E;} + .d2-1374398470 .stroke-N3{stroke:#9499AB;} + .d2-1374398470 .stroke-N4{stroke:#CFD2DD;} + .d2-1374398470 .stroke-N5{stroke:#DEE1EB;} + .d2-1374398470 .stroke-N6{stroke:#EEF1F8;} + .d2-1374398470 .stroke-N7{stroke:#FFFFFF;} + .d2-1374398470 .stroke-B1{stroke:#0D32B2;} + .d2-1374398470 .stroke-B2{stroke:#0D32B2;} + .d2-1374398470 .stroke-B3{stroke:#E3E9FD;} + .d2-1374398470 .stroke-B4{stroke:#E3E9FD;} + .d2-1374398470 .stroke-B5{stroke:#EDF0FD;} + .d2-1374398470 .stroke-B6{stroke:#F7F8FE;} + .d2-1374398470 .stroke-AA2{stroke:#4A6FF3;} + .d2-1374398470 .stroke-AA4{stroke:#EDF0FD;} + .d2-1374398470 .stroke-AA5{stroke:#F7F8FE;} + .d2-1374398470 .stroke-AB4{stroke:#EDF0FD;} + .d2-1374398470 .stroke-AB5{stroke:#F7F8FE;} + .d2-1374398470 .background-color-N1{background-color:#0A0F25;} + .d2-1374398470 .background-color-N2{background-color:#676C7E;} + .d2-1374398470 .background-color-N3{background-color:#9499AB;} + .d2-1374398470 .background-color-N4{background-color:#CFD2DD;} + .d2-1374398470 .background-color-N5{background-color:#DEE1EB;} + .d2-1374398470 .background-color-N6{background-color:#EEF1F8;} + .d2-1374398470 .background-color-N7{background-color:#FFFFFF;} + .d2-1374398470 .background-color-B1{background-color:#0D32B2;} + .d2-1374398470 .background-color-B2{background-color:#0D32B2;} + .d2-1374398470 .background-color-B3{background-color:#E3E9FD;} + .d2-1374398470 .background-color-B4{background-color:#E3E9FD;} + .d2-1374398470 .background-color-B5{background-color:#EDF0FD;} + .d2-1374398470 .background-color-B6{background-color:#F7F8FE;} + .d2-1374398470 .background-color-AA2{background-color:#4A6FF3;} + .d2-1374398470 .background-color-AA4{background-color:#EDF0FD;} + .d2-1374398470 .background-color-AA5{background-color:#F7F8FE;} + .d2-1374398470 .background-color-AB4{background-color:#EDF0FD;} + .d2-1374398470 .background-color-AB5{background-color:#F7F8FE;} + .d2-1374398470 .color-N1{color:#0A0F25;} + .d2-1374398470 .color-N2{color:#676C7E;} + .d2-1374398470 .color-N3{color:#9499AB;} + .d2-1374398470 .color-N4{color:#CFD2DD;} + .d2-1374398470 .color-N5{color:#DEE1EB;} + .d2-1374398470 .color-N6{color:#EEF1F8;} + .d2-1374398470 .color-N7{color:#FFFFFF;} + .d2-1374398470 .color-B1{color:#0D32B2;} + .d2-1374398470 .color-B2{color:#0D32B2;} + .d2-1374398470 .color-B3{color:#E3E9FD;} + .d2-1374398470 .color-B4{color:#E3E9FD;} + .d2-1374398470 .color-B5{color:#EDF0FD;} + .d2-1374398470 .color-B6{color:#F7F8FE;} + .d2-1374398470 .color-AA2{color:#4A6FF3;} + .d2-1374398470 .color-AA4{color:#EDF0FD;} + .d2-1374398470 .color-AA5{color:#F7F8FE;} + .d2-1374398470 .color-AB4{color:#EDF0FD;} + .d2-1374398470 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1374398470);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1374398470);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1374398470);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1374398470);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1374398470);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1374398470);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1374398470);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1374398470);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1374398470);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1374398470);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1374398470);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1374398470);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1374398470);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1374398470);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1374398470);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1374398470);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1374398470);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1374398470);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ある日、トマトが道を歩いていたら、道路の向こうからキュウリがやって来ました。トマトは驚いて尋ねました。「キュウリさん、どうしてあなたはここにいるのですか？」 キュウリは答えました。「あなたと同じ理由でここにいます。サラダになるために。」「バナナは皮を剥いて食べるものです。」 「バカは死ななきゃ治らない。」 - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/unicode/japanese-mixed/dagre/board.exp.json b/e2etests/testdata/unicode/japanese-mixed/dagre/board.exp.json index 03c5f64b6..6ece1cf25 100644 --- a/e2etests/testdata/unicode/japanese-mixed/dagre/board.exp.json +++ b/e2etests/testdata/unicode/japanese-mixed/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -274,6 +288,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1979.5, @@ -321,6 +336,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1979.5, @@ -368,6 +384,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1979.5, @@ -415,6 +432,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1979.5, @@ -462,6 +480,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1979.5, @@ -502,6 +521,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/unicode/japanese-mixed/dagre/sketch.exp.svg b/e2etests/testdata/unicode/japanese-mixed/dagre/sketch.exp.svg index 28281a4c6..db9bcd1a2 100644 --- a/e2etests/testdata/unicode/japanese-mixed/dagre/sketch.exp.svg +++ b/e2etests/testdata/unicode/japanese-mixed/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -トマトが赤くなったのはなぜですか？Because it saw the salad dressing!👩‍👩‍👧‍👶👩‍👩‍👧‍👶トマトが赤くなったのはなぜですか？Because it saw the salad dressing!👩‍👩‍👧‍👶👩‍👩‍👧‍👶今日はTokyoでsushiを食べました先日、Shibuyaで友達とshoppingを楽😊しんだ後、ramen屋でdelicious😊なラーメンを食べた。English English English先日先日先日 + .d2-1028838171 .fill-N1{fill:#0A0F25;} + .d2-1028838171 .fill-N2{fill:#676C7E;} + .d2-1028838171 .fill-N3{fill:#9499AB;} + .d2-1028838171 .fill-N4{fill:#CFD2DD;} + .d2-1028838171 .fill-N5{fill:#DEE1EB;} + .d2-1028838171 .fill-N6{fill:#EEF1F8;} + .d2-1028838171 .fill-N7{fill:#FFFFFF;} + .d2-1028838171 .fill-B1{fill:#0D32B2;} + .d2-1028838171 .fill-B2{fill:#0D32B2;} + .d2-1028838171 .fill-B3{fill:#E3E9FD;} + .d2-1028838171 .fill-B4{fill:#E3E9FD;} + .d2-1028838171 .fill-B5{fill:#EDF0FD;} + .d2-1028838171 .fill-B6{fill:#F7F8FE;} + .d2-1028838171 .fill-AA2{fill:#4A6FF3;} + .d2-1028838171 .fill-AA4{fill:#EDF0FD;} + .d2-1028838171 .fill-AA5{fill:#F7F8FE;} + .d2-1028838171 .fill-AB4{fill:#EDF0FD;} + .d2-1028838171 .fill-AB5{fill:#F7F8FE;} + .d2-1028838171 .stroke-N1{stroke:#0A0F25;} + .d2-1028838171 .stroke-N2{stroke:#676C7E;} + .d2-1028838171 .stroke-N3{stroke:#9499AB;} + .d2-1028838171 .stroke-N4{stroke:#CFD2DD;} + .d2-1028838171 .stroke-N5{stroke:#DEE1EB;} + .d2-1028838171 .stroke-N6{stroke:#EEF1F8;} + .d2-1028838171 .stroke-N7{stroke:#FFFFFF;} + .d2-1028838171 .stroke-B1{stroke:#0D32B2;} + .d2-1028838171 .stroke-B2{stroke:#0D32B2;} + .d2-1028838171 .stroke-B3{stroke:#E3E9FD;} + .d2-1028838171 .stroke-B4{stroke:#E3E9FD;} + .d2-1028838171 .stroke-B5{stroke:#EDF0FD;} + .d2-1028838171 .stroke-B6{stroke:#F7F8FE;} + .d2-1028838171 .stroke-AA2{stroke:#4A6FF3;} + .d2-1028838171 .stroke-AA4{stroke:#EDF0FD;} + .d2-1028838171 .stroke-AA5{stroke:#F7F8FE;} + .d2-1028838171 .stroke-AB4{stroke:#EDF0FD;} + .d2-1028838171 .stroke-AB5{stroke:#F7F8FE;} + .d2-1028838171 .background-color-N1{background-color:#0A0F25;} + .d2-1028838171 .background-color-N2{background-color:#676C7E;} + .d2-1028838171 .background-color-N3{background-color:#9499AB;} + .d2-1028838171 .background-color-N4{background-color:#CFD2DD;} + .d2-1028838171 .background-color-N5{background-color:#DEE1EB;} + .d2-1028838171 .background-color-N6{background-color:#EEF1F8;} + .d2-1028838171 .background-color-N7{background-color:#FFFFFF;} + .d2-1028838171 .background-color-B1{background-color:#0D32B2;} + .d2-1028838171 .background-color-B2{background-color:#0D32B2;} + .d2-1028838171 .background-color-B3{background-color:#E3E9FD;} + .d2-1028838171 .background-color-B4{background-color:#E3E9FD;} + .d2-1028838171 .background-color-B5{background-color:#EDF0FD;} + .d2-1028838171 .background-color-B6{background-color:#F7F8FE;} + .d2-1028838171 .background-color-AA2{background-color:#4A6FF3;} + .d2-1028838171 .background-color-AA4{background-color:#EDF0FD;} + .d2-1028838171 .background-color-AA5{background-color:#F7F8FE;} + .d2-1028838171 .background-color-AB4{background-color:#EDF0FD;} + .d2-1028838171 .background-color-AB5{background-color:#F7F8FE;} + .d2-1028838171 .color-N1{color:#0A0F25;} + .d2-1028838171 .color-N2{color:#676C7E;} + .d2-1028838171 .color-N3{color:#9499AB;} + .d2-1028838171 .color-N4{color:#CFD2DD;} + .d2-1028838171 .color-N5{color:#DEE1EB;} + .d2-1028838171 .color-N6{color:#EEF1F8;} + .d2-1028838171 .color-N7{color:#FFFFFF;} + .d2-1028838171 .color-B1{color:#0D32B2;} + .d2-1028838171 .color-B2{color:#0D32B2;} + .d2-1028838171 .color-B3{color:#E3E9FD;} + .d2-1028838171 .color-B4{color:#E3E9FD;} + .d2-1028838171 .color-B5{color:#EDF0FD;} + .d2-1028838171 .color-B6{color:#F7F8FE;} + .d2-1028838171 .color-AA2{color:#4A6FF3;} + .d2-1028838171 .color-AA4{color:#EDF0FD;} + .d2-1028838171 .color-AA5{color:#F7F8FE;} + .d2-1028838171 .color-AB4{color:#EDF0FD;} + .d2-1028838171 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1028838171);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1028838171);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1028838171);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1028838171);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1028838171);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1028838171);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1028838171);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1028838171);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1028838171);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1028838171);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1028838171);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1028838171);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1028838171);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1028838171);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1028838171);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1028838171);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1028838171);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1028838171);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>トマトが赤くなったのはなぜですか？Because it saw the salad dressing!👩‍👩‍👧‍👶👩‍👩‍👧‍👶トマトが赤くなったのはなぜですか？Because it saw the salad dressing!👩‍👩‍👧‍👶👩‍👩‍👧‍👶今日はTokyoでsushiを食べました先日、Shibuyaで友達とshoppingを楽😊しんだ後、ramen屋でdelicious😊なラーメンを食べた。English English English先日先日先日 - - - - - - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/unicode/japanese-mixed/elk/board.exp.json b/e2etests/testdata/unicode/japanese-mixed/elk/board.exp.json index b402f364e..fa2a93a19 100644 --- a/e2etests/testdata/unicode/japanese-mixed/elk/board.exp.json +++ b/e2etests/testdata/unicode/japanese-mixed/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -274,6 +288,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1991.5, @@ -312,6 +327,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1991.5, @@ -350,6 +366,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1991.5, @@ -388,6 +405,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1991.5, @@ -426,6 +444,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1991.5, @@ -457,6 +476,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/unicode/japanese-mixed/elk/sketch.exp.svg b/e2etests/testdata/unicode/japanese-mixed/elk/sketch.exp.svg index 28459879c..66dcf5f28 100644 --- a/e2etests/testdata/unicode/japanese-mixed/elk/sketch.exp.svg +++ b/e2etests/testdata/unicode/japanese-mixed/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -トマトが赤くなったのはなぜですか？Because it saw the salad dressing!👩‍👩‍👧‍👶👩‍👩‍👧‍👶トマトが赤くなったのはなぜですか？Because it saw the salad dressing!👩‍👩‍👧‍👶👩‍👩‍👧‍👶今日はTokyoでsushiを食べました先日、Shibuyaで友達とshoppingを楽😊しんだ後、ramen屋でdelicious😊なラーメンを食べた。English English English先日先日先日 + .d2-3260157287 .fill-N1{fill:#0A0F25;} + .d2-3260157287 .fill-N2{fill:#676C7E;} + .d2-3260157287 .fill-N3{fill:#9499AB;} + .d2-3260157287 .fill-N4{fill:#CFD2DD;} + .d2-3260157287 .fill-N5{fill:#DEE1EB;} + .d2-3260157287 .fill-N6{fill:#EEF1F8;} + .d2-3260157287 .fill-N7{fill:#FFFFFF;} + .d2-3260157287 .fill-B1{fill:#0D32B2;} + .d2-3260157287 .fill-B2{fill:#0D32B2;} + .d2-3260157287 .fill-B3{fill:#E3E9FD;} + .d2-3260157287 .fill-B4{fill:#E3E9FD;} + .d2-3260157287 .fill-B5{fill:#EDF0FD;} + .d2-3260157287 .fill-B6{fill:#F7F8FE;} + .d2-3260157287 .fill-AA2{fill:#4A6FF3;} + .d2-3260157287 .fill-AA4{fill:#EDF0FD;} + .d2-3260157287 .fill-AA5{fill:#F7F8FE;} + .d2-3260157287 .fill-AB4{fill:#EDF0FD;} + .d2-3260157287 .fill-AB5{fill:#F7F8FE;} + .d2-3260157287 .stroke-N1{stroke:#0A0F25;} + .d2-3260157287 .stroke-N2{stroke:#676C7E;} + .d2-3260157287 .stroke-N3{stroke:#9499AB;} + .d2-3260157287 .stroke-N4{stroke:#CFD2DD;} + .d2-3260157287 .stroke-N5{stroke:#DEE1EB;} + .d2-3260157287 .stroke-N6{stroke:#EEF1F8;} + .d2-3260157287 .stroke-N7{stroke:#FFFFFF;} + .d2-3260157287 .stroke-B1{stroke:#0D32B2;} + .d2-3260157287 .stroke-B2{stroke:#0D32B2;} + .d2-3260157287 .stroke-B3{stroke:#E3E9FD;} + .d2-3260157287 .stroke-B4{stroke:#E3E9FD;} + .d2-3260157287 .stroke-B5{stroke:#EDF0FD;} + .d2-3260157287 .stroke-B6{stroke:#F7F8FE;} + .d2-3260157287 .stroke-AA2{stroke:#4A6FF3;} + .d2-3260157287 .stroke-AA4{stroke:#EDF0FD;} + .d2-3260157287 .stroke-AA5{stroke:#F7F8FE;} + .d2-3260157287 .stroke-AB4{stroke:#EDF0FD;} + .d2-3260157287 .stroke-AB5{stroke:#F7F8FE;} + .d2-3260157287 .background-color-N1{background-color:#0A0F25;} + .d2-3260157287 .background-color-N2{background-color:#676C7E;} + .d2-3260157287 .background-color-N3{background-color:#9499AB;} + .d2-3260157287 .background-color-N4{background-color:#CFD2DD;} + .d2-3260157287 .background-color-N5{background-color:#DEE1EB;} + .d2-3260157287 .background-color-N6{background-color:#EEF1F8;} + .d2-3260157287 .background-color-N7{background-color:#FFFFFF;} + .d2-3260157287 .background-color-B1{background-color:#0D32B2;} + .d2-3260157287 .background-color-B2{background-color:#0D32B2;} + .d2-3260157287 .background-color-B3{background-color:#E3E9FD;} + .d2-3260157287 .background-color-B4{background-color:#E3E9FD;} + .d2-3260157287 .background-color-B5{background-color:#EDF0FD;} + .d2-3260157287 .background-color-B6{background-color:#F7F8FE;} + .d2-3260157287 .background-color-AA2{background-color:#4A6FF3;} + .d2-3260157287 .background-color-AA4{background-color:#EDF0FD;} + .d2-3260157287 .background-color-AA5{background-color:#F7F8FE;} + .d2-3260157287 .background-color-AB4{background-color:#EDF0FD;} + .d2-3260157287 .background-color-AB5{background-color:#F7F8FE;} + .d2-3260157287 .color-N1{color:#0A0F25;} + .d2-3260157287 .color-N2{color:#676C7E;} + .d2-3260157287 .color-N3{color:#9499AB;} + .d2-3260157287 .color-N4{color:#CFD2DD;} + .d2-3260157287 .color-N5{color:#DEE1EB;} + .d2-3260157287 .color-N6{color:#EEF1F8;} + .d2-3260157287 .color-N7{color:#FFFFFF;} + .d2-3260157287 .color-B1{color:#0D32B2;} + .d2-3260157287 .color-B2{color:#0D32B2;} + .d2-3260157287 .color-B3{color:#E3E9FD;} + .d2-3260157287 .color-B4{color:#E3E9FD;} + .d2-3260157287 .color-B5{color:#EDF0FD;} + .d2-3260157287 .color-B6{color:#F7F8FE;} + .d2-3260157287 .color-AA2{color:#4A6FF3;} + .d2-3260157287 .color-AA4{color:#EDF0FD;} + .d2-3260157287 .color-AA5{color:#F7F8FE;} + .d2-3260157287 .color-AB4{color:#EDF0FD;} + .d2-3260157287 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3260157287);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3260157287);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3260157287);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3260157287);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3260157287);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3260157287);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3260157287);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3260157287);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3260157287);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3260157287);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3260157287);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3260157287);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3260157287);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3260157287);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3260157287);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3260157287);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3260157287);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3260157287);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>トマトが赤くなったのはなぜですか？Because it saw the salad dressing!👩‍👩‍👧‍👶👩‍👩‍👧‍👶トマトが赤くなったのはなぜですか？Because it saw the salad dressing!👩‍👩‍👧‍👶👩‍👩‍👧‍👶今日はTokyoでsushiを食べました先日、Shibuyaで友達とshoppingを楽😊しんだ後、ramen屋でdelicious😊なラーメンを食べた。English English English先日先日先日 - - - - - - + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/unicode/korean/dagre/board.exp.json b/e2etests/testdata/unicode/korean/dagre/board.exp.json index 5917ea9cf..7ad3753fe 100644 --- a/e2etests/testdata/unicode/korean/dagre/board.exp.json +++ b/e2etests/testdata/unicode/korean/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -61,6 +70,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/unicode/korean/dagre/sketch.exp.svg b/e2etests/testdata/unicode/korean/dagre/sketch.exp.svg index 5e1ef77c5..bc51e2d41 100644 --- a/e2etests/testdata/unicode/korean/dagre/sketch.exp.svg +++ b/e2etests/testdata/unicode/korean/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -고생끝에낙이온다 + .d2-2636282580 .fill-N1{fill:#0A0F25;} + .d2-2636282580 .fill-N2{fill:#676C7E;} + .d2-2636282580 .fill-N3{fill:#9499AB;} + .d2-2636282580 .fill-N4{fill:#CFD2DD;} + .d2-2636282580 .fill-N5{fill:#DEE1EB;} + .d2-2636282580 .fill-N6{fill:#EEF1F8;} + .d2-2636282580 .fill-N7{fill:#FFFFFF;} + .d2-2636282580 .fill-B1{fill:#0D32B2;} + .d2-2636282580 .fill-B2{fill:#0D32B2;} + .d2-2636282580 .fill-B3{fill:#E3E9FD;} + .d2-2636282580 .fill-B4{fill:#E3E9FD;} + .d2-2636282580 .fill-B5{fill:#EDF0FD;} + .d2-2636282580 .fill-B6{fill:#F7F8FE;} + .d2-2636282580 .fill-AA2{fill:#4A6FF3;} + .d2-2636282580 .fill-AA4{fill:#EDF0FD;} + .d2-2636282580 .fill-AA5{fill:#F7F8FE;} + .d2-2636282580 .fill-AB4{fill:#EDF0FD;} + .d2-2636282580 .fill-AB5{fill:#F7F8FE;} + .d2-2636282580 .stroke-N1{stroke:#0A0F25;} + .d2-2636282580 .stroke-N2{stroke:#676C7E;} + .d2-2636282580 .stroke-N3{stroke:#9499AB;} + .d2-2636282580 .stroke-N4{stroke:#CFD2DD;} + .d2-2636282580 .stroke-N5{stroke:#DEE1EB;} + .d2-2636282580 .stroke-N6{stroke:#EEF1F8;} + .d2-2636282580 .stroke-N7{stroke:#FFFFFF;} + .d2-2636282580 .stroke-B1{stroke:#0D32B2;} + .d2-2636282580 .stroke-B2{stroke:#0D32B2;} + .d2-2636282580 .stroke-B3{stroke:#E3E9FD;} + .d2-2636282580 .stroke-B4{stroke:#E3E9FD;} + .d2-2636282580 .stroke-B5{stroke:#EDF0FD;} + .d2-2636282580 .stroke-B6{stroke:#F7F8FE;} + .d2-2636282580 .stroke-AA2{stroke:#4A6FF3;} + .d2-2636282580 .stroke-AA4{stroke:#EDF0FD;} + .d2-2636282580 .stroke-AA5{stroke:#F7F8FE;} + .d2-2636282580 .stroke-AB4{stroke:#EDF0FD;} + .d2-2636282580 .stroke-AB5{stroke:#F7F8FE;} + .d2-2636282580 .background-color-N1{background-color:#0A0F25;} + .d2-2636282580 .background-color-N2{background-color:#676C7E;} + .d2-2636282580 .background-color-N3{background-color:#9499AB;} + .d2-2636282580 .background-color-N4{background-color:#CFD2DD;} + .d2-2636282580 .background-color-N5{background-color:#DEE1EB;} + .d2-2636282580 .background-color-N6{background-color:#EEF1F8;} + .d2-2636282580 .background-color-N7{background-color:#FFFFFF;} + .d2-2636282580 .background-color-B1{background-color:#0D32B2;} + .d2-2636282580 .background-color-B2{background-color:#0D32B2;} + .d2-2636282580 .background-color-B3{background-color:#E3E9FD;} + .d2-2636282580 .background-color-B4{background-color:#E3E9FD;} + .d2-2636282580 .background-color-B5{background-color:#EDF0FD;} + .d2-2636282580 .background-color-B6{background-color:#F7F8FE;} + .d2-2636282580 .background-color-AA2{background-color:#4A6FF3;} + .d2-2636282580 .background-color-AA4{background-color:#EDF0FD;} + .d2-2636282580 .background-color-AA5{background-color:#F7F8FE;} + .d2-2636282580 .background-color-AB4{background-color:#EDF0FD;} + .d2-2636282580 .background-color-AB5{background-color:#F7F8FE;} + .d2-2636282580 .color-N1{color:#0A0F25;} + .d2-2636282580 .color-N2{color:#676C7E;} + .d2-2636282580 .color-N3{color:#9499AB;} + .d2-2636282580 .color-N4{color:#CFD2DD;} + .d2-2636282580 .color-N5{color:#DEE1EB;} + .d2-2636282580 .color-N6{color:#EEF1F8;} + .d2-2636282580 .color-N7{color:#FFFFFF;} + .d2-2636282580 .color-B1{color:#0D32B2;} + .d2-2636282580 .color-B2{color:#0D32B2;} + .d2-2636282580 .color-B3{color:#E3E9FD;} + .d2-2636282580 .color-B4{color:#E3E9FD;} + .d2-2636282580 .color-B5{color:#EDF0FD;} + .d2-2636282580 .color-B6{color:#F7F8FE;} + .d2-2636282580 .color-AA2{color:#4A6FF3;} + .d2-2636282580 .color-AA4{color:#EDF0FD;} + .d2-2636282580 .color-AA5{color:#F7F8FE;} + .d2-2636282580 .color-AB4{color:#EDF0FD;} + .d2-2636282580 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-2636282580);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-2636282580);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-2636282580);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-2636282580);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-2636282580);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-2636282580);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-2636282580);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-2636282580);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-2636282580);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-2636282580);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-2636282580);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-2636282580);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-2636282580);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-2636282580);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-2636282580);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-2636282580);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-2636282580);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-2636282580);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>고생끝에낙이온다 - + \ No newline at end of file diff --git a/e2etests/testdata/unicode/korean/elk/board.exp.json b/e2etests/testdata/unicode/korean/elk/board.exp.json index d64da8678..325d0d91d 100644 --- a/e2etests/testdata/unicode/korean/elk/board.exp.json +++ b/e2etests/testdata/unicode/korean/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -61,6 +70,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/unicode/korean/elk/sketch.exp.svg b/e2etests/testdata/unicode/korean/elk/sketch.exp.svg index 5c34bec75..a658da626 100644 --- a/e2etests/testdata/unicode/korean/elk/sketch.exp.svg +++ b/e2etests/testdata/unicode/korean/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -고생끝에낙이온다 + .d2-3829169148 .fill-N1{fill:#0A0F25;} + .d2-3829169148 .fill-N2{fill:#676C7E;} + .d2-3829169148 .fill-N3{fill:#9499AB;} + .d2-3829169148 .fill-N4{fill:#CFD2DD;} + .d2-3829169148 .fill-N5{fill:#DEE1EB;} + .d2-3829169148 .fill-N6{fill:#EEF1F8;} + .d2-3829169148 .fill-N7{fill:#FFFFFF;} + .d2-3829169148 .fill-B1{fill:#0D32B2;} + .d2-3829169148 .fill-B2{fill:#0D32B2;} + .d2-3829169148 .fill-B3{fill:#E3E9FD;} + .d2-3829169148 .fill-B4{fill:#E3E9FD;} + .d2-3829169148 .fill-B5{fill:#EDF0FD;} + .d2-3829169148 .fill-B6{fill:#F7F8FE;} + .d2-3829169148 .fill-AA2{fill:#4A6FF3;} + .d2-3829169148 .fill-AA4{fill:#EDF0FD;} + .d2-3829169148 .fill-AA5{fill:#F7F8FE;} + .d2-3829169148 .fill-AB4{fill:#EDF0FD;} + .d2-3829169148 .fill-AB5{fill:#F7F8FE;} + .d2-3829169148 .stroke-N1{stroke:#0A0F25;} + .d2-3829169148 .stroke-N2{stroke:#676C7E;} + .d2-3829169148 .stroke-N3{stroke:#9499AB;} + .d2-3829169148 .stroke-N4{stroke:#CFD2DD;} + .d2-3829169148 .stroke-N5{stroke:#DEE1EB;} + .d2-3829169148 .stroke-N6{stroke:#EEF1F8;} + .d2-3829169148 .stroke-N7{stroke:#FFFFFF;} + .d2-3829169148 .stroke-B1{stroke:#0D32B2;} + .d2-3829169148 .stroke-B2{stroke:#0D32B2;} + .d2-3829169148 .stroke-B3{stroke:#E3E9FD;} + .d2-3829169148 .stroke-B4{stroke:#E3E9FD;} + .d2-3829169148 .stroke-B5{stroke:#EDF0FD;} + .d2-3829169148 .stroke-B6{stroke:#F7F8FE;} + .d2-3829169148 .stroke-AA2{stroke:#4A6FF3;} + .d2-3829169148 .stroke-AA4{stroke:#EDF0FD;} + .d2-3829169148 .stroke-AA5{stroke:#F7F8FE;} + .d2-3829169148 .stroke-AB4{stroke:#EDF0FD;} + .d2-3829169148 .stroke-AB5{stroke:#F7F8FE;} + .d2-3829169148 .background-color-N1{background-color:#0A0F25;} + .d2-3829169148 .background-color-N2{background-color:#676C7E;} + .d2-3829169148 .background-color-N3{background-color:#9499AB;} + .d2-3829169148 .background-color-N4{background-color:#CFD2DD;} + .d2-3829169148 .background-color-N5{background-color:#DEE1EB;} + .d2-3829169148 .background-color-N6{background-color:#EEF1F8;} + .d2-3829169148 .background-color-N7{background-color:#FFFFFF;} + .d2-3829169148 .background-color-B1{background-color:#0D32B2;} + .d2-3829169148 .background-color-B2{background-color:#0D32B2;} + .d2-3829169148 .background-color-B3{background-color:#E3E9FD;} + .d2-3829169148 .background-color-B4{background-color:#E3E9FD;} + .d2-3829169148 .background-color-B5{background-color:#EDF0FD;} + .d2-3829169148 .background-color-B6{background-color:#F7F8FE;} + .d2-3829169148 .background-color-AA2{background-color:#4A6FF3;} + .d2-3829169148 .background-color-AA4{background-color:#EDF0FD;} + .d2-3829169148 .background-color-AA5{background-color:#F7F8FE;} + .d2-3829169148 .background-color-AB4{background-color:#EDF0FD;} + .d2-3829169148 .background-color-AB5{background-color:#F7F8FE;} + .d2-3829169148 .color-N1{color:#0A0F25;} + .d2-3829169148 .color-N2{color:#676C7E;} + .d2-3829169148 .color-N3{color:#9499AB;} + .d2-3829169148 .color-N4{color:#CFD2DD;} + .d2-3829169148 .color-N5{color:#DEE1EB;} + .d2-3829169148 .color-N6{color:#EEF1F8;} + .d2-3829169148 .color-N7{color:#FFFFFF;} + .d2-3829169148 .color-B1{color:#0D32B2;} + .d2-3829169148 .color-B2{color:#0D32B2;} + .d2-3829169148 .color-B3{color:#E3E9FD;} + .d2-3829169148 .color-B4{color:#E3E9FD;} + .d2-3829169148 .color-B5{color:#EDF0FD;} + .d2-3829169148 .color-B6{color:#F7F8FE;} + .d2-3829169148 .color-AA2{color:#4A6FF3;} + .d2-3829169148 .color-AA4{color:#EDF0FD;} + .d2-3829169148 .color-AA5{color:#F7F8FE;} + .d2-3829169148 .color-AB4{color:#EDF0FD;} + .d2-3829169148 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3829169148);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3829169148);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3829169148);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3829169148);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3829169148);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3829169148);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3829169148);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3829169148);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3829169148);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3829169148);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3829169148);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3829169148);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3829169148);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3829169148);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3829169148);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3829169148);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3829169148);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3829169148);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>고생끝에낙이온다 - + \ No newline at end of file diff --git a/e2etests/testdata/unicode/mixed-language-2/dagre/board.exp.json b/e2etests/testdata/unicode/mixed-language-2/dagre/board.exp.json index 34ac578d6..3b49a9fbe 100644 --- a/e2etests/testdata/unicode/mixed-language-2/dagre/board.exp.json +++ b/e2etests/testdata/unicode/mixed-language-2/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -715,6 +740,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -756,6 +782,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -797,6 +824,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -838,6 +866,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -879,6 +908,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -930,6 +960,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 150.5, @@ -977,6 +1008,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 150.5, @@ -1024,6 +1056,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 150.5, @@ -1071,6 +1104,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 454.5, @@ -1118,6 +1152,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 454.5, @@ -1165,6 +1200,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 454.5, @@ -1212,6 +1248,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 769.5, @@ -1259,6 +1296,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 769.5, @@ -1306,6 +1344,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 769.5, @@ -1353,6 +1392,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1093.5, @@ -1400,6 +1440,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1093.5, @@ -1447,6 +1488,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1093.5, @@ -1487,6 +1529,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/unicode/mixed-language-2/dagre/sketch.exp.svg b/e2etests/testdata/unicode/mixed-language-2/dagre/sketch.exp.svg index c84ad9715..53c52c715 100644 --- a/e2etests/testdata/unicode/mixed-language-2/dagre/sketch.exp.svg +++ b/e2etests/testdata/unicode/mixed-language-2/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -我 (wǒ) - Mandarin Chineseສະບາຍດີ (sabaai dii) - Laoជំរាបសួរ (jomreab suor) - Khmerสวัสดี (sà-wàt-dii) - Thaiສະບາຍດີ (sabaidee) - Laoဟယ်လို (helaou) - Burmesemari (まり) - Ainucào (草) - Zhuangкүнтізбе (kúntízbe) - Kazakhբարև (barev) - Armenianмонгол (mongol) - Mongolianmila (میلا) - Uyghurનમસ્તે (namaste) - Gujarati漢字 (kanji) - Japanese위 (wi) - Korean吾哥 (ngǔgāi) - Cantoneseမင်္ဂလာပါ (mingalaba) - Burmeseсайн уу (sain uu) - Mongolianਸਤਿ ਸ੍ਰੀ ਅਕਾਲ (sat sri akal) - Punjabi你吃了吗 (ní chī le ma) - Mandarin Chinese饭 (fan) - Zhuangمەن سىزنى ياخشى ئۈمىد ق + .d2-1730306677 .fill-N1{fill:#0A0F25;} + .d2-1730306677 .fill-N2{fill:#676C7E;} + .d2-1730306677 .fill-N3{fill:#9499AB;} + .d2-1730306677 .fill-N4{fill:#CFD2DD;} + .d2-1730306677 .fill-N5{fill:#DEE1EB;} + .d2-1730306677 .fill-N6{fill:#EEF1F8;} + .d2-1730306677 .fill-N7{fill:#FFFFFF;} + .d2-1730306677 .fill-B1{fill:#0D32B2;} + .d2-1730306677 .fill-B2{fill:#0D32B2;} + .d2-1730306677 .fill-B3{fill:#E3E9FD;} + .d2-1730306677 .fill-B4{fill:#E3E9FD;} + .d2-1730306677 .fill-B5{fill:#EDF0FD;} + .d2-1730306677 .fill-B6{fill:#F7F8FE;} + .d2-1730306677 .fill-AA2{fill:#4A6FF3;} + .d2-1730306677 .fill-AA4{fill:#EDF0FD;} + .d2-1730306677 .fill-AA5{fill:#F7F8FE;} + .d2-1730306677 .fill-AB4{fill:#EDF0FD;} + .d2-1730306677 .fill-AB5{fill:#F7F8FE;} + .d2-1730306677 .stroke-N1{stroke:#0A0F25;} + .d2-1730306677 .stroke-N2{stroke:#676C7E;} + .d2-1730306677 .stroke-N3{stroke:#9499AB;} + .d2-1730306677 .stroke-N4{stroke:#CFD2DD;} + .d2-1730306677 .stroke-N5{stroke:#DEE1EB;} + .d2-1730306677 .stroke-N6{stroke:#EEF1F8;} + .d2-1730306677 .stroke-N7{stroke:#FFFFFF;} + .d2-1730306677 .stroke-B1{stroke:#0D32B2;} + .d2-1730306677 .stroke-B2{stroke:#0D32B2;} + .d2-1730306677 .stroke-B3{stroke:#E3E9FD;} + .d2-1730306677 .stroke-B4{stroke:#E3E9FD;} + .d2-1730306677 .stroke-B5{stroke:#EDF0FD;} + .d2-1730306677 .stroke-B6{stroke:#F7F8FE;} + .d2-1730306677 .stroke-AA2{stroke:#4A6FF3;} + .d2-1730306677 .stroke-AA4{stroke:#EDF0FD;} + .d2-1730306677 .stroke-AA5{stroke:#F7F8FE;} + .d2-1730306677 .stroke-AB4{stroke:#EDF0FD;} + .d2-1730306677 .stroke-AB5{stroke:#F7F8FE;} + .d2-1730306677 .background-color-N1{background-color:#0A0F25;} + .d2-1730306677 .background-color-N2{background-color:#676C7E;} + .d2-1730306677 .background-color-N3{background-color:#9499AB;} + .d2-1730306677 .background-color-N4{background-color:#CFD2DD;} + .d2-1730306677 .background-color-N5{background-color:#DEE1EB;} + .d2-1730306677 .background-color-N6{background-color:#EEF1F8;} + .d2-1730306677 .background-color-N7{background-color:#FFFFFF;} + .d2-1730306677 .background-color-B1{background-color:#0D32B2;} + .d2-1730306677 .background-color-B2{background-color:#0D32B2;} + .d2-1730306677 .background-color-B3{background-color:#E3E9FD;} + .d2-1730306677 .background-color-B4{background-color:#E3E9FD;} + .d2-1730306677 .background-color-B5{background-color:#EDF0FD;} + .d2-1730306677 .background-color-B6{background-color:#F7F8FE;} + .d2-1730306677 .background-color-AA2{background-color:#4A6FF3;} + .d2-1730306677 .background-color-AA4{background-color:#EDF0FD;} + .d2-1730306677 .background-color-AA5{background-color:#F7F8FE;} + .d2-1730306677 .background-color-AB4{background-color:#EDF0FD;} + .d2-1730306677 .background-color-AB5{background-color:#F7F8FE;} + .d2-1730306677 .color-N1{color:#0A0F25;} + .d2-1730306677 .color-N2{color:#676C7E;} + .d2-1730306677 .color-N3{color:#9499AB;} + .d2-1730306677 .color-N4{color:#CFD2DD;} + .d2-1730306677 .color-N5{color:#DEE1EB;} + .d2-1730306677 .color-N6{color:#EEF1F8;} + .d2-1730306677 .color-N7{color:#FFFFFF;} + .d2-1730306677 .color-B1{color:#0D32B2;} + .d2-1730306677 .color-B2{color:#0D32B2;} + .d2-1730306677 .color-B3{color:#E3E9FD;} + .d2-1730306677 .color-B4{color:#E3E9FD;} + .d2-1730306677 .color-B5{color:#EDF0FD;} + .d2-1730306677 .color-B6{color:#F7F8FE;} + .d2-1730306677 .color-AA2{color:#4A6FF3;} + .d2-1730306677 .color-AA4{color:#EDF0FD;} + .d2-1730306677 .color-AA5{color:#F7F8FE;} + .d2-1730306677 .color-AB4{color:#EDF0FD;} + .d2-1730306677 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-1730306677);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-1730306677);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-1730306677);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-1730306677);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-1730306677);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-1730306677);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-1730306677);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-1730306677);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-1730306677);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-1730306677);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-1730306677);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-1730306677);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-1730306677);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-1730306677);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-1730306677);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-1730306677);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-1730306677);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-1730306677);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>我 (wǒ) - Mandarin Chineseສະບາຍດີ (sabaai dii) - Laoជំរាបសួរ (jomreab suor) - Khmerสวัสดี (sà-wàt-dii) - Thaiສະບາຍດີ (sabaidee) - Laoဟယ်လို (helaou) - Burmesemari (まり) - Ainucào (草) - Zhuangкүнтізбе (kúntízbe) - Kazakhբարև (barev) - Armenianмонгол (mongol) - Mongolianmila (میلا) - Uyghurનમસ્તે (namaste) - Gujarati漢字 (kanji) - Japanese위 (wi) - Korean吾哥 (ngǔgāi) - Cantoneseမင်္ဂလာပါ (mingalaba) - Burmeseсайн уу (sain uu) - Mongolianਸਤਿ ਸ੍ਰੀ ਅਕਾਲ (sat sri akal) - Punjabi你吃了吗 (ní chī le ma) - Mandarin Chinese饭 (fan) - Zhuangمەن سىزنى ياخشى ئۈمىد ق - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/unicode/mixed-language-2/elk/board.exp.json b/e2etests/testdata/unicode/mixed-language-2/elk/board.exp.json index d2273cf01..bfe014cac 100644 --- a/e2etests/testdata/unicode/mixed-language-2/elk/board.exp.json +++ b/e2etests/testdata/unicode/mixed-language-2/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -141,6 +152,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -182,6 +194,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -223,6 +236,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -264,6 +278,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -305,6 +320,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -346,6 +362,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -387,6 +404,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -428,6 +446,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -469,6 +488,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -510,6 +530,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -551,6 +572,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -592,6 +614,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -633,6 +656,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -674,6 +698,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -715,6 +740,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -756,6 +782,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -797,6 +824,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -838,6 +866,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -879,6 +908,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -930,6 +960,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 162.5, @@ -968,6 +999,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 162.5, @@ -1006,6 +1038,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 162.5, @@ -1044,6 +1077,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 426.5, @@ -1082,6 +1116,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 426.5, @@ -1120,6 +1155,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 426.5, @@ -1158,6 +1194,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 701.5, @@ -1196,6 +1233,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 701.5, @@ -1234,6 +1272,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 701.5, @@ -1272,6 +1311,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 985.5, @@ -1310,6 +1350,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 985.5, @@ -1348,6 +1389,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 985.5, @@ -1379,6 +1421,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/unicode/mixed-language-2/elk/sketch.exp.svg b/e2etests/testdata/unicode/mixed-language-2/elk/sketch.exp.svg index 6bbcd40c2..475ac65e5 100644 --- a/e2etests/testdata/unicode/mixed-language-2/elk/sketch.exp.svg +++ b/e2etests/testdata/unicode/mixed-language-2/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -我 (wǒ) - Mandarin Chineseສະບາຍດີ (sabaai dii) - Laoជំរាបសួរ (jomreab suor) - Khmerสวัสดี (sà-wàt-dii) - Thaiສະບາຍດີ (sabaidee) - Laoဟယ်လို (helaou) - Burmesemari (まり) - Ainucào (草) - Zhuangкүнтізбе (kúntízbe) - Kazakhբարև (barev) - Armenianмонгол (mongol) - Mongolianmila (میلا) - Uyghurનમસ્તે (namaste) - Gujarati漢字 (kanji) - Japanese위 (wi) - Korean吾哥 (ngǔgāi) - Cantoneseမင်္ဂလာပါ (mingalaba) - Burmeseсайн уу (sain uu) - Mongolianਸਤਿ ਸ੍ਰੀ ਅਕਾਲ (sat sri akal) - Punjabi你吃了吗 (ní chī le ma) - Mandarin Chinese饭 (fan) - Zhuangمەن سىزنى ياخشى ئۈمىد ق + .d2-3899830953 .fill-N1{fill:#0A0F25;} + .d2-3899830953 .fill-N2{fill:#676C7E;} + .d2-3899830953 .fill-N3{fill:#9499AB;} + .d2-3899830953 .fill-N4{fill:#CFD2DD;} + .d2-3899830953 .fill-N5{fill:#DEE1EB;} + .d2-3899830953 .fill-N6{fill:#EEF1F8;} + .d2-3899830953 .fill-N7{fill:#FFFFFF;} + .d2-3899830953 .fill-B1{fill:#0D32B2;} + .d2-3899830953 .fill-B2{fill:#0D32B2;} + .d2-3899830953 .fill-B3{fill:#E3E9FD;} + .d2-3899830953 .fill-B4{fill:#E3E9FD;} + .d2-3899830953 .fill-B5{fill:#EDF0FD;} + .d2-3899830953 .fill-B6{fill:#F7F8FE;} + .d2-3899830953 .fill-AA2{fill:#4A6FF3;} + .d2-3899830953 .fill-AA4{fill:#EDF0FD;} + .d2-3899830953 .fill-AA5{fill:#F7F8FE;} + .d2-3899830953 .fill-AB4{fill:#EDF0FD;} + .d2-3899830953 .fill-AB5{fill:#F7F8FE;} + .d2-3899830953 .stroke-N1{stroke:#0A0F25;} + .d2-3899830953 .stroke-N2{stroke:#676C7E;} + .d2-3899830953 .stroke-N3{stroke:#9499AB;} + .d2-3899830953 .stroke-N4{stroke:#CFD2DD;} + .d2-3899830953 .stroke-N5{stroke:#DEE1EB;} + .d2-3899830953 .stroke-N6{stroke:#EEF1F8;} + .d2-3899830953 .stroke-N7{stroke:#FFFFFF;} + .d2-3899830953 .stroke-B1{stroke:#0D32B2;} + .d2-3899830953 .stroke-B2{stroke:#0D32B2;} + .d2-3899830953 .stroke-B3{stroke:#E3E9FD;} + .d2-3899830953 .stroke-B4{stroke:#E3E9FD;} + .d2-3899830953 .stroke-B5{stroke:#EDF0FD;} + .d2-3899830953 .stroke-B6{stroke:#F7F8FE;} + .d2-3899830953 .stroke-AA2{stroke:#4A6FF3;} + .d2-3899830953 .stroke-AA4{stroke:#EDF0FD;} + .d2-3899830953 .stroke-AA5{stroke:#F7F8FE;} + .d2-3899830953 .stroke-AB4{stroke:#EDF0FD;} + .d2-3899830953 .stroke-AB5{stroke:#F7F8FE;} + .d2-3899830953 .background-color-N1{background-color:#0A0F25;} + .d2-3899830953 .background-color-N2{background-color:#676C7E;} + .d2-3899830953 .background-color-N3{background-color:#9499AB;} + .d2-3899830953 .background-color-N4{background-color:#CFD2DD;} + .d2-3899830953 .background-color-N5{background-color:#DEE1EB;} + .d2-3899830953 .background-color-N6{background-color:#EEF1F8;} + .d2-3899830953 .background-color-N7{background-color:#FFFFFF;} + .d2-3899830953 .background-color-B1{background-color:#0D32B2;} + .d2-3899830953 .background-color-B2{background-color:#0D32B2;} + .d2-3899830953 .background-color-B3{background-color:#E3E9FD;} + .d2-3899830953 .background-color-B4{background-color:#E3E9FD;} + .d2-3899830953 .background-color-B5{background-color:#EDF0FD;} + .d2-3899830953 .background-color-B6{background-color:#F7F8FE;} + .d2-3899830953 .background-color-AA2{background-color:#4A6FF3;} + .d2-3899830953 .background-color-AA4{background-color:#EDF0FD;} + .d2-3899830953 .background-color-AA5{background-color:#F7F8FE;} + .d2-3899830953 .background-color-AB4{background-color:#EDF0FD;} + .d2-3899830953 .background-color-AB5{background-color:#F7F8FE;} + .d2-3899830953 .color-N1{color:#0A0F25;} + .d2-3899830953 .color-N2{color:#676C7E;} + .d2-3899830953 .color-N3{color:#9499AB;} + .d2-3899830953 .color-N4{color:#CFD2DD;} + .d2-3899830953 .color-N5{color:#DEE1EB;} + .d2-3899830953 .color-N6{color:#EEF1F8;} + .d2-3899830953 .color-N7{color:#FFFFFF;} + .d2-3899830953 .color-B1{color:#0D32B2;} + .d2-3899830953 .color-B2{color:#0D32B2;} + .d2-3899830953 .color-B3{color:#E3E9FD;} + .d2-3899830953 .color-B4{color:#E3E9FD;} + .d2-3899830953 .color-B5{color:#EDF0FD;} + .d2-3899830953 .color-B6{color:#F7F8FE;} + .d2-3899830953 .color-AA2{color:#4A6FF3;} + .d2-3899830953 .color-AA4{color:#EDF0FD;} + .d2-3899830953 .color-AA5{color:#F7F8FE;} + .d2-3899830953 .color-AB4{color:#EDF0FD;} + .d2-3899830953 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3899830953);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3899830953);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3899830953);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3899830953);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3899830953);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3899830953);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3899830953);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3899830953);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3899830953);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3899830953);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3899830953);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3899830953);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3899830953);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3899830953);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3899830953);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3899830953);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3899830953);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3899830953);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>我 (wǒ) - Mandarin Chineseສະບາຍດີ (sabaai dii) - Laoជំរាបសួរ (jomreab suor) - Khmerสวัสดี (sà-wàt-dii) - Thaiສະບາຍດີ (sabaidee) - Laoဟယ်လို (helaou) - Burmesemari (まり) - Ainucào (草) - Zhuangкүнтізбе (kúntízbe) - Kazakhբարև (barev) - Armenianмонгол (mongol) - Mongolianmila (میلا) - Uyghurનમસ્તે (namaste) - Gujarati漢字 (kanji) - Japanese위 (wi) - Korean吾哥 (ngǔgāi) - Cantoneseမင်္ဂလာပါ (mingalaba) - Burmeseсайн уу (sain uu) - Mongolianਸਤਿ ਸ੍ਰੀ ਅਕਾਲ (sat sri akal) - Punjabi你吃了吗 (ní chī le ma) - Mandarin Chinese饭 (fan) - Zhuangمەن سىزنى ياخشى ئۈمىد ق - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/unicode/mixed-language/dagre/board.exp.json b/e2etests/testdata/unicode/mixed-language/dagre/board.exp.json index 421ffcdfe..31df07cbb 100644 --- a/e2etests/testdata/unicode/mixed-language/dagre/board.exp.json +++ b/e2etests/testdata/unicode/mixed-language/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -150,6 +161,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 358, @@ -197,6 +209,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 620, @@ -237,6 +250,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/unicode/mixed-language/dagre/sketch.exp.svg b/e2etests/testdata/unicode/mixed-language/dagre/sketch.exp.svg index 6ce90fe3c..5766191b1 100644 --- a/e2etests/testdata/unicode/mixed-language/dagre/sketch.exp.svg +++ b/e2etests/testdata/unicode/mixed-language/dagre/sketch.exp.svg @@ -1,20 +1,20 @@ -有一个叫做夏天的季节。 ある季節、夏という名前がついています。한 계절, 여름이란 이름이 있습니다.夏天的时候，天气非常热，人们总是流着汗。

    夏になると、とても暑くて、人々は汗を流しています。

    +有一个叫做夏天的季节。 ある季節、夏という名前がついています。한 계절, 여름이란 이름이 있습니다.夏天的时候，天气非常热，人们总是流着汗。

    夏になると、とても暑くて、人々は汗を流しています。

    여름에는 매우 더워서 사람들은 땀을 흘립니다.

    -
     +
     - - - + + +     \ No newline at end of file diff --git a/e2etests/testdata/unicode/mixed-language/elk/board.exp.json b/e2etests/testdata/unicode/mixed-language/elk/board.exp.json index e1f1d747a..447aef1a3 100644 --- a/e2etests/testdata/unicode/mixed-language/elk/board.exp.json +++ b/e2etests/testdata/unicode/mixed-language/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -59,6 +68,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +110,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -150,6 +161,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 409.6659851074219, @@ -188,6 +200,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 552.3330078125, @@ -219,6 +232,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/unicode/mixed-language/elk/sketch.exp.svg b/e2etests/testdata/unicode/mixed-language/elk/sketch.exp.svg index 8c55fb51f..ba8fbfcfa 100644 --- a/e2etests/testdata/unicode/mixed-language/elk/sketch.exp.svg +++ b/e2etests/testdata/unicode/mixed-language/elk/sketch.exp.svg @@ -1,20 +1,20 @@ -有一个叫做夏天的季节。 ある季節、夏という名前がついています。한 계절, 여름이란 이름이 있습니다.夏天的时候，天气非常热，人们总是流着汗。

    夏になると、とても暑くて、人々は汗を流しています。

    +有一个叫做夏天的季节。 ある季節、夏という名前がついています。한 계절, 여름이란 이름이 있습니다.夏天的时候，天气非常热，人们总是流着汗。

    夏になると、とても暑くて、人々は汗を流しています。

    여름에는 매우 더워서 사람들은 땀을 흘립니다.

    -
     +
     - - - + + +     \ No newline at end of file diff --git a/e2etests/testdata/unicode/with-style/dagre/board.exp.json b/e2etests/testdata/unicode/with-style/dagre/board.exp.json index 354bcadea..559c3e8cd 100644 --- a/e2etests/testdata/unicode/with-style/dagre/board.exp.json +++ b/e2etests/testdata/unicode/with-style/dagre/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -61,6 +70,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/unicode/with-style/dagre/sketch.exp.svg b/e2etests/testdata/unicode/with-style/dagre/sketch.exp.svg index 0bdc811d8..345c7f33c 100644 --- a/e2etests/testdata/unicode/with-style/dagre/sketch.exp.svg +++ b/e2etests/testdata/unicode/with-style/dagre/sketch.exp.svg @@ -1,9 +1,9 @@ -おやすみなさい + .d2-3204979801 .fill-N1{fill:#0A0F25;} + .d2-3204979801 .fill-N2{fill:#676C7E;} + .d2-3204979801 .fill-N3{fill:#9499AB;} + .d2-3204979801 .fill-N4{fill:#CFD2DD;} + .d2-3204979801 .fill-N5{fill:#DEE1EB;} + .d2-3204979801 .fill-N6{fill:#EEF1F8;} + .d2-3204979801 .fill-N7{fill:#FFFFFF;} + .d2-3204979801 .fill-B1{fill:#0D32B2;} + .d2-3204979801 .fill-B2{fill:#0D32B2;} + .d2-3204979801 .fill-B3{fill:#E3E9FD;} + .d2-3204979801 .fill-B4{fill:#E3E9FD;} + .d2-3204979801 .fill-B5{fill:#EDF0FD;} + .d2-3204979801 .fill-B6{fill:#F7F8FE;} + .d2-3204979801 .fill-AA2{fill:#4A6FF3;} + .d2-3204979801 .fill-AA4{fill:#EDF0FD;} + .d2-3204979801 .fill-AA5{fill:#F7F8FE;} + .d2-3204979801 .fill-AB4{fill:#EDF0FD;} + .d2-3204979801 .fill-AB5{fill:#F7F8FE;} + .d2-3204979801 .stroke-N1{stroke:#0A0F25;} + .d2-3204979801 .stroke-N2{stroke:#676C7E;} + .d2-3204979801 .stroke-N3{stroke:#9499AB;} + .d2-3204979801 .stroke-N4{stroke:#CFD2DD;} + .d2-3204979801 .stroke-N5{stroke:#DEE1EB;} + .d2-3204979801 .stroke-N6{stroke:#EEF1F8;} + .d2-3204979801 .stroke-N7{stroke:#FFFFFF;} + .d2-3204979801 .stroke-B1{stroke:#0D32B2;} + .d2-3204979801 .stroke-B2{stroke:#0D32B2;} + .d2-3204979801 .stroke-B3{stroke:#E3E9FD;} + .d2-3204979801 .stroke-B4{stroke:#E3E9FD;} + .d2-3204979801 .stroke-B5{stroke:#EDF0FD;} + .d2-3204979801 .stroke-B6{stroke:#F7F8FE;} + .d2-3204979801 .stroke-AA2{stroke:#4A6FF3;} + .d2-3204979801 .stroke-AA4{stroke:#EDF0FD;} + .d2-3204979801 .stroke-AA5{stroke:#F7F8FE;} + .d2-3204979801 .stroke-AB4{stroke:#EDF0FD;} + .d2-3204979801 .stroke-AB5{stroke:#F7F8FE;} + .d2-3204979801 .background-color-N1{background-color:#0A0F25;} + .d2-3204979801 .background-color-N2{background-color:#676C7E;} + .d2-3204979801 .background-color-N3{background-color:#9499AB;} + .d2-3204979801 .background-color-N4{background-color:#CFD2DD;} + .d2-3204979801 .background-color-N5{background-color:#DEE1EB;} + .d2-3204979801 .background-color-N6{background-color:#EEF1F8;} + .d2-3204979801 .background-color-N7{background-color:#FFFFFF;} + .d2-3204979801 .background-color-B1{background-color:#0D32B2;} + .d2-3204979801 .background-color-B2{background-color:#0D32B2;} + .d2-3204979801 .background-color-B3{background-color:#E3E9FD;} + .d2-3204979801 .background-color-B4{background-color:#E3E9FD;} + .d2-3204979801 .background-color-B5{background-color:#EDF0FD;} + .d2-3204979801 .background-color-B6{background-color:#F7F8FE;} + .d2-3204979801 .background-color-AA2{background-color:#4A6FF3;} + .d2-3204979801 .background-color-AA4{background-color:#EDF0FD;} + .d2-3204979801 .background-color-AA5{background-color:#F7F8FE;} + .d2-3204979801 .background-color-AB4{background-color:#EDF0FD;} + .d2-3204979801 .background-color-AB5{background-color:#F7F8FE;} + .d2-3204979801 .color-N1{color:#0A0F25;} + .d2-3204979801 .color-N2{color:#676C7E;} + .d2-3204979801 .color-N3{color:#9499AB;} + .d2-3204979801 .color-N4{color:#CFD2DD;} + .d2-3204979801 .color-N5{color:#DEE1EB;} + .d2-3204979801 .color-N6{color:#EEF1F8;} + .d2-3204979801 .color-N7{color:#FFFFFF;} + .d2-3204979801 .color-B1{color:#0D32B2;} + .d2-3204979801 .color-B2{color:#0D32B2;} + .d2-3204979801 .color-B3{color:#E3E9FD;} + .d2-3204979801 .color-B4{color:#E3E9FD;} + .d2-3204979801 .color-B5{color:#EDF0FD;} + .d2-3204979801 .color-B6{color:#F7F8FE;} + .d2-3204979801 .color-AA2{color:#4A6FF3;} + .d2-3204979801 .color-AA4{color:#EDF0FD;} + .d2-3204979801 .color-AA5{color:#F7F8FE;} + .d2-3204979801 .color-AB4{color:#EDF0FD;} + .d2-3204979801 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-3204979801);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-3204979801);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-3204979801);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-3204979801);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-3204979801);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-3204979801);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-3204979801);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-3204979801);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-3204979801);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-3204979801);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-3204979801);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-3204979801);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-3204979801);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-3204979801);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-3204979801);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-3204979801);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-3204979801);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-3204979801);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>おやすみなさい - + \ No newline at end of file diff --git a/e2etests/testdata/unicode/with-style/elk/board.exp.json b/e2etests/testdata/unicode/with-style/elk/board.exp.json index 813559b54..a8dcbc0d6 100644 --- a/e2etests/testdata/unicode/with-style/elk/board.exp.json +++ b/e2etests/testdata/unicode/with-style/elk/board.exp.json @@ -1,5 +1,13 @@ { "name": "", + "config": { + "sketch": false, + "themeID": 0, + "darkThemeID": null, + "pad": null, + "center": null, + "layoutEngine": null + }, "isFolderOnly": false, "fontFamily": "SourceSansPro", "shapes": [ @@ -18,6 +26,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -61,6 +70,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/e2etests/testdata/unicode/with-style/elk/sketch.exp.svg b/e2etests/testdata/unicode/with-style/elk/sketch.exp.svg index 0a3fc8070..d8ea13f8b 100644 --- a/e2etests/testdata/unicode/with-style/elk/sketch.exp.svg +++ b/e2etests/testdata/unicode/with-style/elk/sketch.exp.svg @@ -1,9 +1,9 @@ -おやすみなさい + .d2-4075491441 .fill-N1{fill:#0A0F25;} + .d2-4075491441 .fill-N2{fill:#676C7E;} + .d2-4075491441 .fill-N3{fill:#9499AB;} + .d2-4075491441 .fill-N4{fill:#CFD2DD;} + .d2-4075491441 .fill-N5{fill:#DEE1EB;} + .d2-4075491441 .fill-N6{fill:#EEF1F8;} + .d2-4075491441 .fill-N7{fill:#FFFFFF;} + .d2-4075491441 .fill-B1{fill:#0D32B2;} + .d2-4075491441 .fill-B2{fill:#0D32B2;} + .d2-4075491441 .fill-B3{fill:#E3E9FD;} + .d2-4075491441 .fill-B4{fill:#E3E9FD;} + .d2-4075491441 .fill-B5{fill:#EDF0FD;} + .d2-4075491441 .fill-B6{fill:#F7F8FE;} + .d2-4075491441 .fill-AA2{fill:#4A6FF3;} + .d2-4075491441 .fill-AA4{fill:#EDF0FD;} + .d2-4075491441 .fill-AA5{fill:#F7F8FE;} + .d2-4075491441 .fill-AB4{fill:#EDF0FD;} + .d2-4075491441 .fill-AB5{fill:#F7F8FE;} + .d2-4075491441 .stroke-N1{stroke:#0A0F25;} + .d2-4075491441 .stroke-N2{stroke:#676C7E;} + .d2-4075491441 .stroke-N3{stroke:#9499AB;} + .d2-4075491441 .stroke-N4{stroke:#CFD2DD;} + .d2-4075491441 .stroke-N5{stroke:#DEE1EB;} + .d2-4075491441 .stroke-N6{stroke:#EEF1F8;} + .d2-4075491441 .stroke-N7{stroke:#FFFFFF;} + .d2-4075491441 .stroke-B1{stroke:#0D32B2;} + .d2-4075491441 .stroke-B2{stroke:#0D32B2;} + .d2-4075491441 .stroke-B3{stroke:#E3E9FD;} + .d2-4075491441 .stroke-B4{stroke:#E3E9FD;} + .d2-4075491441 .stroke-B5{stroke:#EDF0FD;} + .d2-4075491441 .stroke-B6{stroke:#F7F8FE;} + .d2-4075491441 .stroke-AA2{stroke:#4A6FF3;} + .d2-4075491441 .stroke-AA4{stroke:#EDF0FD;} + .d2-4075491441 .stroke-AA5{stroke:#F7F8FE;} + .d2-4075491441 .stroke-AB4{stroke:#EDF0FD;} + .d2-4075491441 .stroke-AB5{stroke:#F7F8FE;} + .d2-4075491441 .background-color-N1{background-color:#0A0F25;} + .d2-4075491441 .background-color-N2{background-color:#676C7E;} + .d2-4075491441 .background-color-N3{background-color:#9499AB;} + .d2-4075491441 .background-color-N4{background-color:#CFD2DD;} + .d2-4075491441 .background-color-N5{background-color:#DEE1EB;} + .d2-4075491441 .background-color-N6{background-color:#EEF1F8;} + .d2-4075491441 .background-color-N7{background-color:#FFFFFF;} + .d2-4075491441 .background-color-B1{background-color:#0D32B2;} + .d2-4075491441 .background-color-B2{background-color:#0D32B2;} + .d2-4075491441 .background-color-B3{background-color:#E3E9FD;} + .d2-4075491441 .background-color-B4{background-color:#E3E9FD;} + .d2-4075491441 .background-color-B5{background-color:#EDF0FD;} + .d2-4075491441 .background-color-B6{background-color:#F7F8FE;} + .d2-4075491441 .background-color-AA2{background-color:#4A6FF3;} + .d2-4075491441 .background-color-AA4{background-color:#EDF0FD;} + .d2-4075491441 .background-color-AA5{background-color:#F7F8FE;} + .d2-4075491441 .background-color-AB4{background-color:#EDF0FD;} + .d2-4075491441 .background-color-AB5{background-color:#F7F8FE;} + .d2-4075491441 .color-N1{color:#0A0F25;} + .d2-4075491441 .color-N2{color:#676C7E;} + .d2-4075491441 .color-N3{color:#9499AB;} + .d2-4075491441 .color-N4{color:#CFD2DD;} + .d2-4075491441 .color-N5{color:#DEE1EB;} + .d2-4075491441 .color-N6{color:#EEF1F8;} + .d2-4075491441 .color-N7{color:#FFFFFF;} + .d2-4075491441 .color-B1{color:#0D32B2;} + .d2-4075491441 .color-B2{color:#0D32B2;} + .d2-4075491441 .color-B3{color:#E3E9FD;} + .d2-4075491441 .color-B4{color:#E3E9FD;} + .d2-4075491441 .color-B5{color:#EDF0FD;} + .d2-4075491441 .color-B6{color:#F7F8FE;} + .d2-4075491441 .color-AA2{color:#4A6FF3;} + .d2-4075491441 .color-AA4{color:#EDF0FD;} + .d2-4075491441 .color-AA5{color:#F7F8FE;} + .d2-4075491441 .color-AB4{color:#EDF0FD;} + .d2-4075491441 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker-d2-4075491441);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker-d2-4075491441);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright-d2-4075491441);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright-d2-4075491441);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright-d2-4075491441);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright-d2-4075491441);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark-d2-4075491441);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright-d2-4075491441);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright-d2-4075491441);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright-d2-4075491441);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright-d2-4075491441);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker-d2-4075491441);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark-d2-4075491441);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal-d2-4075491441);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal-d2-4075491441);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright-d2-4075491441);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright-d2-4075491441);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright-d2-4075491441);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>おやすみなさい - + \ No newline at end of file diff --git a/e2etests/themes_test.go b/e2etests/themes_test.go index 4691ffce9..989b5b449 100644 --- a/e2etests/themes_test.go +++ b/e2etests/themes_test.go @@ -111,8 +111,8 @@ func main() { markdown -> code -> ex ex: |tex - \\displaylines{x = a + b \\\\ y = b + c} - \\sum_{k=1}^{n} h_{k} \\int_{0}^{1} \\bigl(\\partial_{k} f(x_{k-1}+t h_{k} e_{k}) -\\partial_{k} f(a)\\bigr) \\,dt + \displaylines{x = a + b \\ y = b + c} + \sum_{k=1}^{n} h_{k} \int_{0}^{1} \bigl(\partial_{k} f(x_{k-1}+t h_{k} e_{k}) -\partial_{k} f(a)\bigr) \,dt | `, }, @@ -218,8 +218,8 @@ func main() { markdown -> code -> ex ex: |tex - \\displaylines{x = a + b \\\\ y = b + c} - \\sum_{k=1}^{n} h_{k} \\int_{0}^{1} \\bigl(\\partial_{k} f(x_{k-1}+t h_{k} e_{k}) -\\partial_{k} f(a)\\bigr) \\,dt + \displaylines{x = a + b \\ y = b + c} + \sum_{k=1}^{n} h_{k} \int_{0}^{1} \bigl(\partial_{k} f(x_{k-1}+t h_{k} e_{k}) -\partial_{k} f(a)\bigr) \,dt | `, }, diff --git a/e2etests/txtar.txt b/e2etests/txtar.txt index 2d5aa6acf..19a0c532c 100644 --- a/e2etests/txtar.txt +++ b/e2etests/txtar.txt @@ -171,6 +171,29 @@ a -> b: hi { style.underline: true } +-- icon-style -- + +AWS Firewall Manager : { + icon: https://icons.terrastruct.com/aws%2FSecurity%2C%20Identity%2C%20&%20Compliance%2FAWS-Firewall-Manager.svg + icon.style.border-radius: 5 +} + +lambda : { + shape: image + icon: https://icons.terrastruct.com/aws%2FCompute%2FAWS-Lambda.svg + icon.style.border-radius: 20 +} + +AWS Cloud : { + icon: https://icons.terrastruct.com/aws%2F_Group%20Icons%2FAWS-Cloud_light-bg.svg + icon.style.border-radius: 0 +} + +Mesh : { + icon: https://icons.terrastruct.com/aws%2FNetworking%20&%20Content%20Delivery%2FAWS-App-Mesh.svg + icon.style.border-radius: 999 +} + -- none-fill -- vars: { @@ -481,4 +504,702 @@ colors: { style.stroke: "linear-gradient(to right, red, blue, green)" style.font-color: "linear-gradient(to bottom right, red 0%, yellow 25%, green 50%, cyan 75%, blue 100%)" } -gradient -> colors +gradient -> colors: foobar {style.font-color: red; style.stroke: red; style.fill: "radial-gradient(#ffffff, #000000)"} + +-- var_in_markdown -- +vars: { + service-x: Kube +} +x: ${service-x} +description: |md + ${service-x} is a service + + ``` + Let ${y} be ${x} + ``` +| +b -> description -> a + +-- md-tables -- +# Financial table +savings: ||md + | Month | Savings | Expenses | Balance | + | -------- | ------- | -------- | ------- | + | January | $250 | $150 | $100 | + | February | $80 | $200 | -$120 | + | March | $420 | $180 | $240 | +|| + +# Simple 2x2 table +status: ||md + | Status | Count | + | ------ | ----- | + | Done | 42 | + | Todo | 17 | +|| + +# Long table with many rows +metrics: ||md + | Metric | Value | + | --------- | ------- | + | Uptime | 99.9% | + | Latency | 150ms | + | Errors | 0.01% | + | Requests | 15k/min | + | CPU | 45% | + | Memory | 68% | + | Disk | 72% | + | Network | 33% | +|| + +# Connect tables with labeled edges +savings -> status: Triggers { + style: { + stroke-dash: 5 + } +} +status -> metrics: Monitors { + style: { + stroke-width: 2 + } +} + +# Add some styling +savings.style: { + fill: "#e8f4f8" + stroke: "#4a90e2" +} + +status.style: { + fill: "#f8e8e8" + stroke: "#e24a4a" +} + +metrics.style: { + fill: "#f0f8e8" + stroke: "#82e24a" +} + +# Container for financial data +financial: { + label: "Financial Overview" + style.stroke-width: 2 + + monthly: ||md + | Month | Revenue | Costs | Margin | + | --------- | -------- | -------- | ------ | + | January | $25,000 | $18,000 | 28% | + | February | $28,500 | $19,200 | 33% | + | March | $31,200 | $21,500 | 31% | + || + + quarterly: ||md + | Quarter | Target | Actual | Variance | + |:--------|-------:|:------:|:---------| + | Q1 2024 | $75K | $84.7K | +12.9% | + | Q2 2024 | $82K | - | - | + || + + monthly -> quarterly: "Aggregates" +} + +# Container for system metrics +monitoring: { + label: "System Health" + style.3d: true + + availability: ||md + | Service | Status | Uptime | Last Incident | + |:-----------|:------:|:------:|:--------------| + | API | ✅ | 99.9% | 15 days ago | + | Database | ✅ | 99.8% | 3 days ago | + | Cache | ⚠️ | 98.5% | 1 hour ago | + || + + performance: ||md + | Metric | P50 | P90 | P99 | + |:----------------|:-----:|:-----:|:-----:| + | Response Time | 120ms | 350ms | 750ms | + | DB Query Time | 45ms | 180ms | 450ms | + | Cache Latency | 5ms | 12ms | 30ms | + || + + availability -> performance: "Affects" +} + +# Container for project status +projects: { + label: "Project Tracking" + style.stroke: "#4a90e2" + style.double-border: true + + status: ||md + | Project | Priority | Progress | Due Date | Owner | + |---------|:--------:|:--------:|:---------|:------| + | Alpha | HIGH | ![p](https://progress.com/80) 80% | 2024-04-01 | Alice | + | Beta | MEDIUM | ![p](https://progress.com/45) 45% | 2024-05-15 | Bob | + | Gamma | LOW | ![p](https://progress.com/20) 20% | 2024-06-30 | Carol | + || + + risks: ||md + | Risk ID | Description | Impact | Mitigation | + |:-------:|:------------|:------:|:-----------| + | R1 | Resource shortage | 🔴 High | Hire contractors | + | R2 | Technical debt | 🟡 Med | Code review | + | R3 | Scope creep | 🟢 Low | Clear requirements | + || +} + +# Container for team stats +team: { + label: "Team Analytics" + style.fill: "#f5f5f5" + + velocity: ||md + | Sprint | Points | Completed | Carryover | + |:-------|:------:|:---------:|:---------:| + | SP-1 | 34 | 30 | 4 | + | SP-2 | 38 | 35 | 3 | + | SP-3 | 42 | 40 | 2 | + | Average| 38 | 35 | 3 | + || +} + +# Connect containers +financial -> monitoring: "Impacts" +monitoring -> projects: "Informs" { + style.stroke-dash: 5 +} +projects -> team: "Assigns" { + style.animated: true +} + +# Styling +financial.style.fill: "#e8f4f8" +monitoring.style.fill: "#f8e8e8" +projects.style.fill: "#e8f8e8" +team.style.fill: "#f8f0e8" + +-- sql-table-reserved -- +my_table: { + shape: sql_table + icon: https://static.wikia.nocookie.net/tomandjerry/images/4/46/JerryJumbo3-1-.jpg + width: 200 + height: 200 + "shape": string + "icon": string + "width": int + "height": int +} + +x -> my_table."shape" + +-- single-backslash-latex -- +formula: { + equation: |latex + \begin{equation} \label{eq1} + \begin{split} + A & = \frac{\\pi r^2}{2} \\ + & = \frac{1}{2} \pi r^2 + \end{split} + \end{equation} + | +} + +-- link-on-connections -- +a <-> b: { + link: https://google.com/ +} + +b -> c: test { + link: layers.d +} + +layers: { + d: { + d + } +} + +-- shape-animate -- +vars: { + d2-config: { + layout-engine: elk + # Terminal theme code + theme-id: 300 + } +} +network: { + cell tower: { + satellites: { + shape: stored_data + style.multiple: true + } + + transmitter + + satellites -> transmitter: send + satellites -> transmitter: send + satellites -> transmitter: send + } + + online portal: { + ui: {shape: hexagon} + } + + data processor: { + storage: { + style.animated: true + shape: cylinder + style.multiple: true + } + } + + cell tower.transmitter -> data processor.storage: phone logs +} + +user: { + shape: person + width: 130 +} + +user -> network.cell tower: make call +user -> network.online portal.ui: access { + style.stroke-dash: 3 +} + +api server -> network.online portal.ui: display +api server -> logs: persist +logs: {shape: page; style.multiple: true} + +network.data processor -> api server + +-- note-overlap -- +shape: sequence_diagram +alice -> bob +alice -> alice: "Self-messages" +alice -> alice: "Self-messages" +alice -> alice: "Self-messages" +alice -> alice: "Self-messages" + +bob."In the eyes of my dog, I'm a man." + +-- elk-title-near -- +title: "diagram title : Red-line hits 'near: top-center' in elk" {near: top-center} +a: { + a -> b +} +b: { + c +} + +a.b -> b.c +b.c -> a.a: {style.font-color: red; style.stroke: red; style.fill: mistyrose} + +-- sql-casing-panic -- + +asdf:{ + shape:sQl_table + zxcv +} + +-- connection-icons -- +direction: right +a -> b: hello { + icon: https://icons.terrastruct.com/essentials%2F213-alarm.svg +} +b -> c: { + icon: https://icons.terrastruct.com/essentials%2F213-alarm.svg +} + +direction: right +producer -> consumer: { + icon: https://icons.terrastruct.com/aws%2FApplication%20Integration%2FAmazon-Simple-Queue-Service-SQS.svg + icon.style.border-radius: 20 +} + +-- model-view -- +# Models +user.style.fill: blue +softwareSystem: { + serviceA.class: ok + serviceB + serviceC.class: ok + serviceD + + serviceA -> serviceB + serviceA -> serviceD + serviceC -> serviceB +} +externalSystem +user -> softwareSystem +softwareSystem -> externalSystem + +# Clear models +**: suspend +(** -> **)[*]: suspend + +# Include all top-level objects +*: unsuspend +# Include all objects with a certain class +**: unsuspend { + &class: ok +} +# Include all connections/objects connected to an object +(** -> externalSystem)[*]: unsuspend + +-- sequence-diagram-note-md -- +shape: sequence_diagram +x -> y: hello +x.x: |md + ## A man who fishes for marlin in ponds + + - ...dramatic pause + + will put his money in Etruscan bonds. +| + +y.z: |latex + \\lim_{h \\rightarrow 0 } \\frac{f(x+h)-f(x)}{h} +| + +x.z: |python + 1 + 1 = 2 +| + +-- md-label -- +rectangle.shape: rectangle +rectangle: |md + # hello + + - world + + blah blah +| + +square.shape: square +square: |md + # hello + + - world + + blah blah +| + +page.shape: page +page: |md + # hello + + - world + + blah blah +| + +parallelogram.shape: parallelogram +parallelogram: |md + # hello + + - world + + blah blah +| + +document.shape: document +document: |md + # hello + + - world + + blah blah +| + +cylinder.shape: cylinder +cylinder: |md + # hello + + - world + + blah blah +| + +queue.shape: queue +queue: |md + # hello + + - world + + blah blah +| + +package.shape: package +package: |md + # hello + + - world + + blah blah +| + +step.shape: step +step: |md + # hello + + - world + + blah blah +| + +callout.shape: callout +callout: |md + # hello + + - world + + blah blah +| + +stored_data.shape: stored_data +stored_data: |md + # hello + + - world + + blah blah +| + +person.shape: person +person: |md + # hello + + - world + + blah blah +| + +diamond.shape: diamond +diamond: |md + # hello + + - world + + blah blah +| + +oval.shape: oval +oval: |md + # hello + + - world + + blah blah +| + +circle.shape: circle +circle: |md + # hello + + - world + + blah blah +| + +hexagon.shape: hexagon +hexagon: |md + # hello + + - world + + blah blah +| + +cloud.shape: cloud +cloud: |md + # hello + + - world + + blah blah +| + +-- c4-person-shape -- +c4mdperson.shape: c4-person +c4mdperson: |md +## Personal Banking Customer + +[person] + +A customer of the bank, with\ +personal bank accounts + | +c4person: { + shape: c4-person + label: "C4 Style Person" +} +regular_person -> c4mdperson + +regular_person: { + shape: person + label: "Standard Person" +} + +c4person -> regular_person: "Compare shapes" + +styling: { + c4styled: { + shape: c4-person + style.fill: "#91BEEA" + style.stroke: "#2E6195" + style.stroke-width: 2 + } + + c4sized: { + shape: c4-person + width: 150 + height: 180 + label: "Custom Size" + } +} + +c4person -> styling.c4styled -> styling.c4sized +**: { + &shape: c4-person + style.fill: "#08427b" + style.stroke: black + style.font-color: white + style.stroke-width: 1 +} + +-- legend -- +vars: { + d2-legend: { + a: { + label: Microservice + } + b: Database { + shape: cylinder + style.stroke-dash: 2 + } + a <-> b: Good relationship { + style.stroke: red + style.stroke-dash: 2 + style.stroke-width: 1 + } + a -> b: Bad relationship + a -> b: Tenuous { + target-arrowhead.shape: circle + } + } +} + +api-1 +api-2 + +api-1 -> postgres +api-2 -> postgres + +postgres: { + shape: cylinder +} +postgres -> external: { + style.stroke: black +} + +api-1 <-> api-2: { + style.stroke: red + style.stroke-dash: 2 +} +api-1 -> api-3: { + target-arrowhead.shape: circle +} + +-- dark-theme-md -- + +vars: { + d2-config: { + dark-theme-id: 200 + } +} +a.shape: rectangle +a: |md + # hey +| + +-- small-c4-person -- + +a.shape: c4-person +a: c4-person +a.width: 180 + +-- c4-person-label -- +c4mdperson: |md +## Personal Banking Customer + +[person] + +A customer of the bank, with personal bank accounts + | { + shape: c4-person + label.near: center-center + } + +c4mdperson2: |md +## Personal Banking Customer + +[person] + +A customer of the bank, with personal bank accounts + | { + shape: c4-person + label.near: top-center + } + +c4mdperson3: |md +## Personal Banking Customer + +[person] + +A customer of the bank, with personal bank accounts + | { + shape: c4-person + label.near: bottom-center + } + +customer1: |md + ## Personal Banking Customer + [person] + + A customer of the bank, with pekkrsonal bank ccountskks. +| { + shape: c4-person +} + +customer2: |md + ## Personal Banking Customerk + [person] + + A customer of the bank, with pekkrsonal bank accountskks. + + A customer of the bank, with pekkrsonal bank accountskks. + + A customer of the bank, with pekkrsonal bank accountskks. +| { + shape: c4-person +} + +customer3: |md + ## Personal Banking Customer + [person] + + A customer of the bank, with pekkrsonal bank accountskks. +| { + shape: c4-person +} + +customer4: |md + ## Personal Banking Customer + [person] + + A customer of the bank, with pekkrsonal bank accountskks. +| { + shape: c4-person +} diff --git a/go.mod b/go.mod index 1dce72a30..969883950 100644 --- a/go.mod +++ b/go.mod @@ -7,6 +7,7 @@ toolchain go1.23.0 require ( github.com/PuerkitoBio/goquery v1.10.0 github.com/alecthomas/chroma/v2 v2.14.0 + github.com/coder/websocket v1.8.12 github.com/dop251/goja v0.0.0-20240927123429-241b342198c2 github.com/dsoprea/go-exif/v3 v3.0.1 github.com/dsoprea/go-png-image-structure/v2 v2.0.0-20210512210324-29b889a6093d @@ -23,13 +24,12 @@ require ( github.com/yuin/goldmark v1.7.4 go.uber.org/multierr v1.11.0 golang.org/x/image v0.20.0 - golang.org/x/net v0.29.0 - golang.org/x/text v0.18.0 + golang.org/x/net v0.35.0 + golang.org/x/text v0.22.0 golang.org/x/tools v0.25.0 golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da gonum.org/v1/plot v0.14.0 - nhooyr.io/websocket v1.8.17 - oss.terrastruct.com/util-go v0.0.0-20241005222610-44c011a04896 + oss.terrastruct.com/util-go v0.0.0-20250213174338-243d8661088a ) require ( @@ -49,8 +49,8 @@ require ( github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect github.com/pmezard/go-difflib v1.0.0 // indirect golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect - golang.org/x/sys v0.25.0 // indirect - golang.org/x/term v0.24.0 // indirect + golang.org/x/sys v0.30.0 // indirect + golang.org/x/term v0.29.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index ccffe8f68..bcfc3e385 100644 --- a/go.sum +++ b/go.sum @@ -17,6 +17,8 @@ github.com/andybalholm/cascadia v1.3.2/go.mod h1:7gtRlve5FxPPgIgX36uWBX58OdBsSS6 github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/campoy/embedmd v1.0.0 h1:V4kI2qTJJLf4J29RzI/MAt2c3Bl4dQSYPuflzwFH2hY= github.com/campoy/embedmd v1.0.0/go.mod h1:oxyr9RCiSXg0M3VJ3ks0UGfp98BpSSGr0kpiX3MzVl8= +github.com/coder/websocket v1.8.12 h1:5bUXkEPPIbewrnkU8LTCLVaxi4N4J8ahufH2vlo4NAo= +github.com/coder/websocket v1.8.12/go.mod h1:LNVeNrXQZfe5qhS9ALED3uA+l5pPqvwXg3CKoDBB2gs= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= @@ -145,8 +147,8 @@ golang.org/x/net v0.0.0-20221002022538-bcab6841153b/go.mod h1:YDH+HFinaLZZlnHAfS golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= -golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= +golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8= +golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -164,24 +166,24 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= -golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc= +golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= -golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM= -golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8= +golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU= +golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= -golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM= +golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= @@ -203,9 +205,7 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -nhooyr.io/websocket v1.8.17 h1:KEVeLJkUywCKVsnLIDlD/5gtayKp8VoCkksHCGGfT9Y= -nhooyr.io/websocket v1.8.17/go.mod h1:rN9OFWIUwuxg4fR5tELlYC04bXYowCP9GX47ivo2l+c= -oss.terrastruct.com/util-go v0.0.0-20241005222610-44c011a04896 h1:g752s1ECv9FD8GunFOZRGWzjeR0cr/TZdSsjAnFEmL8= -oss.terrastruct.com/util-go v0.0.0-20241005222610-44c011a04896/go.mod h1:eMWv0sOtD9T2RUl90DLWfuShZCYp4NrsqNpI8eqO6U4= +oss.terrastruct.com/util-go v0.0.0-20250213174338-243d8661088a h1:UXF/Z9i9tOx/wqGUOn/T12wZeez1Gg0sAVKKl7YUDwM= +oss.terrastruct.com/util-go v0.0.0-20250213174338-243d8661088a/go.mod h1:eMWv0sOtD9T2RUl90DLWfuShZCYp4NrsqNpI8eqO6U4= rsc.io/pdf v0.1.1 h1:k1MczvYDUvJBe93bYd7wrZLLUEcLZAuF824/I4e5Xr4= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= diff --git a/lib/color/color.go b/lib/color/color.go index cbd8971f7..701cc0b3d 100644 --- a/lib/color/color.go +++ b/lib/color/color.go @@ -86,6 +86,11 @@ func darkenCSS(colorString string) (string, error) { } func LuminanceCategory(colorString string) (string, error) { + // check if colorString matches the `url('#grad-')` format + // which is used to refer to a or element. + if IsURLGradientID(colorString) { + return "normal", nil + } l, err := Luminance(colorString) if err != nil { return "", err @@ -507,7 +512,18 @@ var NamedColors = []string{ var ColorHexRegex = regexp.MustCompile(`^#(([0-9a-fA-F]{2}){3}|([0-9a-fA-F]){3})$`) func ValidColor(color string) bool { - if !go2.Contains(NamedColors, strings.ToLower(color)) && !ColorHexRegex.MatchString(color) && !IsGradient(color) { + if IsGradient(color) { + gradient, err := ParseGradient(color) + if err != nil { + return false + } + for _, colorStop := range gradient.ColorStops { + _, err = csscolorparser.Parse(colorStop.Color) + if err != nil { + return false + } + } + } else if !go2.Contains(NamedColors, strings.ToLower(color)) && !ColorHexRegex.MatchString(color) { return false } diff --git a/lib/color/gradient.go b/lib/color/gradient.go index 29f29acc3..51dbde637 100644 --- a/lib/color/gradient.go +++ b/lib/color/gradient.go @@ -246,3 +246,9 @@ var GradientRegex = regexp.MustCompile(`^(linear|radial)-gradient\((.+)\)$`) func IsGradient(color string) bool { return GradientRegex.MatchString(color) } + +var URLGradientID = regexp.MustCompile(`^url\('#grad-[a-f0-9]{40}'\)$`) + +func IsURLGradientID(color string) bool { + return URLGradientID.MatchString(color) +} diff --git a/lib/imgbundler/imgbundler.go b/lib/imgbundler/imgbundler.go index 46352de3f..7dbd6268e 100644 --- a/lib/imgbundler/imgbundler.go +++ b/lib/imgbundler/imgbundler.go @@ -6,7 +6,7 @@ import ( "encoding/base64" "fmt" "html" - "io/ioutil" + "io" "mime" "net/http" "net/url" @@ -166,7 +166,7 @@ func worker(ctx context.Context, l simplelog.Logger, inputPath string, href []by var err error if isRemote { l.Debug(fmt.Sprintf("fetching %s remotely", string(href))) - buf, mimeType, err = httpGet(ctx, html.UnescapeString(string(href))) + buf, mimeType, err = httpGet(ctx, l, html.UnescapeString(string(href))) } else { l.Debug(fmt.Sprintf("reading %s from disk", string(href))) path := html.UnescapeString(string(href)) @@ -181,8 +181,15 @@ func worker(ctx context.Context, l simplelog.Logger, inputPath string, href []by if mimeType == "" { mimeType = sniffMimeType(href, buf, isRemote) + l.Debug(fmt.Sprintf("no mimetype provided - sniffed MIME type for %s: %s", string(href), mimeType)) + } else { + l.Debug(fmt.Sprintf("mimetype provided for %s: %s", string(href), mimeType)) } mimeType = strings.Replace(mimeType, "text/xml", "image/svg+xml", 1) + if mimeType == "application/octet-stream" && bytes.Contains(buf, []byte(" 0 { + // Add widths of all columns + for _, colWidth := range columnWidths { + tableWidth += colWidth + } + + // Add border for every column division (including outer borders) + tableWidth += float64(len(columnWidths)+1) * tableBorder + } + + // Add outer borders to height + tableHeight += 2 * tableBorder + + block.width = tableWidth + block.height = tableHeight + + case "thead", "tbody", "tfoot": + var sectionWidth, sectionHeight float64 + var sectionColumnWidths [][]float64 + + // Iterate over tr elements + for child := n.FirstChild; child != nil; child = child.NextSibling { + if child.Type == html.ElementNode && child.Data == "tr" { + childAttrs := ruler.measureNode(depth+1, child, fontFamily, fontSize, fontStyle) + sectionHeight += childAttrs.height + sectionWidth = go2.Max(sectionWidth, childAttrs.width) + + if rowCellWidths, ok := childAttrs.extraData.([]float64); ok { + sectionColumnWidths = append(sectionColumnWidths, rowCellWidths) + } + } + } + + block.width = sectionWidth + block.height = sectionHeight + block.extraData = sectionColumnWidths // Pass column widths back to table + + case "td", "th": + // Apply semibold style to header cells + cellFontStyle := fontStyle + if n.Data == "th" { + cellFontStyle = d2fonts.FONT_STYLE_SEMIBOLD + } + + // Measure cell content with appropriate font style + var cellContentWidth, cellContentHeight float64 + + for child := n.FirstChild; child != nil; child = child.NextSibling { + // Pass the header-specific font style to child measurements + childAttrs := ruler.measureNode(depth+1, child, fontFamily, fontSize, cellFontStyle) + cellContentWidth = go2.Max(cellContentWidth, childAttrs.width) + cellContentHeight += childAttrs.height + } + + block.width = cellContentWidth + block.height = cellContentHeight + + case "tr": + var rowWidth, rowHeight float64 + var cellWidths []float64 + + cellBorder := 1.0 + rowBorder := 1.0 + + maxCellHeight := 0.0 + cellCount := 0 + + // Check if this row is in a thead to determine default font style for cells + inHeader := hasAncestorElement(n, "thead") + rowFontStyle := fontStyle + if inHeader { + rowFontStyle = d2fonts.FONT_STYLE_SEMIBOLD + } + + for child := n.FirstChild; child != nil; child = child.NextSibling { + if child.Type == html.ElementNode && (child.Data == "td" || child.Data == "th") { + cellCount++ + + // Use semibold for th elements regardless of location + childFontStyle := rowFontStyle + if child.Data == "th" { + childFontStyle = d2fonts.FONT_STYLE_SEMIBOLD + } + + childAttrs := ruler.measureNode(depth+1, child, fontFamily, fontSize, childFontStyle) + cellPaddingH := 13.0 * 2 + cellPaddingV := 6.0 * 2 + + cellWidth := childAttrs.width + cellPaddingH + cellHeight := childAttrs.height + cellPaddingV + + cellWidths = append(cellWidths, cellWidth) + maxCellHeight = go2.Max(maxCellHeight, cellHeight) + } + } + + if cellCount > 0 { + for _, w := range cellWidths { + rowWidth += w + } + rowWidth += float64(cellCount+1) * cellBorder + } + + rowHeight = maxCellHeight + rowBorder + + block.width = rowWidth + block.height = rowHeight + block.extraData = cellWidths } if block.height > 0 && block.height < lineHeightPx { block.height = lineHeightPx @@ -436,3 +579,16 @@ func (ruler *Ruler) measureNode(depth int, n *html.Node, fontFamily *d2fonts.Fon } return blockAttrs{} } + +func mergeColumnWidths(existing []float64, new [][]float64) []float64 { + for _, rowWidths := range new { + for i, width := range rowWidths { + if i >= len(existing) { + existing = append(existing, width) + } else { + existing[i] = go2.Max(existing[i], width) + } + } + } + return existing +} diff --git a/lib/textmeasure/substitutions.go b/lib/textmeasure/substitutions.go new file mode 100644 index 000000000..a141e7385 --- /dev/null +++ b/lib/textmeasure/substitutions.go @@ -0,0 +1,77 @@ +package textmeasure + +import ( + "sort" + "strings" + + "github.com/yuin/goldmark/ast" + "github.com/yuin/goldmark/text" +) + +func ReplaceSubstitutionsMarkdown(mdText string, variables map[string]string) string { + source := []byte(mdText) + reader := text.NewReader(source) + doc := markdownRenderer.Parser().Parse(reader) + + type substitution struct { + start int + stop int + newVal string + } + var substitutions []substitution + + ast.Walk(doc, func(n ast.Node, entering bool) (ast.WalkStatus, error) { + if !entering { + return ast.WalkContinue, nil + } + + if isCodeNode(n) { + return ast.WalkSkipChildren, nil + } + + if textNode, ok := n.(*ast.Text); ok { + segment := textNode.Segment + originalText := string(segment.Value(source)) + newText := replaceVariables(originalText, variables) + + if originalText != newText { + substitutions = append(substitutions, substitution{ + start: segment.Start, + stop: segment.Stop, + newVal: newText, + }) + } + } + return ast.WalkContinue, nil + }) + + if len(substitutions) == 0 { + return mdText + } + + sort.Slice(substitutions, func(i, j int) bool { + return substitutions[i].start > substitutions[j].start + }) + + result := string(source) + for _, sub := range substitutions { + result = result[:sub.start] + sub.newVal + result[sub.stop:] + } + + return result +} + +func isCodeNode(n ast.Node) bool { + switch n.Kind() { + case ast.KindCodeBlock, ast.KindFencedCodeBlock, ast.KindCodeSpan: + return true + } + return false +} + +func replaceVariables(s string, vars map[string]string) string { + for k, v := range vars { + s = strings.ReplaceAll(s, "${"+k+"}", v) + } + return s +} diff --git a/lib/version/version.go b/lib/version/version.go index 78d91b5d6..cf82936fd 100644 --- a/lib/version/version.go +++ b/lib/version/version.go @@ -3,7 +3,7 @@ package version import "regexp" // Pre-built binaries will have version set correctly during build time. -var Version = "v0.6.7-HEAD" +var Version = "v0.7.0-HEAD" func OnlyNumbers() string { re, err := regexp.Compile("[0-9]+.[0-9]+.[0-9]+") diff --git a/make.sh b/make.sh index 6177fa6f2..9a3161556 100755 --- a/make.sh +++ b/make.sh @@ -14,8 +14,8 @@ if ! go version | grep -q '1.2[0-9]'; then exit 1 fi -if [ "${CI:-}" ]; then - export FORCE_COLOR=1 - npx playwright@1.31.1 install --with-deps chromium -fi +# if [ "${CI:-}" ]; then +# export FORCE_COLOR=1 +# npx playwright@1.31.1 install --with-deps chromium +# fi _make "$@" diff --git a/testdata/d2compiler/TestCompile/array-classes.exp.json b/testdata/d2compiler/TestCompile/array-classes.exp.json index 55f49e18a..52b0b85e9 100644 --- a/testdata/d2compiler/TestCompile/array-classes.exp.json +++ b/testdata/d2compiler/TestCompile/array-classes.exp.json @@ -616,6 +616,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -651,6 +652,7 @@ "value": "2" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -729,6 +731,7 @@ "value": "4" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" @@ -805,6 +808,7 @@ "value": "4" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" diff --git a/testdata/d2compiler/TestCompile/basic_icon.exp.json b/testdata/d2compiler/TestCompile/basic_icon.exp.json index c4e7552f6..8fb94fdb2 100644 --- a/testdata/d2compiler/TestCompile/basic_icon.exp.json +++ b/testdata/d2compiler/TestCompile/basic_icon.exp.json @@ -86,6 +86,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -146,6 +147,7 @@ "Fragment": "", "RawFragment": "" }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/basic_sequence.exp.json b/testdata/d2compiler/TestCompile/basic_sequence.exp.json index f5e4620d6..2c9eb6893 100644 --- a/testdata/d2compiler/TestCompile/basic_sequence.exp.json +++ b/testdata/d2compiler/TestCompile/basic_sequence.exp.json @@ -81,6 +81,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -128,6 +129,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "sequence_diagram" diff --git a/testdata/d2compiler/TestCompile/basic_shape.exp.json b/testdata/d2compiler/TestCompile/basic_shape.exp.json index ff306f1c4..af9cae10b 100644 --- a/testdata/d2compiler/TestCompile/basic_shape.exp.json +++ b/testdata/d2compiler/TestCompile/basic_shape.exp.json @@ -81,6 +81,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -128,6 +129,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" diff --git a/testdata/d2compiler/TestCompile/basic_style.exp.json b/testdata/d2compiler/TestCompile/basic_style.exp.json index 8a855ee99..4aae900f3 100644 --- a/testdata/d2compiler/TestCompile/basic_style.exp.json +++ b/testdata/d2compiler/TestCompile/basic_style.exp.json @@ -88,6 +88,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -139,6 +140,7 @@ "value": "0.4" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/class-shape-class.exp.json b/testdata/d2compiler/TestCompile/class-shape-class.exp.json index 049d4ed34..de4ffe4e5 100644 --- a/testdata/d2compiler/TestCompile/class-shape-class.exp.json +++ b/testdata/d2compiler/TestCompile/class-shape-class.exp.json @@ -205,6 +205,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -262,6 +263,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "class" diff --git a/testdata/d2compiler/TestCompile/class_paren.exp.json b/testdata/d2compiler/TestCompile/class_paren.exp.json index c6b641edc..74ebae55f 100644 --- a/testdata/d2compiler/TestCompile/class_paren.exp.json +++ b/testdata/d2compiler/TestCompile/class_paren.exp.json @@ -180,6 +180,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -248,6 +249,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "class" diff --git a/testdata/d2compiler/TestCompile/class_style.exp.json b/testdata/d2compiler/TestCompile/class_style.exp.json index f139da4f2..26181a699 100644 --- a/testdata/d2compiler/TestCompile/class_style.exp.json +++ b/testdata/d2compiler/TestCompile/class_style.exp.json @@ -154,6 +154,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -215,6 +216,7 @@ "value": "0.4" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "class" diff --git a/testdata/d2compiler/TestCompile/classes.exp.json b/testdata/d2compiler/TestCompile/classes.exp.json index ac50b12bd..c7db781a6 100644 --- a/testdata/d2compiler/TestCompile/classes.exp.json +++ b/testdata/d2compiler/TestCompile/classes.exp.json @@ -642,6 +642,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -677,6 +678,7 @@ "value": "4" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -751,6 +753,7 @@ "value": "orange" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" @@ -823,6 +826,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" @@ -875,6 +879,7 @@ "value": "orange" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" diff --git a/testdata/d2compiler/TestCompile/composite-glob-filter.exp.json b/testdata/d2compiler/TestCompile/composite-glob-filter.exp.json new file mode 100644 index 000000000..f7cc9c42a --- /dev/null +++ b/testdata/d2compiler/TestCompile/composite-glob-filter.exp.json @@ -0,0 +1,15 @@ +{ + "graph": null, + "err": { + "errs": [ + { + "range": "d2/testdata/d2compiler/TestCompile/composite-glob-filter.d2,2:2:8-2:16:22", + "errmsg": "d2/testdata/d2compiler/TestCompile/composite-glob-filter.d2:3:3: glob filters cannot be composites" + }, + { + "range": "d2/testdata/d2compiler/TestCompile/composite-glob-filter.d2,2:2:8-2:16:22", + "errmsg": "d2/testdata/d2compiler/TestCompile/composite-glob-filter.d2:3:3: glob filters cannot be composites" + } + ] + } +} diff --git a/testdata/d2compiler/TestCompile/default_direction.exp.json b/testdata/d2compiler/TestCompile/default_direction.exp.json index b412ef6b2..dba184e16 100644 --- a/testdata/d2compiler/TestCompile/default_direction.exp.json +++ b/testdata/d2compiler/TestCompile/default_direction.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/dimension_with_style.exp.json b/testdata/d2compiler/TestCompile/dimension_with_style.exp.json index 0f9d3dd6b..87237e968 100644 --- a/testdata/d2compiler/TestCompile/dimension_with_style.exp.json +++ b/testdata/d2compiler/TestCompile/dimension_with_style.exp.json @@ -116,6 +116,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -167,6 +168,7 @@ "value": "true" } }, + "iconStyle": {}, "width": { "value": "200" }, diff --git a/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json b/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json index 6072848cd..cb20c5cec 100644 --- a/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json +++ b/testdata/d2compiler/TestCompile/dimensions_on_containers.exp.json @@ -950,6 +950,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -997,6 +998,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1042,6 +1044,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "width": { "value": "512" }, @@ -1090,6 +1093,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "width": { "value": "128" }, @@ -1141,6 +1145,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "width": { "value": "512" }, @@ -1192,6 +1197,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "width": { "value": "128" }, @@ -1240,6 +1246,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "width": { "value": "512" }, @@ -1291,6 +1298,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "width": { "value": "128" }, @@ -1342,6 +1350,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "width": { "value": "512" }, @@ -1393,6 +1402,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "width": { "value": "128" }, diff --git a/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json b/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json index 2aad6eb2d..d0b29ebe0 100644 --- a/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json +++ b/testdata/d2compiler/TestCompile/dimensions_on_nonimage.exp.json @@ -144,6 +144,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -191,6 +192,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "width": { "value": "200" }, diff --git a/testdata/d2compiler/TestCompile/edge.exp.json b/testdata/d2compiler/TestCompile/edge.exp.json index 04daae90e..e2e993a37 100644 --- a/testdata/d2compiler/TestCompile/edge.exp.json +++ b/testdata/d2compiler/TestCompile/edge.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -96,6 +97,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -143,6 +145,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -188,6 +191,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json index 573bd41bb..adeb0fc84 100644 --- a/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json +++ b/testdata/d2compiler/TestCompile/edge_arrowhead_fields.exp.json @@ -244,6 +244,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -269,6 +270,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "diamond" @@ -292,6 +294,7 @@ "value": "true" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -315,6 +318,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -362,6 +366,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -407,6 +412,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json b/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json index 43dbe6934..8bfcb1efb 100644 --- a/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json +++ b/testdata/d2compiler/TestCompile/edge_arrowhead_primary.exp.json @@ -104,6 +104,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -129,6 +130,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -153,6 +155,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -200,6 +203,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -245,6 +249,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_chain.exp.json b/testdata/d2compiler/TestCompile/edge_chain.exp.json index fc3cb532e..8de3ef918 100644 --- a/testdata/d2compiler/TestCompile/edge_chain.exp.json +++ b/testdata/d2compiler/TestCompile/edge_chain.exp.json @@ -112,6 +112,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -143,6 +144,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -173,6 +175,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -220,6 +223,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -285,6 +289,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -330,6 +335,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json index 7b58cb7bd..f7c6e7676 100644 --- a/testdata/d2compiler/TestCompile/edge_chain_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_chain_map.exp.json @@ -141,6 +141,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -172,6 +173,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -202,6 +204,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -249,6 +252,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -314,6 +318,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -359,6 +364,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_column_index.exp.json b/testdata/d2compiler/TestCompile/edge_column_index.exp.json index a1f43e986..cc0b6dfc3 100644 --- a/testdata/d2compiler/TestCompile/edge_column_index.exp.json +++ b/testdata/d2compiler/TestCompile/edge_column_index.exp.json @@ -343,6 +343,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -376,6 +377,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -514,6 +516,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "sql_table" @@ -650,6 +653,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "sql_table" diff --git a/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json b/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json index a2e8b7dc6..c1adc882a 100644 --- a/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json +++ b/testdata/d2compiler/TestCompile/edge_exclusive_style.exp.json @@ -110,6 +110,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -145,6 +146,7 @@ "value": "true" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -192,6 +194,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -237,6 +240,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json index 50be77f89..f860a01ee 100644 --- a/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_flat_arrowhead.exp.json @@ -153,6 +153,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -178,6 +179,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "diamond" @@ -205,6 +207,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -272,6 +275,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -337,6 +341,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json index bccfb9129..3bfdedda5 100644 --- a/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_flat_label_arrowhead.exp.json @@ -121,6 +121,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -146,6 +147,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -170,6 +172,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -217,6 +220,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -262,6 +266,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_index.exp.json b/testdata/d2compiler/TestCompile/edge_index.exp.json index dec38ad77..d5e420691 100644 --- a/testdata/d2compiler/TestCompile/edge_index.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index.exp.json @@ -136,6 +136,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -170,6 +171,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -237,6 +239,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -302,6 +305,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_index_map.exp.json b/testdata/d2compiler/TestCompile/edge_index_map.exp.json index 14c91274e..e53b113a0 100644 --- a/testdata/d2compiler/TestCompile/edge_index_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_map.exp.json @@ -155,6 +155,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -189,6 +190,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -256,6 +258,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -321,6 +324,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json index 6ebba4d34..2d00c2aed 100644 --- a/testdata/d2compiler/TestCompile/edge_index_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_nested.exp.json @@ -165,6 +165,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -199,6 +200,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -246,6 +248,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -311,6 +314,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -376,6 +380,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" 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 084167741..ea1e11136 100644 --- a/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json +++ b/testdata/d2compiler/TestCompile/edge_index_nested_cross_scope.exp.json @@ -181,6 +181,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -215,6 +216,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -282,6 +284,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -347,6 +350,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -412,6 +416,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" 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 5a9afc37d..693e12b64 100644 --- a/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_key_group_flat_nested.exp.json @@ -194,6 +194,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -232,6 +233,7 @@ "value": "0.4" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -299,6 +301,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -364,6 +367,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -429,6 +433,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" 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 846333d45..e1ac538d5 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 @@ -200,6 +200,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -238,6 +239,7 @@ "value": "0.4" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -285,6 +287,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -330,6 +333,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -375,6 +379,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" 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 6ac0e489b..a2db7b1f3 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 @@ -213,6 +213,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -251,6 +252,7 @@ "value": "0.4" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -298,6 +300,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -343,6 +346,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -388,6 +392,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" 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 b3a8c19ed..6360c15e5 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 @@ -231,6 +231,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -269,6 +270,7 @@ "value": "0.4" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -316,6 +318,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -361,6 +364,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -406,6 +410,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_label_map.exp.json b/testdata/d2compiler/TestCompile/edge_label_map.exp.json index 04edc0e31..0b0132cb6 100644 --- a/testdata/d2compiler/TestCompile/edge_label_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_label_map.exp.json @@ -121,6 +121,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -156,6 +157,7 @@ "value": "0.5" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -203,6 +205,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -248,6 +251,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_map.exp.json b/testdata/d2compiler/TestCompile/edge_map.exp.json index 4e4652c77..2a8eeabe8 100644 --- a/testdata/d2compiler/TestCompile/edge_map.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map.exp.json @@ -104,6 +104,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -135,6 +136,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -182,6 +184,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -227,6 +230,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json index 9874c0c27..5a9545082 100644 --- a/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_arrowhead.exp.json @@ -133,6 +133,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -158,6 +159,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "diamond" @@ -182,6 +184,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -229,6 +232,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -274,6 +278,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json b/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json index 4821d0012..493260187 100644 --- a/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_group_flat.exp.json @@ -149,6 +149,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -187,6 +188,7 @@ "value": "0.4" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -254,6 +256,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -319,6 +322,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json b/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json index 1a0f715fa..6c50e60da 100644 --- a/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_group_semiflat.exp.json @@ -167,6 +167,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -205,6 +206,7 @@ "value": "0.4" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -272,6 +274,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -337,6 +340,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_map_nested.exp.json b/testdata/d2compiler/TestCompile/edge_map_nested.exp.json index ab4523fa7..4e9e325ed 100644 --- a/testdata/d2compiler/TestCompile/edge_map_nested.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_nested.exp.json @@ -129,6 +129,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -164,6 +165,7 @@ "value": "0.4" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -211,6 +213,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -256,6 +259,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json b/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json index 6e83a2f2e..68cd94414 100644 --- a/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json +++ b/testdata/d2compiler/TestCompile/edge_map_nested_flat.exp.json @@ -111,6 +111,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -146,6 +147,7 @@ "value": "0.4" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -193,6 +195,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -238,6 +241,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json index c00936b2d..4fd0fe368 100644 --- a/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_mixed_arrowhead.exp.json @@ -221,6 +221,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -246,6 +247,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "diamond" @@ -265,6 +267,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "diamond" @@ -291,6 +294,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -358,6 +362,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -423,6 +428,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json index 6f5721e7c..5a9553e36 100644 --- a/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_non_shape_arrowhead.exp.json @@ -115,6 +115,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -140,6 +141,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "triangle" @@ -164,6 +166,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -211,6 +214,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -256,6 +260,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json index 18c537b79..580fabe28 100644 --- a/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json +++ b/testdata/d2compiler/TestCompile/edge_semiflat_arrowhead.exp.json @@ -171,6 +171,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -196,6 +197,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "diamond" @@ -223,6 +225,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -290,6 +293,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -355,6 +359,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/escaped_id.exp.json b/testdata/d2compiler/TestCompile/escaped_id.exp.json index 796618579..edbc2ecda 100644 --- a/testdata/d2compiler/TestCompile/escaped_id.exp.json +++ b/testdata/d2compiler/TestCompile/escaped_id.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/fill-pattern.exp.json b/testdata/d2compiler/TestCompile/fill-pattern.exp.json index fcdeecfc7..55e3b7770 100644 --- a/testdata/d2compiler/TestCompile/fill-pattern.exp.json +++ b/testdata/d2compiler/TestCompile/fill-pattern.exp.json @@ -110,6 +110,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -161,6 +162,7 @@ "value": "dots" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/glob-connection-steps.exp.json b/testdata/d2compiler/TestCompile/glob-connection-steps.exp.json new file mode 100644 index 000000000..911d7f930 --- /dev/null +++ b/testdata/d2compiler/TestCompile/glob-connection-steps.exp.json @@ -0,0 +1,557 @@ +{ + "graph": { + "name": "", + "isFolderOnly": true, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/glob-connection-steps.d2,0:0:0-5:0:45", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-connection-steps.d2,0:0:0-0:21:21", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-connection-steps.d2,0:0:0-0:14:14", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-connection-steps.d2,0:0:0-0:1:1", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-connection-steps.d2,0:2:2-0:7:7", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-connection-steps.d2,0:8:8-0:14:14", + "value": [ + { + "string": "stroke", + "raw_string": "stroke" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-connection-steps.d2,0:16:16-0:21:21", + "value": [ + { + "string": "black", + "raw_string": "black" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-connection-steps.d2,2:0:23-4:1:44", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-connection-steps.d2,2:0:23-2:6:29", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-connection-steps.d2,2:0:23-2:6:29", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/glob-connection-steps.d2,2:8:31-4:1:44", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-connection-steps.d2,3:2:35-3:9:42", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-connection-steps.d2,3:2:35-3:4:37", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-connection-steps.d2,3:2:35-3:4:37", + "value": [ + { + "string": "ok", + "raw_string": "ok" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": ",1:0:0-1:0:0", + "nodes": [ + { + "import": { + "range": ",1:0:0-1:0:0", + "spread": true, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-connection-steps.d2,3:7:40-3:9:42", + "value": [ + { + "string": "ok", + "raw_string": "ok" + } + ] + } + } + ] + } + } + ] + }, + "import": { + "range": "d2/testdata/d2compiler/TestCompile/glob-connection-steps.d2,3:6:39-3:9:42", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-connection-steps.d2,3:7:40-3:9:42", + "value": [ + { + "string": "ok", + "raw_string": "ok" + } + ] + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": null, + "layers": [ + { + "name": "ok", + "isFolderOnly": true, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/glob-connection-steps.d2,0:0:0-1:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/ok.d2,1:0:1-1:5:6", + "value": [ + { + "string": "steps", + "raw_string": "steps" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": ",1:0:0-2:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/ok.d2,2:2:12-2:3:13", + "value": [ + { + "string": "1", + "raw_string": "1" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/ok.d2,1:0:0-2:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/ok.d2,3:4:21-3:9:26", + "value": [ + { + "string": "step1", + "raw_string": "step1" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": ",1:0:0-2:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-connection-steps.d2,0:2:2-0:7:7", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": ",1:0:0-2:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-connection-steps.d2,0:8:8-0:14:14", + "value": [ + { + "string": "stroke", + "raw_string": "stroke" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-connection-steps.d2,0:16:16-0:21:21", + "value": [ + { + "string": "black", + "raw_string": "black" + } + ] + } + }, + "value": {} + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": null, + "steps": [ + { + "name": "1", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/ok.d2,0:0:0-1:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/ok.d2,3:4:21-3:9:26", + "value": [ + { + "string": "step1", + "raw_string": "step1" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": ",1:0:0-2:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-connection-steps.d2,0:2:2-0:7:7", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": ",1:0:0-2:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-connection-steps.d2,0:8:8-0:14:14", + "value": [ + { + "string": "stroke", + "raw_string": "stroke" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-connection-steps.d2,0:16:16-0:21:21", + "value": [ + { + "string": "black", + "raw_string": "black" + } + ] + } + }, + "value": {} + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "step1", + "id_val": "step1", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/ok.d2,3:4:21-3:9:26", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/ok.d2,3:4:21-3:9:26", + "value": [ + { + "string": "step1", + "raw_string": "step1" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "step1" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "stroke": { + "value": "black" + } + }, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + } + ] + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile/glob-spread-vars.exp.json b/testdata/d2compiler/TestCompile/glob-spread-vars.exp.json new file mode 100644 index 000000000..183600210 --- /dev/null +++ b/testdata/d2compiler/TestCompile/glob-spread-vars.exp.json @@ -0,0 +1,319 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars.d2,0:0:0-10:0:65", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars.d2,0:0:0-4:1:26", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars.d2,0:0:0-0:4:4", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars.d2,0:0:0-0:4:4", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars.d2,0:6:6-4:1:26", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars.d2,1:2:10-3:3:24", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars.d2,1:2:10-1:3:11", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars.d2,1:2:10-1:3:11", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars.d2,1:5:13-3:3:24", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars.d2,2:4:19-2:5:20", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars.d2,2:4:19-2:5:20", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars.d2,2:4:19-2:5:20", + "value": [ + { + "string": "1", + "raw_string": "1" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars.d2,6:0:28-9:1:64", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars.d2,6:0:28-6:1:29", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars.d2,6:0:28-6:1:29", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars.d2,6:3:31-9:1:64", + "nodes": [ + { + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars.d2,7:2:35-7:9:42", + "spread": true, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars.d2,7:7:40-7:8:41", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars.d2,8:2:45-8:19:62", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars.d2,8:2:45-8:14:57", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars.d2,8:2:45-8:3:46", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars.d2,8:4:47-8:9:52", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars.d2,8:10:53-8:14:57", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars.d2,8:16:59-8:19:62", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "a", + "id_val": "a", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars.d2,6:0:28-6:1:29", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars.d2,6:0:28-6:1:29", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "a" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "1", + "id_val": "1", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars.d2,2:4:19-2:5:20", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars.d2,2:4:19-2:5:20", + "value": [ + { + "string": "1", + "raw_string": "1" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "1" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "fill": { + "value": "red" + } + }, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile/glob-spread-vars/1.exp.json b/testdata/d2compiler/TestCompile/glob-spread-vars/1.exp.json new file mode 100644 index 000000000..11f146c70 --- /dev/null +++ b/testdata/d2compiler/TestCompile/glob-spread-vars/1.exp.json @@ -0,0 +1,322 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/1.d2,0:0:0-10:0:65", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/1.d2,0:0:0-4:1:26", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/1.d2,0:0:0-0:4:4", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/1.d2,0:0:0-0:4:4", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/1.d2,0:6:6-4:1:26", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/1.d2,1:2:10-3:3:24", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/1.d2,1:2:10-1:3:11", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/1.d2,1:2:10-1:3:11", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/1.d2,1:5:13-3:3:24", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/1.d2,2:4:19-2:5:20", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/1.d2,2:4:19-2:5:20", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/1.d2,2:4:19-2:5:20", + "value": [ + { + "string": "1", + "raw_string": "1" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/1.d2,6:0:28-9:1:64", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/1.d2,6:0:28-6:1:29", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/1.d2,6:0:28-6:1:29", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/1.d2,6:3:31-9:1:64", + "nodes": [ + { + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/1.d2,7:2:35-7:9:42", + "spread": true, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/1.d2,7:7:40-7:8:41", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/1.d2,8:2:45-8:19:62", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/1.d2,8:2:45-8:14:57", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/1.d2,8:2:45-8:3:46", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/1.d2,8:4:47-8:9:52", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/1.d2,8:10:53-8:14:57", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/1.d2,8:16:59-8:19:62", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "a", + "id_val": "a", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/1.d2,6:0:28-6:1:29", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/1.d2,6:0:28-6:1:29", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "a" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "1", + "id_val": "1", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/1.d2,2:4:19-2:5:20", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/1.d2,2:4:19-2:5:20", + "value": [ + { + "string": "1", + "raw_string": "1" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "1" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "fill": { + "value": "red" + } + }, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile/glob-spread-vars/2.exp.json b/testdata/d2compiler/TestCompile/glob-spread-vars/2.exp.json new file mode 100644 index 000000000..7dc035581 --- /dev/null +++ b/testdata/d2compiler/TestCompile/glob-spread-vars/2.exp.json @@ -0,0 +1,585 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/2.d2,0:0:0-13:0:66", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/2.d2,0:0:0-5:1:30", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/2.d2,0:0:0-0:4:4", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/2.d2,0:0:0-0:4:4", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/2.d2,0:6:6-5:1:30", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/2.d2,1:2:10-4:3:28", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/2.d2,1:2:10-1:3:11", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/2.d2,1:2:10-1:3:11", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/2.d2,1:5:13-4:3:28", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/2.d2,2:4:19-2:5:20", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/2.d2,2:4:19-2:5:20", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/2.d2,2:4:19-2:5:20", + "value": [ + { + "string": "1", + "raw_string": "1" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/2.d2,3:2:23-3:3:24", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/2.d2,3:2:23-3:3:24", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/2.d2,3:2:23-3:3:24", + "value": [ + { + "string": "2", + "raw_string": "2" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/2.d2,7:0:32-10:1:61", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/2.d2,7:0:32-7:1:33", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/2.d2,7:0:32-7:1:33", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/2.d2,7:3:35-10:1:61", + "nodes": [ + { + "substitution": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/2.d2,8:2:39-8:9:46", + "spread": true, + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/2.d2,8:7:44-8:8:45", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/2.d2,9:2:49-9:12:59", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/2.d2,9:2:49-9:12:59", + "src": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/2.d2,9:2:49-9:4:51", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/2.d2,9:2:49-9:4:51", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/2.d2,9:8:55-9:12:59", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/2.d2,9:8:55-9:9:56", + "value": [ + { + "string": "_", + "raw_string": "_" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/2.d2,9:10:57-9:12:59", + "value": [ + { + "string": "ok", + "raw_string": "ok" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/2.d2,12:0:63-12:2:65", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/2.d2,12:0:63-12:2:65", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/2.d2,12:0:63-12:2:65", + "value": [ + { + "string": "ok", + "raw_string": "ok" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": [ + { + "index": 0, + "isCurve": false, + "src_arrow": false, + "dst_arrow": true, + "references": [ + { + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "index": 0, + "isCurve": false, + "src_arrow": false, + "dst_arrow": true, + "references": [ + { + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ], + "objects": [ + { + "id": "a", + "id_val": "a", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/2.d2,7:0:32-7:1:33", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/2.d2,7:0:32-7:1:33", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "a" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "1", + "id_val": "1", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/2.d2,2:4:19-2:5:20", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/2.d2,2:4:19-2:5:20", + "value": [ + { + "string": "1", + "raw_string": "1" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "1" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "2", + "id_val": "2", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/2.d2,3:2:23-3:3:24", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/2.d2,3:2:23-3:3:24", + "value": [ + { + "string": "2", + "raw_string": "2" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "2" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "ok", + "id_val": "ok", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/2.d2,9:8:55-9:12:59", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/2.d2,9:8:55-9:9:56", + "value": [ + { + "string": "_", + "raw_string": "_" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/2.d2,9:10:57-9:12:59", + "value": [ + { + "string": "ok", + "raw_string": "ok" + } + ] + } + } + ] + }, + "key_path_index": 1, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/2.d2,12:0:63-12:2:65", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/2.d2,12:0:63-12:2:65", + "value": [ + { + "string": "ok", + "raw_string": "ok" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/2.d2,9:8:55-9:12:59", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/2.d2,9:8:55-9:9:56", + "value": [ + { + "string": "_", + "raw_string": "_" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/glob-spread-vars/2.d2,9:10:57-9:12:59", + "value": [ + { + "string": "ok", + "raw_string": "ok" + } + ] + } + } + ] + }, + "key_path_index": 1, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "ok" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile/grid.exp.json b/testdata/d2compiler/TestCompile/grid.exp.json index 2b2c4b674..dcbafbdfb 100644 --- a/testdata/d2compiler/TestCompile/grid.exp.json +++ b/testdata/d2compiler/TestCompile/grid.exp.json @@ -106,6 +106,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -153,6 +154,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/grid_nested.exp.json b/testdata/d2compiler/TestCompile/grid_nested.exp.json index c424ef3df..8fa215458 100644 --- a/testdata/d2compiler/TestCompile/grid_nested.exp.json +++ b/testdata/d2compiler/TestCompile/grid_nested.exp.json @@ -342,6 +342,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -389,6 +390,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -440,6 +442,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -485,6 +488,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -530,6 +534,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -586,6 +591,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -642,6 +648,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -687,6 +694,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -738,6 +746,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -783,6 +792,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/icon-near-composite-together.exp.json b/testdata/d2compiler/TestCompile/icon-near-composite-together.exp.json index 1d0b6974e..0aff685f7 100644 --- a/testdata/d2compiler/TestCompile/icon-near-composite-together.exp.json +++ b/testdata/d2compiler/TestCompile/icon-near-composite-together.exp.json @@ -120,6 +120,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -180,6 +181,7 @@ "Fragment": "", "RawFragment": "" }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/image_children_Steps.exp.json b/testdata/d2compiler/TestCompile/image_children_Steps.exp.json index b9b6f483f..647584533 100644 --- a/testdata/d2compiler/TestCompile/image_children_Steps.exp.json +++ b/testdata/d2compiler/TestCompile/image_children_Steps.exp.json @@ -4,7 +4,7 @@ "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/image_children_Steps.d2,3:2:115-3:7:120", - "errmsg": "d2/testdata/d2compiler/TestCompile/image_children_Steps.d2:4:3: steps is only allowed at a board root" + "errmsg": "d2/testdata/d2compiler/TestCompile/image_children_Steps.d2:4:3: steps must be declared at a board root scope" } ] } diff --git a/testdata/d2compiler/TestCompile/image_style.exp.json b/testdata/d2compiler/TestCompile/image_style.exp.json index 0f22863e9..026db1ff4 100644 --- a/testdata/d2compiler/TestCompile/image_style.exp.json +++ b/testdata/d2compiler/TestCompile/image_style.exp.json @@ -163,6 +163,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -227,6 +228,7 @@ "Fragment": "", "RawFragment": "" }, + "iconStyle": {}, "near_key": null, "shape": { "value": "image" diff --git a/testdata/d2compiler/TestCompile/import-classes-boards.exp.json b/testdata/d2compiler/TestCompile/import-classes-boards.exp.json new file mode 100644 index 000000000..50d98e426 --- /dev/null +++ b/testdata/d2compiler/TestCompile/import-classes-boards.exp.json @@ -0,0 +1,11 @@ +{ + "graph": null, + "err": { + "errs": [ + { + "range": "d2/testdata/d2compiler/TestCompile/import-classes-boards.d2,9:6:75-9:12:81", + "errmsg": "d2/testdata/d2compiler/TestCompile/import-classes-boards.d2:10:7: layers must be declared at a board root scope" + } + ] + } +} diff --git a/testdata/d2compiler/TestCompile/import-connections.exp.json b/testdata/d2compiler/TestCompile/import-connections.exp.json new file mode 100644 index 000000000..69643e832 --- /dev/null +++ b/testdata/d2compiler/TestCompile/import-connections.exp.json @@ -0,0 +1,596 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/import-connections.d2,0:0:0-3:0:20", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/import-connections.d2,0:0:0-0:10:10", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile/import-connections.d2,0:0:0-0:10:10", + "src": { + "range": "d2/testdata/d2compiler/TestCompile/import-connections.d2,0:0:0-0:3:3", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-connections.d2,0:0:0-0:1:1", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-connections.d2,0:2:2-0:3:3", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile/import-connections.d2,0:7:7-0:10:10", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-connections.d2,0:7:7-0:8:8", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-connections.d2,0:9:9-0:10:10", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/import-connections.d2,2:0:12-2:7:19", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/import-connections.d2,2:0:12-2:1:13", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-connections.d2,2:0:12-2:1:13", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "d2/testdata/d2compiler/TestCompile/import-connections.d2,2:3:15-2:7:19", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-connections.d2,2:4:16-2:7:19", + "value": [ + { + "string": "imp", + "raw_string": "imp" + } + ] + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": [ + { + "index": 0, + "isCurve": false, + "src_arrow": false, + "dst_arrow": true, + "references": [ + { + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "index": 0, + "isCurve": false, + "src_arrow": false, + "dst_arrow": true, + "references": [ + { + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ], + "objects": [ + { + "id": "b", + "id_val": "b", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/import-connections.d2,0:0:0-0:3:3", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-connections.d2,0:0:0-0:1:1", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-connections.d2,0:2:2-0:3:3", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/import-connections.d2,0:7:7-0:10:10", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-connections.d2,0:7:7-0:8:8", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-connections.d2,0:9:9-0:10:10", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/import-connections.d2,2:0:12-2:1:13", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-connections.d2,2:0:12-2:1:13", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/import-connections.d2,0:0:0-0:3:3", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-connections.d2,0:0:0-0:1:1", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-connections.d2,0:2:2-0:3:3", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/import-connections.d2,0:7:7-0:10:10", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-connections.d2,0:7:7-0:8:8", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-connections.d2,0:9:9-0:10:10", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/import-connections.d2,2:0:12-2:1:13", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-connections.d2,2:0:12-2:1:13", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "b" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "c", + "id_val": "c", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/imp.d2,1:0:1-1:1:2", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/imp.d2,1:0:1-1:1:2", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/imp.d2,3:5:10-3:6:11", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/imp.d2,3:5:10-3:6:11", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/import-connections.d2,0:0:0-0:3:3", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-connections.d2,0:0:0-0:1:1", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-connections.d2,0:2:2-0:3:3", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "key_path_index": 1, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "c" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "d", + "id_val": "d", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/imp.d2,2:0:3-2:1:4", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/imp.d2,2:0:3-2:1:4", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/imp.d2,3:0:5-3:1:6", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/imp.d2,3:0:5-3:1:6", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/import-connections.d2,0:7:7-0:10:10", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-connections.d2,0:7:7-0:8:8", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-connections.d2,0:9:9-0:10:10", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "key_path_index": 1, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "d" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile/import-icon-near.exp.json b/testdata/d2compiler/TestCompile/import-icon-near.exp.json index ae9301419..ec3c4453b 100644 --- a/testdata/d2compiler/TestCompile/import-icon-near.exp.json +++ b/testdata/d2compiler/TestCompile/import-icon-near.exp.json @@ -61,6 +61,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -78,6 +79,26 @@ "id": "y", "id_val": "y", "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/import-icon-near.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-icon-near.d2,0:0:0-0:1:1", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, { "key": { "range": "d2/testdata/d2compiler/TestCompile/import-icon-near.d2,0:0:0-0:1:1", @@ -108,6 +129,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -153,6 +175,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/import-link-layer-1.exp.json b/testdata/d2compiler/TestCompile/import-link-layer-1.exp.json index 193b606ee..08b4460d8 100644 --- a/testdata/d2compiler/TestCompile/import-link-layer-1.exp.json +++ b/testdata/d2compiler/TestCompile/import-link-layer-1.exp.json @@ -172,6 +172,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -219,6 +220,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -236,7 +238,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/import-link-layer-1.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -246,10 +248,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/y.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -259,7 +262,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -269,10 +272,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/y.d2,0:2:2-0:6:6", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -311,6 +315,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -369,6 +374,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.z" }, @@ -389,7 +395,7 @@ "name": "z", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/import-link-layer-1.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -399,10 +405,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/import-link-layer-1.d2,4:7:33-4:9:35", "value": [ { - "string": "hi" + "string": "hi", + "raw_string": "hi" } ] } @@ -427,6 +434,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -474,6 +482,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/import-link-layer-2.exp.json b/testdata/d2compiler/TestCompile/import-link-layer-2.exp.json index ea5a73210..a778eaf3f 100644 --- a/testdata/d2compiler/TestCompile/import-link-layer-2.exp.json +++ b/testdata/d2compiler/TestCompile/import-link-layer-2.exp.json @@ -120,6 +120,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -178,6 +179,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.z" }, @@ -198,7 +200,7 @@ "name": "z", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/import-link-layer-2.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -208,10 +210,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/import-link-layer-2.d2,3:7:24-3:9:26", "value": [ { - "string": "hi" + "string": "hi", + "raw_string": "hi" } ] } @@ -236,6 +239,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -283,6 +287,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/import-link-layer-3.exp.json b/testdata/d2compiler/TestCompile/import-link-layer-3.exp.json index 54f6603f1..cb5992bc8 100644 --- a/testdata/d2compiler/TestCompile/import-link-layer-3.exp.json +++ b/testdata/d2compiler/TestCompile/import-link-layer-3.exp.json @@ -172,6 +172,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -219,6 +220,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -236,7 +238,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/import-link-layer-3.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -246,10 +248,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/y.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -268,10 +271,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/y.d2,1:0:2-1:6:8", "value": [ { - "string": "layers" + "string": "layers", + "raw_string": "layers" } ] } @@ -281,7 +285,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -291,10 +295,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/y.d2,2:2:14-2:5:17", "value": [ { - "string": "lol" + "string": "lol", + "raw_string": "lol" } ] } @@ -304,7 +309,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/y.d2,1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -314,10 +319,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/y.d2,3:4:25-3:8:29", "value": [ { - "string": "asdf" + "string": "asdf", + "raw_string": "asdf" } ] } @@ -327,7 +333,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -337,10 +343,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/y.d2,3:9:30-3:13:34", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -389,6 +396,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -436,6 +444,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -453,7 +462,7 @@ "name": "lol", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/y.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -463,10 +472,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/y.d2,3:4:25-3:8:29", "value": [ { - "string": "asdf" + "string": "asdf", + "raw_string": "asdf" } ] } @@ -476,7 +486,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -486,10 +496,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/y.d2,3:9:30-3:13:34", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -528,6 +539,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -586,6 +598,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.z" }, @@ -608,7 +621,7 @@ "name": "z", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/import-link-layer-3.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -618,10 +631,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/import-link-layer-3.d2,4:7:33-4:9:35", "value": [ { - "string": "hi" + "string": "hi", + "raw_string": "hi" } ] } @@ -646,6 +660,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -693,6 +708,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/import-link-layer-4.exp.json b/testdata/d2compiler/TestCompile/import-link-layer-4.exp.json index 8192eec65..b4c38c37b 100644 --- a/testdata/d2compiler/TestCompile/import-link-layer-4.exp.json +++ b/testdata/d2compiler/TestCompile/import-link-layer-4.exp.json @@ -190,6 +190,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -237,6 +238,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -254,7 +256,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/import-link-layer-4.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -264,10 +266,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/y.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -286,10 +289,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/y.d2,1:0:2-1:6:8", "value": [ { - "string": "layers" + "string": "layers", + "raw_string": "layers" } ] } @@ -299,7 +303,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -309,10 +313,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/y.d2,2:2:14-2:5:17", "value": [ { - "string": "lol" + "string": "lol", + "raw_string": "lol" } ] } @@ -322,7 +327,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/y.d2,1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -332,10 +337,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/y.d2,3:4:25-3:8:29", "value": [ { - "string": "asdf" + "string": "asdf", + "raw_string": "asdf" } ] } @@ -345,7 +351,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -355,10 +361,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/y.d2,3:9:30-3:13:34", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -396,10 +403,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/y.d2,5:1:52-5:2:53", "value": [ { - "string": "z" + "string": "z", + "raw_string": "z" } ] } @@ -409,7 +417,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/y.d2,1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -419,10 +427,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/y.d2,5:6:57-5:9:60", "value": [ { - "string": "fjf" + "string": "fjf", + "raw_string": "fjf" } ] } @@ -457,6 +466,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -504,6 +514,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -521,7 +532,7 @@ "name": "lol", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/y.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -531,10 +542,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/y.d2,3:4:25-3:8:29", "value": [ { - "string": "asdf" + "string": "asdf", + "raw_string": "asdf" } ] } @@ -544,7 +556,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -554,10 +566,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/y.d2,3:9:30-3:13:34", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -596,6 +609,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -654,6 +668,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.x.layers.z" }, @@ -674,7 +689,7 @@ "name": "z", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/y.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -684,10 +699,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/y.d2,5:6:57-5:9:60", "value": [ { - "string": "fjf" + "string": "fjf", + "raw_string": "fjf" } ] } @@ -712,6 +728,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -759,6 +776,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -778,7 +796,7 @@ "name": "z", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/import-link-layer-4.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -788,10 +806,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/import-link-layer-4.d2,4:7:28-4:9:30", "value": [ { - "string": "hi" + "string": "hi", + "raw_string": "hi" } ] } @@ -816,6 +835,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -863,6 +883,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/import-link-underscore-1.exp.json b/testdata/d2compiler/TestCompile/import-link-underscore-1.exp.json index 5feb61b1a..87649968b 100644 --- a/testdata/d2compiler/TestCompile/import-link-underscore-1.exp.json +++ b/testdata/d2compiler/TestCompile/import-link-underscore-1.exp.json @@ -120,6 +120,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -167,6 +168,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -184,7 +186,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/import-link-underscore-1.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -194,10 +196,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -216,10 +219,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,1:0:2-1:6:8", "value": [ { - "string": "layers" + "string": "layers", + "raw_string": "layers" } ] } @@ -229,7 +233,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -239,10 +243,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,2:2:14-2:3:15", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -252,7 +257,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -262,10 +267,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,3:4:23-3:5:24", "value": [ { - "string": "d" + "string": "d", + "raw_string": "d" } ] } @@ -275,7 +281,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -285,10 +291,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,3:6:25-3:10:29", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -321,10 +328,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,4:2:35-4:3:36", "value": [ { - "string": "s" + "string": "s", + "raw_string": "s" } ] } @@ -334,7 +342,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -344,10 +352,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,4:4:37-4:8:41", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -380,10 +389,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,6:4:59-6:10:65", "value": [ { - "string": "layers" + "string": "layers", + "raw_string": "layers" } ] } @@ -393,7 +403,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -403,10 +413,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,7:6:75-7:7:76", "value": [ { - "string": "c" + "string": "c", + "raw_string": "c" } ] } @@ -416,7 +427,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -426,10 +437,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,8:8:88-8:9:89", "value": [ { - "string": "c" + "string": "c", + "raw_string": "c" } ] } @@ -439,7 +451,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -449,10 +461,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,8:10:90-8:14:94", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -485,10 +498,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,9:4:102-9:5:103", "value": [ { - "string": "z" + "string": "z", + "raw_string": "z" } ] } @@ -498,7 +512,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -508,10 +522,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,9:6:104-9:10:108", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -544,10 +559,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,10:4:118-10:5:119", "value": [ { - "string": "f" + "string": "f", + "raw_string": "f" } ] } @@ -557,7 +573,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -567,10 +583,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,10:6:120-10:10:124", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -618,10 +635,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,14:2:159-14:3:160", "value": [ { - "string": "k" + "string": "k", + "raw_string": "k" } ] } @@ -631,7 +649,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -641,10 +659,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,15:4:168-15:5:169", "value": [ { - "string": "k" + "string": "k", + "raw_string": "k" } ] } @@ -679,6 +698,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -726,6 +746,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -743,7 +764,7 @@ "name": "b", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -753,10 +774,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,3:4:23-3:5:24", "value": [ { - "string": "d" + "string": "d", + "raw_string": "d" } ] } @@ -766,7 +788,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -776,10 +798,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,3:6:25-3:10:29", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -812,10 +835,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,4:2:35-4:3:36", "value": [ { - "string": "s" + "string": "s", + "raw_string": "s" } ] } @@ -825,7 +849,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -835,10 +859,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,4:4:37-4:8:41", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -871,10 +896,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,6:4:59-6:10:65", "value": [ { - "string": "layers" + "string": "layers", + "raw_string": "layers" } ] } @@ -884,7 +910,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -894,10 +920,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,7:6:75-7:7:76", "value": [ { - "string": "c" + "string": "c", + "raw_string": "c" } ] } @@ -907,7 +934,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -917,10 +944,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,8:8:88-8:9:89", "value": [ { - "string": "c" + "string": "c", + "raw_string": "c" } ] } @@ -930,7 +958,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -940,10 +968,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,8:10:90-8:14:94", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -976,10 +1005,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,9:4:102-9:5:103", "value": [ { - "string": "z" + "string": "z", + "raw_string": "z" } ] } @@ -989,7 +1019,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -999,10 +1029,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,9:6:104-9:10:108", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -1035,10 +1066,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,10:4:118-10:5:119", "value": [ { - "string": "f" + "string": "f", + "raw_string": "f" } ] } @@ -1048,7 +1080,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -1058,10 +1090,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,10:6:120-10:10:124", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -1110,6 +1143,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -1168,6 +1202,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.x" }, @@ -1227,6 +1262,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.x.layers.k" }, @@ -1247,7 +1283,7 @@ "name": "c", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -1257,10 +1293,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,8:8:88-8:9:89", "value": [ { - "string": "c" + "string": "c", + "raw_string": "c" } ] } @@ -1270,7 +1307,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -1280,10 +1317,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,8:10:90-8:14:94", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -1316,10 +1354,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,9:4:102-9:5:103", "value": [ { - "string": "z" + "string": "z", + "raw_string": "z" } ] } @@ -1329,7 +1368,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -1339,10 +1378,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,9:6:104-9:10:108", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -1375,10 +1415,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,10:4:118-10:5:119", "value": [ { - "string": "f" + "string": "f", + "raw_string": "f" } ] } @@ -1388,7 +1429,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -1398,10 +1439,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,10:6:120-10:10:124", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -1440,6 +1482,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -1498,6 +1541,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.x.layers.b" }, @@ -1557,6 +1601,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.x" }, @@ -1616,6 +1661,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.x.layers.b" }, @@ -1638,7 +1684,7 @@ "name": "k", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -1648,10 +1694,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,15:4:168-15:5:169", "value": [ { - "string": "k" + "string": "k", + "raw_string": "k" } ] } @@ -1676,6 +1723,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -1723,6 +1771,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/import-link-underscore-2.exp.json b/testdata/d2compiler/TestCompile/import-link-underscore-2.exp.json index ee11e5deb..fcba32681 100644 --- a/testdata/d2compiler/TestCompile/import-link-underscore-2.exp.json +++ b/testdata/d2compiler/TestCompile/import-link-underscore-2.exp.json @@ -138,6 +138,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -185,6 +186,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -202,7 +204,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/import-link-underscore-2.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -212,10 +214,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -234,10 +237,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,1:0:2-1:6:8", "value": [ { - "string": "layers" + "string": "layers", + "raw_string": "layers" } ] } @@ -247,7 +251,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -257,10 +261,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,2:2:14-2:3:15", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -270,7 +275,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -280,10 +285,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,3:4:23-3:5:24", "value": [ { - "string": "d" + "string": "d", + "raw_string": "d" } ] } @@ -293,7 +299,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -303,10 +309,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,3:6:25-3:10:29", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -339,10 +346,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,4:2:35-4:3:36", "value": [ { - "string": "s" + "string": "s", + "raw_string": "s" } ] } @@ -352,7 +360,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -362,10 +370,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,4:4:37-4:8:41", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -398,10 +407,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,6:4:59-6:10:65", "value": [ { - "string": "layers" + "string": "layers", + "raw_string": "layers" } ] } @@ -411,7 +421,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -421,10 +431,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,7:6:75-7:7:76", "value": [ { - "string": "c" + "string": "c", + "raw_string": "c" } ] } @@ -434,7 +445,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -444,10 +455,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,8:8:88-8:9:89", "value": [ { - "string": "c" + "string": "c", + "raw_string": "c" } ] } @@ -457,7 +469,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -467,10 +479,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,8:10:90-8:14:94", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -503,10 +516,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,9:4:102-9:5:103", "value": [ { - "string": "z" + "string": "z", + "raw_string": "z" } ] } @@ -516,7 +530,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -526,10 +540,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,9:6:104-9:10:108", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -562,10 +577,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,10:4:118-10:5:119", "value": [ { - "string": "f" + "string": "f", + "raw_string": "f" } ] } @@ -575,7 +591,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -585,10 +601,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,10:6:120-10:10:124", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -636,10 +653,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,14:2:159-14:3:160", "value": [ { - "string": "k" + "string": "k", + "raw_string": "k" } ] } @@ -649,7 +667,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -659,10 +677,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,15:4:168-15:5:169", "value": [ { - "string": "k" + "string": "k", + "raw_string": "k" } ] } @@ -697,6 +716,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -744,6 +764,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -761,7 +782,7 @@ "name": "b", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -771,10 +792,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,3:4:23-3:5:24", "value": [ { - "string": "d" + "string": "d", + "raw_string": "d" } ] } @@ -784,7 +806,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -794,10 +816,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,3:6:25-3:10:29", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -830,10 +853,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,4:2:35-4:3:36", "value": [ { - "string": "s" + "string": "s", + "raw_string": "s" } ] } @@ -843,7 +867,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -853,10 +877,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,4:4:37-4:8:41", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -889,10 +914,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,6:4:59-6:10:65", "value": [ { - "string": "layers" + "string": "layers", + "raw_string": "layers" } ] } @@ -902,7 +928,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -912,10 +938,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,7:6:75-7:7:76", "value": [ { - "string": "c" + "string": "c", + "raw_string": "c" } ] } @@ -925,7 +952,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -935,10 +962,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,8:8:88-8:9:89", "value": [ { - "string": "c" + "string": "c", + "raw_string": "c" } ] } @@ -948,7 +976,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -958,10 +986,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,8:10:90-8:14:94", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -994,10 +1023,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,9:4:102-9:5:103", "value": [ { - "string": "z" + "string": "z", + "raw_string": "z" } ] } @@ -1007,7 +1037,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -1017,10 +1047,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,9:6:104-9:10:108", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -1053,10 +1084,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,10:4:118-10:5:119", "value": [ { - "string": "f" + "string": "f", + "raw_string": "f" } ] } @@ -1066,7 +1098,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -1076,10 +1108,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,10:6:120-10:10:124", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -1128,6 +1161,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -1186,6 +1220,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.x" }, @@ -1245,6 +1280,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.x.layers.k" }, @@ -1265,7 +1301,7 @@ "name": "c", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -1275,10 +1311,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,8:8:88-8:9:89", "value": [ { - "string": "c" + "string": "c", + "raw_string": "c" } ] } @@ -1288,7 +1325,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -1298,10 +1335,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,8:10:90-8:14:94", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -1334,10 +1372,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,9:4:102-9:5:103", "value": [ { - "string": "z" + "string": "z", + "raw_string": "z" } ] } @@ -1347,7 +1386,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -1357,10 +1396,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,9:6:104-9:10:108", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -1393,10 +1433,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,10:4:118-10:5:119", "value": [ { - "string": "f" + "string": "f", + "raw_string": "f" } ] } @@ -1406,7 +1447,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -1416,10 +1457,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,10:6:120-10:10:124", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -1458,6 +1500,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -1516,6 +1559,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.x.layers.b" }, @@ -1575,6 +1619,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.x" }, @@ -1634,6 +1679,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.x.layers.b" }, @@ -1656,7 +1702,7 @@ "name": "k", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -1666,10 +1712,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,15:4:168-15:5:169", "value": [ { - "string": "k" + "string": "k", + "raw_string": "k" } ] } @@ -1694,6 +1741,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -1741,6 +1789,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/import-link-underscore-3.exp.json b/testdata/d2compiler/TestCompile/import-link-underscore-3.exp.json index 2c1e2f072..48a99d619 100644 --- a/testdata/d2compiler/TestCompile/import-link-underscore-3.exp.json +++ b/testdata/d2compiler/TestCompile/import-link-underscore-3.exp.json @@ -190,6 +190,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -237,6 +238,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -254,7 +256,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/import-link-underscore-3.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -264,10 +266,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -286,10 +289,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,1:0:2-1:6:8", "value": [ { - "string": "layers" + "string": "layers", + "raw_string": "layers" } ] } @@ -299,7 +303,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -309,10 +313,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,2:2:14-2:3:15", "value": [ { - "string": "y" + "string": "y", + "raw_string": "y" } ] } @@ -322,7 +327,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -332,10 +337,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/y.d2,0:0:0-0:1:1", "value": [ { - "string": "o" + "string": "o", + "raw_string": "o" } ] } @@ -345,7 +351,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -355,10 +361,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/y.d2,0:2:2-0:6:6", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -407,6 +414,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -454,6 +462,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -471,7 +480,7 @@ "name": "y", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -481,10 +490,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/y.d2,0:0:0-0:1:1", "value": [ { - "string": "o" + "string": "o", + "raw_string": "o" } ] } @@ -494,7 +504,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -504,10 +514,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/y.d2,0:2:2-0:6:6", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -546,6 +557,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -604,6 +616,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.b" }, @@ -626,7 +639,7 @@ "name": "b", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/import-link-underscore-3.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -636,10 +649,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/import-link-underscore-3.d2,5:4:31-5:5:32", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -664,6 +678,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -711,6 +726,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/import-nested-layers.exp.json b/testdata/d2compiler/TestCompile/import-nested-layers.exp.json index af4dd552c..5fe4c1837 100644 --- a/testdata/d2compiler/TestCompile/import-nested-layers.exp.json +++ b/testdata/d2compiler/TestCompile/import-nested-layers.exp.json @@ -120,6 +120,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -167,6 +168,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -184,7 +186,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/import-nested-layers.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -194,10 +196,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -216,10 +219,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,1:0:2-1:6:8", "value": [ { - "string": "layers" + "string": "layers", + "raw_string": "layers" } ] } @@ -229,7 +233,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -239,10 +243,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,2:2:14-2:3:15", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -252,7 +257,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -262,10 +267,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,3:2:21-3:3:22", "value": [ { - "string": "d" + "string": "d", + "raw_string": "d" } ] } @@ -284,10 +290,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,5:2:26-5:8:32", "value": [ { - "string": "layers" + "string": "layers", + "raw_string": "layers" } ] } @@ -297,7 +304,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -307,10 +314,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,6:4:40-6:5:41", "value": [ { - "string": "c" + "string": "c", + "raw_string": "c" } ] } @@ -320,7 +328,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -330,10 +338,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,7:5:50-7:6:51", "value": [ { - "string": "c" + "string": "c", + "raw_string": "c" } ] } @@ -378,6 +387,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -425,6 +435,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -442,7 +453,7 @@ "name": "b", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -452,10 +463,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,3:2:21-3:3:22", "value": [ { - "string": "d" + "string": "d", + "raw_string": "d" } ] } @@ -474,10 +486,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,5:2:26-5:8:32", "value": [ { - "string": "layers" + "string": "layers", + "raw_string": "layers" } ] } @@ -487,7 +500,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -497,10 +510,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,6:4:40-6:5:41", "value": [ { - "string": "c" + "string": "c", + "raw_string": "c" } ] } @@ -510,7 +524,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -520,10 +534,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,7:5:50-7:6:51", "value": [ { - "string": "c" + "string": "c", + "raw_string": "c" } ] } @@ -558,6 +573,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -605,6 +621,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -622,7 +639,7 @@ "name": "c", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -632,10 +649,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,7:5:50-7:6:51", "value": [ { - "string": "c" + "string": "c", + "raw_string": "c" } ] } @@ -660,6 +678,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -707,6 +726,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/import-nested-var.exp.json b/testdata/d2compiler/TestCompile/import-nested-var.exp.json new file mode 100644 index 000000000..a2ec401d7 --- /dev/null +++ b/testdata/d2compiler/TestCompile/import-nested-var.exp.json @@ -0,0 +1,116 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/import-nested-var.d2,0:0:0-1:0:23", + "nodes": [ + { + "import": { + "range": "d2/testdata/d2compiler/TestCompile/import-nested-var.d2,0:0:0-0:22:22", + "spread": true, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-nested-var.d2,0:4:4-0:10:10", + "value": [ + { + "string": "models", + "raw_string": "models" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-nested-var.d2,0:11:11-0:22:22", + "value": [ + { + "string": "environment", + "raw_string": "environment" + } + ] + } + } + ] + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "k", + "id_val": "k", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/models.d2,3:4:20-3:5:21", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/models.d2,3:4:20-3:5:21", + "value": [ + { + "string": "k", + "raw_string": "k" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "k" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile/import-scenario.exp.json b/testdata/d2compiler/TestCompile/import-scenario.exp.json new file mode 100644 index 000000000..70f8e48df --- /dev/null +++ b/testdata/d2compiler/TestCompile/import-scenario.exp.json @@ -0,0 +1,423 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/import-scenario.d2,0:0:0-3:0:12", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/import-scenario.d2,0:0:0-0:1:1", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/import-scenario.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-scenario.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "import": { + "range": "d2/testdata/d2compiler/TestCompile/import-scenario.d2,2:0:3-2:8:11", + "spread": true, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-scenario.d2,2:4:7-2:8:11", + "value": [ + { + "string": "test", + "raw_string": "test" + } + ] + } + } + ] + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "a", + "id_val": "a", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/import-scenario.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-scenario.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "a" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/test.d2,1:0:1-1:1:2", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/test.d2,1:0:1-1:1:2", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "x" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ], + "scenarios": [ + { + "name": "production", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/test.d2,0:0:0-1:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-scenario.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/test.d2,1:0:1-1:1:2", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": ",1:0:0-2:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/test.d2,5:6:39-5:13:46", + "value": [ + { + "string": "tooltip", + "raw_string": "tooltip" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/test.d2,5:15:48-5:18:51", + "value": [ + { + "string": "foo", + "raw_string": "foo" + } + ] + } + }, + "value": {} + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "a", + "id_val": "a", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/import-scenario.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-scenario.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "a" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/test.d2,1:0:1-1:1:2", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/test.d2,1:0:1-1:1:2", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/test.d2,5:4:37-5:13:46", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/test.d2,5:4:37-5:5:38", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/test.d2,5:6:39-5:13:46", + "value": [ + { + "string": "tooltip", + "raw_string": "tooltip" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "x" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "tooltip": { + "value": "foo" + }, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile/import-steps.exp.json b/testdata/d2compiler/TestCompile/import-steps.exp.json new file mode 100644 index 000000000..d0c2b4cc9 --- /dev/null +++ b/testdata/d2compiler/TestCompile/import-steps.exp.json @@ -0,0 +1,701 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/import-steps.d2,0:0:0-3:0:12", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/import-steps.d2,0:0:0-0:1:1", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/import-steps.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-steps.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "import": { + "range": "d2/testdata/d2compiler/TestCompile/import-steps.d2,2:0:3-2:8:11", + "spread": true, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-steps.d2,2:4:7-2:8:11", + "value": [ + { + "string": "test", + "raw_string": "test" + } + ] + } + } + ] + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "a", + "id_val": "a", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/import-steps.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-steps.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "a" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/test.d2,1:0:1-1:1:2", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/test.d2,1:0:1-1:1:2", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "x" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ], + "steps": [ + { + "name": "1", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/test.d2,0:0:0-1:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-steps.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/test.d2,1:0:1-1:1:2", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": ",1:0:0-2:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/test.d2,5:6:26-5:13:33", + "value": [ + { + "string": "tooltip", + "raw_string": "tooltip" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/test.d2,5:15:35-5:18:38", + "value": [ + { + "string": "foo", + "raw_string": "foo" + } + ] + } + }, + "value": {} + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "a", + "id_val": "a", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/import-steps.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-steps.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "a" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/test.d2,1:0:1-1:1:2", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/test.d2,1:0:1-1:1:2", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/test.d2,5:4:24-5:13:33", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/test.d2,5:4:24-5:5:25", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/test.d2,5:6:26-5:13:33", + "value": [ + { + "string": "tooltip", + "raw_string": "tooltip" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "x" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "tooltip": { + "value": "foo" + }, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + { + "name": "2", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/test.d2,0:0:0-1:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-steps.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/test.d2,1:0:1-1:1:2", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": ",1:0:0-2:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/test.d2,5:6:26-5:13:33", + "value": [ + { + "string": "tooltip", + "raw_string": "tooltip" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/test.d2,8:15:65-8:17:67", + "value": [ + { + "string": "do", + "raw_string": "do" + } + ] + } + }, + "value": {} + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "a", + "id_val": "a", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/import-steps.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-steps.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "a" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/test.d2,1:0:1-1:1:2", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/test.d2,1:0:1-1:1:2", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/test.d2,5:4:24-5:13:33", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/test.d2,5:4:24-5:5:25", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/test.d2,5:6:26-5:13:33", + "value": [ + { + "string": "tooltip", + "raw_string": "tooltip" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/test.d2,8:4:54-8:13:63", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/test.d2,8:4:54-8:5:55", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/test.d2,8:6:56-8:13:63", + "value": [ + { + "string": "tooltip", + "raw_string": "tooltip" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "x" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "tooltip": { + "value": "do" + }, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile/import-style-1.exp.json b/testdata/d2compiler/TestCompile/import-style-1.exp.json new file mode 100644 index 000000000..10933669a --- /dev/null +++ b/testdata/d2compiler/TestCompile/import-style-1.exp.json @@ -0,0 +1,422 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-1.d2,0:0:0-3:0:29", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-1.d2,0:0:0-0:19:19", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-1.d2,0:0:0-0:14:14", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-1.d2,0:0:0-0:1:1", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-1.d2,0:2:2-0:3:3", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-1.d2,0:4:4-0:9:9", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-1.d2,0:10:10-0:14:14", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-1.d2,0:16:16-0:19:19", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-1.d2,2:0:21-2:7:28", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-1.d2,2:0:21-2:1:22", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-1.d2,2:0:21-2:1:22", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-1.d2,2:3:24-2:7:28", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-1.d2,2:4:25-2:7:28", + "value": [ + { + "string": "imp", + "raw_string": "imp" + } + ] + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "b", + "id_val": "b", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-1.d2,0:0:0-0:14:14", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-1.d2,0:0:0-0:1:1", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-1.d2,0:2:2-0:3:3", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-1.d2,0:4:4-0:9:9", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-1.d2,0:10:10-0:14:14", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-1.d2,2:0:21-2:1:22", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-1.d2,2:0:21-2:1:22", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-1.d2,0:0:0-0:14:14", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-1.d2,0:0:0-0:1:1", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-1.d2,0:2:2-0:3:3", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-1.d2,0:4:4-0:9:9", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-1.d2,0:10:10-0:14:14", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-1.d2,2:0:21-2:1:22", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-1.d2,2:0:21-2:1:22", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "b" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "c", + "id_val": "c", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/imp.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/imp.d2,0:0:0-0:1:1", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-1.d2,0:0:0-0:14:14", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-1.d2,0:0:0-0:1:1", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-1.d2,0:2:2-0:3:3", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-1.d2,0:4:4-0:9:9", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-1.d2,0:10:10-0:14:14", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "key_path_index": 1, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "c" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "fill": { + "value": "red" + } + }, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile/import-style-2.exp.json b/testdata/d2compiler/TestCompile/import-style-2.exp.json new file mode 100644 index 000000000..605e32be9 --- /dev/null +++ b/testdata/d2compiler/TestCompile/import-style-2.exp.json @@ -0,0 +1,576 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-2.d2,0:0:0-3:0:31", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-2.d2,0:0:0-0:21:21", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-2.d2,0:0:0-0:16:16", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-2.d2,0:0:0-0:1:1", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-2.d2,0:2:2-0:3:3", + "value": [ + { + "string": "k", + "raw_string": "k" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-2.d2,0:4:4-0:5:5", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-2.d2,0:6:6-0:11:11", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-2.d2,0:12:12-0:16:16", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-2.d2,0:18:18-0:21:21", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-2.d2,2:0:23-2:7:30", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-2.d2,2:0:23-2:1:24", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-2.d2,2:0:23-2:1:24", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-2.d2,2:3:26-2:7:30", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-2.d2,2:4:27-2:7:30", + "value": [ + { + "string": "imp", + "raw_string": "imp" + } + ] + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "b", + "id_val": "b", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-2.d2,0:0:0-0:16:16", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-2.d2,0:0:0-0:1:1", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-2.d2,0:2:2-0:3:3", + "value": [ + { + "string": "k", + "raw_string": "k" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-2.d2,0:4:4-0:5:5", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-2.d2,0:6:6-0:11:11", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-2.d2,0:12:12-0:16:16", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-2.d2,2:0:23-2:1:24", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-2.d2,2:0:23-2:1:24", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-2.d2,0:0:0-0:16:16", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-2.d2,0:0:0-0:1:1", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-2.d2,0:2:2-0:3:3", + "value": [ + { + "string": "k", + "raw_string": "k" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-2.d2,0:4:4-0:5:5", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-2.d2,0:6:6-0:11:11", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-2.d2,0:12:12-0:16:16", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-2.d2,2:0:23-2:1:24", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-2.d2,2:0:23-2:1:24", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "b" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "k", + "id_val": "k", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/imp.d2,1:0:1-1:1:2", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/imp.d2,1:0:1-1:1:2", + "value": [ + { + "string": "k", + "raw_string": "k" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-2.d2,0:0:0-0:16:16", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-2.d2,0:0:0-0:1:1", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-2.d2,0:2:2-0:3:3", + "value": [ + { + "string": "k", + "raw_string": "k" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-2.d2,0:4:4-0:5:5", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-2.d2,0:6:6-0:11:11", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-2.d2,0:12:12-0:16:16", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "key_path_index": 1, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "k" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "c", + "id_val": "c", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/imp.d2,2:2:8-2:3:9", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/imp.d2,2:2:8-2:3:9", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-2.d2,0:0:0-0:16:16", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-2.d2,0:0:0-0:1:1", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-2.d2,0:2:2-0:3:3", + "value": [ + { + "string": "k", + "raw_string": "k" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-2.d2,0:4:4-0:5:5", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-2.d2,0:6:6-0:11:11", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style-2.d2,0:12:12-0:16:16", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "key_path_index": 2, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "c" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "fill": { + "value": "red" + } + }, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile/import-style.exp.json b/testdata/d2compiler/TestCompile/import-style.exp.json new file mode 100644 index 000000000..0bea509e5 --- /dev/null +++ b/testdata/d2compiler/TestCompile/import-style.exp.json @@ -0,0 +1,342 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/import-style.d2,0:0:0-3:0:27", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/import-style.d2,0:0:0-0:17:17", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/import-style.d2,0:0:0-0:12:12", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style.d2,0:0:0-0:1:1", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style.d2,0:2:2-0:7:7", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style.d2,0:8:8-0:12:12", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style.d2,0:14:14-0:17:17", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/import-style.d2,2:0:19-2:7:26", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/import-style.d2,2:0:19-2:1:20", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style.d2,2:0:19-2:1:20", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "d2/testdata/d2compiler/TestCompile/import-style.d2,2:3:22-2:7:26", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style.d2,2:4:23-2:7:26", + "value": [ + { + "string": "imp", + "raw_string": "imp" + } + ] + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "c", + "id_val": "c", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/import-style.d2,0:0:0-0:12:12", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style.d2,0:0:0-0:1:1", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style.d2,0:2:2-0:7:7", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style.d2,0:8:8-0:12:12", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "c" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "fill": { + "value": "red" + } + }, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "c", + "id_val": "c", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/imp.d2,1:0:1-1:1:2", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/imp.d2,1:0:1-1:1:2", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/import-style.d2,0:0:0-0:12:12", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style.d2,0:0:0-0:1:1", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style.d2,0:2:2-0:7:7", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style.d2,0:8:8-0:12:12", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "c" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "fill": { + "value": "red" + } + }, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "b", + "id_val": "b", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/import-style.d2,2:0:19-2:1:20", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-style.d2,2:0:19-2:1:20", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "b" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile/import-var-chain.exp.json b/testdata/d2compiler/TestCompile/import-var-chain.exp.json new file mode 100644 index 000000000..5f738b569 --- /dev/null +++ b/testdata/d2compiler/TestCompile/import-var-chain.exp.json @@ -0,0 +1,58 @@ +{ + "graph": { + "name": "", + "isFolderOnly": true, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/import-var-chain.d2,0:0:0-1:0:8", + "nodes": [ + { + "import": { + "range": "d2/testdata/d2compiler/TestCompile/import-var-chain.d2,0:0:0-0:7:7", + "spread": true, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/import-var-chain.d2,0:4:4-0:7:7", + "value": [ + { + "string": "dev", + "raw_string": "dev" + } + ] + } + } + ] + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": null + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile/import_url_link.exp.json b/testdata/d2compiler/TestCompile/import_url_link.exp.json index 66f878da6..8f42343b0 100644 --- a/testdata/d2compiler/TestCompile/import_url_link.exp.json +++ b/testdata/d2compiler/TestCompile/import_url_link.exp.json @@ -39,6 +39,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -86,6 +87,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "https://google.com" }, diff --git a/testdata/d2compiler/TestCompile/imported-glob-leaf-filter.exp.json b/testdata/d2compiler/TestCompile/imported-glob-leaf-filter.exp.json new file mode 100644 index 000000000..410f77b04 --- /dev/null +++ b/testdata/d2compiler/TestCompile/imported-glob-leaf-filter.exp.json @@ -0,0 +1,307 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/imported-glob-leaf-filter.d2,0:0:0-10:0:71", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/imported-glob-leaf-filter.d2,1:0:1-6:1:56", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/imported-glob-leaf-filter.d2,1:0:1-1:3:4", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/imported-glob-leaf-filter.d2,1:0:1-1:3:4", + "value": [ + { + "string": "***", + "raw_string": "***" + } + ], + "pattern": [ + "*", + "", + "*", + "", + "*" + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/imported-glob-leaf-filter.d2,1:5:6-6:1:56", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/imported-glob-leaf-filter.d2,2:2:10-2:13:21", + "ampersand": true, + "key": { + "range": "d2/testdata/d2compiler/TestCompile/imported-glob-leaf-filter.d2,2:3:11-2:7:15", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/imported-glob-leaf-filter.d2,2:3:11-2:7:15", + "value": [ + { + "string": "leaf", + "raw_string": "leaf" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "boolean": { + "range": "d2/testdata/d2compiler/TestCompile/imported-glob-leaf-filter.d2,2:9:17-2:13:21", + "value": true + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/imported-glob-leaf-filter.d2,3:2:24-5:3:54", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/imported-glob-leaf-filter.d2,3:2:24-3:7:29", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/imported-glob-leaf-filter.d2,3:2:24-3:7:29", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/imported-glob-leaf-filter.d2,3:9:31-5:3:54", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/imported-glob-leaf-filter.d2,4:4:37-4:17:50", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/imported-glob-leaf-filter.d2,4:4:37-4:13:46", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/imported-glob-leaf-filter.d2,4:4:37-4:13:46", + "value": [ + { + "string": "font-size", + "raw_string": "font-size" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "number": { + "range": "d2/testdata/d2compiler/TestCompile/imported-glob-leaf-filter.d2,4:15:48-4:17:50", + "raw": "30", + "value": "30" + } + } + } + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/imported-glob-leaf-filter.d2,7:0:57-9:1:70", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/imported-glob-leaf-filter.d2,7:0:57-7:1:58", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/imported-glob-leaf-filter.d2,7:0:57-7:1:58", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/imported-glob-leaf-filter.d2,7:3:60-9:1:70", + "nodes": [ + { + "import": { + "range": "d2/testdata/d2compiler/TestCompile/imported-glob-leaf-filter.d2,8:1:63-8:6:68", + "spread": true, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/imported-glob-leaf-filter.d2,8:5:67-8:6:68", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "b", + "id_val": "b", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/x.d2,1:0:1-1:1:2", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/x.d2,1:0:1-1:1:2", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "b" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "fontSize": { + "value": "30" + } + }, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "a", + "id_val": "a", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/imported-glob-leaf-filter.d2,7:0:57-7:1:58", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/imported-glob-leaf-filter.d2,7:0:57-7:1:58", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "a" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile/invalid_gradient_color_stop.exp.json b/testdata/d2compiler/TestCompile/invalid_gradient_color_stop.exp.json new file mode 100644 index 000000000..49f1fffea --- /dev/null +++ b/testdata/d2compiler/TestCompile/invalid_gradient_color_stop.exp.json @@ -0,0 +1,11 @@ +{ + "graph": null, + "err": { + "errs": [ + { + "range": "d2/testdata/d2compiler/TestCompile/invalid_gradient_color_stop.d2,2:18:25-2:47:54", + "errmsg": "d2/testdata/d2compiler/TestCompile/invalid_gradient_color_stop.d2:3:19: expected \"fill\" to be a valid named color (\"orange\"), a hex code (\"#f0ff3a\"), or a gradient (\"linear-gradient(red, blue)\")" + } + ] + } +} diff --git a/testdata/d2compiler/TestCompile/label-near-composite-separate.exp.json b/testdata/d2compiler/TestCompile/label-near-composite-separate.exp.json index b73200e7a..7181e76a6 100644 --- a/testdata/d2compiler/TestCompile/label-near-composite-separate.exp.json +++ b/testdata/d2compiler/TestCompile/label-near-composite-separate.exp.json @@ -125,6 +125,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -172,6 +173,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/label-near-composite-together.exp.json b/testdata/d2compiler/TestCompile/label-near-composite-together.exp.json index ee68c9863..ebe24c0e4 100644 --- a/testdata/d2compiler/TestCompile/label-near-composite-together.exp.json +++ b/testdata/d2compiler/TestCompile/label-near-composite-together.exp.json @@ -120,6 +120,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -167,6 +168,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/label-near-parent.exp.json b/testdata/d2compiler/TestCompile/label-near-parent.exp.json index 192949f56..1d3135e56 100644 --- a/testdata/d2compiler/TestCompile/label-near-parent.exp.json +++ b/testdata/d2compiler/TestCompile/label-near-parent.exp.json @@ -102,6 +102,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -149,6 +150,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/layer-import-nested-layer.exp.json b/testdata/d2compiler/TestCompile/layer-import-nested-layer.exp.json new file mode 100644 index 000000000..c73e9a011 --- /dev/null +++ b/testdata/d2compiler/TestCompile/layer-import-nested-layer.exp.json @@ -0,0 +1,341 @@ +{ + "graph": { + "name": "", + "isFolderOnly": true, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/layer-import-nested-layer.d2,0:0:0-3:0:28", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/layer-import-nested-layer.d2,0:0:0-2:1:27", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/layer-import-nested-layer.d2,0:0:0-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/layer-import-nested-layer.d2,0:0:0-0:6:6", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/layer-import-nested-layer.d2,0:8:8-2:1:27", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/layer-import-nested-layer.d2,1:1:11-1:15:25", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/layer-import-nested-layer.d2,1:1:11-1:3:13", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/layer-import-nested-layer.d2,1:1:11-1:3:13", + "value": [ + { + "string": "ok", + "raw_string": "ok" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/layer-import-nested-layer.d2,1:5:15-1:15:25", + "nodes": [ + { + "import": { + "range": "d2/testdata/d2compiler/TestCompile/layer-import-nested-layer.d2,1:6:16-1:14:24", + "spread": true, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/layer-import-nested-layer.d2,1:10:20-1:14:24", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + } + } + ] + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": null, + "layers": [ + { + "name": "ok", + "isFolderOnly": true, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/layer-import-nested-layer.d2,0:0:0-1:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/meow.d2,0:0:0-0:6:6", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": ",1:0:0-2:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/meow.d2,1:2:12-1:3:13", + "value": [ + { + "string": "1", + "raw_string": "1" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/meow.d2,1:0:0-2:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/meow.d2,2:4:21-2:8:25", + "value": [ + { + "string": "asdf", + "raw_string": "asdf" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": null, + "layers": [ + { + "name": "1", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/meow.d2,0:0:0-1:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/meow.d2,2:4:21-2:8:25", + "value": [ + { + "string": "asdf", + "raw_string": "asdf" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "asdf", + "id_val": "asdf", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/meow.d2,2:4:21-2:8:25", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/meow.d2,2:4:21-2:8:25", + "value": [ + { + "string": "asdf", + "raw_string": "asdf" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "asdf" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + } + ] + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile/leaky_sequence.exp.json b/testdata/d2compiler/TestCompile/leaky_sequence.exp.json index 4faeaa7e8..642600cd2 100644 --- a/testdata/d2compiler/TestCompile/leaky_sequence.exp.json +++ b/testdata/d2compiler/TestCompile/leaky_sequence.exp.json @@ -161,6 +161,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -192,6 +193,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -270,6 +272,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "sequence_diagram" @@ -346,6 +349,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -391,6 +395,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/legend.exp.json b/testdata/d2compiler/TestCompile/legend.exp.json new file mode 100644 index 000000000..0c75e278c --- /dev/null +++ b/testdata/d2compiler/TestCompile/legend.exp.json @@ -0,0 +1,1212 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,0:0:0-32:0:535", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,1:3:4-27:1:492", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,1:3:4-1:7:8", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,1:3:4-1:7:8", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,1:9:10-27:1:492", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,2:2:14-26:3:490", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,2:2:14-2:11:23", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,2:2:14-2:11:23", + "value": [ + { + "string": "d2-legend", + "raw_string": "d2-legend" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,2:13:25-26:3:490", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,3:4:31-8:5:152", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,3:4:31-3:8:35", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,3:4:31-3:8:35", + "value": [ + { + "string": "User", + "raw_string": "User" + } + ] + } + } + ] + }, + "primary": { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,3:10:37-3:50:77", + "value": [ + { + "string": "A person who interacts with the system", + "raw_string": "A person who interacts with the system" + } + ] + } + }, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,3:51:78-8:5:152", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,4:6:86-4:19:99", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,4:6:86-4:11:91", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,4:6:86-4:11:91", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,4:13:93-4:19:99", + "value": [ + { + "string": "person", + "raw_string": "person" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,5:6:106-7:7:146", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,5:6:106-5:11:111", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,5:6:106-5:11:111", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,5:13:113-7:7:146", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,6:8:123-6:23:138", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,6:8:123-6:12:127", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,6:8:123-6:12:127", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,6:14:129-6:23:138", + "value": [ + { + "string": "#f5f5f5", + "raw_string": "#f5f5f5" + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,10:4:158-13:5:251", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,10:4:158-10:12:166", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,10:4:158-10:12:166", + "value": [ + { + "string": "Database", + "raw_string": "Database" + } + ] + } + } + ] + }, + "primary": { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,10:14:168-10:39:193", + "value": [ + { + "string": "Stores application data", + "raw_string": "Stores application data" + } + ] + } + }, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,10:40:194-13:5:251", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,11:6:202-11:21:217", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,11:6:202-11:11:207", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,11:6:202-11:11:207", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,11:13:209-11:21:217", + "value": [ + { + "string": "cylinder", + "raw_string": "cylinder" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,12:6:224-12:27:245", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,12:6:224-12:16:234", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,12:6:224-12:11:229", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,12:12:230-12:16:234", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,12:18:236-12:27:245", + "value": [ + { + "string": "#b5d3ff", + "raw_string": "#b5d3ff" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,15:4:257-17:5:339", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,15:4:257-15:15:268", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,15:4:257-15:15:268", + "value": [ + { + "string": "HiddenShape", + "raw_string": "HiddenShape" + } + ] + } + } + ] + }, + "primary": { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,15:17:270-15:55:308", + "value": [ + { + "string": "This should not appear in the legend", + "raw_string": "This should not appear in the legend" + } + ] + } + }, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,15:56:309-17:5:339", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,16:6:317-16:22:333", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,16:6:317-16:19:330", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,16:6:317-16:11:322", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,16:12:323-16:19:330", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "number": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,16:21:332-16:22:333", + "raw": "0", + "value": "0" + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,19:4:345-21:5:410", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,19:4:345-19:20:361", + "src": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,19:4:345-19:8:349", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,19:4:345-19:8:349", + "value": [ + { + "string": "User", + "raw_string": "User" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,19:12:353-19:20:361", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,19:12:353-19:20:361", + "value": [ + { + "string": "Database", + "raw_string": "Database" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,19:22:363-19:34:375", + "value": [ + { + "string": "Reads data", + "raw_string": "Reads data" + } + ] + } + }, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,19:35:376-21:5:410", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,20:6:384-20:26:404", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,20:6:384-20:18:396", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,20:6:384-20:11:389", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,20:12:390-20:18:396", + "value": [ + { + "string": "stroke", + "raw_string": "stroke" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,20:20:398-20:26:404", + "value": [ + { + "string": "blue", + "raw_string": "blue" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,23:4:416-25:5:486", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,23:4:416-23:20:432", + "src": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,23:4:416-23:12:424", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,23:4:416-23:12:424", + "value": [ + { + "string": "Database", + "raw_string": "Database" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,23:16:428-23:20:432", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,23:16:428-23:20:432", + "value": [ + { + "string": "User", + "raw_string": "User" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,23:22:434-23:39:451", + "value": [ + { + "string": "Returns results", + "raw_string": "Returns results" + } + ] + } + }, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,23:40:452-25:5:486", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,24:6:460-24:26:480", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,24:6:460-24:23:477", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,24:6:460-24:11:465", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,24:12:466-24:23:477", + "value": [ + { + "string": "stroke-dash", + "raw_string": "stroke-dash" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "number": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,24:25:479-24:26:480", + "raw": "5", + "value": "5" + } + } + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,29:0:494-29:10:504", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,29:0:494-29:4:498", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,29:0:494-29:4:498", + "value": [ + { + "string": "user", + "raw_string": "user" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,29:6:500-29:10:504", + "value": [ + { + "string": "User", + "raw_string": "User" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,30:0:505-30:12:517", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,30:0:505-30:2:507", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,30:0:505-30:2:507", + "value": [ + { + "string": "db", + "raw_string": "db" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,30:4:509-30:12:517", + "value": [ + { + "string": "Database", + "raw_string": "Database" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,31:0:518-31:16:534", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,31:0:518-31:10:528", + "src": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,31:0:518-31:4:522", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,31:0:518-31:4:522", + "value": [ + { + "string": "user", + "raw_string": "user" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,31:8:526-31:10:528", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,31:8:526-31:10:528", + "value": [ + { + "string": "db", + "raw_string": "db" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,31:12:530-31:16:534", + "value": [ + { + "string": "Uses", + "raw_string": "Uses" + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "legend": { + "objects": [ + { + "id": "User", + "id_val": "User", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,3:4:31-3:8:35", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,3:4:31-3:8:35", + "value": [ + { + "string": "User", + "raw_string": "User" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,19:4:345-19:8:349", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,19:4:345-19:8:349", + "value": [ + { + "string": "User", + "raw_string": "User" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,23:16:428-23:20:432", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,23:16:428-23:20:432", + "value": [ + { + "string": "User", + "raw_string": "User" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "box": { + "TopLeft": { + "x": 10, + "y": 10 + }, + "Width": 100, + "Height": 100 + }, + "attributes": { + "label": { + "value": "A person who interacts with the system" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "fill": { + "value": "#f5f5f5" + } + }, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "person" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "Database", + "id_val": "Database", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,10:4:158-10:12:166", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,10:4:158-10:12:166", + "value": [ + { + "string": "Database", + "raw_string": "Database" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,19:12:353-19:20:361", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,19:12:353-19:20:361", + "value": [ + { + "string": "Database", + "raw_string": "Database" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,23:4:416-23:12:424", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,23:4:416-23:12:424", + "value": [ + { + "string": "Database", + "raw_string": "Database" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "box": { + "TopLeft": { + "x": 10, + "y": 10 + }, + "Width": 100, + "Height": 100 + }, + "attributes": { + "label": { + "value": "Stores application data" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "fill": { + "value": "#b5d3ff" + } + }, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "cylinder" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ], + "edges": [ + { + "index": 0, + "isCurve": false, + "route": [ + { + "x": 10, + "y": 10 + }, + { + "x": 110, + "y": 10 + } + ], + "src_arrow": false, + "dst_arrow": true, + "references": [ + { + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "Reads data" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "stroke": { + "value": "blue" + } + }, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "index": 0, + "isCurve": false, + "route": [ + { + "x": 10, + "y": 10 + }, + { + "x": 110, + "y": 10 + } + ], + "src_arrow": false, + "dst_arrow": true, + "references": [ + { + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "Returns results" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "strokeDash": { + "value": "5" + } + }, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "edges": [ + { + "index": 0, + "isCurve": false, + "src_arrow": false, + "dst_arrow": true, + "references": [ + { + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "Uses" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ], + "objects": [ + { + "id": "user", + "id_val": "user", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,29:0:494-29:4:498", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,29:0:494-29:4:498", + "value": [ + { + "string": "user", + "raw_string": "user" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,31:0:518-31:4:522", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,31:0:518-31:4:522", + "value": [ + { + "string": "user", + "raw_string": "user" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "User" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "db", + "id_val": "db", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,30:0:505-30:2:507", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,30:0:505-30:2:507", + "value": [ + { + "string": "db", + "raw_string": "db" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,31:8:526-31:10:528", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/legend.d2,31:8:526-31:10:528", + "value": [ + { + "string": "db", + "raw_string": "db" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "Database" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile/link-beyond-import-root.exp.json b/testdata/d2compiler/TestCompile/link-beyond-import-root.exp.json index 36ee7d8df..57b5da914 100644 --- a/testdata/d2compiler/TestCompile/link-beyond-import-root.exp.json +++ b/testdata/d2compiler/TestCompile/link-beyond-import-root.exp.json @@ -39,6 +39,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -97,6 +98,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json b/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json index 7b906e66c..eed6477a5 100644 --- a/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-key-nested.exp.json @@ -173,6 +173,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -220,6 +221,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -276,6 +278,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.x" }, @@ -296,7 +299,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -306,10 +309,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-key-nested.d2,5:4:47-5:6:49", "value": [ { - "string": "yo" + "string": "yo", + "raw_string": "yo" } ] } @@ -334,6 +338,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -381,6 +386,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/link-board-mixed.exp.json b/testdata/d2compiler/TestCompile/link-board-mixed.exp.json index 739e2f29f..86e6555a9 100644 --- a/testdata/d2compiler/TestCompile/link-board-mixed.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-mixed.exp.json @@ -323,6 +323,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -401,6 +402,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.cat" }, @@ -421,7 +423,7 @@ "name": "cat", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -431,10 +433,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:4:81-5:11:88", "value": [ { - "string": "the cat" + "string": "the cat", + "raw_string": "the cat" } ] } @@ -453,10 +456,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,5:15:92-5:24:101", "value": [ { - "string": "meeeowwww" + "string": "meeeowwww", + "raw_string": "meeeowwww" } ] } @@ -535,6 +539,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -566,6 +571,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -613,6 +619,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -658,6 +665,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -677,7 +685,7 @@ "name": "green", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -687,10 +695,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,0:0:0-0:8:8", "value": [ { - "string": "question" + "string": "question", + "raw_string": "question" } ] } @@ -710,7 +719,7 @@ }, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -720,10 +729,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,1:9:40-1:13:44", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -751,10 +761,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:13:152-11:18:157", "value": [ { - "string": "style" + "string": "style", + "raw_string": "style" } ] } @@ -764,7 +775,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -774,10 +785,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-mixed.d2,11:19:158-11:23:162", "value": [ { - "string": "fill" + "string": "fill", + "raw_string": "fill" } ] } @@ -822,6 +834,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -946,6 +959,7 @@ "value": "green" } }, + "iconStyle": {}, "link": { "value": "root.layers.cat" }, diff --git a/testdata/d2compiler/TestCompile/link-board-nested.exp.json b/testdata/d2compiler/TestCompile/link-board-nested.exp.json index 1107c09ff..8b19e239f 100644 --- a/testdata/d2compiler/TestCompile/link-board-nested.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-nested.exp.json @@ -202,6 +202,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -260,6 +261,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.x.layers.x" }, @@ -280,7 +282,7 @@ "name": "x", "isFolderOnly": true, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -290,10 +292,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,3:4:47-3:10:53", "value": [ { - "string": "layers" + "string": "layers", + "raw_string": "layers" } ] } @@ -303,7 +306,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -313,10 +316,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,4:6:63-4:7:64", "value": [ { - "string": "x" + "string": "x", + "raw_string": "x" } ] } @@ -326,7 +330,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -336,10 +340,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:76-5:13:81", "value": [ { - "string": "hello" + "string": "hello", + "raw_string": "hello" } ] } @@ -374,6 +379,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -392,7 +398,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -402,10 +408,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-nested.d2,5:8:76-5:13:81", "value": [ { - "string": "hello" + "string": "hello", + "raw_string": "hello" } ] } @@ -430,6 +437,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -477,6 +485,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/link-board-not-board.exp.json b/testdata/d2compiler/TestCompile/link-board-not-board.exp.json index 3d1d8ee0f..86ae50689 100644 --- a/testdata/d2compiler/TestCompile/link-board-not-board.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-not-board.exp.json @@ -167,6 +167,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -214,6 +215,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -270,6 +272,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -287,7 +290,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-not-board.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -297,10 +300,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-not-board.d2,4:4:44-4:5:45", "value": [ { - "string": "y" + "string": "y", + "raw_string": "y" } ] } @@ -325,6 +329,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -372,6 +377,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/link-board-not-found-1.exp.json b/testdata/d2compiler/TestCompile/link-board-not-found-1.exp.json index 47e6df352..c3e953a02 100644 --- a/testdata/d2compiler/TestCompile/link-board-not-found-1.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-not-found-1.exp.json @@ -63,6 +63,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -121,6 +122,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/link-board-not-found-2.exp.json b/testdata/d2compiler/TestCompile/link-board-not-found-2.exp.json index b3dd8d79b..26b2d11d2 100644 --- a/testdata/d2compiler/TestCompile/link-board-not-found-2.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-not-found-2.exp.json @@ -230,6 +230,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -248,7 +249,7 @@ "name": "one", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-not-found-2.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -258,10 +259,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-not-found-2.d2,2:8:29-2:12:33", "value": [ { - "string": "ping" + "string": "ping", + "raw_string": "ping" } ] } @@ -271,7 +273,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -281,10 +283,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-not-found-2.d2,3:12:49-3:16:53", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -324,6 +327,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -371,6 +375,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -388,7 +393,7 @@ "name": "two", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-not-found-2.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -398,10 +403,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-not-found-2.d2,7:8:94-7:12:98", "value": [ { - "string": "pong" + "string": "pong", + "raw_string": "pong" } ] } @@ -411,7 +417,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -421,10 +427,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-not-found-2.d2,8:12:114-8:16:118", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -464,6 +471,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -511,6 +519,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/link-board-ok.exp.json b/testdata/d2compiler/TestCompile/link-board-ok.exp.json index 4548844ea..d645e93a9 100644 --- a/testdata/d2compiler/TestCompile/link-board-ok.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-ok.exp.json @@ -144,6 +144,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -202,6 +203,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.x" }, @@ -222,7 +224,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -232,10 +234,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-ok.d2,3:3:36-3:4:37", "value": [ { - "string": "y" + "string": "y", + "raw_string": "y" } ] } @@ -260,6 +263,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -307,6 +311,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/link-board-underscore-not-found.exp.json b/testdata/d2compiler/TestCompile/link-board-underscore-not-found.exp.json index f266a391c..20694e06d 100644 --- a/testdata/d2compiler/TestCompile/link-board-underscore-not-found.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-underscore-not-found.exp.json @@ -225,6 +225,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -272,6 +273,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -289,7 +291,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore-not-found.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -299,10 +301,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore-not-found.d2,3:4:23-3:6:25", "value": [ { - "string": "yo" + "string": "yo", + "raw_string": "yo" } ] } @@ -321,10 +324,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore-not-found.d2,4:4:30-4:10:36", "value": [ { - "string": "layers" + "string": "layers", + "raw_string": "layers" } ] } @@ -334,7 +338,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -344,10 +348,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore-not-found.d2,5:6:46-5:7:47", "value": [ { - "string": "x" + "string": "x", + "raw_string": "x" } ] } @@ -357,7 +362,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore-not-found.d2,1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -367,10 +372,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore-not-found.d2,6:8:59-6:13:64", "value": [ { - "string": "hello" + "string": "hello", + "raw_string": "hello" } ] } @@ -380,7 +386,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -390,10 +396,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore-not-found.d2,6:14:65-6:18:69", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -442,6 +449,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -489,6 +497,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -506,7 +515,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore-not-found.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -516,10 +525,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore-not-found.d2,6:8:59-6:13:64", "value": [ { - "string": "hello" + "string": "hello", + "raw_string": "hello" } ] } @@ -529,7 +539,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -539,10 +549,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore-not-found.d2,6:14:65-6:18:69", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -581,6 +592,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -639,6 +651,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/link-board-underscore.exp.json b/testdata/d2compiler/TestCompile/link-board-underscore.exp.json index fb21164d4..c100ead47 100644 --- a/testdata/d2compiler/TestCompile/link-board-underscore.exp.json +++ b/testdata/d2compiler/TestCompile/link-board-underscore.exp.json @@ -269,6 +269,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -316,6 +317,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -333,7 +335,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -343,10 +345,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,3:3:21-3:5:23", "value": [ { - "string": "yo" + "string": "yo", + "raw_string": "yo" } ] } @@ -365,10 +368,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,4:4:28-4:10:34", "value": [ { - "string": "layers" + "string": "layers", + "raw_string": "layers" } ] } @@ -378,7 +382,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -388,10 +392,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,5:6:44-5:7:45", "value": [ { - "string": "x" + "string": "x", + "raw_string": "x" } ] } @@ -401,7 +406,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -411,10 +416,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:8:57-6:13:62", "value": [ { - "string": "hello" + "string": "hello", + "raw_string": "hello" } ] } @@ -424,7 +430,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -434,10 +440,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:14:63-6:18:67", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -470,10 +477,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:8:90-7:11:93", "value": [ { - "string": "hey" + "string": "hey", + "raw_string": "hey" } ] } @@ -483,7 +491,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -493,10 +501,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:12:94-7:16:98", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -545,6 +554,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -592,6 +602,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -609,7 +620,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -619,10 +630,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:8:57-6:13:62", "value": [ { - "string": "hello" + "string": "hello", + "raw_string": "hello" } ] } @@ -632,7 +644,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -642,10 +654,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,6:14:63-6:18:67", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -678,10 +691,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:8:90-7:11:93", "value": [ { - "string": "hey" + "string": "hey", + "raw_string": "hey" } ] } @@ -691,7 +705,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -701,10 +715,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/link-board-underscore.d2,7:12:94-7:16:98", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -743,6 +758,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -801,6 +817,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.x" }, @@ -860,6 +877,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.x" }, diff --git a/testdata/d2compiler/TestCompile/link-file-underscore.exp.json b/testdata/d2compiler/TestCompile/link-file-underscore.exp.json index 80284b3cb..479315f1f 100644 --- a/testdata/d2compiler/TestCompile/link-file-underscore.exp.json +++ b/testdata/d2compiler/TestCompile/link-file-underscore.exp.json @@ -39,6 +39,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -86,6 +87,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -103,7 +105,7 @@ "name": "a", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -113,10 +115,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,3:7:20-3:8:21", "value": [ { - "string": "c" + "string": "c", + "raw_string": "c" } ] } @@ -141,6 +144,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -188,6 +192,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -205,7 +210,7 @@ "name": "b", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -215,10 +220,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,4:7:31-4:8:32", "value": [ { - "string": "d" + "string": "d", + "raw_string": "d" } ] } @@ -228,7 +234,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -238,10 +244,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,4:9:33-4:13:37", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -280,6 +287,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -338,6 +346,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.a" }, @@ -358,7 +367,7 @@ "name": "e", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -368,10 +377,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,6:4:62-6:5:63", "value": [ { - "string": "l" + "string": "l", + "raw_string": "l" } ] } @@ -390,10 +400,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,8:2:67-8:8:73", "value": [ { - "string": "layers" + "string": "layers", + "raw_string": "layers" } ] } @@ -403,7 +414,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -413,10 +424,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,9:3:80-9:4:81", "value": [ { - "string": "j" + "string": "j", + "raw_string": "j" } ] } @@ -426,7 +438,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -436,10 +448,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,10:5:90-10:6:91", "value": [ { - "string": "k" + "string": "k", + "raw_string": "k" } ] } @@ -449,7 +462,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -459,10 +472,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,10:7:92-10:11:96", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -495,10 +509,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,11:5:105-11:6:106", "value": [ { - "string": "n" + "string": "n", + "raw_string": "n" } ] } @@ -508,7 +523,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -518,10 +533,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,11:7:107-11:11:111", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -554,10 +570,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,12:5:122-12:6:123", "value": [ { - "string": "m" + "string": "m", + "raw_string": "m" } ] } @@ -567,7 +584,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -577,10 +594,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,12:7:124-12:11:128", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -629,6 +647,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -676,6 +695,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -693,7 +713,7 @@ "name": "j", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -703,10 +723,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,10:5:90-10:6:91", "value": [ { - "string": "k" + "string": "k", + "raw_string": "k" } ] } @@ -716,7 +737,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -726,10 +747,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,10:7:92-10:11:96", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -762,10 +784,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,11:5:105-11:6:106", "value": [ { - "string": "n" + "string": "n", + "raw_string": "n" } ] } @@ -775,7 +798,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -785,10 +808,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,11:7:107-11:11:111", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -821,10 +845,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,12:5:122-12:6:123", "value": [ { - "string": "m" + "string": "m", + "raw_string": "m" } ] } @@ -834,7 +859,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -844,10 +869,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,12:7:124-12:11:128", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -886,6 +912,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -944,6 +971,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.e" }, @@ -1003,6 +1031,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root" }, @@ -1062,6 +1091,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.a" }, diff --git a/testdata/d2compiler/TestCompile/markdown_ampersand.exp.json b/testdata/d2compiler/TestCompile/markdown_ampersand.exp.json new file mode 100644 index 000000000..dd728c8ca --- /dev/null +++ b/testdata/d2compiler/TestCompile/markdown_ampersand.exp.json @@ -0,0 +1,116 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/markdown_ampersand.d2,0:0:0-3:0:86", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/markdown_ampersand.d2,0:0:0-2:1:85", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/markdown_ampersand.d2,0:0:0-0:4:4", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/markdown_ampersand.d2,0:0:0-0:4:4", + "value": [ + { + "string": "memo", + "raw_string": "memo" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "block_string": { + "range": "d2/testdata/d2compiler/TestCompile/markdown_ampersand.d2,0:6:6-2:1:85", + "quote": "", + "tag": "md", + "value": "d2" + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "memo", + "id_val": "memo", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/markdown_ampersand.d2,0:0:0-0:4:4", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/markdown_ampersand.d2,0:0:0-0:4:4", + "value": [ + { + "string": "memo", + "raw_string": "memo" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "d2" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "language": "markdown", + "shape": { + "value": "text" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile/missing-class.exp.json b/testdata/d2compiler/TestCompile/missing-class.exp.json index 1aa7a9673..87203ba69 100644 --- a/testdata/d2compiler/TestCompile/missing-class.exp.json +++ b/testdata/d2compiler/TestCompile/missing-class.exp.json @@ -63,6 +63,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -121,6 +122,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/multiple-import-nested-layers.exp.json b/testdata/d2compiler/TestCompile/multiple-import-nested-layers.exp.json index e9db7f592..42cf16c14 100644 --- a/testdata/d2compiler/TestCompile/multiple-import-nested-layers.exp.json +++ b/testdata/d2compiler/TestCompile/multiple-import-nested-layers.exp.json @@ -120,6 +120,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -167,6 +168,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -184,7 +186,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/multiple-import-nested-layers.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -194,10 +196,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/y/x.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -207,7 +210,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -217,10 +220,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/y/x.d2,0:2:2-0:3:3", "value": [ { - "string": "c" + "string": "c", + "raw_string": "c" } ] } @@ -230,7 +234,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -240,10 +244,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/y/x.d2,0:4:4-0:8:8", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -281,10 +286,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/y/x.d2,2:0:20-2:6:26", "value": [ { - "string": "layers" + "string": "layers", + "raw_string": "layers" } ] } @@ -294,7 +300,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -304,10 +310,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/y/x.d2,3:2:32-3:3:33", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -317,7 +324,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/y/x.d2,1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -327,10 +334,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/y/n.d2,0:0:0-0:1:1", "value": [ { - "string": "p" + "string": "p", + "raw_string": "p" } ] } @@ -365,6 +373,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -434,6 +443,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -501,6 +511,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.x.layers.b" }, @@ -521,7 +532,7 @@ "name": "b", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/y/x.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -531,10 +542,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/y/n.d2,0:0:0-0:1:1", "value": [ { - "string": "p" + "string": "p", + "raw_string": "p" } ] } @@ -559,6 +571,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -606,6 +619,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/name-with-dot-underscore.exp.json b/testdata/d2compiler/TestCompile/name-with-dot-underscore.exp.json index 7c2ec3cf4..082436c4b 100644 --- a/testdata/d2compiler/TestCompile/name-with-dot-underscore.exp.json +++ b/testdata/d2compiler/TestCompile/name-with-dot-underscore.exp.json @@ -145,6 +145,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -192,6 +193,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -279,6 +281,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -324,6 +327,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/near_bad_connected.exp.json b/testdata/d2compiler/TestCompile/near_bad_connected.exp.json index 4565b1d7e..c09412740 100644 --- a/testdata/d2compiler/TestCompile/near_bad_connected.exp.json +++ b/testdata/d2compiler/TestCompile/near_bad_connected.exp.json @@ -127,6 +127,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -158,6 +159,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -225,6 +227,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": { "range": "d2/testdata/d2compiler/TestCompile/near_bad_connected.d2,2:11:21-2:21:31", "path": [ @@ -285,6 +288,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/near_constant.exp.json b/testdata/d2compiler/TestCompile/near_constant.exp.json index 6139e09c5..6ccaebf47 100644 --- a/testdata/d2compiler/TestCompile/near_constant.exp.json +++ b/testdata/d2compiler/TestCompile/near_constant.exp.json @@ -63,6 +63,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -121,6 +122,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": { "range": "d2/testdata/d2compiler/TestCompile/near_constant.d2,0:8:8-0:18:18", "path": [ diff --git a/testdata/d2compiler/TestCompile/near_descendant_connect_to_outside.exp.json b/testdata/d2compiler/TestCompile/near_descendant_connect_to_outside.exp.json index 1d11c9f01..37989ebb3 100644 --- a/testdata/d2compiler/TestCompile/near_descendant_connect_to_outside.exp.json +++ b/testdata/d2compiler/TestCompile/near_descendant_connect_to_outside.exp.json @@ -161,6 +161,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -192,6 +193,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -270,6 +272,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": { "range": "d2/testdata/d2compiler/TestCompile/near_descendant_connect_to_outside.d2,2:11:21-2:19:29", "path": [ @@ -361,6 +364,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -406,6 +410,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/nested-array-classes.exp.json b/testdata/d2compiler/TestCompile/nested-array-classes.exp.json index a897f1678..521b8dda7 100644 --- a/testdata/d2compiler/TestCompile/nested-array-classes.exp.json +++ b/testdata/d2compiler/TestCompile/nested-array-classes.exp.json @@ -396,6 +396,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -422,6 +423,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "arrow" @@ -445,6 +447,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -474,6 +477,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "arrow" @@ -497,6 +501,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -568,6 +573,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -633,6 +639,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/nested-scope-1.exp.json b/testdata/d2compiler/TestCompile/nested-scope-1.exp.json index 711c99020..7a91d8274 100644 --- a/testdata/d2compiler/TestCompile/nested-scope-1.exp.json +++ b/testdata/d2compiler/TestCompile/nested-scope-1.exp.json @@ -39,6 +39,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -86,6 +87,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -131,6 +133,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -176,6 +179,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/nested-scope-2.exp.json b/testdata/d2compiler/TestCompile/nested-scope-2.exp.json index 523843136..92be695cd 100644 --- a/testdata/d2compiler/TestCompile/nested-scope-2.exp.json +++ b/testdata/d2compiler/TestCompile/nested-scope-2.exp.json @@ -88,6 +88,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -199,6 +200,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/nested_sql.exp.json b/testdata/d2compiler/TestCompile/nested_sql.exp.json index 1781b2ac6..e552aec34 100644 --- a/testdata/d2compiler/TestCompile/nested_sql.exp.json +++ b/testdata/d2compiler/TestCompile/nested_sql.exp.json @@ -176,6 +176,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -223,6 +224,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -328,6 +330,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "sql_table" diff --git a/testdata/d2compiler/TestCompile/nil_scope_obj_regression.exp.json b/testdata/d2compiler/TestCompile/nil_scope_obj_regression.exp.json index 94c666990..527ed2528 100644 --- a/testdata/d2compiler/TestCompile/nil_scope_obj_regression.exp.json +++ b/testdata/d2compiler/TestCompile/nil_scope_obj_regression.exp.json @@ -105,6 +105,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -183,6 +184,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -228,6 +230,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/no-class-primary.exp.json b/testdata/d2compiler/TestCompile/no-class-primary.exp.json index f137a4b3e..35fc3a86a 100644 --- a/testdata/d2compiler/TestCompile/no-class-primary.exp.json +++ b/testdata/d2compiler/TestCompile/no-class-primary.exp.json @@ -4,7 +4,7 @@ "errs": [ { "range": "d2/testdata/d2compiler/TestCompile/no-class-primary.d2,0:2:2-0:7:7", - "errmsg": "d2/testdata/d2compiler/TestCompile/no-class-primary.d2:1:3: class missing value" + "errmsg": "d2/testdata/d2compiler/TestCompile/no-class-primary.d2:1:3: reserved field \"class\" must have a value" } ] } diff --git a/testdata/d2compiler/TestCompile/no-self-link.exp.json b/testdata/d2compiler/TestCompile/no-self-link.exp.json new file mode 100644 index 000000000..0a57e6b2a --- /dev/null +++ b/testdata/d2compiler/TestCompile/no-self-link.exp.json @@ -0,0 +1,707 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,0:0:0-13:1:100", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,1:0:1-1:19:20", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,1:0:1-1:6:7", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,1:0:1-1:1:2", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,1:2:3-1:6:7", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,1:8:9-1:19:20", + "value": [ + { + "string": "scenarios.a", + "raw_string": "scenarios.a" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,3:0:22-7:1:67", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,3:0:22-3:6:28", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,3:0:22-3:6:28", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,3:8:30-7:1:67", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,4:2:34-6:3:65", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,4:2:34-4:3:35", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,4:2:34-4:3:35", + "value": [ + { + "string": "g", + "raw_string": "g" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,4:5:37-6:3:65", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,5:4:43-5:22:61", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,5:4:43-5:10:49", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,5:4:43-5:5:44", + "value": [ + { + "string": "s", + "raw_string": "s" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,5:6:45-5:10:49", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,5:12:51-5:22:61", + "value": [ + { + "string": "_.layers.g", + "raw_string": "_.layers.g" + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,9:0:69-13:1:100", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,9:0:69-9:9:78", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,9:0:69-9:9:78", + "value": [ + { + "string": "scenarios", + "raw_string": "scenarios" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,9:11:80-13:1:100", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,10:2:84-12:3:98", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,10:2:84-10:3:85", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,10:2:84-10:3:85", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,10:5:87-12:3:98", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,11:4:93-11:5:94", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,11:4:93-11:5:94", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,11:4:93-11:5:94", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,1:0:1-1:6:7", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,1:0:1-1:1:2", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,1:2:3-1:6:7", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "x" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "link": { + "value": "root.scenarios.a" + }, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ], + "layers": [ + { + "name": "g", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,0:0:0-1:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,5:4:43-5:5:44", + "value": [ + { + "string": "s", + "raw_string": "s" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": ",1:0:0-2:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,5:6:45-5:10:49", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "root.layers.g" + } + ] + } + }, + "value": {} + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "s", + "id_val": "s", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,5:4:43-5:10:49", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,5:4:43-5:5:44", + "value": [ + { + "string": "s", + "raw_string": "s" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,5:6:45-5:10:49", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "s" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + } + ], + "scenarios": [ + { + "name": "a", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,0:0:0-1:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,1:0:1-1:1:2", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": ",1:0:0-2:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,1:2:3-1:6:7", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "root.scenarios.a" + } + ] + } + }, + "value": {} + } + } + ] + } + } + } + }, + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,11:4:93-11:5:94", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,1:0:1-1:6:7", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,1:0:1-1:1:2", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,1:2:3-1:6:7", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "x" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "b", + "id_val": "b", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,11:4:93-11:5:94", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/no-self-link.d2,11:4:93-11:5:94", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "b" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile/no_url_link_and_path_url_label_concurrently.exp.json b/testdata/d2compiler/TestCompile/no_url_link_and_path_url_label_concurrently.exp.json new file mode 100644 index 000000000..be462dfa3 --- /dev/null +++ b/testdata/d2compiler/TestCompile/no_url_link_and_path_url_label_concurrently.exp.json @@ -0,0 +1,11 @@ +{ + "graph": null, + "err": { + "errs": [ + { + "range": "d2/testdata/d2compiler/TestCompile/no_url_link_and_path_url_label_concurrently.d2,0:34:34-0:56:56", + "errmsg": "d2/testdata/d2compiler/TestCompile/no_url_link_and_path_url_label_concurrently.d2:1:35: Label cannot be set to URL when link is also set (for security)" + } + ] + } +} diff --git a/testdata/d2compiler/TestCompile/non_url_link.exp.json b/testdata/d2compiler/TestCompile/non_url_link.exp.json new file mode 100644 index 000000000..89170f4c9 --- /dev/null +++ b/testdata/d2compiler/TestCompile/non_url_link.exp.json @@ -0,0 +1,150 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/non_url_link.d2,0:0:0-3:0:94", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/non_url_link.d2,0:0:0-2:1:93", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/non_url_link.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/non_url_link.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/non_url_link.d2,0:3:3-2:1:93", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/non_url_link.d2,1:2:7-1:86:91", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/non_url_link.d2,1:2:7-1:6:11", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/non_url_link.d2,1:2:7-1:6:11", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/non_url_link.d2,1:8:13-1:86:91", + "value": [ + { + "string": "vscode://file//Users/pmoura/logtalk/examples/searching/hill_climbing1.lgt:35:0", + "raw_string": "vscode://file//Users/pmoura/logtalk/examples/searching/hill_climbing1.lgt:35:0" + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/non_url_link.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/non_url_link.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "x" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "link": { + "value": "vscode://file//Users/pmoura/logtalk/examples/searching/hill_climbing1.lgt:35:0" + }, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile/null.exp.json b/testdata/d2compiler/TestCompile/null.exp.json index 9781daf23..139f60edc 100644 --- a/testdata/d2compiler/TestCompile/null.exp.json +++ b/testdata/d2compiler/TestCompile/null.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/positions.exp.json b/testdata/d2compiler/TestCompile/positions.exp.json index 700810882..33ba65869 100644 --- a/testdata/d2compiler/TestCompile/positions.exp.json +++ b/testdata/d2compiler/TestCompile/positions.exp.json @@ -106,6 +106,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -153,6 +154,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "top": { "value": "200" }, diff --git a/testdata/d2compiler/TestCompile/reordered-classes.exp.json b/testdata/d2compiler/TestCompile/reordered-classes.exp.json index 07280d1c2..23c7a4d6e 100644 --- a/testdata/d2compiler/TestCompile/reordered-classes.exp.json +++ b/testdata/d2compiler/TestCompile/reordered-classes.exp.json @@ -209,6 +209,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -267,6 +268,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "diamond" diff --git a/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json b/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json index d037b9da4..d182c5702 100644 --- a/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json +++ b/testdata/d2compiler/TestCompile/reserved_icon_near_style.exp.json @@ -276,6 +276,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -377,6 +378,7 @@ "Fragment": "", "RawFragment": "" }, + "iconStyle": {}, "near_key": { "range": "d2/testdata/d2compiler/TestCompile/reserved_icon_near_style.d2,6:8:90-6:9:91", "path": [ @@ -437,6 +439,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/reserved_missing_values.exp.json b/testdata/d2compiler/TestCompile/reserved_missing_values.exp.json new file mode 100644 index 000000000..3d3cdd4da --- /dev/null +++ b/testdata/d2compiler/TestCompile/reserved_missing_values.exp.json @@ -0,0 +1,15 @@ +{ + "graph": null, + "err": { + "errs": [ + { + "range": "d2/testdata/d2compiler/TestCompile/reserved_missing_values.d2,1:2:12-1:7:17", + "errmsg": "d2/testdata/d2compiler/TestCompile/reserved_missing_values.d2:2:3: reserved field \"width\" must have a value" + }, + { + "range": "d2/testdata/d2compiler/TestCompile/reserved_missing_values.d2,3:2:29-3:6:33", + "errmsg": "d2/testdata/d2compiler/TestCompile/reserved_missing_values.d2:4:3: reserved field \"left\" must have a value" + } + ] + } +} diff --git a/testdata/d2compiler/TestCompile/reserved_quoted/1.exp.json b/testdata/d2compiler/TestCompile/reserved_quoted/1.exp.json new file mode 100644 index 000000000..f9f9c6a0d --- /dev/null +++ b/testdata/d2compiler/TestCompile/reserved_quoted/1.exp.json @@ -0,0 +1,193 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/1.d2,0:0:0-3:0:24", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/1.d2,0:0:0-2:1:23", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/1.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/1.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/1.d2,0:3:3-2:1:23", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/1.d2,1:2:7-1:16:21", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/1.d2,1:2:7-1:9:14", + "path": [ + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/1.d2,1:2:7-1:9:14", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/1.d2,1:11:16-1:16:21", + "value": [ + { + "string": "hello", + "raw_string": "hello" + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/1.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/1.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "x" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "label", + "id_val": "label", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/1.d2,1:2:7-1:9:14", + "path": [ + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/1.d2,1:2:7-1:9:14", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "hello" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile/reserved_quoted/2.exp.json b/testdata/d2compiler/TestCompile/reserved_quoted/2.exp.json new file mode 100644 index 000000000..5ec7efcd3 --- /dev/null +++ b/testdata/d2compiler/TestCompile/reserved_quoted/2.exp.json @@ -0,0 +1,459 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/2.d2,0:0:0-9:2:128", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/2.d2,0:0:0-8:1:125", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/2.d2,0:0:0-0:8:8", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/2.d2,0:0:0-0:8:8", + "value": [ + { + "string": "my_table", + "raw_string": "my_table" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/2.d2,0:10:10-8:1:125", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/2.d2,1:2:14-1:18:30", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/2.d2,1:2:14-1:7:19", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/2.d2,1:2:14-1:7:19", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/2.d2,1:9:21-1:18:30", + "value": [ + { + "string": "sql_table", + "raw_string": "sql_table" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/2.d2,2:2:33-2:12:43", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/2.d2,2:2:33-2:7:38", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/2.d2,2:2:33-2:7:38", + "value": [ + { + "string": "width", + "raw_string": "width" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "number": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/2.d2,2:9:40-2:12:43", + "raw": "200", + "value": "200" + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/2.d2,3:2:46-3:13:57", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/2.d2,3:2:46-3:8:52", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/2.d2,3:2:46-3:8:52", + "value": [ + { + "string": "height", + "raw_string": "height" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "number": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/2.d2,3:10:54-3:13:57", + "raw": "200", + "value": "200" + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/2.d2,4:2:60-4:17:75", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/2.d2,4:2:60-4:9:67", + "path": [ + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/2.d2,4:2:60-4:9:67", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/2.d2,4:11:69-4:17:75", + "value": [ + { + "string": "string", + "raw_string": "string" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/2.d2,5:2:78-5:16:92", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/2.d2,5:2:78-5:8:84", + "path": [ + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/2.d2,5:2:78-5:8:84", + "value": [ + { + "string": "icon", + "raw_string": "icon" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/2.d2,5:10:86-5:16:92", + "value": [ + { + "string": "string", + "raw_string": "string" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/2.d2,6:2:95-6:14:107", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/2.d2,6:2:95-6:9:102", + "path": [ + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/2.d2,6:2:95-6:9:102", + "value": [ + { + "string": "width", + "raw_string": "width" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/2.d2,6:11:104-6:14:107", + "value": [ + { + "string": "int", + "raw_string": "int" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/2.d2,7:2:110-7:15:123", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/2.d2,7:2:110-7:10:118", + "path": [ + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/2.d2,7:2:110-7:10:118", + "value": [ + { + "string": "height", + "raw_string": "height" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/2.d2,7:12:120-7:15:123", + "value": [ + { + "string": "int", + "raw_string": "int" + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "my_table", + "id_val": "my_table", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/2.d2,0:0:0-0:8:8", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/2.d2,0:0:0-0:8:8", + "value": [ + { + "string": "my_table", + "raw_string": "my_table" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "sql_table": { + "columns": [ + { + "name": { + "label": "shape", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0 + }, + "type": { + "label": "string", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0 + }, + "constraint": null, + "reference": "" + }, + { + "name": { + "label": "icon", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0 + }, + "type": { + "label": "string", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0 + }, + "constraint": null, + "reference": "" + }, + { + "name": { + "label": "width", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0 + }, + "type": { + "label": "int", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0 + }, + "constraint": null, + "reference": "" + }, + { + "name": { + "label": "height", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0 + }, + "type": { + "label": "int", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0 + }, + "constraint": null, + "reference": "" + } + ] + }, + "attributes": { + "label": { + "value": "my_table" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "width": { + "value": "200" + }, + "height": { + "value": "200" + }, + "near_key": null, + "shape": { + "value": "sql_table" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile/reserved_quoted/3.exp.json b/testdata/d2compiler/TestCompile/reserved_quoted/3.exp.json new file mode 100644 index 000000000..3ca4731d6 --- /dev/null +++ b/testdata/d2compiler/TestCompile/reserved_quoted/3.exp.json @@ -0,0 +1,239 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/3.d2,0:0:0-2:2:14", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/3.d2,0:0:0-0:9:9", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/3.d2,0:0:0-0:9:9", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/3.d2,0:0:0-0:1:1", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/3.d2,0:2:2-0:9:9", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/3.d2,1:0:10-1:1:11", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/3.d2,1:0:10-1:1:11", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/3.d2,1:0:10-1:1:11", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "shape", + "id_val": "shape", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/3.d2,0:0:0-0:9:9", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/3.d2,0:0:0-0:1:1", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/3.d2,0:2:2-0:9:9", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "key_path_index": 1, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/3.d2,0:0:0-0:9:9", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/3.d2,0:0:0-0:1:1", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/3.d2,0:2:2-0:9:9", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "key_path_index": 1, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "shape" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/3.d2,1:0:10-1:1:11", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/3.d2,1:0:10-1:1:11", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "x" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile/reserved_quoted/4.exp.json b/testdata/d2compiler/TestCompile/reserved_quoted/4.exp.json new file mode 100644 index 000000000..56b7aa426 --- /dev/null +++ b/testdata/d2compiler/TestCompile/reserved_quoted/4.exp.json @@ -0,0 +1,288 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/4.d2,0:0:0-0:16:16", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/4.d2,0:0:0-0:16:16", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/4.d2,0:0:0-0:16:16", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/4.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/4.d2,0:2:2-0:9:9", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/4.d2,0:10:10-0:16:16", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/4.d2,0:0:0-0:16:16", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/4.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/4.d2,0:2:2-0:9:9", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/4.d2,0:10:10-0:16:16", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "x" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "style", + "id_val": "style", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/4.d2,0:0:0-0:16:16", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/4.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/4.d2,0:2:2-0:9:9", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/4.d2,0:10:10-0:16:16", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "key_path_index": 1, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "style" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "fill", + "id_val": "fill", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/4.d2,0:0:0-0:16:16", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/4.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/4.d2,0:2:2-0:9:9", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/reserved_quoted/4.d2,0:10:10-0:16:16", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "key_path_index": 2, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "fill" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile/root_direction.exp.json b/testdata/d2compiler/TestCompile/root_direction.exp.json index a61670cdc..0a385ea52 100644 --- a/testdata/d2compiler/TestCompile/root_direction.exp.json +++ b/testdata/d2compiler/TestCompile/root_direction.exp.json @@ -52,6 +52,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" diff --git a/testdata/d2compiler/TestCompile/root_sequence.exp.json b/testdata/d2compiler/TestCompile/root_sequence.exp.json index 4fa6ad4a8..a48c41800 100644 --- a/testdata/d2compiler/TestCompile/root_sequence.exp.json +++ b/testdata/d2compiler/TestCompile/root_sequence.exp.json @@ -52,6 +52,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "sequence_diagram" diff --git a/testdata/d2compiler/TestCompile/self-referencing.exp.json b/testdata/d2compiler/TestCompile/self-referencing.exp.json index 461633527..1160ba8f2 100644 --- a/testdata/d2compiler/TestCompile/self-referencing.exp.json +++ b/testdata/d2compiler/TestCompile/self-referencing.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -96,6 +97,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -163,6 +165,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/sequence-diagram-icons.exp.json b/testdata/d2compiler/TestCompile/sequence-diagram-icons.exp.json index ff10cdd9d..45b32d268 100644 --- a/testdata/d2compiler/TestCompile/sequence-diagram-icons.exp.json +++ b/testdata/d2compiler/TestCompile/sequence-diagram-icons.exp.json @@ -381,6 +381,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "sequence_diagram" @@ -412,6 +413,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -442,6 +444,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -595,6 +598,7 @@ "Fragment": "", "RawFragment": "" }, + "iconStyle": {}, "near_key": null, "shape": { "value": "image" @@ -660,6 +664,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -725,6 +730,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -781,6 +787,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -837,6 +844,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -893,6 +901,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json b/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json index 4c90eaac0..06a6cb6bc 100644 --- a/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json +++ b/testdata/d2compiler/TestCompile/sequence-timestamp.exp.json @@ -236,6 +236,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "sequence_diagram" @@ -267,6 +268,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -365,6 +367,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -430,6 +433,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -475,6 +479,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -520,6 +525,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -576,6 +582,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/sequence_container.exp.json b/testdata/d2compiler/TestCompile/sequence_container.exp.json index 5dd16ad44..5203a8c4b 100644 --- a/testdata/d2compiler/TestCompile/sequence_container.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_container.exp.json @@ -261,6 +261,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "sequence_diagram" @@ -292,6 +293,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -322,6 +324,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -433,6 +436,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -542,6 +546,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -651,6 +656,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -760,6 +766,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -869,6 +876,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -978,6 +986,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1023,6 +1032,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/sequence_container_2.exp.json b/testdata/d2compiler/TestCompile/sequence_container_2.exp.json index 503423b6c..91c242c78 100644 --- a/testdata/d2compiler/TestCompile/sequence_container_2.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_container_2.exp.json @@ -239,6 +239,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "sequence_diagram" @@ -270,6 +271,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -381,6 +383,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -490,6 +493,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -599,6 +603,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -644,6 +649,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -711,6 +717,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -778,6 +785,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -845,6 +853,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -890,6 +899,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json b/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json index 1958d8227..fa415091a 100644 --- a/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_grouped_note.exp.json @@ -161,6 +161,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "sequence_diagram" @@ -208,6 +209,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -284,6 +286,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -329,6 +332,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -385,6 +389,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/sequence_scoping.exp.json b/testdata/d2compiler/TestCompile/sequence_scoping.exp.json index 0870aa4c1..1226ba7fc 100644 --- a/testdata/d2compiler/TestCompile/sequence_scoping.exp.json +++ b/testdata/d2compiler/TestCompile/sequence_scoping.exp.json @@ -349,6 +349,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -380,6 +381,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -410,6 +412,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -440,6 +443,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -487,6 +491,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "sequence_diagram" @@ -583,6 +588,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -752,6 +758,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -797,6 +804,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -853,6 +861,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -982,6 +991,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1049,6 +1059,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/set_direction.exp.json b/testdata/d2compiler/TestCompile/set_direction.exp.json index b59d6d0da..e8b9461bb 100644 --- a/testdata/d2compiler/TestCompile/set_direction.exp.json +++ b/testdata/d2compiler/TestCompile/set_direction.exp.json @@ -81,6 +81,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -128,6 +129,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/shape-hierarchy.exp.json b/testdata/d2compiler/TestCompile/shape-hierarchy.exp.json index a2f5aca09..f337fbe56 100644 --- a/testdata/d2compiler/TestCompile/shape-hierarchy.exp.json +++ b/testdata/d2compiler/TestCompile/shape-hierarchy.exp.json @@ -127,6 +127,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -158,6 +159,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -205,6 +207,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "hierarchy" @@ -250,6 +253,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -295,6 +299,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/shape_edge_style.exp.json b/testdata/d2compiler/TestCompile/shape_edge_style.exp.json index 83e7f0642..6cf7bad88 100644 --- a/testdata/d2compiler/TestCompile/shape_edge_style.exp.json +++ b/testdata/d2compiler/TestCompile/shape_edge_style.exp.json @@ -1,11 +1,157 @@ { - "graph": null, - "err": { - "errs": [ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/shape_edge_style.d2,0:0:0-4:0:30", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/shape_edge_style.d2,1:0:1-3:1:29", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/shape_edge_style.d2,1:0:1-1:1:2", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/shape_edge_style.d2,1:0:1-1:1:2", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/shape_edge_style.d2,1:3:4-3:1:29", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/shape_edge_style.d2,2:1:7-2:21:27", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/shape_edge_style.d2,2:1:7-2:15:21", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/shape_edge_style.d2,2:1:7-2:6:12", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/shape_edge_style.d2,2:7:13-2:15:21", + "value": [ + { + "string": "animated", + "raw_string": "animated" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "boolean": { + "range": "d2/testdata/d2compiler/TestCompile/shape_edge_style.d2,2:17:23-2:21:27", + "value": true + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ { - "range": "d2/testdata/d2compiler/TestCompile/shape_edge_style.d2,2:1:7-2:21:27", - "errmsg": "d2/testdata/d2compiler/TestCompile/shape_edge_style.d2:3:2: key \"animated\" can only be applied to edges" + "id": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/shape_edge_style.d2,1:0:1-1:1:2", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/shape_edge_style.d2,1:0:1-1:1:2", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "x" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "animated": { + "value": "true" + } + }, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 } ] - } + }, + "err": null } diff --git a/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json b/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json index 3cf517caa..91bd0d318 100644 --- a/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json +++ b/testdata/d2compiler/TestCompile/single_dimension_on_circle.exp.json @@ -115,6 +115,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -162,6 +163,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "height": { "value": "230" }, diff --git a/testdata/d2compiler/TestCompile/spread-import-link.exp.json b/testdata/d2compiler/TestCompile/spread-import-link.exp.json index a3fbe8c23..317c97be7 100644 --- a/testdata/d2compiler/TestCompile/spread-import-link.exp.json +++ b/testdata/d2compiler/TestCompile/spread-import-link.exp.json @@ -120,6 +120,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -167,6 +168,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -184,7 +186,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/spread-import-link.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -194,10 +196,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -207,7 +210,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -217,10 +220,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:2:2-0:6:6", "value": [ { - "string": "link" + "string": "link", + "raw_string": "link" } ] } @@ -253,10 +257,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,1:0:17-1:6:23", "value": [ { - "string": "layers" + "string": "layers", + "raw_string": "layers" } ] } @@ -266,7 +271,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -276,10 +281,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,2:2:29-2:3:30", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -289,7 +295,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -299,10 +305,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,3:4:38-3:5:39", "value": [ { - "string": "d" + "string": "d", + "raw_string": "d" } ] } @@ -337,6 +344,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -395,6 +403,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "root.layers.x.layers.b" }, @@ -415,7 +424,7 @@ "name": "b", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -425,10 +434,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile/x.d2,3:4:38-3:5:39", "value": [ { - "string": "d" + "string": "d", + "raw_string": "d" } ] } @@ -453,6 +463,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -500,6 +511,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/spread_var_order.exp.json b/testdata/d2compiler/TestCompile/spread_var_order.exp.json index c71ac28d6..d18b6a528 100644 --- a/testdata/d2compiler/TestCompile/spread_var_order.exp.json +++ b/testdata/d2compiler/TestCompile/spread_var_order.exp.json @@ -213,6 +213,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -260,6 +261,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -305,6 +307,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -350,6 +353,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/sql-constraints.exp.json b/testdata/d2compiler/TestCompile/sql-constraints.exp.json index db24296fa..b09356ed4 100644 --- a/testdata/d2compiler/TestCompile/sql-constraints.exp.json +++ b/testdata/d2compiler/TestCompile/sql-constraints.exp.json @@ -243,6 +243,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -355,6 +356,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "sql_table" diff --git a/testdata/d2compiler/TestCompile/sql-null-constraint.exp.json b/testdata/d2compiler/TestCompile/sql-null-constraint.exp.json index c07b88b69..d8fa1b51c 100644 --- a/testdata/d2compiler/TestCompile/sql-null-constraint.exp.json +++ b/testdata/d2compiler/TestCompile/sql-null-constraint.exp.json @@ -220,6 +220,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -329,6 +330,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "sql_table" diff --git a/testdata/d2compiler/TestCompile/sql-regression.exp.json b/testdata/d2compiler/TestCompile/sql-regression.exp.json index 64b5d46e5..790a983d9 100644 --- a/testdata/d2compiler/TestCompile/sql-regression.exp.json +++ b/testdata/d2compiler/TestCompile/sql-regression.exp.json @@ -218,6 +218,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -269,6 +270,7 @@ "value": "lemonchiffon" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -346,6 +348,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "sql_table" @@ -391,6 +394,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/sql_paren.exp.json b/testdata/d2compiler/TestCompile/sql_paren.exp.json index 8064ff8ed..298d2b6e7 100644 --- a/testdata/d2compiler/TestCompile/sql_paren.exp.json +++ b/testdata/d2compiler/TestCompile/sql_paren.exp.json @@ -157,6 +157,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -264,6 +265,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "sql_table" diff --git a/testdata/d2compiler/TestCompile/stroke-width.exp.json b/testdata/d2compiler/TestCompile/stroke-width.exp.json index 1be890e5d..61ed5576b 100644 --- a/testdata/d2compiler/TestCompile/stroke-width.exp.json +++ b/testdata/d2compiler/TestCompile/stroke-width.exp.json @@ -88,6 +88,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -139,6 +140,7 @@ "value": "0" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/table_connection_attr.exp.json b/testdata/d2compiler/TestCompile/table_connection_attr.exp.json index 9012bd927..7bbb316a5 100644 --- a/testdata/d2compiler/TestCompile/table_connection_attr.exp.json +++ b/testdata/d2compiler/TestCompile/table_connection_attr.exp.json @@ -302,6 +302,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -339,6 +340,7 @@ "value": "true" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -449,6 +451,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "sql_table" @@ -557,6 +560,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "sql_table" diff --git a/testdata/d2compiler/TestCompile/table_style.exp.json b/testdata/d2compiler/TestCompile/table_style.exp.json index b68772eff..917b1488f 100644 --- a/testdata/d2compiler/TestCompile/table_style.exp.json +++ b/testdata/d2compiler/TestCompile/table_style.exp.json @@ -154,6 +154,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -237,6 +238,7 @@ "value": "0.4" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "sql_table" diff --git a/testdata/d2compiler/TestCompile/table_style_map.exp.json b/testdata/d2compiler/TestCompile/table_style_map.exp.json index bd065d54f..c167b8a2d 100644 --- a/testdata/d2compiler/TestCompile/table_style_map.exp.json +++ b/testdata/d2compiler/TestCompile/table_style_map.exp.json @@ -205,6 +205,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -291,6 +292,7 @@ "value": "blue" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "sql_table" diff --git a/testdata/d2compiler/TestCompile/text-transform.exp.json b/testdata/d2compiler/TestCompile/text-transform.exp.json index 6d32e0f75..4a0f683c6 100644 --- a/testdata/d2compiler/TestCompile/text-transform.exp.json +++ b/testdata/d2compiler/TestCompile/text-transform.exp.json @@ -286,6 +286,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -321,6 +322,7 @@ "value": "capitalize" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -414,6 +416,7 @@ "value": "uppercase" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -505,6 +508,7 @@ "value": "lowercase" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/underscore_connection.exp.json b/testdata/d2compiler/TestCompile/underscore_connection.exp.json index a1f7d0132..baa8fd2db 100644 --- a/testdata/d2compiler/TestCompile/underscore_connection.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_connection.exp.json @@ -138,6 +138,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -169,6 +170,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -216,6 +218,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -325,6 +328,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -392,6 +396,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -459,6 +464,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/underscore_edge.exp.json b/testdata/d2compiler/TestCompile/underscore_edge.exp.json index 3e00fcc33..2bf15a15d 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge.exp.json @@ -116,6 +116,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -147,6 +148,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -225,6 +227,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -281,6 +284,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json index ab721e9e3..ed6afd89d 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_chain.exp.json @@ -175,6 +175,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -206,6 +207,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -236,6 +238,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -345,6 +348,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -401,6 +405,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -457,6 +462,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json index 7b44d6ac8..b130d3304 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_existing.exp.json @@ -182,6 +182,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -213,6 +214,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -243,6 +245,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -321,6 +324,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -397,6 +401,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -442,6 +447,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json index 25aa72494..7d96d4e5f 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_index.exp.json @@ -187,6 +187,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -221,6 +222,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -268,6 +270,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -313,6 +316,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -358,6 +362,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json b/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json index 3533194a7..76b39644a 100644 --- a/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_edge_nested.exp.json @@ -156,6 +156,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -187,6 +188,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -234,6 +236,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -310,6 +313,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -377,6 +381,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json index 1145d7dcb..43d78caf3 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_create.exp.json @@ -82,6 +82,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -129,6 +130,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -185,6 +187,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json index f2af3ad4d..e3b4b235f 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_not_root.exp.json @@ -111,6 +111,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -158,6 +159,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -203,6 +205,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -259,6 +262,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json index 8e1ecb3f2..35798e4f8 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_preference_1.exp.json @@ -125,6 +125,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -172,6 +173,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -248,6 +250,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json index e8850d2a2..6c9079e71 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_preference_2.exp.json @@ -125,6 +125,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -203,6 +204,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -248,6 +250,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json b/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json index 7d9f8ed7f..be7f6a60f 100644 --- a/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_parent_squared.exp.json @@ -122,6 +122,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -169,6 +170,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -214,6 +216,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -281,6 +284,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json b/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json index 2caaa6a50..a4eea2c07 100644 --- a/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json +++ b/testdata/d2compiler/TestCompile/underscore_unresolved_obj.exp.json @@ -82,6 +82,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -129,6 +130,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -185,6 +187,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json b/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json index 2b2f1b4f8..ee8cb5b52 100644 --- a/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json +++ b/testdata/d2compiler/TestCompile/unescaped_id_cr.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/url_link.exp.json b/testdata/d2compiler/TestCompile/url_link.exp.json index 0ee2c0378..2088ee53c 100644 --- a/testdata/d2compiler/TestCompile/url_link.exp.json +++ b/testdata/d2compiler/TestCompile/url_link.exp.json @@ -81,6 +81,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -128,6 +129,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "https://google.com" }, diff --git a/testdata/d2compiler/TestCompile/url_link_and_not_url_tooltip_concurrently.exp.json b/testdata/d2compiler/TestCompile/url_link_and_not_url_tooltip_concurrently.exp.json index 4fc6b9851..e118daffd 100644 --- a/testdata/d2compiler/TestCompile/url_link_and_not_url_tooltip_concurrently.exp.json +++ b/testdata/d2compiler/TestCompile/url_link_and_not_url_tooltip_concurrently.exp.json @@ -114,6 +114,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -161,6 +162,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "tooltip": { "value": "hello world" }, diff --git a/testdata/d2compiler/TestCompile/url_link_and_path_url_label_concurrently.exp.json b/testdata/d2compiler/TestCompile/url_link_and_path_url_label_concurrently.exp.json new file mode 100644 index 000000000..7915a7835 --- /dev/null +++ b/testdata/d2compiler/TestCompile/url_link_and_path_url_label_concurrently.exp.json @@ -0,0 +1,261 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/url_link_and_path_url_label_concurrently.d2,0:0:0-0:46:46", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/url_link_and_path_url_label_concurrently.d2,0:0:0-0:46:46", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile/url_link_and_path_url_label_concurrently.d2,0:0:0-0:6:6", + "src": { + "range": "d2/testdata/d2compiler/TestCompile/url_link_and_path_url_label_concurrently.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/url_link_and_path_url_label_concurrently.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile/url_link_and_path_url_label_concurrently.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/url_link_and_path_url_label_concurrently.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/url_link_and_path_url_label_concurrently.d2,0:8:8-0:19:19", + "value": [ + { + "string": "hello world", + "raw_string": "hello world" + } + ] + } + }, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/url_link_and_path_url_label_concurrently.d2,0:20:20-0:46:46", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/url_link_and_path_url_label_concurrently.d2,0:21:21-0:45:45", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/url_link_and_path_url_label_concurrently.d2,0:21:21-0:25:25", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/url_link_and_path_url_label_concurrently.d2,0:21:21-0:25:25", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/url_link_and_path_url_label_concurrently.d2,0:27:27-0:45:45", + "value": [ + { + "string": "https://google.com", + "raw_string": "https://google.com" + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": [ + { + "index": 0, + "isCurve": false, + "src_arrow": false, + "dst_arrow": true, + "references": [ + { + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "hello world" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "link": { + "value": "https://google.com" + }, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ], + "objects": [ + { + "id": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/url_link_and_path_url_label_concurrently.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/url_link_and_path_url_label_concurrently.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "x" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "y", + "id_val": "y", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/url_link_and_path_url_label_concurrently.d2,0:5:5-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/url_link_and_path_url_label_concurrently.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "y" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile/url_link_and_path_url_label_ok.exp.json b/testdata/d2compiler/TestCompile/url_link_and_path_url_label_ok.exp.json new file mode 100644 index 000000000..f92df7b13 --- /dev/null +++ b/testdata/d2compiler/TestCompile/url_link_and_path_url_label_ok.exp.json @@ -0,0 +1,247 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/url_link_and_path_url_label_ok.d2,0:0:0-0:43:43", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/url_link_and_path_url_label_ok.d2,0:0:0-0:43:43", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile/url_link_and_path_url_label_ok.d2,0:0:0-0:11:11", + "src": { + "range": "d2/testdata/d2compiler/TestCompile/url_link_and_path_url_label_ok.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/url_link_and_path_url_label_ok.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile/url_link_and_path_url_label_ok.d2,0:5:5-0:11:11", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/url_link_and_path_url_label_ok.d2,0:5:5-0:11:11", + "value": [ + { + "string": "y note", + "raw_string": "y note" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/url_link_and_path_url_label_ok.d2,0:13:13-0:43:43", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/url_link_and_path_url_label_ok.d2,0:14:14-0:42:42", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/url_link_and_path_url_label_ok.d2,0:14:14-0:18:18", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/url_link_and_path_url_label_ok.d2,0:14:14-0:18:18", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/url_link_and_path_url_label_ok.d2,0:20:20-0:42:42", + "value": [ + { + "string": "https://not-google.com", + "raw_string": "https://not-google.com" + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": [ + { + "index": 0, + "isCurve": false, + "src_arrow": false, + "dst_arrow": true, + "references": [ + { + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "link": { + "value": "https://not-google.com" + }, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ], + "objects": [ + { + "id": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/url_link_and_path_url_label_ok.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/url_link_and_path_url_label_ok.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "x" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "y note", + "id_val": "y note", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/url_link_and_path_url_label_ok.d2,0:5:5-0:11:11", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/url_link_and_path_url_label_ok.d2,0:5:5-0:11:11", + "value": [ + { + "string": "y note", + "raw_string": "y note" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "y note" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile/url_link_non_url_tooltip_ok.exp.json b/testdata/d2compiler/TestCompile/url_link_non_url_tooltip_ok.exp.json index 55017b2a1..ce81bdb9f 100644 --- a/testdata/d2compiler/TestCompile/url_link_non_url_tooltip_ok.exp.json +++ b/testdata/d2compiler/TestCompile/url_link_non_url_tooltip_ok.exp.json @@ -114,6 +114,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -161,6 +162,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "tooltip": { "value": "note: url.ParseRequestURI might see this as a URL" }, diff --git a/testdata/d2compiler/TestCompile/url_relative_link.exp.json b/testdata/d2compiler/TestCompile/url_relative_link.exp.json new file mode 100644 index 000000000..1a1f3899d --- /dev/null +++ b/testdata/d2compiler/TestCompile/url_relative_link.exp.json @@ -0,0 +1,150 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/url_relative_link.d2,0:0:0-3:0:23", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/url_relative_link.d2,0:0:0-2:1:22", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/url_relative_link.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/url_relative_link.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/url_relative_link.d2,0:3:3-2:1:22", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/url_relative_link.d2,1:2:7-1:15:20", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/url_relative_link.d2,1:2:7-1:6:11", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/url_relative_link.d2,1:2:7-1:6:11", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/url_relative_link.d2,1:8:13-1:15:20", + "value": [ + { + "string": "/google", + "raw_string": "/google" + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/url_relative_link.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/url_relative_link.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "x" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "link": { + "value": "/google" + }, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile/url_tooltip.exp.json b/testdata/d2compiler/TestCompile/url_tooltip.exp.json index 5191349ed..3ceaabfef 100644 --- a/testdata/d2compiler/TestCompile/url_tooltip.exp.json +++ b/testdata/d2compiler/TestCompile/url_tooltip.exp.json @@ -81,6 +81,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -128,6 +129,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "tooltip": { "value": "https://google.com" }, diff --git a/testdata/d2compiler/TestCompile/var_in_glob.exp.json b/testdata/d2compiler/TestCompile/var_in_glob.exp.json index d4ca77cc6..6002ce862 100644 --- a/testdata/d2compiler/TestCompile/var_in_glob.exp.json +++ b/testdata/d2compiler/TestCompile/var_in_glob.exp.json @@ -198,6 +198,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -229,6 +230,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -276,6 +278,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -321,6 +324,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -366,6 +370,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -411,6 +416,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/var_in_markdown.exp.json b/testdata/d2compiler/TestCompile/var_in_markdown.exp.json new file mode 100644 index 000000000..c817c276b --- /dev/null +++ b/testdata/d2compiler/TestCompile/var_in_markdown.exp.json @@ -0,0 +1,178 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/var_in_markdown.d2,0:0:0-15:0:90", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/var_in_markdown.d2,0:0:0-2:1:17", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/var_in_markdown.d2,0:0:0-0:4:4", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/var_in_markdown.d2,0:0:0-0:4:4", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/var_in_markdown.d2,0:6:6-2:1:17", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/var_in_markdown.d2,1:2:10-1:7:15", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/var_in_markdown.d2,1:2:10-1:3:11", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/var_in_markdown.d2,1:2:10-1:3:11", + "value": [ + { + "string": "v", + "raw_string": "v" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/var_in_markdown.d2,1:5:13-1:7:15", + "value": [ + { + "string": "ok", + "raw_string": "ok" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/var_in_markdown.d2,4:0:19-14:1:89", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/var_in_markdown.d2,4:0:19-4:1:20", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/var_in_markdown.d2,4:0:19-4:1:20", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "block_string": { + "range": "d2/testdata/d2compiler/TestCompile/var_in_markdown.d2,4:3:22-14:1:89", + "quote": "", + "tag": "md", + "value": "moky\n\n`hey ${v}`\n\nregular markdown\n\n```\nbye ${v}\n```" + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/var_in_markdown.d2,4:0:19-4:1:20", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/var_in_markdown.d2,4:0:19-4:1:20", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "moky\n\n`hey ${v}`\n\nregular markdown\n\n```\nbye ${v}\n```" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "language": "markdown", + "shape": { + "value": "text" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile/var_in_vars.exp.json b/testdata/d2compiler/TestCompile/var_in_vars.exp.json index 3e371542b..4c3c46b85 100644 --- a/testdata/d2compiler/TestCompile/var_in_vars.exp.json +++ b/testdata/d2compiler/TestCompile/var_in_vars.exp.json @@ -553,6 +553,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -584,6 +585,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -631,6 +633,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" @@ -676,6 +679,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" @@ -721,6 +725,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -786,6 +791,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" @@ -851,6 +857,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" diff --git a/testdata/d2compiler/TestCompile/var_nested_in_markdown.exp.json b/testdata/d2compiler/TestCompile/var_nested_in_markdown.exp.json new file mode 100644 index 000000000..14d120f4b --- /dev/null +++ b/testdata/d2compiler/TestCompile/var_nested_in_markdown.exp.json @@ -0,0 +1,207 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile/var_nested_in_markdown.d2,0:0:0-9:0:50", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/var_nested_in_markdown.d2,0:0:0-4:1:28", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/var_nested_in_markdown.d2,0:0:0-0:4:4", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/var_nested_in_markdown.d2,0:0:0-0:4:4", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/var_nested_in_markdown.d2,0:6:6-4:1:28", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/var_nested_in_markdown.d2,1:2:10-3:3:26", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/var_nested_in_markdown.d2,1:2:10-1:3:11", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/var_nested_in_markdown.d2,1:2:10-1:3:11", + "value": [ + { + "string": "v", + "raw_string": "v" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile/var_nested_in_markdown.d2,1:5:13-3:3:26", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/var_nested_in_markdown.d2,2:2:17-2:7:22", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/var_nested_in_markdown.d2,2:2:17-2:3:18", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/var_nested_in_markdown.d2,2:2:17-2:3:18", + "value": [ + { + "string": "g", + "raw_string": "g" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/var_nested_in_markdown.d2,2:5:20-2:7:22", + "value": [ + { + "string": "ok", + "raw_string": "ok" + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile/var_nested_in_markdown.d2,6:0:30-8:1:49", + "key": { + "range": "d2/testdata/d2compiler/TestCompile/var_nested_in_markdown.d2,6:0:30-6:1:31", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/var_nested_in_markdown.d2,6:0:30-6:1:31", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "block_string": { + "range": "d2/testdata/d2compiler/TestCompile/var_nested_in_markdown.d2,6:3:33-8:1:49", + "quote": "", + "tag": "md", + "value": "moky" + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile/var_nested_in_markdown.d2,6:0:30-6:1:31", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile/var_nested_in_markdown.d2,6:0:30-6:1:31", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "moky" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "language": "markdown", + "shape": { + "value": "text" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile/vars-in-imports.exp.json b/testdata/d2compiler/TestCompile/vars-in-imports.exp.json index 05c63f5e3..416f9b8ad 100644 --- a/testdata/d2compiler/TestCompile/vars-in-imports.exp.json +++ b/testdata/d2compiler/TestCompile/vars-in-imports.exp.json @@ -241,6 +241,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -288,6 +289,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -333,6 +335,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -378,6 +381,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -423,6 +427,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -468,6 +473,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -513,6 +519,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile/wrong_column_index.exp.json b/testdata/d2compiler/TestCompile/wrong_column_index.exp.json index 555ed3efc..c8b6b2b06 100644 --- a/testdata/d2compiler/TestCompile/wrong_column_index.exp.json +++ b/testdata/d2compiler/TestCompile/wrong_column_index.exp.json @@ -703,6 +703,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -736,6 +737,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -992,6 +994,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "sql_table" @@ -1160,6 +1163,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "sql_table" diff --git a/testdata/d2compiler/TestCompile2/boards/board-label-primary.exp.json b/testdata/d2compiler/TestCompile2/boards/board-label-primary.exp.json new file mode 100644 index 000000000..cc6d74f2e --- /dev/null +++ b/testdata/d2compiler/TestCompile2/boards/board-label-primary.exp.json @@ -0,0 +1,529 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/board-label-primary.d2,0:0:0-10:0:70", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/board-label-primary.d2,0:0:0-0:2:2", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/board-label-primary.d2,0:0:0-0:2:2", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/board-label-primary.d2,0:0:0-0:2:2", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/board-label-primary.d2,1:0:3-9:1:69", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/board-label-primary.d2,1:0:3-1:6:9", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/board-label-primary.d2,1:0:3-1:6:9", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/board-label-primary.d2,1:8:11-9:1:69", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/board-label-primary.d2,2:2:15-4:3:34", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/board-label-primary.d2,2:2:15-2:3:16", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/board-label-primary.d2,2:2:15-2:3:16", + "value": [ + { + "string": "1", + "raw_string": "1" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/board-label-primary.d2,2:5:18-2:8:21", + "value": [ + { + "string": "one", + "raw_string": "one" + } + ] + } + }, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/board-label-primary.d2,2:9:22-4:3:34", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/board-label-primary.d2,3:4:28-3:6:30", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/board-label-primary.d2,3:4:28-3:6:30", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/board-label-primary.d2,3:4:28-3:6:30", + "value": [ + { + "string": "RJ", + "raw_string": "RJ" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/board-label-primary.d2,5:2:37-8:3:67", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/board-label-primary.d2,5:2:37-5:3:38", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/board-label-primary.d2,5:2:37-5:3:38", + "value": [ + { + "string": "2", + "raw_string": "2" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/board-label-primary.d2,5:5:40-8:3:67", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/board-label-primary.d2,6:4:46-6:14:56", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/board-label-primary.d2,6:4:46-6:9:51", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/board-label-primary.d2,6:4:46-6:9:51", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/board-label-primary.d2,6:11:53-6:14:56", + "value": [ + { + "string": "two", + "raw_string": "two" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/board-label-primary.d2,7:4:61-7:6:63", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/board-label-primary.d2,7:4:61-7:6:63", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/board-label-primary.d2,7:4:61-7:6:63", + "value": [ + { + "string": "RJ", + "raw_string": "RJ" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "hi", + "id_val": "hi", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/board-label-primary.d2,0:0:0-0:2:2", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/board-label-primary.d2,0:0:0-0:2:2", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "hi" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ], + "layers": [ + { + "name": "1", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/board-label-primary.d2,0:0:0-1:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/board-label-primary.d2,3:4:28-3:6:30", + "value": [ + { + "string": "RJ", + "raw_string": "RJ" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "one" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "RJ", + "id_val": "RJ", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/board-label-primary.d2,3:4:28-3:6:30", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/board-label-primary.d2,3:4:28-3:6:30", + "value": [ + { + "string": "RJ", + "raw_string": "RJ" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "RJ" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + { + "name": "2", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/board-label-primary.d2,0:0:0-1:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/board-label-primary.d2,6:4:46-6:9:51", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/board-label-primary.d2,6:11:53-6:14:56", + "value": [ + { + "string": "two", + "raw_string": "two" + } + ] + } + }, + "value": {} + } + }, + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/board-label-primary.d2,7:4:61-7:6:63", + "value": [ + { + "string": "RJ", + "raw_string": "RJ" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "two" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "RJ", + "id_val": "RJ", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/board-label-primary.d2,7:4:61-7:6:63", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/board-label-primary.d2,7:4:61-7:6:63", + "value": [ + { + "string": "RJ", + "raw_string": "RJ" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "RJ" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile2/boards/isFolderOnly-shapes.exp.json b/testdata/d2compiler/TestCompile2/boards/isFolderOnly-shapes.exp.json index cd20cadf7..712ab3ec6 100644 --- a/testdata/d2compiler/TestCompile2/boards/isFolderOnly-shapes.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/isFolderOnly-shapes.exp.json @@ -133,6 +133,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -151,7 +152,7 @@ "name": "1", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly-shapes.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -161,10 +162,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly-shapes.d2,1:0:1-1:9:10", "value": [ { - "string": "direction" + "string": "direction", + "raw_string": "direction" } ] } @@ -193,10 +195,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly-shapes.d2,5:4:39-5:6:41", "value": [ { - "string": "RJ" + "string": "RJ", + "raw_string": "RJ" } ] } @@ -221,6 +224,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -268,6 +272,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json b/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json index 8cdf54d08..ab399402b 100644 --- a/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/isFolderOnly.exp.json @@ -304,6 +304,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -322,7 +323,7 @@ "name": "one", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -332,10 +333,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,3:4:24-3:9:29", "value": [ { - "string": "santa" + "string": "santa", + "raw_string": "santa" } ] } @@ -360,6 +362,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -407,6 +410,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -424,7 +428,7 @@ "name": "two", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -434,10 +438,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53", "value": [ { - "string": "clause" + "string": "clause", + "raw_string": "clause" } ] } @@ -456,10 +461,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,7:2:56-7:11:65", "value": [ { - "string": "scenarios" + "string": "scenarios", + "raw_string": "scenarios" } ] } @@ -469,7 +475,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -479,10 +485,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,8:3:72-8:11:80", "value": [ { - "string": "seinfeld" + "string": "seinfeld", + "raw_string": "seinfeld" } ] } @@ -492,7 +499,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -502,10 +509,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53", "value": [ { - "string": "clause" + "string": "clause", + "raw_string": "clause" } ] } @@ -529,10 +537,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,10:3:92-10:11:100", "value": [ { - "string": "missoula" + "string": "missoula", + "raw_string": "missoula" } ] } @@ -542,7 +551,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -552,10 +561,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53", "value": [ { - "string": "clause" + "string": "clause", + "raw_string": "clause" } ] } @@ -574,10 +584,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:4:108-11:9:113", "value": [ { - "string": "steps" + "string": "steps", + "raw_string": "steps" } ] } @@ -587,7 +598,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -597,10 +608,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:5:122-12:11:128", "value": [ { - "string": "missus" + "string": "missus", + "raw_string": "missus" } ] } @@ -650,6 +662,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -697,6 +710,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -714,7 +728,7 @@ "name": "seinfeld", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -724,10 +738,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53", "value": [ { - "string": "clause" + "string": "clause", + "raw_string": "clause" } ] } @@ -752,6 +767,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -799,6 +815,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -816,7 +833,7 @@ "name": "missoula", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -826,10 +843,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,6:4:47-6:10:53", "value": [ { - "string": "clause" + "string": "clause", + "raw_string": "clause" } ] } @@ -848,10 +866,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,11:4:108-11:9:113", "value": [ { - "string": "steps" + "string": "steps", + "raw_string": "steps" } ] } @@ -861,7 +880,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -871,10 +890,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/isFolderOnly.d2,12:5:122-12:11:128", "value": [ { - "string": "missus" + "string": "missus", + "raw_string": "missus" } ] } @@ -914,6 +934,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -961,6 +982,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -986,13 +1008,14 @@ "id_val": "", "attributes": { "label": { - "value": "" + "value": "one two three" }, "labelDimensions": { "width": 0, "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" diff --git a/testdata/d2compiler/TestCompile2/boards/no-inherit-label.exp.json b/testdata/d2compiler/TestCompile2/boards/no-inherit-label.exp.json index 54890fce4..473dc72e9 100644 --- a/testdata/d2compiler/TestCompile2/boards/no-inherit-label.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/no-inherit-label.exp.json @@ -133,6 +133,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -151,7 +152,7 @@ "name": "1", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/no-inherit-label.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -161,10 +162,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/no-inherit-label.d2,5:4:32-5:6:34", "value": [ { - "string": "RJ" + "string": "RJ", + "raw_string": "RJ" } ] } @@ -189,6 +191,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -236,6 +239,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/boards/recursive.exp.json b/testdata/d2compiler/TestCompile2/boards/recursive.exp.json index 8324c327d..6e5cdc016 100644 --- a/testdata/d2compiler/TestCompile2/boards/recursive.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/recursive.exp.json @@ -308,6 +308,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -355,6 +356,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -372,7 +374,7 @@ "name": "one", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -382,10 +384,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,4:4:29-4:9:34", "value": [ { - "string": "santa" + "string": "santa", + "raw_string": "santa" } ] } @@ -410,6 +413,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -457,6 +461,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -474,7 +479,7 @@ "name": "two", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -484,10 +489,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,7:4:52-7:10:58", "value": [ { - "string": "clause" + "string": "clause", + "raw_string": "clause" } ] } @@ -506,10 +512,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,8:2:61-8:7:66", "value": [ { - "string": "steps" + "string": "steps", + "raw_string": "steps" } ] } @@ -519,7 +526,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -529,10 +536,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,9:3:73-9:11:81", "value": [ { - "string": "seinfeld" + "string": "seinfeld", + "raw_string": "seinfeld" } ] } @@ -542,7 +550,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -552,10 +560,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,7:4:52-7:10:58", "value": [ { - "string": "clause" + "string": "clause", + "raw_string": "clause" } ] } @@ -574,10 +583,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,10:4:89-10:12:97", "value": [ { - "string": "reindeer" + "string": "reindeer", + "raw_string": "reindeer" } ] } @@ -601,10 +611,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,12:3:106-12:11:114", "value": [ { - "string": "missoula" + "string": "missoula", + "raw_string": "missoula" } ] } @@ -614,7 +625,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -624,10 +635,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,7:4:52-7:10:58", "value": [ { - "string": "clause" + "string": "clause", + "raw_string": "clause" } ] } @@ -646,10 +658,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,10:4:89-10:12:97", "value": [ { - "string": "reindeer" + "string": "reindeer", + "raw_string": "reindeer" } ] } @@ -668,10 +681,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,13:4:122-13:11:129", "value": [ { - "string": "montana" + "string": "montana", + "raw_string": "montana" } ] } @@ -706,6 +720,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -753,6 +768,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -770,7 +786,7 @@ "name": "seinfeld", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -780,10 +796,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,7:4:52-7:10:58", "value": [ { - "string": "clause" + "string": "clause", + "raw_string": "clause" } ] } @@ -802,10 +819,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,10:4:89-10:12:97", "value": [ { - "string": "reindeer" + "string": "reindeer", + "raw_string": "reindeer" } ] } @@ -830,6 +848,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -877,6 +896,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -922,6 +942,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -939,7 +960,7 @@ "name": "missoula", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -949,10 +970,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,7:4:52-7:10:58", "value": [ { - "string": "clause" + "string": "clause", + "raw_string": "clause" } ] } @@ -971,10 +993,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,10:4:89-10:12:97", "value": [ { - "string": "reindeer" + "string": "reindeer", + "raw_string": "reindeer" } ] } @@ -993,10 +1016,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/recursive.d2,13:4:122-13:11:129", "value": [ { - "string": "montana" + "string": "montana", + "raw_string": "montana" } ] } @@ -1021,6 +1045,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -1068,6 +1093,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1113,6 +1139,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1158,6 +1185,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/boards/root.exp.json b/testdata/d2compiler/TestCompile2/boards/root.exp.json index d610fe2e0..bfc3760a0 100644 --- a/testdata/d2compiler/TestCompile2/boards/root.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/root.exp.json @@ -175,6 +175,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -222,6 +223,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -239,7 +241,7 @@ "name": "one", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -249,10 +251,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,4:4:29-4:9:34", "value": [ { - "string": "santa" + "string": "santa", + "raw_string": "santa" } ] } @@ -277,6 +280,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -324,6 +328,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -341,7 +346,7 @@ "name": "two", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -351,10 +356,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/root.d2,7:4:52-7:10:58", "value": [ { - "string": "clause" + "string": "clause", + "raw_string": "clause" } ] } @@ -379,6 +385,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -426,6 +433,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json b/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json index 4fa49ab8b..33ccc8138 100644 --- a/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json +++ b/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.exp.json @@ -207,6 +207,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -238,6 +239,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -285,6 +287,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -330,6 +333,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -347,7 +351,7 @@ "name": "1", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -357,10 +361,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -379,10 +384,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,0:5:5-0:6:6", "value": [ { - "string": "x" + "string": "x", + "raw_string": "x" } ] } @@ -446,10 +452,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:16:44-4:21:49", "value": [ { - "string": "style" + "string": "style", + "raw_string": "style" } ] } @@ -459,7 +466,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -469,10 +476,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/boards/scenarios_edge_index.d2,4:22:50-4:29:57", "value": [ { - "string": "opacity" + "string": "opacity", + "raw_string": "opacity" } ] } @@ -513,6 +521,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -551,6 +560,7 @@ "value": "0.1" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -618,6 +628,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -683,6 +694,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/boards/style-nested-boards.exp.json b/testdata/d2compiler/TestCompile2/boards/style-nested-boards.exp.json new file mode 100644 index 000000000..07703c3cd --- /dev/null +++ b/testdata/d2compiler/TestCompile2/boards/style-nested-boards.exp.json @@ -0,0 +1,1284 @@ +{ + "graph": { + "name": "", + "isFolderOnly": true, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,0:0:0-23:0:147", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,0:0:0-0:22:22", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,0:0:0-0:15:15", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,0:0:0-0:2:2", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,0:3:3-0:8:8", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,0:9:9-0:15:15", + "value": [ + { + "string": "stroke", + "raw_string": "stroke" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,0:17:17-0:22:22", + "value": [ + { + "string": "black", + "raw_string": "black" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,2:0:24-9:1:72", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,2:0:24-2:9:33", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,2:0:24-2:9:33", + "value": [ + { + "string": "scenarios", + "raw_string": "scenarios" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,2:11:35-9:1:72", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,3:2:39-5:3:53", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,3:2:39-3:3:40", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,3:2:39-3:3:40", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,3:5:42-5:3:53", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,4:4:48-4:5:49", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,4:4:48-4:5:49", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,4:4:48-4:5:49", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,6:2:56-8:3:70", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,6:2:56-6:3:57", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,6:2:56-6:3:57", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,6:5:59-8:3:70", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,7:4:65-7:5:66", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,7:4:65-7:5:66", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,7:4:65-7:5:66", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,10:0:73-17:1:117", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,10:0:73-10:5:78", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,10:0:73-10:5:78", + "value": [ + { + "string": "steps", + "raw_string": "steps" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,10:7:80-17:1:117", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,11:2:84-13:3:98", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,11:2:84-11:3:85", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,11:2:84-11:3:85", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,11:5:87-13:3:98", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,12:4:93-12:5:94", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,12:4:93-12:5:94", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,12:4:93-12:5:94", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,14:2:101-16:3:115", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,14:2:101-14:3:102", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,14:2:101-14:3:102", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,14:5:104-16:3:115", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,15:4:110-15:5:111", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,15:4:110-15:5:111", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,15:4:110-15:5:111", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,18:0:118-22:1:146", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,18:0:118-18:6:124", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,18:0:118-18:6:124", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,18:8:126-22:1:146", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,19:2:130-21:3:144", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,19:2:130-19:3:131", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,19:2:130-19:3:131", + "value": [ + { + "string": "e", + "raw_string": "e" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,19:5:133-21:3:144", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,20:4:139-20:5:140", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,20:4:139-20:5:140", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,20:4:139-20:5:140", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": null, + "layers": [ + { + "name": "e", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,0:0:0-1:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,20:4:139-20:5:140", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,20:4:139-20:5:140", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,20:4:139-20:5:140", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "x" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + } + ], + "scenarios": [ + { + "name": "a", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,0:0:0-1:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,4:4:48-4:5:49", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": ",1:0:0-2:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,0:3:3-0:8:8", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": ",1:0:0-2:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,0:9:9-0:15:15", + "value": [ + { + "string": "stroke", + "raw_string": "stroke" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,0:17:17-0:22:22", + "value": [ + { + "string": "black", + "raw_string": "black" + } + ] + } + }, + "value": {} + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,4:4:48-4:5:49", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,4:4:48-4:5:49", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "x" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "stroke": { + "value": "black" + } + }, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + { + "name": "b", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,0:0:0-1:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,7:4:65-7:5:66", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": ",1:0:0-2:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,0:3:3-0:8:8", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": ",1:0:0-2:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,0:9:9-0:15:15", + "value": [ + { + "string": "stroke", + "raw_string": "stroke" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,0:17:17-0:22:22", + "value": [ + { + "string": "black", + "raw_string": "black" + } + ] + } + }, + "value": {} + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,7:4:65-7:5:66", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,7:4:65-7:5:66", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "x" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "stroke": { + "value": "black" + } + }, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + } + ], + "steps": [ + { + "name": "c", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,0:0:0-1:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,12:4:93-12:5:94", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": ",1:0:0-2:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,0:3:3-0:8:8", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": ",1:0:0-2:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,0:9:9-0:15:15", + "value": [ + { + "string": "stroke", + "raw_string": "stroke" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,0:17:17-0:22:22", + "value": [ + { + "string": "black", + "raw_string": "black" + } + ] + } + }, + "value": {} + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,12:4:93-12:5:94", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,12:4:93-12:5:94", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "x" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "stroke": { + "value": "black" + } + }, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + { + "name": "d", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,0:0:0-1:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,12:4:93-12:5:94", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": ",1:0:0-2:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,0:3:3-0:8:8", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": ",1:0:0-2:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,0:9:9-0:15:15", + "value": [ + { + "string": "stroke", + "raw_string": "stroke" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,0:17:17-0:22:22", + "value": [ + { + "string": "black", + "raw_string": "black" + } + ] + } + }, + "value": {} + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,12:4:93-12:5:94", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,12:4:93-12:5:94", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,15:4:110-15:5:111", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/boards/style-nested-boards.d2,15:4:110-15:5:111", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "x" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "stroke": { + "value": "black" + } + }, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/1.exp.json b/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/1.exp.json index 9d857a0fc..110018670 100644 --- a/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/1.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/1.exp.json @@ -316,6 +316,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -370,6 +371,7 @@ "value": "true" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" @@ -419,6 +421,7 @@ "value": "yellow" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" @@ -436,7 +439,7 @@ "name": "next", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/1.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -446,10 +449,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/1.d2,11:4:101-11:5:102", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -459,7 +463,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -469,10 +473,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/1.d2,1:4:5-1:9:10", "value": [ { - "string": "style" + "string": "style", + "raw_string": "style" } ] } @@ -482,7 +487,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -492,10 +497,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/1.d2,1:10:11-1:14:15", "value": [ { - "string": "fill" + "string": "fill", + "raw_string": "fill" } ] } @@ -540,6 +546,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -591,6 +598,7 @@ "value": "yellow" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/2.exp.json b/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/2.exp.json index 24f29b12f..74134f549 100644 --- a/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/2.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/2.exp.json @@ -183,6 +183,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -201,7 +202,7 @@ "name": "b", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/2.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -211,10 +212,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/2.d2,5:4:48-5:5:49", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -224,7 +226,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -234,10 +236,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/2.d2,1:3:4-1:8:9", "value": [ { - "string": "style" + "string": "style", + "raw_string": "style" } ] } @@ -247,7 +250,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -257,10 +260,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/2.d2,1:9:10-1:13:14", "value": [ { - "string": "fill" + "string": "fill", + "raw_string": "fill" } ] } @@ -299,10 +303,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/2.d2,5:9:53-5:10:54", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -312,7 +317,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -322,10 +327,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/2.d2,1:3:4-1:8:9", "value": [ { - "string": "style" + "string": "style", + "raw_string": "style" } ] } @@ -335,7 +341,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -345,10 +351,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/2.d2,1:9:10-1:13:14", "value": [ { - "string": "fill" + "string": "fill", + "raw_string": "fill" } ] } @@ -437,6 +444,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -468,6 +476,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -519,6 +528,7 @@ "value": "yellow" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -568,6 +578,7 @@ "value": "yellow" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.exp.json b/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.exp.json index c42990a09..b457d3910 100644 --- a/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/alixander-lazy-globs-review/3.exp.json @@ -358,6 +358,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -469,6 +470,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "sql_table" diff --git a/testdata/d2compiler/TestCompile2/globs/and-filter.exp.json b/testdata/d2compiler/TestCompile2/globs/and-filter.exp.json new file mode 100644 index 000000000..685cb507f --- /dev/null +++ b/testdata/d2compiler/TestCompile2/globs/and-filter.exp.json @@ -0,0 +1,756 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,0:0:0-14:0:154", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,1:0:1-5:1:61", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,1:0:1-1:1:2", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,1:0:1-1:1:2", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,1:3:4-5:1:61", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,2:2:8-2:16:22", + "ampersand": true, + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,2:3:9-2:8:14", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,2:3:9-2:8:14", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,2:10:16-2:16:22", + "value": [ + { + "string": "person", + "raw_string": "person" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,3:2:25-3:18:41", + "ampersand": true, + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,3:3:26-3:12:35", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,3:3:26-3:12:35", + "value": [ + { + "string": "connected", + "raw_string": "connected" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "boolean": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,3:14:37-3:18:41", + "value": true + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,4:2:44-4:17:59", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,4:2:44-4:12:54", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,4:2:44-4:7:49", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,4:8:50-4:12:54", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,4:14:56-4:17:59", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,6:0:62-10:1:123", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,6:1:63-6:9:71", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,6:1:63-6:3:65", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,6:1:63-6:3:65", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,6:7:69-6:9:71", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,6:7:69-6:9:71", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,6:10:72-6:13:75", + "int": null, + "glob": true + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,6:15:77-10:1:123", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,7:2:81-7:9:88", + "ampersand": true, + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,7:3:82-7:6:85", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,7:3:82-7:6:85", + "value": [ + { + "string": "src", + "raw_string": "src" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,7:8:87-7:9:88", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,8:2:91-8:9:98", + "ampersand": true, + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,8:3:92-8:6:95", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,8:3:92-8:6:95", + "value": [ + { + "string": "dst", + "raw_string": "dst" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,8:8:97-8:9:98", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,9:2:101-9:22:121", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,9:2:101-9:14:113", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,9:2:101-9:7:106", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,9:8:107-9:14:113", + "value": [ + { + "string": "stroke", + "raw_string": "stroke" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,9:16:115-9:22:121", + "value": [ + { + "string": "yellow", + "raw_string": "yellow" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,11:0:124-11:6:130", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,11:0:124-11:6:130", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,11:0:124-11:1:125", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,11:0:124-11:1:125", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,11:5:129-11:6:130", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,11:5:129-11:6:130", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,12:0:131-12:15:146", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,12:0:131-12:7:138", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,12:0:131-12:1:132", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,12:2:133-12:7:138", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,12:9:140-12:15:146", + "value": [ + { + "string": "person", + "raw_string": "person" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,13:0:147-13:6:153", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,13:0:147-13:6:153", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,13:0:147-13:1:148", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,13:0:147-13:1:148", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,13:5:152-13:6:153", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,13:5:152-13:6:153", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": [ + { + "index": 0, + "isCurve": false, + "src_arrow": false, + "dst_arrow": true, + "references": [ + { + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "index": 0, + "isCurve": false, + "src_arrow": false, + "dst_arrow": true, + "references": [ + { + "map_key_edge_index": 0 + }, + { + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "stroke": { + "value": "yellow" + } + }, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ], + "objects": [ + { + "id": "a", + "id_val": "a", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,11:0:124-11:1:125", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,11:0:124-11:1:125", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,12:0:131-12:7:138", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,12:0:131-12:1:132", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,12:2:133-12:7:138", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,13:0:147-13:1:148", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,13:0:147-13:1:148", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "a" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "fill": { + "value": "red" + } + }, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "person" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "b", + "id_val": "b", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,11:5:129-11:6:130", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,11:5:129-11:6:130", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "b" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "c", + "id_val": "c", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,13:5:152-13:6:153", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/and-filter.d2,13:5:152-13:6:153", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "c" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile2/globs/connected-filter.exp.json b/testdata/d2compiler/TestCompile2/globs/connected-filter.exp.json new file mode 100644 index 000000000..17cb1d2d9 --- /dev/null +++ b/testdata/d2compiler/TestCompile2/globs/connected-filter.exp.json @@ -0,0 +1,391 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/connected-filter.d2,0:0:0-7:0:54", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/connected-filter.d2,1:0:1-4:1:44", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/connected-filter.d2,1:0:1-1:1:2", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/connected-filter.d2,1:0:1-1:1:2", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/connected-filter.d2,1:3:4-4:1:44", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/connected-filter.d2,2:2:8-2:18:24", + "ampersand": true, + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/connected-filter.d2,2:3:9-2:12:18", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/connected-filter.d2,2:3:9-2:12:18", + "value": [ + { + "string": "connected", + "raw_string": "connected" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "boolean": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/connected-filter.d2,2:14:20-2:18:24", + "value": true + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/connected-filter.d2,3:2:27-3:17:42", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/connected-filter.d2,3:2:27-3:12:37", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/connected-filter.d2,3:2:27-3:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/connected-filter.d2,3:8:33-3:12:37", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/connected-filter.d2,3:14:39-3:17:42", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/connected-filter.d2,5:0:45-5:6:51", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/connected-filter.d2,5:0:45-5:6:51", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/connected-filter.d2,5:0:45-5:1:46", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/connected-filter.d2,5:0:45-5:1:46", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/connected-filter.d2,5:5:50-5:6:51", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/connected-filter.d2,5:5:50-5:6:51", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/connected-filter.d2,6:0:52-6:1:53", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/connected-filter.d2,6:0:52-6:1:53", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/connected-filter.d2,6:0:52-6:1:53", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": [ + { + "index": 0, + "isCurve": false, + "src_arrow": false, + "dst_arrow": true, + "references": [ + { + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ], + "objects": [ + { + "id": "a", + "id_val": "a", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/connected-filter.d2,5:0:45-5:1:46", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/connected-filter.d2,5:0:45-5:1:46", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "a" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "fill": { + "value": "red" + } + }, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "b", + "id_val": "b", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/connected-filter.d2,5:5:50-5:6:51", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/connected-filter.d2,5:5:50-5:6:51", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "b" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "fill": { + "value": "red" + } + }, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "c", + "id_val": "c", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/connected-filter.d2,6:0:52-6:1:53", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/connected-filter.d2,6:0:52-6:1:53", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "c" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile2/globs/creating-node-bug.exp.json b/testdata/d2compiler/TestCompile2/globs/creating-node-bug.exp.json index 665feb37a..e1fc37f38 100644 --- a/testdata/d2compiler/TestCompile2/globs/creating-node-bug.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/creating-node-bug.exp.json @@ -205,6 +205,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -236,6 +237,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -283,6 +285,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -328,6 +331,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -373,6 +377,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -418,6 +423,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/globs/default-glob-filter/1.exp.json b/testdata/d2compiler/TestCompile2/globs/default-glob-filter/1.exp.json index 6bff2fcca..6f46f67b0 100644 --- a/testdata/d2compiler/TestCompile2/globs/default-glob-filter/1.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/default-glob-filter/1.exp.json @@ -357,6 +357,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -411,6 +412,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -471,6 +473,7 @@ "value": "blue" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" @@ -534,6 +537,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/globs/default-glob-filter/2.exp.json b/testdata/d2compiler/TestCompile2/globs/default-glob-filter/2.exp.json index 31071203f..c155de01b 100644 --- a/testdata/d2compiler/TestCompile2/globs/default-glob-filter/2.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/default-glob-filter/2.exp.json @@ -194,6 +194,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -225,6 +226,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -276,6 +278,7 @@ "value": "0.2" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -325,6 +328,7 @@ "value": "0.2" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -374,6 +378,7 @@ "value": "0.2" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/globs/default-glob-filter/3.exp.json b/testdata/d2compiler/TestCompile2/globs/default-glob-filter/3.exp.json index 06886b16c..43bfe445b 100644 --- a/testdata/d2compiler/TestCompile2/globs/default-glob-filter/3.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/default-glob-filter/3.exp.json @@ -187,6 +187,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -238,6 +239,7 @@ "value": "0.2" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -307,6 +309,7 @@ "Fragment": "", "RawFragment": "" }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/globs/default-glob-filter/4.exp.json b/testdata/d2compiler/TestCompile2/globs/default-glob-filter/4.exp.json index 5c50c84be..4323a1aa6 100644 --- a/testdata/d2compiler/TestCompile2/globs/default-glob-filter/4.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/default-glob-filter/4.exp.json @@ -331,6 +331,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -369,6 +370,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -420,6 +422,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -469,6 +472,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -518,6 +522,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.exp.json b/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.exp.json new file mode 100644 index 000000000..bfff699cf --- /dev/null +++ b/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.exp.json @@ -0,0 +1,955 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,0:0:0-17:2:209", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,1:2:3-4:3:58", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,1:3:4-1:9:10", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,1:3:4-1:4:5", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,1:3:4-1:4:5", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,1:8:9-1:9:10", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,1:8:9-1:9:10", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,1:10:11-1:13:14", + "int": null, + "glob": true + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,1:15:16-4:3:58", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,2:4:22-2:11:29", + "ampersand": true, + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,2:5:23-2:8:26", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,2:5:23-2:8:26", + "value": [ + { + "string": "src", + "raw_string": "src" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,2:10:28-2:11:29", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,3:4:34-3:24:54", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,3:4:34-3:21:51", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,3:4:34-3:9:39", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,3:10:40-3:21:51", + "value": [ + { + "string": "stroke-dash", + "raw_string": "stroke-dash" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "number": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,3:23:53-3:24:54", + "raw": "3", + "value": "3" + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,5:2:61-8:3:114", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,5:3:62-5:9:68", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,5:3:62-5:4:63", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,5:3:62-5:4:63", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,5:8:67-5:9:68", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,5:8:67-5:9:68", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,5:10:69-5:13:72", + "int": null, + "glob": true + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,5:15:74-8:3:114", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,6:4:80-6:11:87", + "ampersand": true, + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,6:5:81-6:8:84", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,6:5:81-6:8:84", + "value": [ + { + "string": "dst", + "raw_string": "dst" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,6:10:86-6:11:87", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,7:4:92-7:22:110", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,7:4:92-7:16:104", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,7:4:92-7:9:97", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,7:10:98-7:16:104", + "value": [ + { + "string": "stroke", + "raw_string": "stroke" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,7:18:106-7:22:110", + "value": [ + { + "string": "blue", + "raw_string": "blue" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,9:2:117-13:3:179", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,9:3:118-9:9:124", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,9:3:118-9:4:119", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,9:3:118-9:4:119", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,9:8:123-9:9:124", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,9:8:123-9:9:124", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,9:10:125-9:13:128", + "int": null, + "glob": true + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,9:15:130-13:3:179", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,10:4:136-10:11:143", + "ampersand": true, + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,10:5:137-10:8:140", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,10:5:137-10:8:140", + "value": [ + { + "string": "src", + "raw_string": "src" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,10:10:142-10:11:143", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,11:4:148-11:11:155", + "ampersand": true, + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,11:5:149-11:8:152", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,11:5:149-11:8:152", + "value": [ + { + "string": "dst", + "raw_string": "dst" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,11:10:154-11:11:155", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,12:4:160-12:19:175", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,12:4:160-12:14:170", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,12:4:160-12:9:165", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,12:10:166-12:14:170", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,12:16:172-12:19:175", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,14:2:182-14:8:188", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,14:2:182-14:8:188", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,14:2:182-14:3:183", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,14:2:182-14:3:183", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,14:7:187-14:8:188", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,14:7:187-14:8:188", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,15:2:191-15:8:197", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,15:2:191-15:8:197", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,15:2:191-15:3:192", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,15:2:191-15:3:192", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,15:7:196-15:8:197", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,15:7:196-15:8:197", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,16:2:200-16:8:206", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,16:2:200-16:8:206", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,16:2:200-16:3:201", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,16:2:200-16:3:201", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,16:7:205-16:8:206", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,16:7:205-16:8:206", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": [ + { + "index": 0, + "isCurve": false, + "src_arrow": false, + "dst_arrow": true, + "references": [ + { + "map_key_edge_index": 0 + }, + { + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "strokeDash": { + "value": "3" + } + }, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "index": 0, + "isCurve": false, + "src_arrow": false, + "dst_arrow": true, + "references": [ + { + "map_key_edge_index": 0 + }, + { + "map_key_edge_index": 0 + }, + { + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "stroke": { + "value": "blue" + }, + "fill": { + "value": "red" + } + }, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "index": 0, + "isCurve": false, + "src_arrow": false, + "dst_arrow": true, + "references": [ + { + "map_key_edge_index": 0 + }, + { + "map_key_edge_index": 0 + }, + { + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "stroke": { + "value": "blue" + }, + "strokeDash": { + "value": "3" + } + }, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ], + "objects": [ + { + "id": "a", + "id_val": "a", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,14:2:182-14:3:183", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,14:2:182-14:3:183", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,16:2:200-16:3:201", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,16:2:200-16:3:201", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "a" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "b", + "id_val": "b", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,14:7:187-14:8:188", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,14:7:187-14:8:188", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,15:2:191-15:3:192", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,15:2:191-15:3:192", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "b" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "c", + "id_val": "c", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,15:7:196-15:8:197", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,15:7:196-15:8:197", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,16:7:205-16:8:206", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/1.d2,16:7:205-16:8:206", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "c" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.exp.json b/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.exp.json new file mode 100644 index 000000000..f42ea6df7 --- /dev/null +++ b/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.exp.json @@ -0,0 +1,1557 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,0:0:0-38:8:457", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,1:0:1-7:1:70", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,1:0:1-1:1:2", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,1:0:1-1:1:2", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,1:3:4-7:1:70", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,2:2:8-2:15:21", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,2:2:8-2:7:13", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,2:2:8-2:7:13", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,2:9:15-2:15:21", + "value": [ + { + "string": "circle", + "raw_string": "circle" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,3:2:24-6:3:68", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,3:2:24-3:7:29", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,3:2:24-3:7:29", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,3:9:31-6:3:68", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,4:4:37-4:14:47", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,4:4:37-4:8:41", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,4:4:37-4:8:41", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,4:10:43-4:14:47", + "value": [ + { + "string": "blue", + "raw_string": "blue" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,5:4:52-5:16:64", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,5:4:52-5:11:59", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,5:4:52-5:11:59", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "number": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,5:13:61-5:16:64", + "raw": "0.8", + "value": "4/5" + } + } + } + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,8:0:71-14:1:142", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,8:0:71-8:1:72", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,8:0:71-8:1:72", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,8:3:74-14:1:142", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,9:2:78-9:18:94", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,9:2:78-9:7:83", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,9:2:78-9:7:83", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,9:9:85-9:18:94", + "value": [ + { + "string": "rectangle", + "raw_string": "rectangle" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,10:2:97-13:3:140", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,10:2:97-10:7:102", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,10:2:97-10:7:102", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,10:9:104-13:3:140", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,11:4:110-11:13:119", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,11:4:110-11:8:114", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,11:4:110-11:8:114", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,11:10:116-11:13:119", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,12:4:124-12:16:136", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,12:4:124-12:11:131", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,12:4:124-12:11:131", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "number": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,12:13:133-12:16:136", + "raw": "0.5", + "value": "1/2" + } + } + } + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,15:0:143-19:1:207", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,15:0:143-15:1:144", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,15:0:143-15:1:144", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,15:3:146-19:1:207", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,16:2:150-16:16:164", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,16:2:150-16:7:155", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,16:2:150-16:7:155", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,16:9:157-16:16:164", + "value": [ + { + "string": "diamond", + "raw_string": "diamond" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,17:2:167-17:19:184", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,17:2:167-17:12:177", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,17:2:167-17:7:172", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,17:8:173-17:12:177", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,17:14:179-17:19:184", + "value": [ + { + "string": "green", + "raw_string": "green" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,18:2:187-18:20:205", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,18:2:187-18:15:200", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,18:2:187-18:7:192", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,18:8:193-18:15:200", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "number": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,18:17:202-18:20:205", + "raw": "0.8", + "value": "4/5" + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,21:0:209-24:1:272", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,21:1:210-21:7:216", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,21:1:210-21:2:211", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,21:1:210-21:2:211", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,21:6:215-21:7:216", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,21:6:215-21:7:216", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,21:8:217-21:11:220", + "int": null, + "glob": true + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,21:13:222-24:1:272", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,22:2:226-22:23:247", + "ampersand": true, + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,22:3:227-22:17:241", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,22:3:227-22:6:230", + "value": [ + { + "string": "src", + "raw_string": "src" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,22:7:231-22:12:236", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,22:13:237-22:17:241", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,22:19:243-22:23:247", + "value": [ + { + "string": "blue", + "raw_string": "blue" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,23:2:250-23:22:270", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,23:2:250-23:19:267", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,23:2:250-23:7:255", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,23:8:256-23:19:267", + "value": [ + { + "string": "stroke-dash", + "raw_string": "stroke-dash" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "number": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,23:21:269-23:22:270", + "raw": "3", + "value": "3" + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,25:0:273-28:1:336", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,25:1:274-25:7:280", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,25:1:274-25:2:275", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,25:1:274-25:2:275", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,25:6:279-25:7:280", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,25:6:279-25:7:280", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,25:8:281-25:11:284", + "int": null, + "glob": true + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,25:13:286-28:1:336", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,26:2:290-26:25:313", + "ampersand": true, + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,26:3:291-26:20:308", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,26:3:291-26:6:294", + "value": [ + { + "string": "dst", + "raw_string": "dst" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,26:7:295-26:12:300", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,26:13:301-26:20:308", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "number": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,26:22:310-26:25:313", + "raw": "0.8", + "value": "4/5" + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,27:2:316-27:20:334", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,27:2:316-27:14:328", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,27:2:316-27:7:321", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,27:8:322-27:14:328", + "value": [ + { + "string": "stroke", + "raw_string": "stroke" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,27:16:330-27:20:334", + "value": [ + { + "string": "cyan", + "raw_string": "cyan" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,29:0:337-33:1:426", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,29:1:338-29:7:344", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,29:1:338-29:2:339", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,29:1:338-29:2:339", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,29:6:343-29:7:344", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,29:6:343-29:7:344", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,29:8:345-29:11:348", + "int": null, + "glob": true + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,29:13:350-33:1:426", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,30:2:354-30:23:375", + "ampersand": true, + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,30:3:355-30:12:364", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,30:3:355-30:6:358", + "value": [ + { + "string": "src", + "raw_string": "src" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,30:7:359-30:12:364", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,30:14:366-30:23:375", + "value": [ + { + "string": "rectangle", + "raw_string": "rectangle" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,31:2:378-31:24:400", + "ampersand": true, + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,31:3:379-31:17:393", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,31:3:379-31:6:382", + "value": [ + { + "string": "dst", + "raw_string": "dst" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,31:7:383-31:12:388", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,31:13:389-31:17:393", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,31:19:395-31:24:400", + "value": [ + { + "string": "green", + "raw_string": "green" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,32:2:403-32:23:424", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,32:2:403-32:20:421", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,32:2:403-32:7:408", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,32:8:409-32:20:421", + "value": [ + { + "string": "stroke-width", + "raw_string": "stroke-width" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "number": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,32:22:423-32:23:424", + "raw": "5", + "value": "5" + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,35:0:428-35:6:434", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,35:0:428-35:6:434", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,35:0:428-35:1:429", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,35:0:428-35:1:429", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,35:5:433-35:6:434", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,35:5:433-35:6:434", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,36:0:435-36:6:441", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,36:0:435-36:6:441", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,36:0:435-36:1:436", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,36:0:435-36:1:436", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,36:5:440-36:6:441", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,36:5:440-36:6:441", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,37:0:442-37:6:448", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,37:0:442-37:6:448", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,37:0:442-37:1:443", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,37:0:442-37:1:443", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,37:5:447-37:6:448", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,37:5:447-37:6:448", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": [ + { + "index": 0, + "isCurve": false, + "src_arrow": false, + "dst_arrow": true, + "references": [ + { + "map_key_edge_index": 0 + }, + { + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "strokeDash": { + "value": "3" + } + }, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "index": 0, + "isCurve": false, + "src_arrow": false, + "dst_arrow": true, + "references": [ + { + "map_key_edge_index": 0 + }, + { + "map_key_edge_index": 0 + }, + { + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "stroke": { + "value": "cyan" + }, + "strokeWidth": { + "value": "5" + } + }, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "index": 0, + "isCurve": false, + "src_arrow": false, + "dst_arrow": true, + "references": [ + { + "map_key_edge_index": 0 + }, + { + "map_key_edge_index": 0 + }, + { + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "stroke": { + "value": "cyan" + }, + "strokeDash": { + "value": "3" + } + }, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ], + "objects": [ + { + "id": "a", + "id_val": "a", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,1:0:1-1:1:2", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,1:0:1-1:1:2", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,35:0:428-35:1:429", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,35:0:428-35:1:429", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,37:0:442-37:1:443", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,37:0:442-37:1:443", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "a" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "opacity": { + "value": "0.8" + }, + "fill": { + "value": "blue" + } + }, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "circle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "b", + "id_val": "b", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,8:0:71-8:1:72", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,8:0:71-8:1:72", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,35:5:433-35:6:434", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,35:5:433-35:6:434", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,36:0:435-36:1:436", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,36:0:435-36:1:436", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "b" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "opacity": { + "value": "0.5" + }, + "fill": { + "value": "red" + } + }, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "c", + "id_val": "c", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,15:0:143-15:1:144", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,15:0:143-15:1:144", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,36:5:440-36:6:441", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,36:5:440-36:6:441", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,37:5:447-37:6:448", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/edge-glob-ampersand-filter/2.d2,37:5:447-37:6:448", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "c" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "opacity": { + "value": "0.8" + }, + "fill": { + "value": "green" + } + }, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "diamond" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile2/globs/exists-filter.exp.json b/testdata/d2compiler/TestCompile2/globs/exists-filter.exp.json index 4721aaee6..93cc9a768 100644 --- a/testdata/d2compiler/TestCompile2/globs/exists-filter.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/exists-filter.exp.json @@ -194,6 +194,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -241,6 +242,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -301,6 +303,7 @@ "value": "true" } }, + "iconStyle": {}, "link": { "value": "https://google.com" }, diff --git a/testdata/d2compiler/TestCompile2/globs/glob-filter.exp.json b/testdata/d2compiler/TestCompile2/globs/glob-filter.exp.json index b92bbf90c..209d491fb 100644 --- a/testdata/d2compiler/TestCompile2/globs/glob-filter.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/glob-filter.exp.json @@ -240,6 +240,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -287,6 +288,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -347,6 +349,7 @@ "value": "true" } }, + "iconStyle": {}, "link": { "value": "https://google.com" }, @@ -406,6 +409,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "https://yahoo.com" }, diff --git a/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.exp.json b/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.exp.json new file mode 100644 index 000000000..a1391a7e6 --- /dev/null +++ b/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.exp.json @@ -0,0 +1,514 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.d2,0:0:0-10:0:93", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.d2,1:0:1-4:1:41", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.d2,1:0:1-1:2:3", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.d2,1:0:1-1:2:3", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.d2,1:4:5-4:1:41", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.d2,2:2:9-2:14:21", + "ampersand": true, + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.d2,2:3:10-2:7:14", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.d2,2:3:10-2:7:14", + "value": [ + { + "string": "leaf", + "raw_string": "leaf" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "boolean": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.d2,2:9:16-2:14:21", + "value": false + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.d2,3:2:24-3:17:39", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.d2,3:2:24-3:12:34", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.d2,3:2:24-3:7:29", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.d2,3:8:30-3:12:34", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.d2,3:14:36-3:17:39", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.d2,5:0:42-8:1:86", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.d2,5:0:42-5:2:44", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.d2,5:0:42-5:2:44", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.d2,5:4:46-8:1:86", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.d2,6:2:50-6:13:61", + "ampersand": true, + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.d2,6:3:51-6:7:55", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.d2,6:3:51-6:7:55", + "value": [ + { + "string": "leaf", + "raw_string": "leaf" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "boolean": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.d2,6:9:57-6:13:61", + "value": true + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.d2,7:2:64-7:22:84", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.d2,7:2:64-7:14:76", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.d2,7:2:64-7:7:69", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.d2,7:8:70-7:14:76", + "value": [ + { + "string": "stroke", + "raw_string": "stroke" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.d2,7:16:78-7:22:84", + "value": [ + { + "string": "yellow", + "raw_string": "yellow" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.d2,9:0:87-9:5:92", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.d2,9:0:87-9:5:92", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.d2,9:0:87-9:1:88", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.d2,9:2:89-9:3:90", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.d2,9:4:91-9:5:92", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "a", + "id_val": "a", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.d2,9:0:87-9:5:92", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.d2,9:0:87-9:1:88", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.d2,9:2:89-9:3:90", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.d2,9:4:91-9:5:92", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "a" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "fill": { + "value": "red" + } + }, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "b", + "id_val": "b", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.d2,9:0:87-9:5:92", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.d2,9:0:87-9:1:88", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.d2,9:2:89-9:3:90", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.d2,9:4:91-9:5:92", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "key_path_index": 1, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "b" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "fill": { + "value": "red" + } + }, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "c", + "id_val": "c", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.d2,9:0:87-9:5:92", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.d2,9:0:87-9:1:88", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.d2,9:2:89-9:3:90", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-1.d2,9:4:91-9:5:92", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "key_path_index": 2, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "c" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "stroke": { + "value": "yellow" + } + }, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.exp.json b/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.exp.json new file mode 100644 index 000000000..937780ff3 --- /dev/null +++ b/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.exp.json @@ -0,0 +1,547 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.d2,0:0:0-11:0:73", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.d2,1:0:1-4:1:45", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.d2,1:0:1-1:2:3", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.d2,1:0:1-1:2:3", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.d2,1:4:5-4:1:45", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.d2,2:2:9-2:13:20", + "ampersand": true, + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.d2,2:3:10-2:7:14", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.d2,2:3:10-2:7:14", + "value": [ + { + "string": "leaf", + "raw_string": "leaf" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "boolean": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.d2,2:9:16-2:13:20", + "value": true + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.d2,3:2:23-3:22:43", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.d2,3:2:23-3:14:35", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.d2,3:2:23-3:7:28", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.d2,3:8:29-3:14:35", + "value": [ + { + "string": "stroke", + "raw_string": "stroke" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.d2,3:16:37-3:22:43", + "value": [ + { + "string": "yellow", + "raw_string": "yellow" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.d2,5:0:46-7:1:61", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.d2,5:0:46-5:1:47", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.d2,5:0:46-5:1:47", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.d2,5:3:49-7:1:61", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.d2,6:2:53-6:8:59", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.d2,6:2:53-6:8:59", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.d2,6:2:53-6:3:54", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.d2,6:2:53-6:3:54", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.d2,6:7:58-6:8:59", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.d2,6:7:58-6:8:59", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.d2,8:0:62-10:1:72", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.d2,8:0:62-8:1:63", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.d2,8:0:62-8:1:63", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.d2,8:3:65-10:1:72", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.d2,9:2:69-9:3:70", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.d2,9:2:69-9:3:70", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.d2,9:2:69-9:3:70", + "value": [ + { + "string": "e", + "raw_string": "e" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": [ + { + "index": 0, + "isCurve": false, + "src_arrow": false, + "dst_arrow": true, + "references": [ + { + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ], + "objects": [ + { + "id": "a", + "id_val": "a", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.d2,5:0:46-5:1:47", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.d2,5:0:46-5:1:47", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "a" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "b", + "id_val": "b", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.d2,6:2:53-6:3:54", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.d2,6:2:53-6:3:54", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "b" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "stroke": { + "value": "yellow" + } + }, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "c", + "id_val": "c", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.d2,6:7:58-6:8:59", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.d2,6:7:58-6:8:59", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "c" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "stroke": { + "value": "yellow" + } + }, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "d", + "id_val": "d", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.d2,8:0:62-8:1:63", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.d2,8:0:62-8:1:63", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "d" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "e", + "id_val": "e", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.d2,9:2:69-9:3:70", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/leaf-filter-2.d2,9:2:69-9:3:70", + "value": [ + { + "string": "e", + "raw_string": "e" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "e" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "stroke": { + "value": "yellow" + } + }, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile2/globs/level-filter.exp.json b/testdata/d2compiler/TestCompile2/globs/level-filter.exp.json new file mode 100644 index 000000000..acec6846c --- /dev/null +++ b/testdata/d2compiler/TestCompile2/globs/level-filter.exp.json @@ -0,0 +1,1286 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,0:0:0-21:0:193", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,1:0:1-4:1:38", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,1:0:1-1:2:3", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,1:0:1-1:2:3", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,1:4:5-4:1:38", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,2:2:9-2:11:18", + "ampersand": true, + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,2:3:10-2:8:15", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,2:3:10-2:8:15", + "value": [ + { + "string": "level", + "raw_string": "level" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "number": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,2:10:17-2:11:18", + "raw": "0", + "value": "0" + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,3:2:21-3:17:36", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,3:2:21-3:12:31", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,3:2:21-3:7:26", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,3:8:27-3:12:31", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,3:14:33-3:17:36", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,5:0:39-8:1:81", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,5:0:39-5:2:41", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,5:0:39-5:2:41", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,5:4:43-8:1:81", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,6:2:47-6:11:56", + "ampersand": true, + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,6:3:48-6:8:53", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,6:3:48-6:8:53", + "value": [ + { + "string": "level", + "raw_string": "level" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "number": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,6:10:55-6:11:56", + "raw": "1", + "value": "1" + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,7:2:59-7:22:79", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,7:2:59-7:14:71", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,7:2:59-7:7:64", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,7:8:65-7:14:71", + "value": [ + { + "string": "stroke", + "raw_string": "stroke" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,7:16:73-7:22:79", + "value": [ + { + "string": "yellow", + "raw_string": "yellow" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,9:0:82-13:1:153", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,9:1:83-9:9:91", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,9:1:83-9:3:85", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,9:1:83-9:3:85", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,9:7:89-9:9:91", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,9:7:89-9:9:91", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,9:10:92-9:13:95", + "int": null, + "glob": true + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,9:15:97-13:1:153", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,10:2:101-10:15:114", + "ampersand": true, + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,10:3:102-10:12:111", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,10:3:102-10:6:105", + "value": [ + { + "string": "src", + "raw_string": "src" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,10:7:106-10:12:111", + "value": [ + { + "string": "level", + "raw_string": "level" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "number": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,10:14:113-10:15:114", + "raw": "0", + "value": "0" + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,11:2:117-11:15:130", + "ampersand": true, + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,11:3:118-11:12:127", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,11:3:118-11:6:121", + "value": [ + { + "string": "dst", + "raw_string": "dst" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,11:7:122-11:12:127", + "value": [ + { + "string": "level", + "raw_string": "level" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "number": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,11:14:129-11:15:130", + "raw": "0", + "value": "0" + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,12:2:133-12:20:151", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,12:2:133-12:14:145", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,12:2:133-12:7:138", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,12:8:139-12:14:145", + "value": [ + { + "string": "stroke", + "raw_string": "stroke" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,12:16:147-12:20:151", + "value": [ + { + "string": "blue", + "raw_string": "blue" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,14:0:154-14:5:159", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,14:0:154-14:5:159", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,14:0:154-14:1:155", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,14:2:156-14:3:157", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,14:4:158-14:5:159", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,16:0:161-16:6:167", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,16:0:161-16:6:167", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,16:0:161-16:1:162", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,16:0:161-16:1:162", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,16:5:166-16:6:167", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,16:5:166-16:6:167", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,17:0:168-19:1:183", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,17:0:168-17:1:169", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,17:0:168-17:1:169", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,17:3:171-19:1:183", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,18:2:175-18:8:181", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,18:2:175-18:8:181", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,18:2:175-18:3:176", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,18:2:175-18:3:176", + "value": [ + { + "string": "1", + "raw_string": "1" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,18:7:180-18:8:181", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,18:7:180-18:8:181", + "value": [ + { + "string": "2", + "raw_string": "2" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,20:0:184-20:8:192", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,20:0:184-20:8:192", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,20:0:184-20:3:187", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,20:0:184-20:1:185", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,20:2:186-20:3:187", + "value": [ + { + "string": "1", + "raw_string": "1" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,20:7:191-20:8:192", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,20:7:191-20:8:192", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": [ + { + "index": 0, + "isCurve": false, + "src_arrow": false, + "dst_arrow": true, + "references": [ + { + "map_key_edge_index": 0 + }, + { + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "stroke": { + "value": "blue" + } + }, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "index": 0, + "isCurve": false, + "src_arrow": false, + "dst_arrow": true, + "references": [ + { + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "index": 0, + "isCurve": false, + "src_arrow": false, + "dst_arrow": true, + "references": [ + { + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ], + "objects": [ + { + "id": "a", + "id_val": "a", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,14:0:154-14:5:159", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,14:0:154-14:1:155", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,14:2:156-14:3:157", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,14:4:158-14:5:159", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,17:0:168-17:1:169", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,17:0:168-17:1:169", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,20:0:184-20:3:187", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,20:0:184-20:1:185", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,20:2:186-20:3:187", + "value": [ + { + "string": "1", + "raw_string": "1" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "a" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "fill": { + "value": "red" + } + }, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "b", + "id_val": "b", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,14:0:154-14:5:159", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,14:0:154-14:1:155", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,14:2:156-14:3:157", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,14:4:158-14:5:159", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "key_path_index": 1, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "b" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "stroke": { + "value": "yellow" + } + }, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "c", + "id_val": "c", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,14:0:154-14:5:159", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,14:0:154-14:1:155", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,14:2:156-14:3:157", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,14:4:158-14:5:159", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "key_path_index": 2, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "c" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,16:0:161-16:1:162", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,16:0:161-16:1:162", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,20:7:191-20:8:192", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,20:7:191-20:8:192", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "x" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "fill": { + "value": "red" + } + }, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "y", + "id_val": "y", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,16:5:166-16:6:167", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,16:5:166-16:6:167", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "y" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "fill": { + "value": "red" + } + }, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "1", + "id_val": "1", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,18:2:175-18:3:176", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,18:2:175-18:3:176", + "value": [ + { + "string": "1", + "raw_string": "1" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,20:0:184-20:3:187", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,20:0:184-20:1:185", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,20:2:186-20:3:187", + "value": [ + { + "string": "1", + "raw_string": "1" + } + ] + } + } + ] + }, + "key_path_index": 1, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "1" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "stroke": { + "value": "yellow" + } + }, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "2", + "id_val": "2", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,18:7:180-18:8:181", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/level-filter.d2,18:7:180-18:8:181", + "value": [ + { + "string": "2", + "raw_string": "2" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "2" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "stroke": { + "value": "yellow" + } + }, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile2/globs/md-shape.exp.json b/testdata/d2compiler/TestCompile2/globs/md-shape.exp.json new file mode 100644 index 000000000..d40047583 --- /dev/null +++ b/testdata/d2compiler/TestCompile2/globs/md-shape.exp.json @@ -0,0 +1,830 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,0:0:0-17:8:183", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,1:0:1-1:15:16", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,1:0:1-1:7:8", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,1:0:1-1:1:2", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,1:2:3-1:7:8", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,1:9:10-1:15:16", + "value": [ + { + "string": "circle", + "raw_string": "circle" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,2:0:17-2:12:29", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,2:0:17-2:1:18", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,2:0:17-2:1:18", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "block_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,2:3:20-2:12:29", + "quote": "", + "tag": "md", + "value": "#hi" + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,4:0:31-4:15:46", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,4:0:31-4:7:38", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,4:0:31-4:1:32", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,4:2:33-4:7:38", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,4:9:40-4:15:46", + "value": [ + { + "string": "circle", + "raw_string": "circle" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,5:0:47-5:18:65", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,5:0:47-5:7:54", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,5:0:47-5:1:48", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,5:2:49-5:7:54", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "block_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,5:9:56-5:18:65", + "quote": "", + "tag": "md", + "value": "#hi" + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,7:0:67-7:12:79", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,7:0:67-7:1:68", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,7:0:67-7:1:68", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "block_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,7:3:70-7:12:79", + "quote": "", + "tag": "md", + "value": "#hi" + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,8:0:80-8:15:95", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,8:0:80-8:7:87", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,8:0:80-8:1:81", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,8:2:82-8:7:87", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,8:9:89-8:15:95", + "value": [ + { + "string": "circle", + "raw_string": "circle" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,10:0:97-10:18:115", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,10:0:97-10:7:104", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,10:0:97-10:1:98", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,10:2:99-10:7:104", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "block_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,10:9:106-10:18:115", + "quote": "", + "tag": "md", + "value": "#hi" + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,11:0:116-11:15:131", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,11:0:116-11:7:123", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,11:0:116-11:1:117", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,11:2:118-11:7:123", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,11:9:125-11:15:131", + "value": [ + { + "string": "circle", + "raw_string": "circle" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,13:0:133-16:1:174", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,13:0:133-13:1:134", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,13:0:133-13:1:134", + "value": [ + { + "string": "e", + "raw_string": "e" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,13:3:136-16:1:174", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,14:2:140-14:15:153", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,14:2:140-14:7:145", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,14:2:140-14:7:145", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,14:9:147-14:15:153", + "value": [ + { + "string": "circle", + "raw_string": "circle" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,15:2:156-15:18:172", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,15:2:156-15:7:161", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,15:2:156-15:7:161", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "block_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,15:9:163-15:18:172", + "quote": "", + "tag": "md", + "value": "#hi" + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "a", + "id_val": "a", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,1:0:1-1:7:8", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,1:0:1-1:1:2", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,1:2:3-1:7:8", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,2:0:17-2:1:18", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,2:0:17-2:1:18", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "#hi" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "language": "markdown", + "shape": { + "value": "circle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "b", + "id_val": "b", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,4:0:31-4:7:38", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,4:0:31-4:1:32", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,4:2:33-4:7:38", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,5:0:47-5:7:54", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,5:0:47-5:1:48", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,5:2:49-5:7:54", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "#hi" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "language": "markdown", + "shape": { + "value": "circle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "c", + "id_val": "c", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,7:0:67-7:1:68", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,7:0:67-7:1:68", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,8:0:80-8:7:87", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,8:0:80-8:1:81", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,8:2:82-8:7:87", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "#hi" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "language": "markdown", + "shape": { + "value": "circle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "d", + "id_val": "d", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,10:0:97-10:7:104", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,10:0:97-10:1:98", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,10:2:99-10:7:104", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,11:0:116-11:7:123", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,11:0:116-11:1:117", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,11:2:118-11:7:123", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "#hi" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "language": "markdown", + "shape": { + "value": "circle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "e", + "id_val": "e", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,13:0:133-13:1:134", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/md-shape.d2,13:0:133-13:1:134", + "value": [ + { + "string": "e", + "raw_string": "e" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "#hi" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "language": "markdown", + "shape": { + "value": "circle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile2/globs/merge-glob-values.exp.json b/testdata/d2compiler/TestCompile2/globs/merge-glob-values.exp.json new file mode 100644 index 000000000..37196cdff --- /dev/null +++ b/testdata/d2compiler/TestCompile2/globs/merge-glob-values.exp.json @@ -0,0 +1,297 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/merge-glob-values.d2,0:0:0-5:0:64", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/merge-glob-values.d2,1:0:1-1:3:4", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/merge-glob-values.d2,1:0:1-1:3:4", + "path": [ + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/merge-glob-values.d2,1:0:1-1:3:4", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/merge-glob-values.d2,2:0:5-2:23:28", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/merge-glob-values.d2,2:0:5-2:20:25", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/merge-glob-values.d2,2:0:5-2:1:6", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/merge-glob-values.d2,2:2:7-2:7:12", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/merge-glob-values.d2,2:8:13-2:20:25", + "value": [ + { + "string": "stroke-width", + "raw_string": "stroke-width" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "number": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/merge-glob-values.d2,2:22:27-2:23:28", + "raw": "2", + "value": "2" + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/merge-glob-values.d2,3:0:29-3:21:50", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/merge-glob-values.d2,3:0:29-3:17:46", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/merge-glob-values.d2,3:0:29-3:1:30", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/merge-glob-values.d2,3:2:31-3:7:36", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/merge-glob-values.d2,3:8:37-3:17:46", + "value": [ + { + "string": "font-size", + "raw_string": "font-size" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "number": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/merge-glob-values.d2,3:19:48-3:21:50", + "raw": "14", + "value": "14" + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/merge-glob-values.d2,4:0:51-4:12:63", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/merge-glob-values.d2,4:0:51-4:7:58", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/merge-glob-values.d2,4:0:51-4:1:52", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/merge-glob-values.d2,4:2:53-4:7:58", + "value": [ + { + "string": "width", + "raw_string": "width" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "number": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/merge-glob-values.d2,4:9:60-4:12:63", + "raw": "339", + "value": "339" + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "a", + "id_val": "a", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/merge-glob-values.d2,1:0:1-1:3:4", + "path": [ + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/merge-glob-values.d2,1:0:1-1:3:4", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/merge-glob-values.d2,4:0:51-4:7:58", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/merge-glob-values.d2,4:0:51-4:1:52", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/merge-glob-values.d2,4:2:53-4:7:58", + "value": [ + { + "string": "width", + "raw_string": "width" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "a" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "strokeWidth": { + "value": "2" + }, + "fontSize": { + "value": "14" + } + }, + "iconStyle": {}, + "width": { + "value": "339" + }, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.exp.json b/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.exp.json new file mode 100644 index 000000000..d083d3091 --- /dev/null +++ b/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.exp.json @@ -0,0 +1,737 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,0:0:0-2:0:38", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:0:1-1:36:37", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:0:1-1:36:37", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:0:1-1:16:17", + "path": [ + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:0:1-1:3:4", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:4:5-1:7:8", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:8:9-1:11:12", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:12:13-1:16:17", + "value": [ + { + "string": "z1", + "raw_string": "z1" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:20:21-1:36:37", + "path": [ + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:20:21-1:23:24", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:24:25-1:27:28", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:28:29-1:31:32", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:32:33-1:36:37", + "value": [ + { + "string": "z2", + "raw_string": "z2" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": [ + { + "index": 0, + "isCurve": false, + "src_arrow": false, + "dst_arrow": true, + "references": [ + { + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ], + "objects": [ + { + "id": "a", + "id_val": "a", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:0:1-1:16:17", + "path": [ + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:0:1-1:3:4", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:4:5-1:7:8", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:8:9-1:11:12", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:12:13-1:16:17", + "value": [ + { + "string": "z1", + "raw_string": "z1" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:20:21-1:36:37", + "path": [ + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:20:21-1:23:24", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:24:25-1:27:28", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:28:29-1:31:32", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:32:33-1:36:37", + "value": [ + { + "string": "z2", + "raw_string": "z2" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "a" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "b", + "id_val": "b", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:0:1-1:16:17", + "path": [ + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:0:1-1:3:4", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:4:5-1:7:8", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:8:9-1:11:12", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:12:13-1:16:17", + "value": [ + { + "string": "z1", + "raw_string": "z1" + } + ] + } + } + ] + }, + "key_path_index": 1, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:20:21-1:36:37", + "path": [ + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:20:21-1:23:24", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:24:25-1:27:28", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:28:29-1:31:32", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:32:33-1:36:37", + "value": [ + { + "string": "z2", + "raw_string": "z2" + } + ] + } + } + ] + }, + "key_path_index": 1, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "b" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "c", + "id_val": "c", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:0:1-1:16:17", + "path": [ + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:0:1-1:3:4", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:4:5-1:7:8", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:8:9-1:11:12", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:12:13-1:16:17", + "value": [ + { + "string": "z1", + "raw_string": "z1" + } + ] + } + } + ] + }, + "key_path_index": 2, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:20:21-1:36:37", + "path": [ + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:20:21-1:23:24", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:24:25-1:27:28", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:28:29-1:31:32", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:32:33-1:36:37", + "value": [ + { + "string": "z2", + "raw_string": "z2" + } + ] + } + } + ] + }, + "key_path_index": 2, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "c" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "z1", + "id_val": "z1", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:0:1-1:16:17", + "path": [ + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:0:1-1:3:4", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:4:5-1:7:8", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:8:9-1:11:12", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:12:13-1:16:17", + "value": [ + { + "string": "z1", + "raw_string": "z1" + } + ] + } + } + ] + }, + "key_path_index": 3, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "z1" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "z2", + "id_val": "z2", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:20:21-1:36:37", + "path": [ + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:20:21-1:23:24", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:24:25-1:27:28", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:28:29-1:31:32", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/mixed-edge-quoting.d2,1:32:33-1:36:37", + "value": [ + { + "string": "z2", + "raw_string": "z2" + } + ] + } + } + ] + }, + "key_path_index": 3, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "z2" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile2/globs/override-edge/1.exp.json b/testdata/d2compiler/TestCompile2/globs/override-edge/1.exp.json index fed08dc94..4441ad3f1 100644 --- a/testdata/d2compiler/TestCompile2/globs/override-edge/1.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/override-edge/1.exp.json @@ -253,6 +253,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -294,6 +295,7 @@ "value": "green" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -341,6 +343,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -386,6 +389,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/globs/override-edge/2.exp.json b/testdata/d2compiler/TestCompile2/globs/override-edge/2.exp.json index 28e9b1036..2eadbacd7 100644 --- a/testdata/d2compiler/TestCompile2/globs/override-edge/2.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/override-edge/2.exp.json @@ -255,6 +255,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -293,6 +294,7 @@ "value": "green" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -330,6 +332,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -397,6 +400,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -462,6 +466,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/globs/reapply-scenario.exp.json b/testdata/d2compiler/TestCompile2/globs/reapply-scenario.exp.json index 80e132917..b76efa1c8 100644 --- a/testdata/d2compiler/TestCompile2/globs/reapply-scenario.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/reapply-scenario.exp.json @@ -243,6 +243,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -290,6 +291,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -335,6 +337,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" @@ -352,7 +355,7 @@ "name": "k", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/globs/reapply-scenario.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -362,10 +365,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/globs/reapply-scenario.d2,2:0:20-2:1:21", "value": [ { - "string": "x" + "string": "x", + "raw_string": "x" } ] } @@ -375,7 +379,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -385,10 +389,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/globs/reapply-scenario.d2,3:2:27-3:3:28", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -398,7 +403,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -408,10 +413,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/globs/reapply-scenario.d2,1:5:6-1:10:11", "value": [ { - "string": "shape" + "string": "shape", + "raw_string": "shape" } ] } @@ -456,6 +462,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -523,6 +530,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -588,6 +596,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" diff --git a/testdata/d2compiler/TestCompile2/globs/second-scenario.exp.json b/testdata/d2compiler/TestCompile2/globs/second-scenario.exp.json index 727036175..77c065cb0 100644 --- a/testdata/d2compiler/TestCompile2/globs/second-scenario.exp.json +++ b/testdata/d2compiler/TestCompile2/globs/second-scenario.exp.json @@ -272,6 +272,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -290,7 +291,7 @@ "name": "k", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/globs/second-scenario.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -300,10 +301,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/globs/second-scenario.d2,5:4:45-5:5:46", "value": [ { - "string": "x" + "string": "x", + "raw_string": "x" } ] } @@ -313,7 +315,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -323,10 +325,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/globs/second-scenario.d2,6:6:56-6:7:57", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -336,7 +339,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -346,10 +349,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/globs/second-scenario.d2,1:5:6-1:10:11", "value": [ { - "string": "shape" + "string": "shape", + "raw_string": "shape" } ] } @@ -394,6 +398,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -441,6 +446,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -486,6 +492,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" @@ -503,7 +510,7 @@ "name": "z", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/globs/second-scenario.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -513,10 +520,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/globs/second-scenario.d2,10:4:79-10:5:80", "value": [ { - "string": "x" + "string": "x", + "raw_string": "x" } ] } @@ -526,7 +534,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -536,10 +544,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/globs/second-scenario.d2,11:6:90-11:7:91", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -549,7 +558,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -559,10 +568,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/globs/second-scenario.d2,1:5:6-1:10:11", "value": [ { - "string": "shape" + "string": "shape", + "raw_string": "shape" } ] } @@ -607,6 +617,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -654,6 +665,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -699,6 +711,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" diff --git a/testdata/d2compiler/TestCompile2/globs/suspend-shape.exp.json b/testdata/d2compiler/TestCompile2/globs/suspend-shape.exp.json new file mode 100644 index 000000000..d8c653c2f --- /dev/null +++ b/testdata/d2compiler/TestCompile2/globs/suspend-shape.exp.json @@ -0,0 +1,102 @@ +{ + "graph": { + "name": "", + "isFolderOnly": true, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspend-shape.d2,0:0:0-3:0:21", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspend-shape.d2,1:0:1-1:8:9", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspend-shape.d2,1:0:1-1:1:2", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspend-shape.d2,1:0:1-1:1:2", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspend-shape.d2,1:3:4-1:8:9", + "value": [ + { + "string": "hello", + "raw_string": "hello" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspend-shape.d2,2:0:10-2:10:20", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspend-shape.d2,2:0:10-2:1:11", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspend-shape.d2,2:0:10-2:1:11", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "primary": {}, + "value": { + "suspension": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspend-shape.d2,2:3:13-2:10:20", + "value": true + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": null + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile2/globs/suspension-lazy.exp.json b/testdata/d2compiler/TestCompile2/globs/suspension-lazy.exp.json new file mode 100644 index 000000000..39250038d --- /dev/null +++ b/testdata/d2compiler/TestCompile2/globs/suspension-lazy.exp.json @@ -0,0 +1,276 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-lazy.d2,0:0:0-6:0:47", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-lazy.d2,1:0:1-1:6:7", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-lazy.d2,1:0:1-1:6:7", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-lazy.d2,1:0:1-1:1:2", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-lazy.d2,1:0:1-1:1:2", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-lazy.d2,1:5:6-1:6:7", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-lazy.d2,1:5:6-1:6:7", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-lazy.d2,2:0:8-2:1:9", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-lazy.d2,2:0:8-2:1:9", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-lazy.d2,2:0:8-2:1:9", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-lazy.d2,3:0:10-3:11:21", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-lazy.d2,3:0:10-3:2:12", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-lazy.d2,3:0:10-3:2:12", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "primary": {}, + "value": { + "suspension": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-lazy.d2,3:4:14-3:11:21", + "value": true + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-lazy.d2,4:0:22-4:22:44", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-lazy.d2,4:1:23-4:9:31", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-lazy.d2,4:1:23-4:3:25", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-lazy.d2,4:1:23-4:3:25", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-lazy.d2,4:7:29-4:9:31", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-lazy.d2,4:7:29-4:9:31", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-lazy.d2,4:10:32-4:13:35", + "int": null, + "glob": true + }, + "primary": {}, + "value": { + "suspension": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-lazy.d2,4:15:37-4:22:44", + "value": true + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-lazy.d2,5:0:45-5:1:46", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-lazy.d2,5:0:45-5:1:46", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-lazy.d2,5:0:45-5:1:46", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "d", + "id_val": "d", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-lazy.d2,5:0:45-5:1:46", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-lazy.d2,5:0:45-5:1:46", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "d" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile2/globs/suspension-quotes.exp.json b/testdata/d2compiler/TestCompile2/globs/suspension-quotes.exp.json new file mode 100644 index 000000000..bcc779a93 --- /dev/null +++ b/testdata/d2compiler/TestCompile2/globs/suspension-quotes.exp.json @@ -0,0 +1,417 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-quotes.d2,0:0:0-7:0:76", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-quotes.d2,1:0:1-1:6:7", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-quotes.d2,1:0:1-1:6:7", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-quotes.d2,1:0:1-1:1:2", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-quotes.d2,1:0:1-1:1:2", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-quotes.d2,1:5:6-1:6:7", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-quotes.d2,1:5:6-1:6:7", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-quotes.d2,2:0:8-2:1:9", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-quotes.d2,2:0:8-2:1:9", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-quotes.d2,2:0:8-2:1:9", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-quotes.d2,3:0:10-3:11:21", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-quotes.d2,3:0:10-3:2:12", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-quotes.d2,3:0:10-3:2:12", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "primary": {}, + "value": { + "suspension": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-quotes.d2,3:4:14-3:11:21", + "value": true + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-quotes.d2,4:0:22-4:22:44", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-quotes.d2,4:1:23-4:9:31", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-quotes.d2,4:1:23-4:3:25", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-quotes.d2,4:1:23-4:3:25", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-quotes.d2,4:7:29-4:9:31", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-quotes.d2,4:7:29-4:9:31", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-quotes.d2,4:10:32-4:13:35", + "int": null, + "glob": true + }, + "primary": {}, + "value": { + "suspension": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-quotes.d2,4:15:37-4:22:44", + "value": true + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-quotes.d2,5:0:45-5:12:57", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-quotes.d2,5:0:45-5:1:46", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-quotes.d2,5:0:45-5:1:46", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-quotes.d2,5:3:48-5:12:57", + "value": [ + { + "string": "suspend", + "raw_string": "suspend" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-quotes.d2,6:0:58-6:17:75", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-quotes.d2,6:0:58-6:6:64", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-quotes.d2,6:0:58-6:1:59", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-quotes.d2,6:0:58-6:1:59", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-quotes.d2,6:5:63-6:6:64", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-quotes.d2,6:5:63-6:6:64", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-quotes.d2,6:8:66-6:17:75", + "value": [ + { + "string": "suspend", + "raw_string": "suspend" + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": [ + { + "index": 0, + "isCurve": false, + "src_arrow": false, + "dst_arrow": true, + "references": [ + { + "map_key_edge_index": 0 + }, + { + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "suspend" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ], + "objects": [ + { + "id": "d", + "id_val": "d", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-quotes.d2,5:0:45-5:1:46", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-quotes.d2,5:0:45-5:1:46", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-quotes.d2,6:0:58-6:1:59", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-quotes.d2,6:0:58-6:1:59", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-quotes.d2,6:5:63-6:6:64", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-quotes.d2,6:5:63-6:6:64", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "suspend" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile2/globs/suspension-restore-edge.exp.json b/testdata/d2compiler/TestCompile2/globs/suspension-restore-edge.exp.json new file mode 100644 index 000000000..a312d2fa8 --- /dev/null +++ b/testdata/d2compiler/TestCompile2/globs/suspension-restore-edge.exp.json @@ -0,0 +1,341 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-restore-edge.d2,0:0:0-9:0:108", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-restore-edge.d2,1:0:1-1:6:7", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-restore-edge.d2,1:0:1-1:6:7", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-restore-edge.d2,1:0:1-1:1:2", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-restore-edge.d2,1:0:1-1:1:2", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-restore-edge.d2,1:5:6-1:6:7", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-restore-edge.d2,1:5:6-1:6:7", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-restore-edge.d2,2:0:8-2:1:9", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-restore-edge.d2,2:0:8-2:1:9", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-restore-edge.d2,2:0:8-2:1:9", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-restore-edge.d2,3:0:10-3:11:21", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-restore-edge.d2,3:0:10-3:2:12", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-restore-edge.d2,3:0:10-3:2:12", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "primary": {}, + "value": { + "suspension": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-restore-edge.d2,3:4:14-3:11:21", + "value": true + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-restore-edge.d2,4:0:22-4:22:44", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-restore-edge.d2,4:1:23-4:9:31", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-restore-edge.d2,4:1:23-4:3:25", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-restore-edge.d2,4:1:23-4:3:25", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-restore-edge.d2,4:7:29-4:9:31", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-restore-edge.d2,4:7:29-4:9:31", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-restore-edge.d2,4:10:32-4:13:35", + "int": null, + "glob": true + }, + "primary": {}, + "value": { + "suspension": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-restore-edge.d2,4:15:37-4:22:44", + "value": true + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-restore-edge.d2,5:0:45-5:1:46", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-restore-edge.d2,5:0:45-5:1:46", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-restore-edge.d2,5:0:45-5:1:46", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "comment": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-restore-edge.d2,7:0:48-7:37:85", + "value": "Also restores the objects connected" + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-restore-edge.d2,8:0:86-8:21:107", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-restore-edge.d2,8:1:87-8:8:94", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-restore-edge.d2,8:1:87-8:3:89", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-restore-edge.d2,8:1:87-8:3:89", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-restore-edge.d2,8:7:93-8:8:94", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-restore-edge.d2,8:7:93-8:8:94", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-restore-edge.d2,8:9:95-8:12:98", + "int": null, + "glob": true + }, + "primary": {}, + "value": { + "suspension": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-restore-edge.d2,8:14:100-8:21:107", + "value": false + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "d", + "id_val": "d", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-restore-edge.d2,5:0:45-5:1:46", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/suspension-restore-edge.d2,5:0:45-5:1:46", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "d" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.exp.json b/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.exp.json new file mode 100644 index 000000000..9f6e86713 --- /dev/null +++ b/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.exp.json @@ -0,0 +1,772 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,0:0:0-13:0:121", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,1:0:1-3:1:11", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,1:0:1-1:1:2", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,1:0:1-1:1:2", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,1:3:4-3:1:11", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,2:2:8-2:3:9", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,2:2:8-2:3:9", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,2:2:8-2:3:9", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,4:0:12-6:1:22", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,4:0:12-4:1:13", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,4:0:12-4:1:13", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,4:3:15-6:1:22", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,5:2:19-5:3:20", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,5:2:19-5:3:20", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,5:2:19-5:3:20", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,7:0:23-7:17:40", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,7:0:23-7:10:33", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,7:0:23-7:3:26", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,7:0:23-7:1:24", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,7:2:25-7:3:26", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,7:7:30-7:10:33", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,7:7:30-7:8:31", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,7:9:32-7:10:33", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,7:12:35-7:17:40", + "value": [ + { + "string": "likes", + "raw_string": "likes" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,8:0:41-8:11:52", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,8:0:41-8:2:43", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,8:0:41-8:2:43", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "primary": {}, + "value": { + "suspension": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,8:4:45-8:11:52", + "value": true + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,9:0:53-9:22:75", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,9:1:54-9:9:62", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,9:1:54-9:3:56", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,9:1:54-9:3:56", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,9:7:60-9:9:62", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,9:7:60-9:9:62", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,9:10:63-9:13:66", + "int": null, + "glob": true + }, + "primary": {}, + "value": { + "suspension": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,9:15:68-9:22:75", + "value": true + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,10:0:76-12:1:120", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,10:1:77-10:9:85", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,10:1:77-10:3:79", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,10:1:77-10:3:79", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,10:7:83-10:9:85", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,10:7:83-10:9:85", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,10:10:86-10:13:89", + "int": null, + "glob": true + }, + "primary": { + "suspension": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,10:15:91-10:24:100", + "value": false + } + }, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,10:25:101-12:1:120", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,11:2:105-11:15:118", + "ampersand": true, + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,11:3:106-11:8:111", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,11:3:106-11:8:111", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,11:10:113-11:15:118", + "value": [ + { + "string": "likes", + "raw_string": "likes" + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": [ + { + "index": 0, + "isCurve": false, + "src_arrow": false, + "dst_arrow": true, + "references": [ + { + "map_key_edge_index": 0 + }, + { + "map_key_edge_index": 0 + }, + { + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "likes" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ], + "objects": [ + { + "id": "a", + "id_val": "a", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,1:0:1-1:1:2", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,1:0:1-1:1:2", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,7:0:23-7:3:26", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,7:0:23-7:1:24", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,7:2:25-7:3:26", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "a" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "b", + "id_val": "b", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,2:2:8-2:3:9", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,2:2:8-2:3:9", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,7:0:23-7:3:26", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,7:0:23-7:1:24", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,7:2:25-7:3:26", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 1, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "b" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "c", + "id_val": "c", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,4:0:12-4:1:13", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,4:0:12-4:1:13", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,7:7:30-7:10:33", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,7:7:30-7:8:31", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,7:9:32-7:10:33", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "c" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "d", + "id_val": "d", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,5:2:19-5:3:20", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,5:2:19-5:3:20", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,7:7:30-7:10:33", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,7:7:30-7:8:31", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-cross-container-edge-label.d2,7:9:32-7:10:33", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "key_path_index": 1, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "d" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.exp.json b/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.exp.json new file mode 100644 index 000000000..564e662a2 --- /dev/null +++ b/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.exp.json @@ -0,0 +1,495 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.d2,0:0:0-10:0:94", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.d2,1:0:1-3:1:16", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.d2,1:0:1-1:1:2", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.d2,1:0:1-1:1:2", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.d2,1:3:4-3:1:16", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.d2,2:2:8-2:8:14", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.d2,2:2:8-2:8:14", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.d2,2:2:8-2:3:9", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.d2,2:2:8-2:3:9", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.d2,2:7:13-2:8:14", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.d2,2:7:13-2:8:14", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.d2,5:0:18-5:11:29", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.d2,5:0:18-5:2:20", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.d2,5:0:18-5:2:20", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "primary": {}, + "value": { + "suspension": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.d2,5:4:22-5:11:29", + "value": true + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.d2,6:0:30-6:22:52", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.d2,6:1:31-6:9:39", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.d2,6:1:31-6:3:33", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.d2,6:1:31-6:3:33", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.d2,6:7:37-6:9:39", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.d2,6:7:37-6:9:39", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.d2,6:10:40-6:13:43", + "int": null, + "glob": true + }, + "primary": {}, + "value": { + "suspension": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.d2,6:15:45-6:22:52", + "value": true + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.d2,7:0:53-9:1:93", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.d2,7:1:54-7:9:62", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.d2,7:1:54-7:3:56", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.d2,7:1:54-7:3:56", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.d2,7:7:60-7:9:62", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.d2,7:7:60-7:9:62", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.d2,7:10:63-7:13:66", + "int": null, + "glob": true + }, + "primary": { + "suspension": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.d2,7:15:68-7:24:77", + "value": false + } + }, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.d2,7:25:78-9:1:93", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.d2,8:2:82-8:11:91", + "ampersand": true, + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.d2,8:3:83-8:6:86", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.d2,8:3:83-8:6:86", + "value": [ + { + "string": "dst", + "raw_string": "dst" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.d2,8:8:88-8:11:91", + "value": [ + { + "string": "a.c", + "raw_string": "a.c" + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": [ + { + "index": 0, + "isCurve": false, + "src_arrow": false, + "dst_arrow": true, + "references": [ + { + "map_key_edge_index": 0 + }, + { + "map_key_edge_index": 0 + }, + { + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ], + "objects": [ + { + "id": "a", + "id_val": "a", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.d2,1:0:1-1:1:2", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.d2,1:0:1-1:1:2", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "a" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "b", + "id_val": "b", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.d2,2:2:8-2:3:9", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.d2,2:2:8-2:3:9", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "b" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "c", + "id_val": "c", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.d2,2:7:13-2:8:14", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-child.d2,2:7:13-2:8:14", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "c" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.exp.json b/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.exp.json new file mode 100644 index 000000000..4100e2ac1 --- /dev/null +++ b/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.exp.json @@ -0,0 +1,285 @@ +{ + "graph": { + "name": "", + "isFolderOnly": true, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,0:0:0-7:0:80", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,1:0:1-1:6:7", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,1:0:1-1:6:7", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,1:0:1-1:1:2", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,1:0:1-1:1:2", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,1:5:6-1:6:7", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,1:5:6-1:6:7", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,2:0:8-2:11:19", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,2:0:8-2:2:10", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,2:0:8-2:2:10", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "primary": {}, + "value": { + "suspension": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,2:4:12-2:11:19", + "value": true + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,3:0:20-3:22:42", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,3:1:21-3:9:29", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,3:1:21-3:3:23", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,3:1:21-3:3:23", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,3:7:27-3:9:29", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,3:7:27-3:9:29", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,3:10:30-3:13:33", + "int": null, + "glob": true + }, + "primary": {}, + "value": { + "suspension": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,3:15:35-3:22:42", + "value": true + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,4:0:43-6:1:79", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,4:1:44-4:7:50", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,4:1:44-4:2:45", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,4:1:44-4:2:45", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,4:6:49-4:7:50", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,4:6:49-4:7:50", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,4:8:51-4:11:54", + "int": null, + "glob": true + }, + "primary": { + "suspension": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,4:13:56-4:22:65", + "value": false + } + }, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,4:23:66-6:1:79", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,5:2:70-5:9:77", + "ampersand": true, + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,5:3:71-5:6:74", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,5:3:71-5:6:74", + "value": [ + { + "string": "dst", + "raw_string": "dst" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-filter.d2,5:8:76-5:9:77", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": null + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.exp.json b/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.exp.json new file mode 100644 index 000000000..c3508fbc6 --- /dev/null +++ b/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.exp.json @@ -0,0 +1,577 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,0:0:0-13:0:121", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,1:0:1-3:1:11", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,1:0:1-1:1:2", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,1:0:1-1:1:2", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,1:3:4-3:1:11", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,2:2:8-2:3:9", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,2:2:8-2:3:9", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,2:2:8-2:3:9", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,4:0:12-6:1:22", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,4:0:12-4:1:13", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,4:0:12-4:1:13", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,4:3:15-6:1:22", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,5:2:19-5:3:20", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,5:2:19-5:3:20", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,5:2:19-5:3:20", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,7:0:23-7:17:40", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,7:0:23-7:10:33", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,7:0:23-7:3:26", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,7:0:23-7:1:24", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,7:2:25-7:3:26", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,7:7:30-7:10:33", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,7:7:30-7:8:31", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,7:9:32-7:10:33", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,7:12:35-7:17:40", + "value": [ + { + "string": "likes", + "raw_string": "likes" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,8:0:41-8:11:52", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,8:0:41-8:2:43", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,8:0:41-8:2:43", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "primary": {}, + "value": { + "suspension": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,8:4:45-8:11:52", + "value": true + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,9:0:53-9:22:75", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,9:1:54-9:9:62", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,9:1:54-9:3:56", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,9:1:54-9:3:56", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,9:7:60-9:9:62", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,9:7:60-9:9:62", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,9:10:63-9:13:66", + "int": null, + "glob": true + }, + "primary": {}, + "value": { + "suspension": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,9:15:68-9:22:75", + "value": true + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,10:0:76-12:1:120", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,10:1:77-10:9:85", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,10:1:77-10:3:79", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,10:1:77-10:3:79", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,10:7:83-10:9:85", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,10:7:83-10:9:85", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,10:10:86-10:13:89", + "int": null, + "glob": true + }, + "primary": { + "suspension": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,10:15:91-10:24:100", + "value": false + } + }, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,10:25:101-12:1:120", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,11:2:105-11:15:118", + "ampersand": true, + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,11:3:106-11:8:111", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,11:3:106-11:8:111", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,11:10:113-11:15:118", + "value": [ + { + "string": "likes", + "raw_string": "likes" + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "a", + "id_val": "a", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,1:0:1-1:1:2", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,1:0:1-1:1:2", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,7:0:23-7:3:26", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,7:0:23-7:1:24", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,7:2:25-7:3:26", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "a" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "b", + "id_val": "b", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,2:2:8-2:3:9", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,2:2:8-2:3:9", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,7:0:23-7:3:26", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,7:0:23-7:1:24", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label#01.d2,7:2:25-7:3:26", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 1, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "b" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label.exp.json b/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label.exp.json new file mode 100644 index 000000000..bce164ba8 --- /dev/null +++ b/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label.exp.json @@ -0,0 +1,409 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label.d2,0:0:0-7:0:76", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label.d2,1:0:1-1:13:14", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label.d2,1:0:1-1:6:7", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label.d2,1:0:1-1:1:2", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label.d2,1:0:1-1:1:2", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label.d2,1:5:6-1:6:7", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label.d2,1:5:6-1:6:7", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label.d2,1:8:9-1:13:14", + "value": [ + { + "string": "hello", + "raw_string": "hello" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label.d2,2:0:15-2:1:16", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label.d2,2:0:15-2:1:16", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label.d2,2:0:15-2:1:16", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label.d2,3:0:17-3:11:28", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label.d2,3:0:17-3:2:19", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label.d2,3:0:17-3:2:19", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "primary": {}, + "value": { + "suspension": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label.d2,3:4:21-3:11:28", + "value": true + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label.d2,4:0:29-4:22:51", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label.d2,4:1:30-4:9:38", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label.d2,4:1:30-4:3:32", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label.d2,4:1:30-4:3:32", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label.d2,4:7:36-4:9:38", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label.d2,4:7:36-4:9:38", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label.d2,4:10:39-4:13:42", + "int": null, + "glob": true + }, + "primary": {}, + "value": { + "suspension": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label.d2,4:15:44-4:22:51", + "value": true + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label.d2,6:0:53-6:22:75", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label.d2,6:1:54-6:7:60", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label.d2,6:1:54-6:2:55", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label.d2,6:1:54-6:2:55", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label.d2,6:6:59-6:7:60", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label.d2,6:6:59-6:7:60", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label.d2,6:8:61-6:11:64", + "int": null, + "glob": true + }, + "primary": {}, + "value": { + "suspension": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label.d2,6:13:66-6:22:75", + "value": false + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": [ + { + "index": 0, + "isCurve": false, + "src_arrow": false, + "dst_arrow": true, + "references": [ + { + "map_key_edge_index": 0 + }, + { + "map_key_edge_index": 0 + }, + { + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "hello" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ], + "objects": [ + { + "id": "a", + "id_val": "a", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label.d2,1:0:1-1:1:2", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label.d2,1:0:1-1:1:2", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "a" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "b", + "id_val": "b", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label.d2,1:5:6-1:6:7", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-edge-label.d2,1:5:6-1:6:7", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "b" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile2/globs/unsuspend-label.exp.json b/testdata/d2compiler/TestCompile2/globs/unsuspend-label.exp.json new file mode 100644 index 000000000..3a0edc892 --- /dev/null +++ b/testdata/d2compiler/TestCompile2/globs/unsuspend-label.exp.json @@ -0,0 +1,405 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-label.d2,0:0:0-7:0:76", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-label.d2,1:0:1-1:13:14", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-label.d2,1:0:1-1:6:7", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-label.d2,1:0:1-1:1:2", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-label.d2,1:0:1-1:1:2", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-label.d2,1:5:6-1:6:7", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-label.d2,1:5:6-1:6:7", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-label.d2,1:8:9-1:13:14", + "value": [ + { + "string": "hello", + "raw_string": "hello" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-label.d2,2:0:15-2:1:16", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-label.d2,2:0:15-2:1:16", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-label.d2,2:0:15-2:1:16", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-label.d2,3:0:17-3:11:28", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-label.d2,3:0:17-3:2:19", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-label.d2,3:0:17-3:2:19", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "primary": {}, + "value": { + "suspension": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-label.d2,3:4:21-3:11:28", + "value": true + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-label.d2,4:0:29-4:22:51", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-label.d2,4:1:30-4:9:38", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-label.d2,4:1:30-4:3:32", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-label.d2,4:1:30-4:3:32", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-label.d2,4:7:36-4:9:38", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-label.d2,4:7:36-4:9:38", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-label.d2,4:10:39-4:13:42", + "int": null, + "glob": true + }, + "primary": {}, + "value": { + "suspension": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-label.d2,4:15:44-4:22:51", + "value": true + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-label.d2,6:0:53-6:22:75", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-label.d2,6:1:54-6:7:60", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-label.d2,6:1:54-6:2:55", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-label.d2,6:1:54-6:2:55", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-label.d2,6:6:59-6:7:60", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-label.d2,6:6:59-6:7:60", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-label.d2,6:8:61-6:11:64", + "int": null, + "glob": true + }, + "primary": {}, + "value": { + "suspension": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-label.d2,6:13:66-6:22:75", + "value": false + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": [ + { + "index": 0, + "isCurve": false, + "src_arrow": false, + "dst_arrow": true, + "references": [ + { + "map_key_edge_index": 0 + }, + { + "map_key_edge_index": 0 + }, + { + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "hello" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ], + "objects": [ + { + "id": "a", + "id_val": "a", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-label.d2,1:0:1-1:1:2", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-label.d2,1:0:1-1:1:2", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "a" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "b", + "id_val": "b", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-label.d2,1:5:6-1:6:7", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-label.d2,1:5:6-1:6:7", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "b" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile2/globs/unsuspend-shape-label.exp.json b/testdata/d2compiler/TestCompile2/globs/unsuspend-shape-label.exp.json new file mode 100644 index 000000000..ab40a755f --- /dev/null +++ b/testdata/d2compiler/TestCompile2/globs/unsuspend-shape-label.exp.json @@ -0,0 +1,180 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-shape-label.d2,0:0:0-4:0:34", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-shape-label.d2,1:0:1-1:8:9", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-shape-label.d2,1:0:1-1:1:2", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-shape-label.d2,1:0:1-1:1:2", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-shape-label.d2,1:3:4-1:8:9", + "value": [ + { + "string": "hello", + "raw_string": "hello" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-shape-label.d2,2:0:10-2:10:20", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-shape-label.d2,2:0:10-2:1:11", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-shape-label.d2,2:0:10-2:1:11", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "primary": {}, + "value": { + "suspension": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-shape-label.d2,2:3:13-2:10:20", + "value": true + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-shape-label.d2,3:0:21-3:12:33", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-shape-label.d2,3:0:21-3:1:22", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-shape-label.d2,3:0:21-3:1:22", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "primary": {}, + "value": { + "suspension": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-shape-label.d2,3:3:24-3:12:33", + "value": false + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "a", + "id_val": "a", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-shape-label.d2,1:0:1-1:1:2", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/globs/unsuspend-shape-label.d2,1:0:1-1:1:2", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "hello" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile2/nulls/basic/attribute.exp.json b/testdata/d2compiler/TestCompile2/nulls/basic/attribute.exp.json index fb4a47fbd..97233c400 100644 --- a/testdata/d2compiler/TestCompile2/nulls/basic/attribute.exp.json +++ b/testdata/d2compiler/TestCompile2/nulls/basic/attribute.exp.json @@ -119,6 +119,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -230,6 +231,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/nulls/basic/basic-edge.exp.json b/testdata/d2compiler/TestCompile2/nulls/basic/basic-edge.exp.json new file mode 100644 index 000000000..36451d711 --- /dev/null +++ b/testdata/d2compiler/TestCompile2/nulls/basic/basic-edge.exp.json @@ -0,0 +1,232 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/basic-edge.d2,0:0:0-3:0:26", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/basic-edge.d2,1:0:1-1:6:7", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/basic-edge.d2,1:0:1-1:6:7", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/basic-edge.d2,1:0:1-1:1:2", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/basic-edge.d2,1:0:1-1:1:2", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/basic-edge.d2,1:5:6-1:6:7", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/basic-edge.d2,1:5:6-1:6:7", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/basic-edge.d2,2:0:8-2:17:25", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/basic-edge.d2,2:1:9-2:7:15", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/basic-edge.d2,2:1:9-2:2:10", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/basic-edge.d2,2:1:9-2:2:10", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/basic-edge.d2,2:6:14-2:7:15", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/basic-edge.d2,2:6:14-2:7:15", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/basic-edge.d2,2:8:16-2:11:19", + "int": 0, + "glob": false + }, + "primary": {}, + "value": { + "null": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/basic-edge.d2,2:13:21-2:17:25" + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "a", + "id_val": "a", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/basic-edge.d2,1:0:1-1:1:2", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/basic-edge.d2,1:0:1-1:1:2", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "a" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "b", + "id_val": "b", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/basic-edge.d2,1:5:6-1:6:7", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/basic-edge.d2,1:5:6-1:6:7", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "b" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.exp.json b/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.exp.json new file mode 100644 index 000000000..0039c2309 --- /dev/null +++ b/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.exp.json @@ -0,0 +1,1065 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,0:0:0-6:0:82", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,1:0:1-1:14:15", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,1:0:1-1:14:15", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,1:0:1-1:5:6", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,1:0:1-1:1:2", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,1:2:3-1:3:4", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,1:4:5-1:5:6", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,1:9:10-1:14:15", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,1:9:10-1:10:11", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,1:11:12-1:12:13", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,1:13:14-1:14:15", + "value": [ + { + "string": "e", + "raw_string": "e" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,2:0:16-2:14:30", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,2:0:16-2:14:30", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,2:0:16-2:5:21", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,2:0:16-2:1:17", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,2:2:18-2:3:19", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,2:4:20-2:5:21", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,2:9:25-2:14:30", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,2:9:25-2:10:26", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,2:11:27-2:12:28", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,2:13:29-2:14:30", + "value": [ + { + "string": "e", + "raw_string": "e" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,4:0:32-4:23:55", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,4:0:32-4:1:33", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,4:0:32-4:1:33", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,4:3:35-4:13:45", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,4:3:35-4:6:38", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,4:3:35-4:4:36", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,4:5:37-4:6:38", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,4:10:42-4:13:45", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,4:10:42-4:11:43", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,4:12:44-4:13:45", + "value": [ + { + "string": "e", + "raw_string": "e" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,4:14:46-4:17:49", + "int": 0, + "glob": false + }, + "primary": {}, + "value": { + "null": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,4:19:51-4:23:55" + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,5:0:56-5:25:81", + "edges": [ + { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,5:1:57-5:15:71", + "src": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,5:1:57-5:6:62", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,5:1:57-5:2:58", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,5:3:59-5:4:60", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,5:5:61-5:6:62", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,5:10:66-5:15:71", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,5:10:66-5:11:67", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,5:12:68-5:13:69", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,5:14:70-5:15:71", + "value": [ + { + "string": "e", + "raw_string": "e" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "edge_index": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,5:16:72-5:19:75", + "int": 1, + "glob": false + }, + "primary": {}, + "value": { + "null": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,5:21:77-5:25:81" + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "a", + "id_val": "a", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,1:0:1-1:5:6", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,1:0:1-1:1:2", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,1:2:3-1:3:4", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,1:4:5-1:5:6", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,1:9:10-1:14:15", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,1:9:10-1:10:11", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,1:11:12-1:12:13", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,1:13:14-1:14:15", + "value": [ + { + "string": "e", + "raw_string": "e" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,2:0:16-2:5:21", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,2:0:16-2:1:17", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,2:2:18-2:3:19", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,2:4:20-2:5:21", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,2:9:25-2:14:30", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,2:9:25-2:10:26", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,2:11:27-2:12:28", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,2:13:29-2:14:30", + "value": [ + { + "string": "e", + "raw_string": "e" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,4:0:32-4:1:33", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,4:0:32-4:1:33", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "a" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "b", + "id_val": "b", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,1:0:1-1:5:6", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,1:0:1-1:1:2", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,1:2:3-1:3:4", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,1:4:5-1:5:6", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "key_path_index": 1, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,2:0:16-2:5:21", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,2:0:16-2:1:17", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,2:2:18-2:3:19", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,2:4:20-2:5:21", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "key_path_index": 1, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "b" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "c", + "id_val": "c", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,1:0:1-1:5:6", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,1:0:1-1:1:2", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,1:2:3-1:3:4", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,1:4:5-1:5:6", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "key_path_index": 2, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,2:0:16-2:5:21", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,2:0:16-2:1:17", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,2:2:18-2:3:19", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,2:4:20-2:5:21", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "key_path_index": 2, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "c" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "d", + "id_val": "d", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,1:9:10-1:14:15", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,1:9:10-1:10:11", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,1:11:12-1:12:13", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,1:13:14-1:14:15", + "value": [ + { + "string": "e", + "raw_string": "e" + } + ] + } + } + ] + }, + "key_path_index": 1, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,2:9:25-2:14:30", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,2:9:25-2:10:26", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,2:11:27-2:12:28", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,2:13:29-2:14:30", + "value": [ + { + "string": "e", + "raw_string": "e" + } + ] + } + } + ] + }, + "key_path_index": 1, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "d" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "e", + "id_val": "e", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,1:9:10-1:14:15", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,1:9:10-1:10:11", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,1:11:12-1:12:13", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,1:13:14-1:14:15", + "value": [ + { + "string": "e", + "raw_string": "e" + } + ] + } + } + ] + }, + "key_path_index": 2, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,2:9:25-2:14:30", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,2:9:25-2:10:26", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,2:11:27-2:12:28", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/nulls/basic/nested-edge.d2,2:13:29-2:14:30", + "value": [ + { + "string": "e", + "raw_string": "e" + } + ] + } + } + ] + }, + "key_path_index": 2, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "e" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile2/nulls/basic/shape.exp.json b/testdata/d2compiler/TestCompile2/nulls/basic/shape.exp.json index ec5030e90..fa6fc4bf7 100644 --- a/testdata/d2compiler/TestCompile2/nulls/basic/shape.exp.json +++ b/testdata/d2compiler/TestCompile2/nulls/basic/shape.exp.json @@ -69,6 +69,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" diff --git a/testdata/d2compiler/TestCompile2/nulls/implicit/delete-children.exp.json b/testdata/d2compiler/TestCompile2/nulls/implicit/delete-children.exp.json index 758fbbabb..fcfbe21c0 100644 --- a/testdata/d2compiler/TestCompile2/nulls/implicit/delete-children.exp.json +++ b/testdata/d2compiler/TestCompile2/nulls/implicit/delete-children.exp.json @@ -174,6 +174,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -274,6 +275,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/nulls/implicit/delete-connection.exp.json b/testdata/d2compiler/TestCompile2/nulls/implicit/delete-connection.exp.json index 62151696b..0e60bd324 100644 --- a/testdata/d2compiler/TestCompile2/nulls/implicit/delete-connection.exp.json +++ b/testdata/d2compiler/TestCompile2/nulls/implicit/delete-connection.exp.json @@ -92,6 +92,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -139,6 +140,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/nulls/implicit/delete-multiple-connections.exp.json b/testdata/d2compiler/TestCompile2/nulls/implicit/delete-multiple-connections.exp.json index 7a9d1b326..66c5b2812 100644 --- a/testdata/d2compiler/TestCompile2/nulls/implicit/delete-multiple-connections.exp.json +++ b/testdata/d2compiler/TestCompile2/nulls/implicit/delete-multiple-connections.exp.json @@ -184,6 +184,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -231,6 +232,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -276,6 +278,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -321,6 +324,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/nulls/implicit/delete-nested-connection.exp.json b/testdata/d2compiler/TestCompile2/nulls/implicit/delete-nested-connection.exp.json index ab4289ac1..3eb4e3250 100644 --- a/testdata/d2compiler/TestCompile2/nulls/implicit/delete-nested-connection.exp.json +++ b/testdata/d2compiler/TestCompile2/nulls/implicit/delete-nested-connection.exp.json @@ -114,6 +114,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -161,6 +162,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -248,6 +250,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/nulls/implicit/no-delete-connection.exp.json b/testdata/d2compiler/TestCompile2/nulls/implicit/no-delete-connection.exp.json index c0b0e4fc1..b6b70ff58 100644 --- a/testdata/d2compiler/TestCompile2/nulls/implicit/no-delete-connection.exp.json +++ b/testdata/d2compiler/TestCompile2/nulls/implicit/no-delete-connection.exp.json @@ -92,6 +92,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -123,6 +124,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -170,6 +172,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -215,6 +218,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/nulls/multiboard/scenario.exp.json b/testdata/d2compiler/TestCompile2/nulls/multiboard/scenario.exp.json index 4e804caff..f586a6d3a 100644 --- a/testdata/d2compiler/TestCompile2/nulls/multiboard/scenario.exp.json +++ b/testdata/d2compiler/TestCompile2/nulls/multiboard/scenario.exp.json @@ -127,6 +127,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -174,6 +175,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -191,7 +193,7 @@ "name": "a", "isFolderOnly": true, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/nulls/multiboard/scenario.d2,0:0:0-1:0:0", "nodes": null }, "root": { @@ -206,6 +208,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" diff --git a/testdata/d2compiler/TestCompile2/nulls/reappear/attribute-reset.exp.json b/testdata/d2compiler/TestCompile2/nulls/reappear/attribute-reset.exp.json index 92f2e464a..3ba9efaba 100644 --- a/testdata/d2compiler/TestCompile2/nulls/reappear/attribute-reset.exp.json +++ b/testdata/d2compiler/TestCompile2/nulls/reappear/attribute-reset.exp.json @@ -120,6 +120,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -167,6 +168,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/nulls/reappear/children-reset.exp.json b/testdata/d2compiler/TestCompile2/nulls/reappear/children-reset.exp.json index 6af8f1845..37405dce0 100644 --- a/testdata/d2compiler/TestCompile2/nulls/reappear/children-reset.exp.json +++ b/testdata/d2compiler/TestCompile2/nulls/reappear/children-reset.exp.json @@ -136,6 +136,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -267,6 +268,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -323,6 +325,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/nulls/reappear/edge-reset.exp.json b/testdata/d2compiler/TestCompile2/nulls/reappear/edge-reset.exp.json index d6e3860e1..7a3a04234 100644 --- a/testdata/d2compiler/TestCompile2/nulls/reappear/edge-reset.exp.json +++ b/testdata/d2compiler/TestCompile2/nulls/reappear/edge-reset.exp.json @@ -115,6 +115,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -162,6 +163,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -207,6 +209,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/nulls/reappear/edge.exp.json b/testdata/d2compiler/TestCompile2/nulls/reappear/edge.exp.json index f22a53468..c51ea36c2 100644 --- a/testdata/d2compiler/TestCompile2/nulls/reappear/edge.exp.json +++ b/testdata/d2compiler/TestCompile2/nulls/reappear/edge.exp.json @@ -166,6 +166,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -197,6 +198,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -264,6 +266,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -329,6 +332,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/nulls/reappear/shape.exp.json b/testdata/d2compiler/TestCompile2/nulls/reappear/shape.exp.json index 744b757f3..ae073b07b 100644 --- a/testdata/d2compiler/TestCompile2/nulls/reappear/shape.exp.json +++ b/testdata/d2compiler/TestCompile2/nulls/reappear/shape.exp.json @@ -92,6 +92,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -139,6 +140,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/array.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/array.exp.json index 73c5d4b33..ec5b3038a 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/array.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/array.exp.json @@ -248,6 +248,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -330,6 +331,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "sql_table" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/combined.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/combined.exp.json index 647ad1d52..cffe24a16 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/combined.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/combined.exp.json @@ -113,6 +113,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -160,6 +161,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/comment-array.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/comment-array.exp.json new file mode 100644 index 000000000..0596e3a42 --- /dev/null +++ b/testdata/d2compiler/TestCompile2/vars/basic/comment-array.exp.json @@ -0,0 +1,216 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/comment-array.d2,0:0:0-12:0:71", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/comment-array.d2,1:0:1-9:1:67", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/comment-array.d2,1:0:1-1:4:5", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/comment-array.d2,1:0:1-1:4:5", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/comment-array.d2,1:6:7-9:1:67", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/comment-array.d2,2:2:11-8:3:65", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/comment-array.d2,2:2:11-2:6:15", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/comment-array.d2,2:2:11-2:6:15", + "value": [ + { + "string": "list", + "raw_string": "list" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "array": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/comment-array.d2,2:8:17-8:2:64", + "nodes": [ + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/comment-array.d2,3:4:23-3:7:26", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/comment-array.d2,4:4:32-4:7:35", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/comment-array.d2,5:4:41-5:7:44", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + }, + { + "double_quoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/comment-array.d2,6:4:50-6:7:53", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + }, + { + "comment": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/comment-array.d2,7:4:58-7:7:61", + "value": "e" + } + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/comment-array.d2,11:0:69-11:1:70", + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/comment-array.d2,11:0:69-11:1:70", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/comment-array.d2,11:0:69-11:1:70", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "a", + "id_val": "a", + "references": [ + { + "key": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/comment-array.d2,11:0:69-11:1:70", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2compiler/TestCompile2/vars/basic/comment-array.d2,11:0:69-11:1:70", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "a" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": null +} diff --git a/testdata/d2compiler/TestCompile2/vars/basic/double-border.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/double-border.exp.json index 8b7f30d5d..448acbbc1 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/double-border.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/double-border.exp.json @@ -113,6 +113,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -217,9 +218,10 @@ "value": "true" } }, + "iconStyle": {}, "near_key": null, "shape": { - "value": "Circle" + "value": "circle" }, "direction": { "value": "" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/double-quote-primary.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/double-quote-primary.exp.json index d23e46259..407f8ad27 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/double-quote-primary.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/double-quote-primary.exp.json @@ -152,6 +152,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -199,6 +200,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/double-quoted.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/double-quoted.exp.json index dd4764b6b..ef3b6a3b4 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/double-quoted.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/double-quoted.exp.json @@ -113,6 +113,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -160,6 +161,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/edge-label.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/edge-label.exp.json index 87391a571..8750bbebe 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/edge-label.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/edge-label.exp.json @@ -152,6 +152,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -183,6 +184,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -230,6 +232,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -275,6 +278,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/edge-map.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/edge-map.exp.json index cb64534ff..2f6130c61 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/edge-map.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/edge-map.exp.json @@ -192,6 +192,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -218,6 +219,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -241,6 +243,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -288,6 +291,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -333,6 +337,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/map.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/map.exp.json index e04804d69..77170767c 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/map.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/map.exp.json @@ -313,6 +313,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -339,6 +340,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -362,6 +364,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -424,6 +427,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -469,6 +473,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -514,6 +519,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/multi-part-array.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/multi-part-array.exp.json index f6b14f864..d9c1f3fab 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/multi-part-array.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/multi-part-array.exp.json @@ -142,6 +142,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -200,6 +201,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/nested.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/nested.exp.json index 2b5c53b82..a19448c54 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/nested.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/nested.exp.json @@ -249,6 +249,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -300,6 +301,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/number.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/number.exp.json index a27ca9ad5..2f4ec8488 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/number.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/number.exp.json @@ -177,6 +177,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -224,6 +225,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -272,6 +274,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.exp.json index b9d8924d5..0d2507540 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/parent-scope.exp.json @@ -220,6 +220,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -267,6 +268,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -312,6 +314,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/primary-and-composite.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/primary-and-composite.exp.json index f787b07bc..c64006cb0 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/primary-and-composite.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/primary-and-composite.exp.json @@ -168,6 +168,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -215,6 +216,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -260,6 +262,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/quoted-var-quoted-sub.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/quoted-var-quoted-sub.exp.json index 0ab13c79f..53a31fe40 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/quoted-var-quoted-sub.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/quoted-var-quoted-sub.exp.json @@ -113,6 +113,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -160,6 +161,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.exp.json index ec1525372..0d2ce8a0f 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/quoted-var.exp.json @@ -296,6 +296,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -350,6 +351,7 @@ "value": "5" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/shape-label.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/shape-label.exp.json index faf48d651..26c2458dc 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/shape-label.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/shape-label.exp.json @@ -129,6 +129,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -176,6 +177,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/single-quoted.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/single-quoted.exp.json index 5e1a45456..5ea7b5420 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/single-quoted.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/single-quoted.exp.json @@ -110,6 +110,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -157,6 +158,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/spread-array.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/spread-array.exp.json index f83c5490d..4793baf29 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/spread-array.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/spread-array.exp.json @@ -259,6 +259,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -342,6 +343,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "sql_table" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/spread-edge.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/spread-edge.exp.json index 2222e2d12..cf0883009 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/spread-edge.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/spread-edge.exp.json @@ -171,6 +171,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -202,6 +203,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -249,6 +251,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -294,6 +297,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -339,6 +343,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/spread-nested.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/spread-nested.exp.json index 484af8d51..2e5f19a4a 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/spread-nested.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/spread-nested.exp.json @@ -158,6 +158,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -205,6 +206,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -250,6 +252,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/spread.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/spread.exp.json index 31cda41df..18d7542d7 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/spread.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/spread.exp.json @@ -224,6 +224,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -271,6 +272,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -316,6 +318,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -361,6 +364,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -406,6 +410,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/style.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/style.exp.json index 9cd133ce4..72874a2f6 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/style.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/style.exp.json @@ -169,6 +169,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -220,6 +221,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/basic/sub-array.exp.json b/testdata/d2compiler/TestCompile2/vars/basic/sub-array.exp.json index 0c182f344..9e1539bbe 100644 --- a/testdata/d2compiler/TestCompile2/vars/basic/sub-array.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/basic/sub-array.exp.json @@ -158,6 +158,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -216,6 +217,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/boards/layer-2.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/layer-2.exp.json index deafde506..e6d5021f3 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/layer-2.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/layer-2.exp.json @@ -330,6 +330,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -348,7 +349,7 @@ "name": "l", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -358,10 +359,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,8:4:65-8:8:69", "value": [ { - "string": "vars" + "string": "vars", + "raw_string": "vars" } ] } @@ -371,7 +373,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -381,10 +383,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,9:6:79-9:7:80", "value": [ { - "string": "x" + "string": "x", + "raw_string": "x" } ] } @@ -418,10 +421,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,11:4:104-11:6:106", "value": [ { - "string": "hi" + "string": "hi", + "raw_string": "hi" } ] } @@ -450,10 +454,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer-2.d2,12:4:117-12:9:122", "value": [ { - "string": "hello" + "string": "hello", + "raw_string": "hello" } ] } @@ -488,6 +493,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -535,6 +541,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -580,6 +587,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json index 651a8f2ec..1faf67423 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/layer.exp.json @@ -187,6 +187,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -205,7 +206,7 @@ "name": "l", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -215,10 +216,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/layer.d2,7:4:47-7:6:49", "value": [ { - "string": "hi" + "string": "hi", + "raw_string": "hi" } ] } @@ -253,6 +255,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -300,6 +303,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json index 0344bf673..a7cc3ebdd 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/overlay.exp.json @@ -513,6 +513,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -531,7 +532,7 @@ "name": "l2", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -541,10 +542,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,16:4:134-16:8:138", "value": [ { - "string": "vars" + "string": "vars", + "raw_string": "vars" } ] } @@ -554,7 +556,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -564,10 +566,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,17:6:148-17:7:149", "value": [ { - "string": "y" + "string": "y", + "raw_string": "y" } ] } @@ -601,10 +604,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,19:4:170-19:5:171", "value": [ { - "string": "x" + "string": "x", + "raw_string": "x" } ] } @@ -633,10 +637,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,20:4:182-20:5:183", "value": [ { - "string": "y" + "string": "y", + "raw_string": "y" } ] } @@ -671,6 +676,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -718,6 +724,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -763,6 +770,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -782,7 +790,7 @@ "name": "l", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -792,10 +800,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,1:0:1-1:4:5", "value": [ { - "string": "vars" + "string": "vars", + "raw_string": "vars" } ] } @@ -805,7 +814,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -815,10 +824,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,2:2:11-2:3:12", "value": [ { - "string": "x" + "string": "x", + "raw_string": "x" } ] } @@ -847,10 +857,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,8:6:64-8:7:65", "value": [ { - "string": "y" + "string": "y", + "raw_string": "y" } ] } @@ -884,10 +895,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,10:4:86-10:5:87", "value": [ { - "string": "x" + "string": "x", + "raw_string": "x" } ] } @@ -916,10 +928,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/overlay.d2,11:4:98-11:5:99", "value": [ { - "string": "y" + "string": "y", + "raw_string": "y" } ] } @@ -954,6 +967,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -1001,6 +1015,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1046,6 +1061,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json index a43035991..660308ec6 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/replace.exp.json @@ -249,6 +249,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -267,7 +268,7 @@ "name": "l", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -277,10 +278,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,1:0:1-1:4:5", "value": [ { - "string": "vars" + "string": "vars", + "raw_string": "vars" } ] } @@ -290,7 +292,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -300,10 +302,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,2:2:11-2:3:12", "value": [ { - "string": "x" + "string": "x", + "raw_string": "x" } ] } @@ -337,10 +340,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/replace.d2,10:4:95-10:5:96", "value": [ { - "string": "x" + "string": "x", + "raw_string": "x" } ] } @@ -375,6 +379,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -422,6 +427,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json b/testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json index 3e7cfeca1..1c699584f 100644 --- a/testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/boards/scenario.exp.json @@ -187,6 +187,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -205,7 +206,7 @@ "name": "l", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -215,10 +216,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,1:0:1-1:4:5", "value": [ { - "string": "vars" + "string": "vars", + "raw_string": "vars" } ] } @@ -228,7 +230,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -238,10 +240,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,2:2:11-2:3:12", "value": [ { - "string": "x" + "string": "x", + "raw_string": "x" } ] } @@ -275,10 +278,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2compiler/TestCompile2/vars/boards/scenario.d2,7:4:50-7:6:52", "value": [ { - "string": "hi" + "string": "hi", + "raw_string": "hi" } ] } @@ -313,6 +317,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -360,6 +365,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/config/basic.exp.json b/testdata/d2compiler/TestCompile2/vars/config/basic.exp.json index bff64593a..47cf3e9d3 100644 --- a/testdata/d2compiler/TestCompile2/vars/config/basic.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/config/basic.exp.json @@ -151,6 +151,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -182,6 +183,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -229,6 +231,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -274,6 +277,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/config/data.exp.json b/testdata/d2compiler/TestCompile2/vars/config/data.exp.json index 3cc4116a2..bb17c0b0f 100644 --- a/testdata/d2compiler/TestCompile2/vars/config/data.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/config/data.exp.json @@ -189,6 +189,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" diff --git a/testdata/d2compiler/TestCompile2/vars/errors/split-var-usage.exp.json b/testdata/d2compiler/TestCompile2/vars/errors/split-var-usage.exp.json index aedfa7123..16d5bd9e7 100644 --- a/testdata/d2compiler/TestCompile2/vars/errors/split-var-usage.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/errors/split-var-usage.exp.json @@ -192,6 +192,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -263,6 +264,7 @@ "value": "green" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/errors/spread-mid-string.exp.json b/testdata/d2compiler/TestCompile2/vars/errors/spread-mid-string.exp.json index 92963e270..0f849df83 100644 --- a/testdata/d2compiler/TestCompile2/vars/errors/spread-mid-string.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/errors/spread-mid-string.exp.json @@ -142,6 +142,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -189,6 +190,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/override/label.exp.json b/testdata/d2compiler/TestCompile2/vars/override/label.exp.json index 7101e2e4f..19fc7c45d 100644 --- a/testdata/d2compiler/TestCompile2/vars/override/label.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/override/label.exp.json @@ -162,6 +162,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -229,6 +230,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/override/map.exp.json b/testdata/d2compiler/TestCompile2/vars/override/map.exp.json index 11208a29b..9f53a9e28 100644 --- a/testdata/d2compiler/TestCompile2/vars/override/map.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/override/map.exp.json @@ -220,6 +220,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -267,6 +268,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -312,6 +314,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/override/recursive-var.exp.json b/testdata/d2compiler/TestCompile2/vars/override/recursive-var.exp.json index c075d52a3..2dec10472 100644 --- a/testdata/d2compiler/TestCompile2/vars/override/recursive-var.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/override/recursive-var.exp.json @@ -315,6 +315,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -362,6 +363,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -407,6 +409,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -452,6 +455,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2compiler/TestCompile2/vars/override/var-in-var.exp.json b/testdata/d2compiler/TestCompile2/vars/override/var-in-var.exp.json index 6f41e1fad..595ce0ca1 100644 --- a/testdata/d2compiler/TestCompile2/vars/override/var-in-var.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/override/var-in-var.exp.json @@ -251,6 +251,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -298,6 +299,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -343,6 +345,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2exporter/TestExport/connection/arrowhead.exp.json b/testdata/d2exporter/TestExport/connection/arrowhead.exp.json index 470ab802c..3e8325d5f 100644 --- a/testdata/d2exporter/TestExport/connection/arrowhead.exp.json +++ b/testdata/d2exporter/TestExport/connection/arrowhead.exp.json @@ -18,6 +18,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +59,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -132,6 +134,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [], "isCurve": true, "animated": false, @@ -155,6 +158,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/testdata/d2exporter/TestExport/connection/basic.exp.json b/testdata/d2exporter/TestExport/connection/basic.exp.json index c6d945ff4..55384a242 100644 --- a/testdata/d2exporter/TestExport/connection/basic.exp.json +++ b/testdata/d2exporter/TestExport/connection/basic.exp.json @@ -18,6 +18,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +59,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -108,6 +110,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [], "isCurve": true, "animated": false, @@ -131,6 +134,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/testdata/d2exporter/TestExport/connection/stroke-dash.exp.json b/testdata/d2exporter/TestExport/connection/stroke-dash.exp.json index 45e0a8878..973d5da22 100644 --- a/testdata/d2exporter/TestExport/connection/stroke-dash.exp.json +++ b/testdata/d2exporter/TestExport/connection/stroke-dash.exp.json @@ -18,6 +18,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +59,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -108,6 +110,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [], "isCurve": true, "animated": false, @@ -131,6 +134,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/testdata/d2exporter/TestExport/connection/theme_stroke-dash.exp.json b/testdata/d2exporter/TestExport/connection/theme_stroke-dash.exp.json index ab22cf785..a981c56fe 100644 --- a/testdata/d2exporter/TestExport/connection/theme_stroke-dash.exp.json +++ b/testdata/d2exporter/TestExport/connection/theme_stroke-dash.exp.json @@ -18,6 +18,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +59,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -108,6 +110,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [], "isCurve": true, "animated": false, @@ -138,6 +141,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [], "isCurve": true, "animated": false, @@ -161,6 +165,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/testdata/d2exporter/TestExport/label/basic_shape.exp.json b/testdata/d2exporter/TestExport/label/basic_shape.exp.json index 234023e0c..ea30cdd5e 100644 --- a/testdata/d2exporter/TestExport/label/basic_shape.exp.json +++ b/testdata/d2exporter/TestExport/label/basic_shape.exp.json @@ -18,6 +18,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -60,6 +61,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/testdata/d2exporter/TestExport/label/connection_font_color.exp.json b/testdata/d2exporter/TestExport/label/connection_font_color.exp.json index 5b7d8fdfe..88c0cc893 100644 --- a/testdata/d2exporter/TestExport/label/connection_font_color.exp.json +++ b/testdata/d2exporter/TestExport/label/connection_font_color.exp.json @@ -18,6 +18,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +59,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -108,6 +110,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [], "isCurve": true, "animated": false, @@ -131,6 +134,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/testdata/d2exporter/TestExport/label/shape_font_color.exp.json b/testdata/d2exporter/TestExport/label/shape_font_color.exp.json index d0e68a092..419cd96f8 100644 --- a/testdata/d2exporter/TestExport/label/shape_font_color.exp.json +++ b/testdata/d2exporter/TestExport/label/shape_font_color.exp.json @@ -18,6 +18,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -60,6 +61,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/testdata/d2exporter/TestExport/legend/basic_legend.exp.json b/testdata/d2exporter/TestExport/legend/basic_legend.exp.json new file mode 100644 index 000000000..3790d8800 --- /dev/null +++ b/testdata/d2exporter/TestExport/legend/basic_legend.exp.json @@ -0,0 +1,331 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "x", + "type": "rectangle", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "x", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 1 + }, + { + "id": "y", + "type": "oval", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "y", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 1 + } + ], + "connections": [ + { + "id": "(x -> y)[0]", + "src": "x", + "srcArrow": "none", + "dst": "y", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "connects", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + }, + "legend": { + "shapes": [ + { + "id": "legend", + "type": "rectangle", + "pos": { + "x": 10, + "y": 10 + }, + "width": 100, + "height": 100, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B4", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "legend", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 1 + }, + { + "id": "legend.l1", + "type": "rectangle", + "pos": { + "x": 10, + "y": 10 + }, + "width": 100, + "height": 100, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Rectangles", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 2 + }, + { + "id": "legend.l2", + "type": "oval", + "pos": { + "x": 10, + "y": 10 + }, + "width": 100, + "height": 100, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B5", + "stroke": "B1", + "animated": false, + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "Ovals", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 2 + } + ], + "connections": [ + { + "id": "legend.(l1 -> l2)[0]", + "src": "legend.l1", + "srcArrow": "none", + "dst": "legend.l2", + "dstArrow": "triangle", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "Connection", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "link": "", + "route": [ + { + "x": 10, + "y": 10 + }, + { + "x": 110, + "y": 10 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ] + } +} diff --git a/testdata/d2exporter/TestExport/shape/basic.exp.json b/testdata/d2exporter/TestExport/shape/basic.exp.json index a204974b3..83fb196a7 100644 --- a/testdata/d2exporter/TestExport/shape/basic.exp.json +++ b/testdata/d2exporter/TestExport/shape/basic.exp.json @@ -18,6 +18,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -60,6 +61,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/testdata/d2exporter/TestExport/shape/border-radius.exp.json b/testdata/d2exporter/TestExport/shape/border-radius.exp.json index 67f9c5ff7..c1784fac7 100644 --- a/testdata/d2exporter/TestExport/shape/border-radius.exp.json +++ b/testdata/d2exporter/TestExport/shape/border-radius.exp.json @@ -18,6 +18,7 @@ "borderRadius": 5, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -60,6 +61,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/testdata/d2exporter/TestExport/shape/image_dimensions.exp.json b/testdata/d2exporter/TestExport/shape/image_dimensions.exp.json index 22fe3c160..40bd170da 100644 --- a/testdata/d2exporter/TestExport/shape/image_dimensions.exp.json +++ b/testdata/d2exporter/TestExport/shape/image_dimensions.exp.json @@ -18,6 +18,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -72,6 +73,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/testdata/d2exporter/TestExport/shape/sequence_group_position.exp.json b/testdata/d2exporter/TestExport/shape/sequence_group_position.exp.json index bbdd390b7..fcf8d799a 100644 --- a/testdata/d2exporter/TestExport/shape/sequence_group_position.exp.json +++ b/testdata/d2exporter/TestExport/shape/sequence_group_position.exp.json @@ -18,6 +18,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +59,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -98,6 +100,7 @@ "borderRadius": 0, "fill": "B5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -138,6 +141,7 @@ "borderRadius": 0, "fill": "N5", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -189,6 +193,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [], "animated": false, "tooltip": "", @@ -218,6 +223,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [], "animated": false, "tooltip": "", @@ -247,6 +253,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [], "animated": false, "tooltip": "", @@ -269,6 +276,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/testdata/d2exporter/TestExport/shape/synonyms.exp.json b/testdata/d2exporter/TestExport/shape/synonyms.exp.json index 0eb9f4605..94ce84b69 100644 --- a/testdata/d2exporter/TestExport/shape/synonyms.exp.json +++ b/testdata/d2exporter/TestExport/shape/synonyms.exp.json @@ -18,6 +18,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +59,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -100,6 +102,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/testdata/d2exporter/TestExport/shape/text_color.exp.json b/testdata/d2exporter/TestExport/shape/text_color.exp.json index baac9c397..630e9f93b 100644 --- a/testdata/d2exporter/TestExport/shape/text_color.exp.json +++ b/testdata/d2exporter/TestExport/shape/text_color.exp.json @@ -18,6 +18,7 @@ "borderRadius": 0, "fill": "transparent", "stroke": "N1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -60,6 +61,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/testdata/d2exporter/TestExport/theme/connection_with_bold.exp.json b/testdata/d2exporter/TestExport/theme/connection_with_bold.exp.json index fedddcdde..d3559a6b2 100644 --- a/testdata/d2exporter/TestExport/theme/connection_with_bold.exp.json +++ b/testdata/d2exporter/TestExport/theme/connection_with_bold.exp.json @@ -18,6 +18,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +59,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -108,6 +110,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [], "isCurve": true, "animated": false, @@ -131,6 +134,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/testdata/d2exporter/TestExport/theme/connection_with_italic.exp.json b/testdata/d2exporter/TestExport/theme/connection_with_italic.exp.json index 46a3f9979..d9a166bfb 100644 --- a/testdata/d2exporter/TestExport/theme/connection_with_italic.exp.json +++ b/testdata/d2exporter/TestExport/theme/connection_with_italic.exp.json @@ -18,6 +18,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +59,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -108,6 +110,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [], "isCurve": true, "animated": false, @@ -131,6 +134,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/testdata/d2exporter/TestExport/theme/connection_without_italic.exp.json b/testdata/d2exporter/TestExport/theme/connection_without_italic.exp.json index 150de8af8..6dad87d6f 100644 --- a/testdata/d2exporter/TestExport/theme/connection_without_italic.exp.json +++ b/testdata/d2exporter/TestExport/theme/connection_without_italic.exp.json @@ -18,6 +18,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -58,6 +59,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -108,6 +110,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [], "isCurve": true, "animated": false, @@ -131,6 +134,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/testdata/d2exporter/TestExport/theme/shape_with_italic.exp.json b/testdata/d2exporter/TestExport/theme/shape_with_italic.exp.json index 72575a3e5..cbebe7bdf 100644 --- a/testdata/d2exporter/TestExport/theme/shape_with_italic.exp.json +++ b/testdata/d2exporter/TestExport/theme/shape_with_italic.exp.json @@ -18,6 +18,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -60,6 +61,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/testdata/d2exporter/TestExport/theme/shape_without_bold.exp.json b/testdata/d2exporter/TestExport/theme/shape_without_bold.exp.json index ee1636c5f..eb848fe63 100644 --- a/testdata/d2exporter/TestExport/theme/shape_without_bold.exp.json +++ b/testdata/d2exporter/TestExport/theme/shape_without_bold.exp.json @@ -18,6 +18,7 @@ "borderRadius": 0, "fill": "B6", "stroke": "B1", + "animated": false, "shadow": false, "3d": false, "multiple": false, @@ -60,6 +61,7 @@ "borderRadius": 0, "fill": "N7", "stroke": "", + "animated": false, "shadow": false, "3d": false, "multiple": false, diff --git a/testdata/d2ir/TestCompile/classes/basic.exp.json b/testdata/d2ir/TestCompile/classes/basic.exp.json index 86e555a27..45f877d4f 100644 --- a/testdata/d2ir/TestCompile/classes/basic.exp.json +++ b/testdata/d2ir/TestCompile/classes/basic.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/classes/basic.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -59,19 +67,51 @@ ] }, { - "name": "classes", + "name": { + "range": "TestCompile/classes/basic.d2,1:0:2-1:7:9", + "value": [ + { + "string": "classes", + "raw_string": "classes" + } + ] + }, "composite": { "fields": [ { - "name": "mango", + "name": { + "range": "TestCompile/classes/basic.d2,2:2:15-2:7:20", + "value": [ + { + "string": "mango", + "raw_string": "mango" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/classes/basic.d2,3:4:28-3:9:33", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/classes/basic.d2,3:10:34-3:14:38", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/classes/basic.d2,3:16:40-3:22:46", diff --git a/testdata/d2ir/TestCompile/classes/inherited.exp.json b/testdata/d2ir/TestCompile/classes/inherited.exp.json index 1cce8f672..e0eeeaccd 100644 --- a/testdata/d2ir/TestCompile/classes/inherited.exp.json +++ b/testdata/d2ir/TestCompile/classes/inherited.exp.json @@ -1,19 +1,51 @@ { "fields": [ { - "name": "classes", + "name": { + "range": "TestCompile/classes/inherited.d2,0:0:0-0:7:7", + "value": [ + { + "string": "classes", + "raw_string": "classes" + } + ] + }, "composite": { "fields": [ { - "name": "mango", + "name": { + "range": "TestCompile/classes/inherited.d2,1:2:13-1:7:18", + "value": [ + { + "string": "mango", + "raw_string": "mango" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/classes/inherited.d2,2:4:26-2:9:31", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/classes/inherited.d2,2:10:32-2:14:36", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", @@ -452,27 +484,75 @@ ] }, { - "name": "scenarios", + "name": { + "range": "TestCompile/classes/inherited.d2,5:0:51-5:9:60", + "value": [ + { + "string": "scenarios", + "raw_string": "scenarios" + } + ] + }, "composite": { "fields": [ { - "name": "hawaii", + "name": { + "range": "TestCompile/classes/inherited.d2,6:2:66-6:8:72", + "value": [ + { + "string": "hawaii", + "raw_string": "hawaii" + } + ] + }, "composite": { "fields": [ { - "name": "classes", + "name": { + "range": "TestCompile/classes/inherited.d2,0:0:0-0:7:7", + "value": [ + { + "string": "classes", + "raw_string": "classes" + } + ] + }, "composite": { "fields": [ { - "name": "mango", + "name": { + "range": "TestCompile/classes/inherited.d2,1:2:13-1:7:18", + "value": [ + { + "string": "mango", + "raw_string": "mango" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/classes/inherited.d2,2:4:26-2:9:31", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/classes/inherited.d2,2:10:32-2:14:36", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", @@ -911,27 +991,75 @@ ] }, { - "name": "steps", + "name": { + "range": "TestCompile/classes/inherited.d2,7:2:78-7:7:83", + "value": [ + { + "string": "steps", + "raw_string": "steps" + } + ] + }, "composite": { "fields": [ { - "name": "1", + "name": { + "range": "TestCompile/classes/inherited.d2,8:6:93-8:7:94", + "value": [ + { + "string": "1", + "raw_string": "1" + } + ] + }, "composite": { "fields": [ { - "name": "classes", + "name": { + "range": "TestCompile/classes/inherited.d2,0:0:0-0:7:7", + "value": [ + { + "string": "classes", + "raw_string": "classes" + } + ] + }, "composite": { "fields": [ { - "name": "mango", + "name": { + "range": "TestCompile/classes/inherited.d2,1:2:13-1:7:18", + "value": [ + { + "string": "mango", + "raw_string": "mango" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/classes/inherited.d2,2:4:26-2:9:31", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/classes/inherited.d2,2:10:32-2:14:36", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", @@ -1232,15 +1360,39 @@ ] }, { - "name": "cherry", + "name": { + "range": "TestCompile/classes/inherited.d2,10:10:127-10:16:133", + "value": [ + { + "string": "cherry", + "raw_string": "cherry" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/classes/inherited.d2,11:12:149-11:17:154", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/classes/inherited.d2,11:18:155-11:22:159", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", @@ -1811,7 +1963,15 @@ ] }, { - "name": "x", + "name": { + "range": "TestCompile/classes/inherited.d2,14:8:195-14:9:196", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -2059,23 +2219,63 @@ ] }, { - "name": "2", + "name": { + "range": "TestCompile/classes/inherited.d2,16:6:211-16:7:212", + "value": [ + { + "string": "2", + "raw_string": "2" + } + ] + }, "composite": { "fields": [ { - "name": "classes", + "name": { + "range": "TestCompile/classes/inherited.d2,0:0:0-0:7:7", + "value": [ + { + "string": "classes", + "raw_string": "classes" + } + ] + }, "composite": { "fields": [ { - "name": "mango", + "name": { + "range": "TestCompile/classes/inherited.d2,1:2:13-1:7:18", + "value": [ + { + "string": "mango", + "raw_string": "mango" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/classes/inherited.d2,2:4:26-2:9:31", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/classes/inherited.d2,2:10:32-2:14:36", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", @@ -2376,15 +2576,39 @@ ] }, { - "name": "cherry", + "name": { + "range": "TestCompile/classes/inherited.d2,10:10:127-10:16:133", + "value": [ + { + "string": "cherry", + "raw_string": "cherry" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/classes/inherited.d2,11:12:149-11:17:154", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/classes/inherited.d2,11:18:155-11:22:159", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/classes/inherited.d2,11:24:161-11:27:164", @@ -2955,7 +3179,15 @@ ] }, { - "name": "x", + "name": { + "range": "TestCompile/classes/inherited.d2,14:8:195-14:9:196", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -3013,7 +3245,15 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/classes/inherited.d2,17:8:224-17:9:225", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -3159,23 +3399,63 @@ ] }, { - "name": "3", + "name": { + "range": "TestCompile/classes/inherited.d2,19:6:240-19:7:241", + "value": [ + { + "string": "3", + "raw_string": "3" + } + ] + }, "composite": { "fields": [ { - "name": "classes", + "name": { + "range": "TestCompile/classes/inherited.d2,0:0:0-0:7:7", + "value": [ + { + "string": "classes", + "raw_string": "classes" + } + ] + }, "composite": { "fields": [ { - "name": "mango", + "name": { + "range": "TestCompile/classes/inherited.d2,1:2:13-1:7:18", + "value": [ + { + "string": "mango", + "raw_string": "mango" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/classes/inherited.d2,2:4:26-2:9:31", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/classes/inherited.d2,2:10:32-2:14:36", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", @@ -3476,15 +3756,39 @@ ] }, { - "name": "cherry", + "name": { + "range": "TestCompile/classes/inherited.d2,10:10:127-10:16:133", + "value": [ + { + "string": "cherry", + "raw_string": "cherry" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/classes/inherited.d2,11:12:149-11:17:154", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/classes/inherited.d2,11:18:155-11:22:159", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312", @@ -4460,7 +4764,15 @@ ] }, { - "name": "x", + "name": { + "range": "TestCompile/classes/inherited.d2,14:8:195-14:9:196", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -4518,7 +4830,15 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/classes/inherited.d2,17:8:224-17:9:225", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -4819,23 +5139,63 @@ ] }, { - "name": "4", + "name": { + "range": "TestCompile/classes/inherited.d2,27:6:359-27:7:360", + "value": [ + { + "string": "4", + "raw_string": "4" + } + ] + }, "composite": { "fields": [ { - "name": "classes", + "name": { + "range": "TestCompile/classes/inherited.d2,0:0:0-0:7:7", + "value": [ + { + "string": "classes", + "raw_string": "classes" + } + ] + }, "composite": { "fields": [ { - "name": "mango", + "name": { + "range": "TestCompile/classes/inherited.d2,1:2:13-1:7:18", + "value": [ + { + "string": "mango", + "raw_string": "mango" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/classes/inherited.d2,2:4:26-2:9:31", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/classes/inherited.d2,2:10:32-2:14:36", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", @@ -5136,15 +5496,39 @@ ] }, { - "name": "cherry", + "name": { + "range": "TestCompile/classes/inherited.d2,10:10:127-10:16:133", + "value": [ + { + "string": "cherry", + "raw_string": "cherry" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/classes/inherited.d2,11:12:149-11:17:154", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/classes/inherited.d2,11:18:155-11:22:159", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312", @@ -6120,7 +6504,15 @@ ] }, { - "name": "x", + "name": { + "range": "TestCompile/classes/inherited.d2,14:8:195-14:9:196", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -6231,7 +6623,15 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/classes/inherited.d2,17:8:224-17:9:225", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -6342,15 +6742,39 @@ ] }, { - "name": "layers", + "name": { + "range": "TestCompile/classes/inherited.d2,28:8:372-28:14:378", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + }, "composite": { "fields": [ { - "name": "deep", + "name": { + "range": "TestCompile/classes/inherited.d2,29:10:392-29:14:396", + "value": [ + { + "string": "deep", + "raw_string": "deep" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/classes/inherited.d2,30:12:412-30:13:413", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -6408,19 +6832,51 @@ ] }, { - "name": "classes", + "name": { + "range": "TestCompile/classes/inherited.d2,0:0:0-0:7:7", + "value": [ + { + "string": "classes", + "raw_string": "classes" + } + ] + }, "composite": { "fields": [ { - "name": "mango", + "name": { + "range": "TestCompile/classes/inherited.d2,1:2:13-1:7:18", + "value": [ + { + "string": "mango", + "raw_string": "mango" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/classes/inherited.d2,2:4:26-2:9:31", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/classes/inherited.d2,2:10:32-2:14:36", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/classes/inherited.d2,2:16:38-2:22:44", @@ -6721,15 +7177,39 @@ ] }, { - "name": "cherry", + "name": { + "range": "TestCompile/classes/inherited.d2,10:10:127-10:16:133", + "value": [ + { + "string": "cherry", + "raw_string": "cherry" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/classes/inherited.d2,11:12:149-11:17:154", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/classes/inherited.d2,11:18:155-11:22:159", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/classes/inherited.d2,22:24:308-22:28:312", diff --git a/testdata/d2ir/TestCompile/classes/layer-modify.exp.json b/testdata/d2ir/TestCompile/classes/layer-modify.exp.json index a3cb58791..22838f5c1 100644 --- a/testdata/d2ir/TestCompile/classes/layer-modify.exp.json +++ b/testdata/d2ir/TestCompile/classes/layer-modify.exp.json @@ -1,19 +1,51 @@ { "fields": [ { - "name": "classes", + "name": { + "range": "TestCompile/classes/layer-modify.d2,0:0:0-0:7:7", + "value": [ + { + "string": "classes", + "raw_string": "classes" + } + ] + }, "composite": { "fields": [ { - "name": "orb", + "name": { + "range": "TestCompile/classes/layer-modify.d2,1:2:13-1:5:16", + "value": [ + { + "string": "orb", + "raw_string": "orb" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/classes/layer-modify.d2,2:4:24-2:9:29", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/classes/layer-modify.d2,2:10:30-2:14:34", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/classes/layer-modify.d2,2:16:36-2:22:42", @@ -452,27 +484,75 @@ ] }, { - "name": "layers", + "name": { + "range": "TestCompile/classes/layer-modify.d2,5:0:49-5:6:55", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/classes/layer-modify.d2,6:2:61-6:3:62", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "classes", + "name": { + "range": "TestCompile/classes/layer-modify.d2,0:0:0-0:7:7", + "value": [ + { + "string": "classes", + "raw_string": "classes" + } + ] + }, "composite": { "fields": [ { - "name": "orb", + "name": { + "range": "TestCompile/classes/layer-modify.d2,1:2:13-1:5:16", + "value": [ + { + "string": "orb", + "raw_string": "orb" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/classes/layer-modify.d2,2:4:24-2:9:29", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/classes/layer-modify.d2,2:10:30-2:14:34", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/classes/layer-modify.d2,2:16:36-2:22:42", @@ -573,7 +653,15 @@ ] }, { - "name": "stroke", + "name": { + "range": "TestCompile/classes/layer-modify.d2,7:22:88-7:28:94", + "value": [ + { + "string": "stroke", + "raw_string": "stroke" + } + ] + }, "primary": { "value": { "range": "TestCompile/classes/layer-modify.d2,7:30:96-7:33:99", diff --git a/testdata/d2ir/TestCompile/classes/merge.exp.json b/testdata/d2ir/TestCompile/classes/merge.exp.json index b192ca8a3..50d54cbd5 100644 --- a/testdata/d2ir/TestCompile/classes/merge.exp.json +++ b/testdata/d2ir/TestCompile/classes/merge.exp.json @@ -1,19 +1,51 @@ { "fields": [ { - "name": "classes", + "name": { + "range": "TestCompile/classes/merge.d2,0:0:0-0:7:7", + "value": [ + { + "string": "classes", + "raw_string": "classes" + } + ] + }, "composite": { "fields": [ { - "name": "mango", + "name": { + "range": "TestCompile/classes/merge.d2,1:2:13-1:7:18", + "value": [ + { + "string": "mango", + "raw_string": "mango" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/classes/merge.d2,2:4:26-2:9:31", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/classes/merge.d2,2:10:32-2:14:36", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/classes/merge.d2,2:16:38-2:22:44", @@ -205,7 +237,15 @@ ] }, { - "name": "width", + "name": { + "range": "TestCompile/classes/merge.d2,3:2:47-3:7:52", + "value": [ + { + "string": "width", + "raw_string": "width" + } + ] + }, "primary": { "value": { "range": "TestCompile/classes/merge.d2,3:9:54-3:11:56", @@ -581,27 +621,75 @@ ] }, { - "name": "layers", + "name": { + "range": "TestCompile/classes/merge.d2,6:0:63-6:6:69", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + }, "composite": { "fields": [ { - "name": "hawaii", + "name": { + "range": "TestCompile/classes/merge.d2,7:2:75-7:8:81", + "value": [ + { + "string": "hawaii", + "raw_string": "hawaii" + } + ] + }, "composite": { "fields": [ { - "name": "classes", + "name": { + "range": "TestCompile/classes/merge.d2,0:0:0-0:7:7", + "value": [ + { + "string": "classes", + "raw_string": "classes" + } + ] + }, "composite": { "fields": [ { - "name": "mango", + "name": { + "range": "TestCompile/classes/merge.d2,1:2:13-1:7:18", + "value": [ + { + "string": "mango", + "raw_string": "mango" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/classes/merge.d2,2:4:26-2:9:31", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/classes/merge.d2,2:10:32-2:14:36", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/classes/merge.d2,2:16:38-2:22:44", @@ -793,7 +881,15 @@ ] }, { - "name": "width", + "name": { + "range": "TestCompile/classes/merge.d2,3:2:47-3:7:52", + "value": [ + { + "string": "width", + "raw_string": "width" + } + ] + }, "primary": { "value": { "range": "TestCompile/classes/merge.d2,10:15:130-10:19:134", diff --git a/testdata/d2ir/TestCompile/classes/nested.exp.json b/testdata/d2ir/TestCompile/classes/nested.exp.json index 007eecf1b..0c8c582de 100644 --- a/testdata/d2ir/TestCompile/classes/nested.exp.json +++ b/testdata/d2ir/TestCompile/classes/nested.exp.json @@ -1,19 +1,51 @@ { "fields": [ { - "name": "classes", + "name": { + "range": "TestCompile/classes/nested.d2,0:0:0-0:7:7", + "value": [ + { + "string": "classes", + "raw_string": "classes" + } + ] + }, "composite": { "fields": [ { - "name": "mango", + "name": { + "range": "TestCompile/classes/nested.d2,1:2:13-1:7:18", + "value": [ + { + "string": "mango", + "raw_string": "mango" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/classes/nested.d2,2:4:26-2:9:31", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/classes/nested.d2,2:10:32-2:14:36", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44", @@ -452,23 +484,63 @@ ] }, { - "name": "layers", + "name": { + "range": "TestCompile/classes/nested.d2,5:0:51-5:6:57", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + }, "composite": { "fields": [ { - "name": "hawaii", + "name": { + "range": "TestCompile/classes/nested.d2,6:2:63-6:8:69", + "value": [ + { + "string": "hawaii", + "raw_string": "hawaii" + } + ] + }, "composite": { "fields": [ { - "name": "layers", + "name": { + "range": "TestCompile/classes/nested.d2,7:2:75-7:8:81", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + }, "composite": { "fields": [ { - "name": "maui", + "name": { + "range": "TestCompile/classes/nested.d2,8:6:91-8:10:95", + "value": [ + { + "string": "maui", + "raw_string": "maui" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/classes/nested.d2,9:8:107-9:9:108", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -526,19 +598,51 @@ ] }, { - "name": "classes", + "name": { + "range": "TestCompile/classes/nested.d2,0:0:0-0:7:7", + "value": [ + { + "string": "classes", + "raw_string": "classes" + } + ] + }, "composite": { "fields": [ { - "name": "mango", + "name": { + "range": "TestCompile/classes/nested.d2,1:2:13-1:7:18", + "value": [ + { + "string": "mango", + "raw_string": "mango" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/classes/nested.d2,2:4:26-2:9:31", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/classes/nested.d2,2:10:32-2:14:36", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44", @@ -1182,19 +1286,51 @@ ] }, { - "name": "classes", + "name": { + "range": "TestCompile/classes/nested.d2,0:0:0-0:7:7", + "value": [ + { + "string": "classes", + "raw_string": "classes" + } + ] + }, "composite": { "fields": [ { - "name": "mango", + "name": { + "range": "TestCompile/classes/nested.d2,1:2:13-1:7:18", + "value": [ + { + "string": "mango", + "raw_string": "mango" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/classes/nested.d2,2:4:26-2:9:31", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/classes/nested.d2,2:10:32-2:14:36", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/classes/nested.d2,2:16:38-2:22:44", diff --git a/testdata/d2ir/TestCompile/edges/chain.exp.json b/testdata/d2ir/TestCompile/edges/chain.exp.json index 0500f467b..046190339 100644 --- a/testdata/d2ir/TestCompile/edges/chain.exp.json +++ b/testdata/d2ir/TestCompile/edges/chain.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "references": [ { "string": { @@ -192,7 +200,15 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "references": [ { "string": { @@ -569,7 +585,15 @@ ] }, { - "name": "c", + "name": { + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, "references": [ { "string": { @@ -946,7 +970,15 @@ ] }, { - "name": "d", + "name": { + "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + }, "references": [ { "string": { @@ -1141,11 +1173,27 @@ { "edge_id": { "src_path": [ - "a" + { + "range": "TestCompile/edges/chain.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } ], "src_arrow": false, "dst_path": [ - "b" + { + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -1318,11 +1366,27 @@ { "edge_id": { "src_path": [ - "b" + { + "range": "TestCompile/edges/chain.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } ], "src_arrow": false, "dst_path": [ - "c" + { + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -1495,11 +1559,27 @@ { "edge_id": { "src_path": [ - "c" + { + "range": "TestCompile/edges/chain.d2,0:10:10-0:11:11", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } ], "src_arrow": false, "dst_path": [ - "d" + { + "range": "TestCompile/edges/chain.d2,0:15:15-0:16:16", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } ], "dst_arrow": true, "index": 0, diff --git a/testdata/d2ir/TestCompile/edges/nested.exp.json b/testdata/d2ir/TestCompile/edges/nested.exp.json index 5be013c80..b22c45a68 100644 --- a/testdata/d2ir/TestCompile/edges/nested.exp.json +++ b/testdata/d2ir/TestCompile/edges/nested.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/edges/nested.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "y", + "name": { + "range": "TestCompile/edges/nested.d2,0:2:2-0:3:3", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -350,11 +366,27 @@ ] }, { - "name": "z", + "name": { + "range": "TestCompile/edges/nested.d2,0:7:7-0:8:8", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + }, "composite": { "fields": [ { - "name": "p", + "name": { + "range": "TestCompile/edges/nested.d2,0:9:9-0:10:10", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + }, "references": [ { "string": { @@ -703,13 +735,45 @@ { "edge_id": { "src_path": [ - "x", - "y" + { + "range": "TestCompile/edges/nested.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, + { + "range": "TestCompile/edges/nested.d2,0:2:2-0:3:3", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } ], "src_arrow": false, "dst_path": [ - "z", - "p" + { + "range": "TestCompile/edges/nested.d2,0:7:7-0:8:8", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + }, + { + "range": "TestCompile/edges/nested.d2,0:9:9-0:10:10", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + } ], "dst_arrow": true, "index": 0, diff --git a/testdata/d2ir/TestCompile/edges/root.exp.json b/testdata/d2ir/TestCompile/edges/root.exp.json index 2c986a481..7516b678a 100644 --- a/testdata/d2ir/TestCompile/edges/root.exp.json +++ b/testdata/d2ir/TestCompile/edges/root.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/edges/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -118,7 +126,15 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/edges/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -239,11 +255,27 @@ { "edge_id": { "src_path": [ - "x" + { + "range": "TestCompile/edges/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } ], "src_arrow": false, "dst_path": [ - "y" + { + "range": "TestCompile/edges/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } ], "dst_arrow": true, "index": 0, diff --git a/testdata/d2ir/TestCompile/edges/underscore.exp.json b/testdata/d2ir/TestCompile/edges/underscore.exp.json index bdb82ef60..ef947862b 100644 --- a/testdata/d2ir/TestCompile/edges/underscore.exp.json +++ b/testdata/d2ir/TestCompile/edges/underscore.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "p", + "name": { + "range": "TestCompile/edges/underscore.d2,0:0:0-0:1:1", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + }, "composite": { "fields": [ { - "name": "z", + "name": { + "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + }, "references": [ { "string": { @@ -266,7 +282,15 @@ ] }, { - "name": "x", + "name": { + "range": "TestCompile/edges/underscore.d2,0:7:7-0:8:8", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -420,12 +444,36 @@ { "edge_id": { "src_path": [ - "x" + { + "range": "TestCompile/edges/underscore.d2,0:7:7-0:8:8", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } ], "src_arrow": false, "dst_path": [ - "p", - "z" + { + "range": "TestCompile/edges/underscore.d2,0:0:0-0:1:1", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + }, + { + "range": "TestCompile/edges/underscore.d2,0:12:12-0:13:13", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } ], "dst_arrow": true, "index": 0, diff --git a/testdata/d2ir/TestCompile/fields/array.exp.json b/testdata/d2ir/TestCompile/fields/array.exp.json index d648144d6..78aa29981 100644 --- a/testdata/d2ir/TestCompile/fields/array.exp.json +++ b/testdata/d2ir/TestCompile/fields/array.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/fields/array.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "values": [ { diff --git a/testdata/d2ir/TestCompile/fields/label.exp.json b/testdata/d2ir/TestCompile/fields/label.exp.json index 5c7aa801d..35311dec1 100644 --- a/testdata/d2ir/TestCompile/fields/label.exp.json +++ b/testdata/d2ir/TestCompile/fields/label.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/fields/label.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "primary": { "value": { "range": "TestCompile/fields/label.d2,0:3:3-0:6:6", diff --git a/testdata/d2ir/TestCompile/fields/nested.exp.json b/testdata/d2ir/TestCompile/fields/nested.exp.json index 3dfc1f981..f24741927 100644 --- a/testdata/d2ir/TestCompile/fields/nested.exp.json +++ b/testdata/d2ir/TestCompile/fields/nested.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/fields/nested.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "y", + "name": { + "range": "TestCompile/fields/nested.d2,0:2:2-0:3:3", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "primary": { "value": { "range": "TestCompile/fields/nested.d2,0:5:5-0:8:8", diff --git a/testdata/d2ir/TestCompile/fields/primary/nested.exp.json b/testdata/d2ir/TestCompile/fields/primary/nested.exp.json index 9388dc418..d2220242c 100644 --- a/testdata/d2ir/TestCompile/fields/primary/nested.exp.json +++ b/testdata/d2ir/TestCompile/fields/primary/nested.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/fields/primary/nested.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "y", + "name": { + "range": "TestCompile/fields/primary/nested.d2,0:2:2-0:3:3", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "primary": { "value": { "range": "TestCompile/fields/primary/nested.d2,0:5:5-0:8:8", @@ -20,7 +36,15 @@ "composite": { "fields": [ { - "name": "pqrs", + "name": { + "range": "TestCompile/fields/primary/nested.d2,0:11:11-0:15:15", + "value": [ + { + "string": "pqrs", + "raw_string": "pqrs" + } + ] + }, "references": [ { "string": { diff --git a/testdata/d2ir/TestCompile/fields/primary/root.exp.json b/testdata/d2ir/TestCompile/fields/primary/root.exp.json index 13a6aa1ab..920ed0a58 100644 --- a/testdata/d2ir/TestCompile/fields/primary/root.exp.json +++ b/testdata/d2ir/TestCompile/fields/primary/root.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/fields/primary/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "primary": { "value": { "range": "TestCompile/fields/primary/root.d2,0:3:3-0:6:6", @@ -16,7 +24,15 @@ "composite": { "fields": [ { - "name": "pqrs", + "name": { + "range": "TestCompile/fields/primary/root.d2,0:9:9-0:13:13", + "value": [ + { + "string": "pqrs", + "raw_string": "pqrs" + } + ] + }, "references": [ { "string": { diff --git a/testdata/d2ir/TestCompile/fields/quoted.exp.json b/testdata/d2ir/TestCompile/fields/quoted.exp.json new file mode 100644 index 000000000..14e00f923 --- /dev/null +++ b/testdata/d2ir/TestCompile/fields/quoted.exp.json @@ -0,0 +1,898 @@ +{ + "fields": [ + { + "name": { + "range": "TestCompile/fields/quoted.d2,0:0:0-0:8:8", + "value": [ + { + "string": "my_table", + "raw_string": "my_table" + } + ] + }, + "composite": { + "fields": [ + { + "name": { + "range": "TestCompile/fields/quoted.d2,1:2:14-1:7:19", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, + "primary": { + "value": { + "range": "TestCompile/fields/quoted.d2,1:9:21-1:18:30", + "value": [ + { + "string": "sql_table", + "raw_string": "sql_table" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/fields/quoted.d2,1:2:14-1:7:19", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, + "key_path": { + "range": "TestCompile/fields/quoted.d2,1:2:14-1:7:19", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/fields/quoted.d2,1:2:14-1:7:19", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/fields/quoted.d2,1:2:14-1:18:30", + "key": { + "range": "TestCompile/fields/quoted.d2,1:2:14-1:7:19", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/fields/quoted.d2,1:2:14-1:7:19", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/fields/quoted.d2,1:9:21-1:18:30", + "value": [ + { + "string": "sql_table", + "raw_string": "sql_table" + } + ] + } + } + } + }, + "due_to_glob": false, + "due_to_lazy_glob": false + } + ] + }, + { + "name": { + "range": "TestCompile/fields/quoted.d2,2:2:33-2:7:38", + "value": [ + { + "string": "width", + "raw_string": "width" + } + ] + }, + "primary": { + "value": { + "range": "TestCompile/fields/quoted.d2,2:9:40-2:12:43", + "raw": "200", + "value": "200" + } + }, + "references": [ + { + "string": { + "range": "TestCompile/fields/quoted.d2,2:2:33-2:7:38", + "value": [ + { + "string": "width", + "raw_string": "width" + } + ] + }, + "key_path": { + "range": "TestCompile/fields/quoted.d2,2:2:33-2:7:38", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/fields/quoted.d2,2:2:33-2:7:38", + "value": [ + { + "string": "width", + "raw_string": "width" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/fields/quoted.d2,2:2:33-2:12:43", + "key": { + "range": "TestCompile/fields/quoted.d2,2:2:33-2:7:38", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/fields/quoted.d2,2:2:33-2:7:38", + "value": [ + { + "string": "width", + "raw_string": "width" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "number": { + "range": "TestCompile/fields/quoted.d2,2:9:40-2:12:43", + "raw": "200", + "value": "200" + } + } + } + }, + "due_to_glob": false, + "due_to_lazy_glob": false + } + ] + }, + { + "name": { + "range": "TestCompile/fields/quoted.d2,3:2:46-3:8:52", + "value": [ + { + "string": "height", + "raw_string": "height" + } + ] + }, + "primary": { + "value": { + "range": "TestCompile/fields/quoted.d2,3:10:54-3:13:57", + "raw": "200", + "value": "200" + } + }, + "references": [ + { + "string": { + "range": "TestCompile/fields/quoted.d2,3:2:46-3:8:52", + "value": [ + { + "string": "height", + "raw_string": "height" + } + ] + }, + "key_path": { + "range": "TestCompile/fields/quoted.d2,3:2:46-3:8:52", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/fields/quoted.d2,3:2:46-3:8:52", + "value": [ + { + "string": "height", + "raw_string": "height" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/fields/quoted.d2,3:2:46-3:13:57", + "key": { + "range": "TestCompile/fields/quoted.d2,3:2:46-3:8:52", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/fields/quoted.d2,3:2:46-3:8:52", + "value": [ + { + "string": "height", + "raw_string": "height" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "number": { + "range": "TestCompile/fields/quoted.d2,3:10:54-3:13:57", + "raw": "200", + "value": "200" + } + } + } + }, + "due_to_glob": false, + "due_to_lazy_glob": false + } + ] + }, + { + "name": { + "range": "TestCompile/fields/quoted.d2,4:2:60-4:9:67", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, + "primary": { + "value": { + "range": "TestCompile/fields/quoted.d2,4:11:69-4:17:75", + "value": [ + { + "string": "string", + "raw_string": "string" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/fields/quoted.d2,4:2:60-4:9:67", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, + "key_path": { + "range": "TestCompile/fields/quoted.d2,4:2:60-4:9:67", + "path": [ + { + "double_quoted_string": { + "range": "TestCompile/fields/quoted.d2,4:2:60-4:9:67", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/fields/quoted.d2,4:2:60-4:17:75", + "key": { + "range": "TestCompile/fields/quoted.d2,4:2:60-4:9:67", + "path": [ + { + "double_quoted_string": { + "range": "TestCompile/fields/quoted.d2,4:2:60-4:9:67", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/fields/quoted.d2,4:11:69-4:17:75", + "value": [ + { + "string": "string", + "raw_string": "string" + } + ] + } + } + } + }, + "due_to_glob": false, + "due_to_lazy_glob": false + } + ] + }, + { + "name": { + "range": "TestCompile/fields/quoted.d2,5:2:78-5:8:84", + "value": [ + { + "string": "icon", + "raw_string": "icon" + } + ] + }, + "primary": { + "value": { + "range": "TestCompile/fields/quoted.d2,5:10:86-5:16:92", + "value": [ + { + "string": "string", + "raw_string": "string" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/fields/quoted.d2,5:2:78-5:8:84", + "value": [ + { + "string": "icon", + "raw_string": "icon" + } + ] + }, + "key_path": { + "range": "TestCompile/fields/quoted.d2,5:2:78-5:8:84", + "path": [ + { + "double_quoted_string": { + "range": "TestCompile/fields/quoted.d2,5:2:78-5:8:84", + "value": [ + { + "string": "icon", + "raw_string": "icon" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/fields/quoted.d2,5:2:78-5:16:92", + "key": { + "range": "TestCompile/fields/quoted.d2,5:2:78-5:8:84", + "path": [ + { + "double_quoted_string": { + "range": "TestCompile/fields/quoted.d2,5:2:78-5:8:84", + "value": [ + { + "string": "icon", + "raw_string": "icon" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/fields/quoted.d2,5:10:86-5:16:92", + "value": [ + { + "string": "string", + "raw_string": "string" + } + ] + } + } + } + }, + "due_to_glob": false, + "due_to_lazy_glob": false + } + ] + }, + { + "name": { + "range": "TestCompile/fields/quoted.d2,6:2:95-6:9:102", + "value": [ + { + "string": "width", + "raw_string": "width" + } + ] + }, + "primary": { + "value": { + "range": "TestCompile/fields/quoted.d2,6:11:104-6:14:107", + "value": [ + { + "string": "int", + "raw_string": "int" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/fields/quoted.d2,6:2:95-6:9:102", + "value": [ + { + "string": "width", + "raw_string": "width" + } + ] + }, + "key_path": { + "range": "TestCompile/fields/quoted.d2,6:2:95-6:9:102", + "path": [ + { + "double_quoted_string": { + "range": "TestCompile/fields/quoted.d2,6:2:95-6:9:102", + "value": [ + { + "string": "width", + "raw_string": "width" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/fields/quoted.d2,6:2:95-6:14:107", + "key": { + "range": "TestCompile/fields/quoted.d2,6:2:95-6:9:102", + "path": [ + { + "double_quoted_string": { + "range": "TestCompile/fields/quoted.d2,6:2:95-6:9:102", + "value": [ + { + "string": "width", + "raw_string": "width" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/fields/quoted.d2,6:11:104-6:14:107", + "value": [ + { + "string": "int", + "raw_string": "int" + } + ] + } + } + } + }, + "due_to_glob": false, + "due_to_lazy_glob": false + } + ] + }, + { + "name": { + "range": "TestCompile/fields/quoted.d2,7:2:110-7:10:118", + "value": [ + { + "string": "height", + "raw_string": "height" + } + ] + }, + "primary": { + "value": { + "range": "TestCompile/fields/quoted.d2,7:12:120-7:15:123", + "value": [ + { + "string": "int", + "raw_string": "int" + } + ] + } + }, + "references": [ + { + "string": { + "range": "TestCompile/fields/quoted.d2,7:2:110-7:10:118", + "value": [ + { + "string": "height", + "raw_string": "height" + } + ] + }, + "key_path": { + "range": "TestCompile/fields/quoted.d2,7:2:110-7:10:118", + "path": [ + { + "double_quoted_string": { + "range": "TestCompile/fields/quoted.d2,7:2:110-7:10:118", + "value": [ + { + "string": "height", + "raw_string": "height" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/fields/quoted.d2,7:2:110-7:15:123", + "key": { + "range": "TestCompile/fields/quoted.d2,7:2:110-7:10:118", + "path": [ + { + "double_quoted_string": { + "range": "TestCompile/fields/quoted.d2,7:2:110-7:10:118", + "value": [ + { + "string": "height", + "raw_string": "height" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/fields/quoted.d2,7:12:120-7:15:123", + "value": [ + { + "string": "int", + "raw_string": "int" + } + ] + } + } + } + }, + "due_to_glob": false, + "due_to_lazy_glob": false + } + ] + } + ], + "edges": null + }, + "references": [ + { + "string": { + "range": "TestCompile/fields/quoted.d2,0:0:0-0:8:8", + "value": [ + { + "string": "my_table", + "raw_string": "my_table" + } + ] + }, + "key_path": { + "range": "TestCompile/fields/quoted.d2,0:0:0-0:8:8", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/fields/quoted.d2,0:0:0-0:8:8", + "value": [ + { + "string": "my_table", + "raw_string": "my_table" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/fields/quoted.d2,0:0:0-8:1:125", + "key": { + "range": "TestCompile/fields/quoted.d2,0:0:0-0:8:8", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/fields/quoted.d2,0:0:0-0:8:8", + "value": [ + { + "string": "my_table", + "raw_string": "my_table" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "TestCompile/fields/quoted.d2,0:10:10-8:1:125", + "nodes": [ + { + "map_key": { + "range": "TestCompile/fields/quoted.d2,1:2:14-1:18:30", + "key": { + "range": "TestCompile/fields/quoted.d2,1:2:14-1:7:19", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/fields/quoted.d2,1:2:14-1:7:19", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/fields/quoted.d2,1:9:21-1:18:30", + "value": [ + { + "string": "sql_table", + "raw_string": "sql_table" + } + ] + } + } + } + }, + { + "map_key": { + "range": "TestCompile/fields/quoted.d2,2:2:33-2:12:43", + "key": { + "range": "TestCompile/fields/quoted.d2,2:2:33-2:7:38", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/fields/quoted.d2,2:2:33-2:7:38", + "value": [ + { + "string": "width", + "raw_string": "width" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "number": { + "range": "TestCompile/fields/quoted.d2,2:9:40-2:12:43", + "raw": "200", + "value": "200" + } + } + } + }, + { + "map_key": { + "range": "TestCompile/fields/quoted.d2,3:2:46-3:13:57", + "key": { + "range": "TestCompile/fields/quoted.d2,3:2:46-3:8:52", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/fields/quoted.d2,3:2:46-3:8:52", + "value": [ + { + "string": "height", + "raw_string": "height" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "number": { + "range": "TestCompile/fields/quoted.d2,3:10:54-3:13:57", + "raw": "200", + "value": "200" + } + } + } + }, + { + "map_key": { + "range": "TestCompile/fields/quoted.d2,4:2:60-4:17:75", + "key": { + "range": "TestCompile/fields/quoted.d2,4:2:60-4:9:67", + "path": [ + { + "double_quoted_string": { + "range": "TestCompile/fields/quoted.d2,4:2:60-4:9:67", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/fields/quoted.d2,4:11:69-4:17:75", + "value": [ + { + "string": "string", + "raw_string": "string" + } + ] + } + } + } + }, + { + "map_key": { + "range": "TestCompile/fields/quoted.d2,5:2:78-5:16:92", + "key": { + "range": "TestCompile/fields/quoted.d2,5:2:78-5:8:84", + "path": [ + { + "double_quoted_string": { + "range": "TestCompile/fields/quoted.d2,5:2:78-5:8:84", + "value": [ + { + "string": "icon", + "raw_string": "icon" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/fields/quoted.d2,5:10:86-5:16:92", + "value": [ + { + "string": "string", + "raw_string": "string" + } + ] + } + } + } + }, + { + "map_key": { + "range": "TestCompile/fields/quoted.d2,6:2:95-6:14:107", + "key": { + "range": "TestCompile/fields/quoted.d2,6:2:95-6:9:102", + "path": [ + { + "double_quoted_string": { + "range": "TestCompile/fields/quoted.d2,6:2:95-6:9:102", + "value": [ + { + "string": "width", + "raw_string": "width" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/fields/quoted.d2,6:11:104-6:14:107", + "value": [ + { + "string": "int", + "raw_string": "int" + } + ] + } + } + } + }, + { + "map_key": { + "range": "TestCompile/fields/quoted.d2,7:2:110-7:15:123", + "key": { + "range": "TestCompile/fields/quoted.d2,7:2:110-7:10:118", + "path": [ + { + "double_quoted_string": { + "range": "TestCompile/fields/quoted.d2,7:2:110-7:10:118", + "value": [ + { + "string": "height", + "raw_string": "height" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/fields/quoted.d2,7:12:120-7:15:123", + "value": [ + { + "string": "int", + "raw_string": "int" + } + ] + } + } + } + } + ] + } + } + } + }, + "due_to_glob": false, + "due_to_lazy_glob": false + } + ] + } + ], + "edges": null +} diff --git a/testdata/d2ir/TestCompile/fields/root.exp.json b/testdata/d2ir/TestCompile/fields/root.exp.json index 619b7fcc4..d099a144f 100644 --- a/testdata/d2ir/TestCompile/fields/root.exp.json +++ b/testdata/d2ir/TestCompile/fields/root.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/fields/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { diff --git a/testdata/d2ir/TestCompile/filters/array.exp.json b/testdata/d2ir/TestCompile/filters/array.exp.json index b65935e1b..d45038668 100644 --- a/testdata/d2ir/TestCompile/filters/array.exp.json +++ b/testdata/d2ir/TestCompile/filters/array.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "the-little-cannon", + "name": { + "range": "TestCompile/filters/array.d2,0:0:0-0:17:17", + "value": [ + { + "string": "the-little-cannon", + "raw_string": "the-little-cannon" + } + ] + }, "composite": { "fields": [ { - "name": "class", + "name": { + "range": "TestCompile/filters/array.d2,1:1:22-1:6:27", + "value": [ + { + "string": "class", + "raw_string": "class" + } + ] + }, "composite": { "values": [ { @@ -245,11 +261,27 @@ ] }, { - "name": "style", + "name": { + "range": "TestCompile/filters/array.d2,12:1:150-12:6:155", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "multiple", + "name": { + "range": "TestCompile/filters/array.d2,12:7:156-12:15:164", + "value": [ + { + "string": "multiple", + "raw_string": "multiple" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/array.d2,12:17:166-12:21:170", @@ -542,11 +574,27 @@ ] }, { - "name": "dino", + "name": { + "range": "TestCompile/filters/array.d2,3:0:50-3:4:54", + "value": [ + { + "string": "dino", + "raw_string": "dino" + } + ] + }, "composite": { "fields": [ { - "name": "class", + "name": { + "range": "TestCompile/filters/array.d2,4:1:59-4:6:64", + "value": [ + { + "string": "class", + "raw_string": "class" + } + ] + }, "composite": { "values": [ { @@ -838,11 +886,27 @@ ] }, { - "name": "catapult", + "name": { + "range": "TestCompile/filters/array.d2,6:0:89-6:8:97", + "value": [ + { + "string": "catapult", + "raw_string": "catapult" + } + ] + }, "composite": { "fields": [ { - "name": "class", + "name": { + "range": "TestCompile/filters/array.d2,7:1:102-7:6:107", + "value": [ + { + "string": "class", + "raw_string": "class" + } + ] + }, "composite": { "values": [ { @@ -1082,11 +1146,27 @@ ] }, { - "name": "style", + "name": { + "range": "TestCompile/filters/array.d2,12:1:150-12:6:155", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "multiple", + "name": { + "range": "TestCompile/filters/array.d2,12:7:156-12:15:164", + "value": [ + { + "string": "multiple", + "raw_string": "multiple" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/array.d2,12:17:166-12:21:170", diff --git a/testdata/d2ir/TestCompile/filters/base.exp.json b/testdata/d2ir/TestCompile/filters/base.exp.json index 98d52c7fe..20ddadedf 100644 --- a/testdata/d2ir/TestCompile/filters/base.exp.json +++ b/testdata/d2ir/TestCompile/filters/base.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "jacob", + "name": { + "range": "TestCompile/filters/base.d2,0:0:0-0:5:5", + "value": [ + { + "string": "jacob", + "raw_string": "jacob" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/filters/base.d2,1:1:10-1:6:15", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/base.d2,1:8:17-1:14:23", @@ -246,11 +262,27 @@ ] }, { - "name": "jeremy", + "name": { + "range": "TestCompile/filters/base.d2,3:0:26-3:6:32", + "value": [ + { + "string": "jeremy", + "raw_string": "jeremy" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/filters/base.d2,4:1:37-4:6:42", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/base.d2,4:8:44-4:17:53", @@ -457,7 +489,15 @@ ] }, { - "name": "label", + "name": { + "range": "TestCompile/filters/base.d2,8:1:81-8:6:86", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/base.d2,8:8:88-8:23:103", diff --git a/testdata/d2ir/TestCompile/filters/edge.exp.json b/testdata/d2ir/TestCompile/filters/edge.exp.json index b975d17d3..89c6f9104 100644 --- a/testdata/d2ir/TestCompile/filters/edge.exp.json +++ b/testdata/d2ir/TestCompile/filters/edge.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/filters/edge.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -572,263 +580,19 @@ }, "due_to_glob": true, "due_to_lazy_glob": false - }, - { - "string": { - "range": "TestCompile/filters/edge.d2,6:1:87-6:2:88", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - }, - "key_path": { - "range": "TestCompile/filters/edge.d2,6:1:87-6:2:88", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,6:1:87-6:2:88", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "context": { - "edge": { - "range": "TestCompile/filters/edge.d2,6:1:87-6:7:93", - "src": { - "range": "TestCompile/filters/edge.d2,6:1:87-6:2:88", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,6:1:87-6:2:88", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/filters/edge.d2,6:6:92-6:7:93", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,6:6:92-6:7:93", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/filters/edge.d2,6:0:86-10:1:203", - "edges": [ - { - "range": "TestCompile/filters/edge.d2,6:1:87-6:7:93", - "src": { - "range": "TestCompile/filters/edge.d2,6:1:87-6:2:88", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,6:1:87-6:2:88", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/filters/edge.d2,6:6:92-6:7:93", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,6:6:92-6:7:93", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/filters/edge.d2,6:8:94-6:11:97", - "int": null, - "glob": true - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/filters/edge.d2,6:13:99-10:1:203", - "nodes": [ - { - "map_key": { - "range": "TestCompile/filters/edge.d2,7:1:102-7:33:134", - "ampersand": true, - "key": { - "range": "TestCompile/filters/edge.d2,7:2:103-7:24:125", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,7:2:103-7:18:119", - "value": [ - { - "string": "source-arrowhead", - "raw_string": "source-arrowhead" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,7:19:120-7:24:125", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,7:26:127-7:33:134", - "value": [ - { - "string": "diamond", - "raw_string": "diamond" - } - ] - } - } - } - }, - { - "map_key": { - "range": "TestCompile/filters/edge.d2,8:1:136-8:33:168", - "ampersand": true, - "key": { - "range": "TestCompile/filters/edge.d2,8:2:137-8:24:159", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,8:2:137-8:18:153", - "value": [ - { - "string": "target-arrowhead", - "raw_string": "target-arrowhead" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,8:19:154-8:24:159", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,8:26:161-8:33:168", - "value": [ - { - "string": "diamond", - "raw_string": "diamond" - } - ] - } - } - } - }, - { - "map_key": { - "range": "TestCompile/filters/edge.d2,9:1:170-9:32:201", - "key": { - "range": "TestCompile/filters/edge.d2,9:1:170-9:6:175", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,9:1:170-9:6:175", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,9:8:177-9:32:201", - "value": [ - { - "string": "diamond shape arrowheads", - "raw_string": "diamond shape arrowheads" - } - ] - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": false } ] }, { - "name": "y", + "name": { + "range": "TestCompile/filters/edge.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -1155,11 +919,27 @@ { "edge_id": { "src_path": [ - "x" + { + "range": "TestCompile/filters/edge.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } ], "src_arrow": false, "dst_path": [ - "y" + { + "range": "TestCompile/filters/edge.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -1168,11 +948,27 @@ "map": { "fields": [ { - "name": "source-arrowhead", + "name": { + "range": "TestCompile/filters/edge.d2,1:1:11-1:17:27", + "value": [ + { + "string": "source-arrowhead", + "raw_string": "source-arrowhead" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/filters/edge.d2,1:18:28-1:23:33", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/edge.d2,1:25:35-1:32:42", @@ -1270,6 +1066,92 @@ "due_to_glob": false, "due_to_lazy_glob": false }, + { + "string": { + "range": "TestCompile/filters/edge.d2,7:19:120-7:24:125", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/edge.d2,7:2:103-7:24:125", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,7:2:103-7:18:119", + "value": [ + { + "string": "source-arrowhead", + "raw_string": "source-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,7:19:120-7:24:125", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/edge.d2,7:1:102-7:33:134", + "ampersand": true, + "key": { + "range": "TestCompile/filters/edge.d2,7:2:103-7:24:125", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,7:2:103-7:18:119", + "value": [ + { + "string": "source-arrowhead", + "raw_string": "source-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,7:19:120-7:24:125", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,7:26:127-7:33:134", + "value": [ + { + "string": "diamond", + "raw_string": "diamond" + } + ] + } + } + } + }, + "due_to_glob": true, + "due_to_lazy_glob": false + }, { "string": { "range": "TestCompile/filters/edge.d2,7:19:120-7:24:125", @@ -1447,6 +1329,92 @@ "due_to_glob": false, "due_to_lazy_glob": false }, + { + "string": { + "range": "TestCompile/filters/edge.d2,7:2:103-7:18:119", + "value": [ + { + "string": "source-arrowhead", + "raw_string": "source-arrowhead" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/edge.d2,7:2:103-7:24:125", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,7:2:103-7:18:119", + "value": [ + { + "string": "source-arrowhead", + "raw_string": "source-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,7:19:120-7:24:125", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/edge.d2,7:1:102-7:33:134", + "ampersand": true, + "key": { + "range": "TestCompile/filters/edge.d2,7:2:103-7:24:125", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,7:2:103-7:18:119", + "value": [ + { + "string": "source-arrowhead", + "raw_string": "source-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,7:19:120-7:24:125", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,7:26:127-7:33:134", + "value": [ + { + "string": "diamond", + "raw_string": "diamond" + } + ] + } + } + } + }, + "due_to_glob": true, + "due_to_lazy_glob": false + }, { "string": { "range": "TestCompile/filters/edge.d2,7:2:103-7:18:119", @@ -1536,11 +1504,27 @@ ] }, { - "name": "target-arrowhead", + "name": { + "range": "TestCompile/filters/edge.d2,2:1:44-2:17:60", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/filters/edge.d2,2:18:61-2:23:66", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/edge.d2,2:25:68-2:32:75", @@ -1638,6 +1622,92 @@ "due_to_glob": false, "due_to_lazy_glob": false }, + { + "string": { + "range": "TestCompile/filters/edge.d2,8:19:154-8:24:159", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/edge.d2,8:2:137-8:24:159", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,8:2:137-8:18:153", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,8:19:154-8:24:159", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/edge.d2,8:1:136-8:33:168", + "ampersand": true, + "key": { + "range": "TestCompile/filters/edge.d2,8:2:137-8:24:159", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,8:2:137-8:18:153", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,8:19:154-8:24:159", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,8:26:161-8:33:168", + "value": [ + { + "string": "diamond", + "raw_string": "diamond" + } + ] + } + } + } + }, + "due_to_glob": true, + "due_to_lazy_glob": false + }, { "string": { "range": "TestCompile/filters/edge.d2,8:19:154-8:24:159", @@ -1815,6 +1885,92 @@ "due_to_glob": false, "due_to_lazy_glob": false }, + { + "string": { + "range": "TestCompile/filters/edge.d2,8:2:137-8:18:153", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + }, + "key_path": { + "range": "TestCompile/filters/edge.d2,8:2:137-8:24:159", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,8:2:137-8:18:153", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,8:19:154-8:24:159", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/filters/edge.d2,8:1:136-8:33:168", + "ampersand": true, + "key": { + "range": "TestCompile/filters/edge.d2,8:2:137-8:24:159", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,8:2:137-8:18:153", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,8:19:154-8:24:159", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/filters/edge.d2,8:26:161-8:33:168", + "value": [ + { + "string": "diamond", + "raw_string": "diamond" + } + ] + } + } + } + }, + "due_to_glob": true, + "due_to_lazy_glob": false + }, { "string": { "range": "TestCompile/filters/edge.d2,8:2:137-8:18:153", @@ -1904,7 +2060,15 @@ ] }, { - "name": "label", + "name": { + "range": "TestCompile/filters/edge.d2,9:1:170-9:6:175", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/edge.d2,9:8:177-9:32:201", @@ -2399,11 +2563,27 @@ { "edge_id": { "src_path": [ - "x" + { + "range": "TestCompile/filters/edge.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } ], "src_arrow": false, "dst_path": [ - "y" + { + "range": "TestCompile/filters/edge.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } ], "dst_arrow": true, "index": 1, @@ -2500,233 +2680,6 @@ }, "due_to_glob": false, "due_to_lazy_glob": false - }, - { - "context": { - "edge": { - "range": "TestCompile/filters/edge.d2,6:1:87-6:7:93", - "src": { - "range": "TestCompile/filters/edge.d2,6:1:87-6:2:88", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,6:1:87-6:2:88", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/filters/edge.d2,6:6:92-6:7:93", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,6:6:92-6:7:93", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/filters/edge.d2,6:0:86-10:1:203", - "edges": [ - { - "range": "TestCompile/filters/edge.d2,6:1:87-6:7:93", - "src": { - "range": "TestCompile/filters/edge.d2,6:1:87-6:2:88", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,6:1:87-6:2:88", - "value": [ - { - "string": "x", - "raw_string": "x" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/filters/edge.d2,6:6:92-6:7:93", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,6:6:92-6:7:93", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/filters/edge.d2,6:8:94-6:11:97", - "int": null, - "glob": true - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/filters/edge.d2,6:13:99-10:1:203", - "nodes": [ - { - "map_key": { - "range": "TestCompile/filters/edge.d2,7:1:102-7:33:134", - "ampersand": true, - "key": { - "range": "TestCompile/filters/edge.d2,7:2:103-7:24:125", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,7:2:103-7:18:119", - "value": [ - { - "string": "source-arrowhead", - "raw_string": "source-arrowhead" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,7:19:120-7:24:125", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,7:26:127-7:33:134", - "value": [ - { - "string": "diamond", - "raw_string": "diamond" - } - ] - } - } - } - }, - { - "map_key": { - "range": "TestCompile/filters/edge.d2,8:1:136-8:33:168", - "ampersand": true, - "key": { - "range": "TestCompile/filters/edge.d2,8:2:137-8:24:159", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,8:2:137-8:18:153", - "value": [ - { - "string": "target-arrowhead", - "raw_string": "target-arrowhead" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,8:19:154-8:24:159", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,8:26:161-8:33:168", - "value": [ - { - "string": "diamond", - "raw_string": "diamond" - } - ] - } - } - } - }, - { - "map_key": { - "range": "TestCompile/filters/edge.d2,9:1:170-9:32:201", - "key": { - "range": "TestCompile/filters/edge.d2,9:1:170-9:6:175", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,9:1:170-9:6:175", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/filters/edge.d2,9:8:177-9:32:201", - "value": [ - { - "string": "diamond shape arrowheads", - "raw_string": "diamond shape arrowheads" - } - ] - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": false } ] } diff --git a/testdata/d2ir/TestCompile/filters/label-filter/1.exp.json b/testdata/d2ir/TestCompile/filters/label-filter/1.exp.json index a6cb88ffd..7b9cda909 100644 --- a/testdata/d2ir/TestCompile/filters/label-filter/1.exp.json +++ b/testdata/d2ir/TestCompile/filters/label-filter/1.exp.json @@ -1,15 +1,39 @@ { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/filters/label-filter/1.d2,1:0:1-1:1:2", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/filters/label-filter/1.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/filters/label-filter/1.d2,6:8:33-6:15:40", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/label-filter/1.d2,9:17:80-9:18:81", @@ -684,15 +708,39 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/filters/label-filter/1.d2,2:0:3-2:1:4", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/filters/label-filter/1.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/filters/label-filter/1.d2,6:8:33-6:15:40", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/label-filter/1.d2,6:17:42-6:20:45", @@ -1205,7 +1253,15 @@ ] }, { - "name": "p", + "name": { + "range": "TestCompile/filters/label-filter/1.d2,3:0:5-3:1:6", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/label-filter/1.d2,3:3:8-3:4:9", @@ -1220,11 +1276,27 @@ "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/filters/label-filter/1.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/filters/label-filter/1.d2,6:8:33-6:15:40", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/label-filter/1.d2,13:17:118-13:20:121", @@ -1909,15 +1981,39 @@ ] }, { - "name": "a", + "name": { + "range": "TestCompile/filters/label-filter/1.d2,4:0:10-4:1:11", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/filters/label-filter/1.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/filters/label-filter/1.d2,6:8:33-6:15:40", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/label-filter/1.d2,6:17:42-6:20:45", @@ -2499,15 +2595,39 @@ ] }, { - "name": "z", + "name": { + "range": "TestCompile/filters/label-filter/1.d2,4:5:15-4:6:16", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/filters/label-filter/1.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/filters/label-filter/1.d2,6:8:33-6:15:40", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/label-filter/1.d2,6:17:42-6:20:45", @@ -3093,11 +3213,27 @@ { "edge_id": { "src_path": [ - "a" + { + "range": "TestCompile/filters/label-filter/1.d2,4:0:10-4:1:11", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } ], "src_arrow": false, "dst_path": [ - "z" + { + "range": "TestCompile/filters/label-filter/1.d2,4:5:15-4:6:16", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -3117,11 +3253,27 @@ "map": { "fields": [ { - "name": "target-arrowhead", + "name": { + "range": "TestCompile/filters/label-filter/1.d2,17:1:155-17:17:171", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/filters/label-filter/1.d2,17:18:172-17:23:177", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/label-filter/1.d2,17:25:179-17:32:186", diff --git a/testdata/d2ir/TestCompile/filters/label-filter/2.exp.json b/testdata/d2ir/TestCompile/filters/label-filter/2.exp.json index 0fc2941dc..a6814b031 100644 --- a/testdata/d2ir/TestCompile/filters/label-filter/2.exp.json +++ b/testdata/d2ir/TestCompile/filters/label-filter/2.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/filters/label-filter/2.d2,8:0:83-8:1:84", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -240,7 +248,15 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/filters/label-filter/2.d2,8:5:88-8:6:89", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -483,11 +499,27 @@ { "edge_id": { "src_path": [ - "x" + { + "range": "TestCompile/filters/label-filter/2.d2,8:0:83-8:1:84", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } ], "src_arrow": false, "dst_path": [ - "y" + { + "range": "TestCompile/filters/label-filter/2.d2,8:5:88-8:6:89", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -507,11 +539,27 @@ "map": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/filters/label-filter/2.d2,1:12:13-1:17:18", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/filters/label-filter/2.d2,1:18:19-1:25:26", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/label-filter/2.d2,5:17:78-5:18:79", @@ -1457,385 +1505,33 @@ }, "due_to_glob": true, "due_to_lazy_glob": true - }, - { - "context": { - "edge": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:7:40", - "src": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:2:35", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:2:35", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/filters/label-filter/2.d2,3:6:39-3:7:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,3:6:39-3:7:40", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/filters/label-filter/2.d2,3:0:33-6:1:81", - "edges": [ - { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:7:40", - "src": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:2:35", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:2:35", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/filters/label-filter/2.d2,3:6:39-3:7:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,3:6:39-3:7:40", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/filters/label-filter/2.d2,3:8:41-3:11:44", - "int": null, - "glob": true - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/filters/label-filter/2.d2,3:13:46-6:1:81", - "nodes": [ - { - "map_key": { - "range": "TestCompile/filters/label-filter/2.d2,4:2:50-4:12:60", - "ampersand": true, - "key": { - "range": "TestCompile/filters/label-filter/2.d2,4:3:51-4:8:56", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,4:3:51-4:8:56", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,4:10:58-4:12:60", - "value": [ - { - "string": "hi", - "raw_string": "hi" - } - ] - } - } - } - }, - { - "map_key": { - "range": "TestCompile/filters/label-filter/2.d2,5:2:63-5:18:79", - "key": { - "range": "TestCompile/filters/label-filter/2.d2,5:2:63-5:15:76", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,5:2:63-5:7:68", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,5:8:69-5:15:76", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter/2.d2,5:17:78-5:18:79", - "raw": "1", - "value": "1" - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "context": { - "edge": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:7:40", - "src": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:2:35", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:2:35", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/filters/label-filter/2.d2,3:6:39-3:7:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,3:6:39-3:7:40", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/filters/label-filter/2.d2,3:0:33-6:1:81", - "edges": [ - { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:7:40", - "src": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:2:35", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:2:35", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/filters/label-filter/2.d2,3:6:39-3:7:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,3:6:39-3:7:40", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/filters/label-filter/2.d2,3:8:41-3:11:44", - "int": null, - "glob": true - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/filters/label-filter/2.d2,3:13:46-6:1:81", - "nodes": [ - { - "map_key": { - "range": "TestCompile/filters/label-filter/2.d2,4:2:50-4:12:60", - "ampersand": true, - "key": { - "range": "TestCompile/filters/label-filter/2.d2,4:3:51-4:8:56", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,4:3:51-4:8:56", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,4:10:58-4:12:60", - "value": [ - { - "string": "hi", - "raw_string": "hi" - } - ] - } - } - } - }, - { - "map_key": { - "range": "TestCompile/filters/label-filter/2.d2,5:2:63-5:18:79", - "key": { - "range": "TestCompile/filters/label-filter/2.d2,5:2:63-5:15:76", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,5:2:63-5:7:68", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,5:8:69-5:15:76", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter/2.d2,5:17:78-5:18:79", - "raw": "1", - "value": "1" - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true } ] }, { "edge_id": { "src_path": [ - "x" + { + "range": "TestCompile/filters/label-filter/2.d2,8:0:83-8:1:84", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } ], "src_arrow": false, "dst_path": [ - "y" + { + "range": "TestCompile/filters/label-filter/2.d2,8:5:88-8:6:89", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } ], "dst_arrow": true, "index": 1, @@ -1844,11 +1540,27 @@ "map": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/filters/label-filter/2.d2,1:12:13-1:17:18", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/filters/label-filter/2.d2,1:18:19-1:25:26", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/label-filter/2.d2,1:27:28-1:30:31", @@ -2438,558 +2150,6 @@ }, "due_to_glob": true, "due_to_lazy_glob": true - }, - { - "context": { - "edge": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:7:40", - "src": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:2:35", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:2:35", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/filters/label-filter/2.d2,3:6:39-3:7:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,3:6:39-3:7:40", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/filters/label-filter/2.d2,3:0:33-6:1:81", - "edges": [ - { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:7:40", - "src": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:2:35", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:2:35", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/filters/label-filter/2.d2,3:6:39-3:7:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,3:6:39-3:7:40", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/filters/label-filter/2.d2,3:8:41-3:11:44", - "int": null, - "glob": true - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/filters/label-filter/2.d2,3:13:46-6:1:81", - "nodes": [ - { - "map_key": { - "range": "TestCompile/filters/label-filter/2.d2,4:2:50-4:12:60", - "ampersand": true, - "key": { - "range": "TestCompile/filters/label-filter/2.d2,4:3:51-4:8:56", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,4:3:51-4:8:56", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,4:10:58-4:12:60", - "value": [ - { - "string": "hi", - "raw_string": "hi" - } - ] - } - } - } - }, - { - "map_key": { - "range": "TestCompile/filters/label-filter/2.d2,5:2:63-5:18:79", - "key": { - "range": "TestCompile/filters/label-filter/2.d2,5:2:63-5:15:76", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,5:2:63-5:7:68", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,5:8:69-5:15:76", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter/2.d2,5:17:78-5:18:79", - "raw": "1", - "value": "1" - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "context": { - "edge": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:7:40", - "src": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:2:35", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:2:35", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/filters/label-filter/2.d2,3:6:39-3:7:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,3:6:39-3:7:40", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/filters/label-filter/2.d2,3:0:33-6:1:81", - "edges": [ - { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:7:40", - "src": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:2:35", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:2:35", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/filters/label-filter/2.d2,3:6:39-3:7:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,3:6:39-3:7:40", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/filters/label-filter/2.d2,3:8:41-3:11:44", - "int": null, - "glob": true - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/filters/label-filter/2.d2,3:13:46-6:1:81", - "nodes": [ - { - "map_key": { - "range": "TestCompile/filters/label-filter/2.d2,4:2:50-4:12:60", - "ampersand": true, - "key": { - "range": "TestCompile/filters/label-filter/2.d2,4:3:51-4:8:56", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,4:3:51-4:8:56", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,4:10:58-4:12:60", - "value": [ - { - "string": "hi", - "raw_string": "hi" - } - ] - } - } - } - }, - { - "map_key": { - "range": "TestCompile/filters/label-filter/2.d2,5:2:63-5:18:79", - "key": { - "range": "TestCompile/filters/label-filter/2.d2,5:2:63-5:15:76", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,5:2:63-5:7:68", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,5:8:69-5:15:76", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter/2.d2,5:17:78-5:18:79", - "raw": "1", - "value": "1" - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "context": { - "edge": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:7:40", - "src": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:2:35", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:2:35", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/filters/label-filter/2.d2,3:6:39-3:7:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,3:6:39-3:7:40", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/filters/label-filter/2.d2,3:0:33-6:1:81", - "edges": [ - { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:7:40", - "src": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:2:35", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,3:1:34-3:2:35", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/filters/label-filter/2.d2,3:6:39-3:7:40", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,3:6:39-3:7:40", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/filters/label-filter/2.d2,3:8:41-3:11:44", - "int": null, - "glob": true - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/filters/label-filter/2.d2,3:13:46-6:1:81", - "nodes": [ - { - "map_key": { - "range": "TestCompile/filters/label-filter/2.d2,4:2:50-4:12:60", - "ampersand": true, - "key": { - "range": "TestCompile/filters/label-filter/2.d2,4:3:51-4:8:56", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,4:3:51-4:8:56", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,4:10:58-4:12:60", - "value": [ - { - "string": "hi", - "raw_string": "hi" - } - ] - } - } - } - }, - { - "map_key": { - "range": "TestCompile/filters/label-filter/2.d2,5:2:63-5:18:79", - "key": { - "range": "TestCompile/filters/label-filter/2.d2,5:2:63-5:15:76", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,5:2:63-5:7:68", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/2.d2,5:8:69-5:15:76", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter/2.d2,5:17:78-5:18:79", - "raw": "1", - "value": "1" - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true } ] } diff --git a/testdata/d2ir/TestCompile/filters/label-filter/3.exp.json b/testdata/d2ir/TestCompile/filters/label-filter/3.exp.json index 868349959..65f2526bd 100644 --- a/testdata/d2ir/TestCompile/filters/label-filter/3.exp.json +++ b/testdata/d2ir/TestCompile/filters/label-filter/3.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/filters/label-filter/3.d2,6:0:53-6:1:54", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -128,7 +136,15 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/filters/label-filter/3.d2,6:5:58-6:6:59", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -259,11 +275,27 @@ { "edge_id": { "src_path": [ - "x" + { + "range": "TestCompile/filters/label-filter/3.d2,6:0:53-6:1:54", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } ], "src_arrow": false, "dst_path": [ - "y" + { + "range": "TestCompile/filters/label-filter/3.d2,6:5:58-6:6:59", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -283,11 +315,27 @@ "map": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/filters/label-filter/3.d2,3:2:31-3:7:36", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/filters/label-filter/3.d2,3:8:37-3:15:44", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/label-filter/3.d2,3:17:46-3:20:49", @@ -750,190 +798,6 @@ }, "due_to_glob": true, "due_to_lazy_glob": true - }, - { - "context": { - "edge": { - "range": "TestCompile/filters/label-filter/3.d2,1:1:2-1:7:8", - "src": { - "range": "TestCompile/filters/label-filter/3.d2,1:1:2-1:2:3", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/3.d2,1:1:2-1:2:3", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/filters/label-filter/3.d2,1:6:7-1:7:8", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/3.d2,1:6:7-1:7:8", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - }, - "key": { - "range": "TestCompile/filters/label-filter/3.d2,1:0:1-4:1:51", - "edges": [ - { - "range": "TestCompile/filters/label-filter/3.d2,1:1:2-1:7:8", - "src": { - "range": "TestCompile/filters/label-filter/3.d2,1:1:2-1:2:3", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/3.d2,1:1:2-1:2:3", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/filters/label-filter/3.d2,1:6:7-1:7:8", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/3.d2,1:6:7-1:7:8", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/filters/label-filter/3.d2,1:8:9-1:11:12", - "int": null, - "glob": true - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/filters/label-filter/3.d2,1:13:14-4:1:51", - "nodes": [ - { - "map_key": { - "range": "TestCompile/filters/label-filter/3.d2,2:2:18-2:12:28", - "ampersand": true, - "key": { - "range": "TestCompile/filters/label-filter/3.d2,2:3:19-2:8:24", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/3.d2,2:3:19-2:8:24", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/3.d2,2:10:26-2:12:28", - "value": [ - { - "string": "hi", - "raw_string": "hi" - } - ] - } - } - } - }, - { - "map_key": { - "range": "TestCompile/filters/label-filter/3.d2,3:2:31-3:20:49", - "key": { - "range": "TestCompile/filters/label-filter/3.d2,3:2:31-3:15:44", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/3.d2,3:2:31-3:7:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/filters/label-filter/3.d2,3:8:37-3:15:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/filters/label-filter/3.d2,3:17:46-3:20:49", - "raw": "0.1", - "value": "1/10" - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true } ] } diff --git a/testdata/d2ir/TestCompile/filters/lazy-filter.exp.json b/testdata/d2ir/TestCompile/filters/lazy-filter.exp.json index d61c21bc4..c7031c8ae 100644 --- a/testdata/d2ir/TestCompile/filters/lazy-filter.exp.json +++ b/testdata/d2ir/TestCompile/filters/lazy-filter.exp.json @@ -1,15 +1,39 @@ { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/filters/lazy-filter.d2,6:0:42-6:1:43", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/filters/lazy-filter.d2,3:2:20-3:7:25", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/filters/lazy-filter.d2,3:8:26-3:12:30", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/lazy-filter.d2,3:14:32-3:20:38", @@ -260,11 +284,27 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/filters/lazy-filter.d2,7:0:44-7:1:45", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "composite": { "fields": [ { - "name": "label", + "name": { + "range": "TestCompile/filters/lazy-filter.d2,8:2:48-8:7:53", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/lazy-filter.d2,8:9:55-8:10:56", @@ -557,11 +597,27 @@ ] }, { - "name": "style", + "name": { + "range": "TestCompile/filters/lazy-filter.d2,3:2:20-3:7:25", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/filters/lazy-filter.d2,3:8:26-3:12:30", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/lazy-filter.d2,3:14:32-3:20:38", diff --git a/testdata/d2ir/TestCompile/filters/not-basic.exp.json b/testdata/d2ir/TestCompile/filters/not-basic.exp.json index 661fcd6b5..8038ce65b 100644 --- a/testdata/d2ir/TestCompile/filters/not-basic.exp.json +++ b/testdata/d2ir/TestCompile/filters/not-basic.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "jacob", + "name": { + "range": "TestCompile/filters/not-basic.d2,0:0:0-0:5:5", + "value": [ + { + "string": "jacob", + "raw_string": "jacob" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/filters/not-basic.d2,1:1:10-1:6:15", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/not-basic.d2,1:8:17-1:14:23", @@ -212,7 +228,15 @@ ] }, { - "name": "label", + "name": { + "range": "TestCompile/filters/not-basic.d2,8:1:82-8:6:87", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/not-basic.d2,8:8:89-8:27:108", @@ -389,11 +413,27 @@ ] }, { - "name": "jeremy", + "name": { + "range": "TestCompile/filters/not-basic.d2,3:0:26-3:6:32", + "value": [ + { + "string": "jeremy", + "raw_string": "jeremy" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/filters/not-basic.d2,4:1:37-4:6:42", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/not-basic.d2,4:8:44-4:17:53", diff --git a/testdata/d2ir/TestCompile/filters/order.exp.json b/testdata/d2ir/TestCompile/filters/order.exp.json index aaaa8b71e..db2197ee6 100644 --- a/testdata/d2ir/TestCompile/filters/order.exp.json +++ b/testdata/d2ir/TestCompile/filters/order.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "jacob", + "name": { + "range": "TestCompile/filters/order.d2,0:0:0-0:5:5", + "value": [ + { + "string": "jacob", + "raw_string": "jacob" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/filters/order.d2,1:1:10-1:6:15", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/order.d2,1:8:17-1:14:23", @@ -246,11 +262,27 @@ ] }, { - "name": "jeremy", + "name": { + "range": "TestCompile/filters/order.d2,3:0:26-3:6:32", + "value": [ + { + "string": "jeremy", + "raw_string": "jeremy" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/filters/order.d2,4:1:37-4:6:42", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/order.d2,4:8:44-4:17:53", @@ -457,7 +489,15 @@ ] }, { - "name": "label", + "name": { + "range": "TestCompile/filters/order.d2,7:1:62-7:6:67", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/order.d2,7:8:69-7:23:84", diff --git a/testdata/d2ir/TestCompile/filters/primary-filter.exp.json b/testdata/d2ir/TestCompile/filters/primary-filter.exp.json index d17adef3f..18d20b92f 100644 --- a/testdata/d2ir/TestCompile/filters/primary-filter.exp.json +++ b/testdata/d2ir/TestCompile/filters/primary-filter.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "parent", + "name": { + "range": "TestCompile/filters/primary-filter.d2,1:0:1-1:6:7", + "value": [ + { + "string": "parent", + "raw_string": "parent" + } + ] + }, "composite": { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/filters/primary-filter.d2,2:2:13-2:3:14", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "composite": { "fields": null, "edges": null @@ -350,7 +366,15 @@ ] }, { - "name": "b1", + "name": { + "range": "TestCompile/filters/primary-filter.d2,2:7:18-2:9:20", + "value": [ + { + "string": "b1", + "raw_string": "b1" + } + ] + }, "composite": { "fields": null, "edges": null @@ -695,7 +719,15 @@ ] }, { - "name": "b3", + "name": { + "range": "TestCompile/filters/primary-filter.d2,4:7:38-4:9:40", + "value": [ + { + "string": "b3", + "raw_string": "b3" + } + ] + }, "composite": { "fields": null, "edges": null @@ -816,7 +848,15 @@ ] }, { - "name": "c1", + "name": { + "range": "TestCompile/filters/primary-filter.d2,6:8:50-6:10:52", + "value": [ + { + "string": "c1", + "raw_string": "c1" + } + ] + }, "composite": { "fields": [], "edges": null @@ -1044,11 +1084,27 @@ { "edge_id": { "src_path": [ - "a" + { + "range": "TestCompile/filters/primary-filter.d2,2:2:13-2:3:14", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } ], "src_arrow": false, "dst_path": [ - "b1" + { + "range": "TestCompile/filters/primary-filter.d2,2:7:18-2:9:20", + "value": [ + { + "string": "b1", + "raw_string": "b1" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -1147,11 +1203,27 @@ { "edge_id": { "src_path": [ - "a" + { + "range": "TestCompile/filters/primary-filter.d2,2:2:13-2:3:14", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } ], "src_arrow": false, "dst_path": [ - "b3" + { + "range": "TestCompile/filters/primary-filter.d2,4:7:38-4:9:40", + "value": [ + { + "string": "b3", + "raw_string": "b3" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -1250,11 +1322,27 @@ { "edge_id": { "src_path": [ - "b1" + { + "range": "TestCompile/filters/primary-filter.d2,2:7:18-2:9:20", + "value": [ + { + "string": "b1", + "raw_string": "b1" + } + ] + } ], "src_arrow": false, "dst_path": [ - "c1" + { + "range": "TestCompile/filters/primary-filter.d2,6:8:50-6:10:52", + "value": [ + { + "string": "c1", + "raw_string": "c1" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -1879,19 +1967,51 @@ ] }, { - "name": "classes", + "name": { + "range": "TestCompile/filters/primary-filter.d2,20:0:185-20:7:192", + "value": [ + { + "string": "classes", + "raw_string": "classes" + } + ] + }, "composite": { "fields": [ { - "name": "hidden", + "name": { + "range": "TestCompile/filters/primary-filter.d2,21:2:198-21:8:204", + "value": [ + { + "string": "hidden", + "raw_string": "hidden" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/filters/primary-filter.d2,22:4:212-22:9:217", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/filters/primary-filter.d2,23:6:227-23:10:231", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/filters/primary-filter.d2,23:12:233-23:15:236", diff --git a/testdata/d2ir/TestCompile/imports/boards-deep.exp.json b/testdata/d2ir/TestCompile/imports/boards-deep.exp.json index 3925c7050..2ea3a94a1 100644 --- a/testdata/d2ir/TestCompile/imports/boards-deep.exp.json +++ b/testdata/d2ir/TestCompile/imports/boards-deep.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "a", + "name": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "composite": { "fields": [ { - "name": "link", + "name": { + "range": "index.d2,0:2:2-0:6:6", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + }, "primary": { "value": { "range": ",0:0:0-0:0:0", @@ -196,19 +212,51 @@ ] }, { - "name": "layers", + "name": { + "range": "index.d2,0:18:18-0:24:24", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + }, "composite": { "fields": [ { - "name": "b", + "name": { + "range": "index.d2,0:28:28-0:29:29", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "composite": { "fields": [ { - "name": "b", + "name": { + "range": "b.d2,0:0:0-0:1:1", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "composite": { "fields": [ { - "name": "link", + "name": { + "range": "b.d2,0:2:2-0:6:6", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + }, "primary": { "value": { "range": ",0:0:0-0:0:0", @@ -399,19 +447,51 @@ ] }, { - "name": "layers", + "name": { + "range": "b.d2,0:18:18-0:24:24", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + }, "composite": { "fields": [ { - "name": "c", + "name": { + "range": "b.d2,0:28:28-0:29:29", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, "composite": { "fields": [ { - "name": "c", + "name": { + "range": "c.d2,0:0:0-0:1:1", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, "composite": { "fields": [ { - "name": "link", + "name": { + "range": "c.d2,0:2:2-0:6:6", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + }, "primary": { "value": { "range": ",0:0:0-0:0:0", @@ -602,15 +682,39 @@ ] }, { - "name": "layers", + "name": { + "range": "c.d2,0:18:18-0:24:24", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + }, "composite": { "fields": [ { - "name": "d", + "name": { + "range": "c.d2,0:28:28-0:29:29", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + }, "composite": { "fields": [ { - "name": "d", + "name": { + "range": "d.d2,0:0:0-0:1:1", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + }, "references": [ { "string": { @@ -671,6 +775,78 @@ "edges": null }, "references": [ + { + "string": { + "range": "c.d2,0:28:28-0:29:29", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + }, + "key_path": { + "range": "c.d2,0:28:28-0:29:29", + "path": [ + { + "unquoted_string": { + "range": "c.d2,0:28:28-0:29:29", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "c.d2,0:28:28-0:34:34", + "key": { + "range": "c.d2,0:28:28-0:29:29", + "path": [ + { + "unquoted_string": { + "range": "c.d2,0:28:28-0:29:29", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "c.d2,0:31:31-0:34:34", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "c.d2,0:32:32-0:33:33", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + } + } + } + }, + "due_to_glob": false, + "due_to_lazy_glob": false + }, { "string": { "range": "c.d2,0:28:28-0:29:29", @@ -856,6 +1032,78 @@ "edges": null }, "references": [ + { + "string": { + "range": "b.d2,0:28:28-0:29:29", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, + "key_path": { + "range": "b.d2,0:28:28-0:29:29", + "path": [ + { + "unquoted_string": { + "range": "b.d2,0:28:28-0:29:29", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "b.d2,0:28:28-0:34:34", + "key": { + "range": "b.d2,0:28:28-0:29:29", + "path": [ + { + "unquoted_string": { + "range": "b.d2,0:28:28-0:29:29", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "b.d2,0:31:31-0:34:34", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "b.d2,0:32:32-0:33:33", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + } + } + } + }, + "due_to_glob": false, + "due_to_lazy_glob": false + }, { "string": { "range": "b.d2,0:28:28-0:29:29", @@ -1041,6 +1289,78 @@ "edges": null }, "references": [ + { + "string": { + "range": "index.d2,0:28:28-0:29:29", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, + "key_path": { + "range": "index.d2,0:28:28-0:29:29", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:28:28-0:29:29", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "index.d2,0:28:28-0:34:34", + "key": { + "range": "index.d2,0:28:28-0:29:29", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:28:28-0:29:29", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "index.d2,0:31:31-0:34:34", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:32:32-0:33:33", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + } + } + } + }, + "due_to_glob": false, + "due_to_lazy_glob": false + }, { "string": { "range": "index.d2,0:28:28-0:29:29", diff --git a/testdata/d2ir/TestCompile/imports/boards.exp.json b/testdata/d2ir/TestCompile/imports/boards.exp.json index a9de84ecf..e2cd8d6b4 100644 --- a/testdata/d2ir/TestCompile/imports/boards.exp.json +++ b/testdata/d2ir/TestCompile/imports/boards.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "x", + "name": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "link", + "name": { + "range": "index.d2,0:2:2-0:6:6", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + }, "primary": { "value": { "range": ",0:0:0-0:0:0", @@ -196,19 +212,51 @@ ] }, { - "name": "layers", + "name": { + "range": "index.d2,0:18:18-0:24:24", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "index.d2,0:28:28-0:29:29", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "y", + "name": { + "range": "x.d2,0:0:0-0:1:1", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "composite": { "fields": [ { - "name": "link", + "name": { + "range": "x.d2,0:2:2-0:6:6", + "value": [ + { + "string": "link", + "raw_string": "link" + } + ] + }, "primary": { "value": { "range": ",0:0:0-0:0:0", @@ -399,15 +447,39 @@ ] }, { - "name": "layers", + "name": { + "range": "x.d2,0:18:18-0:24:24", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + }, "composite": { "fields": [ { - "name": "y", + "name": { + "range": "x.d2,0:28:28-0:29:29", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "composite": { "fields": [ { - "name": "meow", + "name": { + "range": "y.d2,0:0:0-0:4:4", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + }, "references": [ { "string": { @@ -468,6 +540,78 @@ "edges": null }, "references": [ + { + "string": { + "range": "x.d2,0:28:28-0:29:29", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, + "key_path": { + "range": "x.d2,0:28:28-0:29:29", + "path": [ + { + "unquoted_string": { + "range": "x.d2,0:28:28-0:29:29", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "x.d2,0:28:28-0:34:34", + "key": { + "range": "x.d2,0:28:28-0:29:29", + "path": [ + { + "unquoted_string": { + "range": "x.d2,0:28:28-0:29:29", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "x.d2,0:31:31-0:34:34", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "x.d2,0:32:32-0:33:33", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + } + } + } + }, + "due_to_glob": false, + "due_to_lazy_glob": false + }, { "string": { "range": "x.d2,0:28:28-0:29:29", @@ -653,6 +797,78 @@ "edges": null }, "references": [ + { + "string": { + "range": "index.d2,0:28:28-0:29:29", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, + "key_path": { + "range": "index.d2,0:28:28-0:29:29", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:28:28-0:29:29", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "index.d2,0:28:28-0:34:34", + "key": { + "range": "index.d2,0:28:28-0:29:29", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:28:28-0:29:29", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "index.d2,0:31:31-0:34:34", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:32:32-0:33:33", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + } + } + } + }, + "due_to_glob": false, + "due_to_lazy_glob": false + }, { "string": { "range": "index.d2,0:28:28-0:29:29", diff --git a/testdata/d2ir/TestCompile/imports/merge-arrays.exp.json b/testdata/d2ir/TestCompile/imports/merge-arrays.exp.json index a0da3f4da..c897ec4af 100644 --- a/testdata/d2ir/TestCompile/imports/merge-arrays.exp.json +++ b/testdata/d2ir/TestCompile/imports/merge-arrays.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "x", + "name": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "class", + "name": { + "range": "index.d2,0:2:2-0:7:7", + "value": [ + { + "string": "class", + "raw_string": "class" + } + ] + }, "composite": { "values": [ { diff --git a/testdata/d2ir/TestCompile/imports/nested-scope.exp.json b/testdata/d2ir/TestCompile/imports/nested-scope.exp.json index 8ed85fd1f..b3ea88c1b 100644 --- a/testdata/d2ir/TestCompile/imports/nested-scope.exp.json +++ b/testdata/d2ir/TestCompile/imports/nested-scope.exp.json @@ -1,15 +1,39 @@ { "fields": [ { - "name": "elem", + "name": { + "range": "second.d2,0:0:0-0:4:4", + "value": [ + { + "string": "elem", + "raw_string": "elem" + } + ] + }, "composite": { "fields": [ { - "name": "third", + "name": { + "range": "third.d2,0:0:0-0:5:5", + "value": [ + { + "string": "third", + "raw_string": "third" + } + ] + }, "composite": { "fields": [ { - "name": "elem", + "name": { + "range": "third.d2,1:2:11-1:6:15", + "value": [ + { + "string": "elem", + "raw_string": "elem" + } + ] + }, "references": [ { "string": { diff --git a/testdata/d2ir/TestCompile/imports/nested/array.exp.json b/testdata/d2ir/TestCompile/imports/nested/array.exp.json index c35c86882..e06ff2377 100644 --- a/testdata/d2ir/TestCompile/imports/nested/array.exp.json +++ b/testdata/d2ir/TestCompile/imports/nested/array.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "x", + "name": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "values": [ { @@ -18,6 +26,89 @@ ] }, "references": [ + { + "string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, + "key_path": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "index.d2,0:0:0-0:7:7", + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "index.d2,0:3:3-0:7:7", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:4:4-0:5:5", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "index.d2,0:6:6-0:7:7", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + } + } + } + }, + "due_to_glob": false, + "due_to_lazy_glob": false + }, { "string": { "range": "index.d2,0:0:0-0:1:1", diff --git a/testdata/d2ir/TestCompile/imports/nested/map.exp.json b/testdata/d2ir/TestCompile/imports/nested/map.exp.json index 2377f1914..6efbc25c3 100644 --- a/testdata/d2ir/TestCompile/imports/nested/map.exp.json +++ b/testdata/d2ir/TestCompile/imports/nested/map.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "x", + "name": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "x.d2,1:1:6-1:6:11", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "x.d2,1:8:13-1:14:19", @@ -84,7 +100,15 @@ ] }, { - "name": "label", + "name": { + "range": "x.d2,2:1:21-2:6:26", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + }, "primary": { "value": { "range": "x.d2,2:8:28-2:12:32", @@ -166,6 +190,89 @@ "edges": null }, "references": [ + { + "string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, + "key_path": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "index.d2,0:0:0-0:7:7", + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "index.d2,0:3:3-0:7:7", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:4:4-0:5:5", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "index.d2,0:6:6-0:7:7", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + } + } + } + }, + "due_to_glob": false, + "due_to_lazy_glob": false + }, { "string": { "range": "index.d2,0:0:0-0:1:1", diff --git a/testdata/d2ir/TestCompile/imports/nested/scalar.exp.json b/testdata/d2ir/TestCompile/imports/nested/scalar.exp.json index 7fb4ed533..0d42ee494 100644 --- a/testdata/d2ir/TestCompile/imports/nested/scalar.exp.json +++ b/testdata/d2ir/TestCompile/imports/nested/scalar.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "x", + "name": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "primary": { "value": { "range": "x.d2,0:3:3-0:7:7", @@ -14,6 +22,89 @@ } }, "references": [ + { + "string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, + "key_path": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "index.d2,0:0:0-0:7:7", + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "index.d2,0:3:3-0:7:7", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:4:4-0:5:5", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + }, + { + "unquoted_string": { + "range": "index.d2,0:6:6-0:7:7", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + } + } + } + }, + "due_to_glob": false, + "due_to_lazy_glob": false + }, { "string": { "range": "index.d2,0:0:0-0:1:1", diff --git a/testdata/d2ir/TestCompile/imports/nested/spread.exp.json b/testdata/d2ir/TestCompile/imports/nested/spread.exp.json index 6250a7662..fb9eaa89c 100644 --- a/testdata/d2ir/TestCompile/imports/nested/spread.exp.json +++ b/testdata/d2ir/TestCompile/imports/nested/spread.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "jon", + "name": { + "range": "x.d2,0:5:5-0:8:8", + "value": [ + { + "string": "jon", + "raw_string": "jon" + } + ] + }, "references": [ { "string": { @@ -59,7 +67,15 @@ ] }, { - "name": "jan", + "name": { + "range": "x.d2,0:10:10-0:13:13", + "value": [ + { + "string": "jan", + "raw_string": "jan" + } + ] + }, "references": [ { "string": { diff --git a/testdata/d2ir/TestCompile/imports/nested/spread_primary.exp.json b/testdata/d2ir/TestCompile/imports/nested/spread_primary.exp.json index d712911fe..f8c0489a4 100644 --- a/testdata/d2ir/TestCompile/imports/nested/spread_primary.exp.json +++ b/testdata/d2ir/TestCompile/imports/nested/spread_primary.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "q", + "name": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "q", + "raw_string": "q" + } + ] + }, "primary": { "value": { "range": "x.d2,0:3:3-0:7:7", @@ -16,7 +24,15 @@ "composite": { "fields": [ { - "name": "jon", + "name": { + "range": "x.d2,0:10:10-0:13:13", + "value": [ + { + "string": "jon", + "raw_string": "jon" + } + ] + }, "references": [ { "string": { @@ -74,7 +90,15 @@ ] }, { - "name": "jan", + "name": { + "range": "x.d2,0:15:15-0:18:18", + "value": [ + { + "string": "jan", + "raw_string": "jan" + } + ] + }, "references": [ { "string": { diff --git a/testdata/d2ir/TestCompile/imports/pattern-value.exp.json b/testdata/d2ir/TestCompile/imports/pattern-value.exp.json index d5f4c5203..a40689479 100644 --- a/testdata/d2ir/TestCompile/imports/pattern-value.exp.json +++ b/testdata/d2ir/TestCompile/imports/pattern-value.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "userWebsite", + "name": { + "range": "index.d2,0:0:0-0:11:11", + "value": [ + { + "string": "userWebsite", + "raw_string": "userWebsite" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "x.d2,0:0:0-0:5:5", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "x.d2,0:7:7-0:13:13", @@ -84,7 +100,15 @@ ] }, { - "name": "label", + "name": { + "range": "x.d2,1:0:14-1:5:19", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + }, "primary": { "value": { "range": "x.d2,1:7:21-1:11:25", @@ -166,6 +190,59 @@ "edges": null }, "references": [ + { + "string": { + "range": "index.d2,0:0:0-0:11:11", + "value": [ + { + "string": "userWebsite", + "raw_string": "userWebsite" + } + ] + }, + "key_path": { + "range": "index.d2,0:0:0-0:11:11", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:11:11", + "value": [ + { + "string": "userWebsite", + "raw_string": "userWebsite" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "index.d2,0:0:0-0:11:11", + "key": { + "range": "index.d2,0:0:0-0:11:11", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:11:11", + "value": [ + { + "string": "userWebsite", + "raw_string": "userWebsite" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + "due_to_glob": false, + "due_to_lazy_glob": false + }, { "string": { "range": "index.d2,0:0:0-0:11:11", @@ -222,11 +299,27 @@ ] }, { - "name": "userMobile", + "name": { + "range": "index.d2,1:0:12-1:10:22", + "value": [ + { + "string": "userMobile", + "raw_string": "userMobile" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "x.d2,0:0:0-0:5:5", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "x.d2,0:7:7-0:13:13", @@ -305,7 +398,15 @@ ] }, { - "name": "label", + "name": { + "range": "x.d2,1:0:14-1:5:19", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + }, "primary": { "value": { "range": "x.d2,1:7:21-1:11:25", @@ -387,6 +488,59 @@ "edges": null }, "references": [ + { + "string": { + "range": "index.d2,1:0:12-1:10:22", + "value": [ + { + "string": "userMobile", + "raw_string": "userMobile" + } + ] + }, + "key_path": { + "range": "index.d2,1:0:12-1:10:22", + "path": [ + { + "unquoted_string": { + "range": "index.d2,1:0:12-1:10:22", + "value": [ + { + "string": "userMobile", + "raw_string": "userMobile" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "index.d2,1:0:12-1:10:22", + "key": { + "range": "index.d2,1:0:12-1:10:22", + "path": [ + { + "unquoted_string": { + "range": "index.d2,1:0:12-1:10:22", + "value": [ + { + "string": "userMobile", + "raw_string": "userMobile" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + "due_to_glob": false, + "due_to_lazy_glob": false + }, { "string": { "range": "index.d2,1:0:12-1:10:22", diff --git a/testdata/d2ir/TestCompile/imports/spread.exp.json b/testdata/d2ir/TestCompile/imports/spread.exp.json index db398ce59..d1901521b 100644 --- a/testdata/d2ir/TestCompile/imports/spread.exp.json +++ b/testdata/d2ir/TestCompile/imports/spread.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "x", + "name": { + "range": "x.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "primary": { "value": { "range": "x.d2,0:3:3-0:7:7", diff --git a/testdata/d2ir/TestCompile/imports/steps-inheritence.exp.json b/testdata/d2ir/TestCompile/imports/steps-inheritence.exp.json index 0218343fa..3f542c369 100644 --- a/testdata/d2ir/TestCompile/imports/steps-inheritence.exp.json +++ b/testdata/d2ir/TestCompile/imports/steps-inheritence.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "z", + "name": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + }, "references": [ { "string": { @@ -59,15 +67,39 @@ ] }, { - "name": "scenarios", + "name": { + "range": "index.d2,0:28:28-0:37:37", + "value": [ + { + "string": "scenarios", + "raw_string": "scenarios" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "index.d2,0:41:41-0:42:42", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "z", + "name": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + }, "references": [ { "string": { @@ -125,7 +157,15 @@ ] }, { - "name": "a", + "name": { + "range": "x.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "references": [ { "string": { @@ -186,6 +226,78 @@ "edges": null }, "references": [ + { + "string": { + "range": "index.d2,0:41:41-0:42:42", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, + "key_path": { + "range": "index.d2,0:41:41-0:42:42", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:41:41-0:42:42", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "index.d2,0:41:41-0:46:46", + "key": { + "range": "index.d2,0:41:41-0:42:42", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:41:41-0:42:42", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "index.d2,0:44:44-0:46:46", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:45:45-0:46:46", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + } + } + } + }, + "due_to_glob": false, + "due_to_lazy_glob": false + }, { "string": { "range": "index.d2,0:41:41-0:42:42", @@ -261,11 +373,27 @@ ] }, { - "name": "y", + "name": { + "range": "index.d2,0:48:48-0:49:49", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "composite": { "fields": [ { - "name": "z", + "name": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + }, "references": [ { "string": { @@ -323,7 +451,15 @@ ] }, { - "name": "b", + "name": { + "range": "y.d2,0:0:0-0:1:1", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "references": [ { "string": { @@ -384,6 +520,78 @@ "edges": null }, "references": [ + { + "string": { + "range": "index.d2,0:48:48-0:49:49", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, + "key_path": { + "range": "index.d2,0:48:48-0:49:49", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:48:48-0:49:49", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "index.d2,0:48:48-0:54:54", + "key": { + "range": "index.d2,0:48:48-0:49:49", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:48:48-0:49:49", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "index.d2,0:51:51-0:54:54", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:52:52-0:53:53", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + } + } + } + }, + "due_to_glob": false, + "due_to_lazy_glob": false + }, { "string": { "range": "index.d2,0:48:48-0:49:49", @@ -608,15 +816,39 @@ ] }, { - "name": "steps", + "name": { + "range": "index.d2,0:3:3-0:8:8", + "value": [ + { + "string": "steps", + "raw_string": "steps" + } + ] + }, "composite": { "fields": [ { - "name": "1", + "name": { + "range": "index.d2,0:12:12-0:13:13", + "value": [ + { + "string": "1", + "raw_string": "1" + } + ] + }, "composite": { "fields": [ { - "name": "z", + "name": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + }, "references": [ { "string": { @@ -674,7 +906,15 @@ ] }, { - "name": "a", + "name": { + "range": "x.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "references": [ { "string": { @@ -735,6 +975,78 @@ "edges": null }, "references": [ + { + "string": { + "range": "index.d2,0:12:12-0:13:13", + "value": [ + { + "string": "1", + "raw_string": "1" + } + ] + }, + "key_path": { + "range": "index.d2,0:12:12-0:13:13", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:12:12-0:13:13", + "value": [ + { + "string": "1", + "raw_string": "1" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "index.d2,0:12:12-0:17:17", + "key": { + "range": "index.d2,0:12:12-0:13:13", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:12:12-0:13:13", + "value": [ + { + "string": "1", + "raw_string": "1" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "index.d2,0:15:15-0:17:17", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:16:16-0:17:17", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + } + } + } + }, + "due_to_glob": false, + "due_to_lazy_glob": false + }, { "string": { "range": "index.d2,0:12:12-0:13:13", @@ -810,11 +1122,27 @@ ] }, { - "name": "2", + "name": { + "range": "index.d2,0:19:19-0:20:20", + "value": [ + { + "string": "2", + "raw_string": "2" + } + ] + }, "composite": { "fields": [ { - "name": "z", + "name": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + }, "references": [ { "string": { @@ -872,7 +1200,15 @@ ] }, { - "name": "a", + "name": { + "range": "x.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "references": [ { "string": { @@ -930,7 +1266,15 @@ ] }, { - "name": "b", + "name": { + "range": "y.d2,0:0:0-0:1:1", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "references": [ { "string": { @@ -991,6 +1335,78 @@ "edges": null }, "references": [ + { + "string": { + "range": "index.d2,0:19:19-0:20:20", + "value": [ + { + "string": "2", + "raw_string": "2" + } + ] + }, + "key_path": { + "range": "index.d2,0:19:19-0:20:20", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:19:19-0:20:20", + "value": [ + { + "string": "2", + "raw_string": "2" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "index.d2,0:19:19-0:25:25", + "key": { + "range": "index.d2,0:19:19-0:20:20", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:19:19-0:20:20", + "value": [ + { + "string": "2", + "raw_string": "2" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "index.d2,0:22:22-0:25:25", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:23:23-0:24:24", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + } + } + } + }, + "due_to_glob": false, + "due_to_lazy_glob": false + }, { "string": { "range": "index.d2,0:19:19-0:20:20", diff --git a/testdata/d2ir/TestCompile/imports/value.exp.json b/testdata/d2ir/TestCompile/imports/value.exp.json index 703c3422a..fa8af8371 100644 --- a/testdata/d2ir/TestCompile/imports/value.exp.json +++ b/testdata/d2ir/TestCompile/imports/value.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "x", + "name": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "x.d2,0:0:0-0:5:5", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "x.d2,0:7:7-0:13:13", @@ -84,7 +100,15 @@ ] }, { - "name": "label", + "name": { + "range": "x.d2,1:0:14-1:5:19", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + }, "primary": { "value": { "range": "x.d2,1:7:21-1:11:25", @@ -166,6 +190,78 @@ "edges": null }, "references": [ + { + "string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, + "key_path": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "index.d2,0:0:0-0:8:8", + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "index.d2,0:3:3-0:8:8", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:4:4-0:5:5", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + } + } + } + }, + "due_to_glob": false, + "due_to_lazy_glob": false + }, { "string": { "range": "index.d2,0:0:0-0:1:1", diff --git a/testdata/d2ir/TestCompile/imports/vars/1.exp.json b/testdata/d2ir/TestCompile/imports/vars/1.exp.json index b3f70120c..70fc1b29a 100644 --- a/testdata/d2ir/TestCompile/imports/vars/1.exp.json +++ b/testdata/d2ir/TestCompile/imports/vars/1.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "vars", + "name": { + "range": "index.d2,0:0:0-0:4:4", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + }, "composite": { "fields": [ { - "name": "meow", + "name": { + "range": "x.d2,0:0:0-0:4:4", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + }, "primary": { "value": { "range": "x.d2,0:6:6-0:18:18", @@ -169,7 +185,15 @@ ] }, { - "name": "q", + "name": { + "range": "index.d2,0:17:17-0:18:18", + "value": [ + { + "string": "q", + "raw_string": "q" + } + ] + }, "primary": { "value": { "range": "x.d2,0:6:6-0:18:18", diff --git a/testdata/d2ir/TestCompile/imports/vars/2.exp.json b/testdata/d2ir/TestCompile/imports/vars/2.exp.json index c1368afb1..e87de9f66 100644 --- a/testdata/d2ir/TestCompile/imports/vars/2.exp.json +++ b/testdata/d2ir/TestCompile/imports/vars/2.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "vars", + "name": { + "range": "index.d2,0:0:0-0:4:4", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "index.d2,0:8:8-0:9:9", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "primary": { "value": { "range": "a.d2,0:11:11-0:12:12", @@ -317,7 +333,15 @@ ] }, { - "name": "hi", + "name": { + "range": "a.d2,0:16:16-0:18:18", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + }, "primary": { "value": { "range": "a.d2,0:11:11-0:12:12", diff --git a/testdata/d2ir/TestCompile/imports/vars/3.exp.json b/testdata/d2ir/TestCompile/imports/vars/3.exp.json index 68e6c6c4e..b2fec7be2 100644 --- a/testdata/d2ir/TestCompile/imports/vars/3.exp.json +++ b/testdata/d2ir/TestCompile/imports/vars/3.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "vars", + "name": { + "range": "a.d2,0:0:0-0:4:4", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "a.d2,0:8:8-0:9:9", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "primary": { "value": { "range": "index.d2,0:18:18-0:19:19", @@ -317,7 +333,15 @@ ] }, { - "name": "hi", + "name": { + "range": "index.d2,0:23:23-0:25:25", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + }, "primary": { "value": { "range": "index.d2,0:18:18-0:19:19", diff --git a/testdata/d2ir/TestCompile/layers/errs/4/good_edge.exp.json b/testdata/d2ir/TestCompile/layers/errs/4/good_edge.exp.json index 668820d84..f9cb22e45 100644 --- a/testdata/d2ir/TestCompile/layers/errs/4/good_edge.exp.json +++ b/testdata/d2ir/TestCompile/layers/errs/4/good_edge.exp.json @@ -1,15 +1,39 @@ { "fields": [ { - "name": "layers", + "name": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:0:0-0:6:6", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:7:7-0:8:8", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "y", + "name": { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:9:9-0:10:10", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -462,11 +486,27 @@ { "edge_id": { "src_path": [ - "y" + { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:9:9-0:10:10", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } ], "src_arrow": false, "dst_path": [ - "y" + { + "range": "TestCompile/layers/errs/4/good_edge.d2,0:9:9-0:10:10", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } ], "dst_arrow": true, "index": 0, diff --git a/testdata/d2ir/TestCompile/layers/root.exp.json b/testdata/d2ir/TestCompile/layers/root.exp.json index eda3c52a7..08f0334ed 100644 --- a/testdata/d2ir/TestCompile/layers/root.exp.json +++ b/testdata/d2ir/TestCompile/layers/root.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/layers/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -118,7 +126,15 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/layers/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -235,23 +251,63 @@ ] }, { - "name": "layers", + "name": { + "range": "TestCompile/layers/root.d2,1:0:7-1:6:13", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + }, "composite": { "fields": [ { - "name": "bingo", + "name": { + "range": "TestCompile/layers/root.d2,2:1:18-2:6:23", + "value": [ + { + "string": "bingo", + "raw_string": "bingo" + } + ] + }, "composite": { "fields": [ { - "name": "p", + "name": { + "range": "TestCompile/layers/root.d2,2:10:27-2:11:28", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + }, "composite": { "fields": [ { - "name": "q", + "name": { + "range": "TestCompile/layers/root.d2,2:12:29-2:13:30", + "value": [ + { + "string": "q", + "raw_string": "q" + } + ] + }, "composite": { "fields": [ { - "name": "z", + "name": { + "range": "TestCompile/layers/root.d2,2:14:31-2:15:32", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + }, "references": [ { "string": { @@ -812,11 +868,27 @@ { "edge_id": { "src_path": [ - "x" + { + "range": "TestCompile/layers/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } ], "src_arrow": false, "dst_path": [ - "y" + { + "range": "TestCompile/layers/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } ], "dst_arrow": true, "index": 0, diff --git a/testdata/d2ir/TestCompile/patterns/alixander-review/1.exp.json b/testdata/d2ir/TestCompile/patterns/alixander-review/1.exp.json index b6516bba8..9ff260e57 100644 --- a/testdata/d2ir/TestCompile/patterns/alixander-review/1.exp.json +++ b/testdata/d2ir/TestCompile/patterns/alixander-review/1.exp.json @@ -1,15 +1,39 @@ { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/patterns/alixander-review/1.d2,5:0:65-5:1:66", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/alixander-review/1.d2,1:4:5-1:9:10", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/alixander-review/1.d2,1:10:11-1:14:15", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/alixander-review/1.d2,1:16:17-1:22:23", @@ -146,7 +170,15 @@ ] }, { - "name": "multiple", + "name": { + "range": "TestCompile/patterns/alixander-review/1.d2,3:8:49-3:16:57", + "value": [ + { + "string": "multiple", + "raw_string": "multiple" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/alixander-review/1.d2,3:18:59-3:22:63", @@ -3723,7 +3755,15 @@ ] }, { - "name": "shape", + "name": { + "range": "TestCompile/patterns/alixander-review/1.d2,2:3:27-2:8:32", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/alixander-review/1.d2,2:10:34-2:16:40", @@ -4689,15 +4729,39 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/patterns/alixander-review/1.d2,6:2:72-6:3:73", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/alixander-review/1.d2,1:4:5-1:9:10", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/alixander-review/1.d2,1:10:11-1:14:15", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/alixander-review/1.d2,1:16:17-1:22:23", @@ -5687,7 +5751,15 @@ ] }, { - "name": "shape", + "name": { + "range": "TestCompile/patterns/alixander-review/1.d2,2:3:27-2:8:32", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/alixander-review/1.d2,2:10:34-2:16:40", @@ -6610,23 +6682,63 @@ ] }, { - "name": "layers", + "name": { + "range": "TestCompile/patterns/alixander-review/1.d2,9:0:77-9:6:83", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + }, "composite": { "fields": [ { - "name": "next", + "name": { + "range": "TestCompile/patterns/alixander-review/1.d2,10:2:89-10:6:93", + "value": [ + { + "string": "next", + "raw_string": "next" + } + ] + }, "composite": { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/alixander-review/1.d2,11:4:101-11:5:102", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/alixander-review/1.d2,1:4:5-1:9:10", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/alixander-review/1.d2,1:10:11-1:14:15", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/alixander-review/1.d2,1:16:17-1:22:23", @@ -6650,28 +6762,8 @@ ] }, "key_path": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:14:15", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "next" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:3:4", @@ -6719,28 +6811,8 @@ "key": { "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:22:23", "key": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:14:15", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "next" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:3:4", @@ -6817,28 +6889,8 @@ ] }, "key_path": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:14:15", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "next" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:3:4", @@ -6886,28 +6938,8 @@ "key": { "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:22:23", "key": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:14:15", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "next" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:3:4", @@ -6978,28 +7010,8 @@ ] }, "key_path": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:14:15", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "next" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:3:4", @@ -7047,28 +7059,8 @@ "key": { "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:22:23", "key": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:14:15", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "next" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:3:4", @@ -7516,326 +7508,6 @@ }, "due_to_glob": false, "due_to_lazy_glob": false - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "next" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "next" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:3:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:4:5-1:9:10", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:10:11-1:14:15", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:22:23", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "next" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:3:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:4:5-1:9:10", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:10:11-1:14:15", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:16:17-1:22:23", - "value": [ - { - "string": "yellow", - "raw_string": "yellow" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "next" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "next" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:3:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:4:5-1:9:10", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:10:11-1:14:15", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:22:23", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "next" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:3:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:4:5-1:9:10", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:10:11-1:14:15", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:16:17-1:22:23", - "value": [ - { - "string": "yellow", - "raw_string": "yellow" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true } ] } @@ -7953,326 +7625,6 @@ }, "due_to_glob": false, "due_to_lazy_glob": false - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "next" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:3:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:4:5-1:9:10", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:10:11-1:14:15", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:22:23", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "next" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:3:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:4:5-1:9:10", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:10:11-1:14:15", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:16:17-1:22:23", - "value": [ - { - "string": "yellow", - "raw_string": "yellow" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "next" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:3:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:4:5-1:9:10", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:10:11-1:14:15", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:22:23", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "next" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:0:1-1:3:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:4:5-1:9:10", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:10:11-1:14:15", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/1.d2,1:16:17-1:22:23", - "value": [ - { - "string": "yellow", - "raw_string": "yellow" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true } ] } diff --git a/testdata/d2ir/TestCompile/patterns/alixander-review/2.exp.json b/testdata/d2ir/TestCompile/patterns/alixander-review/2.exp.json index d88480af2..80f5083dc 100644 --- a/testdata/d2ir/TestCompile/patterns/alixander-review/2.exp.json +++ b/testdata/d2ir/TestCompile/patterns/alixander-review/2.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/alixander-review/2.d2,1:0:1-1:1:2", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "references": [ { "string": { @@ -59,7 +67,15 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/patterns/alixander-review/2.d2,3:5:9-3:6:10", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -654,7 +670,15 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/patterns/alixander-review/2.d2,5:0:12-5:1:13", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "references": [ { "string": { @@ -712,7 +736,15 @@ ] }, { - "name": "c", + "name": { + "range": "TestCompile/patterns/alixander-review/2.d2,6:0:14-6:1:15", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, "references": [ { "string": { @@ -774,11 +806,27 @@ { "edge_id": { "src_path": [ - "a" + { + "range": "TestCompile/patterns/alixander-review/2.d2,1:0:1-1:1:2", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } ], "src_arrow": false, "dst_path": [ - "y" + { + "range": "TestCompile/patterns/alixander-review/2.d2,3:5:9-3:6:10", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -883,11 +931,27 @@ { "edge_id": { "src_path": [ - "b" + { + "range": "TestCompile/patterns/alixander-review/2.d2,5:0:12-5:1:13", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } ], "src_arrow": false, "dst_path": [ - "y" + { + "range": "TestCompile/patterns/alixander-review/2.d2,3:5:9-3:6:10", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -992,11 +1056,27 @@ { "edge_id": { "src_path": [ - "c" + { + "range": "TestCompile/patterns/alixander-review/2.d2,6:0:14-6:1:15", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } ], "src_arrow": false, "dst_path": [ - "y" + { + "range": "TestCompile/patterns/alixander-review/2.d2,3:5:9-3:6:10", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } ], "dst_arrow": true, "index": 0, diff --git a/testdata/d2ir/TestCompile/patterns/alixander-review/3.exp.json b/testdata/d2ir/TestCompile/patterns/alixander-review/3.exp.json index 1defbbfb0..630ae91dc 100644 --- a/testdata/d2ir/TestCompile/patterns/alixander-review/3.exp.json +++ b/testdata/d2ir/TestCompile/patterns/alixander-review/3.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/alixander-review/3.d2,1:0:1-1:1:2", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "composite": { "fields": [ { - "name": "b", + "name": { + "range": "TestCompile/patterns/alixander-review/3.d2,3:4:8-3:5:9", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "references": [ { "string": { @@ -899,7 +915,15 @@ ] }, { - "name": "c", + "name": { + "range": "TestCompile/patterns/alixander-review/3.d2,3:9:13-3:10:14", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, "references": [ { "string": { @@ -1644,19 +1668,51 @@ ] }, { - "name": "layers", + "name": { + "range": "TestCompile/patterns/alixander-review/3.d2,5:0:16-5:6:22", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + }, "composite": { "fields": [ { - "name": "z", + "name": { + "range": "TestCompile/patterns/alixander-review/3.d2,6:2:28-6:3:29", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + }, "composite": { "fields": [ { - "name": "d", + "name": { + "range": "TestCompile/patterns/alixander-review/3.d2,7:4:37-7:5:38", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + }, "composite": { "fields": [ { - "name": "b", + "name": { + "range": "TestCompile/patterns/alixander-review/3.d2,3:4:8-3:5:9", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "references": [ { "string": { @@ -1760,31 +1816,6 @@ }, "key": { "range": "TestCompile/patterns/alixander-review/3.d2,3:0:4-3:10:14", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "z" - } - ] - } - } - ] - }, "edges": [ { "range": "TestCompile/patterns/alixander-review/3.d2,3:0:4-3:10:14", @@ -1951,31 +1982,6 @@ }, "key": { "range": "TestCompile/patterns/alixander-review/3.d2,3:0:4-3:10:14", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "z" - } - ] - } - } - ] - }, "edges": [ { "range": "TestCompile/patterns/alixander-review/3.d2,3:0:4-3:10:14", @@ -2434,7 +2440,15 @@ ] }, { - "name": "c", + "name": { + "range": "TestCompile/patterns/alixander-review/3.d2,3:9:13-3:10:14", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, "references": [ { "string": { @@ -2520,31 +2534,6 @@ }, "key": { "range": "TestCompile/patterns/alixander-review/3.d2,3:0:4-3:10:14", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "z" - } - ] - } - } - ] - }, "edges": [ { "range": "TestCompile/patterns/alixander-review/3.d2,3:0:4-3:10:14", @@ -2693,31 +2682,6 @@ }, "key": { "range": "TestCompile/patterns/alixander-review/3.d2,3:0:4-3:10:14", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "z" - } - ] - } - } - ] - }, "edges": [ { "range": "TestCompile/patterns/alixander-review/3.d2,3:0:4-3:10:14", @@ -2789,12 +2753,36 @@ { "edge_id": { "src_path": [ - "d", - "b" + { + "range": "TestCompile/patterns/alixander-review/3.d2,7:4:37-7:5:38", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + }, + { + "range": "TestCompile/patterns/alixander-review/3.d2,3:4:8-3:5:9", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } ], "src_arrow": false, "dst_path": [ - "c" + { + "range": "TestCompile/patterns/alixander-review/3.d2,3:9:13-3:10:14", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -2860,31 +2848,6 @@ }, "key": { "range": "TestCompile/patterns/alixander-review/3.d2,3:0:4-3:10:14", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "z" - } - ] - } - } - ] - }, "edges": [ { "range": "TestCompile/patterns/alixander-review/3.d2,3:0:4-3:10:14", @@ -3035,260 +2998,6 @@ }, "due_to_glob": false, "due_to_lazy_glob": false - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "z" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "z" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/alixander-review/3.d2,3:0:4-3:10:14", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "z" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/alixander-review/3.d2,3:0:4-3:10:14", - "src": { - "range": "TestCompile/patterns/alixander-review/3.d2,3:0:4-3:5:9", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/3.d2,3:0:4-3:3:7", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/3.d2,3:4:8-3:5:9", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/alixander-review/3.d2,3:9:13-3:10:14", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/3.d2,3:9:13-3:10:14", - "value": [ - { - "string": "c", - "raw_string": "c" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "z" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "z" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/alixander-review/3.d2,3:0:4-3:10:14", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "z" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/alixander-review/3.d2,3:0:4-3:10:14", - "src": { - "range": "TestCompile/patterns/alixander-review/3.d2,3:0:4-3:5:9", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/3.d2,3:0:4-3:3:7", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/3.d2,3:4:8-3:5:9", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/alixander-review/3.d2,3:9:13-3:10:14", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/3.d2,3:9:13-3:10:14", - "value": [ - { - "string": "c", - "raw_string": "c" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true } ] } @@ -3406,260 +3115,6 @@ }, "due_to_glob": false, "due_to_lazy_glob": false - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "z" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/alixander-review/3.d2,3:0:4-3:10:14", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "z" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/alixander-review/3.d2,3:0:4-3:10:14", - "src": { - "range": "TestCompile/patterns/alixander-review/3.d2,3:0:4-3:5:9", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/3.d2,3:0:4-3:3:7", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/3.d2,3:4:8-3:5:9", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/alixander-review/3.d2,3:9:13-3:10:14", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/3.d2,3:9:13-3:10:14", - "value": [ - { - "string": "c", - "raw_string": "c" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "z" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/alixander-review/3.d2,3:0:4-3:10:14", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "z" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/alixander-review/3.d2,3:0:4-3:10:14", - "src": { - "range": "TestCompile/patterns/alixander-review/3.d2,3:0:4-3:5:9", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/3.d2,3:0:4-3:3:7", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/3.d2,3:4:8-3:5:9", - "value": [ - { - "string": "b", - "raw_string": "b" - } - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/alixander-review/3.d2,3:9:13-3:10:14", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/3.d2,3:9:13-3:10:14", - "value": [ - { - "string": "c", - "raw_string": "c" - } - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "primary": {}, - "value": {} - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true } ] } @@ -3668,12 +3123,36 @@ { "edge_id": { "src_path": [ - "a", - "b" + { + "range": "TestCompile/patterns/alixander-review/3.d2,1:0:1-1:1:2", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, + { + "range": "TestCompile/patterns/alixander-review/3.d2,3:4:8-3:5:9", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } ], "src_arrow": false, "dst_path": [ - "c" + { + "range": "TestCompile/patterns/alixander-review/3.d2,3:9:13-3:10:14", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } ], "dst_arrow": true, "index": 0, diff --git a/testdata/d2ir/TestCompile/patterns/alixander-review/4.exp.json b/testdata/d2ir/TestCompile/patterns/alixander-review/4.exp.json index 3b9a8519e..7014f5396 100644 --- a/testdata/d2ir/TestCompile/patterns/alixander-review/4.exp.json +++ b/testdata/d2ir/TestCompile/patterns/alixander-review/4.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/alixander-review/4.d2,3:0:11-3:1:12", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "composite": { "fields": [ { - "name": "child", + "name": { + "range": "TestCompile/patterns/alixander-review/4.d2,1:3:4-1:8:9", + "value": [ + { + "string": "child", + "raw_string": "child" + } + ] + }, "references": [ { "string": { @@ -579,11 +595,27 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/patterns/alixander-review/4.d2,4:0:13-4:1:14", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "composite": { "fields": [ { - "name": "child", + "name": { + "range": "TestCompile/patterns/alixander-review/4.d2,1:3:4-1:8:9", + "value": [ + { + "string": "child", + "raw_string": "child" + } + ] + }, "references": [ { "string": { @@ -987,11 +1019,27 @@ ] }, { - "name": "c", + "name": { + "range": "TestCompile/patterns/alixander-review/4.d2,5:0:15-5:1:16", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, "composite": { "fields": [ { - "name": "child", + "name": { + "range": "TestCompile/patterns/alixander-review/4.d2,1:3:4-1:8:9", + "value": [ + { + "string": "child", + "raw_string": "child" + } + ] + }, "references": [ { "string": { diff --git a/testdata/d2ir/TestCompile/patterns/alixander-review/5.exp.json b/testdata/d2ir/TestCompile/patterns/alixander-review/5.exp.json index a23a2b133..4a7609d4e 100644 --- a/testdata/d2ir/TestCompile/patterns/alixander-review/5.exp.json +++ b/testdata/d2ir/TestCompile/patterns/alixander-review/5.exp.json @@ -1,23 +1,63 @@ { "fields": [ { - "name": "scenarios", + "name": { + "range": "TestCompile/patterns/alixander-review/5.d2,3:0:21-3:9:30", + "value": [ + { + "string": "scenarios", + "raw_string": "scenarios" + } + ] + }, "composite": { "fields": [ { - "name": "b", + "name": { + "range": "TestCompile/patterns/alixander-review/5.d2,4:2:36-4:3:37", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "composite": { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/alixander-review/5.d2,5:4:45-5:5:46", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/alixander-review/5.d2,1:15:16-1:18:19", @@ -30,280 +70,6 @@ } }, "references": [ - { - "string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", - "value": [ - { - "string": "**", - "raw_string": "**" - } - ], - "pattern": [ - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:18:19", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", - "value": [ - { - "string": "**", - "raw_string": "**" - } - ], - "pattern": [ - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:15:16-1:18:19", - "value": [ - { - "string": "red", - "raw_string": "red" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - }, - "key_path": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:13:14", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", - "value": [ - { - "string": "**", - "raw_string": "**" - } - ], - "pattern": [ - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:18:19", - "key": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:13:14", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", - "value": [ - { - "string": "**", - "raw_string": "**" - } - ], - "pattern": [ - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:15:16-1:18:19", - "value": [ - { - "string": "red", - "raw_string": "red" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, { "string": { "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", @@ -438,28 +204,8 @@ ] }, "key_path": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:13:14", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", @@ -505,28 +251,8 @@ "key": { "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:18:19", "key": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:13:14", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", @@ -595,28 +321,8 @@ ] }, "key_path": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:13:14", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", @@ -662,28 +368,8 @@ "key": { "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:18:19", "key": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:13:14", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", @@ -752,28 +438,8 @@ ] }, "key_path": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:13:14", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", @@ -819,28 +485,8 @@ "key": { "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:18:19", "key": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:13:14", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", @@ -909,28 +555,8 @@ ] }, "key_path": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:13:14", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", @@ -976,28 +602,476 @@ "key": { "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:18:19", "key": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:13:14", "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", "value": [ { - "string": "scenarios" + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", + "value": [ + { + "string": "style", + "raw_string": "style" } ] } }, { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", "value": [ { - "string": "b" + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:15:16-1:18:19", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + }, + "due_to_glob": true, + "due_to_lazy_glob": true + }, + { + "string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:13:14", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:18:19", + "key": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:13:14", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", + "value": [ + { + "string": "style", + "raw_string": "style" } ] } }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:15:16-1:18:19", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + }, + "due_to_glob": true, + "due_to_lazy_glob": true + }, + { + "string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:13:14", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:18:19", + "key": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:13:14", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:15:16-1:18:19", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + }, + "due_to_glob": true, + "due_to_lazy_glob": true + }, + { + "string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:13:14", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:18:19", + "key": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:13:14", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:15:16-1:18:19", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + }, + "due_to_glob": true, + "due_to_lazy_glob": true + }, + { + "string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:13:14", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:18:19", + "key": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:13:14", + "path": [ { "unquoted_string": { "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", @@ -1410,15 +1484,39 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/patterns/alixander-review/5.d2,5:9:50-5:10:51", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/alixander-review/5.d2,1:15:16-1:18:19", @@ -1431,280 +1529,6 @@ } }, "references": [ - { - "string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", - "value": [ - { - "string": "**", - "raw_string": "**" - } - ], - "pattern": [ - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:18:19", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", - "value": [ - { - "string": "**", - "raw_string": "**" - } - ], - "pattern": [ - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:15:16-1:18:19", - "value": [ - { - "string": "red", - "raw_string": "red" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - }, - "key_path": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:13:14", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", - "value": [ - { - "string": "**", - "raw_string": "**" - } - ], - "pattern": [ - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:18:19", - "key": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:13:14", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", - "value": [ - { - "string": "**", - "raw_string": "**" - } - ], - "pattern": [ - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:15:16-1:18:19", - "value": [ - { - "string": "red", - "raw_string": "red" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, { "string": { "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", @@ -1839,28 +1663,8 @@ ] }, "key_path": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:13:14", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", @@ -1906,28 +1710,8 @@ "key": { "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:18:19", "key": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:13:14", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", @@ -1996,28 +1780,8 @@ ] }, "key_path": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:13:14", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", @@ -2063,28 +1827,8 @@ "key": { "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:18:19", "key": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:13:14", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", @@ -2153,28 +1897,8 @@ ] }, "key_path": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:13:14", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", @@ -2220,28 +1944,359 @@ "key": { "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:18:19", "key": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:13:14", "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", "value": [ { - "string": "scenarios" + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", + "value": [ + { + "string": "style", + "raw_string": "style" } ] } }, { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", "value": [ { - "string": "b" + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:15:16-1:18:19", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + }, + "due_to_glob": true, + "due_to_lazy_glob": true + }, + { + "string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:13:14", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:18:19", + "key": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:13:14", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", + "value": [ + { + "string": "style", + "raw_string": "style" } ] } }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:15:16-1:18:19", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + }, + "due_to_glob": true, + "due_to_lazy_glob": true + }, + { + "string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:13:14", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:18:19", + "key": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:13:14", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:15:16-1:18:19", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + }, + "due_to_glob": true, + "due_to_lazy_glob": true + }, + { + "string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:13:14", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", + "value": [ + { + "string": "**", + "raw_string": "**" + } + ], + "pattern": [ + "*", + "", + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:18:19", + "key": { + "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:13:14", + "path": [ { "unquoted_string": { "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", @@ -2658,11 +2713,27 @@ { "edge_id": { "src_path": [ - "a" + { + "range": "TestCompile/patterns/alixander-review/5.d2,5:4:45-5:5:46", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } ], "src_arrow": false, "dst_path": [ - "b" + { + "range": "TestCompile/patterns/alixander-review/5.d2,5:9:50-5:10:51", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -2865,630 +2936,6 @@ }, "due_to_glob": false, "due_to_lazy_glob": false - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", - "value": [ - { - "string": "**", - "raw_string": "**" - } - ], - "pattern": [ - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:18:19", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", - "value": [ - { - "string": "**", - "raw_string": "**" - } - ], - "pattern": [ - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:15:16-1:18:19", - "value": [ - { - "string": "red", - "raw_string": "red" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", - "value": [ - { - "string": "**", - "raw_string": "**" - } - ], - "pattern": [ - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:18:19", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", - "value": [ - { - "string": "**", - "raw_string": "**" - } - ], - "pattern": [ - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:15:16-1:18:19", - "value": [ - { - "string": "red", - "raw_string": "red" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", - "value": [ - { - "string": "**", - "raw_string": "**" - } - ], - "pattern": [ - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:18:19", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", - "value": [ - { - "string": "**", - "raw_string": "**" - } - ], - "pattern": [ - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:15:16-1:18:19", - "value": [ - { - "string": "red", - "raw_string": "red" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", - "value": [ - { - "string": "**", - "raw_string": "**" - } - ], - "pattern": [ - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:18:19", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", - "value": [ - { - "string": "**", - "raw_string": "**" - } - ], - "pattern": [ - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:15:16-1:18:19", - "value": [ - { - "string": "red", - "raw_string": "red" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true } ] } @@ -3629,630 +3076,6 @@ }, "due_to_glob": false, "due_to_lazy_glob": false - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", - "value": [ - { - "string": "**", - "raw_string": "**" - } - ], - "pattern": [ - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:18:19", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", - "value": [ - { - "string": "**", - "raw_string": "**" - } - ], - "pattern": [ - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:15:16-1:18:19", - "value": [ - { - "string": "red", - "raw_string": "red" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", - "value": [ - { - "string": "**", - "raw_string": "**" - } - ], - "pattern": [ - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:18:19", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", - "value": [ - { - "string": "**", - "raw_string": "**" - } - ], - "pattern": [ - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:15:16-1:18:19", - "value": [ - { - "string": "red", - "raw_string": "red" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", - "value": [ - { - "string": "**", - "raw_string": "**" - } - ], - "pattern": [ - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:18:19", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", - "value": [ - { - "string": "**", - "raw_string": "**" - } - ], - "pattern": [ - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:15:16-1:18:19", - "value": [ - { - "string": "red", - "raw_string": "red" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", - "value": [ - { - "string": "**", - "raw_string": "**" - } - ], - "pattern": [ - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:18:19", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:0:1-1:2:3", - "value": [ - { - "string": "**", - "raw_string": "**" - } - ], - "pattern": [ - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:3:4-1:8:9", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:9:10-1:13:14", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/alixander-review/5.d2,1:15:16-1:18:19", - "value": [ - { - "string": "red", - "raw_string": "red" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true } ] } diff --git a/testdata/d2ir/TestCompile/patterns/alixander-review/6.exp.json b/testdata/d2ir/TestCompile/patterns/alixander-review/6.exp.json index de8c8b7c4..e4ee83a08 100644 --- a/testdata/d2ir/TestCompile/patterns/alixander-review/6.exp.json +++ b/testdata/d2ir/TestCompile/patterns/alixander-review/6.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/patterns/alixander-review/6.d2,3:0:33-3:1:34", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -240,7 +248,15 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/patterns/alixander-review/6.d2,3:5:38-3:6:39", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -483,11 +499,27 @@ { "edge_id": { "src_path": [ - "x" + { + "range": "TestCompile/patterns/alixander-review/6.d2,3:0:33-3:1:34", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } ], "src_arrow": false, "dst_path": [ - "y" + { + "range": "TestCompile/patterns/alixander-review/6.d2,3:5:38-3:6:39", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -507,11 +539,27 @@ "map": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/alixander-review/6.d2,1:12:13-1:17:18", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/patterns/alixander-review/6.d2,1:18:19-1:25:26", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/alixander-review/6.d2,1:27:28-1:30:31", @@ -1117,11 +1165,27 @@ { "edge_id": { "src_path": [ - "x" + { + "range": "TestCompile/patterns/alixander-review/6.d2,3:0:33-3:1:34", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } ], "src_arrow": false, "dst_path": [ - "y" + { + "range": "TestCompile/patterns/alixander-review/6.d2,3:5:38-3:6:39", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } ], "dst_arrow": true, "index": 1, @@ -1130,11 +1194,27 @@ "map": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/alixander-review/6.d2,1:12:13-1:17:18", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/patterns/alixander-review/6.d2,1:18:19-1:25:26", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/alixander-review/6.d2,1:27:28-1:30:31", diff --git a/testdata/d2ir/TestCompile/patterns/alixander-review/7.exp.json b/testdata/d2ir/TestCompile/patterns/alixander-review/7.exp.json index f10e20827..33c4e7195 100644 --- a/testdata/d2ir/TestCompile/patterns/alixander-review/7.exp.json +++ b/testdata/d2ir/TestCompile/patterns/alixander-review/7.exp.json @@ -1,15 +1,39 @@ { "fields": [ { - "name": "table", + "name": { + "range": "TestCompile/patterns/alixander-review/7.d2,8:0:53-8:5:58", + "value": [ + { + "string": "table", + "raw_string": "table" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/alixander-review/7.d2,2:2:8-2:7:13", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/alixander-review/7.d2,2:8:14-2:12:18", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/alixander-review/7.d2,9:14:76-9:18:80", @@ -541,7 +565,15 @@ ] }, { - "name": "shape", + "name": { + "range": "TestCompile/patterns/alixander-review/7.d2,10:2:83-10:7:88", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/alixander-review/7.d2,10:9:90-10:18:99", @@ -620,7 +652,15 @@ ] }, { - "name": "a", + "name": { + "range": "TestCompile/patterns/alixander-review/7.d2,11:2:102-11:3:103", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/alixander-review/7.d2,11:5:105-11:6:106", @@ -635,11 +675,27 @@ "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/alixander-review/7.d2,5:2:34-5:7:39", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/alixander-review/7.d2,5:8:40-5:12:44", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/alixander-review/7.d2,5:14:46-5:17:49", diff --git a/testdata/d2ir/TestCompile/patterns/alixander-review/8.exp.json b/testdata/d2ir/TestCompile/patterns/alixander-review/8.exp.json index 8beb437d0..ff3df8a4b 100644 --- a/testdata/d2ir/TestCompile/patterns/alixander-review/8.exp.json +++ b/testdata/d2ir/TestCompile/patterns/alixander-review/8.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "b", + "name": { + "range": "TestCompile/patterns/alixander-review/8.d2,4:0:62-4:1:63", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "references": [ { "string": { @@ -118,7 +126,15 @@ ] }, { - "name": "c", + "name": { + "range": "TestCompile/patterns/alixander-review/8.d2,4:5:67-4:6:68", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, "references": [ { "string": { @@ -239,11 +255,27 @@ { "edge_id": { "src_path": [ - "b" + { + "range": "TestCompile/patterns/alixander-review/8.d2,4:0:62-4:1:63", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } ], "src_arrow": false, "dst_path": [ - "c" + { + "range": "TestCompile/patterns/alixander-review/8.d2,4:5:67-4:6:68", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -252,11 +284,27 @@ "map": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:12:43-2:17:48", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "stroke", + "name": { + "range": "TestCompile/patterns/alixander-review/8.d2,2:18:49-2:24:55", + "value": [ + { + "string": "stroke", + "raw_string": "stroke" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/alixander-review/8.d2,2:26:57-2:29:60", diff --git a/testdata/d2ir/TestCompile/patterns/case/1.exp.json b/testdata/d2ir/TestCompile/patterns/case/1.exp.json index 5d27f6319..bf15513f5 100644 --- a/testdata/d2ir/TestCompile/patterns/case/1.exp.json +++ b/testdata/d2ir/TestCompile/patterns/case/1.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "animal", + "name": { + "range": "TestCompile/patterns/case/1.d2,0:0:0-0:6:6", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/case/1.d2,2:4:29-2:11:36", @@ -80,7 +88,15 @@ ] }, { - "name": "action", + "name": { + "range": "TestCompile/patterns/case/1.d2,1:0:13-1:6:19", + "value": [ + { + "string": "action", + "raw_string": "action" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/case/1.d2,2:4:29-2:11:36", diff --git a/testdata/d2ir/TestCompile/patterns/case/2.exp.json b/testdata/d2ir/TestCompile/patterns/case/2.exp.json index c0331792b..7ba09d8c0 100644 --- a/testdata/d2ir/TestCompile/patterns/case/2.exp.json +++ b/testdata/d2ir/TestCompile/patterns/case/2.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "diddy kong", + "name": { + "range": "TestCompile/patterns/case/2.d2,0:0:0-0:10:10", + "value": [ + { + "string": "diddy kong", + "raw_string": "diddy kong" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/case/2.d2,2:7:30-2:10:33", @@ -70,7 +78,15 @@ ] }, { - "name": "Donkey Kong", + "name": { + "range": "TestCompile/patterns/case/2.d2,1:0:11-1:11:22", + "value": [ + { + "string": "Donkey Kong", + "raw_string": "Donkey Kong" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/case/2.d2,2:7:30-2:10:33", diff --git a/testdata/d2ir/TestCompile/patterns/double-glob/1.exp.json b/testdata/d2ir/TestCompile/patterns/double-glob/1.exp.json index 5c880b983..da8744885 100644 --- a/testdata/d2ir/TestCompile/patterns/double-glob/1.exp.json +++ b/testdata/d2ir/TestCompile/patterns/double-glob/1.exp.json @@ -1,19 +1,51 @@ { "fields": [ { - "name": "shared", + "name": { + "range": "TestCompile/patterns/double-glob/1.d2,0:0:0-0:6:6", + "value": [ + { + "string": "shared", + "raw_string": "shared" + } + ] + }, "composite": { "fields": [ { - "name": "animate", + "name": { + "range": "TestCompile/patterns/double-glob/1.d2,0:7:7-0:14:14", + "value": [ + { + "string": "animate", + "raw_string": "animate" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/double-glob/1.d2,2:3:32-2:8:37", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/double-glob/1.d2,2:9:38-2:13:42", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/double-glob/1.d2,2:15:44-2:18:47", @@ -350,15 +382,39 @@ ] }, { - "name": "animal", + "name": { + "range": "TestCompile/patterns/double-glob/1.d2,1:7:22-1:13:28", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/double-glob/1.d2,2:3:32-2:8:37", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/double-glob/1.d2,2:9:38-2:13:42", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/double-glob/1.d2,2:15:44-2:18:47", @@ -695,11 +751,27 @@ ] }, { - "name": "style", + "name": { + "range": "TestCompile/patterns/double-glob/1.d2,2:3:32-2:8:37", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/double-glob/1.d2,2:9:38-2:13:42", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/double-glob/1.d2,2:15:44-2:18:47", diff --git a/testdata/d2ir/TestCompile/patterns/double-glob/defaults.exp.json b/testdata/d2ir/TestCompile/patterns/double-glob/defaults.exp.json index e0c116c32..59ed40c44 100644 --- a/testdata/d2ir/TestCompile/patterns/double-glob/defaults.exp.json +++ b/testdata/d2ir/TestCompile/patterns/double-glob/defaults.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/double-glob/defaults.d2,4:0:22-4:1:23", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/double-glob/defaults.d2,1:8:14-1:12:18", @@ -143,11 +159,27 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/patterns/double-glob/defaults.d2,5:0:24-5:1:25", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/double-glob/defaults.d2,1:8:14-1:12:18", @@ -285,11 +317,27 @@ ] }, { - "name": "c", + "name": { + "range": "TestCompile/patterns/double-glob/defaults.d2,6:0:26-6:1:27", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/double-glob/defaults.d2,1:8:14-1:12:18", @@ -427,11 +475,27 @@ ] }, { - "name": "d", + "name": { + "range": "TestCompile/patterns/double-glob/defaults.d2,7:0:28-7:1:29", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/double-glob/defaults.d2,1:8:14-1:12:18", @@ -569,19 +633,51 @@ ] }, { - "name": "scenarios", + "name": { + "range": "TestCompile/patterns/double-glob/defaults.d2,9:0:31-9:9:40", + "value": [ + { + "string": "scenarios", + "raw_string": "scenarios" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/patterns/double-glob/defaults.d2,9:10:41-9:11:42", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/double-glob/defaults.d2,4:0:22-4:1:23", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/double-glob/defaults.d2,1:8:14-1:12:18", @@ -594,6 +690,69 @@ } }, "references": [ + { + "string": { + "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:12:18", + "key": { + "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/defaults.d2,1:8:14-1:12:18", + "value": [ + { + "string": "page", + "raw_string": "page" + } + ] + } + } + } + }, + "due_to_glob": true, + "due_to_lazy_glob": true + }, { "string": { "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", @@ -719,11 +878,27 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/patterns/double-glob/defaults.d2,5:0:24-5:1:25", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/double-glob/defaults.d2,1:8:14-1:12:18", @@ -736,6 +911,69 @@ } }, "references": [ + { + "string": { + "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:12:18", + "key": { + "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/defaults.d2,1:8:14-1:12:18", + "value": [ + { + "string": "page", + "raw_string": "page" + } + ] + } + } + } + }, + "due_to_glob": true, + "due_to_lazy_glob": true + }, { "string": { "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", @@ -861,11 +1099,27 @@ ] }, { - "name": "c", + "name": { + "range": "TestCompile/patterns/double-glob/defaults.d2,6:0:26-6:1:27", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/double-glob/defaults.d2,1:8:14-1:12:18", @@ -878,6 +1132,69 @@ } }, "references": [ + { + "string": { + "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:12:18", + "key": { + "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/defaults.d2,1:8:14-1:12:18", + "value": [ + { + "string": "page", + "raw_string": "page" + } + ] + } + } + } + }, + "due_to_glob": true, + "due_to_lazy_glob": true + }, { "string": { "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", @@ -1003,11 +1320,27 @@ ] }, { - "name": "d", + "name": { + "range": "TestCompile/patterns/double-glob/defaults.d2,7:0:28-7:1:29", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/double-glob/defaults.d2,1:8:14-1:12:18", @@ -1020,6 +1353,69 @@ } }, "references": [ + { + "string": { + "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:12:18", + "key": { + "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/double-glob/defaults.d2,1:8:14-1:12:18", + "value": [ + { + "string": "page", + "raw_string": "page" + } + ] + } + } + } + }, + "due_to_glob": true, + "due_to_lazy_glob": true + }, { "string": { "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", @@ -1145,11 +1541,27 @@ ] }, { - "name": "p", + "name": { + "range": "TestCompile/patterns/double-glob/defaults.d2,9:15:46-9:16:47", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/double-glob/defaults.d2,1:8:14-1:12:18", @@ -1162,69 +1574,6 @@ } }, "references": [ - { - "string": { - "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - }, - "key_path": { - "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:12:18", - "key": { - "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/double-glob/defaults.d2,1:8:14-1:12:18", - "value": [ - { - "string": "page", - "raw_string": "page" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, { "string": { "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", @@ -1456,288 +1805,6 @@ }, "due_to_glob": false, "due_to_lazy_glob": false - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/double-glob/defaults.d2,0:0:0-0:2:2", - "value": [ - { - "string": "**", - "raw_string": "**" - } - ], - "pattern": [ - "*", - "", - "*" - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/double-glob/defaults.d2,0:0:0-2:1:20", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/double-glob/defaults.d2,0:0:0-0:2:2", - "value": [ - { - "string": "**", - "raw_string": "**" - } - ], - "pattern": [ - "*", - "", - "*" - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/patterns/double-glob/defaults.d2,0:4:4-2:1:20", - "nodes": [ - { - "map_key": { - "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:12:18", - "key": { - "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/double-glob/defaults.d2,1:8:14-1:12:18", - "value": [ - { - "string": "page", - "raw_string": "page" - } - ] - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/double-glob/defaults.d2,0:0:0-0:2:2", - "value": [ - { - "string": "**", - "raw_string": "**" - } - ], - "pattern": [ - "*", - "", - "*" - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/double-glob/defaults.d2,0:0:0-2:1:20", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/double-glob/defaults.d2,0:0:0-0:2:2", - "value": [ - { - "string": "**", - "raw_string": "**" - } - ], - "pattern": [ - "*", - "", - "*" - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/patterns/double-glob/defaults.d2,0:4:4-2:1:20", - "nodes": [ - { - "map_key": { - "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:12:18", - "key": { - "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/double-glob/defaults.d2,1:8:14-1:12:18", - "value": [ - { - "string": "page", - "raw_string": "page" - } - ] - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true } ] } @@ -1848,301 +1915,43 @@ }, "due_to_glob": false, "due_to_lazy_glob": false - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/double-glob/defaults.d2,0:0:0-0:2:2", - "value": [ - { - "string": "**", - "raw_string": "**" - } - ], - "pattern": [ - "*", - "", - "*" - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/double-glob/defaults.d2,0:0:0-2:1:20", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/double-glob/defaults.d2,0:0:0-0:2:2", - "value": [ - { - "string": "**", - "raw_string": "**" - } - ], - "pattern": [ - "*", - "", - "*" - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/patterns/double-glob/defaults.d2,0:4:4-2:1:20", - "nodes": [ - { - "map_key": { - "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:12:18", - "key": { - "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/double-glob/defaults.d2,1:8:14-1:12:18", - "value": [ - { - "string": "page", - "raw_string": "page" - } - ] - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/double-glob/defaults.d2,0:0:0-0:2:2", - "value": [ - { - "string": "**", - "raw_string": "**" - } - ], - "pattern": [ - "*", - "", - "*" - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/double-glob/defaults.d2,0:0:0-2:1:20", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/double-glob/defaults.d2,0:0:0-0:2:2", - "value": [ - { - "string": "**", - "raw_string": "**" - } - ], - "pattern": [ - "*", - "", - "*" - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/patterns/double-glob/defaults.d2,0:4:4-2:1:20", - "nodes": [ - { - "map_key": { - "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:12:18", - "key": { - "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/double-glob/defaults.d2,1:1:7-1:6:12", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/double-glob/defaults.d2,1:8:14-1:12:18", - "value": [ - { - "string": "page", - "raw_string": "page" - } - ] - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true } ] }, { - "name": "layers", + "name": { + "range": "TestCompile/patterns/double-glob/defaults.d2,10:0:50-10:6:56", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/patterns/double-glob/defaults.d2,10:7:57-10:8:58", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "p", + "name": { + "range": "TestCompile/patterns/double-glob/defaults.d2,10:12:62-10:13:63", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + }, "references": [ { "string": { diff --git a/testdata/d2ir/TestCompile/patterns/double-glob/edge-no-container.exp.json b/testdata/d2ir/TestCompile/patterns/double-glob/edge-no-container.exp.json index 280e2698a..a43d04e43 100644 --- a/testdata/d2ir/TestCompile/patterns/double-glob/edge-no-container.exp.json +++ b/testdata/d2ir/TestCompile/patterns/double-glob/edge-no-container.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "zone A", + "name": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,0:0:0-0:6:6", + "value": [ + { + "string": "zone A", + "raw_string": "zone A" + } + ] + }, "composite": { "fields": [ { - "name": "machine A", + "name": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,1:1:11-1:10:20", + "value": [ + { + "string": "machine A", + "raw_string": "machine A" + } + ] + }, "references": [ { "string": { @@ -63,11 +79,27 @@ ] }, { - "name": "machine B", + "name": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,2:1:22-2:10:31", + "value": [ + { + "string": "machine B", + "raw_string": "machine B" + } + ] + }, "composite": { "fields": [ { - "name": "submachine A", + "name": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,3:2:37-3:14:49", + "value": [ + { + "string": "submachine A", + "raw_string": "submachine A" + } + ] + }, "references": [ { "string": { @@ -125,7 +157,15 @@ ] }, { - "name": "submachine B", + "name": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,4:2:52-4:14:64", + "value": [ + { + "string": "submachine B", + "raw_string": "submachine B" + } + ] + }, "references": [ { "string": { @@ -617,7 +657,15 @@ ] }, { - "name": "load balancer", + "name": { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:13:83-7:26:96", + "value": [ + { + "string": "load balancer", + "raw_string": "load balancer" + } + ] + }, "references": [ { "string": { @@ -770,12 +818,36 @@ { "edge_id": { "src_path": [ - "zone A", - "machine A" + { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,0:0:0-0:6:6", + "value": [ + { + "string": "zone A", + "raw_string": "zone A" + } + ] + }, + { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,1:1:11-1:10:20", + "value": [ + { + "string": "machine A", + "raw_string": "machine A" + } + ] + } ], "src_arrow": false, "dst_path": [ - "load balancer" + { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:13:83-7:26:96", + "value": [ + { + "string": "load balancer", + "raw_string": "load balancer" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -906,13 +978,45 @@ { "edge_id": { "src_path": [ - "zone A", - "machine B", - "submachine A" + { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,0:0:0-0:6:6", + "value": [ + { + "string": "zone A", + "raw_string": "zone A" + } + ] + }, + { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,2:1:22-2:10:31", + "value": [ + { + "string": "machine B", + "raw_string": "machine B" + } + ] + }, + { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,3:2:37-3:14:49", + "value": [ + { + "string": "submachine A", + "raw_string": "submachine A" + } + ] + } ], "src_arrow": false, "dst_path": [ - "load balancer" + { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:13:83-7:26:96", + "value": [ + { + "string": "load balancer", + "raw_string": "load balancer" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -1043,13 +1147,45 @@ { "edge_id": { "src_path": [ - "zone A", - "machine B", - "submachine B" + { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,0:0:0-0:6:6", + "value": [ + { + "string": "zone A", + "raw_string": "zone A" + } + ] + }, + { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,2:1:22-2:10:31", + "value": [ + { + "string": "machine B", + "raw_string": "machine B" + } + ] + }, + { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,4:2:52-4:14:64", + "value": [ + { + "string": "submachine B", + "raw_string": "submachine B" + } + ] + } ], "src_arrow": false, "dst_path": [ - "load balancer" + { + "range": "TestCompile/patterns/double-glob/edge-no-container.d2,7:13:83-7:26:96", + "value": [ + { + "string": "load balancer", + "raw_string": "load balancer" + } + ] + } ], "dst_arrow": true, "index": 0, diff --git a/testdata/d2ir/TestCompile/patterns/double-glob/edge/1.exp.json b/testdata/d2ir/TestCompile/patterns/double-glob/edge/1.exp.json index 1aec90b3b..a4a865b93 100644 --- a/testdata/d2ir/TestCompile/patterns/double-glob/edge/1.exp.json +++ b/testdata/d2ir/TestCompile/patterns/double-glob/edge/1.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "fast", + "name": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,0:0:0-0:4:4", + "value": [ + { + "string": "fast", + "raw_string": "fast" + } + ] + }, "composite": { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,1:2:10-1:3:11", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "references": [ { "string": { @@ -63,7 +79,15 @@ ] }, { - "name": "far", + "name": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,2:2:14-2:5:17", + "value": [ + { + "string": "far", + "raw_string": "far" + } + ] + }, "references": [ { "string": { @@ -376,11 +400,27 @@ ] }, { - "name": "task", + "name": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,5:0:21-5:4:25", + "value": [ + { + "string": "task", + "raw_string": "task" + } + ] + }, "composite": { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/double-glob/edge/1.d2,6:2:31-6:3:32", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "references": [ { "string": { @@ -690,12 +730,36 @@ { "edge_id": { "src_path": [ - "task", - "a" + { + "range": "TestCompile/patterns/double-glob/edge/1.d2,5:0:21-5:4:25", + "value": [ + { + "string": "task", + "raw_string": "task" + } + ] + }, + { + "range": "TestCompile/patterns/double-glob/edge/1.d2,6:2:31-6:3:32", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } ], "src_arrow": false, "dst_path": [ - "fast" + { + "range": "TestCompile/patterns/double-glob/edge/1.d2,0:0:0-0:4:4", + "value": [ + { + "string": "fast", + "raw_string": "fast" + } + ] + } ], "dst_arrow": true, "index": 0, diff --git a/testdata/d2ir/TestCompile/patterns/double-glob/edge/2.exp.json b/testdata/d2ir/TestCompile/patterns/double-glob/edge/2.exp.json index 694a4faf2..b076a2afb 100644 --- a/testdata/d2ir/TestCompile/patterns/double-glob/edge/2.exp.json +++ b/testdata/d2ir/TestCompile/patterns/double-glob/edge/2.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "composite": { "fields": [ { - "name": "b", + "name": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:3:6-2:4:7", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "references": [ { "string": { @@ -229,7 +245,15 @@ ] }, { - "name": "c", + "name": { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:8:11-2:9:12", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, "references": [ { "string": { @@ -382,12 +406,36 @@ { "edge_id": { "src_path": [ - "a", - "b" + { + "range": "TestCompile/patterns/double-glob/edge/2.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, + { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:3:6-2:4:7", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } ], "src_arrow": false, "dst_path": [ - "c" + { + "range": "TestCompile/patterns/double-glob/edge/2.d2,2:8:11-2:9:12", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } ], "dst_arrow": true, "index": 0, diff --git a/testdata/d2ir/TestCompile/patterns/edge-glob-index.exp.json b/testdata/d2ir/TestCompile/patterns/edge-glob-index.exp.json index c35f511d5..b19cf8189 100644 --- a/testdata/d2ir/TestCompile/patterns/edge-glob-index.exp.json +++ b/testdata/d2ir/TestCompile/patterns/edge-glob-index.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "references": [ { "string": { @@ -804,7 +812,15 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "references": [ { "string": { @@ -1611,11 +1627,27 @@ { "edge_id": { "src_path": [ - "a" + { + "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } ], "src_arrow": false, "dst_path": [ - "b" + { + "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -1624,11 +1656,27 @@ "map": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:17:38", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:18:39-3:22:43", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/edge-glob-index.d2,3:24:45-3:27:48", @@ -2204,11 +2252,27 @@ { "edge_id": { "src_path": [ - "a" + { + "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } ], "src_arrow": false, "dst_path": [ - "b" + { + "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } ], "dst_arrow": true, "index": 1, @@ -2217,11 +2281,27 @@ "map": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:17:38", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:18:39-3:22:43", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/edge-glob-index.d2,3:24:45-3:27:48", @@ -2797,11 +2877,27 @@ { "edge_id": { "src_path": [ - "a" + { + "range": "TestCompile/patterns/edge-glob-index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } ], "src_arrow": false, "dst_path": [ - "b" + { + "range": "TestCompile/patterns/edge-glob-index.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } ], "dst_arrow": true, "index": 2, @@ -2810,11 +2906,27 @@ "map": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:12:33-3:17:38", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/edge-glob-index.d2,3:18:39-3:22:43", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/edge-glob-index.d2,3:24:45-3:27:48", diff --git a/testdata/d2ir/TestCompile/patterns/edge-glob-null.exp.json b/testdata/d2ir/TestCompile/patterns/edge-glob-null.exp.json index a61325deb..7a8ed01c5 100644 --- a/testdata/d2ir/TestCompile/patterns/edge-glob-null.exp.json +++ b/testdata/d2ir/TestCompile/patterns/edge-glob-null.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/edge-glob-null.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "references": [ { "string": { @@ -118,7 +126,15 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/patterns/edge-glob-null.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "references": [ { "string": { @@ -235,7 +251,15 @@ ] }, { - "name": "x", + "name": { + "range": "TestCompile/patterns/edge-glob-null.d2,2:0:25-2:1:26", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -352,7 +376,15 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/patterns/edge-glob-null.d2,2:5:30-2:6:31", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { diff --git a/testdata/d2ir/TestCompile/patterns/edge-glob-style-inherit/1.exp.json b/testdata/d2ir/TestCompile/patterns/edge-glob-style-inherit/1.exp.json index b78377170..235f784df 100644 --- a/testdata/d2ir/TestCompile/patterns/edge-glob-style-inherit/1.exp.json +++ b/testdata/d2ir/TestCompile/patterns/edge-glob-style-inherit/1.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,1:0:29-1:1:30", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -164,7 +172,15 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,1:5:34-1:6:35", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -327,15 +343,39 @@ ] }, { - "name": "scenarios", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,5:0:61-5:9:70", + "value": [ + { + "string": "scenarios", + "raw_string": "scenarios" + } + ] + }, "composite": { "fields": [ { - "name": "1", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,6:2:76-6:3:77", + "value": [ + { + "string": "1", + "raw_string": "1" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,1:0:29-1:1:30", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -551,7 +591,15 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,1:5:34-1:6:35", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -712,828 +760,33 @@ "due_to_lazy_glob": false } ] - }, - { - "name": "style", - "composite": { - "fields": [ - { - "name": "opacity", - "composite": { - "fields": null, - "edges": null - }, - "references": [ - { - "string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:18:18-0:25:25", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:12:12-0:17:17", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:18:18-0:25:25", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:0:0-0:28:28", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:12:12-0:17:17", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:18:18-0:25:25", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:1:1-0:7:7", - "src": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:1:1-0:2:2", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:1:1-0:2:2", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:6:6-0:7:7", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:6:6-0:7:7", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:8:8-0:11:11", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:12:12-0:25:25", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:12:12-0:17:17", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:18:18-0:25:25", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:27:27-0:28:28", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:18:18-0:25:25", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:12:12-0:17:17", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:18:18-0:25:25", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:0:0-0:28:28", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:12:12-0:17:17", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:18:18-0:25:25", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:1:1-0:7:7", - "src": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:1:1-0:2:2", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:1:1-0:2:2", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:6:6-0:7:7", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:6:6-0:7:7", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:8:8-0:11:11", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:12:12-0:25:25", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:12:12-0:17:17", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:18:18-0:25:25", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:27:27-0:28:28", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - } - ] - } - ], - "edges": null - }, - "references": [ - { - "string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:12:12-0:17:17", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:12:12-0:17:17", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:18:18-0:25:25", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:0:0-0:28:28", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:12:12-0:17:17", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:18:18-0:25:25", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:1:1-0:7:7", - "src": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:1:1-0:2:2", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:1:1-0:2:2", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:6:6-0:7:7", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:6:6-0:7:7", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:8:8-0:11:11", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:12:12-0:25:25", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:12:12-0:17:17", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:18:18-0:25:25", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:27:27-0:28:28", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:12:12-0:17:17", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:12:12-0:17:17", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:18:18-0:25:25", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:0:0-0:28:28", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:12:12-0:17:17", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:18:18-0:25:25", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:1:1-0:7:7", - "src": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:1:1-0:2:2", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:1:1-0:2:2", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:6:6-0:7:7", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:6:6-0:7:7", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:8:8-0:11:11", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:12:12-0:25:25", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:12:12-0:17:17", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:18:18-0:25:25", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:27:27-0:28:28", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - } - ] } ], "edges": [ { "edge_id": { "src_path": [ - "x" + { + "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,1:0:29-1:1:30", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } ], "src_arrow": false, "dst_path": [ - "y" + { + "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,1:5:34-1:6:35", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -1542,11 +795,27 @@ "map": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:12:12-0:17:17", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:18:18-0:25:25", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,2:17:56-2:18:57", @@ -2431,400 +1700,6 @@ }, "due_to_glob": false, "due_to_lazy_glob": false - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:12:12-0:17:17", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:18:18-0:25:25", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:0:0-0:28:28", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:12:12-0:17:17", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:18:18-0:25:25", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:1:1-0:7:7", - "src": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:1:1-0:2:2", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:1:1-0:2:2", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:6:6-0:7:7", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:6:6-0:7:7", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:8:8-0:11:11", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:12:12-0:25:25", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:12:12-0:17:17", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:18:18-0:25:25", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:27:27-0:28:28", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:12:12-0:17:17", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:18:18-0:25:25", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:0:0-0:28:28", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:12:12-0:17:17", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:18:18-0:25:25", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:1:1-0:7:7", - "src": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:1:1-0:2:2", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:1:1-0:2:2", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:6:6-0:7:7", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:6:6-0:7:7", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:8:8-0:11:11", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:12:12-0:25:25", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:12:12-0:17:17", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:18:18-0:25:25", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:27:27-0:28:28", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true } ] } @@ -2942,400 +1817,6 @@ }, "due_to_glob": false, "due_to_lazy_glob": false - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:12:12-0:17:17", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:18:18-0:25:25", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:0:0-0:28:28", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:12:12-0:17:17", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:18:18-0:25:25", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:1:1-0:7:7", - "src": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:1:1-0:2:2", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:1:1-0:2:2", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:6:6-0:7:7", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:6:6-0:7:7", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:8:8-0:11:11", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:12:12-0:25:25", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:12:12-0:17:17", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:18:18-0:25:25", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:27:27-0:28:28", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:12:12-0:17:17", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:18:18-0:25:25", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:0:0-0:28:28", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:12:12-0:17:17", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:18:18-0:25:25", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:1:1-0:7:7", - "src": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:1:1-0:2:2", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:1:1-0:2:2", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:6:6-0:7:7", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:6:6-0:7:7", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:8:8-0:11:11", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:12:12-0:25:25", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:12:12-0:17:17", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:18:18-0:25:25", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:27:27-0:28:28", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true } ] } @@ -3344,11 +1825,27 @@ { "edge_id": { "src_path": [ - "x" + { + "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,1:0:29-1:1:30", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } ], "src_arrow": false, "dst_path": [ - "y" + { + "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,1:5:34-1:6:35", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -3357,11 +1854,27 @@ "map": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:12:12-0:17:17", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,0:18:18-0:25:25", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/edge-glob-style-inherit/1.d2,2:17:56-2:18:57", diff --git a/testdata/d2ir/TestCompile/patterns/edge-glob-style-inherit/2.exp.json b/testdata/d2ir/TestCompile/patterns/edge-glob-style-inherit/2.exp.json index bfd84a1da..f1c6dcea9 100644 --- a/testdata/d2ir/TestCompile/patterns/edge-glob-style-inherit/2.exp.json +++ b/testdata/d2ir/TestCompile/patterns/edge-glob-style-inherit/2.exp.json @@ -1,15 +1,39 @@ { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,2:0:48-2:1:49", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:17:17-0:18:18", @@ -1671,15 +1695,39 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,2:5:53-2:6:54", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:17:17-0:18:18", @@ -3232,23 +3280,63 @@ ] }, { - "name": "steps", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,4:0:56-4:5:61", + "value": [ + { + "string": "steps", + "raw_string": "steps" + } + ] + }, "composite": { "fields": [ { - "name": "1", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,5:2:67-5:3:68", + "value": [ + { + "string": "1", + "raw_string": "1" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,2:0:48-2:1:49", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,6:21:93-6:22:94", @@ -4352,28 +4440,8 @@ ] }, "key_path": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:15:15", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", @@ -4417,326 +4485,8 @@ "key": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:18:18", "key": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:15:15", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:17:17-0:18:18", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:18:18", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:17:17-0:18:18", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:18:18", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", @@ -5012,15 +4762,39 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,2:5:53-2:6:54", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:17:17-0:18:18", @@ -5809,28 +5583,8 @@ ] }, "key_path": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:15:15", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", @@ -5874,326 +5628,8 @@ "key": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:18:18", "key": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:15:15", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:17:17-0:18:18", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:18:18", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:17:17-0:18:18", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:18:18", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", @@ -6364,828 +5800,33 @@ "due_to_lazy_glob": false } ] - }, - { - "name": "style", - "composite": { - "fields": [ - { - "name": "opacity", - "composite": { - "fields": null, - "edges": null - }, - "references": [ - { - "string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:0:19-1:28:47", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:7:26", - "src": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:8:27-1:11:30", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:25:44", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:27:46-1:28:47", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:0:19-1:28:47", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:7:26", - "src": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:8:27-1:11:30", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:25:44", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:27:46-1:28:47", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - } - ] - } - ], - "edges": null - }, - "references": [ - { - "string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:0:19-1:28:47", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:7:26", - "src": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:8:27-1:11:30", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:25:44", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:27:46-1:28:47", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:0:19-1:28:47", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:7:26", - "src": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:8:27-1:11:30", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:25:44", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:27:46-1:28:47", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - } - ] } ], "edges": [ { "edge_id": { "src_path": [ - "x" + { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,2:0:48-2:1:49", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } ], "src_arrow": false, "dst_path": [ - "y" + { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,2:5:53-2:6:54", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -7194,11 +5835,27 @@ "map": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:27:46-1:28:47", @@ -7903,861 +6560,55 @@ }, "due_to_glob": false, "due_to_lazy_glob": false - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:18:18", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:17:17-0:18:18", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:0:19-1:28:47", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:7:26", - "src": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:8:27-1:11:30", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:25:44", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:27:46-1:28:47", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:18:18", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:17:17-0:18:18", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:18:18", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:17:17-0:18:18", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:0:19-1:28:47", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:7:26", - "src": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:8:27-1:11:30", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:25:44", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:27:46-1:28:47", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true } ] }, { - "name": "2", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,8:2:101-8:3:102", + "value": [ + { + "string": "2", + "raw_string": "2" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,2:0:48-2:1:49", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,6:21:93-6:22:94", @@ -9861,28 +7712,8 @@ ] }, "key_path": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:15:15", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", @@ -9926,28 +7757,8 @@ "key": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:18:18", "key": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:15:15", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", @@ -10010,28 +7821,8 @@ ] }, "key_path": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:15:15", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", @@ -10075,326 +7866,8 @@ "key": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:18:18", "key": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:15:15", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:17:17-0:18:18", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:18:18", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:17:17-0:18:18", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "2" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:18:18", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "2" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", @@ -10820,15 +8293,39 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,2:5:53-2:6:54", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:17:17-0:18:18", @@ -11617,28 +9114,8 @@ ] }, "key_path": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:15:15", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", @@ -11682,28 +9159,8 @@ "key": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:18:18", "key": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:15:15", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", @@ -11766,28 +9223,8 @@ ] }, "key_path": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:15:15", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", @@ -11831,326 +9268,8 @@ "key": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:18:18", "key": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:15:15", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:17:17-0:18:18", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:18:18", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:17:17-0:18:18", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "2" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:18:18", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "2" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", @@ -12471,1224 +9590,33 @@ "due_to_lazy_glob": false } ] - }, - { - "name": "style", - "composite": { - "fields": [ - { - "name": "opacity", - "composite": { - "fields": [], - "edges": null - }, - "references": [ - { - "string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:0:19-1:28:47", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:7:26", - "src": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:8:27-1:11:30", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:25:44", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:27:46-1:28:47", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:0:19-1:28:47", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:7:26", - "src": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:8:27-1:11:30", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:25:44", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:27:46-1:28:47", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "2" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:0:19-1:28:47", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "2" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:7:26", - "src": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:8:27-1:11:30", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:25:44", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:27:46-1:28:47", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - } - ] - } - ], - "edges": null - }, - "references": [ - { - "string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:0:19-1:28:47", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:7:26", - "src": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:8:27-1:11:30", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:25:44", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:27:46-1:28:47", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:0:19-1:28:47", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:7:26", - "src": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:8:27-1:11:30", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:25:44", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:27:46-1:28:47", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "2" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:0:19-1:28:47", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "2" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:7:26", - "src": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:8:27-1:11:30", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:25:44", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:27:46-1:28:47", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - } - ] } ], "edges": [ { "edge_id": { "src_path": [ - "x" + { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,2:0:48-2:1:49", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } ], "src_arrow": false, "dst_path": [ - "y" + { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,2:5:53-2:6:54", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -13697,11 +9625,27 @@ "map": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,9:31:137-9:32:138", @@ -14886,368 +10830,55 @@ }, "due_to_glob": false, "due_to_lazy_glob": false - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "2" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "2" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:18:18", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "2" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:17:17-0:18:18", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "2" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "2" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:0:19-1:28:47", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "2" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:7:26", - "src": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:8:27-1:11:30", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:25:44", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:27:46-1:28:47", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true } ] }, { - "name": "3", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,11:2:145-11:3:146", + "value": [ + { + "string": "3", + "raw_string": "3" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,2:0:48-2:1:49", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,6:21:93-6:22:94", @@ -16351,28 +11982,8 @@ ] }, "key_path": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:15:15", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", @@ -16416,28 +12027,8 @@ "key": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:18:18", "key": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:15:15", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", @@ -16500,28 +12091,8 @@ ] }, "key_path": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:15:15", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", @@ -16565,28 +12136,8 @@ "key": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:18:18", "key": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:15:15", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", @@ -16649,28 +12200,8 @@ ] }, "key_path": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:15:15", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", @@ -16714,326 +12245,8 @@ "key": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:18:18", "key": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:15:15", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:17:17-0:18:18", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "2" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:18:18", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "2" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:17:17-0:18:18", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "3" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:18:18", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "3" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", @@ -17459,15 +12672,39 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,2:5:53-2:6:54", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,12:21:171-12:22:172", @@ -18359,28 +13596,8 @@ ] }, "key_path": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:15:15", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", @@ -18424,28 +13641,8 @@ "key": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:18:18", "key": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:15:15", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", @@ -18508,28 +13705,8 @@ ] }, "key_path": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:15:15", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", @@ -18573,326 +13750,8 @@ "key": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:18:18", "key": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:15:15", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:17:17-0:18:18", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:18:18", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:17:17-0:18:18", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "2" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:18:18", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "2" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", @@ -19058,28 +13917,8 @@ ] }, "key_path": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:15:15", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "3" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", @@ -19123,28 +13962,8 @@ "key": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:18:18", "key": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:15:15", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "3" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", @@ -19568,1620 +14387,33 @@ "due_to_lazy_glob": false } ] - }, - { - "name": "style", - "composite": { - "fields": [ - { - "name": "opacity", - "composite": { - "fields": [], - "edges": null - }, - "references": [ - { - "string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:0:19-1:28:47", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:7:26", - "src": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:8:27-1:11:30", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:25:44", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:27:46-1:28:47", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:0:19-1:28:47", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:7:26", - "src": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:8:27-1:11:30", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:25:44", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:27:46-1:28:47", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "2" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:0:19-1:28:47", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "2" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:7:26", - "src": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:8:27-1:11:30", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:25:44", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:27:46-1:28:47", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "3" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:0:19-1:28:47", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "3" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:7:26", - "src": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:8:27-1:11:30", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:25:44", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:27:46-1:28:47", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - } - ] - } - ], - "edges": null - }, - "references": [ - { - "string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:0:19-1:28:47", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:7:26", - "src": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:8:27-1:11:30", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:25:44", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:27:46-1:28:47", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:0:19-1:28:47", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:7:26", - "src": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:8:27-1:11:30", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:25:44", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:27:46-1:28:47", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "2" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:0:19-1:28:47", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "2" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:7:26", - "src": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:8:27-1:11:30", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:25:44", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:27:46-1:28:47", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "3" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:0:19-1:28:47", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "3" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:7:26", - "src": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:8:27-1:11:30", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:25:44", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:27:46-1:28:47", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - } - ] } ], "edges": [ { "edge_id": { "src_path": [ - "x" + { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,2:0:48-2:1:49", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } ], "src_arrow": false, "dst_path": [ - "y" + { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,2:5:53-2:6:54", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -21190,11 +14422,27 @@ "map": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,9:31:137-9:32:138", @@ -22346,351 +15594,6 @@ }, "due_to_glob": false, "due_to_lazy_glob": false - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "3" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "3" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:18:18", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "3" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:17:17-0:18:18", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "3" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "3" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:0:19-1:28:47", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "3" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:7:26", - "src": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:8:27-1:11:30", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:25:44", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:27:46-1:28:47", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true } ] } @@ -23029,1534 +15932,6 @@ }, "due_to_glob": false, "due_to_lazy_glob": false - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:18:18", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:17:17-0:18:18", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:0:19-1:28:47", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:7:26", - "src": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:8:27-1:11:30", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:25:44", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:27:46-1:28:47", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:18:18", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:17:17-0:18:18", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:18:18", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:17:17-0:18:18", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:0:19-1:28:47", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:7:26", - "src": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:8:27-1:11:30", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:25:44", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:27:46-1:28:47", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "2" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:18:18", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "2" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:17:17-0:18:18", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "2" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:0:19-1:28:47", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "2" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:7:26", - "src": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:8:27-1:11:30", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:25:44", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:27:46-1:28:47", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "3" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:18:18", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "3" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,0:17:17-0:18:18", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "3" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:0:19-1:28:47", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "steps" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "3" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:7:26", - "src": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:1:20-1:2:21", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:6:25-1:7:26", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:8:27-1:11:30", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:25:44", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:27:46-1:28:47", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true } ] } @@ -24565,11 +15940,27 @@ { "edge_id": { "src_path": [ - "x" + { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,2:0:48-2:1:49", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } ], "src_arrow": false, "dst_path": [ - "y" + { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,2:5:53-2:6:54", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -24578,11 +15969,27 @@ "map": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:12:31-1:17:36", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:18:37-1:25:44", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/edge-glob-style-inherit/2.d2,1:27:46-1:28:47", diff --git a/testdata/d2ir/TestCompile/patterns/edge-nexus.exp.json b/testdata/d2ir/TestCompile/patterns/edge-nexus.exp.json index 687051252..82142a1b6 100644 --- a/testdata/d2ir/TestCompile/patterns/edge-nexus.exp.json +++ b/testdata/d2ir/TestCompile/patterns/edge-nexus.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/edge-nexus.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "references": [ { "string": { @@ -59,7 +67,15 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/patterns/edge-nexus.d2,1:0:2-1:1:3", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "references": [ { "string": { @@ -117,7 +133,15 @@ ] }, { - "name": "c", + "name": { + "range": "TestCompile/patterns/edge-nexus.d2,2:0:4-2:1:5", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, "references": [ { "string": { @@ -175,7 +199,15 @@ ] }, { - "name": "d", + "name": { + "range": "TestCompile/patterns/edge-nexus.d2,3:0:6-3:1:7", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + }, "references": [ { "string": { @@ -233,7 +265,15 @@ ] }, { - "name": "nexus", + "name": { + "range": "TestCompile/patterns/edge-nexus.d2,4:5:13-4:10:18", + "value": [ + { + "string": "nexus", + "raw_string": "nexus" + } + ] + }, "references": [ { "string": { @@ -360,11 +400,27 @@ { "edge_id": { "src_path": [ - "a" + { + "range": "TestCompile/patterns/edge-nexus.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } ], "src_arrow": false, "dst_path": [ - "nexus" + { + "range": "TestCompile/patterns/edge-nexus.d2,4:5:13-4:10:18", + "value": [ + { + "string": "nexus", + "raw_string": "nexus" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -469,11 +525,27 @@ { "edge_id": { "src_path": [ - "b" + { + "range": "TestCompile/patterns/edge-nexus.d2,1:0:2-1:1:3", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } ], "src_arrow": false, "dst_path": [ - "nexus" + { + "range": "TestCompile/patterns/edge-nexus.d2,4:5:13-4:10:18", + "value": [ + { + "string": "nexus", + "raw_string": "nexus" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -578,11 +650,27 @@ { "edge_id": { "src_path": [ - "c" + { + "range": "TestCompile/patterns/edge-nexus.d2,2:0:4-2:1:5", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } ], "src_arrow": false, "dst_path": [ - "nexus" + { + "range": "TestCompile/patterns/edge-nexus.d2,4:5:13-4:10:18", + "value": [ + { + "string": "nexus", + "raw_string": "nexus" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -687,11 +775,27 @@ { "edge_id": { "src_path": [ - "d" + { + "range": "TestCompile/patterns/edge-nexus.d2,3:0:6-3:1:7", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } ], "src_arrow": false, "dst_path": [ - "nexus" + { + "range": "TestCompile/patterns/edge-nexus.d2,4:5:13-4:10:18", + "value": [ + { + "string": "nexus", + "raw_string": "nexus" + } + ] + } ], "dst_arrow": true, "index": 0, diff --git a/testdata/d2ir/TestCompile/patterns/edge/1.exp.json b/testdata/d2ir/TestCompile/patterns/edge/1.exp.json index e961e1ac3..eb2826547 100644 --- a/testdata/d2ir/TestCompile/patterns/edge/1.exp.json +++ b/testdata/d2ir/TestCompile/patterns/edge/1.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "animate", + "name": { + "range": "TestCompile/patterns/edge/1.d2,0:0:0-0:7:7", + "value": [ + { + "string": "animate", + "raw_string": "animate" + } + ] + }, "references": [ { "string": { @@ -59,7 +67,15 @@ ] }, { - "name": "animal", + "name": { + "range": "TestCompile/patterns/edge/1.d2,1:0:8-1:6:14", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + }, "references": [ { "string": { @@ -121,11 +137,27 @@ { "edge_id": { "src_path": [ - "animate" + { + "range": "TestCompile/patterns/edge/1.d2,0:0:0-0:7:7", + "value": [ + { + "string": "animate", + "raw_string": "animate" + } + ] + } ], "src_arrow": false, "dst_path": [ - "animal" + { + "range": "TestCompile/patterns/edge/1.d2,1:0:8-1:6:14", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -240,11 +272,27 @@ { "edge_id": { "src_path": [ - "animal" + { + "range": "TestCompile/patterns/edge/1.d2,1:0:8-1:6:14", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + } ], "src_arrow": false, "dst_path": [ - "animate" + { + "range": "TestCompile/patterns/edge/1.d2,0:0:0-0:7:7", + "value": [ + { + "string": "animate", + "raw_string": "animate" + } + ] + } ], "dst_arrow": true, "index": 0, diff --git a/testdata/d2ir/TestCompile/patterns/edge/2.exp.json b/testdata/d2ir/TestCompile/patterns/edge/2.exp.json index 02950f5d0..f7e1516ce 100644 --- a/testdata/d2ir/TestCompile/patterns/edge/2.exp.json +++ b/testdata/d2ir/TestCompile/patterns/edge/2.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "shared", + "name": { + "range": "TestCompile/patterns/edge/2.d2,0:0:0-0:6:6", + "value": [ + { + "string": "shared", + "raw_string": "shared" + } + ] + }, "composite": { "fields": [ { - "name": "animate", + "name": { + "range": "TestCompile/patterns/edge/2.d2,0:7:7-0:14:14", + "value": [ + { + "string": "animate", + "raw_string": "animate" + } + ] + }, "references": [ { "string": { @@ -85,7 +101,15 @@ ] }, { - "name": "animal", + "name": { + "range": "TestCompile/patterns/edge/2.d2,1:7:22-1:13:28", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + }, "references": [ { "string": { @@ -169,11 +193,27 @@ { "edge_id": { "src_path": [ - "animate" + { + "range": "TestCompile/patterns/edge/2.d2,0:7:7-0:14:14", + "value": [ + { + "string": "animate", + "raw_string": "animate" + } + ] + } ], "src_arrow": false, "dst_path": [ - "animal" + { + "range": "TestCompile/patterns/edge/2.d2,1:7:22-1:13:28", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -308,11 +348,27 @@ { "edge_id": { "src_path": [ - "animal" + { + "range": "TestCompile/patterns/edge/2.d2,1:7:22-1:13:28", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + } ], "src_arrow": false, "dst_path": [ - "animate" + { + "range": "TestCompile/patterns/edge/2.d2,0:7:7-0:14:14", + "value": [ + { + "string": "animate", + "raw_string": "animate" + } + ] + } ], "dst_arrow": true, "index": 0, diff --git a/testdata/d2ir/TestCompile/patterns/edge/3.exp.json b/testdata/d2ir/TestCompile/patterns/edge/3.exp.json index 8d19eaaa5..4986e0fc5 100644 --- a/testdata/d2ir/TestCompile/patterns/edge/3.exp.json +++ b/testdata/d2ir/TestCompile/patterns/edge/3.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "shared", + "name": { + "range": "TestCompile/patterns/edge/3.d2,0:0:0-0:6:6", + "value": [ + { + "string": "shared", + "raw_string": "shared" + } + ] + }, "composite": { "fields": [ { - "name": "animate", + "name": { + "range": "TestCompile/patterns/edge/3.d2,0:7:7-0:14:14", + "value": [ + { + "string": "animate", + "raw_string": "animate" + } + ] + }, "references": [ { "string": { @@ -85,7 +101,15 @@ ] }, { - "name": "animal", + "name": { + "range": "TestCompile/patterns/edge/3.d2,1:7:22-1:13:28", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + }, "references": [ { "string": { @@ -169,11 +193,27 @@ { "edge_id": { "src_path": [ - "animate" + { + "range": "TestCompile/patterns/edge/3.d2,0:7:7-0:14:14", + "value": [ + { + "string": "animate", + "raw_string": "animate" + } + ] + } ], "src_arrow": false, "dst_path": [ - "animal" + { + "range": "TestCompile/patterns/edge/3.d2,1:7:22-1:13:28", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -348,11 +388,27 @@ { "edge_id": { "src_path": [ - "animal" + { + "range": "TestCompile/patterns/edge/3.d2,1:7:22-1:13:28", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + } ], "src_arrow": false, "dst_path": [ - "animate" + { + "range": "TestCompile/patterns/edge/3.d2,0:7:7-0:14:14", + "value": [ + { + "string": "animate", + "raw_string": "animate" + } + ] + } ], "dst_arrow": true, "index": 0, diff --git a/testdata/d2ir/TestCompile/patterns/edge/4.exp.json b/testdata/d2ir/TestCompile/patterns/edge/4.exp.json index b3fa57457..0e71feff0 100644 --- a/testdata/d2ir/TestCompile/patterns/edge/4.exp.json +++ b/testdata/d2ir/TestCompile/patterns/edge/4.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "app_a", + "name": { + "range": "TestCompile/patterns/edge/4.d2,0:0:0-0:5:5", + "value": [ + { + "string": "app_a", + "raw_string": "app_a" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/patterns/edge/4.d2,1:3:12-1:4:13", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -250,7 +266,15 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/patterns/edge/4.d2,8:18:55-8:19:56", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -446,11 +470,27 @@ { "edge_id": { "src_path": [ - "x" + { + "range": "TestCompile/patterns/edge/4.d2,1:3:12-1:4:13", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } ], "src_arrow": false, "dst_path": [ - "y" + { + "range": "TestCompile/patterns/edge/4.d2,8:18:55-8:19:56", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -694,11 +734,27 @@ ] }, { - "name": "app_b", + "name": { + "range": "TestCompile/patterns/edge/4.d2,4:1:19-4:6:24", + "value": [ + { + "string": "app_b", + "raw_string": "app_b" + } + ] + }, "composite": { "fields": [ { - "name": "y", + "name": { + "range": "TestCompile/patterns/edge/4.d2,5:3:31-5:4:32", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -943,7 +999,15 @@ ] }, { - "name": "x", + "name": { + "range": "TestCompile/patterns/edge/4.d2,8:7:44-8:8:45", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -1139,11 +1203,27 @@ { "edge_id": { "src_path": [ - "x" + { + "range": "TestCompile/patterns/edge/4.d2,8:7:44-8:8:45", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } ], "src_arrow": false, "dst_path": [ - "y" + { + "range": "TestCompile/patterns/edge/4.d2,5:3:31-5:4:32", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -1391,13 +1471,45 @@ { "edge_id": { "src_path": [ - "app_a", - "x" + { + "range": "TestCompile/patterns/edge/4.d2,0:0:0-0:5:5", + "value": [ + { + "string": "app_a", + "raw_string": "app_a" + } + ] + }, + { + "range": "TestCompile/patterns/edge/4.d2,1:3:12-1:4:13", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } ], "src_arrow": false, "dst_path": [ - "app_b", - "y" + { + "range": "TestCompile/patterns/edge/4.d2,4:1:19-4:6:24", + "value": [ + { + "string": "app_b", + "raw_string": "app_b" + } + ] + }, + { + "range": "TestCompile/patterns/edge/4.d2,5:3:31-5:4:32", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -1556,13 +1668,45 @@ { "edge_id": { "src_path": [ - "app_b", - "x" + { + "range": "TestCompile/patterns/edge/4.d2,4:1:19-4:6:24", + "value": [ + { + "string": "app_b", + "raw_string": "app_b" + } + ] + }, + { + "range": "TestCompile/patterns/edge/4.d2,8:7:44-8:8:45", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } ], "src_arrow": false, "dst_path": [ - "app_a", - "y" + { + "range": "TestCompile/patterns/edge/4.d2,0:0:0-0:5:5", + "value": [ + { + "string": "app_a", + "raw_string": "app_a" + } + ] + }, + { + "range": "TestCompile/patterns/edge/4.d2,8:18:55-8:19:56", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } ], "dst_arrow": true, "index": 0, diff --git a/testdata/d2ir/TestCompile/patterns/escaped.exp.json b/testdata/d2ir/TestCompile/patterns/escaped.exp.json index 8048e9a5a..868e2dcec 100644 --- a/testdata/d2ir/TestCompile/patterns/escaped.exp.json +++ b/testdata/d2ir/TestCompile/patterns/escaped.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "animal", + "name": { + "range": "TestCompile/patterns/escaped.d2,0:0:0-0:6:6", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/escaped.d2,0:8:8-0:12:12", @@ -80,7 +88,15 @@ ] }, { - "name": "action", + "name": { + "range": "TestCompile/patterns/escaped.d2,1:0:13-1:6:19", + "value": [ + { + "string": "action", + "raw_string": "action" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/escaped.d2,1:8:21-1:11:24", @@ -159,7 +175,15 @@ ] }, { - "name": "a*", + "name": { + "range": "TestCompile/patterns/escaped.d2,2:0:25-2:2:27", + "value": [ + { + "string": "a*", + "raw_string": "a\\*" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/escaped.d2,2:5:30-2:12:37", diff --git a/testdata/d2ir/TestCompile/patterns/field-glob-style-inherit.exp.json b/testdata/d2ir/TestCompile/patterns/field-glob-style-inherit.exp.json index 554e30926..60ef25b06 100644 --- a/testdata/d2ir/TestCompile/patterns/field-glob-style-inherit.exp.json +++ b/testdata/d2ir/TestCompile/patterns/field-glob-style-inherit.exp.json @@ -1,15 +1,39 @@ { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/patterns/field-glob-style-inherit.d2,1:0:19-1:1:20", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/field-glob-style-inherit.d2,0:2:2-0:7:7", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/patterns/field-glob-style-inherit.d2,0:8:8-0:15:15", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/field-glob-style-inherit.d2,2:17:41-2:18:42", @@ -1166,23 +1190,63 @@ ] }, { - "name": "scenarios", + "name": { + "range": "TestCompile/patterns/field-glob-style-inherit.d2,5:0:46-5:9:55", + "value": [ + { + "string": "scenarios", + "raw_string": "scenarios" + } + ] + }, "composite": { "fields": [ { - "name": "1", + "name": { + "range": "TestCompile/patterns/field-glob-style-inherit.d2,6:2:61-6:3:62", + "value": [ + { + "string": "1", + "raw_string": "1" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/patterns/field-glob-style-inherit.d2,1:0:19-1:1:20", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/field-glob-style-inherit.d2,0:2:2-0:7:7", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/patterns/field-glob-style-inherit.d2,0:8:8-0:15:15", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/field-glob-style-inherit.d2,2:17:41-2:18:42", @@ -2024,28 +2088,8 @@ ] }, "key_path": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/field-glob-style-inherit.d2,0:0:0-0:15:15", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/field-glob-style-inherit.d2,0:0:0-0:1:1", @@ -2089,28 +2133,117 @@ "key": { "range": "TestCompile/patterns/field-glob-style-inherit.d2,0:0:0-0:18:18", "key": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/field-glob-style-inherit.d2,0:0:0-0:15:15", "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/field-glob-style-inherit.d2,0:0:0-0:1:1", "value": [ { - "string": "scenarios" + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/field-glob-style-inherit.d2,0:2:2-0:7:7", + "value": [ + { + "string": "style", + "raw_string": "style" } ] } }, { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/field-glob-style-inherit.d2,0:8:8-0:15:15", "value": [ { - "string": "1" + "string": "opacity", + "raw_string": "opacity" } ] } - }, + } + ] + }, + "primary": {}, + "value": { + "number": { + "range": "TestCompile/patterns/field-glob-style-inherit.d2,0:17:17-0:18:18", + "raw": "0", + "value": "0" + } + } + } + }, + "due_to_glob": true, + "due_to_lazy_glob": true + }, + { + "string": { + "range": "TestCompile/patterns/field-glob-style-inherit.d2,0:2:2-0:7:7", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/field-glob-style-inherit.d2,0:0:0-0:15:15", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/field-glob-style-inherit.d2,0:0:0-0:1:1", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/field-glob-style-inherit.d2,0:2:2-0:7:7", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/field-glob-style-inherit.d2,0:8:8-0:15:15", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/field-glob-style-inherit.d2,0:0:0-0:18:18", + "key": { + "range": "TestCompile/patterns/field-glob-style-inherit.d2,0:0:0-0:15:15", + "path": [ { "unquoted_string": { "range": "TestCompile/patterns/field-glob-style-inherit.d2,0:0:0-0:1:1", @@ -2407,154 +2540,6 @@ }, "due_to_glob": false, "due_to_lazy_glob": false - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/field-glob-style-inherit.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/field-glob-style-inherit.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/field-glob-style-inherit.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/field-glob-style-inherit.d2,0:0:0-0:18:18", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/field-glob-style-inherit.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/field-glob-style-inherit.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/field-glob-style-inherit.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/field-glob-style-inherit.d2,0:17:17-0:18:18", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true } ] } @@ -2672,154 +2657,6 @@ }, "due_to_glob": false, "due_to_lazy_glob": false - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/field-glob-style-inherit.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/field-glob-style-inherit.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/field-glob-style-inherit.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/field-glob-style-inherit.d2,0:0:0-0:18:18", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "1" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/field-glob-style-inherit.d2,0:0:0-0:1:1", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/field-glob-style-inherit.d2,0:2:2-0:7:7", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/field-glob-style-inherit.d2,0:8:8-0:15:15", - "value": [ - { - "string": "opacity", - "raw_string": "opacity" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "number": { - "range": "TestCompile/patterns/field-glob-style-inherit.d2,0:17:17-0:18:18", - "raw": "0", - "value": "0" - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true } ] } diff --git a/testdata/d2ir/TestCompile/patterns/glob-edge-glob-index.exp.json b/testdata/d2ir/TestCompile/patterns/glob-edge-glob-index.exp.json index 10b67da74..7a1b8fc34 100644 --- a/testdata/d2ir/TestCompile/patterns/glob-edge-glob-index.exp.json +++ b/testdata/d2ir/TestCompile/patterns/glob-edge-glob-index.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "references": [ { "string": { @@ -342,7 +350,15 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "references": [ { "string": { @@ -1435,7 +1451,15 @@ ] }, { - "name": "c", + "name": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,3:0:21-3:1:22", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, "references": [ { "string": { @@ -1556,11 +1580,27 @@ { "edge_id": { "src_path": [ - "a" + { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } ], "src_arrow": false, "dst_path": [ - "b" + { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -1569,11 +1609,27 @@ "map": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:17:45", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:18:46-4:22:50", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:24:52-4:27:55", @@ -2167,11 +2223,27 @@ { "edge_id": { "src_path": [ - "a" + { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } ], "src_arrow": false, "dst_path": [ - "b" + { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } ], "dst_arrow": true, "index": 1, @@ -2180,11 +2252,27 @@ "map": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:17:45", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:18:46-4:22:50", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:24:52-4:27:55", @@ -2778,11 +2866,27 @@ { "edge_id": { "src_path": [ - "a" + { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } ], "src_arrow": false, "dst_path": [ - "b" + { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } ], "dst_arrow": true, "index": 2, @@ -2791,11 +2895,27 @@ "map": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:17:45", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:18:46-4:22:50", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:24:52-4:27:55", @@ -3389,11 +3509,27 @@ { "edge_id": { "src_path": [ - "c" + { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,3:0:21-3:1:22", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } ], "src_arrow": false, "dst_path": [ - "b" + { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -3402,11 +3538,27 @@ "map": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:12:40-4:17:45", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:18:46-4:22:50", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/glob-edge-glob-index.d2,4:24:52-4:27:55", diff --git a/testdata/d2ir/TestCompile/patterns/import-glob/1.exp.json b/testdata/d2ir/TestCompile/patterns/import-glob/1.exp.json index 7c0aa92b0..11a4d9bb5 100644 --- a/testdata/d2ir/TestCompile/patterns/import-glob/1.exp.json +++ b/testdata/d2ir/TestCompile/patterns/import-glob/1.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "before", + "name": { + "range": "index.d2,0:0:0-0:6:6", + "value": [ + { + "string": "before", + "raw_string": "before" + } + ] + }, "primary": { "value": { "range": "globs.d2,2:5:24-2:9:28", @@ -70,7 +78,15 @@ ] }, { - "name": "after", + "name": { + "range": "index.d2,0:22:22-0:27:27", + "value": [ + { + "string": "after", + "raw_string": "after" + } + ] + }, "primary": { "value": { "range": "globs.d2,2:5:24-2:9:28", diff --git a/testdata/d2ir/TestCompile/patterns/import-glob/2.exp.json b/testdata/d2ir/TestCompile/patterns/import-glob/2.exp.json index a55fa2287..2d7375ac9 100644 --- a/testdata/d2ir/TestCompile/patterns/import-glob/2.exp.json +++ b/testdata/d2ir/TestCompile/patterns/import-glob/2.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "x", + "name": { + "range": "rules.d2,2:0:30-2:1:31", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "primary": { "value": { "range": "rules.d2,1:5:25-1:9:29", @@ -16,11 +24,27 @@ "composite": { "fields": [ { - "name": "style", + "name": { + "range": "rules.d2,0:4:4-0:9:9", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "rules.d2,0:10:10-0:14:14", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "rules.d2,0:16:16-0:19:19", @@ -948,7 +972,15 @@ ] }, { - "name": "hi", + "name": { + "range": "index.d2,1:0:13-1:2:15", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + }, "primary": { "value": { "range": "rules.d2,1:5:25-1:9:29", @@ -963,11 +995,27 @@ "composite": { "fields": [ { - "name": "style", + "name": { + "range": "rules.d2,0:4:4-0:9:9", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "rules.d2,0:10:10-0:14:14", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "rules.d2,0:16:16-0:19:19", diff --git a/testdata/d2ir/TestCompile/patterns/nested/prefix-suffix/3.exp.json b/testdata/d2ir/TestCompile/patterns/nested/prefix-suffix/3.exp.json index c25616563..5bc579641 100644 --- a/testdata/d2ir/TestCompile/patterns/nested/prefix-suffix/3.exp.json +++ b/testdata/d2ir/TestCompile/patterns/nested/prefix-suffix/3.exp.json @@ -1,15 +1,39 @@ { "fields": [ { - "name": "animate", + "name": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,0:0:0-0:7:7", + "value": [ + { + "string": "animate", + "raw_string": "animate" + } + ] + }, "composite": { "fields": [ { - "name": "constant", + "name": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,0:8:8-0:16:16", + "value": [ + { + "string": "constant", + "raw_string": "constant" + } + ] + }, "composite": { "fields": [ { - "name": "tinkertinker", + "name": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,0:17:17-0:29:29", + "value": [ + { + "string": "tinkertinker", + "raw_string": "tinkertinker" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,2:33:108-2:40:115", @@ -505,15 +529,39 @@ ] }, { - "name": "astronaut", + "name": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,1:0:36-1:9:45", + "value": [ + { + "string": "astronaut", + "raw_string": "astronaut" + } + ] + }, "composite": { "fields": [ { - "name": "constant", + "name": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,1:10:46-1:18:54", + "value": [ + { + "string": "constant", + "raw_string": "constant" + } + ] + }, "composite": { "fields": [ { - "name": "thinkerthinker", + "name": { + "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,1:19:55-1:33:69", + "value": [ + { + "string": "thinkerthinker", + "raw_string": "thinkerthinker" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/nested/prefix-suffix/3.d2,2:33:108-2:40:115", diff --git a/testdata/d2ir/TestCompile/patterns/override/1.exp.json b/testdata/d2ir/TestCompile/patterns/override/1.exp.json index 8efff4de9..2829984b4 100644 --- a/testdata/d2ir/TestCompile/patterns/override/1.exp.json +++ b/testdata/d2ir/TestCompile/patterns/override/1.exp.json @@ -1,15 +1,39 @@ { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/override/1.d2,4:0:43-4:1:44", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/override/1.d2,1:3:4-1:8:9", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/override/1.d2,1:9:10-1:13:14", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/override/1.d2,2:15:38-2:18:41", diff --git a/testdata/d2ir/TestCompile/patterns/override/2.exp.json b/testdata/d2ir/TestCompile/patterns/override/2.exp.json index 54f0423bd..644c7691f 100644 --- a/testdata/d2ir/TestCompile/patterns/override/2.exp.json +++ b/testdata/d2ir/TestCompile/patterns/override/2.exp.json @@ -1,23 +1,63 @@ { "fields": [ { - "name": "layers", + "name": { + "range": "TestCompile/patterns/override/2.d2,3:0:25-3:6:31", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + }, "composite": { "fields": [ { - "name": "hi", + "name": { + "range": "TestCompile/patterns/override/2.d2,4:2:37-4:4:39", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + }, "composite": { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/override/2.d2,7:4:117-7:5:118", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/override/2.d2,1:4:5-1:9:10", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/override/2.d2,1:10:11-1:14:15", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/override/2.d2,5:19:62-5:22:65", @@ -41,28 +81,8 @@ ] }, "key_path": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/override/2.d2,1:0:1-1:14:15", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/override/2.d2,1:0:1-1:3:4", @@ -110,28 +130,8 @@ "key": { "range": "TestCompile/patterns/override/2.d2,1:0:1-1:22:23", "key": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/override/2.d2,1:0:1-1:14:15", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/override/2.d2,1:0:1-1:3:4", @@ -559,28 +559,8 @@ ] }, "key_path": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/override/2.d2,1:0:1-1:14:15", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/override/2.d2,1:0:1-1:3:4", @@ -628,28 +608,8 @@ "key": { "range": "TestCompile/patterns/override/2.d2,1:0:1-1:22:23", "key": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/override/2.d2,1:0:1-1:14:15", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/override/2.d2,1:0:1-1:3:4", @@ -954,28 +914,8 @@ ] }, "key_path": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/override/2.d2,1:0:1-1:14:15", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/override/2.d2,1:0:1-1:3:4", @@ -1023,28 +963,8 @@ "key": { "range": "TestCompile/patterns/override/2.d2,1:0:1-1:22:23", "key": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/override/2.d2,1:0:1-1:14:15", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/override/2.d2,1:0:1-1:3:4", @@ -1675,326 +1595,6 @@ }, "due_to_glob": false, "due_to_lazy_glob": false - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/override/2.d2,1:0:1-1:3:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/override/2.d2,1:4:5-1:9:10", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/override/2.d2,1:10:11-1:14:15", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/override/2.d2,1:0:1-1:22:23", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/override/2.d2,1:0:1-1:3:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/override/2.d2,1:4:5-1:9:10", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/override/2.d2,1:10:11-1:14:15", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/override/2.d2,1:16:17-1:22:23", - "value": [ - { - "string": "yellow", - "raw_string": "yellow" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/override/2.d2,1:0:1-1:3:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/override/2.d2,1:4:5-1:9:10", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/override/2.d2,1:10:11-1:14:15", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/override/2.d2,1:0:1-1:22:23", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/override/2.d2,1:0:1-1:3:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/override/2.d2,1:4:5-1:9:10", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/override/2.d2,1:10:11-1:14:15", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/override/2.d2,1:16:17-1:22:23", - "value": [ - { - "string": "yellow", - "raw_string": "yellow" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true } ] } @@ -2178,326 +1778,6 @@ }, "due_to_glob": false, "due_to_lazy_glob": false - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/override/2.d2,1:0:1-1:3:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/override/2.d2,1:4:5-1:9:10", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/override/2.d2,1:10:11-1:14:15", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/override/2.d2,1:0:1-1:22:23", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/override/2.d2,1:0:1-1:3:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/override/2.d2,1:4:5-1:9:10", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/override/2.d2,1:10:11-1:14:15", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/override/2.d2,1:16:17-1:22:23", - "value": [ - { - "string": "yellow", - "raw_string": "yellow" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/override/2.d2,1:0:1-1:3:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/override/2.d2,1:4:5-1:9:10", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/override/2.d2,1:10:11-1:14:15", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/override/2.d2,1:0:1-1:22:23", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/override/2.d2,1:0:1-1:3:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/override/2.d2,1:4:5-1:9:10", - "value": [ - { - "string": "style", - "raw_string": "style" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/override/2.d2,1:10:11-1:14:15", - "value": [ - { - "string": "fill", - "raw_string": "fill" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/override/2.d2,1:16:17-1:22:23", - "value": [ - { - "string": "yellow", - "raw_string": "yellow" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true } ] } diff --git a/testdata/d2ir/TestCompile/patterns/override/3.exp.json b/testdata/d2ir/TestCompile/patterns/override/3.exp.json index 604061dc0..0a31dfb85 100644 --- a/testdata/d2ir/TestCompile/patterns/override/3.exp.json +++ b/testdata/d2ir/TestCompile/patterns/override/3.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/override/3.d2,3:0:28-3:1:29", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "references": [ { "string": { @@ -118,7 +126,15 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/patterns/override/3.d2,3:5:33-3:6:34", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "references": [ { "string": { @@ -235,23 +251,63 @@ ] }, { - "name": "layers", + "name": { + "range": "TestCompile/patterns/override/3.d2,5:0:36-5:6:42", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + }, "composite": { "fields": [ { - "name": "hi", + "name": { + "range": "TestCompile/patterns/override/3.d2,6:2:48-6:4:50", + "value": [ + { + "string": "hi", + "raw_string": "hi" + } + ] + }, "composite": { "fields": [ { - "name": "scenarios", + "name": { + "range": "TestCompile/patterns/override/3.d2,9:4:90-9:13:99", + "value": [ + { + "string": "scenarios", + "raw_string": "scenarios" + } + ] + }, "composite": { "fields": [ { - "name": "b", + "name": { + "range": "TestCompile/patterns/override/3.d2,10:6:109-10:7:110", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "composite": { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/override/3.d2,12:8:175-12:9:176", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "references": [ { "string": { @@ -368,7 +424,15 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/patterns/override/3.d2,12:13:180-12:14:181", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "references": [ { "string": { @@ -489,11 +553,27 @@ { "edge_id": { "src_path": [ - "a" + { + "range": "TestCompile/patterns/override/3.d2,12:8:175-12:9:176", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } ], "src_arrow": false, "dst_path": [ - "b" + { + "range": "TestCompile/patterns/override/3.d2,12:13:180-12:14:181", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -502,7 +582,15 @@ "map": { "fields": [ { - "name": "label", + "name": { + "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/override/3.d2,7:27:81-7:30:84", @@ -595,51 +683,6 @@ }, "key": { "range": "TestCompile/patterns/override/3.d2,1:0:1-1:25:26", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, "edges": [ { "range": "TestCompile/patterns/override/3.d2,1:1:2-1:11:12", @@ -811,31 +854,6 @@ }, "key": { "range": "TestCompile/patterns/override/3.d2,7:4:58-7:30:84", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, "edges": [ { "range": "TestCompile/patterns/override/3.d2,7:5:59-7:15:69", @@ -1075,51 +1093,6 @@ }, "key": { "range": "TestCompile/patterns/override/3.d2,1:0:1-1:25:26", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, "edges": [ { "range": "TestCompile/patterns/override/3.d2,1:1:2-1:11:12", @@ -1266,31 +1239,6 @@ }, "key": { "range": "TestCompile/patterns/override/3.d2,7:4:58-7:30:84", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, "edges": [ { "range": "TestCompile/patterns/override/3.d2,7:5:59-7:15:69", @@ -1497,1552 +1445,6 @@ }, "due_to_glob": false, "due_to_lazy_glob": false - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/override/3.d2,1:0:1-1:25:26", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:11:12", - "src": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/override/3.d2,1:12:13-1:15:16", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:23:24-1:25:26", - "value": [ - { - "string": "hi", - "raw_string": "hi" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/override/3.d2,7:4:58-7:30:84", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/override/3.d2,7:5:59-7:15:69", - "src": { - "range": "TestCompile/patterns/override/3.d2,7:5:59-7:8:62", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,7:5:59-7:8:62", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/override/3.d2,7:12:66-7:15:69", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,7:12:66-7:15:69", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/override/3.d2,7:16:70-7:19:73", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/override/3.d2,7:20:74-7:25:79", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,7:20:74-7:25:79", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,7:27:81-7:30:84", - "value": [ - { - "string": "bye", - "raw_string": "bye" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/override/3.d2,1:0:1-1:25:26", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:11:12", - "src": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/override/3.d2,1:12:13-1:15:16", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:23:24-1:25:26", - "value": [ - { - "string": "hi", - "raw_string": "hi" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/override/3.d2,7:4:58-7:30:84", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/override/3.d2,7:5:59-7:15:69", - "src": { - "range": "TestCompile/patterns/override/3.d2,7:5:59-7:8:62", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,7:5:59-7:8:62", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/override/3.d2,7:12:66-7:15:69", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,7:12:66-7:15:69", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/override/3.d2,7:16:70-7:19:73", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/override/3.d2,7:20:74-7:25:79", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,7:20:74-7:25:79", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,7:27:81-7:30:84", - "value": [ - { - "string": "bye", - "raw_string": "bye" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/override/3.d2,1:0:1-1:25:26", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:11:12", - "src": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/override/3.d2,1:12:13-1:15:16", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:23:24-1:25:26", - "value": [ - { - "string": "hi", - "raw_string": "hi" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/override/3.d2,7:4:58-7:30:84", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/override/3.d2,7:5:59-7:15:69", - "src": { - "range": "TestCompile/patterns/override/3.d2,7:5:59-7:8:62", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,7:5:59-7:8:62", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/override/3.d2,7:12:66-7:15:69", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,7:12:66-7:15:69", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/override/3.d2,7:16:70-7:19:73", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/override/3.d2,7:20:74-7:25:79", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,7:20:74-7:25:79", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,7:27:81-7:30:84", - "value": [ - { - "string": "bye", - "raw_string": "bye" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/override/3.d2,7:4:58-7:30:84", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/override/3.d2,7:5:59-7:15:69", - "src": { - "range": "TestCompile/patterns/override/3.d2,7:5:59-7:8:62", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,7:5:59-7:8:62", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/override/3.d2,7:12:66-7:15:69", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,7:12:66-7:15:69", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/override/3.d2,7:16:70-7:19:73", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/override/3.d2,7:20:74-7:25:79", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,7:20:74-7:25:79", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,7:27:81-7:30:84", - "value": [ - { - "string": "bye", - "raw_string": "bye" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/override/3.d2,1:0:1-1:25:26", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:11:12", - "src": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/override/3.d2,1:12:13-1:15:16", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:23:24-1:25:26", - "value": [ - { - "string": "hi", - "raw_string": "hi" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/override/3.d2,7:4:58-7:30:84", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/override/3.d2,7:5:59-7:15:69", - "src": { - "range": "TestCompile/patterns/override/3.d2,7:5:59-7:8:62", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,7:5:59-7:8:62", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/override/3.d2,7:12:66-7:15:69", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,7:12:66-7:15:69", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/override/3.d2,7:16:70-7:19:73", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/override/3.d2,7:20:74-7:25:79", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,7:20:74-7:25:79", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,7:27:81-7:30:84", - "value": [ - { - "string": "bye", - "raw_string": "bye" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true } ] } @@ -3189,1552 +1591,6 @@ }, "due_to_glob": false, "due_to_lazy_glob": false - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/override/3.d2,1:0:1-1:25:26", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:11:12", - "src": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/override/3.d2,1:12:13-1:15:16", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:23:24-1:25:26", - "value": [ - { - "string": "hi", - "raw_string": "hi" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/override/3.d2,7:4:58-7:30:84", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/override/3.d2,7:5:59-7:15:69", - "src": { - "range": "TestCompile/patterns/override/3.d2,7:5:59-7:8:62", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,7:5:59-7:8:62", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/override/3.d2,7:12:66-7:15:69", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,7:12:66-7:15:69", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/override/3.d2,7:16:70-7:19:73", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/override/3.d2,7:20:74-7:25:79", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,7:20:74-7:25:79", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,7:27:81-7:30:84", - "value": [ - { - "string": "bye", - "raw_string": "bye" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/override/3.d2,1:0:1-1:25:26", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:11:12", - "src": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/override/3.d2,1:12:13-1:15:16", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:23:24-1:25:26", - "value": [ - { - "string": "hi", - "raw_string": "hi" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/override/3.d2,7:4:58-7:30:84", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/override/3.d2,7:5:59-7:15:69", - "src": { - "range": "TestCompile/patterns/override/3.d2,7:5:59-7:8:62", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,7:5:59-7:8:62", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/override/3.d2,7:12:66-7:15:69", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,7:12:66-7:15:69", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/override/3.d2,7:16:70-7:19:73", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/override/3.d2,7:20:74-7:25:79", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,7:20:74-7:25:79", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,7:27:81-7:30:84", - "value": [ - { - "string": "bye", - "raw_string": "bye" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/override/3.d2,1:0:1-1:25:26", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:11:12", - "src": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/override/3.d2,1:12:13-1:15:16", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:23:24-1:25:26", - "value": [ - { - "string": "hi", - "raw_string": "hi" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/override/3.d2,7:4:58-7:30:84", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/override/3.d2,7:5:59-7:15:69", - "src": { - "range": "TestCompile/patterns/override/3.d2,7:5:59-7:8:62", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,7:5:59-7:8:62", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/override/3.d2,7:12:66-7:15:69", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,7:12:66-7:15:69", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/override/3.d2,7:16:70-7:19:73", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/override/3.d2,7:20:74-7:25:79", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,7:20:74-7:25:79", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,7:27:81-7:30:84", - "value": [ - { - "string": "bye", - "raw_string": "bye" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/override/3.d2,7:4:58-7:30:84", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/override/3.d2,7:5:59-7:15:69", - "src": { - "range": "TestCompile/patterns/override/3.d2,7:5:59-7:8:62", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,7:5:59-7:8:62", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/override/3.d2,7:12:66-7:15:69", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,7:12:66-7:15:69", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/override/3.d2,7:16:70-7:19:73", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/override/3.d2,7:20:74-7:25:79", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,7:20:74-7:25:79", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,7:27:81-7:30:84", - "value": [ - { - "string": "bye", - "raw_string": "bye" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/override/3.d2,1:0:1-1:25:26", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:11:12", - "src": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/override/3.d2,1:12:13-1:15:16", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:23:24-1:25:26", - "value": [ - { - "string": "hi", - "raw_string": "hi" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/override/3.d2,7:4:58-7:30:84", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/override/3.d2,7:5:59-7:15:69", - "src": { - "range": "TestCompile/patterns/override/3.d2,7:5:59-7:8:62", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,7:5:59-7:8:62", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/override/3.d2,7:12:66-7:15:69", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,7:12:66-7:15:69", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/override/3.d2,7:16:70-7:19:73", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/override/3.d2,7:20:74-7:25:79", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,7:20:74-7:25:79", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,7:27:81-7:30:84", - "value": [ - { - "string": "bye", - "raw_string": "bye" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true } ] } @@ -5001,1398 +1857,6 @@ }, "due_to_glob": false, "due_to_lazy_glob": false - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/override/3.d2,1:0:1-1:25:26", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:11:12", - "src": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/override/3.d2,1:12:13-1:15:16", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:23:24-1:25:26", - "value": [ - { - "string": "hi", - "raw_string": "hi" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/override/3.d2,1:0:1-1:25:26", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:11:12", - "src": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/override/3.d2,1:12:13-1:15:16", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:23:24-1:25:26", - "value": [ - { - "string": "hi", - "raw_string": "hi" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/override/3.d2,1:0:1-1:25:26", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:11:12", - "src": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/override/3.d2,1:12:13-1:15:16", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:23:24-1:25:26", - "value": [ - { - "string": "hi", - "raw_string": "hi" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/override/3.d2,1:0:1-1:25:26", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:11:12", - "src": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/override/3.d2,1:12:13-1:15:16", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:23:24-1:25:26", - "value": [ - { - "string": "hi", - "raw_string": "hi" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/override/3.d2,1:0:1-1:25:26", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:11:12", - "src": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/override/3.d2,1:12:13-1:15:16", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:23:24-1:25:26", - "value": [ - { - "string": "hi", - "raw_string": "hi" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/override/3.d2,1:0:1-1:25:26", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:11:12", - "src": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/override/3.d2,1:12:13-1:15:16", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:23:24-1:25:26", - "value": [ - { - "string": "hi", - "raw_string": "hi" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/override/3.d2,1:0:1-1:25:26", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:11:12", - "src": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/override/3.d2,1:12:13-1:15:16", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:23:24-1:25:26", - "value": [ - { - "string": "hi", - "raw_string": "hi" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/override/3.d2,1:0:1-1:25:26", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:11:12", - "src": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/override/3.d2,1:12:13-1:15:16", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:23:24-1:25:26", - "value": [ - { - "string": "hi", - "raw_string": "hi" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true } ] } @@ -6688,1398 +2152,6 @@ }, "due_to_glob": false, "due_to_lazy_glob": false - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/override/3.d2,1:0:1-1:25:26", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:11:12", - "src": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/override/3.d2,1:12:13-1:15:16", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:23:24-1:25:26", - "value": [ - { - "string": "hi", - "raw_string": "hi" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/override/3.d2,1:0:1-1:25:26", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:11:12", - "src": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/override/3.d2,1:12:13-1:15:16", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:23:24-1:25:26", - "value": [ - { - "string": "hi", - "raw_string": "hi" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/override/3.d2,1:0:1-1:25:26", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:11:12", - "src": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/override/3.d2,1:12:13-1:15:16", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:23:24-1:25:26", - "value": [ - { - "string": "hi", - "raw_string": "hi" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/override/3.d2,1:0:1-1:25:26", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:11:12", - "src": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/override/3.d2,1:12:13-1:15:16", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:23:24-1:25:26", - "value": [ - { - "string": "hi", - "raw_string": "hi" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/override/3.d2,1:0:1-1:25:26", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:11:12", - "src": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/override/3.d2,1:12:13-1:15:16", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:23:24-1:25:26", - "value": [ - { - "string": "hi", - "raw_string": "hi" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/override/3.d2,1:0:1-1:25:26", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "b" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:11:12", - "src": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/override/3.d2,1:12:13-1:15:16", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:23:24-1:25:26", - "value": [ - { - "string": "hi", - "raw_string": "hi" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/override/3.d2,1:0:1-1:25:26", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:11:12", - "src": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/override/3.d2,1:12:13-1:15:16", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:23:24-1:25:26", - "value": [ - { - "string": "hi", - "raw_string": "hi" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/override/3.d2,1:0:1-1:25:26", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "hi" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:11:12", - "src": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:1:2-1:4:5", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:8:9-1:11:12", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/override/3.d2,1:12:13-1:15:16", - "int": null, - "glob": true - }, - "edge_key": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", - "value": [ - { - "string": "label", - "raw_string": "label" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/override/3.d2,1:23:24-1:25:26", - "value": [ - { - "string": "hi", - "raw_string": "hi" - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true } ] } @@ -8088,11 +2160,27 @@ { "edge_id": { "src_path": [ - "a" + { + "range": "TestCompile/patterns/override/3.d2,3:0:28-3:1:29", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } ], "src_arrow": false, "dst_path": [ - "b" + { + "range": "TestCompile/patterns/override/3.d2,3:5:33-3:6:34", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -8101,7 +2189,15 @@ "map": { "fields": [ { - "name": "label", + "name": { + "range": "TestCompile/patterns/override/3.d2,1:16:17-1:21:22", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/override/3.d2,1:23:24-1:25:26", diff --git a/testdata/d2ir/TestCompile/patterns/override/4.exp.json b/testdata/d2ir/TestCompile/patterns/override/4.exp.json index 40b076ead..3c38e65f0 100644 --- a/testdata/d2ir/TestCompile/patterns/override/4.exp.json +++ b/testdata/d2ir/TestCompile/patterns/override/4.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/override/4.d2,3:0:28-3:1:29", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "references": [ { "string": { @@ -157,7 +165,15 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/patterns/override/4.d2,3:5:33-3:6:34", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "references": [ { "string": { @@ -317,11 +333,27 @@ { "edge_id": { "src_path": [ - "a" + { + "range": "TestCompile/patterns/override/4.d2,3:0:28-3:1:29", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } ], "src_arrow": false, "dst_path": [ - "b" + { + "range": "TestCompile/patterns/override/4.d2,3:5:33-3:6:34", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -330,7 +362,15 @@ "map": { "fields": [ { - "name": "label", + "name": { + "range": "TestCompile/patterns/override/4.d2,1:16:17-1:21:22", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/override/4.d2,4:9:47-4:12:50", diff --git a/testdata/d2ir/TestCompile/patterns/override/5.exp.json b/testdata/d2ir/TestCompile/patterns/override/5.exp.json index e73c6eed9..0b2e4e7ac 100644 --- a/testdata/d2ir/TestCompile/patterns/override/5.exp.json +++ b/testdata/d2ir/TestCompile/patterns/override/5.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/override/5.d2,4:0:74-4:1:75", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "references": [ { "string": { @@ -118,7 +126,15 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/patterns/override/5.d2,4:5:79-4:6:80", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "references": [ { "string": { @@ -239,11 +255,27 @@ { "edge_id": { "src_path": [ - "a" + { + "range": "TestCompile/patterns/override/5.d2,4:0:74-4:1:75", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } ], "src_arrow": false, "dst_path": [ - "b" + { + "range": "TestCompile/patterns/override/5.d2,4:5:79-4:6:80", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -252,7 +284,15 @@ "map": { "fields": [ { - "name": "label", + "name": { + "range": "TestCompile/patterns/override/5.d2,1:16:17-1:21:22", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/override/5.d2,6:23:105-6:26:108", diff --git a/testdata/d2ir/TestCompile/patterns/override/6.exp.json b/testdata/d2ir/TestCompile/patterns/override/6.exp.json index f52183c3e..2c9d0debd 100644 --- a/testdata/d2ir/TestCompile/patterns/override/6.exp.json +++ b/testdata/d2ir/TestCompile/patterns/override/6.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/override/6.d2,2:0:29-2:1:30", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "composite": { "fields": [], "edges": null @@ -221,7 +229,15 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/patterns/override/6.d2,7:0:138-7:1:139", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "composite": { "fields": [], "edges": null diff --git a/testdata/d2ir/TestCompile/patterns/override/7.exp.json b/testdata/d2ir/TestCompile/patterns/override/7.exp.json index 6658f0928..8f4638294 100644 --- a/testdata/d2ir/TestCompile/patterns/override/7.exp.json +++ b/testdata/d2ir/TestCompile/patterns/override/7.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/override/7.d2,3:0:93-3:1:94", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "composite": { "fields": [], "edges": null @@ -168,7 +176,15 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/patterns/override/7.d2,6:0:136-6:1:137", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "composite": { "fields": [], "edges": null diff --git a/testdata/d2ir/TestCompile/patterns/prefix-suffix.exp.json b/testdata/d2ir/TestCompile/patterns/prefix-suffix.exp.json index db2c68dc4..38d6844b5 100644 --- a/testdata/d2ir/TestCompile/patterns/prefix-suffix.exp.json +++ b/testdata/d2ir/TestCompile/patterns/prefix-suffix.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "tinker", + "name": { + "range": "TestCompile/patterns/prefix-suffix.d2,0:0:0-0:6:6", + "value": [ + { + "string": "tinker", + "raw_string": "tinker" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/prefix-suffix.d2,2:5:31-2:12:38", @@ -80,7 +88,15 @@ ] }, { - "name": "thinker", + "name": { + "range": "TestCompile/patterns/prefix-suffix.d2,1:0:13-1:7:20", + "value": [ + { + "string": "thinker", + "raw_string": "thinker" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/prefix-suffix.d2,2:5:31-2:12:38", diff --git a/testdata/d2ir/TestCompile/patterns/prefix-suffix/2.exp.json b/testdata/d2ir/TestCompile/patterns/prefix-suffix/2.exp.json index 32d2fc713..3113b66d4 100644 --- a/testdata/d2ir/TestCompile/patterns/prefix-suffix/2.exp.json +++ b/testdata/d2ir/TestCompile/patterns/prefix-suffix/2.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "tinker", + "name": { + "range": "TestCompile/patterns/prefix-suffix/2.d2,0:0:0-0:6:6", + "value": [ + { + "string": "tinker", + "raw_string": "tinker" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/prefix-suffix/2.d2,2:9:35-2:16:42", @@ -80,7 +88,15 @@ ] }, { - "name": "thinker", + "name": { + "range": "TestCompile/patterns/prefix-suffix/2.d2,1:0:13-1:7:20", + "value": [ + { + "string": "thinker", + "raw_string": "thinker" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/prefix-suffix/2.d2,2:9:35-2:16:42", diff --git a/testdata/d2ir/TestCompile/patterns/prefix-suffix/3.exp.json b/testdata/d2ir/TestCompile/patterns/prefix-suffix/3.exp.json index dfb1a9f64..d525b4b23 100644 --- a/testdata/d2ir/TestCompile/patterns/prefix-suffix/3.exp.json +++ b/testdata/d2ir/TestCompile/patterns/prefix-suffix/3.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "tinkertinker", + "name": { + "range": "TestCompile/patterns/prefix-suffix/3.d2,0:0:0-0:12:12", + "value": [ + { + "string": "tinkertinker", + "raw_string": "tinkertinker" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/prefix-suffix/3.d2,2:17:56-2:24:63", @@ -80,7 +88,15 @@ ] }, { - "name": "thinkerthinker", + "name": { + "range": "TestCompile/patterns/prefix-suffix/3.d2,1:0:19-1:14:33", + "value": [ + { + "string": "thinkerthinker", + "raw_string": "thinkerthinker" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/prefix-suffix/3.d2,2:17:56-2:24:63", diff --git a/testdata/d2ir/TestCompile/patterns/prefix.exp.json b/testdata/d2ir/TestCompile/patterns/prefix.exp.json index 920eddc82..532640cc5 100644 --- a/testdata/d2ir/TestCompile/patterns/prefix.exp.json +++ b/testdata/d2ir/TestCompile/patterns/prefix.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "animal", + "name": { + "range": "TestCompile/patterns/prefix.d2,0:0:0-0:6:6", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/prefix.d2,2:4:29-2:11:36", @@ -80,7 +88,15 @@ ] }, { - "name": "action", + "name": { + "range": "TestCompile/patterns/prefix.d2,1:0:13-1:6:19", + "value": [ + { + "string": "action", + "raw_string": "action" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/prefix.d2,2:4:29-2:11:36", diff --git a/testdata/d2ir/TestCompile/patterns/prevent-chain-recursion.exp.json b/testdata/d2ir/TestCompile/patterns/prevent-chain-recursion.exp.json index d75403066..ebd7e7e73 100644 --- a/testdata/d2ir/TestCompile/patterns/prevent-chain-recursion.exp.json +++ b/testdata/d2ir/TestCompile/patterns/prevent-chain-recursion.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "one", + "name": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,9:0:46-9:3:49", + "value": [ + { + "string": "one", + "raw_string": "one" + } + ] + }, "composite": { "fields": [ { - "name": "c", + "name": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,2:2:10-2:3:11", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/prevent-chain-recursion.d2,2:5:13-2:6:14", @@ -20,11 +36,27 @@ "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:8:33-6:12:37", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:14:39-6:17:42", @@ -285,11 +317,27 @@ ] }, { - "name": "style", + "name": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:8:33-6:12:37", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:14:39-6:17:42", @@ -540,11 +588,27 @@ ] }, { - "name": "two", + "name": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,10:0:50-10:3:53", + "value": [ + { + "string": "two", + "raw_string": "two" + } + ] + }, "composite": { "fields": [ { - "name": "c", + "name": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,2:2:10-2:3:11", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/prevent-chain-recursion.d2,2:5:13-2:6:14", @@ -559,11 +623,27 @@ "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:8:33-6:12:37", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:14:39-6:17:42", @@ -824,11 +904,27 @@ ] }, { - "name": "style", + "name": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:8:33-6:12:37", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/prevent-chain-recursion.d2,6:14:39-6:17:42", diff --git a/testdata/d2ir/TestCompile/patterns/reserved.exp.json b/testdata/d2ir/TestCompile/patterns/reserved.exp.json index 196237058..d287e3151 100644 --- a/testdata/d2ir/TestCompile/patterns/reserved.exp.json +++ b/testdata/d2ir/TestCompile/patterns/reserved.exp.json @@ -1,15 +1,39 @@ { "fields": [ { - "name": "vars", + "name": { + "range": "TestCompile/patterns/reserved.d2,0:0:0-0:4:4", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + }, "composite": { "fields": [ { - "name": "d2-config", + "name": { + "range": "TestCompile/patterns/reserved.d2,1:2:10-1:11:19", + "value": [ + { + "string": "d2-config", + "raw_string": "d2-config" + } + ] + }, "composite": { "fields": [ { - "name": "layout-engine", + "name": { + "range": "TestCompile/patterns/reserved.d2,2:4:27-2:17:40", + "value": [ + { + "string": "layout-engine", + "raw_string": "layout-engine" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/reserved.d2,2:19:42-2:22:45", @@ -313,7 +337,15 @@ ] }, { - "name": "Spiderman 1", + "name": { + "range": "TestCompile/patterns/reserved.d2,6:0:53-6:11:64", + "value": [ + { + "string": "Spiderman 1", + "raw_string": "Spiderman 1" + } + ] + }, "references": [ { "string": { @@ -371,7 +403,15 @@ ] }, { - "name": "Spiderman 2", + "name": { + "range": "TestCompile/patterns/reserved.d2,7:0:65-7:11:76", + "value": [ + { + "string": "Spiderman 2", + "raw_string": "Spiderman 2" + } + ] + }, "references": [ { "string": { @@ -429,7 +469,15 @@ ] }, { - "name": "Spiderman 3", + "name": { + "range": "TestCompile/patterns/reserved.d2,8:0:77-8:11:88", + "value": [ + { + "string": "Spiderman 3", + "raw_string": "Spiderman 3" + } + ] + }, "references": [ { "string": { @@ -491,11 +539,27 @@ { "edge_id": { "src_path": [ - "Spiderman 1" + { + "range": "TestCompile/patterns/reserved.d2,6:0:53-6:11:64", + "value": [ + { + "string": "Spiderman 1", + "raw_string": "Spiderman 1" + } + ] + } ], "src_arrow": false, "dst_path": [ - "Spiderman 2" + { + "range": "TestCompile/patterns/reserved.d2,7:0:65-7:11:76", + "value": [ + { + "string": "Spiderman 2", + "raw_string": "Spiderman 2" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -627,11 +691,27 @@ { "edge_id": { "src_path": [ - "Spiderman 1" + { + "range": "TestCompile/patterns/reserved.d2,6:0:53-6:11:64", + "value": [ + { + "string": "Spiderman 1", + "raw_string": "Spiderman 1" + } + ] + } ], "src_arrow": false, "dst_path": [ - "Spiderman 3" + { + "range": "TestCompile/patterns/reserved.d2,8:0:77-8:11:88", + "value": [ + { + "string": "Spiderman 3", + "raw_string": "Spiderman 3" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -763,11 +843,27 @@ { "edge_id": { "src_path": [ - "Spiderman 2" + { + "range": "TestCompile/patterns/reserved.d2,7:0:65-7:11:76", + "value": [ + { + "string": "Spiderman 2", + "raw_string": "Spiderman 2" + } + ] + } ], "src_arrow": false, "dst_path": [ - "Spiderman 1" + { + "range": "TestCompile/patterns/reserved.d2,6:0:53-6:11:64", + "value": [ + { + "string": "Spiderman 1", + "raw_string": "Spiderman 1" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -899,11 +995,27 @@ { "edge_id": { "src_path": [ - "Spiderman 2" + { + "range": "TestCompile/patterns/reserved.d2,7:0:65-7:11:76", + "value": [ + { + "string": "Spiderman 2", + "raw_string": "Spiderman 2" + } + ] + } ], "src_arrow": false, "dst_path": [ - "Spiderman 3" + { + "range": "TestCompile/patterns/reserved.d2,8:0:77-8:11:88", + "value": [ + { + "string": "Spiderman 3", + "raw_string": "Spiderman 3" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -1035,11 +1147,27 @@ { "edge_id": { "src_path": [ - "Spiderman 3" + { + "range": "TestCompile/patterns/reserved.d2,8:0:77-8:11:88", + "value": [ + { + "string": "Spiderman 3", + "raw_string": "Spiderman 3" + } + ] + } ], "src_arrow": false, "dst_path": [ - "Spiderman 1" + { + "range": "TestCompile/patterns/reserved.d2,6:0:53-6:11:64", + "value": [ + { + "string": "Spiderman 1", + "raw_string": "Spiderman 1" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -1171,11 +1299,27 @@ { "edge_id": { "src_path": [ - "Spiderman 3" + { + "range": "TestCompile/patterns/reserved.d2,8:0:77-8:11:88", + "value": [ + { + "string": "Spiderman 3", + "raw_string": "Spiderman 3" + } + ] + } ], "src_arrow": false, "dst_path": [ - "Spiderman 2" + { + "range": "TestCompile/patterns/reserved.d2,7:0:65-7:11:76", + "value": [ + { + "string": "Spiderman 2", + "raw_string": "Spiderman 2" + } + ] + } ], "dst_arrow": true, "index": 0, diff --git a/testdata/d2ir/TestCompile/patterns/scenarios.exp.json b/testdata/d2ir/TestCompile/patterns/scenarios.exp.json index 587b6d6c3..b2bcb9333 100644 --- a/testdata/d2ir/TestCompile/patterns/scenarios.exp.json +++ b/testdata/d2ir/TestCompile/patterns/scenarios.exp.json @@ -1,15 +1,39 @@ { "fields": [ { - "name": "scenarios", + "name": { + "range": "TestCompile/patterns/scenarios.d2,2:0:2-2:9:11", + "value": [ + { + "string": "scenarios", + "raw_string": "scenarios" + } + ] + }, "composite": { "fields": [ { - "name": "meow", + "name": { + "range": "TestCompile/patterns/scenarios.d2,3:2:17-3:6:21", + "value": [ + { + "string": "meow", + "raw_string": "meow" + } + ] + }, "composite": { "fields": [ { - "name": "e", + "name": { + "range": "TestCompile/patterns/scenarios.d2,4:1:26-4:2:27", + "value": [ + { + "string": "e", + "raw_string": "e" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/scenarios.d2,16:4:57-16:13:66", @@ -78,7 +102,15 @@ ] }, { - "name": "f", + "name": { + "range": "TestCompile/patterns/scenarios.d2,5:1:29-5:2:30", + "value": [ + { + "string": "f", + "raw_string": "f" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/scenarios.d2,16:4:57-16:13:66", @@ -147,7 +179,15 @@ ] }, { - "name": "g", + "name": { + "range": "TestCompile/patterns/scenarios.d2,6:1:32-6:2:33", + "value": [ + { + "string": "g", + "raw_string": "g" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/scenarios.d2,16:4:57-16:13:66", @@ -216,7 +256,15 @@ ] }, { - "name": "h", + "name": { + "range": "TestCompile/patterns/scenarios.d2,7:1:35-7:2:36", + "value": [ + { + "string": "h", + "raw_string": "h" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/scenarios.d2,16:4:57-16:13:66", @@ -289,11 +337,27 @@ { "edge_id": { "src_path": [ - "e" + { + "range": "TestCompile/patterns/scenarios.d2,4:1:26-4:2:27", + "value": [ + { + "string": "e", + "raw_string": "e" + } + ] + } ], "src_arrow": false, "dst_path": [ - "f" + { + "range": "TestCompile/patterns/scenarios.d2,5:1:29-5:2:30", + "value": [ + { + "string": "f", + "raw_string": "f" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -412,11 +476,27 @@ { "edge_id": { "src_path": [ - "e" + { + "range": "TestCompile/patterns/scenarios.d2,4:1:26-4:2:27", + "value": [ + { + "string": "e", + "raw_string": "e" + } + ] + } ], "src_arrow": false, "dst_path": [ - "g" + { + "range": "TestCompile/patterns/scenarios.d2,6:1:32-6:2:33", + "value": [ + { + "string": "g", + "raw_string": "g" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -535,11 +615,27 @@ { "edge_id": { "src_path": [ - "e" + { + "range": "TestCompile/patterns/scenarios.d2,4:1:26-4:2:27", + "value": [ + { + "string": "e", + "raw_string": "e" + } + ] + } ], "src_arrow": false, "dst_path": [ - "h" + { + "range": "TestCompile/patterns/scenarios.d2,7:1:35-7:2:36", + "value": [ + { + "string": "h", + "raw_string": "h" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -658,11 +754,27 @@ { "edge_id": { "src_path": [ - "f" + { + "range": "TestCompile/patterns/scenarios.d2,5:1:29-5:2:30", + "value": [ + { + "string": "f", + "raw_string": "f" + } + ] + } ], "src_arrow": false, "dst_path": [ - "e" + { + "range": "TestCompile/patterns/scenarios.d2,4:1:26-4:2:27", + "value": [ + { + "string": "e", + "raw_string": "e" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -781,11 +893,27 @@ { "edge_id": { "src_path": [ - "f" + { + "range": "TestCompile/patterns/scenarios.d2,5:1:29-5:2:30", + "value": [ + { + "string": "f", + "raw_string": "f" + } + ] + } ], "src_arrow": false, "dst_path": [ - "g" + { + "range": "TestCompile/patterns/scenarios.d2,6:1:32-6:2:33", + "value": [ + { + "string": "g", + "raw_string": "g" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -904,11 +1032,27 @@ { "edge_id": { "src_path": [ - "f" + { + "range": "TestCompile/patterns/scenarios.d2,5:1:29-5:2:30", + "value": [ + { + "string": "f", + "raw_string": "f" + } + ] + } ], "src_arrow": false, "dst_path": [ - "h" + { + "range": "TestCompile/patterns/scenarios.d2,7:1:35-7:2:36", + "value": [ + { + "string": "h", + "raw_string": "h" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -1027,11 +1171,27 @@ { "edge_id": { "src_path": [ - "g" + { + "range": "TestCompile/patterns/scenarios.d2,6:1:32-6:2:33", + "value": [ + { + "string": "g", + "raw_string": "g" + } + ] + } ], "src_arrow": false, "dst_path": [ - "e" + { + "range": "TestCompile/patterns/scenarios.d2,4:1:26-4:2:27", + "value": [ + { + "string": "e", + "raw_string": "e" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -1150,11 +1310,27 @@ { "edge_id": { "src_path": [ - "g" + { + "range": "TestCompile/patterns/scenarios.d2,6:1:32-6:2:33", + "value": [ + { + "string": "g", + "raw_string": "g" + } + ] + } ], "src_arrow": false, "dst_path": [ - "f" + { + "range": "TestCompile/patterns/scenarios.d2,5:1:29-5:2:30", + "value": [ + { + "string": "f", + "raw_string": "f" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -1273,11 +1449,27 @@ { "edge_id": { "src_path": [ - "g" + { + "range": "TestCompile/patterns/scenarios.d2,6:1:32-6:2:33", + "value": [ + { + "string": "g", + "raw_string": "g" + } + ] + } ], "src_arrow": false, "dst_path": [ - "h" + { + "range": "TestCompile/patterns/scenarios.d2,7:1:35-7:2:36", + "value": [ + { + "string": "h", + "raw_string": "h" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -1396,11 +1588,27 @@ { "edge_id": { "src_path": [ - "h" + { + "range": "TestCompile/patterns/scenarios.d2,7:1:35-7:2:36", + "value": [ + { + "string": "h", + "raw_string": "h" + } + ] + } ], "src_arrow": false, "dst_path": [ - "e" + { + "range": "TestCompile/patterns/scenarios.d2,4:1:26-4:2:27", + "value": [ + { + "string": "e", + "raw_string": "e" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -1519,11 +1727,27 @@ { "edge_id": { "src_path": [ - "h" + { + "range": "TestCompile/patterns/scenarios.d2,7:1:35-7:2:36", + "value": [ + { + "string": "h", + "raw_string": "h" + } + ] + } ], "src_arrow": false, "dst_path": [ - "f" + { + "range": "TestCompile/patterns/scenarios.d2,5:1:29-5:2:30", + "value": [ + { + "string": "f", + "raw_string": "f" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -1642,11 +1866,27 @@ { "edge_id": { "src_path": [ - "h" + { + "range": "TestCompile/patterns/scenarios.d2,7:1:35-7:2:36", + "value": [ + { + "string": "h", + "raw_string": "h" + } + ] + } ], "src_arrow": false, "dst_path": [ - "g" + { + "range": "TestCompile/patterns/scenarios.d2,6:1:32-6:2:33", + "value": [ + { + "string": "g", + "raw_string": "g" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -2105,7 +2345,15 @@ ] }, { - "name": "a", + "name": { + "range": "TestCompile/patterns/scenarios.d2,11:0:44-11:1:45", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/scenarios.d2,16:4:57-16:13:66", @@ -2174,7 +2422,15 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/patterns/scenarios.d2,12:0:46-12:1:47", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/scenarios.d2,16:4:57-16:13:66", @@ -2243,7 +2499,15 @@ ] }, { - "name": "c", + "name": { + "range": "TestCompile/patterns/scenarios.d2,13:0:48-13:1:49", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/scenarios.d2,16:4:57-16:13:66", @@ -2312,7 +2576,15 @@ ] }, { - "name": "d", + "name": { + "range": "TestCompile/patterns/scenarios.d2,14:0:50-14:1:51", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/scenarios.d2,16:4:57-16:13:66", @@ -2385,11 +2657,27 @@ { "edge_id": { "src_path": [ - "a" + { + "range": "TestCompile/patterns/scenarios.d2,11:0:44-11:1:45", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } ], "src_arrow": false, "dst_path": [ - "b" + { + "range": "TestCompile/patterns/scenarios.d2,12:0:46-12:1:47", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -2508,11 +2796,27 @@ { "edge_id": { "src_path": [ - "a" + { + "range": "TestCompile/patterns/scenarios.d2,11:0:44-11:1:45", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } ], "src_arrow": false, "dst_path": [ - "c" + { + "range": "TestCompile/patterns/scenarios.d2,13:0:48-13:1:49", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -2631,11 +2935,27 @@ { "edge_id": { "src_path": [ - "a" + { + "range": "TestCompile/patterns/scenarios.d2,11:0:44-11:1:45", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } ], "src_arrow": false, "dst_path": [ - "d" + { + "range": "TestCompile/patterns/scenarios.d2,14:0:50-14:1:51", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -2754,11 +3074,27 @@ { "edge_id": { "src_path": [ - "b" + { + "range": "TestCompile/patterns/scenarios.d2,12:0:46-12:1:47", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } ], "src_arrow": false, "dst_path": [ - "a" + { + "range": "TestCompile/patterns/scenarios.d2,11:0:44-11:1:45", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -2877,11 +3213,27 @@ { "edge_id": { "src_path": [ - "b" + { + "range": "TestCompile/patterns/scenarios.d2,12:0:46-12:1:47", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } ], "src_arrow": false, "dst_path": [ - "c" + { + "range": "TestCompile/patterns/scenarios.d2,13:0:48-13:1:49", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -3000,11 +3352,27 @@ { "edge_id": { "src_path": [ - "b" + { + "range": "TestCompile/patterns/scenarios.d2,12:0:46-12:1:47", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } ], "src_arrow": false, "dst_path": [ - "d" + { + "range": "TestCompile/patterns/scenarios.d2,14:0:50-14:1:51", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -3123,11 +3491,27 @@ { "edge_id": { "src_path": [ - "c" + { + "range": "TestCompile/patterns/scenarios.d2,13:0:48-13:1:49", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } ], "src_arrow": false, "dst_path": [ - "a" + { + "range": "TestCompile/patterns/scenarios.d2,11:0:44-11:1:45", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -3246,11 +3630,27 @@ { "edge_id": { "src_path": [ - "c" + { + "range": "TestCompile/patterns/scenarios.d2,13:0:48-13:1:49", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } ], "src_arrow": false, "dst_path": [ - "b" + { + "range": "TestCompile/patterns/scenarios.d2,12:0:46-12:1:47", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -3369,11 +3769,27 @@ { "edge_id": { "src_path": [ - "c" + { + "range": "TestCompile/patterns/scenarios.d2,13:0:48-13:1:49", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } ], "src_arrow": false, "dst_path": [ - "d" + { + "range": "TestCompile/patterns/scenarios.d2,14:0:50-14:1:51", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -3492,11 +3908,27 @@ { "edge_id": { "src_path": [ - "d" + { + "range": "TestCompile/patterns/scenarios.d2,14:0:50-14:1:51", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } ], "src_arrow": false, "dst_path": [ - "a" + { + "range": "TestCompile/patterns/scenarios.d2,11:0:44-11:1:45", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -3615,11 +4047,27 @@ { "edge_id": { "src_path": [ - "d" + { + "range": "TestCompile/patterns/scenarios.d2,14:0:50-14:1:51", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } ], "src_arrow": false, "dst_path": [ - "b" + { + "range": "TestCompile/patterns/scenarios.d2,12:0:46-12:1:47", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -3738,11 +4186,27 @@ { "edge_id": { "src_path": [ - "d" + { + "range": "TestCompile/patterns/scenarios.d2,14:0:50-14:1:51", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } ], "src_arrow": false, "dst_path": [ - "c" + { + "range": "TestCompile/patterns/scenarios.d2,13:0:48-13:1:49", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } ], "dst_arrow": true, "index": 0, diff --git a/testdata/d2ir/TestCompile/patterns/single-glob/defaults.exp.json b/testdata/d2ir/TestCompile/patterns/single-glob/defaults.exp.json index ab8e85c96..963bfa773 100644 --- a/testdata/d2ir/TestCompile/patterns/single-glob/defaults.exp.json +++ b/testdata/d2ir/TestCompile/patterns/single-glob/defaults.exp.json @@ -1,15 +1,39 @@ { "fields": [ { - "name": "wrapper", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,0:0:0-0:7:7", + "value": [ + { + "string": "wrapper", + "raw_string": "wrapper" + } + ] + }, "composite": { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,4:8:37-4:9:38", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,1:1:14-1:6:19", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/single-glob/defaults.d2,1:8:21-1:12:25", @@ -169,11 +193,27 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,5:8:47-5:9:48", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,1:1:14-1:6:19", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/single-glob/defaults.d2,1:8:21-1:12:25", @@ -333,11 +373,27 @@ ] }, { - "name": "c", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,6:8:57-6:9:58", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,1:1:14-1:6:19", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/single-glob/defaults.d2,1:8:21-1:12:25", @@ -497,11 +553,27 @@ ] }, { - "name": "d", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,7:8:67-7:9:68", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,1:1:14-1:6:19", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/single-glob/defaults.d2,1:8:21-1:12:25", @@ -2527,23 +2599,63 @@ ] }, { - "name": "scenarios", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,9:0:70-9:9:79", + "value": [ + { + "string": "scenarios", + "raw_string": "scenarios" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,9:10:80-9:11:81", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "wrapper", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,0:0:0-0:7:7", + "value": [ + { + "string": "wrapper", + "raw_string": "wrapper" + } + ] + }, "composite": { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,4:8:37-4:9:38", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,1:1:14-1:6:19", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/single-glob/defaults.d2,1:8:21-1:12:25", @@ -2703,11 +2815,27 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,5:8:47-5:9:48", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,1:1:14-1:6:19", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/single-glob/defaults.d2,1:8:21-1:12:25", @@ -2867,11 +2995,27 @@ ] }, { - "name": "c", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,6:8:57-6:9:58", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,1:1:14-1:6:19", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/single-glob/defaults.d2,1:8:21-1:12:25", @@ -3031,11 +3175,27 @@ ] }, { - "name": "d", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,7:8:67-7:9:68", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,1:1:14-1:6:19", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/single-glob/defaults.d2,1:8:21-1:12:25", @@ -3195,11 +3355,27 @@ ] }, { - "name": "p", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,9:23:93-9:24:94", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,1:1:14-1:6:19", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/single-glob/defaults.d2,1:8:21-1:12:25", @@ -4948,28 +5124,8 @@ ] }, "key_path": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/single-glob/defaults.d2,0:0:0-0:9:9", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/single-glob/defaults.d2,0:0:0-0:7:7", @@ -5002,28 +5158,8 @@ "key": { "range": "TestCompile/patterns/single-glob/defaults.d2,0:0:0-2:1:27", "key": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/single-glob/defaults.d2,0:0:0-0:9:9", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/single-glob/defaults.d2,0:0:0-0:7:7", @@ -5108,28 +5244,8 @@ ] }, "key_path": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/single-glob/defaults.d2,0:0:0-0:9:9", "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - }, { "unquoted_string": { "range": "TestCompile/patterns/single-glob/defaults.d2,0:0:0-0:7:7", @@ -5162,28 +5278,248 @@ "key": { "range": "TestCompile/patterns/single-glob/defaults.d2,0:0:0-2:1:27", "key": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/single-glob/defaults.d2,0:0:0-0:9:9", "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/single-glob/defaults.d2,0:0:0-0:7:7", "value": [ { - "string": "scenarios" + "string": "wrapper", + "raw_string": "wrapper" } ] } }, { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "TestCompile/patterns/single-glob/defaults.d2,0:8:8-0:9:9", "value": [ { - "string": "x" + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "TestCompile/patterns/single-glob/defaults.d2,0:11:11-2:1:27", + "nodes": [ + { + "map_key": { + "range": "TestCompile/patterns/single-glob/defaults.d2,1:1:14-1:12:25", + "key": { + "range": "TestCompile/patterns/single-glob/defaults.d2,1:1:14-1:6:19", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/single-glob/defaults.d2,1:1:14-1:6:19", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/single-glob/defaults.d2,1:8:21-1:12:25", + "value": [ + { + "string": "page", + "raw_string": "page" + } + ] + } + } + } + } + ] + } + } + } + }, + "due_to_glob": true, + "due_to_lazy_glob": true + }, + { + "string": { + "range": "TestCompile/patterns/single-glob/defaults.d2,0:0:0-0:7:7", + "value": [ + { + "string": "wrapper", + "raw_string": "wrapper" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/single-glob/defaults.d2,0:0:0-0:9:9", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/single-glob/defaults.d2,0:0:0-0:7:7", + "value": [ + { + "string": "wrapper", + "raw_string": "wrapper" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/single-glob/defaults.d2,0:8:8-0:9:9", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/single-glob/defaults.d2,0:0:0-2:1:27", + "key": { + "range": "TestCompile/patterns/single-glob/defaults.d2,0:0:0-0:9:9", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/single-glob/defaults.d2,0:0:0-0:7:7", + "value": [ + { + "string": "wrapper", + "raw_string": "wrapper" } ] } }, + { + "unquoted_string": { + "range": "TestCompile/patterns/single-glob/defaults.d2,0:8:8-0:9:9", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "TestCompile/patterns/single-glob/defaults.d2,0:11:11-2:1:27", + "nodes": [ + { + "map_key": { + "range": "TestCompile/patterns/single-glob/defaults.d2,1:1:14-1:12:25", + "key": { + "range": "TestCompile/patterns/single-glob/defaults.d2,1:1:14-1:6:19", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/single-glob/defaults.d2,1:1:14-1:6:19", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "TestCompile/patterns/single-glob/defaults.d2,1:8:21-1:12:25", + "value": [ + { + "string": "page", + "raw_string": "page" + } + ] + } + } + } + } + ] + } + } + } + }, + "due_to_glob": true, + "due_to_lazy_glob": true + }, + { + "string": { + "range": "TestCompile/patterns/single-glob/defaults.d2,0:0:0-0:7:7", + "value": [ + { + "string": "wrapper", + "raw_string": "wrapper" + } + ] + }, + "key_path": { + "range": "TestCompile/patterns/single-glob/defaults.d2,0:0:0-0:9:9", + "path": [ + { + "unquoted_string": { + "range": "TestCompile/patterns/single-glob/defaults.d2,0:0:0-0:7:7", + "value": [ + { + "string": "wrapper", + "raw_string": "wrapper" + } + ] + } + }, + { + "unquoted_string": { + "range": "TestCompile/patterns/single-glob/defaults.d2,0:8:8-0:9:9", + "value": [ + { + "string": "*", + "raw_string": "*" + } + ], + "pattern": [ + "*" + ] + } + } + ] + }, + "context": { + "edge": null, + "key": { + "range": "TestCompile/patterns/single-glob/defaults.d2,0:0:0-2:1:27", + "key": { + "range": "TestCompile/patterns/single-glob/defaults.d2,0:0:0-0:9:9", + "path": [ { "unquoted_string": { "range": "TestCompile/patterns/single-glob/defaults.d2,0:0:0-0:7:7", @@ -5377,324 +5713,6 @@ }, "due_to_glob": false, "due_to_lazy_glob": false - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/single-glob/defaults.d2,0:0:0-0:7:7", - "value": [ - { - "string": "wrapper", - "raw_string": "wrapper" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/single-glob/defaults.d2,0:8:8-0:9:9", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/single-glob/defaults.d2,0:0:0-2:1:27", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/single-glob/defaults.d2,0:0:0-0:7:7", - "value": [ - { - "string": "wrapper", - "raw_string": "wrapper" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/single-glob/defaults.d2,0:8:8-0:9:9", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/patterns/single-glob/defaults.d2,0:11:11-2:1:27", - "nodes": [ - { - "map_key": { - "range": "TestCompile/patterns/single-glob/defaults.d2,1:1:14-1:12:25", - "key": { - "range": "TestCompile/patterns/single-glob/defaults.d2,1:1:14-1:6:19", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/single-glob/defaults.d2,1:1:14-1:6:19", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/single-glob/defaults.d2,1:8:21-1:12:25", - "value": [ - { - "string": "page", - "raw_string": "page" - } - ] - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/single-glob/defaults.d2,0:0:0-0:7:7", - "value": [ - { - "string": "wrapper", - "raw_string": "wrapper" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/single-glob/defaults.d2,0:8:8-0:9:9", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/single-glob/defaults.d2,0:0:0-2:1:27", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/single-glob/defaults.d2,0:0:0-0:7:7", - "value": [ - { - "string": "wrapper", - "raw_string": "wrapper" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/single-glob/defaults.d2,0:8:8-0:9:9", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/patterns/single-glob/defaults.d2,0:11:11-2:1:27", - "nodes": [ - { - "map_key": { - "range": "TestCompile/patterns/single-glob/defaults.d2,1:1:14-1:12:25", - "key": { - "range": "TestCompile/patterns/single-glob/defaults.d2,1:1:14-1:6:19", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/single-glob/defaults.d2,1:1:14-1:6:19", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/single-glob/defaults.d2,1:8:21-1:12:25", - "value": [ - { - "string": "page", - "raw_string": "page" - } - ] - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true } ] } @@ -5816,341 +5834,55 @@ }, "due_to_glob": false, "due_to_lazy_glob": false - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/single-glob/defaults.d2,0:0:0-0:7:7", - "value": [ - { - "string": "wrapper", - "raw_string": "wrapper" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/single-glob/defaults.d2,0:8:8-0:9:9", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/single-glob/defaults.d2,0:0:0-2:1:27", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/single-glob/defaults.d2,0:0:0-0:7:7", - "value": [ - { - "string": "wrapper", - "raw_string": "wrapper" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/single-glob/defaults.d2,0:8:8-0:9:9", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/patterns/single-glob/defaults.d2,0:11:11-2:1:27", - "nodes": [ - { - "map_key": { - "range": "TestCompile/patterns/single-glob/defaults.d2,1:1:14-1:12:25", - "key": { - "range": "TestCompile/patterns/single-glob/defaults.d2,1:1:14-1:6:19", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/single-glob/defaults.d2,1:1:14-1:6:19", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/single-glob/defaults.d2,1:8:21-1:12:25", - "value": [ - { - "string": "page", - "raw_string": "page" - } - ] - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/single-glob/defaults.d2,0:0:0-0:7:7", - "value": [ - { - "string": "wrapper", - "raw_string": "wrapper" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/single-glob/defaults.d2,0:8:8-0:9:9", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/single-glob/defaults.d2,0:0:0-2:1:27", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/single-glob/defaults.d2,0:0:0-0:7:7", - "value": [ - { - "string": "wrapper", - "raw_string": "wrapper" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/single-glob/defaults.d2,0:8:8-0:9:9", - "value": [ - { - "string": "*", - "raw_string": "*" - } - ], - "pattern": [ - "*" - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/patterns/single-glob/defaults.d2,0:11:11-2:1:27", - "nodes": [ - { - "map_key": { - "range": "TestCompile/patterns/single-glob/defaults.d2,1:1:14-1:12:25", - "key": { - "range": "TestCompile/patterns/single-glob/defaults.d2,1:1:14-1:6:19", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/single-glob/defaults.d2,1:1:14-1:6:19", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/single-glob/defaults.d2,1:8:21-1:12:25", - "value": [ - { - "string": "page", - "raw_string": "page" - } - ] - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true } ] }, { - "name": "layers", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,10:0:97-10:6:103", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,10:7:104-10:8:105", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "wrapper", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,10:12:109-10:19:116", + "value": [ + { + "string": "wrapper", + "raw_string": "wrapper" + } + ] + }, "composite": { "fields": [ { - "name": "p", + "name": { + "range": "TestCompile/patterns/single-glob/defaults.d2,10:20:117-10:21:118", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + }, "references": [ { "string": { diff --git a/testdata/d2ir/TestCompile/patterns/suffix.exp.json b/testdata/d2ir/TestCompile/patterns/suffix.exp.json index b0cb6cbeb..39d2dcfb7 100644 --- a/testdata/d2ir/TestCompile/patterns/suffix.exp.json +++ b/testdata/d2ir/TestCompile/patterns/suffix.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "animal", + "name": { + "range": "TestCompile/patterns/suffix.d2,0:0:0-0:6:6", + "value": [ + { + "string": "animal", + "raw_string": "animal" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/suffix.d2,2:4:30-2:11:37", @@ -80,7 +88,15 @@ ] }, { - "name": "jingle", + "name": { + "range": "TestCompile/patterns/suffix.d2,1:0:13-1:6:19", + "value": [ + { + "string": "jingle", + "raw_string": "jingle" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/suffix.d2,2:4:30-2:11:37", diff --git a/testdata/d2ir/TestCompile/patterns/table-class-exception.exp.json b/testdata/d2ir/TestCompile/patterns/table-class-exception.exp.json index 8b4fedc2d..850fc7695 100644 --- a/testdata/d2ir/TestCompile/patterns/table-class-exception.exp.json +++ b/testdata/d2ir/TestCompile/patterns/table-class-exception.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "table", + "name": { + "range": "TestCompile/patterns/table-class-exception.d2,9:0:46-9:5:51", + "value": [ + { + "string": "table", + "raw_string": "table" + } + ] + }, "composite": { "fields": [ { - "name": "c", + "name": { + "range": "TestCompile/patterns/table-class-exception.d2,2:2:10-2:3:11", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/table-class-exception.d2,2:5:13-2:6:14", @@ -20,11 +36,27 @@ "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/table-class-exception.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/table-class-exception.d2,6:8:33-6:12:37", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/table-class-exception.d2,6:14:39-6:17:42", @@ -285,11 +317,27 @@ ] }, { - "name": "style", + "name": { + "range": "TestCompile/patterns/table-class-exception.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/table-class-exception.d2,6:8:33-6:12:37", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/table-class-exception.d2,6:14:39-6:17:42", @@ -481,7 +529,15 @@ ] }, { - "name": "shape", + "name": { + "range": "TestCompile/patterns/table-class-exception.d2,10:2:57-10:7:62", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/table-class-exception.d2,10:9:64-10:18:73", @@ -560,7 +616,15 @@ ] }, { - "name": "a", + "name": { + "range": "TestCompile/patterns/table-class-exception.d2,11:2:76-11:3:77", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/table-class-exception.d2,11:5:79-11:6:80", @@ -575,11 +639,27 @@ "composite": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/patterns/table-class-exception.d2,6:2:27-6:7:32", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "fill", + "name": { + "range": "TestCompile/patterns/table-class-exception.d2,6:8:33-6:12:37", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/table-class-exception.d2,6:14:39-6:17:42", @@ -971,11 +1051,27 @@ ] }, { - "name": "class", + "name": { + "range": "TestCompile/patterns/table-class-exception.d2,14:0:84-14:5:89", + "value": [ + { + "string": "class", + "raw_string": "class" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/table-class-exception.d2,15:2:95-15:7:100", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/table-class-exception.d2,15:9:102-15:14:107", @@ -1054,7 +1150,15 @@ ] }, { - "name": "a", + "name": { + "range": "TestCompile/patterns/table-class-exception.d2,16:2:110-16:3:111", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/table-class-exception.d2,16:5:113-16:6:114", diff --git a/testdata/d2ir/TestCompile/patterns/triple-glob/defaults.exp.json b/testdata/d2ir/TestCompile/patterns/triple-glob/defaults.exp.json index 0607e99f9..68e254821 100644 --- a/testdata/d2ir/TestCompile/patterns/triple-glob/defaults.exp.json +++ b/testdata/d2ir/TestCompile/patterns/triple-glob/defaults.exp.json @@ -1,11 +1,27 @@ { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,4:0:23-4:1:24", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,1:1:8-1:6:13", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/triple-glob/defaults.d2,1:8:15-1:12:19", @@ -143,11 +159,27 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,5:0:25-5:1:26", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,1:1:8-1:6:13", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/triple-glob/defaults.d2,1:8:15-1:12:19", @@ -285,11 +317,27 @@ ] }, { - "name": "c", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,6:0:27-6:1:28", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,1:1:8-1:6:13", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/triple-glob/defaults.d2,1:8:15-1:12:19", @@ -427,11 +475,27 @@ ] }, { - "name": "d", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,7:0:29-7:1:30", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,1:1:8-1:6:13", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/triple-glob/defaults.d2,1:8:15-1:12:19", @@ -569,19 +633,51 @@ ] }, { - "name": "scenarios", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,9:0:32-9:9:41", + "value": [ + { + "string": "scenarios", + "raw_string": "scenarios" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,9:10:42-9:11:43", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,4:0:23-4:1:24", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,1:1:8-1:6:13", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/triple-glob/defaults.d2,1:8:15-1:12:19", @@ -782,11 +878,27 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,5:0:25-5:1:26", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,1:1:8-1:6:13", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/triple-glob/defaults.d2,1:8:15-1:12:19", @@ -987,11 +1099,27 @@ ] }, { - "name": "c", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,6:0:27-6:1:28", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,1:1:8-1:6:13", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/triple-glob/defaults.d2,1:8:15-1:12:19", @@ -1192,11 +1320,27 @@ ] }, { - "name": "d", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,7:0:29-7:1:30", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,1:1:8-1:6:13", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/triple-glob/defaults.d2,1:8:15-1:12:19", @@ -1397,11 +1541,27 @@ ] }, { - "name": "p", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,9:15:47-9:16:48", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,1:1:8-1:6:13", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/triple-glob/defaults.d2,1:8:15-1:12:19", @@ -1645,296 +1805,6 @@ }, "due_to_glob": false, "due_to_lazy_glob": false - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,0:0:0-0:3:3", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,0:0:0-2:1:21", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,0:0:0-0:3:3", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,0:5:5-2:1:21", - "nodes": [ - { - "map_key": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,1:1:8-1:12:19", - "key": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,1:1:8-1:6:13", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,1:1:8-1:6:13", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,1:8:15-1:12:19", - "value": [ - { - "string": "page", - "raw_string": "page" - } - ] - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,0:0:0-0:3:3", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,0:0:0-2:1:21", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,0:0:0-0:3:3", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,0:5:5-2:1:21", - "nodes": [ - { - "map_key": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,1:1:8-1:12:19", - "key": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,1:1:8-1:6:13", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,1:1:8-1:6:13", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,1:8:15-1:12:19", - "value": [ - { - "string": "page", - "raw_string": "page" - } - ] - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true } ] } @@ -2045,313 +1915,55 @@ }, "due_to_glob": false, "due_to_lazy_glob": false - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,0:0:0-0:3:3", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,0:0:0-2:1:21", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,0:0:0-0:3:3", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,0:5:5-2:1:21", - "nodes": [ - { - "map_key": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,1:1:8-1:12:19", - "key": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,1:1:8-1:6:13", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,1:1:8-1:6:13", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,1:8:15-1:12:19", - "value": [ - { - "string": "page", - "raw_string": "page" - } - ] - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,0:0:0-0:3:3", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,0:0:0-2:1:21", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,0:0:0-0:3:3", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,0:5:5-2:1:21", - "nodes": [ - { - "map_key": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,1:1:8-1:12:19", - "key": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,1:1:8-1:6:13", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,1:1:8-1:6:13", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,1:8:15-1:12:19", - "value": [ - { - "string": "page", - "raw_string": "page" - } - ] - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true } ] }, { - "name": "layers", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,10:0:51-10:6:57", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,10:7:58-10:8:59", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "p", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,10:12:63-10:13:64", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/triple-glob/defaults.d2,1:1:8-1:6:13", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/triple-glob/defaults.d2,1:8:15-1:12:19", @@ -2595,296 +2207,6 @@ }, "due_to_glob": false, "due_to_lazy_glob": false - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,0:0:0-0:3:3", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,0:0:0-2:1:21", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,0:0:0-0:3:3", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,0:5:5-2:1:21", - "nodes": [ - { - "map_key": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,1:1:8-1:12:19", - "key": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,1:1:8-1:6:13", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,1:1:8-1:6:13", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,1:8:15-1:12:19", - "value": [ - { - "string": "page", - "raw_string": "page" - } - ] - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,0:0:0-0:3:3", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,0:0:0-2:1:21", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,0:0:0-0:3:3", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,0:5:5-2:1:21", - "nodes": [ - { - "map_key": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,1:1:8-1:12:19", - "key": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,1:1:8-1:6:13", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,1:1:8-1:6:13", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,1:8:15-1:12:19", - "value": [ - { - "string": "page", - "raw_string": "page" - } - ] - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true } ] } @@ -2995,296 +2317,6 @@ }, "due_to_glob": false, "due_to_lazy_glob": false - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,0:0:0-0:3:3", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,0:0:0-2:1:21", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,0:0:0-0:3:3", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,0:5:5-2:1:21", - "nodes": [ - { - "map_key": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,1:1:8-1:12:19", - "key": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,1:1:8-1:6:13", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,1:1:8-1:6:13", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,1:8:15-1:12:19", - "value": [ - { - "string": "page", - "raw_string": "page" - } - ] - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,0:0:0-0:3:3", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,0:0:0-2:1:21", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,0:0:0-0:3:3", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,0:5:5-2:1:21", - "nodes": [ - { - "map_key": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,1:1:8-1:12:19", - "key": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,1:1:8-1:6:13", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,1:1:8-1:6:13", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/defaults.d2,1:8:15-1:12:19", - "value": [ - { - "string": "page", - "raw_string": "page" - } - ] - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true } ] } diff --git a/testdata/d2ir/TestCompile/patterns/triple-glob/edge-defaults.exp.json b/testdata/d2ir/TestCompile/patterns/triple-glob/edge-defaults.exp.json index 9b2766ddb..c3ed0fa06 100644 --- a/testdata/d2ir/TestCompile/patterns/triple-glob/edge-defaults.exp.json +++ b/testdata/d2ir/TestCompile/patterns/triple-glob/edge-defaults.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,4:0:55-4:1:56", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "references": [ { "string": { @@ -118,7 +126,15 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,4:5:60-4:6:61", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "references": [ { "string": { @@ -235,7 +251,15 @@ ] }, { - "name": "c", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,5:0:62-5:1:63", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, "references": [ { "string": { @@ -352,7 +376,15 @@ ] }, { - "name": "d", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,5:5:67-5:6:68", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + }, "references": [ { "string": { @@ -469,15 +501,39 @@ ] }, { - "name": "scenarios", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,7:0:70-7:9:79", + "value": [ + { + "string": "scenarios", + "raw_string": "scenarios" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,7:10:80-7:11:81", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,4:0:55-4:1:56", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "references": [ { "string": { @@ -594,7 +650,15 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,4:5:60-4:6:61", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "references": [ { "string": { @@ -711,7 +775,15 @@ ] }, { - "name": "c", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,5:0:62-5:1:63", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + }, "references": [ { "string": { @@ -828,7 +900,15 @@ ] }, { - "name": "d", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,5:5:67-5:6:68", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + }, "references": [ { "string": { @@ -945,7 +1025,15 @@ ] }, { - "name": "p", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,7:15:85-7:16:86", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + }, "references": [ { "string": { @@ -1062,7 +1150,15 @@ ] }, { - "name": "q", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,7:20:90-7:21:91", + "value": [ + { + "string": "q", + "raw_string": "q" + } + ] + }, "references": [ { "string": { @@ -1183,11 +1279,27 @@ { "edge_id": { "src_path": [ - "a" + { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,4:0:55-4:1:56", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } ], "src_arrow": false, "dst_path": [ - "b" + { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,4:5:60-4:6:61", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -1196,11 +1308,27 @@ "map": { "fields": [ { - "name": "target-arrowhead", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:17:36", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:18:37-1:23:42", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:25:44-1:32:51", @@ -1877,31 +2005,6 @@ }, "key": { "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:0:0-2:1:53", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - } - ] - }, "edges": [ { "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:11:11", @@ -2022,11 +2125,27 @@ { "edge_id": { "src_path": [ - "c" + { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,5:0:62-5:1:63", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } ], "src_arrow": false, "dst_path": [ - "d" + { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,5:5:67-5:6:68", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -2035,11 +2154,27 @@ "map": { "fields": [ { - "name": "target-arrowhead", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:17:36", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:18:37-1:23:42", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:25:44-1:32:51", @@ -2716,31 +2851,6 @@ }, "key": { "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:0:0-2:1:53", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - } - ] - }, "edges": [ { "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:11:11", @@ -2861,11 +2971,27 @@ { "edge_id": { "src_path": [ - "p" + { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,7:15:85-7:16:86", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + } ], "src_arrow": false, "dst_path": [ - "q" + { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,7:20:90-7:21:91", + "value": [ + { + "string": "q", + "raw_string": "q" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -2874,11 +3000,27 @@ "map": { "fields": [ { - "name": "target-arrowhead", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:17:36", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:18:37-1:23:42", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:25:44-1:32:51", @@ -3215,31 +3357,6 @@ }, "key": { "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:0:0-2:1:53", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - } - ] - }, "edges": [ { "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:11:11", @@ -3486,718 +3603,6 @@ }, "due_to_glob": false, "due_to_lazy_glob": false - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:0:0-2:1:53", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:11:11", - "src": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:4:4", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:4:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:8:8-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:8:8-0:11:11", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:12:12-0:15:15", - "int": null, - "glob": true - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:17:17-2:1:53", - "nodes": [ - { - "map_key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:32:51", - "key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:23:42", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:17:36", - "value": [ - { - "string": "target-arrowhead", - "raw_string": "target-arrowhead" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:18:37-1:23:42", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:25:44-1:32:51", - "value": [ - { - "string": "diamond", - "raw_string": "diamond" - } - ] - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:0:0-2:1:53", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:11:11", - "src": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:4:4", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:4:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:8:8-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:8:8-0:11:11", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:12:12-0:15:15", - "int": null, - "glob": true - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:17:17-2:1:53", - "nodes": [ - { - "map_key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:32:51", - "key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:23:42", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:17:36", - "value": [ - { - "string": "target-arrowhead", - "raw_string": "target-arrowhead" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:18:37-1:23:42", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:25:44-1:32:51", - "value": [ - { - "string": "diamond", - "raw_string": "diamond" - } - ] - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:0:0-2:1:53", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:11:11", - "src": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:4:4", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:4:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:8:8-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:8:8-0:11:11", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:12:12-0:15:15", - "int": null, - "glob": true - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:17:17-2:1:53", - "nodes": [ - { - "map_key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:32:51", - "key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:23:42", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:17:36", - "value": [ - { - "string": "target-arrowhead", - "raw_string": "target-arrowhead" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:18:37-1:23:42", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:25:44-1:32:51", - "value": [ - { - "string": "diamond", - "raw_string": "diamond" - } - ] - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:0:0-2:1:53", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:11:11", - "src": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:4:4", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:4:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:8:8-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:8:8-0:11:11", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:12:12-0:15:15", - "int": null, - "glob": true - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:17:17-2:1:53", - "nodes": [ - { - "map_key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:32:51", - "key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:23:42", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:17:36", - "value": [ - { - "string": "target-arrowhead", - "raw_string": "target-arrowhead" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:18:37-1:23:42", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:25:44-1:32:51", - "value": [ - { - "string": "diamond", - "raw_string": "diamond" - } - ] - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true } ] } @@ -4331,731 +3736,43 @@ }, "due_to_glob": false, "due_to_lazy_glob": false - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:0:0-2:1:53", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:11:11", - "src": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:4:4", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:4:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:8:8-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:8:8-0:11:11", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:12:12-0:15:15", - "int": null, - "glob": true - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:17:17-2:1:53", - "nodes": [ - { - "map_key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:32:51", - "key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:23:42", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:17:36", - "value": [ - { - "string": "target-arrowhead", - "raw_string": "target-arrowhead" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:18:37-1:23:42", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:25:44-1:32:51", - "value": [ - { - "string": "diamond", - "raw_string": "diamond" - } - ] - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:0:0-2:1:53", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:11:11", - "src": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:4:4", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:4:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:8:8-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:8:8-0:11:11", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:12:12-0:15:15", - "int": null, - "glob": true - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:17:17-2:1:53", - "nodes": [ - { - "map_key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:32:51", - "key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:23:42", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:17:36", - "value": [ - { - "string": "target-arrowhead", - "raw_string": "target-arrowhead" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:18:37-1:23:42", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:25:44-1:32:51", - "value": [ - { - "string": "diamond", - "raw_string": "diamond" - } - ] - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:0:0-2:1:53", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:11:11", - "src": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:4:4", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:4:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:8:8-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:8:8-0:11:11", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:12:12-0:15:15", - "int": null, - "glob": true - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:17:17-2:1:53", - "nodes": [ - { - "map_key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:32:51", - "key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:23:42", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:17:36", - "value": [ - { - "string": "target-arrowhead", - "raw_string": "target-arrowhead" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:18:37-1:23:42", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:25:44-1:32:51", - "value": [ - { - "string": "diamond", - "raw_string": "diamond" - } - ] - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:0:0-2:1:53", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "scenarios" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:11:11", - "src": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:4:4", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:4:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:8:8-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:8:8-0:11:11", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:12:12-0:15:15", - "int": null, - "glob": true - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:17:17-2:1:53", - "nodes": [ - { - "map_key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:32:51", - "key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:23:42", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:17:36", - "value": [ - { - "string": "target-arrowhead", - "raw_string": "target-arrowhead" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:18:37-1:23:42", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:25:44-1:32:51", - "value": [ - { - "string": "diamond", - "raw_string": "diamond" - } - ] - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true } ] }, { - "name": "layers", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,8:0:94-8:6:100", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,8:7:101-8:8:102", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "composite": { "fields": [ { - "name": "j", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,8:12:106-8:13:107", + "value": [ + { + "string": "j", + "raw_string": "j" + } + ] + }, "references": [ { "string": { @@ -5172,7 +3889,15 @@ ] }, { - "name": "f", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,8:17:111-8:18:112", + "value": [ + { + "string": "f", + "raw_string": "f" + } + ] + }, "references": [ { "string": { @@ -5293,11 +4018,27 @@ { "edge_id": { "src_path": [ - "j" + { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,8:12:106-8:13:107", + "value": [ + { + "string": "j", + "raw_string": "j" + } + ] + } ], "src_arrow": false, "dst_path": [ - "f" + { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,8:17:111-8:18:112", + "value": [ + { + "string": "f", + "raw_string": "f" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -5306,11 +4047,27 @@ "map": { "fields": [ { - "name": "target-arrowhead", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:17:36", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:18:37-1:23:42", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:25:44-1:32:51", @@ -5647,31 +4404,6 @@ }, "key": { "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:0:0-2:1:53", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - } - ] - }, "edges": [ { "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:11:11", @@ -5918,718 +4650,6 @@ }, "due_to_glob": false, "due_to_lazy_glob": false - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:0:0-2:1:53", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:11:11", - "src": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:4:4", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:4:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:8:8-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:8:8-0:11:11", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:12:12-0:15:15", - "int": null, - "glob": true - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:17:17-2:1:53", - "nodes": [ - { - "map_key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:32:51", - "key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:23:42", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:17:36", - "value": [ - { - "string": "target-arrowhead", - "raw_string": "target-arrowhead" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:18:37-1:23:42", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:25:44-1:32:51", - "value": [ - { - "string": "diamond", - "raw_string": "diamond" - } - ] - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:0:0-2:1:53", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:11:11", - "src": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:4:4", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:4:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:8:8-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:8:8-0:11:11", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:12:12-0:15:15", - "int": null, - "glob": true - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:17:17-2:1:53", - "nodes": [ - { - "map_key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:32:51", - "key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:23:42", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:17:36", - "value": [ - { - "string": "target-arrowhead", - "raw_string": "target-arrowhead" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:18:37-1:23:42", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:25:44-1:32:51", - "value": [ - { - "string": "diamond", - "raw_string": "diamond" - } - ] - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:0:0-2:1:53", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:11:11", - "src": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:4:4", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:4:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:8:8-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:8:8-0:11:11", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:12:12-0:15:15", - "int": null, - "glob": true - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:17:17-2:1:53", - "nodes": [ - { - "map_key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:32:51", - "key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:23:42", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:17:36", - "value": [ - { - "string": "target-arrowhead", - "raw_string": "target-arrowhead" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:18:37-1:23:42", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:25:44-1:32:51", - "value": [ - { - "string": "diamond", - "raw_string": "diamond" - } - ] - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:0:0-2:1:53", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:11:11", - "src": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:4:4", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:4:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:8:8-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:8:8-0:11:11", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:12:12-0:15:15", - "int": null, - "glob": true - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:17:17-2:1:53", - "nodes": [ - { - "map_key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:32:51", - "key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:23:42", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:17:36", - "value": [ - { - "string": "target-arrowhead", - "raw_string": "target-arrowhead" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:18:37-1:23:42", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:25:44-1:32:51", - "value": [ - { - "string": "diamond", - "raw_string": "diamond" - } - ] - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true } ] } @@ -6763,718 +4783,6 @@ }, "due_to_glob": false, "due_to_lazy_glob": false - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:0:0-2:1:53", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:11:11", - "src": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:4:4", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:4:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:8:8-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:8:8-0:11:11", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:12:12-0:15:15", - "int": null, - "glob": true - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:17:17-2:1:53", - "nodes": [ - { - "map_key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:32:51", - "key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:23:42", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:17:36", - "value": [ - { - "string": "target-arrowhead", - "raw_string": "target-arrowhead" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:18:37-1:23:42", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:25:44-1:32:51", - "value": [ - { - "string": "diamond", - "raw_string": "diamond" - } - ] - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:0:0-2:1:53", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:11:11", - "src": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:4:4", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:4:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:8:8-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:8:8-0:11:11", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:12:12-0:15:15", - "int": null, - "glob": true - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:17:17-2:1:53", - "nodes": [ - { - "map_key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:32:51", - "key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:23:42", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:17:36", - "value": [ - { - "string": "target-arrowhead", - "raw_string": "target-arrowhead" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:18:37-1:23:42", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:25:44-1:32:51", - "value": [ - { - "string": "diamond", - "raw_string": "diamond" - } - ] - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:0:0-2:1:53", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:11:11", - "src": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:4:4", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:4:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:8:8-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:8:8-0:11:11", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:12:12-0:15:15", - "int": null, - "glob": true - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:17:17-2:1:53", - "nodes": [ - { - "map_key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:32:51", - "key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:23:42", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:17:36", - "value": [ - { - "string": "target-arrowhead", - "raw_string": "target-arrowhead" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:18:37-1:23:42", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:25:44-1:32:51", - "value": [ - { - "string": "diamond", - "raw_string": "diamond" - } - ] - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true - }, - { - "string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - }, - "key_path": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - } - ] - }, - "context": { - "edge": null, - "key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:0:0-2:1:53", - "key": { - "range": ",0:0:0-0:0:0", - "path": [ - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "layers" - } - ] - } - }, - { - "unquoted_string": { - "range": ",0:0:0-0:0:0", - "value": [ - { - "string": "x" - } - ] - } - } - ] - }, - "edges": [ - { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:11:11", - "src": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:4:4", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:1:1-0:4:4", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "src_arrow": "", - "dst": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:8:8-0:11:11", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:8:8-0:11:11", - "value": [ - { - "string": "***", - "raw_string": "***" - } - ], - "pattern": [ - "*", - "", - "*", - "", - "*" - ] - } - } - ] - }, - "dst_arrow": ">" - } - ], - "edge_index": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:12:12-0:15:15", - "int": null, - "glob": true - }, - "primary": {}, - "value": { - "map": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,0:17:17-2:1:53", - "nodes": [ - { - "map_key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:32:51", - "key": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:23:42", - "path": [ - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:17:36", - "value": [ - { - "string": "target-arrowhead", - "raw_string": "target-arrowhead" - } - ] - } - }, - { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:18:37-1:23:42", - "value": [ - { - "string": "shape", - "raw_string": "shape" - } - ] - } - } - ] - }, - "primary": {}, - "value": { - "unquoted_string": { - "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:25:44-1:32:51", - "value": [ - { - "string": "diamond", - "raw_string": "diamond" - } - ] - } - } - } - } - ] - } - } - } - }, - "due_to_glob": true, - "due_to_lazy_glob": true } ] } @@ -7483,11 +4791,27 @@ { "edge_id": { "src_path": [ - "a" + { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,4:0:55-4:1:56", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } ], "src_arrow": false, "dst_path": [ - "b" + { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,4:5:60-4:6:61", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -7496,11 +4820,27 @@ "map": { "fields": [ { - "name": "target-arrowhead", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:17:36", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:18:37-1:23:42", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:25:44-1:32:51", @@ -7957,11 +5297,27 @@ { "edge_id": { "src_path": [ - "c" + { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,5:0:62-5:1:63", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } ], "src_arrow": false, "dst_path": [ - "d" + { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,5:5:67-5:6:68", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -7970,11 +5326,27 @@ "map": { "fields": [ { - "name": "target-arrowhead", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:1:20-1:17:36", + "value": [ + { + "string": "target-arrowhead", + "raw_string": "target-arrowhead" + } + ] + }, "composite": { "fields": [ { - "name": "shape", + "name": { + "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:18:37-1:23:42", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + }, "primary": { "value": { "range": "TestCompile/patterns/triple-glob/edge-defaults.d2,1:25:44-1:32:51", diff --git a/testdata/d2ir/TestCompile/scenarios/edge.exp.json b/testdata/d2ir/TestCompile/scenarios/edge.exp.json index 86c00ee6e..e310c85e5 100644 --- a/testdata/d2ir/TestCompile/scenarios/edge.exp.json +++ b/testdata/d2ir/TestCompile/scenarios/edge.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "references": [ { "string": { @@ -118,7 +126,15 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "references": [ { "string": { @@ -235,15 +251,39 @@ ] }, { - "name": "scenarios", + "name": { + "range": "TestCompile/scenarios/edge.d2,1:0:7-1:9:16", + "value": [ + { + "string": "scenarios", + "raw_string": "scenarios" + } + ] + }, "composite": { "fields": [ { - "name": "1", + "name": { + "range": "TestCompile/scenarios/edge.d2,2:2:22-2:3:23", + "value": [ + { + "string": "1", + "raw_string": "1" + } + ] + }, "composite": { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "references": [ { "string": { @@ -510,7 +550,15 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "references": [ { "string": { @@ -781,11 +829,27 @@ { "edge_id": { "src_path": [ - "a" + { + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } ], "src_arrow": false, "dst_path": [ - "b" + { + "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -794,11 +858,27 @@ "map": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/scenarios/edge.d2,3:16:43-3:21:48", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/scenarios/edge.d2,3:22:49-3:29:56", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/scenarios/edge.d2,3:31:58-3:34:61", @@ -1686,11 +1766,27 @@ { "edge_id": { "src_path": [ - "a" + { + "range": "TestCompile/scenarios/edge.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } ], "src_arrow": false, "dst_path": [ - "b" + { + "range": "TestCompile/scenarios/edge.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } ], "dst_arrow": true, "index": 0, diff --git a/testdata/d2ir/TestCompile/scenarios/multiple-scenario-map.exp.json b/testdata/d2ir/TestCompile/scenarios/multiple-scenario-map.exp.json index 603b8a13f..2e605908f 100644 --- a/testdata/d2ir/TestCompile/scenarios/multiple-scenario-map.exp.json +++ b/testdata/d2ir/TestCompile/scenarios/multiple-scenario-map.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/scenarios/multiple-scenario-map.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "references": [ { "string": { @@ -164,7 +172,15 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/scenarios/multiple-scenario-map.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "references": [ { "string": { @@ -327,15 +343,39 @@ ] }, { - "name": "scenarios", + "name": { + "range": "TestCompile/scenarios/multiple-scenario-map.d2,1:0:31-1:9:40", + "value": [ + { + "string": "scenarios", + "raw_string": "scenarios" + } + ] + }, "composite": { "fields": [ { - "name": "1", + "name": { + "range": "TestCompile/scenarios/multiple-scenario-map.d2,2:2:46-2:3:47", + "value": [ + { + "string": "1", + "raw_string": "1" + } + ] + }, "composite": { "fields": [ { - "name": "a", + "name": { + "range": "TestCompile/scenarios/multiple-scenario-map.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + }, "references": [ { "string": { @@ -648,7 +688,15 @@ ] }, { - "name": "b", + "name": { + "range": "TestCompile/scenarios/multiple-scenario-map.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + }, "references": [ { "string": { @@ -961,7 +1009,15 @@ ] }, { - "name": "z", + "name": { + "range": "TestCompile/scenarios/multiple-scenario-map.d2,6:1:98-6:2:99", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + }, "references": [ { "string": { @@ -1023,11 +1079,27 @@ { "edge_id": { "src_path": [ - "a" + { + "range": "TestCompile/scenarios/multiple-scenario-map.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } ], "src_arrow": false, "dst_path": [ - "b" + { + "range": "TestCompile/scenarios/multiple-scenario-map.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -1036,11 +1108,27 @@ "map": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/scenarios/multiple-scenario-map.d2,0:10:10-0:15:15", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/scenarios/multiple-scenario-map.d2,0:16:16-0:23:23", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/scenarios/multiple-scenario-map.d2,3:31:82-3:34:85", @@ -2270,11 +2358,27 @@ { "edge_id": { "src_path": [ - "a" + { + "range": "TestCompile/scenarios/multiple-scenario-map.d2,0:0:0-0:1:1", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } ], "src_arrow": false, "dst_path": [ - "b" + { + "range": "TestCompile/scenarios/multiple-scenario-map.d2,0:5:5-0:6:6", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -2283,11 +2387,27 @@ "map": { "fields": [ { - "name": "style", + "name": { + "range": "TestCompile/scenarios/multiple-scenario-map.d2,0:10:10-0:15:15", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + }, "composite": { "fields": [ { - "name": "opacity", + "name": { + "range": "TestCompile/scenarios/multiple-scenario-map.d2,0:16:16-0:23:23", + "value": [ + { + "string": "opacity", + "raw_string": "opacity" + } + ] + }, "primary": { "value": { "range": "TestCompile/scenarios/multiple-scenario-map.d2,0:25:25-0:28:28", diff --git a/testdata/d2ir/TestCompile/scenarios/root.exp.json b/testdata/d2ir/TestCompile/scenarios/root.exp.json index 93e644f22..85d0e8ec1 100644 --- a/testdata/d2ir/TestCompile/scenarios/root.exp.json +++ b/testdata/d2ir/TestCompile/scenarios/root.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -118,7 +126,15 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -235,15 +251,39 @@ ] }, { - "name": "scenarios", + "name": { + "range": "TestCompile/scenarios/root.d2,1:0:7-1:9:16", + "value": [ + { + "string": "scenarios", + "raw_string": "scenarios" + } + ] + }, "composite": { "fields": [ { - "name": "bingo", + "name": { + "range": "TestCompile/scenarios/root.d2,2:1:21-2:6:26", + "value": [ + { + "string": "bingo", + "raw_string": "bingo" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -360,7 +400,15 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -477,15 +525,39 @@ ] }, { - "name": "p", + "name": { + "range": "TestCompile/scenarios/root.d2,2:10:30-2:11:31", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + }, "composite": { "fields": [ { - "name": "q", + "name": { + "range": "TestCompile/scenarios/root.d2,2:12:32-2:13:33", + "value": [ + { + "string": "q", + "raw_string": "q" + } + ] + }, "composite": { "fields": [ { - "name": "z", + "name": { + "range": "TestCompile/scenarios/root.d2,2:14:34-2:15:35", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + }, "references": [ { "string": { @@ -797,11 +869,27 @@ { "edge_id": { "src_path": [ - "x" + { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } ], "src_arrow": false, "dst_path": [ - "y" + { + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -1007,11 +1095,27 @@ ] }, { - "name": "nuclear", + "name": { + "range": "TestCompile/scenarios/root.d2,3:1:39-3:8:46", + "value": [ + { + "string": "nuclear", + "raw_string": "nuclear" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -1128,7 +1232,15 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -1245,7 +1357,15 @@ ] }, { - "name": "quiche", + "name": { + "range": "TestCompile/scenarios/root.d2,3:12:50-3:18:56", + "value": [ + { + "string": "quiche", + "raw_string": "quiche" + } + ] + }, "references": [ { "string": { @@ -1307,11 +1427,27 @@ { "edge_id": { "src_path": [ - "x" + { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } ], "src_arrow": false, "dst_path": [ - "y" + { + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -1690,11 +1826,27 @@ { "edge_id": { "src_path": [ - "x" + { + "range": "TestCompile/scenarios/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } ], "src_arrow": false, "dst_path": [ - "y" + { + "range": "TestCompile/scenarios/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } ], "dst_arrow": true, "index": 0, diff --git a/testdata/d2ir/TestCompile/steps/recursive.exp.json b/testdata/d2ir/TestCompile/steps/recursive.exp.json index 595f96cc7..1ba1752c1 100644 --- a/testdata/d2ir/TestCompile/steps/recursive.exp.json +++ b/testdata/d2ir/TestCompile/steps/recursive.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -118,7 +126,15 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -235,15 +251,39 @@ ] }, { - "name": "steps", + "name": { + "range": "TestCompile/steps/recursive.d2,1:0:7-1:5:12", + "value": [ + { + "string": "steps", + "raw_string": "steps" + } + ] + }, "composite": { "fields": [ { - "name": "bingo", + "name": { + "range": "TestCompile/steps/recursive.d2,2:1:17-2:6:22", + "value": [ + { + "string": "bingo", + "raw_string": "bingo" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -360,7 +400,15 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -477,15 +525,39 @@ ] }, { - "name": "p", + "name": { + "range": "TestCompile/steps/recursive.d2,2:10:26-2:11:27", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + }, "composite": { "fields": [ { - "name": "q", + "name": { + "range": "TestCompile/steps/recursive.d2,2:12:28-2:13:29", + "value": [ + { + "string": "q", + "raw_string": "q" + } + ] + }, "composite": { "fields": [ { - "name": "z", + "name": { + "range": "TestCompile/steps/recursive.d2,2:14:30-2:15:31", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + }, "references": [ { "string": { @@ -797,11 +869,27 @@ { "edge_id": { "src_path": [ - "x" + { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } ], "src_arrow": false, "dst_path": [ - "y" + { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -1007,11 +1095,27 @@ ] }, { - "name": "nuclear", + "name": { + "range": "TestCompile/steps/recursive.d2,3:1:35-3:8:42", + "value": [ + { + "string": "nuclear", + "raw_string": "nuclear" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -1128,7 +1232,15 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -1245,15 +1357,39 @@ ] }, { - "name": "p", + "name": { + "range": "TestCompile/steps/recursive.d2,2:10:26-2:11:27", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + }, "composite": { "fields": [ { - "name": "q", + "name": { + "range": "TestCompile/steps/recursive.d2,2:12:28-2:13:29", + "value": [ + { + "string": "q", + "raw_string": "q" + } + ] + }, "composite": { "fields": [ { - "name": "z", + "name": { + "range": "TestCompile/steps/recursive.d2,2:14:30-2:15:31", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + }, "references": [ { "string": { @@ -1561,7 +1697,15 @@ ] }, { - "name": "quiche", + "name": { + "range": "TestCompile/steps/recursive.d2,4:2:48-4:8:54", + "value": [ + { + "string": "quiche", + "raw_string": "quiche" + } + ] + }, "references": [ { "string": { @@ -1619,15 +1763,39 @@ ] }, { - "name": "scenarios", + "name": { + "range": "TestCompile/steps/recursive.d2,5:2:57-5:11:66", + "value": [ + { + "string": "scenarios", + "raw_string": "scenarios" + } + ] + }, "composite": { "fields": [ { - "name": "bavarian", + "name": { + "range": "TestCompile/steps/recursive.d2,6:3:73-6:11:81", + "value": [ + { + "string": "bavarian", + "raw_string": "bavarian" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -1744,7 +1912,15 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -1861,15 +2037,39 @@ ] }, { - "name": "p", + "name": { + "range": "TestCompile/steps/recursive.d2,2:10:26-2:11:27", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + }, "composite": { "fields": [ { - "name": "q", + "name": { + "range": "TestCompile/steps/recursive.d2,2:12:28-2:13:29", + "value": [ + { + "string": "q", + "raw_string": "q" + } + ] + }, "composite": { "fields": [ { - "name": "z", + "name": { + "range": "TestCompile/steps/recursive.d2,2:14:30-2:15:31", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + }, "references": [ { "string": { @@ -2177,7 +2377,15 @@ ] }, { - "name": "quiche", + "name": { + "range": "TestCompile/steps/recursive.d2,4:2:48-4:8:54", + "value": [ + { + "string": "quiche", + "raw_string": "quiche" + } + ] + }, "references": [ { "string": { @@ -2235,7 +2443,15 @@ ] }, { - "name": "perseverance", + "name": { + "range": "TestCompile/steps/recursive.d2,7:4:89-7:16:101", + "value": [ + { + "string": "perseverance", + "raw_string": "perseverance" + } + ] + }, "references": [ { "string": { @@ -2297,11 +2513,27 @@ { "edge_id": { "src_path": [ - "x" + { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } ], "src_arrow": false, "dst_path": [ - "y" + { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -2606,11 +2838,27 @@ { "edge_id": { "src_path": [ - "x" + { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } ], "src_arrow": false, "dst_path": [ - "y" + { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -3151,11 +3399,27 @@ { "edge_id": { "src_path": [ - "x" + { + "range": "TestCompile/steps/recursive.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } ], "src_arrow": false, "dst_path": [ - "y" + { + "range": "TestCompile/steps/recursive.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } ], "dst_arrow": true, "index": 0, diff --git a/testdata/d2ir/TestCompile/steps/root.exp.json b/testdata/d2ir/TestCompile/steps/root.exp.json index 62376b02f..7cd244a71 100644 --- a/testdata/d2ir/TestCompile/steps/root.exp.json +++ b/testdata/d2ir/TestCompile/steps/root.exp.json @@ -1,7 +1,15 @@ { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -118,7 +126,15 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -235,15 +251,39 @@ ] }, { - "name": "steps", + "name": { + "range": "TestCompile/steps/root.d2,1:0:7-1:5:12", + "value": [ + { + "string": "steps", + "raw_string": "steps" + } + ] + }, "composite": { "fields": [ { - "name": "bingo", + "name": { + "range": "TestCompile/steps/root.d2,2:1:17-2:6:22", + "value": [ + { + "string": "bingo", + "raw_string": "bingo" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -360,7 +400,15 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -477,15 +525,39 @@ ] }, { - "name": "p", + "name": { + "range": "TestCompile/steps/root.d2,2:10:26-2:11:27", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + }, "composite": { "fields": [ { - "name": "q", + "name": { + "range": "TestCompile/steps/root.d2,2:12:28-2:13:29", + "value": [ + { + "string": "q", + "raw_string": "q" + } + ] + }, "composite": { "fields": [ { - "name": "z", + "name": { + "range": "TestCompile/steps/root.d2,2:14:30-2:15:31", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + }, "references": [ { "string": { @@ -797,11 +869,27 @@ { "edge_id": { "src_path": [ - "x" + { + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } ], "src_arrow": false, "dst_path": [ - "y" + { + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -1007,11 +1095,27 @@ ] }, { - "name": "nuclear", + "name": { + "range": "TestCompile/steps/root.d2,3:1:35-3:8:42", + "value": [ + { + "string": "nuclear", + "raw_string": "nuclear" + } + ] + }, "composite": { "fields": [ { - "name": "x", + "name": { + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + }, "references": [ { "string": { @@ -1128,7 +1232,15 @@ ] }, { - "name": "y", + "name": { + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + }, "references": [ { "string": { @@ -1245,15 +1357,39 @@ ] }, { - "name": "p", + "name": { + "range": "TestCompile/steps/root.d2,2:10:26-2:11:27", + "value": [ + { + "string": "p", + "raw_string": "p" + } + ] + }, "composite": { "fields": [ { - "name": "q", + "name": { + "range": "TestCompile/steps/root.d2,2:12:28-2:13:29", + "value": [ + { + "string": "q", + "raw_string": "q" + } + ] + }, "composite": { "fields": [ { - "name": "z", + "name": { + "range": "TestCompile/steps/root.d2,2:14:30-2:15:31", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + }, "references": [ { "string": { @@ -1561,7 +1697,15 @@ ] }, { - "name": "quiche", + "name": { + "range": "TestCompile/steps/root.d2,3:12:46-3:18:52", + "value": [ + { + "string": "quiche", + "raw_string": "quiche" + } + ] + }, "references": [ { "string": { @@ -1623,11 +1767,27 @@ { "edge_id": { "src_path": [ - "x" + { + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } ], "src_arrow": false, "dst_path": [ - "y" + { + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } ], "dst_arrow": true, "index": 0, @@ -2006,11 +2166,27 @@ { "edge_id": { "src_path": [ - "x" + { + "range": "TestCompile/steps/root.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } ], "src_arrow": false, "dst_path": [ - "y" + { + "range": "TestCompile/steps/root.d2,0:5:5-0:6:6", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } ], "dst_arrow": true, "index": 0, diff --git a/testdata/d2ir/TestCompile/vars/spread-in-place.exp.json b/testdata/d2ir/TestCompile/vars/spread-in-place.exp.json index f56925645..384c3a9d9 100644 --- a/testdata/d2ir/TestCompile/vars/spread-in-place.exp.json +++ b/testdata/d2ir/TestCompile/vars/spread-in-place.exp.json @@ -1,15 +1,39 @@ { "fields": [ { - "name": "vars", + "name": { + "range": "TestCompile/vars/spread-in-place.d2,0:0:0-0:4:4", + "value": [ + { + "string": "vars", + "raw_string": "vars" + } + ] + }, "composite": { "fields": [ { - "name": "person-shape", + "name": { + "range": "TestCompile/vars/spread-in-place.d2,1:2:10-1:14:22", + "value": [ + { + "string": "person-shape", + "raw_string": "person-shape" + } + ] + }, "composite": { "fields": [ { - "name": "grid-columns", + "name": { + "range": "TestCompile/vars/spread-in-place.d2,2:4:30-2:16:42", + "value": [ + { + "string": "grid-columns", + "raw_string": "grid-columns" + } + ] + }, "primary": { "value": { "range": "TestCompile/vars/spread-in-place.d2,2:18:44-2:19:45", @@ -80,7 +104,15 @@ ] }, { - "name": "grid-rows", + "name": { + "range": "TestCompile/vars/spread-in-place.d2,3:4:50-3:13:59", + "value": [ + { + "string": "grid-rows", + "raw_string": "grid-rows" + } + ] + }, "primary": { "value": { "range": "TestCompile/vars/spread-in-place.d2,3:15:61-3:16:62", @@ -151,7 +183,15 @@ ] }, { - "name": "grid-gap", + "name": { + "range": "TestCompile/vars/spread-in-place.d2,4:4:67-4:12:75", + "value": [ + { + "string": "grid-gap", + "raw_string": "grid-gap" + } + ] + }, "primary": { "value": { "range": "TestCompile/vars/spread-in-place.d2,4:14:77-4:15:78", @@ -222,7 +262,15 @@ ] }, { - "name": "head", + "name": { + "range": "TestCompile/vars/spread-in-place.d2,5:4:83-5:8:87", + "value": [ + { + "string": "head", + "raw_string": "head" + } + ] + }, "references": [ { "string": { @@ -280,7 +328,15 @@ ] }, { - "name": "body", + "name": { + "range": "TestCompile/vars/spread-in-place.d2,6:4:92-6:8:96", + "value": [ + { + "string": "body", + "raw_string": "body" + } + ] + }, "references": [ { "string": { @@ -763,11 +819,27 @@ ] }, { - "name": "dora", + "name": { + "range": "TestCompile/vars/spread-in-place.d2,10:0:104-10:4:108", + "value": [ + { + "string": "dora", + "raw_string": "dora" + } + ] + }, "composite": { "fields": [ { - "name": "grid-columns", + "name": { + "range": "TestCompile/vars/spread-in-place.d2,2:4:30-2:16:42", + "value": [ + { + "string": "grid-columns", + "raw_string": "grid-columns" + } + ] + }, "primary": { "value": { "range": "TestCompile/vars/spread-in-place.d2,2:18:44-2:19:45", @@ -838,7 +910,15 @@ ] }, { - "name": "grid-rows", + "name": { + "range": "TestCompile/vars/spread-in-place.d2,3:4:50-3:13:59", + "value": [ + { + "string": "grid-rows", + "raw_string": "grid-rows" + } + ] + }, "primary": { "value": { "range": "TestCompile/vars/spread-in-place.d2,3:15:61-3:16:62", @@ -909,7 +989,15 @@ ] }, { - "name": "grid-gap", + "name": { + "range": "TestCompile/vars/spread-in-place.d2,4:4:67-4:12:75", + "value": [ + { + "string": "grid-gap", + "raw_string": "grid-gap" + } + ] + }, "primary": { "value": { "range": "TestCompile/vars/spread-in-place.d2,4:14:77-4:15:78", @@ -980,7 +1068,15 @@ ] }, { - "name": "head", + "name": { + "range": "TestCompile/vars/spread-in-place.d2,5:4:83-5:8:87", + "value": [ + { + "string": "head", + "raw_string": "head" + } + ] + }, "references": [ { "string": { @@ -1038,7 +1134,15 @@ ] }, { - "name": "body", + "name": { + "range": "TestCompile/vars/spread-in-place.d2,12:2:135-12:6:139", + "value": [ + { + "string": "body", + "raw_string": "body" + } + ] + }, "references": [ { "string": { diff --git a/testdata/d2oracle/TestCreate/add_layer/1.exp.json b/testdata/d2oracle/TestCreate/add_layer/1.exp.json index dfb966563..ebfa807fd 100644 --- a/testdata/d2oracle/TestCreate/add_layer/1.exp.json +++ b/testdata/d2oracle/TestCreate/add_layer/1.exp.json @@ -99,6 +99,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -146,6 +147,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -178,6 +180,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" diff --git a/testdata/d2oracle/TestCreate/add_layer/2.exp.json b/testdata/d2oracle/TestCreate/add_layer/2.exp.json index 2b4f7031f..483ee71f0 100644 --- a/testdata/d2oracle/TestCreate/add_layer/2.exp.json +++ b/testdata/d2oracle/TestCreate/add_layer/2.exp.json @@ -151,6 +151,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -198,6 +199,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -215,7 +217,7 @@ "name": "c", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestCreate/add_layer/2.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -225,10 +227,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/add_layer/2.d2,4:4:24-4:5:25", "value": [ { - "string": "x" + "string": "x", + "raw_string": "x" } ] } @@ -253,6 +256,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -300,6 +304,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -332,6 +337,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" diff --git a/testdata/d2oracle/TestCreate/add_layer/3.exp.json b/testdata/d2oracle/TestCreate/add_layer/3.exp.json index 9a7caee0f..399a2b0d0 100644 --- a/testdata/d2oracle/TestCreate/add_layer/3.exp.json +++ b/testdata/d2oracle/TestCreate/add_layer/3.exp.json @@ -180,6 +180,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -227,6 +228,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -244,7 +246,7 @@ "name": "c", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestCreate/add_layer/3.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -254,10 +256,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/add_layer/3.d2,4:4:24-4:5:25", "value": [ { - "string": "d" + "string": "d", + "raw_string": "d" } ] } @@ -276,10 +279,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/add_layer/3.d2,5:4:30-5:10:36", "value": [ { - "string": "layers" + "string": "layers", + "raw_string": "layers" } ] } @@ -289,7 +293,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -299,10 +303,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/add_layer/3.d2,6:6:46-6:7:47", "value": [ { - "string": "c" + "string": "c", + "raw_string": "c" } ] } @@ -332,6 +337,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -379,6 +385,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -411,6 +418,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" diff --git a/testdata/d2oracle/TestCreate/add_layer/4.exp.json b/testdata/d2oracle/TestCreate/add_layer/4.exp.json index 5adb73476..a36c89f62 100644 --- a/testdata/d2oracle/TestCreate/add_layer/4.exp.json +++ b/testdata/d2oracle/TestCreate/add_layer/4.exp.json @@ -123,6 +123,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -170,6 +171,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -187,7 +189,7 @@ "name": "c", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestCreate/add_layer/4.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -197,10 +199,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/add_layer/4.d2,4:4:24-4:5:25", "value": [ { - "string": "d" + "string": "d", + "raw_string": "d" } ] } @@ -225,6 +228,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -272,6 +276,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/add_layer/5.exp.json b/testdata/d2oracle/TestCreate/add_layer/5.exp.json new file mode 100644 index 000000000..c828ec22e --- /dev/null +++ b/testdata/d2oracle/TestCreate/add_layer/5.exp.json @@ -0,0 +1,518 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,0:0:0-12:0:78", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,0:0:0-4:1:45", + "key": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,0:0:0-0:7:7", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,0:0:0-0:7:7", + "value": [ + { + "string": "classes", + "raw_string": "classes" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,0:9:9-4:1:45", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,1:2:13-3:3:43", + "key": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,1:2:13-1:3:14", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,1:2:13-1:3:14", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,1:5:16-3:3:43", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,2:4:22-2:21:39", + "key": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,2:4:22-2:16:34", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,2:4:22-2:9:27", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,2:10:28-2:16:34", + "value": [ + { + "string": "stroke", + "raw_string": "stroke" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,2:18:36-2:21:39", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,5:0:46-5:1:47", + "key": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,5:0:46-5:1:47", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,5:0:46-5:1:47", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,7:0:49-11:1:77", + "key": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,7:0:49-7:6:55", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,7:0:49-7:6:55", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,7:8:57-11:1:77", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,8:2:61-10:3:75", + "key": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,8:2:61-8:3:62", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,8:2:61-8:3:62", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,8:5:64-10:3:75", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,9:4:70-9:5:71", + "key": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,9:4:70-9:5:71", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,9:4:70-9:5:71", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "b", + "id_val": "b", + "references": [ + { + "key": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,5:0:46-5:1:47", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,5:0:46-5:1:47", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "b" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ], + "layers": [ + { + "name": "c", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,0:0:0-1:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,9:4:70-9:5:71", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,0:0:0-0:7:7", + "value": [ + { + "string": "classes", + "raw_string": "classes" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": ",1:0:0-2:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,1:2:13-1:3:14", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": ",1:0:0-2:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,2:4:22-2:9:27", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": ",1:0:0-2:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,2:10:28-2:16:34", + "value": [ + { + "string": "stroke", + "raw_string": "stroke" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,2:18:36-2:21:39", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + }, + "value": {} + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "d", + "id_val": "d", + "references": [ + { + "key": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,9:4:70-9:5:71", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestCreate/add_layer/5.d2,9:4:70-9:5:71", + "value": [ + { + "string": "d", + "raw_string": "d" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "d" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + } + ] + }, + "err": "" +} diff --git a/testdata/d2oracle/TestCreate/base.exp.json b/testdata/d2oracle/TestCreate/base.exp.json index f552f394a..ed6671aa9 100644 --- a/testdata/d2oracle/TestCreate/base.exp.json +++ b/testdata/d2oracle/TestCreate/base.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/container.exp.json b/testdata/d2oracle/TestCreate/container.exp.json index a98e70b9f..f6ed275e7 100644 --- a/testdata/d2oracle/TestCreate/container.exp.json +++ b/testdata/d2oracle/TestCreate/container.exp.json @@ -71,6 +71,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -118,6 +119,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -163,6 +165,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/container_edge.exp.json b/testdata/d2oracle/TestCreate/container_edge.exp.json index be325688f..2c8c20e5f 100644 --- a/testdata/d2oracle/TestCreate/container_edge.exp.json +++ b/testdata/d2oracle/TestCreate/container_edge.exp.json @@ -94,6 +94,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -125,6 +126,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -172,6 +174,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -217,6 +220,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -262,6 +266,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/container_edge_label.exp.json b/testdata/d2oracle/TestCreate/container_edge_label.exp.json index 5e2691e80..989d00e12 100644 --- a/testdata/d2oracle/TestCreate/container_edge_label.exp.json +++ b/testdata/d2oracle/TestCreate/container_edge_label.exp.json @@ -104,6 +104,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -135,6 +136,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -182,6 +184,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -227,6 +230,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -272,6 +276,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/edge.exp.json b/testdata/d2oracle/TestCreate/edge.exp.json index b9391dd96..1dc918b70 100644 --- a/testdata/d2oracle/TestCreate/edge.exp.json +++ b/testdata/d2oracle/TestCreate/edge.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -96,6 +97,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -143,6 +145,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -188,6 +191,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/edge_nested.exp.json b/testdata/d2oracle/TestCreate/edge_nested.exp.json index fd96ef6e9..b36c7fc63 100644 --- a/testdata/d2oracle/TestCreate/edge_nested.exp.json +++ b/testdata/d2oracle/TestCreate/edge_nested.exp.json @@ -81,6 +81,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -112,6 +113,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -159,6 +161,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -204,6 +207,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -249,6 +253,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/edge_scope.exp.json b/testdata/d2oracle/TestCreate/edge_scope.exp.json index 96a1cef5e..ee973a454 100644 --- a/testdata/d2oracle/TestCreate/edge_scope.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope.exp.json @@ -94,6 +94,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -125,6 +126,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -172,6 +174,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -217,6 +220,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -262,6 +266,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json b/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json index 6d529ec3e..e245ae4c0 100644 --- a/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope_flat.exp.json @@ -94,6 +94,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -125,6 +126,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -172,6 +174,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -217,6 +220,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -262,6 +266,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json b/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json index 6aa1e8666..1ed900594 100644 --- a/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json +++ b/testdata/d2oracle/TestCreate/edge_scope_nested.exp.json @@ -105,6 +105,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -136,6 +137,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -194,6 +196,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -250,6 +253,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -295,6 +299,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -340,6 +345,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/edge_unique.exp.json b/testdata/d2oracle/TestCreate/edge_unique.exp.json index 2228f62f9..8869f398b 100644 --- a/testdata/d2oracle/TestCreate/edge_unique.exp.json +++ b/testdata/d2oracle/TestCreate/edge_unique.exp.json @@ -251,6 +251,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -282,6 +283,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -312,6 +314,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -342,6 +345,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -372,6 +376,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -419,6 +424,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -464,6 +470,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -549,6 +556,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -634,6 +642,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -719,6 +728,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/gen_key.exp.json b/testdata/d2oracle/TestCreate/gen_key.exp.json index 6d3333c4f..8ec9b10c3 100644 --- a/testdata/d2oracle/TestCreate/gen_key.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -112,6 +113,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -157,6 +159,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/gen_key_n.exp.json b/testdata/d2oracle/TestCreate/gen_key_n.exp.json index d35ac1de8..3e5832ebe 100644 --- a/testdata/d2oracle/TestCreate/gen_key_n.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_n.exp.json @@ -323,6 +323,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -392,6 +393,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -459,6 +461,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -526,6 +529,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -571,6 +575,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -616,6 +621,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -661,6 +667,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -706,6 +713,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -751,6 +759,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -796,6 +805,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -841,6 +851,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -886,6 +897,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -931,6 +943,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -976,6 +989,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1021,6 +1035,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/gen_key_nested.exp.json b/testdata/d2oracle/TestCreate/gen_key_nested.exp.json index 8e43202e6..e38c0ca56 100644 --- a/testdata/d2oracle/TestCreate/gen_key_nested.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_nested.exp.json @@ -131,6 +131,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -264,6 +265,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -395,6 +397,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -526,6 +529,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -604,6 +608,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -682,6 +687,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/gen_key_scope.exp.json b/testdata/d2oracle/TestCreate/gen_key_scope.exp.json index 0bcfa43e5..85e3d1b97 100644 --- a/testdata/d2oracle/TestCreate/gen_key_scope.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_scope.exp.json @@ -116,6 +116,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -185,6 +186,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -252,6 +254,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -319,6 +322,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -364,6 +368,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -409,6 +414,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json b/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json index 2cc74b8aa..6760dfa17 100644 --- a/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json +++ b/testdata/d2oracle/TestCreate/gen_key_suffix.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -112,6 +113,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -157,6 +159,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/image-edge.exp.json b/testdata/d2oracle/TestCreate/image-edge.exp.json new file mode 100644 index 000000000..47d894ca1 --- /dev/null +++ b/testdata/d2oracle/TestCreate/image-edge.exp.json @@ -0,0 +1,532 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "index.d2,0:0:0-6:0:106", + "nodes": [ + { + "import": { + "range": "index.d2,0:0:0-0:5:5", + "spread": true, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:4:4-0:5:5", + "value": [ + { + "string": "k", + "raw_string": "k" + } + ] + } + } + ] + } + }, + { + "map_key": { + "range": "index.d2,1:0:6-4:1:94", + "key": { + "range": "index.d2,1:0:6-1:3:9", + "path": [ + { + "unquoted_string": { + "range": "index.d2,1:0:6-1:1:7", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "index.d2,1:2:8-1:3:9", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "index.d2,1:5:11-4:1:94", + "nodes": [ + { + "map_key": { + "range": "index.d2,2:2:15-2:64:77", + "key": { + "range": "index.d2,2:2:15-2:6:19", + "path": [ + { + "unquoted_string": { + "range": "index.d2,2:2:15-2:6:19", + "value": [ + { + "string": "icon", + "raw_string": "icon" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "index.d2,2:8:21-2:64:77", + "value": [ + { + "string": "https://icons.terrastruct.com/essentials/004-picture.svg", + "raw_string": "https://icons.terrastruct.com/essentials/004-picture.svg" + } + ] + } + } + } + }, + { + "map_key": { + "range": "index.d2,3:2:80-3:14:92", + "key": { + "range": "index.d2,3:2:80-3:7:85", + "path": [ + { + "unquoted_string": { + "range": "index.d2,3:2:80-3:7:85", + "value": [ + { + "string": "shape", + "raw_string": "shape" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "index.d2,3:9:87-3:14:92", + "value": [ + { + "string": "image", + "raw_string": "image" + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "index.d2,5:0:95-5:10:105", + "key": { + "range": "index.d2,5:0:95-5:1:96", + "path": [ + { + "unquoted_string": { + "range": "index.d2,5:0:95-5:1:96", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "edges": [ + { + "range": "index.d2,5:3:98-5:9:104", + "src": { + "range": "index.d2,5:3:98-5:4:99", + "path": [ + { + "unquoted_string": { + "range": "index.d2,5:3:98-5:4:99", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "index.d2,5:8:103-5:9:104", + "path": [ + { + "unquoted_string": { + "range": "index.d2,5:8:103-5:9:104", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "dst_arrow": ">" + } + ], + "primary": {}, + "value": {} + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": [ + { + "index": 0, + "isCurve": false, + "src_arrow": false, + "dst_arrow": true, + "references": [ + { + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ], + "objects": [ + { + "id": "a", + "id_val": "a", + "references": [ + { + "key": { + "range": "k.d2,1:0:1-1:1:2", + "path": [ + { + "unquoted_string": { + "range": "k.d2,1:0:1-1:1:2", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "index.d2,1:0:6-1:3:9", + "path": [ + { + "unquoted_string": { + "range": "index.d2,1:0:6-1:1:7", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "index.d2,1:2:8-1:3:9", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "index.d2,5:0:95-5:1:96", + "path": [ + { + "unquoted_string": { + "range": "index.d2,5:0:95-5:1:96", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "a" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "b", + "id_val": "b", + "references": [ + { + "key": { + "range": "k.d2,2:2:8-2:3:9", + "path": [ + { + "unquoted_string": { + "range": "k.d2,2:2:8-2:3:9", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "index.d2,1:0:6-1:3:9", + "path": [ + { + "unquoted_string": { + "range": "index.d2,1:0:6-1:1:7", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + }, + { + "unquoted_string": { + "range": "index.d2,1:2:8-1:3:9", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 1, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "index.d2,5:3:98-5:4:99", + "path": [ + { + "unquoted_string": { + "range": "index.d2,5:3:98-5:4:99", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "b" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "icon": { + "Scheme": "https", + "Opaque": "", + "User": null, + "Host": "icons.terrastruct.com", + "Path": "/essentials/004-picture.svg", + "RawPath": "", + "OmitHost": false, + "ForceQuery": false, + "RawQuery": "", + "Fragment": "", + "RawFragment": "" + }, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "image" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "c", + "id_val": "c", + "references": [ + { + "key": { + "range": "k.d2,3:2:12-3:3:13", + "path": [ + { + "unquoted_string": { + "range": "k.d2,3:2:12-3:3:13", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "index.d2,5:8:103-5:9:104", + "path": [ + { + "unquoted_string": { + "range": "index.d2,5:8:103-5:9:104", + "value": [ + { + "string": "c", + "raw_string": "c" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "c" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": "" +} diff --git a/testdata/d2oracle/TestCreate/layers-basic.exp.json b/testdata/d2oracle/TestCreate/layers-basic.exp.json index fd96eec76..ba7c99692 100644 --- a/testdata/d2oracle/TestCreate/layers-basic.exp.json +++ b/testdata/d2oracle/TestCreate/layers-basic.exp.json @@ -146,6 +146,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -193,6 +194,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -210,7 +212,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -220,10 +222,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,4:4:24-4:5:25", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -242,10 +245,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/layers-basic.d2,5:4:30-5:5:31", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -270,6 +274,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -317,6 +322,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -362,6 +368,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/layers-edge-duplicate.exp.json b/testdata/d2oracle/TestCreate/layers-edge-duplicate.exp.json index 3d0e35b9f..6b4cd2a5f 100644 --- a/testdata/d2oracle/TestCreate/layers-edge-duplicate.exp.json +++ b/testdata/d2oracle/TestCreate/layers-edge-duplicate.exp.json @@ -215,6 +215,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -246,6 +247,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -293,6 +295,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -338,6 +341,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -355,7 +359,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -365,10 +369,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,4:4:29-4:5:30", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -387,10 +392,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/layers-edge-duplicate.d2,4:9:34-4:10:35", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -503,6 +509,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -534,6 +541,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -564,6 +572,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -631,6 +640,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -696,6 +706,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/layers-edge.exp.json b/testdata/d2oracle/TestCreate/layers-edge.exp.json index d21cbdf87..76bc27adf 100644 --- a/testdata/d2oracle/TestCreate/layers-edge.exp.json +++ b/testdata/d2oracle/TestCreate/layers-edge.exp.json @@ -169,6 +169,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -216,6 +217,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -233,7 +235,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -243,10 +245,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,4:4:24-4:5:25", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -265,10 +268,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/layers-edge.d2,5:9:35-5:10:36", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -337,6 +341,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -368,6 +373,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -435,6 +441,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -480,6 +487,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json index 3b2eb0b98..529d26d68 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline.exp.json @@ -104,6 +104,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -151,6 +152,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" @@ -196,6 +198,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json index c5e68d3cb..db9829d8d 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_1.exp.json @@ -150,6 +150,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -197,6 +198,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -242,6 +244,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" @@ -287,6 +290,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -332,6 +336,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json index b5616c220..e18861213 100644 --- a/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json +++ b/testdata/d2oracle/TestCreate/make_scope_multiline_spacing_2.exp.json @@ -150,6 +150,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -197,6 +198,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -242,6 +244,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" @@ -287,6 +290,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -332,6 +336,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/nested.exp.json b/testdata/d2oracle/TestCreate/nested.exp.json index aa857c317..7d21f76b2 100644 --- a/testdata/d2oracle/TestCreate/nested.exp.json +++ b/testdata/d2oracle/TestCreate/nested.exp.json @@ -64,6 +64,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -133,6 +134,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -200,6 +202,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -267,6 +270,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/scenarios-basic.exp.json b/testdata/d2oracle/TestCreate/scenarios-basic.exp.json index e6f6e4791..64d5a0ca1 100644 --- a/testdata/d2oracle/TestCreate/scenarios-basic.exp.json +++ b/testdata/d2oracle/TestCreate/scenarios-basic.exp.json @@ -169,6 +169,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -216,6 +217,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -261,6 +263,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -278,7 +281,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -288,10 +291,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -310,10 +314,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,1:0:2-1:1:3", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -332,10 +337,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/scenarios-basic.d2,6:4:35-6:5:36", "value": [ { - "string": "c" + "string": "c", + "raw_string": "c" } ] } @@ -360,6 +366,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -427,6 +434,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -472,6 +480,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -517,6 +526,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/scenarios-edge-inherited.exp.json b/testdata/d2oracle/TestCreate/scenarios-edge-inherited.exp.json index bf7c7c758..e483a16da 100644 --- a/testdata/d2oracle/TestCreate/scenarios-edge-inherited.exp.json +++ b/testdata/d2oracle/TestCreate/scenarios-edge-inherited.exp.json @@ -192,6 +192,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -223,6 +224,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -270,6 +272,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -315,6 +318,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -332,7 +336,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -342,10 +346,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -364,10 +369,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge-inherited.d2,0:5:5-0:6:6", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -480,6 +486,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -511,6 +518,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -541,6 +549,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -628,6 +637,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -693,6 +703,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/scenarios-edge.exp.json b/testdata/d2oracle/TestCreate/scenarios-edge.exp.json index 090920158..2630612b4 100644 --- a/testdata/d2oracle/TestCreate/scenarios-edge.exp.json +++ b/testdata/d2oracle/TestCreate/scenarios-edge.exp.json @@ -192,6 +192,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -239,6 +240,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -284,6 +286,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -301,7 +304,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -311,10 +314,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -333,10 +337,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/scenarios-edge.d2,1:0:2-1:1:3", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -405,6 +410,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -436,6 +442,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -523,6 +530,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -588,6 +596,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/scope.exp.json b/testdata/d2oracle/TestCreate/scope.exp.json index 54f4d8c6a..742cf41bf 100644 --- a/testdata/d2oracle/TestCreate/scope.exp.json +++ b/testdata/d2oracle/TestCreate/scope.exp.json @@ -93,6 +93,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -162,6 +163,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -229,6 +231,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -296,6 +299,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -341,6 +345,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/steps-basic.exp.json b/testdata/d2oracle/TestCreate/steps-basic.exp.json index 394b6c479..3de45348a 100644 --- a/testdata/d2oracle/TestCreate/steps-basic.exp.json +++ b/testdata/d2oracle/TestCreate/steps-basic.exp.json @@ -169,6 +169,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -216,6 +217,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -261,6 +263,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -278,7 +281,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -288,10 +291,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -310,10 +314,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,1:0:2-1:1:3", "value": [ { - "string": "d" + "string": "d", + "raw_string": "d" } ] } @@ -332,10 +337,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,5:4:25-5:5:26", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -354,10 +360,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/steps-basic.d2,6:4:31-6:5:32", "value": [ { - "string": "c" + "string": "c", + "raw_string": "c" } ] } @@ -382,6 +389,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -429,6 +437,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -474,6 +483,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -519,6 +529,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -564,6 +575,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/steps-conflict.exp.json b/testdata/d2oracle/TestCreate/steps-conflict.exp.json index faa16fc82..ede5da1a3 100644 --- a/testdata/d2oracle/TestCreate/steps-conflict.exp.json +++ b/testdata/d2oracle/TestCreate/steps-conflict.exp.json @@ -169,6 +169,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -216,6 +217,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -261,6 +263,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -278,7 +281,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -288,10 +291,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -310,10 +314,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,1:0:2-1:1:3", "value": [ { - "string": "d" + "string": "d", + "raw_string": "d" } ] } @@ -332,10 +337,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,5:4:25-5:5:26", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -354,10 +360,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/steps-conflict.d2,6:4:31-6:7:34", "value": [ { - "string": "d 2" + "string": "d 2", + "raw_string": "d 2" } ] } @@ -382,6 +389,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -429,6 +437,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -474,6 +483,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -519,6 +529,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -564,6 +575,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestCreate/steps-edge.exp.json b/testdata/d2oracle/TestCreate/steps-edge.exp.json index 3298522ab..6eaefea57 100644 --- a/testdata/d2oracle/TestCreate/steps-edge.exp.json +++ b/testdata/d2oracle/TestCreate/steps-edge.exp.json @@ -192,6 +192,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -239,6 +240,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -284,6 +286,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -301,7 +304,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -311,10 +314,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -333,10 +337,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,1:0:2-1:1:3", "value": [ { - "string": "d" + "string": "d", + "raw_string": "d" } ] } @@ -355,10 +360,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestCreate/steps-edge.d2,5:4:25-5:5:26", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -427,6 +433,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -458,6 +465,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -505,6 +513,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -570,6 +579,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -635,6 +645,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/arrowhead.exp.json b/testdata/d2oracle/TestDelete/arrowhead.exp.json index 6e89878ef..073a6dc88 100644 --- a/testdata/d2oracle/TestDelete/arrowhead.exp.json +++ b/testdata/d2oracle/TestDelete/arrowhead.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -96,6 +97,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -143,6 +145,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -188,6 +191,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/arrowhead_label.exp.json b/testdata/d2oracle/TestDelete/arrowhead_label.exp.json index 0ca9c574f..406826502 100644 --- a/testdata/d2oracle/TestDelete/arrowhead_label.exp.json +++ b/testdata/d2oracle/TestDelete/arrowhead_label.exp.json @@ -115,6 +115,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -141,6 +142,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "diamond" @@ -164,6 +166,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -211,6 +214,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -256,6 +260,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/arrowhead_map.exp.json b/testdata/d2oracle/TestDelete/arrowhead_map.exp.json index e6ff5d752..0a8684592 100644 --- a/testdata/d2oracle/TestDelete/arrowhead_map.exp.json +++ b/testdata/d2oracle/TestDelete/arrowhead_map.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -96,6 +97,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -143,6 +145,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -188,6 +191,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json b/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json index 28694a0da..c466c7f06 100644 --- a/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json +++ b/testdata/d2oracle/TestDelete/arrowhead_shape.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -96,6 +97,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -143,6 +145,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -188,6 +191,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json b/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json index 59968f1d6..7fd99076a 100644 --- a/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json +++ b/testdata/d2oracle/TestDelete/breakup_arrowhead.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/chaos_1.exp.json b/testdata/d2oracle/TestDelete/chaos_1.exp.json index dc0352817..aa860ca5f 100644 --- a/testdata/d2oracle/TestDelete/chaos_1.exp.json +++ b/testdata/d2oracle/TestDelete/chaos_1.exp.json @@ -256,6 +256,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -281,6 +282,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "cf-one-required" @@ -305,6 +307,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -412,6 +415,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "cylinder" @@ -457,6 +461,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -502,6 +507,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children.exp.json b/testdata/d2oracle/TestDelete/children.exp.json index a0fdc1628..119045603 100644 --- a/testdata/d2oracle/TestDelete/children.exp.json +++ b/testdata/d2oracle/TestDelete/children.exp.json @@ -88,6 +88,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -119,6 +120,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -166,6 +168,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -211,6 +214,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -256,6 +260,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_conflicts.exp.json index bfed5014b..45f29a6a3 100644 --- a/testdata/d2oracle/TestDelete/children_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_conflicts.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -112,6 +113,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -157,6 +159,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json index 7759732a2..64581d9da 100644 --- a/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_edge_conflicts.exp.json @@ -121,6 +121,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -152,6 +153,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -219,6 +221,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -264,6 +267,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -309,6 +313,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json index a11ffdd2c..f93045e26 100644 --- a/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_edges_flat_conflicts.exp.json @@ -214,6 +214,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -245,6 +246,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -275,6 +277,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -342,6 +345,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -407,6 +411,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -472,6 +477,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -517,6 +523,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -562,6 +569,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json index fe212f64a..08859f6d5 100644 --- a/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_flat_conflicts.exp.json @@ -98,6 +98,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -165,6 +166,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -210,6 +212,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json index c1cf6e922..75883de8c 100644 --- a/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_multiple_conflicts.exp.json @@ -190,6 +190,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -221,6 +222,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -308,6 +310,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -373,6 +376,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -418,6 +422,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -463,6 +468,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json index c8465ce86..1bfd71ee8 100644 --- a/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_nested_conflicts.exp.json @@ -94,6 +94,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -141,6 +142,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -186,6 +188,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -231,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json index 489e99551..f595e5431 100644 --- a/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_nested_referenced_conflicts.exp.json @@ -153,6 +153,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -262,6 +263,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -349,6 +351,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -394,6 +397,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json b/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json index 656125a78..9e40a2e8b 100644 --- a/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/children_no_self_conflict.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children_order.exp.json b/testdata/d2oracle/TestDelete/children_order.exp.json index a85079f82..2b487c516 100644 --- a/testdata/d2oracle/TestDelete/children_order.exp.json +++ b/testdata/d2oracle/TestDelete/children_order.exp.json @@ -117,6 +117,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -164,6 +165,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -209,6 +211,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -254,6 +257,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -299,6 +303,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json b/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json index 25088c478..f9d889bf6 100644 --- a/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json +++ b/testdata/d2oracle/TestDelete/children_referenced_conflicts.exp.json @@ -98,6 +98,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -165,6 +166,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -210,6 +212,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/children_scope.exp.json b/testdata/d2oracle/TestDelete/children_scope.exp.json index 13e8a86d1..e486aaf45 100644 --- a/testdata/d2oracle/TestDelete/children_scope.exp.json +++ b/testdata/d2oracle/TestDelete/children_scope.exp.json @@ -128,6 +128,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -159,6 +160,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -217,6 +219,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -273,6 +276,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -318,6 +322,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -363,6 +368,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -408,6 +414,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/class_refs.exp.json b/testdata/d2oracle/TestDelete/class_refs.exp.json index 600314149..95133a478 100644 --- a/testdata/d2oracle/TestDelete/class_refs.exp.json +++ b/testdata/d2oracle/TestDelete/class_refs.exp.json @@ -18,6 +18,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" diff --git a/testdata/d2oracle/TestDelete/conflicts_generated.exp.json b/testdata/d2oracle/TestDelete/conflicts_generated.exp.json index 031c8c0ee..4c0be7d37 100644 --- a/testdata/d2oracle/TestDelete/conflicts_generated.exp.json +++ b/testdata/d2oracle/TestDelete/conflicts_generated.exp.json @@ -117,6 +117,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -164,6 +165,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -209,6 +211,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -254,6 +257,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -299,6 +303,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/conflicts_generated_3.exp.json b/testdata/d2oracle/TestDelete/conflicts_generated_3.exp.json index 5bfcfeee6..4b6afb662 100644 --- a/testdata/d2oracle/TestDelete/conflicts_generated_3.exp.json +++ b/testdata/d2oracle/TestDelete/conflicts_generated_3.exp.json @@ -111,6 +111,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -158,6 +159,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -203,6 +205,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -248,6 +251,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -293,6 +297,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/conflicts_generated_continued.exp.json b/testdata/d2oracle/TestDelete/conflicts_generated_continued.exp.json index b6b34b741..d4f337ae8 100644 --- a/testdata/d2oracle/TestDelete/conflicts_generated_continued.exp.json +++ b/testdata/d2oracle/TestDelete/conflicts_generated_continued.exp.json @@ -88,6 +88,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -135,6 +136,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -180,6 +182,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -225,6 +228,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/connection-glob.exp.json b/testdata/d2oracle/TestDelete/connection-glob.exp.json index f1fb79d61..ccfdd0d35 100644 --- a/testdata/d2oracle/TestDelete/connection-glob.exp.json +++ b/testdata/d2oracle/TestDelete/connection-glob.exp.json @@ -172,6 +172,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -203,6 +204,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -250,6 +252,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -295,6 +298,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/container_near.exp.json b/testdata/d2oracle/TestDelete/container_near.exp.json index 5044d5f4b..c77755b02 100644 --- a/testdata/d2oracle/TestDelete/container_near.exp.json +++ b/testdata/d2oracle/TestDelete/container_near.exp.json @@ -166,6 +166,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -213,6 +214,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": { "range": "d2/testdata/d2oracle/TestDelete/container_near.d2,1:8:13-1:9:14", "path": [ @@ -273,6 +275,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -318,6 +321,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": { "range": "d2/testdata/d2oracle/TestDelete/container_near.d2,5:8:32-5:9:33", "path": [ diff --git a/testdata/d2oracle/TestDelete/delete-imported-layer-obj.exp.json b/testdata/d2oracle/TestDelete/delete-imported-layer-obj.exp.json index 108e9f705..9800d9229 100644 --- a/testdata/d2oracle/TestDelete/delete-imported-layer-obj.exp.json +++ b/testdata/d2oracle/TestDelete/delete-imported-layer-obj.exp.json @@ -124,6 +124,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -142,7 +143,7 @@ "name": "x", "isFolderOnly": true, "ast": { - "range": ",0:0:0-1:0:0", + "range": "index.d2,0:0:0-1:0:0", "nodes": null }, "root": { @@ -157,6 +158,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" diff --git a/testdata/d2oracle/TestDelete/delete-layer-obj.exp.json b/testdata/d2oracle/TestDelete/delete-layer-obj.exp.json index f8b40706e..689d73314 100644 --- a/testdata/d2oracle/TestDelete/delete-layer-obj.exp.json +++ b/testdata/d2oracle/TestDelete/delete-layer-obj.exp.json @@ -76,6 +76,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -109,6 +110,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" diff --git a/testdata/d2oracle/TestDelete/delete-layer-style.exp.json b/testdata/d2oracle/TestDelete/delete-layer-style.exp.json index 4756b825d..91c6bbea3 100644 --- a/testdata/d2oracle/TestDelete/delete-layer-style.exp.json +++ b/testdata/d2oracle/TestDelete/delete-layer-style.exp.json @@ -100,6 +100,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -118,7 +119,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestDelete/delete-layer-style.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -128,10 +129,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestDelete/delete-layer-style.d2,2:4:21-2:5:22", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -156,6 +158,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -203,6 +206,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/delete-not-layer-obj.exp.json b/testdata/d2oracle/TestDelete/delete-not-layer-obj.exp.json index 6471d0958..27f02a70e 100644 --- a/testdata/d2oracle/TestDelete/delete-not-layer-obj.exp.json +++ b/testdata/d2oracle/TestDelete/delete-not-layer-obj.exp.json @@ -123,6 +123,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -170,6 +171,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -187,7 +189,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestDelete/delete-not-layer-obj.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -197,10 +199,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestDelete/delete-not-layer-obj.d2,4:4:24-4:5:25", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -225,6 +228,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -272,6 +276,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json b/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json index 4c52363d8..262230084 100644 --- a/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json +++ b/testdata/d2oracle/TestDelete/delete_container_of_near.exp.json @@ -474,6 +474,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -505,6 +506,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -535,6 +537,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -565,6 +568,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -595,6 +599,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -625,6 +630,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -655,6 +661,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -685,6 +692,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -715,6 +723,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -745,6 +754,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -792,6 +802,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -837,6 +848,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -882,6 +894,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -927,6 +940,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -992,6 +1006,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1057,6 +1072,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1142,6 +1158,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1238,6 +1255,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": { "range": "d2/testdata/d2oracle/TestDelete/delete_container_of_near.d2,9:19:236-9:37:254", "path": [ @@ -1318,6 +1336,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1383,6 +1402,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1428,6 +1448,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/delete_icon.exp.json b/testdata/d2oracle/TestDelete/delete_icon.exp.json index 09b4bbab9..362ff5929 100644 --- a/testdata/d2oracle/TestDelete/delete_icon.exp.json +++ b/testdata/d2oracle/TestDelete/delete_icon.exp.json @@ -92,6 +92,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -150,6 +151,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -206,6 +208,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "https://google.com" }, diff --git a/testdata/d2oracle/TestDelete/delete_link.exp.json b/testdata/d2oracle/TestDelete/delete_link.exp.json index b90432335..9bc66d899 100644 --- a/testdata/d2oracle/TestDelete/delete_link.exp.json +++ b/testdata/d2oracle/TestDelete/delete_link.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/delete_near.exp.json b/testdata/d2oracle/TestDelete/delete_near.exp.json index 123053d74..a07c27466 100644 --- a/testdata/d2oracle/TestDelete/delete_near.exp.json +++ b/testdata/d2oracle/TestDelete/delete_near.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -112,6 +113,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -157,6 +159,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json b/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json index 1572242cc..b5f209c0c 100644 --- a/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json +++ b/testdata/d2oracle/TestDelete/delete_needed_flat_near.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -112,6 +113,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -157,6 +159,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json b/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json index dc12090dc..59857da63 100644 --- a/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json +++ b/testdata/d2oracle/TestDelete/delete_redundant_flat_near.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -112,6 +113,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -157,6 +159,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/delete_tooltip.exp.json b/testdata/d2oracle/TestDelete/delete_tooltip.exp.json index 374052ed6..1565eb92a 100644 --- a/testdata/d2oracle/TestDelete/delete_tooltip.exp.json +++ b/testdata/d2oracle/TestDelete/delete_tooltip.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/drop_value.exp.json b/testdata/d2oracle/TestDelete/drop_value.exp.json index ffa928761..71d6f1fd5 100644 --- a/testdata/d2oracle/TestDelete/drop_value.exp.json +++ b/testdata/d2oracle/TestDelete/drop_value.exp.json @@ -53,6 +53,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -111,6 +112,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -167,6 +169,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/drop_value_with_primary.exp.json b/testdata/d2oracle/TestDelete/drop_value_with_primary.exp.json index b77b63a71..d156bd233 100644 --- a/testdata/d2oracle/TestDelete/drop_value_with_primary.exp.json +++ b/testdata/d2oracle/TestDelete/drop_value_with_primary.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/duplicate_generated.exp.json b/testdata/d2oracle/TestDelete/duplicate_generated.exp.json index c157119f0..59976836c 100644 --- a/testdata/d2oracle/TestDelete/duplicate_generated.exp.json +++ b/testdata/d2oracle/TestDelete/duplicate_generated.exp.json @@ -157,6 +157,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -204,6 +205,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -249,6 +251,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -294,6 +297,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -339,6 +343,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -384,6 +389,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -429,6 +435,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge-in-layer.exp.json b/testdata/d2oracle/TestDelete/edge-in-layer.exp.json index 403548280..c853c2d7c 100644 --- a/testdata/d2oracle/TestDelete/edge-in-layer.exp.json +++ b/testdata/d2oracle/TestDelete/edge-in-layer.exp.json @@ -152,6 +152,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -170,7 +171,7 @@ "name": "test", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestDelete/edge-in-layer.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -180,10 +181,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestDelete/edge-in-layer.d2,2:4:24-2:5:25", "value": [ { - "string": "x" + "string": "x", + "raw_string": "x" } ] } @@ -193,7 +195,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -203,10 +205,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestDelete/edge-in-layer.d2,3:6:35-3:7:36", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -225,10 +228,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestDelete/edge-in-layer.d2,3:11:40-3:12:41", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -302,6 +306,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -333,6 +338,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -380,6 +386,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -425,6 +432,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -470,6 +478,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge-only-style.exp.json b/testdata/d2oracle/TestDelete/edge-only-style.exp.json index baec4d804..b25dfbf8d 100644 --- a/testdata/d2oracle/TestDelete/edge-only-style.exp.json +++ b/testdata/d2oracle/TestDelete/edge-only-style.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -96,6 +97,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -143,6 +145,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -188,6 +191,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge-out-layer.exp.json b/testdata/d2oracle/TestDelete/edge-out-layer.exp.json index f71127261..30f48510c 100644 --- a/testdata/d2oracle/TestDelete/edge-out-layer.exp.json +++ b/testdata/d2oracle/TestDelete/edge-out-layer.exp.json @@ -94,6 +94,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -125,6 +126,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -172,6 +174,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -217,6 +220,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -262,6 +266,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge-with-glob.exp.json b/testdata/d2oracle/TestDelete/edge-with-glob.exp.json index 1fffd7e42..955f6120f 100644 --- a/testdata/d2oracle/TestDelete/edge-with-glob.exp.json +++ b/testdata/d2oracle/TestDelete/edge-with-glob.exp.json @@ -155,6 +155,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -202,6 +203,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -247,6 +249,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json b/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json index 1d8b8d2ea..7320cacd9 100644 --- a/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json +++ b/testdata/d2oracle/TestDelete/edge_both_identical_childs.exp.json @@ -98,6 +98,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -129,6 +130,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -229,6 +231,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -296,6 +299,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -363,6 +367,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -419,6 +424,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_common.exp.json b/testdata/d2oracle/TestDelete/edge_common.exp.json index 5f4719f31..bab053572 100644 --- a/testdata/d2oracle/TestDelete/edge_common.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -96,6 +97,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -143,6 +145,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -188,6 +191,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_common_2.exp.json b/testdata/d2oracle/TestDelete/edge_common_2.exp.json index 1994e23e7..931e5f20e 100644 --- a/testdata/d2oracle/TestDelete/edge_common_2.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common_2.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -96,6 +97,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -143,6 +145,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -188,6 +191,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_common_3.exp.json b/testdata/d2oracle/TestDelete/edge_common_3.exp.json index 038ad6051..23088ec1a 100644 --- a/testdata/d2oracle/TestDelete/edge_common_3.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common_3.exp.json @@ -87,6 +87,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -176,6 +177,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -232,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -288,6 +291,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_common_4.exp.json b/testdata/d2oracle/TestDelete/edge_common_4.exp.json index 22dc9057c..178952611 100644 --- a/testdata/d2oracle/TestDelete/edge_common_4.exp.json +++ b/testdata/d2oracle/TestDelete/edge_common_4.exp.json @@ -87,6 +87,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -176,6 +177,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -232,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -288,6 +291,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_conflict.exp.json b/testdata/d2oracle/TestDelete/edge_conflict.exp.json index 40c43ece4..5dec79f50 100644 --- a/testdata/d2oracle/TestDelete/edge_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/edge_conflict.exp.json @@ -110,6 +110,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -141,6 +142,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -230,6 +232,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -286,6 +289,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -342,6 +346,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -387,6 +392,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_decrement.exp.json b/testdata/d2oracle/TestDelete/edge_decrement.exp.json index 13a576bb8..3fc31cd0e 100644 --- a/testdata/d2oracle/TestDelete/edge_decrement.exp.json +++ b/testdata/d2oracle/TestDelete/edge_decrement.exp.json @@ -447,6 +447,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -481,6 +482,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -514,6 +516,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -547,6 +550,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -580,6 +584,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -767,6 +772,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -952,6 +958,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_first.exp.json b/testdata/d2oracle/TestDelete/edge_first.exp.json index b92c2fb3a..e0324527d 100644 --- a/testdata/d2oracle/TestDelete/edge_first.exp.json +++ b/testdata/d2oracle/TestDelete/edge_first.exp.json @@ -176,6 +176,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -207,6 +208,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -237,6 +239,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -306,6 +309,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -373,6 +377,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -440,6 +445,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -485,6 +491,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -530,6 +537,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -595,6 +603,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -640,6 +649,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_flat_style.exp.json b/testdata/d2oracle/TestDelete/edge_flat_style.exp.json index 9a91e3f76..7d046262d 100644 --- a/testdata/d2oracle/TestDelete/edge_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/edge_flat_style.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_identical_child.exp.json b/testdata/d2oracle/TestDelete/edge_identical_child.exp.json index 8803c583a..7b98d1764 100644 --- a/testdata/d2oracle/TestDelete/edge_identical_child.exp.json +++ b/testdata/d2oracle/TestDelete/edge_identical_child.exp.json @@ -98,6 +98,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -129,6 +130,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -198,6 +200,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -265,6 +268,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -332,6 +336,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -388,6 +393,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -444,6 +450,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_key_style.exp.json b/testdata/d2oracle/TestDelete/edge_key_style.exp.json index 92084a164..e494956aa 100644 --- a/testdata/d2oracle/TestDelete/edge_key_style.exp.json +++ b/testdata/d2oracle/TestDelete/edge_key_style.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -96,6 +97,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -143,6 +145,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -188,6 +191,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_last.exp.json b/testdata/d2oracle/TestDelete/edge_last.exp.json index 1d565e6c8..d7d9d03ff 100644 --- a/testdata/d2oracle/TestDelete/edge_last.exp.json +++ b/testdata/d2oracle/TestDelete/edge_last.exp.json @@ -213,6 +213,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -244,6 +245,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -274,6 +276,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -304,6 +307,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -373,6 +377,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -440,6 +445,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -507,6 +513,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -552,6 +559,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -617,6 +625,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -682,6 +691,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -727,6 +737,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -772,6 +783,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_map_style.exp.json b/testdata/d2oracle/TestDelete/edge_map_style.exp.json index 4e09f2ba8..83bbbcb3e 100644 --- a/testdata/d2oracle/TestDelete/edge_map_style.exp.json +++ b/testdata/d2oracle/TestDelete/edge_map_style.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -96,6 +97,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -143,6 +145,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -188,6 +191,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/edge_middle.exp.json b/testdata/d2oracle/TestDelete/edge_middle.exp.json index 28c0fcd11..150463e04 100644 --- a/testdata/d2oracle/TestDelete/edge_middle.exp.json +++ b/testdata/d2oracle/TestDelete/edge_middle.exp.json @@ -199,6 +199,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -230,6 +231,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -260,6 +262,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -290,6 +293,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -359,6 +363,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -426,6 +431,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -493,6 +499,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -538,6 +545,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -603,6 +611,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -648,6 +657,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -693,6 +703,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -738,6 +749,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/empty_map.exp.json b/testdata/d2oracle/TestDelete/empty_map.exp.json index 3d7092713..043fb98b4 100644 --- a/testdata/d2oracle/TestDelete/empty_map.exp.json +++ b/testdata/d2oracle/TestDelete/empty_map.exp.json @@ -71,6 +71,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -118,6 +119,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -163,6 +165,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/flat.exp.json b/testdata/d2oracle/TestDelete/flat.exp.json index bf68210d1..29ad84a68 100644 --- a/testdata/d2oracle/TestDelete/flat.exp.json +++ b/testdata/d2oracle/TestDelete/flat.exp.json @@ -18,6 +18,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" diff --git a/testdata/d2oracle/TestDelete/flat_reserved.exp.json b/testdata/d2oracle/TestDelete/flat_reserved.exp.json index 184a6220e..9192cecb8 100644 --- a/testdata/d2oracle/TestDelete/flat_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/flat_reserved.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -96,6 +97,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -143,6 +145,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -188,6 +191,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/glob-child/1.exp.json b/testdata/d2oracle/TestDelete/glob-child/1.exp.json index 415c0c798..179747558 100644 --- a/testdata/d2oracle/TestDelete/glob-child/1.exp.json +++ b/testdata/d2oracle/TestDelete/glob-child/1.exp.json @@ -117,6 +117,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -195,6 +196,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/hoist_children.exp.json b/testdata/d2oracle/TestDelete/hoist_children.exp.json index 2e9eb254e..a0058ddde 100644 --- a/testdata/d2oracle/TestDelete/hoist_children.exp.json +++ b/testdata/d2oracle/TestDelete/hoist_children.exp.json @@ -71,6 +71,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -118,6 +119,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -163,6 +165,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json b/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json index 5131fc958..c2bca9594 100644 --- a/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json +++ b/testdata/d2oracle/TestDelete/hoist_edge_children.exp.json @@ -88,6 +88,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -119,6 +120,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -166,6 +168,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -211,6 +214,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -256,6 +260,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/import/1.exp.json b/testdata/d2oracle/TestDelete/import/1.exp.json index 00b9d4093..488f27114 100644 --- a/testdata/d2oracle/TestDelete/import/1.exp.json +++ b/testdata/d2oracle/TestDelete/import/1.exp.json @@ -89,6 +89,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -136,6 +137,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/import/2.exp.json b/testdata/d2oracle/TestDelete/import/2.exp.json index 03dae3eb1..207ba75f6 100644 --- a/testdata/d2oracle/TestDelete/import/2.exp.json +++ b/testdata/d2oracle/TestDelete/import/2.exp.json @@ -147,6 +147,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -194,6 +195,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -239,6 +241,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -256,7 +259,7 @@ "name": "y", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "index.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -266,10 +269,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "index.d2,4:4:34-4:5:35", "value": [ { - "string": "c" + "string": "c", + "raw_string": "c" } ] } @@ -294,6 +298,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -341,6 +346,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/import/3.exp.json b/testdata/d2oracle/TestDelete/import/3.exp.json index 90559179d..a663f6033 100644 --- a/testdata/d2oracle/TestDelete/import/3.exp.json +++ b/testdata/d2oracle/TestDelete/import/3.exp.json @@ -94,6 +94,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -141,6 +142,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -186,6 +188,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/import/4.exp.json b/testdata/d2oracle/TestDelete/import/4.exp.json index 5b7c67fb5..8036bad18 100644 --- a/testdata/d2oracle/TestDelete/import/4.exp.json +++ b/testdata/d2oracle/TestDelete/import/4.exp.json @@ -77,6 +77,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -166,6 +167,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/import/5.exp.json b/testdata/d2oracle/TestDelete/import/5.exp.json index b0315b772..dbc5b95ac 100644 --- a/testdata/d2oracle/TestDelete/import/5.exp.json +++ b/testdata/d2oracle/TestDelete/import/5.exp.json @@ -110,6 +110,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -157,6 +158,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -202,6 +204,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/import/6.exp.json b/testdata/d2oracle/TestDelete/import/6.exp.json index 24ad58cdf..e18fe2379 100644 --- a/testdata/d2oracle/TestDelete/import/6.exp.json +++ b/testdata/d2oracle/TestDelete/import/6.exp.json @@ -88,6 +88,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -199,6 +200,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/import/7.exp.json b/testdata/d2oracle/TestDelete/import/7.exp.json index aaf6a4fa1..ed04a8f05 100644 --- a/testdata/d2oracle/TestDelete/import/7.exp.json +++ b/testdata/d2oracle/TestDelete/import/7.exp.json @@ -39,6 +39,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -86,6 +87,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/import/8.exp.json b/testdata/d2oracle/TestDelete/import/8.exp.json index 9cd9e2256..5d45bc795 100644 --- a/testdata/d2oracle/TestDelete/import/8.exp.json +++ b/testdata/d2oracle/TestDelete/import/8.exp.json @@ -39,6 +39,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -70,6 +71,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -117,6 +119,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -162,6 +165,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/key_with_edges.exp.json b/testdata/d2oracle/TestDelete/key_with_edges.exp.json index b627b4c4c..dc1b320b8 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges.exp.json @@ -87,6 +87,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -176,6 +177,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -232,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -288,6 +291,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json b/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json index 3d1f7b584..7e05620bf 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges_2.exp.json @@ -53,6 +53,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -111,6 +112,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -167,6 +169,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json b/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json index 1506c5f02..ac13dc579 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges_3.exp.json @@ -53,6 +53,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -111,6 +112,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -167,6 +169,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json b/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json index 605af29ab..a1be88d73 100644 --- a/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json +++ b/testdata/d2oracle/TestDelete/key_with_edges_4.exp.json @@ -87,6 +87,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -176,6 +177,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -232,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -288,6 +291,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/label-near-in-layer.exp.json b/testdata/d2oracle/TestDelete/label-near-in-layer.exp.json index 28bc88fa7..e05828233 100644 --- a/testdata/d2oracle/TestDelete/label-near-in-layer.exp.json +++ b/testdata/d2oracle/TestDelete/label-near-in-layer.exp.json @@ -100,6 +100,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -118,7 +119,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestDelete/label-near-in-layer.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -128,10 +129,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestDelete/label-near-in-layer.d2,2:4:21-2:5:22", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -156,6 +158,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -203,6 +206,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/label-near/1.exp.json b/testdata/d2oracle/TestDelete/label-near/1.exp.json index 6243ba4b4..274c2cd09 100644 --- a/testdata/d2oracle/TestDelete/label-near/1.exp.json +++ b/testdata/d2oracle/TestDelete/label-near/1.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/label-near/2.exp.json b/testdata/d2oracle/TestDelete/label-near/2.exp.json index 9decfa8ed..d9dc5e4eb 100644 --- a/testdata/d2oracle/TestDelete/label-near/2.exp.json +++ b/testdata/d2oracle/TestDelete/label-near/2.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/layer-delete-complex-object.exp.json b/testdata/d2oracle/TestDelete/layer-delete-complex-object.exp.json new file mode 100644 index 000000000..72926a872 --- /dev/null +++ b/testdata/d2oracle/TestDelete/layer-delete-complex-object.exp.json @@ -0,0 +1,296 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,0:0:0-7:0:32", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,0:0:0-0:1:1", + "key": { + "range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,0:0:0-0:1:1", + "value": [ + { + "string": "k", + "raw_string": "k" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,2:0:3-6:1:31", + "key": { + "range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,2:0:3-2:6:9", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,2:0:3-2:6:9", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,2:8:11-6:1:31", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,3:2:15-5:3:29", + "key": { + "range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,3:2:15-3:3:16", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,3:2:15-3:3:16", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,3:5:18-5:3:29", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,4:4:24-4:5:25", + "key": { + "range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,4:4:24-4:5:25", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,4:4:24-4:5:25", + "value": [ + { + "string": "j", + "raw_string": "j" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "k", + "id_val": "k", + "references": [ + { + "key": { + "range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,0:0:0-0:1:1", + "value": [ + { + "string": "k", + "raw_string": "k" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "k" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ], + "layers": [ + { + "name": "x", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,0:0:0-1:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,4:4:24-4:5:25", + "value": [ + { + "string": "j", + "raw_string": "j" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "j", + "id_val": "j", + "references": [ + { + "key": { + "range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,4:4:24-4:5:25", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestDelete/layer-delete-complex-object.d2,4:4:24-4:5:25", + "value": [ + { + "string": "j", + "raw_string": "j" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "j" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + } + ] + }, + "err": "" +} diff --git a/testdata/d2oracle/TestDelete/layers-basic.exp.json b/testdata/d2oracle/TestDelete/layers-basic.exp.json index b8f5f3fce..a32fc00c9 100644 --- a/testdata/d2oracle/TestDelete/layers-basic.exp.json +++ b/testdata/d2oracle/TestDelete/layers-basic.exp.json @@ -123,6 +123,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -170,6 +171,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -187,7 +189,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestDelete/layers-basic.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -197,10 +199,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestDelete/layers-basic.d2,4:4:24-4:5:25", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -225,6 +228,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -272,6 +276,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/left.exp.json b/testdata/d2oracle/TestDelete/left.exp.json index ecb9c0394..d4ba51dab 100644 --- a/testdata/d2oracle/TestDelete/left.exp.json +++ b/testdata/d2oracle/TestDelete/left.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/multi_near.exp.json b/testdata/d2oracle/TestDelete/multi_near.exp.json index f6c3e68b1..9d13be180 100644 --- a/testdata/d2oracle/TestDelete/multi_near.exp.json +++ b/testdata/d2oracle/TestDelete/multi_near.exp.json @@ -189,6 +189,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -236,6 +237,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -281,6 +283,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": { "range": "d2/testdata/d2oracle/TestDelete/multi_near.d2,2:8:24-2:11:27", "path": [ @@ -341,6 +344,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": { "range": "d2/testdata/d2oracle/TestDelete/multi_near.d2,5:8:44-5:12:48", "path": [ @@ -401,6 +405,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json b/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json index 88f938d40..6158294b1 100644 --- a/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/multi_path_map_conflict.exp.json @@ -123,6 +123,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -190,6 +191,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -235,6 +237,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -280,6 +283,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json b/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json index 2e67684d4..85b6550c1 100644 --- a/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/multi_path_map_no_conflict.exp.json @@ -94,6 +94,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -141,6 +142,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -186,6 +188,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -231,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json b/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json index a50fae2dd..bdc4f201a 100644 --- a/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json +++ b/testdata/d2oracle/TestDelete/multiple_flat_middle_container.exp.json @@ -87,6 +87,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -176,6 +177,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -232,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -288,6 +291,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json b/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json index daca2a820..a453f6782 100644 --- a/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/multiple_flat_style.exp.json @@ -70,6 +70,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -143,6 +144,7 @@ "value": "0.4" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json b/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json index 01edf7efc..37d3de399 100644 --- a/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json +++ b/testdata/d2oracle/TestDelete/multiple_map_styles.exp.json @@ -106,6 +106,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -157,6 +158,7 @@ "value": "0.4" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/near.exp.json b/testdata/d2oracle/TestDelete/near.exp.json index 0ce229964..3fefaa368 100644 --- a/testdata/d2oracle/TestDelete/near.exp.json +++ b/testdata/d2oracle/TestDelete/near.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/nested.exp.json b/testdata/d2oracle/TestDelete/nested.exp.json index 462b1f7c6..9f8a5d5e1 100644 --- a/testdata/d2oracle/TestDelete/nested.exp.json +++ b/testdata/d2oracle/TestDelete/nested.exp.json @@ -64,6 +64,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -133,6 +134,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -200,6 +202,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -267,6 +270,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/nested_2.exp.json b/testdata/d2oracle/TestDelete/nested_2.exp.json index d473f7e02..479b5e676 100644 --- a/testdata/d2oracle/TestDelete/nested_2.exp.json +++ b/testdata/d2oracle/TestDelete/nested_2.exp.json @@ -64,6 +64,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -133,6 +134,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -200,6 +202,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -267,6 +270,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json b/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json index 084c5aba9..caa58e4bb 100644 --- a/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json +++ b/testdata/d2oracle/TestDelete/nested_edge_key_style.exp.json @@ -94,6 +94,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -125,6 +126,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -172,6 +174,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -217,6 +220,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -262,6 +266,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/nested_flat_style.exp.json b/testdata/d2oracle/TestDelete/nested_flat_style.exp.json index 6536e0ab9..bc4dc5b50 100644 --- a/testdata/d2oracle/TestDelete/nested_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/nested_flat_style.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/nested_reserved.exp.json b/testdata/d2oracle/TestDelete/nested_reserved.exp.json index 38b307002..4ba76f7e3 100644 --- a/testdata/d2oracle/TestDelete/nested_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/nested_reserved.exp.json @@ -98,6 +98,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -198,6 +199,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -296,6 +298,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -363,6 +366,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json b/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json index 73b193b3f..d4cf3561f 100644 --- a/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json +++ b/testdata/d2oracle/TestDelete/nested_underscore_update.exp.json @@ -82,6 +82,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -129,6 +130,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -185,6 +187,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/node_in_edge.exp.json b/testdata/d2oracle/TestDelete/node_in_edge.exp.json index dc3c6c44f..68973323e 100644 --- a/testdata/d2oracle/TestDelete/node_in_edge.exp.json +++ b/testdata/d2oracle/TestDelete/node_in_edge.exp.json @@ -163,6 +163,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -194,6 +195,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -224,6 +226,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -271,6 +274,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -316,6 +320,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -361,6 +366,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -406,6 +412,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -451,6 +458,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -496,6 +504,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json index 117af5395..b85f87b5c 100644 --- a/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json +++ b/testdata/d2oracle/TestDelete/node_in_edge_last.exp.json @@ -202,6 +202,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -233,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -263,6 +265,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -293,6 +296,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -340,6 +344,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -405,6 +410,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -470,6 +476,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -515,6 +522,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -571,6 +579,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -627,6 +636,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -672,6 +682,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/only-underscore-nested.exp.json b/testdata/d2oracle/TestDelete/only-underscore-nested.exp.json index b5c7ccdae..d0a8c0dd2 100644 --- a/testdata/d2oracle/TestDelete/only-underscore-nested.exp.json +++ b/testdata/d2oracle/TestDelete/only-underscore-nested.exp.json @@ -94,6 +94,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -141,6 +142,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -186,6 +188,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -231,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/only-underscore.exp.json b/testdata/d2oracle/TestDelete/only-underscore.exp.json index 2309c924e..09859fa6b 100644 --- a/testdata/d2oracle/TestDelete/only-underscore.exp.json +++ b/testdata/d2oracle/TestDelete/only-underscore.exp.json @@ -71,6 +71,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -118,6 +119,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -163,6 +165,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json index b93c9f0c6..414d6bdc5 100644 --- a/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/only_delete_edge_reserved.exp.json @@ -161,6 +161,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -192,6 +193,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -263,6 +265,7 @@ "value": "#000e3d" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -328,6 +331,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json index 35f4eac8b..01a550957 100644 --- a/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json +++ b/testdata/d2oracle/TestDelete/only_delete_obj_reserved.exp.json @@ -161,6 +161,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -196,6 +197,7 @@ "value": "#2b50c2" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -263,6 +265,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -328,6 +331,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/order_1.exp.json b/testdata/d2oracle/TestDelete/order_1.exp.json index 81c1a7f63..f9a3a474f 100644 --- a/testdata/d2oracle/TestDelete/order_1.exp.json +++ b/testdata/d2oracle/TestDelete/order_1.exp.json @@ -88,6 +88,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -119,6 +120,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -166,6 +168,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -211,6 +214,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -256,6 +260,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/order_2.exp.json b/testdata/d2oracle/TestDelete/order_2.exp.json index fb792b501..1c5e29b72 100644 --- a/testdata/d2oracle/TestDelete/order_2.exp.json +++ b/testdata/d2oracle/TestDelete/order_2.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -112,6 +113,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -157,6 +159,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/order_3.exp.json b/testdata/d2oracle/TestDelete/order_3.exp.json index 3d12f9941..b7f6d4a5d 100644 --- a/testdata/d2oracle/TestDelete/order_3.exp.json +++ b/testdata/d2oracle/TestDelete/order_3.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -112,6 +113,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -157,6 +159,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/order_4.exp.json b/testdata/d2oracle/TestDelete/order_4.exp.json index b742e3635..aa2e94afc 100644 --- a/testdata/d2oracle/TestDelete/order_4.exp.json +++ b/testdata/d2oracle/TestDelete/order_4.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/order_5.exp.json b/testdata/d2oracle/TestDelete/order_5.exp.json index 340e97382..61cdfd965 100644 --- a/testdata/d2oracle/TestDelete/order_5.exp.json +++ b/testdata/d2oracle/TestDelete/order_5.exp.json @@ -140,6 +140,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -171,6 +172,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -201,6 +203,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -248,6 +251,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -293,6 +297,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -338,6 +343,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -383,6 +389,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -428,6 +435,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/order_6.exp.json b/testdata/d2oracle/TestDelete/order_6.exp.json index 010f688df..0e2998364 100644 --- a/testdata/d2oracle/TestDelete/order_6.exp.json +++ b/testdata/d2oracle/TestDelete/order_6.exp.json @@ -116,6 +116,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -205,6 +206,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -250,6 +252,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -317,6 +320,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -384,6 +388,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/order_7.exp.json b/testdata/d2oracle/TestDelete/order_7.exp.json index d85b7b0cc..4ee812176 100644 --- a/testdata/d2oracle/TestDelete/order_7.exp.json +++ b/testdata/d2oracle/TestDelete/order_7.exp.json @@ -127,6 +127,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -227,6 +228,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -272,6 +274,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -350,6 +353,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -428,6 +432,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -506,6 +511,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/order_8.exp.json b/testdata/d2oracle/TestDelete/order_8.exp.json index 962ecad45..d28a92233 100644 --- a/testdata/d2oracle/TestDelete/order_8.exp.json +++ b/testdata/d2oracle/TestDelete/order_8.exp.json @@ -134,6 +134,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -181,6 +182,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -226,6 +228,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -271,6 +274,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -316,6 +320,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -361,6 +366,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/save_map.exp.json b/testdata/d2oracle/TestDelete/save_map.exp.json index f9a437bd2..279f40cfd 100644 --- a/testdata/d2oracle/TestDelete/save_map.exp.json +++ b/testdata/d2oracle/TestDelete/save_map.exp.json @@ -81,6 +81,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -128,6 +129,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" diff --git a/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json b/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json index 9135e9999..bbbeae2a8 100644 --- a/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json +++ b/testdata/d2oracle/TestDelete/save_map_with_primary.exp.json @@ -91,6 +91,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -138,6 +139,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" diff --git a/testdata/d2oracle/TestDelete/scenarios-basic.exp.json b/testdata/d2oracle/TestDelete/scenarios-basic.exp.json index 40a69618b..09c30487a 100644 --- a/testdata/d2oracle/TestDelete/scenarios-basic.exp.json +++ b/testdata/d2oracle/TestDelete/scenarios-basic.exp.json @@ -123,6 +123,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -170,6 +171,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -187,7 +189,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestDelete/scenarios-basic.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -197,10 +199,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestDelete/scenarios-basic.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -219,10 +222,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestDelete/scenarios-basic.d2,4:4:27-4:5:28", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -247,6 +251,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -294,6 +299,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -339,6 +345,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/scenarios-edge-inherited.exp.json b/testdata/d2oracle/TestDelete/scenarios-edge-inherited.exp.json index 51771025c..0bee17f8d 100644 --- a/testdata/d2oracle/TestDelete/scenarios-edge-inherited.exp.json +++ b/testdata/d2oracle/TestDelete/scenarios-edge-inherited.exp.json @@ -224,6 +224,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -255,6 +256,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -302,6 +304,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -347,6 +350,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -364,7 +368,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestDelete/scenarios-edge-inherited.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -374,10 +378,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestDelete/scenarios-edge-inherited.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -396,10 +401,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestDelete/scenarios-edge-inherited.d2,0:5:5-0:6:6", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -418,10 +424,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestDelete/scenarios-edge-inherited.d2,5:4:38-5:5:39", "value": [ { - "string": "c" + "string": "c", + "raw_string": "c" } ] } @@ -446,6 +453,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -493,6 +501,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -558,6 +567,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -603,6 +613,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/scenarios-inherited.exp.json b/testdata/d2oracle/TestDelete/scenarios-inherited.exp.json index 26752dc82..03bb2f88a 100644 --- a/testdata/d2oracle/TestDelete/scenarios-inherited.exp.json +++ b/testdata/d2oracle/TestDelete/scenarios-inherited.exp.json @@ -173,6 +173,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -220,6 +221,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -237,7 +239,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestDelete/scenarios-inherited.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -247,10 +249,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestDelete/scenarios-inherited.d2,4:4:27-4:5:28", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -269,10 +272,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestDelete/scenarios-inherited.d2,5:4:33-5:5:34", "value": [ { - "string": "c" + "string": "c", + "raw_string": "c" } ] } @@ -297,6 +301,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -344,6 +349,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -389,6 +395,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/shape_class.exp.json b/testdata/d2oracle/TestDelete/shape_class.exp.json index e5f1f7ea9..aadd6c007 100644 --- a/testdata/d2oracle/TestDelete/shape_class.exp.json +++ b/testdata/d2oracle/TestDelete/shape_class.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json index 279fee006..95bcc6b83 100644 --- a/testdata/d2oracle/TestDelete/shape_sql_table.exp.json +++ b/testdata/d2oracle/TestDelete/shape_sql_table.exp.json @@ -262,6 +262,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -293,6 +294,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -340,6 +342,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -470,6 +473,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "sql_table" @@ -515,6 +519,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/singular_flat_style.exp.json b/testdata/d2oracle/TestDelete/singular_flat_style.exp.json index 4468c2179..4115dc9be 100644 --- a/testdata/d2oracle/TestDelete/singular_flat_style.exp.json +++ b/testdata/d2oracle/TestDelete/singular_flat_style.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/singular_map_style.exp.json b/testdata/d2oracle/TestDelete/singular_map_style.exp.json index 341dfb3c4..bed7f7c8d 100644 --- a/testdata/d2oracle/TestDelete/singular_map_style.exp.json +++ b/testdata/d2oracle/TestDelete/singular_map_style.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/table_refs.exp.json b/testdata/d2oracle/TestDelete/table_refs.exp.json index 8dddf30b2..57f587270 100644 --- a/testdata/d2oracle/TestDelete/table_refs.exp.json +++ b/testdata/d2oracle/TestDelete/table_refs.exp.json @@ -138,6 +138,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -248,6 +249,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "sql_table" diff --git a/testdata/d2oracle/TestDelete/underscore_linked.exp.json b/testdata/d2oracle/TestDelete/underscore_linked.exp.json new file mode 100644 index 000000000..69fcd6c0c --- /dev/null +++ b/testdata/d2oracle/TestDelete/underscore_linked.exp.json @@ -0,0 +1,296 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2oracle/TestDelete/underscore_linked.d2,0:0:0-7:0:32", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2oracle/TestDelete/underscore_linked.d2,0:0:0-0:1:1", + "key": { + "range": "d2/testdata/d2oracle/TestDelete/underscore_linked.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestDelete/underscore_linked.d2,0:0:0-0:1:1", + "value": [ + { + "string": "k", + "raw_string": "k" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "d2/testdata/d2oracle/TestDelete/underscore_linked.d2,2:0:3-6:1:31", + "key": { + "range": "d2/testdata/d2oracle/TestDelete/underscore_linked.d2,2:0:3-2:6:9", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestDelete/underscore_linked.d2,2:0:3-2:6:9", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2oracle/TestDelete/underscore_linked.d2,2:8:11-6:1:31", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2oracle/TestDelete/underscore_linked.d2,3:2:15-5:3:29", + "key": { + "range": "d2/testdata/d2oracle/TestDelete/underscore_linked.d2,3:2:15-3:3:16", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestDelete/underscore_linked.d2,3:2:15-3:3:16", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2oracle/TestDelete/underscore_linked.d2,3:5:18-5:3:29", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2oracle/TestDelete/underscore_linked.d2,4:4:24-4:5:25", + "key": { + "range": "d2/testdata/d2oracle/TestDelete/underscore_linked.d2,4:4:24-4:5:25", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestDelete/underscore_linked.d2,4:4:24-4:5:25", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "k", + "id_val": "k", + "references": [ + { + "key": { + "range": "d2/testdata/d2oracle/TestDelete/underscore_linked.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestDelete/underscore_linked.d2,0:0:0-0:1:1", + "value": [ + { + "string": "k", + "raw_string": "k" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "k" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ], + "layers": [ + { + "name": "x", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2oracle/TestDelete/underscore_linked.d2,0:0:0-1:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestDelete/underscore_linked.d2,4:4:24-4:5:25", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "a", + "id_val": "a", + "references": [ + { + "key": { + "range": "d2/testdata/d2oracle/TestDelete/underscore_linked.d2,4:4:24-4:5:25", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestDelete/underscore_linked.d2,4:4:24-4:5:25", + "value": [ + { + "string": "a", + "raw_string": "a" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "a" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + } + ] + }, + "err": "" +} diff --git a/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json b/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json index 95ef38dd6..69c62e233 100644 --- a/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json +++ b/testdata/d2oracle/TestDelete/underscore_no_conflict.exp.json @@ -105,6 +105,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -152,6 +153,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -208,6 +210,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -253,6 +256,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/underscore_remove.exp.json b/testdata/d2oracle/TestDelete/underscore_remove.exp.json index 17f728b9d..20b8dd3df 100644 --- a/testdata/d2oracle/TestDelete/underscore_remove.exp.json +++ b/testdata/d2oracle/TestDelete/underscore_remove.exp.json @@ -134,6 +134,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -165,6 +166,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -195,6 +197,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -242,6 +245,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -287,6 +291,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -332,6 +337,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -377,6 +383,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -422,6 +429,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/update-near-in-layer.exp.json b/testdata/d2oracle/TestDelete/update-near-in-layer.exp.json index c30b0d330..5c6907533 100644 --- a/testdata/d2oracle/TestDelete/update-near-in-layer.exp.json +++ b/testdata/d2oracle/TestDelete/update-near-in-layer.exp.json @@ -100,6 +100,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -118,7 +119,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestDelete/update-near-in-layer.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -128,10 +129,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestDelete/update-near-in-layer.d2,2:4:21-2:5:22", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -156,6 +158,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -203,6 +206,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestDelete/width.exp.json b/testdata/d2oracle/TestDelete/width.exp.json index 9b46cd396..0fd00e35e 100644 --- a/testdata/d2oracle/TestDelete/width.exp.json +++ b/testdata/d2oracle/TestDelete/width.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/append_multiple_styles.exp.json b/testdata/d2oracle/TestMove/append_multiple_styles.exp.json index f35e81c9d..133711205 100644 --- a/testdata/d2oracle/TestMove/append_multiple_styles.exp.json +++ b/testdata/d2oracle/TestMove/append_multiple_styles.exp.json @@ -226,6 +226,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -273,6 +274,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -345,6 +347,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/basic.exp.json b/testdata/d2oracle/TestMove/basic.exp.json index cf783246e..223735807 100644 --- a/testdata/d2oracle/TestMove/basic.exp.json +++ b/testdata/d2oracle/TestMove/basic.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/basic_nested.exp.json b/testdata/d2oracle/TestMove/basic_nested.exp.json index 16fc91031..a8f52609f 100644 --- a/testdata/d2oracle/TestMove/basic_nested.exp.json +++ b/testdata/d2oracle/TestMove/basic_nested.exp.json @@ -71,6 +71,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -118,6 +119,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -163,6 +165,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/basic_out_of_container.exp.json b/testdata/d2oracle/TestMove/basic_out_of_container.exp.json index fbe57ba9f..022414e56 100644 --- a/testdata/d2oracle/TestMove/basic_out_of_container.exp.json +++ b/testdata/d2oracle/TestMove/basic_out_of_container.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -112,6 +113,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -157,6 +159,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/between_containers.exp.json b/testdata/d2oracle/TestMove/between_containers.exp.json index 8e4ec8375..4973f5d58 100644 --- a/testdata/d2oracle/TestMove/between_containers.exp.json +++ b/testdata/d2oracle/TestMove/between_containers.exp.json @@ -94,6 +94,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -141,6 +142,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -186,6 +188,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -231,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/chain_connected_nested.exp.json b/testdata/d2oracle/TestMove/chain_connected_nested.exp.json index 587de4889..4bc4d33d3 100644 --- a/testdata/d2oracle/TestMove/chain_connected_nested.exp.json +++ b/testdata/d2oracle/TestMove/chain_connected_nested.exp.json @@ -125,6 +125,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -156,6 +157,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -186,6 +188,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -253,6 +256,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -318,6 +322,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -363,6 +368,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" 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 d4d287d9b..0a62c56e9 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 @@ -113,6 +113,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -144,6 +145,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -174,6 +176,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -232,6 +235,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -288,6 +292,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -353,6 +358,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -398,6 +404,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/connected_nested.exp.json b/testdata/d2oracle/TestMove/connected_nested.exp.json index 895608ae8..1d1af6252 100644 --- a/testdata/d2oracle/TestMove/connected_nested.exp.json +++ b/testdata/d2oracle/TestMove/connected_nested.exp.json @@ -88,6 +88,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -119,6 +120,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -166,6 +168,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -211,6 +214,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -256,6 +260,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/container_conflicts_generated.exp.json b/testdata/d2oracle/TestMove/container_conflicts_generated.exp.json index 2bb20536a..68b9333ee 100644 --- a/testdata/d2oracle/TestMove/container_conflicts_generated.exp.json +++ b/testdata/d2oracle/TestMove/container_conflicts_generated.exp.json @@ -132,6 +132,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -179,6 +180,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -224,6 +226,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -269,6 +272,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -314,6 +318,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.exp.json b/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.exp.json index cab5389a5..a4c35e3ff 100644 --- a/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.exp.json +++ b/testdata/d2oracle/TestMove/container_multiple_refs_with_underscore.exp.json @@ -71,6 +71,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -118,6 +119,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -163,6 +165,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/container_near.exp.json b/testdata/d2oracle/TestMove/container_near.exp.json index 95d0a5982..40cf691f2 100644 --- a/testdata/d2oracle/TestMove/container_near.exp.json +++ b/testdata/d2oracle/TestMove/container_near.exp.json @@ -196,6 +196,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -243,6 +244,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -288,6 +290,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": { "range": "d2/testdata/d2oracle/TestMove/container_near.d2,2:10:22-2:15:27", "path": [ @@ -381,6 +384,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -437,6 +441,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -482,6 +487,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -527,6 +533,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/duplicate.exp.json b/testdata/d2oracle/TestMove/duplicate.exp.json index 322268428..b48987e23 100644 --- a/testdata/d2oracle/TestMove/duplicate.exp.json +++ b/testdata/d2oracle/TestMove/duplicate.exp.json @@ -127,6 +127,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -194,6 +195,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -239,6 +241,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "cylinder" diff --git a/testdata/d2oracle/TestMove/duplicate_generated.exp.json b/testdata/d2oracle/TestMove/duplicate_generated.exp.json index 0b27a1251..149eaa277 100644 --- a/testdata/d2oracle/TestMove/duplicate_generated.exp.json +++ b/testdata/d2oracle/TestMove/duplicate_generated.exp.json @@ -186,6 +186,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -233,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -278,6 +280,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -323,6 +326,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -368,6 +372,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -413,6 +418,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -458,6 +464,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -503,6 +510,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/edge_across_containers.exp.json b/testdata/d2oracle/TestMove/edge_across_containers.exp.json index a796860ef..0846db469 100644 --- a/testdata/d2oracle/TestMove/edge_across_containers.exp.json +++ b/testdata/d2oracle/TestMove/edge_across_containers.exp.json @@ -139,6 +139,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -170,6 +171,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -217,6 +219,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -304,6 +307,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -371,6 +375,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -416,6 +421,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/edge_basic.exp.json b/testdata/d2oracle/TestMove/edge_basic.exp.json index fc1f00057..7ffe333d6 100644 --- a/testdata/d2oracle/TestMove/edge_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_basic.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -96,6 +97,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -143,6 +145,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -188,6 +191,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/edge_chain_basic.exp.json b/testdata/d2oracle/TestMove/edge_chain_basic.exp.json index 1a72ed1fe..d5caee6fe 100644 --- a/testdata/d2oracle/TestMove/edge_chain_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_basic.exp.json @@ -102,6 +102,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -133,6 +134,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -163,6 +165,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -210,6 +213,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -275,6 +279,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -320,6 +325,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/edge_chain_circular.exp.json b/testdata/d2oracle/TestMove/edge_chain_circular.exp.json index 0fdadf058..6005424ee 100644 --- a/testdata/d2oracle/TestMove/edge_chain_circular.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_circular.exp.json @@ -153,6 +153,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -184,6 +185,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -214,6 +216,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -261,6 +264,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -348,6 +352,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -413,6 +418,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json b/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json index c8c7aee24..c49f31398 100644 --- a/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_into_container.exp.json @@ -136,6 +136,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -167,6 +168,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -197,6 +199,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -275,6 +278,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -331,6 +335,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -396,6 +401,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -441,6 +447,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json b/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json index 71c90c3cf..caf2e5a4d 100644 --- a/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_chain_out_container.exp.json @@ -153,6 +153,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -184,6 +185,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -214,6 +216,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -261,6 +264,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -306,6 +310,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -393,6 +398,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -438,6 +444,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/edge_conflict.exp.json b/testdata/d2oracle/TestMove/edge_conflict.exp.json index 208bbc7c6..751b426ce 100644 --- a/testdata/d2oracle/TestMove/edge_conflict.exp.json +++ b/testdata/d2oracle/TestMove/edge_conflict.exp.json @@ -139,6 +139,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -170,6 +171,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -259,6 +261,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -315,6 +318,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -371,6 +375,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -416,6 +421,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -461,6 +467,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/edge_into_container.exp.json b/testdata/d2oracle/TestMove/edge_into_container.exp.json index 8ea6e91c5..7008e9fcf 100644 --- a/testdata/d2oracle/TestMove/edge_into_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_into_container.exp.json @@ -128,6 +128,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -159,6 +160,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -237,6 +239,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -282,6 +285,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -338,6 +342,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -383,6 +388,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/edge_nested_basic.exp.json b/testdata/d2oracle/TestMove/edge_nested_basic.exp.json index 34eb8ef15..4065269df 100644 --- a/testdata/d2oracle/TestMove/edge_nested_basic.exp.json +++ b/testdata/d2oracle/TestMove/edge_nested_basic.exp.json @@ -94,6 +94,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -125,6 +126,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -172,6 +174,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -217,6 +220,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -262,6 +266,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/edge_out_of_container.exp.json b/testdata/d2oracle/TestMove/edge_out_of_container.exp.json index f5b230e67..71c01718e 100644 --- a/testdata/d2oracle/TestMove/edge_out_of_container.exp.json +++ b/testdata/d2oracle/TestMove/edge_out_of_container.exp.json @@ -105,6 +105,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -136,6 +137,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -183,6 +185,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -239,6 +242,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -284,6 +288,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/extend_map.exp.json b/testdata/d2oracle/TestMove/extend_map.exp.json index 65216fcde..437ffa606 100644 --- a/testdata/d2oracle/TestMove/extend_map.exp.json +++ b/testdata/d2oracle/TestMove/extend_map.exp.json @@ -152,6 +152,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -219,6 +220,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -264,6 +266,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -309,6 +312,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -354,6 +358,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/extend_stationary_path.exp.json b/testdata/d2oracle/TestMove/extend_stationary_path.exp.json index c727e8304..f8bdef2b9 100644 --- a/testdata/d2oracle/TestMove/extend_stationary_path.exp.json +++ b/testdata/d2oracle/TestMove/extend_stationary_path.exp.json @@ -145,6 +145,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -234,6 +235,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -321,6 +323,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -408,6 +411,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/flat_between_containers.exp.json b/testdata/d2oracle/TestMove/flat_between_containers.exp.json index dfe4b4932..0b379c8fd 100644 --- a/testdata/d2oracle/TestMove/flat_between_containers.exp.json +++ b/testdata/d2oracle/TestMove/flat_between_containers.exp.json @@ -94,6 +94,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -141,6 +142,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -186,6 +188,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -231,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/flat_merge.exp.json b/testdata/d2oracle/TestMove/flat_merge.exp.json index 735394e90..584f99569 100644 --- a/testdata/d2oracle/TestMove/flat_merge.exp.json +++ b/testdata/d2oracle/TestMove/flat_merge.exp.json @@ -127,6 +127,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -174,6 +175,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -219,6 +221,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -264,6 +267,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -309,6 +313,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/flat_middle_container.exp.json b/testdata/d2oracle/TestMove/flat_middle_container.exp.json index 249f6e625..981d0912e 100644 --- a/testdata/d2oracle/TestMove/flat_middle_container.exp.json +++ b/testdata/d2oracle/TestMove/flat_middle_container.exp.json @@ -105,6 +105,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -163,6 +164,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -219,6 +221,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -264,6 +267,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -309,6 +313,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/flat_near.exp.json b/testdata/d2oracle/TestMove/flat_near.exp.json index 88af9eb39..bdfb578ed 100644 --- a/testdata/d2oracle/TestMove/flat_near.exp.json +++ b/testdata/d2oracle/TestMove/flat_near.exp.json @@ -115,6 +115,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -173,6 +174,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": { "range": "d2/testdata/d2oracle/TestMove/flat_near.d2,0:8:8-0:11:11", "path": [ @@ -244,6 +246,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -289,6 +292,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/flat_nested_merge.exp.json b/testdata/d2oracle/TestMove/flat_nested_merge.exp.json index 5e057fe71..91a9b53df 100644 --- a/testdata/d2oracle/TestMove/flat_nested_merge.exp.json +++ b/testdata/d2oracle/TestMove/flat_nested_merge.exp.json @@ -183,6 +183,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -263,6 +264,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -341,6 +343,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -419,6 +422,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -497,6 +501,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -553,6 +558,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -609,6 +615,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -676,6 +683,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -743,6 +751,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -810,6 +819,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -855,6 +865,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json b/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json index a1abcb3b1..ca6f15447 100644 --- a/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json +++ b/testdata/d2oracle/TestMove/flat_nested_merge_multiple_refs.exp.json @@ -281,6 +281,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -423,6 +424,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -574,6 +576,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -725,6 +728,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -770,6 +774,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -815,6 +820,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -860,6 +866,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -905,6 +912,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -983,6 +991,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json index 28401eb18..280402909 100644 --- a/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json +++ b/testdata/d2oracle/TestMove/flat_reparent_with_map_value.exp.json @@ -104,6 +104,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -151,6 +152,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -196,6 +198,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "hexagon" diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json index 5ca987152..8ad631152 100644 --- a/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json +++ b/testdata/d2oracle/TestMove/flat_reparent_with_mixed_map_value.exp.json @@ -145,6 +145,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -192,6 +193,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -237,6 +239,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -282,6 +285,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "hexagon" diff --git a/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json b/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json index 936069718..ddb2a28c6 100644 --- a/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json +++ b/testdata/d2oracle/TestMove/flat_reparent_with_value.exp.json @@ -75,6 +75,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -122,6 +123,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -167,6 +169,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/flat_style.exp.json b/testdata/d2oracle/TestMove/flat_style.exp.json index ac3ee7326..29e36b1e9 100644 --- a/testdata/d2oracle/TestMove/flat_style.exp.json +++ b/testdata/d2oracle/TestMove/flat_style.exp.json @@ -154,6 +154,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -201,6 +202,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -317,6 +319,7 @@ "value": "black" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/full_edge_slice.exp.json b/testdata/d2oracle/TestMove/full_edge_slice.exp.json index fa669a32d..c25b8d2fc 100644 --- a/testdata/d2oracle/TestMove/full_edge_slice.exp.json +++ b/testdata/d2oracle/TestMove/full_edge_slice.exp.json @@ -208,6 +208,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -239,6 +240,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -269,6 +271,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -347,6 +350,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -392,6 +396,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -488,6 +493,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -564,6 +570,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/full_slice.exp.json b/testdata/d2oracle/TestMove/full_slice.exp.json index 7ac3ed662..10332641e 100644 --- a/testdata/d2oracle/TestMove/full_slice.exp.json +++ b/testdata/d2oracle/TestMove/full_slice.exp.json @@ -94,6 +94,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -141,6 +142,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -186,6 +188,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -231,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/gnarly_1.exp.json b/testdata/d2oracle/TestMove/gnarly_1.exp.json index d4fdf0016..53f76c308 100644 --- a/testdata/d2oracle/TestMove/gnarly_1.exp.json +++ b/testdata/d2oracle/TestMove/gnarly_1.exp.json @@ -352,6 +352,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -383,6 +384,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -413,6 +415,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -443,6 +446,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -512,6 +516,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -579,6 +584,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -646,6 +652,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -753,6 +760,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -820,6 +828,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -887,6 +896,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -932,6 +942,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1039,6 +1050,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1115,6 +1127,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1171,6 +1184,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1227,6 +1241,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1283,6 +1298,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/hoist_container_children.exp.json b/testdata/d2oracle/TestMove/hoist_container_children.exp.json index e1175fec1..0e642f6f9 100644 --- a/testdata/d2oracle/TestMove/hoist_container_children.exp.json +++ b/testdata/d2oracle/TestMove/hoist_container_children.exp.json @@ -117,6 +117,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -164,6 +165,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -209,6 +211,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -254,6 +257,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -299,6 +303,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_conflict.exp.json b/testdata/d2oracle/TestMove/include_descendants_conflict.exp.json index 891d371f0..ebc857b6f 100644 --- a/testdata/d2oracle/TestMove/include_descendants_conflict.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_conflict.exp.json @@ -105,6 +105,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -152,6 +153,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -197,6 +199,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -253,6 +256,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -309,6 +313,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_edge_child.exp.json b/testdata/d2oracle/TestMove/include_descendants_edge_child.exp.json index ae2d5dbd4..e1df02488 100644 --- a/testdata/d2oracle/TestMove/include_descendants_edge_child.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_edge_child.exp.json @@ -123,6 +123,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -154,6 +155,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -201,6 +203,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -246,6 +249,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -291,6 +295,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -336,6 +341,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_edge_ref_1.exp.json b/testdata/d2oracle/TestMove/include_descendants_edge_ref_1.exp.json index e2cdeca29..edfabb095 100644 --- a/testdata/d2oracle/TestMove/include_descendants_edge_ref_1.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_edge_ref_1.exp.json @@ -161,6 +161,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -192,6 +193,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -323,6 +325,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -452,6 +455,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -519,6 +523,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -586,6 +591,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_edge_ref_2.exp.json b/testdata/d2oracle/TestMove/include_descendants_edge_ref_2.exp.json index 6398bdbee..56f57f5e3 100644 --- a/testdata/d2oracle/TestMove/include_descendants_edge_ref_2.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_edge_ref_2.exp.json @@ -88,6 +88,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -119,6 +120,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -166,6 +168,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -211,6 +214,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -256,6 +260,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_edge_ref_3.exp.json b/testdata/d2oracle/TestMove/include_descendants_edge_ref_3.exp.json index 49eeceb6a..26e165ce9 100644 --- a/testdata/d2oracle/TestMove/include_descendants_edge_ref_3.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_edge_ref_3.exp.json @@ -99,6 +99,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -130,6 +131,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -177,6 +179,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -233,6 +236,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -289,6 +293,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -334,6 +339,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_edge_ref_4.exp.json b/testdata/d2oracle/TestMove/include_descendants_edge_ref_4.exp.json index a0401b010..159337132 100644 --- a/testdata/d2oracle/TestMove/include_descendants_edge_ref_4.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_edge_ref_4.exp.json @@ -133,6 +133,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -164,6 +165,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -211,6 +213,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -298,6 +301,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -365,6 +369,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -432,6 +437,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -477,6 +483,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_edge_ref_5.exp.json b/testdata/d2oracle/TestMove/include_descendants_edge_ref_5.exp.json index 588c19dc5..91a2ab1a7 100644 --- a/testdata/d2oracle/TestMove/include_descendants_edge_ref_5.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_edge_ref_5.exp.json @@ -162,6 +162,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -193,6 +194,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -240,6 +242,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -285,6 +288,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -372,6 +376,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -439,6 +444,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -506,6 +512,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -551,6 +558,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_edge_ref_6.exp.json b/testdata/d2oracle/TestMove/include_descendants_edge_ref_6.exp.json index 6e965a5c1..c248f2309 100644 --- a/testdata/d2oracle/TestMove/include_descendants_edge_ref_6.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_edge_ref_6.exp.json @@ -99,6 +99,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -130,6 +131,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -177,6 +179,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -253,6 +256,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -309,6 +313,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_edge_ref_7.exp.json b/testdata/d2oracle/TestMove/include_descendants_edge_ref_7.exp.json index e4786e442..02d5dba38 100644 --- a/testdata/d2oracle/TestMove/include_descendants_edge_ref_7.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_edge_ref_7.exp.json @@ -121,6 +121,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -152,6 +153,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -272,6 +274,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -328,6 +331,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -384,6 +388,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -440,6 +445,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_edge_ref_underscore.exp.json b/testdata/d2oracle/TestMove/include_descendants_edge_ref_underscore.exp.json index b3266b6ad..3434b8c76 100644 --- a/testdata/d2oracle/TestMove/include_descendants_edge_ref_underscore.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_edge_ref_underscore.exp.json @@ -302,6 +302,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -333,6 +334,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -363,6 +365,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -600,6 +603,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -835,6 +839,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -955,6 +960,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1075,6 +1081,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1120,6 +1127,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_flat_1.exp.json b/testdata/d2oracle/TestMove/include_descendants_flat_1.exp.json index abfb18ae5..83786f98a 100644 --- a/testdata/d2oracle/TestMove/include_descendants_flat_1.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_flat_1.exp.json @@ -82,6 +82,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -129,6 +130,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -185,6 +187,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -241,6 +244,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_flat_2.exp.json b/testdata/d2oracle/TestMove/include_descendants_flat_2.exp.json index bbb9dbc8f..6745e27f4 100644 --- a/testdata/d2oracle/TestMove/include_descendants_flat_2.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_flat_2.exp.json @@ -116,6 +116,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -194,6 +195,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -250,6 +252,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -306,6 +309,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -362,6 +366,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_flat_3.exp.json b/testdata/d2oracle/TestMove/include_descendants_flat_3.exp.json index 53a6d1c9a..0ab3c4ae9 100644 --- a/testdata/d2oracle/TestMove/include_descendants_flat_3.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_flat_3.exp.json @@ -110,6 +110,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -188,6 +189,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -244,6 +246,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -300,6 +303,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -356,6 +360,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_flat_4.exp.json b/testdata/d2oracle/TestMove/include_descendants_flat_4.exp.json index 2f602a41c..5b2add389 100644 --- a/testdata/d2oracle/TestMove/include_descendants_flat_4.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_flat_4.exp.json @@ -110,6 +110,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -199,6 +200,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -255,6 +257,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -311,6 +314,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -356,6 +360,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_grandchild.exp.json b/testdata/d2oracle/TestMove/include_descendants_grandchild.exp.json index bc210a92d..70eae72ff 100644 --- a/testdata/d2oracle/TestMove/include_descendants_grandchild.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_grandchild.exp.json @@ -163,6 +163,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -210,6 +211,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -255,6 +257,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -331,6 +334,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -387,6 +391,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -432,6 +437,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_map_1.exp.json b/testdata/d2oracle/TestMove/include_descendants_map_1.exp.json index 22437cde7..566d37fb6 100644 --- a/testdata/d2oracle/TestMove/include_descendants_map_1.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_map_1.exp.json @@ -100,6 +100,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -147,6 +148,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -192,6 +194,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -237,6 +240,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_map_2.exp.json b/testdata/d2oracle/TestMove/include_descendants_map_2.exp.json index c87d5f62d..325482a85 100644 --- a/testdata/d2oracle/TestMove/include_descendants_map_2.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_map_2.exp.json @@ -174,6 +174,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -241,6 +242,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -286,6 +288,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -362,6 +365,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -407,6 +411,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -463,6 +468,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_move_out.exp.json b/testdata/d2oracle/TestMove/include_descendants_move_out.exp.json index c80f7b086..9e64a8c33 100644 --- a/testdata/d2oracle/TestMove/include_descendants_move_out.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_move_out.exp.json @@ -123,6 +123,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -170,6 +171,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -215,6 +217,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -260,6 +263,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -305,6 +309,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_near.exp.json b/testdata/d2oracle/TestMove/include_descendants_near.exp.json index fe66e976f..c1c30c719 100644 --- a/testdata/d2oracle/TestMove/include_descendants_near.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_near.exp.json @@ -126,6 +126,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -173,6 +174,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -229,6 +231,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -285,6 +288,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -341,6 +345,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": { "range": "d2/testdata/d2oracle/TestMove/include_descendants_near.d2,3:8:21-3:13:26", "path": [ diff --git a/testdata/d2oracle/TestMove/include_descendants_nested_1.exp.json b/testdata/d2oracle/TestMove/include_descendants_nested_1.exp.json index e3892169e..b5c716c57 100644 --- a/testdata/d2oracle/TestMove/include_descendants_nested_1.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_nested_1.exp.json @@ -94,6 +94,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -141,6 +142,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -186,6 +188,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -231,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_nested_2.exp.json b/testdata/d2oracle/TestMove/include_descendants_nested_2.exp.json index ca86b08a0..08d0349e5 100644 --- a/testdata/d2oracle/TestMove/include_descendants_nested_2.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_nested_2.exp.json @@ -105,6 +105,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -183,6 +184,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -239,6 +241,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -284,6 +287,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_nested_reserved_2.exp.json b/testdata/d2oracle/TestMove/include_descendants_nested_reserved_2.exp.json index 16780889e..0ec8e5cbd 100644 --- a/testdata/d2oracle/TestMove/include_descendants_nested_reserved_2.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_nested_reserved_2.exp.json @@ -97,6 +97,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -155,6 +156,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -211,6 +213,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -267,6 +270,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" diff --git a/testdata/d2oracle/TestMove/include_descendants_nested_reserved_3.exp.json b/testdata/d2oracle/TestMove/include_descendants_nested_reserved_3.exp.json index 354853776..8a0dca281 100644 --- a/testdata/d2oracle/TestMove/include_descendants_nested_reserved_3.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_nested_reserved_3.exp.json @@ -97,6 +97,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -144,6 +145,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -211,6 +213,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -278,6 +281,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" diff --git a/testdata/d2oracle/TestMove/include_descendants_non_conflict.exp.json b/testdata/d2oracle/TestMove/include_descendants_non_conflict.exp.json index ea03a4bf6..9bff95083 100644 --- a/testdata/d2oracle/TestMove/include_descendants_non_conflict.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_non_conflict.exp.json @@ -128,6 +128,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -175,6 +176,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -220,6 +222,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -276,6 +279,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -332,6 +336,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -377,6 +382,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_sql.exp.json b/testdata/d2oracle/TestMove/include_descendants_sql.exp.json index 990495062..f71724ccd 100644 --- a/testdata/d2oracle/TestMove/include_descendants_sql.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_sql.exp.json @@ -143,6 +143,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -190,6 +191,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -267,6 +269,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "sql_table" diff --git a/testdata/d2oracle/TestMove/include_descendants_underscore.exp.json b/testdata/d2oracle/TestMove/include_descendants_underscore.exp.json index 7c897ae05..1db70c985 100644 --- a/testdata/d2oracle/TestMove/include_descendants_underscore.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_underscore.exp.json @@ -241,6 +241,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -272,6 +273,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -302,6 +304,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -380,6 +383,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -436,6 +440,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -534,6 +539,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -632,6 +638,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -697,6 +704,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -753,6 +761,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_underscore_2.exp.json b/testdata/d2oracle/TestMove/include_descendants_underscore_2.exp.json index 6b24d0ce9..41cff8817 100644 --- a/testdata/d2oracle/TestMove/include_descendants_underscore_2.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_underscore_2.exp.json @@ -116,6 +116,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -205,6 +206,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -250,6 +252,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -317,6 +320,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_underscore_3.exp.json b/testdata/d2oracle/TestMove/include_descendants_underscore_3.exp.json index e9279e02e..49ff2400a 100644 --- a/testdata/d2oracle/TestMove/include_descendants_underscore_3.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_underscore_3.exp.json @@ -229,6 +229,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -260,6 +261,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -290,6 +292,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -463,6 +466,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -508,6 +512,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -617,6 +622,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -662,6 +668,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -729,6 +736,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_underscore_regression.exp.json b/testdata/d2oracle/TestMove/include_descendants_underscore_regression.exp.json index 44caff5d9..ba5d3050f 100644 --- a/testdata/d2oracle/TestMove/include_descendants_underscore_regression.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_underscore_regression.exp.json @@ -71,6 +71,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -118,6 +119,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -163,6 +165,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/include_descendants_underscore_regression_2.exp.json b/testdata/d2oracle/TestMove/include_descendants_underscore_regression_2.exp.json index 14b463daf..4c52f6ba6 100644 --- a/testdata/d2oracle/TestMove/include_descendants_underscore_regression_2.exp.json +++ b/testdata/d2oracle/TestMove/include_descendants_underscore_regression_2.exp.json @@ -82,6 +82,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -129,6 +130,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -185,6 +187,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -241,6 +244,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/into_container_existing_map.exp.json b/testdata/d2oracle/TestMove/into_container_existing_map.exp.json index 2d4b8dd57..0a378b1b8 100644 --- a/testdata/d2oracle/TestMove/into_container_existing_map.exp.json +++ b/testdata/d2oracle/TestMove/into_container_existing_map.exp.json @@ -94,6 +94,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -141,6 +142,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -186,6 +188,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -231,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json b/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json index 8f07eb54c..57727eb3c 100644 --- a/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json +++ b/testdata/d2oracle/TestMove/into_container_nonexisting_map.exp.json @@ -71,6 +71,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -118,6 +119,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -163,6 +165,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json b/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json index 409433d81..e669af681 100644 --- a/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json +++ b/testdata/d2oracle/TestMove/into_container_with_flat_keys.exp.json @@ -205,6 +205,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -252,6 +253,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -307,6 +309,7 @@ "value": "#FFFFFF" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json b/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json index 1d1344607..7c87b9557 100644 --- a/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json +++ b/testdata/d2oracle/TestMove/into_container_with_flat_style.exp.json @@ -111,6 +111,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -162,6 +163,7 @@ "value": "5" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -207,6 +209,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/layers-basic.exp.json b/testdata/d2oracle/TestMove/layers-basic.exp.json index 1ebf31684..8f94bc02d 100644 --- a/testdata/d2oracle/TestMove/layers-basic.exp.json +++ b/testdata/d2oracle/TestMove/layers-basic.exp.json @@ -152,6 +152,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -199,6 +200,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -216,7 +218,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -226,10 +228,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,4:4:24-4:5:25", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -239,7 +242,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -249,10 +252,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestMove/layers-basic.d2,5:6:35-5:7:36", "value": [ { - "string": "c" + "string": "c", + "raw_string": "c" } ] } @@ -282,6 +286,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -329,6 +334,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -374,6 +380,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/map_transplant.exp.json b/testdata/d2oracle/TestMove/map_transplant.exp.json index e5eb38532..5e67fd8db 100644 --- a/testdata/d2oracle/TestMove/map_transplant.exp.json +++ b/testdata/d2oracle/TestMove/map_transplant.exp.json @@ -214,6 +214,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -261,6 +262,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -306,6 +308,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -351,6 +354,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -400,6 +404,7 @@ "value": "0.4" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/map_with_label.exp.json b/testdata/d2oracle/TestMove/map_with_label.exp.json index fd11c8959..d8d45770f 100644 --- a/testdata/d2oracle/TestMove/map_with_label.exp.json +++ b/testdata/d2oracle/TestMove/map_with_label.exp.json @@ -104,6 +104,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -151,6 +152,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -196,6 +198,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -241,6 +244,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/merge_nested_maps.exp.json b/testdata/d2oracle/TestMove/merge_nested_maps.exp.json index 7d9fbadc8..2eee34503 100644 --- a/testdata/d2oracle/TestMove/merge_nested_maps.exp.json +++ b/testdata/d2oracle/TestMove/merge_nested_maps.exp.json @@ -265,6 +265,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -312,6 +313,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -461,6 +463,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -517,6 +520,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -593,6 +597,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -660,6 +665,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -727,6 +733,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -772,6 +779,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -817,6 +825,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/merge_reserved.exp.json b/testdata/d2oracle/TestMove/merge_reserved.exp.json index 26d98f1c7..10a25753d 100644 --- a/testdata/d2oracle/TestMove/merge_reserved.exp.json +++ b/testdata/d2oracle/TestMove/merge_reserved.exp.json @@ -256,6 +256,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -303,6 +304,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -441,6 +443,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -497,6 +500,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -553,6 +557,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -609,6 +614,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -654,6 +660,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/middle_container.exp.json b/testdata/d2oracle/TestMove/middle_container.exp.json index c987f6b4e..6f261e618 100644 --- a/testdata/d2oracle/TestMove/middle_container.exp.json +++ b/testdata/d2oracle/TestMove/middle_container.exp.json @@ -94,6 +94,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -141,6 +142,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -186,6 +188,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -231,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/middle_container_generated_conflict.exp.json b/testdata/d2oracle/TestMove/middle_container_generated_conflict.exp.json index 68f5d2343..38609370c 100644 --- a/testdata/d2oracle/TestMove/middle_container_generated_conflict.exp.json +++ b/testdata/d2oracle/TestMove/middle_container_generated_conflict.exp.json @@ -288,6 +288,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -319,6 +320,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -349,6 +351,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -489,6 +492,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -565,6 +569,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -641,6 +646,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -706,6 +712,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -782,6 +789,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -827,6 +835,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/move_container_children.exp.json b/testdata/d2oracle/TestMove/move_container_children.exp.json index 25c452213..cbd771a7d 100644 --- a/testdata/d2oracle/TestMove/move_container_children.exp.json +++ b/testdata/d2oracle/TestMove/move_container_children.exp.json @@ -140,6 +140,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -187,6 +188,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -232,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -277,6 +280,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -322,6 +326,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -367,6 +372,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json b/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json index aad213c61..4cc6eb7ca 100644 --- a/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json +++ b/testdata/d2oracle/TestMove/move_container_conflict_children.exp.json @@ -140,6 +140,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -187,6 +188,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -232,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -277,6 +280,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -322,6 +326,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -367,6 +372,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json b/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json index f50f54085..e27931f74 100644 --- a/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json +++ b/testdata/d2oracle/TestMove/move_into_key_with_value.exp.json @@ -81,6 +81,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -128,6 +129,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -173,6 +175,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/move_out_of_edge.exp.json b/testdata/d2oracle/TestMove/move_out_of_edge.exp.json index 6805aaf32..c33b02578 100644 --- a/testdata/d2oracle/TestMove/move_out_of_edge.exp.json +++ b/testdata/d2oracle/TestMove/move_out_of_edge.exp.json @@ -121,6 +121,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -152,6 +153,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -210,6 +212,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -266,6 +269,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -333,6 +337,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -400,6 +405,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -467,6 +473,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -512,6 +519,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" 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 c92dbe439..4ae6f0cf8 100644 --- a/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json +++ b/testdata/d2oracle/TestMove/move_out_of_nested_edge.exp.json @@ -161,6 +161,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -192,6 +193,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -250,6 +252,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -306,6 +309,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -404,6 +408,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -502,6 +507,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -569,6 +575,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -614,6 +621,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json b/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json index 7d2be161a..901e74a8c 100644 --- a/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json +++ b/testdata/d2oracle/TestMove/multiple_nesting_levels.exp.json @@ -276,6 +276,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -376,6 +377,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -516,6 +518,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -676,6 +679,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -721,6 +725,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -766,6 +771,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -833,6 +839,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -911,6 +918,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/near.exp.json b/testdata/d2oracle/TestMove/near.exp.json index bb04cafce..8e6f4a409 100644 --- a/testdata/d2oracle/TestMove/near.exp.json +++ b/testdata/d2oracle/TestMove/near.exp.json @@ -133,6 +133,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -180,6 +181,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": { "range": "d2/testdata/d2oracle/TestMove/near.d2,1:8:13-1:11:16", "path": [ @@ -251,6 +253,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -296,6 +299,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/nested-underscore-move-out.exp.json b/testdata/d2oracle/TestMove/nested-underscore-move-out.exp.json index 062b7e87b..e195c2c1f 100644 --- a/testdata/d2oracle/TestMove/nested-underscore-move-out.exp.json +++ b/testdata/d2oracle/TestMove/nested-underscore-move-out.exp.json @@ -94,6 +94,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -141,6 +142,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -186,6 +188,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -231,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/nested_reserved_2.exp.json b/testdata/d2oracle/TestMove/nested_reserved_2.exp.json index 178643bd1..bf4d9309b 100644 --- a/testdata/d2oracle/TestMove/nested_reserved_2.exp.json +++ b/testdata/d2oracle/TestMove/nested_reserved_2.exp.json @@ -97,6 +97,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -155,6 +156,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -211,6 +213,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -267,6 +270,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" diff --git a/testdata/d2oracle/TestMove/nested_reserved_3.exp.json b/testdata/d2oracle/TestMove/nested_reserved_3.exp.json index 6e727d799..4d478ad9b 100644 --- a/testdata/d2oracle/TestMove/nested_reserved_3.exp.json +++ b/testdata/d2oracle/TestMove/nested_reserved_3.exp.json @@ -189,6 +189,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -278,6 +279,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -365,6 +367,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -410,6 +413,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -486,6 +490,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" diff --git a/testdata/d2oracle/TestMove/nhooyr_one.exp.json b/testdata/d2oracle/TestMove/nhooyr_one.exp.json index 10b00ea68..4de9a9ac5 100644 --- a/testdata/d2oracle/TestMove/nhooyr_one.exp.json +++ b/testdata/d2oracle/TestMove/nhooyr_one.exp.json @@ -123,6 +123,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -170,6 +171,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -215,6 +217,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -260,6 +263,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -305,6 +309,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/nhooyr_two.exp.json b/testdata/d2oracle/TestMove/nhooyr_two.exp.json index c6d2f7e36..f856c84ca 100644 --- a/testdata/d2oracle/TestMove/nhooyr_two.exp.json +++ b/testdata/d2oracle/TestMove/nhooyr_two.exp.json @@ -169,6 +169,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -200,6 +201,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -247,6 +249,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -292,6 +295,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -337,6 +341,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -382,6 +387,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -427,6 +433,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -472,6 +479,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/out_of_newline_container.exp.json b/testdata/d2oracle/TestMove/out_of_newline_container.exp.json index 406266d42..abf736664 100644 --- a/testdata/d2oracle/TestMove/out_of_newline_container.exp.json +++ b/testdata/d2oracle/TestMove/out_of_newline_container.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -112,6 +113,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -157,6 +159,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/parentheses.exp.json b/testdata/d2oracle/TestMove/parentheses.exp.json index 8550114db..0f72f2fd5 100644 --- a/testdata/d2oracle/TestMove/parentheses.exp.json +++ b/testdata/d2oracle/TestMove/parentheses.exp.json @@ -104,6 +104,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -135,6 +136,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -182,6 +184,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -258,6 +261,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -314,6 +318,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/partial_edge_slice.exp.json b/testdata/d2oracle/TestMove/partial_edge_slice.exp.json index 25c508d64..ecd6c3256 100644 --- a/testdata/d2oracle/TestMove/partial_edge_slice.exp.json +++ b/testdata/d2oracle/TestMove/partial_edge_slice.exp.json @@ -111,6 +111,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -142,6 +143,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -189,6 +191,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -254,6 +257,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -299,6 +303,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/partial_slice.exp.json b/testdata/d2oracle/TestMove/partial_slice.exp.json index adc1a450c..125c9159a 100644 --- a/testdata/d2oracle/TestMove/partial_slice.exp.json +++ b/testdata/d2oracle/TestMove/partial_slice.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -112,6 +113,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -157,6 +159,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/rename_2.exp.json b/testdata/d2oracle/TestMove/rename_2.exp.json index 91bc7ec8e..e4ca0f5f7 100644 --- a/testdata/d2oracle/TestMove/rename_2.exp.json +++ b/testdata/d2oracle/TestMove/rename_2.exp.json @@ -140,6 +140,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -187,6 +188,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -232,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -277,6 +280,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -322,6 +326,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -367,6 +372,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/reuse_map.exp.json b/testdata/d2oracle/TestMove/reuse_map.exp.json index a630a7c6a..31733ba14 100644 --- a/testdata/d2oracle/TestMove/reuse_map.exp.json +++ b/testdata/d2oracle/TestMove/reuse_map.exp.json @@ -157,6 +157,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -204,6 +205,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -280,6 +282,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -325,6 +328,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -370,6 +374,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -426,6 +431,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/slice_style.exp.json b/testdata/d2oracle/TestMove/slice_style.exp.json index ab093f083..4d26bcaa8 100644 --- a/testdata/d2oracle/TestMove/slice_style.exp.json +++ b/testdata/d2oracle/TestMove/slice_style.exp.json @@ -132,6 +132,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -199,6 +200,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -288,6 +290,7 @@ "Fragment": "", "RawFragment": "" }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore-connection.exp.json b/testdata/d2oracle/TestMove/underscore-connection.exp.json index 364083c4e..806d83db8 100644 --- a/testdata/d2oracle/TestMove/underscore-connection.exp.json +++ b/testdata/d2oracle/TestMove/underscore-connection.exp.json @@ -213,6 +213,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -244,6 +245,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -291,6 +293,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -420,6 +423,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -507,6 +511,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -594,6 +599,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_children.exp.json b/testdata/d2oracle/TestMove/underscore_children.exp.json index 3076328ff..e7329d76d 100644 --- a/testdata/d2oracle/TestMove/underscore_children.exp.json +++ b/testdata/d2oracle/TestMove/underscore_children.exp.json @@ -105,6 +105,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -152,6 +153,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -228,6 +230,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_edge_children.exp.json b/testdata/d2oracle/TestMove/underscore_edge_children.exp.json index 060e1bb9c..7896f9a0b 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_children.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_children.exp.json @@ -128,6 +128,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -159,6 +160,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -206,6 +208,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -282,6 +285,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -327,6 +331,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json index adcab65e8..534f0c55e 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_1.exp.json @@ -94,6 +94,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -125,6 +126,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -172,6 +174,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -217,6 +220,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -262,6 +266,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json index 0c8db60f3..1c6f0c357 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_2.exp.json @@ -105,6 +105,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -136,6 +137,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -183,6 +185,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -259,6 +262,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -315,6 +319,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json index 7036b433c..7b389e9bf 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_3.exp.json @@ -105,6 +105,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -136,6 +137,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -183,6 +185,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -239,6 +242,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -284,6 +288,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json index 0fc0392c9..52bc634ab 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_4.exp.json @@ -94,6 +94,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -125,6 +126,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -172,6 +174,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -217,6 +220,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -262,6 +266,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json index 50271e49f..fc9452c25 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_5.exp.json @@ -127,6 +127,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -158,6 +159,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -205,6 +207,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -303,6 +306,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -370,6 +374,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_edge_container_6.exp.json b/testdata/d2oracle/TestMove/underscore_edge_container_6.exp.json index 906801970..d34d69388 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_container_6.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_container_6.exp.json @@ -116,6 +116,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -147,6 +148,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -194,6 +196,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -281,6 +284,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -337,6 +341,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -393,6 +398,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_edge_split.exp.json b/testdata/d2oracle/TestMove/underscore_edge_split.exp.json index 7dd497bd3..af435b294 100644 --- a/testdata/d2oracle/TestMove/underscore_edge_split.exp.json +++ b/testdata/d2oracle/TestMove/underscore_edge_split.exp.json @@ -157,6 +157,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -188,6 +189,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -235,6 +237,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -280,6 +283,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -336,6 +340,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -381,6 +386,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -426,6 +432,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_merge.exp.json b/testdata/d2oracle/TestMove/underscore_merge.exp.json index 914e4dc1b..2cb1f389a 100644 --- a/testdata/d2oracle/TestMove/underscore_merge.exp.json +++ b/testdata/d2oracle/TestMove/underscore_merge.exp.json @@ -137,6 +137,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -184,6 +185,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -229,6 +231,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -294,6 +297,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_split.exp.json b/testdata/d2oracle/TestMove/underscore_split.exp.json index a78f65a45..6cdeb6f7f 100644 --- a/testdata/d2oracle/TestMove/underscore_split.exp.json +++ b/testdata/d2oracle/TestMove/underscore_split.exp.json @@ -134,6 +134,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -181,6 +182,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -226,6 +228,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -282,6 +285,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -327,6 +331,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_split_out.exp.json b/testdata/d2oracle/TestMove/underscore_split_out.exp.json index f50e03ce7..e135e1e86 100644 --- a/testdata/d2oracle/TestMove/underscore_split_out.exp.json +++ b/testdata/d2oracle/TestMove/underscore_split_out.exp.json @@ -192,6 +192,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -239,6 +240,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -284,6 +286,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -360,6 +363,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -405,6 +409,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -450,6 +455,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/underscore_transplant.exp.json b/testdata/d2oracle/TestMove/underscore_transplant.exp.json index f0d5a7646..52c383365 100644 --- a/testdata/d2oracle/TestMove/underscore_transplant.exp.json +++ b/testdata/d2oracle/TestMove/underscore_transplant.exp.json @@ -94,6 +94,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -141,6 +142,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -186,6 +188,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -231,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/unique_name.exp.json b/testdata/d2oracle/TestMove/unique_name.exp.json index bde09595f..d52f4255f 100644 --- a/testdata/d2oracle/TestMove/unique_name.exp.json +++ b/testdata/d2oracle/TestMove/unique_name.exp.json @@ -151,6 +151,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -229,6 +230,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -305,6 +307,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -350,6 +353,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -395,6 +399,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestMove/unique_name_with_references.exp.json b/testdata/d2oracle/TestMove/unique_name_with_references.exp.json index d71534069..81e390133 100644 --- a/testdata/d2oracle/TestMove/unique_name_with_references.exp.json +++ b/testdata/d2oracle/TestMove/unique_name_with_references.exp.json @@ -174,6 +174,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -205,6 +206,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -283,6 +285,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -328,6 +331,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -404,6 +408,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -449,6 +454,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -494,6 +500,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestReconnectEdge/basic.exp.json b/testdata/d2oracle/TestReconnectEdge/basic.exp.json index 8d1d03e08..1c4c52746 100644 --- a/testdata/d2oracle/TestReconnectEdge/basic.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/basic.exp.json @@ -134,6 +134,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -165,6 +166,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -232,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -277,6 +280,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -342,6 +346,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestReconnectEdge/both.exp.json b/testdata/d2oracle/TestReconnectEdge/both.exp.json index 8350d974a..4de8c3207 100644 --- a/testdata/d2oracle/TestReconnectEdge/both.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/both.exp.json @@ -134,6 +134,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -165,6 +166,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -232,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -297,6 +300,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -342,6 +346,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestReconnectEdge/contained.exp.json b/testdata/d2oracle/TestReconnectEdge/contained.exp.json index 96fc260b0..e2f43f63a 100644 --- a/testdata/d2oracle/TestReconnectEdge/contained.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/contained.exp.json @@ -155,6 +155,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -186,6 +187,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -337,6 +339,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -393,6 +396,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -480,6 +484,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -536,6 +541,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestReconnectEdge/in_chain_3.exp.json b/testdata/d2oracle/TestReconnectEdge/in_chain_3.exp.json index bf08c88b8..d2aa47c27 100644 --- a/testdata/d2oracle/TestReconnectEdge/in_chain_3.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/in_chain_3.exp.json @@ -148,6 +148,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -179,6 +180,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -209,6 +211,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -239,6 +242,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -286,6 +290,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -371,6 +376,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -436,6 +442,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestReconnectEdge/in_chain_4.exp.json b/testdata/d2oracle/TestReconnectEdge/in_chain_4.exp.json index 4d3111d03..4c2566ee2 100644 --- a/testdata/d2oracle/TestReconnectEdge/in_chain_4.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/in_chain_4.exp.json @@ -171,6 +171,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -202,6 +203,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -232,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -262,6 +265,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -329,6 +333,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -414,6 +419,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -479,6 +485,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestReconnectEdge/indexed_ref.exp.json b/testdata/d2oracle/TestReconnectEdge/indexed_ref.exp.json index 02ecdaa4f..863817313 100644 --- a/testdata/d2oracle/TestReconnectEdge/indexed_ref.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/indexed_ref.exp.json @@ -199,6 +199,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -237,6 +238,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -304,6 +306,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -389,6 +392,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -434,6 +438,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestReconnectEdge/layers-basic.exp.json b/testdata/d2oracle/TestReconnectEdge/layers-basic.exp.json index 9a8fbf16b..51ede5f50 100644 --- a/testdata/d2oracle/TestReconnectEdge/layers-basic.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/layers-basic.exp.json @@ -192,6 +192,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -239,6 +240,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -256,7 +258,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestReconnectEdge/layers-basic.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -266,10 +268,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestReconnectEdge/layers-basic.d2,4:4:24-4:5:25", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -288,10 +291,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestReconnectEdge/layers-basic.d2,5:4:30-5:5:31", "value": [ { - "string": "c" + "string": "c", + "raw_string": "c" } ] } @@ -310,10 +314,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestReconnectEdge/layers-basic.d2,6:4:36-6:5:37", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -382,6 +387,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -413,6 +419,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -460,6 +467,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -525,6 +533,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -570,6 +579,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestReconnectEdge/loop.exp.json b/testdata/d2oracle/TestReconnectEdge/loop.exp.json index e7470d3fd..eedacbc52 100644 --- a/testdata/d2oracle/TestReconnectEdge/loop.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/loop.exp.json @@ -88,6 +88,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -119,6 +120,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -166,6 +168,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -231,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestReconnectEdge/middle_chain.exp.json b/testdata/d2oracle/TestReconnectEdge/middle_chain.exp.json index e43b962c7..96455be96 100644 --- a/testdata/d2oracle/TestReconnectEdge/middle_chain.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/middle_chain.exp.json @@ -134,6 +134,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -165,6 +166,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -195,6 +197,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -242,6 +245,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -287,6 +291,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -332,6 +337,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -397,6 +403,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestReconnectEdge/middle_chain_both.exp.json b/testdata/d2oracle/TestReconnectEdge/middle_chain_both.exp.json index 72a5b6d19..de79d7b1b 100644 --- a/testdata/d2oracle/TestReconnectEdge/middle_chain_both.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/middle_chain_both.exp.json @@ -180,6 +180,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -211,6 +212,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -241,6 +243,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -271,6 +274,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -318,6 +322,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -363,6 +368,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -408,6 +414,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -453,6 +460,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -538,6 +546,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestReconnectEdge/middle_chain_first.exp.json b/testdata/d2oracle/TestReconnectEdge/middle_chain_first.exp.json index 2ed26f0b5..ac62b5625 100644 --- a/testdata/d2oracle/TestReconnectEdge/middle_chain_first.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/middle_chain_first.exp.json @@ -185,6 +185,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -216,6 +217,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -246,6 +248,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -276,6 +279,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -323,6 +327,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -388,6 +393,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -453,6 +459,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -518,6 +525,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -563,6 +571,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestReconnectEdge/middle_chain_last.exp.json b/testdata/d2oracle/TestReconnectEdge/middle_chain_last.exp.json index da052e0f4..4cb6d804c 100644 --- a/testdata/d2oracle/TestReconnectEdge/middle_chain_last.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/middle_chain_last.exp.json @@ -185,6 +185,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -216,6 +217,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -246,6 +248,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -276,6 +279,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -323,6 +327,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -388,6 +393,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -453,6 +459,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -518,6 +525,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -563,6 +571,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestReconnectEdge/middle_chain_src.exp.json b/testdata/d2oracle/TestReconnectEdge/middle_chain_src.exp.json index 23eec563f..7f2cee3e0 100644 --- a/testdata/d2oracle/TestReconnectEdge/middle_chain_src.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/middle_chain_src.exp.json @@ -134,6 +134,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -165,6 +166,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -195,6 +197,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -242,6 +245,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -287,6 +291,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -352,6 +357,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -397,6 +403,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.exp.json b/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.exp.json index aef393151..f6f0c2926 100644 --- a/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/preserve_old_obj.exp.json @@ -199,6 +199,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -237,6 +238,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -304,6 +306,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -389,6 +392,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -434,6 +438,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestReconnectEdge/reverse.exp.json b/testdata/d2oracle/TestReconnectEdge/reverse.exp.json index 601d36ca8..3a630215c 100644 --- a/testdata/d2oracle/TestReconnectEdge/reverse.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/reverse.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -96,6 +97,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -143,6 +145,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -188,6 +191,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestReconnectEdge/scenarios-basic.exp.json b/testdata/d2oracle/TestReconnectEdge/scenarios-basic.exp.json index 9f986050c..c796560b8 100644 --- a/testdata/d2oracle/TestReconnectEdge/scenarios-basic.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/scenarios-basic.exp.json @@ -192,6 +192,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -239,6 +240,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -256,7 +258,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestReconnectEdge/scenarios-basic.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -266,10 +268,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestReconnectEdge/scenarios-basic.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -288,10 +291,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestReconnectEdge/scenarios-basic.d2,4:4:27-4:5:28", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -310,10 +314,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestReconnectEdge/scenarios-basic.d2,5:4:33-5:5:34", "value": [ { - "string": "c" + "string": "c", + "raw_string": "c" } ] } @@ -382,6 +387,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -413,6 +419,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -480,6 +487,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -525,6 +533,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -590,6 +599,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestReconnectEdge/scenarios-outer-scope.exp.json b/testdata/d2oracle/TestReconnectEdge/scenarios-outer-scope.exp.json index 2e1e86126..1c6573f91 100644 --- a/testdata/d2oracle/TestReconnectEdge/scenarios-outer-scope.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/scenarios-outer-scope.exp.json @@ -169,6 +169,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -216,6 +217,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -233,7 +235,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestReconnectEdge/scenarios-outer-scope.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -243,10 +245,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestReconnectEdge/scenarios-outer-scope.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -265,10 +268,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestReconnectEdge/scenarios-outer-scope.d2,4:4:27-4:5:28", "value": [ { - "string": "d" + "string": "d", + "raw_string": "d" } ] } @@ -287,10 +291,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestReconnectEdge/scenarios-outer-scope.d2,5:4:38-5:5:39", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -359,6 +364,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -390,6 +396,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -457,6 +464,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -502,6 +510,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -547,6 +556,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestReconnectEdge/scope_inner.exp.json b/testdata/d2oracle/TestReconnectEdge/scope_inner.exp.json index 00644f955..122922dd4 100644 --- a/testdata/d2oracle/TestReconnectEdge/scope_inner.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/scope_inner.exp.json @@ -180,6 +180,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -211,6 +212,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -258,6 +260,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -303,6 +306,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -379,6 +383,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -455,6 +460,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -500,6 +506,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestReconnectEdge/scope_outer.exp.json b/testdata/d2oracle/TestReconnectEdge/scope_outer.exp.json index 7d974c12b..8cff25bf2 100644 --- a/testdata/d2oracle/TestReconnectEdge/scope_outer.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/scope_outer.exp.json @@ -151,6 +151,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -182,6 +183,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -229,6 +231,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -274,6 +277,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -350,6 +354,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -395,6 +400,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestReconnectEdge/second_index.exp.json b/testdata/d2oracle/TestReconnectEdge/second_index.exp.json index 5f52b761f..9543dc3e0 100644 --- a/testdata/d2oracle/TestReconnectEdge/second_index.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/second_index.exp.json @@ -234,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -269,6 +270,7 @@ "value": "blue" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -303,6 +305,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -370,6 +373,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -415,6 +419,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -480,6 +485,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestReconnectEdge/src.exp.json b/testdata/d2oracle/TestReconnectEdge/src.exp.json index 9dfbcdefe..eaaee86a2 100644 --- a/testdata/d2oracle/TestReconnectEdge/src.exp.json +++ b/testdata/d2oracle/TestReconnectEdge/src.exp.json @@ -134,6 +134,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -165,6 +166,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -212,6 +214,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -277,6 +280,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -342,6 +346,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/arrows.exp.json b/testdata/d2oracle/TestRename/arrows.exp.json index a21353e07..efe7358da 100644 --- a/testdata/d2oracle/TestRename/arrows.exp.json +++ b/testdata/d2oracle/TestRename/arrows.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -96,6 +97,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -143,6 +145,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -188,6 +191,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/arrows_chain.exp.json b/testdata/d2oracle/TestRename/arrows_chain.exp.json index f3ccd7a27..d12136ef0 100644 --- a/testdata/d2oracle/TestRename/arrows_chain.exp.json +++ b/testdata/d2oracle/TestRename/arrows_chain.exp.json @@ -139,6 +139,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -170,6 +171,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -200,6 +202,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -230,6 +233,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -277,6 +281,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -342,6 +347,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -407,6 +413,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -452,6 +459,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/arrows_complex.exp.json b/testdata/d2oracle/TestRename/arrows_complex.exp.json index 9d5616878..6a4761a8b 100644 --- a/testdata/d2oracle/TestRename/arrows_complex.exp.json +++ b/testdata/d2oracle/TestRename/arrows_complex.exp.json @@ -119,6 +119,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -150,6 +151,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -208,6 +210,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -264,6 +267,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -309,6 +313,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -354,6 +359,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/arrows_trim_common.exp.json b/testdata/d2oracle/TestRename/arrows_trim_common.exp.json index eb75e2e55..35ff56022 100644 --- a/testdata/d2oracle/TestRename/arrows_trim_common.exp.json +++ b/testdata/d2oracle/TestRename/arrows_trim_common.exp.json @@ -155,6 +155,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -186,6 +187,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -216,6 +218,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -246,6 +249,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -293,6 +297,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -338,6 +343,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -403,6 +409,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -468,6 +475,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -513,6 +521,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json b/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json index ab086e248..c533adbb7 100644 --- a/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json +++ b/testdata/d2oracle/TestRename/arrows_trim_common_2.exp.json @@ -205,6 +205,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -236,6 +237,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -266,6 +268,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -296,6 +299,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -509,6 +513,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -565,6 +570,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -652,6 +658,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -739,6 +746,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -795,6 +803,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/complex_edge_1.exp.json b/testdata/d2oracle/TestRename/complex_edge_1.exp.json index 3446d9da4..6c7752ee6 100644 --- a/testdata/d2oracle/TestRename/complex_edge_1.exp.json +++ b/testdata/d2oracle/TestRename/complex_edge_1.exp.json @@ -119,6 +119,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -150,6 +151,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -208,6 +210,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -264,6 +267,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -309,6 +313,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -354,6 +359,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/complex_edge_2.exp.json b/testdata/d2oracle/TestRename/complex_edge_2.exp.json index 43ca3dd0d..c3b5ddf48 100644 --- a/testdata/d2oracle/TestRename/complex_edge_2.exp.json +++ b/testdata/d2oracle/TestRename/complex_edge_2.exp.json @@ -119,6 +119,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -150,6 +151,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -208,6 +210,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -264,6 +267,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -309,6 +313,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -354,6 +359,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/conflict.exp.json b/testdata/d2oracle/TestRename/conflict.exp.json index c882e1f56..9e6a685ed 100644 --- a/testdata/d2oracle/TestRename/conflict.exp.json +++ b/testdata/d2oracle/TestRename/conflict.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -112,6 +113,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -157,6 +159,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/conflict_2.exp.json b/testdata/d2oracle/TestRename/conflict_2.exp.json index 598ec3077..9470bb343 100644 --- a/testdata/d2oracle/TestRename/conflict_2.exp.json +++ b/testdata/d2oracle/TestRename/conflict_2.exp.json @@ -116,6 +116,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -185,6 +186,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -252,6 +254,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -319,6 +322,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -364,6 +368,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -409,6 +414,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/conflict_with_dots.exp.json b/testdata/d2oracle/TestRename/conflict_with_dots.exp.json index 229aff72e..8f00ca8e9 100644 --- a/testdata/d2oracle/TestRename/conflict_with_dots.exp.json +++ b/testdata/d2oracle/TestRename/conflict_with_dots.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -112,6 +113,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -157,6 +159,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/conflict_with_numbers.exp.json b/testdata/d2oracle/TestRename/conflict_with_numbers.exp.json index 85b87e0db..91a338397 100644 --- a/testdata/d2oracle/TestRename/conflict_with_numbers.exp.json +++ b/testdata/d2oracle/TestRename/conflict_with_numbers.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -112,6 +113,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -157,6 +159,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/container.exp.json b/testdata/d2oracle/TestRename/container.exp.json index 1d4593223..becd9d77a 100644 --- a/testdata/d2oracle/TestRename/container.exp.json +++ b/testdata/d2oracle/TestRename/container.exp.json @@ -744,6 +744,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -778,6 +779,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -808,6 +810,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -838,6 +841,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -868,6 +872,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -898,6 +903,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -928,6 +934,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -958,6 +965,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -1246,6 +1254,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1532,6 +1541,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1807,6 +1817,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1925,6 +1936,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -2043,6 +2055,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -2130,6 +2143,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -2217,6 +2231,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -2262,6 +2277,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -2327,6 +2343,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -2372,6 +2389,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -2417,6 +2435,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -2484,6 +2503,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -2551,6 +2571,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -2618,6 +2639,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -2674,6 +2696,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -2730,6 +2753,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/edges.exp.json b/testdata/d2oracle/TestRename/edges.exp.json index 6e5ab0650..4905b686a 100644 --- a/testdata/d2oracle/TestRename/edges.exp.json +++ b/testdata/d2oracle/TestRename/edges.exp.json @@ -409,6 +409,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -440,6 +441,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -470,6 +472,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -500,6 +503,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -530,6 +534,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -560,6 +565,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -590,6 +596,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -761,6 +768,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -950,6 +958,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1037,6 +1046,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1124,6 +1134,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1211,6 +1222,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1298,6 +1310,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1343,6 +1356,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1408,6 +1422,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/flat.exp.json b/testdata/d2oracle/TestRename/flat.exp.json index 028991927..57cb11c1b 100644 --- a/testdata/d2oracle/TestRename/flat.exp.json +++ b/testdata/d2oracle/TestRename/flat.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/generated-conflict.exp.json b/testdata/d2oracle/TestRename/generated-conflict.exp.json index c47aae643..69781b604 100644 --- a/testdata/d2oracle/TestRename/generated-conflict.exp.json +++ b/testdata/d2oracle/TestRename/generated-conflict.exp.json @@ -65,6 +65,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -112,6 +113,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -157,6 +159,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/generated.exp.json b/testdata/d2oracle/TestRename/generated.exp.json index 7d2554939..d913858f9 100644 --- a/testdata/d2oracle/TestRename/generated.exp.json +++ b/testdata/d2oracle/TestRename/generated.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/layers-basic.exp.json b/testdata/d2oracle/TestRename/layers-basic.exp.json index 3ed3c1f79..b0b454d6f 100644 --- a/testdata/d2oracle/TestRename/layers-basic.exp.json +++ b/testdata/d2oracle/TestRename/layers-basic.exp.json @@ -123,6 +123,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -170,6 +171,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -187,7 +189,7 @@ "name": "y", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestRename/layers-basic.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -197,10 +199,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestRename/layers-basic.d2,4:4:24-4:5:25", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -225,6 +228,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -272,6 +276,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/near.exp.json b/testdata/d2oracle/TestRename/near.exp.json index 7c7ddf563..c80e6bb1a 100644 --- a/testdata/d2oracle/TestRename/near.exp.json +++ b/testdata/d2oracle/TestRename/near.exp.json @@ -104,6 +104,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -151,6 +152,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": { "range": "d2/testdata/d2oracle/TestRename/near.d2,1:8:13-1:9:14", "path": [ @@ -211,6 +213,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/nested.exp.json b/testdata/d2oracle/TestRename/nested.exp.json index 9c0a5f917..937e4e6fe 100644 --- a/testdata/d2oracle/TestRename/nested.exp.json +++ b/testdata/d2oracle/TestRename/nested.exp.json @@ -171,6 +171,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -315,6 +316,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -457,6 +459,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -599,6 +602,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -741,6 +745,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -850,6 +855,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/scenarios-basic.exp.json b/testdata/d2oracle/TestRename/scenarios-basic.exp.json index 3189b8434..f32fa0fdc 100644 --- a/testdata/d2oracle/TestRename/scenarios-basic.exp.json +++ b/testdata/d2oracle/TestRename/scenarios-basic.exp.json @@ -123,6 +123,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -170,6 +171,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -187,7 +189,7 @@ "name": "y", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestRename/scenarios-basic.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -197,10 +199,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestRename/scenarios-basic.d2,0:0:0-0:1:1", "value": [ { - "string": "x" + "string": "x", + "raw_string": "x" } ] } @@ -219,10 +222,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestRename/scenarios-basic.d2,4:4:27-4:5:28", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -247,6 +251,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -294,6 +299,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -339,6 +345,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestRename/scenarios-conflict.exp.json b/testdata/d2oracle/TestRename/scenarios-conflict.exp.json index 0a968b476..152b77114 100644 --- a/testdata/d2oracle/TestRename/scenarios-conflict.exp.json +++ b/testdata/d2oracle/TestRename/scenarios-conflict.exp.json @@ -123,6 +123,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -170,6 +171,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -187,7 +189,7 @@ "name": "y", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestRename/scenarios-conflict.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -197,10 +199,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestRename/scenarios-conflict.d2,0:0:0-0:1:1", "value": [ { - "string": "x" + "string": "x", + "raw_string": "x" } ] } @@ -219,10 +222,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestRename/scenarios-conflict.d2,4:4:27-4:7:30", "value": [ { - "string": "x 2" + "string": "x 2", + "raw_string": "x 2" } ] } @@ -247,6 +251,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -294,6 +299,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -339,6 +345,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/base.exp.json b/testdata/d2oracle/TestSet/base.exp.json index 18dbe52f0..52c6a4415 100644 --- a/testdata/d2oracle/TestSet/base.exp.json +++ b/testdata/d2oracle/TestSet/base.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/block_string_multiline.exp.json b/testdata/d2oracle/TestSet/block_string_multiline.exp.json index b42981de5..21ffc5ea8 100644 --- a/testdata/d2oracle/TestSet/block_string_multiline.exp.json +++ b/testdata/d2oracle/TestSet/block_string_multiline.exp.json @@ -49,6 +49,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -96,6 +97,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "language": "markdown", "shape": { diff --git a/testdata/d2oracle/TestSet/block_string_oneline.exp.json b/testdata/d2oracle/TestSet/block_string_oneline.exp.json index 2324b55be..420b6f2b0 100644 --- a/testdata/d2oracle/TestSet/block_string_oneline.exp.json +++ b/testdata/d2oracle/TestSet/block_string_oneline.exp.json @@ -49,6 +49,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -96,6 +97,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "language": "markdown", "shape": { diff --git a/testdata/d2oracle/TestSet/class-with-label.exp.json b/testdata/d2oracle/TestSet/class-with-label.exp.json index 1cfcb550d..6680e270e 100644 --- a/testdata/d2oracle/TestSet/class-with-label.exp.json +++ b/testdata/d2oracle/TestSet/class-with-label.exp.json @@ -200,6 +200,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -304,6 +305,7 @@ "value": "0.5" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/classes-style.exp.json b/testdata/d2oracle/TestSet/classes-style.exp.json index a99073d1f..f82fb327f 100644 --- a/testdata/d2oracle/TestSet/classes-style.exp.json +++ b/testdata/d2oracle/TestSet/classes-style.exp.json @@ -220,6 +220,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -324,6 +325,7 @@ "value": "green" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/dupe-classes-style.exp.json b/testdata/d2oracle/TestSet/dupe-classes-style.exp.json index 9c74249a8..6e4ae054d 100644 --- a/testdata/d2oracle/TestSet/dupe-classes-style.exp.json +++ b/testdata/d2oracle/TestSet/dupe-classes-style.exp.json @@ -220,6 +220,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -324,6 +325,7 @@ "value": "green" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge-arrowhead-filled/1.exp.json b/testdata/d2oracle/TestSet/edge-arrowhead-filled/1.exp.json index 6414372f0..75474bf2c 100644 --- a/testdata/d2oracle/TestSet/edge-arrowhead-filled/1.exp.json +++ b/testdata/d2oracle/TestSet/edge-arrowhead-filled/1.exp.json @@ -121,6 +121,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -151,6 +152,7 @@ "value": "true" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -174,6 +176,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -221,6 +224,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -266,6 +270,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge-arrowhead-filled/2.exp.json b/testdata/d2oracle/TestSet/edge-arrowhead-filled/2.exp.json index d4f4f21cc..a92a0c94d 100644 --- a/testdata/d2oracle/TestSet/edge-arrowhead-filled/2.exp.json +++ b/testdata/d2oracle/TestSet/edge-arrowhead-filled/2.exp.json @@ -185,6 +185,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -215,6 +216,7 @@ "value": "true" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "diamond" @@ -238,6 +240,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -285,6 +288,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -330,6 +334,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge-arrowhead-filled/3.exp.json b/testdata/d2oracle/TestSet/edge-arrowhead-filled/3.exp.json index d6077911e..690eaa45c 100644 --- a/testdata/d2oracle/TestSet/edge-arrowhead-filled/3.exp.json +++ b/testdata/d2oracle/TestSet/edge-arrowhead-filled/3.exp.json @@ -165,6 +165,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -195,6 +196,7 @@ "value": "true" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "diamond" @@ -218,6 +220,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -265,6 +268,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -310,6 +314,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge-arrowhead-filled/4.exp.json b/testdata/d2oracle/TestSet/edge-arrowhead-filled/4.exp.json index cf40b23a1..44336869e 100644 --- a/testdata/d2oracle/TestSet/edge-arrowhead-filled/4.exp.json +++ b/testdata/d2oracle/TestSet/edge-arrowhead-filled/4.exp.json @@ -165,6 +165,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -195,6 +196,7 @@ "value": "false" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "diamond" @@ -218,6 +220,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -265,6 +268,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -310,6 +314,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge-arrowhead-filled/5.exp.json b/testdata/d2oracle/TestSet/edge-arrowhead-filled/5.exp.json index 9e5f0ae80..c783adc63 100644 --- a/testdata/d2oracle/TestSet/edge-arrowhead-filled/5.exp.json +++ b/testdata/d2oracle/TestSet/edge-arrowhead-filled/5.exp.json @@ -183,6 +183,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -213,6 +214,7 @@ "value": "true" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "diamond" @@ -236,6 +238,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -283,6 +286,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -328,6 +332,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge-class-with-label.exp.json b/testdata/d2oracle/TestSet/edge-class-with-label.exp.json index fde7a3b65..bfe5a0d88 100644 --- a/testdata/d2oracle/TestSet/edge-class-with-label.exp.json +++ b/testdata/d2oracle/TestSet/edge-class-with-label.exp.json @@ -230,6 +230,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -265,6 +266,7 @@ "value": "0.5" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -315,6 +317,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -360,6 +363,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge-comment.exp.json b/testdata/d2oracle/TestSet/edge-comment.exp.json index 4458b4bc4..ab4fdc066 100644 --- a/testdata/d2oracle/TestSet/edge-comment.exp.json +++ b/testdata/d2oracle/TestSet/edge-comment.exp.json @@ -121,6 +121,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -156,6 +157,7 @@ "value": "green" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -203,6 +205,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -248,6 +251,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge.exp.json b/testdata/d2oracle/TestSet/edge.exp.json index f9568af91..90ea191b2 100644 --- a/testdata/d2oracle/TestSet/edge.exp.json +++ b/testdata/d2oracle/TestSet/edge.exp.json @@ -75,6 +75,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -106,6 +107,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -153,6 +155,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -198,6 +201,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_append_style.exp.json b/testdata/d2oracle/TestSet/edge_append_style.exp.json index a215df715..fd2d9d6b0 100644 --- a/testdata/d2oracle/TestSet/edge_append_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_append_style.exp.json @@ -110,6 +110,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -145,6 +146,7 @@ "value": "true" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -192,6 +194,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -237,6 +240,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_chain.exp.json b/testdata/d2oracle/TestSet/edge_chain.exp.json index e36df946d..e1206c7e3 100644 --- a/testdata/d2oracle/TestSet/edge_chain.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain.exp.json @@ -202,6 +202,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -236,6 +237,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -266,6 +268,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -313,6 +316,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -378,6 +382,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -463,6 +468,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -508,6 +514,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json b/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json index 193d30de7..c8070996c 100644 --- a/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_append_style.exp.json @@ -185,6 +185,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -223,6 +224,7 @@ "value": "true" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -253,6 +255,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -320,6 +323,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -405,6 +409,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -450,6 +455,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json b/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json index e688fa412..b23e53e2b 100644 --- a/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_existing_style.exp.json @@ -269,6 +269,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -300,6 +301,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -343,6 +345,7 @@ "value": "true" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -390,6 +393,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -495,6 +499,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -580,6 +585,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json index 3bd0f42a8..bde4bbcf2 100644 --- a/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_chain_nested_set.exp.json @@ -225,6 +225,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -263,6 +264,7 @@ "value": "0.4" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -293,6 +295,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -340,6 +343,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -405,6 +409,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -490,6 +495,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -535,6 +541,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json index fe8208050..dfc9ac4cc 100644 --- a/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/edge_flat_merge_arrowhead.exp.json @@ -190,6 +190,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -216,6 +217,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" @@ -242,6 +244,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -272,6 +275,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -339,6 +343,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -424,6 +429,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -469,6 +475,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_index_case.exp.json b/testdata/d2oracle/TestSet/edge_index_case.exp.json index d1eb8f9c3..55af4a12d 100644 --- a/testdata/d2oracle/TestSet/edge_index_case.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_case.exp.json @@ -179,6 +179,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -210,6 +211,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -240,6 +242,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -287,6 +290,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -332,6 +336,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -377,6 +382,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -422,6 +428,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -467,6 +474,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -512,6 +520,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json b/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json index c9a5de043..f26a90724 100644 --- a/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_merge_style.exp.json @@ -186,6 +186,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -224,6 +225,7 @@ "value": "0.5" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -254,6 +256,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -321,6 +324,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -406,6 +410,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -451,6 +456,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_index_nested.exp.json b/testdata/d2oracle/TestSet/edge_index_nested.exp.json index 1abf22a57..8ff757aac 100644 --- a/testdata/d2oracle/TestSet/edge_index_nested.exp.json +++ b/testdata/d2oracle/TestSet/edge_index_nested.exp.json @@ -104,6 +104,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -135,6 +136,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -182,6 +184,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -227,6 +230,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -272,6 +276,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_key_and_key.exp.json b/testdata/d2oracle/TestSet/edge_key_and_key.exp.json index b2b5df2bc..07425c661 100644 --- a/testdata/d2oracle/TestSet/edge_key_and_key.exp.json +++ b/testdata/d2oracle/TestSet/edge_key_and_key.exp.json @@ -155,6 +155,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -190,6 +191,7 @@ "value": "true" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -299,6 +301,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -355,6 +358,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -411,6 +415,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_label.exp.json b/testdata/d2oracle/TestSet/edge_label.exp.json index bc87c278f..3468d9d84 100644 --- a/testdata/d2oracle/TestSet/edge_label.exp.json +++ b/testdata/d2oracle/TestSet/edge_label.exp.json @@ -120,6 +120,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -155,6 +156,7 @@ "value": "true" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -202,6 +204,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -247,6 +250,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json index e647ebf85..77a473d6e 100644 --- a/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/edge_merge_arrowhead.exp.json @@ -162,6 +162,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -188,6 +189,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "diamond" @@ -211,6 +213,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -258,6 +261,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -303,6 +307,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_merge_style.exp.json b/testdata/d2oracle/TestSet/edge_merge_style.exp.json index dd6f28c99..d78925d90 100644 --- a/testdata/d2oracle/TestSet/edge_merge_style.exp.json +++ b/testdata/d2oracle/TestSet/edge_merge_style.exp.json @@ -157,6 +157,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -195,6 +196,7 @@ "value": "true" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -242,6 +244,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -287,6 +290,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json index 64f975592..cd559926f 100644 --- a/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_nested_label_set.exp.json @@ -104,6 +104,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -135,6 +136,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -182,6 +184,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -227,6 +230,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -272,6 +276,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json b/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json index cddd2cccb..ef0c5efa8 100644 --- a/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json +++ b/testdata/d2oracle/TestSet/edge_nested_style_set.exp.json @@ -150,6 +150,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -185,6 +186,7 @@ "value": "0.4" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -232,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -277,6 +280,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -322,6 +326,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json index 88538296c..c9fc2da34 100644 --- a/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/edge_replace_arrowhead.exp.json @@ -115,6 +115,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -141,6 +142,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "diamond" @@ -164,6 +166,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -211,6 +214,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -256,6 +260,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json b/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json index 7b3b4168a..76c51dfe6 100644 --- a/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json +++ b/testdata/d2oracle/TestSet/edge_replace_arrowhead_indexed.exp.json @@ -153,6 +153,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -179,6 +180,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "diamond" @@ -205,6 +207,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -272,6 +275,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -337,6 +341,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json b/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json index 4a3477968..9718c2ab7 100644 --- a/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/edge_set_arrowhead.exp.json @@ -115,6 +115,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -141,6 +142,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "diamond" @@ -164,6 +166,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -211,6 +214,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -256,6 +260,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/expanded_map_style.exp.json b/testdata/d2oracle/TestSet/expanded_map_style.exp.json index cd0111b35..b9a5e4ca8 100644 --- a/testdata/d2oracle/TestSet/expanded_map_style.exp.json +++ b/testdata/d2oracle/TestSet/expanded_map_style.exp.json @@ -106,6 +106,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -157,6 +158,7 @@ "value": "0.2" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/glob-field/1.exp.json b/testdata/d2oracle/TestSet/glob-field/1.exp.json index ef0bae2ce..05a3908e7 100644 --- a/testdata/d2oracle/TestSet/glob-field/1.exp.json +++ b/testdata/d2oracle/TestSet/glob-field/1.exp.json @@ -173,6 +173,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -224,6 +225,7 @@ "value": "blue" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -273,6 +275,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/glob-field/2.exp.json b/testdata/d2oracle/TestSet/glob-field/2.exp.json index c4f0ab737..1a9612c8e 100644 --- a/testdata/d2oracle/TestSet/glob-field/2.exp.json +++ b/testdata/d2oracle/TestSet/glob-field/2.exp.json @@ -255,6 +255,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -293,6 +294,7 @@ "value": "blue" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -330,6 +332,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -397,6 +400,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -462,6 +466,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/glob-field/3.exp.json b/testdata/d2oracle/TestSet/glob-field/3.exp.json index 290195f8f..15891da3b 100644 --- a/testdata/d2oracle/TestSet/glob-field/3.exp.json +++ b/testdata/d2oracle/TestSet/glob-field/3.exp.json @@ -255,6 +255,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -293,6 +294,7 @@ "value": "green" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -330,6 +332,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -397,6 +400,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -462,6 +466,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/glob-with-label.exp.json b/testdata/d2oracle/TestSet/glob-with-label.exp.json index f41339c5c..d061fdcbb 100644 --- a/testdata/d2oracle/TestSet/glob-with-label.exp.json +++ b/testdata/d2oracle/TestSet/glob-with-label.exp.json @@ -135,6 +135,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -228,6 +229,7 @@ "value": "0.5" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/icon.exp.json b/testdata/d2oracle/TestSet/icon.exp.json index ab79c0a72..99e7f3522 100644 --- a/testdata/d2oracle/TestSet/icon.exp.json +++ b/testdata/d2oracle/TestSet/icon.exp.json @@ -81,6 +81,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -141,6 +142,7 @@ "Fragment": "", "RawFragment": "" }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/import/1.exp.json b/testdata/d2oracle/TestSet/import/1.exp.json index a2186cf1f..aabf1198e 100644 --- a/testdata/d2oracle/TestSet/import/1.exp.json +++ b/testdata/d2oracle/TestSet/import/1.exp.json @@ -146,6 +146,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -200,6 +201,7 @@ "value": "blue" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -245,6 +247,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/import/10.exp.json b/testdata/d2oracle/TestSet/import/10.exp.json new file mode 100644 index 000000000..909ef237e --- /dev/null +++ b/testdata/d2oracle/TestSet/import/10.exp.json @@ -0,0 +1,4 @@ +{ + "graph": null, + "err": "failed to set \"asdf.link\" to \"\\\"_._\\\"\": board [man 1] cannot be modified through this file" +} diff --git a/testdata/d2oracle/TestSet/import/2.exp.json b/testdata/d2oracle/TestSet/import/2.exp.json index 929277298..f4ea8bd5d 100644 --- a/testdata/d2oracle/TestSet/import/2.exp.json +++ b/testdata/d2oracle/TestSet/import/2.exp.json @@ -146,6 +146,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -197,6 +198,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -242,6 +244,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/import/3.exp.json b/testdata/d2oracle/TestSet/import/3.exp.json index feeebe288..3221ef86c 100644 --- a/testdata/d2oracle/TestSet/import/3.exp.json +++ b/testdata/d2oracle/TestSet/import/3.exp.json @@ -146,6 +146,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -197,6 +198,7 @@ "value": "yellow" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -242,6 +244,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/import/4.exp.json b/testdata/d2oracle/TestSet/import/4.exp.json index 19de4ef48..b969af5e1 100644 --- a/testdata/d2oracle/TestSet/import/4.exp.json +++ b/testdata/d2oracle/TestSet/import/4.exp.json @@ -117,6 +117,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -210,6 +211,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -255,6 +257,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/import/5.exp.json b/testdata/d2oracle/TestSet/import/5.exp.json index fe34e8801..40563f34d 100644 --- a/testdata/d2oracle/TestSet/import/5.exp.json +++ b/testdata/d2oracle/TestSet/import/5.exp.json @@ -146,6 +146,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -193,6 +194,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -284,6 +286,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -329,6 +332,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/import/6.exp.json b/testdata/d2oracle/TestSet/import/6.exp.json index 7c2f2b3e6..5ce8503b3 100644 --- a/testdata/d2oracle/TestSet/import/6.exp.json +++ b/testdata/d2oracle/TestSet/import/6.exp.json @@ -150,6 +150,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -197,6 +198,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -299,6 +301,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -334,6 +337,26 @@ "key_path_index": 0, "map_key_edge_index": -1 }, + { + "key": { + "range": "index.d2,1:0:2-1:1:3", + "path": [ + { + "unquoted_string": { + "range": "index.d2,1:0:2-1:1:3", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, { "key": { "range": "index.d2,2:0:9-2:14:23", @@ -397,6 +420,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/import/7.exp.json b/testdata/d2oracle/TestSet/import/7.exp.json index ce85d720a..ff461a795 100644 --- a/testdata/d2oracle/TestSet/import/7.exp.json +++ b/testdata/d2oracle/TestSet/import/7.exp.json @@ -145,6 +145,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -283,6 +284,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/import/8.exp.json b/testdata/d2oracle/TestSet/import/8.exp.json index c4e4373ba..354ff6378 100644 --- a/testdata/d2oracle/TestSet/import/8.exp.json +++ b/testdata/d2oracle/TestSet/import/8.exp.json @@ -175,6 +175,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -222,6 +223,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -239,7 +241,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "index.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -249,10 +251,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "yo.d2,0:0:0-0:1:1", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -262,7 +265,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -272,10 +275,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "index.d2,5:6:37-5:11:42", "value": [ { - "string": "style" + "string": "style", + "raw_string": "style" } ] } @@ -285,7 +289,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -295,10 +299,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "index.d2,5:12:43-5:16:47", "value": [ { - "string": "fill" + "string": "fill", + "raw_string": "fill" } ] } @@ -343,6 +348,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -436,6 +442,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/import/9.exp.json b/testdata/d2oracle/TestSet/import/9.exp.json index 3c942e675..c1a4a9202 100644 --- a/testdata/d2oracle/TestSet/import/9.exp.json +++ b/testdata/d2oracle/TestSet/import/9.exp.json @@ -127,6 +127,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -165,6 +166,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -232,6 +234,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -297,6 +300,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/inline_style.exp.json b/testdata/d2oracle/TestSet/inline_style.exp.json index 032b0654e..f505c5593 100644 --- a/testdata/d2oracle/TestSet/inline_style.exp.json +++ b/testdata/d2oracle/TestSet/inline_style.exp.json @@ -132,6 +132,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -186,6 +187,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/label-near/1.exp.json b/testdata/d2oracle/TestSet/label-near/1.exp.json index 5a4b9b691..4cd86b573 100644 --- a/testdata/d2oracle/TestSet/label-near/1.exp.json +++ b/testdata/d2oracle/TestSet/label-near/1.exp.json @@ -92,6 +92,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -139,6 +140,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/label-near/2.exp.json b/testdata/d2oracle/TestSet/label-near/2.exp.json index 2352d151b..1c92daa51 100644 --- a/testdata/d2oracle/TestSet/label-near/2.exp.json +++ b/testdata/d2oracle/TestSet/label-near/2.exp.json @@ -74,6 +74,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -143,6 +144,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/label-near/3.exp.json b/testdata/d2oracle/TestSet/label-near/3.exp.json index 1a3e49305..24e88c517 100644 --- a/testdata/d2oracle/TestSet/label-near/3.exp.json +++ b/testdata/d2oracle/TestSet/label-near/3.exp.json @@ -92,6 +92,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -139,6 +140,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/label-near/4.exp.json b/testdata/d2oracle/TestSet/label-near/4.exp.json index b259afc2c..063de6728 100644 --- a/testdata/d2oracle/TestSet/label-near/4.exp.json +++ b/testdata/d2oracle/TestSet/label-near/4.exp.json @@ -120,6 +120,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -167,6 +168,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/label-near/5.exp.json b/testdata/d2oracle/TestSet/label-near/5.exp.json index ab5708901..d63713dc3 100644 --- a/testdata/d2oracle/TestSet/label-near/5.exp.json +++ b/testdata/d2oracle/TestSet/label-near/5.exp.json @@ -120,6 +120,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -167,6 +168,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/label.exp.json b/testdata/d2oracle/TestSet/label.exp.json index b091d0d7e..397860074 100644 --- a/testdata/d2oracle/TestSet/label.exp.json +++ b/testdata/d2oracle/TestSet/label.exp.json @@ -52,6 +52,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -99,6 +100,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/label_primary.exp.json b/testdata/d2oracle/TestSet/label_primary.exp.json index 612f2cff8..bee189046 100644 --- a/testdata/d2oracle/TestSet/label_primary.exp.json +++ b/testdata/d2oracle/TestSet/label_primary.exp.json @@ -100,6 +100,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -131,6 +132,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -178,6 +180,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -223,6 +226,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -268,6 +272,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/label_replace.exp.json b/testdata/d2oracle/TestSet/label_replace.exp.json index 976aa222f..19322842f 100644 --- a/testdata/d2oracle/TestSet/label_replace.exp.json +++ b/testdata/d2oracle/TestSet/label_replace.exp.json @@ -52,6 +52,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -99,6 +100,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/label_unset.exp.json b/testdata/d2oracle/TestSet/label_unset.exp.json index c1cd12102..cf95c66c2 100644 --- a/testdata/d2oracle/TestSet/label_unset.exp.json +++ b/testdata/d2oracle/TestSet/label_unset.exp.json @@ -42,6 +42,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -89,6 +90,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/labeled_set_position.exp.json b/testdata/d2oracle/TestSet/labeled_set_position.exp.json new file mode 100644 index 000000000..b1f367682 --- /dev/null +++ b/testdata/d2oracle/TestSet/labeled_set_position.exp.json @@ -0,0 +1,214 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2oracle/TestSet/labeled_set_position.d2,0:0:0-2:0:29", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2oracle/TestSet/labeled_set_position.d2,0:0:0-0:15:15", + "key": { + "range": "d2/testdata/d2oracle/TestSet/labeled_set_position.d2,0:0:0-0:9:9", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/labeled_set_position.d2,0:0:0-0:3:3", + "value": [ + { + "string": "hey", + "raw_string": "hey" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/labeled_set_position.d2,0:4:4-0:9:9", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/labeled_set_position.d2,0:11:11-0:15:15", + "value": [ + { + "string": "what", + "raw_string": "what" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2oracle/TestSet/labeled_set_position.d2,1:0:16-1:12:28", + "key": { + "range": "d2/testdata/d2oracle/TestSet/labeled_set_position.d2,1:0:16-1:7:23", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/labeled_set_position.d2,1:0:16-1:3:19", + "value": [ + { + "string": "hey", + "raw_string": "hey" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/labeled_set_position.d2,1:4:20-1:7:23", + "value": [ + { + "string": "top", + "raw_string": "top" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "number": { + "range": "d2/testdata/d2oracle/TestSet/labeled_set_position.d2,1:9:25-1:12:28", + "raw": "200", + "value": "200" + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "hey", + "id_val": "hey", + "references": [ + { + "key": { + "range": "d2/testdata/d2oracle/TestSet/labeled_set_position.d2,0:0:0-0:9:9", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/labeled_set_position.d2,0:0:0-0:3:3", + "value": [ + { + "string": "hey", + "raw_string": "hey" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/labeled_set_position.d2,0:4:4-0:9:9", + "value": [ + { + "string": "label", + "raw_string": "label" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "d2/testdata/d2oracle/TestSet/labeled_set_position.d2,1:0:16-1:7:23", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/labeled_set_position.d2,1:0:16-1:3:19", + "value": [ + { + "string": "hey", + "raw_string": "hey" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/labeled_set_position.d2,1:4:20-1:7:23", + "value": [ + { + "string": "top", + "raw_string": "top" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "what" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "top": { + "value": "200" + }, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": "" +} diff --git a/testdata/d2oracle/TestSet/layers-unusable-ref-style.exp.json b/testdata/d2oracle/TestSet/layers-unusable-ref-style.exp.json index 39dd972b0..97b3399f2 100644 --- a/testdata/d2oracle/TestSet/layers-unusable-ref-style.exp.json +++ b/testdata/d2oracle/TestSet/layers-unusable-ref-style.exp.json @@ -174,6 +174,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -221,6 +222,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -238,7 +240,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -248,10 +250,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,4:4:24-4:5:25", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -270,10 +273,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,5:4:30-5:5:31", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -283,7 +287,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -293,10 +297,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,5:6:32-5:11:37", "value": [ { - "string": "style" + "string": "style", + "raw_string": "style" } ] } @@ -306,7 +311,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -316,10 +321,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/layers-unusable-ref-style.d2,5:12:38-5:19:45", "value": [ { - "string": "opacity" + "string": "opacity", + "raw_string": "opacity" } ] } @@ -360,6 +366,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -407,6 +414,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -478,6 +486,7 @@ "value": "0.2" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/layers-usable-ref-style.exp.json b/testdata/d2oracle/TestSet/layers-usable-ref-style.exp.json index 157eadec4..d55c89dc6 100644 --- a/testdata/d2oracle/TestSet/layers-usable-ref-style.exp.json +++ b/testdata/d2oracle/TestSet/layers-usable-ref-style.exp.json @@ -169,6 +169,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -216,6 +217,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -233,7 +235,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -243,10 +245,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,4:4:24-4:5:25", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -256,7 +259,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -266,10 +269,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,4:8:28-4:13:33", "value": [ { - "string": "style" + "string": "style", + "raw_string": "style" } ] } @@ -279,7 +283,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -289,10 +293,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/layers-usable-ref-style.d2,4:14:34-4:21:41", "value": [ { - "string": "opacity" + "string": "opacity", + "raw_string": "opacity" } ] } @@ -333,6 +338,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -384,6 +390,7 @@ "value": "0.2" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/map_key_missing.exp.json b/testdata/d2oracle/TestSet/map_key_missing.exp.json index e26a74490..f71507435 100644 --- a/testdata/d2oracle/TestSet/map_key_missing.exp.json +++ b/testdata/d2oracle/TestSet/map_key_missing.exp.json @@ -98,6 +98,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -129,6 +130,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -196,6 +198,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -241,6 +244,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/nested-edge-chained/1.exp.json b/testdata/d2oracle/TestSet/nested-edge-chained/1.exp.json index 892a665c1..daf3c91ed 100644 --- a/testdata/d2oracle/TestSet/nested-edge-chained/1.exp.json +++ b/testdata/d2oracle/TestSet/nested-edge-chained/1.exp.json @@ -348,6 +348,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -379,6 +380,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -416,6 +418,7 @@ "value": "green" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -640,6 +643,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -862,6 +866,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -991,6 +996,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1036,6 +1042,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/nested-edge-chained/2.exp.json b/testdata/d2oracle/TestSet/nested-edge-chained/2.exp.json index 162b3f2a5..3cd9eb892 100644 --- a/testdata/d2oracle/TestSet/nested-edge-chained/2.exp.json +++ b/testdata/d2oracle/TestSet/nested-edge-chained/2.exp.json @@ -377,6 +377,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -408,6 +409,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -445,6 +447,7 @@ "value": "green" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -492,6 +495,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -714,6 +718,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -936,6 +941,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1065,6 +1071,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1110,6 +1117,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/nested_alex.exp.json b/testdata/d2oracle/TestSet/nested_alex.exp.json index 97bb445e0..253cb6faf 100644 --- a/testdata/d2oracle/TestSet/nested_alex.exp.json +++ b/testdata/d2oracle/TestSet/nested_alex.exp.json @@ -170,6 +170,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -201,6 +202,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -248,6 +250,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -293,6 +296,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -358,6 +362,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/new_style.exp.json b/testdata/d2oracle/TestSet/new_style.exp.json index 4a8400833..648bb085e 100644 --- a/testdata/d2oracle/TestSet/new_style.exp.json +++ b/testdata/d2oracle/TestSet/new_style.exp.json @@ -88,6 +88,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -139,6 +140,7 @@ "value": "0.2" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/replace_arrowhead.exp.json b/testdata/d2oracle/TestSet/replace_arrowhead.exp.json index 9870e4e34..888319515 100644 --- a/testdata/d2oracle/TestSet/replace_arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/replace_arrowhead.exp.json @@ -115,6 +115,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -141,6 +142,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" @@ -164,6 +166,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -211,6 +214,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -256,6 +260,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json b/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json index 2c26e580a..fdaa282dd 100644 --- a/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json +++ b/testdata/d2oracle/TestSet/replace_arrowhead_map.exp.json @@ -133,6 +133,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -159,6 +160,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" @@ -182,6 +184,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -229,6 +232,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -274,6 +278,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/replace_dimensions.exp.json b/testdata/d2oracle/TestSet/replace_dimensions.exp.json index 892cd96b3..bbd52960e 100644 --- a/testdata/d2oracle/TestSet/replace_dimensions.exp.json +++ b/testdata/d2oracle/TestSet/replace_dimensions.exp.json @@ -77,6 +77,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -124,6 +125,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "width": { "value": "200" }, diff --git a/testdata/d2oracle/TestSet/replace_edge_style.exp.json b/testdata/d2oracle/TestSet/replace_edge_style.exp.json index 6704cc4f9..d94e11224 100644 --- a/testdata/d2oracle/TestSet/replace_edge_style.exp.json +++ b/testdata/d2oracle/TestSet/replace_edge_style.exp.json @@ -151,6 +151,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -189,6 +190,7 @@ "value": "3" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -236,6 +238,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -281,6 +284,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json b/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json index 97d772826..1b98b999e 100644 --- a/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json +++ b/testdata/d2oracle/TestSet/replace_edge_style_map.exp.json @@ -129,6 +129,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -164,6 +165,7 @@ "value": "4" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -211,6 +213,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -256,6 +259,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/replace_fill_pattern.exp.json b/testdata/d2oracle/TestSet/replace_fill_pattern.exp.json index e85fb417b..297ec7b31 100644 --- a/testdata/d2oracle/TestSet/replace_fill_pattern.exp.json +++ b/testdata/d2oracle/TestSet/replace_fill_pattern.exp.json @@ -92,6 +92,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -143,6 +144,7 @@ "value": "grain" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/replace_link.exp.json b/testdata/d2oracle/TestSet/replace_link.exp.json index e6ac31625..f8b84f64b 100644 --- a/testdata/d2oracle/TestSet/replace_link.exp.json +++ b/testdata/d2oracle/TestSet/replace_link.exp.json @@ -81,6 +81,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -128,6 +129,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "link": { "value": "https://apple.com" }, diff --git a/testdata/d2oracle/TestSet/replace_position.exp.json b/testdata/d2oracle/TestSet/replace_position.exp.json index 464357f3e..527819046 100644 --- a/testdata/d2oracle/TestSet/replace_position.exp.json +++ b/testdata/d2oracle/TestSet/replace_position.exp.json @@ -135,6 +135,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -182,6 +183,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "width": { "value": "100" }, diff --git a/testdata/d2oracle/TestSet/replace_shape.exp.json b/testdata/d2oracle/TestSet/replace_shape.exp.json index 9fa391b04..d3a119f45 100644 --- a/testdata/d2oracle/TestSet/replace_shape.exp.json +++ b/testdata/d2oracle/TestSet/replace_shape.exp.json @@ -63,6 +63,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -121,6 +122,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "circle" diff --git a/testdata/d2oracle/TestSet/replace_style.exp.json b/testdata/d2oracle/TestSet/replace_style.exp.json index 47a623194..3d2afde1e 100644 --- a/testdata/d2oracle/TestSet/replace_style.exp.json +++ b/testdata/d2oracle/TestSet/replace_style.exp.json @@ -70,6 +70,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -143,6 +144,7 @@ "value": "0.2" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json b/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json index 197c9461b..6d054f57d 100644 --- a/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json +++ b/testdata/d2oracle/TestSet/replace_style_edgecase.exp.json @@ -125,6 +125,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -243,6 +244,7 @@ "value": "orange" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/replace_tooltip.exp.json b/testdata/d2oracle/TestSet/replace_tooltip.exp.json index c1490dc89..c6307c6c2 100644 --- a/testdata/d2oracle/TestSet/replace_tooltip.exp.json +++ b/testdata/d2oracle/TestSet/replace_tooltip.exp.json @@ -81,6 +81,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -128,6 +129,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "tooltip": { "value": "y" }, diff --git a/testdata/d2oracle/TestSet/scenario-child.exp.json b/testdata/d2oracle/TestSet/scenario-child.exp.json index e2c9e891e..5ac73722c 100644 --- a/testdata/d2oracle/TestSet/scenario-child.exp.json +++ b/testdata/d2oracle/TestSet/scenario-child.exp.json @@ -230,6 +230,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -261,6 +262,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -308,6 +310,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -353,6 +356,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -370,7 +374,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -380,10 +384,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -402,10 +407,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,0:5:5-0:6:6", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -424,10 +430,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,4:4:32-4:6:34", "value": [ { - "string": "hi" + "string": "hi", + "raw_string": "hi" } ] } @@ -491,10 +498,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,5:16:51-5:21:56", "value": [ { - "string": "style" + "string": "style", + "raw_string": "style" } ] } @@ -504,7 +512,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -514,10 +522,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenario-child.d2,5:22:57-5:34:69", "value": [ { - "string": "stroke-width" + "string": "stroke-width", + "raw_string": "stroke-width" } ] } @@ -558,6 +567,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -596,6 +606,7 @@ "value": "3" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -663,6 +674,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -728,6 +740,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -773,6 +786,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/scenario-grandchild.exp.json b/testdata/d2oracle/TestSet/scenario-grandchild.exp.json index 0f8d74762..64873797b 100644 --- a/testdata/d2oracle/TestSet/scenario-grandchild.exp.json +++ b/testdata/d2oracle/TestSet/scenario-grandchild.exp.json @@ -348,6 +348,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -379,6 +380,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -426,6 +428,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -471,6 +474,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -488,7 +492,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenario-grandchild.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -498,10 +502,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenario-grandchild.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -520,10 +525,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenario-grandchild.d2,0:5:5-0:6:6", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -542,10 +548,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenario-grandchild.d2,4:4:32-4:13:41", "value": [ { - "string": "scenarios" + "string": "scenarios", + "raw_string": "scenarios" } ] } @@ -555,7 +562,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -565,10 +572,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenario-grandchild.d2,5:6:51-5:7:52", "value": [ { - "string": "c" + "string": "c", + "raw_string": "c" } ] } @@ -578,7 +586,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenario-grandchild.d2,1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -588,10 +596,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenario-grandchild.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -610,10 +619,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenario-grandchild.d2,0:5:5-0:6:6", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -677,10 +687,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenario-grandchild.d2,6:20:76-6:25:81", "value": [ { - "string": "style" + "string": "style", + "raw_string": "style" } ] } @@ -690,7 +701,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -700,10 +711,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenario-grandchild.d2,6:26:82-6:30:86", "value": [ { - "string": "bold" + "string": "bold", + "raw_string": "bold" } ] } @@ -727,10 +739,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenario-grandchild.d2,7:26:119-7:38:131", "value": [ { - "string": "stroke-width" + "string": "stroke-width", + "raw_string": "stroke-width" } ] } @@ -825,6 +838,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -856,6 +870,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -903,6 +918,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -948,6 +964,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -965,7 +982,7 @@ "name": "c", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenario-grandchild.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -975,10 +992,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenario-grandchild.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -997,10 +1015,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenario-grandchild.d2,0:5:5-0:6:6", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -1064,10 +1083,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenario-grandchild.d2,6:20:76-6:25:81", "value": [ { - "string": "style" + "string": "style", + "raw_string": "style" } ] } @@ -1077,7 +1097,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -1087,10 +1107,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenario-grandchild.d2,6:26:82-6:30:86", "value": [ { - "string": "bold" + "string": "bold", + "raw_string": "bold" } ] } @@ -1114,10 +1135,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenario-grandchild.d2,7:26:119-7:38:131", "value": [ { - "string": "stroke-width" + "string": "stroke-width", + "raw_string": "stroke-width" } ] } @@ -1158,6 +1180,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -1202,6 +1225,7 @@ "value": "true" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -1289,6 +1313,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1374,6 +1399,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/scenarios-arrowhead.exp.json b/testdata/d2oracle/TestSet/scenarios-arrowhead.exp.json index 6227312a5..6154cace4 100644 --- a/testdata/d2oracle/TestSet/scenarios-arrowhead.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-arrowhead.exp.json @@ -366,6 +366,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -392,6 +393,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "triangle" @@ -415,6 +417,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -445,6 +448,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -492,6 +496,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -537,6 +542,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -582,6 +588,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -627,6 +634,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -644,7 +652,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-arrowhead.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -654,10 +662,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-arrowhead.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -676,10 +685,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-arrowhead.d2,0:5:5-0:6:6", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -698,10 +708,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-arrowhead.d2,3:0:47-3:1:48", "value": [ { - "string": "x" + "string": "x", + "raw_string": "x" } ] } @@ -720,10 +731,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-arrowhead.d2,3:5:52-3:6:53", "value": [ { - "string": "y" + "string": "y", + "raw_string": "y" } ] } @@ -742,10 +754,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-arrowhead.d2,10:4:142-10:5:143", "value": [ { - "string": "c" + "string": "c", + "raw_string": "c" } ] } @@ -764,10 +777,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-arrowhead.d2,10:9:147-10:10:148", "value": [ { - "string": "d" + "string": "d", + "raw_string": "d" } ] } @@ -831,10 +845,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-arrowhead.d2,1:2:12-1:18:28", "value": [ { - "string": "target-arrowhead" + "string": "target-arrowhead", + "raw_string": "target-arrowhead" } ] } @@ -844,7 +859,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -854,10 +869,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-arrowhead.d2,1:19:29-1:24:34", "value": [ { - "string": "shape" + "string": "shape", + "raw_string": "shape" } ] } @@ -990,6 +1006,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -1016,6 +1033,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "diamond" @@ -1042,6 +1060,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -1072,6 +1091,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -1102,6 +1122,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -1169,6 +1190,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1234,6 +1256,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1279,6 +1302,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1324,6 +1348,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1369,6 +1394,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -1414,6 +1440,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/scenarios-edge-set.exp.json b/testdata/d2oracle/TestSet/scenarios-edge-set.exp.json index 681028ae3..138b327d7 100644 --- a/testdata/d2oracle/TestSet/scenarios-edge-set.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-edge-set.exp.json @@ -230,6 +230,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -261,6 +262,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -308,6 +310,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -353,6 +356,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -370,7 +374,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-edge-set.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -380,10 +384,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-edge-set.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -402,10 +407,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-edge-set.d2,0:5:5-0:6:6", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -424,10 +430,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-edge-set.d2,4:4:32-4:5:33", "value": [ { - "string": "c" + "string": "c", + "raw_string": "c" } ] } @@ -491,10 +498,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-edge-set.d2,5:16:50-5:21:55", "value": [ { - "string": "style" + "string": "style", + "raw_string": "style" } ] } @@ -504,7 +512,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -514,10 +522,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-edge-set.d2,5:22:56-5:29:63", "value": [ { - "string": "opacity" + "string": "opacity", + "raw_string": "opacity" } ] } @@ -558,6 +567,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -596,6 +606,7 @@ "value": "0.2" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -663,6 +674,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -728,6 +740,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -773,6 +786,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/scenarios-existing-edge-set.exp.json b/testdata/d2oracle/TestSet/scenarios-existing-edge-set.exp.json index 5f85a1b48..561707163 100644 --- a/testdata/d2oracle/TestSet/scenarios-existing-edge-set.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-existing-edge-set.exp.json @@ -238,6 +238,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -269,6 +270,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -316,6 +318,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -361,6 +364,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -378,7 +382,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-existing-edge-set.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -388,10 +392,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-existing-edge-set.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -410,10 +415,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-existing-edge-set.d2,0:5:5-0:6:6", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -432,10 +438,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-existing-edge-set.d2,5:4:65-5:5:66", "value": [ { - "string": "c" + "string": "c", + "raw_string": "c" } ] } @@ -543,10 +550,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-existing-edge-set.d2,4:13:41-4:18:46", "value": [ { - "string": "style" + "string": "style", + "raw_string": "style" } ] } @@ -556,7 +564,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -566,10 +574,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-existing-edge-set.d2,4:19:47-4:26:54", "value": [ { - "string": "opacity" + "string": "opacity", + "raw_string": "opacity" } ] } @@ -610,6 +619,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -641,6 +651,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -675,6 +686,7 @@ "value": "0.2" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -742,6 +754,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -807,6 +820,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -852,6 +866,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/scenarios-label-primary-missing.exp.json b/testdata/d2oracle/TestSet/scenarios-label-primary-missing.exp.json index cef4033e3..17575be51 100644 --- a/testdata/d2oracle/TestSet/scenarios-label-primary-missing.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-label-primary-missing.exp.json @@ -202,6 +202,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -253,6 +254,7 @@ "value": "0.2" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -270,7 +272,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -280,10 +282,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -303,7 +306,7 @@ }, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -313,10 +316,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,1:2:7-1:7:12", "value": [ { - "string": "style" + "string": "style", + "raw_string": "style" } ] } @@ -326,7 +330,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -336,10 +340,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,1:8:13-1:15:20", "value": [ { - "string": "opacity" + "string": "opacity", + "raw_string": "opacity" } ] } @@ -374,10 +379,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary-missing.d2,6:4:53-6:5:54", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -402,6 +408,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -473,6 +480,7 @@ "value": "0.2" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -518,6 +526,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/scenarios-label-primary.exp.json b/testdata/d2oracle/TestSet/scenarios-label-primary.exp.json index 532add34b..d79e4dffc 100644 --- a/testdata/d2oracle/TestSet/scenarios-label-primary.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-label-primary.exp.json @@ -225,6 +225,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -276,6 +277,7 @@ "value": "0.2" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -293,7 +295,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -303,10 +305,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -326,7 +329,7 @@ }, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -336,10 +339,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,1:2:7-1:7:12", "value": [ { - "string": "style" + "string": "style", + "raw_string": "style" } ] } @@ -349,7 +353,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -359,10 +363,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-label-primary.d2,1:8:13-1:15:20", "value": [ { - "string": "opacity" + "string": "opacity", + "raw_string": "opacity" } ] } @@ -403,6 +408,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -474,6 +480,7 @@ "value": "0.3" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/scenarios-multiple.exp.json b/testdata/d2oracle/TestSet/scenarios-multiple.exp.json index f49af2dfc..f61a8e9be 100644 --- a/testdata/d2oracle/TestSet/scenarios-multiple.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-multiple.exp.json @@ -229,6 +229,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -276,6 +277,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -293,7 +295,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-multiple.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -303,10 +305,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-multiple.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -316,7 +319,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -326,10 +329,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-multiple.d2,5:6:35-5:11:40", "value": [ { - "string": "style" + "string": "style", + "raw_string": "style" } ] } @@ -339,7 +343,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -349,10 +353,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-multiple.d2,5:12:41-5:16:45", "value": [ { - "string": "fill" + "string": "fill", + "raw_string": "fill" } ] } @@ -381,10 +386,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-multiple.d2,6:12:63-6:19:70", "value": [ { - "string": "opacity" + "string": "opacity", + "raw_string": "opacity" } ] } @@ -419,10 +425,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-multiple.d2,4:4:27-4:5:28", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -447,6 +454,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -585,6 +593,7 @@ "value": "red" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -630,6 +639,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.exp.json b/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.exp.json index b201b16cc..83a61214a 100644 --- a/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.exp.json @@ -247,6 +247,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -294,6 +295,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -339,6 +341,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -356,7 +359,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -366,10 +369,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -379,7 +383,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -389,10 +393,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,1:2:7-1:3:8", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -412,7 +417,7 @@ }, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -422,10 +427,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,7:16:64-7:21:69", "value": [ { - "string": "style" + "string": "style", + "raw_string": "style" } ] } @@ -435,7 +441,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -445,10 +451,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-nested-usable-ref-style.d2,7:22:70-7:29:77", "value": [ { - "string": "opacity" + "string": "opacity", + "raw_string": "opacity" } ] } @@ -494,6 +501,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -561,6 +569,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -630,6 +639,7 @@ "value": "0.2" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.exp.json b/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.exp.json index 8b8ef383c..7e9747aa5 100644 --- a/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.exp.json @@ -174,6 +174,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -221,6 +222,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -238,7 +240,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -248,10 +250,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -261,7 +264,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -271,10 +274,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,5:6:35-5:11:40", "value": [ { - "string": "style" + "string": "style", + "raw_string": "style" } ] } @@ -284,7 +288,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -294,10 +298,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,5:12:41-5:19:48", "value": [ { - "string": "opacity" + "string": "opacity", + "raw_string": "opacity" } ] } @@ -332,10 +337,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-unusable-ref-style.d2,4:4:27-4:5:28", "value": [ { - "string": "b" + "string": "b", + "raw_string": "b" } ] } @@ -360,6 +366,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -453,6 +460,7 @@ "value": "0.2" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -498,6 +506,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/scenarios-usable-ref-style.exp.json b/testdata/d2oracle/TestSet/scenarios-usable-ref-style.exp.json index c99418180..8271c8999 100644 --- a/testdata/d2oracle/TestSet/scenarios-usable-ref-style.exp.json +++ b/testdata/d2oracle/TestSet/scenarios-usable-ref-style.exp.json @@ -189,6 +189,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -236,6 +237,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" @@ -253,7 +255,7 @@ "name": "x", "isFolderOnly": false, "ast": { - "range": ",0:0:0-1:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,0:0:0-1:0:0", "nodes": [ { "map_key": { @@ -263,10 +265,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,0:0:0-0:1:1", "value": [ { - "string": "a" + "string": "a", + "raw_string": "a" } ] } @@ -286,7 +289,7 @@ }, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -296,10 +299,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,4:14:44-4:19:49", "value": [ { - "string": "style" + "string": "style", + "raw_string": "style" } ] } @@ -309,7 +313,7 @@ "primary": {}, "value": { "map": { - "range": ",0:0:0-1:0:0", + "range": ",1:0:0-2:0:0", "nodes": [ { "map_key": { @@ -319,10 +323,11 @@ "path": [ { "unquoted_string": { - "range": ",0:0:0-0:0:0", + "range": "d2/testdata/d2oracle/TestSet/scenarios-usable-ref-style.d2,4:20:50-4:27:57", "value": [ { - "string": "opacity" + "string": "opacity", + "raw_string": "opacity" } ] } @@ -363,6 +368,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -434,6 +440,7 @@ "value": "0.2" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/set-style-in-layer.exp.json b/testdata/d2oracle/TestSet/set-style-in-layer.exp.json new file mode 100644 index 000000000..73d98726c --- /dev/null +++ b/testdata/d2oracle/TestSet/set-style-in-layer.exp.json @@ -0,0 +1,726 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,0:0:0-13:0:116", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,0:0:0-0:3:3", + "key": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,0:0:0-0:3:3", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,0:0:0-0:3:3", + "value": [ + { + "string": "hey", + "raw_string": "hey" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,2:0:5-6:1:60", + "key": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,2:0:5-2:6:11", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,2:0:5-2:6:11", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,2:8:13-6:1:60", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,3:2:17-5:3:58", + "key": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,3:2:17-3:3:18", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,3:2:17-3:3:18", + "value": [ + { + "string": "k", + "raw_string": "k" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,3:5:20-5:3:58", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,4:4:26-4:32:54", + "key": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,4:4:26-4:5:27", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,4:4:26-4:5:27", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,4:7:29-4:32:54", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,4:8:30-4:31:53", + "key": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,4:8:30-4:20:42", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,4:8:30-4:13:35", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,4:14:36-4:20:42", + "value": [ + { + "string": "stroke", + "raw_string": "stroke" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "double_quoted_string": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,4:22:44-4:31:53", + "value": [ + { + "string": "#969db4", + "raw_string": "#969db4" + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,8:0:62-12:1:115", + "key": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,8:0:62-8:6:68", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,8:0:62-8:6:68", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,8:8:70-12:1:115", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,9:2:74-11:3:113", + "key": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,9:2:74-9:3:75", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,9:2:74-9:3:75", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,9:5:77-11:3:113", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,10:4:83-10:30:109", + "key": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,10:4:83-10:5:84", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,10:4:83-10:5:84", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,10:7:86-10:30:109", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,10:8:87-10:29:108", + "key": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,10:8:87-10:18:97", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,10:8:87-10:13:92", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,10:14:93-10:18:97", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "double_quoted_string": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,10:20:99-10:29:108", + "value": [ + { + "string": "#ff0000", + "raw_string": "#ff0000" + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "hey", + "id_val": "hey", + "references": [ + { + "key": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,0:0:0-0:3:3", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,0:0:0-0:3:3", + "value": [ + { + "string": "hey", + "raw_string": "hey" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "hey" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ], + "layers": [ + { + "name": "k", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,0:0:0-1:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,4:4:26-4:5:27", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": ",1:0:0-2:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,4:8:30-4:13:35", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": ",1:0:0-2:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,4:14:36-4:20:42", + "value": [ + { + "string": "stroke", + "raw_string": "stroke" + } + ] + } + } + ] + }, + "primary": { + "double_quoted_string": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,4:22:44-4:31:53", + "value": [ + { + "string": "#969db4", + "raw_string": "#969db4" + } + ] + } + }, + "value": {} + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "b", + "id_val": "b", + "references": [ + { + "key": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,4:4:26-4:5:27", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,4:4:26-4:5:27", + "value": [ + { + "string": "b", + "raw_string": "b" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "b" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "stroke": { + "value": "#969db4" + } + }, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + { + "name": "x", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,0:0:0-1:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,10:4:83-10:5:84", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": ",1:0:0-2:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,10:8:87-10:13:92", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": ",1:0:0-2:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,10:14:93-10:18:97", + "value": [ + { + "string": "fill", + "raw_string": "fill" + } + ] + } + } + ] + }, + "primary": { + "double_quoted_string": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,10:20:99-10:29:108", + "value": [ + { + "string": "#ff0000", + "raw_string": "#ff0000" + } + ] + } + }, + "value": {} + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "y", + "id_val": "y", + "references": [ + { + "key": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,10:4:83-10:5:84", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/set-style-in-layer.d2,10:4:83-10:5:84", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "y" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "fill": { + "value": "#ff0000" + } + }, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + } + ] + }, + "err": "" +} diff --git a/testdata/d2oracle/TestSet/set_dimensions.exp.json b/testdata/d2oracle/TestSet/set_dimensions.exp.json index 548d0f7b7..cebfc5fc0 100644 --- a/testdata/d2oracle/TestSet/set_dimensions.exp.json +++ b/testdata/d2oracle/TestSet/set_dimensions.exp.json @@ -77,6 +77,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -124,6 +125,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "width": { "value": "200" }, diff --git a/testdata/d2oracle/TestSet/set_fill_pattern.exp.json b/testdata/d2oracle/TestSet/set_fill_pattern.exp.json index 476a81bc1..8f0abe1e8 100644 --- a/testdata/d2oracle/TestSet/set_fill_pattern.exp.json +++ b/testdata/d2oracle/TestSet/set_fill_pattern.exp.json @@ -92,6 +92,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -143,6 +144,7 @@ "value": "grain" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/set_position.exp.json b/testdata/d2oracle/TestSet/set_position.exp.json index 699f78ae8..0177d5130 100644 --- a/testdata/d2oracle/TestSet/set_position.exp.json +++ b/testdata/d2oracle/TestSet/set_position.exp.json @@ -77,6 +77,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -124,6 +125,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "top": { "value": "200" }, diff --git a/testdata/d2oracle/TestSet/set_tooltip.exp.json b/testdata/d2oracle/TestSet/set_tooltip.exp.json index a832f994d..7f62f46f4 100644 --- a/testdata/d2oracle/TestSet/set_tooltip.exp.json +++ b/testdata/d2oracle/TestSet/set_tooltip.exp.json @@ -81,6 +81,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -128,6 +129,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "tooltip": { "value": "y" }, diff --git a/testdata/d2oracle/TestSet/shape.exp.json b/testdata/d2oracle/TestSet/shape.exp.json index bd4bedb40..d9ff9b0f5 100644 --- a/testdata/d2oracle/TestSet/shape.exp.json +++ b/testdata/d2oracle/TestSet/shape.exp.json @@ -81,6 +81,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -128,6 +129,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "square" diff --git a/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json b/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json index 25e8aeedb..22b041728 100644 --- a/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json +++ b/testdata/d2oracle/TestSet/shape_nested_style_set.exp.json @@ -88,6 +88,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -139,6 +140,7 @@ "value": "0.4" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/step-connection.exp.json b/testdata/d2oracle/TestSet/step-connection.exp.json new file mode 100644 index 000000000..ff3902361 --- /dev/null +++ b/testdata/d2oracle/TestSet/step-connection.exp.json @@ -0,0 +1,677 @@ +{ + "graph": { + "name": "", + "isFolderOnly": true, + "ast": { + "range": "d2/testdata/d2oracle/TestSet/step-connection.d2,0:0:0-8:0:118", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2oracle/TestSet/step-connection.d2,0:0:0-7:1:117", + "key": { + "range": "d2/testdata/d2oracle/TestSet/step-connection.d2,0:0:0-0:5:5", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/step-connection.d2,0:0:0-0:5:5", + "value": [ + { + "string": "steps", + "raw_string": "steps" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2oracle/TestSet/step-connection.d2,0:7:7-7:1:117", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2oracle/TestSet/step-connection.d2,1:2:11-6:3:115", + "key": { + "range": "d2/testdata/d2oracle/TestSet/step-connection.d2,1:2:11-1:3:12", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/step-connection.d2,1:2:11-1:3:12", + "value": [ + { + "string": "1", + "raw_string": "1" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2oracle/TestSet/step-connection.d2,1:5:14-6:3:115", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2oracle/TestSet/step-connection.d2,2:4:20-4:5:78", + "edges": [ + { + "range": "d2/testdata/d2oracle/TestSet/step-connection.d2,2:4:20-2:25:41", + "src": { + "range": "d2/testdata/d2oracle/TestSet/step-connection.d2,2:4:20-2:11:27", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/step-connection.d2,2:4:20-2:11:27", + "value": [ + { + "string": "Modules", + "raw_string": "Modules" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": "d2/testdata/d2oracle/TestSet/step-connection.d2,2:15:31-2:25:41", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/step-connection.d2,2:15:31-2:25:41", + "value": [ + { + "string": "Metricbeat", + "raw_string": "Metricbeat" + } + ] + } + } + ] + }, + "dst_arrow": "" + } + ], + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2oracle/TestSet/step-connection.d2,2:27:43-4:5:78", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2oracle/TestSet/step-connection.d2,3:6:51-3:27:72", + "key": { + "range": "d2/testdata/d2oracle/TestSet/step-connection.d2,3:6:51-3:24:69", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/step-connection.d2,3:6:51-3:11:56", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/step-connection.d2,3:12:57-3:24:69", + "value": [ + { + "string": "stroke-width", + "raw_string": "stroke-width" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "number": { + "range": "d2/testdata/d2oracle/TestSet/step-connection.d2,3:26:71-3:27:72", + "raw": "1", + "value": "1" + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2oracle/TestSet/step-connection.d2,5:4:83-5:32:111", + "key": { + "range": "d2/testdata/d2oracle/TestSet/step-connection.d2,5:4:83-5:27:106", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/step-connection.d2,5:4:83-5:14:93", + "value": [ + { + "string": "Metricbeat", + "raw_string": "Metricbeat" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/step-connection.d2,5:15:94-5:20:99", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/step-connection.d2,5:21:100-5:27:106", + "value": [ + { + "string": "stroke", + "raw_string": "stroke" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/step-connection.d2,5:29:108-5:32:111", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": null, + "steps": [ + { + "name": "1", + "isFolderOnly": false, + "ast": { + "range": "d2/testdata/d2oracle/TestSet/step-connection.d2,0:0:0-1:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/step-connection.d2,2:4:20-2:11:27", + "value": [ + { + "string": "Modules", + "raw_string": "Modules" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/step-connection.d2,2:15:31-2:25:41", + "value": [ + { + "string": "Metricbeat", + "raw_string": "Metricbeat" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": ",1:0:0-2:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/step-connection.d2,5:15:94-5:20:99", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": ",1:0:0-2:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/step-connection.d2,5:21:100-5:27:106", + "value": [ + { + "string": "stroke", + "raw_string": "stroke" + } + ] + } + } + ] + }, + "primary": { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/step-connection.d2,5:29:108-5:32:111", + "value": [ + { + "string": "red", + "raw_string": "red" + } + ] + } + }, + "value": {} + } + } + ] + } + } + } + } + ] + } + } + } + }, + { + "map_key": { + "range": ",0:0:0-0:0:0", + "edges": [ + { + "range": ",0:0:0-0:0:0", + "src": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "Modules" + } + ] + } + } + ] + }, + "src_arrow": "", + "dst": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": ",0:0:0-0:0:0", + "value": [ + { + "string": "Metricbeat" + } + ] + } + } + ] + }, + "dst_arrow": "" + } + ], + "primary": {}, + "value": { + "map": { + "range": ",0:0:0-1:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/step-connection.d2,3:6:51-3:11:56", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": ",1:0:0-2:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/step-connection.d2,3:12:57-3:24:69", + "value": [ + { + "string": "stroke-width", + "raw_string": "stroke-width" + } + ] + } + } + ] + }, + "primary": { + "number": { + "range": "d2/testdata/d2oracle/TestSet/step-connection.d2,3:26:71-3:27:72", + "raw": "1", + "value": "1" + } + }, + "value": {} + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": [ + { + "index": 0, + "isCurve": false, + "src_arrow": false, + "dst_arrow": false, + "references": [ + { + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "strokeWidth": { + "value": "1" + } + }, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ], + "objects": [ + { + "id": "Modules", + "id_val": "Modules", + "references": [ + { + "key": { + "range": "d2/testdata/d2oracle/TestSet/step-connection.d2,2:4:20-2:11:27", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/step-connection.d2,2:4:20-2:11:27", + "value": [ + { + "string": "Modules", + "raw_string": "Modules" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + } + ], + "attributes": { + "label": { + "value": "Modules" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "Metricbeat", + "id_val": "Metricbeat", + "references": [ + { + "key": { + "range": "d2/testdata/d2oracle/TestSet/step-connection.d2,2:15:31-2:25:41", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/step-connection.d2,2:15:31-2:25:41", + "value": [ + { + "string": "Metricbeat", + "raw_string": "Metricbeat" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": 0 + }, + { + "key": { + "range": "d2/testdata/d2oracle/TestSet/step-connection.d2,5:4:83-5:27:106", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/step-connection.d2,5:4:83-5:14:93", + "value": [ + { + "string": "Metricbeat", + "raw_string": "Metricbeat" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/step-connection.d2,5:15:94-5:20:99", + "value": [ + { + "string": "style", + "raw_string": "style" + } + ] + } + }, + { + "unquoted_string": { + "range": "d2/testdata/d2oracle/TestSet/step-connection.d2,5:21:100-5:27:106", + "value": [ + { + "string": "stroke", + "raw_string": "stroke" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "Metricbeat" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": { + "stroke": { + "value": "red" + } + }, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + } + ] + }, + "err": "" +} diff --git a/testdata/d2oracle/TestSet/unapplied-classes-style-2.exp.json b/testdata/d2oracle/TestSet/unapplied-classes-style-2.exp.json index fce9058ea..717072ce9 100644 --- a/testdata/d2oracle/TestSet/unapplied-classes-style-2.exp.json +++ b/testdata/d2oracle/TestSet/unapplied-classes-style-2.exp.json @@ -194,6 +194,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -245,6 +246,7 @@ "value": "green" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/unapplied-classes-style.exp.json b/testdata/d2oracle/TestSet/unapplied-classes-style.exp.json index b7ac7a166..22266b4ff 100644 --- a/testdata/d2oracle/TestSet/unapplied-classes-style.exp.json +++ b/testdata/d2oracle/TestSet/unapplied-classes-style.exp.json @@ -176,6 +176,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -249,6 +250,7 @@ "value": "green" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestSet/var-with-label.exp.json b/testdata/d2oracle/TestSet/var-with-label.exp.json index c31d31557..b6c12b0d5 100644 --- a/testdata/d2oracle/TestSet/var-with-label.exp.json +++ b/testdata/d2oracle/TestSet/var-with-label.exp.json @@ -170,6 +170,7 @@ "height": 0 }, "style": {}, + "iconStyle": {}, "near_key": null, "shape": { "value": "" @@ -221,6 +222,7 @@ "value": "0.5" } }, + "iconStyle": {}, "near_key": null, "shape": { "value": "rectangle" diff --git a/testdata/d2oracle/TestUpdateImport/in_layer.exp.json b/testdata/d2oracle/TestUpdateImport/in_layer.exp.json new file mode 100644 index 000000000..e66d31063 --- /dev/null +++ b/testdata/d2oracle/TestUpdateImport/in_layer.exp.json @@ -0,0 +1,410 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "index.d2,0:0:0-7:0:39", + "nodes": [ + { + "map_key": { + "range": "index.d2,0:0:0-0:1:1", + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "index.d2,2:0:3-6:1:38", + "key": { + "range": "index.d2,2:0:3-2:6:9", + "path": [ + { + "unquoted_string": { + "range": "index.d2,2:0:3-2:6:9", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "index.d2,2:8:11-6:1:38", + "nodes": [ + { + "map_key": { + "range": "index.d2,3:2:15-5:3:36", + "key": { + "range": "index.d2,3:2:15-3:3:16", + "path": [ + { + "unquoted_string": { + "range": "index.d2,3:2:15-3:3:16", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "index.d2,3:5:18-5:3:36", + "nodes": [ + { + "map_key": { + "range": "index.d2,4:4:24-4:12:32", + "key": { + "range": "index.d2,4:4:24-4:5:25", + "path": [ + { + "unquoted_string": { + "range": "index.d2,4:4:24-4:5:25", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "index.d2,4:7:27-4:12:32", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "index.d2,4:8:28-4:12:32", + "value": [ + { + "string": "woof", + "raw_string": "woof" + } + ] + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "x" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ], + "layers": [ + { + "name": "y", + "isFolderOnly": false, + "ast": { + "range": "index.d2,0:0:0-1:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "index.d2,4:4:24-4:5:25", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": ",1:0:0-2:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "woof.d2,0:0:0-0:1:1", + "value": [ + { + "string": "k", + "raw_string": "k" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "z", + "id_val": "z", + "references": [ + { + "key": { + "range": "index.d2,4:4:24-4:5:25", + "path": [ + { + "unquoted_string": { + "range": "index.d2,4:4:24-4:5:25", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "index.d2,4:4:24-4:5:25", + "path": [ + { + "unquoted_string": { + "range": "index.d2,4:4:24-4:5:25", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "z" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "k", + "id_val": "k", + "references": [ + { + "key": { + "range": "woof.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "woof.d2,0:0:0-0:1:1", + "value": [ + { + "string": "k", + "raw_string": "k" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "k" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + } + ] + }, + "err": "" +} diff --git a/testdata/d2oracle/TestUpdateImport/layer_import.exp.json b/testdata/d2oracle/TestUpdateImport/layer_import.exp.json new file mode 100644 index 000000000..b1f35b938 --- /dev/null +++ b/testdata/d2oracle/TestUpdateImport/layer_import.exp.json @@ -0,0 +1,293 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "index.d2,0:0:0-7:0:39", + "nodes": [ + { + "map_key": { + "range": "index.d2,0:0:0-0:1:1", + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "index.d2,2:0:3-6:1:38", + "key": { + "range": "index.d2,2:0:3-2:6:9", + "path": [ + { + "unquoted_string": { + "range": "index.d2,2:0:3-2:6:9", + "value": [ + { + "string": "layers", + "raw_string": "layers" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "index.d2,2:8:11-6:1:38", + "nodes": [ + { + "map_key": { + "range": "index.d2,3:2:15-5:3:36", + "key": { + "range": "index.d2,3:2:15-3:3:16", + "path": [ + { + "unquoted_string": { + "range": "index.d2,3:2:15-3:3:16", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "index.d2,3:5:18-5:3:36", + "nodes": [ + { + "import": { + "range": "index.d2,4:4:24-4:12:32", + "spread": true, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "index.d2,4:8:28-4:12:32", + "value": [ + { + "string": "woof", + "raw_string": "woof" + } + ] + } + } + ] + } + } + ] + } + } + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "x" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ], + "layers": [ + { + "name": "y", + "isFolderOnly": false, + "ast": { + "range": "index.d2,0:0:0-1:0:0", + "nodes": [ + { + "map_key": { + "range": ",0:0:0-0:0:0", + "key": { + "range": ",0:0:0-0:0:0", + "path": [ + { + "unquoted_string": { + "range": "woof.d2,0:0:0-0:1:1", + "value": [ + { + "string": "k", + "raw_string": "k" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "k", + "id_val": "k", + "references": [ + { + "key": { + "range": "woof.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "woof.d2,0:0:0-0:1:1", + "value": [ + { + "string": "k", + "raw_string": "k" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "k" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + } + ] + }, + "err": "" +} diff --git a/testdata/d2oracle/TestUpdateImport/mixed_imports.exp.json b/testdata/d2oracle/TestUpdateImport/mixed_imports.exp.json new file mode 100644 index 000000000..89ddf2f9f --- /dev/null +++ b/testdata/d2oracle/TestUpdateImport/mixed_imports.exp.json @@ -0,0 +1,397 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "index.d2,0:0:0-4:0:22", + "nodes": [ + { + "map_key": { + "range": "index.d2,0:0:0-0:8:8", + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "index.d2,0:3:3-0:8:8", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:4:4-0:8:8", + "value": [ + { + "string": "woof", + "raw_string": "woof" + } + ] + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "index.d2,1:0:9-1:1:10", + "key": { + "range": "index.d2,1:0:9-1:1:10", + "path": [ + { + "unquoted_string": { + "range": "index.d2,1:0:9-1:1:10", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "import": { + "range": "index.d2,2:0:11-2:8:19", + "spread": true, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "index.d2,2:4:15-2:8:19", + "value": [ + { + "string": "woof", + "raw_string": "woof" + } + ] + } + } + ] + } + }, + { + "map_key": { + "range": "index.d2,3:0:20-3:1:21", + "key": { + "range": "index.d2,3:0:20-3:1:21", + "path": [ + { + "unquoted_string": { + "range": "index.d2,3:0:20-3:1:21", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "x" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "k", + "id_val": "k", + "references": [ + { + "key": { + "range": "woof.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "woof.d2,0:0:0-0:1:1", + "value": [ + { + "string": "k", + "raw_string": "k" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "k" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "k", + "id_val": "k", + "references": [ + { + "key": { + "range": "woof.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "woof.d2,0:0:0-0:1:1", + "value": [ + { + "string": "k", + "raw_string": "k" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "k" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "y", + "id_val": "y", + "references": [ + { + "key": { + "range": "index.d2,1:0:9-1:1:10", + "path": [ + { + "unquoted_string": { + "range": "index.d2,1:0:9-1:1:10", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "y" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "z", + "id_val": "z", + "references": [ + { + "key": { + "range": "index.d2,3:0:20-3:1:21", + "path": [ + { + "unquoted_string": { + "range": "index.d2,3:0:20-3:1:21", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "z" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": "" +} diff --git a/testdata/d2oracle/TestUpdateImport/multiple_imports.exp.json b/testdata/d2oracle/TestUpdateImport/multiple_imports.exp.json new file mode 100644 index 000000000..837aae868 --- /dev/null +++ b/testdata/d2oracle/TestUpdateImport/multiple_imports.exp.json @@ -0,0 +1,416 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "index.d2,0:0:0-3:0:20", + "nodes": [ + { + "map_key": { + "range": "index.d2,0:0:0-0:8:8", + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "index.d2,0:3:3-0:8:8", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:4:4-0:8:8", + "value": [ + { + "string": "woof", + "raw_string": "woof" + } + ] + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "index.d2,1:0:9-1:8:17", + "key": { + "range": "index.d2,1:0:9-1:1:10", + "path": [ + { + "unquoted_string": { + "range": "index.d2,1:0:9-1:1:10", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "index.d2,1:3:12-1:8:17", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "index.d2,1:4:13-1:8:17", + "value": [ + { + "string": "woof", + "raw_string": "woof" + } + ] + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "index.d2,2:0:18-2:1:19", + "key": { + "range": "index.d2,2:0:18-2:1:19", + "path": [ + { + "unquoted_string": { + "range": "index.d2,2:0:18-2:1:19", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "x" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "k", + "id_val": "k", + "references": [ + { + "key": { + "range": "woof.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "woof.d2,0:0:0-0:1:1", + "value": [ + { + "string": "k", + "raw_string": "k" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "k" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "k", + "id_val": "k", + "references": [ + { + "key": { + "range": "woof.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "woof.d2,0:0:0-0:1:1", + "value": [ + { + "string": "k", + "raw_string": "k" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "k" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "y", + "id_val": "y", + "references": [ + { + "key": { + "range": "index.d2,1:0:9-1:1:10", + "path": [ + { + "unquoted_string": { + "range": "index.d2,1:0:9-1:1:10", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "index.d2,1:0:9-1:1:10", + "path": [ + { + "unquoted_string": { + "range": "index.d2,1:0:9-1:1:10", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "y" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "z", + "id_val": "z", + "references": [ + { + "key": { + "range": "index.d2,2:0:18-2:1:19", + "path": [ + { + "unquoted_string": { + "range": "index.d2,2:0:18-2:1:19", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "z" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": "" +} diff --git a/testdata/d2oracle/TestUpdateImport/nested_import.exp.json b/testdata/d2oracle/TestUpdateImport/nested_import.exp.json new file mode 100644 index 000000000..e4b2e89a8 --- /dev/null +++ b/testdata/d2oracle/TestUpdateImport/nested_import.exp.json @@ -0,0 +1,337 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "index.d2,0:0:0-4:0:30", + "nodes": [ + { + "map_key": { + "range": "index.d2,0:0:0-3:1:29", + "key": { + "range": "index.d2,0:0:0-0:9:9", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:9:9", + "value": [ + { + "string": "container", + "raw_string": "container" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "index.d2,0:11:11-3:1:29", + "nodes": [ + { + "map_key": { + "range": "index.d2,1:2:15-1:10:23", + "key": { + "range": "index.d2,1:2:15-1:3:16", + "path": [ + { + "unquoted_string": { + "range": "index.d2,1:2:15-1:3:16", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "index.d2,1:5:18-1:10:23", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "index.d2,1:6:19-1:10:23", + "value": [ + { + "string": "woof", + "raw_string": "woof" + } + ] + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "index.d2,2:2:26-2:3:27", + "key": { + "range": "index.d2,2:2:26-2:3:27", + "path": [ + { + "unquoted_string": { + "range": "index.d2,2:2:26-2:3:27", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "container", + "id_val": "container", + "references": [ + { + "key": { + "range": "index.d2,0:0:0-0:9:9", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:9:9", + "value": [ + { + "string": "container", + "raw_string": "container" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "container" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "k", + "id_val": "k", + "references": [ + { + "key": { + "range": "woof.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "woof.d2,0:0:0-0:1:1", + "value": [ + { + "string": "k", + "raw_string": "k" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "k" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "index.d2,1:2:15-1:3:16", + "path": [ + { + "unquoted_string": { + "range": "index.d2,1:2:15-1:3:16", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "index.d2,1:2:15-1:3:16", + "path": [ + { + "unquoted_string": { + "range": "index.d2,1:2:15-1:3:16", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "x" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "y", + "id_val": "y", + "references": [ + { + "key": { + "range": "index.d2,2:2:26-2:3:27", + "path": [ + { + "unquoted_string": { + "range": "index.d2,2:2:26-2:3:27", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "y" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": "" +} diff --git a/testdata/d2oracle/TestUpdateImport/no_matching_import.exp.json b/testdata/d2oracle/TestUpdateImport/no_matching_import.exp.json new file mode 100644 index 000000000..2acfaef4d --- /dev/null +++ b/testdata/d2oracle/TestUpdateImport/no_matching_import.exp.json @@ -0,0 +1,262 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "index.d2,0:0:0-2:0:10", + "nodes": [ + { + "map_key": { + "range": "index.d2,0:0:0-0:7:7", + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "index.d2,0:3:3-0:7:7", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:4:4-0:7:7", + "value": [ + { + "string": "cat", + "raw_string": "cat" + } + ] + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "index.d2,1:0:8-1:1:9", + "key": { + "range": "index.d2,1:0:8-1:1:9", + "path": [ + { + "unquoted_string": { + "range": "index.d2,1:0:8-1:1:9", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "x" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "k", + "id_val": "k", + "references": [ + { + "key": { + "range": "cat.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "cat.d2,0:0:0-0:1:1", + "value": [ + { + "string": "k", + "raw_string": "k" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "k" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "y", + "id_val": "y", + "references": [ + { + "key": { + "range": "index.d2,1:0:8-1:1:9", + "path": [ + { + "unquoted_string": { + "range": "index.d2,1:0:8-1:1:9", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "y" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": "" +} diff --git a/testdata/d2oracle/TestUpdateImport/remove_directory_import.exp.json b/testdata/d2oracle/TestUpdateImport/remove_directory_import.exp.json new file mode 100644 index 000000000..2183e42b6 --- /dev/null +++ b/testdata/d2oracle/TestUpdateImport/remove_directory_import.exp.json @@ -0,0 +1,246 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "index.d2,0:0:0-3:0:6", + "nodes": [ + { + "map_key": { + "range": "index.d2,0:0:0-0:1:1", + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "index.d2,1:0:2-1:1:3", + "key": { + "range": "index.d2,1:0:2-1:1:3", + "path": [ + { + "unquoted_string": { + "range": "index.d2,1:0:2-1:1:3", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "index.d2,2:0:4-2:1:5", + "key": { + "range": "index.d2,2:0:4-2:1:5", + "path": [ + { + "unquoted_string": { + "range": "index.d2,2:0:4-2:1:5", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "x" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "y", + "id_val": "y", + "references": [ + { + "key": { + "range": "index.d2,1:0:2-1:1:3", + "path": [ + { + "unquoted_string": { + "range": "index.d2,1:0:2-1:1:3", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "y" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "z", + "id_val": "z", + "references": [ + { + "key": { + "range": "index.d2,2:0:4-2:1:5", + "path": [ + { + "unquoted_string": { + "range": "index.d2,2:0:4-2:1:5", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "z" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": "" +} diff --git a/testdata/d2oracle/TestUpdateImport/remove_import.exp.json b/testdata/d2oracle/TestUpdateImport/remove_import.exp.json new file mode 100644 index 000000000..be88e94da --- /dev/null +++ b/testdata/d2oracle/TestUpdateImport/remove_import.exp.json @@ -0,0 +1,177 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "index.d2,0:0:0-2:0:4", + "nodes": [ + { + "map_key": { + "range": "index.d2,0:0:0-0:1:1", + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "index.d2,1:0:2-1:1:3", + "key": { + "range": "index.d2,1:0:2-1:1:3", + "path": [ + { + "unquoted_string": { + "range": "index.d2,1:0:2-1:1:3", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "x" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "y", + "id_val": "y", + "references": [ + { + "key": { + "range": "index.d2,1:0:2-1:1:3", + "path": [ + { + "unquoted_string": { + "range": "index.d2,1:0:2-1:1:3", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "y" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": "" +} diff --git a/testdata/d2oracle/TestUpdateImport/remove_nested_import.exp.json b/testdata/d2oracle/TestUpdateImport/remove_nested_import.exp.json new file mode 100644 index 000000000..6c4cb9a55 --- /dev/null +++ b/testdata/d2oracle/TestUpdateImport/remove_nested_import.exp.json @@ -0,0 +1,252 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "index.d2,0:0:0-4:0:23", + "nodes": [ + { + "map_key": { + "range": "index.d2,0:0:0-3:1:22", + "key": { + "range": "index.d2,0:0:0-0:9:9", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:9:9", + "value": [ + { + "string": "container", + "raw_string": "container" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "index.d2,0:11:11-3:1:22", + "nodes": [ + { + "map_key": { + "range": "index.d2,1:2:15-1:3:16", + "key": { + "range": "index.d2,1:2:15-1:3:16", + "path": [ + { + "unquoted_string": { + "range": "index.d2,1:2:15-1:3:16", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "index.d2,2:2:19-2:3:20", + "key": { + "range": "index.d2,2:2:19-2:3:20", + "path": [ + { + "unquoted_string": { + "range": "index.d2,2:2:19-2:3:20", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + } + } + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "container", + "id_val": "container", + "references": [ + { + "key": { + "range": "index.d2,0:0:0-0:9:9", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:9:9", + "value": [ + { + "string": "container", + "raw_string": "container" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "container" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "index.d2,1:2:15-1:3:16", + "path": [ + { + "unquoted_string": { + "range": "index.d2,1:2:15-1:3:16", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "x" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "y", + "id_val": "y", + "references": [ + { + "key": { + "range": "index.d2,2:2:19-2:3:20", + "path": [ + { + "unquoted_string": { + "range": "index.d2,2:2:19-2:3:20", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "y" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": "" +} diff --git a/testdata/d2oracle/TestUpdateImport/remove_spread_import.exp.json b/testdata/d2oracle/TestUpdateImport/remove_spread_import.exp.json new file mode 100644 index 000000000..24487fde6 --- /dev/null +++ b/testdata/d2oracle/TestUpdateImport/remove_spread_import.exp.json @@ -0,0 +1,177 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "index.d2,0:0:0-3:0:5", + "nodes": [ + { + "map_key": { + "range": "index.d2,0:0:0-0:1:1", + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "map_key": { + "range": "index.d2,2:0:3-2:1:4", + "key": { + "range": "index.d2,2:0:3-2:1:4", + "path": [ + { + "unquoted_string": { + "range": "index.d2,2:0:3-2:1:4", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "x" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "y", + "id_val": "y", + "references": [ + { + "key": { + "range": "index.d2,2:0:3-2:1:4", + "path": [ + { + "unquoted_string": { + "range": "index.d2,2:0:3-2:1:4", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "y" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": "" +} diff --git a/testdata/d2oracle/TestUpdateImport/update_deep_directory_paths.exp.json b/testdata/d2oracle/TestUpdateImport/update_deep_directory_paths.exp.json new file mode 100644 index 000000000..629973701 --- /dev/null +++ b/testdata/d2oracle/TestUpdateImport/update_deep_directory_paths.exp.json @@ -0,0 +1,416 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "index.d2,0:0:0-3:0:37", + "nodes": [ + { + "map_key": { + "range": "index.d2,0:0:0-0:16:16", + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "index.d2,0:3:3-0:16:16", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:4:4-0:16:16", + "value": [ + { + "string": "woof/bar/baz", + "raw_string": "woof/bar/baz" + } + ] + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "index.d2,1:0:17-1:17:34", + "key": { + "range": "index.d2,1:0:17-1:1:18", + "path": [ + { + "unquoted_string": { + "range": "index.d2,1:0:17-1:1:18", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "index.d2,1:3:20-1:17:34", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "index.d2,1:4:21-1:17:34", + "value": [ + { + "string": "woof/qux/quux", + "raw_string": "woof/qux/quux" + } + ] + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "index.d2,2:0:35-2:1:36", + "key": { + "range": "index.d2,2:0:35-2:1:36", + "path": [ + { + "unquoted_string": { + "range": "index.d2,2:0:35-2:1:36", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "x" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "k", + "id_val": "k", + "references": [ + { + "key": { + "range": "woof/bar/baz.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "woof/bar/baz.d2,0:0:0-0:1:1", + "value": [ + { + "string": "k", + "raw_string": "k" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "k" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "k", + "id_val": "k", + "references": [ + { + "key": { + "range": "woof/qux/quux.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "woof/qux/quux.d2,0:0:0-0:1:1", + "value": [ + { + "string": "k", + "raw_string": "k" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "k" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "y", + "id_val": "y", + "references": [ + { + "key": { + "range": "index.d2,1:0:17-1:1:18", + "path": [ + { + "unquoted_string": { + "range": "index.d2,1:0:17-1:1:18", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "index.d2,1:0:17-1:1:18", + "path": [ + { + "unquoted_string": { + "range": "index.d2,1:0:17-1:1:18", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "y" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "z", + "id_val": "z", + "references": [ + { + "key": { + "range": "index.d2,2:0:35-2:1:36", + "path": [ + { + "unquoted_string": { + "range": "index.d2,2:0:35-2:1:36", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "z" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": "" +} diff --git a/testdata/d2oracle/TestUpdateImport/update_directory_import.exp.json b/testdata/d2oracle/TestUpdateImport/update_directory_import.exp.json new file mode 100644 index 000000000..26b681263 --- /dev/null +++ b/testdata/d2oracle/TestUpdateImport/update_directory_import.exp.json @@ -0,0 +1,416 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "index.d2,0:0:0-3:0:28", + "nodes": [ + { + "map_key": { + "range": "index.d2,0:0:0-0:12:12", + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "index.d2,0:3:3-0:12:12", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:4:4-0:12:12", + "value": [ + { + "string": "woof/bar", + "raw_string": "woof/bar" + } + ] + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "index.d2,1:0:13-1:12:25", + "key": { + "range": "index.d2,1:0:13-1:1:14", + "path": [ + { + "unquoted_string": { + "range": "index.d2,1:0:13-1:1:14", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "index.d2,1:3:16-1:12:25", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "index.d2,1:4:17-1:12:25", + "value": [ + { + "string": "woof/baz", + "raw_string": "woof/baz" + } + ] + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "index.d2,2:0:26-2:1:27", + "key": { + "range": "index.d2,2:0:26-2:1:27", + "path": [ + { + "unquoted_string": { + "range": "index.d2,2:0:26-2:1:27", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "x" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "k", + "id_val": "k", + "references": [ + { + "key": { + "range": "woof/bar.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "woof/bar.d2,0:0:0-0:1:1", + "value": [ + { + "string": "k", + "raw_string": "k" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "k" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "k", + "id_val": "k", + "references": [ + { + "key": { + "range": "woof/baz.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "woof/baz.d2,0:0:0-0:1:1", + "value": [ + { + "string": "k", + "raw_string": "k" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "k" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "y", + "id_val": "y", + "references": [ + { + "key": { + "range": "index.d2,1:0:13-1:1:14", + "path": [ + { + "unquoted_string": { + "range": "index.d2,1:0:13-1:1:14", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "index.d2,1:0:13-1:1:14", + "path": [ + { + "unquoted_string": { + "range": "index.d2,1:0:13-1:1:14", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "y" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "z", + "id_val": "z", + "references": [ + { + "key": { + "range": "index.d2,2:0:26-2:1:27", + "path": [ + { + "unquoted_string": { + "range": "index.d2,2:0:26-2:1:27", + "value": [ + { + "string": "z", + "raw_string": "z" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "z" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": "" +} diff --git a/testdata/d2oracle/TestUpdateImport/update_import.exp.json b/testdata/d2oracle/TestUpdateImport/update_import.exp.json new file mode 100644 index 000000000..69194c8b0 --- /dev/null +++ b/testdata/d2oracle/TestUpdateImport/update_import.exp.json @@ -0,0 +1,262 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "index.d2,0:0:0-2:0:11", + "nodes": [ + { + "map_key": { + "range": "index.d2,0:0:0-0:8:8", + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "index.d2,0:3:3-0:8:8", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:4:4-0:8:8", + "value": [ + { + "string": "woof", + "raw_string": "woof" + } + ] + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "index.d2,1:0:9-1:1:10", + "key": { + "range": "index.d2,1:0:9-1:1:10", + "path": [ + { + "unquoted_string": { + "range": "index.d2,1:0:9-1:1:10", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "x" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "k", + "id_val": "k", + "references": [ + { + "key": { + "range": "woof.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "woof.d2,0:0:0-0:1:1", + "value": [ + { + "string": "k", + "raw_string": "k" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "k" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "y", + "id_val": "y", + "references": [ + { + "key": { + "range": "index.d2,1:0:9-1:1:10", + "path": [ + { + "unquoted_string": { + "range": "index.d2,1:0:9-1:1:10", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "y" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": "" +} diff --git a/testdata/d2oracle/TestUpdateImport/update_import_with_dir.exp.json b/testdata/d2oracle/TestUpdateImport/update_import_with_dir.exp.json new file mode 100644 index 000000000..ef6720216 --- /dev/null +++ b/testdata/d2oracle/TestUpdateImport/update_import_with_dir.exp.json @@ -0,0 +1,262 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "index.d2,0:0:0-2:0:15", + "nodes": [ + { + "map_key": { + "range": "index.d2,0:0:0-0:12:12", + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "import": { + "range": "index.d2,0:3:3-0:12:12", + "spread": false, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:4:4-0:12:12", + "value": [ + { + "string": "bar/woof", + "raw_string": "bar/woof" + } + ] + } + } + ] + } + } + } + }, + { + "map_key": { + "range": "index.d2,1:0:13-1:1:14", + "key": { + "range": "index.d2,1:0:13-1:1:14", + "path": [ + { + "unquoted_string": { + "range": "index.d2,1:0:13-1:1:14", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + }, + { + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "x" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "k", + "id_val": "k", + "references": [ + { + "key": { + "range": "bar/woof.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "bar/woof.d2,0:0:0-0:1:1", + "value": [ + { + "string": "k", + "raw_string": "k" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "k" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "y", + "id_val": "y", + "references": [ + { + "key": { + "range": "index.d2,1:0:13-1:1:14", + "path": [ + { + "unquoted_string": { + "range": "index.d2,1:0:13-1:1:14", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "y" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": "" +} diff --git a/testdata/d2oracle/TestUpdateImport/update_spread_import.exp.json b/testdata/d2oracle/TestUpdateImport/update_spread_import.exp.json new file mode 100644 index 000000000..daec0b4aa --- /dev/null +++ b/testdata/d2oracle/TestUpdateImport/update_spread_import.exp.json @@ -0,0 +1,243 @@ +{ + "graph": { + "name": "", + "isFolderOnly": false, + "ast": { + "range": "index.d2,0:0:0-3:0:13", + "nodes": [ + { + "map_key": { + "range": "index.d2,0:0:0-0:1:1", + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + }, + { + "import": { + "range": "index.d2,1:0:2-1:8:10", + "spread": true, + "pre": "", + "path": [ + { + "unquoted_string": { + "range": "index.d2,1:4:6-1:8:10", + "value": [ + { + "string": "woof", + "raw_string": "woof" + } + ] + } + } + ] + } + }, + { + "map_key": { + "range": "index.d2,2:0:11-2:1:12", + "key": { + "range": "index.d2,2:0:11-2:1:12", + "path": [ + { + "unquoted_string": { + "range": "index.d2,2:0:11-2:1:12", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + }, + "root": { + "id": "", + "id_val": "", + "attributes": { + "label": { + "value": "" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + "edges": null, + "objects": [ + { + "id": "x", + "id_val": "x", + "references": [ + { + "key": { + "range": "index.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "index.d2,0:0:0-0:1:1", + "value": [ + { + "string": "x", + "raw_string": "x" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "x" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "k", + "id_val": "k", + "references": [ + { + "key": { + "range": "woof.d2,0:0:0-0:1:1", + "path": [ + { + "unquoted_string": { + "range": "woof.d2,0:0:0-0:1:1", + "value": [ + { + "string": "k", + "raw_string": "k" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "k" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + }, + { + "id": "y", + "id_val": "y", + "references": [ + { + "key": { + "range": "index.d2,2:0:11-2:1:12", + "path": [ + { + "unquoted_string": { + "range": "index.d2,2:0:11-2:1:12", + "value": [ + { + "string": "y", + "raw_string": "y" + } + ] + } + } + ] + }, + "key_path_index": 0, + "map_key_edge_index": -1 + } + ], + "attributes": { + "label": { + "value": "y" + }, + "labelDimensions": { + "width": 0, + "height": 0 + }, + "style": {}, + "iconStyle": {}, + "near_key": null, + "shape": { + "value": "rectangle" + }, + "direction": { + "value": "" + }, + "constraint": null + }, + "zIndex": 0 + } + ] + }, + "err": "" +} diff --git a/testdata/d2parser/TestParse/import/#10.exp.json b/testdata/d2parser/TestParse/import/#10.exp.json new file mode 100644 index 000000000..ef55d73a4 --- /dev/null +++ b/testdata/d2parser/TestParse/import/#10.exp.json @@ -0,0 +1,100 @@ +{ + "ast": { + "range": "d2/testdata/d2parser/TestParse/import/#10.d2,0:0:0-3:0:591", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2parser/TestParse/import/#10.d2,0:0:0-2:1:590", + "key": { + "range": "d2/testdata/d2parser/TestParse/import/#10.d2,0:0:0-0:6:6", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2parser/TestParse/import/#10.d2,0:0:0-0:6:6", + "value": [ + { + "string": "gcloud", + "raw_string": "gcloud" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "map": { + "range": "d2/testdata/d2parser/TestParse/import/#10.d2,0:8:8-2:1:590", + "nodes": [ + { + "map_key": { + "range": "d2/testdata/d2parser/TestParse/import/#10.d2,1:2:12-1:22:32", + "key": { + "range": "d2/testdata/d2parser/TestParse/import/#10.d2,1:2:12-1:6:16", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2parser/TestParse/import/#10.d2,1:2:12-1:6:16", + "value": [ + { + "string": "icon", + "raw_string": "icon" + } + ] + } + } + ] + }, + "primary": {}, + "value": { + "unquoted_string": { + "range": "d2/testdata/d2parser/TestParse/import/#10.d2,1:8:18-1:22:32", + "value": [ + { + "string": "data:image/png", + "raw_string": "data:image/png" + } + ] + } + } + } + }, + { + "map_key": { + "range": "d2/testdata/d2parser/TestParse/import/#10.d2,1:23:33-1:578:588", + "key": { + "range": "d2/testdata/d2parser/TestParse/import/#10.d2,1:23:33-1:578:588", + "path": [ + { + "unquoted_string": { + "range": "d2/testdata/d2parser/TestParse/import/#10.d2,1:23:33-1:578:588", + "value": [ + { + "string": "base64,iVBORw0KGgoAAAANSUhEUgAAAMwAAADACAMAAAB/Pny7AAAAjVBMVEVChfT///89fOM3gPTk7P0+g/R0oPaKr+0rc+E0d+I5euNYjObt9P1lmiVBORw0KGgoAAAANSUhEUgAAAiVBORw0KGgoAAAANSUhEUgAAAiVBORw0KGgoAAAANSUhEUgAAABORw0KGgoAAAANSUhEUgAAAMwAAADACAMAAAB/Pny7AAAAjVBMVEVChfT///89fOM3gPTk7P0+g/R0oPaKr+0rc+E0d+I5euNYjObt9P1lmiVBORw0KGgoAAAANSUhEUgAAAiVBORw0KGgoAAAANSUhEUgAAAiVBORw0KGgoAAAANSUhEUgAAABORw0KGgoAAAANSUhEUgAAAMwAAADACAMAAAB/Pny7AAAAjVBMVEVChfT///89fOM3gPTk7P0+g/R0oPaKr+0rc+E0d+I5euNYjObt9P1lmiVBORw0KGgoAAAANSUhEUgAAAiVBORw0KGgoAAAANSUhEUgAAAiVBORw0KGgoAAAANSUhEUgAAA", + "raw_string": "base64,iVBORw0KGgoAAAANSUhEUgAAAMwAAADACAMAAAB/Pny7AAAAjVBMVEVChfT///89fOM3gPTk7P0+g/R0oPaKr+0rc+E0d+I5euNYjObt9P1lmiVBORw0KGgoAAAANSUhEUgAAAiVBORw0KGgoAAAANSUhEUgAAAiVBORw0KGgoAAAANSUhEUgAAABORw0KGgoAAAANSUhEUgAAAMwAAADACAMAAAB/Pny7AAAAjVBMVEVChfT///89fOM3gPTk7P0+g/R0oPaKr+0rc+E0d+I5euNYjObt9P1lmiVBORw0KGgoAAAANSUhEUgAAAiVBORw0KGgoAAAANSUhEUgAAAiVBORw0KGgoAAAANSUhEUgAAABORw0KGgoAAAANSUhEUgAAAMwAAADACAMAAAB/Pny7AAAAjVBMVEVChfT///89fOM3gPTk7P0+g/R0oPaKr+0rc+E0d+I5euNYjObt9P1lmiVBORw0KGgoAAAANSUhEUgAAAiVBORw0KGgoAAAANSUhEUgAAAiVBORw0KGgoAAAANSUhEUgAAA" + } + ] + } + } + ] + }, + "primary": {}, + "value": {} + } + } + ] + } + } + } + } + ] + }, + "err": { + "errs": [ + { + "range": "d2/testdata/d2parser/TestParse/import/#10.d2,1:23:33-1:578:588", + "errmsg": "d2/testdata/d2parser/TestParse/import/#10.d2:2:24: key length 555 exceeds maximum allowed length of 518" + } + ] + } +}